update to lynx 2.8.5rel.1

tested todd@,naddy@. millert@ deraadt@ ok

300 files changed, 90319 insertions, 43072 deletions

diff --git a/gnu/usr.bin/lynx/ABOUT-NLS b/gnu/usr.bin/lynx/ABOUT-NLS
index 249a4b5b01e..92e0eef842e 100644
--- a/gnu/usr.bin/lynx/ABOUT-NLS
+++ b/gnu/usr.bin/lynx/ABOUT-NLS
@@ -1,3 +1,8 @@
+Some of this discussion is obsolete - lynx does not bundle the "intl"
+directory, and consequently the "--with-included-gettext" configure option is
+not supported.
+------------------------------------------------------------------------------
+
 Notes on the Free Translation Project
 *************************************
 
diff --git a/gnu/usr.bin/lynx/CHANGES b/gnu/usr.bin/lynx/CHANGES
index 0f9dfbb45e6..dfa08dd1ff1 100644
--- a/gnu/usr.bin/lynx/CHANGES
+++ b/gnu/usr.bin/lynx/CHANGES
@@ -1,26 +1,1176 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
-extracted from 2002-09-12 (2.8.5dev.9)
+2004-02-04 (2.8.5rel.1)
+* build fixes for MINGW32 -DK
+* build fixes for OS/2 (reported by IZ) -TD
+
+2004-02-02 (2.8.5pre.5)
+* MINGW32-specific changes to build with that configuration using the configure
+  script in Cygwin and "-mno-cygwin" option -DK
+* move Cygwin defines for WIN_EX, _WINDOWS_NSL out of www_tcp.h, to the
+  configure script to fix a definition-order problem with CAN_CUT_AND_PASTE
+  (report by DK) -TD
+* improve workaround for ncurses to build with pre-4.0 versions that do not
+  declare attr_t -TD
+
+2004-01-28 (2.8.5pre.4)
+* workaround to build with ncurses 4.2 -TD
+* fixes from Thorsten Glaser:
+  + use ${GNUSYSTEM_AUX_DIR}/mkinstalldirs if it exists.
+  + use $ac_config_sub variable in CF_CHECK_CACHE macro.
+  + add case in CF_XOPEN_SOURCE macro to prevent defining _XOPEN_SOURCE
+  + use $(MKINSTALLDIRS) variable in generated makefile.
+  + correct comment in lynx.cfg for the default value of FTP_PASSIVE 
+  + increase pattern length for mkdtemp() call.
+* add command-line & menu option/config variables to replace the compile-time
+  UNDERLINE_LINKS definition (suggested by BL) -TD
+* correct ownership of installed lynx_doc directory (report by FLWM, PG) -TD
+* modify configure check for tar to test several common variants including
+  star, modify makefile.in to use the configured 'tar' program (request by
+  FLWM) -TD
+* compiler ifdef-fixes -BL
+* documentation updates for DJGPP and OpenSSL -DK
+* fixes/updates for DJGPP makefiles -DK
+* modify po/makefile.inn to substitute the PACKAGE and VERSION strings into
+  lynx.pot automatically, and to remove the unused boilerplate header comment
+  (suggested by LP) -TD
+* fixes for substituted project-version in configure script -TD
+
+2004-01-24 (2.8.5pre.3)
+* update documentation's version numbers for release -TD
+* modify configure check for libbz2 to allow for older headers which do not
+  include <stdio.h> -TD
+* add configure option --enable-locale-charset, which adds configure settings
+  and an option-menu checkbox telling lynx if it should use the function call
+  nl_langinfo(CODESET) to find the display character set rather than rely on
+  the user to set it via lynx.cfg or the options menu (discussion with Andreas
+  Metzler) -TD
+* remove intl subdirectory (gettext-0.10.35), since some of the ".po" files
+  have been modified to rely upon newer features of gettext.  Modified
+  configure script macro to report this properly -TD 
+* add SSL_CERT_DIR, SSL_CERT_FILE to lynx.man (suggested by Stef Caunter) -TD
+* documentation updates for DJGPP -DK, LP, FLWM
+* update address for Free Software Foundation in COPYHEADER and COPYING
+  (Atsuhito Kohda).
+* change CF_CHECK_IPV6 to warn rather than error-out if a working getaddrinfo()
+  function cannot be found.  The previous behavior would warn on Linux and
+  error-out on other systems (report by RobertM) -TD
+* localized displayed strings used for popups in options menu -TD
+* add SHOW_KB_NAME to allow user to decide whether to display "KB" or "Kib"
+  or even "Kilobytes" for the progress message (discussion on lynx-dev) -TD
+* correct form generated to select Visited Links page in LYHistory.c to match
+  the values used in LYOptions.c with new function LYMenuVisitedLinks, and
+  corrected ifdef to ensure that menu is generated when the forms-based option
+  menu is configured (report by TH) -TD
+* modify configure check for ranlib to use AC_CHECK_TOOL, since AC_PROG_RANLIB
+  does not do proper cross-compiling checks.  This actually applies to autoconf
+  2.5x -- autoconf 2.13 does less in that area -TD
+* update config.guess (2004-01-05) and config.sub (2004-01-05).
+* ensure that freeaddrinfo() is only called if lynx has initialized its
+  parameter, fixes a core-dump on IRIX6.5 -TD
+* change remaining references for lynx.browser.org to lynx.isc.org (reported by
+  Frederic L W Meunier) -TD
+
+2004-01-19 (2.8.5pre.2)
+* update URLs in docs/README.ssl (Stef Caunter, DK).
+* use http://search.lycos.com rather than the messy http://www.lycos.com -DK
+* update some URLs in lynx_help -FLWM (Frederic L W Meunier)
+* remove a few unnecessary #include's (reported by Frederic L W Meunier) -TD
+* fix some compiler warnings with casts -PG
+* add docs/ directory to "make install-doc" rule.  If the help-files are
+  compressed, the same will apply to the non-README files in that directory
+  (reported by Frederic L W Meunier) -TD
+* minor fixes to allow compiling with K&R compiler, e.g.,SunOS 4.x with the
+  5lib curses -TD
+* split up remove_file() in LYLocal.c so directory removal is performed in a
+  separate function remove_directory().  Neither will perform an "rm -rf",
+  but only single operations "rm" and "rmdir".  The original behavior can be
+  obtained by setting RMDIR_PATH to point to a script which does "rm -rf"
+  in lynx.cfg (suggested by Pat Walsh).
+* modify configure script so NetBSD does not define _XOPEN_SOURCE, since that
+  makes the IPv6 code not compile.
+* modify configure script to prefer _SGI_SOURCE on IRIX6.5 to allow it to
+  compile IPv6 support (report by RobertM) -TD
+* replace fixed-buffer Style_className[] with a dynamically-allocated buffer,
+  needed for large pages which lack correctly-nested tags, e.g.,
+    http://www.aspas-nature.org/petitions/petition2.html
+  (reported by Frederic L W Meunier) -TD
+* move OMIT_SCN_KEEPING definition to LYHash.h, to avoid mismatch between the
+  LYCurses.c and HTML.c -TD
+* remove obsolete OPT_SCN ifdef from HTML.c since the inactive side does not
+  compile -TD
+* fix a few out-of-bounds errors in LYSetHiText() and related functions,
+  which were found by valgrind -TD
+
+2004-01-07 (2.8.5pre.1)
+This version has been test-built on
+* Linux (ncurses, ncursesw, PDCurses, slang),
+* FreeBSD 4.9, 5.1 (ncurses, ncursesw),
+* Tru64 4.0d, 5.1 (cc, curses),
+* OpenVMS,
+* OS/2 EMX,
+* win32 (Visual C++ 6.0 and Borland C++, Cygwin),
+* AIX 4.3, 5.1,
+* HPUX 11,
+* Solaris 8, 9.
+Other recent builds include IRIX 6.5 (cc and gcc, curses/ncurses),
+FreeBSD 4.1, 4.8, NetBSD 1.5, 1.6 and OpenBSD 2.8 (curses/ncurses).
+
+2004-01-07 (2.8.5dev.17)
+* fix initialization of LYlines and LYcols for curses configurations other than
+  ncurses which implement pads -TD
+* fix ifdef's for alloca(), e.g., on AIX 4 -TD
+* fix misspelled LYGetEnv/LYgetenv in DJGPP configuration -DK
+* a few portability fixes to allow building on OS/2, AIX, Tru64 and HPUX -TD
+* add docs/README.rootcerts -IZ, Stef Caunter, Johannes Hromadka)
+* update po files (ca.po, da.po, de.po, et.po, hu.po, ru.po, sv.po, tr.po and
+  zh_CN.po) from
+  http://www.iro.umontreal.ca/contrib/po/maint/lynx/
+* correct some mismatches between INSTALLATION and "configure --help" (prompted
+  by discussion with Stef Caunter) -TD
+* undef conflicting symbols "small" and FILE_DOES_NOT_EXIST which are
+  misdefined in Cygwin's w32api headers (report by Frederic L W Meunier) -TD
+* amend check for refresh-URL to ensure it only prepends a link for text/html
+  content type (report by Carlton Anderson).
+* do not strip parameters from refresh-URL (report by Carlton Anderson gave an
+  example of their use) -TD
+* correct logic for resetting count of leading/trailing spaces in S_litteral
+  case (report by TH) -TD
+* remove obsolete XMOSAIC_HACK defines -TD
+* adapted patch by Bjoern Jacke <bjoern@j3e.de> to ensure that toupper(),
+  tolower() and isupper() macros are interpreted in POSIX locale.  This is
+  ifdef'd with EXP_ASCII_CTYPES -TD
+* improve check for Unix-style shell given in $SHELL by limiting the check to
+  the base-name (discussion with GV, DK) -TD
+* modify increment_tagged_htline() to reallocate its HTLine parameter if the
+  result would be larger than the allocation.  This can happen when a large
+  textarea is adjusted (report by Thorsten Glaser)  -TD
+* add ifdef'd logic to change HTLine to calloc() rather than memory pools,
+  making it possible to use valgrind, etc., for debugging -LP
+* modify version shown for SSL to be derived from runtime SSLeay_version()
+  function if linked with OpenSSL or SSLeay.  Add corresponding definition
+  for GNU TLS (discussion by Frederic L W Meunier, GV) -TD
+* add check for broken ProFTPD 1.2.5rc1, e.g., at ftp://ftp.oldskool.org/pub,
+  and force a reconnection if an error 550 is detected when doing RETR.  This
+  is ifdef'd with BROKEN_PROFTPD and checks version (reports by GV, DK) -TD
+* modify file-upload to not print a warning message if the form-field is empty
+  (Frank Heckenbach).
+* add a few null-pointer checks to GridText.c (addresses symptoms reported by
+  Frederic L W Meunier when nested-tables are toggled off) -TD
+* modify LYTrimNewline() to trim carriage-returns as well as line-feeds, making
+  it possible to share cookie files between platforms that have different
+  line-terminations (report by Frederic L W Meunier) -TD
+* rename EXP_PERSISTENT_COOKIES ifdef to USE_PERSISTENT_COOKIES -TD
+* rename EXP_READPROGRESS ifdef to USE_READPROGRESS -TD
+* rename SOURCE_CACHE ifdef to USE_SOURCE_CACHE -TD
+* change a few configure script defaults to "enable":  source-cache, prettysrc
+  and read-eta.  Also change default for read-eta configuration flag to "Show
+  KB/Sec" (requests by LP, Frederic L W Meunier) -TD
+* modify generated help_files.sed script to fix a couple of cases where the
+  intermediate result had more than 2 ".gz" substrings to reduce (reported by
+  IZ) -TD
+* change configure script to compile-in file-upload by default, change its
+  corresponding ifdef to USE_FILE_UPLOAD -TD
+* use EXEEXT, OBJEXT substitutions in makefile.in -TD
+* update configure script check for getbegx(), etc -TD
+* revert table-layout changes from dev.15/dev.16 because of unresolved
+  issues -TD
+* add configure option --with-bzlib -TD
+* modify bzip2/zlib ifdef's to make them independent -TD
+* implement support for bzip compression by internal calls to libbz2 -IZ
+* make usage of EDIT_A_PREV_SHORTCUT and EDIT_THE_PREV_SHORTCUT consistent
+  (report by LP) -TD
+* if a document is in the cache (the rendering is in memory), on reload it
+  should not be cleared from the cache until the connection to the server is
+  opened; if the connection fails, the user will reuse the old version (request
+  by IZ) -LP
+* for DJGPP, escape all backslashes in commands given to LYSystem() when
+  a Unix-style shell is given in $SHELL -DK, TD
+* correct strings in LYOptions.c so ENABLE_LYNXRC works for bookmark_file
+  and run_all_execution_links -DK
+* modify comparison in USE_CURSES_PAIR_0 ifdef of parse_attributes() to take
+  into account the mono-attributes as well.  This fixes a case where a color
+  style might have the same color-attributes as the background, and would
+  incorrectly fall-through to use the mono-attributes (report by DK) -TD
+* rewrote lynx_chg_color() to handle a COLORS value of 16 (report by TH) -TD
+* redefine PDCurses' COLORS value to 16, since it incorrectly uses 8.
+* add -scrsize option and corresponding SCREEN_SIZE value to lynx.cfg to allow
+  lynx's screensize to be specified.  To display background color properly,
+  this also requires a patch to PDCurses:
+    http://www.t3.rim.or.jp/~patakuti/tmp/lynx/PDCurses-2.5.patch.resize
+  This requires PDCurses 2.5 and higher -TH
+* add a clean-rule to src/chrtrans/makefile.bcb -TD
+* fix pathname generated for "View temporary file" in LYDownload.c using new
+  function LYAddPathToSave() (report by P.J.Walsh) -TD
+* comment-out --enable-libjs option since it is not used -TD
+* change code to match lynx.cfg description for FORCE_COOKIE_PROMPT and
+  FORCE_SSL_PROMPT, making "prompt" rather than "default" the keyword to use
+  when telling lynx to prompt (report by DK) -TD
+* really add FORCE_COOKIE_PROMPT setting to lynx.cfg (report by DK) -TD
+* change default of configure script options --enable-source-cache and
+  --enable-prettysrc to non-experimental to "yes", so they will normally
+  be compiled-in, but normally disabled in lynx.cfg (suggested by LP).
+* modify configure script and related ifdef's to build with gnutls 0.8.9
+  (report by Atsuhito Kohda) -TD
+* modify ifdef's to use mkdtemp() if it is available (prompted by MirBSD
+  patch) -TD
+* several fixes from Thorsten Glaser (MirBSD):
+  + workaround for invoking shell scripts when executable permissions are
+    discarded as a result from using CVS.
+  + adjust buffer-size used in a readlink() call in case the result is too
+    long to include trailing null.
+  + change default ftp mode to passive.
+  + if ftp connection fails, automatically retry, switching between passive
+    and active modes.  Do this retry switching only when connecting to a
+    different host.  A new variable ftp_local_passive distinguishes this
+    from the user preference in ftp_passive.
+  + improved certificate handling (case-insensitive domain-comparison, strip
+    port-numbers from comparison).
+  + fix a few typos & compiler-warnings.
+* add PT154 charset support.  See
+  http://www.iana.org/assignments/charset-reg/PTCP154 for more information. 
+  (patch by Timur Birsh <birsh@mail.kz>)
+* integrate some improvements for configure script in CF_BUNDLED_INTL and
+  CF_OUR_MESSAGES from tin and dialog -TD
+* remove #undef for UTF8 from UCMap.h, rename UTF8 variable, modify configure
+  check for slang to test-compile with with the Debian slang-utf8 package -TD
+* modify configure script to not use "head -1", which does not work for some
+  platforms when POSIXLY_CORRECT (sic) is set -TD
+* fix configure script check for term.h, which may be <ncursesw/term.h> -TD
+* modify an ifdef in HTCheckForInterrupt() to allow compile with DJGPP -GV
+* add docs/README.sslcerts (Stef Caunter <cauntes@mail.mohawkc.on.ca>).
+* modify LYLocalFileToURL() to allow for CurrentDir() returning a value that
+  does not begin with a slash, e.g., with DJGPP which returns a drive-letter
+  first -DK
+* amend change in dev.15 to HTParse() to escape spaces, to exclude non-URL
+  strings such as absolute filenames (report by Patrick Ash) -TD
+* modify LYParseTagParam() (added in dev.13) to not stop on ';' (fixes a bug
+  reported by LV which broke complicated refresh-URL containing "&amp;") -TD
+* change default start page to lynx.isc.org, since lynx.browser.org is not
+  maintained -TD
+* modify HTML_start_element() to work with a case where there is an HREF
+  attribute without a value, fixes bug introduced after dev.9, e.g., for
+        X-URL: http://bankr.tsr.ru/tv-6.shtml
+  (also reported by Frederic L W Meunier for http://www.jacotei.com.br/) -LP
+* correct construction of link to temporary filename in download options, did
+  not port to DOS-pathnames (report by LP) -TD
+
+2003-06-01 (2.8.5dev.16)
+* add zh_CN.po from
+  http://www.iro.umontreal.ca/contrib/po/maint/lynx/
+* updated obsolete link for nntp in users's guide -TD
+* add F_FILE_TYPE to F_TEXTLIKE() macro, and use it consistently in a few more
+  places, making editing in filename fields consistent with other text input
+  fields -TD
+* add LYAdjHiTextPos() to modify the behavior of color-style code, so leading
+  blanks are not highlighted (reported by Frederic L W Meunier) -TD
+* modify CacheThru_new() to accept "https:" URLs for source-caching (report
+  by Chuck Martin) -TD
+* adapt some of the SH_EX ifdef'd features:
+  + add -delay option, to make progress messages slow, along with corresponding
+    code for lynx.cfg -TD
+  + show build date/time for systems that do not use a configure script.
+  + use LYK_CHG_CENTER keycode bound to ^Q to control whether table cells are
+    centered.  The command-line -center option also controls this behavior.
+* add BIN_SUFFIX, TEXT_SUFFIX to userdefs.h -TD
+* modify BeginInternalPage(), adding a doctype to generated internal pages
+  to allow validating them -TD
+* modify HTFWriter.c to use binary suffix for any file with an application
+  presentation type, to better distinguish it from text and html.  Use text
+  suffix for any "text/" file other than "text/html".  These changes cover the
+  most common cases needed to make a link to view the temporary file useful in
+  the download page -TD
+* modify LYdownload_options(), adding a link to view the temporary file if the
+  downloaded file is text or html -TD
+* modify LYwouldPush(), omitting the download page from list of user-interface
+  pages which should not be pushed onto the history stack when visiting another
+  page, such as info or help.  Otherwise the downloaded file is discarded
+  (report by BL) -TD
+* simplify set_vi_keys() and related functions using table-driven
+  set_any_keys() and reset_any_keys() -TD
+* HTAnchor_findAddress now returns HTParentAnchor, avoid casting -LP
+* change select timeout in HTCheckForInterrupt() to zero, allowing immediate
+  return rather than waiting (DJGPP otherwise blocks for 50msec).  For Unix
+  platforms, the DontCheck() function limits the amount of polling which
+  otherwise would be too much CPU usage -LP
+* modify configure check for gcc -Winline warning to work around defect in
+  gcc 3.3 -TD
+* fix bug introduced recently in forms-submitting for TEXTAREA; the "%0d%0a"
+  was put after each line rather than before, making the first and second lines
+  joined (report by LV) -TD
+* reset the leading/trailing space counts in error-recovery logic added in
+  2.8.5dev.15 for S_litteral case in SGML_character().  Otherwise a mismatch,
+  e.g., due to a stray "<" or ">" in <script>...</script>, prevented a match
+  on the </script> -TD
+* do not free adult_table[] atexit - it should be perfectly empty after
+  free'ing all HText's.  (There is an error if it is not empty at exit) -LP
+* unnamed child anchors (`children_notag' list) now use HText memory pool.
+  Links properly deleted when reparsing the document -LP
+* Use less memory for documents with many anchors:  most anchors are never
+  visited, just stored for the reference.  So fill in adult_table[] with
+  HTParentAnchor0 (36 bytes size) instead of full HTParentAnchor (~200 bytes). 
+  HTParentAnchor now allocated on demand, nearly 1:1 to HText.  [more comments
+  in HTAnchor.h, changes located in HTAnchor.c] -LP
+* HTParentAnchor0 stores its hash value, to avoid calling HASH_FUNCTION twice
+  on the same anchor (Re:  HTAnchor_delete()) -LP
+* fix a potential out-of-bounds bug in HTBEquivalent() -LP
+* change strrchr() calls to strchr() in a few src/*.c file when parsing
+  "#fragment" left-to-right -LP
+* modify HTFWriter_abort() to remove file on error -IZ
+* added hot.paste style which puts a right-arrow at the UR corner (which is
+  currently unused).  Clicking on it initiates a GOTO to the current selection
+  (same as PASTE_URL action).  The hot.paste style is disabled unless STYLES
+  and CUT_AND_PASTE are both enabled.  Disabled and the user defines hot.paste
+  in the ".lss" file -IZ
+* modify LYK_PASTE_URL case in LYMainLoop.c to allow pasting URLs of the form
+  <address> and "<URL:address>" to lynx.  This is useful when it is not easy to
+  choose address without the surrounding "<>" or "<URL:>" -IZ
+* make a minor memory saving (circa 15%) for table processing, improve yet
+  another case of "ladder" (as in the top of google results), and fixes one
+  case of "wrong indentation" (elements of a table which contained <center>
+  were made too wide) -IZ
+* modify Stbl_trimFakeRows() to compensate for 2.8.5dev.15 changes to
+  Stbl_addRowToTable() from 2.8.5dev.15 which caches shrinking cell arrays in a
+  pool.  It did not take into account reallocation of the same data, e.g., in
+  Stbl_reserveCellsInRow().  For example:
+    http://camden-sbc.rutgers.edu/FacultyStaff/Directory/default.htm
+  (report by Patrick Ash) -IZ
+* add FORCE_COOKIE_PROMPT setting to lynx.cfg, allowing for manipulation in the
+  options menu and (if LYNXRC_ENABLE is set) via the .lynxrc file.  This lets
+  the user decide whether to ignore prompting for cookies with invalid syntax.
+  If the prompts are ignored, a corresponding message is displayed -TD
+* add FORCE_SSL_PROMPT setting to lynx.cfg, allowing for manipulation in the
+  options menu and (if LYNXRC_ENABLE is set) via the .lynxrc file.  This lets
+  the user decide whether to ignore prompting for questionable aspects of
+  an SSL connection.  If the prompts are ignored, a corresponding message is
+  displayed -TD
+* change select() calls to use the expected 1+descriptor value documented for
+  that function rather than FD_SETSIZE.  It is possible that some very old
+  or unique platform would not work, but this is more efficient (discussion on
+  lynx-dev) -TD
+* modify logic for S_litteral case in SGML_character() to recover from spaces
+  between the '<', '>' and the corresponding end of the tag, e.g.,
+	<style >
+	< style >
+	< style >
+  match "<style>", and
+	</style >
+	< /style >
+	< /style >
+  match "</style>" (report by TH) -TD
+* correct a check in HText_trimHightext() for the last line of the display,
+  which left unhighlighted the portion of a multi-line anchor which fell in
+  that place (report by TH) -TD
+* correct an off-by-one in redraw_lines_of_link() which left the link on the
+  last line on a page highlighted when moving the cursor up (reported by Morten
+  Bo Johansen) -TD
+
+2003-04-27 (2.8.5dev.15)
+* change definition of docdir1, helpdir1 to avoid using ksh-semantics (see
+  2.8.5dev.2) -TD
+* update ja.po, uk.po, zh_TW.po from
+  http://www.iro.umontreal.ca/contrib/po/maint/lynx/
+* improve layout of TRSTable.c, reducing "laddering" effect, where cells in
+  different columns do not overlap by lines -IZ
+* modify SGML_new() to allow display charset-switching when reloading a
+  document -IZ
+* fix a buffer-size in LYK_PASTE_URL case in LYMainLoop.c -IZ
+* various improvements to load-time for TRSTable.c -IZ
+  As a test:
+   <URL:ilyaz.org/software/tmp/table_2col_bold_it_500000.html.gz>.
+  This is a simple table with 2 columns, one with bold contents, another with
+  italic one.  The total number of rows is 500K.  With the patch and an
+  acceptable malloc(), lynx should use the working set of about 110M to show
+  the table.  On my system with 128M memory, this leads to only 4M of the
+  process space swapped.
+* add case LYK_TO_CLIPBOARD to HTCheckForInterrupt (not a good place), to allow
+  COPY command to work during download (copying the location to clipboard). 
+  The best thing would be to get the location *after* redirects, but this will
+  require some additional work -IZ
+* add popen-based support for cut/paste.  This is a slightly reworked patch to
+  GNU readline.  If RL_PASTE_CMD and RL_CLCOPY_CMD are defined in the
+  environment, lynx will use them as commands to do cut&paste.  The simplest
+  such commands could just store/retrieve things from
+  /tmp/.clipboard_user-name; more advanced ones could use X clipboard -IZ
+* modify yawerty_kb.h to map U+0411 and U+0431 to 'B' and 'W' positions
+  respectively.  The map contained U+0412 and U+0432 at those positions,
+  which are duplicated at other positons -IZ
+* fix HTLoadFinger() which was miscasting const data -TD
+* update Subir Grewal's Lynx links URL to the newest location
+  http://www.subir.com/lynx.html -TD
+* add configure option --with-gnutls, to allow lynx to be built with gnutls. 
+  Used gnutls 0.8.6 on Redhat 8.0 to login at yahoo (gnutls is not very
+  portable, so this is an experimental option) -TD
+* modify loop in HTInitProgramPaths() to convert enum ProgramPaths to an
+  integer, to accommodate HPUX 11.22 compiler (report by JS) -TD
+* amend change in dev.13 to HTParse() to escape spaces, to exclude lynx's
+  internal URL types such as lynxprog (report by P.J.Walsh) -TD
+* modified ifdef's to enable -connect_timeout option for DJGPP -GV
+  In particular, in LYUtils.c, undef "select" in case Lynx is compiled with
+  curses (and not S-Lang).  Watt-32's select_s cannot be used on a 
+  stdin handle, so one must undef it and use DJGPP's select().
+* modify ifdef in HTCheckForInterrupt() to work with MingW and PDcurses -GV
+* add version information for the macros in aclocal.m4 (request by Lars
+  Hecking) -TD
+* modify file-upload to use actual binary-data rather than base64-format -TD
+* generate unique boundary for multipart data in HText_SubmitForm() -TD 
+* reorganize HText_SubmitForm(), maintaining post data using bstring's -TD
+* modify HText_SubmitForm() to add field name for the fake coordinate pair
+  when formatting a multipart submit (report by Peter Pilsl
+  <pilsl_@goldfisch.at>) -TD
+* change post_data to a bstring; implement functions and macros for
+  manipulating bstring data.  This allows post_data to maintain embedded nulls,
+  e.g., for file-upload -TD
+* fix ifdef's for <ncursesw/term.h> -TD
+* fixes for file upload -IZ
+  + modify logic for headers use write them even if MultipartContentType was
+    not set.
+  + change logic for base64 to be used ONLY if \0 was found.
+    If a "strange" char is found, only change "text/plain" to
+    "application/octet-stream".
+* change a couple of _user_message() calls to HTUserMsg2() calls so their
+  content is saved in the "Messages" buffer -IZ, TD
+* undo 2002-11-11 SGMLFindTag optimization (problem with color styles,
+  reported by IZ). Optimize the function by storing the previously found tags.
+  Also use my_casecomp() to decrease AS_casecomp() calls by testing the
+  first character manually -LP
+* optimize HTStyle comparison:  just compare numbers from enum.
+  It was previously implemented as a strcmp comparison with a fixed string.
+  Used in a very inner loop, in HTML_put_character() -LP
+* LYEnsureAbsoluteURL() now absorbs LYFillLocalFileURL() call -LP
+* optimize LYLegitimizeHREF() -LP
+* in HTML.c, revise href resolving logic.  HTAnchor_findChildAndLink now
+  resolves href with respect to BASE internally; HTParse incorporates
+  LYFillLocalFileURL call (after the parsing, and only when the related string
+  is not empty and parse includes access, host, path and punctuation).  This
+  removes all LYFillLocalFileURL and most HTParse calls from HTML.c and makes
+  code more consistent. (Previously, functions were called in a different order
+  for document with/without BASE, which had the side effect in some cases,
+  e.g., href="c:" on a DOS machine was resolved properly with _any_ base, and
+  badly broken without:) -LP
+* add/use HTParseALL macro to simplify coding -LP
+* revise "internal links" logic (read KW 1997-11-03 notes, before v2.8).
+  In HTML.c and HTAnchor.c, internal links code affects only parent lookup
+  in the adults table (more correct in case of post data), now a mainline:
+  we omit "#ifndef DONT_TRACK_INTERNAL_LINKS" condition in the two files.
+  In HTML.c, avoid using internal links for unrelated `src=' attributes
+  (BGSOUND_SRC, FRAME_SRC, IFRAME_SRC, OVERLAY_SRC, EMBED_SRC links:) -LP
+* refine HTAnchor_delete() vs deleteLinks() mutual recursion logic - LP
+* change ALIGN_SIZE in GridText.c to sizeof(double), which is probably more
+  portable than "8" -LP
+* modify a syslog() call to guard against possible '%' in its parameter -TD
+* remove extra quotes from calling HTMake822Word() for form boundary names
+  (addresses bug report for fastmail.fm by P.J.Walsh) -TD
+
+2003-02-04 (2.8.5dev.14)
+* correct a missing ">" at the beginning of page sent as response to mailto -TD
+* simplify (clarify) anchor structure:  links now moved from HTAnchor to
+  HTChildAnchor (the only place they were used).  By this we avoid unneeded
+  casting in calls to HTAnchor_followMainLink, HTAnchor_followTypedLink,
+  deleteLinks. [GridText.c, HTML.c, LYList.c, HTAnchor.c] -LP
+* as of 1998-11-21 "workaround for multiple anchors in the same (invalid) HTML
+  document with the same NAME and different destinations (HTAnchor.c) - KW",
+  along with skipping HTAnchor_link() call in this case now, we realize that
+  HTChildAnchor may have only a single link.  (Previously implemented by
+  mainLink and links list).  This simplifies HTAnchor.c -LP
+* simplify HTChunk.c -LP
+* optimize LYRemoveNewlines() and LYRemoveBlanks() -LP
+* check for no common name (CN) in certificate when connecting via SSL, fixes
+  a SIGSEGV with
+    https://web-shokai.tokyo-denwa.net/
+  (patch by patakuti@t3.rim.or.jp)
+* add uk.po (Ukranian) from
+  http://www.iro.umontreal.ca/contrib/po/maint/lynx/
+* modify HTList_linkObject to avoid an infinite loop in HTList_unlinkObject due
+  to relinking some node several times, corrupting the previous list chain -LP
+* increase ATEXITSIZE to 50, 40 was not enough -TD
+* ifdef-out call to Cygwin_Shell() in LYMainLoop.c, which does not work
+  properly for some environments (report by Corinna Vinschen
+  <vinschen@redhat.com>, forwarded by Frederic L W Meunier) -TD
+* correct a bug in HTAnchor_findChildAndLink() introduced in dev.13 handling
+  USEMAP, e.g.,
+    http://www.sendas-delivery.com.br/topo_sendas.asp
+  (reported by Frederic L W Meunier) -LP
+* minor fixes for K&R compiler on SunOS: prototype of HTDOS_slashes(),
+  definition of LYLeakSequence -TD
+
+2003-01-22 (2.8.5dev.13)
+* change new memory-allocation in HTString.c and GridText.c to provide pointers
+  to data aligned to the host's pointer-size, to work on Tru64 where this
+  happens to be 8 -TD
+* resync ".po" files using msgmerge -TD
+* remove quadratic complexity from insert_blanks_in_line() usage with large
+  tables (Stbl).  It occasionally cleans up split_line() a bit.  CPU load
+  anomaly reported by BL -LP
+* ALLOC_IN_POOL, POOL_NEW, POOL_FREE macros now became functions, suggested by
+  BL -LP
+* define HAVE_ALLOCA for djgpp fixed-configuration -LP
+* add command-line option (--nested-tables) to help in testing this feature -TD
+* add command-line option (--find-leaks) to disable the memory leak checking
+  code, allowing one to build an executable which is useful for both normal
+  and leak-checking (request by Frederic L W Meunier) -TD
+* improve performance of HTParse() for very long strings -LP
+* fix memory leak in HTFileSaveStream() -LP
+* further optimization in HTAnchor.c - save 3 mallocs per HTChildAnchor by
+  using new HTList_ functions:  HTList_linkObject(), HTList_unlinkObject(),
+  HTList_unlinkLastObject() which utilize external memory, no malloc/free -LP
+* modify "make install-help" rule to avoid warning message about keystrokes
+  subdirectory (report by Martin Mokrejs) -TD
+* optimize !HText_TrueLineSize() expressions as HText_TrueEmptyLine() -LP
+* optimize is_url(), rewriting it as case-statements to avoid unnecesary
+  comparisons, make similar optimization in HTParse() -LP, TD
+* corrected logic in is_url() where the "://" was not necessarily checked in
+  the proper position - TD
+* for color-style configuration, add a link to lynx.lss from LYNXCFG: -TD
+* simplify setup of internal pages with new function InternalPageFP() -TD
+* modify parsing of refresh-URL to strip single quotes, to handle
+    http://tovar.yandex.ru/
+  (reported by LP) -TD
+* investigated conflict between NSL_FORK and _WINDOWS_NSL ifdef's for Cygwin
+  configuration in HTTCP.c; left them as-is since #undef'ing _WINDOWS_NSL in
+  that case causes problems connecting (feedback by Frederic L W Meunier) -TD
+* corrected an off-by-one error in computing the location of the bottom line
+  for mouse input in PDCurses configuration which made that area ignore mouse
+  clicks.  Merged almost-identical cases for mouse-input for NT/Windows95 -TD
+* ifdef'd out (USE_CURSES_PAIR_0) the ASSUMED_COLORS logic for the PDCurses
+  configuration (reports by DK) -TD
+* LYSetHiText(), LYAddHiText(), and LYClearHiText() use HText memory pool -TD
+* add atexit-cleanup for history stack, removed incomplete code for this from
+  cleanup(), since that gave misleading results in leak-checking.  Fix a few
+  small leaks as well (reported by LP) -TD
+* modify cleanup() to leave the trace file open if checking for leaks -TD
+* add some simple statistics to summary in Lynx.leaks report -TD
+* add malloc-sequence number to Lynx.leaks report, to help with debugging -TD
+* fix memory leaks in nested-tables logic, which did not free subtable data
+  if there was an enclosing table (reports by Frederic L W Meunier) -TD
+* adapted change by LP to allocate HTLine's from memory pool -TD
+* move fallback definition of MAXHOSTNAMELEN from HTFTP.c to www_tcp.h so it
+  can be used in HTTCP.c (Debian #140682).
+* improved configure script checks for ncurses -TD
+* correct description of XLOADIMAGE_COMMAND in lynx.cfg (report by Mats
+  Peterson <mats@alicja.dyns.cx>) -TD
+* fix configure script so it does not compute basename of system mailer when
+  none was found.  Add check in LYMail.c, LYPrint.c to avoid using system
+  mailer when it is not configured (report by Frederic L W Meunier) -TD
+* update several po files (da.po, de.po, et.po, hu.po, sv.po, tr.po) from
+  http://www.iro.umontreal.ca/contrib/po/maint/lynx/
+* correct logic in recent HTAnchor_findChildAndLink() changes around internal
+  links and fragments; avoid unneeded reallocations by using HTParseAnchor()
+  instead of HTParse() -LP
+* trim some fat from HTML_start_element(), case HTML_A -LP
+* add optimized string functions StrAllocCopy_extra() [and paired FREE_extra()]
+  which store string size and never shrink; for heavily reallocated strings in
+  temp objects.  Used in SGML.c for value[] fields currently -LP
+* in HTUtils.h, FREE macro was unsafe if happen before 'else' -LP
+* modify HTParse() to escape any spaces which remain from LYLegitimizeHREF() or
+  other sources (report by Peter Rasmussen <plr@udgaard.com>) -TD
+
+2002-12-18 (2.8.5dev.12)
+* remove a check in LYMain.c for Cygwin's console, which does not work with
+  screen (report by Frederic L W Meunier) -TD
+* undo line/pool logic, fixing a memory leak -LP
+* changes proposed by Bela Lubkin, to optimize ALLOC_IN_POOL macro
+  substitution, pack bitfields in HTStyleChanges to make them more compact on
+  some systems -LP
+* correct logic of do_check_recall(), broken in dev.9 cleanup of pathname
+  constants with LYIsDosDrive() (report by Frederic L W Meunier) -TD
+* update makelynx.bat, built with slang configuration -TD
+* turn on file-upload in makefile.msc -TD
+
+2002-12-01 (2.8.5dev.11)
+* fix a typo in changelog date -TD
+* add project version & date to lynx.cfg -TD
+* document xxx_PATH variables in lynx.cfg -TD
+
+2002-11-11 (2.8.5dev.10)
+* modify file-upload to provide content-type based on file-suffix.  This is
+  needed to validate local html files with current the W3C validation service
+  webpage -TD
+* modify file-upload to warn but permit the filename or file contents to be
+  missing (report by Clemens Fisher) -TD
+* workaround for compiler bug in fix_httplike_urls() -BL
+* change enumShowColor so SHOW_COLOR_NEVER is zero as in 2.8.3, which makes the
+  result from LYChoosePopup() match the enum values.  This fixes a bug which
+  would make the slang configuration toggle back to color when accepting an
+  options screen (report by Sean McGuire <smcguire@soc.lib.md.us> and Carlton
+  Anderson) -TD
+* add a null-pointer check in content_is_compressed() -TD
+* in partial mode, load document with #fragment on the fly. Long awaited fix.
+  LYMainLoop_pageDisplay() now returns BOOL -LP
+* calculate WWW_SOURCE once, it is now a constant, not a define -LP
+* use malloc instead of calloc in several places, particularly in HTList
+  operations (each field initialized explicitely) -LP
+* fix a few typos in samples/mailcap (Carlton Anderson
+  <canderson1776@yahoo.com>).
+* ifdef'd default_fg and default_bg for PDCURSES to be 15, since that agrees
+  with lynx's use of color names, and works around a bug exposed by the
+  ASSUMED_COLORS change from 2.8.5dev.9 (report by DK) -TD
+* simplify pretty-source code in SGML.c using PUTS(), put_pretty_entity() and
+  put_pretty_number() -TD
+* refine S_attr test in SGML.c to make pretty-source code handle the case where
+  a blank precedes the '='.  The misplaced markers made lynx omit newlines from
+  the pretty-source view (report by LP) -TD
+* rewrote HTStat() to ensure that it does stat() for files on Windows -TD
+* HTTCP.c patch to make DJGPP/Watt-32 non-blocking connect in HTDoConnect().
+  This allows pressing 'z' to abort connections.  Removed extra _HTProgress()
+  for INET6; it overwrote previous progress message -GV, DK
+* in SGML.c, element stack now use a pool of 10 elements to avoid most of
+  malloc/free calls -LP
+* in HTParse(), use single alloca instead of three malloc/free pairs -LP
+* in HTParse.c, avoid most strcasecomp calls in scan() - LP
+* modify GridText.c to store lines, anchors, and forms in the same HText memory
+  pool as styles.  This will optimize memory allocation/deallocation by 8Kb
+  units.  The down side:  lines in TRST mode will be stored twice.  Some
+  structs are made a bit more compact -LP
+* add DJGPP to SINGLE_USER_UNIX special cases -DK
+* modify configure script to not strip the -g option from $CFLAGS if it was
+  present in the user's environment rather than autoconf adding it (report by
+  DK) -TD
+* add --with-curses-dir configure script option -TD
+* in SGMLFindTag, we translate string uppercase in-place and launch case
+  insensitive search, add SGMLFindUprTag() to cover the cases where the string
+  is readonly - LP, TD
+* DJGPP build restored.  MV_PATH was undefined long ago by mistake.  Fix recent
+  DJGPP changes in HTTCP.c:  move _resolve_hook few lines below, it will not
+  compile otherwise.  Remove minor warnings -LP
+* optimize parsing html with many relative links, href="#fragment" -
+  HTAnchor_findChildAndLink() and HTML_start_element(), case HTML_A:  now avoid
+  significant overhead when link == HTInternalLink (e.g., resolving against
+  base, lots of reallocations, parent lookup, etc., all are useless).  Two
+  functions affected.  [HTAnchor.c, HTML.c].  The code works both with and
+  without DONT_TRACK_INTERNAL_LINKS symbol -LP
+* optimize parsing of large html files - with thousands of anchors - LP
+  + remove quadratic complexity from split_line() usage [GridText.c].
+    Because of some work with anchors on the last(=split) line,
+    the anchors list was traversed from the beginning for each output line.
+    Now we store last_anchor_before_split  explicitly.
+    [According to gprof, split_line() weight decreased from 33% down to 4%,
+    with the following test file: 13,000 output lines, 3,100 anchors, ~800Kb]
+  + remove quadratic complexity from HTAnchor_findChild() usage [HTAnchor.c].
+    HTParentAnchor::children list was traversed zillion times, now we
+    split it into a tree (named anchors <a name=...>, fast search required)
+    and a list (just a storage for the rest anchors, no search required).
+    [The same file, gprof shows HTAnchor_findChild() weight decreased
+    from 11% down to 0.1%]
+  + remove quadratic complexity when generating a 'l'ist page,
+    now traverse anchors list only once [LYList.c, GridText.c].
+* add a search method to HTBTree implementation. - LP
+* amend check for refresh-URL to avoid adding a link if the retrieved page is
+  compressed, since the link would be added to the compressed file, corrupting
+  it (reported by Michel SUCH and Karl-Heinz Weirich <weirich@de.ibm.com>) -TD
+* strip parameters from refresh-URL -TD
+* correct misspelled $LYNX_LOCALEDIR variable in LYMain.c (reported by Michel
+  Such)
+* change the install procedure for lynx.cfg to attempt to update the file with
+  the user's customizations if any, and to save the old configuration
+  information in a series, e.g., lynx.cfg-1, lynx.cfg-2, etc. -TD
+* re-fix the problem with config.cache not being removed at the beginning of
+  the configure script - see 2.8.5dev.3 (report by Clemens Fisher) -TD
+
+2002-10-06 (2.8.5dev.9)
+* improve ETA data shown in experimental read-progress (from Debian #117476)
+* modify -dump, -source and related options which set dump mode to also set
+  -nopause (report by Benjamin Pflugmann <benjamin-mutt@pflugmann.de>) -TD
+* correct indexing in LYStyle.c our_pairs[] array, which did not allow for use
+  of default colors -TD
+* make ASSUMED_COLORS in lynx.cfg apply to normal curses implementations which
+  do not implement assume_default_colors() (prompted by discussion with
+  Bela Lubkin) -TD
+* make permanent an ifdef from HS which provides for truncating a too-long
+  title with an ellipsis -HN
+* gettext'ify a few overlooked strings in LYOptions.c -HN
+* modify LYGetHostByName() for MSDOS/DJGPP/Watt-32 to enable terminating it by
+  pressing 'z' (patch by Gisle Vanem)
+* update configure script macros for NLS to gettext 0.10.40 -TD
+* add PRCS version/date to lynx.cfg -TD
+* setup ifdef's for Unix-specific permissions checks to exclude single-user
+  systems such as OS/2 EMX, Cygwin and BeOS, which otherwise act like Unix
+  since we can run the configure script on those platforms -TD
+* re-order some tests in the configure script to allow pdcurses' X11 port to
+  be recognized as supporting color and line-drawing characters -TD
+* work around a Cygwin bug which causes subprocesses of a full-screen program
+  to dump core (perhaps reported by Frederic L W Meunier, but observed in
+  running lynx in a bash shell spawned from my directory editor) -TD
+* fix an inequality in HTDirTitles() which made the "Up to" link omitted for
+  the first level of an ftp listing, making it awkward to visit the parent
+  directory if one first visited a subdirectory -TD
+* change HTURLPath_toFile() to keep local URLs distinct from remote ones, so
+  win32 version will not display misleading drive letter on ftp listings -TD
+* rewrote Home_Dir(), adding checks for "My Documents" on Windows 2000, and
+  ensuring that the resulting directory actually exists -TD
+* change ifdef's in LYwaddnstr() to use waddstr() consistently, since
+  wide-character curses implementation treat the string in the given locale
+  anyway, just like the waddnwstr() call -TD
+* reduce clutter with new macro LYIsDosDrive() -TD
+* add ifdef's for OS/2 EMX to existing DOSPATH code which checks for drive
+  letter (Michel Such)
+* modify definitions of IsOurFile() and OpenHiddenFile() to allow trace file
+  to be written when one already exists -TD
+* use new macros LYSameFilename(), LYSameHostname(), LYIsNullDevice() to hide
+  platform-specific filename comparisons -TD
+* change sed delimiter in configure script to use '%' consistently, to avoid
+  using '@', which may appear in AFS pathnames (report by Martin Mokrejs) -TD
+* narrowed accommodation for paths with embedded blanks in LYLegitimizeHREF()
+  to exclude those containing newlines or tabs (report by Leslie Fairall for
+  http://www.realtor.com) -TD
+* modified VMS build scripts to allow linking with OpenSSL, tested with
+  OpenSSL-0.9.6g using UCX network libraries.  It is reported (by
+  <grant@rigel.cc.wmich.edu>) that one can modify the scripts to also build
+  with Multinet's UCX emulation, but the machine I used for testing has only
+  UCX (comp.os.vms discussion with Christoph Gartmann
+  <gartmann@immunbio.mpg.de>) -TD
+* modify UCSetBoxChars() to assume wide-character curses implementations can
+  draw boxes -TD
+* reduce the number of strncasecomp() calls with associated constants by making
+  macros for the lynx internal URL types, e.g., isLYNXCGI() -TD
+* modify logic that handles goto-fragment (e.g., G #foo) to update the URL
+  shown in the info page (Debian #113734) -TD
+* reduce clutter using new macros findPoundSelector(),
+  restorePoundSelector() and function trimPoundSelector() -TD
+* reduce clutter using functions for updating the strings in DocInfo, mainly in
+  LYMainLoop.c -TD
+* renamed 'document' to 'DocInfo' -TD
+* reduce clutter by using NonNull() macro consistently -TD
+* define HistInfo struct in terms of document, to make it clearer -TD
+* add verification of SSL server certificates.  It requires a "cert.pem" file
+  or cert files in the "certs" subdirectory in your OpenSSL directory for CA
+  verification.  The mod_ssl distribution includes a "ca-bundle.crt" that has a
+  good set of root certifying authority certs and works well for "cert.pem".
+  Adding custom CA root certs can be done by either putting them in the server
+  "cert.pem", or (for a normal user) copying "cert.pem", adding the cert, and
+  setting the SSL_CERT_FILE environment variable before running Lynx (Chris
+  Adams <cmadams@hiwaay.net>).
+* add REPLAYSECS config value to allow slowing command scripts down, for
+  testing -TD
+* implement a "set" command for command-scripts, allowing the script writer
+  to manipulate the sleep-times for messages (prompted by discussion with
+  Ville Herva) -TD
+* implement an "exit" command for command-scripts (Ville Herva)
+* modify logic for -cmd_script to stop reading from the command script when
+  an end-of-file is detected (patch by Ville Herva <vherva@niksula.hut.fi>).
+* fill in a few descriptions of restrictions for the help message, as well
+  as showing the on/off state of the "goto_xxx" restrictions -TD
 * correct inverted logic of restrictions table which made "-restrict=default"
   provide incorrect values for several items.  This was broken in 2.8.4dev.19
   (reported by Jeff Long <long@ukans.edu> and RobertM <robm@bob.bofh.org>) -TD
+* add environment variable LYNX_TRACE_FILE which, if given, overrides the
+  compiled-in value of Lynx.trace (or LY-TRACE.LOG).  This specifies the
+  name of the trace file relative to the home directory -TD
+* treat empty string for most environment variables, e.g., those specifying
+  a pathname, as null -TD
+* add environment variable LYNX_LOCALEDIR to simplify configuration on OS/2
+  EMX (from discussion with Michel Such) -TD
+* add alias for charsets "ISO-8859-8-I" and "ISO-8859-8-E" to "iso-8859-8"
+  (request by Atsuhito Kohda) -TD
+* modify handling of HTML_SUP to always append '^'.  It was checking if the
+  preceding character was a valid hexadecimal code (reported by HN and Steve
+  White <swhite@zipcon.net>) -TD
 * correct check for calling endwin() to allow for curses implementations
   without newterm (report/patch by Brett Lymn).
+* add koi8-r.html as a test for non-ANSI 8-bit displays.
+* construct "Accept-Encoding" gzip/compress parameters based on whether lynx is
+  built with zlib and/or gzip/compress paths are defined.  The latter is
+  assumed on Unix (by the configure script), though non-Unix environments may
+  lack those utilities (report by Roy Langford <rlnopicnodl@geeklife.com>,
+  analysis by Frederic L W Meunier) -TD
+* modify mouse support in slang configuration (Eduardo Chappa):
+  + Middle button takes you to the bookmarks file.
+  + Clicking on empty parts of the screen makes the screen scroll. This is
+    not 100% true, here are the caveats related to this:
+    + When you click in the first line of the screen pine goes back one screen,
+      the same happens when you click in the last line (this is normal Lynx
+      behavior, I did nothing in this respect).  With this patch, intermediate
+      scrolling is enabled, which means that left clicking in different (empty
+      parts) of the screen may move you half a screen or two lines.  The idea
+      is that close to the top you scroll more, close to the center you scroll
+      less and you scroll in the direction up or down according to which half
+      of the screen you click on.
+    + If you click on an empty part of the screen, Lynx changed its behavior
+      from doing nothing to moving the active link to the closest link near the
+      click.  This is not disabled by this patch, instead, if a closest link is
+      not found, the screen will scroll, according to the position of the link.
+* improve check in LYgetEnum() for ambiguous/abbreviated names in the lynx.cfg
+  file, e.g., to match the string "visited_links=first" without confusing it
+  with "visited_links=first_reversed" (report by vortex5 <vortex5@24i.net>,
+  analysis by TH) -TD
+* use StrAllocCopy() rather than strdup() in parse_style() (LYStyle.c) to
+  avoid false report from leak-checking (from report by Martin Mokrejs) -TD
+* share SSL handle between HTTP.c and HTAAUtil.c so that call of
+  HTAA_shouldRetryWithAuth() from HTLoadHTTP() updates the handle used in that
+  function.  This makes lynx able to get the user/password prompt for
+  https://enter.nifty.com/iw/ -TH
+* fix a highlighting problem in view-source mode, which left the final
+  character of the target unhighlighted -TH
+* modify LYStringToKeycode(), which is used by -cmd_script option to decode
+  characters, to handle hexadecimal codes written with -cmd_log option from
+  dev.8 changes (reported by Gleb V Kotelnitskyy <kiz@pth.ntu-kpi.kiev.ua>) -TD
+* modify ifdef's in LYCurses.h to implement underline-links for slang
+  configuration (report by TH) -TD
+* modify checks with WEXITSTATUS() and similar "result" macros to ensure that
+  they consistently use corresponding "test" macros such as WIFEXITED() -TD
+* add a null-pointer check in GridText.c to cover a problem with
+	http://209.1.58.86/store/
+  (reported by Walter Ian Kaye) -TD
+* add some more CTRACE's to LYCookie.c to help diagnose LV problem report -TD
+* updated nl.po (patch by Pieter-Paul Spiertz <pspiertz@sci.kun.nl>) -JS
+* new (cs.po, hu.po, tr.po) and updated (da.po, et.po, it.po, ru.po, sv.po) po
+  files from http://www.iro.umontreal.ca/contrib/po/maint/lynx/, used msgmerge
+  to align with 2.8.4's lynx.pot and corrected some minor issues highlighted by
+  check_po.  Checking for a newer version of check_po (to handle patterns
+  such as "%1$s") found none, but noticed a comment in gettext mailing list
+  stating that msgfmt does checking.  Comparing with "msgfmt -c -v", found
+  that it does useful checks, but misses about 1/4 of what check_po finds.
+  Will use both -TD
 * escape blanks and other non-7bit graphic characters in startfile and similar
   addresses to guard against interpreting the address as multiple lines
   during a GET, etc (report by Ulf Harnhammar <ulfh@Update.UU.SE>) -TD
 
-extracted from 2001-10-06 (2.8.5dev.3)
+2002-05-28 (2.8.5dev.8)
+* updated makelynx.bat (vtailor@gte.net).
+* recognize charset value in meta description even if content-type is not
+  given, in  LYHandleMETA() -VH
+* remove ifdef that disabled home/end keys with Cygwin configuration -DK
+* fix a problem when whereis target string, which includes Japanese and is top
+  of the second line in the link string, is in the current link (patch by
+  Hataguchi Takeshi).
+* fix a problem with highlighting Japanese string (patch by Hataguchi Takeshi).
+* modify LYDownload() to ensure that local addresses under DJGPP using the
+  special form of path beginning "/dev/" are passed to external programs
+  without stripping the initial slash from the path.  This special form of path
+  will be understood only by other DJGPP programs.  Addresses of the form
+  "/dev/x/" are equivalent to the DOS path "x:\".  Addresses of the form
+  "/dev/env/VARI" are equivalent to the environment variable "VARI" -DK
+* modify remove_bookmark_link() to assume that OS/2 EMX does not allow rename
+  of a file overwriting an existing one -IZ
+* recognize local .php files as HTML files (patch by Karl Eichwalder
+  <ke@suse.de>).
+* change LYCurses.c to not redefine gettext(), and use ScreenClear() instead
+  of clrscr() for DJGPP -DK
+* the DJGPP port of Lynx once used to compile with DJ Delorie's tcp/ip library.
+  It is no longer the case; Watt-32 is required.  Changed to assume WATT32 is
+  defined when DJGPP (or __DJGPP__) is defined (patch by Gisle Vanem).
+* change LYKeycodeToString() to provide a default translation for characters
+  which are not key-symbols, etc., so they may be used in command scripts
+  with the -cmd_script option (reported by Christoph Fabianek) -TD
+* new po files (ca.po, et.po, it.po, zh_TW.po) and updated de.po from
+  http://www.iro.umontreal.ca/contrib/po/maint/lynx/, used msgmerge to align
+  with 2.8.4's lynx.pot and corrected some minor issues highlighted by
+  check_po script by Stefan Hundhammer <sh@suse.de> -TD
+* some cleanup/restructuring of HText_SubmitForm(), incomplete - toward
+  implementing correct MIME boundary -TD
+* revalidate user's guide and related files using W3C validator via file-upload
+  facility -TD
+* simplify some loops in GridText.c using new function next_anchor() -TD
+* quote field-names used when submitting form-data as suggested in RFC 2068
+  (report by Lieven Tomme <lieven@itopia.com>) -TD
+* remove configure-check for mkstemp(), which is redundant given that lynx
+  writes temporary files in a directory which is not readable by other users.
+  On more than one system (e.g., Solaris), mkstemp() is not usable in the
+  manner we attempted, since it does not necessarily choose a distinct name if
+  the previously-chosen filename no longer exists (report/analysis by PG) -TD
+* correct a typo in configure macro CF_HEADER_PATH which told the script to
+  look for header files in the user's $HOME/lib rather than $HOME/include
+  directory -TD
+* update config.guess, config.sub -TD
+* add check for HTTP headers using Netscape extension "Refresh", and if found,
+  add a corresponding refresh-URL at the beginning of the document.  Fixes
+  Debian #126723.
+* strip username from URLs used in an HTTP GET, and warn about this condition.
+  The example given was
+    "http://www.microsoft.com&item%3dq209354@212.254.206.213/1338825GHU_98.asp"
+  the text of which could mislead a user into believe it was an official site
+  (reported by Frederic L W Meunier) -TD
+* add limit checks in HText_trimHightext() to fix an infinite loop visiting
+  this site (which contains a form with only hidden input fields):
+  1- http://www.ibazar.com.br/
+  2- Click "Cadastro" and accept all cookies
+  3- Click "[accepte.gif]"
+  (reported by Frederic L W Meunier) -TD
+
+2002-01-06 (2.8.5dev.7)
+* ifdef'd new directory-sorting code to compile when configure --disable-dired
+  is specified -TD
+* add (commented-out) definitions for building with OpenSSL in makefile.msc,
+  tested with OpenSSL 0.9.6c and Visual C++ 5.0 -TD
+* correct call to HTGetLinkInfo() in follow_link_number() from 2.8.5dev.6
+  changes to fix uninitialized pointer (report by PW) -TD
+
+2002-01-01 (2.8.5dev.6)
+* add configure options to link with dbmalloc and dmalloc debugging libraries
+  which offer different features than --enable-find-leaks -TD
+* restructured LYhighlight() and logic related to highlighted text using new
+  functions LYSetHilite(), LYAddHilite(), LYGetHiliteStr() and LYGetHilitePos()
+  to allow more than two lines to be highlighted in links (Debian #114062) -TD
+* simplified some of LYCookie.c with new functions find_domain_entry(),
+  alloc_attr_value() and parse_attribute() -TD
+* modify expansion of %s for WIN_EX EXTERN commands so that short names (used
+  when the command begins with an uppercase character) are not quoted, and use
+  backslashes.  The normal %s expansion uses forward slashes and may quote the
+  name if it contains a blank -TD
+* modify local directory sort by type to ignore leading '.' characters when
+  looking for filetype -TD
+* modify logic of HTDirEntry() to avoid storing a trailing backslash (DOS-style
+  path separator) in the anchor URL for local directory entries (from report
+  by Hataguchi Takeshi) -TD
+* amend change in 2.8.5dev.2 to HTLoadHTTP() to omit "Accept-Encoding:  gzip"
+  ensuring that also -source or -dump option is used.  Retesting excite.com
+  shows that it no longer matters, since the page was replaced by a short
+  javascript which is not sent compressed (request by Hataguchi Takeshi) -TD
+* correct a missing definition for COMPRESS_PROG in the configure script
+  introduced by 2.8.5dev.5 changes (also noted by Stepan Kasal) -TD
+* several fixes from Stepan Kasal <kasal@math.cas.cz>:
+  + remove code in LYCurses.c which checks ttytype variable for "dec-vt"
+    prefix.  EWAN, a decent telnet program for M$ Windows, sets $TERM to
+    dec-vt100.  This is similar to vt102 but it is not appropriate to use vt100
+    settings for it.  ncurses has in its terminfo database an entry for
+	"dec-vt100|EWAN telnet's terminal"
+    The terminfo file is successfully opened when ncurses is initialised and
+    ttytype is set to the name mentioned above.  After stripping "dec-" from
+    it, lynx ends up searching for
+	"/usr/share/terminfo/v/vt100|EWAN telnet's terminal"
+    which cannot cannot be found and lynx crashes.
+  + compress installed html files with the -9 option of gzip.
+  + improved install-help makefile rule
+* fix some longstanding problems with the DOS port -DK
+  + fix inability to break out of a hung nameserver lookup or hung connection
+    attempt without aborting lynx entirely.  Using the WATT-32 signal handler
+    for this seems to work well.  Change the default compile option for DJGPP
+    to -DIGNORE_CTRL_C, causing lynx to ignore SIGINT, so CTRL-BREAK is
+    completely disabled.  With this patch CTRL-C stops current actions without
+    quitting lynx.  To have a way to abort lynx when necessary, bind ALT-X to
+    SIGQUIT.  (The unix default of CTRL-\ is not bound to the same scan code on
+    different international keyboards, while ALT-X is familiar to DOS users for
+    existing programs).  Because the WATT-32 signal handler was not available
+    to external programs, a patch to WATT-32 is necessary for the new lynx code
+    to work.  The patch for WATT-32 is shown in the INSTALLATION documentation.
+  + added some fixes for "/" vs "\" handling in pathnames so that non-DJGPP
+    programs will see standard DOS pathnames when called.  The mailer code was
+    ignoring the environment variable SHELL when calling the mailer, leading to
+    a lack of environment space for the mailer to work -DK
+  + add calls to _eth_release() and _eth_init(), which Gisle Vanem says should
+    not be necessary in this part of lynx.  But this seems to fix get
+    intermittent hung nameserver lookup sessions after using CTRL-C.
+* simplified a loop in HTConfirmCookie() and added CTRACE's to demonstrate that
+  this is working properly (addresses Debian #119751) -TD
+* add some CTRACE's to curses screen initialization and resizing to provide
+  better diagnosis of problem reported by David Balazic
+  <david.balazic@uni-mb.si> on HP-UX 11.00) -PG
+* modify configure.in and aclocal.m4 to work with autoconf 2.52 patched with
+    ftp://invisible-island.net/autoconf/autoconf-2.52-20011227.patch.gz
+* modify configure macros CF_CURSES_CPPFLAGS and CF_NCURSES_CPPFLAGS to ensure
+  that the (n)curses.h header file is actually found, in case someone tries to
+  build lynx without having installed the development files (based on anonymous
+  posting on comp.os.linux.networking newsgroup) -TD
+* update config.guess, config.sub from
+    http://subversions.gnu.org/cgi-bin/viewcvs/config/config/
+
+2001-11-18 (2.8.5dev.5)
+* modify prompt for file- or directory-name in rename/move operation to provide
+  a default based on the selected file/directory -TD
+* add -DOK_OVERRIDE to makefile.msc, to allow rename/move of files in the local
+  directory editor -TD
+* correct delay time for win32's HTAlert, etc., which was in milliseconds
+  rather than seconds -TD
+* modify check for mbstate_t in CF_WIDEC_CURSES to define HAVE_MBSTATE_T if
+  that type is found, use this ifdef in LYwaddnstr() to make that compile
+  properly on Solaris 2.6 (report by PG) -TD
+* disable SUPPORT_MULTIBYTE_EDIT ifdef for EBCDIC (i.e., NOT_ASCII) -PG
+* collect names of lynx.cfg and .lynxrc variables into LYrcFile.h, to simplify
+  checks for matching spelling, e.g., against the values used in LYOptions.c
+* modify dired support to allow sorting by a variety of things in addition to
+  the existing sort into files versus directories.  This is saved in ~/lynxrc
+  as dir_sort_order -TD
+* if --disable-full-paths is specified, do not use full path for SYSTEM_MAIL
+  (report by IZ) -TD
+* modify configure script to reduce the number of xxx_PATH definitions compiled
+  into the code if --disable-dired was specified.  Change configure script so
+  that dired support for chmod, copy, mkdir, and touch to use built-in
+  functions rather than external programs -TD
+* modify configure script tests for program pathnames so that if full pathnames
+  are specified and the program is not found, no corresponding xxx_PATH symbol
+  is defined -TD
+* eliminate duplicate LYGetEnum() in LYrcFile.c, using the variant from
+  LYReadCFG.c which allows abbreviations -TD
+* change handling of tagsoup option in LYrcFile.c to invoke the corresponding
+  HTSwitchDTD() function, so saved tagsoup initializes properly from ~/.lynxrc
+  (report by Michel Such) -TD
+* modify some tag-names in LYOptions.c to correspond to the names used in
+  lynx.cfg to make the corresponding names work properly when used in ~/.lynxrc
+  via ENABLE_LYNXRC settings (report by Michel Such) -TD
+    old             new
+    ----------------------------
+    assume_char_set -> assume_charset
+    show_scrollbar  -> scrollbar
+    DTD_recovery    -> tagsoup
+    show_rate       -> show_kb_rate
+    user_agent      -> useragent
+    ----------------------------
+* correct length passed by LYpaddstr() to LYwaddnstr(), which could be larger
+  than allowed -TD
+
+2001-11-08 (2.8.5dev.4)
+* if file-upload code is configured, suppress message that indicates it is not
+  implemented, i.e., "[FILE Input] (not implemented)" -TD
+* modify file-upload submission to send plain text if the file is entirely
+  printable text.  Mime encoding is needed if the file contains nulls, etc.,
+  but reportedly may confuse some hosts -TD
+* suppress "charset=" clause on form submission if it is iso-8859-1 -TD
+* move case for F_FILE_TYPE in HText_SubmitForm() to obtain original behavior
+  of fallthrough for F_SUBMIT_TYPE, F_TEXT_SUBMIT_TYPE, F_IMAGE_SUBMIT_TYPE to
+  translate their character set, etc.  (report by KW) -TD
+* revert 2.8.4dev.21 change to avoid truncating cookie path in LYSetCookie().
+  The server that wouldn't work with the current lynx behavior is
+  identified as "Oracle_Web_Listener/4.0.8.2.3EnterpriseEdition"  -DK
+* modify LYLegitimizeHREF() change from 2.8.4dev.21 to eliminate newlines from
+  the HREF rather than converting them to spaces.  This fixes a problem with
+  www.ebay.com which splits up HREFs with newlines.  Changing the newlines to
+  spaces made the HREF no longer match, e.g., when it was built up from
+  a CGI script (report by Morten Bo Johansen) -TD
+* add two test files for testing UTF-8, based on Markus Kuhn's demos
+  (quickbrown.html and utf-8-demo.html).  These work with ncurses 20011103
+  patch, for wide-characters except for combining characters (more work is
+  needed in ncurses).  Tested with XFree86 xterm (patch #163) -TD
+* modify select_multi_bookmarks() check for interrupt character to limit it to
+  "hard" interrupt characters such as ^G.  This fixes a case where "z" would
+  have been treated as an interrupt character in advanced multibookmark mode
+  (reports by Michael Warner, HN, as well as Debian #111463) -TD
+* modify SUPPORT_MULTIBYTE_EDIT logic in LYUpperCase() and LYLowerCase() to
+  check for a null character following an upper-128 code.  This is more likely
+  to occur in EBCDIC, though the multibyte strings should not have a null at
+  this position in any case (report by PG) -TD
+* for wide-character curses configuration, do not force repainting at the end
+  of display_page() -TD
+* modify configure test for mkstemp() to check if that function returns
+  distinct values (report by Fr3dY indicates that AmigaOS has a broken version
+  of mkstemp() which always returns the same value) -TD
+* modify LYwaddstr() to use wide-character curses functions to make UTF-8
+  output work without relying upon side-effects of narrow-character functions.
+  Note that this relies on the user having set a UTF-8 locale, e.g.,
+  en_US.UTF-8 -TD
+* modify HText_appendCharacter() to not use utfxtra_on_this_line when compiling
+  with WIDEC_CURSES, since the curses library already does this adjustment -TD
+* correct the following names in LYrcFile.c which were added to allow
+  ENABLE_LYNXRC lines in lynx.cfg to enable them to be saved in ~/.lynxrc
+    old           new          where-used
+    -------------------------------------
+    DTD_recovery  tagsoup      (command-line option and lynx.cfg)
+    show_rate     show_kb_rate (lynx.cfg)
+    user_agent    useragent    (command-line option)
+    -------------------------------------
+  (report by Michel Such <msuch@free.fr>) -TD
+* modify LYRefreshEdit() to clear field before repainting (patch by Hataguchi
+  Takeshi)
+* for CJK configuration, force clearing/repainting in HTUserMsg() (patch by
+  Hataguchi Takeshi)
+* make HTInfoMsg() sleep condition consistent with other messages by using
+  LYSleepInfo() -TD
+* reduce clutter with new function utf8_length() -TD
+* replace !isascii(ch) with new macro is8bits(ch), to reduce clutter, fix some
+  sign-extensions and make it more portable -TD
+* change some of the "#if" statements to "#ifdef", to work around broken
+  versions (2.96, 3.0.1) of gcc distributed with Mandrake 8.1 (though
+  reportedly this is due to Redhat):  the -C option passes through comments as
+  usual, but some comments expand on preprocessor lines, which causes the
+  preprocessor to report an expression error.  This prevented "make
+  install-help" from running, though the -C option is not needed for that.
+  However, lacking a working -C option makes the C preprocessor useless for
+  analyzing bugs -TD
+* modify configure script to accept --with-screen=ncursesw, to build with the
+  wide-character version of ncurses -TD
+* modify configure script to look for mkdtemp(), to quiet another bogus linker
+  message -TD
+
+2001-10-06 (2.8.5dev.3)
+* add CF_MKSTEMP configure macro, from vile, to check for a working mkstemp().
+  This will quiet some bogus warning messages in recent runtime support, but
+  (see 2.8.3) does not affect the security of temporary files in lynx -TD
+* updated CF_PATH_SYNTAX configure macro, from vile, to handle leading "\\" in
+  a win32 pathname -TD
+* for configurations that provide scrollbar, add a checkbox to the Options menu
+  to enable or disable it -TD
+* modify LYGetHostByName() in HTTCP.c to use the threaded _WINDOWS_NSL code for
+  all Cygwin machines.  The ability to interrupt nameserver lookup has not
+  worked in Win98 using the Cygwin port, despite defining _WINDOWS_NSL.  It
+  looks like the threaded code was only for WinNT.  At least under Cygwin, that
+  code also seems to work fine under Win98 -DK
+* add FIELDS_ARE_NUMBERED as a possible value for DEFAULT_KEYPAD_MODE in
+  lynx.cfg as well as keypad_mode in .lynxrc -TD
+* add NUMBER_FIELDS_ON_LEFT and NUMBER_LINKS_ON_LEFT to lynx.cfg, use these to
+  control where field- and link-numbering is placed.  Caveat:  there are some
+  cases where fields that do popup's are truncated, e.g., in the Options menu,
+  when right-alignment is used -TD
+* support for DJGPP's two forms of file addressing, [a-zA-Z]:[/\\] and
+  /dev/[a-zA-z]/ -DK
+* add samples/lynxdump script, to illustrate how to use lynx -dump with no
+  link references (prompted by discussion with LV) -TD
+* add samples/keepviewer script, to illustrate how to retain a temporary file
+  for use in an external viewer -TD
+* add ifdef's in is_url() to avoid recognizing URLs if they are disabled in the
+  given configuration, i.e., bibp, finger, ftp, gopher, news (report by
+  Frederic L W Meunier) -TD
+* modify LYrefresh() to take into account whether a popup window exists, so
+  that a search prompt will not overwrite a popup.  This bug was introduced by
+  the curses pads (reported by Felicia Neff <neff@panix.com> and Fr3dY
+  <fr3dy@retemail.es>) -TD
+* add note in keystroke_help.html about CTRL-V as literal-next (lnext) for
+  users who are unfamiliar with stty -TD
+* add NcFTP-style ftp-URLs which are supported by Netscape and wget (request
+  by Martin Mokrejs) -TD
+* add traces in LYReadCFG.c and LYrcFile.c to report lines which are not found
+  in the symbol table, to help diagnose when a user adds lynx.cfg information
+  to .lynxrc -TD
+* define additional -trace-mask option, 8=config -TD
 * modify LYtouchline() to avoid using wredrawln() for ncurses, since the
   LYwin variable may be a pad much wider than the screen, which is not handled
   properly (report by Karl Eichwalder <keichwa@gmx.net>) -TD
-* correct beginning configure script, which was supposed to remove
+* correct beginning of configure script, which was supposed to remove
   config.cache, but did not, due to a misplaced line when it was added
   1998-06-04 (prompted by a report by Fr3dY <fr3dy@retemail.es> that the
   checks for srand/rand did not work) -TD
 
-extracted from 2001-08-15 (2.8.5dev.2)
+2001-08-15 (2.8.5dev.2)
+* several small fixes to HTFile.c to make directory listings work properly on
+  win32, e.g., stat'ing a directory with a trailing slash fails (reported by
+  Hataguchi Takeshi) -TD
+* adjust definitions in LYCurses.h to get rid of slang-ifdef's for getyx() and
+  wmove() -TD
+* change order of srandom/random versus srand48/lrand48 -DK
+* patch to get the DJGPP port to use the configure script -DK
+  It seems to work well in the variations I have tried, including both PDCurses
+  and SLang.  revised INSTALLATION for DOS, giving a URL for my DOS patch to
+  openssl.  I dropped the reference to goto URL of the form
+  file:///dev/c/path/filename, since this only works in certain parts of lynx
+  (such as lynx.cfg).  I'll try to get this working in the future.  In fixing
+  makefile.in, I patched the sed script for converting the path to docdir.  As
+  far as I can tell, however, from my examination of lynx.cfg, this isn't used
+  for any platform.  Does this part of the sed script do anything?
+  Things still needing fixing for DOS:
+  + support for both forms of file addressing, [a-zA-Z]:[/\\] and
+    /dev/[a-zA-z]/.
+  + support for gzipped help files.  This works with long file names in a DOS
+    box under Windows, but not in plain DOS, which doesn't allow double
+    extensions.
+  + better handling of local files in root directory.  "file:///c:/" takes a
+    long time to work, but "file:///c:/." works fine.  I haven't really looked
+    to see why.
+  + no ability to break out of hung nameserver lookups or http requests without
+    closing lynx with SIGINT.  This is the biggest complaint I get by email.
+* modify ifdef for myGetChar() in LYStrings.c to build with PDCurses 2.3 e.g.,
+  to use a version which is modified for Japanese input (patch by Hataguchi
+  Takeshi <patakuti@t3.rim.or.jp>).
+* review LYSafeGets() calls, stripping newlines from a few places where they
+  were overlooked, and simplifying some places where LYSafeGets() would
+  normally return a buffer ended with a newline (prompted by a report by Brian
+  S Queen <bqueen@nas.nasa.gov> for LYTraversal.c) -TD
+* correct reallocation-size in ProcessMailcapEntry()
+* modify HTLoadHTTP() to omit "Accept-Encoding: gzip" if command-line "-base"
+  option is given.  This makes
+	lynx -base -source excite.com
+  work as expected.  Otherwise, excite.com will transmit the document gzip'd,
+  and the ensuing logic in HTSaveToFile() would see the mime-type as gzip
+  rather than text/html, and not prepend the base URL (report by Kai Shih
+  <kai@mit.edu>) -TD
 * work around defect in move_anchors_in_region() and related logic by changing
   default for nested-tables to FALSE when Lynx is not configured for
   color-style.  The problem is that when an anchor is shifted right by
@@ -35,7 +1185,7 @@ extracted from 2001-08-15 (2.8.5dev.2)
   by adding checks in www_search_backward() and www_search_foreward(), (report
   by -Frederic L W Meunier) -TD
 
-extracted from 2001-07-24 (2.8.5dev.1)
+2001-07-24 (2.8.5dev.1)
 * modify GetChar() definition for PDCurses to ignore key-modifiers which are
   passed back from getch() as if they were key codes.  Those interfere with
   shifted commands such as 'Q' -TD
@@ -176,7 +1326,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
   coding for the alphabet -TD
 * workaround in lynx_nl2crlf() for ncurses, which did not refrain from using
   cursor-down if it was set to a newline when nonl() was specified -TD
-* replace permissions[] array in LYLocal.c because cygwin (mis)implements the
+* replace permissions[] array in LYLocal.c because Cygwin (mis)implements the
   S_xxx values as a function -TD
 * add ENABLE_LYNXRC setting to lynx.cfg, which allows one to modify the list
   of values which are visible on the O'ptions form which can be saved to the
@@ -206,7 +1356,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
   case where items in very wide popup menus would wrap, e.g., the EXTERN_LINK
   menu -TD
 * add a configure checks for term.h, to work around broken package for ncurses
-  on cygwin -TD
+  on Cygwin -TD
 * combine checks for useragent into one function LYCheckUserAgent() -TD
 * add runtime toggle for EXP_NESTED_TABLES, bind this to "~" (see www.tin.org
   for comparison) -TD
@@ -219,7 +1369,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
   has to be set appropriately.  Made EXP_NESTED_TABLES the default and changed
   the default locations for WATT-32 and PDCURSES to top-level directories.  The
   DOS port of gettext is now dependent on libiconv.a to convert character sets
-  as the .mo file is read.  The format for the makefile in WWW/Library/djgpp
+  as the .mo file is read.  The format for the makefile in WWW/Library/DJGPP
   now reflects the changes previously made in the src makefile.
 * improve definition of CTRACE, making it an expression again as it was before
   dev.20 -PG
@@ -672,7 +1822,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
   exists; attempt to create the directory if it does not, e.g., ~/tmp/, to
   resolve problem introduced by Mandrake's patch -TD
 * modify SetOutputMode() to flush stdout to work around buffering problem with
-  cygwin on error exit from Lynx (reported by Brad Town <btown@ceddec.com>) -TD
+  Cygwin on error exit from Lynx (reported by Brad Town <btown@ceddec.com>) -TD
 * change definitions for LYCharINTERRUPT1 and LYCharINTERRUPT2 to not use
   FROMASCII() in the EBCDIC configuration, since those symbols are used in case
   statements which otherwise would not compile -PG
@@ -1286,10 +2436,10 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
   ShowInfo Page -TH
 * remove spurious backslashes in sed script for adjusting link to htmlized
   lynx.cfg -Michael Warner
-* add -luser32 library for cygwin configuration, needed for WIN_EX ifdefs -DK
+* add -luser32 library for Cygwin configuration, needed for WIN_EX ifdefs -DK
 * correct some screen handling problems when built with SLang -DK
-* updated the INSTALLATION file to reflect building under cygwin -DK
-* define WIN_EX and _WINDOWS_NSL for cygwin configuration -DK
+* updated the INSTALLATION file to reflect building under Cygwin -DK
+* define WIN_EX and _WINDOWS_NSL for Cygwin configuration -DK
 * use select_s() from WATT-32 for the DJGPP port, rather than select() from
   DJGPP (suggested by Gisle Vanem, to make it faster) -DK
 * add a configure check CF_SET_ERRNO to check if we really can set errno,
@@ -1683,7 +2833,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
   with ncurses and possibly other curses implementations, but not with slang,
   on Unix-like platforms, and cannot work on platforms where lynx gets keyboard
   input in the form of platform- or implementation-specific keycodes (DOS,
-  Windows - except with cygwin?) instead of as an octet stream.
+  Windows - except with Cygwin?) instead of as an octet stream.
   - The -nozap option takes an argument.  The basic functionality as already
   described gets invoked if the argument is not a specially recognized keyword
   (it is suggested that -nozap=full or -nozap=all be used).  The only
@@ -1973,7 +3123,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
   visited links page -IZ
 * reformatted src/makefile.dos and src/makefile.dsl to make them simpler to
   modify -TD
-* add -DOK_OVERRIDE to DIRED_DEFS for djgpp -LP
+* add -DOK_OVERRIDE to DIRED_DEFS for DJGPP -LP
 * change the samples in "URL Schemes Supported in Lynx" so they would appear
   without //user:passw@ but //user@ with the explanation of yet another
   possibility added in words...  So user will not get a wrong impression if
@@ -2015,9 +3165,9 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
   and TEXTAREA_AUTOEXTEDIT, added description -KW
 * minor tweaks: -accept_all_cookies help string, some formatting changes,
   minor text additions and corrections -KW
-* set $(PROG_EXT) variable in makefiles for cygwin -TD
+* set $(PROG_EXT) variable in makefiles for Cygwin -TD
 * define __CYGWIN__ if needed, e.g., for betas that define __CYGWIN32__ -TD
-* workaround cygwin b19.1 problem generating cfg_defs.h because it did not
+* workaround Cygwin b19.1 problem generating cfg_defs.h because it did not
   properly export $PATH -TD
 1999-11-03 (2.8.3dev.14)
 * modify no_color_video check for A_UNDERLINE so it is active for any
@@ -2031,7 +3181,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
 * correct ifdef's in LYPrint.c so that send_file_to_mail() works with DJGPP -DK
 * modify DOS makefiles for PDCURSES for watt-32 and some of the other recent
   changes to lynx.  Included some of the EXP_ defines that DOS users may want.
-  Changed the -O3 back to -O2, since -O3 has no advantage under djgpp -DK
+  Changed the -O3 back to -O2, since -O3 has no advantage under DJGPP -DK
 * remove a useless ';', use FREE() instead of free() - JB
 * correct spelling lexem/lexeme (reported by KW) -TD
 * split-out function check_history() in LYMainLoop.c -TD
@@ -6133,7 +7283,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
 1998-03-20 (2.8.1dev.3)
 * Added death for Win/DOS clients that don't have a TMP space defined. - WB
 * Added _WINDOWS_NSL to provide interruptable lookups in Win32 per a
-  patch from afn06760@afn.org. (modified hopefully for borland AND cygwin and
+  patch from afn06760@afn.org. (modified hopefully for borland AND Cygwin and
   hard defined in tcp.h).  I had to recompile everything in multithread
   mode for borland, including my zlib library. - WB
 * Added _WINDOWS as a target for FNAMES_8_3 in userdefs.h to allow for 16
diff --git a/gnu/usr.bin/lynx/COPYHEADER b/gnu/usr.bin/lynx/COPYHEADER
index 01e35329b7d..8c88e974f59 100644
--- a/gnu/usr.bin/lynx/COPYHEADER
+++ b/gnu/usr.bin/lynx/COPYHEADER
@@ -13,7 +13,8 @@
 
    You should have received a copy of the GNU General Public License
    along with Lynx; see the file COPYING.  If not, write to the Free
-   Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
 
    Any licensing or usage questions should be directed to Michael
    Grobe <grobe@ukans.edu>.
diff --git a/gnu/usr.bin/lynx/COPYING b/gnu/usr.bin/lynx/COPYING
index a43ea2126fb..5b6e7c66c27 100644
--- a/gnu/usr.bin/lynx/COPYING
+++ b/gnu/usr.bin/lynx/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -279,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
 
-	Appendix: How to Apply These Terms to Your New Programs
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -305,14 +305,15 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
diff --git a/gnu/usr.bin/lynx/INSTALLATION b/gnu/usr.bin/lynx/INSTALLATION
index b7e0babc681..62a61522fb7 100644
--- a/gnu/usr.bin/lynx/INSTALLATION
+++ b/gnu/usr.bin/lynx/INSTALLATION
@@ -245,6 +245,9 @@ II. Compile instructions -- UNIX
 	disable extended HTML DTD logic.  This should revert to old-style
 	(2.7.1/2.7.2) behavior, but is not well-tested.
 
+  --disable-file-upload			(define USE_FILE_UPLOAD)
+	Compile-in support for form-based file-upload.
+
   --disable-finger			(define DISABLE_FINGER)
 	Do not compile-in code used to connect to "finger" URLs.
 
@@ -300,7 +303,7 @@ II. Compile instructions -- UNIX
 	Turn off code that lets Lynx display parts of a long page while loading
 	it.
 
-  --disable-persistent-cookies		(prevent defining EXP_PERSISTENT_COOKIES)
+  --disable-persistent-cookies		(prevent defining USE_PERSISTENT_COOKIES)
 	Use this option to tell configure whether to compile-in support for
 	saving cookies to a file, for subsequent reuse.  Persistent cookie
 	support will use (or create) the file specified by the 'COOKIE_FILE'
@@ -308,6 +311,20 @@ II. Compile instructions -- UNIX
 	(Currently there is no protection against conflict if several lynx
 	sessions are active from the same account).
 
+  --disable-prettysrc			(define USE_PRETTYSRC)
+	Use this option to compile-in support for colorizing the source view of
+	HTML pages.  If compiled-in, new source view mode is available with
+	-prettysrc command line option.
+
+  --disable-read-eta			(define USE_READPROGRESS)
+	Enhance the read-progress message to show ETA (estimated time to
+	completion), as well as the amount of time stalled without any data
+	transferred.
+
+  --disable-source-cache		(define USE_SOURCE_CACHE)
+	Use this option to compile-in support for caching HTML pages locally,
+	in files or in memory.	Configurable from lynx.cfg
+
   --disable-trace			(define NO_LYNX_TRACE)
 	Turn off code that lets you trace internal details of Lynx's operation.
 	We recommend that you leave this enabled, since we need this
@@ -345,6 +362,8 @@ II. Compile instructions -- UNIX
         Note that this flag is ignored if the CFLAGS environment
         variable is set, in that case "-g" (or whatever) has to
         be included in the CFLAGS value to get debugging.
+	Autoconf normally adds -g and -O options to CFLAGS if CFLAGS
+	was not set, and if the compiler supports those options.
 
   --enable-default-colors		(define USE_DEFAULT_COLORS)
   	Enable use of default-color background (ncurses/slang).  Either
@@ -366,9 +385,6 @@ II. Compile instructions -- UNIX
   --enable-find-leaks			(define LY_FIND_LEAKS)
 	Use this option to compile-in logic for testing memory leaks.
 
-  --enable-file-upload			(define EXP_FILE_UPLOAD)
-	Compile-in support for form-based file-upload.
-
   --enable-font-switch			(define EXP_CHARTRANS_AUTOSWITCH)
 	Allow Lynx to automatically change the Linux console state (switch
 	fonts) according to the current Display Character Set.  (Linux console
@@ -410,6 +426,10 @@ II. Compile instructions -- UNIX
   	Disabled by default; used for ifdef'ing JavaScript interface.
 	Currently dummy: no JavaScript support implemented in Lynx yet.
 
+  --enable-locale-charset		(define EXP_LOCALE_CHARSET)
+  	Use nl_langinfo(CODESET) to determine initial value for display
+	charset, overrides character_set value in .lynxrc file.
+
   --enable-nested-tables
 	Extends TRST to format nested tables, as well as be smarter about
 	<BR> and <P> tags in table cells.
@@ -421,25 +441,11 @@ II. Compile instructions -- UNIX
 	Disabled by default, this allows interruption of NSL requests,
 	so that `z' will stop the `look-up' phase of a connection.
 
-  --enable-prettysrc			(define USE_PRETTYSRC)
-	Use this option to compile-in support for colorizing the source view of
-	HTML pages.  If compiled-in, new source view mode is available with
-	-prettysrc command line option.
-
-  --enable-read-eta			(define EXP_READPROGRESS)
-	Enhance the read-progress message to show ETA (estimated time to
-	completion), as well as the amount of time stalled without any data
-	transferred.
-
   --enable-scrollbar			(define USE_SCROLLBAR)
 	Compile-in experimental support for scrollbar on the right-margin of
 	the screen.  If you configure with ncurses, this works with the mouse
 	on xterm, etc.
 
-  --enable-source-cache			(define SOURCE_CACHE)
-	Use this option to compile-in support for caching HTML pages locally,
-	in files or in memory.	Configurable from lynx.cfg
-
   --enable-syslog			(define SYSLOG_REQUESTED_URLS)
 	Use this option to log NSL requests via syslog().
 
@@ -460,16 +466,38 @@ II. Compile instructions -- UNIX
 	support a configure script, such as MS-DOS, Win32 and VMS, you must
 	edit userdefs.h if you wish to specify the location of lynx.cfg).
 
-  --with-catgets
-	use catgets functions if available.  See "--enable-nls".
-
   --with-charsets=list			(define ALL_CHARSETS)
  	Limit the number of charsets that are compiled-in to the specified
 	list of comma-separated MIME names.
 
+  --with-curses-dir
+	Specify directory under which curses/ncurses is installed.  This
+	assumes a standard install, e.g., with an include and lib subdirectory.
+
+  --with-dbmalloc
+	use Conor Cahill's dbmalloc library
+
+  --with-dmalloc
+	use Gray Watson's dmalloc library
+
+  --with-gnutls[=XXX]			(define USE_SSL)
+	Use this option to configure with the GNU TLS library.
+	See docs/README.ssl for additional information.
+
+	The optional value XXX specifies the directory in which the library
+	can be found, and may be either the path of the "lib" directory,
+	or one level above.  In either case, the corresponding header files
+	are assumed to be in the parallel "include" directory.  The default
+	is /usr/local/gnutls.
+
   --with-included-gettext
-	use the GNU gettext library included here (default).  See
-	"--enable-nls".
+	not supported in this package.  The configure script uses macros which
+	are bundled together with more useful features.
+
+	See the "--enable-nls" option.
+
+  --with-libiconv-prefix=DIR
+	search for libiconv in DIR/include and DIR/lib
 
   --with-nls-datadir=DIR
 	Use this option to override the configure script's NLS data directory,
@@ -478,18 +506,25 @@ II. Compile instructions -- UNIX
 	or native gettext is used.
 
   --with-screen=XXX
-	Use this option to select the screen type.  The option value,
-	XXX must be one of curses (the default), ncurses, pdcurses or slang.
-	Specifying a screen type causes the configure script to look in
-	standard locations for the associated header and library files,
-	unless you have preset the $CFLAGS and $LIBS variables.
+	Use this option to select the screen type.  The option value, XXX
+	must be one of curses (the default), ncurses, ncursesw, pdcurses or
+	slang.  Specifying a screen type causes the configure script to
+	look in standard locations for the associated header and library
+	files, unless you have preset the $CFLAGS and $LIBS variables.
 
+	--with-screen=ncursesw		(define NCURSES, WIDEC_CURSES)
 	--with-screen=ncurses		(define NCURSES)
+	--with-screen=pdcurses		(define PDCURSES)
 	--with-screen=slang		(define USE_SLANG)
 
 	Note that some systems may have a default curses library which
 	does not support color, while on others, ncurses is installed as
-	the curses library.
+	the curses library.  The variant ncursesw is the wide-character
+	version of ncurses.
+
+	The pdcurses selection supported by the configure script is a UNIX-only
+	library which uses X11.  If you are configuring with DJGPP, the likely
+	choice is "curses", since that is how PDCurses is normally installed.
 
   --with-socks[=XXX]			(define SOCKS)
 	Use this option to configure with the socks library.
@@ -525,6 +560,9 @@ II. Compile instructions -- UNIX
 	or one level above.  In either case, the corresponding header files
 	are assumed to be in the parallel "include" directory.
 
+  --with-bzlib				(define USE_BZLIB)
+	Use libbz2 for decompression of some bzip2 files.
+
   --with-zlib				(define USE_ZLIB)
 	Use zlib for decompression of some gzip files.
 
@@ -761,25 +799,35 @@ Visual C++:
 
 V. Compile instructions -- 386 DOS
 
-    Compiling for DOS with DJGPP is a multistep procedure. First install
-    the C compiler and its libraries (see readme.1st from DJGPP distribution).
-
-    Originally, lynx makefiles come with the initial -O2 optimization level. 
-    If you experience compilation process too slow due to paging to the disk
-    (DPMI server provide virtual memory, when in lack of RAM), you may change
-    optimization to -O1 or turn the optimization off entirely.
-
-    Alternatively, to get the last bit of run-time performance you may try
-    -O2 or -O3, in this case you may need to "stubedit" your "cc1.exe" file
-    to enlarge compiler stack size.  If using DJGPP 2.02 and GCC 2.8.1,
+    Compiling for DOS with DJGPP has traditionally been a multistep
+    procedure. Now, if you have a full installation of DJGPP you can
+    also install using the configure script, just as in the UNIX
+    section. This needs to be done under a BASH shell. Use a shell
+    script to run configure as in the example at the end of this
+    section. Otherwise you can follow the below instructions. The
+    multistep procedure for DOS may not be supported in the future
+    and use of the configure script is recommended. The information
+    about required libraries and unpacking applies to both methods of
+    compiling.
+
+    First install the C compiler and its libraries (see readme.1st from
+    DJGPP distribution).
+
+    Originally, lynx makefiles come with the initial -O2 optimization
+    level. If you experience compilation process too slow due to paging
+    to the disk (DPMI server provide virtual memory, when in lack of
+    RAM), you may change optimization to -O1 or turn the optimization
+    off entirely.
+
+    If using optimization level -O2 or -O3 with older versions of DJGPP
+    and GCC, you may need to "stubedit" your "cc1.exe" file to enlarge
+    compiler stack size. For instance, if using DJGPP 2.02 and GCC 2.8.1,
     to compile with -O3 optimization, the stub needs to be edited to give
-    a larger stack. To do this go into  djgpp\lib\gcc-lib\djgpp\2.81
-    and either type the command:
+    a larger stack. To do this go into djgpp\lib\gcc-lib\djgpp\2.81 and
+    either type the command:
    	 "stubedit cc1.exe bufsize=63k minstack=2M",
-    or edit interactively with: "stubedit cc1.exe".
-    The requirements for compiling with optimization using DJGPP 2.03
-    and GCC 2.95.2 have not yet been fully investigated. The above
-    should serve as a guide.
+    or edit interactively with: "stubedit cc1.exe". Current versions of
+    DJGPP and GCC generally work with the standard stack.
 
     Unpack the source code using a DOS program like UNZIP386.  If you are
     using PKUNZIP to unpack the .zip archive, you must use the -d command
@@ -793,46 +841,158 @@ V. Compile instructions -- 386 DOS
 
     If you wish to compile with "USE_ZLIB" (recommended), you must have the
     zlib library.  Get the source from
-	    http://www.gzip.org/zlib/ 
+	    http://www.gzip.org/zlib/
     and compile it.  Put libz.a in the lib subdirectory of DJGPP, and put
     zlib.h and zconf.h in the include subdirectory.
 
     In addition to the files in the Lynx distribution, you will need a curses
     package and a TCP package.  You can use PDCurses (available at
-    "http://www.lightlink.com/hessling/") and the DJGPP port of WATTCP.  The
+    "http://pdcurses.sourceforge.net/") and the DJGPP port of WATTCP.  The
     updated version of WATTCP is known as WATT-32, and is available at
     "http://www.bgnett.no/~giva/".  You can also use slang (available at
-    "ftp://space.mit.edu/pub/davis/slang") as your screen library.  You must
-    compile these before you go any further.  If you wish to use PDCurses 2.4,
+    "http://www.s-lang.org/") as your screen library.  You must
+    compile these before you go any further.  If you wish to use PDCurses 2.6,
     you need to first apply the following patch:
 
-    --- dos/pdckbd.c.ori	Sun Dec 26 23:15:04 1999
-    +++ dos/pdckbd.c	Fri Mar  3 00:20:14 2000
-    @@ -336,7 +336,7 @@
-     	||  (scan == 0x4e && ascii == 0x2b)  /* Plus */
-     	||  (scan == 0xe0 && ascii == 0x2f)) /* Slash */
-     		return ((int) ((ascii & 0x0f) | 0xf0) << 8);
-    -	if (ascii == 0x00 || ascii == 0xe0)
-    +	if (ascii == 0x00 || (ascii == 0xe0 && scan != 0x00))
-     		return ((int) (scan << 8));
-     	return ((int) (ascii));
-     }
-    @@ -496,7 +496,7 @@
-     		_watch_breaks();
-     #else
-     # ifdef GO32
-    -	(void*)signal(SIGINT,(setting ? SIG_DFL : SIG_IGN));
-    +/*	(void*)signal(SIGINT,(setting ? SIG_DFL : SIG_IGN)); */
-     /*	__djgpp_set_ctrl_c(setting);*/
-     	setcbrk(setting);
-     # else
-
-    If you have trouble applying the patch, try using the "patch" program,
-    ("ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/pat253b.zip").
+--- dos/gccdos.mak.ori	2002-01-11 20:11:18.000000000 -0800
++++ dos/gccdos.mak	2003-12-13 21:29:28.000000000 -0800
+@@ -40,11 +40,11 @@
+ 	CFLAGS  = -c -g -Wall -DPDCDEBUG
+ 	LDFLAGS = -g
+ else
+-	CFLAGS  = -c -O -Wall
++	CFLAGS  = -c -O2 -Wall
+ 	LDFLAGS =
+ endif
+
+-CPPFLAGS	= -I$(PDCURSES_HOME) -I$(CCINCDIR) -D_NAIVE_DOS_REGS
++CPPFLAGS	= -I$(PDCURSES_HOME) -I$(CCINCDIR) -D_NAIVE_DOS_REGS -DHAVE_STRING_H
+
+ CCFLAGS		= $(CFLAGS) $(CPPFLAGS)
+
+@@ -64,10 +64,10 @@
+ all:	$(PDCLIBS) $(DEMOS)
+
+ clean:
+ 	-del *.o
+-	-del curses.lib
+-	-del panel.lib
++	-del pdcurses.a
++	-del panel.a
+
+ demos:	$(DEMOS)
+
+@@ -287,33 +287,27 @@
+ #------------------------------------------------------------------------
+
+ firework.exe:	firework.o $(LIBCURSES)
+-	$(LINK) $(LDFLAGS) -o firework firework.o $(LIBCURSES)
+-	$(COFF2EXE) firework
++	$(LINK) $(LDFLAGS) -o firework.exe firework.o $(LIBCURSES)
+ 	strip $@
+
+ newdemo.exe:	newdemo.o $(LIBCURSES)
+-	$(LINK) $(LDFLAGS) -o newdemo newdemo.o $(LIBCURSES)
+-	$(COFF2EXE) newdemo
++	$(LINK) $(LDFLAGS) -o newdemo.exe newdemo.o $(LIBCURSES)
+ 	strip $@
+
+ ptest.exe:	ptest.o $(LIBCURSES) $(LIBPANEL)
+-	$(LINK) $(LDFLAGS) -o ptest ptest.o $(LIBCURSES) $(LIBPANEL)
+-	$(COFF2EXE) ptest
++	$(LINK) $(LDFLAGS) -o ptest.exe ptest.o $(LIBCURSES) $(LIBPANEL)
+ 	strip $@
+
+ testcurs.exe:	testcurs.o $(LIBCURSES)
+-	$(LINK) $(LDFLAGS) -o testcurs testcurs.o $(LIBCURSES)
+-	$(COFF2EXE) testcurs
++	$(LINK) $(LDFLAGS) -o testcurs.exe testcurs.o $(LIBCURSES)
+ 	strip $@
+
+ tuidemo.exe:	tuidemo.o tui.o $(LIBCURSES)
+-	$(LINK) $(LDFLAGS) -o tuidemo tuidemo.o tui.o $(LIBCURSES)
+-	$(COFF2EXE) tuidemo
++	$(LINK) $(LDFLAGS) -o tuidemo.exe tuidemo.o tui.o $(LIBCURSES)
+ 	strip $@
+
+ xmas.exe:	xmas.o $(LIBCURSES)
+-	$(LINK) $(LDFLAGS) -o xmas xmas.o $(LIBCURSES)
+-	$(COFF2EXE) xmas
++	$(LINK) $(LDFLAGS) -o xmas.exe xmas.o $(LIBCURSES)
+ 	strip $@
+
+
+--- dos/pdckbd.c.ori	2002-09-01 00:13:30.000000000 -0800
++++ dos/pdckbd.c	2004-01-19 20:30:02.000000000 -0800
+@@ -362,7 +362,7 @@
+ 		return ((int) (0xb8 << 8));
+ 	if (ascii == 0xe0 && scan == 0x53 && pdc_key_modifiers & PDC_KEY_MODIFIER_SHIFT) /* Shift Del */
+ 		return ((int) (0xb9 << 8));
+-	if (ascii == 0x00 || ascii == 0xe0)
++	if (ascii == 0x00 || (ascii == 0xe0 && scan != 0x00))
+ 		return ((int) (scan << 8));
+ 	return ((int) (ascii));
+ }
+@@ -522,7 +522,7 @@
+ 		_watch_breaks();
+ #else
+ # ifdef GO32
+-	(void*)signal(SIGINT,(setting ? SIG_DFL : SIG_IGN));
++/*	(void*)signal(SIGINT,(setting ? SIG_DFL : SIG_IGN)); */
+ /*	__djgpp_set_ctrl_c(setting);*/
+ 	setcbrk(setting);
+ # else
+--- pdcurses/kernel.c.ori	2002-11-27 03:24:32.000000000 -0800
++++ pdcurses/kernel.c	2003-12-13 21:22:38.000000000 -0800
+@@ -27,6 +27,10 @@
+ #include <memory.h>
+ #endif
+
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ #ifdef UNIX
+ #include <defs.h>
+ #include <term.h>
+--- pdcurses/pdcutil.c.ori	2001-01-10 00:27:22.000000000 -0800
++++ pdcurses/pdcutil.c	2003-12-13 21:24:58.000000000 -0800
+@@ -49,7 +49,7 @@
+ #  include <limits.h>
+ #endif
+
+-#ifdef STDC_HEADERS
++#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
+ #  include <string.h>
+ #endif
+
+--- pdcurses/pdcwin.c.ori	2002-05-25 17:13:32.000000000 -0800
++++ pdcurses/pdcwin.c	2003-12-13 21:26:02.000000000 -0800
+@@ -27,6 +27,10 @@
+ # include <memory.h>
+ #endif
+
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ #ifndef HAVE_MEMMOVE
+ # define memmove PDC_memmove
+ #endif
+
+    If you wish to compile with SSL enabled, you need to get and compile
+    OpenSSL. The DJGPP port has been successfully compiled with the
+    0.9.7 stable series of OpenSSL. DJGPP can compile OpenSSL from the
+    standard source distribution (http://www.openssl.org/). See the file
+    "INSTALL.DJGPP" in the OpenSSL distribution.
+
+
+    If you have trouble applying the patches, try using the "patch" program,
+    ("http://www.delorie.com/pub/djgpp/current/v2gnu/pat253b.zip").
     To read the Unix man style documentation, use, for example, "less"
-    ("ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/lss358b.zip").
-    Compile or place your compiled PDCurses library in lynx2-*/curses, and
-    compile or place your compiled WATT-32 library in lynx2-*/djgpp/watt32.  If
+    ("http://www.delorie.com/pub/djgpp/current/v2gnu/lss374b.zip").
+    Compile or place your compiled PDCurses library in /djgpp/pdcur26, and
+    compile or place your compiled WATT-32 library in /djgpp/watt32.  If
     using the SLANG library, put libslang.a in your DJGPP/lib directory and put
     slang.h and slcurses.h in your DJGPP/include directory, or in the
     appropriate directories specified by LIBRARY_PATH and INCLUDE_PATH in your
@@ -877,14 +1037,15 @@ V. Compile instructions -- 386 DOS
     "slip8250  0x60 6 3 0x2F8" so that it uses COM2 and IRQ 3, in order to
     avoid an IRQ conflict with a mouse or some other device.  Another packet
     driver is slipper.exe, which is available from many sites, including
-    "ftp://jazz.trumpet.com.au/slipper".  To remove it from memory use
+    "ftp://ftp.trumpet.com.au/slipper".  To remove it from memory use
     termin.com (usage "termin 0x60"), available in the CRYNWR package.  To
     connect over a dialup PPP connection you need dosppp or klos' pppshare.
     (Find at:
-    "http://mvmpc9.ciw.uni-karlsruhe.de/c:/user/toni/dosppp/dosppp06.zip",
-    "http://personal.redestb.es/tonilop/dosppp/dosppp06.zip", or
+    "http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/net/dosppp/dosppp06.zip"
+    "http://www.ncf.carleton.ca/ncf/pda/computer/dos/net/dosppp06.zip"
+    "http://mvmpc200.ciw.uni-karlsruhe.de/~mvmpc9/user/TONI/dosppp/dosppp06.zip"
     "ftp://ftp.oldskool.org/pub/tvdog/internet/dosppp06.zip";
-    "http://www.klos.com/get.pppshare.html")
+    "ftp://ftp.klos.com/pub/demo/pppshare.exe")
 
     File access looks like this:
 
@@ -894,7 +1055,6 @@ V. Compile instructions -- 386 DOS
     file://localhost/c:/
     file://localhost/c:/dos
     file://localhost/c:/dos/command.com
-    file://localhost/dev/c/dos/command.com
 
     See "http://www.fdisk.com/doslynx/lynxport.htm" for more hints and
     some precompiled libraries. One problem you can encounter is editing
@@ -924,9 +1084,36 @@ V. Compile instructions -- 386 DOS
     complete batch file with error checking and annotation can be found at:
     "http://www.flora.org/lynx-dev/html/month111997/msg00250.html".
 
+    If you use the configure method, remember that if you configure with
+    the option "--enable-nls", you also need to set LIBS="-liconv". A
+    sample shell script to run configure using PDCurses follows. If you
+    compile to use SLANG, note that the DJGPP keyhandler will be used
+    instead of the SLANG keyhandler unless you define "NO_DJ_KEYHANDLER".
+
+    #!/bin/sh
+    CFLAGS="-O2 -I/djgpp/pdcur26 -I/djgpp/watt32/inc" \
+    LIBS="-L/djgpp/pdcur26/lib -L/djgpp/watt32/lib -liconv" \
+    ./configure --prefix=d:/djgpp/lynx-rel/lynx-cnf \
+    --with-screen=curses \
+    --disable-full-paths \
+    --enable-addrlist-page \
+    --enable-change-exec \
+    --enable-cgi-links \
+    --enable-charset-choice \
+    --enable-color-style \
+    --enable-exec-links \
+    --enable-externs \
+    --enable-file-upload \
+    --enable-nested-tables \
+    --enable-nls \
+    --libdir=d:/djgpp/lynx-rel/lynx-cnf \
+    --with-bzlib \
+    --with-zlib \
+    --with-ssl
+
 -- 1997/9/29 - D. Kaufman <dkaufman@rahul.net>
 -- 1997/10/3 - B. Schiavo <Wschiavo@concentric.net>
--- Last update - 2001/07/12
+-- Last update - 2004/01/19
 
 
 VI. General installation instructions
@@ -986,10 +1173,15 @@ VII. Setting environment variables before running Lynx (optional)
     TEMP or TMP  Bookmarks are kept here with no HOME.  Temp files here.
     USER         Set to your login name (optional)
     LYNX_CFG     Set to the full path and filename for lynx.cfg
+    LYNX_LSS     Set to the full path and filename for lynx.lss
     LYNX_SAVE_SPACE  The (modifiable) location for downloaded file storage.
+    SSL_CERT_FILE Set to the full path and filename for your file of trusted
+                  certificates
 
     386 version only:
     WATTCP.CFG   Set to the full path for the WATTCP.CFG directory
+    RL_CLCOPY_CMD Command to copy a URL to a "clipboard" file
+    RL_PASTE_CMD  Command to go to a URL in your "clipboard" file
 
     Define these in your batch file for running Lynx.  For example, if your
     application line is "D:\win32\lynx.bat", lynx.bat for Win32 may look like:
diff --git a/gnu/usr.bin/lynx/LYMessages_en.h b/gnu/usr.bin/lynx/LYMessages_en.h
index 2f118832e18..0be27dfa52f 100644
--- a/gnu/usr.bin/lynx/LYMessages_en.h
+++ b/gnu/usr.bin/lynx/LYMessages_en.h
@@ -20,7 +20,7 @@
  * Links to collections of alternate definitions, developed by the Lynx
  * User Community, are maintained in Lynx links:
  *
- *    http://www.trill-home.com/lynx.html
+ *    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
@@ -28,11 +28,9 @@
  */
 #define ALERT_FORMAT gettext("Alert!: %s")
 #define WELCOME_MSG gettext("Welcome")
-#define REALLY_QUIT_Y gettext("Are you sure you want to quit?")
-#define REALLY_QUIT_N gettext("Are you sure you want to quit?")
+#define REALLY_QUIT gettext("Are you sure you want to quit?")
 #ifdef VMS
-#define REALLY_EXIT_Y gettext("Really exit from Lynx?")
-#define REALLY_EXIT_N gettext("Really exit from Lynx?")
+#define REALLY_EXIT gettext("Really exit from Lynx?")
 #endif /* VMS */
 #define CONNECTION_INTERRUPTED gettext("Connection interrupted.")
 #define TRANSFER_INTERRUPTED gettext("Data transfer interrupted.")
@@ -831,6 +829,7 @@
 #define YOUR_SEGMENT gettext("your")
 #define RUNTIME_OPT_SEGMENT gettext("for runtime options")
 #define COMPILE_OPT_SEGMENT gettext("compile time options")
+#define COLOR_STYLE_SEGMENT gettext("color-style configuration")
 #define REL_VERSION gettext("latest release")
 #define PRE_VERSION gettext("pre-release version")
 #define DEV_VERSION gettext("development version")
diff --git a/gnu/usr.bin/lynx/PROBLEMS b/gnu/usr.bin/lynx/PROBLEMS
index 8e0cf214a75..d764c199904 100644
--- a/gnu/usr.bin/lynx/PROBLEMS
+++ b/gnu/usr.bin/lynx/PROBLEMS
@@ -6,6 +6,37 @@ they will be outlined in this file.
 
 ---------
 
+    The install script will attempt to preserve your current settings in the
+    lynx.cfg file.  You should review these (at the end of lynx.cfg) after
+    install.  For instance references to lynx.browser.org for a startfile can
+    be removed, since that site is no longer maintained.
+
+---------
+
+    Some customized installs of OpenSSL are not detected by the configure
+    script.  For example, with Redhat9, we did this to work around:
+
+	#!/bin/sh
+	KRB=/usr/kerberos
+	export LIBS="-L$KRB/lib -lssl -lcrypto -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+	export CPPFLAGS="-I$KRB/include -I/usr/include/openssl"
+	export CFLAGS="-O -g $CPPFLAGS"
+	./configure --with-ssl $*
+
+---------
+
+    The configure script check for IPv6 (--enable-ipv6) assumes that your build
+    machine can listen for IPv6 connections.  It cannot determine if you want
+    to use it only for outgoing connections.  If the configure script is
+    otherwise successful, it will warn about a nonfunctioning getaddrinfo()
+    function, and does not define these symbols needed to successfully compile
+    IPv6 support.  You can work around this by by editing lynx_cfg.h:
+
+	HAVE_GAI_STRERROR
+	HAVE_GETADDRINFO
+
+---------
+
     Control-Z on Unix can cause aberrant behavior.  If you encounter
     problems, use -restrictions=suspend to disable it, and only '!'
     for escapes to shell (on VMS control-Z is unconditional 'Q'uit,
@@ -38,7 +69,7 @@ they will be outlined in this file.
 ---------
 
     On a Sun system, the message:
-        "Alert!:  Unable to connect to remote host"
+	"Alert!:  Unable to connect to remote host"
     will be displayed every time an attempt is made to access a host
     other than localhost if Lynx has been built without the resolv
     library and needed it, or with it and shouldn't have been.
@@ -66,12 +97,12 @@ they will be outlined in this file.
     In order to get bold text to appear differently than inverse video,
     the user should put this line in ~/.Xdefaults:
 
-        Term*boldStyle:         Offset_X
+	Term*boldStyle:		Offset_X
 
     From the `shelltool' man page, it seems that an analogous line
     in ~/.defaults
 
-        /Tty/Bold_style "Offset_X"
+	/Tty/Bold_style "Offset_X"
 
     ought to work just as well, but you may not get the desired
     behavior until you modify your .Xdefaults file (and run `xrdb
@@ -124,7 +155,7 @@ they will be outlined in this file.
     of HP/UX 10.10.  It also breaks tn3270, ncftp, emacs, and xemacs.
     Using:
     		LIBS="-lc -lcurses -ltermcap \
-                      ^^^
+		      ^^^
     (i.e, adding -lc *before* the -lcurses) in the snake3 and snake3-slang
     targets of the top level Makefile yields a usable image, but with
     inappropriate video attributes on the Lynx displays (reverse video and
@@ -217,3 +248,11 @@ they will be outlined in this file.
     SOCKETSHR 0.9D sources and offers the fixes as:
        http://alder.cc.kcl.ac.uk/fileserv/zip/socketshr_src_09d-2.zip
        ftp://ftp2.kcl.ac.uk/zip/socketshr_src_09d-2.zip
+
+---------
+
+    On VMS, to build an SSL-capable version, lynx and the ssl library
+    e.g., OpenSSL, must be built using the same network library.  If you
+    build OpenSSL without specifying the network library (the 5th parameter
+    of the makevms.com script), it will guess, possibly not the one you
+    intended.  We have tested only the UCX configuration -TD (2002/9/15).
diff --git a/gnu/usr.bin/lynx/README b/gnu/usr.bin/lynx/README
index 98f7b34961e..3ed7711b6c8 100644
--- a/gnu/usr.bin/lynx/README
+++ b/gnu/usr.bin/lynx/README
@@ -10,7 +10,7 @@ FOR REAL NOVICES
 To use this package, you need a compiler & a bit of experience
 at very simple programming.  If you just want something which will work
 `out-of-the-box', you can get pre-compiled versions of Lynx
-by following the links from  <URL: http://lynx.browser.org/> ;
+by following the links from  <URL: http://lynx.isc.org/> ;
 for DOS or Windows, goto <URL: http://www.fdisk.com/doslynx/lynxport.htm>.
 
 WHAT IS LYNX?
@@ -37,7 +37,7 @@ HOW TO GET LYNX
        <URL: ftp://lynx.isc.org/release>;
    the latest development version is at:
        <URL: http://lynx.isc.org/current>.
-   The Lynx homepage is <URL: http://lynx.browser.org/>.
+   The Lynx homepage is <URL: http://lynx.isc.org/>.
    The on-line help page (enter `h') has links to many useful things.
 
 LICENSE
diff --git a/gnu/usr.bin/lynx/WWW/BUILD b/gnu/usr.bin/lynx/WWW/BUILD
deleted file mode 100644
index 5fda9e0e7c0..00000000000
--- a/gnu/usr.bin/lynx/WWW/BUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/csh
-#			Build all WWW Code for this platform
-#
-#	Figure out what sort of unix this is
-#	(NeXT machines don't have uname!)
-
-set UNAME=NeXT
-if (-e /usr/bin/uname) set UNAME=`/usr/bin/uname`
-if (-e /bin/uname) set UNAME=`/bin/uname`
-if (-e /usr/apollo/bin) set UNAME=`ver sys5.3 /bin/uname`
-if ( $UNAME == "" ) then
-    if (-r /NextApps ) set UNAME=next
-endif
-#
-setenv UNAME $UNAME
-# For apollo, must use bsd mode. Also, WWW_MACH not inherited through make!
-if ($UNAME == "DomainOS")    setenv WWW_MACH	apollo_m68k
-if ($UNAME == next)	setenv WWW_MACH 	next
-if ($UNAME == "HP-UX")	setenv WWW_MACH 	snake
-if ($UNAME == "IRIX")	setenv WWW_MACH 	sgi
-if ($UNAME == "SunOS")	setenv WWW_MACH		sun4
-if ($UNAME == "ULTRIX")	setenv WWW_MACH		decstation
-if ($UNAME == "AIX")    setenv WWW_MACH		rs6000
-if ($UNAME == "OSF1")   setenv WWW_MACH		osf1
-
-if ($WWW_MACH == "") then
-    echo "Please edit BUILD file to include your machine OS"
-    echo "and mail differences back to www-bug@info.cern.ch
-    exit -99
-endif
-echo "________________________________________________________________"
-echo "WWW build for machine type:                            " $WWW_MACH
-
-#	Now go do build
-
-#	We don't want SHELL set to something funny to screw up make
-
-(cd All/Implementation; unsetenv SHELL; make)
-set stat = $status
-echo
-echo "WWW build for " $WWW_MACH  " done. status = " $stat
-exit $stat
diff --git a/gnu/usr.bin/lynx/WWW/Copyright.txt b/gnu/usr.bin/lynx/WWW/Copyright.txt
deleted file mode 100644
index 3d7397bba61..00000000000
--- a/gnu/usr.bin/lynx/WWW/Copyright.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-                                                        Copyright -- /hypertext
-                           COPYRIGHT CERN 1990-1993
-                                       
-   Except where specifically placed in the public domain, the information (of
-   all forms) in these directories is the intellectual property of the European
-   Laboratory for Particle Physics (known as CERN). No guarantee whatsoever is
-   provided by CERN. No liability whatsoever is accepted for any loss or damage
-   of any kind resulting from any defect or inaccuracy in this information or
-   code.
-   
-   The conditions for public domain and other access to the code are defined in
-    distribution conditions of WWW code[1]
-   
-   Tim Berners-Lee[2]
-   
-   CERN
-   
-   1211 Geneva 23, Switzerland
-   
-           Tel +41(22)767 3755, Fax +41(22)767 7155, Email: tbl@cernvax.cern.ch
-                                                                               
-   
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAABrow.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAABrow.c
index 519030faa2d..5c711b8a493 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAABrow.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAABrow.c
@@ -57,13 +57,12 @@
 #include <HTAlert.h>		/* HTConfirm(), HTPrompt()	*/
 #include <HTAAUtil.h>		/* AA common to both sides	*/
 #include <HTAssoc.h>		/* Assoc list			*/
+#include <HTAccess.h>		/* Are we using an HTTP gateway? */
 #include <HTAABrow.h>		/* Implemented here		*/
 #include <HTUU.h>		/* Uuencoding and uudecoding	*/
 
 #include <LYLeaks.h>
 
-extern BOOL using_proxy;	/* Are we using an HTTP gateway? */
-
 /*
 **  Local datatype definitions
 **
@@ -394,7 +393,7 @@ PRIVATE HTAASetup *HTAASetup_new ARGS4(
 {
     HTAASetup *setup;
 
-    if (!server || !template || !*template)
+    if (!server || isEmpty(template))
 	return NULL;
 
     if ((setup = typecalloc(HTAASetup)) == 0)
@@ -649,7 +648,7 @@ PRIVATE char *compose_auth_string ARGS3(
 		     realm->realmname,
 		     (IsProxy ? "proxy" : "server"),
 		     (theHost ? theHost : "??"),
-		     (thePort ? thePort : ""));
+		     NonNull(thePort));
 	FREE(proxiedHost);
 	FREE(thePort);
 	username = realm->username;
@@ -676,8 +675,8 @@ PRIVATE char *compose_auth_string ARGS3(
 	}
     }
 
-    len = strlen(realm->username ? realm->username : "") +
-	  strlen(realm->password ? realm->password : "") + 3;
+    len = strlen(NonNull(realm->username)) +
+	  strlen(NonNull(realm->password)) + 3;
 
     if (scheme == HTAA_PUBKEY) {
 #ifdef PUBKEY
@@ -685,7 +684,7 @@ PRIVATE char *compose_auth_string ARGS3(
 	StrAllocCopy(secret_key, HTAA_generateRandomKey());
 #endif /* PUBKEY */
 	/* Room for secret key, timestamp and inet address */
-	len += strlen(secret_key ? secret_key : "") + 30;
+	len += strlen(NonNull(secret_key)) + 30;
     } else {
 	FREE(secret_key);
     }
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAABrow.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAABrow.h
index b19b2e6ac4d..4ebbcf3bb32 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAABrow.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAABrow.h
@@ -130,11 +130,5 @@ extern void HTAAForwardAuth_set PARAMS((
 	CONST char *	scheme_name,
 	CONST char *	scheme_specifics));
 extern void HTAAForwardAuth_reset NOPARAMS;
-/*
-
- */
 
 #endif  /* NOT HTAABROW_H */
-/*
-
-   End of file HTAABrow.h.  */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAAProt.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAAProt.c
index 6821068f383..5a4e493e88a 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAAProt.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAAProt.c
@@ -59,7 +59,7 @@ PRIVATE BOOL isNumber ARGS1(CONST char *, s)
 {
     CONST char *cur = s;
 
-    if (!s || !*s) return NO;
+    if (isEmpty(s)) return NO;
 
     if (*cur == '-')
 	cur++;		/* Allow initial minus sign in a number */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAAProt.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAAProt.h
index ad3af096264..c9b20b2a086 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAAProt.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAAProt.h
@@ -247,11 +247,4 @@ extern char * HTAA_GidToName PARAMS((int gid));
 */
 extern int HTAA_NameToGid PARAMS((char *name));
 
-/*
-
- */
-
 #endif /* not HTAAPROT_H */
-/*
-
-   End of file HTAAProt.h.  */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAAUtil.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAAUtil.c
index 25d24aa67b0..fd7d24aaff5 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAAUtil.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAAUtil.c
@@ -50,10 +50,6 @@
 #include <HTTCP.h>
 #include <HTTP.h>
 
-#ifdef USE_SSL
-PRIVATE SSL * Handle = NULL;	/* The SSL Handle	*/
-#endif /* USE_SSL */
-
 #include <LYStrings.h>
 #include <LYLeaks.h>
 
@@ -560,8 +556,8 @@ PUBLIC char *HTAA_getUnfoldedLine NOARGS
 
 	if (start_pointer >= end_pointer) {/*Read the next block and continue*/
 #ifdef USE_SSL
-	    if (Handle)
-		count = SSL_read(Handle, buffer, BUFFER_SIZE);
+	    if (SSL_handle)
+		count = SSL_read(SSL_handle, buffer, BUFFER_SIZE);
 	    else
 		count = NETREAD(in_soc, buffer, BUFFER_SIZE);
 #else
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAccess.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAccess.c
index 61097ce34ab..eda37d8f36d 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAccess.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAccess.c
@@ -22,7 +22,7 @@
 **	27 Jan 95 Ensured that proxy service will be overridden for files
 **		  on the local host (because HTLoadFile() doesn't try ftp
 **		  for those) and will substitute ftp for remote files. FM
-**	28 Jan 95 Tweeked PDM's proxy override mods to handle port info
+**	28 Jan 95 Tweaked PDM's proxy override mods to handle port info
 **		  for news and wais URL's. FM
 **
 **  Bugs
@@ -267,16 +267,10 @@ PUBLIC BOOL override_proxy ARGS1(
     }
     Host = (((at = strchr(host, '@')) != NULL) ? (at+1) : host);
 
-#ifdef VMS
-#define CompareHostname(a,b) strcasecomp(a, b)
-#else
-#define CompareHostname(a,b) strcmp(a, b)
-#endif /* VMS */
-
     if ((acc_method = HTParse(addr, "", PARSE_ACCESS))) {
 	if (!strcmp("file", acc_method) &&
-	    (!strcmp(Host, "localhost") ||
-	     !CompareHostname(Host, HTHostName()))) {
+	    (LYSameHostname(Host, "localhost") ||
+	     LYSameHostname(Host, HTHostName()))) {
 	    FREE(host);
 	    FREE(acc_method);
 	    return YES;
@@ -388,19 +382,21 @@ PRIVATE int get_physical ARGS2(
 	CONST char *,		addr,
 	HTParentAnchor *,	anchor)
 {
+    int result;
     char * acc_method = NULL;	/* Name of access method */
     char * physical = NULL;
     char * Server_addr = NULL;
     BOOL override_flag = NO;
 
+    CTRACE((tfp, "get_physical %s\n", addr));
+
     /*
     **	Make sure the using_proxy variable is FALSE.
     */
     using_proxy = NO;
 
 #ifndef NO_RULES
-    physical = HTTranslate(addr);
-    if (!physical) {
+    if ((physical = HTTranslate(addr)) == 0) {
 	if (redirecting_url) {
 	    return HT_REDIRECTING;
 	}
@@ -432,8 +428,7 @@ PRIVATE int get_physical ARGS2(
     }
 #endif /* NO_RULES */
 
-    acc_method =  HTParse(HTAnchor_physical(anchor),
-		"file:", PARSE_ACCESS);
+    acc_method = HTParse(HTAnchor_physical(anchor), STR_FILE_URL, PARSE_ACCESS);
 
     /*
     **	Check whether gateway access has been set up for this.
@@ -461,16 +456,16 @@ PRIVATE int get_physical ARGS2(
 		    StrAllocCat(Server_addr, ":119/");
 		}
 		FREE(host);
-	    } else if (getenv("NNTPSERVER") != NULL) {
+	    } else if (LYGetEnv("NNTPSERVER") != NULL) {
 		StrAllocCopy(Server_addr, "news://");
-		StrAllocCat(Server_addr, (char *)getenv("NNTPSERVER"));
+		StrAllocCat(Server_addr, LYGetEnv("NNTPSERVER"));
 		StrAllocCat(Server_addr, ":119/");
 	    }
 	} else if (!strcasecomp(acc_method, "wais")) {
 	    /*
-	**  Wais also needs checking of the default port
-	**  for selective exclusions.
-	*/
+	    **  Wais also needs checking of the default port
+	    **  for selective exclusions.
+	    */
 	    char *host = NULL;
 	    if ((host = HTParse(addr, "", PARSE_HOST))) {
 		if (!(strchr(host, ':'))) {
@@ -495,7 +490,7 @@ PRIVATE int get_physical ARGS2(
 	**  Search for gateways.
 	*/
 	HTSprintf0(&gateway_parameter, "WWW_%s_GATEWAY", acc_method);
-	gateway = getenv(gateway_parameter); /* coerce for decstation */
+	gateway = LYGetEnv(gateway_parameter); /* coerce for decstation */
 
 	/*
 	**  Search for proxy servers.
@@ -507,7 +502,7 @@ PRIVATE int get_physical ARGS2(
 	    strcpy(gateway_parameter, "ftp_proxy");
 	else
 	    sprintf(gateway_parameter, "%s_proxy", acc_method);
-	proxy = getenv(gateway_parameter);
+	proxy = LYGetEnv(gateway_parameter);
 	FREE(gateway_parameter);
 
 	if (gateway)
@@ -544,8 +539,8 @@ PRIVATE int get_physical ARGS2(
 	    FREE(gatewayed);
 	    FREE(acc_method);
 
-	    acc_method =  HTParse(HTAnchor_physical(anchor),
-		"http:", PARSE_ACCESS);
+	    acc_method = HTParse(HTAnchor_physical(anchor),
+				 STR_HTTP_URL, PARSE_ACCESS);
 
 	} else if (gateway) {
 	    char * path = HTParse(addr, "",
@@ -557,8 +552,8 @@ PRIVATE int get_physical ARGS2(
 	    FREE(gatewayed);
 	    FREE(acc_method);
 
-	    acc_method =  HTParse(HTAnchor_physical(anchor),
-		"http:", PARSE_ACCESS);
+	    acc_method = HTParse(HTAnchor_physical(anchor),
+				 STR_HTTP_URL, PARSE_ACCESS);
 	}
     }
     FREE(Server_addr);
@@ -567,6 +562,7 @@ PRIVATE int get_physical ARGS2(
     /*
     **	Search registered protocols to find suitable one.
     */
+    result = HT_NO_ACCESS;
     {
 	int i, n;
 #ifndef NO_INIT
@@ -578,13 +574,14 @@ PRIVATE int get_physical ARGS2(
 	    if (!strcmp(p->name, acc_method)) {
 		HTAnchor_setProtocol(anchor, p);
 		FREE(acc_method);
-		return (HT_OK);
+		result = HT_OK;
+		break;
 	    }
 	}
     }
 
     FREE(acc_method);
-    return HT_NO_ACCESS;
+    return result;
 }
 
 /*
@@ -596,9 +593,6 @@ PRIVATE int get_physical ARGS2(
  *  I want the "pop" to occur as soon as possible after loading
  *  has finished. - kw @@@
  */
-
-extern char*UCAssume_MIMEcharset;
-
 PUBLIC void LYUCPushAssumed ARGS1(
     HTParentAnchor *,	anchor)
 {
@@ -690,10 +684,10 @@ PRIVATE int HTLoad ARGS4(
     /* prevent crash if telnet or similar mapped or proxied by rule. - kw */
     LYFixCursesOnForAccess(addr, HTAnchor_physical(anchor));
     p = (HTProtocol *)HTAnchor_protocol(anchor);
-    anchor->underway = TRUE;		/* Hack to deal with caching */
-    status= (*(p->load))(HTAnchor_physical(anchor),
+    anchor->parent->underway = TRUE;		/* Hack to deal with caching */
+    status= p->load(HTAnchor_physical(anchor),
 			anchor, format_out, sink);
-    anchor->underway = FALSE;
+    anchor->parent->underway = FALSE;
     LYUCPopAssumed();
     return status;
 }
@@ -708,7 +702,7 @@ PUBLIC HTStream *HTSaveStream ARGS1(
     if (!p)
 	return NULL;
 
-    return (*p->saveStream)(anchor);
+    return p->saveStream(anchor);
 }
 
 PUBLIC int redirection_attempts = 0; /* counter in HTLoadDocument */
@@ -732,13 +726,13 @@ PUBLIC int redirection_attempts = 0; /* counter in HTLoadDocument */
 */
 
 PRIVATE BOOL HTLoadDocument ARGS4(
-	CONST char *,		full_address,
+	CONST char *,		full_address, /* may include #fragment */
 	HTParentAnchor *,	anchor,
 	HTFormat,		format_out,
 	HTStream*,		sink)
 {
-    int		status;
-    HText *	text;
+    int     status;
+    HText * text;
     CONST char * address_to_load = full_address;
     char *cp;
     BOOL ForcingNoCache = LYforce_no_cache;
@@ -778,10 +772,10 @@ PRIVATE BOOL HTLoadDocument ARGS4(
      *	are LYNXIMGMAP documents, for which we defer to LYLoadIMGmap
      *	for prompting if necessary. - kw
      */
-    if (LYinternal_flag && !LYforce_no_cache &&
+    text = (HText *)HTAnchor_document(anchor);
+    if (LYinternal_flag && !text && !LYforce_no_cache &&
 	anchor->post_data && !anchor->safe &&
-	(text = (HText *)HTAnchor_document(anchor)) == NULL &&
-	strncmp(full_address, "LYNXIMGMAP:", 11) &&
+	!isLYNXIMGMAP(full_address) &&
 	HTConfirm(gettext("Document with POST content not found in cache.  Resubmit?"))
 	!= TRUE) {
 	return NO;
@@ -823,7 +817,7 @@ PRIVATE BOOL HTLoadDocument ARGS4(
 	    NewDoc.bookmark = anchor->bookmark;
 	    NewDoc.isHEAD = anchor->isHEAD;
 	    NewDoc.safe = anchor->safe;
-	    anchor = HTAnchor_parent(HTAnchor_findAddress(&NewDoc));
+	    anchor = HTAnchor_findAddress(&NewDoc);
 	}
     }
     /*
@@ -838,7 +832,8 @@ PRIVATE BOOL HTLoadDocument ARGS4(
     /*
     **	See if we can use an already loaded document.
     */
-    if (!LYforce_no_cache && (text = (HText *)HTAnchor_document(anchor))) {
+    text = (HText *)HTAnchor_document(anchor);
+    if (text && !LYforce_no_cache) {
 	/*
 	**  We have a cached rendition of the target document.
 	**  Check if it's OK to re-use it.  We consider it OK if:
@@ -890,15 +885,15 @@ PRIVATE BOOL HTLoadDocument ARGS4(
 	**  etc.) but the code for doing those other things isn't
 	**  available yet.
 	*/
+	if (LYoverride_no_cache ||
 #ifdef DONT_TRACK_INTERNAL_LINKS
-	if (LYoverride_no_cache || !HText_hasNoCacheSet(text) ||
-	    !HText_AreDifferent(anchor, full_address))
+	    !HText_hasNoCacheSet(text) ||
+	    !HText_AreDifferent(anchor, full_address)
 #else
-	if (LYoverride_no_cache ||
 	    ((LYinternal_flag || !HText_hasNoCacheSet(text)) &&
-	     strncmp(full_address, "LYNXIMGMAP:", 11)))
+	     !isLYNXIMGMAP(full_address))
 #endif /* TRACK_INTERNAL_LINKS */
-	{
+	) {
 	    CTRACE((tfp, "HTAccess: Document already in memory.\n"));
 	    HText_select(text);
 
@@ -914,6 +909,14 @@ PRIVATE BOOL HTLoadDocument ARGS4(
 	}
     }
 
+    if (text && HText_HaveUserChangedForms(text)) {
+	/*
+	 * Issue a warning.  User forms content will be lost.
+	 * Will not restore changed forms, currently.
+	 */
+	HTAlert(RELOADING_FORM);
+    }
+
     /*
     **	Get the document from the net.	If we are auto-reloading,
     **	the mutable anchor elements from the previous rendition
@@ -922,12 +925,30 @@ PRIVATE BOOL HTLoadDocument ARGS4(
     */
     LYforce_no_cache = NO;  /* reset after each time through */
     if (ForcingNoCache) {
-	FREE(anchor->title);
+	FREE(anchor->title);  /* ??? */
     }
     status = HTLoad(address_to_load, anchor, format_out, sink);
     CTRACE((tfp, "HTAccess:  status=%d\n", status));
 
     /*
+     *  RECOVERY:
+     *  if the loading failed, and we had a cached HText copy,
+     *  and no new HText created - use a previous copy, issue a warning.
+     */
+    if (text && status < 0 && (HText *)HTAnchor_document(anchor) == text) {
+	HTAlert(gettext("Loading failed, use a previous copy."));
+	CTRACE((tfp, "HTAccess: Loading failed, use a previous copy.\n"));
+	HText_select(text);
+
+#ifdef DIRED_SUPPORT
+	if (HTAnchor_format(anchor) == WWW_DIRED)
+	    lynx_edit_mode = TRUE;
+#endif
+	redirection_attempts = 0;
+	return YES;
+    }
+
+    /*
     **	Log the access if necessary.
     */
     if (HTlogfile) {
@@ -1089,7 +1110,7 @@ PUBLIC BOOL HTLoadAbsolute ARGS1(
 	CONST DocAddress *,	docaddr)
 {
     return HTLoadDocument(docaddr->address,
-			  HTAnchor_parent(HTAnchor_findAddress(docaddr)),
+			  HTAnchor_findAddress(docaddr),
 			  (HTOutputFormat ? HTOutputFormat : WWW_PRESENT),
 			  HTOutputStream);
 }
@@ -1112,7 +1133,7 @@ PUBLIC BOOL HTLoadToStream ARGS3(
 	HTStream *,	sink)
 {
     return HTLoadDocument(addr,
-			  HTAnchor_parent(HTAnchor_findAddress(addr)),
+			  HTAnchor_findSimpleAddress(addr),
 			  (HTOutputFormat ? HTOutputFormat : WWW_PRESENT),
 			  sink);
 }
@@ -1137,7 +1158,6 @@ PUBLIC BOOL HTLoadRelative ARGS2(
     BOOL result;
     char * mycopy = NULL;
     char * stripped = NULL;
-    char * current_address = HTAnchor_address((HTAnchor*)here);
 
     full_address.address = NULL;
     full_address.post_data = NULL;
@@ -1151,8 +1171,8 @@ PUBLIC BOOL HTLoadRelative ARGS2(
     stripped = HTStrip(mycopy);
     full_address.address =
 		HTParse(stripped,
-			current_address,
-			PARSE_ACCESS|PARSE_HOST|PARSE_PATH|PARSE_PUNCTUATION);
+			here->address,
+			PARSE_ALL_WITHOUT_ANCHOR);
     result = HTLoadAbsolute(&full_address);
     /*
     **	If we got redirection, result will be NO, but use_this_url_instead
@@ -1160,7 +1180,6 @@ PUBLIC BOOL HTLoadRelative ARGS2(
     **	is appropriate. - FM
     */
     FREE(full_address.address);
-    FREE(current_address);
     FREE(mycopy);  /* Memory leak fixed 10/7/92 -- JFG */
     return result;
 }
@@ -1188,14 +1207,12 @@ PUBLIC BOOL HTLoadAnchor ARGS1(
     if (HTAnchor_document(parent) == NULL) {	/* If not already loaded */
 						/* TBL 921202 */
 	BOOL result;
-	char * address = HTAnchor_address((HTAnchor*) parent);
 
-	result = HTLoadDocument(address,
+	result = HTLoadDocument(parent->address,
 				parent,
 				HTOutputFormat ?
 				HTOutputFormat : WWW_PRESENT,
 				HTOutputStream);
-	FREE(address);
 	if (!result) return NO;
 	loaded = YES;
     }
@@ -1203,7 +1220,9 @@ PUBLIC BOOL HTLoadAnchor ARGS1(
     {
 	HText *text = (HText*)HTAnchor_document(parent);
 
-	if (destination != (HTAnchor *)parent) {  /* If child anchor */
+	if ((destination != (HTAnchor *)parent) &&
+	    (destination != (HTAnchor *)(parent->parent))) {
+						  /* If child anchor */
 	    HText_selectAnchor(text,		  /* Double display? @@ */
 			       (HTChildAnchor*)destination);
 	} else {
@@ -1327,7 +1346,7 @@ PUBLIC BOOL HTSearchAbsolute ARGS2(
     abs_doc.isHEAD = FALSE;
     abs_doc.safe = FALSE;
 
-    anchor = (HTParentAnchor*)HTAnchor_findAddress(&abs_doc);
+    anchor = HTAnchor_findAddress(&abs_doc);
     return HTSearch(keywords, anchor);
 }
 
@@ -1349,7 +1368,7 @@ PUBLIC BOOL HTSearchAbsolute ARGS2(
 PUBLIC HTParentAnchor * HTHomeAnchor NOARGS
 {
     char * my_home_document = NULL;
-    char * home = (char *)getenv(LOGICAL_DEFAULT);
+    char * home = LYGetEnv(LOGICAL_DEFAULT);
     char * ref;
     HTParentAnchor * anchor;
 
@@ -1379,8 +1398,8 @@ PUBLIC HTParentAnchor * HTHomeAnchor NOARGS
 #ifdef UNIX
     if (my_home_document == NULL) {
 	FILE * fp = NULL;
-	CONST char * home =  (CONST char*)getenv("HOME");
-	if (home != null) {
+	char * home = LYGetEnv("HOME");
+	if (home != 0) {
 	    HTSprintf0(&my_home_document, "%s/%s", home, PERSONAL_DEFAULT);
 	    fp = fopen(my_home_document, "r");
 	}
@@ -1401,14 +1420,14 @@ PUBLIC HTParentAnchor * HTHomeAnchor NOARGS
     ref = HTParse((my_home_document ?
 		   my_home_document : (HTClientHost ?
 				     REMOTE_ADDRESS : LAST_RESORT)),
-		  "file:",
-		  PARSE_ACCESS|PARSE_HOST|PARSE_PATH|PARSE_PUNCTUATION);
+		  STR_FILE_URL,
+		  PARSE_ALL_WITHOUT_ANCHOR);
     if (my_home_document) {
 	CTRACE((tfp, "HTAccess: Using custom home page %s i.e., address %s\n",
 		    my_home_document, ref));
 	FREE(my_home_document);
     }
-    anchor = (HTParentAnchor*)HTAnchor_findAddress(ref);
+    anchor = HTAnchor_findSimpleAddress(ref);
     FREE(ref);
     return anchor;
 }
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAccess.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAccess.h
index 0c763051716..dbe36fa2028 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAccess.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAccess.h
@@ -105,21 +105,17 @@ extern BOOL override_proxy PARAMS((
 Load a document from relative name
 
   ON ENTRY,
-
   relative_name           The relative address of the file to be accessed.
-
   here                    The anchor of the object being searched
 
   ON EXIT,
-
   returns    YES          Success in opening file
-
   NO                      Failure
 
  */
 extern  BOOL HTLoadRelative PARAMS((
-                CONST char *            relative_name,
-                HTParentAnchor *        here));
+		CONST char *		relative_name,
+		HTParentAnchor *	here));
 
 
 /*
@@ -127,23 +123,11 @@ extern  BOOL HTLoadRelative PARAMS((
 Load a document from absolute name
 
   ON ENTRY,
-
   addr                    The absolute address of the document to be accessed.
-
   filter_it               if YES, treat document as HTML
 
- */
-
-/*
-
   ON EXIT,
-
- */
-
-/*
-
   returns YES             Success in opening document
-
   NO                      Failure
 
  */
@@ -155,22 +139,18 @@ extern BOOL HTLoadAbsolute PARAMS((CONST DocAddress * addr));
 Load a document from absolute name to a stream
 
   ON ENTRY,
-
   addr                    The absolute address of the document to be accessed.
-
   filter_it               if YES, treat document as HTML
 
   ON EXIT,
-
   returns YES             Success in opening document
-
   NO                      Failure
 
    Note: This is equivalent to HTLoadDocument
 
  */
 extern BOOL HTLoadToStream PARAMS((CONST char * addr, BOOL filter_it,
-                                HTStream * sink));
+				HTStream * sink));
 
 
 /*
@@ -178,27 +158,13 @@ extern BOOL HTLoadToStream PARAMS((CONST char * addr, BOOL filter_it,
 Load if necessary, and select an anchor
 
   ON ENTRY,
-
   destination                The child or parenet anchor to be loaded.
 
- */
-
-/*
-
   ON EXIT,
-
- */
-
-/*
-
   returns YES             Success
-
   returns NO              Failure
 
  */
-
-
-
 extern BOOL HTLoadAnchor PARAMS((HTAnchor * destination));
 
 
@@ -207,16 +173,12 @@ extern BOOL HTLoadAnchor PARAMS((HTAnchor * destination));
 Make a stream for Saving object back
 
   ON ENTRY,
-
   anchor                  is valid anchor which has previously beeing loaded
 
   ON EXIT,
-
   returns                 0 if error else a stream to save the object to.
 
  */
-
-
 extern HTStream * HTSaveStream PARAMS((HTParentAnchor * anchor));
 
 
@@ -228,9 +190,7 @@ Search
    current address and attempts to open the new address.
 
   ON ENTRY,
-
   *keywords               space-separated keyword list or similar search list
-
   here                    The anchor of the object being searched
 
  */
@@ -245,15 +205,13 @@ Search Given Indexname
    the current address and attempts to open the new address.
 
   ON ENTRY,
-
   *keywords               space-separated keyword list or similar search list
-
   *indexname              is name of object search is to be done on.
 
  */
 extern BOOL HTSearchAbsolute PARAMS((
-        CONST char *    keywords,
-        char *    	indexname));
+	CONST char *	keywords,
+	char *		indexname));
 
 
 /*
@@ -263,15 +221,15 @@ Register an access method
  */
 
 typedef struct _HTProtocol {
-        char * name;
+	char * name;
 
-        int (*load)PARAMS((
-                CONST char *    full_address,
-                HTParentAnchor * anchor,
-                HTFormat        format_out,
-                HTStream*       sink));
+	int (*load)PARAMS((
+		CONST char *	full_address,
+		HTParentAnchor * anchor,
+		HTFormat	format_out,
+		HTStream*	sink));
 
-        HTStream* (*saveStream)PARAMS((HTParentAnchor * anchor));
+	HTStream* (*saveStream)PARAMS((HTParentAnchor * anchor));
 
 } HTProtocol;
 
@@ -310,7 +268,6 @@ extern void LYUCPushAssumed PARAMS((
     HTParentAnchor *	anchor));
 extern int LYUCPopAssumed NOPARAMS;
 
-#endif /* HTACCESS_H */
-/*
+extern BOOL using_proxy;	/* Are we using an NNTP proxy? */
 
-   end of HTAccess  */
+#endif /* HTACCESS_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAnchor.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAnchor.c
index d336cb7b796..e83a0fa8b08 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAnchor.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAnchor.c
@@ -18,9 +18,11 @@
 #include <HTUtils.h>
 #include <HTAnchor.h>
 #include <HTParse.h>
+#include <HTString.h>
 #include <UCAux.h>
 #include <UCMap.h>
 
+#include <GridText.h>
 #include <LYUtils.h>
 #include <LYCharSets.h>
 #include <LYLeaks.h>
@@ -56,7 +58,9 @@ struct _HyperDoc {
 };
 #endif /* VMS */
 
-PRIVATE HTList **adult_table = 0;  /* Point to table of lists of all parents */
+/* Table of lists of all parents */
+PRIVATE HTList adult_table[HASH_SIZE] = { {NULL, NULL} };
+
 
 /*				Creation Methods
 **				================
@@ -65,165 +69,226 @@ PRIVATE HTList **adult_table = 0;  /* Point to table of lists of all parents */
 **	consistency, we insist that you furnish more information about the
 **	anchor you are creating : use newWithParent or newWithAddress.
 */
-PRIVATE HTParentAnchor * HTParentAnchor_new NOARGS
+PRIVATE HTParentAnchor0 * HTParentAnchor0_new ARGS2(
+	CONST char *,	address,
+	short,		hash)
+{
+    HTParentAnchor0 *newAnchor = typecalloc(HTParentAnchor0);
+    if (newAnchor == NULL)
+	outofmem(__FILE__, "HTParentAnchor0_new");
+
+    newAnchor->parent = newAnchor;	/* self */
+    StrAllocCopy(newAnchor->address, address);
+    newAnchor->adult_hash = hash;
+
+    return(newAnchor);
+}
+
+PRIVATE HTParentAnchor * HTParentAnchor_new ARGS1(
+	HTParentAnchor0 *,	parent)
 {
     HTParentAnchor *newAnchor = typecalloc(HTParentAnchor);
     if (newAnchor == NULL)
 	outofmem(__FILE__, "HTParentAnchor_new");
-    newAnchor->parent = newAnchor;
-    newAnchor->bookmark = NULL;		/* Bookmark filename. - FM */
+
+    newAnchor->parent = parent;		/* cross reference */
+    parent->info = newAnchor;		/* cross reference */
+    newAnchor->address = parent->address;  /* copy pointer */
+
     newAnchor->isISMAPScript = FALSE;	/* Lynx appends ?0,0 if TRUE. - FM */
     newAnchor->isHEAD = FALSE;		/* HEAD request if TRUE. - FM */
     newAnchor->safe = FALSE;		/* Safe. - FM */
-#ifdef SOURCE_CACHE
-    newAnchor->source_cache_file = NULL;
-    newAnchor->source_cache_chunk = NULL;
-#endif
-    newAnchor->FileCache = NULL;	/* Path to a disk-cached copy. - FM */
-    newAnchor->SugFname = NULL;		/* Suggested filename. - FM */
-    newAnchor->RevTitle = NULL;		/* TITLE for a LINK with REV. - FM */
-    newAnchor->citehost = NULL;		/* LINK REL=citehost - RDC */
-    newAnchor->cache_control = NULL;	/* Cache-Control. - FM */
     newAnchor->no_cache = FALSE;	/* no-cache? - FM */
-    newAnchor->content_type = NULL;	/* Content-Type. - FM */
-    newAnchor->content_language = NULL; /* Content-Language. - FM */
-    newAnchor->content_encoding = NULL; /* Compression algorithm. - FM */
-    newAnchor->content_base = NULL;	/* Content-Base. - FM */
-    newAnchor->content_disposition = NULL; /* Content-Disposition. - FM */
-    newAnchor->content_location = NULL; /* Content-Location. - FM */
-    newAnchor->content_md5 = NULL;	/* Content-MD5. - FM */
+    newAnchor->inBASE = FALSE;		/* duplicated from HTML.c/h */
     newAnchor->content_length = 0;	/* Content-Length. - FM */
-    newAnchor->date = NULL;		/* Date. - FM */
-    newAnchor->expires = NULL;		/* Expires. - FM */
-    newAnchor->last_modified = NULL;	/* Last-Modified. - FM */
-    newAnchor->ETag = NULL;		/* ETag (HTTP/1.1 cache validator) */
-    newAnchor->server = NULL;		/* Server. - FM */
     return(newAnchor);
 }
 
-PRIVATE HTChildAnchor * HTChildAnchor_new NOARGS
+PRIVATE HTChildAnchor * HTChildAnchor_new ARGS1(
+	HTParentAnchor0 *,	parent)
 {
-    HTChildAnchor *p;
-
-    p = typecalloc(HTChildAnchor);
+    HTChildAnchor *p = typecalloc(HTChildAnchor);
     if (p == NULL)
 	outofmem(__FILE__, "HTChildAnchor_new");
+
+    p->parent = parent;		/* parent reference */
     return p;
 }
 
+PRIVATE HTChildAnchor * HText_pool_ChildAnchor_new ARGS1(
+	HTParentAnchor *,	parent)
+{
+    HTChildAnchor *p = (HTChildAnchor *)HText_pool_calloc((HText*)(parent->document),
+						sizeof(HTChildAnchor));
+    if (p == NULL)
+	outofmem(__FILE__, "HText_pool_ChildAnchor_new");
+
+    p->parent = parent->parent;	/* parent reference */
+    return p;
+}
 
 #ifdef CASE_INSENSITIVE_ANCHORS
-/*	Case insensitive string comparison
-**	----------------------------------
+/* Case insensitive string comparison */
+#define HT_EQUIV(a,b) (TOUPPER(a) == TOUPPER(b))
+#else
+/* Case sensitive string comparison */
+#define HT_EQUIV(a,b) ((a) == (b))
+#endif
+
+/*	Null-terminated string comparison
+**	---------------------------------
 ** On entry,
 **	s	Points to one string, null terminated
 **	t	points to the other.
 ** On exit,
-**	returns YES if the strings are equivalent ignoring case
-**		NO if they differ in more than	their case.
+**	returns YES if the strings are equivalent
+**		NO if they differ.
 */
-PRIVATE BOOL HTEquivalent ARGS2(
+PRIVATE BOOL HTSEquivalent ARGS2(
 	CONST char *,	s,
 	CONST char *,	t)
 {
     if (s && t) {  /* Make sure they point to something */
 	for (; *s && *t; s++, t++) {
-	    if (TOUPPER(*s) != TOUPPER(*t)) {
+	    if (!HT_EQUIV(*s, *t)) {
 		return(NO);
 	    }
 	}
-	return( TOUPPER(*s) == TOUPPER(*t));
+	return(HT_EQUIV(*s, *t));
     } else {
 	return(s == t);		/* Two NULLs are equivalent, aren't they ? */
     }
 }
 
-#else
-
-/*	Case sensitive string comparison
-**	----------------------------------
+/*	Binary string comparison
+**	------------------------
 ** On entry,
-**	s	Points to one string, null terminated
+**	s	Points to one bstring
 **	t	points to the other.
 ** On exit,
-**	returns YES if the strings are identical or both NULL
+**	returns YES if the strings are equivalent
 **		NO if they differ.
 */
-PRIVATE BOOL HTIdentical ARGS2(
-	CONST char *,	s,
-	CONST char *,	t)
-{
-    if (s && t) {  /* Make sure they point to something */
-#ifdef SH_EX	/* 1998/04/28 (Tue) 22:02:58 */
-	if (*s == 'P' || *t == 'P') {
-	    if (strcmp(s + 1, "Name") == 0 || strcmp(t + 1, "Name") == 0)
-		return NO;
-	}
-#endif
-	for (; *s && *t; s++, t++) {
-	    if (*s != *t) {
+PRIVATE BOOL HTBEquivalent ARGS2(
+	CONST bstring *,	s,
+	CONST bstring *,	t)
+{
+    if (s && t && BStrLen(s) == BStrLen(t)) {
+	int j;
+	int len = BStrLen(s);
+	for (j = 0; j < len; ++j) {
+	    if (!HT_EQUIV(BStrData(s)[j], BStrData(t)[j])) {
 		return(NO);
 	    }
 	}
-	return (BOOL) (*s == *t);
+	return(YES);
     } else {
-	return (BOOL) (s == t);  /* Two NULLs are identical, aren't they ? */
+	return(s == t);		/* Two NULLs are equivalent, aren't they ? */
     }
 }
+
+/*
+ *  Three-way compare function
+ */
+PRIVATE int compare_anchors ARGS2(
+	void *, l,
+	void *, r)
+{
+    CONST char* a = ((HTChildAnchor *)l)->tag;
+    CONST char* b = ((HTChildAnchor *)r)->tag;
+    /* both tags are not NULL */
+
+#ifdef CASE_INSENSITIVE_ANCHORS
+	return strcasecomp(a, b); /* Case insensitive */
+#else
+	return strcmp(a, b);      /* Case sensitive - FM */
 #endif /* CASE_INSENSITIVE_ANCHORS */
+}
 
 
 /*	Create new or find old sub-anchor
 **	---------------------------------
 **
-**	Me one is for a new anchor being edited into an existing
-**	document.  The parent anchor must already exist.
+**	This one is for a named child.
+**	The parent anchor must already exist.
 */
-PUBLIC HTChildAnchor * HTAnchor_findChild ARGS2(
-	HTParentAnchor *,	parent,
+PRIVATE HTChildAnchor * HTAnchor_findNamedChild ARGS2(
+	HTParentAnchor0 *,	parent,
 	CONST char *,		tag)
 {
     HTChildAnchor *child;
-    HTList *kids;
 
-    if (!parent) {
-	CTRACE((tfp, "HTAnchor_findChild called with NULL parent.\n"));
-	return(NULL);
-    }
-    if ((kids = parent->children) != 0) {
-	/*
-	**  Parent has children.  Search them.
-	*/
-	if (tag && *tag) {		/* TBL */
-	    while (NULL != (child=(HTChildAnchor *)HTList_nextObject(kids))) {
-#ifdef CASE_INSENSITIVE_ANCHORS
-		if (HTEquivalent(child->tag, tag)) /* Case insensitive */
-#else
-		if (HTIdentical(child->tag, tag)) /* Case sensitive - FM */
-#endif /* CASE_INSENSITIVE_ANCHORS */
-		{
-		    CTRACE((tfp, "Child anchor %p of parent %p with name `%s' already exists.\n",
+    if (parent && tag && *tag) {  /* TBL */
+	if (parent->children) {
+	    /*
+	    **  Parent has children.  Search them.
+	    */
+	    HTChildAnchor sample;
+	    sample.tag = (char*)tag;    /* for compare_anchors() only */
+
+	    child = (HTChildAnchor *)HTBTree_search(parent->children, &sample);
+	    if (child != NULL) {
+		CTRACE((tfp, "Child anchor %p of parent %p with name `%s' already exists.\n",
 				(void *)child, (void *)parent, tag));
-		    return(child);
-		}
+		return(child);
 	    }
-	}  /*  end if tag is void */
-    } else {  /* parent doesn't have any children yet : create family */
-	parent->children = HTList_new();
+	} else {  /* parent doesn't have any children yet : create family */
+	    parent->children = HTBTree_new(compare_anchors);
+	}
+
+	child = HTChildAnchor_new(parent);
+	CTRACE((tfp, "HTAnchor: New Anchor %p named `%s' is child of %p\n",
+		(void *)child,
+		NonNull(tag),
+		(void *)child->parent));
+
+	StrAllocCopy(child->tag, tag);   /* should be set before HTBTree_add */
+	HTBTree_add(parent->children, child);
+	return(child);
+
+    } else {
+	CTRACE((tfp, "HTAnchor_findNamedChild called with NULL parent.\n"));
+	return(NULL);
+    }
+
+}
+
+/*
+**	This one is for a new unnamed child being edited into an existing
+**	document.  The parent anchor and the document must already exist.
+**	(Just add new unnamed child).
+*/
+PRIVATE HTChildAnchor * HTAnchor_addChild ARGS1(
+	HTParentAnchor *,	parent)
+{
+    HTChildAnchor *child;
+
+    if (!parent) {
+	CTRACE((tfp, "HTAnchor_addChild called with NULL parent.\n"));
+	return(NULL);
     }
 
-    child = HTChildAnchor_new();
-    CTRACE((tfp, "HTAnchor: New Anchor %p named `%s' is child of %p\n",
+    child = HText_pool_ChildAnchor_new(parent);
+    CTRACE((tfp, "HTAnchor: New unnamed Anchor %p is child of %p\n",
 		(void *)child,
-		tag ? tag : (CONST char *)"",
-		(void *)parent)); /* int for apollo */
-    HTList_addObject (parent->children, child);
-    child->parent = parent;
-    StrAllocCopy(child->tag, tag);
+		(void *)child->parent));
+
+    child->tag = 0;
+    HTList_linkObject(&parent->children_notag, child, &child->_add_children_notag);
+
     return(child);
 }
 
 
+PRIVATE HTParentAnchor0 * HTAnchor_findAddress_in_adult_table PARAMS((
+	CONST DocAddress *	newdoc));
+
+PRIVATE BOOL HTAnchor_link PARAMS((
+	HTChildAnchor *		child,
+	HTAnchor *		destination,
+	HTLinkType *		type));
+
+
 /*	Create or find a child anchor with a possible link
 **	--------------------------------------------------
 **
@@ -237,217 +302,199 @@ PUBLIC HTChildAnchor * HTAnchor_findChildAndLink ARGS4(
 	CONST char *,		href,	/* May be "" or 0 */
 	HTLinkType *,		ltype)	/* May be 0	  */
 {
-    HTChildAnchor * child = HTAnchor_findChild(parent, tag);
+    HTChildAnchor * child;
+    CTRACE((tfp,"Entered HTAnchor_findChildAndLink:  tag=`%s',%s href=`%s'\n",
+	       NonNull(tag),
+	       (ltype == HTInternalLink) ? " (internal link)" : "",
+	       NonNull(href) ));
 
-    CTRACE((tfp,"Entered HTAnchor_findChildAndLink\n"));
+    if (tag && *tag) {
+	child = HTAnchor_findNamedChild(parent->parent, tag);
+    } else {
+	child = HTAnchor_addChild(parent);
+    }
 
     if (href && *href) {
-	char *relative_to = HTAnchor_address((HTAnchor *)parent);
-	DocAddress parsed_doc;
-	HTAnchor * dest;
-
-	parsed_doc.address = HTParse(href, relative_to, PARSE_ALL);
-#ifndef DONT_TRACK_INTERNAL_LINKS
-	if (ltype && parent->post_data && ltype == LINK_INTERNAL) {
-	    /* for internal links, find a destination with the same
-	       post data if the source of the link has post data. - kw */
-	    parsed_doc.post_data = parent->post_data;
-	    parsed_doc.post_content_type = parent->post_content_type;
-	} else
-#endif
-	{
+	CONST char *fragment = NULL;
+	HTParentAnchor0 * dest;
+
+	if (ltype == HTInternalLink && *href == '#') {
+	    dest = parent->parent;
+	} else {
+	    CONST char *relative_to = (parent->inBASE && *href != '#') ?
+				parent->content_base : parent->address;
+	    DocAddress parsed_doc;
+	    parsed_doc.address = HTParse(href, relative_to,
+					 PARSE_ALL_WITHOUT_ANCHOR);
+
 	    parsed_doc.post_data = NULL;
 	    parsed_doc.post_content_type = NULL;
+	    if (ltype && parent->post_data && ltype == HTInternalLink) {
+		/* for internal links, find a destination with the same
+		   post data if the source of the link has post data. - kw
+		   Example: LYNXIMGMAP: */
+		parsed_doc.post_data = parent->post_data;
+		parsed_doc.post_content_type = parent->post_content_type;
+	    }
+	    parsed_doc.bookmark = NULL;
+	    parsed_doc.isHEAD = FALSE;
+	    parsed_doc.safe = FALSE;
+
+	    dest = HTAnchor_findAddress_in_adult_table(&parsed_doc);
+	    FREE(parsed_doc.address);
 	}
-	parsed_doc.bookmark = NULL;
-	parsed_doc.isHEAD = FALSE;
-	parsed_doc.safe = FALSE;
-	dest = HTAnchor_findAddress(&parsed_doc);
 
-#define DUPLICATE_ANCHOR_NAME_WORKAROUND
+	/*
+	** [from HTAnchor_findAddress()]
+	** If the address represents a sub-anchor, we load its parent (above),
+	** then we create a named child anchor within that parent.
+	*/
+	fragment = (*href == '#') ?  href+1 : HTParseAnchor(href);
+
+	if (*fragment)
+	    dest = (HTParentAnchor0 *)HTAnchor_findNamedChild(dest, fragment);
+
 
-#ifdef DUPLICATE_ANCHOR_NAME_WORKAROUND
 	if (tag && *tag) {
-	    HTAnchor *testdest1;
-	    int nlinks;
-	    testdest1 = child->mainLink.dest;
-	    if (testdest1) {
-		nlinks = 1 + HTList_count(child->links);
+	    if (child->dest) { /* DUPLICATE_ANCHOR_NAME_WORKAROUND  - kw */
 		CTRACE((tfp,
-		       "*** Duplicate ChildAnchor %p named `%s' with %d links",
-		       child, tag, nlinks));
-		if (dest == testdest1 && ltype == child->mainLink.type) {
-		    CTRACE((tfp,", same dest %p and type, keeping it\n",
-			   testdest1));
-		} else {
-		    CTRACE((tfp,", different dest %p, creating unnamed child\n",
-			   testdest1));
-		    child = HTAnchor_findChild(parent, 0);
+			   "*** Duplicate ChildAnchor %p named `%s'",
+			   child, tag));
+		if ((HTAnchor *)dest != child->dest || ltype != child->type) {
+		    CTRACE((tfp,
+			   ", different dest %p or type, creating unnamed child\n",
+			   child->dest));
+		    child = HTAnchor_addChild(parent);
 		}
 	    }
 	}
-#endif
-	HTAnchor_link((HTAnchor *)child, dest, ltype);
-	FREE(parsed_doc.address);
-	FREE(relative_to);
+	HTAnchor_link(child, (HTAnchor *)dest, ltype);
     }
-    return(child);
+    return child;
 }
 
-#ifdef LY_FIND_LEAKS
-/*
-**  Function for freeing the adult hash table. - FM
-*/
-PRIVATE void free_adult_table NOARGS
-{
-    int i_counter;
-    HTList * HTAp_freeme;
-    HTParentAnchor * parent;
-    /*
-     *	Loop through all lists.
-     */
-    for (i_counter = 0; i_counter < HASH_SIZE; i_counter++) {
-	/*
-	**  Loop through the list.
-	*/
-	while (adult_table[i_counter] != NULL) {
-	    /*
-	    **	Free off items - FM
-	    */
-	    HTAp_freeme = adult_table[i_counter];
-	    adult_table[i_counter] = HTAp_freeme->next;
-	    if (HTAp_freeme->object) {
-		parent = (HTParentAnchor *)HTAp_freeme->object;
-		CTRACE((tfp, "delete anchor:%d/%d,%d,%d %s\n",
-		       i_counter, HTList_count(HTAp_freeme) + 1,
-		       (parent->physical ? 1 : 0),
-		       (int)parent->underway,
-		       (parent->address ? parent->address : "(no address)")));
-		parent->underway = FALSE;
-		HTAnchor_delete(parent);
-	    }
-	    FREE(HTAp_freeme);
-	}
-    }
-    FREE(adult_table);
-}
-#endif /* LY_FIND_LEAKS */
 
-/*	Create new or find old named anchor
-**	-----------------------------------
+/*	Create new or find old parent anchor
+**	------------------------------------
 **
 **	Me one is for a reference which is found in a document, and might
 **	not be already loaded.
 **	Note: You are not guaranteed a new anchor -- you might get an old one,
 **	like with fonts.
 */
-PUBLIC HTAnchor * HTAnchor_findAddress ARGS1(
+PUBLIC HTParentAnchor * HTAnchor_findAddress ARGS1(
 	CONST DocAddress *,	newdoc)
 {
     /* Anchor tag specified ? */
-    char *tag = HTParse(newdoc->address, "", PARSE_ANCHOR);
+    CONST char *tag = HTParseAnchor(newdoc->address);
 
     CTRACE((tfp,"Entered HTAnchor_findAddress\n"));
 
     /*
-    **	If the address represents a sub-anchor, we recursively load its
-    **	parent, then we create a child anchor within that document.
+    **	If the address represents a sub-anchor, we load its parent,
+    **	then we create a named child anchor within that parent.
     */
     if (*tag) {
 	DocAddress parsed_doc;
-	HTParentAnchor * foundParent;
+	HTParentAnchor0 * foundParent;
 	HTChildAnchor * foundAnchor;
 
 	parsed_doc.address = HTParse(newdoc->address, "",
-		PARSE_ACCESS | PARSE_HOST | PARSE_PATH | PARSE_PUNCTUATION);
+				     PARSE_ALL_WITHOUT_ANCHOR);
 	parsed_doc.post_data = newdoc->post_data;
 	parsed_doc.post_content_type = newdoc->post_content_type;
 	parsed_doc.bookmark = newdoc->bookmark;
 	parsed_doc.isHEAD = newdoc->isHEAD;
 	parsed_doc.safe = newdoc->safe;
 
-	foundParent = (HTParentAnchor *)HTAnchor_findAddress(&parsed_doc);
-	foundAnchor = HTAnchor_findChild (foundParent, tag);
+	foundParent = HTAnchor_findAddress_in_adult_table(&parsed_doc);
+	foundAnchor = HTAnchor_findNamedChild (foundParent, tag);
 	FREE(parsed_doc.address);
-	FREE(tag);
-	return (HTAnchor *)foundAnchor;
-    } else {
-	/*
-	**  If the address has no anchor tag,
-	**  check whether we have this node.
-	*/
-	int hash;
-	HTList * adults;
-	HTList *grownups;
-	HTParentAnchor * foundAnchor;
+	return HTAnchor_parent((HTAnchor *)foundParent);
+    }
+    return HTAnchor_parent((HTAnchor *)HTAnchor_findAddress_in_adult_table(newdoc));
+}
 
-	FREE(tag);
 
-	/*
-	**  Select list from hash table,
-	*/
-	hash = HASH_FUNCTION(newdoc->address);
-	if (!adult_table) {
-	    adult_table = typecallocn(HTList *, HASH_SIZE);
-	    if (!adult_table)
-		outofmem(__FILE__, "HTAnchor_findAddress");
-#ifdef LY_FIND_LEAKS
-	    atexit(free_adult_table);
-#endif
-	}
-	if (!adult_table[hash])
-	    adult_table[hash] = HTList_new();
-	adults = adult_table[hash];
+/*  The address has no anchor tag, for sure.
+ */
+PRIVATE HTParentAnchor0 * HTAnchor_findAddress_in_adult_table ARGS1(
+	CONST DocAddress *,	newdoc)
+{
+    /*
+    **  Check whether we have this node.
+    */
+    int hash;
+    HTList * adults;
+    HTList *grownups;
+    HTParentAnchor0 * foundAnchor;
+    BOOL need_extra_info = (newdoc->post_data || newdoc->post_content_type ||
+		newdoc->bookmark || newdoc->isHEAD || newdoc->safe);
 
-	/*
-	**  Search list for anchor.
-	*/
-	grownups = adults;
-	while (NULL != (foundAnchor =
-			(HTParentAnchor *)HTList_nextObject(grownups))) {
-#ifdef CASE_INSENSITIVE_ANCHORS
-	    if (HTEquivalent(foundAnchor->address, newdoc->address) &&
-		HTEquivalent(foundAnchor->post_data, newdoc->post_data) &&
-		foundAnchor->isHEAD == newdoc->isHEAD)
-#else
-	    if (HTIdentical(foundAnchor->address, newdoc->address) &&
-		HTIdentical(foundAnchor->post_data, newdoc->post_data) &&
-		foundAnchor->isHEAD == newdoc->isHEAD)
-#endif /* CASE_INSENSITIVE_ANCHORS */
-	    {
-		CTRACE((tfp, "Anchor %p with address `%s' already exists.\n",
-			    (void *)foundAnchor, newdoc->address));
-		 return (HTAnchor *)foundAnchor;
-	     }
+    /*
+     *  We need not free adult_table[] atexit -
+     *  it should be perfectly empty after free'ing all HText's.
+     *  (There is an error if it is not empty at exit). -LP
+     */
+
+    /*
+    **  Select list from hash table,
+    */
+    hash = HASH_FUNCTION(newdoc->address);
+    adults = &(adult_table[hash]);
+
+    /*
+    **  Search list for anchor.
+    */
+    grownups = adults;
+    while (NULL != (foundAnchor =
+		    (HTParentAnchor0 *)HTList_nextObject(grownups))) {
+	if (HTSEquivalent(foundAnchor->address, newdoc->address) &&
+
+	    ((!foundAnchor->info && !need_extra_info) ||
+	     (foundAnchor->info &&
+	      HTBEquivalent(foundAnchor->info->post_data, newdoc->post_data) &&
+	      foundAnchor->info->isHEAD == newdoc->isHEAD)))
+	{
+	    CTRACE((tfp, "Anchor %p with address `%s' already exists.\n",
+			(void *)foundAnchor, newdoc->address));
+	    return foundAnchor;
 	}
+    }
+
+    /*
+    **  Node not found: create new anchor.
+    */
+    foundAnchor = HTParentAnchor0_new(newdoc->address, hash);
+    CTRACE((tfp, "New anchor %p has hash %d and address `%s'\n",
+		(void *)foundAnchor, hash, newdoc->address));
+
+    if (need_extra_info) {
+	/* rare case, create a big structure */
+	HTParentAnchor *p = HTParentAnchor_new(foundAnchor);
 
-	/*
-	**  Node not found: create new anchor.
-	*/
-	foundAnchor = HTParentAnchor_new();
-	CTRACE((tfp, "New anchor %p has hash %d and address `%s'\n",
-		    (void *)foundAnchor, hash, newdoc->address));
-	StrAllocCopy(foundAnchor->address, newdoc->address);
 	if (newdoc->post_data)
-	    StrAllocCopy(foundAnchor->post_data, newdoc->post_data);
+	    BStrCopy(p->post_data, newdoc->post_data);
 	if (newdoc->post_content_type)
-	    StrAllocCopy(foundAnchor->post_content_type,
-			 newdoc->post_content_type);
+	    StrAllocCopy(p->post_content_type,
+		     newdoc->post_content_type);
 	if (newdoc->bookmark)
-	    StrAllocCopy(foundAnchor->bookmark, newdoc->bookmark);
-	foundAnchor->isHEAD = newdoc->isHEAD;
-	foundAnchor->safe = newdoc->safe;
-	HTList_addObject (adults, foundAnchor);
-	return (HTAnchor *)foundAnchor;
+	    StrAllocCopy(p->bookmark, newdoc->bookmark);
+	p->isHEAD = newdoc->isHEAD;
+	p->safe = newdoc->safe;
     }
+    HTList_linkObject(adults, foundAnchor, &foundAnchor->_add_adult);
+
+    return foundAnchor;
 }
+
 /*	Create new or find old named anchor - simple form
 **	-------------------------------------------------
 **
-**	Like the previous one, but simpler to use for simple cases.
+**     Like HTAnchor_findAddress, but simpler to use for simple cases.
 **	No post data etc. can be supplied. - kw
 */
-PUBLIC HTAnchor * HTAnchor_findSimpleAddress ARGS1(
+PUBLIC HTParentAnchor * HTAnchor_findSimpleAddress ARGS1(
 	CONST char *,	url)
 {
     DocAddress urldoc;
@@ -461,173 +508,107 @@ PUBLIC HTAnchor * HTAnchor_findSimpleAddress ARGS1(
     return HTAnchor_findAddress(&urldoc);
 }
 
+
+/*	Link me Anchor to another given one
+**	-------------------------------------
+*/
+PRIVATE BOOL HTAnchor_link ARGS3(
+	HTChildAnchor *,	child,
+	HTAnchor *,		destination,
+	HTLinkType *,		type)
+{
+    if (!(child && destination))
+	return(NO);  /* Can't link to/from non-existing anchor */
+
+    CTRACE((tfp, "Linking child %p to anchor %p\n", child, destination));
+    if (child->dest) {
+	CTRACE((tfp, "*** child anchor already has destination, exiting!\n"));
+	return(NO);
+    }
+
+    child->dest = destination;
+    child->type = type;
+
+    if (child->parent != destination->parent)
+	/* link only foreign children */
+	HTList_linkObject(&destination->parent->sources, child, &child->_add_sources);
+
+    return(YES);  /* Success */
+}
+
+
 /*	Delete an anchor and possibly related things (auto garbage collection)
 **	--------------------------------------------
 **
 **	The anchor is only deleted if the corresponding document is not loaded.
-**	All outgoing links from parent and children are deleted, and this anchor
-**	is removed from the sources list of all its targets.
+**	All outgoing links from children are deleted, and children are
+**	removed from the sources lists of theirs targets.
 **	We also try to delete the targets whose documents are not loaded.
-**	If this anchor's source list is empty, we delete it and its children.
+**	If this anchor's sources list is empty, we delete it and its children.
 */
+
+/*
+ *	Recursively try to delete destination anchor of this child.
+ *	In any event, this will tell destination anchor that we
+ *	no longer consider it a destination.
+ */
 PRIVATE void deleteLinks ARGS1(
-	HTAnchor *,	me)
+	HTChildAnchor *,	me)
 {
     /*
-     *	Memory leaks fixed.
-     *	05-27-94 Lynx 2-3-1 Garrett Arch Blythe
-     */
-
-    /*
-     *	Anchor is NULL, do nothing.
+     *	Unregister me with our destination anchor's parent.
      */
-    if (!me) {
-	return;
-    }
-
-    /*
-     *	Unregister me with our mainLink destination anchor's parent.
-     */
-    if (me->mainLink.dest) {
-	HTParentAnchor *parent = me->mainLink.dest->parent;
+    if (me->dest) {
+	HTParentAnchor0 *parent = me->dest->parent;
 
 	/*
-	 *  Set the mainLink pointer to zero NOW.  If we don't,
-	 *  and we get somehow called recursively again for this
-	 *  same old me during the HTAnchor_delete below, weird
-	 *  things can occasionally happen. - kw
+	 *  Start.  Set the dest pointer to zero.
 	 */
-	 me->mainLink.dest = NULL;
+	 me->dest = NULL;
 
 	/*
 	 *  Remove me from the parent's sources so that the
-	 *  parent knows one less anchor is it's dest.
+	 *  parent knows one less anchor is its dest.
 	 */
-	if (!HTList_isEmpty(parent->sources)) {
+	if ((me->parent != parent) && !HTList_isEmpty(&parent->sources)) {
 	    /*
 	     *	Really should only need to deregister once.
 	     */
-	    HTList_removeObject(parent->sources, (void *)me);
+	    HTList_unlinkObject(&parent->sources, (void *)me);
 	}
 
 	/*
+	 *  Recursive call.
 	 *  Test here to avoid calling overhead.
-	 *  If the parent has no loaded document, then we should
-	 *  tell it to attempt to delete itself.
-	 *  Don't do this jazz if the anchor passed in is the same
-	 *  as the anchor to delete.
-	 *  Also, don't do this if the destination parent is our
-	 *  parent.
+	 *  Don't delete if document is loaded or being loaded.
 	 */
-	if (!parent->document &&
-	    parent != (HTParentAnchor *)me &&
-	    me->parent != parent) {
+	if ((me->parent != parent) && !parent->underway &&
+	    (!parent->info || !parent->info->document)) {
 	    HTAnchor_delete(parent);
 	}
 
 	/*
-	 *  At this point, we haven't a mainLink.  Set it to be
+	 *  At this point, we haven't a destination.  Set it to be
 	 *  so.
 	 *  Leave the HTAtom pointed to by type up to other code to
 	 *  handle (reusable, near static).
 	 */
-	me->mainLink.type = NULL;
-    }
-
-    /*
-     *	Check for extra destinations in our links list.
-     */
-    if (!HTList_isEmpty(me->links)) {
-	HTLink *target;
-	HTParentAnchor *parent;
-
-	/*
-	 *  Take out our extra non mainLinks one by one, calling
-	 *  their parents to know that they are no longer
-	 *  the destination of me's anchor.
-	 */
-	while ((target = (HTLink *)HTList_removeLastObject(me->links)) != 0) {
-	    parent = target->dest->parent;
-	    if (!HTList_isEmpty(parent->sources)) {
-		/*
-		 *  Only need to tell destination parent
-		 *  anchor once.
-		 */
-		HTList_removeObject(parent->sources, (void *)me);
-	    }
-
-	    /*
-	     *	Avoid calling overhead.
-	     *	If the parent hasn't a loaded document, then
-	     *	   we will attempt to have the parent
-	     *	   delete itself.
-	     *	Don't call twice if this is the same anchor
-	     *	   that we are trying to delete.
-	     *	Also, don't do this if we are trying to delete
-	     *	   our parent.
-	     */
-	    if (!parent->document &&
-		(HTParentAnchor *)me != parent &&
-		me->parent != parent) {
-		HTAnchor_delete(parent);
-	    }
-	    /*
-	     *	The link structure has to be deleted, too!
-	     *	That was missing, but this code probably never
-	     *	got exercised by Lynx.	- KW
-	     */
-	    FREE(target);
-	}
-
-	/*
-	 *  At this point, me no longer has any destination in
-	 *  the links list.  Get rid of it.
-	 */
-	if (me->links) {
-	    HTList_delete(me->links);
-	    me->links = NULL;
-	}
-    }
-
-    /*
-     *	Catch in case links list exists but nothing in it.
-     */
-    if (me->links) {
-	HTList_delete(me->links);
-	me->links = NULL;
+	me->type = NULL;
     }
 }
 
-#ifdef SOURCE_CACHE
-PUBLIC void HTAnchor_clearSourceCache ARGS1(
-	HTParentAnchor *,	me)
-{
-    /*
-     * Clean up the source cache, if any.
-     */
-    if (me->source_cache_file) {
-	CTRACE((tfp, "SourceCache: Removing file %s\n",
-	       me->source_cache_file));
-	LYRemoveTemp(me->source_cache_file);
-	FREE(me->source_cache_file);
-    }
-    if (me->source_cache_chunk) {
-	CTRACE((tfp, "SourceCache: Removing memory chunk %p\n",
-	       (void *)me->source_cache_chunk));
-	HTChunkFree(me->source_cache_chunk);
-	me->source_cache_chunk = NULL;
-    }
-}
-#endif /* SOURCE_CACHE */
+
+PRIVATE void HTParentAnchor_free PARAMS((
+	HTParentAnchor *	me));
 
 PUBLIC BOOL HTAnchor_delete ARGS1(
-	HTParentAnchor *,	me)
+	HTParentAnchor0 *,	me)
 {
     /*
      *	Memory leaks fixed.
      * 05-27-94 Lynx 2-3-1 Garrett Arch Blythe
      */
-    HTList *cur;
+    HTBTElement *ele;
     HTChildAnchor *child;
 
     /*
@@ -640,44 +621,39 @@ PUBLIC BOOL HTAnchor_delete ARGS1(
     /*
      *	Don't delete if document is loaded or being loaded.
      */
-    if (me->document || me->underway) {
+    if (me->underway || (me->info && me->info->document)) {
 	return(NO);
     }
 
     /*
      *  Mark ourselves busy, so that recursive calls of this function
-     *  on this HTParentAnchor will not free it from under our feet. - kw
+     *  on this HTParentAnchor0 will not free it from under our feet. - kw
      */
     me->underway = TRUE;
 
-    /*
-     *	Recursively try to delete destination anchors of this parent.
-     *	In any event, this will tell all destination anchors that we
-     *	no longer consider them a destination.
-     */
-    deleteLinks((HTAnchor *)me);
-
-    /*
-     *	There are still incoming links to this one (we are the
-     *	destination of another anchor).
-     *	Don't actually delete this anchor, but children are OK to
-     *	delete their links.
-     */
-    if (!HTList_isEmpty(me->sources)) {
+    {
 	/*
-	 *  Delete all outgoing links from children, do not
-	 *  delete the children, though.
+	 *  Delete all outgoing links from named children.
+	 *  Do not delete named children itself (may have incoming links).
 	 */
-	if (!HTList_isEmpty(me->children)) {
-	    cur = me->children;
-	    while ((child = (HTChildAnchor *)HTList_nextObject(cur)) != 0) {
-		if (child != NULL) {
-		    deleteLinks((HTAnchor *)child);
-		}
+	if (me->children) {
+	    ele = HTBTree_next(me->children, NULL);
+	    while (ele != NULL) {
+		child = (HTChildAnchor *)HTBTree_object(ele);
+		if (child->dest)
+		    deleteLinks(child);
+		ele = HTBTree_next(me->children, ele);
 	    }
 	}
-	me->underway = FALSE;
+    }
+    me->underway = FALSE;
+
 
+    /*
+     * There are still incoming links to this one (we are the
+     * destination of another anchor).
+     */
+    if (!HTList_isEmpty(&me->sources)) {
 	/*
 	 *  Can't delete parent, still have sources.
 	 */
@@ -685,39 +661,88 @@ PUBLIC BOOL HTAnchor_delete ARGS1(
     }
 
     /*
-     *	No more incoming links : kill everything
-     *	First, recursively delete children and their links.
+     *	No more incoming and outgoing links : kill everything
+     *	First, delete named children.
      */
-    if (!HTList_isEmpty(me->children)) {
-	while ((child = (HTChildAnchor *)HTList_removeLastObject(
-							me->children)) != 0) {
-	    if (child) {
-		deleteLinks((HTAnchor *)child);
-		if (child->tag) {
-		    FREE(child->tag);
-		}
-		FREE(child);
-	    }
+    if (me->children) {
+	ele = HTBTree_next(me->children, NULL);
+	while (ele != NULL) {
+	    child = (HTChildAnchor *)HTBTree_object(ele);
+	    FREE(child->tag);
+	    FREE(child);
+	    ele = HTBTree_next(me->children, ele);
 	}
+	HTBTree_free(me->children);
     }
-    me->underway = FALSE;
 
     /*
-     *	Delete our empty list of children.
+     *  Delete the ParentAnchor, if any. (Document was already deleted).
      */
-    if (me->children) {
-	HTList_delete(me->children);
-	me->children = NULL;
+    if (me->info) {
+	HTParentAnchor_free(me->info);
+	FREE(me->info);
+    }
+
+    /*
+     *	Remove ourselves from the hash table's list.
+     */
+    HTList_unlinkObject(&(adult_table[me->adult_hash]), (void *)me);
+
+    /*
+     *	Free the address.
+     */
+    FREE(me->address);
+
+    /*
+     *	Finally, kill the parent anchor passed in.
+     */
+    FREE(me);
+
+    return(YES);
+}
+
+/*
+ *  Unnamed children (children_notag) have no sence without HText -
+ *  delete them and their links if we are about to free HText.
+ *  Document currently exists. Called within HText_free().
+ */
+PUBLIC void HTAnchor_delete_links ARGS1(
+	HTParentAnchor *,	me)
+{
+    HTList *cur;
+    HTChildAnchor *child;
+
+    /*
+     *	Do nothing if nothing to do.
+     */
+    if (!me || !me->document) {
+	return;
     }
 
     /*
-     * Delete our empty list of sources.
+     *  Mark ourselves busy, so that recursive calls
+     *  on this HTParentAnchor0 will not free it from under our feet. - kw
      */
-    if (me->sources) {
-	HTList_delete(me->sources);
-	me->sources = NULL;
+    me->parent->underway = TRUE;
+
+    /*
+     *  Delete all outgoing links from unnamed children.
+     */
+    if (!HTList_isEmpty(&me->children_notag)) {
+	cur = &me->children_notag;
+	while ((child =
+		(HTChildAnchor *)HTList_unlinkLastObject(cur)) != 0) {
+	    deleteLinks(child);
+	    /* child allocated in HText pool, HText_free() will free it later*/
+	}
     }
+    me->parent->underway = FALSE;
+}
+
 
+PRIVATE void HTParentAnchor_free ARGS1(
+	HTParentAnchor *,	me)
+{
     /*
      *	Delete the methods list.
      */
@@ -738,13 +763,13 @@ PUBLIC BOOL HTAnchor_delete ARGS1(
     FREE(me->isIndexPrompt);
     FREE(me->title);
     FREE(me->physical);
-    FREE(me->post_data);
+    BStrFree(me->post_data);
     FREE(me->post_content_type);
     FREE(me->bookmark);
     FREE(me->owner);
     FREE(me->RevTitle);
     FREE(me->citehost);
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     HTAnchor_clearSourceCache(me);
 #endif
     if (me->FileCache) {
@@ -768,6 +793,7 @@ PUBLIC BOOL HTAnchor_delete ARGS1(
     FREE(me->subject);
     FREE(me->date);
     FREE(me->expires);
+
     FREE(me->last_modified);
     FREE(me->ETag);
     FREE(me->server);
@@ -776,56 +802,37 @@ PUBLIC BOOL HTAnchor_delete ARGS1(
 #endif
 
     /*
-     *	Remove ourselves from the hash table's list.
-     */
-    if (adult_table) {
-	unsigned short usi_hash = (unsigned short) HASH_FUNCTION(me->address);
-
-	if (adult_table[usi_hash])  {
-	    HTList_removeObject(adult_table[usi_hash], (void *)me);
-	}
-    }
-
-    /*
      *	Original code wanted a way to clean out the HTFormat if no
      *	longer needed (ref count?).  I'll leave it alone since
      *	those HTAtom objects are a little harder to know where
      *	they are being referenced all at one time. (near static)
      */
 
-    /*
-     *	Free the address.
-     */
-    FREE(me->address);
-
-    FREE (me->UCStages);
+    FREE(me->UCStages);
     ImageMapList_free(me->imaps);
-
-
-    /*
-     *	Finally, kill the parent anchor passed in.
-     */
-    FREE(me);
-
-    return(YES);
 }
 
-
-/*		Move an anchor to the head of the list of its siblings
-**		------------------------------------------------------
-**
-**	This is to ensure that an anchor which might have already existed
-**	is put in the correct order as we load the document.
-*/
-PUBLIC void HTAnchor_makeLastChild ARGS1(
-	HTChildAnchor *,	me)
+#ifdef USE_SOURCE_CACHE
+PUBLIC void HTAnchor_clearSourceCache ARGS1(
+	HTParentAnchor *,	me)
 {
-    if (me->parent != (HTParentAnchor *)me) {  /* Make sure it's a child */
-	HTList * siblings = me->parent->children;
-	HTList_removeObject (siblings, me);
-	HTList_addObject (siblings, me);
+    /*
+     * Clean up the source cache, if any.
+     */
+    if (me->source_cache_file) {
+	CTRACE((tfp, "SourceCache: Removing file %s\n",
+	       me->source_cache_file));
+	LYRemoveTemp(me->source_cache_file);
+	FREE(me->source_cache_file);
+    }
+    if (me->source_cache_chunk) {
+	CTRACE((tfp, "SourceCache: Removing memory chunk %p\n",
+	       (void *)me->source_cache_chunk));
+	HTChunkFree(me->source_cache_chunk);
+	me->source_cache_chunk = NULL;
     }
 }
+#endif /* USE_SOURCE_CACHE */
 
 /*	Data access functions
 **	---------------------
@@ -833,7 +840,14 @@ PUBLIC void HTAnchor_makeLastChild ARGS1(
 PUBLIC HTParentAnchor * HTAnchor_parent ARGS1(
 	HTAnchor *,	me)
 {
-    return( me ? me->parent : NULL);
+    if (!me)
+	return NULL;
+
+    if (me->parent->info)
+	return me->parent->info;
+
+    /* else: create a new structure */
+    return HTParentAnchor_new(me->parent);
 }
 
 PUBLIC void HTAnchor_setDocument ARGS2(
@@ -857,7 +871,8 @@ PUBLIC char * HTAnchor_address ARGS1(
     char *addr = NULL;
 
     if (me) {
-	if (((HTParentAnchor *)me == me->parent) ||
+	if (((HTParentAnchor0 *)me == me->parent) ||
+	    ((HTParentAnchor *)me == me->parent->info) ||
 	    !((HTChildAnchor *)me)->tag) {  /* it's an adult or no tag */
 	    StrAllocCopy(addr, me->parent->address);
 	} else {  /* it's a named child */
@@ -884,7 +899,7 @@ PUBLIC HTFormat HTAnchor_format ARGS1(
 
 PUBLIC void HTAnchor_setIndex ARGS2(
 	HTParentAnchor *,	me,
-	char *,			address)
+	CONST char *,		address)
 {
     if (me) {
 	me->isIndex = YES;
@@ -894,7 +909,7 @@ PUBLIC void HTAnchor_setIndex ARGS2(
 
 PUBLIC void HTAnchor_setPrompt ARGS2(
 	HTParentAnchor *,	me,
-	char *,			prompt)
+	CONST char *,		prompt)
 {
     if (me) {
 	StrAllocCopy(me->isIndexPrompt, prompt);
@@ -913,13 +928,7 @@ PUBLIC BOOL HTAnchor_isIndex ARGS1(
 PUBLIC BOOL HTAnchor_isISMAPScript ARGS1(
 	HTAnchor *,	me)
 {
-    return( me ? me->parent->isISMAPScript : NO);
-}
-
-PUBLIC BOOL HTAnchor_hasChildren ARGS1(
-	HTParentAnchor *,	me)
-{
-    return (BOOL) ( me ? ! HTList_isEmpty(me->children) : NO);
+    return( (me && me->parent->info) ? me->parent->info->isISMAPScript : NO);
 }
 
 #if defined(USE_COLOR_STYLE)
@@ -1185,89 +1194,22 @@ PUBLIC BOOL HTAnchor_setSubject ARGS2(
     return TRUE;
 }
 
-/*	Link me Anchor to another given one
-**	-------------------------------------
-*/
-PUBLIC BOOL HTAnchor_link ARGS3(
-	HTAnchor *,	source,
-	HTAnchor *,	destination,
-	HTLinkType *,	type)
-{
-    if (!(source && destination))
-	return(NO);  /* Can't link to/from non-existing anchor */
-    CTRACE((tfp, "Linking anchor %p to anchor %p\n", source, destination));
-    if (!source->mainLink.dest) {
-	source->mainLink.dest = destination;
-	source->mainLink.type = type;
-    } else {
-	HTLink * newLink = typecalloc(HTLink);
-	if (newLink == NULL)
-	    outofmem(__FILE__, "HTAnchor_link");
-	newLink->dest = destination;
-	newLink->type = type;
-	if (!source->links)
-	    source->links = HTList_new();
-	HTList_addObject (source->links, newLink);
-    }
-    if (!destination->parent->sources)
-	destination->parent->sources = HTList_new();
-    HTList_addObject (destination->parent->sources, source);
-    return(YES);  /* Success */
-}
-
-
 /*	Manipulation of links
 **	---------------------
 */
-PUBLIC HTAnchor * HTAnchor_followMainLink ARGS1(
-	HTAnchor *,	me)
+PUBLIC HTAnchor * HTAnchor_followLink ARGS1(
+	HTChildAnchor *,	me)
 {
-    return( me->mainLink.dest);
+    return( me->dest);
 }
 
 PUBLIC HTAnchor * HTAnchor_followTypedLink ARGS2(
-	HTAnchor *,	me,
-	HTLinkType *,	type)
-{
-    if (me->mainLink.type == type)
-	return( me->mainLink.dest);
-    if (me->links) {
-	HTList *links = me->links;
-	HTLink *the_link;
-	while (NULL != (the_link=(HTLink *)HTList_nextObject(links))) {
-	    if (the_link->type == type) {
-		return( the_link->dest);
-	    }
-	}
-    }
-    return(NULL);  /* No link of me type */
-}
-
-
-/*	Make main link
-*/
-PUBLIC BOOL HTAnchor_makeMainLink ARGS2(
-	HTAnchor *,	me,
-	HTLink *,	movingLink)
+	HTChildAnchor *,	me,
+	HTLinkType *,		type)
 {
-    /* Check that everything's OK */
-    if (!(me && HTList_removeObject (me->links, movingLink))) {
-	return(NO);  /* link not found or NULL anchor */
-    } else {
-	/* First push current main link onto top of links list */
-	HTLink *newLink = typecalloc(HTLink);
-	if (newLink == NULL)
-	    outofmem(__FILE__, "HTAnchor_makeMainLink");
-	memcpy((void *)newLink,
-	       (CONST char *)&me->mainLink, sizeof (HTLink));
-	HTList_addObject (me->links, newLink);
-
-	/* Now make movingLink the new main link, and free it */
-	memcpy((void *)&me->mainLink,
-	       (CONST void *)movingLink, sizeof (HTLink));
-	FREE(movingLink);
-	return(YES);
-    }
+    if (me->type == type)
+	return( me->dest);
+    return(NULL);  /* No link of me type */
 }
 
 
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAnchor.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAnchor.h
index 89a7f88ff5e..3467f6121b3 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAnchor.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAnchor.h
@@ -15,6 +15,7 @@
 /* Version 1 of 24-Oct-1991 (JFG), written in C, browser-independent */
 
 #include <HTList.h>
+#include <HTBTree.h>
 #include <HTChunk.h>
 #include <HTAtom.h>
 #include <UCDefs.h>
@@ -26,37 +27,50 @@
 typedef struct _HyperDoc HyperDoc;  /* Ready for forward references */
 typedef struct _HTAnchor HTAnchor;
 typedef struct _HTParentAnchor HTParentAnchor;
+typedef struct _HTParentAnchor0 HTParentAnchor0;
 
 /*	After definition of HTFormat: */
 #include <HTFormat.h>
 
-typedef HTAtom HTLinkType;
 
-typedef struct {
-  HTAnchor *	dest;		/* The anchor to which this leads */
-  HTLinkType *	type;		/* Semantics of this link */
-} HTLink;
-
-struct _HTAnchor {		/* Generic anchor : just links */
-  HTLink	mainLink;	/* Main (or default) destination of this */
-  HTList *	links;		/* List of extra links from this, if any */
-  /* We separate the first link from the others to avoid too many small mallocs
-     involved by a list creation.  Most anchors only point to one place. */
-  HTParentAnchor * parent;	/* Parent of this anchor (self for adults) */
+struct _HTAnchor {		/* Generic anchor */
+  HTParentAnchor0 * parent;	/* Parent of this anchor (self for adults) */
+};
+
+struct _HTParentAnchor0 {	/* One for adult_table,
+				 * generally not used outside HTAnchor.c */
+  /* Common part from the generic anchor structure */
+  HTParentAnchor0 * parent;	/* (self) */
+
+  /* ParentAnchor0-specific information */
+  char		  * address;	/* Absolute address of this node */
+  HTParentAnchor  * info;	/* additional info, allocated on demand */
+
+  HTBTree *	children;	/* Subanchors <a name="tag">, sorted by tag */
+  HTList	sources;	/* List of anchors pointing to this, if any */
+
+  HTList	_add_adult;	/* - just a memory for list entry:) */
+  short		adult_hash;	/* adult list number */
+  BOOL		underway;	/* Document about to be attached to it */
 };
 
+/*
+ *  Separated from the above to save memory:  allocated on demand,
+ *  it is nearly 1:1 to HText (well, sometimes without HText...),
+ *  available for SGML, HTML, and HText stages.
+ *  [being precise, we currently allocate it before HTLoadDocument(),
+ *  in HTAnchor_findAddress() and HTAnchor_parent()].
+ */
 struct _HTParentAnchor {
   /* Common part from the generic anchor structure */
-  HTLink	mainLink;	/* Main (or default) destination of this */
-  HTList *	links;		/* List of extra links from this, if any */
-  HTParentAnchor * parent;	/* Parent of this anchor (self) */
+  HTParentAnchor0 * parent;	/* Parent of this anchor */
 
   /* ParentAnchor-specific information */
-  HTList *	children;	/* Subanchors of this, if any */
-  HTList *	sources;	/* List of anchors pointing to this, if any */
-  HyperDoc *	document;	/* The document within which this is an anchor */
-  char *	address;	/* Absolute address of this node */
-  char *	post_data;	/* Posting data */
+  HTList	children_notag;	/* Subanchors <a href=...>, tag is NULL */
+  HyperDoc *	document;	/* The document within which this is an anchor*/
+
+  char *	address;	/* parent->address, a pointer */
+  bstring *	post_data;	/* Posting data */
   char *	post_content_type;  /* Type of post data */
   char *	bookmark;	/* Bookmark filename */
   HTFormat	format;		/* Pointer to node format descriptor */
@@ -75,11 +89,10 @@ struct _HTParentAnchor {
   HTList*	methods;	/* Methods available as HTAtoms */
   void *	protocol;	/* Protocol object */
   char *	physical;	/* Physical address */
-  BOOL		underway;	/* Document about to be attached to it */
   BOOL		isISMAPScript;	/* Script for clickable image map */
   BOOL		isHEAD;		/* Document is headers from a HEAD request */
   BOOL		safe;			/* Safe */
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
   char *	source_cache_file;
   HTChunk *	source_cache_chunk;
 #endif
@@ -87,6 +100,7 @@ struct _HTParentAnchor {
   char *	SugFname;	/* Suggested filename */
   char *	cache_control;	/* Cache-Control */
   BOOL		no_cache;	/* Cache-Control, Pragma or META "no-cache"? */
+  BOOL		inBASE;		/* duplicated from HTStructured (HTML.c/h) */
   char *	content_type;		/* Content-Type */
   char *	content_language;	/* Content-Language */
   char *	content_encoding;	/* Compression algorithm */
@@ -106,14 +120,20 @@ struct _HTParentAnchor {
   HTList *	imaps;			/* client side image maps */
 };
 
+typedef HTAtom HTLinkType;
+
 typedef struct {
   /* Common part from the generic anchor structure */
-  HTLink	mainLink;	/* Main (or default) destination of this */
-  HTList *	links;		/* List of extra links from this, if any */
-  HTParentAnchor * parent;	/* Parent of this anchor */
+  HTParentAnchor0 * parent;	/* Parent of this anchor */
 
   /* ChildAnchor-specific information */
-  char *	tag;		/* Address of this anchor relative to parent */
+  char *	tag;		/* #fragment,  relative to the parent */
+
+  HTAnchor *	dest;		/* The anchor to which this leads */
+  HTLinkType *	type;		/* Semantics of this link */
+
+  HTList	_add_children_notag;	/* - just a memory for list entry:) */
+  HTList	_add_sources;		/* - just a memory for list entry:) */
 } HTChildAnchor;
 
 /*
@@ -121,29 +141,16 @@ typedef struct {
 **  needed information including posting data and post content type.
 */
 typedef struct _DocAddress {
-    char * address;
-    char * post_data;
-    char * post_content_type;
-    char * bookmark;
-    BOOL   isHEAD;
-    BOOL   safe;
+    char *	address;
+    bstring *	post_data;
+    char *	post_content_type;
+    char *	bookmark;
+    BOOL	isHEAD;
+    BOOL	safe;
 } DocAddress;
 
-/* "internal" means "within the same document, with certainty".
-   It includes a space so it cannot conflict with any (valid) "TYPE"
-   attributes on A elements. [According to which DTD, anyway??] - kw */
-
-#define LINK_INTERNAL HTAtom_for("internal link")
-
-/*	Create new or find old sub-anchor
-**	---------------------------------
-**
-**	This one is for a new anchor being edited into an existing
-**	document.  The parent anchor must already exist.
-*/
-extern HTChildAnchor * HTAnchor_findChild PARAMS((
-	HTParentAnchor *	parent,
-	CONST char *		tag));
+/* "internal" means "within the same document, with certainty". */
+extern HTLinkType * HTInternalLink;
 
 /*	Create or find a child anchor with a possible link
 **	--------------------------------------------------
@@ -158,15 +165,15 @@ extern HTChildAnchor * HTAnchor_findChildAndLink PARAMS((
 	CONST char * href,		/* May be "" or 0 */
 	HTLinkType * ltype));		/* May be 0 */
 
-/*	Create new or find old named anchor
-**	-----------------------------------
+/*	Create new or find old parent anchor
+**	------------------------------------
 **
 **	This one is for a reference which is found in a document, and might
 **	not be already loaded.
 **	Note: You are not guaranteed a new anchor -- you might get an old one,
 **	like with fonts.
 */
-extern HTAnchor * HTAnchor_findAddress PARAMS((
+extern HTParentAnchor * HTAnchor_findAddress PARAMS((
 	CONST DocAddress *	address));
 
 /*	Create new or find old named anchor - simple form
@@ -175,35 +182,34 @@ extern HTAnchor * HTAnchor_findAddress PARAMS((
 **	Like the previous one, but simpler to use for simple cases.
 **	No post data etc. can be supplied. - kw
 */
-extern HTAnchor * HTAnchor_findSimpleAddress PARAMS((
+extern HTParentAnchor * HTAnchor_findSimpleAddress PARAMS((
 	CONST char *	url));
 
 /*	Delete an anchor and possibly related things (auto garbage collection)
 **	--------------------------------------------
 **
 **	The anchor is only deleted if the corresponding document is not loaded.
-**	All outgoing links from parent and children are deleted, and this anchor
-**	is removed from the sources list of all its targets.
+**	All outgoing links from children are deleted, and children are
+**	removed from the sources lists of their targets.
 **	We also try to delete the targets whose documents are not loaded.
-**	If this anchor's source list is empty, we delete it and its children.
+**	If this anchor's sources list is empty, we delete it and its children.
 */
 extern BOOL HTAnchor_delete PARAMS((
+	HTParentAnchor0 *	me));
+
+/*
+ *  Unnamed children (children_notag) have no sense without HText -
+ *  delete them and their links if we are about to free HText.
+ *  Document currently exists.  Called within HText_free().
+ */
+extern void HTAnchor_delete_links PARAMS((
 	HTParentAnchor *	me));
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 extern void HTAnchor_clearSourceCache PARAMS((
 	HTParentAnchor *	me));
 #endif
 
-/*		Move an anchor to the head of the list of its siblings
-**		------------------------------------------------------
-**
-**	This is to ensure that an anchor which might have already existed
-**	is put in the correct order as we load the document.
-*/
-extern void HTAnchor_makeLastChild PARAMS((
-	HTChildAnchor *		me));
-
 /*	Data access functions
 **	---------------------
 */
@@ -232,11 +238,11 @@ extern HTFormat HTAnchor_format PARAMS((
 
 extern void HTAnchor_setIndex PARAMS((
 	HTParentAnchor *	me,
-	char *		address));
+	CONST char *		address));
 
 extern void HTAnchor_setPrompt PARAMS((
 	HTParentAnchor *	me,
-	char *			prompt));
+	CONST char *		prompt));
 
 extern BOOL HTAnchor_isIndex PARAMS((
 	HTParentAnchor *	me));
@@ -244,9 +250,6 @@ extern BOOL HTAnchor_isIndex PARAMS((
 extern BOOL HTAnchor_isISMAPScript PARAMS((
 	HTAnchor *		me));
 
-extern BOOL HTAnchor_hasChildren PARAMS((
-	HTParentAnchor *	me));
-
 #if defined(USE_COLOR_STYLE)
 extern CONST char * HTAnchor_style PARAMS((
 	HTParentAnchor *	me));
@@ -372,28 +375,16 @@ extern BOOL HTAnchor_setSubject PARAMS((
 	HTParentAnchor *	me,
 	CONST char *		subject));
 
-/*	Link this Anchor to another given one
-**	-------------------------------------
-*/
-extern BOOL HTAnchor_link PARAMS((
-	HTAnchor *		source,
-	HTAnchor *		destination,
-	HTLinkType *		type));
-
 /*	Manipulation of links
 **	---------------------
 */
-extern HTAnchor * HTAnchor_followMainLink PARAMS((
-	HTAnchor *		me));
+extern HTAnchor * HTAnchor_followLink PARAMS((
+	HTChildAnchor *		me));
 
 extern HTAnchor * HTAnchor_followTypedLink PARAMS((
-	HTAnchor *		me,
+	HTChildAnchor *		me,
 	HTLinkType *		type));
 
-extern BOOL HTAnchor_makeMainLink PARAMS((
-	HTAnchor *		me,
-	HTLink *		movingLink));
-
 /*	Read and write methods
 **	----------------------
 */
@@ -455,7 +446,3 @@ extern LYUCcharset * HTAnchor_copyUCInfoStage PARAMS((
 extern void ImageMapList_free PARAMS((HTList * list));
 
 #endif /* HTANCHOR_H */
-
-/*
-
-    */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAssoc.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAssoc.h
index b08486dd0b7..d45339d90db 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAssoc.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAssoc.h
@@ -28,6 +28,3 @@ PUBLIC char *HTAssocList_lookup PARAMS((HTAssocList *   alist,
                                         CONST char *    name));
 
 #endif /* not HTASSOC_H */
-/*
-
-   End of file HTAssoc.h.  */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAtom.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAtom.c
index cb5fc7c4471..b0b9273bd1f 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAtom.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAtom.c
@@ -50,7 +50,7 @@ PUBLIC HTAtom * HTAtom_for ARGS1(CONST char *, string)
      *  05-29-94 Lynx 2-3-1 Garrett Arch Blythe
      */
     if (!initialised) {
-        int i;
+	int i;
 	for (i = 0; i < HASH_SIZE; i++)
 	    hash_table[i] = (HTAtom *) 0;
 	initialised = YES;
@@ -67,7 +67,7 @@ PUBLIC HTAtom * HTAtom_for ARGS1(CONST char *, string)
     */
     for (a = hash_table[hash]; a; a = a->next) {
 	if (0 == strcasecomp(a->name, string)) {
-    	    /* CTRACE((tfp, "HTAtom: Old atom %p for `%s'\n", a, string)); */
+	    /* CTRACE((tfp, "HTAtom: Old atom %p for `%s'\n", a, string)); */
 	    return a;				/* Found: return it */
 	}
     }
@@ -76,10 +76,10 @@ PUBLIC HTAtom * HTAtom_for ARGS1(CONST char *, string)
     */
     a = (HTAtom *)malloc(sizeof(*a));
     if (a == NULL)
-        outofmem(__FILE__, "HTAtom_for");
+	outofmem(__FILE__, "HTAtom_for");
     a->name = (char *)malloc(strlen(string)+1);
     if (a->name == NULL)
-        outofmem(__FILE__, "HTAtom_for");
+	outofmem(__FILE__, "HTAtom_for");
     strcpy(a->name, string);
     a->next = hash_table[hash];		/* Put onto the head of list */
     hash_table[hash] = a;
@@ -112,7 +112,7 @@ PRIVATE void free_atoms NOARGS
 		 */
 		while (hash_table[i_counter] != NULL)	{
 			/*
-		 	 *	Free off atoms and any members.
+			 *	Free off atoms and any members.
 			 */
 			HTAp_freeme = hash_table[i_counter];
 			hash_table[i_counter] = HTAp_freeme->next;
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAtom.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAtom.h
index e948767d99f..1af962fc268 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAtom.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTAtom.h
@@ -36,6 +36,3 @@ PUBLIC HTList * HTAtom_templateMatches PARAMS((CONST char * templ));
 #define HTAtom_name(a) ((a)->name)
 
 #endif  /* HTATOM_H */
-/*
-
-    */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTBTree.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTBTree.c
index db3b50db510..ca03df51778 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTBTree.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTBTree.c
@@ -20,7 +20,7 @@ PUBLIC HTBTree * HTBTree_new ARGS1(HTComparer, comp)
     ** for it when given a mean to compare things
     */
 {
-    HTBTree * tree = (HTBTree *)malloc(sizeof(HTBTree));
+    HTBTree * tree = typeMalloc(HTBTree);
     if (tree==NULL) outofmem(__FILE__, "HTBTree_new");
 
     tree->compare = comp;
@@ -38,7 +38,7 @@ PRIVATE void HTBTElement_free ARGS1(HTBTElement*, element)
     */
 {
     if (element) {
-        if (element->left != NULL)
+	if (element->left != NULL)
 	    HTBTElement_free(element->left);
 	if (element->right != NULL)
 	    HTBTElement_free(element->right);
@@ -64,7 +64,7 @@ PRIVATE void HTBTElementAndObject_free ARGS1(HTBTElement*, element)
     */
 {
     if (element) {     /* Just in case nothing was in the tree anyway */
-        if (element->left != NULL)
+	if (element->left != NULL)
 	    HTBTElementAndObject_free(element->left);
 	if (element->right != NULL)
 	    HTBTElementAndObject_free(element->right);
@@ -83,6 +83,30 @@ PUBLIC void HTBTreeAndObject_free ARGS1(HTBTree*, tree)
 }
 
 
+PUBLIC void * HTBTree_search ARGS2(
+		   HTBTree*,  tree,
+		   void*,     object)
+    /**********************************************************************
+    ** Returns a pointer to equivalent object in a tree or NULL if none.
+    */
+{
+    HTBTElement * cur = tree->top;
+    int res;
+
+    while (cur != NULL)
+    {
+	res = tree->compare(object, cur->object);
+
+	if (res == 0)
+	    return cur->object;
+	else if (res < 0)
+	    cur = cur->left;
+	else if (res > 0)
+	    cur = cur->right;
+    }
+    return NULL;
+}
+
 
 
 PUBLIC void HTBTree_add ARGS2(
@@ -91,7 +115,7 @@ PUBLIC void HTBTree_add ARGS2(
     /**********************************************************************
     ** This void is the core of HTBTree.c . It will
     **       1/ add a new element to the tree at the right place
-    **          so that the tree remains sorted
+    **		so that the tree remains sorted
     **       2/ balance the tree to be as fast as possible when reading it
     */
 {
@@ -101,27 +125,27 @@ PUBLIC void HTBTree_add ARGS2(
     HTBTElement * father_of_forefather;
     BOOL father_found,top_found;
     int depth,depth2,corrections;
-        /* father_of_element is a pointer to the structure that is the father of the
-        ** new object "object".
-        ** added_element is a pointer to the structure that contains or will contain
-        ** the new object "object".
-        ** father_of_forefather and forefather_of_element are pointers that are used
-        ** to modify the depths of upper elements, when needed.
-        **
-        ** father_found indicates by a value NO when the future father of "object"
-        ** is found.
-        ** top_found indicates by a value NO when, in case of a difference of depths
-        **  < 2, the top of the tree is encountered and forbids any further try to
-        ** balance the tree.
-        ** corrections is an integer used to avoid infinite loops in cases
-        ** such as:
-        **
-        **             3                        3
-        **          4                              4
-        **           5                            5
-        **
-        ** 3 is used here to show that it need not be the top of the tree.
-        */
+	/* father_of_element is a pointer to the structure that is the father of the
+	** new object "object".
+	** added_element is a pointer to the structure that contains or will contain
+	** the new object "object".
+	** father_of_forefather and forefather_of_element are pointers that are used
+	** to modify the depths of upper elements, when needed.
+	**
+	** father_found indicates by a value NO when the future father of "object"
+	** is found.
+	** top_found indicates by a value NO when, in case of a difference of depths
+	**  < 2, the top of the tree is encountered and forbids any further try to
+	** balance the tree.
+	** corrections is an integer used to avoid infinite loops in cases
+	** such as:
+	**
+	**             3                        3
+	**          4                              4
+	**           5                            5
+	**
+	** 3 is used here to show that it need not be the top of the tree.
+	*/
 
     /*
     ** 1/ Adding of the element to the binary tree
@@ -129,124 +153,124 @@ PUBLIC void HTBTree_add ARGS2(
 
     if (tree->top == NULL)
     {
-        tree->top = (HTBTElement *)malloc(sizeof(HTBTElement));
-        if (tree->top == NULL) outofmem(__FILE__, "HTBTree_add");
-        tree->top->up = NULL;
-        tree->top->object = object;
-        tree->top->left = NULL;
-        tree->top->left_depth = 0;
-        tree->top->right = NULL;
-        tree->top->right_depth = 0;
+	tree->top = typeMalloc(HTBTElement);
+	if (tree->top == NULL) outofmem(__FILE__, "HTBTree_add");
+	tree->top->up = NULL;
+	tree->top->object = object;
+	tree->top->left = NULL;
+	tree->top->left_depth = 0;
+	tree->top->right = NULL;
+	tree->top->right_depth = 0;
     }
     else
     {
-        father_found = YES;
-        father_of_element = tree->top;
-        added_element = NULL;
-        father_of_forefather = NULL;
-        forefather_of_element = NULL;
-        while (father_found)
-        {
-            if (tree->compare(object,father_of_element->object)<0)
+	father_found = YES;
+	father_of_element = tree->top;
+	added_element = NULL;
+	father_of_forefather = NULL;
+	forefather_of_element = NULL;
+	while (father_found)
+	{
+	    int res = tree->compare(object,father_of_element->object);
+	    if (res < 0)
 	    {
-                if (father_of_element->left != NULL)
-                    father_of_element = father_of_element->left;
-                else
-	        {
-                    father_found = NO;
-                    father_of_element->left =
-                        (HTBTElement *)malloc(sizeof(HTBTElement));
-                    if (father_of_element->left==NULL)
-                        outofmem(__FILE__, "HTBTree_add");
-                    added_element = father_of_element->left;
-                    added_element->up = father_of_element;
-                    added_element->object = object;
-                    added_element->left = NULL;
-                    added_element->left_depth = 0;
-                    added_element->right = NULL;
-                    added_element->right_depth = 0;
-                }
-   	    }
-            if (tree->compare(object,father_of_element->object)>=0)
-            {
-                if (father_of_element->right != NULL)
-                    father_of_element = father_of_element->right;
-                else
-                {
-                    father_found = NO;
-                    father_of_element->right =
-                        (HTBTElement *)malloc(sizeof(HTBTElement));
-                    if (father_of_element->right==NULL)
-                        outofmem(__FILE__, "HTBTree_add");
-                    added_element = father_of_element->right;
-                    added_element->up = father_of_element;
-                    added_element->object = object;
-                    added_element->left = NULL;
-                    added_element->left_depth = 0;
-                    added_element->right = NULL;
-                    added_element->right_depth = 0;
-    	        }
-            }
+		if (father_of_element->left != NULL)
+		    father_of_element = father_of_element->left;
+		else
+		{
+		    father_found = NO;
+		    father_of_element->left = typeMalloc(HTBTElement);
+		    if (father_of_element->left==NULL)
+			outofmem(__FILE__, "HTBTree_add");
+		    added_element = father_of_element->left;
+		    added_element->up = father_of_element;
+		    added_element->object = object;
+		    added_element->left = NULL;
+		    added_element->left_depth = 0;
+		    added_element->right = NULL;
+		    added_element->right_depth = 0;
+		}
+	    }
+	    else /* res >= 0 */
+	   {
+		if (father_of_element->right != NULL)
+		    father_of_element = father_of_element->right;
+		else
+		{
+		    father_found = NO;
+		    father_of_element->right = typeMalloc(HTBTElement);
+		    if (father_of_element->right==NULL)
+			outofmem(__FILE__, "HTBTree_add");
+		    added_element = father_of_element->right;
+		    added_element->up = father_of_element;
+		    added_element->object = object;
+		    added_element->left = NULL;
+		    added_element->left_depth = 0;
+		    added_element->right = NULL;
+		    added_element->right_depth = 0;
+		}
+	    }
 	}
-            /*
-            ** Changing of all depths that need to be changed
-            */
-        father_of_forefather = father_of_element;
-        forefather_of_element = added_element;
-        do
-        {
-            if (father_of_forefather->left == forefather_of_element)
-            {
-                depth = father_of_forefather->left_depth;
-                father_of_forefather->left_depth = 1
-                            + MAXIMUM(forefather_of_element->right_depth,
-                                  forefather_of_element->left_depth);
-                depth2 = father_of_forefather->left_depth;
-            }
-            else
+
+	/*
+	** Changing of all depths that need to be changed
+	*/
+	father_of_forefather = father_of_element;
+	forefather_of_element = added_element;
+	do
+	{
+	    if (father_of_forefather->left == forefather_of_element)
 	    {
-                depth = father_of_forefather->right_depth;
-                father_of_forefather->right_depth = 1
-                            + MAXIMUM(forefather_of_element->right_depth,
-                                  forefather_of_element->left_depth);
-                depth2 = father_of_forefather->right_depth;
-            }
-            forefather_of_element = father_of_forefather;
-            father_of_forefather = father_of_forefather->up;
-        } while ((depth != depth2) && (father_of_forefather != NULL));
-
-
-
-            /*
-            ** 2/ Balancing the binary tree, if necessary
-            */
-        top_found = YES;
-        corrections = 0;
-        while ((top_found) && (corrections < 7))
-        {
-            if ((abs(father_of_element->left_depth
-                      - father_of_element->right_depth)) < 2)
+		depth = father_of_forefather->left_depth;
+		father_of_forefather->left_depth = 1
+			    + MAXIMUM(forefather_of_element->right_depth,
+				  forefather_of_element->left_depth);
+		depth2 = father_of_forefather->left_depth;
+	    }
+	    else
+	    {
+		depth = father_of_forefather->right_depth;
+		father_of_forefather->right_depth = 1
+			    + MAXIMUM(forefather_of_element->right_depth,
+				  forefather_of_element->left_depth);
+		depth2 = father_of_forefather->right_depth;
+	    }
+	    forefather_of_element = father_of_forefather;
+	    father_of_forefather = father_of_forefather->up;
+	} while ((depth != depth2) && (father_of_forefather != NULL));
+
+
+
+	    /*
+	    ** 2/ Balancing the binary tree, if necessary
+	    */
+	top_found = YES;
+	corrections = 0;
+	while ((top_found) && (corrections < 7))
+	{
+	    if ((abs(father_of_element->left_depth
+		      - father_of_element->right_depth)) < 2)
 	    {
-                if (father_of_element->up != NULL)
-                    father_of_element = father_of_element->up;
-                else top_found = NO;
+		if (father_of_element->up != NULL)
+		    father_of_element = father_of_element->up;
+		else top_found = NO;
 	    }
-            else
- 	    {                /* We start the process of balancing */
-
-                corrections = corrections + 1;
-                    /*
-                    ** corrections is an integer used to avoid infinite
-                    ** loops in cases such as:
-                    **
-                    **             3                        3
-                    **          4                              4
-                    **           5                            5
-                    **
-                    ** 3 is used to show that it need not be the top of the tree
-		    ** But let's avoid these two exceptions anyhow
-		    ** with the two following conditions (4 March 94 - AS)
-                    */
+	    else
+	    {		     /* We start the process of balancing */
+
+		corrections = corrections + 1;
+		   /*
+		   ** corrections is an integer used to avoid infinite
+		   ** loops in cases such as:
+		   **
+		   **             3                        3
+		   **          4                              4
+		   **           5                            5
+		   **
+		   ** 3 is used to show that it need not be the top of the tree
+		   ** But let's avoid these two exceptions anyhow
+		   ** with the two following conditions (4 March 94 - AS)
+		   */
 
 		if ((father_of_element->left == NULL)
 		    && (father_of_element->right->right == NULL)
@@ -261,26 +285,26 @@ PUBLIC void HTBTree_add ARGS2(
 		    corrections = 7;
 
 
-                if (father_of_element->left_depth > father_of_element->right_depth)
-	        {
-                    added_element = father_of_element->left;
-                    father_of_element->left_depth = added_element->right_depth;
-                    added_element->right_depth = 1
-                                    + MAXIMUM(father_of_element->right_depth,
-                                          father_of_element->left_depth);
-                    if (father_of_element->up != NULL)
+		if (father_of_element->left_depth > father_of_element->right_depth)
+		{
+		    added_element = father_of_element->left;
+		    father_of_element->left_depth = added_element->right_depth;
+		    added_element->right_depth = 1
+				    + MAXIMUM(father_of_element->right_depth,
+					  father_of_element->left_depth);
+		    if (father_of_element->up != NULL)
 		    {
 			/* Bug fixed in March 94  -  AS */
 			BOOL first_time;
 
-                        father_of_forefather = father_of_element->up;
-                        forefather_of_element = added_element;
+			father_of_forefather = father_of_element->up;
+			forefather_of_element = added_element;
 			first_time = YES;
-                        do
-                        {
-                            if (father_of_forefather->left
-                                 == forefather_of_element->up)
-                              {
+			do
+			{
+			    if (father_of_forefather->left
+				 == forefather_of_element->up)
+			      {
 				  depth = father_of_forefather->left_depth;
 				  if (first_time)
 				  {
@@ -294,11 +318,11 @@ PUBLIC void HTBTree_add ARGS2(
 					   + MAXIMUM(forefather_of_element->up->left_depth,
 					      forefather_of_element->up->right_depth);
 
-                                depth2 = father_of_forefather->left_depth;
+				depth2 = father_of_forefather->left_depth;
 			    }
-                            else
+			    else
 			    {
-                                depth = father_of_forefather->right_depth;
+				depth = father_of_forefather->right_depth;
 				if (first_time)
 				{
 				    father_of_forefather->right_depth = 1
@@ -310,100 +334,100 @@ PUBLIC void HTBTree_add ARGS2(
 				    father_of_forefather->right_depth = 1
 				      + MAXIMUM(forefather_of_element->up->left_depth,
 					   forefather_of_element->up->right_depth);
-                                depth2 = father_of_forefather->right_depth;
+				depth2 = father_of_forefather->right_depth;
 			    }
-                            forefather_of_element = forefather_of_element->up;
-                            father_of_forefather = father_of_forefather->up;
+			    forefather_of_element = forefather_of_element->up;
+			    father_of_forefather = father_of_forefather->up;
 			} while ((depth != depth2) &&
 				 (father_of_forefather != NULL));
-                        father_of_forefather = father_of_element->up;
-                        if (father_of_forefather->left == father_of_element)
-	                {
-                            /*
-                            **                   3                       3
-                            **               4                       5
-                            ** When tree   5   6        becomes    7    4
-                            **            7 8                          8 6
-                            **
-                            ** 3 is used to show that it may not be the top of the
-                            ** tree.
-                            */
-                            father_of_forefather->left = added_element;
-                            father_of_element->left = added_element->right;
-                            added_element->right = father_of_element;
-                        }
-                        if (father_of_forefather->right == father_of_element)
-		        {
-                            /*
-                            **          3                       3
-                            **               4                       5
-                            ** When tree   5   6        becomes    7    4
-                            **            7 8                          8 6
-                            **
-                            ** 3 is used to show that it may not be the top of the
-                            ** tree
-                            */
-                            father_of_forefather->right = added_element;
-                            father_of_element->left = added_element->right;
-                            added_element->right = father_of_element;
-                        }
-                        added_element->up = father_of_forefather;
+			father_of_forefather = father_of_element->up;
+			if (father_of_forefather->left == father_of_element)
+			{
+			    /*
+			    **                   3                       3
+			    **               4                       5
+			    ** When tree   5   6        becomes    7    4
+			    **            7 8                          8 6
+			    **
+			    ** 3 is used to show that it may not be the top of the
+			    ** tree.
+			    */
+			    father_of_forefather->left = added_element;
+			    father_of_element->left = added_element->right;
+			    added_element->right = father_of_element;
+			}
+			if (father_of_forefather->right == father_of_element)
+			{
+			    /*
+			    **          3                       3
+			    **               4                       5
+			    ** When tree   5   6        becomes    7    4
+			    **            7 8                          8 6
+			    **
+			    ** 3 is used to show that it may not be the top of the
+			    ** tree
+			    */
+			    father_of_forefather->right = added_element;
+			    father_of_element->left = added_element->right;
+			    added_element->right = father_of_element;
+			}
+			added_element->up = father_of_forefather;
 		    }
-                    else
+		    else
 		    {
-                        /*
-                        **
-                        **               1                       2
-                        ** When tree   2   3        becomes    4    1
-                        **            4 5                          5 3
-                        **
-                        ** 1 is used to show that it is the top of the tree
-                        */
-                        added_element->up = NULL;
-                        father_of_element->left = added_element->right;
-                        added_element->right = father_of_element;
+			/*
+			**
+			**               1                       2
+			** When tree   2   3        becomes    4    1
+			**            4 5                          5 3
+			**
+			** 1 is used to show that it is the top of the tree
+			*/
+			added_element->up = NULL;
+			father_of_element->left = added_element->right;
+			added_element->right = father_of_element;
 		    }
-                    father_of_element->up = added_element;
-                    if (father_of_element->left != NULL)
-                        father_of_element->left->up = father_of_element;
-	        }
-                else
-	        {
-                    added_element = father_of_element->right;
-                    father_of_element->right_depth = added_element->left_depth;
-                    added_element->left_depth = 1 +
-                            MAXIMUM(father_of_element->right_depth,
-                                father_of_element->left_depth);
-                    if (father_of_element->up != NULL)
+		    father_of_element->up = added_element;
+		    if (father_of_element->left != NULL)
+			father_of_element->left->up = father_of_element;
+		}
+		else
+		{
+		    added_element = father_of_element->right;
+		    father_of_element->right_depth = added_element->left_depth;
+		    added_element->left_depth = 1 +
+			    MAXIMUM(father_of_element->right_depth,
+				father_of_element->left_depth);
+		    if (father_of_element->up != NULL)
 			/* Bug fixed in March 94  -  AS */
 		    {
 			BOOL first_time;
 
-                        father_of_forefather = father_of_element->up;
-                        forefather_of_element = added_element;
+			father_of_forefather = father_of_element->up;
+			forefather_of_element = added_element;
 			first_time = YES;
-                        do
-                        {
-                            if (father_of_forefather->left
+			do
+			{
+			    if (father_of_forefather->left
 				== forefather_of_element->up)
-                            {
-                                depth = father_of_forefather->left_depth;
-                                if (first_time)
+			    {
+				depth = father_of_forefather->left_depth;
+				if (first_time)
 				{
 				    father_of_forefather->left_depth = 1
 				       + MAXIMUM(forefather_of_element->left_depth,
 					       forefather_of_element->right_depth);
 				    first_time = NO;
 				}
-                                else
+				else
 				    father_of_forefather->left_depth = 1
 				      + MAXIMUM(forefather_of_element->up->left_depth,
-				       	  forefather_of_element->up->right_depth);
+					  forefather_of_element->up->right_depth);
 				depth2 = father_of_forefather->left_depth;
 			    }
-                            else
+			    else
 			    {
-                                depth = father_of_forefather->right_depth;
+				depth = father_of_forefather->right_depth;
 				if (first_time)
 				{
 				    father_of_forefather->right_depth = 1
@@ -415,78 +439,78 @@ PUBLIC void HTBTree_add ARGS2(
 				    father_of_forefather->right_depth = 1
 				      + MAXIMUM(forefather_of_element->up->left_depth,
 					   forefather_of_element->up->right_depth);
-                                depth2 = father_of_forefather->right_depth;
+				depth2 = father_of_forefather->right_depth;
 			    }
-                            father_of_forefather = father_of_forefather->up;
-                            forefather_of_element = forefather_of_element->up;
+			    father_of_forefather = father_of_forefather->up;
+			    forefather_of_element = forefather_of_element->up;
 			} while ((depth != depth2) &&
 				 (father_of_forefather != NULL));
-                        father_of_forefather = father_of_element->up;
-                        if (father_of_forefather->left == father_of_element)
-		        {
-                            /*
-                            **                    3                       3
-                            **               4                       6
-                            ** When tree   5   6        becomes    4    8
-                            **                7 8                 5 7
-                            **
-                            ** 3 is used to show that it may not be the top of the
-                            ** tree.
-                            */
-                            father_of_forefather->left = added_element;
-                            father_of_element->right = added_element->left;
-                            added_element->left = father_of_element;
-                        }
-                        if (father_of_forefather->right == father_of_element)
-		        {
-                            /*
-                            **           3                      3
-                            **               4                       6
-                            ** When tree   5   6        becomes    4    8
-                            **                7 8                 5 7
-                            **
-                            ** 3 is used to show that it may not be the top of the
-                            ** tree
-                            */
-                            father_of_forefather->right = added_element;
-                            father_of_element->right = added_element->left;
-                            added_element->left = father_of_element;
-                        }
-                        added_element->up = father_of_forefather;
+			father_of_forefather = father_of_element->up;
+			if (father_of_forefather->left == father_of_element)
+			{
+			    /*
+			    **                    3                       3
+			    **               4                       6
+			    ** When tree   5   6        becomes    4    8
+			    **                7 8                 5 7
+			    **
+			    ** 3 is used to show that it may not be the top of the
+			    ** tree.
+			    */
+			    father_of_forefather->left = added_element;
+			    father_of_element->right = added_element->left;
+			    added_element->left = father_of_element;
+			}
+			if (father_of_forefather->right == father_of_element)
+			{
+			    /*
+			    **           3                      3
+			    **               4                       6
+			    ** When tree   5   6        becomes    4    8
+			    **                7 8                 5 7
+			    **
+			    ** 3 is used to show that it may not be the top of the
+			    ** tree
+			    */
+			    father_of_forefather->right = added_element;
+			    father_of_element->right = added_element->left;
+			    added_element->left = father_of_element;
+			}
+			added_element->up = father_of_forefather;
 		    }
-                    else
-                    {
-                        /*
-                        **
-                        **               1                       3
-                        ** When tree   2   3        becomes    1    5
-                        **                4 5                 2 4
-                        **
-                        ** 1 is used to show that it is the top of the tree.
-                        */
-                        added_element->up = NULL;
-                        father_of_element->right = added_element->left;
-                        added_element->left = father_of_element;
+		    else
+		    {
+			/*
+			**
+			**               1                       3
+			** When tree   2   3        becomes    1    5
+			**                4 5                 2 4
+			**
+			** 1 is used to show that it is the top of the tree.
+			*/
+			added_element->up = NULL;
+			father_of_element->right = added_element->left;
+			added_element->left = father_of_element;
 		    }
-                    father_of_element->up = added_element;
-                    if (father_of_element->right != NULL)
-		        father_of_element->right->up = father_of_element;
+		    father_of_element->up = added_element;
+		    if (father_of_element->right != NULL)
+			father_of_element->right->up = father_of_element;
 		}
 	    }
-        }
-        while (father_of_element->up != NULL)
+	}
+	while (father_of_element->up != NULL)
 	{
-            father_of_element = father_of_element->up;
-        }
-        tree->top = father_of_element;
+	    father_of_element = father_of_element->up;
+	}
+	tree->top = father_of_element;
     }
 }
 
 
 
 PUBLIC HTBTElement * HTBTree_next ARGS2(
-                               HTBTree*,       tree,
-                               HTBTElement*,   ele)
+			       HTBTree*,       tree,
+			       HTBTElement*,   ele)
     /**************************************************************************
     ** this function returns a pointer to the leftmost element if ele is NULL,
     ** and to the next object to the right otherwise.
@@ -498,30 +522,30 @@ PUBLIC HTBTElement * HTBTree_next ARGS2(
 
     if (ele == NULL)
     {
-        father_of_element = tree->top;
-        if (father_of_element != NULL)
-            while (father_of_element->left != NULL)
-                father_of_element = father_of_element->left;
+	father_of_element = tree->top;
+	if (father_of_element != NULL)
+	    while (father_of_element->left != NULL)
+		father_of_element = father_of_element->left;
     }
     else
     {
-        father_of_element = ele;
-        if (father_of_element->right != NULL)
+	father_of_element = ele;
+	if (father_of_element->right != NULL)
 	{
-            father_of_element = father_of_element->right;
-            while (father_of_element->left != NULL)
-                father_of_element = father_of_element->left;
+	    father_of_element = father_of_element->right;
+	    while (father_of_element->left != NULL)
+		father_of_element = father_of_element->left;
 	}
-        else
+	else
 	{
-            father_of_forefather = father_of_element->up;
-	        while (father_of_forefather &&
+	    father_of_forefather = father_of_element->up;
+		while (father_of_forefather &&
 		       (father_of_forefather->right == father_of_element))
-      	        {
-                    father_of_element = father_of_forefather;
+		{
+		    father_of_element = father_of_forefather;
 		    father_of_forefather = father_of_element->up;
 		}
-            father_of_element = father_of_forefather;
+	    father_of_element = father_of_forefather;
 	}
     }
 #ifdef BTREE_TRACE
@@ -530,22 +554,22 @@ PUBLIC HTBTElement * HTBTree_next ARGS2(
     */
     if (father_of_element != NULL)
     {
-        printf("\nObject = %s\t",(char *)father_of_element->object);
-        if (father_of_element->up != NULL)
-            printf("Objet du pere = %s\n",
+	printf("\nObject = %s\t",(char *)father_of_element->object);
+	if (father_of_element->up != NULL)
+	    printf("Objet du pere = %s\n",
 		   (char *)father_of_element->up->object);
-        else printf("Pas de Pere\n");
-        if (father_of_element->left != NULL)
-            printf("Objet du fils gauche = %s\t",
+	else printf("Pas de Pere\n");
+	if (father_of_element->left != NULL)
+	    printf("Objet du fils gauche = %s\t",
 		   (char *)father_of_element->left->object);
-        else printf("Pas de fils gauche\t");
-        if (father_of_element->right != NULL)
-            printf("Objet du fils droit = %s\n",
+	else printf("Pas de fils gauche\t");
+	if (father_of_element->right != NULL)
+	    printf("Objet du fils droit = %s\n",
 		   (char *)father_of_element->right->object);
-        else printf("Pas de fils droit\n");
-        printf("Profondeur gauche = %d\t",father_of_element->left_depth);
-        printf("Profondeur droite = %d\n",father_of_element->right_depth);
-        printf("      **************\n");
+	else printf("Pas de fils droit\n");
+	printf("Profondeur gauche = %d\t",father_of_element->left_depth);
+	printf("Profondeur droite = %d\n",father_of_element->right_depth);
+	printf("      **************\n");
     }
 #endif
     return father_of_element;
@@ -702,9 +726,9 @@ main ()
     while (next_element != NULL)
     {
 #ifndef BTREE_TRACE
-        printf("The next element is %s\n",next_element->object);
+	printf("The next element is %s\n",next_element->object);
 #endif
-        next_element = HTBTree_next(tree,next_element);
+	next_element = HTBTree_next(tree,next_element);
     }
     HTBTree_free(tree);
 }
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTBTree.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTBTree.h
index d4b2ac08816..cbbfad432af 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTBTree.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTBTree.h
@@ -15,7 +15,7 @@
 #ifndef HTUTILS_H
 #include <HTUtils.h>
 #endif
- 
+
 /*
 
 Data structures
@@ -76,6 +76,16 @@ extern void HTBTree_add PARAMS((HTBTree* tree, void * object));
 
 /*
 
+Search an object in a binary tree
+
+  returns          Pointer to equivalent object in a tree or NULL if none.
+ */
+
+extern void * HTBTree_search PARAMS((HTBTree* tree, void * object));
+
+
+/*
+
 Find user object for element
 
  */
@@ -91,7 +101,7 @@ Find next element in depth-first order
   ele                    if NULL, start with leftmost element. if != 0 give next object to
                          the right.
 
-  returns                Pointer to element ot NULL if none left.
+  returns                Pointer to element or NULL if none left.
 
  */
 extern HTBTElement * HTBTree_next PARAMS((HTBTree* tree, HTBTElement * ele));
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTChunk.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTChunk.c
index 05a5da61999..bc6eefcba34 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTChunk.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTChunk.c
@@ -61,7 +61,7 @@ PUBLIC HTChunk * HTChunkCreate2 ARGS2 (int,grow, size_t, needed)
 	ch->allocated = needed-1 - ((needed-1) % ch->growby)
 	    + ch->growby; /* Round up */
 	CTRACE((tfp, "HTChunkCreate2: requested %d, allocate %d\n",
-	       needed, ch->allocated));
+	       (int) needed, ch->allocated));
 	ch->data = typecallocn(char, ch->allocated);
 	if (!ch->data)
 	    outofmem(__FILE__, "HTChunkCreate2 data");
@@ -91,6 +91,28 @@ PUBLIC void HTChunkFree ARGS1 (HTChunk *,ch)
 }
 
 
+/*	Realloc the chunk
+**	-----------------
+*/
+PUBLIC BOOL HTChunkRealloc ARGS2 (HTChunk *,ch, int,growby)
+{
+    char *data;
+    ch->allocated = ch->allocated + growby;
+
+    data = ch->data ? (char *)realloc(ch->data, ch->allocated)
+			: typecallocn(char, ch->allocated);
+    if (data) {
+	ch->data = data;
+    } else if (ch->failok) {
+	HTChunkClear(ch);	/* allocation failed, clear all data - kw */
+	return FALSE;		/* caller should check ch->allocated - kw */
+    } else {
+	outofmem(__FILE__, "HTChunkRealloc");
+    }
+    return TRUE;
+}
+
+
 /*	Append a character
 **	------------------
 */
@@ -99,18 +121,8 @@ PUBLIC void HTChunkFree ARGS1 (HTChunk *,ch)
 PUBLIC void HTChunkPutc ARGS2 (HTChunk *,ch, char,c)
 {
     if (ch->size >= ch->allocated) {
-	char *data;
-	ch->allocated = ch->allocated + ch->growby;
-	data = ch->data ? (char *)realloc(ch->data, ch->allocated)
-			: typecallocn(char, ch->allocated);
-	if (data) {
-	    ch->data = data;
-	} else if (ch->failok) {
-	    HTChunkClear(ch);	/* allocation failed, clear all data - kw */
-	    return;		/* caller should check ch->allocated - kw */
-	} else {
-	    outofmem(__FILE__, "HTChunkPutc");
-	}
+	if (!HTChunkRealloc(ch, ch->growby))
+	    return;
     }
     ch->data[ch->size++] = c;
 }
@@ -132,22 +144,11 @@ PUBLIC void HTChunkEnsure ARGS2 (HTChunk *,ch, int,needed)
 
 PUBLIC void HTChunkPutb ARGS3 (HTChunk *,ch, CONST char *,b, int,l)
 {
-    int needed = ch->size + l;
     if (l <= 0) return;
-    if (needed > ch->allocated) {
-	char *data;
-	ch->allocated = needed-1 - ((needed-1) % ch->growby)
-	    + ch->growby; /* Round up */
-	data = ch->data ? (char *)realloc(ch->data, ch->allocated)
-			: typecallocn(char, ch->allocated);
-	if (data) {
-	    ch->data = data;
-	} else if (ch->failok) {
-	    HTChunkClear(ch);	/* allocation failed, clear all data - kw */
-	    return;		/* caller should check ch->allocated - kw */
-	} else {
-	    outofmem(__FILE__, "HTChunkPutb");
-	}
+    if (ch->size + l > ch->allocated) {
+	int growby = l - (l % ch->growby) + ch->growby; /* Round up */
+	if (!HTChunkRealloc(ch, growby))
+	    return;
     }
     memcpy(ch->data + ch->size, b, l);
     ch->size += l;
@@ -178,19 +179,9 @@ PUBLIC void HTChunkPutUtf8Char ARGS2(
 	utflen = 0;
 
     if (ch->size + utflen > ch->allocated) {
-	char *data;
 	int growby = (ch->growby >= utflen) ? ch->growby : utflen;
-	ch->allocated = ch->allocated + growby;
-	data = ch->data ? (char *)realloc(ch->data, ch->allocated)
-			: typecallocn(char, ch->allocated);
-	if (data) {
-	    ch->data = data;
-	} else if (ch->failok) {
-	    HTChunkClear(ch);	/* allocation failed, clear all data - kw */
-	    return;		/* caller should check ch->allocated - kw */
-	} else {
-	    outofmem(__FILE__, "HTChunkPutUtf8Char");
-	}
+	if (!HTChunkRealloc(ch, growby))
+	    return;
     }
 
     switch (utflen) {
@@ -249,9 +240,11 @@ PUBLIC void HTChunkTerminate ARGS1 (HTChunk *,ch)
 PUBLIC void HTChunkPuts ARGS2 (HTChunk *,ch, CONST char *,s)
 {
     CONST char * p;
-    for (p=s; *p; p++) {
-	HTChunkPutc(ch, *p);
-	if (ch->allocated == 0)
-	    return;		/* must have been allocation failure - kw */
+    for (p = s; *p; p++) {
+	if (ch->size >= ch->allocated) {
+	    if (!HTChunkRealloc(ch, ch->growby))
+		return;
+	}
+	ch->data[ch->size++] = *p;
     }
 }
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTChunk.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTChunk.h
index a243b2b4edc..4150c1e72a8 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTChunk.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTChunk.h
@@ -13,12 +13,12 @@
 #ifndef HTUTILS_H
 #include <HTUtils.h>
 #endif
- 
+
 #include <UCMap.h>
 
 typedef struct {
 	int	size;		/* In bytes			*/
-	int	growby; 	/* Allocation unit in bytes	*/
+	int	growby;		/* Allocation unit in bytes	*/
 	int	allocated;	/* Current size of *data	*/
 	char *	data;		/* Pointer to malloced area or 0 */
 	int	failok;		/* allowed to fail without exiting program? */
@@ -70,11 +70,11 @@ extern HTChunk * HTChunkCreate2 PARAMS((int growby, size_t needed));
  *
  *   ON ENTRY,
  *
- *   ch 		A valid chunk pointer made by HTChunkCreate()
+ *   ch			A valid chunk pointer made by HTChunkCreate()
  *
  *   ON EXIT,
  *
- *   ch 		is invalid and may not be used.
+ *   ch			is invalid and may not be used.
  *
  */
 
@@ -87,7 +87,7 @@ extern void HTChunkFree PARAMS((HTChunk * ch));
  *
  *   ON ENTRY,
  *
- *   ch 		A valid chunk pointer made by HTChunkCreate()
+ *   ch			A valid chunk pointer made by HTChunkCreate()
  *
  *   ON EXIT,
  *
@@ -100,11 +100,30 @@ extern void HTChunkClear PARAMS((HTChunk * ch));
 
 /*
  *
+ * Realloc a chunk
+ *
+ *   ON ENTRY,
+ *
+ *   ch			A valid chunk pointer made by HTChunkCreate()
+ *
+ *   growby		growby
+ *
+ *   ON EXIT,
+ *
+ *   *ch		Expanded by growby
+ *
+ */
+
+extern BOOL HTChunkRealloc PARAMS((HTChunk * ch, int growby));
+
+
+/*
+ *
  * Ensure a chunk has a certain space in
  *
  *   ON ENTRY,
  *
- *   ch 		A valid chunk pointer made by HTChunkCreate()
+ *   ch			A valid chunk pointer made by HTChunkCreate()
  *
  *   s			The size required
  *
@@ -123,7 +142,7 @@ extern void HTChunkEnsure PARAMS((HTChunk * ch, int s));
  *
  *   ON ENTRY,
  *
- *   ch 		A valid chunk pointer made by HTChunkCreate()
+ *   ch			A valid chunk pointer made by HTChunkCreate()
  *
  *   c			The character to be appended
  *
@@ -143,9 +162,9 @@ extern void HTChunkPutUtf8Char PARAMS((HTChunk * ch, UCode_t code));
  *
  *   ON ENTRY,
  *
- *   ch 		A valid chunk pointer made by HTChunkCreate()
+ *   ch			A valid chunk pointer made by HTChunkCreate()
  *
- *   str		Tpoints to a zero-terminated string to be appended
+ *   str		Points to a zero-terminated string to be appended
  *
  *   ON EXIT,
  *
@@ -167,7 +186,7 @@ extern void HTChunkPuts PARAMS((HTChunk * ch, CONST char *str));
  *
  *   ON ENTRY,
  *
- *   ch 		A valid chunk pointer made by HTChunkCreate()
+ *   ch			A valid chunk pointer made by HTChunkCreate()
  *
  *   ON EXIT,
  *
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTDOS.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTDOS.c
index 5313f1e5630..df667bef016 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTDOS.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTDOS.c
@@ -3,11 +3,11 @@
  */
 
 #include <HTUtils.h>
+#include <LYUtils.h>
 #include <HTDOS.h>
+#include <LYStrings.h>
 
-#ifdef WIN_EX
-#include <LYGlobalDefs.h>
-#endif
+#include <LYLeaks.h>
 
 /*
  * Make a copy of the source argument in the result, allowing some extra
@@ -24,10 +24,10 @@ PRIVATE char * copy_plus ARGS2(char **, result, CONST char *, source)
 /* PUBLIC							HTDOS_wwwName()
 **		CONVERTS DOS Name into WWW Name
 ** ON ENTRY:
-**	dosname 	DOS file specification (NO NODE)
+**	dosname		DOS file specification (NO NODE)
 **
 ** ON EXIT:
-**	returns 	WWW file specification
+**	returns		WWW file specification
 **
 */
 char * HTDOS_wwwName ARGS1(CONST char *, dosname)
@@ -67,27 +67,36 @@ char * HTDOS_wwwName ARGS1(CONST char *, dosname)
     if (wwwname_len > 1)
 	cp_url--;	/* point last char */
 
-    if (wwwname_len > 3 && *cp_url == '/')
-	*cp_url = '\0';
-
-#ifdef NOTUSED
-    if(*cp_url == ':') {
+    if (wwwname_len > 3 && *cp_url == '/') {
 	cp_url++;
-	*cp_url = '/';	/* terminate drive letter to survive */
+	*cp_url = '\0';
     }
-#endif
-
     return(wwwname);
 }
 
 
+/*
+ * Convert slashes from Unix to DOS
+ */
+char * HTDOS_slashes ARGS1(char *, path)
+{
+    char *s;
+
+    for (s = path; *s != '\0'; ++s)	{
+	if (*s == '/')	{
+	    *s = '\\';
+	}
+    }
+    return path;
+}
+
 /* PUBLIC							HTDOS_name()
 **		CONVERTS WWW name into a DOS name
 ** ON ENTRY:
-**	wwwname 	WWW file name
+**	wwwname		WWW file name
 **
 ** ON EXIT:
-**	returns 	DOS file specification
+**	returns		DOS file specification
 */
 char * HTDOS_name ARGS1(char *, wwwname)
 {
@@ -99,12 +108,18 @@ char * HTDOS_name ARGS1(char *, wwwname)
     int joe;
 
     copy_plus(&result, wwwname);
-
-    for (joe = 0; result[joe] != '\0'; joe++)	{
-	if (result[joe] == '/')	{
-	    result[joe] = '\\';	/* convert slashes to dos-style */
-	}
+#ifdef __DJGPP__
+    if (result[0] == '/'
+     && result[1] == 'd'
+     && result[2] == 'e'
+     && result[3] == 'v'
+     && result[4] == '/'
+     && isalpha(result[5])) {
+	return(result);
     }
+#endif /* __DJGPP__ */
+
+    (void) HTDOS_slashes(result);
 
     /* pesky leading slash, rudiment from file://localhost/  */
     /* the rest of path may be with or without drive letter  */
@@ -114,31 +129,44 @@ char * HTDOS_name ARGS1(char *, wwwname)
     }
 
 #ifdef _WINDOWS	/* 1998/04/02 (Thu) 08:59:48 */
-    if (strchr(result, '\\') != NULL
-     && strchr(result, ':') == NULL) {
+    if (LYLastPathSep(result) != NULL
+     && !LYIsDosDrive(result)) {
 	sprintf(temp_buff, "%.3s\\%.*s", windows_drive,
 		(int)(sizeof(temp_buff) - 5), result);
 	StrAllocCopy(result, temp_buff);
-    } else {
-	char *p = strchr(result, ':');
-	if (p && (strcmp(p, ":\\") == 0)) {
-	    p[2] = '.';
-	    p[3] = '\0';
-	}
     }
 #endif
     /*
      * If we have only a device, add a trailing slash.  Otherwise it just
      * refers to the current directory on the given device.
      */
-    if (strchr(result, '\\') == 0
-     && result[1] == ':')
-	StrAllocCat(result, "\\");
+    if (LYLastPathSep(result) == NULL
+     && LYIsDosDrive(result))
+	LYAddPathSep0(result);
 
     CTRACE((tfp, "HTDOS_name changed `%s' to `%s'\n", wwwname, result));
     return (result);
 }
 
+#ifdef WIN_EX
+PUBLIC char *HTDOS_short_name(char *path)
+{
+    static char sbuf[LY_MAXPATH];
+    char *ret;
+    DWORD r;
+
+    if (strchr(path, '/'))
+	path = HTDOS_name(path);
+    r = GetShortPathName(path, sbuf, sizeof sbuf);
+    if (r >= sizeof(sbuf) || r == 0) {
+	ret = LYstrncpy(sbuf, path, sizeof(sbuf));
+    } else {
+	ret = sbuf;
+    }
+    return ret;
+}
+#endif
+
 #if defined(DJGPP) && defined(DJGPP_KEYHANDLER)
 /* PUBLIC       getxkey()
 **              Replaces libc's getxkey() with polling of tcp/ip
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTDOS.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTDOS.h
index 319a63588c7..128608d923f 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTDOS.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTDOS.h
@@ -18,6 +18,10 @@
 */
 char * HTDOS_wwwName PARAMS((CONST char * dosname));
 
+/*
+ * Converts Unix slashes to DOS
+ */
+char * HTDOS_slashes PARAMS((char * path));
 
 /* PUBLIC                                                       HTDOS_name()
 **              CONVERTS WWW name into a DOS name
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFTP.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFTP.c
index 960ba11f8e7..4c90ac0e41c 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFTP.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFTP.c
@@ -57,16 +57,13 @@ BUGS:	@@@	Limit connection cache size!
 **		same time.
 */
 
-#if defined(DJGPP) && !defined(WATT32)
-#define u_long unsigned long
-#endif
-
 #include <HTUtils.h>
 
 #include <HTAlert.h>
 
 #include <HTFTP.h>	/* Implemented here */
 #include <HTTCP.h>
+#include <HTTP.h>
 #include <HTFont.h>
 
 #define REPEAT_PORT	/* Give the port number for each file */
@@ -96,7 +93,7 @@ BUGS:	@@@	Limit connection cache size!
 
 typedef struct _connection {
     struct _connection *	next;	/* Link on list		*/
-    u_long			addr;	/* IP address		*/
+    unsigned long		addr;	/* IP address		*/
     int				socket; /* Socket number for communication */
     BOOL			binary; /* Binary mode? */
 } connection;
@@ -105,12 +102,13 @@ typedef struct _connection {
 */
 #include <HTML.h>
 
-#define PUTC(c) (*targetClass.put_character)(target, c)
-#define PUTS(s) (*targetClass.put_string)(target, s)
-#define START(e) (*targetClass.start_element)(target, e, 0, 0, -1, 0)
-#define END(e) (*targetClass.end_element)(target, e, 0)
-#define FREE_TARGET (*targetClass._free)(target)
-#define ABORT_TARGET (*targetClass._free)(target)
+#define PUTC(c)      (*targetClass.put_character) (target, c)
+#define PUTS(s)      (*targetClass.put_string)    (target, s)
+#define START(e)     (*targetClass.start_element) (target, e, 0, 0, -1, 0)
+#define END(e)       (*targetClass.end_element)   (target, e, 0)
+#define FREE_TARGET  (*targetClass._free)         (target)
+#define ABORT_TARGET (*targetClass._free)         (target)
+
 struct _HTStructured {
 	CONST HTStructuredClass *	isa;
 	/* ... */
@@ -120,16 +118,12 @@ struct _HTStructured {
 **	---------------------
 */
 PUBLIC int HTfileSortMethod = FILE_BY_NAME;
+
 #ifndef DISABLE_FTP /*This disables everything to end-of-file */
 PRIVATE char ThisYear[8];
 PRIVATE char LastYear[8];
 PRIVATE int TheDate;
 PRIVATE BOOLEAN HaveYears = FALSE;
-#ifdef SOCKS
-extern BOOLEAN socks_flag;
-extern unsigned long socks_bind_remoteAddr;
-#endif /* SOCKS */
-extern char *personal_mail_address;
 
 /*	Module-Wide Variables
 **	---------------------
@@ -141,6 +135,15 @@ PRIVATE int data_soc = -1;		/* Socket for data transfer =invalid */
 PRIVATE char *user_entered_password = NULL;
 PRIVATE char *last_username_and_host = NULL;
 
+/*
+ * ProFTPD 1.2.5rc1 is known to have a broken implementation of RETR.  If asked
+ * to retrieve a directory, it gets confused and fails subsequent commands such
+ * as CWD and LIST.  Since this is an unusual bug, we should remove this ifdef
+ * at some point - TD 2004/1/1.
+ */
+#define BROKEN_PROFTPD 1
+PRIVATE int ProFTPD_bugs = FALSE;
+
 typedef enum {
 	GENERIC_SERVER
 	, MACHTEN_SERVER
@@ -363,6 +366,7 @@ PRIVATE char *help_message_cache_non_empty NOARGS
 {
   return(help_message_buffer);
 }
+
 PRIVATE char *help_message_cache_contents NOARGS
 {
    return(help_message_buffer);
@@ -481,6 +485,12 @@ PRIVATE int response ARGS1(
 			    continuation == ' ')
 			    continuation_response = -1; /* ended */
 		}
+#ifdef BROKEN_PROFTPD
+		if (result == 220 && LYstrstr(response_text, "ProFTPD 1.2.5")) {
+		    ProFTPD_bugs = TRUE;
+		    CTRACE((tfp, "This server is broken (RETR)\n"));
+		}
+#endif
 		break;
 	    } /* if end of line */
 
@@ -795,8 +805,8 @@ PRIVATE int get_connection ARGS2(
 	return status;			/* Bad return */
     }
 
-    CTRACE((tfp, "FTP connected, socket %d  control %ld\n",
-		con->socket, (long)con));
+    CTRACE((tfp, "FTP connected, socket %d  control %p\n",
+		con->socket, con));
     control = con;		/* Current control connection */
 
     /* Initialise buffering for control connection */
@@ -875,7 +885,7 @@ PRIVATE int get_connection ARGS2(
 		/*
 		 * Use an environment variable and the host global. - FM
 		 */
-		if ((cp=getenv("USER")) != NULL)
+		if ((cp=LYGetEnv("USER")) != NULL)
 		    StrAllocCopy(user, cp);
 		else
 		    StrAllocCopy(user, "WWWuser");
@@ -1789,7 +1799,7 @@ PRIVATE void parse_vms_dir_entry ARGS2(
     /** Wrap it up **/
     CTRACE((tfp, "HTFTP: VMS filename: %s  date: %s  size: %d\n",
 		entry_info->filename,
-		entry_info->date ? entry_info->date : "",
+		NonNull(entry_info->date),
 		entry_info->size));
     return;
 } /* parse_vms_dir_entry() */
@@ -1862,7 +1872,7 @@ PRIVATE void parse_ms_windows_dir_entry ARGS2(
     /** Wrap it up **/
     CTRACE((tfp, "HTFTP: MS Windows filename: %s  date: %s  size: %d\n",
 		entry_info->filename,
-		entry_info->date ? entry_info->date : "",
+		NonNull(entry_info->date),
 		entry_info->size));
     return;
 } /* parse_ms_windows_dir_entry */
@@ -1971,7 +1981,7 @@ PRIVATE void parse_windows_nt_dir_entry ARGS2(
     /** Wrap it up **/
     CTRACE((tfp, "HTFTP: Windows NT filename: %s  date: %s  size: %d\n",
 		entry_info->filename,
-		entry_info->date ? entry_info->date : "",
+		NonNull(entry_info->date),
 		entry_info->size));
     return;
 } /* parse_windows_nt_dir_entry */
@@ -2112,7 +2122,7 @@ PRIVATE void parse_cms_dir_entry ARGS2(
     /** Wrap it up. **/
     CTRACE((tfp, "HTFTP: VM/CMS filename: %s  date: %s  size: %d\n",
 		entry_info->filename,
-		entry_info->date ? entry_info->date : "",
+		NonNull(entry_info->date),
 		entry_info->size));
     return;
 } /* parse_cms_dir_entry */
@@ -2632,7 +2642,7 @@ PRIVATE int read_directory ARGS4(
     **	we could someday set up an equivalent listing
     **	for Unix ftp servers. - FM
     */
-    need_parent_link = HTDirTitles(target, (HTAnchor*)parent, tildeIsTop);
+    need_parent_link = HTDirTitles(target, parent, tildeIsTop);
 
     data_read_pointer = data_write_pointer = data_buffer;
 
@@ -2660,7 +2670,6 @@ PRIVATE int read_directory ARGS4(
     }
     FREE (filename);
 
-
     {
 	HTBTree * bt = HTBTree_new((HTComparer)compare_EntryInfo_structs);
 	int ic;
@@ -2750,8 +2759,6 @@ AgainForMultiNet:
 	    BytesReceived += chunk->size;
 	    if (BytesReceived > BytesReported + 1024) {
 #ifdef _WINDOWS
-		extern int ws_read_per_sec;
-
 		sprintf(NumBytes,gettext("Transferred %d bytes (%5d)"),
 				BytesReceived, ws_read_per_sec);
 #else
@@ -2772,7 +2779,7 @@ AgainForMultiNet:
 		FREE(spilledname);
 		CTRACE((tfp, "Adding file to BTree: %s\n",
 			    entry_info->filename));
-		HTBTree_add(bt, (EntryInfo *)entry_info);
+		HTBTree_add(bt, entry_info);
 	    } else {
 		free_entryinfo_struct_contents(entry_info);
 		FREE(entry_info);
@@ -2912,36 +2919,22 @@ unload_btree:
     return HT_LOADED;
 }
 
-/*	Retrieve File from Server
-**	-------------------------
-**
-** On entry,
-**	name		WWW address of a file: document, including hostname
-** On exit,
-**	returns		Socket number for file if good.
-**			<0 if bad.
-*/
-PUBLIC int HTFTPLoad ARGS4(
+/*
+ * Setup an FTP connection.
+ */
+PRIVATE int setup_connection ARGS2(
 	CONST char *,		name,
-	HTParentAnchor *,	anchor,
-	HTFormat,		format_out,
-	HTStream *,		sink)
+	HTParentAnchor *,	anchor)
 {
-    BOOL isDirectory = NO;
-    HTAtom * encoding = NULL;
-    int status, final_status;
     int retry;			/* How many times tried? */
-    int outstanding = 1;	/* outstanding control connection responses
-				   that we are willing to wait for, if we
-				   get to the point of reading data - kw */
-    HTFormat format;
+    int status;
 
     /* set use_list to NOT since we don't know what kind of server
      * this is yet.  And set the type to GENERIC
      */
     use_list = FALSE;
     server_type = GENERIC_SERVER;
-    HTReadProgress(0,0);
+    ProFTPD_bugs = FALSE;
 
     for (retry = 0; retry < 2; retry++) { /* For timed out/broken connections */
 	status = get_connection(name, anchor);
@@ -3019,7 +3012,7 @@ PUBLIC int HTFTPLoad ARGS4(
 		    return -99;
 		}
 		passive_port = (p0<<8) + p1;
-		snprintf(dst, sizeof(dst), "%d.%d.%d.%d", h0, h1, h2, h3);
+		sprintf(dst, "%d.%d.%d.%d", h0, h1, h2, h3);
 	    } else if (strcmp(p, "EPSV") == 0) {
 		unsigned char c0, c1, c2, c3;
 		struct sockaddr_storage ss;
@@ -3078,10 +3071,10 @@ PUBLIC int HTFTPLoad ARGS4(
 	    /* Open connection for data:  */
 
 #ifdef INET6
-	    HTSprintf0(&command, "ftp://%s:%d/", dst, passive_port);
+	    HTSprintf0(&command, "%s//%s:%d/", STR_FTP_URL, dst, passive_port);
 #else
-	    HTSprintf0(&command, "ftp://%d.%d.%d.%d:%d/",
-		    h0, h1, h2, h3, passive_port);
+	    HTSprintf0(&command, "%s//%d.%d.%d.%d:%d/",
+		    STR_FTP_URL, h0, h1, h2, h3, passive_port);
 #endif
 	    status = HTDoConnect(command, "FTP data", passive_port, &data_soc);
 	    FREE(command);
@@ -3098,6 +3091,37 @@ PUBLIC int HTFTPLoad ARGS4(
 	break;	/* No more retries */
 
     } /* for retries */
+    return status;
+}
+
+/*	Retrieve File from Server
+**	-------------------------
+**
+** On entry,
+**	name		WWW address of a file: document, including hostname
+** On exit,
+**	returns		Socket number for file if good.
+**			<0 if bad.
+*/
+PUBLIC int HTFTPLoad ARGS4(
+	CONST char *,		name,
+	HTParentAnchor *,	anchor,
+	HTFormat,		format_out,
+	HTStream *,		sink)
+{
+    BOOL isDirectory = NO;
+    HTAtom * encoding = NULL;
+    int status, final_status;
+    int outstanding = 1;	/* outstanding control connection responses
+				   that we are willing to wait for, if we
+				   get to the point of reading data - kw */
+    HTFormat format;
+
+    CTRACE((tfp, "HTFTPLoad(%s) %s connection\n", name, ftp_local_passive ? "passive" : "normal"));
+
+    HTReadProgress(0,0);
+
+    status = setup_connection(name, anchor);
     if (status < 0)
 	return status;		/* Failed with this code */
 
@@ -3548,6 +3572,23 @@ PUBLIC int HTFTPLoad ARGS4(
 	*/
 	if (!(type) || (type && *type != 'D')) {
 	    status = send_cmd_2("RETR", filename);
+#ifdef BROKEN_PROFTPD
+	    /*
+	     * ProFTPD 1.2.5rc1 gets confused when asked to RETR a directory.
+	     */
+	    if (status >= 5) {
+		int check;
+
+		if (ProFTPD_bugs) {
+		    CTRACE((tfp, "{{reconnecting...\n"));
+		    close_connection(control);
+		    check = setup_connection(name, anchor);
+		    CTRACE((tfp, "...done }}reconnecting\n"));
+		    if (check < 0)
+			return check;
+		}
+	    }
+#endif
 	} else {
 	    status = 5;		/* Failed status set as flag. - FM */
 	}
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFTP.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFTP.h
index 60168b610db..cda35834fd3 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFTP.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFTP.h
@@ -28,7 +28,7 @@ extern int HTfileSortMethod;  /* specifies the method of sorting */
 **	fn		WWW file name
 **
 ** ON EXIT:
-**	returns 	vms file specification
+**	returns		vms file specification
 **
 ** Bug:	Returns pointer to static -- non-reentrant
 */
@@ -68,7 +68,3 @@ Return Host Name
 extern CONST char * HTHostName NOPARAMS;
 
 #endif
-
-/*
-
-   end  */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFWriter.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFWriter.c
index b8b0c5d9bc8..b7b8ac17b14 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFWriter.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFWriter.c
@@ -27,8 +27,8 @@ struct _HTStream {
 	CONST HTStreamClass *	isa;
 
 	FILE *			fp;
-	char * 			end_command;
-	char * 			remove_command;
+	char *			end_command;
+	char *			remove_command;
 	BOOL			announce;
 };
 
@@ -61,7 +61,7 @@ PRIVATE CONST HTStreamClass HTBlackHoleClass =
 	"BlackHole",
 	HTBlackHole_free,
 	HTBlackHole_abort,
-	HTBlackHole_put_character, 	HTBlackHole_put_string,
+	HTBlackHole_put_character,	HTBlackHole_put_string,
 	HTBlackHole_write
 };
 
@@ -133,7 +133,7 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 {
     fclose(me->fp);
     if (me->end_command) {		/* Temp file */
-        _HTProgress(me->end_command);	/* Tell user what's happening */
+	_HTProgress(me->end_command);	/* Tell user what's happening */
 	system(me->end_command);
 	FREE(me->end_command);
 	if (me->remove_command) {
@@ -173,7 +173,7 @@ PRIVATE CONST HTStreamClass HTFWriter = /* As opposed to print etc */
 	"FileWriter",
 	HTFWriter_free,
 	HTFWriter_abort,
-	HTFWriter_put_character, 	HTFWriter_put_string,
+	HTFWriter_put_character,	HTFWriter_put_string,
 	HTFWriter_write
 };
 
@@ -238,7 +238,7 @@ PUBLIC HTStream* HTSaveAndExecute ARGS3(
     HTStream* me;
 
     if (HTClientHost) {
-        HTAlert(CANNOT_SAVE_REMOTE);
+	HTAlert(CANNOT_SAVE_REMOTE);
 	return HTBlackHole();
     }
 
@@ -259,7 +259,7 @@ PUBLIC HTStream* HTSaveAndExecute ARGS3(
     me->fp = fopen (fnam, BIN_W);
     if (!me->fp) {
 	HTAlert(CANNOT_OPEN_TEMP);
-        FREE(fnam);
+	FREE(fnam);
 	FREE(me);
 	return NULL;
     }
@@ -307,7 +307,7 @@ PUBLIC HTStream* HTSaveLocally ARGS3(
     HTStream* me;
 
     if (HTClientHost) {
-        HTAlert(CANNOT_SAVE_REMOTE);
+	HTAlert(CANNOT_SAVE_REMOTE);
 	return HTBlackHole();
     }
 
@@ -336,7 +336,7 @@ PUBLIC HTStream* HTSaveLocally ARGS3(
     me->fp = fopen (answer, BIN_W);
     if (!me->fp) {
 	HTAlert(CANNOT_OPEN_OUTPUT);
-        FREE(answer);
+	FREE(answer);
 	FREE(me);
 	return NULL;
     }
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFWriter.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFWriter.h
index b4e79cbce38..04acfb18c71 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFWriter.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFWriter.h
@@ -23,7 +23,4 @@ extern HTStream * HTSaveLocally PARAMS((
         HTParentAnchor *        anchor, /* Not used */
         HTStream *              sink));
 
-#endif
-/*
-
-   end */
+#endif /* HTFWRITE_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFile.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFile.c
index 40fa3826bac..98353450576 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFile.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFile.c
@@ -23,7 +23,7 @@
 #include <HTUtils.h>
 
 #ifndef VMS
-#ifdef DOSPATH
+#if defined(DOSPATH)
 #undef LONG_LIST
 #define LONG_LIST  /* Define this for long style unix listings (ls -l),
 		     the actual style is configurable from lynx.cfg */
@@ -31,18 +31,22 @@
 /* #define NO_PARENT_DIR_REFERENCE */ /* Define this for no parent links */
 #endif /* !VMS */
 
-#ifdef DOSPATH
+#if defined(DOSPATH)
 #define HAVE_READDIR 1
 #define USE_DIRENT
+#endif
+
+#if defined(USE_DOS_DRIVES)
 #include <HTDOS.h>
-#endif /* DOSPATH */
+#endif
 
 #include <HTFile.h>		/* Implemented here */
+
 #ifdef VMS
 #include <stat.h>
 #endif /* VMS */
 
-#ifdef USE_ZLIB
+#if defined (USE_ZLIB) || defined (USE_BZLIB)
 #include <GridText.h>
 #endif
 
@@ -80,6 +84,12 @@ typedef struct _HTSuffix {
 	float		quality;
 } HTSuffix;
 
+typedef struct {
+    struct stat file_info;
+    char sort_tags;
+    char file_name[1];	/* on the end of the struct, since its length varies */
+} DIRED;
+
 #ifndef NGROUPS
 #ifdef NGROUPS_MAX
 #define NGROUPS NGROUPS_MAX
@@ -119,8 +129,6 @@ PUBLIC int HTDirReadme = HT_DIR_README_NONE;
 PUBLIC int HTDirReadme = HT_DIR_README_TOP;
 #endif /* DIRED_SUPPORT */
 
-extern BOOL HTPassEightBitRaw;
-
 PRIVATE char *HTMountRoot = "/Net/";		/* Where to find mounts */
 #ifdef VMS
 PRIVATE char *HTCacheRoot = "/WWW$SCRATCH";	/* Where to cache things */
@@ -128,8 +136,6 @@ PRIVATE char *HTCacheRoot = "/WWW$SCRATCH";	/* Where to cache things */
 PRIVATE char *HTCacheRoot = "/tmp/W3_Cache_";	/* Where to cache things */
 #endif /* VMS */
 
-/*PRIVATE char *HTSaveRoot  = "$(HOME)/WWW/";*/ /* Where to save things */
-
 /*
 **  Suffix registration.
 */
@@ -181,9 +187,9 @@ PRIVATE char *FormatNum ARGS3(
 
 PRIVATE void LYListFmtParse ARGS5(
 	char *,		fmtstr,
+	DIRED *,	data,
 	char *,		file,
 	HTStructured *, target,
-	char *,		entry,
 	char *,		tail)
 {
 	char c;
@@ -191,11 +197,10 @@ PRIVATE void LYListFmtParse ARGS5(
 	char *end;
 	char *start;
 	char *str = NULL;
-	struct stat st;
 	char *buf = NULL;
 	char tmp[LY_MAXPATH];
 	char type;
-#ifndef _WINDOWS
+#ifndef NOUSERS
 	char *name;
 #endif
 	time_t now;
@@ -228,7 +233,7 @@ PRIVATE void LYListFmtParse ARGS5(
 #define PTBIT(a, s)  PBIT(a, 0, 0)
 #endif
 
-	if (lstat(file, &st) < 0)
+	if (data->file_info.st_mode == 0)
 		fmtstr = "    %a";	/* can't stat so just do anchor */
 
 	StrAllocCopy(str, fmtstr);
@@ -267,13 +272,13 @@ PRIVATE void LYListFmtParse ARGS5(
 
 		case 'A':
 		case 'a':	/* anchor */
-			HTDirEntry(target, tail, entry);
-			FormatStr(&buf, start, entry);
+			HTDirEntry(target, tail, data->file_name);
+			FormatStr(&buf, start, data->file_name);
 			PUTS(buf);
 			END(HTML_A);
 			*buf = '\0';
 #ifdef S_IFLNK
-			if (c != 'A' && S_ISLNK(st.st_mode) &&
+			if (c != 'A' && S_ISLNK(data->file_info.st_mode) &&
 			    (len = readlink(file, tmp, sizeof(tmp) - 1)) >= 0) {
 				PUTS(" -> ");
 				tmp[len] = '\0';
@@ -284,7 +289,7 @@ PRIVATE void LYListFmtParse ARGS5(
 
 		case 'T':	/* MIME type */
 		case 't':	/* MIME type description */
-		    if (S_ISDIR(st.st_mode)) {
+		    if (S_ISDIR(data->file_info.st_mode)) {
 			if (c != 'T') {
 			    FormatStr(&buf, start, ENTRY_IS_DIRECTORY);
 			} else {
@@ -315,8 +320,8 @@ PRIVATE void LYListFmtParse ARGS5(
 
 		case 'd':	/* date */
 			now = time(0);
-			datestr = ctime(&st.st_mtime);
-			if ((now - st.st_mtime) < SEC_PER_YEAR/2)
+			datestr = ctime(&data->file_info.st_mtime);
+			if ((now - data->file_info.st_mtime) < SEC_PER_YEAR/2)
 				/*
 				**  MMM DD HH:MM
 				*/
@@ -331,22 +336,23 @@ PRIVATE void LYListFmtParse ARGS5(
 			break;
 
 		case 's':	/* size in bytes */
-			FormatNum(&buf, start, (int) st.st_size);
+			FormatNum(&buf, start, (int) data->file_info.st_size);
 			break;
 
 		case 'K':	/* size in Kilobytes but not for directories */
-			if (S_ISDIR(st.st_mode)) {
+			if (S_ISDIR(data->file_info.st_mode)) {
 				FormatStr(&buf, start, "");
+				StrAllocCat(buf, " ");
 				break;
 			}
 			/* FALL THROUGH */
 		case 'k':	/* size in Kilobytes */
-			FormatNum(&buf, start, (int)((st.st_size+1023)/1024));
+			FormatNum(&buf, start, (int)((data->file_info.st_size+1023)/1024));
 			StrAllocCat(buf, "K");
 			break;
 
 		case 'p':	/* unix-style permission bits */
-			switch(st.st_mode & S_IFMT) {
+			switch(data->file_info.st_mode & S_IFMT) {
 #if defined(_MSC_VER) && defined(_S_IFIFO)
 			case _S_IFIFO: type = 'p'; break;
 #else
@@ -374,42 +380,40 @@ PRIVATE void LYListFmtParse ARGS5(
 			}
 #ifdef _WINDOWS
 			sprintf(tmp, "%c%s", type,
-				PBIT(st.st_mode, 6, st.st_mode & S_IRWXU));
+				PBIT(data->file_info.st_mode, 6, data->file_info.st_mode & S_IRWXU));
 #else
 			sprintf(tmp, "%c%s%s%s", type,
-				PBIT(st.st_mode, 6, st.st_mode & S_ISUID),
-				PBIT(st.st_mode, 3, st.st_mode & S_ISGID),
-				PTBIT(st.st_mode,   st.st_mode & S_ISVTX));
+				PBIT(data->file_info.st_mode, 6, data->file_info.st_mode & S_ISUID),
+				PBIT(data->file_info.st_mode, 3, data->file_info.st_mode & S_ISGID),
+				PTBIT(data->file_info.st_mode,   data->file_info.st_mode & S_ISVTX));
 #endif
 			FormatStr(&buf, start, tmp);
 			break;
 
-#ifdef _WINDOWS
 		case 'o':	/* owner */
-		case 'g':	/* group */
-			break;
-#else
-		case 'o':	/* owner */
-			name = HTAA_UidToName (st.st_uid);
+#ifndef NOUSERS
+			name = HTAA_UidToName (data->file_info.st_uid);
 			if (*name) {
 				FormatStr(&buf, start, name);
 			} else {
-				FormatNum(&buf, start, (int) st.st_uid);
+				FormatNum(&buf, start, (int) data->file_info.st_uid);
 			}
+#endif
 			break;
 
 		case 'g':	/* group */
-			name = HTAA_GidToName(st.st_gid);
+#ifndef NOUSERS
+			name = HTAA_GidToName(data->file_info.st_gid);
 			if (*name) {
 				FormatStr(&buf, start, name);
 			} else {
-				FormatNum(&buf, start, (int) st.st_gid);
+				FormatNum(&buf, start, (int) data->file_info.st_gid);
 			}
-			break;
 #endif
+			break;
 
 		case 'l':	/* link count */
-			FormatNum(&buf, start, (int) st.st_nlink);
+			FormatNum(&buf, start, (int) data->file_info.st_nlink);
 			break;
 
 		case '%':	/* literal % with flags/width */
@@ -589,9 +593,10 @@ PRIVATE int HTCreatePath ARGS1(CONST char *,path)
 **  On exit:
 **	Returns a malloc'ed string which must be freed by the caller.
 */
-PUBLIC char * HTURLPath_toFile ARGS2(
+PUBLIC char * HTURLPath_toFile ARGS3(
 	CONST char *,	name,
-	BOOL,		expand_all)
+	BOOL,		expand_all,
+	BOOL,		is_remote GCC_UNUSED)
 {
     char * path = NULL;
     char * result = NULL;
@@ -603,21 +608,11 @@ PUBLIC char * HTURLPath_toFile ARGS2(
 	HTUnEscapeSome(path, "/");	/* Interpret % signs for path delims */
 
     CTRACE((tfp, "URLPath `%s' means path `%s'\n", name, path));
-#ifdef DOSPATH
-    StrAllocCopy(result, HTDOS_name(path));
-#else
-#ifdef __EMX__
-    if (path[0] == '/'
-	&& isalpha(path[1])
-	&& path[2] == ':') /* pesky leading slash */
-	StrAllocCopy(result, path+1);
-    else
-	StrAllocCopy(result, path);
-    CTRACE((tfp, "EMX hack changed `%s' to `%s'\n", path, result));
+#if defined(USE_DOS_DRIVES)
+    StrAllocCopy(result, is_remote ? path : HTDOS_name(path));
 #else
     StrAllocCopy(result, path);
-#endif /* __EMX__ */
-#endif /* DOSPATH */
+#endif
 
     FREE(path);
 
@@ -659,21 +654,7 @@ PUBLIC char * HTnameOfFile_WWW ARGS3(
 	if ((0 == strcasecomp(host, HTHostName())) ||
 	    (0 == strcasecomp(host, "localhost")) || !*host) {
 	    CTRACE((tfp, "Node `%s' means path `%s'\n", name, path));
-#ifdef DOSPATH
-	    StrAllocCopy(result, HTDOS_name(path));
-#else
-#ifdef __EMX__
-	    if (path[0] == '/'
-	     && isalpha(path[1])
-	     && path[2] == ':') /* pesky leading slash */
-		StrAllocCopy(result, path+1);
-	    else
-		StrAllocCopy(result, path);
-	    CTRACE((tfp, "EMX hack changed `%s' to `%s'\n", path, result));
-#else
-	    StrAllocCopy(result, path);
-#endif /* __EMX__ */
-#endif /* DOSPATH */
+	    StrAllocCopy(result, HTSYS_name(path));
 	} else if (WWW_prefix) {
 	    HTSprintf0(&result, "%s%s%s", "/Net/", host, path);
 	    CTRACE((tfp, "Node `%s' means file `%s'\n", name, result));
@@ -682,7 +663,7 @@ PUBLIC char * HTnameOfFile_WWW ARGS3(
 	}
     } else if (WWW_prefix) {  /* other access */
 #ifdef VMS
-	if ((home = getenv("HOME")) == 0)
+	if ((home = LYGetEnv("HOME")) == 0)
 	    home = HTCacheRoot;
 	else
 	    home = HTVMS_wwwName(home);
@@ -690,7 +671,7 @@ PUBLIC char * HTnameOfFile_WWW ARGS3(
 #if defined(_WINDOWS)	/* 1997/10/16 (Thu) 20:42:51 */
 	home =  (char *)Home_Dir();
 #else
-	home = getenv("HOME");
+	home = LYGetEnv("HOME");
 #endif
 	if (home == 0)
 	    home = "/tmp";
@@ -724,13 +705,13 @@ PUBLIC char * WWW_nameOfFile ARGS1(
     char * result = NULL;
 #ifdef NeXT
     if (0 == strncmp("/private/Net/", name, 13)) {
-	HTSprintf0(&result, "file://%s", name+13);
+	HTSprintf0(&result, "%s//%s", STR_FILE_URL, name+13);
     } else
 #endif /* NeXT */
     if (0 == strncmp(HTMountRoot, name, 5)) {
-	HTSprintf0(&result, "file://%s", name+5);
+	HTSprintf0(&result, "%s//%s", STR_FILE_URL, name+5);
     } else {
-	HTSprintf0(&result, "file://%s%s", HTHostName(), name);
+	HTSprintf0(&result, "%s//%s%s", STR_FILE_URL, HTHostName(), name);
     }
     CTRACE((tfp, "File `%s'\n\tmeans node `%s'\n", name, result));
     return result;
@@ -1131,7 +1112,7 @@ PUBLIC void LYGetFileInfo ARGS7(
 	 */
 	Afn = HTEscape(filename, URL_PATH);
 	LYLocalFileToURL(&Aname, Afn);
-	file_anchor = HTAnchor_parent(HTAnchor_findSimpleAddress(Aname));
+	file_anchor = HTAnchor_findSimpleAddress(Aname);
 
 	file_csname = file_anchor->charset;
 	format = HTFileFormat(filename, &myEnc, pdesc);
@@ -1298,10 +1279,11 @@ PUBLIC BOOL HTEditable ARGS1(
 PUBLIC HTStream * HTFileSaveStream ARGS1(
 	HTParentAnchor *,	anchor)
 {
-    CONST char * addr = HTAnchor_address((HTAnchor*)anchor);
-    char *  localname = HTLocalName(addr);
+    CONST char * addr = anchor->address;
+    char * localname = HTLocalName(addr);
+    FILE * fp = fopen(localname, BIN_W);
 
-    FILE* fp = fopen(localname, BIN_W);
+    FREE(localname);
     if (!fp)
 	return NULL;
 
@@ -1317,16 +1299,15 @@ PUBLIC void HTDirEntry ARGS3(
 	CONST char *,	entry)
 {
     char * relative = NULL;
+    char * stripped = NULL;
     char * escaped = NULL;
     int len;
 
-    if (0 == strcmp(entry,"../")) {
-	/*
-	**  Undo slash appending for anchor creation.
-	*/
-	StrAllocCopy(escaped,"..");
-    } else {
-	escaped = HTEscape(entry, URL_XPALPHAS);
+    StrAllocCopy(escaped, entry);
+    LYTrimPathSep(escaped);
+    if (strcmp(escaped, "..") != 0) {
+	stripped = escaped;
+	escaped = HTEscape(stripped, URL_XPALPHAS);
 	if (((len = strlen(escaped)) > 2) &&
 	    escaped[(len - 3)] == '%' &&
 	    escaped[(len - 2)] == '2' &&
@@ -1352,6 +1333,7 @@ PUBLIC void HTDirEntry ARGS3(
 	HTStartAnchor(target, NULL, relative);
 	FREE(relative);
     }
+    FREE(stripped);
     FREE(escaped);
 }
 
@@ -1370,20 +1352,24 @@ PUBLIC void HTDirEntry ARGS3(
 */
 PUBLIC BOOL HTDirTitles ARGS3(
 	HTStructured *, target,
-	HTAnchor *,	anchor,
+	HTParentAnchor *, anchor,
 	BOOL,		tildeIsTop)
 {
-    char * logical = HTAnchor_address(anchor);
+    CONST char * logical = anchor->address;
     char * path = HTParse(logical, "", PARSE_PATH + PARSE_PUNCTUATION);
     char * current;
     char * cp = NULL;
     BOOL need_parent_link = FALSE;
     int i;
-
-#ifdef DOSPATH
-    BOOL local_link = FALSE;
-    if (strlen(logical) > 18 && logical[18] == ':') local_link = TRUE;
+#if defined(USE_DOS_DRIVES)
+    BOOL local_link = (strlen(logical) > 18
+		     && !strncasecomp(logical, "file://localhost/", 17)
+		     && LYIsDosDrive(logical + 17));
+    BOOL is_remote = !local_link;
+#else
+#define is_remote TRUE
 #endif
+
     /*
     **	Check tildeIsTop for treating home directory as Welcome
     **	(assume the tilde is not followed by a username). - FM
@@ -1411,7 +1397,7 @@ PUBLIC BOOL HTDirTitles ARGS3(
 	}
 	cp = NULL;
     }
-    current = strrchr(path, '/');	/* last part or "" */
+    current = LYPathLeaf (path);	/* last part or "" */
 
     {
       char * printable = NULL;
@@ -1421,7 +1407,8 @@ PUBLIC BOOL HTDirTitles ARGS3(
 	    (0 == strncasecomp(path, "/%2F", 4))	/* "//" ? */
 	    ? (path+1)
 	    : path,
-	    TRUE);
+	    TRUE,
+	    is_remote);
       if (0 == strncasecomp(printable, "/vmsysu:", 8) ||
 	  0 == strncasecomp(printable, "/anonymou.", 10)) {
 	  StrAllocCopy(cp, (printable+1));
@@ -1429,7 +1416,7 @@ PUBLIC BOOL HTDirTitles ARGS3(
 	  FREE(cp);
       }
 #else
-      StrAllocCopy(printable, (current ? current + 1 : ""));
+      StrAllocCopy(printable, current);
       HTUnEscape(printable);
 #endif /* DIRED_SUPPORT */
 
@@ -1461,7 +1448,6 @@ PUBLIC BOOL HTDirTitles ARGS3(
 	  (0 == strncasecomp(printable, "anonymou.", 9) &&
 	   strchr(printable, '/') == NULL)) {
 	  FREE(printable);
-	  FREE(logical);
 	  FREE(path);
 	  return(need_parent_link);
       }
@@ -1472,21 +1458,19 @@ PUBLIC BOOL HTDirTitles ARGS3(
     /*
     **	Make link back to parent directory.
     */
-#ifdef DOSPATH
-    if (current != path)	/* leave "/c:" alone */
-#endif
-    if (current && current[1]) {   /* was a slash AND something else too */
+    if (current - path > 0
+      && LYIsPathSep(current[-1])
+      && current[0] != '\0') {	/* was a slash AND something else too */
 	char * parent = NULL;
 	char * relative = NULL;
 
-	*current++ = '\0';
+	current[-1] = '\0';
 	parent = strrchr(path, '/');  /* penultimate slash */
 
 	if ((parent &&
 	     (!strcmp(parent, "/..") ||
 	      !strncasecomp(parent, "/%2F", 4))) ||
 	    !strncasecomp(current, "%2F", 3)) {
-	    FREE(logical);
 	    FREE(path);
 	    return(need_parent_link);
 	}
@@ -1494,7 +1478,7 @@ PUBLIC BOOL HTDirTitles ARGS3(
 	relative = 0;
 	HTSprintf0(&relative, "%s/..", current);
 
-#ifdef DOSPATH
+#if defined(DOSPATH) || defined(__EMX__)
 	if (local_link) {
 	    if (parent != 0 && strlen(parent) == 3 ) {
 		StrAllocCat(relative, "/.");
@@ -1542,7 +1526,6 @@ PUBLIC BOOL HTDirTitles ARGS3(
 		HTUnEscape(fullparentpath);
 		if ((dp = opendir(fullparentpath)) == NULL) {
 		    FREE(fullparentpath);
-		    FREE(logical);
 		    FREE(relative);
 		    FREE(path);
 		    return(need_parent_link);
@@ -1551,7 +1534,6 @@ PUBLIC BOOL HTDirTitles ARGS3(
 		FREE(fullparentpath);
 #ifdef LONG_LIST
 		need_parent_link = TRUE;
-		FREE(logical);
 		FREE(path);
 		FREE(relative);
 		return(need_parent_link);
@@ -1586,7 +1568,6 @@ PUBLIC BOOL HTDirTitles ARGS3(
     }
 #endif /* !NO_PARENT_DIR_REFERENCE */
 
-    FREE(logical);
     FREE(path);
     return(need_parent_link);
 }
@@ -1601,6 +1582,7 @@ PRIVATE void do_readme ARGS2(HTStructured *, target, CONST char *, localname)
 {
     FILE * fp;
     char * readme_file_name = NULL;
+    int ch;
 
     HTSprintf0(&readme_file_name, "%s/%s", localname, HT_DIR_README_FILE);
 
@@ -1611,29 +1593,8 @@ PRIVATE void do_readme ARGS2(HTStructured *, target, CONST char *, localname)
 
 	targetClass =  *target->isa;	/* (Can't init agregate in K&R) */
 	START(HTML_PRE);
-	for (;;){
-	    int c = fgetc(fp);
-	    if (c == EOF) break;
-#ifdef NOTDEFINED
-	    switch (c) {
-		case '&':
-		case '<':
-		case '>':
-			PUTC('&');
-			PUTC('#');
-			PUTC((char)(c / 10));
-			PUTC((char) (c % 10));
-			PUTC(';');
-			break;
-/*		case '\n':
-			PUTC('\r');
-Bug removed thanks to joe@athena.mit.edu */
-		default:
-			PUTC((char)c);
-	    }
-#else
-	    PUTC((char)c);
-#endif /* NOTDEFINED */
+	while ((ch = fgetc(fp)) != EOF) {
+	    PUTC((char)ch);
 	}
 	END(HTML_PRE);
 	HTDisplayPartial();
@@ -1642,6 +1603,68 @@ Bug removed thanks to joe@athena.mit.edu */
     FREE(readme_file_name);
 }
 
+#define DIRED_BLOK(obj) (((DIRED *)(obj))->sort_tags)
+#define DIRED_NAME(obj) (((DIRED *)(obj))->file_name)
+
+#define NM_cmp(a,b) ((a) < (b) ? -1 : ((a) > (b) ? 1 : 0))
+
+#if defined(LONG_LIST) && defined(DIRED_SUPPORT)
+PRIVATE char *file_type ARGS1(char *, path)
+{
+    char *type;
+    while (*path == '.')
+	++path;
+    type = strchr(path, '.');
+    if (type == NULL)
+	type = "";
+    return type;
+}
+#endif /* LONG_LIST && DIRED_SUPPORT */
+
+PRIVATE int dired_cmp ARGS2(void *, a, void *, b)
+{
+    DIRED *p = (DIRED *)a;
+    DIRED *q = (DIRED *)b;
+    int code = p->sort_tags - q->sort_tags;
+#if defined(LONG_LIST) && defined(DIRED_SUPPORT)
+    if (code == 0) {
+	switch (dir_list_order) {
+	case ORDER_BY_SIZE:
+	    code = -NM_cmp(p->file_info.st_size, q->file_info.st_size);
+	    break;
+	case ORDER_BY_DATE:
+	    code = -NM_cmp(p->file_info.st_mtime, q->file_info.st_mtime);
+	    break;
+	case ORDER_BY_MODE:
+	    code = NM_cmp(p->file_info.st_mode, q->file_info.st_mode);
+	    break;
+	case ORDER_BY_USER:
+	    code = NM_cmp(p->file_info.st_uid, q->file_info.st_uid);
+	    break;
+	case ORDER_BY_GROUP:
+	    code = NM_cmp(p->file_info.st_gid, q->file_info.st_gid);
+	    break;
+	case ORDER_BY_TYPE:
+	    code = AS_cmp(file_type(p->file_name), file_type(q->file_name));
+	    break;
+	default:
+	    code = 0;
+	    break;
+	}
+    }
+#endif /* LONG_LIST && DIRED_SUPPORT */
+    if (code == 0)
+	code = AS_cmp(p->file_name, q->file_name);
+#if 0
+    CTRACE((tfp, "dired_cmp(%d) ->%d\n\t%c:%s (%s)\n\t%c:%s (%s)\n",
+	    dir_list_order,
+	    code,
+	    p->sort_tags, p->file_name, file_type(p->file_name),
+	    q->sort_tags, q->file_name, file_type(q->file_name)));
+#endif
+    return code;
+}
+
 PRIVATE int print_local_dir ARGS5(
 	DIR  *,			dp,
 	char *,			localname,
@@ -1652,20 +1675,17 @@ PRIVATE int print_local_dir ARGS5(
     HTStructured *target;	/* HTML object */
     HTStructuredClass targetClass;
     STRUCT_DIRENT * dirbuf;
-    char *logical = NULL;
     char *pathname = NULL;
     char *tail = NULL;
     BOOL present[HTML_A_ATTRIBUTES];
     char * tmpfilename = NULL;
     BOOL need_parent_link = FALSE;
-    struct stat file_info;
     int status;
     int i;
 
     CTRACE((tfp, "print_local_dir() started\n"));
 
-    logical = HTAnchor_address((HTAnchor*)anchor);
-    pathname = HTParse(logical, "",
+    pathname = HTParse(anchor->address, "",
 		       PARSE_PATH + PARSE_PUNCTUATION);
 
     if (!strcmp(pathname,"/")) {
@@ -1712,21 +1732,19 @@ PRIVATE int print_local_dir ARGS5(
     **	is not defined so that need we to create the
     **	link via an LYListFmtParse() call. - FM
     */
-    need_parent_link = HTDirTitles(target,
-				   (HTAnchor *)anchor, FALSE);
+    need_parent_link = HTDirTitles(target, anchor, FALSE);
 
 #ifdef DIRED_SUPPORT
-    if (strncmp(anchor->address, "lynxcgi:", 8)) {
-	HTAnchor_setFormat((HTParentAnchor *) anchor, WWW_DIRED);
+    if (!isLYNXCGI(anchor->address)) {
+	HTAnchor_setFormat(anchor, WWW_DIRED);
 	lynx_edit_mode = TRUE;
     }
 #endif /* DIRED_SUPPORT */
     if (HTDirReadme == HT_DIR_README_TOP)
 	do_readme(target, localname);
 
-
     {
-	HTBTree * bt = HTBTree_new((HTComparer)AS_cmp);
+	HTBTree * bt = HTBTree_new(dired_cmp);
 	int num_of_entries = 0;	    /* lines counter */
 
 	_HTProgress (READING_DIRECTORY);
@@ -1735,9 +1753,9 @@ PRIVATE int print_local_dir ARGS5(
 	    /*
 	    **	While there are directory entries to be read...
 	    */
-	    char * dirname = NULL;
+	    DIRED *data = NULL;
 
-#ifndef DOSPATH
+#if !(defined(DOSPATH) || defined(__EMX__))
 	    if (dirbuf->d_ino == 0)
 		/*
 		**  If the entry is not being used, skip it.
@@ -1759,42 +1777,51 @@ PRIVATE int print_local_dir ARGS5(
 		continue;
 
 	    StrAllocCopy(tmpfilename, localname);
-	    if (strcmp(localname, "/"))
-		/*
-		**  If filename is not root directory.
-		*/
-		StrAllocCat(tmpfilename, "/");
+	    /*
+	    **  If filename is not root directory, add trailing separator.
+	    */
+	    LYAddPathSep(&tmpfilename);
 
 	    StrAllocCat(tmpfilename, dirbuf->d_name);
-	    stat(tmpfilename, &file_info);
+	    data = (DIRED *)malloc(sizeof(DIRED) + strlen(dirbuf->d_name) + 4);
+	    if (data == NULL) {
+		/* FIXME */
+	    }
+	    LYTrimPathSep (tmpfilename);
+	    if (lstat(tmpfilename, &(data->file_info)) < 0)
+		data->file_info.st_mode = 0;
+
+	    strcpy(data->file_name, dirbuf->d_name);
 #ifndef DIRED_SUPPORT
-	    if (S_ISDIR(file_info.st_mode))
-		HTSprintf0(&dirname, "D%s",dirbuf->d_name);
-	    else
-		HTSprintf0(&dirname, "F%s",dirbuf->d_name);
+	    if (S_ISDIR(data->file_info.st_mode)) {
+		data->sort_tags = 'D';
+	    } else {
+		data->sort_tags = 'F';
 		/* D & F to have first directories, then files */
-#else
-	    if (S_ISDIR(file_info.st_mode))
-	    {
-		if (dir_list_style == MIXED_STYLE)
-		    HTSprintf0(&dirname, " %s/", dirbuf->d_name);
-		else if (!strcmp(dirbuf->d_name, ".."))
-		    HTSprintf0(&dirname, "A%s", dirbuf->d_name);
-		else
-		    HTSprintf0(&dirname, "D%s", dirbuf->d_name);
 	    }
-	    else if (dir_list_style == MIXED_STYLE)
-		HTSprintf0(&dirname, " %s", dirbuf->d_name);
-	    else if (dir_list_style == FILES_FIRST)
-		HTSprintf0(&dirname, "C%s", dirbuf->d_name);
+#else
+	    if (S_ISDIR(data->file_info.st_mode)) {
+		if (dir_list_style == MIXED_STYLE) {
+		    data->sort_tags = ' ';
+		    LYAddPathSep0(data->file_name);
+		} else if (!strcmp(dirbuf->d_name, "..")) {
+		    data->sort_tags = 'A';
+		} else {
+		    data->sort_tags = 'D';
+		}
+	    } else if (dir_list_style == MIXED_STYLE) {
+		data->sort_tags = ' ';
+	    } else if (dir_list_style == FILES_FIRST) {
+		data->sort_tags = 'C';
 		/* C & D to have first files, then directories */
-	    else
-		HTSprintf0(&dirname, "F%s", dirbuf->d_name);
+	    } else {
+		data->sort_tags = 'F';
+	    }
 #endif /* !DIRED_SUPPORT */
 	    /*
 	    **	Sort dirname in the tree bt.
 	    */
-	    HTBTree_add(bt, dirname);
+	    HTBTree_add(bt, data);
 
 #ifdef DISP_PARTIAL
 	    /* optimize for expensive operation: */
@@ -1836,7 +1863,7 @@ PRIVATE int print_local_dir ARGS5(
 	    state = 'I';
 
 	    while (next_element != NULL) {
-		char *entry, *file_extra;
+		DIRED *entry;
 
 #ifndef DISP_PARTIAL
 		if (num_of_entries_output % HTMAX(display_lines,10) == 0) {
@@ -1847,30 +1874,25 @@ PRIVATE int print_local_dir ARGS5(
 		    }
 		}
 #endif
-		StrAllocCopy(tmpfilename,localname);
-		if (strcmp(localname, "/"))
-		    /*
-		    **	If filename is not root directory.
-		    */
-		    LYAddHtmlSep(&tmpfilename);
+		StrAllocCopy(tmpfilename, localname);
+		/*
+		**	If filename is not root directory.
+		*/
+		LYAddPathSep(&tmpfilename);
 
-		entry = (char*)HTBTree_object(next_element)+1;
+		entry = (DIRED *)(HTBTree_object(next_element));
 		/*
 		**  Append the current entry's filename
 		**  to the path.
 		*/
-		StrAllocCat(tmpfilename, entry);
+		StrAllocCat(tmpfilename, entry->file_name);
 		HTSimplify(tmpfilename);
 		/*
 		**  Output the directory entry.
 		*/
-		if (strcmp((char *)
-			   (HTBTree_object(next_element)), "D..") &&
-		    strcmp((char *)
-			   (HTBTree_object(next_element)), "A.."))
-		{
+		if (strcmp(DIRED_NAME(HTBTree_object(next_element)), "..")) {
 #ifdef DIRED_SUPPORT
-		    test = (*(char *)(HTBTree_object(next_element))
+		    test = (DIRED_BLOK(HTBTree_object(next_element))
 			    == 'D' ? 'D' : 'F');
 		    if (state != test) {
 #ifndef LONG_LIST
@@ -1886,7 +1908,7 @@ PRIVATE int print_local_dir ARGS5(
 			    }
 #endif /* !LONG_LIST */
 			state =
-			   (char) (*(char *)(HTBTree_object(next_element))
+			   (char) (DIRED_BLOK(HTBTree_object(next_element))
 			    == 'D' ? 'D' : 'F');
 			START(HTML_H2);
 			if (dir_list_style != MIXED_STYLE) {
@@ -1904,8 +1926,7 @@ PRIVATE int print_local_dir ARGS5(
 #endif /* !LONG_LIST */
 		    }
 #else
-		    if (state != *(char *)(HTBTree_object(
-					     next_element))) {
+		    if (state != DIRED_BLOK(HTBTree_object(next_element))) {
 #ifndef LONG_LIST
 			if (state == 'D') {
 			    END(HTML_DIR);
@@ -1913,7 +1934,7 @@ PRIVATE int print_local_dir ARGS5(
 			}
 #endif /* !LONG_LIST */
 			state =
-			  (char) (*(char *)(HTBTree_object(next_element))
+			  (char) (DIRED_BLOK(HTBTree_object(next_element))
 			   == 'D' ? 'D' : 'F');
 			START(HTML_H2);
 			START(HTML_EM);
@@ -1933,19 +1954,13 @@ PRIVATE int print_local_dir ARGS5(
 		    START(HTML_LI);
 #endif /* !LONG_LIST */
 		}
-		file_extra = NULL;
 
 #ifdef LONG_LIST
-		LYListFmtParse(list_format, tmpfilename, target,
-		    entry, tail);
+		LYListFmtParse(list_format, entry, tmpfilename, target, tail);
 #else
-		HTDirEntry(target, tail, entry);
-		PUTS(entry);
+		HTDirEntry(target, tail, entry->file_name);
+		PUTS(entry->file_name);
 		END(HTML_A);
-		if (file_extra) {
-		    PUTS(file_extra);
-		    FREE(file_extra);
-		}
 		MAYBE_END(HTML_LI);
 		PUTC('\n');
 #endif /* LONG_LIST */
@@ -1986,7 +2001,6 @@ PRIVATE int print_local_dir ARGS5(
 	    }
 	} /* end printing out the tree in order */
 
-	FREE(logical);
 	FREE(tmpfilename);
 	FREE(tail);
 	HTBTreeAndObject_free(bt);
@@ -2011,30 +2025,26 @@ PUBLIC int HTStat ARGS2(
 	struct stat *,	data)
 {
     int result = -1;
-    char *temp_name = NULL;
     size_t len = strlen(filename);
 
     if (len != 0 && LYIsPathSep(filename[len-1])) {
+	char *temp_name = NULL;
 	HTSprintf0(&temp_name, "%s.", filename);
+	result = HTStat(temp_name, data);
+	FREE(temp_name);
     } else {
-	temp_name = (char *)filename;
-    }
+	result = stat(filename, data);
 #ifdef _WINDOWS
-    /*
-     * Someone claims that stat() doesn't give the proper result for a
-     * directory on Windows.
-     */
-    if (access(temp_name, 0) == 0) {
-	if (stat(temp_name, data) == -1)
+	/*
+	 * Someone claims that stat() doesn't give the proper result for a
+	 * directory on Windows.
+	 */
+	if (result == -1
+	 && access(filename, 0) == 0) {
 	    data->st_mode = S_IFDIR;
-	result = 0;
-    }
-#else
-    result = stat(temp_name, data);
+	    result = 0;
+	}
 #endif
-
-    if (temp_name != filename) {
-	FREE(temp_name);
     }
     return result;
 }
@@ -2066,15 +2076,21 @@ PUBLIC int HTLoadFile ARGS4(
     char * newname = NULL;	/* Simplified name of file */
     HTAtom * encoding;		/* @@ not used yet */
     HTAtom * myEncoding = NULL; /* enc of this file, may be gzip etc. */
-    int status;
+    int status = -1;
     char *dot;
 #ifdef VMS
     struct stat stat_info;
 #endif /* VMS */
 #ifdef USE_ZLIB
     gzFile gzfp = 0;
-    BOOL use_gzread = NO;
 #endif /* USE_ZLIB */
+#ifdef USE_BZLIB
+    BZFILE *bzfp = 0;
+#endif /* USE_ZLIB */
+#if defined(USE_ZLIB) || defined(USE_BZLIB)
+    CompressFileType internal_decompress = cftNone;
+    BOOL failed_decompress = NO;
+#endif
 
     /*
     **	Reduce the filename to a basic form (hopefully unique!).
@@ -2088,13 +2104,8 @@ PUBLIC int HTLoadFile ARGS4(
     */
     acc_method = HTParse(newname, "", PARSE_ACCESS);
     if (strcmp("ftp", acc_method) == 0 ||
-       (strcmp("localhost", nodename) != 0 &&
-#ifdef VMS
-	strcasecomp(nodename, HTHostName()) != 0
-#else
-	strcmp(nodename, HTHostName()) != 0
-#endif /* VMS */
-    )) {
+       (!LYSameHostname("localhost", nodename) &&
+	!LYSameHostname(nodename, HTHostName()))) {
 	status = -1;
 	FREE(newname);
 	FREE(filename);
@@ -2103,17 +2114,17 @@ PUBLIC int HTLoadFile ARGS4(
 #ifndef DISABLE_FTP
 	ftp_newhost = HTParse(addr, "", PARSE_HOST);
 	if (strcmp(ftp_lasthost, ftp_newhost))
-		ftp_local_passive = ftp_passive;
+	    ftp_local_passive = ftp_passive;
 
 	status = HTFTPLoad(addr, anchor, format_out, sink);
 
 	if ( ftp_passive == ftp_local_passive ) {
-		if (( status >= 400 ) || ( status < 0 )) {
-			ftp_local_passive = !ftp_passive;
-			status = HTFTPLoad(addr, anchor, format_out, sink);
-		}
+	    if (( status >= 400 ) || ( status < 0 )) {
+		ftp_local_passive = !ftp_passive;
+		status = HTFTPLoad(addr, anchor, format_out, sink);
+	    }
 	}
-	
+
 	free(ftp_lasthost);
 	ftp_lasthost = ftp_newhost;
 #endif /* DISABLE_FTP */
@@ -2122,7 +2133,7 @@ PUBLIC int HTLoadFile ARGS4(
 	FREE(newname);
 	FREE(acc_method);
     }
-#if defined(VMS) || defined(DOSPATH)
+#if defined(VMS) || defined(USE_DOS_DRIVES)
     HTUnEscape(filename);
 #endif /* VMS */
 
@@ -2252,9 +2263,23 @@ PUBLIC int HTLoadFile ARGS4(
 
 		    CTRACE((tfp, "HTLoadFile: gzopen of `%s' gives %p\n",
 				vmsname, (void*)gzfp));
-		    use_gzread = YES;
+		    internal_decompress = cftGzip;
 		} else
 #endif	/* USE_ZLIB */
+#ifdef USE_BZLIB
+		if (strcmp(format_out->name, "www/download") != 0 &&
+		    (!strcmp(HTAtom_name(myEncoding), "bzip2") ||
+		     !strcmp(HTAtom_name(myEncoding), "x-bzip2"))) {
+		    fclose(fp);
+		    if (semicolon != NULL)
+			*semicolon = ';';
+		    bzfp = BZ2_bzopen(vmsname, BIN_R);
+
+		    CTRACE((tfp, "HTLoadFile: bzopen of `%s' gives %p\n",
+				vmsname, (void*)bzfp));
+		    use_zread = YES;
+		} else
+#endif	/* USE_BZLIB */
 		{
 		    StrAllocCopy(anchor->content_type, format->name);
 		    StrAllocCopy(anchor->content_encoding, HTAtom_name(myEncoding));
@@ -2292,7 +2317,7 @@ PUBLIC int HTLoadFile ARGS4(
 
 			CTRACE((tfp, "HTLoadFile: gzopen of `%s' gives %p\n",
 				    vmsname, (void*)gzfp));
-			use_gzread = YES;
+			internal_decompress = cftGzip;
 		    }
 #else  /* USE_ZLIB */
 		    format = HTAtom_for("www/compressed");
@@ -2300,7 +2325,20 @@ PUBLIC int HTLoadFile ARGS4(
 		    break;
 		case cftBzip2:
 		    StrAllocCopy(anchor->content_encoding, "x-bzip2");
+#ifdef USE_BZLIB
+		    if (strcmp(format_out->name, "www/download") != 0) {
+			fclose(fp);
+			if (semicolon != NULL)
+			    *semicolon = ';';
+			bzfp = BZ2_bzopen(vmsname, BIN_R);
+
+			CTRACE((tfp, "HTLoadFile: bzopen of `%s' gives %p\n",
+				    vmsname, (void*)bzfp));
+			internal_decompress = cfgBzip2;
+		    }
+#else  /* USE_BZLIB */
 		    format = HTAtom_for("www/compressed");
+#endif	/* USE_BZLIB */
 		    break;
 		case cftNone:
 		    break;
@@ -2310,9 +2348,29 @@ PUBLIC int HTLoadFile ARGS4(
 		*semicolon = ';';
 	    FREE(filename);
 	    FREE(nodename);
+#if defined(USE_ZLIB) || defined(USE_BZLIB)
+	    if (internal_decompress != cftNone) {
+		switch (internal_decompress) {
 #ifdef USE_ZLIB
-	    if (use_gzread) {
-		if (gzfp) {
+		case cftCompress:
+		case cftGzip:
+		    failed_decompress = (gzfp == 0);
+		    break;
+#endif
+#ifdef USE_BZLIB
+		case cftBzip2:
+		    failed_decompress = (bzfp == 0);
+		    break;
+#endif
+		default:
+		    failed_decompress = YES;
+		    break;
+		}
+		if (failed_decompress) {
+		    status = HTLoadError(NULL,
+					 -(HT_ERROR),
+					 FAILED_OPEN_COMPRESSED_FILE);
+		} else {
 		    char * sugfname = NULL;
 		    if (anchor->SugFname) {
 			StrAllocCopy(sugfname, anchor->SugFname);
@@ -2333,16 +2391,21 @@ PUBLIC int HTLoadFile ARGS4(
 		    if (sugfname && *sugfname)
 			StrAllocCopy(anchor->SugFname, sugfname);
 		    FREE(sugfname);
-		    status = HTParseGzFile(format, format_out,
-					   anchor,
-					   gzfp, sink);
-		} else {
-		    status = HTLoadError(NULL,
-					 -(HT_ERROR),
-					 FAILED_OPEN_COMPRESSED_FILE);
+#ifdef USE_BZLIB
+		    if (bzfp)
+			status = HTParseBzFile(format, format_out,
+					       anchor,
+					       bzfp, sink);
+#endif
+#ifdef USE_ZLIB
+		    if (gzfp)
+			status = HTParseGzFile(format, format_out,
+					       anchor,
+					       gzfp, sink);
+#endif
 		}
 	    } else
-#endif /* USE_ZLIB */
+#endif /* USE_ZLIB || USE_BZLIB */
 	    {
 		status = HTParseFile(format, format_out, anchor, fp, sink);
 		fclose(fp);
@@ -2360,7 +2423,7 @@ PUBLIC int HTLoadFile ARGS4(
     **	For unix, we try to translate the name into the name of a
     **	transparently mounted file.
     **
-    **	Not allowed in secure (HTClienntHost) situations. TBL 921019
+    **	Not allowed in secure (HTClientHost) situations. TBL 921019
     */
 #ifndef NO_UNIX_IO
     /*	Need protection here for telnet server but not httpd server. */
@@ -2410,7 +2473,7 @@ PUBLIC int HTLoadFile ARGS4(
 		/*
 		**  While there are directory entries to be read...
 		*/
-#ifndef DOSPATH
+#if !(defined(DOSPATH) || defined(__EMX__))
 		if (dirbuf->d_ino == 0)
 		    continue;	/* if the entry is not being used, skip it */
 #endif
@@ -2504,6 +2567,10 @@ PUBLIC int HTLoadFile ARGS4(
 	**  will hold the directory entry, and a type 'DIR' which is used
 	**  to point to the current directory being read.
 	*/
+#if defined(USE_DOS_DRIVES)
+	if (strlen(localname) == 2 && LYIsDosDrive(localname))
+	    LYAddPathSep(&localname);
+#endif
 	if (HTStat(localname,&dir_info) == -1)	   /* get file information */
 	{
 				/* if can't read file information */
@@ -2608,9 +2675,21 @@ PUBLIC int HTLoadFile ARGS4(
 
 			CTRACE((tfp, "HTLoadFile: gzopen of `%s' gives %p\n",
 				    localname, (void*)gzfp));
-			use_gzread = YES;
+			internal_decompress = cftGzip;
 		    } else
 #endif	/* USE_ZLIB */
+#ifdef USE_BZLIB
+		    if (strcmp(format_out->name, "www/download") != 0 &&
+			(!strcmp(HTAtom_name(myEncoding), "bzip2") ||
+			 !strcmp(HTAtom_name(myEncoding), "x-bzip2"))) {
+			fclose(fp);
+			bzfp = BZ2_bzopen(localname, BIN_R);
+
+			CTRACE((tfp, "HTLoadFile: bzopen of `%s' gives %p\n",
+				    localname, (void*)bzfp));
+			internal_decompress = cftBzip2;
+		    } else
+#endif	/* USE_BZLIB */
 		    {
 			StrAllocCopy(anchor->content_type, format->name);
 			StrAllocCopy(anchor->content_encoding, HTAtom_name(myEncoding));
@@ -2645,7 +2724,7 @@ PUBLIC int HTLoadFile ARGS4(
 
 			    CTRACE((tfp, "HTLoadFile: gzopen of `%s' gives %p\n",
 					localname, (void*)gzfp));
-			    use_gzread = YES;
+			    internal_decompress = cftGzip;
 			}
 #else  /* USE_ZLIB */
 			format = HTAtom_for("www/compressed");
@@ -2653,7 +2732,18 @@ PUBLIC int HTLoadFile ARGS4(
 			break;
 		    case cftBzip2:
 			StrAllocCopy(anchor->content_encoding, "x-bzip2");
+#ifdef USE_BZLIB
+			if (strcmp(format_out->name, "www/download") != 0) {
+			    fclose(fp);
+			    bzfp = BZ2_bzopen(localname, BIN_R);
+
+			    CTRACE((tfp, "HTLoadFile: bzopen of `%s' gives %p\n",
+					localname, (void*)bzfp));
+			    internal_decompress = cftBzip2;
+			}
+#else  /* USE_BZLIB */
 			format = HTAtom_for("www/compressed");
+#endif	/* USE_BZLIB */
 			break;
 		    case cftNone:
 			break;
@@ -2661,9 +2751,28 @@ PUBLIC int HTLoadFile ARGS4(
 		}
 		FREE(localname);
 		FREE(nodename);
+#if defined(USE_ZLIB) || defined(USE_BZLIB)
+		if (internal_decompress != cftNone) {
+		    switch (internal_decompress) {
 #ifdef USE_ZLIB
-		if (use_gzread) {
-		    if (gzfp) {
+		    case cftGzip:
+			failed_decompress = (gzfp == 0);
+			break;
+#endif
+#ifdef USE_BZLIB
+		    case cftBzip2:
+			failed_decompress = (bzfp == 0);
+			break;
+#endif
+		    default:
+			failed_decompress = YES;
+			break;
+		    }
+		    if (failed_decompress) {
+			status = HTLoadError(NULL,
+					     -(HT_ERROR),
+					     FAILED_OPEN_COMPRESSED_FILE);
+		    } else {
 			char * sugfname = NULL;
 			if (anchor->SugFname) {
 			    StrAllocCopy(sugfname, anchor->SugFname);
@@ -2684,13 +2793,18 @@ PUBLIC int HTLoadFile ARGS4(
 			if (sugfname && *sugfname)
 			    StrAllocCopy(anchor->SugFname, sugfname);
 			FREE(sugfname);
-			status = HTParseGzFile(format, format_out,
-					       anchor,
-					       gzfp, sink);
-		    } else {
-			status = HTLoadError(NULL,
-					     -(HT_ERROR),
-					     FAILED_OPEN_COMPRESSED_FILE);
+#ifdef USE_BZLIB
+			if (bzfp)
+			    status = HTParseBzFile(format, format_out,
+						   anchor,
+						   bzfp, sink);
+#endif
+#ifdef USE_ZLIB
+			if (gzfp)
+			    status = HTParseGzFile(format, format_out,
+						   anchor,
+						   gzfp, sink);
+#endif
 		    }
 		} else
 #endif /* USE_ZLIB */
@@ -2746,6 +2860,161 @@ PUBLIC int HTLoadFile ARGS4(
     }
 }
 
+static CONST char *program_paths[pp_Last];
+
+/*
+ * Given a program number, return its path
+ */
+PUBLIC CONST char * HTGetProgramPath ARGS1(
+	ProgramPaths,	code)
+{
+    CONST char *result = NULL;
+    if (code > ppUnknown && code < pp_Last)
+	result = program_paths[code];
+    return result;
+}
+
+/*
+ * Store a program's path.  The caller must allocate the string used for 'path',
+ * since HTInitProgramPaths() may free it.
+ */
+PUBLIC void HTSetProgramPath ARGS2(
+	ProgramPaths,	code,
+	CONST char *,	path)
+{
+    if (code > ppUnknown && code < pp_Last) {
+	program_paths[code] = isEmpty(path) ? 0 : path;
+    }
+}
+
+/*
+ * Reset the list of known program paths to the ones that are compiled-in
+ */
+PUBLIC void HTInitProgramPaths NOARGS
+{
+    int code;
+    CONST char *path;
+    CONST char *test;
+
+    for (code = (int) ppUnknown + 1; code < (int) pp_Last; ++code) {
+	switch (code) {
+#ifdef BZIP2_PATH
+	case ppBZIP2:
+	    path = BZIP2_PATH;
+	    break;
+#endif
+#ifdef CHMOD_PATH
+	case ppCHMOD:
+	    path = CHMOD_PATH;
+	    break;
+#endif
+#ifdef COMPRESS_PATH
+	case ppCOMPRESS:
+	    path = COMPRESS_PATH;
+	    break;
+#endif
+#ifdef COPY_PATH
+	case ppCOPY:
+	    path = COPY_PATH;
+	    break;
+#endif
+#ifdef CSWING_PATH
+	case ppCSWING:
+	    path = CSWING_PATH;
+	    break;
+#endif
+#ifdef GZIP_PATH
+	case ppGZIP:
+	    path = GZIP_PATH;
+	    break;
+#endif
+#ifdef INSTALL_PATH
+	case ppINSTALL:
+	    path = INSTALL_PATH;
+	    break;
+#endif
+#ifdef MKDIR_PATH
+	case ppMKDIR:
+	    path = MKDIR_PATH;
+	    break;
+#endif
+#ifdef MV_PATH
+	case ppMV:
+	    path = MV_PATH;
+	    break;
+#endif
+#ifdef RLOGIN_PATH
+	case ppRLOGIN:
+	    path = RLOGIN_PATH;
+	    break;
+#endif
+#ifdef RM_PATH
+	case ppRM:
+	    path = RM_PATH;
+	    break;
+#endif
+#ifdef RMDIR_PATH
+	case ppRMDIR:
+	    path = RMDIR_PATH;
+	    break;
+#endif
+#ifdef TAR_PATH
+	case ppTAR:
+	    path = TAR_PATH;
+	    break;
+#endif
+#ifdef TELNET_PATH
+	case ppTELNET:
+	    path = TELNET_PATH;
+	    break;
+#endif
+#ifdef TN3270_PATH
+	case ppTN3270:
+	    path = TN3270_PATH;
+	    break;
+#endif
+#ifdef TOUCH_PATH
+	case ppTOUCH:
+	    path = TOUCH_PATH;
+	    break;
+#endif
+#ifdef UNCOMPRESS_PATH
+	case ppUNCOMPRESS:
+	    path = UNCOMPRESS_PATH;
+	    break;
+#endif
+#ifdef UNZIP_PATH
+	case ppUNZIP:
+	    path = UNZIP_PATH;
+	    break;
+#endif
+#ifdef UUDECODE_PATH
+	case ppUUDECODE:
+	    path = UUDECODE_PATH;
+	    break;
+#endif
+#ifdef ZCAT_PATH
+	case ppZCAT:
+	    path = ZCAT_PATH;
+	    break;
+#endif
+#ifdef ZIP_PATH
+	case ppZIP:
+	    path = ZIP_PATH;
+	    break;
+#endif
+	default:
+	    path = NULL;
+	    break;
+	}
+	test = HTGetProgramPath(code);
+	if (test != NULL && test != path) {
+	    free((char *)test);
+	}
+	HTSetProgramPath(code, path);
+    }
+}
+
 /*
 **	Protocol descriptors
 */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFile.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFile.h
index edee6ded9de..976e18b0956 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFile.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFile.h
@@ -42,7 +42,7 @@ extern int HTDirReadme;         /* Include readme files in listing? */
 /*
 **  Convert filenames between local and WWW formats
 */
-extern char * HTURLPath_toFile PARAMS((CONST char * name, BOOL expand_all));
+extern char * HTURLPath_toFile PARAMS((CONST char * name, BOOL expand_all, BOOL is_remote));
 extern char * HTnameOfFile_WWW PARAMS((CONST char * name, BOOL WWW_prefix, BOOL expand_all));
 #define HTLocalName(name)      HTnameOfFile_WWW(name,TRUE,TRUE)
 #define HTfullURL_toFile(name) HTnameOfFile_WWW(name,FALSE,TRUE)
@@ -69,7 +69,7 @@ extern char * HTCacheFileName PARAMS((CONST char * name));
 */
 extern BOOL HTDirTitles PARAMS((
         HTStructured *  target,
-        HTAnchor *      anchor,
+        HTParentAnchor* anchor,
 	BOOL		tildeIsTop));
 
 /*
@@ -276,6 +276,55 @@ extern CONST char * HTFileSuffix PARAMS((
                 CONST char* enc));
 
 /*
+ * Enumerate external programs that lynx may assume exists.  Unlike those
+ * given in download scripts, etc., lynx would really like to know their
+ * absolute paths, for better security.
+ */
+typedef enum {
+    ppUnknown = 0
+    ,ppBZIP2
+    ,ppCHMOD
+    ,ppCOMPRESS
+    ,ppCOPY
+    ,ppCSWING
+    ,ppGZIP
+    ,ppINSTALL
+    ,ppMKDIR
+    ,ppMV
+    ,ppRLOGIN
+    ,ppRM
+    ,ppRMDIR
+    ,ppTAR
+    ,ppTELNET
+    ,ppTN3270
+    ,ppTOUCH
+    ,ppUNCOMPRESS
+    ,ppUNZIP
+    ,ppUUDECODE
+    ,ppZCAT
+    ,ppZIP
+    ,pp_Last
+} ProgramPaths;
+
+/*
+ * Given a program number, return its path
+ */
+extern CONST char * HTGetProgramPath PARAMS((
+		ProgramPaths code));
+
+/*
+ * Store a program's path 
+ */
+extern void HTSetProgramPath PARAMS((
+		ProgramPaths code,
+		CONST char *path));
+
+/*
+ * Reset the list of known program paths to the ones that are compiled-in
+ */
+extern void HTInitProgramPaths NOPARAMS;
+
+/*
 **  The Protocols
 */
 #ifdef GLOBALREF_IS_MACRO
@@ -284,6 +333,5 @@ extern GLOBALREF (HTProtocol,HTFile);
 #else
 GLOBALREF HTProtocol HTFTP, HTFile;
 #endif /* GLOBALREF_IS_MACRO */
-#endif /* HTFILE_H */
 
-/* end of HTFile */
+#endif /* HTFILE_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFinger.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFinger.c
index 9f205e0c0d7..08d0932d112 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFinger.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFinger.c
@@ -53,7 +53,7 @@
 
 /*	Module-wide variables
 */
-PRIVATE int s;					/* Socket for FingerHost */
+PRIVATE int finger_fd;				/* Socket for FingerHost */
 
 struct _HTStructured {
 	CONST HTStructuredClass * isa;		/* For gopher streams */
@@ -69,7 +69,7 @@ PRIVATE HTStructuredClass targetClass;		/* Copy of fn addresses */
 PRIVATE BOOL initialized = NO;
 PRIVATE BOOL initialize NOARGS
 {
-  s = -1;		/* Disconnected */
+  finger_fd = -1;		/* Disconnected */
   return YES;
 }
 
@@ -124,16 +124,16 @@ PRIVATE int response ARGS5(
 
     /* Set up buffering.
     */
-    HTInitInput(s);
+    HTInitInput(finger_fd);
 
     /* Send the command.
     */
     CTRACE((tfp, "HTFinger command to be sent: %s", command));
-    status = NETWRITE(s, (char *)command, length);
+    status = NETWRITE(finger_fd, (char *)command, length);
     if (status < 0) {
 	CTRACE((tfp, "HTFinger: Unable to send command. Disconnecting.\n"));
-	NETCLOSE(s);
-	s = -1;
+	NETCLOSE(finger_fd);
+	finger_fd = -1;
 	return status;
     } /* if bad status */
 
@@ -203,7 +203,7 @@ PRIVATE int response ARGS5(
 	     */
 	    p = l = line;
 	    while (*l) {
-		if (strncmp(l, "news:", 5) &&
+		if (strncmp(l, STR_NEWS_URL, LEN_NEWS_URL) &&
 		    strncmp(l, "snews://", 8) &&
 		    strncmp(l, "nntp://", 7) &&
 		    strncmp(l, "snewspost:", 10) &&
@@ -216,7 +216,7 @@ PRIVATE int response ARGS5(
 		    strncmp(l, "http://", 7) &&
 		    strncmp(l, "https://", 8) &&
 		    strncmp(l, "wais://", 7) &&
-		    strncmp(l, "mailto:", 7) &&
+		    strncmp(l, STR_MAILTO_URL, LEN_MAILTO_URL) &&
 		    strncmp(l, "cso://", 6) &&
 		    strncmp(l, "gopher://", 9))
 		    PUTC(*l++);
@@ -232,8 +232,8 @@ PRIVATE int response ARGS5(
 	    PUTC('\n');
 	}
     }
-    NETCLOSE(s);
-    s = -1;
+    NETCLOSE(finger_fd);
+    finger_fd = -1;
 
 end_html:
     END(HTML_PRE);
@@ -258,9 +258,12 @@ PUBLIC int HTLoadFinger ARGS4(
 {
     char *username, *sitename, *colon;	/* Fields extracted from URL */
     char *slash, *at_sign;		/* Fields extracted from URL */
-    char *command, *str;		/* Buffers */
+    char *command, *str, *param;	/* Buffers */
     int port;				/* Port number from URL */
     int status;				/* tcp return */
+    int result = HT_LOADED;
+    BOOL IsGopherURL = FALSE;
+    CONST char * p1 = arg;
 
     CTRACE((tfp, "HTFinger: Looking for %s\n", (arg ? arg : "NULL")));
 
@@ -276,10 +279,6 @@ PUBLIC int HTLoadFinger ARGS4(
 	return HT_NOT_LOADED;	/* FAIL */
     }
 
-  {
-    CONST char * p1=arg;
-    BOOL IsGopherURL = FALSE;
-
     /*  Set up the host and command fields.
     */
     if (!strncasecomp(arg, "finger://", 9)) {
@@ -288,9 +287,13 @@ PUBLIC int HTLoadFinger ARGS4(
 	p1 = arg + 9;  /* Skip "gopher://" prefix */
 	IsGopherURL = TRUE;
     }
-    sitename = (char *)p1;
 
-    if ((slash = strchr(sitename, '/')) != NULL) {
+    param = 0;
+    sitename = StrAllocCopy(param, p1);
+    if (param == 0) {
+	HTAlert(COULD_NOT_LOAD_DATA);
+	return HT_NOT_LOADED;
+    } else if ((slash = strchr(sitename, '/')) != NULL) {
 	*slash++ = '\0';
 	HTUnEscape(slash);
 	if (IsGopherURL) {
@@ -301,15 +304,17 @@ PUBLIC int HTLoadFinger ARGS4(
 	    *slash++ = '\0';
 	}
     }
+
     if ((at_sign = strchr(sitename, '@')) != NULL) {
 	if (IsGopherURL) {
 	    HTAlert(COULD_NOT_LOAD_DATA);
 	    return HT_NOT_LOADED;	/* FAIL */
+	} else {
+	    *at_sign++ = '\0';
+	    username = sitename;
+	    sitename = at_sign;
+	    HTUnEscape(username);
 	}
-	*at_sign++ = '\0';
-	username = sitename;
-	sitename = at_sign;
-	HTUnEscape(username);
     } else if (slash) {
 	username = slash;
     } else {
@@ -318,99 +323,93 @@ PUBLIC int HTLoadFinger ARGS4(
 
     if (*sitename == '\0') {
 	HTAlert(gettext("Could not load data (no sitename in finger URL)"));
-	return HT_NOT_LOADED;		/* Ignore if no name */
-    }
-
-    if ((colon = strchr(sitename, ':')) != NULL) {
+	result = HT_NOT_LOADED;		/* Ignore if no name */
+    } else if ((colon = strchr(sitename, ':')) != NULL) {
 	*colon++ = '\0';
 	port = atoi(colon);
 	if (port != 79) {
 	    HTAlert(gettext("Invalid port number - will only use port 79!"));
-	    return HT_NOT_LOADED;	/* Ignore if wrong port */
+	    result = HT_NOT_LOADED;	/* Ignore if wrong port */
 	}
     }
 
-    /* Load the string for making a connection/
-    */
-    str = 0;
-    HTSprintf0(&str, "lose://%s/", sitename);
-
-    /* Load the command for the finger server.
-    */
-    command = 0;
-    if (at_sign && slash) {
-	if (*slash == 'w' || *slash == 'W') {
-	    HTSprintf0(&command, "/w %s%c%c", username, CR, LF);
-	} else {
+    if (result == HT_LOADED) {
+	/* Load the string for making a connection/
+	*/
+	str = 0;
+	HTSprintf0(&str, "lose://%s/", sitename);
+
+	/* Load the command for the finger server.
+	*/
+	command = 0;
+	if (at_sign && slash) {
+	    if (*slash == 'w' || *slash == 'W') {
+		HTSprintf0(&command, "/w %s%c%c", username, CR, LF);
+	    } else {
+		HTSprintf0(&command, "%s%c%c", username, CR, LF);
+	    }
+	} else if (at_sign) {
 	    HTSprintf0(&command, "%s%c%c", username, CR, LF);
-	}
-    } else if (at_sign) {
-	HTSprintf0(&command, "%s%c%c", username, CR, LF);
-    } else if (*username == '/') {
-	if ((slash = strchr((username+1), '/')) != NULL) {
-	    *slash = ' ';
-	}
-	HTSprintf0(&command, "%s%c%c", username, CR, LF);
-    } else if ((*username == 'w' || *username == 'W') &&
-	       *(username+1) == '/') {
-	if (*username+2 != '\0') {
-	    *(username+1) = ' ';
-	} else {
-	    *(username+1) = '\0';
-	}
-	HTSprintf0(&command, "/%s%c%c", username, CR, LF);
-    } else if ((*username == 'w' || *username == 'W') &&
-	       *(username+1) == '\0') {
-	HTSprintf0(&command, "/%s%c%c", username, CR, LF);
-    } else if ((slash = strchr(username, '/')) != NULL) {
-	*slash++ = '\0';
-	if (*slash == 'w' || *slash == 'W') {
-	    HTSprintf0(&command, "/w %s%c%c", username, CR, LF);
+	} else if (*username == '/') {
+	    if ((slash = strchr((username+1), '/')) != NULL) {
+		*slash = ' ';
+	    }
+	    HTSprintf0(&command, "%s%c%c", username, CR, LF);
+	} else if ((*username == 'w' || *username == 'W') &&
+		   *(username+1) == '/') {
+	    if (*username+2 != '\0') {
+		*(username+1) = ' ';
+	    } else {
+		*(username+1) = '\0';
+	    }
+	    HTSprintf0(&command, "/%s%c%c", username, CR, LF);
+	} else if ((*username == 'w' || *username == 'W') &&
+		   *(username+1) == '\0') {
+	    HTSprintf0(&command, "/%s%c%c", username, CR, LF);
+	} else if ((slash = strchr(username, '/')) != NULL) {
+	    *slash++ = '\0';
+	    if (*slash == 'w' || *slash == 'W') {
+		HTSprintf0(&command, "/w %s%c%c", username, CR, LF);
+	    } else {
+		HTSprintf0(&command, "%s%c%c", username, CR, LF);
+	    }
 	} else {
 	    HTSprintf0(&command, "%s%c%c", username, CR, LF);
 	}
-    } else {
-	HTSprintf0(&command, "%s%c%c", username, CR, LF);
-    }
-  } /* scope of p1 */
 
-    /* Now, let's get a stream setup up from the FingerHost:
-    ** CONNECTING to finger host
-    */
-    CTRACE((tfp, "HTFinger: doing HTDoConnect on '%s'\n", str));
-    status = HTDoConnect(str, "finger", FINGER_PORT, &s);
-    CTRACE((tfp, "HTFinger: Done DoConnect; status %d\n", status));
-
-    if (status == HT_INTERRUPTED) {
-	/* Interrupt cleanly */
-	CTRACE((tfp, "HTFinger: Interrupted on connect; recovering cleanly.\n"));
-	HTProgress (CONNECTION_INTERRUPTED);
-	FREE(str);
-	FREE(command);
-	return HT_NOT_LOADED;
-    }
-    if (status < 0) {
-	NETCLOSE(s);
-	s = -1;
-	CTRACE((tfp, "HTFinger: Unable to connect to finger host.\n"));
-	HTAlert(gettext("Could not access finger host."));
-	FREE(str);
-	FREE(command);
-	return HT_NOT_LOADED;	/* FAIL */
-    }
-    CTRACE((tfp, "HTFinger: Connected to finger host '%s'.\n", str));
-    FREE(str);
+	/* Now, let's get a stream setup up from the FingerHost:
+	** CONNECTING to finger host
+	*/
+	CTRACE((tfp, "HTFinger: doing HTDoConnect on '%s'\n", str));
+	status = HTDoConnect(str, "finger", FINGER_PORT, &finger_fd);
+	CTRACE((tfp, "HTFinger: Done DoConnect; status %d\n", status));
+
+	if (status == HT_INTERRUPTED) {
+	    /* Interrupt cleanly */
+	    CTRACE((tfp, "HTFinger: Interrupted on connect; recovering cleanly.\n"));
+	    HTProgress (CONNECTION_INTERRUPTED);
+	    result = HT_NOT_LOADED;
+	} else if (status < 0) {
+	    NETCLOSE(finger_fd);
+	    finger_fd = -1;
+	    CTRACE((tfp, "HTFinger: Unable to connect to finger host.\n"));
+	    HTAlert(gettext("Could not access finger host."));
+	    result = HT_NOT_LOADED;	/* FAIL */
+	} else {
+	    CTRACE((tfp, "HTFinger: Connected to finger host '%s'.\n", str));
 
-    /* Send the command, and process response if successful.
-    */
-    if (response(command, sitename, anAnchor, format_out, stream) != 0) {
-	HTAlert(gettext("No response from finger server."));
+	    /* Send the command, and process response if successful.
+	    */
+	    if (response(command, sitename, anAnchor, format_out, stream) != 0) {
+		HTAlert(gettext("No response from finger server."));
+		result = HT_NOT_LOADED;
+	    }
+	}
+	FREE(str);
 	FREE(command);
-	return HT_NOT_LOADED;
     }
-
-    FREE(command);
-    return HT_LOADED;
+    FREE(param);
+    return result;
 }
 
 #ifdef GLOBALDEF_IS_MACRO
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFormat.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFormat.c
index 70184064e67..d93f59cc1f9 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFormat.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFormat.c
@@ -55,7 +55,6 @@ PUBLIC long int HTMaxBytes  = 0;	/* No effective limit */
 #endif
 
 PUBLIC	BOOL HTOutputSource = NO;	/* Flag: shortcut parser to stdout */
-/* extern  BOOL interactive; LJM */
 
 #ifdef ORIGINAL
 struct _HTStream {
@@ -627,8 +626,8 @@ PUBLIC void HTDisplayPartial NOARGS
 		 * If partial_threshold <= 0, then it's a full page
 		 */
 	) {
-	    NumOfLines_partial = HText_getNumOfLines();
-	    LYMainLoop_pageDisplay(Newline_partial);
+	    if (LYMainLoop_pageDisplay(Newline_partial))
+		NumOfLines_partial = HText_getNumOfLines();
 	}
     }
 #else /* nothing */
@@ -688,12 +687,6 @@ PUBLIC int HTCopy ARGS4(
     BOOL suppress_readprogress = NO;
     int bytes;
     int rv = 0;
-#ifdef _WINDOWS	/* 1997/11/11 (Tue) 15:18:16 */
-    long file_length;
-    extern int bytes_already_read;
-
-    file_length = anchor->content_length;
-#endif
 
     /*	Push the data down the stream
     */
@@ -924,7 +917,7 @@ PUBLIC int HTFileCopy ARGS2(
     return rv;
 }
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 /*	Push data from an HTChunk down a stream
 **	---------------------------------------
 **
@@ -1064,6 +1057,83 @@ PRIVATE int HTGzFileCopy ARGS2(
 }
 #endif /* USE_ZLIB */
 
+#ifdef USE_BZLIB
+/*	Push data from a bzip file pointer down a stream
+**	-------------------------------------
+**
+**   This routine is responsible for creating and PRESENTING any
+**   graphic (or other) objects described by the file.
+**
+**
+**  State of file and target stream on entry:
+**		      BZFILE (bzfp) assumed open (should have bzipped content),
+**		      target (sink) assumed valid.
+**
+**  Return values:
+**	HT_INTERRUPTED  Interruption after some data read.
+**	HT_PARTIAL_CONTENT	Error after some data read.
+**	-1		Error before any data read.
+**	HT_LOADED	Normal end of file indication on reading.
+**
+**  State of file and target stream on return:
+**	always		bzfp still open, target stream still valid.
+*/
+PRIVATE int HTBzFileCopy ARGS2(
+	BZFILE *,		bzfp,
+	HTStream*,		sink)
+{
+    HTStreamClass targetClass;
+    int status, bytes;
+    int bzerrnum;
+    int rv = HT_OK;
+
+    /*	Push the data down the stream
+    */
+    targetClass = *(sink->isa); /* Copy pointers to procedures */
+
+    /*	read and inflate bzip'd file, and push binary down sink
+    */
+    HTReadProgress(bytes = 0, 0);
+    for (;;) {
+	status = BZ2_bzread(bzfp, input_buffer, INPUT_BUFFER_SIZE);
+	if (status <= 0) { /* EOF or error */
+	    if (status == 0) {
+		rv = HT_LOADED;
+		break;
+	    }
+	    CTRACE((tfp, "HTBzFileCopy: Read error, bzread returns %d\n",
+			status));
+	    CTRACE((tfp, "bzerror   : %s\n",
+			BZ2_bzerror(bzfp, &bzerrnum)));
+	    if (bytes) {
+		rv = HT_PARTIAL_CONTENT;
+	    } else {
+		rv = -1;
+	    }
+	    break;
+	}
+
+	(*targetClass.put_block)(sink, input_buffer, status);
+	bytes += status;
+	HTReadProgress(bytes, -1);
+	HTDisplayPartial();
+
+	if (HTCheckForInterrupt()) {
+	    _HTProgress (TRANSFER_INTERRUPTED);
+	    if (bytes) {
+		rv = HT_INTERRUPTED;
+	    } else {
+		rv = -1;
+	    }
+	    break;
+	}
+    } /* next bufferload */
+
+    HTFinishDisplayPartial();
+    return rv;
+}
+#endif /* USE_BZLIB */
+
 /*	Push data from a socket down a stream STRIPPING CR
 **	--------------------------------------------------
 **
@@ -1249,7 +1319,7 @@ PUBLIC int HTParseFile ARGS5(
 	return HT_LOADED;
 }
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 /*	Parse a document in memory given format and memory block pointer
 **
 **   This routine is responsible for creating and PRESENTING any
@@ -1383,6 +1453,82 @@ PUBLIC int HTParseGzFile ARGS5(
 }
 #endif /* USE_ZLIB */
 
+#ifdef USE_BZLIB
+PRIVATE void HTCloseBzFile ARGS1(
+	BZFILE *,		bzfp)
+{
+    if (bzfp)
+	BZ2_bzclose(bzfp);
+}
+
+/*	HTParseBzFile
+**
+**  State of file and target stream on entry:
+**			bzFile (bzfp) assumed open,
+**			target (sink) usually NULL (will call stream stack).
+**
+**  Return values:
+**	-501		Stream stack failed (cannot present or convert).
+**	-1		Download cancelled.
+**	HT_NO_DATA	Error before any data read.
+**	HT_PARTIAL_CONTENT	Interruption or error after some data read.
+**	HT_LOADED	Normal end of file indication on reading.
+**
+**  State of file and target stream on return:
+**	always		bzfp closed; target freed, aborted, or NULL.
+*/
+PUBLIC int HTParseBzFile ARGS5(
+	HTFormat,		rep_in,
+	HTFormat,		format_out,
+	HTParentAnchor *,	anchor,
+	BZFILE*,		bzfp,
+	HTStream*,		sink)
+{
+    HTStream * stream;
+    HTStreamClass targetClass;
+    int rv;
+
+    stream = HTStreamStack(rep_in, format_out, sink, anchor);
+
+    if (!stream) {
+	char *buffer = 0;
+	HTCloseBzFile(bzfp);
+	if (LYCancelDownload) {
+	    LYCancelDownload = FALSE;
+	    return -1;
+	}
+	HTSprintf0(&buffer, CANNOT_CONVERT_I_TO_O,
+		HTAtom_name(rep_in), HTAtom_name(format_out));
+	CTRACE((tfp, "HTFormat(in HTParseBzFile): %s\n", buffer));
+	rv = HTLoadError(sink, 501, buffer);
+	FREE(buffer);
+	return rv;
+    }
+
+    /*	Push the data down the stream
+    **
+    **	@@  Bug:  This decision ought to be made based on "encoding"
+    **	rather than on content-type.  @@@  When we handle encoding.
+    **	The current method smells anyway.
+    */
+    targetClass = *(stream->isa);	/* Copy pointers to procedures */
+    rv = HTBzFileCopy(bzfp, stream);
+    if (rv == -1 || rv == HT_INTERRUPTED) {
+	(*targetClass._abort)(stream, NULL);
+    } else {
+	(*targetClass._free)(stream);
+    }
+
+    HTCloseBzFile(bzfp);
+    if (rv == -1)
+	return HT_NO_DATA;
+    else if (rv == HT_INTERRUPTED || (rv > 0 && rv != HT_LOADED))
+	return HT_PARTIAL_CONTENT;
+    else
+	return HT_LOADED;
+}
+#endif /* USE_BZLIB */
+
 /*	Converter stream: Network Telnet to internal character text
 **	-----------------------------------------------------------
 **
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFormat.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFormat.h
index 63c96f5b70f..4ee14688e53 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFormat.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTFormat.h
@@ -38,7 +38,8 @@ typedef HTAtom * HTFormat;
 
  */
                         /* Internal ones */
-#define WWW_SOURCE HTAtom_for("www/source")     /* Whatever it was originally*/
+/* #define WWW_SOURCE HTAtom_for("www/source") */    /* Whatever it was originally*/
+extern HTAtom * WWW_SOURCE;     /* calculated once, heavy used */
 
 /*
 
@@ -343,7 +344,7 @@ extern int HTFileCopy PARAMS((
         HTStream*               sink));
 
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 #include <HTChunk.h>
 /*
 
@@ -424,7 +425,7 @@ extern int HTParseFile PARAMS((
         FILE            *fp,
         HTStream*       sink));
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 /*
 
 HTParseMem: Parse a document in memory
@@ -443,12 +444,9 @@ extern int HTParseMem PARAMS((
 #endif
 
 #ifdef USE_ZLIB
-
-#ifdef USE_ZLIB
 #include <zlib.h>
-#endif /* USE_ZLIB */
 /*
-HTParseGzFile: Parse a gzipped File through a file pointer
+HTParseGzFile: Parse a gzip'ed File through a file pointer
 
    This routine is called by protocols modules to load an object.  uses
    HTStreamStack and HTGzFileCopy.  Returns HT_LOADED if successful, can also
@@ -463,6 +461,24 @@ extern int HTParseGzFile PARAMS((
 
 #endif /* USE_ZLIB */
 
+#ifdef USE_BZLIB
+#include <bzlib.h>
+/*
+HTParseBzFile: Parse a bzip2'ed File through a file pointer
+
+   This routine is called by protocols modules to load an object.  uses
+   HTStreamStack and HTGzFileCopy.  Returns HT_LOADED if successful, can also
+   return HT_PARTIAL_CONTENT, HT_NO_DATA, or other <0 for failure.
+ */
+extern int HTParseBzFile PARAMS((
+        HTFormat        format_in,
+        HTFormat        format_out,
+        HTParentAnchor  *anchor,
+        BZFILE          *bzfp,
+        HTStream*       sink));
+
+#endif /* USE_BZLIB */
+
 /*
 
 HTNetToText: Convert Net ASCII to local representation
@@ -493,8 +509,5 @@ Epilogue
 
  */
 extern BOOL HTOutputSource;     /* Flag: shortcut parser */
-#endif
-
-/*
 
-   end */
+#endif /* HTFORMAT_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGopher.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGopher.c
index 96681e6649d..b47822ff931 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGopher.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGopher.c
@@ -327,23 +327,16 @@ PRIVATE void parse_menu ARGS2(
 
 	    } else if (port) {		/* Other types need port */
 		char *address = 0;
+		char *format = *selector ? "%s//%s@%s/" : "%s//%s/";
 
 		if (gtype == GOPHER_TELNET) {
 		    PUTS(" (TEL) ");
-		    if (*selector)
-			HTSprintf0(&address, "telnet://%s@%s/",
-					   selector, host);
-		    else
-			HTSprintf0(&address, "telnet://%s/", host);
+		    HTSprintf0(&address, format, STR_TELNET_URL, selector, host);
 		}
 		else if (gtype == GOPHER_TN3270)
 		{
 		    PUTS("(3270) ");
-		    if (*selector)
-			HTSprintf0(&address, "tn3270://%s@%s/",
-				selector, host);
-		    else
-			HTSprintf0(&address, "tn3270://%s/", host);
+		    HTSprintf0(&address, format, STR_TN3270_URL, selector, host);
 		}
 		else {			/* If parsed ok */
 		    char *r;
@@ -1339,7 +1332,7 @@ PRIVATE int generate_cso_report ARGS1(
 			    } else if (*l == '>') {
 				StrAllocCat(buf, "&gt;");
 				l++;
-			    } else if (strncmp(l, "news:", 5) &&
+			    } else if (strncmp(l, STR_NEWS_URL, LEN_NEWS_URL) &&
 				       strncmp(l, "snews://", 8) &&
 				       strncmp(l, "nntp://", 7) &&
 				       strncmp(l, "snewspost:", 10) &&
@@ -1352,7 +1345,7 @@ PRIVATE int generate_cso_report ARGS1(
 				       strncmp(l, "http://", 7) &&
 				       strncmp(l, "https://", 8) &&
 				       strncmp(l, "wais://", 7) &&
-				       strncmp(l, "mailto:", 7) &&
+				       strncmp(l, STR_MAILTO_URL, LEN_MAILTO_URL) &&
 				       strncmp(l, "cso://", 6) &&
 				       strncmp(l, "gopher://", 9)) {
 				HTSprintf(&buf, "%c", *l++);
@@ -1383,7 +1376,7 @@ PRIVATE int generate_cso_report ARGS1(
 			} else if (*l == '>') {
 			    StrAllocCat(buf, "&gt;");
 			    l++;
-			} else if (strncmp(l, "news:", 5) &&
+			} else if (strncmp(l, STR_NEWS_URL, LEN_NEWS_URL) &&
 				   strncmp(l, "snews://", 8) &&
 				   strncmp(l, "nntp://", 7) &&
 				   strncmp(l, "snewspost:", 10) &&
@@ -1396,7 +1389,7 @@ PRIVATE int generate_cso_report ARGS1(
 				   strncmp(l, "http://", 7) &&
 				   strncmp(l, "https://", 8) &&
 				   strncmp(l, "wais://", 7) &&
-				   strncmp(l, "mailto:", 7) &&
+				   strncmp(l, STR_MAILTO_URL, LEN_MAILTO_URL) &&
 				   strncmp(l, "cso://", 6) &&
 				   strncmp(l, "gopher://", 9)) {
 			    HTSprintf(&buf, "%c", *l++);
@@ -1440,11 +1433,11 @@ PRIVATE int HTLoadCSO ARGS4(
 	HTStream*,		sink)
 {
     static CONST char end_form[] = "</BODY>\n</HTML>\n";
-    char *host, *cp;
+    char *host, *cp, *data;
     int port = CSO_PORT;
     int status;				/* tcp return */
-    char *command = NULL;
-    char *content = NULL;
+    bstring *command = NULL;
+    bstring *content = NULL;
     int len, i, j, start, finish, flen, ndx;
     int return_type, has_indexed;
     CSOfield_info *fld;
@@ -1481,12 +1474,15 @@ PRIVATE int HTLoadCSO ARGS4(
 
     HTInitInput(s);		/* Set up input buffering */
 
-    HTSprintf0(&command, "fields%c%c", CR, LF);
-    CTRACE((tfp, "HTLoadCSO: Connected, writing command `%s' to socket %d\n",
-		command, s));
+    HTBprintf(&command, "fields%c%c", CR, LF);
+    if (TRACE) {
+	CTRACE((tfp, "HTLoadCSO: Connected, writing command `"));
+	trace_bstring(command);
+	CTRACE((tfp, "' to socket %d\n", s));
+    }
     _HTProgress (GOPHER_SENDING_CSO_REQUEST);
-    status = NETWRITE(s, command, (int)strlen(command));
-    FREE(command);
+    status = NETWRITE(s, BStrData(command), BStrLen(command));
+    BStrFree(command);
     if (status < 0) {
 	CTRACE((tfp, "HTLoadCSO: Unable to send command.\n"));
 	return HTInetStatus("send");
@@ -1521,7 +1517,7 @@ PRIVATE int HTLoadCSO ARGS4(
 	return HT_NOT_LOADED;
     }
     host = HTParse(arg, "", PARSE_HOST);
-    if ((cp=strchr(host, ':')) != NULL) {
+    if ((cp = strchr(host, ':')) != NULL) {
 	if (cp[1] >= '0' && cp[1] <= '9') {
 	    port = atoi((cp+1));
 	    if (port == CSO_PORT) {
@@ -1530,7 +1526,7 @@ PRIVATE int HTLoadCSO ARGS4(
 	}
     }
     anAnchor->safe = TRUE;
-    if (!(anAnchor->post_data && *anAnchor->post_data)) {
+    if (isBEmpty(anAnchor->post_data)) {
 	generate_cso_form(host, port, buf, Target);
 	(*Target->isa->_free)(Target);
 	FREE(host);
@@ -1539,66 +1535,72 @@ PRIVATE int HTLoadCSO ARGS4(
 	return HT_LOADED;
     }
 
-    HTSprintf0(&command,
+    HTBprintf(&command,
      "<HTML>\n<HEAD>\n<TITLE>CSO/PH Results on %s</TITLE>\n</HEAD>\n<BODY>\n",
 	    host);
-    (*Target->isa->put_block)(Target, command, strlen(command));
-    FREE(command);
+    (*Target->isa->put_block)(Target, BStrData(command), BStrLen(command));
+    BStrFree(command);
     FREE(host);
 
-    StrAllocCopy(content, anAnchor->post_data);
-    if (content[strlen(content)-1] != '&')
-	StrAllocCat(content, "&");
-    len = strlen(content);
+    BStrCopy(content, anAnchor->post_data);
+
+    if (BStrData(content)[BStrLen(content)-1] != '&')
+	BStrCat0(content, "&");
+
+    data = BStrData(content);
+    len = BStrLen(content);
     for (i = 0; i < len; i++) {
-	if (content[i] == '+') {
-	    content[i] = ' ';
+	if (data[i] == '+') {
+	    data[i] = ' ';
 	}
     }
-    HTUnEscape(content);
-    len = strlen(content);
+
+    data = BStrData(content);
+    HTUnEscape(data);		/* FIXME: could it have embedded null? */
+    len = BStrLen(content);
+
     return_type = 0;
     has_indexed = 0;
     start = finish = 0;
     for (i = 0; i < len; i++) {
-	if (!content[i] || content[i] == '&') {
+	if (!data[i] || data[i] == '&') {
 	    /*
 	    **	Value parsed.  Unescape characters and look for first '='
 	    **	to delimit field name from value.
 	    */
 	    flen = i - start;
 	    finish = start + flen;
-	    content[finish] = '\0';
+	    data[finish] = '\0';
 	    for (j = start; j < finish; j++) {
-		if (content[j] == '=') {
+		if (data[j] == '=') {
 		    /*
-		    **	content[start..j-1] is field name,
+		    **	data[start..j-1] is field name,
 		    **	[j+1..finish-1] is value.
 		    */
-		    if ((content[start+1] == '_') &&
-			((content[start] == 'r') || (content[start] == 'q'))) {
+		    if ((data[start+1] == '_') &&
+			((data[start] == 'r') || (data[start] == 'q'))) {
 			/*
 			**  Decode fields number and lookup field info.
 			*/
-			sscanf (&content[start+2], "%d=", &ndx);
+			sscanf (&data[start+2], "%d=", &ndx);
 			for (fld = CSOfields; fld; fld = fld->next) {
 			    if (ndx==fld->id) {
 				if ((j+1) >= finish)
 				    break;	/* ignore nulls */
-				if (content[start] == 'q') {
+				if (data[start] == 'q') {
 				    /*
 				     * Append field to query line.
 				     */
 				    if (fld->lookup) {
 					if (fld->indexed)
 					    has_indexed = 1;
-					if (command == 0 || *command == 0) {
-					    StrAllocCopy(command, "query ");
+					if (isBEmpty(command)) {
+					    BStrCopy0(command, "query ");
 					} else {
-					    StrAllocCat(command, " ");
+					    BStrCat0(command, " ");
 					}
-					HTSprintf(&command, "%s=\"%s\"",
-						  fld->name, &content[j+1]);
+					HTBprintf(&command, "%s=\"%s\"",
+						  fld->name, &data[j+1]);
 				    } else {
 					strcpy(buf,
 				"Warning: non-lookup field ignored<BR>\n");
@@ -1606,16 +1608,16 @@ PRIVATE int HTLoadCSO ARGS4(
 								  buf,
 								  strlen(buf));
 				    }
-				} else if (content[start] == 'r') {
+				} else if (data[start] == 'r') {
 				    fld->explicit_return = 1;
 				}
 				break;
 			    }
 			}
-		    } else if (!strncmp(&content[start],"return=",7)) {
-			if (!strcmp(&content[start+7],"all")) {
+		    } else if (!strncmp(&data[start], "return=", 7)) {
+			if (!strcmp(&data[start+7], "all")) {
 			    return_type = 1;
-			} else if (!strcmp(&content[start+7],"selected")) {
+			} else if (!strcmp(&data[start+7], "selected")) {
 			    return_type = 2;
 			}
 		    }
@@ -1624,8 +1626,8 @@ PRIVATE int HTLoadCSO ARGS4(
 	    start = i + 1;
 	}
     }
-    FREE(content);
-    if ((command == 0 || *command == 0) || !has_indexed) {
+    BStrFree(content);
+    if (isBEmpty(command) || !has_indexed) {
 	NETCLOSE(s);
 	strcpy(buf,
   "<EM>Error:</EM> At least one indexed field value must be specified!\n");
@@ -1640,25 +1642,28 @@ PRIVATE int HTLoadCSO ARGS4(
     **	Append return fields.
     */
     if (return_type == 1) {
-	StrAllocCat(command, " return all");
+	BStrCat0(command, " return all");
     } else if (return_type == 2) {
-	StrAllocCat(command, " return");
+	BStrCat0(command, " return");
 	for (fld = CSOfields; fld; fld = fld->next) {
 	    if (fld->explicit_return) {
-		HTSprintf(&command, " %s", fld->name);
+		HTBprintf(&command, " %s", fld->name);
 	    }
 	}
     }
-    HTSprintf(&command, "%c%c", CR, LF);
+    HTBprintf(&command, "%c%c", CR, LF);
     strcpy(buf, "<H2>\n<EM>CSO/PH command:</EM> ");
     (*Target->isa->put_block)(Target, buf, strlen(buf));
-    (*Target->isa->put_block)(Target, command, strlen(command));
+    (*Target->isa->put_block)(Target, BStrData(command), BStrLen(command));
     strcpy(buf, "</H2>\n");
     (*Target->isa->put_block)(Target, buf, strlen(buf));
-    CTRACE((tfp, "HTLoadCSO: Writing command `%s' to socket %d\n",
-		command, s));
-    status = NETWRITE(s, command, strlen(command));
-    FREE(command);
+    if (TRACE) {
+	CTRACE((tfp, "HTLoadCSO: Writing command `"));  
+	trace_bstring(command);
+	CTRACE((tfp, "' to socket %d\n", s));
+    }
+    status = NETWRITE(s, BStrData(command), BStrLen(command));
+    BStrFree(command);
     if (status < 0) {
 	CTRACE((tfp, "HTLoadCSO: Unable to send command.\n"));
 	free_CSOfields();
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGopher.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGopher.h
index 03b89675b8a..624c04d48e9 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGopher.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGopher.h
@@ -21,7 +21,3 @@ GLOBALREF HTProtocol HTGopher;
 #endif /* GLOBALREF_IS_MACRO */
 
 #endif /* HTGOPHER_H */
-
-/*
-
-   end of gopher module */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.c
index 2b16599fb6a..8f9e4d1d463 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.c
@@ -652,7 +652,7 @@ PUBLIC GroupDefList *HTAA_readGroupFile ARGS1(CONST char *, filename)
     FILE *fp;
     GroupCache *group_cache;
 
-    if (!filename || !*filename) return NULL;
+    if (isEmpty(filename)) return NULL;
 
     if (!group_cache_list)
 	group_cache_list = HTList_new();
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.h
index e78ac5938f5..5288b8d67ee 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTGroup.h
@@ -169,11 +169,5 @@ PUBLIC HTAAFailReasonType HTAA_userAndInetInGroup PARAMS((GroupDef * group,
                                                           char *     username,
                                                           char *     ip_number,
                                                           char *     ip_name));
-/*
-
- */
 
 #endif /* not HTGROUP_H */
-/*
-
-   End of file HTGroup.h.  */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTList.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTList.c
index 90871f901ad..7a517ec64ae 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTList.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTList.c
@@ -17,7 +17,7 @@ PUBLIC HTList * HTList_new NOARGS
 {
     HTList *newList;
 
-    if ((newList = typecalloc(HTList)) == NULL)
+    if ((newList = typeMalloc(HTList)) == NULL)
 	outofmem(__FILE__, "HTList_new");
 
     newList->object = NULL;
@@ -87,6 +87,43 @@ PUBLIC HTList * HTList_appendList ARGS2(
 }
 
 
+/*	Link object to START of list (so it is pointed to by the head).
+ *
+ *	Unlike HTList_addObject(), it does not malloc memory for HTList entry,
+ *	it use already allocated memory which should not be free'd by any
+ *	list operations (optimization).
+ */
+PUBLIC void HTList_linkObject ARGS3(
+	HTList *,	me,
+	void *,		newObject,
+	HTList *,	newNode)
+{
+    if (me) {
+	if (newNode->object == NULL && newNode->next == NULL) {
+	    /*  It is safe: */
+	    newNode->object = newObject;
+	    newNode->next = me->next;
+	    me->next = newNode;
+
+	} else {
+	    /*
+	     *  This node is already linked to some list (probably this one),
+	     *  so refuse changing node pointers to keep the list valid!!!
+	     */
+	    CTRACE((tfp, "*** HTList: Refuse linking already linked obj "));
+	    CTRACE((tfp, "%p, node %p, list %p\n",
+			newObject, newNode, me));
+	}
+
+    } else {
+	CTRACE((tfp, "HTList: Trying to link object %p to a nonexisting list\n",
+		    newObject));
+    }
+
+    return;
+}
+
+
 /*      Add object to START of list (so it is pointed to by the head).
 */
 PUBLIC void HTList_addObject ARGS2(
@@ -96,7 +133,7 @@ PUBLIC void HTList_addObject ARGS2(
     HTList *newNode;
 
     if (me) {
-	if ((newNode = typecalloc(HTList)) == NULL)
+	if ((newNode = typeMalloc(HTList)) == NULL)
 	    outofmem(__FILE__, "HTList_addObject");
 	newNode->object = newObject;
 	newNode->next = me->next;
@@ -157,7 +194,7 @@ PUBLIC void HTList_insertObjectAt ARGS3(
     prevNode = temp;
     while ((temp = temp->next)) {
 	if (Pos == 0) {
-	    if ((newNode = typecalloc(HTList)) == NULL)
+	    if ((newNode = typeMalloc(HTList)) == NULL)
 		outofmem(__FILE__, "HTList_addObjectAt");
 	    newNode->object = newObject;
 	    newNode->next = temp;
@@ -175,6 +212,32 @@ PUBLIC void HTList_insertObjectAt ARGS3(
 }
 
 
+/*	Unlink specified object from list.
+ *	It does not free memory.
+ */
+PUBLIC BOOL HTList_unlinkObject ARGS2(
+	HTList *,	me,
+	void *,		oldObject)
+{
+    HTList *temp = me;
+    HTList *prevNode;
+
+    if (temp && oldObject) {
+	while (temp->next) {
+	    prevNode = temp;
+	    temp = temp->next;
+	    if (temp->object == oldObject) {
+		prevNode->next = temp->next;
+		temp->next = NULL;
+		temp->object = NULL;
+		return YES;  /* Success */
+	    }
+	}
+    }
+    return NO;  /* object not found or NULL list */
+}
+
+
 /*	Remove specified object from list.
 */
 PUBLIC BOOL HTList_removeObject ARGS2(
@@ -230,6 +293,29 @@ PUBLIC void * HTList_removeObjectAt  ARGS2(
     return NULL;  /* Reached the end of the list */
 }
 
+/*	Unlink object from START of list (the Last one inserted
+ *	via HTList_linkObject(), and pointed to by the head).
+ *	It does not free memory.
+ */
+PUBLIC void * HTList_unlinkLastObject ARGS1(
+	HTList *,	me)
+{
+    HTList * lastNode;
+    void * lastObject;
+
+    if (me && me->next) {
+	lastNode = me->next;
+	lastObject = lastNode->object;
+	me->next = lastNode->next;
+	lastNode->next = NULL;
+	lastNode->object = NULL;
+	return lastObject;
+
+    } else {  /* Empty list */
+	return NULL;
+    }
+}
+
 
 /*	Remove object from START of list (the Last one inserted
 **	via HTList_addObject(), and pointed to by the head).
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTList.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTList.h
index e3ba6a0fbe6..19739d9c877 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTList.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTList.h
@@ -139,6 +139,29 @@ extern void * HTList_objectAt PARAMS((
 	HTList *	me,
 	int		position));
 
+/*      Link object to START of list (so it is pointed to by the head).
+ *
+ *      Unlike HTList_addObject(), it does not malloc memory for HTList entry,
+ *	it use already allocated memory which should not be free'd by any
+ *	list operations (optimization).
+ */
+extern void HTList_linkObject PARAMS((
+	HTList *	me,
+	void *		newObject,
+	HTList *	newNode));
 
-#endif /* HTLIST_H */
+/*	Unlink object from START of list (the Last one inserted
+ *	via HTList_linkObject(), and pointed to by the head).
+ *	It does not free memory.
+ */
+extern void * HTList_unlinkLastObject PARAMS((
+	HTList *	me));
 
+/*	Unlink specified object from list.
+ *	It does not free memory.
+ */
+extern BOOL HTList_unlinkObject PARAMS((
+	HTList *	me,
+	void *		oldObject));
+
+#endif /* HTLIST_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMIME.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMIME.c
index 2672b4060e4..3115acab856 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMIME.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMIME.c
@@ -22,12 +22,11 @@
 
 #include <LYCookie.h>
 #include <LYCharSets.h>
+#include <LYCharUtils.h>
 #include <LYStrings.h>
 #include <LYUtils.h>
 #include <LYLeaks.h>
 
-extern BOOL HTPassEightBitRaw;
-
 /*		MIME Object
 **		-----------
 */
@@ -75,6 +74,9 @@ typedef enum {
 	miPRAGMA,
 	miPROXY_AUTHENTICATE,
 	miPUBLIC,
+	miR,
+	miRE,
+	miREFRESH,
 	miRETRY_AFTER,
 	miS,
 	miSAFE,
@@ -130,6 +132,8 @@ struct _HTStream {
 	char *			set_cookie2;	/* Set-Cookie2 */
 	char *			location;	/* Location */
 
+	char *			refresh_url;	/* "Refresh:" URL */
+
 	HTFormat		encoding;	/* Content-Transfer-Encoding */
 	char *			compression_encoding;
 	HTFormat		format;		/* Content-Type */
@@ -165,6 +169,32 @@ PUBLIC void HTMIME_TrimDoubleQuotes ARGS1(
 	value[i] = cp[(i +1)];
 }
 
+PRIVATE BOOL content_is_compressed ARGS1(HTStream *, me)
+{
+    char *encoding = me->anchor->content_encoding;
+
+    return encoding != 0
+        && strcmp(encoding, "8bit") != 0
+	&& strcmp(encoding, "7bit") != 0
+	&& strcmp(encoding, "binary") != 0;
+}
+
+/*
+ * Strip quotes from a refresh-URL.
+ */
+PRIVATE void dequote ARGS1(char *, url)
+{
+    int len;
+
+    len = strlen(url);
+    if (*url == '\'' && len > 1 && url[len-1] == url[0]) {
+	url[len-1] = '\0';
+	while ((url[0] = url[1]) != '\0') {
+	    ++url;
+	}
+    }
+}
+
 PRIVATE int pumpData ARGS1(HTStream *, me)
 {
     if (strchr(HTAtom_name(me->format), ';') != NULL) {
@@ -174,13 +204,13 @@ PRIVATE int pumpData ARGS1(HTStream *, me)
 		HTAtom_name(me->format)));
 	StrAllocCopy(cp, HTAtom_name(me->format));
 	/*
-	**	Note that the Content-Type value was converted
-	**	to lower case when we loaded into me->format,
-	**	but there may have been a mixed or upper-case
-	**	atom, so we'll force lower-casing again.  We
-	**	also stripped spaces and double-quotes, but
-	**	we'll make sure they're still gone from any
-	**	charset parameter we check. - FM
+	** Note that the Content-Type value was converted
+	** to lower case when we loaded into me->format,
+	** but there may have been a mixed or upper-case
+	** atom, so we'll force lower-casing again.  We
+	** also stripped spaces and double-quotes, but
+	** we'll make sure they're still gone from any
+	** charset parameter we check.  - FM
 	*/
 	LYLowerCase(cp);
 	if ((cp1 = strchr(cp, ';')) != NULL) {
@@ -352,7 +382,7 @@ PRIVATE int pumpData ARGS1(HTStream *, me)
 		LYmktime(me->anchor->date, TRUE)) {
 		me->anchor->no_cache = TRUE;
 	    }
-	} else if (LYmktime(me->anchor->expires, FALSE) <= 0) {
+	} else if (LYmktime(me->anchor->expires, FALSE) == 0) {
 	    /*
 	    **  We don't have a Date header, and
 	    **  the value is in past for us. - FM
@@ -432,6 +462,26 @@ PRIVATE int pumpData ARGS1(HTStream *, me)
     } 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;
+	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);
+    }
     return HT_OK;
 }
 
@@ -605,20 +655,18 @@ PRIVATE int dispatchField ARGS1(HTStream *, me)
 	LYLowerCase(me->value);
 	StrAllocCopy(me->anchor->content_encoding, me->value);
 	FREE(me->compression_encoding);
-	if (!strcmp(me->value, "8bit") ||
-	    !strcmp(me->value, "7bit") ||
-	    !strcmp(me->value, "binary")) {
-	    /*
-	    **	Some server indicated "8bit", "7bit" or "binary"
-	    **	inappropriately.  We'll ignore it. - FM
-	    */
-	    CTRACE((tfp, "                Ignoring it!\n"));
-	} else {
+	if (content_is_compressed(me)) {
 	    /*
 	    **	Save it to use as a flag for setting
 	    **	up a "www/compressed" target. - FM
 	    */
 	    StrAllocCopy(me->compression_encoding, me->value);
+	} else {
+	    /*
+	    **	Some server indicated "8bit", "7bit" or "binary"
+	    **	inappropriately.  We'll ignore it. - FM
+	    */
+	    CTRACE((tfp, "                Ignoring it!\n"));
 	}
 	break;
     case miCONTENT_FEATURES:
@@ -800,6 +848,12 @@ PRIVATE int dispatchField ARGS1(HTStream *, me)
 	CTRACE((tfp, "HTMIME: PICKED UP Public: '%s'\n",
 		me->value));
 	break;
+    case miREFRESH:		/* nonstandard: Netscape */
+	HTMIME_TrimDoubleQuotes(me->value);
+	CTRACE((tfp, "HTMIME: PICKED UP Refresh: '%s'\n",
+		me->value));
+	StrAllocCopy(me->refresh_url, me->value);
+	break;
     case miRETRY_AFTER:
 	HTMIME_TrimDoubleQuotes(me->value);
 	CTRACE((tfp, "HTMIME: PICKED UP Retry-After: '%s'\n",
@@ -1032,10 +1086,8 @@ PRIVATE void HTMIME_put_character ARGS2(
 
 	case 'r':
 	case 'R':
-	    me->check_pointer = "etry-after:";
-	    me->if_ok = miRETRY_AFTER;
-	    me->state = miCHECK;
-	    CTRACE((tfp, "HTMIME: Got 'R' at beginning of line, checking for 'etry-after'\n"));
+	    me->state = miR;
+	    CTRACE((tfp, "HTMIME: Got 'R' at beginning of line, state now R\n"));
 	    break;
 
 	case 's':
@@ -1323,6 +1375,47 @@ PRIVATE void HTMIME_put_character ARGS2(
 	} /* switch on character */
 	break;
 
+    case miR:				/* Check for 'e' */
+	switch (c) {
+	case 'e':
+	case 'E':
+	    me->state = miRE;
+	    CTRACE((tfp, "HTMIME: Was R, found E\n"));
+	    break;
+	default:
+	    CTRACE((tfp, "HTMIME: Bad character `%c' found where `%s' expected\n",
+			c, "'e'"));
+	    goto bad_field_name;
+
+	} /* switch on character */
+	break;
+
+    case miRE:				/* Check for 'a' or 'o' */
+	switch (c) {
+	case 'f':
+	case 'F':			/* nonstandard: Netscape */
+	    me->check_pointer = "resh:";
+	    me->if_ok = miREFRESH;
+	    me->state = miCHECK;
+	    CTRACE((tfp, "HTMIME: Was RE, found F, checking for '%s'\n", me->check_pointer));
+	    break;
+
+	case 't':
+	case 'T':
+	    me->check_pointer = "ry-after:";
+	    me->if_ok = miRETRY_AFTER;
+	    me->state = miCHECK;
+	    CTRACE((tfp, "HTMIME: Was RE, found T, checking for '%s'\n", me->check_pointer));
+	    break;
+
+	default:
+	    CTRACE((tfp, "HTMIME: Bad character `%c' found where `%s' expected\n",
+			c, "'f' or 't'"));
+	    goto bad_field_name;
+
+	} /* switch on character */
+	break;
+
     case miS:				/* Check for 'a' or 'e' */
 	switch (c) {
 	case 'a':
@@ -1672,6 +1765,7 @@ PRIVATE void HTMIME_put_character ARGS2(
     case miPRAGMA:
     case miPROXY_AUTHENTICATE:
     case miPUBLIC:
+    case miREFRESH:
     case miRETRY_AFTER:
     case miSAFE:
     case miSERVER:
@@ -1889,8 +1983,9 @@ PUBLIC HTStream* HTMIMEConvert ARGS3(
     me->format	  =	WWW_HTML;
     me->targetRep =	pres->rep_out;
     me->boundary  =	NULL;		/* Not set yet */
-    me->set_cookie  =	NULL;		/* Not set yet */
-    me->set_cookie2  =	NULL;		/* Not set yet */
+    me->set_cookie =	NULL;		/* Not set yet */
+    me->set_cookie2 =	NULL;		/* Not set yet */
+    me->refresh_url =	NULL;		/* Not set yet */
     me->encoding  =	0;		/* Not set yet */
     me->compression_encoding = NULL;	/* Not set yet */
     me->net_ascii =	NO;		/* Local character set */
@@ -2172,7 +2267,7 @@ PUBLIC int HTrjis ARGS2(
 */
 /*
  * RJIS ( Recover JIS code from broken file )
- * $Header: /home/cvs/src/gnu/usr.bin/lynx/WWW/Library/Implementation/Attic/HTMIME.c,v 1.3 2003/05/01 18:59:36 avsm Exp $
+ * $Header: /home/cvs/src/gnu/usr.bin/lynx/WWW/Library/Implementation/Attic/HTMIME.c,v 1.4 2004/06/22 04:01:42 avsm Exp $
  * Copyright (C) 1992 1994
  * Hironobu Takahashi (takahasi@tiny.or.jp)
  *
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMIME.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMIME.h
index 818f38f2d29..211e21b4bd6 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMIME.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMIME.h
@@ -88,7 +88,3 @@ extern int HTmaybekanji PARAMS((
 	int	c2));
 
 #endif /* !HTMIME_H */
-
-/*
-
-   end of HTMIME */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLDTD.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLDTD.c
index 09d3902333d..8264f7d8cf7 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLDTD.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLDTD.c
@@ -791,7 +791,7 @@ static attr object_attr[] = {		/* OBJECT attributes */
 	{ "USEMAP"        T(h) },
 	{ "VSPACE"        T(N) },
 	{ "WIDTH"         T(N) },
-	{ 0               T(N) } 	/* Terminate list */
+	{ 0               T(N) }	/* Terminate list */
 };
 
 static attr olist_attr[] = {		/* OL attributes */
@@ -1663,7 +1663,8 @@ PUBLIC void HTSwitchDTD ARGS1(
     int,		new_flag)
 {
     if (TRACE)
-	CTRACE((tfp,"HTMLDTD: Copying DTD element info of size %d, %d * %d\n",
+	CTRACE((tfp,"HTMLDTD: Copying %s DTD element info of size %d, %d * %d\n",
+		new_flag ? "strict" : "tagsoup",
 		(int) (new_flag ? sizeof(tags_new) : sizeof(tags_old)),
 		HTML_ALL_ELEMENTS,
 		(int) sizeof(HTTag)));
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLDTD.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLDTD.h
index 79d1111fc2d..d6d210963ac 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLDTD.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLDTD.h
@@ -1034,9 +1034,4 @@ extern void HTStartIsIndex PARAMS((
 		CONST char *	prompt,
 		CONST char *	href));
 
-
 #endif /* HTMLDTD_H */
-
-/*
-
-   End of module definition  */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLGen.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLGen.h
index b34b39d2f4a..ee484078b86 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLGen.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTMLGen.h
@@ -24,9 +24,4 @@ extern HTStream * HTPlainToHTML PARAMS((
         HTParentAnchor *        anchor,
         HTStream *              sink));
 
-
-#endif
-
-/*
-
-    */
+#endif /* HTMLGEN_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTNews.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTNews.c
index 30068713170..651e66adadd 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTNews.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTNews.c
@@ -17,6 +17,7 @@
 #include <HTCJK.h>
 #include <HTMIME.h>
 #include <HTFont.h>
+#include <HTFormat.h>
 #include <HTTCP.h>
 #include <LYUtils.h>
 #include <LYStrings.h>
@@ -51,6 +52,7 @@ PRIVATE char HTNewsGetCharacter NOPARAMS;
 #endif /* USE_SSL */
 
 #include <HTML.h>
+#include <HTAccess.h>
 #include <HTParse.h>
 #include <HTFormat.h>
 #include <HTAlert.h>
@@ -59,7 +61,8 @@ PRIVATE char HTNewsGetCharacter NOPARAMS;
 #include <LYGlobalDefs.h>
 #include <LYLeaks.h>
 
-#define SnipIn(d,fmt,len,s) sprintf(d, fmt, (int)sizeof(d)-len, s)
+#define SnipIn(d,fmt,len,s)      sprintf(d, fmt,      (int)sizeof(d)-len, s)
+#define SnipIn2(d,fmt,tag,len,s) sprintf(d, fmt, tag, (int)sizeof(d)-len, s)
 
 struct _HTStructured {
 	CONST HTStructuredClass *	isa;
@@ -72,12 +75,6 @@ struct _HTStream
 
 #define LINE_LENGTH 512			/* Maximum length of line of ARTICLE etc */
 #define GROUP_NAME_LENGTH	256	/* Maximum length of group name */
-extern BOOLEAN scan_for_buried_news_references;
-extern BOOLEAN LYListNewsNumbers;
-extern BOOLEAN LYListNewsDates;
-extern int interrupted_in_htgetcharacter;
-extern BOOL keep_mime_headers;	 /* Include mime headers and force raw text */
-extern BOOL using_proxy;	/* Are we using an NNTP proxy? */
 
 /*
 **  Module-wide variables.
@@ -203,8 +200,8 @@ PRIVATE BOOL initialize NOARGS
 	cp = NULL;
     }
 #else
-    if (getenv("NNTPSERVER")) {
-	StrAllocCopy(HTNewsHost, (char *)getenv("NNTPSERVER"));
+    if (LYGetEnv("NNTPSERVER")) {
+	StrAllocCopy(HTNewsHost, LYGetEnv("NNTPSERVER"));
 	CTRACE((tfp, "HTNews: NNTPSERVER defined as `%s'\n",
 		    HTNewsHost));
     } else {
@@ -848,7 +845,7 @@ PRIVATE void post_article ARGS1(
     **	Open the temporary file with the
     **	nntp headers and message body. - FM
     */
-    if ((fd = fopen((postfile ? postfile : ""), TXT_R)) == NULL) {
+    if ((fd = fopen(NonNull(postfile), TXT_R)) == NULL) {
 	HTAlert(FAILED_CANNOT_OPEN_POST);
 	return;
     }
@@ -944,8 +941,7 @@ PRIVATE void post_article ARGS1(
 }
 
 #ifdef SH_EX	/* for MIME */
-#define NEWS_DEBUG 0
-#if NEWS_DEBUG
+#ifdef NEWS_DEBUG
 /* for DEBUG 1997/11/07 (Fri) 17:20:16 */
 void debug_print(unsigned char *p)
 {
@@ -987,7 +983,7 @@ static char *decode_mime(char *str)
 	    q = p + 1;
 	}
     }
-#if NEWS_DEBUG
+#ifdef NEWS_DEBUG
     printf("new=[");
     debug_print(temp);
 #endif
@@ -1146,7 +1142,7 @@ PRIVATE int read_article ARGS1(
 	if (from || replyto) {
 	    char *temp = NULL;
 	    StrAllocCopy(temp, author_address(replyto ? replyto : from));
-	    StrAllocCopy(href,"mailto:");
+	    StrAllocCopy(href, STR_MAILTO_URL);
 	    if (strchr(temp, '%') || strchr(temp, '?')) {
 		cp = HTEscape(temp, URL_XPALPHAS);
 		StrAllocCat(href, cp);
@@ -1292,7 +1288,7 @@ PRIVATE int read_article ARGS1(
 	    **	so add a link for posting followups for
 	    **	this article. - FM
 	    */
-	    if (!strncasecomp(NewsHREF, "snews:", 6))
+	    if (!strncasecomp(NewsHREF, STR_SNEWS_URL, 6))
 		StrAllocCopy(href,"snewsreply://");
 	    else
 		StrAllocCopy(href,"newsreply://");
@@ -1391,7 +1387,7 @@ PRIVATE int read_article ARGS1(
 	if (((char)ich == LF) || (p == &line[LINE_LENGTH])) {
 	    *p++ = '\0';			/* Terminate the string */
 	    CTRACE((tfp, "B %s", line));
-#if NEWS_DEBUG	/* 1997/11/09 (Sun) 15:56:11 */
+#ifdef NEWS_DEBUG	/* 1997/11/09 (Sun) 15:56:11 */
 	    debug_print(line);	/* @@@ */
 #endif
 	    if (line[0] == '.') {
@@ -1441,7 +1437,7 @@ PRIVATE int read_article ARGS1(
 			    p2 += 7;
 			    *p2 = 0;
 			    while (*l) {
-				if (strncmp(l, "news:", 5) &&
+				if (strncmp(l, STR_NEWS_URL, LEN_NEWS_URL) &&
 				    strncmp(l, "snews://", 8) &&
 				    strncmp(l, "nntp://", 7) &&
 				    strncmp(l, "snewspost:", 10) &&
@@ -1454,7 +1450,7 @@ PRIVATE int read_article ARGS1(
 				    strncmp(l, "http://", 7) &&
 				    strncmp(l, "https://", 8) &&
 				    strncmp(l, "wais://", 7) &&
-				    strncmp(l, "mailto:", 7) &&
+				    strncmp(l, STR_MAILTO_URL, LEN_MAILTO_URL) &&
 				    strncmp(l, "cso://", 6) &&
 				    strncmp(l, "gopher://", 9)) {
 				    PUTC (*l++);
@@ -1480,7 +1476,7 @@ PRIVATE int read_article ARGS1(
 			}
 		    }
 		    while (*l) {		/* Last bit of the line */
-			if (strncmp(l, "news:", 5) &&
+			if (strncmp(l, STR_NEWS_URL, LEN_NEWS_URL) &&
 			    strncmp(l, "snews://", 8) &&
 			    strncmp(l, "nntp://", 7) &&
 			    strncmp(l, "snewspost:", 10) &&
@@ -1493,7 +1489,7 @@ PRIVATE int read_article ARGS1(
 			    strncmp(l, "http://", 7) &&
 			    strncmp(l, "https://", 8) &&
 			    strncmp(l, "wais://", 7) &&
-			    strncmp(l, "mailto:", 7) &&
+			    strncmp(l, STR_MAILTO_URL, LEN_MAILTO_URL) &&
 			    strncmp(l, "cso://", 6) &&
 			    strncmp(l, "gopher://", 9))
 			    PUTC (*l++);
@@ -2097,7 +2093,7 @@ add_post:
 
 	START(HTML_HR);
 	PUTC('\n');
-	if (!strncasecomp(NewsHREF, "snews:", 6))
+	if (!strncasecomp(NewsHREF, STR_SNEWS_URL, 6))
 	    StrAllocCopy(href,"snewspost://");
 	else
 	    StrAllocCopy(href,"newspost://");
@@ -2178,7 +2174,7 @@ PRIVATE int HTLoadNews ARGS4(
 	**	xxxxx			News group (no "@")
 	**	group/n1-n2		Articles n1 to n2 in group
 	*/
-	normal_url = (BOOL) (!strncmp(arg, "news:", 5) || !strncmp(arg, "nntp:", 5));
+	normal_url = (BOOL) (!strncmp(arg, STR_NEWS_URL, LEN_NEWS_URL) || !strncmp(arg, "nntp:", 5));
 	spost_wanted = (BOOL) (!normal_url && strstr(arg, "snewspost:") != NULL);
 	sreply_wanted = (BOOL) (!(normal_url || spost_wanted) &&
 			 strstr(arg, "snewsreply:") != NULL);
@@ -2254,7 +2250,7 @@ PRIVATE int HTLoadNews ARGS4(
 	**  rules.  For instance, if the article reference contains a '#',
 	**  the rest of it is lost -- JFG 10/7/92, from a bug report
 	*/
-	} else if (!strncasecomp (arg, "nntp:", 5)) {
+	} else if (isNNTP_URL(arg)) {
 	    if (((*(arg + 5) == '\0') ||
 		 (!strcmp((arg + 5), "/") ||
 		  !strcmp((arg + 5), "//") ||
@@ -2285,10 +2281,10 @@ PRIVATE int HTLoadNews ARGS4(
 		StrAllocCopy(NewsHost, cp);
 	    }
 	    FREE(cp);
-	    SnipIn(command, "nntp://%.*s/", 9, NewsHost);
+	    SnipIn2(command, "%s//%.*s/", STR_NNTP_URL, 9, NewsHost);
 	    StrAllocCopy(NewsHREF, command);
 	}
-	else if (!strncasecomp(arg, "snews:", 6)) {
+	else if (!strncasecomp(arg, STR_SNEWS_URL, 6)) {
 #ifdef USE_SSL
 	    if (((*(arg + 6) == '\0') ||
 		 (!strcmp((arg + 6), "/") ||
@@ -2317,10 +2313,10 @@ PRIVATE int HTLoadNews ARGS4(
 		    NEWS_NETCLOSE(s);
 		    s = -1;
 		}
-	    StrAllocCopy(NewsHost, cp);
+		StrAllocCopy(NewsHost, cp);
 	    }
 	    FREE(cp);
-	    sprintf(command, "snews://%.250s/", NewsHost);
+	    sprintf(command, "%s//%.250s/", STR_SNEWS_URL, NewsHost);
 	    StrAllocCopy(NewsHREF, command);
 #else
 	    HTAlert(gettext("This client does not contain support for SNEWS URLs."));
@@ -2369,7 +2365,7 @@ PRIVATE int HTLoadNews ARGS4(
 		s = -1;
 	    }
 	    StrAllocCopy(NewsHost, HTNewsHost);
-	    StrAllocCopy(NewsHREF, "news:");
+	    StrAllocCopy(NewsHREF, STR_NEWS_URL);
 	}
 
 	/*
@@ -2378,15 +2374,15 @@ PRIVATE int HTLoadNews ARGS4(
 	**  doing the conversion itself, and for handling posts
 	**  or followups.  - TZ & FM
 	*/
-	if (!strncasecomp(p1, "snews:", 6) ||
+	if (!strncasecomp(p1, STR_SNEWS_URL, 6) ||
 	    !strncasecomp(p1, "snewspost:", 10) ||
 	    !strncasecomp(p1, "snewsreply:", 11)) {
 	    StrAllocCopy(ProxyHost, NewsHost);
 	    if ((cp = HTParse(p1, "", PARSE_HOST)) != NULL && *cp != '\0') {
-		SnipIn(command, "snews://%.*s", 10, cp);
+		SnipIn2(command, "%s//%.*s", STR_SNEWS_URL, 10, cp);
 		StrAllocCopy(NewsHost, cp);
 	    } else {
-		SnipIn(command, "snews://%.*s", 10, NewsHost);
+		SnipIn2(command, "%s//%.*s", STR_SNEWS_URL, 10, NewsHost);
 	    }
 	    command[sizeof(command)-2] = '\0';
 	    FREE(cp);
@@ -2552,7 +2548,7 @@ PRIVATE int HTLoadNews ARGS4(
 	if (s < 0) {
 	    /* CONNECTING to news host */
 	    char url[260];
-	    if (!strcmp(NewsHREF, "news:")) {
+	    if (!strcmp(NewsHREF, STR_NEWS_URL)) {
 		SnipIn (url, "lose://%.*s/", 9, NewsHost);
 	    } else if (ProxyHREF) {
 		SnipIn (url, "%.*s", 1, ProxyHREF);
@@ -2565,7 +2561,7 @@ PRIVATE int HTLoadNews ARGS4(
 
 #ifdef USE_SSL
 	    if (!using_proxy &&
-		(!strncmp(arg, "snews:", 6) ||
+		(!strncmp(arg, STR_SNEWS_URL, 6) ||
 		 !strncmp(arg, "snewspost:", 10) ||
 		 !strncmp(arg, "snewsreply:", 11)))
 		status = HTDoConnect (url, "NNTPS", SNEWS_PORT, &s);
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTParse.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTParse.c
index 8f58089267d..d3eaf3a8656 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTParse.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTParse.c
@@ -5,7 +5,18 @@
 #include <HTUtils.h>
 #include <HTParse.h>
 
+#include <LYUtils.h>
 #include <LYLeaks.h>
+#include <LYStrings.h>
+#include <LYCharUtils.h>
+
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#else
+#ifdef __MINGW32__
+#include <malloc.h>
+#endif /* __MINGW32__ */
+#endif
 
 #define HEX_ESCAPE '%'
 
@@ -44,8 +55,8 @@ PUBLIC char * HTStrip ARGS1(
     return s;
 }
 
-/*	Scan a filename for its consituents.			scan()
-**	------------------------------------
+/*	Scan a filename for its constituents.			scan()
+**	-------------------------------------
 **
 ** On entry,
 **	name	points to a document name which may be incomplete.
@@ -60,9 +71,6 @@ PRIVATE void scan ARGS2(
 {
     char * after_access;
     char * p;
-#ifdef NOTDEFINED
-    int length = strlen(name);
-#endif /* NOTDEFINED */
 
     parts->access = NULL;
     parts->host = NULL;
@@ -86,9 +94,6 @@ PRIVATE void scan ARGS2(
 	    break;
     }
 
-#ifdef NOTDEFINED
-    for (p = (name + length-1); p >= name; p--) {}
-#endif /* NOTDEFINED */
     /*
     **	Scan left-to-right for a fragment (anchor).
     */
@@ -130,7 +135,8 @@ PRIVATE void scan ARGS2(
     /*
     **	Check schemes that commonly have unescaped hashes.
     */
-    if (parts->access && parts->anchor) {
+    if (parts->access && parts->anchor &&
+		/* optimize */ strchr("lnsdLNSD", *parts->access) != NULL) {
 	if ((!parts->host && strcasecomp(parts->access, "lynxcgi")) ||
 	    !strcasecomp(parts->access, "nntp") ||
 	    !strcasecomp(parts->access, "snews") ||
@@ -150,21 +156,15 @@ PRIVATE void scan ARGS2(
 	    }
 	}
     }
-
-#ifdef NOT_DEFINED	/* search is just treated as part of path */
-    {
-	char *p = (relative ? relative : absolute);
-	if (p != NULL) {
-	    char *q = strchr(p, '?');	/* Any search string? */
-	    if (q != NULL) {
-		*q = '\0';		/* If so, chop that off. */
-		parts->search = (q + 1);
-	    }
-	}
-    }
-#endif /* NOT_DEFINED */
 } /*scan */
 
+#if defined(HAVE_ALLOCA) && !defined(LY_FIND_LEAKS)
+#define LYalloca(x)        alloca(x)
+#define LYalloca_free(x)   {}
+#else
+#define LYalloca(x)        malloc(x)
+#define LYalloca_free(x)   free(x)
+#endif
 
 /*	Parse a Name relative to another name.			HTParse()
 **	--------------------------------------
@@ -178,7 +178,7 @@ PRIVATE void scan ARGS2(
 **	wanted		A mask for the bits which are wanted.
 **
 ** On exit,
-**	returns		A pointer to a calloc'd string which MUST BE FREED
+**     returns         A pointer to a malloc'd string which MUST BE FREED
 */
 PUBLIC char * HTParse ARGS3(
 	CONST char *,	aName,
@@ -186,8 +186,9 @@ PUBLIC char * HTParse ARGS3(
 	int,		wanted)
 {
     char * result = NULL;
+    char * tail = NULL;  /* a pointer to the end of the 'result' string */
     char * return_value = NULL;
-    int len;
+    int len, len1, len2;
     char * name = NULL;
     char * rel = NULL;
     char * p;
@@ -204,26 +205,58 @@ PUBLIC char * HTParse ARGS3(
 	if (wanted & PARSE_PATH) /* if PARSE_PATH wanted */
 	    wanted &= ~(PARSE_STRICTPATH | PARSE_QUERY); /* ignore details */
     }
+    CTRACE((tfp, "   want:%s%s%s%s%s%s%s\n",
+	    wanted & PARSE_PUNCTUATION ? " punc"   : "",
+	    wanted & PARSE_ANCHOR      ? " anchor" : "",
+	    wanted & PARSE_PATH        ? " path"   : "",
+	    wanted & PARSE_HOST        ? " host"   : "",
+	    wanted & PARSE_ACCESS      ? " access" : "",
+	    wanted & PARSE_STRICTPATH  ? " PATH"   : "",
+	    wanted & PARSE_QUERY       ? " QUERY"  : ""));
+
     /*
-    **	Allocate the output string.
+    ** Allocate the temporary string. Optimized.
     */
-    len = strlen(aName) + strlen(relatedName) + 10;
-    result = typecallocn(char, len);	/* Lots of space: more than enough */
+    len1 = strlen(aName) + 1;
+    len2 = strlen(relatedName) + 1;
+    len = len1 + len2 + 8;     /* Lots of space: more than enough */
+
+    result = tail = (char*)LYalloca(len * 2 + len1 + len2);
     if (result == NULL) {
 	outofmem(__FILE__, "HTParse");
     }
+    *result = '\0';
+    name = result + len;
+    rel = name + len1;
 
     /*
-    **	Make working copies of the input strings to cut up.
+    **	Make working copy of the input string to cut up.
     */
-    StrAllocCopy(name, aName);
-    StrAllocCopy(rel, relatedName);
+    memcpy(name, aName, len1);
 
     /*
-    **	Cut up the strings into URL fields.
+    **	Cut up the string into URL fields.
     */
     scan(name, &given);
-    scan(rel,  &related);
+
+    /*
+    **	Now related string.
+    */
+    if ((given.access && given.host && given.absolute) || !*relatedName) {
+	/*
+	**  Inherit nothing!
+	*/
+	related.access = NULL;
+	related.host = NULL;
+	related.absolute = NULL;
+	related.relative = NULL;
+	related.search = NULL;
+	related.anchor = NULL;
+    } else {
+	memcpy(rel, relatedName, len2);
+	scan(rel,  &related);
+    }
+
 
     /*
     **	Handle the scheme (access) field.
@@ -240,9 +273,12 @@ PUBLIC char * HTParse ARGS3(
     acc_method = given.access ? given.access : related.access;
     if (wanted & PARSE_ACCESS) {
 	if (acc_method) {
-	    strcat(result, acc_method);
-	    if (wanted & PARSE_PUNCTUATION)
-		strcat(result, ":");
+	    strcpy(tail, acc_method);
+	    tail += strlen(tail);
+	    if (wanted & PARSE_PUNCTUATION) {
+		*tail++ = ':';
+		*tail = '\0';
+	    }
 	}
     }
 
@@ -275,17 +311,19 @@ PUBLIC char * HTParse ARGS3(
     /*
     **	Handle the host field.
     */
-    if (wanted & PARSE_HOST)
+    if (wanted & PARSE_HOST) {
 	if (given.host || related.host) {
-	    char *tail = result + strlen(result);
-	    if (wanted & PARSE_PUNCTUATION)
-		strcat(result, "//");
-	    strcat(result, given.host ? given.host : related.host);
+	    if (wanted & PARSE_PUNCTUATION) {
+		*tail++ = '/';
+		*tail++ = '/';
+	    }
+	    strcpy(tail, given.host ? given.host : related.host);
 #define CLEAN_URLS
 #ifdef CLEAN_URLS
 	    /*
 	    **	Ignore default port numbers, and trailing dots on FQDNs,
 	    **	which will only cause identical addresses to look different.
+	    **  (related is already a clean url).
 	    */
 	    {
 		char *p2, *h;
@@ -321,10 +359,10 @@ PUBLIC char * HTParse ARGS3(
 		    *p2 = '\0'; /* It is the default: ignore it */
 		}
 		if (p2 == NULL) {
-		    int len2 = strlen(tail);
+		    int len3 = strlen(tail);
 
-		    if (len2 > 0) {
-			h = tail + len2 - 1;	/* last char of hostname */
+		    if (len3 > 0) {
+			h = tail + len3 - 1;	/* last char of hostname */
 			if (*h == '.')
 			    *h = '\0';		/* chop final . */
 		    }
@@ -343,6 +381,13 @@ PUBLIC char * HTParse ARGS3(
 	    }
 #endif /* CLEAN_URLS */
 	}
+    }
+
+    /*
+     * Trim any blanks from the result so far - there's no excuse for blanks
+     * in a hostname.  Also update the tail here.
+     */
+    tail = LYRemoveBlanks(result);
 
     /*
     **	If host in given or related was ended directly with a '?' (no
@@ -350,7 +395,6 @@ PUBLIC char * HTParse ARGS3(
     **  case search is returned from scan.  A host must have been present.
     **  this restores the '?' at which the host part had been truncated in
     **  scan, we have to do this after host part handling is done. - kw
-    **
     */
     if (given.search && *(given.search - 1) == '\0') {
 	given.absolute = given.search - 1;
@@ -375,54 +419,64 @@ PUBLIC char * HTParse ARGS3(
     **	Handle the path.
     */
     if (wanted & (PARSE_PATH | PARSE_STRICTPATH | PARSE_QUERY)) {
-	char *tail = NULL;
 	int want_detail = (wanted & (PARSE_STRICTPATH | PARSE_QUERY));
-	if (want_detail)
-	    tail = result + strlen(result);
+
 	if (acc_method && !given.absolute && given.relative) {
-	    if (!strcasecomp(acc_method, "nntp") ||
-		!strcasecomp(acc_method, "snews") ||
-		(!strcasecomp(acc_method, "news") &&
-		 !strncasecomp(result, "news://", 7))) {
-		/*
-		 *  Treat all given nntp or snews paths,
-		 *  or given paths for news URLs with a host,
-		 *  as absolute.
-		 */
-		given.absolute = given.relative;
-		given.relative = NULL;
+	    /*
+	     * Treat all given nntp or snews paths, or given paths for news
+	     * URLs with a host, as absolute.
+	     */
+	    switch (*acc_method) {
+	    case 'N':
+	    case 'n':
+		if (!strcasecomp(acc_method, "nntp") ||
+		    (!strcasecomp(acc_method, "news") &&
+		     !strncasecomp(result, "news://", 7))) {
+		    given.absolute = given.relative;
+		    given.relative = NULL;
+		}
+		break;
+	    case 'S':
+	    case 's':
+		if (!strcasecomp(acc_method, "snews")) {
+		    given.absolute = given.relative;
+		    given.relative = NULL;
+		}
+		break;
 	    }
 	}
+
 	if (given.absolute) {			/* All is given */
 	    if (wanted & PARSE_PUNCTUATION)
-		strcat(result, "/");
-	    strcat(result, given.absolute);
+		*tail++ = '/';
+	    strcpy(tail, given.absolute);
 	    CTRACE((tfp, "HTParse: (ABS)\n"));
 	} else if (related.absolute) {		/* Adopt path not name */
-	    strcat(result, "/");
-	    strcat(result, related.absolute);
+	    *tail++ = '/';
+	    strcpy(tail, related.absolute);
 	    if (given.relative) {
-		p = strchr(result, '?');	/* Search part? */
+		p = strchr(tail, '?');	/* Search part? */
 		if (p == NULL)
-		    p = (result + strlen(result) - 1);
+		    p = (tail + strlen(tail) - 1);
 		for (; *p != '/'; p--)
 		    ;				/* last / */
 		p[1] = '\0';			/* Remove filename */
-		strcat(result, given.relative); /* Add given one */
+		strcat(p, given.relative); /* Add given one */
 		HTSimplify (result);
 	    }
 	    CTRACE((tfp, "HTParse: (Related-ABS)\n"));
 	} else if (given.relative) {
-	    strcat(result, given.relative);		/* what we've got */
+	    strcpy(tail, given.relative);		/* what we've got */
 	    CTRACE((tfp, "HTParse: (REL)\n"));
 	} else if (related.relative) {
-	    strcat(result, related.relative);
+	    strcpy(tail, related.relative);
 	    CTRACE((tfp, "HTParse: (Related-REL)\n"));
 	} else {  /* No inheritance */
-	    if (strncasecomp(aName, "lynxcgi:", 8) &&
-		strncasecomp(aName, "lynxexec:", 9) &&
-		strncasecomp(aName, "lynxprog:", 9)) {
-		strcat(result, "/");
+	    if (!isLYNXCGI(aName) &&
+		!isLYNXEXEC(aName) &&
+		!isLYNXPROG(aName)) {
+		*tail++ = '/';
+		*tail = '\0';
 	    }
 	    if (!strcmp(result, "news:/"))
 		result[5] = '*';
@@ -448,31 +502,116 @@ PUBLIC char * HTParse ARGS3(
     }
 
     /*
-    **	Handle the fragment (anchor).
+    **	Handle the fragment (anchor). Never inherit.
     */
-    if (wanted & PARSE_ANCHOR)
-	if ((given.anchor && *given.anchor) ||
-	    (!given.anchor && related.anchor)) {
+    if (wanted & PARSE_ANCHOR) {
+	if (given.anchor && *given.anchor) {
+	    tail += strlen(tail);
 	    if (wanted & PARSE_PUNCTUATION)
-		strcat(result, "#");
-	    strcat(result, (given.anchor) ?
-			     given.anchor : related.anchor);
+		*tail++ = '#';
+	    strcpy(tail, given.anchor);
+	}
+    }
+
+    /*
+     * If there are any blanks remaining in the string, escape them as needed.
+     * See the discussion in LYLegitimizeHREF() for example.
+     */
+    if ((p = strchr(result, ' ')) != 0) {
+	switch (is_url(result)) {
+	case UNKNOWN_URL_TYPE:
+	    CTRACE((tfp, "HTParse:      ignore:`%s'\n", result));
+	    break;
+	case LYNXEXEC_URL_TYPE:
+	case LYNXPROG_URL_TYPE:
+	case LYNXCGI_URL_TYPE:
+	case LYNXPRINT_URL_TYPE:
+	case LYNXHIST_URL_TYPE:
+	case LYNXDOWNLOAD_URL_TYPE:
+	case LYNXKEYMAP_URL_TYPE:
+	case LYNXIMGMAP_URL_TYPE:
+	case LYNXCOOKIE_URL_TYPE:
+	case LYNXDIRED_URL_TYPE:
+	case LYNXOPTIONS_URL_TYPE:
+	case LYNXCFG_URL_TYPE:
+	case LYNXCOMPILE_OPTS_URL_TYPE:
+	case LYNXMESSAGES_URL_TYPE:
+	    CTRACE((tfp, "HTParse:      spaces:`%s'\n", result));
+	    break;
+	case NOT_A_URL_TYPE:
+	default:
+	    CTRACE((tfp, "HTParse:      encode:`%s'\n", result));
+	    do {
+		char *q = p + strlen(p) + 2;
+		while (q != p + 1) {
+		    q[0] = q[-2];
+		    --q;
+		}
+		p[0] = '%';
+		p[1] = '2';
+		p[2] = '0';
+	    } while ((p = strchr(result, ' ')) != 0);
+	    break;
 	}
-    CTRACE((tfp, "HTParse:      result:%s\n", result));
-    FREE(rel);
-    FREE(name);
+    }
+    CTRACE((tfp, "HTParse:      result:`%s'\n", result));
 
     StrAllocCopy(return_value, result);
-    FREE(result);
+    LYalloca_free(result);
+
+    /* FIXME: could be optimized using HTParse() internals */
+    if (*relatedName &&
+	((wanted & PARSE_ALL_WITHOUT_ANCHOR) == PARSE_ALL_WITHOUT_ANCHOR)) {
+	/*
+	 *  Check whether to fill in localhost. - FM
+	 */
+	LYFillLocalFileURL(&return_value, relatedName);
+	CTRACE((tfp, "pass LYFillLocalFile:`%s'\n", return_value));
+    }
 
     return return_value;		/* exactly the right length */
 }
 
+/*	HTParseAnchor(), fast HTParse() specialization
+**	----------------------------------------------
+**
+** On exit,
+**	returns		A pointer within input string (probably to its end '\0')
+*/
+PUBLIC CONST char * HTParseAnchor ARGS1(
+	CONST char *,	aName)
+{
+    CONST char* p = aName;
+    for ( ; *p && *p != '#'; p++)
+	;
+    if (*p == '#') {
+	/* the safe way based on HTParse() -
+	 * keeping in mind scan() peculiarities on schemes:
+	 */
+	struct struct_parts given;
+
+	char* name = (char*)LYalloca((p - aName) + strlen(p) + 1);
+	if (name == NULL) {
+	    outofmem(__FILE__, "HTParseAnchor");
+	}
+	strcpy(name, aName);
+	scan(name, &given);
+	LYalloca_free(name);
+
+	p++; /*next to '#'*/
+	if (given.anchor == NULL) {
+	    for ( ; *p; p++)  /*scroll to end '\0'*/
+		;
+	}
+    }
+    return p;
+}
+
 /*	Simplify a filename.				HTSimplify()
 **	--------------------
 **
-**  A unix-style file is allowed to contain the seqeunce xxx/../ which may
-**  be replaced by "" , and the seqeunce "/./" which may be replaced by "/".
+**  A unix-style file is allowed to contain the sequence xxx/../ which may
+**  be replaced by "" , and the sequence "/./" which may be replaced by "/".
 **  Simplification helps us recognize duplicate filenames.
 **
 **	Thus,	/etc/junk/../fred	becomes /etc/fred
@@ -540,15 +679,6 @@ PUBLIC void HTSimplify ARGS1(
 			while (*q1 != '\0')
 			    *p++ = *q1++;
 			*p = '\0';		/* terminate */
-#ifdef NOTDEFINED
-			/*
-			**  Make sure filename has at least one slash.
-			*/
-			if (*filename == '\0') {
-			    *filename = '/';
-			    *(filename + 1) = '\0';
-			}
-#endif /* NOTDEFINED */
 			/*
 			**  Start again with previous slash.
 			*/
@@ -561,7 +691,7 @@ PUBLIC void HTSimplify ARGS1(
 		    q = p;
 		    q1 = (p + 2);
 		    while (*q1 != '\0')
-		       *q++ = *q1++;
+			*q++ = *q1++;
 		    *q = '\0';		/* terminate */
 		    p--;
 		} else if (p[1] == '.' && p[2] == '?') {
@@ -571,7 +701,7 @@ PUBLIC void HTSimplify ARGS1(
 		    q = (p + 1);
 		    q1 = (p + 2);
 		    while (*q1 != '\0')
-		       *q++ = *q1++;
+			*q++ = *q1++;
 		    *q = '\0';		/* terminate */
 		    p--;
 		} else if (p[1] == '.' && p[2] == '\0') {
@@ -632,7 +762,7 @@ PUBLIC void HTSimplify ARGS1(
 **
 ** This function creates and returns a string which gives an expression of
 ** one address as related to another.  Where there is no relation, an absolute
-** address is retured.
+** address is returned.
 **
 **  On entry,
 **	Both names must be absolute, fully qualified names of nodes
@@ -691,8 +821,8 @@ PUBLIC char * HTRelative ARGS2(
 	strcat(result, last_slash+1);
     }
     CTRACE((tfp,
-	"HTparse: `%s' expressed relative to\n	 `%s' is\n   `%s'.\n",
-		aName, relatedName, result));
+	    "HTparse: `%s' expressed relative to\n   `%s' is\n   `%s'.\n",
+	    aName, relatedName, result));
     return result;
 }
 
@@ -704,7 +834,7 @@ PUBLIC char * HTRelative ARGS2(
 **	It returns a string which has these characters
 **	represented by a '%' character followed by two hex digits.
 **
-**	Unlike HTUnEscape(), this routine returns a calloced string.
+**	Unlike HTUnEscape(), this routine returns a calloc'd string.
 */
 PRIVATE CONST unsigned char isAcceptable[96] =
 
@@ -818,7 +948,7 @@ PUBLIC char * HTEscapeSP ARGS2(
 	if (a == 32) {
 	    *q++ = '+';
 	} else if (!ACCEPTABLE(a)) {
-	    *q++ = HEX_ESCAPE;	/* Means hex commming */
+	    *q++ = HEX_ESCAPE;	/* Means hex coming */
 	    *q++ = hex[a >> 4];
 	    *q++ = hex[a & 15];
 	} else {
@@ -834,7 +964,7 @@ PUBLIC char * HTEscapeSP ARGS2(
 **
 **	This function takes a pointer to a string in which some
 **	characters may have been encoded in %xy form, where xy is
-**	the acsii hex code for character 16x+y.
+**	the ASCII hex code for character 16x+y.
 **	The string is converted in place, as it will never grow.
 */
 PRIVATE char from_hex ARGS1(
@@ -888,7 +1018,7 @@ PUBLIC char * HTUnEscape ARGS1(
 **							    (kweide@tezcat.com)
 **	This function takes a pointer to a string in which some
 **	characters may have been encoded in %xy form, where xy is
-**	the acsii hex code for character 16x+y, and a pointer to
+**	the ASCII hex code for character 16x+y, and a pointer to
 **	a second string containing one or more characters which
 **	should be unescaped if escaped in the first string.
 **	The first string is converted in place, as it will never grow.
@@ -939,17 +1069,21 @@ PRIVATE CONST unsigned char crfc[96] =
 
 /*
 **  Turn a string which is not a RFC 822 token into a quoted-string. - KW
+**  The "quoted" parameter tells whether we need the beginning/ending quote
+**  marks.  If not, the caller will provide them -TD
 */
-PUBLIC void HTMake822Word ARGS1(
-	char **,	str)
+PUBLIC void HTMake822Word ARGS2(
+	char **,	str,
+	int,		quoted)
 {
     CONST char * p;
     char * q;
     char * result;
     unsigned char a;
     int added = 0;
-    if (!(*str) || !(**str)) {
-	StrAllocCopy(*str, "\"\"");
+
+    if (isEmpty(*str)) {
+	StrAllocCopy(*str, quoted ? "\"\"" : "");
 	return;
     }
     for (p = *str; *p; p++) {
@@ -971,14 +1105,17 @@ PUBLIC void HTMake822Word ARGS1(
     result = typecallocn(char, p-(*str) + added + 1);
     if (result == NULL)
 	outofmem(__FILE__, "HTMake822Word");
-    result[0] = '"';
+
+    q = result;
+    if (quoted)
+	*q++ = '"';
     /*
     ** Having converted the character to ASCII, we can't use symbolic
     ** escape codes, since they're in the host character set, which
     ** is not necessarily ASCII.  Thus we use octal escape codes instead.
     ** -- gil (Paul Gilmartin) <pg@sweng.stortek.com>
     */  /* S/390 -- gil -- 0268 */
-    for (q = result + 1, p = *str; *p; p++) {
+    for (p = *str; *p; p++) {
 	a = TOASCII(*p);
 	if ((a != '\011') && ((a & 127) < 32 ||
 			    ( a < 128 && ((crfc[a-32]) & 2))))
@@ -987,7 +1124,8 @@ PUBLIC void HTMake822Word ARGS1(
 	if (a == '\012' || (a == '\015' && (TOASCII(*(p+1)) != '\012')))
 	    *q++ = ' ';
     }
-    *q++ = '"';
+    if (quoted)
+	*q++ = '"';
     *q++ = '\0';			/* Terminate */
     FREE(*str);
     *str = result;
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTParse.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTParse.h
index 39f276a4704..4131e0fcc04 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTParse.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTParse.h
@@ -21,7 +21,10 @@
 #define PARSE_PATH               4
 #define PARSE_ANCHOR             2
 #define PARSE_PUNCTUATION        1
+
 #define PARSE_ALL               31
+#define PARSE_ALL_WITHOUT_ANCHOR  (PARSE_ALL ^ PARSE_ANCHOR)
+
 /*
 **  Additional flag bits for more details on components already
 **  covered by the above.  The PARSE_PATH above doesn't really
@@ -70,6 +73,15 @@ extern char * HTParse PARAMS((
 	CONST char *	relatedName,
 	int		wanted));
 
+/*	HTParseAnchor(), fast HTParse() specialization
+**	----------------------------------------------
+**
+** On exit,
+**	returns		A pointer within input string (probably to its end '\0')
+*/
+extern CONST char * HTParseAnchor PARAMS((
+	CONST char *	aName));
+
 /*	Simplify a filename.				HTSimplify()
 **	--------------------
 **
@@ -77,7 +89,7 @@ extern char * HTParse PARAMS((
 **  be replaced by "" , and the seqeunce "/./" which may be replaced by "/".
 **  Simplification helps us recognize duplicate filenames.
 **
-**	Thus, 	/etc/junk/../fred 	becomes	/etc/fred
+**	Thus,	/etc/junk/../fred	becomes /etc/fred
 **		/etc/junk/./fred	becomes	/etc/junk/fred
 **
 **      but we should NOT change
@@ -180,10 +192,7 @@ extern char * HTUnEscapeSome PARAMS((
 **  Turn a string which is not a RFC 822 token into a quoted-string. - KW
 */
 extern void HTMake822Word PARAMS((
-	char **		str));
+	char **		str,
+	int		quoted));
 
 #endif  /* HTPARSE_H */
-
-/*
-   end of HTParse
-    */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTPlain.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTPlain.c
index 1ef4ca57fbf..333697e348d 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTPlain.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTPlain.c
@@ -30,9 +30,6 @@
 #include <LYCharSets.h>
 #include <LYLeaks.h>
 
-extern BOOL HTPassEightBitRaw;
-extern BOOL HTPassHighCtrlRaw;
-
 PUBLIC int HTPlain_lastraw = -1;
 PRIVATE int HTPlain_bs_pending = 0; /* 1:bs 2:underline 3:underline+bs - kw */
 
@@ -433,7 +430,7 @@ PRIVATE void HTPlain_write ARGS3(HTStream *, me, CONST char*, s, int, l)
 		       me->T.trans_C0_to_uni) {
 		/*
 		**  Quote from SGML.c:
-		**  	"This else if may be too ugly to keep. - KW"
+		**	"This else if may be too ugly to keep. - KW"
 		*/
 		if (me->T.trans_from_uni &&
 		    (((code = UCTransToUni(c, me->inUCLYhndl)) >= 32) ||
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTPlain.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTPlain.h
index 0d363f04c63..ed9a590fbf5 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTPlain.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTPlain.h
@@ -13,9 +13,4 @@ extern HTStream* HTPlainPresent PARAMS((
         HTParentAnchor *        anchor,
         HTStream *              sink));
 
-
-#endif
-
-/*
-
-    */
+#endif /* HTPLAIN_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTRules.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTRules.c
index f2b3432ee2f..c11eb966e3f 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTRules.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTRules.c
@@ -192,13 +192,13 @@ PRIVATE BOOL rule_cond_ok ARGS1(
 **	The most recently defined rules are applied first.
 **
 ** On entry,
-**	required	points to a string whose equivalent value is neeed
+**	required	points to a string whose equivalent value is needed
 ** On exit,
 **	returns		the address of the equivalent string allocated from
 **			the heap which the CALLER MUST FREE. If no translation
-**			occured, then it is a copy of te original.
+**			occurred, then it is a copy of the original.
 ** NEW FEATURES:
-**			When a "protect" or "defprot" rule is mathed,
+**			When a "protect" or "defprot" rule is matched,
 **			a call to HTAA_setCurrentProtection() or
 **			HTAA_setDefaultProtection() is made to notify
 **			the Access Authorization module that the file is
@@ -213,6 +213,7 @@ char * HTTranslate ARGS1(
     char *msgtmp = NULL, *pMsg;
     int proxy_none_flag = 0;
     int permitredir_flag = 0;
+
     StrAllocCopy(current, required);
 
     HTAA_clearProtections();	/* Reset from previous call -- AL */
@@ -397,8 +398,7 @@ char * HTTranslate ARGS1(
 
 	case HT_Invalid:
 	case HT_Fail:				/* Unauthorised */
-		CTRACE((tfp, "HTRule: *** FAIL `%s'\n",
-			    current));
+		CTRACE((tfp, "HTRule: *** FAIL `%s'\n", current));
 		FREE(current);
 		return (char *)0;
 	} /* if tail matches ... switch operation */
@@ -409,6 +409,7 @@ char * HTTranslate ARGS1(
 	char * temp = NULL;
 	StrAllocCopy(temp, "NoProxy=");
 	StrAllocCat(temp, current);
+	FREE(current);
 	return temp;
     }
 
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTStream.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTStream.h
index 868e0f419c7..cf0a4bf3b16 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTStream.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTStream.h
@@ -66,7 +66,3 @@ typedef struct _HTStreamClass {
 extern HTStream * HTErrorStream NOPARAMS;
 
 #endif /* HTSTREAM_H */
-
-/*
-
-   end of HTStream.h */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTString.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTString.c
index 210eedcf641..2177a108910 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTString.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTString.c
@@ -272,11 +272,12 @@ PUBLIC char * HTSACopy ARGS2(
 {
     if (src != 0) {
 	if (src != *dest) {
+	    size_t size = strlen(src) + 1;
 	    FREE(*dest);
-	    *dest = (char *) malloc (strlen(src) + 1);
+	    *dest = (char *) malloc(size);
 	    if (*dest == NULL)
 		outofmem(__FILE__, "HTSACopy");
-	    strcpy (*dest, src);
+	    memcpy(*dest, src, size);
 	}
     } else {
 	FREE(*dest);
@@ -292,7 +293,7 @@ PUBLIC char * HTSACat ARGS2(
 {
     if (src && *src && (src != *dest)) {
 	if (*dest) {
-	    int length = strlen(*dest);
+	    size_t length = strlen(*dest);
 	    *dest = (char *)realloc(*dest, length + strlen(src) + 1);
 	    if (*dest == NULL)
 		outofmem(__FILE__, "HTSACat");
@@ -308,6 +309,45 @@ PUBLIC char * HTSACat ARGS2(
 }
 
 
+/* optimized for heavily realloc'd strings, store length inside */
+
+#define EXTRA_TYPE size_t		/* type we use for length */
+#define EXTRA_SIZE sizeof(void *)	/* alignment >= sizeof(EXTRA_TYPE) */
+
+PUBLIC void   HTSAFree_extra ARGS1(
+	char *,		s)
+{
+    free(s - EXTRA_SIZE);
+}
+
+/* never shrink */
+PUBLIC char * HTSACopy_extra ARGS2(
+	char **,	dest,
+	CONST char *,	src)
+{
+    if (src != 0) {
+	size_t srcsize = strlen(src) + 1;
+	EXTRA_TYPE size = 0;
+
+	if (*dest != 0) {
+	    size = *(EXTRA_TYPE *)((*dest) - EXTRA_SIZE);
+	}
+	if (size < srcsize) {
+	    FREE_extra(*dest);
+	    size = srcsize * 2;   /* x2 step */
+	    *dest = (char *) malloc(size + EXTRA_SIZE);
+	    if (*dest == NULL)
+		outofmem(__FILE__, "HTSACopy_extra");
+	    *(EXTRA_TYPE *)(*dest) = size;
+	    *dest += EXTRA_SIZE;
+	}
+	memcpy(*dest, src, srcsize);
+    } else {
+	Clear_extra(*dest);
+    }
+    return *dest;
+}
+
 /*	Find next Field
 **	---------------
 **
@@ -389,7 +429,8 @@ PUBLIC char * HTNextTok ARGS4(
     BOOL get_comments;
     BOOL get_closing_char_too = FALSE;
     char closer;
-    if (!pstr || !*pstr) return NULL;
+
+    if (isEmpty(pstr)) return NULL;
     if (!delims) delims = " ;,=" ;
     if (!bracks) bracks = "<\"" ;
 
@@ -502,9 +543,9 @@ PRIVATE char *HTAlloc ARGS2(char *, ptr, size_t, length)
 #endif
 
 /*
- * Replacement for sprintf, allocates buffer on the fly according to what's needed
- * for its arguments.  Unlike sprintf, this always concatenates to the destination
- * buffer, so we do not have to provide both flavors.
+ * Replacement for sprintf, allocates buffer on the fly according to what's
+ * needed for its arguments.  Unlike sprintf, this always concatenates to the
+ * destination buffer, so we do not have to provide both flavors.
  */
 typedef enum { Flags, Width, Prec, Type, Format } PRINTF;
 
@@ -748,9 +789,9 @@ PUBLIC_IF_FIND_LEAKS char * StrAllocVsprintf ARGS4(
 #undef SAVE_TIME_NOT_SPACE
 
 /*
- * Replacement for sprintf, allocates buffer on the fly according to what's needed
- * for its arguments.  Unlike sprintf, this always concatenates to the destination
- * buffer.
+ * Replacement for sprintf, allocates buffer on the fly according to what's
+ * needed for its arguments.  Unlike sprintf, this always concatenates to the
+ * destination buffer.
  */
 /* Note: if making changes, also check the memory tracking version
  * LYLeakHTSprintf in LYLeaks.c. - kw */
@@ -960,34 +1001,30 @@ PUBLIC void HTAddXpand ARGS4(
 #endif /* USE_QUOTED_PARAMETER */
 
 /*
- * Append string-parameter to a system command that we are constructing.  The
- * string is a complete parameter (which is a necessary assumption so we can
- * quote it properly).  We're given the index of the newest parameter we're
- * processing.  Zero indicates none, so a value of '1' indicates that we copy
- * from the beginning of the command string up to the first parameter,
- * substitute the quoted parameter and return the result.
+ * Append string to a system command that we are constructing, without quoting. 
+ * We're given the index of the newest parameter we're processing.  Zero
+ * indicates none, so a value of '1' indicates that we copy from the beginning
+ * of the command string up to the first parameter, substitute the quoted
+ * parameter and return the result.
  *
  * Parameters are substituted at "%s" tokens, like printf.  Other printf-style
  * tokens are not substituted; they are passed through without change.
  */
-PUBLIC void HTAddParam ARGS4(
+PUBLIC void HTAddToCmd ARGS4(
     char **,		result,
     CONST char *,	command,
     int,		number,
-    CONST char *,	parameter)
+    CONST char *,	string)
 {
     if (number > 0) {
 	CONST char *last = HTAfterCommandArg(command, number - 1);
 	CONST char *next = last;
-#if USE_QUOTED_PARAMETER
-	char *quoted;
-#endif
 
 	if (number <= 1) {
 	    FREE(*result);
 	}
-	if (parameter == 0)
-	    parameter = "";
+	if (string == 0)
+	    string = "";
 	while (next[0] != 0) {
 	    if (HTIsParam(next)) {
 		if (next != last) {
@@ -996,13 +1033,7 @@ PUBLIC void HTAddParam ARGS4(
 		    HTSACat(result, last);
 		    (*result)[len] = 0;
 		}
-#if USE_QUOTED_PARAMETER
-		quoted = HTQuoteParameter(parameter);
-		HTSACat(result, quoted);
-		FREE(quoted);
-#else
-		HTSACat(result, parameter);
-#endif
+		HTSACat(result, string);
 		CTRACE((tfp, "PARAM-ADD:%s\n", *result));
 		return;
 	    }
@@ -1012,6 +1043,28 @@ PUBLIC void HTAddParam ARGS4(
 }
 
 /*
+ * Append string-parameter to a system command that we are constructing.  The
+ * string is a complete parameter (which is a necessary assumption so we can
+ * quote it properly).
+ */
+PUBLIC void HTAddParam ARGS4(
+    char **,		result,
+    CONST char *,	command,
+    int,		number,
+    CONST char *,	parameter)
+{
+    if (number > 0) {
+#if USE_QUOTED_PARAMETER
+	char *quoted = HTQuoteParameter(parameter);
+	HTAddToCmd(result, command, number, quoted);
+	FREE(quoted);
+#else
+	HTAddToCmd(result, command, number, parameter);
+#endif
+    }
+}
+
+/*
  * Append the remaining command-string to a system command (compare with
  * HTAddParam).  Any remaining "%s" tokens are copied as empty strings.
  */
@@ -1022,6 +1075,7 @@ PUBLIC void HTEndParam ARGS3(
 {
     CONST char *last;
     int count;
+
     count = HTCountCommandArgs (command);
     if (count < number)
 	number = count;
@@ -1033,11 +1087,11 @@ PUBLIC void HTEndParam ARGS3(
 }
 
 
-#ifdef EXP_FILE_UPLOAD
-/*	bstring Allocate and Concatenate
-*/
+/*	Binary-strings (may have embedded nulls).
+ *	Some modules (HTGopher) assume there is a null on the end, anyway.
+ */
 
-/*	Allocate a new copy of a bstring, and returns it
+/*	Allocate a new bstring, and return it.
 */
 PUBLIC void HTSABCopy ARGS3(
 	bstring**,	dest,
@@ -1045,51 +1099,199 @@ PUBLIC void HTSABCopy ARGS3(
 	int,		len)
 {
     bstring *t;
-    CTRACE((tfp, "HTSABCopy(%p, %p, %d)\n", dest, src, len));
-    /* if we already have a bstring ** ... */
-    if (dest) {
-	/* ... with a valid bstring *, free it ... */
-	if (*dest) {
-	    FREE((*dest)->str);
-	    FREE(*dest);
-	}
-	*dest = malloc(sizeof(bstring));
-	if (src) {
-	    CTRACE((tfp, "%% [%s]\n", src));
-	    t = (bstring*) malloc(sizeof(bstring));
-	    if (t == NULL)
-		outofmem(__FILE__, "HTSABCopy");
-	    t->str = (char *) malloc (len);
-	    if (t->str == NULL)
-		outofmem(__FILE__, "HTSABCopy");
-	    memcpy (t->str, src, len);
-	    t->len = len;
-	    *dest = t;
+    unsigned need = len + 1;
+
+    CTRACE2(TRACE_BSTRING, (tfp, "HTSABCopy(%p, %p, %d)\n", dest, src, len));
+    HTSABFree(dest);
+    if (src) {
+	if (TRACE_BSTRING) {
+	    CTRACE((tfp, "===    %4d:", len));
+	    trace_bstring2(src, len);
+	    CTRACE((tfp, "\n"));
 	}
+	if ((t = (bstring*) malloc(sizeof(bstring))) == NULL)
+	    outofmem(__FILE__, "HTSABCopy");
+	if ((t->str = (char *) malloc (need)) == NULL)
+	    outofmem(__FILE__, "HTSABCopy");
+	memcpy (t->str, src, len);
+	t->len = len;
+	t->str[t->len] = '\0';
+	*dest = t;
+    }
+    if (TRACE_BSTRING) {
+	CTRACE((tfp, "=>     %4d:", BStrLen(*dest)));
+	trace_bstring(*dest);
+	CTRACE((tfp, "\n"));
     }
 }
 
+/*
+ * Initialize with a null-terminated string (discards the null).
+ */
+PUBLIC void HTSABCopy0 ARGS2(
+	bstring**,	dest,
+	CONST char *,	src)
+{
+    HTSABCopy(dest, src, strlen(src));
+}
+
+/*
+ * Append a block of memory to a bstring.
+ */
 PUBLIC void HTSABCat ARGS3(
 	bstring **,	dest,
 	CONST char *,	src,
 	int,		len)
 {
     bstring *t = *dest;
+
+    CTRACE2(TRACE_BSTRING, (tfp, "HTSABCat(%p, %p, %d)\n", dest, src, len));
     if (src) {
+	unsigned need = len + 1;
+
+	if (TRACE_BSTRING) {
+	    CTRACE((tfp, "===    %4d:", len));
+	    trace_bstring2(src, len);
+	    CTRACE((tfp, "\n"));
+	}
 	if (t) {
-	    int length = t->len;
-	    t->str = (char *)realloc(t->str, length + len);
+	    unsigned length = t->len + need;
+	    if ((t->str = (char *)realloc(t->str, length)) == NULL)
+		outofmem(__FILE__, "HTSACat");
 	} else {
-	    t = typecalloc(bstring);
-	    if (t == NULL)
+	    if ((t = typecalloc(bstring)) == NULL)
 		outofmem(__FILE__, "HTSACat");
-	    t->str = (char *)malloc(len);
+	    t->str = (char *)malloc(need);
 	}
 	if (t->str == NULL)
 	    outofmem(__FILE__, "HTSACat");
 	memcpy (t->str + t->len, src, len);
 	t->len += len;
+	t->str[t->len] = '\0';
 	*dest = t;
     }
+    if (TRACE_BSTRING) {
+	CTRACE((tfp, "=>     %4d:", BStrLen(*dest)));
+	trace_bstring(*dest);
+	CTRACE((tfp, "\n"));
+    }
+}
+
+/*
+ * Append a null-terminated string (discards the null).
+ */
+PUBLIC void HTSABCat0 ARGS2(
+	bstring**,	dest,
+	CONST char *,	src)
+{
+    HTSABCat(dest, src, strlen(src));
+}
+
+/*
+ * Compare two bstring's for equality
+ */
+PUBLIC BOOL HTSABEql   ARGS2(
+	bstring *,	a,
+	bstring *,	b)
+{
+    unsigned len_a = (a != 0) ? a->len : 0;
+    unsigned len_b = (b != 0) ? b->len : 0;
+
+    if (len_a == len_b) {
+	if (len_a == 0
+	 || memcmp(a->str, b->str, a->len) == 0)
+	    return TRUE;
+    }
+    return FALSE;
+}
+
+/*
+ * Deallocate a bstring.
+ */
+PUBLIC void HTSABFree ARGS1(
+	bstring **,	ptr)
+{
+    if (*ptr != NULL) {
+	FREE((*ptr)->str);
+	FREE(*ptr);
+	*ptr = NULL;
+    }
+}
+
+/*
+ * Use this function to perform formatted sprintf's onto the end of a bstring.
+ * The bstring may contain embedded nulls; the formatted portions must not.
+ */
+#ifdef ANSI_VARARGS
+PUBLIC bstring * HTBprintf (bstring ** pstr, CONST char * fmt, ...)
+#else
+PUBLIC bstring * HTBprintf (va_alist)
+    va_dcl
+#endif
+{
+    bstring *result = 0;
+    char *temp = 0;
+    va_list ap;
+
+    LYva_start(ap,fmt);
+    {
+#if !ANSI_VARARGS
+	bstring **	pstr = va_arg(ap, char **);
+	CONST char *	fmt  = va_arg(ap, CONST char *);
+#endif
+	temp = StrAllocVsprintf(&temp, 0, fmt, &ap);
+	if (!isEmpty(temp)) {
+	    HTSABCat (pstr, temp, strlen(temp));
+	}
+	FREE(temp);
+	result = *pstr;
+    }
+    va_end(ap);
+
+    return (result);
+}
+
+/*
+ * Write binary-data to the logfile, making it safe for most editors to view.
+ * That is most, since we do not restrict line-length.  Nulls and other
+ * non-printing characters are addressed.
+ */
+PUBLIC void trace_bstring2 ARGS2(
+	CONST char *,	text,
+	int,		size)
+{
+    int n;
+
+    if (text != 0) {
+	for (n = 0; n < size; ++n) {
+	    int ch = UCH(text[n]);
+	    switch (ch) {
+	    case '\\':
+		fputs("\\\\", tfp);
+		break;
+	    case '\r':
+		fputs("\\r", tfp);
+		break;
+	    case '\t':
+		fputs("\\t", tfp);
+		break;
+	    case '\f':
+		fputs("\\f", tfp);
+		break;
+	    default:
+		if (isprint(ch) || isspace(ch)) {
+		    fputc(ch, tfp);
+		} else {
+		    fprintf(tfp, "\\%03o", ch);
+		}
+		break;
+	    }
+	}
+    }
+}
+
+PUBLIC void trace_bstring ARGS1(
+	bstring *,	data)
+{
+    trace_bstring2(BStrData(data), BStrLen(data));
 }
-#endif /* EXP_FILE_UPLOAD */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTString.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTString.h
index 53c52cd6792..af994c86329 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTString.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTString.h
@@ -59,6 +59,15 @@ extern char * HTSACopy PARAMS ((char **dest, CONST char *src));
 extern char * HTSACat  PARAMS ((char **dest, CONST char *src));
 
 /*
+optimized for heavily realloc'd strings in temp objects
+*/
+#define StrAllocCopy_extra(dest, src) HTSACopy_extra (&(dest), src)
+#define FREE_extra(x)   {if (x != NULL) {HTSAFree_extra(x); x = NULL;}}
+#define Clear_extra(x)  {if (x != NULL) {*x = '\0';}}
+extern char * HTSACopy_extra PARAMS ((char **dest, CONST char *src));
+extern void   HTSAFree_extra PARAMS ((char *s));
+
+/*
 
 Next word or quoted string
 
@@ -69,7 +78,7 @@ extern char * HTNextField PARAMS ((char** pstr));
 extern char * HTNextTok PARAMS((char ** pstr,
 		      CONST char * delims, CONST char * bracks, char * found));
 
-#if ANSI_VARARGS
+#ifdef ANSI_VARARGS
 extern char * HTSprintf (char ** pstr, CONST char * fmt, ...)
 			GCC_PRINTFLIKE(2,3);
 extern char * HTSprintf0 (char ** pstr, CONST char * fmt, ...)
@@ -102,6 +111,7 @@ extern void HTAddXpand PARAMS((char ** result, CONST char * command, int number,
 #endif
 
 extern int HTCountCommandArgs PARAMS((CONST char * command));
+extern void HTAddToCmd PARAMS((char ** result, CONST char * command, int number, CONST char * string));
 extern void HTAddParam PARAMS((char ** result, CONST char * command, int number, CONST char * parameter));
 extern void HTEndParam PARAMS((char ** result, CONST char * command, int number));
 
@@ -109,15 +119,39 @@ extern void HTEndParam PARAMS((char ** result, CONST char * command, int number)
 #define HTOptParam(result, command, number, parameter) HTSACat(result, parameter)
 
 /* Binary copy and concat */
-#ifdef EXP_FILE_UPLOAD
-
 typedef struct {
 	char *str;
 	int len;
 } bstring;
 
-extern void HTSABCopy PARAMS((bstring** dest, CONST char * src, int len));
-extern void HTSABCat PARAMS((bstring ** dest, CONST char * src, int len));
+extern void HTSABCopy  PARAMS((bstring ** dest, CONST char * src, int len));
+extern void HTSABCopy0 PARAMS((bstring ** dest, CONST char * src));
+extern void HTSABCat   PARAMS((bstring ** dest, CONST char * src, int len));
+extern void HTSABCat0  PARAMS((bstring ** dest, CONST char * src));
+extern BOOL HTSABEql   PARAMS((bstring * a, bstring * b));
+extern void HTSABFree  PARAMS((bstring ** ptr));
+
+#define BStrLen(s)    (((s) != 0) ? (s)->len : 0)
+#define BStrData(s)   (((s) != 0) ? (s)->str : 0)
+
+#define BINEQ(a,b)    (HTSABEql(a,b))	/* like STREQ() */
+
+#define isBEmpty(p)   ((p) == 0 || BStrLen(p) == 0)
+
+#define BStrCopy(d,s)  HTSABCopy(  &(d), BStrData(s), BStrLen(s))
+#define BStrCopy0(d,s) HTSABCopy0( &(d), s)
+#define BStrCat(d,s)   HTSABCat(   &(d), BStrData(s), BStrLen(s))
+#define BStrCat0(d,s)  HTSABCat0(  &(d), s)
+#define BStrFree(d)    HTSABFree(  &(d))
+
+#ifdef ANSI_VARARGS
+extern bstring * HTBprintf (bstring ** pstr, CONST char * fmt, ...)
+			    GCC_PRINTFLIKE(2,3);
+#else
+extern bstring * HTBprintf () GCC_PRINTFLIKE(2,3);
 #endif
 
+extern void trace_bstring PARAMS((bstring *data));
+extern void trace_bstring2 PARAMS((CONST char *text, int size));
+
 #endif /* HTSTRING_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTStyle.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTStyle.c
index 2e8494d237b..9e3bc8a52a6 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTStyle.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTStyle.c
@@ -18,10 +18,9 @@
 */
 PUBLIC HTStyle* HTStyleNew NOARGS
 {
-    HTStyle * self = (HTStyle *)malloc(sizeof(*self));
+    HTStyle * self = typecalloc(HTStyle);
     if (self == NULL)
 	outofmem(__FILE__, "HTStyleNew");
-    memset((void *)self, 0, sizeof(*self));
     return self;
 }
 
@@ -31,6 +30,7 @@ PUBLIC HTStyle* HTStyleNewNamed ARGS1 (CONST char *,name)
 {
     HTStyle * self = HTStyleNew();
     StrAllocCopy(self->name, name);
+    self->id = -1; /* <0 */
     return self;
 }
 
@@ -287,15 +287,9 @@ HTStyleSheet * HTStyleSheetRemoveStyle ARGS2
 
 HTStyleSheet * HTStyleSheetNew NOARGS
 {
-    HTStyleSheet * self = (HTStyleSheet *)malloc(sizeof(*self));
+    HTStyleSheet * self = typecalloc(HTStyleSheet);
     if (self == NULL)
 	outofmem(__FILE__, "HTStyleSheetNew");
-
-    memset((void*)self, 0, sizeof(*self));	/* ANSI */
-/* Harbison c ref man says (char*)self
-   but k&r ansii and abc books and Think_C say (void*) */
-
-/*    bzero(self, sizeof(*self)); */		/* BSD */
     return self;
 }
 
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTStyle.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTStyle.h
index be958f079c4..cc23dd05e2a 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTStyle.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTStyle.h
@@ -77,6 +77,7 @@ typedef struct _HTStyle {
 */
     struct _HTStyle     *next;          /* Link for putting into stylesheet */
     char *              name;           /* Style name */
+    int                 id;             /* equivalent of name, for speed */
     char *              SGMLTag;        /* Tag name to start */
 
 
@@ -158,6 +159,60 @@ extern HTStyleSheet * HTStyleSheetWrite PARAMS((HTStyleSheet * self,
 #define CLEAR_POINTER ((void *)-1)      /* Pointer value means "clear me" */
 
 /* DefaultStyle.c */
-extern HTStyleSheet * DefaultStyle NOPARAMS;
+extern HTStyleSheet * DefaultStyle PARAMS((HTStyle*** result_array));
+
+/* enum, use this instead of HTStyle name comparisons */
+enum HTStyle_Enum {
+	ST_Normal = 0,
+	ST_DivCenter,
+	ST_DivLeft,
+	ST_DivRight,
+	ST_Banner,
+	ST_Blockquote,
+	ST_Bq,
+	ST_Footnote,
+	ST_List,
+	ST_List1,
+	ST_List2,
+	ST_List3,
+	ST_List4,
+	ST_List5,
+	ST_List6,
+	ST_Menu,
+	ST_Menu1,
+	ST_Menu2,
+	ST_Menu3,
+	ST_Menu4,
+	ST_Menu5,
+	ST_Menu6,
+	ST_Glossary,
+	ST_Glossary1,
+	ST_Glossary2,
+	ST_Glossary3,
+	ST_Glossary4,
+	ST_Glossary5,
+	ST_Glossary6,
+	ST_GlossaryCompact,
+	ST_GlossaryCompact1,
+	ST_GlossaryCompact2,
+	ST_GlossaryCompact3,
+	ST_GlossaryCompact4,
+	ST_GlossaryCompact5,
+	ST_GlossaryCompact6,
+	ST_Example,
+	ST_Preformatted,
+	ST_Listing,
+	ST_Address,
+	ST_Note,
+	ST_Heading1,
+	ST_Heading2,
+	ST_Heading3,
+	ST_Heading4,
+	ST_Heading5,
+	ST_Heading6,
+	ST_HeadingCenter,
+	ST_HeadingLeft,
+	ST_HeadingRight
+};
 
 #endif /* HTStyle_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTCP.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTCP.c
index 51db92bd25a..658d2040893 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTCP.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTCP.c
@@ -32,7 +32,7 @@
 #include <resolv.h>
 #endif
 
-#if defined(__DJGPP__) && defined (WATT32)
+#ifdef __DJGPP__
 #include <netdb.h>
 #endif /* __DJGPP__ */
 
@@ -59,14 +59,6 @@ PUBLIC int BSDselect PARAMS((
 
 #include <LYLeaks.h>
 
-#ifndef FD_SETSIZE
-#if defined(UCX) || defined(SOCKETSHR_TCP) || defined(CMU_TCP)
-#define FD_SETSIZE 32
-#else
-#define FD_SETSIZE 256
-#endif /* Limit # sockets to 32 for UCX, BSN - also SOCKETSHR and CMU, AH */
-#endif /* FD_SETSIZE */
-
 /*
 **  Module-Wide variables
 */
@@ -76,7 +68,6 @@ PRIVATE char *hostname = NULL;		/* The name of this host */
 **  PUBLIC VARIABLES
 */
 #ifdef SOCKS
-extern BOOLEAN socks_flag;
 PUBLIC unsigned long socks_bind_remoteAddr; /* for long Rbind */
 #endif /* SOCKS */
 
@@ -99,12 +90,22 @@ extern char *sys_errlist[];		/* see man perror on cernvax */
 extern int sys_nerr;
 #endif /* DECL_SYS_ERRLIST */
 
-#ifdef _WINDOWS_NSL
-char host[512];
-struct hostent  *phost;	/* Pointer to host - See netdb.h */
-int donelookup;
+#ifdef __DJGPP__
+static int ResolveYield (void)
+{
+    return HTCheckForInterrupt() ? 0 : 1;
+}
+#endif
 
-static unsigned long _fork_func (void *arglist)
+/*
+ * This chunk of code is used in both win32 and cygwin.
+ */
+#if defined(_WINDOWS_NSL)
+static char host[512];
+static struct hostent *phost; /* Pointer to host - See netdb.h */
+static int donelookup;
+
+static unsigned long _fork_func (void *arglist GCC_UNUSED)
 {
 #ifdef SH_EX
     unsigned long addr;
@@ -381,8 +382,6 @@ PRIVATE void quench ARGS1(
 
 PUBLIC int lynx_nsl_status = HT_OK;
 
-#if !( defined(__DJGPP__) && !defined(WATT32) )    /* much excluded! */
-
 #define DEBUG_HOSTENT		/* disable in case of problems */
 #define DEBUG_HOSTENT_CHILD  /* for NSL_FORK, may screw up trace file */
 
@@ -643,6 +642,7 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 #ifndef _WINDOWS_NSL
     char *host = str;
 #endif
+
 #ifdef NSL_FORK
     /* for transfer of result between from child to parent: */
     static AlignedHOSTENT aligned_full_rehostent;
@@ -676,6 +676,10 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 
     struct hostent *result_phost = NULL;
 
+#ifdef __DJGPP__
+    _resolve_hook = ResolveYield;
+#endif
+
     if (!str) {
 	CTRACE((tfp, "LYGetHostByName: Can't parse `NULL'.\n"));
 	lynx_nsl_status = HT_INTERNAL;
@@ -730,7 +734,7 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 	**	Pipe, child pid, status buffers, start time, select()
 	**	control variables.
 	*/
-	pid_t fpid, waitret;
+	int fpid, waitret;
 	int pfd[2], selret, readret;
 #ifdef HAVE_TYPE_UNIONWAIT
 	union wait waitstat;
@@ -1076,7 +1080,7 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 #endif /* WCOREDUMP */
 	    } else if (WIFSTOPPED(waitstat)) {
 		CTRACE((tfp, "LYGetHostByName: NSL_FORK child %d is stopped, status 0x%x!\n",
-			(int)waitret, WEXITSTATUS(waitstat)));
+			(int)waitret, WSTOPSIG(waitstat)));
 	    }
 	}
 	if (!got_rehostent) {
@@ -1089,6 +1093,7 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
     {
 	HANDLE hThread, dwThreadID;
 
+#ifndef __CYGWIN__
 	if (!system_is_NT) {	/* for Windows9x */
 	    unsigned long t;
 	    t = (unsigned long)inet_addr(host);
@@ -1097,6 +1102,7 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 	    else
 		phost = gethostbyname(host);
 	} else {		/* for Windows NT */
+#endif /* !__CYGWIN__ */
 	    phost = (struct hostent *) NULL;
 	    donelookup = FALSE;
 	    hThread = CreateThread((void *)NULL, 4096UL,
@@ -1118,7 +1124,9 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 		    return NULL;
 		}
 	    }
+#ifndef __CYGWIN__
 	}
+#endif /* !__CYGWIN__ */
 	if (phost) {
 	    lynx_nsl_status = HT_OK;
 	    result_phost = phost;
@@ -1159,8 +1167,6 @@ failed:
     return NULL;
 }
 
-#endif /* from here on DJGPP without WATT32 joins us again. */
-
 
 /*	Parse a network node address and port
 **	-------------------------------------
@@ -1266,10 +1272,6 @@ PRIVATE int HTParseInet ARGS2(
     */
     if (dotcount_ip == 3)   /* Numeric node address: */
     {
-
-#if defined(__DJGPP__) && !defined(WATT32)
-	soc_in->sin_addr.s_addr = htonl(aton(host));
-#else
 #ifdef DGUX_OLD
 	soc_in->sin_addr.s_addr = inet_addr(host).s_addr; /* See arpa/inet.h */
 #else
@@ -1289,7 +1291,6 @@ PRIVATE int HTParseInet ARGS2(
 #endif /* HAVE_INET_ATON */
 #endif /* GUSI */
 #endif /* DGUX_OLD */
-#endif /* __DJGPP__ && !WATT32 */
 #ifndef _WINDOWS_NSL
 	FREE(host);
 #endif /* _WINDOWS_NSL */
@@ -1300,21 +1301,11 @@ PRIVATE int HTParseInet ARGS2(
 	CTRACE((tfp, "HTParseInet: Calling LYGetHostByName(%s)\n", host));
 #endif /* MVS */
 
-#if defined(__DJGPP__) && !defined(WATT32)
-	if (!valid_hostname(host)) {
-	    FREE(host);
-	    return HT_NOT_ACCEPTABLE; /* only HTDoConnect checks this. */
-	}
-	soc_in->sin_addr.s_addr = htonl(resolve(host));
-	if (soc_in->sin_addr.s_addr == 0) {
-	    goto failed;
-	}
-#else /* !(__DJGPP__ && !WATT32) */
 #ifdef _WINDOWS_NSL
 	phost = LYGetHostByName(host);	/* See above */
 	if (!phost) goto failed;
 	memcpy((void *)&soc_in->sin_addr, phost->h_addr, phost->h_length);
-#else /* !(__DJGPP__ && !WATT32) && !_WINDOWS_NSL */
+#else /* !_WINDOWS_NSL */
 	{
 	    struct hostent  *phost;
 	    phost = LYGetHostByName(host);	/* See above */
@@ -1339,7 +1330,7 @@ PRIVATE int HTParseInet ARGS2(
 #endif /* VMS && CMU_TCP */
 	}
 #endif /* _WINDOWS_NSL */
-#endif /* __DJGPP__ && !WATT32 */
+
 #ifndef _WINDOWS_NSL
 	FREE(host);
 #endif /* _WINDOWS_NSL */
@@ -1383,7 +1374,7 @@ HTGetAddrInfo ARGS2(
     char *p;
     char *s;
     char *host, *port;
-    char pbuf[10];
+    char pbuf[80];
 
     s = strdup(str);
 
@@ -1398,7 +1389,7 @@ HTGetAddrInfo ARGS2(
     if (port) {
 	*port++ = '\0';
     } else {
-	snprintf(pbuf, sizeof(pbuf), "%d", defport);
+	sprintf(pbuf, "%d", defport);
 	port = pbuf;
     }
 
@@ -1431,10 +1422,6 @@ PRIVATE void free_HTTCP_hostname NOARGS
 **	-------------------------------------------
 **
 */
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 64		/* Arbitrary limit */
-#endif /* MAXHOSTNAMELEN */
-
 PRIVATE void get_host_details NOARGS
 {
     char name[MAXHOSTNAMELEN+1];	/* The name of this host */
@@ -1464,9 +1451,9 @@ PRIVATE void get_host_details NOARGS
     **	Get rest from UCX$BIND_DOM logical.
     */
     if (strchr(hostname,'.') == NULL) {		  /* Not full address */
-	domain_name = getenv("UCX$BIND_DOMAIN");
+	domain_name = LYGetEnv("UCX$BIND_DOMAIN");
 	if (domain_name == NULL)
-	    domain_name = getenv("TCPIP$BIND_DOMAIN");
+	    domain_name = LYGetEnv("TCPIP$BIND_DOMAIN");
 	if (domain_name != NULL) {
 	    StrAllocCat(hostname, ".");
 	    StrAllocCat(hostname, domain_name);
@@ -1537,7 +1524,7 @@ PUBLIC int HTDoConnect ARGS4(
     char *at_sign = NULL;
     char *host = NULL;
 #ifdef INET6
-    struct addrinfo *res, *res0;
+    struct addrinfo *res = 0, *res0 = 0;
 #else
     struct sockaddr_in soc_address;
     struct sockaddr_in *soc_in = &soc_address;
@@ -1568,7 +1555,6 @@ PUBLIC int HTDoConnect ARGS4(
     _HTProgress (line);
 #ifdef INET6
     /* HTParseInet() is useless! */
-    _HTProgress(host);
     res0 = HTGetAddrInfo(host, default_port);
     if (res0 == NULL) {
 	HTSprintf0 (&line, gettext("Unable to locate remote host %s."), host);
@@ -1630,7 +1616,7 @@ PUBLIC int HTDoConnect ARGS4(
     }
 #endif /* INET6 */
 
-#ifndef DOSPATH
+#if !defined(DOSPATH) || defined(__DJGPP__)
 #if !defined(NO_IOCTL) || defined(USE_FCNTL)
     /*
     **	Make the socket non-blocking, so the connect can be canceled.
@@ -1648,7 +1634,7 @@ PUBLIC int HTDoConnect ARGS4(
 	    _HTProgress(gettext("Could not make connection non-blocking."));
     }
 #endif /* !NO_IOCTL || USE_FCNTL */
-#endif /* !DOSPATH */
+#endif /* !DOSPATH || __DJGPP__ */
 
     /*
     **	Issue the connect.  Since the server can't do an instantaneous
@@ -1674,7 +1660,7 @@ PUBLIC int HTDoConnect ARGS4(
 #else
     status = connect(*s, (struct sockaddr*)&soc_address, sizeof(soc_address));
 #endif /* INET6 */
-#ifndef __DJGPP__
+
     /*
     **	According to the Sun man page for connect:
     **	   EINPROGRESS	       The socket is non-blocking and the  con-
@@ -1717,7 +1703,8 @@ PUBLIC int HTDoConnect ARGS4(
 		HTAlert(gettext("Connection failed (too many retries)."));
 #ifdef INET6
 		FREE(line);
-		freeaddrinfo(res0);
+		if (res0)
+		    freeaddrinfo(res0);
 #endif /* INET6 */
 		return HT_NO_DATA;
 	    }
@@ -1733,11 +1720,11 @@ PUBLIC int HTDoConnect ARGS4(
 	    FD_SET((unsigned) *s, &writefds);
 #ifdef SOCKS
 	    if (socks_flag)
-		ret = Rselect(*s + 1, NULL,
+		ret = Rselect((unsigned)*s + 1, NULL,
 			      (void *)&writefds, NULL, &select_timeout);
 	    else
 #endif /* SOCKS */
-	    ret = select(*s + 1, NULL, (void *)&writefds, NULL, &select_timeout);
+	    ret = select((unsigned)*s + 1, NULL, (void *)&writefds, NULL, &select_timeout);
 
 #ifdef SOCKET_DEBUG_TRACE
 	    if (tries == 1) {
@@ -1881,7 +1868,7 @@ PUBLIC int HTDoConnect ARGS4(
 	break;
     }
 #endif /* INET6 */
-#endif /* !__DJGPP__ */
+
 #ifdef INET6
     if (*s < 0)
 #else
@@ -1894,7 +1881,7 @@ PUBLIC int HTDoConnect ARGS4(
 	*/
 	NETCLOSE(*s);
     }
-#ifndef DOSPATH
+#if !defined(DOSPATH) || defined(__DJGPP__)
 #if !defined(NO_IOCTL) || defined(USE_FCNTL)
     else {
 	/*
@@ -1910,11 +1897,12 @@ PUBLIC int HTDoConnect ARGS4(
 	    _HTProgress(gettext("Could not restore socket to blocking."));
     }
 #endif /* !NO_IOCTL || USE_FCNTL */
-#endif /* !DOSPATH */
+#endif /* !DOSPATH || __DJGPP__ */
 
 #ifdef INET6
     FREE(line);
-    freeaddrinfo(res0);
+    if (res0)
+	freeaddrinfo(res0);
 #endif /* INET6 */
     return status;
 }
@@ -1931,7 +1919,7 @@ PUBLIC int HTDoRead ARGS3(
     fd_set readfds;
     struct timeval select_timeout;
     int tries=0;
-#ifdef EXP_READPROGRESS
+#ifdef USE_READPROGRESS
     int otries = 0;
     time_t otime = time((time_t *)0);
 #endif
@@ -1982,7 +1970,7 @@ PUBLIC int HTDoRead ARGS3(
 	    return HT_INTERRUPTED;
 	}
 
-#ifdef EXP_READPROGRESS
+#ifdef USE_READPROGRESS
 	if (tries - otries > 10) {
 	    time_t t = time((time_t *)0);
 
@@ -2005,11 +1993,11 @@ PUBLIC int HTDoRead ARGS3(
 	    FD_SET((unsigned)fildes, &readfds);
 #ifdef SOCKS
 	    if (socks_flag)
-		ret = Rselect(fildes + 1,
+		ret = Rselect((unsigned)fildes + 1,
 			      (void *)&readfds, NULL, NULL, &select_timeout);
 	    else
 #endif /* SOCKS */
-		ret = select(fildes + 1,
+		ret = select((unsigned)fildes + 1,
 			     (void *)&readfds, NULL, NULL, &select_timeout);
 	} while ((ret == -1) && (errno == EINTR));
 
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTCP.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTCP.h
index 91f98c80df9..363ab15d2e8 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTCP.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTCP.h
@@ -87,11 +87,7 @@ extern BOOL valid_hostname PARAMS((char * name));
 */
 extern int lynx_nsl_status;
 
-#if defined(__DJGPP__) && !defined(WATT32)
-#define LYGetHostByName(host) resolv(host) /* we'll use it the same way */
-#else
 extern struct hostent * LYGetHostByName PARAMS((char * str));
-#endif
 
 /*      Get Name of This Machine
 **      ------------------------
@@ -107,8 +103,8 @@ extern int HTDoConnect PARAMS((
 	int *		s));
 
 extern int HTDoRead PARAMS((
-	int 		fildes,
+	int		fildes,
 	void *		buf,
-	unsigned 	nbyte));
+	unsigned	nbyte));
 
 #endif   /* HTTCP_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTP.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTP.c
index 0e7af29de68..93fe4bb489e 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTP.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTP.c
@@ -7,9 +7,6 @@
 */
 
 #include <HTUtils.h>
-#if defined(__DJGPP__) && defined (WATT32)
-#include <tcp.h>
-#endif /* __DJGPP__ */
 #include <HTTP.h>
 #include <LYUtils.h>
 
@@ -36,6 +33,7 @@
 #include <HTML.h>
 #include <HTInit.h>
 #include <HTAABrow.h>
+#include <HTAccess.h>		/* Are we using an HTTP gateway? */
 
 #include <LYCookie.h>
 #include <LYGlobalDefs.h>
@@ -50,29 +48,16 @@ struct _HTStream
 
 extern char * HTAppName;	/* Application name: please supply */
 extern char * HTAppVersion;	/* Application version: please supply */
-extern char * personal_mail_address;	/* User's name/email address */
-extern char * LYUserAgent;	/* Lynx User-Agent string */
-extern BOOL LYNoRefererHeader;	/* Never send Referer header? */
-extern BOOL LYNoRefererForThis; /* No Referer header for this URL? */
-extern BOOL LYNoFromHeader;	/* Never send From header? */
-extern BOOL LYSetCookies;	/* Act on Set-Cookie headers? */
-
-extern BOOL using_proxy;	/* Are we using an HTTP gateway? */
+
 PUBLIC BOOL reloading = FALSE;	/* Reloading => send no-cache pragma to proxy */
 PUBLIC char * redirecting_url = NULL;	    /* Location: value. */
 PUBLIC BOOL permanent_redirection = FALSE;  /* Got 301 status? */
 PUBLIC BOOL redirect_post_content = FALSE;  /* Don't convert to GET? */
 
-extern BOOLEAN LYUserSpecifiedURL; /* Is the URL a goto? */
-
-extern BOOL keep_mime_headers;	 /* Include mime headers and force source dump */
-extern BOOL no_url_redirection;  /* Don't follow Location: URL for */
-extern char *http_error_file;	 /* Store HTTP status code in this file */
-extern BOOL traversal;		 /* TRUE if we are doing a traversal */
-extern BOOL dump_output_immediately;  /* TRUE if no interactive user */
-
 #ifdef USE_SSL
 PUBLIC SSL_CTX * ssl_ctx = NULL;	/* SSL ctx */
+PUBLIC SSL * SSL_handle = NULL;
+PUBLIC int ssl_okay;
 
 PRIVATE void free_ssl_ctx NOARGS
 {
@@ -80,6 +65,26 @@ PRIVATE void free_ssl_ctx NOARGS
 	SSL_CTX_free(ssl_ctx);
 }
 
+PRIVATE int HTSSLCallback(int preverify_ok, X509_STORE_CTX *x509_ctx)
+{
+    char *msg = NULL;
+    int result = 1;
+
+    if (!(preverify_ok || ssl_okay || ssl_noprompt)) {
+#ifdef USE_X509_SUPPORT
+	HTSprintf0(&msg, "SSL error:%s-Continue?",
+		   X509_verify_cert_error_string(X509_STORE_CTX_get_error(x509_ctx)));
+	if (HTForcedPrompt(ssl_noprompt, msg, YES))
+	    ssl_okay = 1;
+	else
+	    result = 0;
+#endif
+
+	FREE(msg);
+    }
+    return result;
+}
+
 PUBLIC SSL * HTGetSSLHandle NOARGS
 {
     if (ssl_ctx == NULL) {
@@ -94,9 +99,11 @@ PUBLIC SSL * HTGetSSLHandle NOARGS
 	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
 	SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL);
 	SSL_CTX_set_default_verify_paths(ssl_ctx);
+	SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, HTSSLCallback);
 #endif /* SSLEAY_VERSION_NUMBER < 0x0800 */
 	atexit(free_ssl_ctx);
     }
+    ssl_okay = 0;
     return(SSL_new(ssl_ctx));
 }
 
@@ -106,7 +113,7 @@ PUBLIC void HTSSLInitPRNG NOARGS
     if (RAND_status() == 0) {
 	char rand_file[256];
 	time_t t;
-	pid_t pid;
+	int pid;
 	long l,seed;
 
 	t = time(NULL);
@@ -120,7 +127,7 @@ PUBLIC void HTSSLInitPRNG NOARGS
 	/* Seed in time (mod_ssl does this) */
 	RAND_seed((unsigned char *)&t, sizeof(time_t));
 	/* Seed in pid (mod_ssl does this) */
-	RAND_seed((unsigned char *)&pid, sizeof(pid_t));
+	RAND_seed((unsigned char *)&pid, sizeof(pid));
 	/* Initialize system's random number generator */
 	RAND_bytes((unsigned char *)&seed, sizeof(long));
 	lynx_srand(seed);
@@ -143,7 +150,7 @@ PUBLIC void HTSSLInitPRNG NOARGS
 #define HTTP_NETWRITE(sock, buff, size, handle) \
 	(handle ? SSL_write(handle, buff, size) : NETWRITE(sock, buff, size))
 #define HTTP_NETCLOSE(sock, handle)  \
-	{ (void)NETCLOSE(sock); if (handle) SSL_free(handle); handle = NULL; }
+	{ (void)NETCLOSE(sock); if (handle) SSL_free(handle); SSL_handle = handle = NULL; }
 
 #else
 #define HTTP_NETREAD(a, b, c, d)   NETREAD(a, b, c)
@@ -245,7 +252,6 @@ PUBLIC int ws_netread(int fd, char *buf, int len)
 
     extern int win32_check_interrupt(void);	/* LYUtil.c */
     extern int lynx_timeout;			/* LYMain.c */
-    extern int AlertSecs;			/* LYMain.c */
     extern CRITICAL_SECTION critSec_READ;	/* LYMain.c */
 
 #define TICK	5
@@ -324,6 +330,32 @@ PUBLIC int ws_netread(int fd, char *buf, int len)
 }
 #endif
 
+/*
+ * Strip any username from the given string so we retain only the host.
+ * If the
+ */
+PRIVATE void strip_userid ARGS1(
+	char *,		host)
+{
+    char *p1 = host;
+    char *p2 = strchr(host, '@');
+    char *fake;
+
+    if (p2 != 0) {
+	*p2++ = '\0';
+	if ((fake = HTParse(host, "", PARSE_HOST)) != NULL) {
+	    char *msg = NULL;
+
+	    CTRACE((tfp, "FIXME:%s\n", fake));
+	    HTSprintf0(&msg, gettext("Address contains a username: %s"), host);
+	    HTAlert(msg);
+	    FREE(msg);
+	}
+	while ((*p1++ = *p2++) != '\0') {
+	    ;
+	}
+    }
+}
 
 /*		Load Document from HTTP Server			HTLoadHTTP()
 **		==============================
@@ -350,7 +382,7 @@ PRIVATE int HTLoadHTTP ARGS4 (
 {
   int s;			/* Socket number for returned data */
   CONST char *url = arg;	/* The URL which get_physical() returned */
-  char *command = NULL;		/* The whole command */
+  bstring *command = NULL;	/* The whole command */
   char *eol;			/* End of line if found */
   char *start_of_data;		/* Start of body of reply */
   int status;			/* tcp return */
@@ -385,10 +417,15 @@ PRIVATE int HTLoadHTTP ARGS4 (
   CONST char *connect_url = NULL; /* The URL being proxied */
   char *connect_host = NULL;	/* The host being proxied */
   SSL * handle = NULL;		/* The SSL handle */
-  char SSLprogress[256];	/* progress bar message */
+  char ssl_dn[256];
+  char *cert_host;
+  char *ssl_host;
+  char *p;
+  char *msg = NULL;
 #if SSLEAY_VERSION_NUMBER >= 0x0900
   BOOL try_tls = TRUE;
 #endif /* SSLEAY_VERSION_NUMBER >= 0x0900 */
+  SSL_handle = NULL;
 #else
   void * handle = NULL;
 #endif /* USE_SSL */
@@ -505,7 +542,7 @@ use_tunnel:
   ** then do the SSL stuff here
   */
   if (did_connect || !strncmp(url, "https", 5)) {
-      handle = HTGetSSLHandle();
+      SSL_handle = handle = HTGetSSLHandle();
       SSL_set_fd(handle, s);
 #if SSLEAY_VERSION_NUMBER >= 0x0900
       if (!try_tls)
@@ -517,8 +554,7 @@ use_tunnel:
       if (status <= 0) {
 #if SSLEAY_VERSION_NUMBER >= 0x0900
 	  if (try_tls) {
-	      CTRACE((tfp, "HTTP: Retrying connection without TLS\n"));
-	      _HTProgress("Retrying connection.");
+	      _HTProgress(gettext("Retrying connection without TLS."));
 	      try_tls = FALSE;
 	      if (did_connect)
 		  HTTP_NETCLOSE(s, handle);
@@ -554,20 +590,46 @@ use_tunnel:
 	  goto done;
 #endif /* SSLEAY_VERSION_NUMBER >= 0x0900 */
       }
-      sprintf(SSLprogress,"Secure %d-bit %s (%s) HTTP connection",SSL_get_cipher_bits(handle,NULL),SSL_get_cipher_version(handle),SSL_get_cipher(handle));
-      _HTProgress(SSLprogress);
-
-#ifdef NOTDEFINED
-      if (strcmp(HTParse(url, "", PARSE_HOST),
-		 strstr(X509_NAME_oneline(
-			X509_get_subject_name(
-				handle->session->peer)),"/CN=")+4)) {
-	  HTAlert("Certificate is for different host name");
-	  HTAlert(strstr(X509_NAME_oneline(
-			 X509_get_subject_name(
-				handle->session->peer)),"/CN=")+4);
+
+      X509_NAME_oneline(X509_get_subject_name(SSL_get_peer_certificate(handle)),
+		        ssl_dn, sizeof(ssl_dn));
+      if ((cert_host = strstr(ssl_dn, "/CN=")) == NULL) {
+	  HTSprintf0(&msg,
+		     gettext("SSL error:Can't find common name in certificate-Continue?"));
+	   if (! HTForcedPrompt(ssl_noprompt, msg, YES)) {
+	      status = HT_NOT_LOADED;
+	      FREE(msg);
+	      goto done;
+	  }
+      } else {
+	  cert_host += 4;
+	  if ((p = strchr(cert_host, '/')) != NULL)
+	      *p = '\0';
+	  if ((p = strchr(cert_host, ':')) != NULL)
+	      *p = '\0';
+	  ssl_host = HTParse(url, "", PARSE_HOST);
+	  if ((p = strchr(ssl_host, ':')) != NULL)
+	      *p = '\0';
+	  if (strcasecomp(ssl_host, cert_host)) {
+	      HTSprintf0(&msg,
+			 gettext("SSL error:host(%s)!=cert(%s)-Continue?"),
+			 ssl_host,
+			 cert_host);
+	      if (! HTForcedPrompt(ssl_noprompt, msg, YES)) {
+		  status = HT_NOT_LOADED;
+		  FREE(msg);
+		  goto done;
+	      }
+	  }
       }
-#endif /* NOTDEFINED */
+
+      HTSprintf0(&msg,
+		 gettext("Secure %d-bit %s (%s) HTTP connection"),
+		 SSL_get_cipher_bits(handle, NULL),
+		 SSL_get_cipher_version(handle),
+		 SSL_get_cipher(handle));
+      _HTProgress(msg);
+      FREE(msg);
   }
 #endif /* USE_SSL */
 
@@ -580,18 +642,18 @@ use_tunnel:
 #ifdef USE_SSL
     if (do_connect) {
 	METHOD = "CONNECT";
-	StrAllocCopy(command, "CONNECT ");
+	BStrCopy0(command, "CONNECT ");
     } else
 #endif /* USE_SSL */
     if (do_post) {
 	METHOD = "POST";
-	StrAllocCopy(command, "POST ");
+	BStrCopy0(command, "POST ");
     } else if (do_head) {
 	METHOD = "HEAD";
-	StrAllocCopy(command, "HEAD ");
+	BStrCopy0(command, "HEAD ");
     } else {
 	METHOD = "GET";
-	StrAllocCopy(command, "GET ");
+	BStrCopy0(command, "GET ");
     }
 
     /*
@@ -602,31 +664,32 @@ use_tunnel:
 #ifdef USE_SSL
     if (using_proxy && !did_connect) {
 	if (do_connect)
-	    StrAllocCat(command, connect_host);
+	    BStrCat0(command, connect_host);
 	else
-	    StrAllocCat(command, p1+1);
+	    BStrCat0(command, p1+1);
     }
 #else
     if (using_proxy)
-	StrAllocCat(command, p1+1);
+	BStrCat0(command, p1+1);
 #endif /* USE_SSL */
     else
-	StrAllocCat(command, p1);
+	BStrCat0(command, p1);
     FREE(p1);
   }
   if (extensions) {
-      StrAllocCat(command, " ");
-      StrAllocCat(command, HTTP_VERSION);
+      BStrCat0(command, " ");
+      BStrCat0(command, HTTP_VERSION);
   }
 
-  StrAllocCat(command, crlf);	/* CR LF, as in rfc 977 */
+  BStrCat0(command, crlf);	/* CR LF, as in rfc 977 */
 
   if (extensions) {
       int n, i;
       char * host = NULL;
 
       if ((host = HTParse(anAnchor->address, "", PARSE_HOST)) != NULL) {
-	  HTSprintf(&command, "Host: %s%c%c", host, CR,LF);
+	  strip_userid(host);
+	  HTBprintf(&command, "Host: %s%c%c", host, CR,LF);
 	  FREE(host);
       }
 
@@ -659,31 +722,56 @@ use_tunnel:
 			    temp);
 	      len += strlen(linebuf);
 	      if (len > 252 && !first_Accept) {
-		  StrAllocCat(command, crlf);
+		  BStrCat0(command, crlf);
 		  HTSprintf0(&linebuf, "Accept: %s%s",
 				HTAtom_name(pres->rep),
 				temp);
 		  len = strlen(linebuf);
 	      }
-	      StrAllocCat(command, linebuf);
+	      BStrCat0(command, linebuf);
 	      first_Accept = FALSE;
 	  }
       }
-      HTSprintf(&command, "%s*/*;q=0.01%c%c",
+      HTBprintf(&command, "%s*/*;q=0.01%c%c",
 		    (first_Accept ?
 		       "Accept: " : ", "), CR, LF);
       first_Accept = FALSE;
       len = 0;
 
-      HTSprintf(&command, "Accept-Encoding: %s, %s%c%c",
-		    "gzip", "compress", CR, LF);
+      /*
+       * FIXME:  suppressing the "Accept-Encoding" in this case is done to work
+       * around limitations of the presentation logic used for the command-line
+       * "-base" option.  The remote site may transmit the document gzip'd, but
+       * the ensuing logic in HTSaveToFile() would see the mime-type as gzip
+       * rather than text/html, and not prepend the base URL.  This is less
+       * efficient than accepting the compressed data and uncompressing it,
+       * adding the base URL but is simpler than augmenting the dump's
+       * presentation logic -TD
+       */
+      if (LYPrependBaseToSource && dump_output_immediately) {
+	  CTRACE((tfp, "omit Accept-Encoding to work-around interaction with -source\n"));
+      } else {
+	  char *list = 0;
+#if defined(USE_ZLIB) || defined(GZIP_PATH)
+	  StrAllocCopy(list, "gzip");
+#endif
+#if defined(USE_ZLIB) || defined(COMPRESS_PATH)
+	  if (list != 0)
+	      StrAllocCat(list, ", ");
+	  StrAllocCat(list, "compress");
+#endif
+	  if (list != 0) {
+	      HTBprintf(&command, "Accept-Encoding: %s%c%c", list, CR, LF);
+	      free(list);
+	  }
+      }
 
       if (language && *language) {
-	  HTSprintf(&command, "Accept-Language: %s%c%c", language, CR, LF);
+	  HTBprintf(&command, "Accept-Language: %s%c%c", language, CR, LF);
       }
 
       if (pref_charset && *pref_charset) {
-	  StrAllocCat(command, "Accept-Charset: ");
+	  BStrCat0(command, "Accept-Charset: ");
 	  StrAllocCopy(linebuf, pref_charset);
 	  if (linebuf[strlen(linebuf)-1] == ',')
 	      linebuf[strlen(linebuf)-1] = '\0';
@@ -692,8 +780,8 @@ use_tunnel:
 	      StrAllocCat(linebuf, ", iso-8859-1;q=0.01");
 	  if (strstr(linebuf, "us-ascii") == NULL)
 	      StrAllocCat(linebuf, ", us-ascii;q=0.01");
-	  StrAllocCat(command, linebuf);
-	  HTSprintf(&command, "%c%c", CR, LF);
+	  BStrCat0(command, linebuf);
+	  HTBprintf(&command, "%c%c", CR, LF);
       }
 
 #if 0
@@ -720,7 +808,7 @@ use_tunnel:
       **  new-httpd@apache.org from Koen Holtman, Jan 1999.
       */
       if (!do_post) {
-	  HTSprintf(&command, "Negotiate: trans%c%c", CR, LF);
+	  HTBprintf(&command, "Negotiate: trans%c%c", CR, LF);
       }
 #endif /* 0 */
 
@@ -731,25 +819,25 @@ use_tunnel:
       **  Also send it as a Cache-Control header for HTTP/1.1. - FM
       */
       if (reloading) {
-	  HTSprintf(&command, "Pragma: no-cache%c%c", CR, LF);
-	  HTSprintf(&command, "Cache-Control: no-cache%c%c", CR, LF);
+	  HTBprintf(&command, "Pragma: no-cache%c%c", CR, LF);
+	  HTBprintf(&command, "Cache-Control: no-cache%c%c", CR, LF);
       }
 
       if (LYUserAgent && *LYUserAgent) {
 	  char *cp = LYSkipBlanks(LYUserAgent);
 	  /* Won't send it at all if all blank - kw */
 	  if (*cp != '\0')
-	      HTSprintf(&command, "User-Agent: %.*s%c%c",
+	      HTBprintf(&command, "User-Agent: %.*s%c%c",
 		      INIT_LINE_SIZE-15, LYUserAgent, CR, LF);
       } else {
-	  HTSprintf(&command, "User-Agent: %s/%s  libwww-FM/%s%c%c",
+	  HTBprintf(&command, "User-Agent: %s/%s  libwww-FM/%s%c%c",
 		  HTAppName ? HTAppName : "unknown",
 		  HTAppVersion ? HTAppVersion : "0.0",
 		  HTLibraryVersion, CR, LF);
       }
 
       if (personal_mail_address && !LYNoFromHeader) {
-	  HTSprintf(&command, "From: %s%c%c", personal_mail_address, CR,LF);
+	  HTBprintf(&command, "From: %s%c%c", personal_mail_address, CR,LF);
       }
 
       if (!(LYUserSpecifiedURL ||
@@ -757,18 +845,15 @@ use_tunnel:
 	  strcmp(HTLoadedDocumentURL(), "")) {
 	  char *cp = LYRequestReferer;
 	  if (!cp) cp = HTLoadedDocumentURL(); /* @@@ Try both? - kw */
-	  StrAllocCat(command, "Referer: ");
-	  if (!strncasecomp(cp, "LYNXIMGMAP:", 11)) {
-	      char *cp1 = strchr(cp, '#');
-	      if (cp1)
-		  *cp1 = '\0';
-	      StrAllocCat(command, cp + 11);
-	      if (cp1)
-		  *cp1 = '#';
+	  BStrCat0(command, "Referer: ");
+	  if (isLYNXIMGMAP(cp)) {
+	      char *cp1 = trimPoundSelector(cp);
+	      BStrCat0(command, cp + LEN_LYNXIMGMAP);
+	      restorePoundSelector(cp1);
 	  } else {
-	      StrAllocCat(command, cp);
+	      BStrCat0(command, cp);
 	  }
-	  HTSprintf(&command, "%c%c", CR, LF);
+	  HTBprintf(&command, "%c%c", CR, LF);
       }
 
       {
@@ -830,7 +915,7 @@ use_tunnel:
 		**  If auth is not NULL nor zero-length, it's
 		**  an Authorization header to be included. - FM
 		*/
-		HTSprintf(&command, "%s%c%c", auth, CR, LF);
+		HTBprintf(&command, "%s%c%c", auth, CR, LF);
 		CTRACE((tfp, "HTTP: Sending authorization: %s\n", auth));
 	    } else if (auth && *auth == '\0') {
 		/*
@@ -848,7 +933,7 @@ use_tunnel:
 		    if (did_connect)
 			HTTP_NETCLOSE(s, handle);
 #endif /* USE_SSL */
-		    FREE(command);
+		    BStrFree(command);
 		    FREE(hostname);
 		    FREE(docname);
 		    FREE(abspath);
@@ -865,7 +950,7 @@ use_tunnel:
 	    **	document being proxied.
 	    */
 	    if (!strncmp(docname, "http", 4)) {
-		cookie = LYCookie(host2, path2, port2, secure);
+		cookie = LYAddCookieHeader(host2, path2, port2, secure);
 	    }
 	    FREE(host2);
 	    FREE(path2);
@@ -877,7 +962,7 @@ use_tunnel:
 	    /*
 	    **	Add cookie for a non-proxied request. - FM
 	    */
-	    cookie = LYCookie(hostname, abspath, portnumber, secure);
+	    cookie = LYAddCookieHeader(hostname, abspath, portnumber, secure);
 	    auth_proxy = NO;
 	}
 	/*
@@ -889,8 +974,8 @@ use_tunnel:
 		**  It's a historical cookie, so signal to the
 		**  server that we support modern cookies. - FM
 		*/
-		StrAllocCat(command, "Cookie2: $Version=\"1\"");
-		StrAllocCat(command, crlf);
+		BStrCat0(command, "Cookie2: $Version=\"1\"");
+		BStrCat0(command, crlf);
 		CTRACE((tfp, "HTTP: Sending Cookie2: $Version =\"1\"\n"));
 	    }
 	    if (*cookie != '\0') {
@@ -899,9 +984,9 @@ use_tunnel:
 		**  Note that any folding of long strings has been
 		**  done already in LYCookie.c. - FM
 		*/
-		StrAllocCat(command, "Cookie: ");
-		StrAllocCat(command, cookie);
-		StrAllocCat(command, crlf);
+		BStrCat0(command, "Cookie: ");
+		BStrCat0(command, cookie);
+		BStrCat0(command, crlf);
 		CTRACE((tfp, "HTTP: Sending Cookie: %s\n", cookie));
 	    }
 	    FREE(cookie);
@@ -925,7 +1010,7 @@ use_tunnel:
 	    **	an Authorization or Proxy-Authorization
 	    **	header to be included. - FM
 	    */
-	    HTSprintf(&command, "%s%c%c", auth, CR, LF);
+	    HTBprintf(&command, "%s%c%c", auth, CR, LF);
 	    CTRACE((tfp, (auth_proxy ?
 			 "HTTP: Sending proxy authorization: %s\n" :
 			 "HTTP: Sending authorization: %s\n"),
@@ -945,7 +1030,7 @@ use_tunnel:
 	    } else {
 		if (traversal || dump_output_immediately)
 		    HTAlert(FAILED_NEED_PASSWD);
-		FREE(command);
+		BStrFree(command);
 		FREE(hostname);
 		FREE(docname);
 		status = HT_NOT_LOADED;
@@ -968,51 +1053,52 @@ use_tunnel:
 #endif /* USE_SSL */
 	do_post) {
 	CTRACE((tfp, "HTTP: Doing post, content-type '%s'\n",
-		     anAnchor->post_content_type ? anAnchor->post_content_type
-						 : "lose"));
-	HTSprintf(&command, "Content-type: %s%c%c",
+		     anAnchor->post_content_type
+		     ? anAnchor->post_content_type
+		     : "lose"));
+	HTBprintf(&command, "Content-type: %s%c%c",
 		   anAnchor->post_content_type
 		   ? anAnchor->post_content_type
 		   : "lose",
 		  CR, LF);
-/*
- * Ack!  This assumes non-binary data!  Icky!
- *
- */
-	HTSprintf(&command, "Content-length: %d%c%c",
-		  (anAnchor->post_data)
-		   ? strlen (anAnchor->post_data)
+
+	HTBprintf(&command, "Content-length: %d%c%c",
+		  !isBEmpty(anAnchor->post_data)
+		   ? BStrLen(anAnchor->post_data)
 		   : 0,
 		  CR, LF);
 
-	StrAllocCat(command, crlf);	/* Blank line means "end" of headers */
+	BStrCat0(command, crlf);	/* Blank line means "end" of headers */
 
-	StrAllocCat(command, anAnchor->post_data);
+	BStrCat(command, anAnchor->post_data);
     }
     else
-	StrAllocCat(command, crlf);	/* Blank line means "end" of headers */
+	BStrCat0(command, crlf);	/* Blank line means "end" of headers */
 
+    if (TRACE) {
+	CTRACE((tfp, "Writing:\n"));
+	trace_bstring(command);
 #ifdef USE_SSL
-  CTRACE((tfp, "Writing:\n%s%s----------------------------------\n",
-	       command,
+	CTRACE((tfp, "%s",
 	       (anAnchor->post_data && !do_connect ? crlf : "")));
 #else
-  CTRACE((tfp, "Writing:\n%s%s----------------------------------\n",
-	       command,
+	CTRACE((tfp, "%s",
 	       (anAnchor->post_data ? crlf : "")));
 #endif /* USE_SSL */
+	CTRACE((tfp, "----------------------------------\n"));
+    }
 
   _HTProgress (gettext("Sending HTTP request."));
 
 #ifdef    NOT_ASCII  /* S/390 -- gil -- 0548 */
   {   char *p;
 
-      for ( p = command; p < command + strlen(command); p++ )
+      for ( p = BStrData(command); p < BStrData(command) + BStrLen(command); p++ )
 	  *p = TOASCII(*p);
   }
 #endif /* NOT_ASCII */
-  status = HTTP_NETWRITE(s, command, (int)strlen(command), handle);
-  FREE(command);
+  status = HTTP_NETWRITE(s, BStrData(command), BStrLen(command), handle);
+  BStrFree(command);
   FREE(linebuf);
   if (status <= 0) {
       if (status == 0) {
@@ -1024,7 +1110,7 @@ use_tunnel:
 		 !already_retrying &&
 		 /* Don't retry if we're posting. */ !do_post) {
 	    /*
-	    **	Arrrrgh, HTTP 0/1 compability problem, maybe.
+	    **	Arrrrgh, HTTP 0/1 compatibility problem, maybe.
 	    */
 	    CTRACE((tfp, "HTTP: BONZO ON WRITE Trying again with HTTP0 request.\n"));
 	    _HTProgress (RETRYING_AS_HTTP0);
@@ -2033,7 +2119,7 @@ done:
   FREE(connect_host);
   if (handle) {
     SSL_free(handle);
-    handle = NULL;
+    SSL_handle = handle = NULL;
   }
 #endif /* USE_SSL */
   return status;
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTP.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTP.h
index cd6925f29d2..971305f9855 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTP.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTP.h
@@ -19,15 +19,14 @@ GLOBALREF HTProtocol HTTPS;
 #define URL_POST_METHOD 2
 #define URL_MAIL_METHOD 3
 
+extern int ws_read_per_sec;
 extern BOOL reloading;
 extern char * redirecting_url;
 extern BOOL permanent_redirection;
 extern BOOL redirect_post_content;
 
-#endif /* HTTP_H */
-
-/*
-
-   end of HTTP module definition
+#ifdef USE_SSL
+extern SSL * SSL_handle;
+#endif
 
- */
+#endif /* HTTP_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTelnet.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTelnet.c
index 33f87e4eb8d..ce51e836a35 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTelnet.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTelnet.c
@@ -32,17 +32,16 @@
 #include <HTAlert.h>
 
 #include <LYStrings.h>
+#include <LYClean.h>
 #include <LYLeaks.h>
 
 PRIVATE void do_system ARGS1(char *, command)
 {
-    CTRACE((tfp, "HTTelnet: Command is: %s\n\n", command));
-#ifdef UNIX	/* want LYSystem's signal sanitizing - kw */
-    LYSystem(command);
-#else		/* Non-UNIX should use LYSystem too? - left for now - kw */
-    system(command);
-#endif
-    FREE(command);
+    if (!isEmpty(command)) {
+	CTRACE((tfp, "HTTelnet: Command is: %s\n\n", command));
+	LYSystem(command);
+	FREE(command);
+    }
 }
 
 /*	Telnet or "rlogin" access
@@ -50,6 +49,7 @@ PRIVATE void do_system ARGS1(char *, command)
 */
 PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 {
+    CONST char *program;
 	char * user = host;
 	char * password = NULL;
 	char * cp;
@@ -156,13 +156,14 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 #if	!defined(TELNET_DONE) && (defined(NeXT) && defined(NeXTSTEP) && NeXTSTEP<=20100)
 #define FMT_TELNET "%s%s%s %s %s"
 
-	HTAddParam(&command, FMT_TELNET, 1, TELNET_PATH);
-	HTOptParam(&command, FMT_TELNET, 2, user ? " -l " : "");
-	HTAddParam(&command, FMT_TELNET, 3, user);
-	HTAddParam(&command, FMT_TELNET, 4, hostname);
-	HTAddParam(&command, FMT_TELNET, 5, port);
-	HTEndParam(&command, FMT_TELNET, 5);
-
+	if ((program = HTGetProgramPath(ppTELNET)) != NULL) {
+	    HTAddParam(&command, FMT_TELNET, 1, program);
+	    HTOptParam(&command, FMT_TELNET, 2, user ? " -l " : "");
+	    HTAddParam(&command, FMT_TELNET, 3, user);
+	    HTAddParam(&command, FMT_TELNET, 4, hostname);
+	    HTAddParam(&command, FMT_TELNET, 5, port);
+	    HTEndParam(&command, FMT_TELNET, 5);
+	}
 	do_system(command);
 #define TELNET_DONE
 #endif
@@ -174,45 +175,37 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 #define FMT_TN3270 "%s %s %s"
 #define FMT_TELNET "%s %s %s"
 
-	if (login_protocol == rlogin) {
-
-	    HTAddParam(&command, FMT_RLOGIN, 1, RLOGIN_PATH);
-	    HTAddParam(&command, FMT_RLOGIN, 2, hostname);
-	    HTOptParam(&command, FMT_RLOGIN, 3, user ? " -l " : "");
-	    HTAddParam(&command, FMT_RLOGIN, 4, user);
-	    HTEndParam(&command, FMT_RLOGIN, 4);
-
-	} else if (login_protocol == tn3270) {
-
-	    HTAddParam(&command, FMT_TN3270, 1, TN3270_PATH);
-	    HTAddParam(&command, FMT_TN3270, 2, hostname);
-	    HTAddParam(&command, FMT_TN3270, 3, port);
-	    HTEndParam(&command, FMT_TN3270, 3);
-
-	} else {  /* TELNET */
-
-	    HTAddParam(&command, FMT_TELNET, 1, TELNET_PATH);
-	    HTAddParam(&command, FMT_TELNET, 2, hostname);
-	    HTAddParam(&command, FMT_TELNET, 3, port);
-	    HTEndParam(&command, FMT_TELNET, 3);
+	switch (login_protocol) {
+	case rlogin:
+	    if ((program = HTGetProgramPath(ppRLOGIN)) != NULL) {
+		HTAddParam(&command, FMT_RLOGIN, 1, program);
+		HTAddParam(&command, FMT_RLOGIN, 2, hostname);
+		HTOptParam(&command, FMT_RLOGIN, 3, user ? " -l " : "");
+		HTAddParam(&command, FMT_RLOGIN, 4, user);
+		HTEndParam(&command, FMT_RLOGIN, 4);
+	    }
+	    break;
+
+	case tn3270:
+	    if ((program = HTGetProgramPath(ppTN3270)) != NULL) {
+		HTAddParam(&command, FMT_TN3270, 1, program);
+		HTAddParam(&command, FMT_TN3270, 2, hostname);
+		HTAddParam(&command, FMT_TN3270, 3, port);
+		HTEndParam(&command, FMT_TN3270, 3);
+	    }
+	    break;
+
+	case telnet:
+	    if ((program = HTGetProgramPath(ppTELNET)) != NULL) {
+		HTAddParam(&command, FMT_TELNET, 1, program);
+		HTAddParam(&command, FMT_TELNET, 2, hostname);
+		HTAddParam(&command, FMT_TELNET, 3, port);
+		HTEndParam(&command, FMT_TELNET, 3);
+	    }
+	    break;
 	}
 
-#ifdef __DJGPP__
-#ifdef WATT32
-	_eth_release();
-#endif /* WATT32 */
-       __djgpp_set_ctrl_c(0);
-       _go32_want_ctrl_break(1);
-#endif /* __DJGPP__ */
-	do_system(command);
-#ifdef __DJGPP__
-       __djgpp_set_ctrl_c(1);
-       _go32_want_ctrl_break(0);
-#ifdef WATT32
-       _eth_init();
-#endif /* WATT32 */
-#endif /* __DJGPP__ */
-
+        LYSystem(command);
 #define TELNET_DONE
 #endif /* unix */
 
@@ -221,22 +214,22 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 	if (login_protocol == rlogin) {
 	    HTSprintf0(&command, "RLOGIN%s%s%s%s%s %s",  /*lm 930713 */
 		user ? "/USERNAME=\"" : "",
-		user ? user : "",
+		NonNull(user),
 		user ? "\"" : "",
 		port ? "/PORT=" : "",
-		port ? port : "",
+		NonNull(port),
 		hostname);
 
 	} else if (login_protocol == tn3270) {
 	    HTSprintf0(&command, "TELNET/TN3270 %s%s %s",
 		port ? "/PORT=" : "",
-		port ? port : "",
+		NonNull(port),
 		hostname);
 
 	} else {  /* TELNET */
 	    HTSprintf0(&command, "TELNET %s%s %s",
 		port ? "/PORT=" : "",
-		port ? port : "",
+		NonNull(port),
 		hostname);
 	}
 
@@ -250,22 +243,22 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 	    if (login_protocol == rlogin) {
 		HTSprintf0(&command, "RLOGIN%s%s%s%s%s %s",  /*lm 930713 */
 		    user ? "/USERNAME=\"" : "",
-		    user ? user : "",
+		    NonNull(user),
 		    user ? "\"" : "",
 		    port ? "/PORT=" : "",
-		    port ? port : "",
+		    NonNull(port),
 		    hostname);
 
 	    } else if (login_protocol == tn3270) {
 		HTSprintf0(&command, "TELNET/TN3270 %s%s %s",
 		    port ? "/PORT=" : "",
-		    port ? port : "",
+		    NonNull(port),
 		    hostname);
 
 	    } else {  /* TELNET */
 		HTSprintf0(&command, "TELNET %s%s %s",
 		    port ? "/PORT=" : "",
-		    port ? port : "",
+		    NonNull(port),
 		    hostname);
 	    }
 
@@ -275,18 +268,18 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 		   hostname,
 		   user ? " -l " : "",
 		   user ? "\"" : "",
-		   user ? user : "",
+		   NonNull(user),
 		   user ? "\"" : "");
 
 	    } else if (login_protocol == tn3270) {
 		HTSprintf0(&command, "TN3270 %s %s",
 		    hostname,
-		    port ? port : "");
+		    NonNull(port));
 
 	    } else {  /* TELNET */
 		HTSprintf0(&command, "TELNET %s %s",
 		    hostname,
-		    port ? port : "");
+		    NonNull(port));
 	    }
 	}
 
@@ -298,20 +291,20 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 	if (login_protocol == rlogin) {
 	    HTSprintf0(&command, "RLOGIN%s%s%s %s %s",
 		user ? "/USERNAME=\"" : "",
-		user ? user : "",
+		NonNull(user),
 		user ? "\"" : "",
 		hostname,
-		port ? port : "");
+		NonNull(port));
 
 	} else if (login_protocol == tn3270) {
 	    HTSprintf0(&command, "TN3270 %s %s",
 		hostname,
-		port ? port : "");
+		NonNull(port));
 
 	} else {  /* TELNET */
 	    HTSprintf0(&command, "TELNET %s %s",
 		hostname,
-		port ? port : "");
+		NonNull(port));
 	}
 
 	do_system(command);
@@ -322,13 +315,11 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 	if (login_protocol == telnet) {
 	    HTSprintf0(&command, "TELNET %s%s %s",
 		port ? "/PORT=" : "",
-		port ? port : "",
+		NonNull(port),
 		hostname);
 	    do_system(command);
 	}
 	else {
-	    extern BOOLEAN HadVMSInterrupt;
-
 	    printf(
 	"\nSorry, this browser was compiled without the %s access option.\n",
 		acc_method);
@@ -344,21 +335,21 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 	if (login_protocol == rlogin) {
 	    HTSprintf0(&command, "MULTINET RLOGIN%s%s%s%s %s",  /*lm 930713 */
 		user ? "/USERNAME=" : "",
-		user ? user : "",
+		NonNull(user),
 		port ? "/PORT=" : "",
-		port ? port : "",
+		NonNull(port),
 		hostname);
 
 	} else if (login_protocol == tn3270) {
 	    HTSprintf0(&command, "MULTINET TELNET/TN3270 %s%s %s",
 		port ? "/PORT=" : "",
-		port ? port : "",
+		NonNull(port),
 		hostname);
 
 	} else {  /* TELNET */
 	    HTSprintf0(&command, "MULTINET TELNET %s%s %s",
 		port ? "/PORT=" : "",
-		port ? port : "",
+		NonNull(port),
 		hostname);
 	}
 
@@ -370,19 +361,19 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 	    if (login_protocol == rlogin) {
 		HTSprintf0(&command, "RLOGIN%s%s%s%s %s",  /*lm 930713 */
 		    user ? "/USERNAME=" : "",
-		    user ? user : "",
+		    NonNull(user),
 		    port ? "/PORT=" : "",
-		    port ? port : "",
+		    NonNull(port),
 		    hostname);
 	    } else if (login_protocol == tn3270) {
 		HTSprintf0(&command, "TELNET/TN3270 %s%s %s",
 		    port ? "/PORT=" : "",
-		    port ? port : "",
+		    NonNull(port),
 		    hostname);
 	    } else {  /* TELNET */
 		HTSprintf0(&command, "TELNET %s%s %s",
 		    port ? "/PORT=" : "",
-		    port ? port : "",
+		    NonNull(port),
 		    hostname);
 	    }
 	} else { /* UNIX command syntax */
@@ -390,15 +381,15 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 		HTSprintf0(&command, "RLOGIN %s%s%s",
 		    hostname,
 		    user ? " -l " : "",
-		    user ? user : "");
+		    NonNull(user));
 	    } else if (login_protocol == tn3270) {
 		HTSprintf0(&command, "TN3270 %s %s",
 		    hostname,
-		    port ? port : "");
+		    NonNull(port));
 	    } else {  /* TELNET */
 		HTSprintf0(&command, "TELNET %s %s",
 		    hostname,
-		    port ? port : "");
+		    NonNull(port));
 	    }
 	}
 
@@ -410,19 +401,19 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 	if (login_protocol == rlogin) {
 	    HTSprintf0(&command, "RLOGIN%s%s %s %s",
 		user ? "/USERNAME=" : "",
-		user ? user : "",
+		NonNull(user),
 		hostname,
-		port ? port : "");
+		NonNull(port));
 
 	} else if (login_protocol == tn3270) {
 	    HTSprintf0(&command, "TN3270 %s %s",
 		hostname,
-		port ? port : "");
+		NonNull(port));
 
 	} else {  /* TELNET */
 	    HTSprintf0(&command, "TELNET %s %s",
 		hostname,
-		port ? port : "");
+		NonNull(port));
 	}
 
 	do_system(command);
@@ -432,13 +423,11 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 	if (login_protocol == telnet) {
 	    HTSprintf0(&command, "TELNET %s%s %s",
 		port ? "/PORT=" : "",
-		port ? port : "",
+		NonNull(port),
 		hostname);
 	    do_system(command);
 	}
 	else {
-	    extern BOOLEAN HadVMSInterrupt;
-
 	    printf(
 	  "\nSorry, this browser was compiled without the %s access option.\n",
 		acc_method);
@@ -451,13 +440,11 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 	if (login_protocol == telnet) {
 	    HTSprintf0(&command, "TELNET %s%s %s",
 		port ? "/PORT=" : "",
-		port ? port : "",
+		NonNull(port),
 		hostname);
 	    do_system(command);
 	}
 	else {
-	    extern BOOLEAN HadVMSInterrupt;
-
 	    printf(
 	  "\nSorry, this browser was compiled without the %s access option.\n",
 		acc_method);
@@ -495,10 +482,7 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host)
 	    fflush(stdout);
 	    LYgetch();
 #ifdef VMS
-	    {
-		extern BOOLEAN HadVMSInterrupt;
-		HadVMSInterrupt = FALSE;
-	    }
+	    HadVMSInterrupt = FALSE;
 #endif /* VMS */
 	}
 #endif /* !TELNET_DONE */
@@ -536,7 +520,7 @@ ARGS4
 	CTRACE((tfp, "HTTelnet: Can't output a live session -- must be interactive!\n"));
 	return HT_NO_DATA;
     }
-    acc_method =  HTParse(addr, "file:", PARSE_ACCESS);
+    acc_method =  HTParse(addr, STR_FILE_URL, PARSE_ACCESS);
 
     host = HTParse(addr, "", PARSE_HOST);
     if (!host || *host == '\0') {
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTelnet.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTelnet.h
index b5ce8877aca..92dbf2ff5f9 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTelnet.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTelnet.h
@@ -17,8 +17,5 @@ GLOBALREF HTProtocol HTTelnet;
 GLOBALREF HTProtocol HTRlogin;
 GLOBALREF HTProtocol HTTn3270;
 #endif /* GLOBALREF_IS_MACRO */
-#endif /* HTTELNET_H */
-
-/*
 
-   end */
+#endif /* HTTELNET_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTUU.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTUU.h
index 2cff52925a8..8e06394e96e 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTUU.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTUU.h
@@ -23,4 +23,4 @@ PUBLIC int HTUU_decode PARAMS((char *bufcoded,
                                unsigned char *bufplain,
                                int outbufsize));
 
-#endif
+#endif /* HTUU_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTUtils.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTUtils.h
index 8172a7501d4..bf2f3bc3d0b 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTUtils.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTUtils.h
@@ -14,6 +14,29 @@
 
 #ifdef HAVE_CONFIG_H
 #include <lynx_cfg.h>	/* generated by autoconf 'configure' script */
+
+/* see AC_FUNC_ALLOCA macro */
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  if HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
 #include <sys/types.h>
 #include <stdio.h>
 
@@ -22,6 +45,7 @@
 #ifdef DJGPP
 #include <sys/config.h>	/* pseudo-autoconf values for DJGPP libc/headers */
 #define HAVE_TRUNCATE 1
+#define HAVE_ALLOCA 1
 #include <limits.h>
 #endif /* DJGPP */
 
@@ -143,6 +167,12 @@
 #include <windows.h>		/* #include "windef.h" */
 #define BOOLEAN_DEFINED
 #undef HAVE_POPEN		/* FIXME: does this not work, or is it missing */
+#undef small			/* see <w32api/rpcndr.h> */
+#endif
+
+/* cygwin, mingw32, etc. */
+#ifdef FILE_DOES_NOT_EXIST
+#undef FILE_DOES_NOT_EXIST	/* see <w32api/winnt.h> */
 #endif
 
 #if defined(_WINDOWS) && !defined(__CYGWIN__)	/* SCW */
@@ -167,7 +197,7 @@ typedef unsigned short mode_t;
 #  define NO_EMPTY_HREFLESS_A
 #endif
 
-#if  defined(__EMX__) || defined(WIN_EX)
+#if  defined(__EMX__) || defined(WIN_EX) || defined(HAVE_POPEN)
 #  define CAN_CUT_AND_PASTE
 #endif
 
@@ -175,6 +205,18 @@ typedef unsigned short mode_t;
 #  define USE_BLINK
 #endif
 
+#if defined(DOSPATH) || defined(__EMX__)
+#  define USE_DOS_DRIVES	/* we allow things like "c:" in paths */
+#endif
+
+#if defined(UNIX)
+#  if (defined(__BEOS__) || defined(__CYGWIN__) || defined(__DJGPP__) || defined(__EMX__) || defined(__MINGW32__))
+#    define SINGLE_USER_UNIX	/* well, at least they try */
+#  else
+#    define MULTI_USER_UNIX
+#  endif
+#endif
+
 /*
 
   ERROR TYPE
@@ -311,6 +353,9 @@ Macros for declarations
 #define NULL ((void *)0)
 #endif
 
+#define isEmpty(s)   ((s) == 0 || *(s) == 0)
+
+#define NonNull(s) (((s) != 0) ? s : "")
 #define NONNULL(s) (((s) != 0) ? s : "(null)")
 
 /* array/table size */
@@ -319,6 +364,9 @@ Macros for declarations
 #define	typecalloc(cast)		(cast *)calloc(1,sizeof(cast))
 #define	typecallocn(cast,ntypes)	(cast *)calloc(ntypes,sizeof(cast))
 
+#define typeMalloc(cast)                (cast *)malloc(sizeof(cast))
+#define typeMallocn(cast,ntypes)        (cast *)malloc(ntypes*sizeof(cast))
+
 /*
 
 OFTEN USED INTEGER MACROS
@@ -341,7 +389,7 @@ Booleans
 
 #ifndef _WINDOWS
 #ifndef BOOLEAN_DEFINED
-        typedef char    BOOLEAN;                /* Logical value */
+    typedef char    BOOLEAN;	/* Logical value */
 #ifndef CURSES
 #ifndef TRUE
 #define TRUE    (BOOLEAN)1
@@ -355,6 +403,7 @@ Booleans
 #ifndef BOOL
 #define BOOL BOOLEAN
 #endif
+
 #ifndef YES
 #define YES (BOOLEAN)1
 #define NO (BOOLEAN)0
@@ -403,15 +452,15 @@ are generally not the response status from any specific protocol.
 #define HT_FORBIDDEN            -403    /* Access forbidden */
 #define HT_NOT_ACCEPTABLE       -406    /* Not Acceptable */
 
-#define HT_PARSER_REOPEN_ELT	 700	/* tells SGML parser to keep tag open */
-#define HT_PARSER_OTHER_CONTENT	 701	/* tells SGML to change content model */
-#define HT_H_ERRNO_VALID 	-800	/* see h_errno for resolver error */
+#define HT_PARSER_REOPEN_ELT     700    /* tells SGML parser to keep tag open */
+#define HT_PARSER_OTHER_CONTENT  701    /* tells SGML to change content model */
+#define HT_H_ERRNO_VALID        -800    /* see h_errno for resolver error */
 
 #define HT_INTERNAL             -900    /* Weird -- should never happen. */
 #define HT_BAD_EOF      -12             /* Premature EOF */
 
 #ifndef va_arg
-# if HAVE_STDARG_H && ANSI_VARARGS
+# if defined(HAVE_STDARG_H) && defined(ANSI_VARARGS)
 #  include <stdarg.h>
 # else
 #  if HAVE_VARARGS_H
@@ -420,7 +469,7 @@ are generally not the response status from any specific protocol.
 # endif
 #endif
 
-#if ANSI_VARARGS
+#if defined(ANSI_VARARGS)
 #define LYva_start(ap,format) va_start(ap,format)
 #else
 #define LYva_start(ap,format) va_start(ap)
@@ -430,11 +479,13 @@ are generally not the response status from any specific protocol.
  * GCC can be told that some functions are like printf (and do type-checking on
  * their parameters).
  */
-#if	GCC_PRINTF
+#ifndef GCC_PRINTFLIKE
+#if defined(GCC_PRINTF) && !defined(printf) && !defined(HAVE_LIBUTF8_H)
 #define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
 #else
 #define GCC_PRINTFLIKE(fmt,var) /*nothing*/
 #endif
+#endif
 
 #include <HTString.h>   /* String utilities */
 
@@ -453,24 +504,40 @@ Out Of Memory checking for malloc() return:
 extern void outofmem PARAMS((CONST char *fname, CONST char *func));
 
 /*
-
-Upper- and Lowercase macros
-
-   The problem here is that toupper(x) is not defined officially unless isupper(x) is.
-   These macros are CERTAINLY needed on #if defined(pyr) || define(mips) or BDSI
-   platforms.  For safefy, we make them mandatory.
-
+ * Upper- and Lowercase macros
+ *
+ * The problem here is that toupper(x) is not defined officially unless
+ * isupper(x) is.  These macros are CERTAINLY needed on #if defined(pyr) ||
+ * define(mips) or BDSI platforms.  For safefy, we make them mandatory.
+ *
+ * Note: Pyramid and Mips can't uppercase non-alpha.
  */
 #include <ctype.h>
 #include <string.h>
 
 #ifndef TOLOWER
-  /* Pyramid and Mips can't uppercase non-alpha */
+
+#ifdef EXP_ASCII_CTYPES
+
+#define TOLOWER(c) ascii_tolower(UCH(c))
+#define TOUPPER(c) ascii_toupper(UCH(c))
+#define ISUPPER(c) ascii_isupper(UCH(c))
+
+extern int ascii_toupper PARAMS((int));
+extern int ascii_tolower PARAMS((int));
+extern int ascii_isupper PARAMS((int));
+
+#else
+
 #define TOLOWER(c) (isupper(UCH(c)) ? tolower(UCH(c)) : UCH(c))
 #define TOUPPER(c) (islower(UCH(c)) ? toupper(UCH(c)) : UCH(c))
+#define ISUPPER(c) (isupper(UCH(c)))
+
+#endif
+
 #endif /* TOLOWER */
 
-#define FREE(x) if (x != 0) {free((char *)x); x = NULL;}
+#define FREE(x)    {if (x != 0) {free((char *)x); x = NULL;}}
 
 /*
 
@@ -501,6 +568,8 @@ extern int WWW_TraceMask;
 #define TRACE_SGML      (TRACE_bit(0))
 #define TRACE_STYLE     (TRACE_bit(1))
 #define TRACE_TRST      (TRACE_bit(2))
+#define TRACE_CFG       (TRACE_bit(3))
+#define TRACE_BSTRING   (TRACE_bit(4))
 
 #if defined(LY_TRACELINE)
 #define LY_SHOWWHERE fprintf( tfp, "%s: %d: ", __FILE__, LY_TRACELINE ),
@@ -568,17 +637,33 @@ extern FILE *TraceFP NOPARAMS;
 
 #ifdef USE_SSL
 #define free_func free__func
+
 #ifdef USE_OPENSSL_INCL
 #include <openssl/ssl.h>
 #include <openssl/crypto.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
+
 #else
+
+#ifdef USE_GNUTLS_INCL
+#include <gnutls/openssl.h>
+/*
+ * GNUTLS's implementation of OpenSSL is very incomplete and rudimentary.
+ * For a start, let's make it compile (TD - 2003/4/13).
+ */
+#ifndef SSL_VERIFY_PEER
+#define SSL_VERIFY_PEER			0x01
+#endif
+
+#else	/* assume SSLeay */
 #include <ssl.h>
 #include <crypto.h>
 #include <rand.h>
 #include <err.h>
 #endif
+#endif /* USE_OPENSSL_INCL */
+
 #undef free_func
 
 extern SSL * HTGetSSLHandle NOPARAMS;
@@ -587,6 +672,20 @@ extern char HTGetSSLCharacter PARAMS((void * handle));
 
 #endif /* USE_SSL */
 
+#ifdef HAVE_LIBDMALLOC
+#include <dmalloc.h>    /* Gray Watson's library */
+#define show_alloc() dmalloc_log_unfreed()
+#endif
+
+#ifdef HAVE_LIBDBMALLOC
+#include <dbmalloc.h>   /* Conor Cahill's library */
+#define show_alloc() malloc_dump(fileno(stderr))
+#endif
+
+#ifndef show_alloc
+#define show_alloc()	/* nothing */
+#endif
+
 #include <userdefs.h>
 
 #endif /* HTUTILS_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMSUtils.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMSUtils.c
index 5d3720350d6..b9f50e3dfb1 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMSUtils.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMSUtils.c
@@ -20,6 +20,7 @@
 #include <UCMap.h>
 #include <UCAux.h>
 #include <HTFTP.h>
+#include <HTTCP.h>
 #include <HTVMSUtils.h>
 #include <ssdef.h>
 #include <jpidef.h>
@@ -31,11 +32,12 @@
 #include <starlet.h>
 #include <rmsdef.h>
 
+#include <LYGlobalDefs.h>
 #include <LYUtils.h>
 #include <LYLeaks.h>
 #include <LYStrings.h>
 
-PUBLIC BOOL HTVMSFileVersions=FALSE; /* Include version numbers in listing? */
+PUBLIC BOOL HTVMSFileVersions = FALSE; /* Include version numbers in listing? */
 
 typedef struct {
    unsigned long BufferLength : 16;
@@ -44,8 +46,6 @@ typedef struct {
    unsigned long ReturnLengthAddress : 32;
 } ItemStruct;
 
-extern CONST char * HTHostName NOPARAMS;
-
 /* PUBLIC							HTVMS_authSysPrv()
 **		CHECKS IF THIS PROCESS IS AUTHORIZED TO ENABLE SYSPRV
 ** ON ENTRY:
@@ -752,9 +752,8 @@ PUBLIC int HTVMSBrowseDir ARGS4(
     struct stat file_info;
     time_t NowTime;
     static char ThisYear[8];
-    VMSEntryInfo *entry_info=0;
+    VMSEntryInfo *entry_info = 0;
     char string_buffer[64];
-    extern BOOLEAN no_dotfiles, show_dotfiles;
 
     HTUnEscape(pathname);
     CTRACE((tfp,"HTVMSBrowseDir: Browsing `%s\'\n", pathname));
@@ -766,10 +765,10 @@ PUBLIC int HTVMSBrowseDir ARGS4(
      *  to /sys$sysroot/syshlp) before calling this routine.
      */
     if (((*pathname != '/') ||
-	 (cp=strchr(pathname+1, '/')) == NULL ||
-	 *(cp+1) == '\0' ||
-	 0==strncmp((cp+1), "000000", 6)) ||
-	(dp=HTVMSopendir(pathname)) == NULL) {
+	 (cp = strchr(pathname+1, '/')) == NULL ||
+	 *(cp + 1) == '\0' ||
+	 0 == strncmp((cp + 1), "000000", 6)) ||
+	(dp = HTVMSopendir(pathname)) == NULL) {
 	FREE(pathname);
 	return HTLoadError(sink, 403, COULD_NOT_ACCESS_DIR);
     }
@@ -1027,7 +1026,7 @@ PUBLIC int HTVMSBrowseDir ARGS4(
 	      {
 		 CTRACE((tfp,"Adding file to BTree: %s\n",
 						      entry_info->filename));
-		 HTBTree_add(bt, (VMSEntryInfo *)entry_info);
+		 HTBTree_add(bt, entry_info);
 	      }
 
 	} /* End while HTVMSreaddir() */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMSUtils.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMSUtils.h
index 2720125eba3..18bdb3b75ad 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMSUtils.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMSUtils.h
@@ -1,5 +1,5 @@
 /*             VMS specific routines
-                                             
+
  */
 
 #ifndef HTVMSUTIL_H
@@ -8,7 +8,7 @@
 #ifndef HTUTILS_H
 #include <HTUtils.h>
 #endif
- 
+
 #include <HTAnchor.h>
 
 extern BOOL HTVMSFileVersions;	/* Include version numbers in listing? */
@@ -30,7 +30,7 @@ PUBLIC BOOL HTVMS_authSysPrv NOPARAMS;
 **	No arguments.
 **
 ** ON EXIT:
-**	
+**
 */
 PUBLIC void HTVMS_enableSysPrv NOPARAMS;
 
@@ -41,7 +41,7 @@ PUBLIC void HTVMS_enableSysPrv NOPARAMS;
 **	No arguments.
 **
 ** ON EXIT:
-**	
+**
 */
 PUBLIC void HTVMS_disableSysPrv NOPARAMS;
 
@@ -53,7 +53,7 @@ PUBLIC void HTVMS_disableSysPrv NOPARAMS;
 **
 ** ON EXIT:
 **	returns YES if access is allowed
-**	
+**
 */
 PUBLIC BOOL HTVMS_checkAccess PARAMS((
 	CONST char * FileName,
@@ -62,29 +62,29 @@ PUBLIC BOOL HTVMS_checkAccess PARAMS((
 
 
 /* PUBLIC							HTVMS_wwwName()
-**		CONVERTS VMS Name into WWW Name 
+**		CONVERTS VMS Name into WWW Name
 ** ON ENTRY:
 **	vmsname		VMS file specification (NO NODE)
 **
 ** ON EXIT:
-**	returns 	www file specification
+**	returns		www file specification
 **
 ** EXAMPLES:
 **	vmsname				wwwname
-**	DISK$USER 			disk$user
-**	DISK$USER: 			/disk$user/
-**	DISK$USER:[DUNS] 		/disk$user/duns
-**	DISK$USER:[DUNS.ECHO] 		/disk$user/duns/echo
-**	[DUNS] 				duns
-**	[DUNS.ECHO] 			duns/echo
-**	[DUNS.ECHO.-.TRANS] 		duns/echo/../trans
-**	[DUNS.ECHO.--.TRANS] 		duns/echo/../../trans
-**	[.DUNS] 			duns
-**	[.DUNS.ECHO] 			duns/echo
-**	[.DUNS.ECHO]TEST.COM 		duns/echo/test.com 
-**	TEST.COM 			test.com
+**	DISK$USER			disk$user
+**	DISK$USER:			/disk$user/
+**	DISK$USER:[DUNS]		/disk$user/duns
+**	DISK$USER:[DUNS.ECHO]		/disk$user/duns/echo
+**	[DUNS]				duns
+**	[DUNS.ECHO]			duns/echo
+**	[DUNS.ECHO.-.TRANS]		duns/echo/../trans
+**	[DUNS.ECHO.--.TRANS]		duns/echo/../../trans
+**	[.DUNS]				duns
+**	[.DUNS.ECHO]			duns/echo
+**	[.DUNS.ECHO]TEST.COM		duns/echo/test.com
+**	TEST.COM			test.com
+**
 **
-**	
 */
 PUBLIC char * HTVMS_wwwName PARAMS((
 	CONST char *	vmsname));
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisProt.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisProt.c
index 9fddc10b74f..7ebe55a3b27 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisProt.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisProt.c
@@ -12,10 +12,10 @@
 **----------------------------------------------------------------------*/
 /* WIDE AREA INFORMATION SERVER SOFTWARE:
    No guarantees or restrictions.  See the readme file for the full standard
-   disclaimer.	
-  
+   disclaimer.
+
    3.26.90	Harry Morris, morris@think.com
-   3.30.90  Harry Morris 
+   3.30.90  Harry Morris
    -	removed chunk code from WAISSearchAPDU,
    -	added makeWAISQueryType1Query() and readWAISType1Query() which replace
    makeWAISQueryTerms() and makeWAISQueryDocs().
@@ -28,7 +28,7 @@
 
 #define _C_WAIS_protocol_
 
-/*	This file implements the Z39.50 extensions required for WAIS 
+/*	This file implements the Z39.50 extensions required for WAIS
 */
 
 #include <HTUtils.h>
@@ -53,7 +53,7 @@
 
 #define RESERVE_SPACE_FOR_WAIS_HEADER(len)	\
      if (*len > 0)				\
-     	*len -= header_len;
+	*len -= header_len;
 
 /*----------------------------------------------------------------------*/
 
@@ -65,7 +65,7 @@ userInfoTagSize(tag,length)
 data_tag tag;
 unsigned long length;
 /* return the number of bytes required to write the user info tag and
-   length 
+   length
  */
 {
   unsigned long size;
@@ -73,13 +73,13 @@ unsigned long length;
   /* calculate bytes required to represent tag.  max tag is 16K */
   size = writtenCompressedIntSize(tag);
   size += writtenCompressedIntSize(length);
-      
+
   return(size);
-}   
+}
 
 /*----------------------------------------------------------------------*/
 
-static char* writeUserInfoHeader PARAMS((data_tag tag,long infoSize,	
+static char* writeUserInfoHeader PARAMS((data_tag tag,long infoSize,
 				      long estHeaderSize,char* buffer,
 				      long* len));
 
@@ -95,7 +95,7 @@ long* len;
    estHeaderSize.  Note that the argument len is the number of bytes remaining
    in the buffer.  Since we write the tag and size at the begining of the
    buffer (in space that we reserved) we don't want to pass len the calls which
-   do that writing. 
+   do that writing.
  */
 {
   long dummyLen = 100;		/* plenty of space for a tag and size */
@@ -105,10 +105,10 @@ long* len;
 
   if (buffer == NULL || *len == 0)
     return(NULL);
-  
+
   /* write the tag */
   buf = writeTag(tag,buf,&dummyLen);
-  
+
   /* see if the if the header size was correct. if not,
      we have to shift the info to fit the real header size */
   if (estHeaderSize != realHeaderSize)
@@ -116,10 +116,10 @@ long* len;
       CHECK_FOR_SPACE_LEFT(realHeaderSize - estHeaderSize,len);
       memmove(buffer + realHeaderSize,buffer + estHeaderSize,(size_t)(realSize));
     }
-   
+
   /* write the size */
   writeCompressedInteger(realSize,buf,&dummyLen);
-  
+
   /* return the true end of buffer */
   return(buffer + realHeaderSize + realSize);
 }
@@ -139,12 +139,12 @@ char* buffer;
   char* buf = buffer;
   buf = readTag(tag,buf);
   buf = readCompressedInteger(num,buf);
-  return(buf); 
+  return(buf);
 }
 
 /*----------------------------------------------------------------------*/
 
-WAISInitResponse* 
+WAISInitResponse*
 makeWAISInitResponse(chunkCode,
 		     chunkIDLen,
 		     chunkMarker,
@@ -167,13 +167,13 @@ char* newLineChars;
   init->HighlightMarker = highlightMarker;
   init->DeHighlightMarker = deHighlightMarker;
   init->NewlineCharacters = newLineChars;
-  
+
   return(init);
 }
 
 /*----------------------------------------------------------------------*/
 
-void 
+void
 freeWAISInitResponse(init)
 WAISInitResponse* init;
 /* free an object made with makeWAISInitResponse */
@@ -199,20 +199,20 @@ long* len;
   char* buf = buffer + header_len;
   WAISInitResponse* info = (WAISInitResponse*)init->UserInformationField;
   unsigned long size;
-  
+
   RESERVE_SPACE_FOR_WAIS_HEADER(len);
-    
+
   buf = writeNum(info->ChunkCode,DT_ChunkCode,buf,len);
   buf = writeNum(info->ChunkIDLength,DT_ChunkIDLength,buf,len);
   buf = writeString(info->ChunkMarker,DT_ChunkMarker,buf,len);
   buf = writeString(info->HighlightMarker,DT_HighlightMarker,buf,len);
   buf = writeString(info->DeHighlightMarker,DT_DeHighlightMarker,buf,len);
   buf = writeString(info->NewlineCharacters,DT_NewlineCharacters,buf,len);
-  
+
   /* now write the header and size */
-  size = buf - buffer; 
+  size = buf - buffer;
   buf = writeUserInfoHeader(DT_UserInformationLength,size,header_len,buffer,len);
-  
+
   return(buf);
 }
 
@@ -225,7 +225,7 @@ char* buffer;
 /* read an init response object */
 {
   char* buf = buffer;
-  unsigned long size; 
+  unsigned long size;
   unsigned long headerSize;
   long chunkCode,chunkIDLen;
   data_tag tag1;
@@ -233,12 +233,12 @@ char* buffer;
   char* highlightMarker = NULL;
   char* deHighlightMarker = NULL;
   char* newLineChars = NULL;
-  
+
   chunkCode = chunkIDLen = UNUSED;
-  
+
   buf = readUserInfoHeader(&tag1,&size,buf);
   headerSize = buf - buffer;
-    
+
   while (buf < (buffer + size + headerSize))
     { data_tag tag = peekTag(buf);
       switch (tag)
@@ -268,7 +268,7 @@ char* buffer;
 	    break;
 	  }
     }
-  	  
+
   *info = (void *)makeWAISInitResponse(chunkCode,chunkIDLen,chunkMarker,
 			       highlightMarker,deHighlightMarker,
 			       newLineChars);
@@ -277,7 +277,7 @@ char* buffer;
 
 /*----------------------------------------------------------------------*/
 
-WAISSearch* 
+WAISSearch*
 makeWAISSearch(seedWords,
 	       docs,
 	       textList,
@@ -294,7 +294,7 @@ char* endDateRange;
 long maxDocsRetrieved;
 
 /* create a type 3 query object */
-{ 
+{
   WAISSearch* query = (WAISSearch*)s_malloc((size_t)sizeof(WAISSearch));
 
   query->SeedWords = seedWords;	/* not copied! */
@@ -304,13 +304,13 @@ long maxDocsRetrieved;
   query->BeginDateRange = beginDateRange;
   query->EndDateRange = endDateRange;
   query->MaxDocumentsRetrieved = maxDocsRetrieved;
-  
+
   return(query);
 }
 
 /*----------------------------------------------------------------------*/
 
-void 
+void
 freeWAISSearch(query)
 WAISSearch* query;
 
@@ -318,14 +318,14 @@ WAISSearch* query;
 {
   void* ptr = NULL;
   long i;
-  
+
   s_free(query->SeedWords);
-  
+
   if (query->Docs != NULL)
     for (i = 0,ptr = (void *)query->Docs[i]; ptr != NULL; ptr = (void *)query->Docs[++i])
       freeDocObj((DocObj*)ptr);
   s_free(query->Docs);
-   
+
   if (query->TextList != NULL)	/* XXX revisit when textlist is fully defined */
     for (i = 0,ptr = (void *)query->TextList[i]; ptr != NULL; ptr = (void *)query->TextList[++i])
       s_free(ptr);
@@ -338,7 +338,7 @@ WAISSearch* query;
 
 /*----------------------------------------------------------------------*/
 
-DocObj* 
+DocObj*
 makeDocObjUsingWholeDocument(docID,type)
 any* docID;
 char* type;
@@ -355,7 +355,7 @@ char* type;
 
 /*----------------------------------------------------------------------*/
 
-DocObj* 
+DocObj*
 makeDocObjUsingLines(docID,type,start,end)
 any* docID;
 char* type;
@@ -376,7 +376,7 @@ long end;
 
 /*----------------------------------------------------------------------*/
 
-DocObj* 
+DocObj*
 makeDocObjUsingBytes(docID,type,start,end)
 any* docID;
 char* type;
@@ -397,7 +397,7 @@ long end;
 
 /*----------------------------------------------------------------------*/
 
-DocObj* 
+DocObj*
 makeDocObjUsingParagraphs(docID,type,start,end)
 any* docID;
 char* type;
@@ -411,8 +411,8 @@ any* end;
   doc->ChunkCode = CT_paragraph;
   doc->DocumentID = docID;		/* not copied */
   doc->Type = type;
-  doc->ChunkStart.ID = start; 
-  doc->ChunkEnd.ID = end; 
+  doc->ChunkStart.ID = start;
+  doc->ChunkEnd.ID = end;
   return(doc);
 }
 
@@ -446,16 +446,16 @@ long* len;
 /* write as little as we can about the doc obj */
 {
   char* buf = buffer;
-  
+
   /* we alwasy have to write the id, but its tag depends on if its a chunk */
   if (doc->ChunkCode == CT_document)
     buf = writeAny(doc->DocumentID,DT_DocumentID,buf,len);
   else
     buf = writeAny(doc->DocumentID,DT_DocumentIDChunk,buf,len);
-  
+
   if (doc->Type != NULL)
     buf = writeString(doc->Type,DT_TYPE,buf,len);
-  
+
   switch (doc->ChunkCode)
     { case CT_document:
 	/* do nothing - there is no chunk data */
@@ -476,7 +476,7 @@ long* len;
 	      doc->ChunkCode);
 	break;
       }
-   
+
   return(buf);
 }
 
@@ -493,12 +493,12 @@ char* buffer;
 {
   char* buf = buffer;
   data_tag tag;
-  
+
   *doc = (DocObj*)s_malloc((size_t)sizeof(DocObj));
-  
+
   tag = peekTag(buf);
   buf = readAny(&((*doc)->DocumentID),buf);
-  
+
   if (tag == DT_DocumentID)
     { (*doc)->ChunkCode = CT_document;
       tag = peekTag(buf);
@@ -539,12 +539,12 @@ char* buffer;
       s_free(*doc);
       REPORT_READ_ERROR(buf);
     }
-  return(buf);  
+  return(buf);
 }
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 writeSearchInfo(query,buffer,len)
 SearchAPDU* query;
 char* buffer;
@@ -557,14 +557,14 @@ long* len;
     }
   else
     { unsigned long header_len = userInfoTagSize(DT_UserInformationLength,
-						 DefWAISSearchSize); 
+						 DefWAISSearchSize);
       char* buf = buffer + header_len;
       WAISSearch* info = (WAISSearch*)query->Query;
       unsigned long size;
       long i;
-  
+
       RESERVE_SPACE_FOR_WAIS_HEADER(len);
-       
+
       buf = writeString(info->SeedWords,DT_SeedWords,buf,len);
 
       if (info->Docs != NULL)
@@ -572,25 +572,25 @@ long* len;
 	  { buf = writeDocObj(info->Docs[i],buf,len);
 	  }
 	}
-   
+
       /* XXX text list */
- 
+
       buf = writeNum(info->DateFactor,DT_DateFactor,buf,len);
       buf = writeString(info->BeginDateRange,DT_BeginDateRange,buf,len);
       buf = writeString(info->EndDateRange,DT_EndDateRange,buf,len);
       buf = writeNum(info->MaxDocumentsRetrieved,DT_MaxDocumentsRetrieved,buf,len);
-  
+
       /* now write the header and size */
-      size = buf - buffer; 
+      size = buf - buffer;
       buf = writeUserInfoHeader(DT_UserInformationLength,size,header_len,buffer,len);
-   
+
       return(buf);
     }
 }
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 readSearchInfo(info,buffer)
 void** info;
 char* buffer;
@@ -607,14 +607,14 @@ char* buffer;
     }
   else				/* a type 3 query */
     { char* buf = buffer;
-      unsigned long size; 
+      unsigned long size;
       unsigned long headerSize;
       data_tag tag1;
       char* seedWords = NULL;
       char* beginDateRange = NULL;
       char* endDateRange = NULL;
       long dateFactor,maxDocsRetrieved;
-      char** textList = NULL; 
+      char** textList = NULL;
       DocObj** docIDs = NULL;
       DocObj* doc = NULL;
       long docs = 0;
@@ -622,10 +622,10 @@ char* buffer;
       void* ptr = NULL;
 
       dateFactor = maxDocsRetrieved = UNUSED;
-  
+
       buf = readUserInfoHeader(&tag1,&size,buf);
       headerSize = buf - buffer;
-  
+
       while (buf < (buffer + size + headerSize))
 	{ data_tag tag = peekTag(buf);
 	  switch (tag)
@@ -641,7 +641,7 @@ char* buffer;
 		  { docIDs = (DocObj**)s_realloc((char*)docIDs,(size_t)(sizeof(DocObj*) * (docs + 2)));
 		  }
 		buf = readDocObj(&doc,buf);
-		if (buf == NULL) 
+		if (buf == NULL)
 		  { s_free(seedWords);
 		    s_free(beginDateRange);
 		    s_free(endDateRange);
@@ -683,7 +683,7 @@ char* buffer;
 		break;
 	      }
 	}
-  	  
+
       *info = (void *)makeWAISSearch(seedWords,docIDs,textList,
 				     dateFactor,beginDateRange,endDateRange,
 				     maxDocsRetrieved);
@@ -722,7 +722,7 @@ char* originCity;
    or set the field in this object to NULL before freeing it.
  */
 {
-  WAISDocumentHeader* header = 
+  WAISDocumentHeader* header =
     (WAISDocumentHeader*)s_malloc((size_t)sizeof(WAISDocumentHeader));
 
   header->DocumentID = docID;
@@ -736,7 +736,7 @@ char* originCity;
   header->Date = date;
   header->Headline = headline;
   header->OriginCity = originCity;
-  
+
   return(header);
 }
 
@@ -769,9 +769,9 @@ long* len;
 					     DefWAISDocHeaderSize);
   char* buf = buffer + header_len;
   unsigned long size1;
-  
+
   RESERVE_SPACE_FOR_WAIS_HEADER(len);
-   
+
   buf = writeAny(header->DocumentID,DT_DocumentID,buf,len);
   buf = writeNum(header->VersionNumber,DT_VersionNumber,buf,len);
   buf = writeNum(header->Score,DT_Score,buf,len);
@@ -787,7 +787,7 @@ long* len;
 	{ long typeSize = strlen(ptr);
 	  size += writtenTagSize(DT_TYPE);
 	  size += writtenCompressedIntSize(typeSize);
-	  size += typeSize; 
+	  size += typeSize;
 	}
       buf = writeCompressedInteger((unsigned long)size,buf,len);
       for (i = 0,ptr = header->Types[i]; ptr != NULL; ptr = header->Types[++i])
@@ -797,9 +797,9 @@ long* len;
   buf = writeString(header->Date,DT_Date,buf,len);
   buf = writeString(header->Headline,DT_Headline,buf,len);
   buf = writeString(header->OriginCity,DT_OriginCity,buf,len);
-  
+
   /* now write the header and size */
-  size1 = buf - buffer; 
+  size1 = buf - buffer;
   buf = writeUserInfoHeader(DT_DocumentHeaderGroup,size1,header_len,buffer,len);
 
   return(buf);
@@ -813,7 +813,7 @@ WAISDocumentHeader** header;
 char* buffer;
 {
   char* buf = buffer;
-  unsigned long size1; 
+  unsigned long size1;
   unsigned long headerSize;
   data_tag tag1;
   any* docID = NULL;
@@ -823,12 +823,12 @@ char* buffer;
   char *date = NULL;
   char *headline = NULL;
   char *originCity = NULL;
-  
+
   versionNumber = score = bestMatch = docLength = lines = UNUSED;
-  
+
   buf = readUserInfoHeader(&tag1,&size1,buf);
   headerSize = buf - buffer;
-    
+
   while (buf < (buffer + size1 + headerSize))
     { data_tag tag = peekTag(buf);
       switch (tag)
@@ -888,7 +888,7 @@ char* buffer;
 	    break;
 	  }
     }
-  	  
+
   *header = makeWAISDocumentHeader(docID,versionNumber,score,bestMatch,
 				   docLength,lines,types,source,date,headline,
 				   originCity);
@@ -915,7 +915,7 @@ long lines;
    or set the field in this object to NULL before freeing it.
  */
 {
-  WAISDocumentShortHeader* header = 
+  WAISDocumentShortHeader* header =
     (WAISDocumentShortHeader*)s_malloc((size_t)sizeof(WAISDocumentShortHeader));
 
   header->DocumentID = docID;
@@ -924,7 +924,7 @@ long lines;
   header->BestMatch = bestMatch;
   header->DocumentLength = docLen;
   header->Lines = lines;
-  
+
   return(header);
 }
 
@@ -950,18 +950,18 @@ long* len;
 					     DefWAISShortHeaderSize);
   char* buf = buffer + header_len;
   unsigned long size;
-  
+
   RESERVE_SPACE_FOR_WAIS_HEADER(len);
-   
+
   buf = writeAny(header->DocumentID,DT_DocumentID,buf,len);
   buf = writeNum(header->VersionNumber,DT_VersionNumber,buf,len);
   buf = writeNum(header->Score,DT_Score,buf,len);
   buf = writeNum(header->BestMatch,DT_BestMatch,buf,len);
   buf = writeNum(header->DocumentLength,DT_DocumentLength,buf,len);
   buf = writeNum(header->Lines,DT_Lines,buf,len);
-  
+
   /* now write the header and size */
-  size = buf - buffer; 
+  size = buf - buffer;
   buf = writeUserInfoHeader(DT_DocumentShortHeaderGroup,size,header_len,buffer,len);
 
   return(buf);
@@ -975,17 +975,17 @@ WAISDocumentShortHeader** header;
 char* buffer;
 {
   char* buf = buffer;
-  unsigned long size; 
+  unsigned long size;
   unsigned long headerSize;
   data_tag tag1;
   any* docID = NULL;
   long versionNumber,score,bestMatch,docLength,lines;
-  
+
   versionNumber = score = bestMatch = docLength = lines = UNUSED;
-  
+
   buf = readUserInfoHeader(&tag1,&size,buf);
   headerSize = buf - buffer;
-    
+
   while (buf < (buffer + size + headerSize))
     { data_tag tag = peekTag(buf);
       switch (tag)
@@ -1013,7 +1013,7 @@ char* buffer;
 	    break;
 	  }
     }
-  	  
+
   *header = makeWAISDocumentShortHeader(docID,versionNumber,score,bestMatch,
 					docLength,lines);
   return(buf);
@@ -1055,7 +1055,7 @@ char* industryCodes;
    or set the field in this object to NULL before freeing it.
  */
 {
-  WAISDocumentLongHeader* header = 
+  WAISDocumentLongHeader* header =
     (WAISDocumentLongHeader*)s_malloc((size_t)sizeof(WAISDocumentLongHeader));
 
   header->DocumentID = docID;
@@ -1072,7 +1072,7 @@ char* industryCodes;
   header->StockCodes = stockCodes;
   header->CompanyCodes = companyCodes;
   header->IndustryCodes = industryCodes;
-  
+
   return(header);
 }
 
@@ -1106,9 +1106,9 @@ long* len;
 					     DefWAISLongHeaderSize);
   char* buf = buffer + header_len;
   unsigned long size1;
-  
+
   RESERVE_SPACE_FOR_WAIS_HEADER(len);
-   
+
   buf = writeAny(header->DocumentID,DT_DocumentID,buf,len);
   buf = writeNum(header->VersionNumber,DT_VersionNumber,buf,len);
   buf = writeNum(header->Score,DT_Score,buf,len);
@@ -1124,7 +1124,7 @@ long* len;
 	{ long typeSize = strlen(ptr);
 	  size += writtenTagSize(DT_TYPE);
 	  size += writtenCompressedIntSize(typeSize);
-	  size += typeSize; 
+	  size += typeSize;
 	}
       buf = writeCompressedInteger((unsigned long)size,buf,len);
       for (i = 0,ptr = header->Types[i]; ptr != NULL; ptr = header->Types[++i])
@@ -1137,9 +1137,9 @@ long* len;
   buf = writeString(header->StockCodes,DT_StockCodes,buf,len);
   buf = writeString(header->CompanyCodes,DT_CompanyCodes,buf,len);
   buf = writeString(header->IndustryCodes,DT_IndustryCodes,buf,len);
-  
+
   /* now write the header and size */
-  size1 = buf - buffer; 
+  size1 = buf - buffer;
   buf = writeUserInfoHeader(DT_DocumentLongHeaderGroup,size1,header_len,buffer,len);
 
   return(buf);
@@ -1153,22 +1153,22 @@ WAISDocumentLongHeader** header;
 char* buffer;
 {
   char* buf = buffer;
-  unsigned long size1; 
+  unsigned long size1;
   unsigned long headerSize;
   data_tag tag1;
   any* docID;
   long versionNumber,score,bestMatch,docLength,lines;
   char **types;
   char *source,*date,*headline,*originCity,*stockCodes,*companyCodes,*industryCodes;
-  
+
   docID = NULL;
   versionNumber = score = bestMatch = docLength = lines = UNUSED;
   types = NULL;
   source = date = headline = originCity = stockCodes = companyCodes = industryCodes = NULL;
-  
+
   buf = readUserInfoHeader(&tag1,&size1,buf);
   headerSize = buf - buffer;
-    
+
   while (buf < (buffer + size1 + headerSize))
     { data_tag tag = peekTag(buf);
       switch (tag)
@@ -1240,7 +1240,7 @@ char* buffer;
 	    break;
 	  }
     }
-  	  
+
   *header = makeWAISDocumentLongHeader(docID,versionNumber,score,bestMatch,
 				       docLength,lines,types,source,date,headline,
 				       originCity,stockCodes,companyCodes,
@@ -1269,7 +1269,7 @@ WAISDocumentCodes** codes;
 diagnosticRecord** diagnostics;
 {
   WAISSearchResponse* response = (WAISSearchResponse*)s_malloc((size_t)sizeof(WAISSearchResponse));
-  
+
   response->SeedWordsUsed = seedWordsUsed;
   response->DocHeaders = docHeaders;
   response->ShortHeaders = shortHeaders;
@@ -1278,7 +1278,7 @@ diagnosticRecord** diagnostics;
   response->Headlines = headlines;
   response->Codes = codes;
   response->Diagnostics = diagnostics;
-  
+
   return(response);
 }
 
@@ -1297,43 +1297,43 @@ WAISSearchResponse* response;
     for (i = 0,ptr = (void *)response->DocHeaders[i]; ptr != NULL; ptr = (void *)response->DocHeaders[++i])
       freeWAISDocumentHeader((WAISDocumentHeader*)ptr);
   s_free(response->DocHeaders);
-   
+
   if (response->ShortHeaders != NULL)
     for (i = 0,ptr = (void *)response->ShortHeaders[i]; ptr != NULL; ptr = (void *)response->ShortHeaders[++i])
       freeWAISDocumentShortHeader((WAISDocumentShortHeader*)ptr);
   s_free(response->ShortHeaders);
-   
+
   if (response->LongHeaders != NULL)
     for (i = 0,ptr = (void *)response->LongHeaders[i]; ptr != NULL; ptr = (void *)response->LongHeaders[++i])
       freeWAISDocumentLongHeader((WAISDocumentLongHeader*)ptr);
   s_free(response->LongHeaders);
-   
+
   if (response->Text != NULL)
     for (i = 0,ptr = (void *)response->Text[i]; ptr != NULL; ptr = (void *)response->Text[++i])
       freeWAISDocumentText((WAISDocumentText*)ptr);
   s_free(response->Text);
-   
+
   if (response->Headlines != NULL)
     for (i = 0,ptr = (void *)response->Headlines[i]; ptr != NULL; ptr = (void *)response->Headlines[++i])
       freeWAISDocumentHeadlines((WAISDocumentHeadlines*)ptr);
   s_free(response->Headlines);
-   
+
   if (response->Codes != NULL)
     for (i = 0,ptr = (void *)response->Codes[i]; ptr != NULL; ptr = (void *)response->Codes[++i])
       freeWAISDocumentCodes((WAISDocumentCodes*)ptr);
   s_free(response->Codes);
-   
+
   if (response->Diagnostics != NULL)
     for (i = 0,ptr = (void *)response->Diagnostics[i]; ptr != NULL; ptr = (void *)response->Diagnostics[++i])
       freeDiag((diagnosticRecord*)ptr);
   s_free(response->Diagnostics);
-  
+
   s_free(response);
 }
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 writeSearchResponseInfo(query,buffer,len)
 SearchResponseAPDU* query;
 char* buffer;
@@ -1346,17 +1346,17 @@ long* len;
   unsigned long size;
   void* header = NULL;
   long i;
-  
+
   RESERVE_SPACE_FOR_WAIS_HEADER(len);
-  
+
   buf = writeString(info->SeedWordsUsed,DT_SeedWordsUsed,buf,len);
-  
+
   /* write out all the headers */
   if (info->DocHeaders != NULL)
     { for (i = 0,header = (void *)info->DocHeaders[i]; header != NULL; header = (void *)info->DocHeaders[++i])
 	buf = writeWAISDocumentHeader((WAISDocumentHeader*)header,buf,len);
       }
-   
+
   if (info->ShortHeaders != NULL)
     { for (i = 0,header = (void *)info->ShortHeaders[i]; header != NULL; header = (void *)info->ShortHeaders[++i])
 	buf = writeWAISDocumentShortHeader((WAISDocumentShortHeader*)header,buf,len);
@@ -1386,11 +1386,11 @@ long* len;
     { for (i = 0, header = (void *)info->Diagnostics[i]; header != NULL; header = (void *)info->Diagnostics[++i])
 	buf = writeDiag((diagnosticRecord*)header,buf,len);
       }
-   
+
   /* now write the header and size */
-  size = buf - buffer; 
+  size = buf - buffer;
   buf = writeUserInfoHeader(DT_UserInformationLength,size,header_len,buffer,len);
-  
+
   return(buf);
 }
 
@@ -1418,7 +1418,7 @@ WAISDocumentText** text;
 WAISDocumentHeadlines** headlines;
 WAISDocumentCodes** codes;
 diagnosticRecord** diags;
-/* if buf is NULL, we have just gotten a read error, and need to clean up 
+/* if buf is NULL, we have just gotten a read error, and need to clean up
    any state we have built.  If not, then everything is going fine, and
    we should just hang loose
  */
@@ -1426,41 +1426,41 @@ diagnosticRecord** diags;
   void* ptr = NULL;
   long i;
 
-  if (buf == NULL)						
-   { s_free(seedWordsUsed);				
-     if (docHeaders != NULL)				
-       for (i = 0,ptr = (void *)docHeaders[i]; ptr != NULL; 
-	    ptr = (void *)docHeaders[++i])		
-	 freeWAISDocumentHeader((WAISDocumentHeader*)ptr);	
-     s_free(docHeaders);				
-     if (shortHeaders != NULL)	
+  if (buf == NULL)
+   { s_free(seedWordsUsed);
+     if (docHeaders != NULL)
+       for (i = 0,ptr = (void *)docHeaders[i]; ptr != NULL;
+	    ptr = (void *)docHeaders[++i])
+	 freeWAISDocumentHeader((WAISDocumentHeader*)ptr);
+     s_free(docHeaders);
+     if (shortHeaders != NULL)
        for (i = 0,ptr = (void *)shortHeaders[i]; ptr != NULL;
-	    ptr = (void *)shortHeaders[++i])	
+	    ptr = (void *)shortHeaders[++i])
 	 freeWAISDocumentShortHeader((WAISDocumentShortHeader*)ptr);
-     s_free(shortHeaders);						
-     if (longHeaders != NULL)				
-       for (i = 0,ptr = (void *)longHeaders[i]; ptr != NULL; 
-	    ptr = (void *)longHeaders[++i])	
+     s_free(shortHeaders);
+     if (longHeaders != NULL)
+       for (i = 0,ptr = (void *)longHeaders[i]; ptr != NULL;
+	    ptr = (void *)longHeaders[++i])
 	 freeWAISDocumentLongHeader((WAISDocumentLongHeader*)ptr);
-     s_free(longHeaders);				
-     if (text != NULL)					
+     s_free(longHeaders);
+     if (text != NULL)
        for (i = 0,ptr = (void *)text[i]; ptr != NULL; ptr = (void *)text[++i])
-	 freeWAISDocumentText((WAISDocumentText*)ptr);	
-     s_free(text);					
-     if (headlines != NULL)					
+	 freeWAISDocumentText((WAISDocumentText*)ptr);
+     s_free(text);
+     if (headlines != NULL)
        for (i = 0,ptr = (void *)headlines[i]; ptr != NULL;
-	    ptr = (void *)headlines[++i])		
-	 freeWAISDocumentHeadlines((WAISDocumentHeadlines*)ptr);	
-     s_free(headlines);						
-     if (codes != NULL)				     
-       for (i = 0,ptr = (void *)codes[i]; ptr != NULL; 
-	    ptr = (void *)codes[++i])				
-	 freeWAISDocumentCodes((WAISDocumentCodes*)ptr);	 
-     s_free(codes);					
-     if (diags != NULL)				      	
-       for (i = 0,ptr = (void *)diags[i]; ptr != NULL; 
-	    ptr = (void *)diags[++i])	 
-	 freeDiag((diagnosticRecord*)ptr);	     
+	    ptr = (void *)headlines[++i])
+	 freeWAISDocumentHeadlines((WAISDocumentHeadlines*)ptr);
+     s_free(headlines);
+     if (codes != NULL)
+       for (i = 0,ptr = (void *)codes[i]; ptr != NULL;
+	    ptr = (void *)codes[++i])
+	 freeWAISDocumentCodes((WAISDocumentCodes*)ptr);
+     s_free(codes);
+     if (diags != NULL)
+       for (i = 0,ptr = (void *)diags[i]; ptr != NULL;
+	    ptr = (void *)diags[++i])
+	 freeDiag((diagnosticRecord*)ptr);
      s_free(diags);
    }
 }
@@ -1473,7 +1473,7 @@ void** info;
 char* buffer;
 {
   char* buf = buffer;
-  unsigned long size; 
+  unsigned long size;
   unsigned long headerSize;
   data_tag tag1;
   void* header = NULL;
@@ -1489,123 +1489,123 @@ char* buffer;
   diagnosticRecord** diags = NULL;
   diagnosticRecord* diag = NULL;
   long numDiags = 0;
-  
+
   numDocHeaders = numLongHeaders = numShortHeaders = numText = numHeadlines = numCodes = 0;
-  
+
   buf = readUserInfoHeader(&tag1,&size,buf);
   headerSize = buf - buffer;
-    
+
   while (buf < (buffer + size + headerSize))
    { data_tag tag = peekTag(buf);
      switch (tag)
       { case DT_SeedWordsUsed:
-      	  buf = readString(&seedWordsUsed,buf);
-      	  break;
-      	case DT_DatabaseDiagnosticRecords:
-      	  if (diags == NULL) /* create a new diag list */
-      	   { diags = (diagnosticRecord**)s_malloc((size_t)sizeof(diagnosticRecord*) * 2);
-      	   }
-      	  else /* grow the diag list */
-      	   { diags = (diagnosticRecord**)s_realloc((char*)diags,(size_t)(sizeof(diagnosticRecord*) * (numDiags + 2)));
-      	   }
-      	  buf = readDiag(&diag,buf);
-      	  diags[numDiags++] = diag; /* put it in the list */
-      	  diags[numDiags] = NULL;
-      	  break;
-      	case DT_DocumentHeaderGroup:
-  		  if (docHeaders == NULL) /* create a new header list */
-  		   { docHeaders = (WAISDocumentHeader**)s_malloc((size_t)sizeof(WAISDocumentHeader*) * 2);
-  		   }
-  		  else /* grow the doc list */
-  		   { docHeaders = (WAISDocumentHeader**)s_realloc((char*)docHeaders,(size_t)(sizeof(WAISDocumentHeader*) * (numDocHeaders + 2)));
-  		   }
-  		  buf = readWAISDocumentHeader((WAISDocumentHeader**)&header,buf);
+	  buf = readString(&seedWordsUsed,buf);
+	  break;
+	case DT_DatabaseDiagnosticRecords:
+	  if (diags == NULL) /* create a new diag list */
+	   { diags = (diagnosticRecord**)s_malloc((size_t)sizeof(diagnosticRecord*) * 2);
+	   }
+	  else /* grow the diag list */
+	   { diags = (diagnosticRecord**)s_realloc((char*)diags,(size_t)(sizeof(diagnosticRecord*) * (numDiags + 2)));
+	   }
+	  buf = readDiag(&diag,buf);
+	  diags[numDiags++] = diag; /* put it in the list */
+	  diags[numDiags] = NULL;
+	  break;
+	case DT_DocumentHeaderGroup:
+		  if (docHeaders == NULL) /* create a new header list */
+		   { docHeaders = (WAISDocumentHeader**)s_malloc((size_t)sizeof(WAISDocumentHeader*) * 2);
+		   }
+		  else /* grow the doc list */
+		   { docHeaders = (WAISDocumentHeader**)s_realloc((char*)docHeaders,(size_t)(sizeof(WAISDocumentHeader*) * (numDocHeaders + 2)));
+		   }
+		  buf = readWAISDocumentHeader((WAISDocumentHeader**)&header,buf);
 		  cleanUpWaisSearchResponse(buf,seedWordsUsed,docHeaders,shortHeaders,longHeaders,text,headlines,codes,diags);
-  		  RETURN_ON_NULL(buf);
-  		  docHeaders[numDocHeaders++] = 
+		  RETURN_ON_NULL(buf);
+		  docHeaders[numDocHeaders++] =
 		    (WAISDocumentHeader*)header; /* put it in the list */
-  		  docHeaders[numDocHeaders] = NULL;
-  		  break;
-  		case DT_DocumentShortHeaderGroup:
-  		  if (shortHeaders == NULL) /* create a new header list */
-  		   { shortHeaders = (WAISDocumentShortHeader**)s_malloc((size_t)sizeof(WAISDocumentShortHeader*) * 2);
-  		   }
-  		  else /* grow the doc list */
-  		   { shortHeaders = (WAISDocumentShortHeader**)s_realloc((char*)shortHeaders,(size_t)(sizeof(WAISDocumentShortHeader*) * (numShortHeaders + 2)));
-  		   }
-  		  buf = readWAISDocumentShortHeader((WAISDocumentShortHeader**)&header,buf);
+		  docHeaders[numDocHeaders] = NULL;
+		  break;
+		case DT_DocumentShortHeaderGroup:
+		  if (shortHeaders == NULL) /* create a new header list */
+		   { shortHeaders = (WAISDocumentShortHeader**)s_malloc((size_t)sizeof(WAISDocumentShortHeader*) * 2);
+		   }
+		  else /* grow the doc list */
+		   { shortHeaders = (WAISDocumentShortHeader**)s_realloc((char*)shortHeaders,(size_t)(sizeof(WAISDocumentShortHeader*) * (numShortHeaders + 2)));
+		   }
+		  buf = readWAISDocumentShortHeader((WAISDocumentShortHeader**)&header,buf);
 		  cleanUpWaisSearchResponse(buf,seedWordsUsed,docHeaders,shortHeaders,longHeaders,text,headlines,codes,diags);
-  		  RETURN_ON_NULL(buf);
-  		  shortHeaders[numShortHeaders++] = 
+		  RETURN_ON_NULL(buf);
+		  shortHeaders[numShortHeaders++] =
 		    (WAISDocumentShortHeader*)header; /* put it in the list */
-  		  shortHeaders[numShortHeaders] = NULL;
-  		  break;
-  		case DT_DocumentLongHeaderGroup:
-  		  if (longHeaders == NULL) /* create a new header list */
-  		   { longHeaders = (WAISDocumentLongHeader**)s_malloc((size_t)sizeof(WAISDocumentLongHeader*) * 2);
-  		   }
-  		  else /* grow the doc list */
-  		   { longHeaders = (WAISDocumentLongHeader**)s_realloc((char*)longHeaders,(size_t)(sizeof(WAISDocumentLongHeader*) * (numLongHeaders + 2)));
-  		   }
-  		  buf = readWAISDocumentLongHeader((WAISDocumentLongHeader**)&header,buf);
+		  shortHeaders[numShortHeaders] = NULL;
+		  break;
+		case DT_DocumentLongHeaderGroup:
+		  if (longHeaders == NULL) /* create a new header list */
+		   { longHeaders = (WAISDocumentLongHeader**)s_malloc((size_t)sizeof(WAISDocumentLongHeader*) * 2);
+		   }
+		  else /* grow the doc list */
+		   { longHeaders = (WAISDocumentLongHeader**)s_realloc((char*)longHeaders,(size_t)(sizeof(WAISDocumentLongHeader*) * (numLongHeaders + 2)));
+		   }
+		  buf = readWAISDocumentLongHeader((WAISDocumentLongHeader**)&header,buf);
 		  cleanUpWaisSearchResponse(buf,seedWordsUsed,docHeaders,shortHeaders,longHeaders,text,headlines,codes,diags);
-  		  RETURN_ON_NULL(buf);
-  		  longHeaders[numLongHeaders++] = 
+		  RETURN_ON_NULL(buf);
+		  longHeaders[numLongHeaders++] =
 		    (WAISDocumentLongHeader*)header; /* put it in the list */
-  		  longHeaders[numLongHeaders] = NULL;
-  		  break;
-        case DT_DocumentTextGroup:
-  		  if (text == NULL) /* create a new list */
-  		   { text = (WAISDocumentText**)s_malloc((size_t)sizeof(WAISDocumentText*) * 2);
-  		   }
-  		  else /* grow the list */
-  		   { text = (WAISDocumentText**)s_realloc((char*)text,(size_t)(sizeof(WAISDocumentText*) * (numText + 2)));
-  		   }
-  		  buf = readWAISDocumentText((WAISDocumentText**)&header,buf);
+		  longHeaders[numLongHeaders] = NULL;
+		  break;
+	case DT_DocumentTextGroup:
+		  if (text == NULL) /* create a new list */
+		   { text = (WAISDocumentText**)s_malloc((size_t)sizeof(WAISDocumentText*) * 2);
+		   }
+		  else /* grow the list */
+		   { text = (WAISDocumentText**)s_realloc((char*)text,(size_t)(sizeof(WAISDocumentText*) * (numText + 2)));
+		   }
+		  buf = readWAISDocumentText((WAISDocumentText**)&header,buf);
 		  cleanUpWaisSearchResponse(buf,seedWordsUsed,docHeaders,shortHeaders,longHeaders,text,headlines,codes,diags);
-  		  RETURN_ON_NULL(buf);
-  		  text[numText++] = 
+		  RETURN_ON_NULL(buf);
+		  text[numText++] =
 		    (WAISDocumentText*)header; /* put it in the list */
-  		  text[numText] = NULL;
-  		  break;
-  		case DT_DocumentHeadlineGroup:
-  		  if (headlines == NULL) /* create a new list */
-  		   { headlines = (WAISDocumentHeadlines**)s_malloc((size_t)sizeof(WAISDocumentHeadlines*) * 2);
-  		   }
-  		  else /* grow the list */
-  		   { headlines = (WAISDocumentHeadlines**)s_realloc((char*)headlines,(size_t)(sizeof(WAISDocumentHeadlines*) * (numHeadlines + 2)));
-  		   }
-  		  buf = readWAISDocumentHeadlines((WAISDocumentHeadlines**)&header,buf);
+		  text[numText] = NULL;
+		  break;
+		case DT_DocumentHeadlineGroup:
+		  if (headlines == NULL) /* create a new list */
+		   { headlines = (WAISDocumentHeadlines**)s_malloc((size_t)sizeof(WAISDocumentHeadlines*) * 2);
+		   }
+		  else /* grow the list */
+		   { headlines = (WAISDocumentHeadlines**)s_realloc((char*)headlines,(size_t)(sizeof(WAISDocumentHeadlines*) * (numHeadlines + 2)));
+		   }
+		  buf = readWAISDocumentHeadlines((WAISDocumentHeadlines**)&header,buf);
 		  cleanUpWaisSearchResponse(buf,seedWordsUsed,docHeaders,shortHeaders,longHeaders,text,headlines,codes,diags);
-  		  RETURN_ON_NULL(buf);
-  		  headlines[numHeadlines++] = 
+		  RETURN_ON_NULL(buf);
+		  headlines[numHeadlines++] =
 		    (WAISDocumentHeadlines*)header; /* put it in the list */
-  		  headlines[numHeadlines] = NULL;
-  		  break;
-  		case DT_DocumentCodeGroup:
-  		  if (codes == NULL) /* create a new list */
-  		   { codes = (WAISDocumentCodes**)s_malloc((size_t)sizeof(WAISDocumentCodes*) * 2);
-  		   }
-  		  else /* grow the list */
-  		   { codes = (WAISDocumentCodes**)s_realloc((char*)codes,(size_t)(sizeof(WAISDocumentCodes*) * (numCodes + 2)));
-  		   }
-  		  buf = readWAISDocumentCodes((WAISDocumentCodes**)&header,buf);
+		  headlines[numHeadlines] = NULL;
+		  break;
+		case DT_DocumentCodeGroup:
+		  if (codes == NULL) /* create a new list */
+		   { codes = (WAISDocumentCodes**)s_malloc((size_t)sizeof(WAISDocumentCodes*) * 2);
+		   }
+		  else /* grow the list */
+		   { codes = (WAISDocumentCodes**)s_realloc((char*)codes,(size_t)(sizeof(WAISDocumentCodes*) * (numCodes + 2)));
+		   }
+		  buf = readWAISDocumentCodes((WAISDocumentCodes**)&header,buf);
 		  cleanUpWaisSearchResponse(buf,seedWordsUsed,docHeaders,shortHeaders,longHeaders,text,headlines,codes,diags);
-  		  RETURN_ON_NULL(buf);
-  		  codes[numCodes++] = 
+		  RETURN_ON_NULL(buf);
+		  codes[numCodes++] =
 		    (WAISDocumentCodes*)header; /* put it in the list */
-  		  codes[numCodes] = NULL;
-  		  break;
-        default:
-          cleanUpWaisSearchResponse(buf,seedWordsUsed,docHeaders,shortHeaders,longHeaders,text,headlines,codes,diags);
-          REPORT_READ_ERROR(buf);
-          break;
+		  codes[numCodes] = NULL;
+		  break;
+	default:
+	  cleanUpWaisSearchResponse(buf,seedWordsUsed,docHeaders,shortHeaders,longHeaders,text,headlines,codes,diags);
+	  REPORT_READ_ERROR(buf);
+	  break;
       }
    }
-  	  
+
   *info = (void *)makeWAISSearchResponse(seedWordsUsed,docHeaders,shortHeaders,
 				 longHeaders,text,headlines,codes,diags);
-  
+
   return(buf);
 }
 
@@ -1622,13 +1622,13 @@ any* documentText;
   docText->DocumentID = docID;
   docText->VersionNumber = versionNumber;
   docText->DocumentText = documentText;
-  
+
   return(docText);
 }
 
 /*----------------------------------------------------------------------*/
 
-void 
+void
 freeWAISDocumentText(docText)
 WAISDocumentText* docText;
 {
@@ -1639,7 +1639,7 @@ WAISDocumentText* docText;
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 writeWAISDocumentText(docText,buffer,len)
 WAISDocumentText* docText;
 char* buffer;
@@ -1649,15 +1649,15 @@ long* len;
 											DefWAISDocTextSize);
   char* buf = buffer + header_len;
   unsigned long size;
-  
+
   RESERVE_SPACE_FOR_WAIS_HEADER(len);
 
   buf = writeAny(docText->DocumentID,DT_DocumentID,buf,len);
   buf = writeNum(docText->VersionNumber,DT_VersionNumber,buf,len);
   buf = writeAny(docText->DocumentText,DT_DocumentText,buf,len);
-  
+
   /* now write the header and size */
-  size = buf - buffer; 
+  size = buf - buffer;
   buf = writeUserInfoHeader(DT_DocumentTextGroup,size,header_len,buffer,len);
 
   return(buf);
@@ -1665,44 +1665,44 @@ long* len;
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 readWAISDocumentText(docText,buffer)
 WAISDocumentText** docText;
 char* buffer;
 {
   char* buf = buffer;
-  unsigned long size; 
+  unsigned long size;
   unsigned long headerSize;
   data_tag tag1;
   any *docID,*documentText;
   long versionNumber;
-  
+
   docID = documentText = NULL;
   versionNumber = UNUSED;
-  
+
   buf = readUserInfoHeader(&tag1,&size,buf);
   headerSize = buf - buffer;
-    
+
   while (buf < (buffer + size + headerSize))
    { data_tag tag = peekTag(buf);
      switch (tag)
       { case DT_DocumentID:
-  		  buf = readAny(&docID,buf);
-  		  break;
-  		case DT_VersionNumber:
-  		  buf = readNum(&versionNumber,buf);
-  		  break;
-  		case DT_DocumentText:
-  		  buf = readAny(&documentText,buf);
-  		  break;
-        default:
-          freeAny(docID);
-          freeAny(documentText);
-          REPORT_READ_ERROR(buf);
-          break;
+		  buf = readAny(&docID,buf);
+		  break;
+		case DT_VersionNumber:
+		  buf = readNum(&versionNumber,buf);
+		  break;
+		case DT_DocumentText:
+		  buf = readAny(&documentText,buf);
+		  break;
+	default:
+	  freeAny(docID);
+	  freeAny(documentText);
+	  REPORT_READ_ERROR(buf);
+	  break;
       }
    }
-  	  
+
   *docText = makeWAISDocumentText(docID,versionNumber,documentText);
   return(buf);
 }
@@ -1732,13 +1732,13 @@ char* originCity;
   docHeadline->Date = date;
   docHeadline->Headline = headline;
   docHeadline->OriginCity = originCity;
-  
+
   return(docHeadline);
 }
 
 /*----------------------------------------------------------------------*/
 
-void 
+void
 freeWAISDocumentHeadlines(docHeadline)
 WAISDocumentHeadlines* docHeadline;
 {
@@ -1752,7 +1752,7 @@ WAISDocumentHeadlines* docHeadline;
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 writeWAISDocumentHeadlines(docHeadline,buffer,len)
 WAISDocumentHeadlines* docHeadline;
 char* buffer;
@@ -1762,7 +1762,7 @@ long* len;
 											DefWAISDocHeadlineSize);
   char* buf = buffer + header_len;
   unsigned long size;
-  
+
   RESERVE_SPACE_FOR_WAIS_HEADER(len);
 
   buf = writeAny(docHeadline->DocumentID,DT_DocumentID,buf,len);
@@ -1771,9 +1771,9 @@ long* len;
   buf = writeString(docHeadline->Date,DT_Date,buf,len);
   buf = writeString(docHeadline->Headline,DT_Headline,buf,len);
   buf = writeString(docHeadline->OriginCity,DT_OriginCity,buf,len);
-  
+
   /* now write the header and size */
-  size = buf - buffer; 
+  size = buf - buffer;
   buf = writeUserInfoHeader(DT_DocumentHeadlineGroup,size,header_len,buffer,len);
 
   return(buf);
@@ -1781,60 +1781,60 @@ long* len;
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 readWAISDocumentHeadlines(docHeadline,buffer)
 WAISDocumentHeadlines** docHeadline;
 char* buffer;
 {
   char* buf = buffer;
-  unsigned long size; 
+  unsigned long size;
   unsigned long headerSize;
   data_tag tag1;
   any* docID;
   long versionNumber;
   char *source,*date,*headline,*originCity;
-  
+
   docID = NULL;
   versionNumber = UNUSED;
   source = date = headline = originCity = NULL;
-  
+
   buf = readUserInfoHeader(&tag1,&size,buf);
   headerSize = buf - buffer;
-    
+
   while (buf < (buffer + size + headerSize))
    { data_tag tag = peekTag(buf);
      switch (tag)
       { case DT_DocumentID:
-  		  buf = readAny(&docID,buf);
-  		  break;
-  		case DT_VersionNumber:
-  		  buf = readNum(&versionNumber,buf);
-  		  break;
-  		case DT_Source:
-  		  buf = readString(&source,buf);
-  		  break;
-  		case DT_Date:
-  		  buf = readString(&date,buf);
-  		  break;
-  		case DT_Headline:
-  		  buf = readString(&headline,buf);
-  		  break;
-  		case DT_OriginCity:
-  		  buf = readString(&originCity,buf);
-  		  break;
-        default:
-          freeAny(docID);
-          s_free(source);
-          s_free(date);
-          s_free(headline);
-          s_free(originCity);
-          REPORT_READ_ERROR(buf);
-          break;
+		  buf = readAny(&docID,buf);
+		  break;
+		case DT_VersionNumber:
+		  buf = readNum(&versionNumber,buf);
+		  break;
+		case DT_Source:
+		  buf = readString(&source,buf);
+		  break;
+		case DT_Date:
+		  buf = readString(&date,buf);
+		  break;
+		case DT_Headline:
+		  buf = readString(&headline,buf);
+		  break;
+		case DT_OriginCity:
+		  buf = readString(&originCity,buf);
+		  break;
+	default:
+	  freeAny(docID);
+	  s_free(source);
+	  s_free(date);
+	  s_free(headline);
+	  s_free(originCity);
+	  REPORT_READ_ERROR(buf);
+	  break;
       }
    }
-  	  
+
   *docHeadline = makeWAISDocumentHeadlines(docID,versionNumber,source,date,
-  									       headline,originCity);
+									       headline,originCity);
   return(buf);
 }
 
@@ -1859,13 +1859,13 @@ char* industryCodes;
   docCodes->StockCodes = stockCodes;
   docCodes->CompanyCodes = companyCodes;
   docCodes->IndustryCodes = industryCodes;
-  
+
   return(docCodes);
 }
 
 /*----------------------------------------------------------------------*/
 
-void 
+void
 freeWAISDocumentCodes(docCodes)
 WAISDocumentCodes* docCodes;
 {
@@ -1878,7 +1878,7 @@ WAISDocumentCodes* docCodes;
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 writeWAISDocumentCodes(docCodes,buffer,len)
 WAISDocumentCodes* docCodes;
 char* buffer;
@@ -1888,7 +1888,7 @@ long* len;
 											DefWAISDocCodeSize);
   char* buf = buffer + header_len;
   unsigned long size;
-  
+
   RESERVE_SPACE_FOR_WAIS_HEADER(len);
 
   buf = writeAny(docCodes->DocumentID,DT_DocumentID,buf,len);
@@ -1896,9 +1896,9 @@ long* len;
   buf = writeString(docCodes->StockCodes,DT_StockCodes,buf,len);
   buf = writeString(docCodes->CompanyCodes,DT_CompanyCodes,buf,len);
   buf = writeString(docCodes->IndustryCodes,DT_IndustryCodes,buf,len);
-  
+
   /* now write the header and size */
-  size = buf - buffer; 
+  size = buf - buffer;
   buf = writeUserInfoHeader(DT_DocumentCodeGroup,size,header_len,buffer,len);
 
   return(buf);
@@ -1906,62 +1906,62 @@ long* len;
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 readWAISDocumentCodes(docCodes,buffer)
 WAISDocumentCodes** docCodes;
 char* buffer;
 {
   char* buf = buffer;
-  unsigned long size; 
+  unsigned long size;
   unsigned long headerSize;
   data_tag tag1;
   any* docID;
   long versionNumber;
   char *stockCodes,*companyCodes,*industryCodes;
-  
+
   docID = NULL;
   versionNumber = UNUSED;
   stockCodes = companyCodes = industryCodes = NULL;
-  
+
   buf = readUserInfoHeader(&tag1,&size,buf);
   headerSize = buf - buffer;
-    
+
   while (buf < (buffer + size + headerSize))
    { data_tag tag = peekTag(buf);
      switch (tag)
       { case DT_DocumentID:
-  		  buf = readAny(&docID,buf);
-  		  break;
-  		case DT_VersionNumber:
-  		  buf = readNum(&versionNumber,buf);
-  		  break;
-  		case DT_StockCodes:
-  		  buf = readString(&stockCodes,buf);
-  		  break;
-  		case DT_CompanyCodes:
-  		  buf = readString(&companyCodes,buf);
-  		  break;
-  		case DT_IndustryCodes:
-  		  buf = readString(&industryCodes,buf);
-  		  break;
-        default:
-          freeAny(docID);
-          s_free(stockCodes);
-          s_free(companyCodes);
-          s_free(industryCodes);
-          REPORT_READ_ERROR(buf);
-          break;
+		  buf = readAny(&docID,buf);
+		  break;
+		case DT_VersionNumber:
+		  buf = readNum(&versionNumber,buf);
+		  break;
+		case DT_StockCodes:
+		  buf = readString(&stockCodes,buf);
+		  break;
+		case DT_CompanyCodes:
+		  buf = readString(&companyCodes,buf);
+		  break;
+		case DT_IndustryCodes:
+		  buf = readString(&industryCodes,buf);
+		  break;
+	default:
+	  freeAny(docID);
+	  s_free(stockCodes);
+	  s_free(companyCodes);
+	  s_free(industryCodes);
+	  REPORT_READ_ERROR(buf);
+	  break;
       }
    }
-  	  
+
   *docCodes = makeWAISDocumentCodes(docID,versionNumber,stockCodes,
-  									companyCodes,industryCodes);
+									companyCodes,industryCodes);
   return(buf);
 }
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 writePresentInfo(present,buffer,len)
 PresentAPDU* present GCC_UNUSED;
 char* buffer;
@@ -1973,7 +1973,7 @@ long* len GCC_UNUSED;
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 readPresentInfo(info,buffer)
 void** info;
 char* buffer;
@@ -1985,7 +1985,7 @@ char* buffer;
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 writePresentResponseInfo(response,buffer,len)
 PresentResponseAPDU* response GCC_UNUSED;
 char* buffer;
@@ -1997,7 +1997,7 @@ long* len GCC_UNUSED;
 
 /*----------------------------------------------------------------------*/
 
-char* 
+char*
 readPresentResponseInfo(info,buffer)
 void** info;
 char* buffer;
@@ -2018,36 +2018,36 @@ char* buffer;
 #define DATA_TYPE	"wt"
 
 /* WAIS supports the following semantics for type 1 queries:
-       
+
      1.  retrieve the header/codes from a document:
 
-            System_Control_Number = docID
-            Data Type = type (optional)
-            And
+	    System_Control_Number = docID
+	    Data Type = type (optional)
+	    And
 
      2.  retrieve a fragment of the text of a document:
 
-            System_Control_Number = docID
-            Data Type = type (optional)
-            And
-	    	Chunk >= start
-	    	And
-	    	Chunk < end
-	    	And
+	    System_Control_Number = docID
+	    Data Type = type (optional)
+	    And
+		Chunk >= start
+		And
+		Chunk < end
+		And
 
-   		Information from multiple documents may be requested by using 
-   		groups of the above joined by:
+		Information from multiple documents may be requested by using
+		groups of the above joined by:
 
-            OR
+	    OR
 
-   		( XXX does an OR come after every group but the first, or do they
-              all come at the end? )
-              
-        ( XXX return type could be in the element set)
+		( XXX does an OR come after every group but the first, or do they
+	      all come at the end? )
+
+	( XXX return type could be in the element set)
 */
 
 static query_term** makeWAISQueryTerms PARAMS((DocObj** docs));
-   
+
 static query_term**
 makeWAISQueryTerms(docs)
 DocObj** docs;
@@ -2075,7 +2075,7 @@ DocObj** docs;
 
       if (doc->ChunkCode == CT_document) /* a whole document */
 	{ terms = (query_term**)s_realloc((char*)terms,
-					  (size_t)(sizeof(query_term*) * 
+					  (size_t)(sizeof(query_term*) *
 						   (numTerms + 3 + 1)));
 	  terms[numTerms++] = makeAttributeTerm(SYSTEM_CONTROL_NUMBER,
 						EQUAL,IGNORE,IGNORE,
@@ -2085,16 +2085,16 @@ DocObj** docs;
 						   IGNORE,IGNORE,IGNORE,
 						   IGNORE,type);
 	     terms[numTerms++] = makeOperatorTerm(AND);
-           }
+	   }
 	  terms[numTerms] = NULL;
 	}
       else			/* a document fragment */
 	{	char chunk_att[ATTRIBUTE_SIZE];
 		any* startChunk = NULL;
 		any* endChunk = NULL;
- 
+
 		terms = (query_term**)s_realloc((char*)terms,
-						(size_t)(sizeof(query_term*) * 
+						(size_t)(sizeof(query_term*) *
 							 (numTerms + 7 + 1)));
 
 		switch (doc->ChunkCode)
@@ -2103,7 +2103,7 @@ DocObj** docs;
 		      { char start[20],end[20];
 			(doc->ChunkCode == CT_byte) ?
 			  strncpy(chunk_att,BYTE,ATTRIBUTE_SIZE) :
-			strncpy(chunk_att,LINE,ATTRIBUTE_SIZE);	
+			strncpy(chunk_att,LINE,ATTRIBUTE_SIZE);
 			sprintf(start,"%ld",doc->ChunkStart.Pos);
 			startChunk = stringToAny(start);
 			sprintf(end,"%ld",doc->ChunkEnd.Pos);
@@ -2132,7 +2132,7 @@ DocObj** docs;
 		 }
 		terms[numTerms++] = makeAttributeTerm(chunk_att,
 						      GREATER_THAN_OR_EQUAL,
-						      IGNORE,IGNORE,IGNORE, 
+						      IGNORE,IGNORE,IGNORE,
 						      IGNORE,
 						      startChunk);
 		terms[numTerms++] = makeOperatorTerm(AND);
@@ -2148,12 +2148,12 @@ DocObj** docs;
 		    freeAny(endChunk);
 		  }
 	      }
-      
+
       freeAny(type);
-      
+
      if (i != 0) /* multiple independent queries, need a disjunction */
 	{ terms = (query_term**)s_realloc((char*)terms,
-					  (size_t)(sizeof(query_term*) * 
+					  (size_t)(sizeof(query_term*) *
 						   (numTerms + 1 + 1)));
 	  terms[numTerms++] = makeOperatorTerm(OR);
 	  terms[numTerms] = NULL;
@@ -2167,10 +2167,10 @@ DocObj** docs;
 
 static DocObj** makeWAISQueryDocs PARAMS((query_term** terms));
 
-static DocObj** 
+static DocObj**
 makeWAISQueryDocs(terms)
 query_term** terms;
-/* given a list of terms in the form given above, convert them to 
+/* given a list of terms in the form given above, convert them to
    DocObjs.
  */
 {
@@ -2181,36 +2181,36 @@ query_term** terms;
   long docNum,termNum;
 
   docNum = termNum = 0;
-  
+
   docs = (DocObj**)s_malloc((size_t)(sizeof(DocObj*) * 1));
   docs[docNum] = NULL;
 
   /* translate the terms into DocObjs */
   while (true)
-    {	      
+    {
       query_term* typeTerm = NULL;
       char* type = NULL;
       long startTermOffset;
 
       docTerm = terms[termNum];
-     
+
       if (docTerm == NULL)
 	break;			/* we're done converting */
 
       typeTerm = terms[termNum + 1]; /* get the lead Term if it exists */
 
       if (strcmp(typeTerm->Use,DATA_TYPE) == 0)	/* we do have a type */
-       { startTermOffset = 3;	
+       { startTermOffset = 3;
 	 type = anyToString(typeTerm->Term);
        }
-      else 				   	/* no type */
+      else			/* no type */
        { startTermOffset = 1;
 	 typeTerm = NULL;
 	 type = NULL;
        }
 
       /* grow the doc list */
-      docs = (DocObj**)s_realloc((char*)docs,(size_t)(sizeof(DocObj*) * 
+      docs = (DocObj**)s_realloc((char*)docs,(size_t)(sizeof(DocObj*) *
 						      (docNum + 1 + 1)));
 
       /* figure out what kind of docObj to build - and build it */
@@ -2218,20 +2218,20 @@ query_term** terms;
       if (fragmentTerm != NULL && fragmentTerm->TermType == TT_Attribute)
 	{			/* build a document fragment */
 	  query_term* startTerm = fragmentTerm;
-	  query_term* endTerm = terms[termNum + startTermOffset + 2]; 
+	  query_term* endTerm = terms[termNum + startTermOffset + 2];
 
 	  if (strcmp(startTerm->Use,BYTE) == 0){ /* a byte chunk */
 	    doc = makeDocObjUsingBytes(duplicateAny(docTerm->Term),
 				       type,
 				       anyToLong(startTerm->Term),
 				       anyToLong(endTerm->Term));
-           log_write("byte");
+	   log_write("byte");
 	  }else if (strcmp(startTerm->Use,LINE) == 0){ /* a line chunk */
 	    doc = makeDocObjUsingLines(duplicateAny(docTerm->Term),
 				       type,
 				       anyToLong(startTerm->Term),
 				       anyToLong(endTerm->Term));
-            log_write("line");
+	    log_write("line");
 	  }else{
 	log_write("chunk");			/* a paragraph chunk */
 	    doc = makeDocObjUsingParagraphs(duplicateAny(docTerm->Term),
@@ -2242,18 +2242,18 @@ query_term** terms;
 	  termNum += (startTermOffset + 4);	/* point to next term */
 	}
       else			/* build a full document */
-	{ 
+	{
 	  doc = makeDocObjUsingWholeDocument(duplicateAny(docTerm->Term),
 					     type);
 log_write("whole doc");
 	  termNum += startTermOffset;	/* point to next term */
 	}
-     
+
       docs[docNum++] = doc;	/* insert the new document */
-	 
+
       docs[docNum] = NULL;	/* keep the doc list terminated */
 
-	 
+
       if (terms[termNum] != NULL)
 	termNum++; /* skip the OR operator it necessary */
       else
@@ -2265,7 +2265,7 @@ log_write("whole doc");
 
 /*----------------------------------------------------------------------*/
 
-any* 
+any*
 makeWAISTextQuery(docs)
 DocObj** docs;
 /* given a list of DocObjs, return an any whose contents is the corresponding
@@ -2274,34 +2274,34 @@ DocObj** docs;
 {
   any *buf = NULL;
   query_term** terms = NULL;
-  
+
   terms = makeWAISQueryTerms(docs);
   buf = writeQuery(terms);
-  
+
   doList((void**)terms,freeTerm);
   s_free(terms);
-  
+
   return(buf);
 }
 
 /*----------------------------------------------------------------------*/
 
-DocObj** 
+DocObj**
 readWAISTextQuery(buf)
 any* buf;
-/* given an any whose contents are type 1 queries of the WAIS sort, 
+/* given an any whose contents are type 1 queries of the WAIS sort,
    construct a list of the corresponding DocObjs
  */
 {
   query_term** terms = NULL;
   DocObj** docs = NULL;
-  
+
   terms = readQuery(buf);
   docs = makeWAISQueryDocs(terms);
-  
+
   doList((void**)terms,freeTerm);
   s_free(terms);
-  
+
   return(docs);
 }
 
@@ -2315,7 +2315,7 @@ any* buf;
 /*   caller to assign nulls to the pointer fields of the WAIS object.  */
 /*----------------------------------------------------------------------*/
 
-void 
+void
 CSTFreeWAISInitResponse(init)
 WAISInitResponse* init;
 /* free an object made with makeWAISInitResponse */
@@ -2325,11 +2325,11 @@ WAISInitResponse* init;
 
 /*----------------------------------------------------------------------*/
 
-void 
+void
 CSTFreeWAISSearch(query)
 WAISSearch* query;
 /* destroy an object made with makeWAISSearch() */
-{ 
+{
   s_free(query);
 }
 
@@ -2339,7 +2339,7 @@ void
 CSTFreeDocObj(doc)
 DocObj* doc;
 /* free a docObj */
-{ 
+{
     s_free(doc);
 }
 
@@ -2348,7 +2348,7 @@ DocObj* doc;
 void
 CSTFreeWAISDocumentHeader(header)
 WAISDocumentHeader* header;
-{ 
+{
     s_free(header);
 }
 
@@ -2357,7 +2357,7 @@ WAISDocumentHeader* header;
 void
 CSTFreeWAISDocumentShortHeader(header)
 WAISDocumentShortHeader* header;
-{ 
+{
   s_free(header);
 }
 /*----------------------------------------------------------------------*/
@@ -2374,31 +2374,31 @@ WAISDocumentLongHeader* header;
 void
 CSTFreeWAISSearchResponse(response)
 WAISSearchResponse* response;
-{ 
+{
   s_free(response);
 }
 
 /*----------------------------------------------------------------------*/
 
-void 
+void
 CSTFreeWAISDocumentText(docText)
 WAISDocumentText* docText;
-{ 
+{
   s_free(docText);
 }
 
 /*----------------------------------------------------------------------*/
 
-void 
+void
 CSTFreeWAISDocHeadlines(docHeadline)
 WAISDocumentHeadlines* docHeadline;
-{ 
+{
   s_free(docHeadline);
 }
 
 /*----------------------------------------------------------------------*/
 
-void 
+void
 CSTFreeWAISDocumentCodes(docCodes)
 WAISDocumentCodes* docCodes;
 {
@@ -2407,7 +2407,7 @@ WAISDocumentCodes* docCodes;
 
 /*----------------------------------------------------------------------*/
 
-void 
+void
 CSTFreeWAISTextQuery(query)
 any* query;
 {
@@ -2423,7 +2423,7 @@ any* query;
 **----------------------------------------------------------------------*/
 /* WIDE AREA INFORMATION SERVER SOFTWARE
    No guarantees or restrictions.  See the readme file for the full standard
-   disclaimer.    
+   disclaimer.
    3.26.90
 */
 
@@ -2438,14 +2438,14 @@ any* query;
 
 /*---------------------------------------------------------------------*/
 
-void 
+void
 readWAISPacketHeader(msgBuffer,header_struct)
 char* msgBuffer;
 WAISMessage *header_struct;
 {
   /* msgBuffer is a string containing at least HEADER_LENGTH bytes. */
-		    
-  memmove(header_struct->msg_len,msgBuffer,(size_t)10); 
+
+  memmove(header_struct->msg_len,msgBuffer,(size_t)10);
   header_struct->msg_type = char_downcase((unsigned long)msgBuffer[10]);
   header_struct->hdr_vers = char_downcase((unsigned long)msgBuffer[11]);
   memmove(header_struct->server,(void*)(msgBuffer + 12),(size_t)10);
@@ -2453,13 +2453,13 @@ WAISMessage *header_struct;
   header_struct->encoding = char_downcase((unsigned long)msgBuffer[23]);
   header_struct->msg_checksum = char_downcase((unsigned long)msgBuffer[24]);
 }
- 
+
 /*---------------------------------------------------------------------*/
 
 /* this modifies the header argument.  See wais-message.h for the different
  * options for the arguments.
  */
- 
+
 void
 writeWAISPacketHeader(header,
 		      dataLen,
@@ -2484,19 +2484,19 @@ long version;
   if (serverLen > 10)
     serverLen = 10;
 
-  sprintf(lengthBuf, "%010ld", dataLen);  
+  sprintf(lengthBuf, "%010ld", dataLen);
   strncpy(header,lengthBuf,10);
 
-  header[10] = type & 0xFF; 
+  header[10] = type & 0xFF;
   header[11] = version & 0xFF;
 
-  strncpy(serverBuf,server,serverLen);       
+  strncpy(serverBuf,server,serverLen);
   strncpy((char*)(header + 12),serverBuf,serverLen);
 
-  header[22] = compression & 0xFF;    
-  header[23] = encoding & 0xFF;    
-  header[24] = '0'; /* checkSum(header + HEADER_LENGTH,dataLen);   XXX the result must be ascii */	
-}              
-              
+  header[22] = compression & 0xFF;
+  header[23] = encoding & 0xFF;
+  header[24] = '0'; /* checkSum(header + HEADER_LENGTH,dataLen);   XXX the result must be ascii */
+}
+
 /*---------------------------------------------------------------------*/
 
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisProt.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisProt.h
index feea3264e8a..4ff76cef517 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisProt.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisProt.h
@@ -12,17 +12,17 @@
 **----------------------------------------------------------------------*/
 /* WIDE AREA INFORMATION SERVER SOFTWARE:
    No guarantees or restrictions.  See the readme file for the full standard
-   disclaimer.	
-  
+   disclaimer.
+
    3.26.90	Harry Morris, morris@think.com
-   3.30.90  Harry Morris 
-   			-	removed chunk code from WAISSearchAPDU,
-   			-	added makeWAISQueryType1Query() and readWAISType1Query() which
-   				replace makeWAISQueryTerms() and makeWAISQueryDocs().
+   3.30.90  Harry Morris
+			-	removed chunk code from WAISSearchAPDU,
+			-	added makeWAISQueryType1Query() and readWAISType1Query() which
+				replace makeWAISQueryTerms() and makeWAISQueryDocs().
    4.11.90  HWM - added definitions of wais element set names
-   4.14.90  HWM - changed symbol for relevance feedback query from QT_3 to 
-   				  QT_RelevanceFeedbackQuery added QT_TextRetrievalQuery as a
-   				  synonym for QT_BooleanQuery
+   4.14.90  HWM - changed symbol for relevance feedback query from QT_3 to
+				  QT_RelevanceFeedbackQuery added QT_TextRetrievalQuery as a
+				  synonym for QT_BooleanQuery
 				- renamed makeWAISType1Query() to makeWAISTextQuery()
 				  renamed readWAISType1Query() to readWAISTextQuery()
    5.29.90  TS - added CSTFreeWAISFoo functions
@@ -95,16 +95,16 @@
 #define DT_DocumentShortHeaderGroup	(data_tag)151
 #define DT_DocumentLongHeaderGroup	(data_tag)152
 #define DT_DocumentTextGroup		(data_tag)153
-#define DT_DocumentHeadlineGroup 	(data_tag)154
+#define DT_DocumentHeadlineGroup	(data_tag)154
 #define DT_DocumentCodeGroup		(data_tag)155
-#define DT_Lines					(data_tag)131 
-#define	DT_TYPE_BLOCK				(data_tag)132
-#define DT_TYPE						(data_tag)133
+#define DT_Lines			(data_tag)131
+#define	DT_TYPE_BLOCK			(data_tag)132
+#define DT_TYPE				(data_tag)133
 
 /* wais element sets */
 #define ES_DocumentHeader		"Document Header"
-#define ES_DocumentShortHeader	"Document Short Header"
-#define ES_DocumentLongHeader	"Document Long Header"
+#define ES_DocumentShortHeader		"Document Short Header"
+#define ES_DocumentLongHeader		"Document Long Header"
 #define ES_DocumentText			"Document Text"
 #define ES_DocumentHeadline		"Document Headline"
 #define ES_DocumentCodes		"Document Codes"
@@ -122,7 +122,7 @@ typedef struct DocObj { /* specifies a section of a document */
 		any*	ID;
 	} ChunkEnd;
 	} DocObj;
-	
+
 /*----------------------------------------------------------------------*/
 /* WAIS APDU extensions */
 
@@ -131,7 +131,7 @@ typedef struct WAISInitResponse {
 	long				ChunkIDLength;
 	char*				ChunkMarker;
 	char*				HighlightMarker;
-	char* 				DeHighlightMarker;
+	char*				DeHighlightMarker;
 	char*				NewlineCharacters;
 	/* XXX  need to add UpdateFrequency and Update Time */
 	} WAISInitResponse;
@@ -149,10 +149,10 @@ typedef struct WAISSearch {
 typedef struct WAISDocumentHeader {
 	any*				DocumentID;
 	long				VersionNumber;
-	long				Score;     
-	long				BestMatch; 
+	long				Score;
+	long				BestMatch;
 	long				DocumentLength;
-	long 				Lines;
+	long				Lines;
 	char**				Types;
 	char*				Source;
 	char*				Date;
@@ -163,35 +163,35 @@ typedef struct WAISDocumentHeader {
 typedef struct WAISDocumentShortHeader {
 	any*				DocumentID;
 	long				VersionNumber;
-	long				Score;     
-	long				BestMatch; 
+	long				Score;
+	long				BestMatch;
 	long				DocumentLength;
-	long 				Lines;
- 	} WAISDocumentShortHeader;
- 
+	long				Lines;
+	} WAISDocumentShortHeader;
+
 typedef struct WAISDocumentLongHeader {
 	any*				DocumentID;
 	long				VersionNumber;
-	long				Score;     
-	long				BestMatch; 
+	long				Score;
+	long				BestMatch;
 	long				DocumentLength;
-	long 				Lines;
+	long				Lines;
 	char**				Types;
 	char*				Source;
 	char*				Date;
 	char*				Headline;
 	char*				OriginCity;
 	char*				StockCodes;
-	char* 				CompanyCodes;
+	char*				CompanyCodes;
 	char*				IndustryCodes;
- 	} WAISDocumentLongHeader;
+	} WAISDocumentLongHeader;
 
 typedef struct WAISDocumentText {
 	any*				DocumentID;
 	long				VersionNumber;
 	any*				DocumentText;
 	} WAISDocumentText;
-	
+
 typedef struct WAISDocumentHeadlines {
 	any*				DocumentID;
 	long				VersionNumber;
@@ -200,7 +200,7 @@ typedef struct WAISDocumentHeadlines {
 	char*				Headline;
 	char*				OriginCity;
 	} WAISDocumentHeadlines;
-	
+
 typedef struct WAISDocumentCodes {
 	any*				DocumentID;
 	long				VersionNumber;
@@ -208,12 +208,12 @@ typedef struct WAISDocumentCodes {
 	char*				CompanyCodes;
 	char*				IndustryCodes;
 	} WAISDocumentCodes;
-	
+
 typedef struct WAISSearchResponse {
-	char*			       		SeedWordsUsed;
-	WAISDocumentHeader** 		DocHeaders;
-	WAISDocumentShortHeader** 	ShortHeaders;
-	WAISDocumentLongHeader** 	LongHeaders;
+	char*					SeedWordsUsed;
+	WAISDocumentHeader**		DocHeaders;
+	WAISDocumentShortHeader**	ShortHeaders;
+	WAISDocumentLongHeader**	LongHeaders;
 	WAISDocumentText**			Text;
 	WAISDocumentHeadlines**		Headlines;
 	WAISDocumentCodes**			Codes;
@@ -326,7 +326,7 @@ void CSTFreeWAISTextQuery PARAMS(( any* query));
 **----------------------------------------------------------------------*/
 /* WIDE AREA INFORMATION SERVER SOFTWARE
    No guarantees or restrictions.  See the readme file for the full standard
-   disclaimer.    
+   disclaimer.
    3.26.90
 */
 
@@ -351,7 +351,7 @@ void CSTFreeWAISTextQuery PARAMS(( any* query));
 #ifndef HTUTILS_H
 #include <HTUtils.h>
 #endif
- 
+
 #include <HTVMS_WaisUI.h>
 
 typedef struct wais_header {
@@ -361,36 +361,36 @@ typedef struct wais_header {
         char    hdr_vers;       /* version of this header, currently = '2' */
         char    server[10];     /* name or address of server */
         char    compression;    /* <sp>=no compression, 'u'=unix compress */
-        char    encoding;       /* <sp>=no encoding, 'h'=hexize, 
+        char    encoding;       /* <sp>=no encoding, 'h'=hexize,
 				   'u'=uuencode */
         char    msg_checksum;   /* XOR of every byte of message */
         } WAISMessage;
 
-#define HEADER_LENGTH 	25	/* number of bytes needed to write a 
+#define HEADER_LENGTH	25	/* number of bytes needed to write a
 				   wais-header (not sizeof(wais_header)) */
 
-#define HEADER_VERSION 	(long)'2'
+#define HEADER_VERSION	(long)'2'
 
 /* message type */
-#define Z3950			'z'  
-#define ACK			'a'  
-#define	NAK			'n'  
+#define Z3950			'z'
+#define ACK			'a'
+#define	NAK			'n'
 
 /* compression */
-#define NO_COMPRESSION 		' ' 
-#define UNIX_COMPRESSION 	'u' 
+#define NO_COMPRESSION		' '
+#define UNIX_COMPRESSION	'u'
 
 /* encoding */
-#define NO_ENCODING		' '  
-#define HEX_ENCODING	'h'  /* Swartz 4/3 encoding */
-#define IBM_HEXCODING	'i'	 /* same as h but uses characters acceptable for IBM mainframes */
-#define UUENCODE		'u'  
+#define NO_ENCODING		' '
+#define HEX_ENCODING		'h'  /* Swartz 4/3 encoding */
+#define IBM_HEXCODING		'i'  /* same as h but uses characters acceptable for IBM mainframes */
+#define UUENCODE		'u'
 
 
 void readWAISPacketHeader PARAMS((char* msgBuffer,WAISMessage *header_struct));
 long getWAISPacketLength PARAMS((WAISMessage* header));
 void writeWAISPacketHeader PARAMS((char* header,long dataLen,long type,
-				char* server,long compression,	
+				char* server,long compression,
 				long encoding,long version));
 
 #endif /* ndef WMESSAGE_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisUI.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisUI.c
index 6f0811c0430..5aaa9e69a56 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisUI.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisUI.c
@@ -696,9 +696,9 @@ freeSearchAPDU(SearchAPDU* query)
 
 /*----------------------------------------------------------------------*/
 
-#define DB_DELIMITER 	"\037" 	/* hex 1F occurs between each database name */
-#define ES_DELIMITER_1 	"\037" 	/* separates database name from element name */
-#define ES_DELIMITER_2 	"\036" 	/* hex 1E separates <db,es> groups from one another */
+#define DB_DELIMITER	"\037"	/* hex 1F occurs between each database name */
+#define ES_DELIMITER_1	"\037"	/* separates database name from element name */
+#define ES_DELIMITER_2	"\036"	/* hex 1E separates <db,es> groups from one another */
 
 char*
 writeSearchAPDU(SearchAPDU* query, char* buffer, long* len)
@@ -911,9 +911,9 @@ readSearchResponseAPDU(SearchResponseAPDU** queryResponse, char* buffer)
    3.26.90	Harry Morris, morris@think.com
    3.30.90  Harry Morris - Changed any->bits to any->bytes
    4.11.90  HWM - fixed include file names, changed
-   				- writeCompressedIntegerWithPadding() to
-                  writeCompressedIntWithPadding()
-                - generalized conditional includes (see c-dialect.h)
+		- writeCompressedIntegerWithPadding() to
+		  writeCompressedIntWithPadding()
+		- generalized conditional includes (see c-dialect.h)
    3.7.91   Jonny Goldman.  Replaced "short" in makeBitMap with "int" line 632.
 */
 
@@ -1907,7 +1907,7 @@ readQueryTerm(query_term** qt, char* buffer)
   char* buf = buffer;
   char  *attributeList = NULL;
   char* operator = NULL;
-  any* 	term;
+  any*  term;
   char* use = NULL;
   char* relation = NULL;
   char* position = NULL;
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisUI.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisUI.h
index 474b943d7bc..6bb2539e511 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisUI.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTVMS_WaisUI.h
@@ -19,7 +19,7 @@ void	log_write PARAMS((char *));
 **
 **----------------------------------------------------------------------*/
 
-void	panic (char* format,...); 
+void	panic (char* format,...);
 
 /*----------------------------------------------------------------------*/
 
@@ -36,11 +36,11 @@ void	panic (char* format,...);
 #endif /* boolean */
 
 #ifndef true
-#define true 	(boolean)1L
+#define true	(boolean)1L
 #endif /* true */
 
 #ifndef false
-#define false 	(boolean)0L   /* used to be (!true), but broke 
+#define false	(boolean)0L   /* used to be (!true), but broke
 				 some compilers */
 #endif /* false */
 
@@ -61,16 +61,16 @@ void	fs_checkPtr PARAMS((void* ptr));
 void*	fs_malloc PARAMS((size_t size));
 void*	fs_realloc PARAMS((void* ptr,size_t size));
 void	fs_free PARAMS((void* ptr));
-char* 	fs_strncat PARAMS((char* dst,char* src,size_t maxToAdd,size_t maxTotal));
+char*	fs_strncat PARAMS((char* dst,char* src,size_t maxToAdd,size_t maxTotal));
 
 /* macros for memory functions.  call these in your program.  */
-#define s_checkPtr(ptr) 	fs_checkPtr(ptr)
-#define s_malloc(size)	      	fs_malloc(size)
+#define s_checkPtr(ptr)		fs_checkPtr(ptr)
+#define s_malloc(size)		fs_malloc(size)
 #define s_realloc(ptr,size)	fs_realloc((ptr),(size))
 #define s_free(ptr)		{ fs_free((char*)ptr); ptr = NULL; }
 #define s_strncat(dst,src,maxToAdd,maxTotal)	fs_strncat((dst),(src),(maxToAdd),(maxTotal))
 
-char* 	s_strdup PARAMS((char* s));
+char*	s_strdup PARAMS((char* s));
 
 #define IS_DELIMITER	1
 #define	NOT_DELIMITER	!IS_DELIMITER
@@ -90,7 +90,7 @@ char *string_downcase PARAMS((char* word));
 /* Data types / constants */
 
 /* bytes to leave for the header size info */
-#define HEADER_LEN	(size_t)2 
+#define HEADER_LEN	(size_t)2
 
 typedef long pdu_type;
 
@@ -108,15 +108,15 @@ typedef long pdu_type;
 #define	resourceControlResponseAPDU	(pdu_type)31
 
 typedef struct any {	/* an any is a non-ascii string of characters */
-	unsigned long	size; 
+	unsigned long	size;
 	char*			bytes;
 	} any;
-	
-typedef any	bit_map; 	/* a bit_map is a group of packed bits */
+
+typedef any	bit_map;	/* a bit_map is a group of packed bits */
 
 typedef unsigned long data_tag;
 
-#define DT_PDUType			(data_tag)1 	
+#define DT_PDUType			(data_tag)1
 #define	DT_ReferenceID			(data_tag)2
 #define	DT_ProtocolVersion		(data_tag)3
 #define	DT_Options			(data_tag)4
@@ -134,7 +134,7 @@ typedef unsigned long data_tag;
 #define	DT_ReplaceIndicator		(data_tag)16
 #define	DT_ResultSetName		(data_tag)17
 #define	DT_DatabaseNames		(data_tag)18
-#define	DT_ElementSetNames 		(data_tag)19
+#define DT_ElementSetNames		(data_tag)19
 #define	DT_QueryType			(data_tag)20
 #define	DT_Query			(data_tag)21
 #define	DT_SearchStatus			(data_tag)22
@@ -162,12 +162,12 @@ typedef unsigned long data_tag;
 
 #define UNUSED	-1
 
-/* number of bytes required to represent the following sizes in compressed 
+/* number of bytes required to represent the following sizes in compressed
    integer format
  */
-#define CompressedInt1Byte	128 		/* 2 ^ 7 */
-#define CompressedInt2Byte	16384 		/* 2 ^ 14 */
-#define CompressedInt3Byte	2097152 	/* 2 ^ 21 */
+#define CompressedInt1Byte	128		/* 2 ^ 7 */
+#define CompressedInt2Byte	16384		/* 2 ^ 14 */
+#define CompressedInt3Byte	2097152		/* 2 ^ 21 */
 /* others may follow ... */
 
 /* types of query */
@@ -198,24 +198,24 @@ typedef unsigned long data_tag;
 #define PARTIAL_2	2
 #define PARTIAL_3	3
 #define PARTIAL_4	4
-#define PS_NONE		5 /* can't use NONE since it was used by result 
+#define PS_NONE		5 /* can't use NONE since it was used by result
 			     set status */
 
 #define DIAGNOSTIC_CODE_SIZE	(size_t)3
 
-typedef struct diagnosticRecord 
+typedef struct diagnosticRecord
  { boolean	SURROGATE;
    char		DIAG[DIAGNOSTIC_CODE_SIZE];
-   char* 	ADDINFO;
+   char*	ADDINFO;
  } diagnosticRecord;
 
 #define D_PermanentSystemError	       "S1"
-#define D_TemporarySystemError	       "S2"
-#define D_UnsupportedSearch	       "S3"
-#define D_TermsOnlyStopWords	       "S5"
-#define D_TooManyArgumentWords	       "S6"
+#define D_TemporarySystemError         "S2"
+#define D_UnsupportedSearch            "S3"
+#define D_TermsOnlyStopWords           "S5"
+#define D_TooManyArgumentWords         "S6"
 #define D_TooManyBooleanOperators      "S7"
-#define D_TooManyTruncatedWords	       "S8"
+#define D_TooManyTruncatedWords        "S8"
 #define D_TooMany IncompleteSubfields  "S9"
 #define D_TruncatedWordsTooShort       "SA"
 #define D_InvalidFormatForRecordNumber "SB"
@@ -251,17 +251,17 @@ typedef struct diagnosticRecord
 
 /* for internal error handling */
 
-extern char* readErrorPosition; 	/* pos where buf stoped making sense */
+extern char* readErrorPosition;		/* pos where buf stoped making sense */
 
 /* the following are macros so that they can return OUT of the function
    which calls them
  */
- 
-#define RETURN_ON_NULL(var) 					\
-	if (var == NULL) 				     	\
+
+#define RETURN_ON_NULL(var)					\
+	if (var == NULL)					\
 	  return(NULL); /* jump out of caller */
 
-#define REPORT_READ_ERROR(pos) 					\
+#define REPORT_READ_ERROR(pos)					\
 	{ readErrorPosition = (pos);				\
 	  return(NULL); /* jump out of caller */		\
     }
@@ -270,8 +270,8 @@ extern char* readErrorPosition; 	/* pos where buf stoped making sense */
 	{ if (*spaceLeft >= spaceNeeded)			\
 	    (*spaceLeft) -= spaceNeeded;			\
 	  else							\
-	   { *spaceLeft = 0; 					\
-	     return(NULL); /* jump out of the caller */ 	\
+	   { *spaceLeft = 0;					\
+	     return(NULL); /* jump out of the caller */		\
 	   }							\
 	}
 
@@ -476,8 +476,8 @@ query_term** readQuery PARAMS((any* info));
 **----------------------------------------------------------------------*/
 
 char *
-generate_retrieval_apdu PARAMS((char *buff, 
-			     long *buff_len, 
+generate_retrieval_apdu PARAMS((char *buff,
+			     long *buff_len,
 			     any *docID,
 			     long chunk_type,
 			     long start_line, long end_line,
@@ -512,7 +512,7 @@ typedef struct InitAPDU {
 	long			MaximumRecordSize;
 	char*			IDAuthentication;
 	char*			ImplementationID;
-	char* 			ImplementationName;
+	char*			ImplementationName;
 	char*			ImplementationVersion;
 	any*			ReferenceID;
 	void*			UserInformationField;
@@ -524,10 +524,10 @@ typedef struct InitResponseAPDU {
 	boolean			willSearch,willPresent,willDelete;
 	boolean			supportAccessControl,supportResourceControl;
 	long			PreferredMessageSize;
-	long 			MaximumRecordSize;
+	long			MaximumRecordSize;
 	char*			IDAuthentication;
 	char*			ImplementationID;
-	char* 			ImplementationName;
+	char*			ImplementationName;
 	char*			ImplementationVersion;
 	any*			ReferenceID;
 	void*			UserInformationField;
@@ -535,14 +535,14 @@ typedef struct InitResponseAPDU {
 
 typedef struct SearchAPDU {
 	pdu_type		PDUType;
-	long	 		SmallSetUpperBound;
+	long			SmallSetUpperBound;
 	long			LargeSetLowerBound;
-	long	 		MediumSetPresentNumber;
-	boolean 		ReplaceIndicator;
+	long			MediumSetPresentNumber;
+	boolean			ReplaceIndicator;
 	char*			ResultSetName;
-	char**			DatabaseNames;   
+	char**			DatabaseNames;
 	char*			QueryType;
-	char**			ElementSetNames;  
+	char**			ElementSetNames;
 	any*			ReferenceID;
 	void*			Query;
 	} SearchAPDU;
@@ -552,9 +552,9 @@ typedef struct SearchResponseAPDU {
 	long			SearchStatus;
 	long			ResultCount;
 	long			NumberOfRecordsReturned;
-	long		 	NextResultSetPosition;
+	long			NextResultSetPosition;
 	long			ResultSetStatus;
-	long 			PresentStatus;
+	long			PresentStatus;
 	any*			ReferenceID;
 	void*			DatabaseDiagnosticRecords;
 	} SearchResponseAPDU;
@@ -563,7 +563,7 @@ typedef struct PresentAPDU {
 	pdu_type		PDUType;
 	long			NumberOfRecordsRequested;
 	long			ResultSetStartPosition;
-	char*		 	ResultSetID;
+	char*			ResultSetID;
 	char*			ElementSetNames;
 	any*			ReferenceID;
 	void*			PresentInfo;
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWAIS.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWAIS.c
index 86e8701d1df..e9269af24ac 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWAIS.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWAIS.c
@@ -123,7 +123,7 @@ PRIVATE int fd_mosaic_connect_to_server ARGS3(
     int status;
     int result;
 
-    HTSprintf0(&dummy, "wais://%s:%d/", host_name, port);
+    HTSprintf0(&dummy, "%s//%s:%d/", STR_WAIS_URL, host_name, port);
 
     status = HTDoConnect (dummy, "WAIS", 210, (int *)fd);
     if (status == HT_INTERRUPTED) {
@@ -637,8 +637,6 @@ PUBLIC int HTLoadWAIS ARGS4(
     int return_status = HT_LOADED;
     int rv;
 
-    extern FILE * connect_to_server();
-
     if (!acceptable_inited)
 	init_acceptable();
 
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWAIS.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWAIS.h
index 613acedfabf..7314025fef9 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWAIS.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWAIS.h
@@ -34,8 +34,3 @@ GLOBALREF HTProtocol HTWAIS;
 #endif /* GLOBALDEF_IS_MACRO */
 
 #endif /* HTWAIS_H */
-
-/*
-                                                                  Tim BL
-
-*/
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWSRC.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWSRC.c
index 9d69669b7d5..75e3934bce2 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWSRC.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWSRC.c
@@ -11,7 +11,7 @@
 #include <HTUtils.h>
 
 #include <HTWSRC.h>
-
+#include <LYUtils.h>
 
 #include <HTML.h>
 #include <HTParse.h>
@@ -92,7 +92,7 @@ struct _HTStream {
 	CONST HTStreamClass *	isa;
 	HTStructured *		target;
 	char *			par_value[PAR_COUNT];
-	enum tokenstate 	state;
+	enum tokenstate		state;
 	char			param[BIG+1];
 	int			param_number;
 	int			param_count;
@@ -335,7 +335,8 @@ PRIVATE void WSRC_gen_html ARGS2(HTStream *, me, BOOL, source_file)
 	    char * www_database;
 	    www_database = HTEscape(me->par_value[PAR_DATABASE_NAME],
 		URL_XALPHAS);
-	    HTSprintf0(&WSRC_address, "wais://%s%s%s/%s",
+	    HTSprintf0(&WSRC_address, "%s//%s%s%s/%s",
+		STR_WAIS_URL,
 		me->par_value[PAR_IP_NAME],
 		me->par_value[PAR_TCP_PORT] ? ":" : "",
 		me->par_value[PAR_TCP_PORT] ? me->par_value[PAR_TCP_PORT] :"",
@@ -430,7 +431,7 @@ PRIVATE void WSRCParser_abort ARGS2(HTStream *, me, HTError, e GCC_UNUSED)
 }
 
 
-/*		Stream subclass 	-- method routines
+/*		Stream subclass		-- method routines
 **		---------------
 */
 
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWSRC.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWSRC.h
index 821cf2ff39c..bae6e123dbc 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWSRC.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTWSRC.h
@@ -35,10 +35,4 @@ extern char * HTDeSlash PARAMS((CONST char * str));
 
 extern char * HTEnSlash PARAMS((CONST char * str));
 
-#endif
-
-/*
-
-                                                                                    Tim BL
-
-    */
+#endif /* HTWSRC_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HText.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/HText.h
index b1a11ba4d1f..b3e03fac920 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HText.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HText.h
@@ -149,14 +149,6 @@ extern void HText_appendImage PARAMS((
 
 /*
 
-  DUMP DIAGNOSTICS TO STDERR
-
- */
-
-extern void HText_dump PARAMS((HText * me));
-
-/*
-
   RETURN THE ANCHOR ASSOCIATED WITH THIS NODE
 
  */
@@ -228,8 +220,4 @@ extern void             HText_unlinkSelection PARAMS((HText * me));
 extern HTAnchor *       HText_referenceSelected PARAMS((HText * me));
 extern HTAnchor *       HText_linkSelTo PARAMS((HText * me, HTAnchor* anchor));
 
-
 #endif /* HTEXT_H */
-/*
-
-   end */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/LYLeaks.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/LYLeaks.h
index fe995fb669c..99c0f4d069d 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/LYLeaks.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/LYLeaks.h
@@ -86,6 +86,11 @@ typedef struct AllocationList_tag	{
 	struct AllocationList_tag *ALp_Next;
 
 	/*
+	 *	Count the number of mallocs.
+	 */
+	long st_Sequence;
+
+	/*
 	 *	The memory pointer allocated.
 	 *	If set to NULL, then an invalid request was made.
 	 *	The invalid pointer also.
@@ -152,6 +157,7 @@ typedef struct AllocationList_tag	{
 #undef StrAllocCopy
 #endif /* StrAllocCopy */
 #define StrAllocCopy(dest, src) LYLeakSACopy(&(dest), src, __FILE__, __LINE__)
+
 #ifdef StrAllocCat
 #undef StrAllocCat
 #endif /* StrAllocCat */
@@ -160,19 +166,23 @@ typedef struct AllocationList_tag	{
 #define mark_malloced(a,size) LYLeak_mark_malloced(a,size, __FILE__, __LINE__)
 
 #if defined(LY_FIND_LEAKS_EXTENDED) && !defined(NO_EXTENDED_MEMORY_TRACKING)
+
 #ifdef HTSprintf0
 #undef HTSprintf0
 #endif /* HTSprintf0 */
 #define HTSprintf0 (Get_htsprintf0_fn(__FILE__,__LINE__))
+
 #ifdef HTSprintf
 #undef HTSprintf
 #endif /* HTSprintf */
 #define HTSprintf (Get_htsprintf_fn(__FILE__,__LINE__))
+
 #endif /* LY_FIND_LEAKS_EXTENDED and not NO_EXTENDED_MEMORY_TRACKING */
 
 #else /* LY_FIND_LEAKS && !NO_MEMORY_TRACKING */
 
 #define mark_malloced(a,size)	/* no-op */
+#define LYLeakSequence() (-1)
 
 #endif /* LY_FIND_LEAKS && !NO_MEMORY_TRACKING */
 
@@ -181,10 +191,14 @@ typedef struct AllocationList_tag	{
 #else
 #define PUBLIC_IF_FIND_LEAKS PRIVATE
 #endif
+
 /*
 **	Function declarations
 **	See the appropriate source file for usage.
 */
+#ifndef LYLeakSequence 
+extern long LYLeakSequence NOPARAMS;
+#endif
 extern void LYLeaks NOPARAMS;
 #ifdef LY_FIND_LEAKS_EXTENDED
 extern AllocationList *LYLeak_mark_malloced PARAMS((
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/LYexit.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/LYexit.h
index 347ee0d364b..005e13d9e6c 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/LYexit.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/LYexit.h
@@ -27,14 +27,14 @@
 /*
  *	Constant defines
  */
-#ifdef _WINDOWS
+#ifdef exit
 #undef exit
 #endif /* _WINDOWS */
 
-#define exit LYexit
+#define exit(code) LYexit(code)
 
 #define atexit LYatexit
-#define ATEXITSIZE 40
+#define ATEXITSIZE 50
 
 /*
  *	Data structures
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/SGML.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/SGML.c
index 6497f8ea1d2..5204b0dba8b 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/SGML.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/SGML.c
@@ -29,6 +29,7 @@
 
 #include <LYCharSets.h>
 #include <LYCharVals.h>	 /* S/390 -- gil -- 0635 */
+#include <LYGlobalDefs.h>
 #include <LYStrings.h>
 #include <LYLeaks.h>
 
@@ -43,11 +44,6 @@
 
 #ifdef USE_PRETTYSRC
 
-#  define PSRC(x) if (psrc_view) { x };
-#  define NPSRC(x) if (!psrc_view) { x };
-#  define IFDEFPSRC(x) x
-#  define IFNDEFPSRC(x)
-
 char* entity_string; /* this is used for printing entity name.
     Unconditionally added since redundant assigments don't hurt much*/
 
@@ -62,29 +58,50 @@ PRIVATE void fake_put_character ARGS2(
 
 #define PUTS_TR(x) psrc_convert_string = TRUE; PUTS(x)
 
-#else
-#  define PSRC(x)
-#  define NPSRC(x)
-#  define IFDEFPSRC(x)
-#  define IFNDEFPSRC(x) x
 #endif
 
- /* will use an inlined version */
-#ifdef USE_INLINE_PUTC
+/* my_casecomp() - optimized by the first character, NOT_ASCII ok */
+#define my_casecomp(a,b)  ((TOUPPER(*a) == TOUPPER(*b)) ? \
+			AS_casecomp(a,b) : \
+			(TOASCII(TOUPPER(*a)) - TOASCII(TOUPPER(*b))))
+
+#if ANSI_PREPRO
+ /* will use partially inlined version */
+#define orig_HTChunkPutUtf8Char HTChunkPutUtf8Char
+#undef HTChunkPutUtf8Char
+
+/* ...used for comments and attributes value like href... */
+#define HTChunkPutUtf8Char(ch,x) \
+    { \
+    if ((TOASCII(x) < 128)  && (ch->size < ch->allocated)) \
+	ch->data[ch->size++] = (char)x; \
+    else \
+	orig_HTChunkPutUtf8Char(ch,x); \
+    }
+
+#if 0
+#define orig_HTChunkPutc HTChunkPutc
 #undef HTChunkPutc
-#define HTChunkPutc(ch,c)\
-    if (ch->size >= ch->allocated) {\
-	ch->allocated = ch->allocated + ch->growby;\
-	ch->data = ch->data ? (char *)realloc(ch->data, ch->allocated)\
-			    : typecallocn(char, ch->allocated);\
-      if (!ch->data)\
-	  outofmem(__FILE__, "HTChunkPutc");\
-    }\
-    ch->data[ch->size++] = c;
-#endif
 
-#define PUTS(str) ((*context->actions->put_string)(context->target, str))
+#define HTChunkPutc(ch,x) \
+    { \
+    if (ch->size < ch->allocated) \
+	ch->data[ch->size++] = x; \
+    else \
+	orig_HTChunkPutc(ch,x); \
+    }
 
+#undef HTChunkTerminate
+
+#define HTChunkTerminate(ch) \
+    HTChunkPutc(ch, (char)0)
+#endif /* */
+#endif	/* ANSI_PREPRO */
+
+#define PUTS(str) ((*context->actions->put_string)(context->target, str))
+#define PUTC(ch)  ((*context->actions->put_character)(context->target, ch))
+#define PUTUTF8(code) (UCPutUtf8_charstring((HTStream *)context->target, \
+		      (putc_func_t*)(context->actions->put_character), code))
 
 #define OPT 1
 
@@ -98,8 +115,6 @@ PUBLIC BOOL HTPassEightBitNum = FALSE;	/* Pass ^ numeric entities raw. */
 PUBLIC BOOL HTPassHighCtrlRaw = FALSE;	/* Pass 127-160,173,&#127; raw. */
 PUBLIC BOOL HTPassHighCtrlNum = FALSE;	/* Pass &#128;-&#159; raw.	*/
 
-/*  extern int LYlowest_eightbit[];  for completeness here  */
-
 /*	The State (context) of the parser
 **
 **	This is passed with each call to make the parser reentrant
@@ -184,6 +199,8 @@ struct _HTStream {
     BOOL			no_lynx_specialcodes;
     int				current_attribute_number;
     HTChunk			*string;
+    int				leading_spaces;
+    int				trailing_spaces;
     HTElement			*element_stack;
     sgml_state			state;
     unsigned char kanji_buf;
@@ -191,7 +208,7 @@ struct _HTStream {
     void *			callerData;
 #endif /* CALLERDATA */
     BOOL present[MAX_ATTRIBUTES];	/* Flags: attribute is present? */
-    char * value[MAX_ATTRIBUTES];	/* malloc'd strings or NULL if none */
+    char * value[MAX_ATTRIBUTES];	/* NULL, or strings alloc'd with StrAllocCopy_extra() */
 
     BOOL			lead_exclamation;
     BOOL			first_dash;
@@ -281,6 +298,27 @@ PRIVATE char *state_name ARGS1(sgml_state, n)
 }
 #endif
 
+/* storage for Element Stack */
+#define DEPTH 10
+static HTElement pool[DEPTH];
+static int depth = 0;
+
+PRIVATE HTElement* pool_alloc NOARGS
+{
+    depth++;
+    if (depth > DEPTH)
+	return (HTElement*) malloc(sizeof(HTElement));
+    return (pool + depth - 1);
+}
+
+PRIVATE void pool_free ARGS1(HTElement*, e)
+{
+    if (depth > DEPTH)
+	FREE(e);
+    depth--;
+    return;
+}
+
 #ifdef USE_PRETTYSRC
 
 PRIVATE void HTMLSRC_apply_markup ARGS3(
@@ -319,10 +357,10 @@ PRIVATE void HTMLSRC_apply_markup ARGS3(
 
 #if ANSI_PREPRO
 #  define PSRCSTART(x)	HTMLSRC_apply_markup(context,HTL_##x,START)
-#  define PSRCSTOP(x)  HTMLSRC_apply_markup(context,HTL_##x,STOP)
+#  define PSRCSTOP(x)   HTMLSRC_apply_markup(context,HTL_##x,STOP)
 #else
 #  define PSRCSTART(x)	HTMLSRC_apply_markup(context,HTL_/**/x,START)
-#  define PSRCSTOP(x)  HTMLSRC_apply_markup(context,HTL_/**/x,STOP)
+#  define PSRCSTOP(x)   HTMLSRC_apply_markup(context,HTL_/**/x,STOP)
 #endif
 
 #define attr_is_href context->cur_attr_is_href
@@ -431,17 +469,9 @@ PRIVATE void change_chartrans_handling ARGS1(
     }
 }
 
-#define PUTC(ch) ((*context->actions->put_character)(context->target, ch))
-#define PUTUTF8(code) (UCPutUtf8_charstring((HTStream *)context->target, \
-		      (putc_func_t*)(context->actions->put_character), code))
-
-extern BOOL historical_comments;
-extern BOOL minimal_comments;
-extern BOOL soft_dquotes;
-
 #ifdef USE_COLOR_STYLE
 #include <AttrList.h>
-static int current_is_class=0;
+static int current_is_class = 0;
 #endif
 
 /*	Handle Attribute
@@ -453,7 +483,6 @@ PRIVATE void handle_attribute_name ARGS2(
 	HTStream *,	context,
 	CONST char *,	s)
 {
-
     HTTag * tag = context->current_tag;
     attr * attributes = tag->attributes;
     int high, low, i, diff;
@@ -482,29 +511,27 @@ PRIVATE void handle_attribute_name ARGS2(
 	 high > low;
 	 diff < 0 ? (low = i+1) : (high = i)) {
 	i = (low + (high-low)/2);
-	diff = strcasecomp(attributes[i].name, s);
+	diff = my_casecomp(attributes[i].name, s);
 	if (diff == 0) {		/* success: found it */
 	    context->current_attribute_number = i;
 #ifdef USE_PRETTYSRC
-	    if (!psrc_view) {
+	    if (psrc_view) {
+		attr_is_name = (BOOL) (attributes[i].type == HTMLA_ANAME);
+		attr_is_href = (BOOL) (attributes[i].type == HTMLA_HREF);
+	    } else
 #endif
+	    {
 	    context->present[i] = YES;
-	    FREE(context->value[i]);
+	    Clear_extra(context->value[i]);
 #ifdef USE_COLOR_STYLE
-#  ifdef USE_PRETTYSRC
+#   ifdef USE_PRETTYSRC
 	    current_is_class = IS_C(attributes[i]);
 #   else
 	    current_is_class = (!strcasecomp("class", s));
 #   endif
 	    CTRACE((tfp, "SGML: found attribute %s, %d\n", s, current_is_class));
 #endif
-
-#ifdef USE_PRETTYSRC
-	    } else {
-		 attr_is_name = (BOOL) (attributes[i].type == HTMLA_ANAME);
-		 attr_is_href = (BOOL) (attributes[i].type == HTMLA_HREF);
 	    }
-#endif
 	    return;
 	} /* if */
 
@@ -524,7 +551,7 @@ PRIVATE void handle_attribute_value ARGS2(
 	CONST char *,	s)
 {
     if (context->current_attribute_number != INVALID) {
-	StrAllocCopy(context->value[context->current_attribute_number], s);
+	StrAllocCopy_extra(context->value[context->current_attribute_number], s);
 #ifdef USE_COLOR_STYLE
 	if (current_is_class)
 	{
@@ -623,6 +650,27 @@ PRIVATE BOOL put_special_unicodes ARGS2(
     return YES;
 }
 
+#ifdef USE_PRETTYSRC
+PRIVATE void put_pretty_entity ARGS2(HTStream *, context, int, term)
+{
+    PSRCSTART(entity);
+    PUTC('&');
+    PUTS(entity_string);
+    if (term)
+	PUTC((char)term);
+    PSRCSTOP(entity);
+}
+
+PRIVATE void put_pretty_number ARGS1(HTStream *, context)
+{
+    PSRCSTART(entity);
+    PUTS( (context->isHex ? "&#x" : "&#") );
+    PUTS(entity_string);
+    PUTC(';');
+    PSRCSTOP(entity);
+}
+#endif /* USE_PRETTYSRC */
+
 /*	Handle entity
 **	-------------
 **
@@ -646,10 +694,8 @@ PRIVATE void handle_entity ARGS2(
 {
     UCode_t code;
     long uck = -1;
-    CONST char *p;
     CONST char *s = context->string->data;
 
-
     /*
     **	Handle all entities normally. - FM
     */
@@ -662,12 +708,7 @@ PRIVATE void handle_entity ARGS2(
 	if (put_special_unicodes(context, code)) {
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		HTMLSRC_apply_markup(context,HTL_entity,START);
-		PUTC('&');
-		PUTS(entity_string);
-		if (term)
-		    PUTC(term);
-		HTMLSRC_apply_markup(context,HTL_entity,STOP);
+		put_pretty_entity(context, term);
 	    }
 #endif
 	    FoundEntity = TRUE;
@@ -683,9 +724,7 @@ PRIVATE void handle_entity ARGS2(
 	     uck >= LYlowest_eightbit[context->outUCLYhndl])) {
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		HTMLSRC_apply_markup(context,HTL_entity,START);
-		PUTC('&'); PUTS(entity_string); if (term) PUTC(term);
-		HTMLSRC_apply_markup(context,HTL_entity,STOP);
+		put_pretty_entity(context, term);
 	    } else
 #endif
 	    PUTC(FROMASCII((char)uck));
@@ -701,16 +740,10 @@ PRIVATE void handle_entity ARGS2(
 					    context->outUCLYhndl, 0) >= 0)) {
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		HTMLSRC_apply_markup(context,HTL_entity,START);
-		PUTC('&');
-		PUTS(entity_string);
-		if (term)
-		    PUTC(term);
-		HTMLSRC_apply_markup(context,HTL_entity,STOP);
+		put_pretty_entity(context, term);
 	    } else
 #endif
-	    for (p = replace_buf; *p; p++)
-		PUTC(*p);
+	    PUTS(replace_buf);
 	    FoundEntity = TRUE;
 	    return;
 	}
@@ -728,9 +761,7 @@ PRIVATE void handle_entity ARGS2(
 	      (putc_func_t*)(fake_put_character), code)): PUTUTF8(code) ) ) {
 
 	    if (psrc_view) {
-		HTMLSRC_apply_markup(context,HTL_entity,START);
-		PUTC('&'); PUTS(entity_string); if (term) PUTC(term);
-		HTMLSRC_apply_markup(context,HTL_entity,STOP);
+		put_pretty_entity(context, term);
 	    }
 
 	    FoundEntity = TRUE;
@@ -743,12 +774,7 @@ PRIVATE void handle_entity ARGS2(
 	if (code >= 32 && code < 127) {
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		HTMLSRC_apply_markup(context,HTL_entity,START);
-		PUTC('&');
-		PUTS(entity_string);
-		if (term)
-		    PUTC(term);
-		HTMLSRC_apply_markup(context,HTL_entity,STOP);
+		put_pretty_entity(context, term);
 	    } else
 #endif
 
@@ -767,12 +793,7 @@ PRIVATE void handle_entity ARGS2(
 	    CTRACE((tfp, "handle_entity: Ignoring '%s'.\n", s));
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		HTMLSRC_apply_markup(context,HTL_entity,START);
-		PUTC('&');
-		PUTS(entity_string);
-		if (term)
-		    PUTC(term);
-		HTMLSRC_apply_markup(context,HTL_entity,STOP);
+		put_pretty_entity(context, term);
 	    }
 #endif
 	    FoundEntity = TRUE;
@@ -786,12 +807,7 @@ PRIVATE void handle_entity ARGS2(
 	    CTRACE((tfp, "handle_entity: Ignoring '%s'.\n", s));
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		HTMLSRC_apply_markup(context,HTL_entity,START);
-		PUTC('&');
-		PUTS(entity_string);
-		if (term)
-		    PUTC(term);
-		HTMLSRC_apply_markup(context,HTL_entity,STOP);
+		put_pretty_entity(context, term);
 	    }
 #endif
 	    FoundEntity = TRUE;
@@ -808,9 +824,7 @@ PRIVATE void handle_entity ARGS2(
 #endif
     CTRACE((tfp, "SGML: Unknown entity '%s' %ld %ld\n", s, (long)code, uck)); /* S/390 -- gil -- 0695 */
     PUTC('&');
-    for (p = s; *p; p++) {
-	PUTC(*p);
-    }
+    PUTS(s);
     if (term != '\0')
 	PUTC(term);
 #ifdef USE_PRETTYSRC
@@ -992,8 +1006,6 @@ PRIVATE BOOL element_valid_within ARGS3(
 		(stacked_tag->tagclass & usecontained));
 }
 
-extern BOOL Old_DTD;
-
 typedef enum {
     close_NO	= 0,
     close_error = 1,
@@ -1034,7 +1046,7 @@ PRIVATE void do_close_stacked ARGS1(
 	e,
 	(char **)&context->include);
     context->element_stack = stacked->next;
-    FREE(stacked);
+    pool_free(stacked);
     context->no_lynx_specialcodes = context->element_stack ?
 	(context->element_stack->tag->flags & Tgf_nolyspcl) : NO;
 }
@@ -1179,7 +1191,7 @@ PRIVATE void end_element ARGS2(
 	    context->element_stack->tag = ALT_TAGP_OF_TAGNUM(e);
 	} else {
 	    context->element_stack = N->next;		/* Remove from stack */
-	    FREE(N);
+	    pool_free(N);
 	}
 	context->no_lynx_specialcodes = context->element_stack ?
 	    (context->element_stack->tag->flags & Tgf_nolyspcl) : NO;
@@ -1289,8 +1301,10 @@ PRIVATE void start_element ARGS1(
     if (!context->inSELECT) {
 	/*
 	**  We are not in a SELECT block, so check if this starts one. - FM
+	**  (frequent case!)
 	*/
-	if (!strcasecomp(new_tag->name, "SELECT")) {
+	/* my_casecomp() - optimized by the first character */
+	if (!my_casecomp(new_tag->name, "SELECT")) {
 	    /*
 	    **	Set the inSELECT flag and fall through. - FM
 	    */
@@ -1346,7 +1360,7 @@ PRIVATE void start_element ARGS1(
     if (status == HT_PARSER_OTHER_CONTENT)
 	new_tag = ALT_TAGP(new_tag);	/* this is only returned for OBJECT */
     if (new_tag->contents != SGML_EMPTY) {		/* i.e., tag not empty */
-	HTElement * N = (HTElement *)malloc(sizeof(HTElement));
+	HTElement * N = pool_alloc();
 	if (N == NULL)
 	    outofmem(__FILE__, "start_element");
 	N->next = context->element_stack;
@@ -1377,20 +1391,27 @@ PRIVATE void start_element ARGS1(
 */
 PUBLIC HTTag * SGMLFindTag ARGS2(
 	CONST SGML_dtd*,	dtd,
-	CONST char *,		string)
+	CONST char *,		s)
 {
     int high, low, i, diff;
+    static HTTag* last[64] = {NULL};  /*optimize using the previous results*/
+    HTTag** res = last + (UCH(*s) % 64);     /*pointer arithmetic*/
+
+    if (*res && !strcasecomp((*res)->name, s))
+	return *res;
 
     for (low = 0, high=dtd->number_of_tags;
-	 high > low;
-	 diff < 0 ? (low = i+1) : (high = i)) {	 /* Binary search */
+	  high > low;
+	  diff < 0 ? (low = i+1) : (high = i)) {	/* Binary search */
 	i = (low + (high-low)/2);
-	diff = AS_casecomp(dtd->tags[i].name, string);	/* Case insensitive */
+	/* my_casecomp() - optimized by the first character, NOT_ASCII ok */
+	diff = my_casecomp(dtd->tags[i].name, s);	/* Case insensitive */
 	if (diff == 0) {		/* success: found it */
-	    return &dtd->tags[i];
+	    *res = &dtd->tags[i];
+	    return *res;
 	}
     }
-    if (IsNmStart(string[0])) {
+    if (IsNmStart(*s)) {
 	/*
 	**  Unrecognized, but may be valid. - KW
 	*/
@@ -1430,7 +1451,7 @@ PRIVATE void SGML_free ARGS1(
 	cur = context->element_stack;
 	t = cur->tag;
 	context->element_stack = cur->next;	/* Remove from stack */
-	FREE(cur);
+	pool_free(cur);
 #ifdef USE_PRETTYSRC
 	if (!psrc_view) /* Don't actually call on target if viewing psrc - kw */
 #endif
@@ -1450,11 +1471,11 @@ PRIVATE void SGML_free ARGS1(
     */
     HTChunkFree(context->string);
     for (i = 0; i < MAX_ATTRIBUTES; i++)
-	FREE(context->value[i]);
+	FREE_extra(context->value[i]);
     FREE(context);
 
 #ifdef USE_PRETTYSRC
-    sgml_in_psrc_was_initialized =FALSE;
+    sgml_in_psrc_was_initialized = FALSE;
 #endif
 }
 
@@ -1485,7 +1506,7 @@ PRIVATE void SGML_abort ARGS2(
     while (context->element_stack) {
 	cur = context->element_stack;
 	context->element_stack = cur->next;	/* Remove from stack */
-	FREE(cur);
+	pool_free(cur);
     }
 
     /*
@@ -1493,13 +1514,12 @@ PRIVATE void SGML_abort ARGS2(
     */
     HTChunkFree(context->string);
     for (i = 0; i < MAX_ATTRIBUTES; i++)
-	FREE(context->value[i]);
+	FREE_extra(context->value[i]);
     FREE(context);
 
 #ifdef USE_PRETTYSRC
-    sgml_in_psrc_was_initialized =FALSE;
+    sgml_in_psrc_was_initialized = FALSE;
 #endif
-
 }
 
 
@@ -1533,10 +1553,10 @@ PRIVATE void SGML_character ARGS2(
     CONST SGML_dtd *dtd =	context->dtd;
     HTChunk	*string =	context->string;
     CONST char * EntityName;
-    char * p;
     HTTag * testtag = NULL;
     BOOLEAN chk;	/* Helps (?) walk through all the else ifs... */
     UCode_t clong, uck = 0; /* Enough bits for UCS4 ... */
+    int testlast;
 #ifdef CJK_EX
     unsigned char c;
 #else
@@ -1697,8 +1717,7 @@ PRIVATE void SGML_character ARGS2(
 	    c = replace_buf[0];
 	    if (c && replace_buf[1]) {
 		if (context->state == S_text) {
-		    for (p = replace_buf; *p; p++)
-			PUTC(*p);
+		    PUTS(replace_buf);
 		    return;
 		}
 		StrAllocCat(context->recover, replace_buf + 1);
@@ -1803,10 +1822,11 @@ top1:
     /*
     **	Handle character based on context->state.
     */
-    CTRACE2(TRACE_SGML, (tfp, "SGML before %s|%.*s|%c\n",
+    CTRACE2(TRACE_SGML, (tfp, "SGML before %s|%.*s|%c|\n",
 	    state_name(context->state),
 	    string->size,
-	    string->data != NULL ? string->data : "", UCH(c)));
+	    NonNull(string->data),
+	    UCH(c)));
     switch(context->state) {
 
     case S_in_kanji:
@@ -1896,7 +1916,7 @@ top1:
 	    if (testtag && testtag->contents == SGML_PCDATA) {
 		context->state = S_pcdata;
 	    } else if (testtag && (testtag->contents == SGML_LITTERAL
-	    			|| testtag->contents == SGML_CDATA)) {
+				|| testtag->contents == SGML_CDATA)) {
 		context->state = S_litteral;
 	    } else if (testtag && (testtag->contents == SGML_SCRIPT)) {
 		context->state = S_script;
@@ -2025,8 +2045,7 @@ top1:
 	    **	No further tests for validity - assume that whoever
 	    **	defined replacement strings knew what she was doing. - KW
 	    */
-	    for (p = replace_buf; *p; p++)
-		PUTC(*p);
+	    PUTS(replace_buf);
 	/*
 	**  If we're displaying UTF-8, try that now. - FM
 	*/
@@ -2049,15 +2068,13 @@ top1:
 	} else if (unsign_c > 160 && unsign_c < 256 &&
 		   !(PASSHI8BIT || HTCJK != NOCJK) &&
 		   !IncludesLatin1Enc) {
-	    int i;
 #ifdef USE_PRETTYSRC
 	    int psrc_view_backup = 0;
 #endif
 
 	    string->size = 0;
 	    EntityName = HTMLGetEntityName((int)(unsign_c - 160));
-	    for (i = 0; EntityName[i]; i++)
-		HTChunkPutc(string, EntityName[i]);
+	    HTChunkPuts(string, EntityName);
 	    HTChunkTerminate(string);
 #ifdef USE_PRETTYSRC
 	    /* we need to disable it temporary*/
@@ -2089,8 +2106,7 @@ top1:
 	**  already, but what the heck, try again. - FM
 	*/
 	} else if (context->T.output_utf8 && *context->utf_buf) {
-	    for (p = context->utf_buf; *p; p++)
-		PUTC(*p);
+	    PUTS(context->utf_buf);
 	    context->utf_buf_p = context->utf_buf;
 	    *(context->utf_buf_p) = '\0';
 #ifdef NOTDEFINED
@@ -2114,47 +2130,6 @@ top1:
 	} else if (TOASCII(UCH(c)) <	 /* S/390 -- gil -- 0997 */
 			LYlowest_eightbit[context->outUCLYhndl] ||
 		   (context->T.trans_from_uni && !HTPassEightBitRaw)) {
-#ifdef NOTUSED_FOTEMODS
-	    /*
-	    **	If we do not have the "7-bit approximations" as our
-	    **	output character set (in which case we did it already)
-	    **	seek a translation for that.  Otherwise, or if the
-	    **	translation fails, use UHHH notation. - FM
-	    */
-	    if ((chk = (context->outUCLYhndl !=
-			UCGetLYhndl_byMIME("us-ascii"))) &&
-		(uck = UCTransUniChar(unsign_c,
-				      UCGetLYhndl_byMIME("us-ascii")))
-				      >= ' ' && TOASCII(uck) < 127) {  /* S/390 -- gil -- 1008 */
-		/*
-		**  Got an ASCII character (yippey). - FM
-		*/
-		PUTC(((char)FROMASCII(TOASCII(uck) & 0xff)));
-	    } else if ((chk && uck == -4) &&
-		       (uck = UCTransUniCharStr(replace_buf,
-						60, clong,
-						UCGetLYhndl_byMIME("us-ascii"),
-						0) >= 0)) {
-		/*
-		**  Got a replacement string (yippey). - FM
-		*/
-		for (p = replace_buf; *p; p++)
-		    PUTC(*p);
-	    } else {
-#endif /* NOTUSED_FOTEMODS */
-		/*
-		**  Out of luck, so use the UHHH notation (ugh). - FM
-		*/
-			/* S/390 -- gil -- 1018 */
-			/* do not print UHHH for now
-		sprintf(replace_buf, "U%.2lX", TOASCII(unsign_c));
-		for (p = replace_buf; *p; p++) {
-		    PUTC(*p);
-		}
-			 */
-#ifdef NOTUSED_FOTEMODS
-	    }
-#endif /* NOTUSED_FOTEMODS */
 	/*
 	**  If we get to here, pass the character. - FM
 	*/
@@ -2187,7 +2162,9 @@ top1:
 			"SGML: Found PI in PCDATA, junking it until '>'\n"));
 #ifdef USE_PRETTYSRC
 		if (psrc_view) {
-		    PSRCSTART(abracket);PUTS("<?");PSRCSTOP(abracket);
+		    PSRCSTART(abracket);
+		    PUTS("<?");
+		    PSRCSTOP(abracket);
 		    context->seen_nonwhite_in_junk_tag = TRUE; /* show all */
 		}
 #endif
@@ -2235,19 +2212,35 @@ top1:
 	    testtag = context->element_stack ?
 		context->element_stack->tag : NULL;
 
-	if (TOUPPER(c) != ((string->size == 1) ?
-					   '/' :
-			   testtag->name[string->size-2])) {
+	if (testtag == NULL) {
+	    string->size--;
+	    context->state = S_text;
+	    goto top1;
+	}
+
+	/*
+	 * Normally when we get the closing ">",
+	 *	testtag contains something like "TITLE"
+	 *	string contains something like "/title>"
+	 * so we decrement by 2 to compare the final character of each.
+	 */
+	testlast = string->size - 2 - context->trailing_spaces - context->leading_spaces;
+
+	if (TOUPPER(c) != ((testlast < 0)
+			    ? '/'
+			    : testtag->name[testlast])) {
 	    int i;
 
 	    /*
 	    **	If complete match, end litteral.
 	    */
-	    if ((c == '>') && testtag &&
-		string->size > 1 && !testtag->name[string->size-2]) {
+	    if ((c == '>') &&
+		testlast >= 0 && !testtag->name[testlast]) {
 #ifdef USE_PRETTYSRC
 		if (psrc_view) {
-		    PSRCSTART(abracket);PUTC('<');PUTC('/');PSRCSTOP(abracket);
+		    PSRCSTART(abracket);
+		    PUTS("</");
+		    PSRCSTOP(abracket);
 		    PSRCSTART(tag);
 		    strcpy(string->data,context->current_tag->name);
 		    if (tagname_transform != 1) {
@@ -2258,28 +2251,50 @@ top1:
 		    }
 		    PUTS(string->data);
 		    PSRCSTOP(tag);
-		    PSRCSTART(abracket);PUTC('>');PSRCSTOP(abracket);
+		    PSRCSTART(abracket);
+		    PUTC('>');
+		    PSRCSTOP(abracket);
 
 		    context->current_tag = NULL;
-		    string->size = 0;
-		    context->current_attribute_number = INVALID;
-		    context->state = S_text;
-		    break;
-		}
+		} else
 #endif
-		end_element(context, context->element_stack->tag);
+		    end_element(context, context->element_stack->tag);
+
 		string->size = 0;
 		context->current_attribute_number = INVALID;
 		context->state = S_text;
+		context->leading_spaces = 0;
+		context->trailing_spaces = 0;
 		break;
 	    }
 
+	    /*
+	     * Allow whitespace between the "<" or ">" and the keyword, for
+	     * error-recovery.
+	     */
+	    if (isspace(UCH(c))) {
+		if (testlast == -1) {
+		    context->leading_spaces += 1;
+		    CTRACE2(TRACE_SGML, (tfp, "leading spaces: %d\n", context->leading_spaces));
+		    break;
+		} else if (testlast > 0) {
+		    context->trailing_spaces += 1;
+		    CTRACE2(TRACE_SGML, (tfp, "trailing spaces: %d\n", context->trailing_spaces));
+		    break;
+		}
+	    }
+
+	    /*
+	     * Mismatch - recover.
+	     */
+	    context->leading_spaces = 0;
+	    context->trailing_spaces = 0;
 	    if (((testtag->contents != SGML_LITTERAL &&
 		  (testtag->flags & Tgf_strict)) ||
 		 (context->state == S_pcdata &&
 		  (testtag->flags & (Tgf_strict|Tgf_endO)))) &&
-		(string->size > 1 &&
-		 (c == '>' || string->size > 2 || IsNmStart(c)))) {
+		(testlast > -1 &&
+		 (c == '>' || testlast > 0 || IsNmStart(c)))) {
 		context->state = S_end;
 		string->size--;
 		for (i = 0; i < string->size; i++)  /* remove '/' */
@@ -2291,7 +2306,7 @@ top1:
 	    }
 	    if (context->state == S_pcdata &&
 		(testtag->flags & (Tgf_strict|Tgf_endO)) &&
-		(string->size == 1 && IsNmStart(c))) {
+		(testlast < 0 && IsNmStart(c))) {
 		context->state = S_tag;
 		break;
 	    }
@@ -2397,9 +2412,9 @@ top1:
 	    */
 #ifdef USE_PRETTYSRC
 	    if (psrc_view && FoundEntity && c == ';') {
-		HTMLSRC_apply_markup(context,HTL_entity, START);
+		PSRCSTART(entity);
 		PUTC(c);
-		HTMLSRC_apply_markup(context,HTL_entity, STOP);
+		PSRCSTOP(entity);
 	    }
 #endif
 	    if (!FoundEntity || c != ';')
@@ -2463,9 +2478,7 @@ top1:
 	    if (psrc_view)
 		PSRCSTART(badseq);
 #endif
-	    PUTC('&');
-	    PUTC('#');
-	    PUTC('x');
+	    PUTS("&#x");
 #ifdef USE_PRETTYSRC
 	    if (psrc_view)
 		PSRCSTOP(badseq);
@@ -2694,11 +2707,7 @@ top1:
 		    PUTC(FROMASCII((char)uck));
 #ifdef USE_PRETTYSRC
 		    } else {
-			PSRCSTART(entity);
-			PUTS( (context->isHex ? "&#x" : "&#") );
-			PUTS(entity_string);
-			PUTC(';');
-			PSRCSTOP(entity);
+			put_pretty_number(context);
 		    }
 #endif
 		} else if ((uck == -4 ||
@@ -2712,68 +2721,15 @@ top1:
 						    0) >= 0)) {
 #ifdef USE_PRETTYSRC
 		    if (psrc_view) {
-			PSRCSTART(entity);
-			PUTS( (context->isHex ? "&#x" : "&#") );
-			PUTS(entity_string);
-			PUTC(';');
-			PSRCSTOP(entity);
+			put_pretty_number(context);
 		    } else
 #endif
-		    for (p = replace_buf; *p; p++) {
-			PUTC(*p);
-		    }
+		    PUTS(replace_buf);
 		/*
 		**  If we're displaying UTF-8, try that now. - FM
 		*/
 		} else if (context->T.output_utf8 && PUTUTF8(code)) {
 		    ;  /* do nothing more */
-#ifdef NOTUSED_FOTEMODS
-		/*
-		**  If the value is greater than 255 and we do not
-		**  have the "7-bit approximations" as our output
-		**  character set (in which case we did it already)
-		**  seek a translation for that. - FM
-		*/
-		} else if ((chk = ((code > 255) &&
-				   context->outUCLYhndl !=
-				   UCGetLYhndl_byMIME("us-ascii"))) &&
-			   (uck = UCTransUniChar(code,
-				   UCGetLYhndl_byMIME("us-ascii")))
-				  >= ' ' && uck < 127) {
-		    /*
-		    **	Got an ASCII character (yippey). - FM
-		    */
-#ifdef USE_PRETTYSRC
-		    if (psrc_view) {
-			PSRCSTART(entity);
-			PUTS( (context->isHex ? "&#x" : "&#") );
-			PUTS(entity_string);
-			PUTC(';');
-			PSRCSTOP(entity);
-		    } else
-#endif
-		    PUTC(((char)FROMASCII(uck & 0xff)));
-/* =============== work in ASCII above here ===============  S/390 -- gil -- 1118 */
-		} else if ((chk && uck == -4) &&
-			   (uck = UCTransUniCharStr(replace_buf,
-						    60, code,
-						UCGetLYhndl_byMIME("us-ascii"),
-						    0) >= 0)) {
-		    /*
-		    **	Got a replacement string (yippey). - FM
-		    */
-#ifdef USE_PRETTYSRC
-		    if (psrc_view) {
-			PSRCSTART(entity);
-			PUTS( (context->isHex ? "&#x" : "&#") );
-			PUTS(entity_string);
-			PUTC(';');
-			PSRCSTOP(entity);
-		    } else
-#endif
-		    for (p = replace_buf; *p; p++)
-			PUTC(*p);
-#endif /* NOTUSED_FOTEMODS */
 		/*
 		**  Ignore 8205 (zwj),
 		**  8206 (lrm), and 8207 (rln), if we get to here. - FM
@@ -2838,11 +2794,11 @@ top1:
 			    PSRCSTART(badseq);
 			}
 #endif
-			PUTC('&');
-			PUTC('#');
 			if (context->isHex) {
-			    PUTC('x');
+			    PUTS("&#x");
 			    context->isHex = FALSE;
+			} else {
+			    PUTS("&#");
 			}
 			string->size--;
 			for (i = 0; i < string->size; i++)	/* recover */
@@ -2864,11 +2820,7 @@ top1:
 		    */
 #ifdef USE_PRETTYSRC
 		    if (psrc_view) {
-			PSRCSTART(entity);
-			PUTS( (context->isHex ? "&#x" : "&#") );
-			PUTS(entity_string);
-			PUTC(';');
-			PSRCSTOP(entity);
+			put_pretty_number(context);
 		    } else
 #endif
 		    PUTC(FROMASCII((char)code));
@@ -2880,8 +2832,7 @@ top1:
 		    EntityName = HTMLGetEntityName(code);
 		    if (EntityName && EntityName[0] != '\0') {
 			string->size = 0;
-			for (i = 0; EntityName[i]; i++)
-			    HTChunkPutc(string, EntityName[i]);
+			HTChunkPuts(string, EntityName);
 			HTChunkTerminate(string);
 			handle_entity(context, '\0');
 			/*
@@ -2900,11 +2851,11 @@ top1:
 			if (psrc_view)
 			    PSRCSTART(badseq);
 #endif
-			PUTC('&');
-			PUTC('#');
 			if (context->isHex) {
-			    PUTC('x');
+			    PUTS("&#x");
 			    context->isHex = FALSE;
+			} else {
+			    PUTS("&#");
 			}
 			string->size--;
 			for (i = 0; i < string->size; i++)	/* recover */
@@ -2946,16 +2897,16 @@ top1:
 		if (psrc_view)
 		    PSRCSTART(badseq);
 #endif
-		PUTC('&');
-		PUTC('#');
+		if (context->isHex) {
+		    PUTS("&#x");
+		    context->isHex = FALSE;
+		} else {
+		    PUTS("&#");
+		}
 #ifdef USE_PRETTYSRC
 		if (psrc_view)
 		    PSRCSTOP(badseq);
 #endif
-		if (context->isHex) {
-		    PUTC('x');
-		    context->isHex = FALSE;
-		}
 		if (context->recover == NULL) {
 		    StrAllocCopy(context->recover, string->data);
 		    context->recover_index = 0;
@@ -3067,7 +3018,9 @@ top1:
 		    CTRACE((tfp, "SGML: Found PI, junking it until '>'\n"));
 #ifdef USE_PRETTYSRC
 		    if (psrc_view) {
-			PSRCSTART(abracket);PUTS("<?");PSRCSTOP(abracket);
+			PSRCSTART(abracket);
+			PUTS("<?");
+			PSRCSTOP(abracket);
 			context->seen_nonwhite_in_junk_tag = TRUE; /*show all*/
 		    }
 #endif
@@ -3079,7 +3032,9 @@ top1:
 
 #ifdef USE_PRETTYSRC
 		if (psrc_view) {
-		    PSRCSTART(abracket);PUTC('<');PSRCSTOP(abracket);
+		    PSRCSTART(abracket);
+		    PUTC('<');
+		    PSRCSTOP(abracket);
 		    PSRCSTART(badtag);
 		    if (tagname_transform != 1) {
 			if (tagname_transform == 0)
@@ -3090,7 +3045,9 @@ top1:
 		    PUTS(string->data);
 		    if (c == '>' ) {
 			PSRCSTOP(badtag);
-			PSRCSTART(abracket);PUTC('>');PSRCSTOP(abracket);
+			PSRCSTART(abracket);
+			PUTC('>');
+			PSRCSTOP(abracket);
 		    } else {
 			PUTC(c);
 		    }
@@ -3111,7 +3068,9 @@ top1:
 
 #ifdef USE_PRETTYSRC
 	    if (psrc_view) {
-		PSRCSTART(abracket);PUTC('<');PSRCSTOP(abracket);
+		PSRCSTART(abracket);
+		PUTC('<');
+		PSRCSTOP(abracket);
 		if (t != context->unknown_tag)
 		    PSRCSTART(tag);
 		else
@@ -3590,10 +3549,12 @@ top1:
 		}
 		PUTS(string->data);
 		if (c == '=' ) PUTC('=');
-		if (context->current_attribute_number == INVALID)
-		    PSRCSTOP(badattr);
-		else
-		    PSRCSTOP(attrib);
+		if (c == '=' || c == '>') {
+		    if (context->current_attribute_number == INVALID)
+			PSRCSTOP(badattr);
+		    else
+			PSRCSTOP(attrib);
+		}
 		if (c == '>') {
 		    PSRCSTART(abracket);
 		    PUTC('>');
@@ -3777,7 +3738,7 @@ top1:
 	    if (psrc_view) {
 		/*PSRCSTART(attrval);*/
 		if (attr_is_name) {
-		    HTStartAnchor(context->target,string->data,NULL);
+		    HTStartAnchor(context->target,string->data, NULL);
 		    (*context->actions->end_element)(
 			context->target,
 			HTML_A,
@@ -3841,7 +3802,7 @@ top1:
 	    if (psrc_view) {
 		/*PSRCSTART(attrval);*/
 		if (attr_is_name) {
-		    HTStartAnchor(context->target,string->data,NULL);
+		    HTStartAnchor(context->target,string->data, NULL);
 		    (*context->actions->end_element)(
 			context->target,
 			HTML_A,
@@ -3921,8 +3882,7 @@ top1:
 #ifdef USE_PRETTYSRC
 		if (psrc_view) {
 		    PSRCSTART(abracket);
-		    PUTC('<');
-		    PUTC('/');
+		    PUTS("</");
 		    PSRCSTOP(abracket);
 		    PSRCSTART(badtag);
 		    if (tagname_transform != 1) {
@@ -3936,7 +3896,9 @@ top1:
 			PUTC(c);
 		    } else {
 			PSRCSTOP(badtag);
-			PSRCSTART(abracket); PUTC('>'); PSRCSTOP(abracket);
+			PSRCSTART(abracket);
+			PUTC('>');
+			PSRCSTOP(abracket);
 		    }
 		    psrc_tagname_processed=TRUE;
 		}
@@ -4120,8 +4082,7 @@ top1:
 #ifdef USE_PRETTYSRC
 	    if (psrc_view && !psrc_tagname_processed) {
 		PSRCSTART(abracket);
-		PUTC('<');
-		PUTC('/');
+		PUTS("</");
 		PSRCSTOP(abracket);
 		PSRCSTART(tag);
 		if (tagname_transform != 1) {
@@ -4130,7 +4091,8 @@ top1:
 		    else
 			LYUpperCase(string->data);
 		}
-		PUTS(string->data); PSRCSTOP(tag);
+		PUTS(string->data);
+		PSRCSTOP(tag);
 		if ( c != '>' ) {
 		    PSRCSTART(badtag);
 		    PUTC(c);
@@ -4330,10 +4292,11 @@ top1:
 #endif
 
     } /* switch on context->state */
-    CTRACE2(TRACE_SGML, (tfp, "SGML after  %s|%.*s|%c\n",
+    CTRACE2(TRACE_SGML, (tfp, "SGML after  %s|%.*s|%c|\n",
 	    state_name(context->state),
 	    string->size,
-	    string->data != NULL ? string->data : "", UCH(c)));
+	    NonNull(string->data),
+	    UCH(c)));
 
 after_switch:
     /*
@@ -4380,7 +4343,7 @@ after_switch:
 	    FREE(context->active_include);
 	    context->include_index = 0;
 	} else {
-	    if (context->current_tag_charset == UTF8 ||
+	    if (context->current_tag_charset == UTF8_handle ||
 		context->T.trans_from_uni) {
 		/*
 		 *  If it looks like we would have fed UTF-8 to the
@@ -4485,12 +4448,13 @@ PUBLIC HTStream* SGML_new  ARGS3(
 
     context->isa = &SGMLParser;
     context->string = HTChunkCreate(128);	/* Grow by this much */
+    context->leading_spaces = 0;
+    context->trailing_spaces = 0;
     context->dtd = dtd;
     context->target = target;
     context->actions = (CONST HTStructuredClass*)(((HTStream*)target)->isa);
 					/* Ugh: no OO */
     context->unknown_tag = &HTTag_unrecognized;
-/*    context->extra_tags = dtd->tags + dtd->number_of_tags; */
     context->current_tag = context->slashedtag = NULL;
     context->state = S_text;
     context->kanji_buf = '\0';
@@ -4527,6 +4491,19 @@ PUBLIC HTStream* SGML_new  ARGS3(
 	context->inUCLYhndl = HTAnchor_getUCLYhndl(anchor,
 						   UCT_STAGE_PARSER);
     }
+#ifdef CAN_SWITCH_DISPLAY_CHARSET /* Allow a switch to a more suitable display charset */
+    else if (anchor->UCStages
+	     && anchor->UCStages->s[UCT_STAGE_PARSER].LYhndl >= 0
+	     && anchor->UCStages->s[UCT_STAGE_PARSER].LYhndl != current_char_set ) {
+	int o = anchor->UCStages->s[UCT_STAGE_PARSER].LYhndl;
+
+	anchor->UCStages->s[UCT_STAGE_PARSER].LYhndl = -1; /* Force reset */
+	HTAnchor_resetUCInfoStage(anchor, o, UCT_STAGE_PARSER,
+				  /* Preserve change this: */
+				  anchor->UCStages->s[UCT_STAGE_PARSER].lock);
+    }
+#endif
+
     context->inUCI = HTAnchor_getUCInfoStage(anchor,
 					     UCT_STAGE_PARSER);
     set_chartrans_handling(context, anchor, -1);
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/SGML.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/SGML.h
index 315b5ee1059..11b011d4f63 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/SGML.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/SGML.h
@@ -276,7 +276,3 @@ extern HTStream * SGML_new PARAMS((
 extern CONST HTStreamClass SGMLParser;
 
 #endif	/* SGML_H */
-
-/*
-
-    */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/UCDefs.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/UCDefs.h
index 19007f75aa1..b548d3370d9 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/UCDefs.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/UCDefs.h
@@ -8,7 +8,7 @@
 #endif
 
 typedef struct _LYUCcharset {
-    int UChndl;  	/* -1 for "old" charsets, >= 0 for chartrans tables */
+    int UChndl;		/* -1 for "old" charsets, >= 0 for chartrans tables */
 
     CONST char * MIMEname;
     int enc;
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/UCMap.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/UCMap.h
index b412dc1e58a..5c096141b1a 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/UCMap.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/UCMap.h
@@ -41,6 +41,10 @@ extern int UCGetLYhndl_byMIME PARAMS((
 extern int safeUCGetLYhndl_byMIME PARAMS((
 	CONST char *	p)); /* returns LATIN1 if name not recognized */
 
+#ifdef EXP_LOCALE_CHARSET
+extern void LYFindLocaleCharset NOPARAMS;
+#endif
+
 extern int UCLYhndl_for_unspec;
 extern int UCLYhndl_for_unrec;
 extern int UCLYhndl_HTFile_for_unspec;
@@ -49,7 +53,7 @@ extern int UCLYhndl_HTFile_for_unrec;
 /* easy to type: */
 extern int LATIN1;     /* UCGetLYhndl_byMIME("iso-8859-1") */
 extern int US_ASCII;   /* UCGetLYhndl_byMIME("us-ascii")   */
-extern int UTF8;       /* UCGetLYhndl_byMIME("utf-8")      */
+extern int UTF8_handle;	/* UCGetLYhndl_byMIME("utf-8")      */
 
 #undef TRANSPARENT	/* defined on Solaris in <sys/stream.h> */
 extern int TRANSPARENT; /* UCGetLYhndl_byMIME("x-transparent")  */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/crypt.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/crypt.c
deleted file mode 100644
index 3645f63e10d..00000000000
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/crypt.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * UFC-crypt: ultra fast crypt(3) implementation
- *
- * Copyright (C) 1991, 1992, Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- * 
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * @(#)crypt.c	2.19 5/28/92
- *
- * Semiportable C version
- *
- */
-
-#include <HTUtils.h>
-
-#include <ufc-crypt.h>
-
-#include <LYLeaks.h>
-
-#ifdef _UFC_32_
-
-/*
- * 32 bit version
- */
-
-extern long32 _ufc_keytab[16][2];
-extern long32 _ufc_sb0[], _ufc_sb1[], _ufc_sb2[], _ufc_sb3[];
-
-#define SBA(sb, v) (*(long32*)((char*)(sb)+(v)))
-
-static ufc_long ary[4];
-
-ufc_long *_ufc_doit(l1, l2, r1, r2, itr)
-  ufc_long l1, l2, r1, r2, itr;
-  { int i;
-    long32 s, *k;
-    register long32 *sb0 = _ufc_sb0;
-    register long32 *sb1 = _ufc_sb1;
-    register long32 *sb2 = _ufc_sb2;
-    register long32 *sb3 = _ufc_sb3;
-
-    while(itr--) {
-      k = &_ufc_keytab[0][0];
-      for(i=8; i--; ) {
-	s = *k++ ^ r1;
-	l1 ^= SBA(sb1, s & 0xffff); l2 ^= SBA(sb1, (s & 0xffff)+4);  
-        l1 ^= SBA(sb0, s >>= 16);   l2 ^= SBA(sb0, (s)         +4); 
-        s = *k++ ^ r2; 
-        l1 ^= SBA(sb3, s & 0xffff); l2 ^= SBA(sb3, (s & 0xffff)+4);
-        l1 ^= SBA(sb2, s >>= 16);   l2 ^= SBA(sb2, (s)         +4);
-
-        s = *k++ ^ l1; 
-        r1 ^= SBA(sb1, s & 0xffff); r2 ^= SBA(sb1, (s & 0xffff)+4);  
-        r1 ^= SBA(sb0, s >>= 16);   r2 ^= SBA(sb0, (s)         +4); 
-        s = *k++ ^ l2; 
-        r1 ^= SBA(sb3, s & 0xffff); r2 ^= SBA(sb3, (s & 0xffff)+4);  
-        r1 ^= SBA(sb2, s >>= 16);   r2 ^= SBA(sb2, (s)         +4);
-      } 
-      s=l1; l1=r1; r1=s; s=l2; l2=r2; r2=s;
-    }
-    ary[0] = l1; ary[1] = l2; ary[2] = r1; ary[3] = r2;
-    return ary;
-  }
-
-#endif
-
-#ifdef _UFC_64_
-
-/*
- * 64 bit version
- */
-
-extern long64 _ufc_keytab[16];
-extern long64 _ufc_sb0[], _ufc_sb1[], _ufc_sb2[], _ufc_sb3[];
-
-#define SBA(sb, v) (*(long64*)((char*)(sb)+(v)))
-
-static ufc_long ary[4];
-
-ufc_long *_ufc_doit(l1, l2, r1, r2, itr)
-  ufc_long l1, l2, r1, r2, itr;
-  { int i;
-    long64 l, r, s, *k;
-    register long64 *sb0 = _ufc_sb0;
-    register long64 *sb1 = _ufc_sb1;
-    register long64 *sb2 = _ufc_sb2;
-    register long64 *sb3 = _ufc_sb3;
-
-    l = (((long64)l1) << 32) | ((long64)l2);
-    r = (((long64)r1) << 32) | ((long64)r2);
-
-    while(itr--) {
-      k = &_ufc_keytab[0];
-      for(i=8; i--; ) {
-	s = *k++ ^ r;
-	l ^= SBA(sb3, (s >>  0) & 0xffff);
-        l ^= SBA(sb2, (s >> 16) & 0xffff);
-        l ^= SBA(sb1, (s >> 32) & 0xffff);
-        l ^= SBA(sb0, (s >> 48) & 0xffff);
-
-	s = *k++ ^ l;
-	r ^= SBA(sb3, (s >>  0) & 0xffff);
-        r ^= SBA(sb2, (s >> 16) & 0xffff);
-        r ^= SBA(sb1, (s >> 32) & 0xffff);
-        r ^= SBA(sb0, (s >> 48) & 0xffff);
-      } 
-      s=l; l=r; r=s;
-    }
-
-    ary[0] = l >> 32; ary[1] = l & 0xffffffff;
-    ary[2] = r >> 32; ary[3] = r & 0xffffffff;
-    return ary;
-  }
-
-#endif
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/crypt_util.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/crypt_util.c
deleted file mode 100644
index b81264c3d14..00000000000
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/crypt_util.c
+++ /dev/null
@@ -1,975 +0,0 @@
-/*
- * UFC-crypt: ultra fast crypt(3) implementation
- *
- * Copyright (C) 1991, 1992, Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * @(#)crypt_util.c	2.40 09/21/92
- *
- * Support routines
- *
- */
-
-#include <HTUtils.h>
-
-#ifndef STATIC
-#define STATIC static
-#endif
-
-#ifndef DOS
-#include <patchlevel.h>
-#include <ufc-crypt.h>
-#else
-/*
- * Thanks to greg%wind@plains.NoDak.edu (Greg W. Wettstein)
- * for DOS patches
- */
-#include <pl.h>
-#include <ufc.h>
-#endif
-
-#include <LYLeaks.h>
-
-static char patchlevel_str[] = PATCHLEVEL;
-
-/*
- * Permutation done once on the 56 bit
- *  key derived from the original 8 byte ASCII key.
- */
-static int pc1[56] = {
-  57, 49, 41, 33, 25, 17,  9,  1, 58, 50, 42, 34, 26, 18,
-  10,  2, 59, 51, 43, 35, 27, 19, 11,  3, 60, 52, 44, 36,
-  63, 55, 47, 39, 31, 23, 15,  7, 62, 54, 46, 38, 30, 22,
-  14,  6, 61, 53, 45, 37, 29, 21, 13,  5, 28, 20, 12,  4
-};
-
-/*
- * How much to rotate each 28 bit half of the pc1 permutated
- *  56 bit key before using pc2 to give the i' key
- */
-static int rots[16] = {
-  1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
-};
-
-/*
- * Permutation giving the key
- * of the i' DES round
- */
-static int pc2[48] = {
-  14, 17, 11, 24,  1,  5,  3, 28, 15,  6, 21, 10,
-  23, 19, 12,  4, 26,  8, 16,  7, 27, 20, 13,  2,
-  41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
-  44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32
-};
-
-/*
- * The E expansion table which selects
- * bits from the 32 bit intermediate result.
- */
-static int esel[48] = {
-  32,  1,  2,  3,  4,  5,  4,  5,  6,  7,  8,  9,
-   8,  9, 10, 11, 12, 13, 12, 13, 14, 15, 16, 17,
-  16, 17, 18, 19, 20, 21, 20, 21, 22, 23, 24, 25,
-  24, 25, 26, 27, 28, 29, 28, 29, 30, 31, 32,  1
-};
-static int e_inverse[64];
-
-/*
- * Permutation done on the
- * result of sbox lookups
- */
-static int perm32[32] = {
-  16,  7, 20, 21, 29, 12, 28, 17,  1, 15, 23, 26,  5, 18, 31, 10,
-  2,   8, 24, 14, 32, 27,  3,  9, 19, 13, 30,  6, 22, 11,  4, 25
-};
-
-/*
- * The sboxes
- */
-static int sbox[8][4][16]= {
-        { { 14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7 },
-          {  0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8 },
-          {  4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0 },
-          { 15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13 }
-        },
-
-        { { 15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10 },
-          {  3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5 },
-          {  0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15 },
-          { 13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9 }
-        },
-
-        { { 10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8 },
-          { 13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1 },
-          { 13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7 },
-          {  1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12 }
-        },
-
-        { {  7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15 },
-          { 13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9 },
-          { 10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4 },
-          {  3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14 }
-        },
-
-        { {  2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9 },
-          { 14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6 },
-          {  4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14 },
-          { 11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3 }
-        },
-
-        { { 12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11 },
-          { 10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8 },
-          {  9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6 },
-          {  4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13 }
-        },
-
-        { {  4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1 },
-          { 13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6 },
-          {  1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2 },
-          {  6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12 }
-        },
-
-        { { 13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7 },
-          {  1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2 },
-          {  7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8 },
-          {  2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11 }
-        }
-};
-
-/*
- * This is the initial
- * permutation matrix
- */
-static int initial_perm[64] = {
-  58, 50, 42, 34, 26, 18, 10,  2, 60, 52, 44, 36, 28, 20, 12, 4,
-  62, 54, 46, 38, 30, 22, 14,  6, 64, 56, 48, 40, 32, 24, 16, 8,
-  57, 49, 41, 33, 25, 17,  9,  1, 59, 51, 43, 35, 27, 19, 11, 3,
-  61, 53, 45, 37, 29, 21, 13,  5, 63, 55, 47, 39, 31, 23, 15, 7
-};
-
-/*
- * This is the final
- * permutation matrix
- */
-static int final_perm[64] = {
-  40,  8, 48, 16, 56, 24, 64, 32, 39,  7, 47, 15, 55, 23, 63, 31,
-  38,  6, 46, 14, 54, 22, 62, 30, 37,  5, 45, 13, 53, 21, 61, 29,
-  36,  4, 44, 12, 52, 20, 60, 28, 35,  3, 43, 11, 51, 19, 59, 27,
-  34,  2, 42, 10, 50, 18, 58, 26, 33,  1, 41,  9, 49, 17, 57, 25
-};
-
-/*
- * The 16 DES keys in BITMASK format
- */
-#ifdef _UFC_32_
-long32 _ufc_keytab[16][2];
-#endif
-#ifdef _UFC_64_
-long64 _ufc_keytab[16];
-#endif
-
-#define ascii_to_bin(c) ((c)>='a'?(c-59):(c)>='A'?((c)-53):(c)-'.')
-#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.')
-
-/* Macro to set a bit (0..23) */
-#define BITMASK(i) ( (1L<<(11L-(i)%12L+3L)) << ((i)<12L?16L:0L) )
-
-/*
- * sb arrays:
- *
- * Workhorses of the inner loop of the DES implementation.
- * They do sbox lookup, shifting of this  value, 32 bit
- * permutation and E permutation for the next round.
- *
- * Kept in 'BITMASK' format.
- */
-
-#ifdef _UFC_32_
-long32 _ufc_sb0[8192], _ufc_sb1[8192], _ufc_sb2[8192], _ufc_sb3[8192];
-static long32 *sb[4] = {_ufc_sb0, _ufc_sb1, _ufc_sb2, _ufc_sb3};
-#endif
-
-#ifdef _UFC_64_
-long64 _ufc_sb0[4096], _ufc_sb1[4096], _ufc_sb2[4096], _ufc_sb3[4096];
-static long64 *sb[4] = {_ufc_sb0, _ufc_sb1, _ufc_sb2, _ufc_sb3};
-#endif
-
-/*
- * eperm32tab: do 32 bit permutation and E selection
- *
- * The first index is the byte number in the 32 bit value to be permuted
- *  -  second  -   is the value of this byte
- *  -  third   -   selects the two 32 bit values
- *
- * The table is used and generated internally in init_des to speed it up
- */
-static ufc_long eperm32tab[4][256][2];
-
-/*
- * do_pc1: permform pc1 permutation in the key schedule generation.
- *
- * The first   index is the byte number in the 8 byte ASCII key
- *  -  second    -      -    the two 28 bits halfs of the result
- *  -  third     -   selects the 7 bits actually used of each byte
- *
- * The result is kept with 28 bit per 32 bit with the 4 most significant
- * bits zero.
- */
-static ufc_long do_pc1[8][2][128];
-
-/*
- * do_pc2: permform pc2 permutation in the key schedule generation.
- *
- * The first   index is the septet number in the two 28 bit intermediate values
- *  -  second    -    -  -  septet values
- *
- * Knowledge of the structure of the pc2 permutation is used.
- *
- * The result is kept with 28 bit per 32 bit with the 4 most significant
- * bits zero.
- */
-static ufc_long do_pc2[8][128];
-
-/*
- * efp: undo an extra e selection and do final
- *      permutation giving the DES result.
- *
- *      Invoked 6 bit a time on two 48 bit values
- *      giving two 32 bit longs.
- */
-static ufc_long efp[16][64][2];
-
-/*
- * revfinal: undo final permutation and do E expension.
- *
- *           Invoked 6 bit a time on DES output
- *           giving 4 32 bit longs.
- */
-static ufc_long revfinal[11][64][4];
-
-
-static unsigned char bytemask[8]  = {
-  0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01
-};
-
-static ufc_long longmask[32] = {
-  0x80000000, 0x40000000, 0x20000000, 0x10000000,
-  0x08000000, 0x04000000, 0x02000000, 0x01000000,
-  0x00800000, 0x00400000, 0x00200000, 0x00100000,
-  0x00080000, 0x00040000, 0x00020000, 0x00010000,
-  0x00008000, 0x00004000, 0x00002000, 0x00001000,
-  0x00000800, 0x00000400, 0x00000200, 0x00000100,
-  0x00000080, 0x00000040, 0x00000020, 0x00000010,
-  0x00000008, 0x00000004, 0x00000002, 0x00000001
-};
-
-#ifdef DEBUG
-
-pr_bits(a, n)
-  ufc_long *a;
-  int n;
-  { ufc_long i, j, t, tmp;
-    n /= 8;
-    for(i = 0; i < n; i++) {
-      tmp=0;
-      for(j = 0; j < 8; j++) {
-	t=8*i+j;
-	tmp|=(a[t/24] & BITMASK(t % 24))?bytemask[j]:0;
-      }
-      (void)printf("%02x ",tmp);
-    }
-    printf(" ");
-  }
-
-static set_bits(v, b)
-  ufc_long v;
-  ufc_long *b;
-  { ufc_long i;
-    *b = 0;
-    for(i = 0; i < 24; i++) {
-      if(v & longmask[8 + i])
-	*b |= BITMASK(i);
-    }
-  }
-
-#endif
-
-/*
- * Silly rewrite of 'bzero'. I do so
- * because some machines don't have
- * bzero and some don't have memset.
- */
-
-STATIC void clearmem(start, cnt)
-  char *start;
-  int cnt;
-  { while(cnt--)
-      *start++ = '\0';
-  }
-
-static int initialized = 0;
-
-/* lookup a 6 bit value in sbox */
-
-#define s_lookup(i,s) sbox[(i)][(((s)>>4) & 0x2)|((s) & 0x1)][((s)>>1) & 0xf];
-
-/*
- * Initialize unit - may be invoked directly
- * by fcrypt users.
- */
-
-void init_des()
-  { int comes_from_bit;
-    int bit, sg;
-    ufc_long j;
-    ufc_long mask1, mask2;
-
-    /*
-     * Create the do_pc1 table used
-     * to affect pc1 permutation
-     * when generating keys
-     */
-    for(bit = 0; bit < 56; bit++) {
-      comes_from_bit  = pc1[bit] - 1;
-      mask1 = bytemask[comes_from_bit % 8 + 1];
-      mask2 = longmask[bit % 28 + 4];
-      for(j = 0; j < 128; j++) {
-	if(j & mask1)
-	  do_pc1[comes_from_bit / 8][bit / 28][j] |= mask2;
-      }
-    }
-
-    /*
-     * Create the do_pc2 table used
-     * to affect pc2 permutation when
-     * generating keys
-     */
-    for(bit = 0; bit < 48; bit++) {
-      comes_from_bit  = pc2[bit] - 1;
-      mask1 = bytemask[comes_from_bit % 7 + 1];
-      mask2 = BITMASK(bit % 24);
-      for(j = 0; j < 128; j++) {
-	if(j & mask1)
-	  do_pc2[comes_from_bit / 7][j] |= mask2;
-      }
-    }
-
-    /*
-     * Now generate the table used to do combined
-     * 32 bit permutation and e expansion
-     *
-     * We use it because we have to permute 16384 32 bit
-     * longs into 48 bit in order to initialize sb.
-     *
-     * Looping 48 rounds per permutation becomes
-     * just too slow...
-     *
-     */
-
-    clearmem((char*)eperm32tab, sizeof(eperm32tab));
-
-    for(bit = 0; bit < 48; bit++) {
-      ufc_long mask1,comes_from;
-
-      comes_from = perm32[esel[bit]-1]-1;
-      mask1      = bytemask[comes_from % 8];
-
-      for(j = 256; j--;) {
-	if(j & mask1)
-	  eperm32tab[comes_from / 8][j][bit / 24] |= BITMASK(bit % 24);
-      }
-    }
-
-    /*
-     * Create the sb tables:
-     *
-     * For each 12 bit segment of an 48 bit intermediate
-     * result, the sb table precomputes the two 4 bit
-     * values of the sbox lookups done with the two 6
-     * bit halves, shifts them to their proper place,
-     * sends them through perm32 and finally E expands
-     * them so that they are ready for the next
-     * DES round.
-     *
-     */
-    for(sg = 0; sg < 4; sg++) {
-      int j1, j2;
-      int s1, s2;
-
-      for(j1 = 0; j1 < 64; j1++) {
-	s1 = s_lookup(2 * sg, j1);
-	for(j2 = 0; j2 < 64; j2++) {
-	  ufc_long to_permute, inx;
-
-	  s2         = s_lookup(2 * sg + 1, j2);
-	  to_permute = (((ufc_long)s1 << 4)  |
-	               (ufc_long)s2) << (24 - 8 * (ufc_long)sg);
-
-#ifdef _UFC_32_
-	  inx = ((j1 << 6)  | j2) << 1;
-	  sb[sg][inx  ]  = eperm32tab[0][(to_permute >> 24) & 0xff][0];
-	  sb[sg][inx+1]  = eperm32tab[0][(to_permute >> 24) & 0xff][1];
-	  sb[sg][inx  ] |= eperm32tab[1][(to_permute >> 16) & 0xff][0];
-	  sb[sg][inx+1] |= eperm32tab[1][(to_permute >> 16) & 0xff][1];
-  	  sb[sg][inx  ] |= eperm32tab[2][(to_permute >>  8) & 0xff][0];
-	  sb[sg][inx+1] |= eperm32tab[2][(to_permute >>  8) & 0xff][1];
-	  sb[sg][inx  ] |= eperm32tab[3][(to_permute)       & 0xff][0];
-	  sb[sg][inx+1] |= eperm32tab[3][(to_permute)       & 0xff][1];
-#endif
-#ifdef _UFC_64_
-	  inx = ((j1 << 6)  | j2);
-	  sb[sg][inx]  =
-	    ((long64)eperm32tab[0][(to_permute >> 24) & 0xff][0] << 32) |
-	     (long64)eperm32tab[0][(to_permute >> 24) & 0xff][1];
-	  sb[sg][inx] |=
-	    ((long64)eperm32tab[1][(to_permute >> 16) & 0xff][0] << 32) |
-	     (long64)eperm32tab[1][(to_permute >> 16) & 0xff][1];
-  	  sb[sg][inx] |=
-	    ((long64)eperm32tab[2][(to_permute >>  8) & 0xff][0] << 32) |
-	     (long64)eperm32tab[2][(to_permute >>  8) & 0xff][1];
-	  sb[sg][inx] |=
-	    ((long64)eperm32tab[3][(to_permute)       & 0xff][0] << 32) |
-	     (long64)eperm32tab[3][(to_permute)       & 0xff][1];
-#endif
-	}
-      }
-    }
-
-    /*
-     * Create an inverse matrix for esel telling
-     * where to plug out bits if undoing it
-     */
-    for(bit=48; bit--;) {
-      e_inverse[esel[bit] - 1     ] = bit;
-      e_inverse[esel[bit] - 1 + 32] = bit + 48;
-    }
-
-    /*
-     * create efp: the matrix used to
-     * undo the E expansion and effect final permutation
-     */
-    clearmem((char*)efp, sizeof efp);
-    for(bit = 0; bit < 64; bit++) {
-      int o_bit, o_long;
-      ufc_long word_value, mask1, mask2;
-      int comes_from_f_bit, comes_from_e_bit;
-      int comes_from_word, bit_within_word;
-
-      /* See where bit i belongs in the two 32 bit long's */
-      o_long = bit / 32; /* 0..1  */
-      o_bit  = bit % 32; /* 0..31 */
-
-      /*
-       * And find a bit in the e permutated value setting this bit.
-       *
-       * Note: the e selection may have selected the same bit several
-       * times.  By the initialization of e_inverse, we only look
-       * for one specific instance.
-       */
-      comes_from_f_bit = final_perm[bit] - 1;         /* 0..63 */
-      comes_from_e_bit = e_inverse[comes_from_f_bit]; /* 0..95 */
-      comes_from_word  = comes_from_e_bit / 6;        /* 0..15 */
-      bit_within_word  = comes_from_e_bit % 6;        /* 0..5  */
-
-      mask1 = longmask[bit_within_word + 26];
-      mask2 = longmask[o_bit];
-
-      for(word_value = 64; word_value--;) {
-	if(word_value & mask1)
-	  efp[comes_from_word][word_value][o_long] |= mask2;
-      }
-    }
-
-
-    /*
-     * Create revfinal: an array to undo final
-     * the effects of efp
-     */
-    clearmem((char*)revfinal, sizeof(revfinal));
-    for(bit = 0; bit < 96; bit++) {
-      int ibit = initial_perm[esel[bit % 48] - 1 + ((bit >= 48) ? 32 : 0)] - 1;
-      mask1 = bytemask[ibit % 6 +  2];
-      mask2 = BITMASK(bit % 24);
-      for(j = 64; j--;) {
-        if(j & mask1) {
-          revfinal[ibit / 6][j][bit / 24] |= mask2;
-        }
-      }
-    }
-
-    initialized++;
-  }
-
-/*
- * Process the elements of the sb table permuting the
- * bits swapped in the expansion by the current salt.
- */
-
-#ifdef _UFC_32_
-STATIC void shuffle_sb(k, saltbits)
-  long32 *k;
-  ufc_long saltbits;
-  { ufc_long j;
-    long32 x;
-    for(j=4096; j--;) {
-      x = (k[0] ^ k[1]) & (long32)saltbits;
-      *k++ ^= x;
-      *k++ ^= x;
-    }
-  }
-#endif
-
-#ifdef _UFC_64_
-STATIC void shuffle_sb(k, saltbits)
-  long64 *k;
-  ufc_long saltbits;
-  { ufc_long j;
-    long64 x;
-    for(j=4096; j--;) {
-      x = ((*k >> 32) ^ *k) & (long64)saltbits;
-      *k++ ^= (x << 32) | x;
-    }
-  }
-#endif
-
-/*
- * Setup the unit for a new salt
- * Hopefully we'll not see a new salt in each crypt call.
- */
-
-static unsigned char current_salt[3] = "&&"; /* invalid value */
-static ufc_long current_saltbits = 0;
-static int direction = 0;
-
-STATIC void setup_salt(s)
-  char *s;
-  { ufc_long i, j, saltbits;
-
-    if(!initialized)
-      init_des();
-
-    if(s[0] == current_salt[0] && s[1] == current_salt[1])
-      return;
-    current_salt[0] = s[0]; current_salt[1] = s[1];
-
-    /*
-     * This is the only crypt change to DES:
-     * entries are swapped in the expansion table
-     * according to the bits set in the salt.
-     */
-    saltbits = 0;
-    for(i = 0; i < 2; i++) {
-      long c=ascii_to_bin(s[i]);
-#ifdef notdef
-      /*
-       * Some applications do rely on illegal
-       * salts.  It seems that UFC-crypt behaves
-       * identically to standard crypt
-       * implementations on illegal salts -- glad
-       */
-      if(c < 0 || c > 63)
-	c = 0;
-#endif
-      for(j = 0; j < 6; j++) {
-	if((c >> j) & 0x1)
-	  saltbits |= BITMASK(6 * i + j);
-      }
-    }
-
-    /*
-     * Permute the sb table values
-     * to reflect the changed e
-     * selection table
-     */
-    shuffle_sb(_ufc_sb0, current_saltbits ^ saltbits);
-    shuffle_sb(_ufc_sb1, current_saltbits ^ saltbits);
-    shuffle_sb(_ufc_sb2, current_saltbits ^ saltbits);
-    shuffle_sb(_ufc_sb3, current_saltbits ^ saltbits);
-
-    current_saltbits = saltbits;
-  }
-
-STATIC void ufc_mk_keytab(key)
-  char *key;
-  { ufc_long v1, v2, *k1;
-    int i;
-#ifdef _UFC_32_
-    long32 v, *k2 = &_ufc_keytab[0][0];
-#endif
-#ifdef _UFC_64_
-    long64 v, *k2 = &_ufc_keytab[0];
-#endif
-
-    v1 = v2 = 0; k1 = &do_pc1[0][0][0];
-    for(i = 8; i--;) {
-      v1 |= k1[*key   & 0x7f]; k1 += 128;
-      v2 |= k1[*key++ & 0x7f]; k1 += 128;
-    }
-
-    for(i = 0; i < 16; i++) {
-      k1 = &do_pc2[0][0];
-
-      v1 = (v1 << rots[i]) | (v1 >> (28 - rots[i]));
-      v  = k1[(v1 >> 21) & 0x7f]; k1 += 128;
-      v |= k1[(v1 >> 14) & 0x7f]; k1 += 128;
-      v |= k1[(v1 >>  7) & 0x7f]; k1 += 128;
-      v |= k1[(v1      ) & 0x7f]; k1 += 128;
-
-#ifdef _UFC_32_
-      *k2++ = v;
-      v = 0;
-#endif
-#ifdef _UFC_64_
-      v <<= 32;
-#endif
-
-      v2 = (v2 << rots[i]) | (v2 >> (28 - rots[i]));
-      v |= k1[(v2 >> 21) & 0x7f]; k1 += 128;
-      v |= k1[(v2 >> 14) & 0x7f]; k1 += 128;
-      v |= k1[(v2 >>  7) & 0x7f]; k1 += 128;
-      v |= k1[(v2      ) & 0x7f];
-
-      *k2++ = v;
-    }
-
-    direction = 0;
-  }
-
-/*
- * Undo an extra E selection and do final permutations
- */
-
-ufc_long *_ufc_dofinalperm(l1, l2, r1, r2)
-  ufc_long l1,l2,r1,r2;
-  { ufc_long v1, v2, x;
-    static ufc_long ary[2];
-
-    x = (l1 ^ l2) & current_saltbits; l1 ^= x; l2 ^= x;
-    x = (r1 ^ r2) & current_saltbits; r1 ^= x; r2 ^= x;
-
-    v1=v2=0; l1 >>= 3; l2 >>= 3; r1 >>= 3; r2 >>= 3;
-
-    v1 |= efp[15][ r2         & 0x3f][0]; v2 |= efp[15][ r2 & 0x3f][1];
-    v1 |= efp[14][(r2 >>= 6)  & 0x3f][0]; v2 |= efp[14][ r2 & 0x3f][1];
-    v1 |= efp[13][(r2 >>= 10) & 0x3f][0]; v2 |= efp[13][ r2 & 0x3f][1];
-    v1 |= efp[12][(r2 >>= 6)  & 0x3f][0]; v2 |= efp[12][ r2 & 0x3f][1];
-
-    v1 |= efp[11][ r1         & 0x3f][0]; v2 |= efp[11][ r1 & 0x3f][1];
-    v1 |= efp[10][(r1 >>= 6)  & 0x3f][0]; v2 |= efp[10][ r1 & 0x3f][1];
-    v1 |= efp[ 9][(r1 >>= 10) & 0x3f][0]; v2 |= efp[ 9][ r1 & 0x3f][1];
-    v1 |= efp[ 8][(r1 >>= 6)  & 0x3f][0]; v2 |= efp[ 8][ r1 & 0x3f][1];
-
-    v1 |= efp[ 7][ l2         & 0x3f][0]; v2 |= efp[ 7][ l2 & 0x3f][1];
-    v1 |= efp[ 6][(l2 >>= 6)  & 0x3f][0]; v2 |= efp[ 6][ l2 & 0x3f][1];
-    v1 |= efp[ 5][(l2 >>= 10) & 0x3f][0]; v2 |= efp[ 5][ l2 & 0x3f][1];
-    v1 |= efp[ 4][(l2 >>= 6)  & 0x3f][0]; v2 |= efp[ 4][ l2 & 0x3f][1];
-
-    v1 |= efp[ 3][ l1         & 0x3f][0]; v2 |= efp[ 3][ l1 & 0x3f][1];
-    v1 |= efp[ 2][(l1 >>= 6)  & 0x3f][0]; v2 |= efp[ 2][ l1 & 0x3f][1];
-    v1 |= efp[ 1][(l1 >>= 10) & 0x3f][0]; v2 |= efp[ 1][ l1 & 0x3f][1];
-    v1 |= efp[ 0][(l1 >>= 6)  & 0x3f][0]; v2 |= efp[ 0][ l1 & 0x3f][1];
-
-    ary[0] = v1; ary[1] = v2;
-    return ary;
-  }
-
-/*
- * crypt only: convert from 64 bit to 11 bit ASCII
- * prefixing with the salt
- */
-
-STATIC char *output_conversion(v1, v2, salt)
-  ufc_long v1, v2;
-  char *salt;
-  { static char outbuf[14];
-    int i, s, shf;
-
-    outbuf[0] = salt[0];
-    outbuf[1] = salt[1] ? salt[1] : salt[0];
-
-    for(i = 0; i < 5; i++) {
-      shf = (26 - 6 * i); /* to cope with MSC compiler bug */
-      outbuf[i + 2] = bin_to_ascii((v1 >> shf) & 0x3f);
-    }
-
-    s  = (v2 & 0xf) << 2;
-    v2 = (v2 >> 2) | ((v1 & 0x3) << 30);
-
-    for(i = 5; i < 10; i++) {
-      shf = (56 - 6 * i);
-      outbuf[i + 2] = bin_to_ascii((v2 >> shf) & 0x3f);
-    }
-
-    outbuf[12] = bin_to_ascii(s);
-    outbuf[13] = 0;
-
-    return outbuf;
-  }
-
-ufc_long *_ufc_doit();
-
-/*
- * UNIX crypt function
- */
-
-char *crypt(key, salt)
-  char *key, *salt;
-  { ufc_long *s;
-    char ktab[9];
-
-    /*
-     * Hack DES tables according to salt
-     */
-    setup_salt(salt);
-
-    /*
-     * Setup key schedule
-     */
-    clearmem(ktab, sizeof ktab);
-    (void)strncpy(ktab, key, 8);
-    ufc_mk_keytab(ktab);
-
-    /*
-     * Go for the 25 DES encryptions
-     */
-    s = _ufc_doit((ufc_long)0, (ufc_long)0,
-		  (ufc_long)0, (ufc_long)0, (ufc_long)25);
-    /*
-     * Do final permutations
-     */
-    s = _ufc_dofinalperm(s[0], s[1], s[2], s[3]);
-
-    /*
-     * And convert back to 6 bit ASCII
-     */
-    return output_conversion(s[0], s[1], salt);
-  }
-
-/*
- * To make fcrypt users happy.
- * They don't need to call init_des.
- */
-
-char *fcrypt(key, salt)
-  char *key;
-  char *salt;
-  { return crypt(key, salt);
-  }
-
-/*
- * UNIX encrypt function.  Takes a bitvector
- * represented by one byte per bit and
- * encrypt/decrypt according to edflag
- */
-
-void encrypt(block, edflag)
-  char *block;
-  int edflag;
-  { ufc_long l1, l2, r1, r2, *s;
-    int i;
-
-    /*
-     * Undo any salt changes to E expansion
-     */
-    setup_salt("..");
-
-    /*
-     * Reverse key table if
-     * changing operation (encrypt/decrypt)
-     */
-    if((edflag == 0) != (direction == 0)) {
-      for(i = 0; i < 8; i++) {
-#ifdef _UFC_32_
-	long32 x;
-	x = _ufc_keytab[15-i][0];
-        _ufc_keytab[15-i][0] = _ufc_keytab[i][0];
-        _ufc_keytab[i][0] = x;
-
-	x = _ufc_keytab[15-i][1];
-        _ufc_keytab[15-i][1] = _ufc_keytab[i][1];
-        _ufc_keytab[i][1] = x;
-#endif
-#ifdef _UFC_64_
-	long64 x;
-	x = _ufc_keytab[15-i];
-	_ufc_keytab[15-i] = _ufc_keytab[i];
-	_ufc_keytab[i] = x;
-#endif
-      }
-      direction = edflag;
-    }
-
-    /*
-     * Do initial permutation + E expansion
-     */
-    i = 0;
-    for(l1 = 0; i < 24; i++) {
-      if(block[initial_perm[esel[i]-1]-1])
-	l1 |= BITMASK(i);
-    }
-    for(l2 = 0; i < 48; i++) {
-      if(block[initial_perm[esel[i]-1]-1])
-	l2 |= BITMASK(i-24);
-    }
-
-    i = 0;
-    for(r1 = 0; i < 24; i++) {
-      if(block[initial_perm[esel[i]-1+32]-1])
-	r1 |= BITMASK(i);
-    }
-    for(r2 = 0; i < 48; i++) {
-      if(block[initial_perm[esel[i]-1+32]-1])
-	r2 |= BITMASK(i-24);
-    }
-
-    /*
-     * Do DES inner loops + final conversion
-     */
-    s = _ufc_doit(l1, l2, r1, r2, (ufc_long)1);
-    /*
-     * Do final permutations
-     */
-    s = _ufc_dofinalperm(s[0], s[1], s[2], s[3]);
-
-    /*
-     * And convert to bit array
-     */
-    l1 = s[0]; r1 = s[1];
-    for(i = 0; i < 32; i++) {
-      *block++ = (l1 & longmask[i]) != 0;
-    }
-    for(i = 0; i < 32; i++) {
-      *block++ = (r1 & longmask[i]) != 0;
-    }
-
-  }
-
-/*
- * UNIX setkey function.  Take a 64 bit DES
- * key and setup the machinery.
- */
-
-void setkey(key)
-  char *key;
-  { int i,j;
-    unsigned char c;
-    unsigned char ktab[8];
-
-    setup_salt(".."); /* be sure we're initialized */
-
-    for(i = 0; i < 8; i++) {
-      for(j = 0, c = 0; j < 8; j++)
-	c = c << 1 | *key++;
-      ktab[i] = c >> 1;
-    }
-
-    ufc_mk_keytab(ktab);
-  }
-
-/*
- * Ultrix crypt16 function, thanks to pcl@convex.oxford.ac.uk (Paul Leyland)
- */
-
-char *crypt16(key, salt)
-  char *key, *salt;
-  { ufc_long *s, *t;
-    char ktab[9], ttab[9];
-    static char q[14], res[25];
-    /*
-     * Hack DES tables according to salt
-     */
-    setup_salt(salt);
-
-    /*
-     * Setup key schedule
-     */
-    clearmem(ktab, sizeof ktab);
-    (void)strncpy(ktab, key, 8);
-    ufc_mk_keytab(ktab);
-
-    /*
-     * Go for first 20 DES encryptions
-     */
-    s = _ufc_doit((ufc_long)0, (ufc_long)0,
-		  (ufc_long)0, (ufc_long)0, (ufc_long)20);
-
-    /*
-     * And convert back to 6 bit ASCII
-     */
-    strcpy (res, output_conversion(s[0], s[1], salt));
-
-    clearmem(ttab, sizeof ttab);
-    if (strlen (key) > 8) (void)strncpy(ttab, key+8, 8);
-    ufc_mk_keytab(ttab);
-
-    /*
-     * Go for second 5 DES encryptions
-     */
-    t = _ufc_doit((ufc_long)0, (ufc_long)0,
-		  (ufc_long)0, (ufc_long)0, (ufc_long)5);
-    /*
-     * And convert back to 6 bit ASCII
-     */
-    strcpy (q, output_conversion(t[0], t[1], salt));
-    strcpy (res+13, q+2);
-
-    clearmem(ktab, sizeof ktab);
-    (void)strncpy(ktab, key, 8);
-    ufc_mk_keytab(ktab);
-
-    return res;
-  }
-
-/*
- * Experimental -- not supported -- may choke your dog
- */
-
-void ufc_setup_password(cookie, s)
-  long *cookie;
-  char *s;
-  { char c;
-    int i;
-    ufc_long x;
-    ufc_long dl1, dl2, dr1, dr2;
-
-    setup_salt(s);
-    dl1 = dl2 = dr1 = dr2 = 0;
-    for(i = 0, s += 2; c = *s++; i++) {
-      int x = ascii_to_bin(c);
-      dl1 |= revfinal[i][x][0];
-      dl2 |= revfinal[i][x][1];
-      dr1 |= revfinal[i][x][2];
-      dr2 |= revfinal[i][x][3];
-    }
-    x = (dl1 ^ dl2) & current_saltbits;
-    x = (dr1 ^ dr2) & current_saltbits;
-    cookie[0] = dl1 ^ x; cookie[1] = dl2 ^ x;
-    cookie[2] = dr1 ^ x; cookie[3] = dr2 ^ x;
-  }
-
-void ufc_do_pw(cookie, guess)
-  long *cookie;
-  char *guess;
-  { char ktab[9];
-    ufc_long *s;
-    clearmem(ktab, sizeof ktab);
-    (void)strncpy(ktab, guess, 8);
-    ufc_mk_keytab(ktab);
-    s = _ufc_doit((ufc_long)0, (ufc_long)0,
-		  (ufc_long)0, (ufc_long)0, (ufc_long)25);
-    cookie[0] = s[0];    cookie[1] = s[1];
-    cookie[2] = s[2];    cookie[3] = s[3];
-  }
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/getline.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/getline.c
deleted file mode 100644
index 3168b9ec0d1..00000000000
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/getline.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-/* CHANGED FOR VMS */
-/*
- * <getline.c>
- */
-
-#include <HTUtils.h>
-
-#include <LYLeaks.h>
-
-/* Read up to (and including) a newline from STREAM into *LINEPTR
-   (and null-terminate it). *LINEPTR is a pointer returned from malloc (or
-   NULL), pointing to *N characters of space.  It is realloc'd as
-   necessary.  Returns the number of characters read (not including the
-   null terminator), or -1 on error or EOF.  */
-
-int getline(char **lineptr, size_t *n, FILE *stream)
-{
-static char line[256];
-char *ptr;
-unsigned int len;
-
-   if (lineptr == NULL || n == NULL)
-   {
-      SOCKET_ERRNO = EINVAL;
-      return -1;
-   }
-
-   if (ferror (stream))
-      return -1;
-
-   if (feof(stream))
-      return -1;
-     
-   fgets(line,256,stream);
-
-   ptr = strchr(line,'\n');   
-   if (ptr)
-      *ptr = '\0';
-
-   len = strlen(line);
-   
-   if ((len+1) < 256)
-   {
-      ptr = realloc(*lineptr, 256);
-      if (ptr == NULL)
-         return(-1);
-      *lineptr = ptr;
-      *n = 256;
-   }
-
-   strcpy(*lineptr,line); 
-   return(len);
-}
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/getpass.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/getpass.c
deleted file mode 100644
index f209da77ad6..00000000000
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/getpass.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-/* CHANGED FOR VMS */
-
-/*
- * <getpass.c>
- */
-
-#include <HTUtils.h>
-#include <descrip.h>
-#include <psldef.h>
-#include <iodef.h>
-#include <starlet.h>
-
-#include <LYLeaks.h>
-
-PUBLIC char * getpass ARGS1(CONST char *, prompt)
-{
-  static char *buf;
-
-  int result;
-  $DESCRIPTOR(devnam,"SYS$INPUT");
-  int chan;
-  int promptlen;
-  struct {
-     short result;
-     short count;
-     int   info;
-  } iosb;
-
-  promptlen = strlen(prompt);
-
-  buf = (char *)malloc(256);
-  if (buf == NULL)
-     return(NULL);  
-
-  result = sys$assign(&devnam, &chan, PSL$C_USER, 0, 0);
-
-  result = sys$qiow(0, chan, IO$_READPROMPT | IO$M_PURGE |IO$M_NOECHO, &iosb, 0, 0,
-                    buf, 255, 0, 0, prompt, promptlen);
-
-  buf[iosb.count] = '\0';
-
-  result = sys$dassgn(chan);
-
-  return buf;
-}
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/makefile.in b/gnu/usr.bin/lynx/WWW/Library/Implementation/makefile.in
index 26b117514e1..e3d47eab89c 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/makefile.in
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/makefile.in
@@ -19,10 +19,12 @@ LYFLAGS		= # FIXME: set in parent makefile
 CC		= @CC@
 DEFS		= @DEFS@
 CPPFLAGS	= @CPPFLAGS@
-_O		= .o
+
+o		= .@OBJEXT@
 
 INTLDIR_CPPFLAGS= @INTLDIR_CPPFLAGS@ -I$(top_srcdir)/intl
 
+CPP		= @CPP@
 CPPOPTS		= $(DEFS) $(CPPFLAGS) $(LYFLAGS) \
 		-I../../.. \
 		-I../../../src \
@@ -79,34 +81,32 @@ LOB = .
 #  uncomment these and fill in WAISINC for adding direct wais access
 #  to Lynx.
 #HTWAIS_c = $(CMN)/HTWAIS.c
-#HTWAIS_o = $(LOB)/HTWAIS$(_O)
+#HTWAIS_o = $(LOB)/HTWAIS$o
 #WAIS = YES
 #WAISINC = -I../../../../freeWAIS-0.202/ir
 #WAISCFLAGS = -DDIRECT_WAIS
 #
 
-# XMOsAIC hack is only for server to cope with xmosaic kludge for mmedia
-#
 # add -DNEW_GATEWAY here for the new gateway config stuff
-CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DXMOSAIC_HACK -DACCESS_AUTH
+CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DACCESS_AUTH
 
 COMPILE	= $(ECHO) $(CC) $(CFLAGS2) -c
 
-COMMON = $(LOB)/HTParse$(_O) $(LOB)/HTAccess$(_O) $(LOB)/HTTP$(_O) \
-	$(LOB)/HTFile$(_O)	$(LOB)/HTBTree$(_O) $(LOB)/HTFTP$(_O) $(LOB)/HTTCP$(_O) \
-	$(LOB)/SGML$(_O) $(LOB)/HTMLDTD$(_O) $(LOB)/HTChunk$(_O) \
-	$(LOB)/HTPlain$(_O) \
-	$(LOB)/HTMLGen$(_O) \
-	$(LOB)/HTAtom$(_O) $(LOB)/HTAnchor$(_O) $(LOB)/HTStyle$(_O) \
-	$(LOB)/HTList$(_O) $(LOB)/HTString$(_O) \
-	$(LOB)/HTRules$(_O) $(LOB)/HTFormat$(_O)  $(LOB)/HTMIME$(_O) \
-	$(LOB)/HTNews$(_O)  $(LOB)/HTGopher$(_O) \
-	$(LOB)/HTTelnet$(_O) $(LOB)/HTFinger$(_O) $(LOB)/HTWSRC$(_O) $(HTWAIS_o) \
-	$(LOB)/HTAAUtil$(_O) $(LOB)/HTAABrow$(_O) \
-	$(LOB)/HTGroup$(_O) \
-	$(LOB)/HTAAProt$(_O) \
-	$(LOB)/HTAssoc$(_O)  $(LOB)/HTLex$(_O)    $(LOB)/HTUU$(_O) \
-	$(LOB)/HTDOS$(_O)
+COMMON = $(LOB)/HTParse$o $(LOB)/HTAccess$o $(LOB)/HTTP$o \
+	$(LOB)/HTFile$o	$(LOB)/HTBTree$o $(LOB)/HTFTP$o $(LOB)/HTTCP$o \
+	$(LOB)/SGML$o $(LOB)/HTMLDTD$o $(LOB)/HTChunk$o \
+	$(LOB)/HTPlain$o \
+	$(LOB)/HTMLGen$o \
+	$(LOB)/HTAtom$o $(LOB)/HTAnchor$o $(LOB)/HTStyle$o \
+	$(LOB)/HTList$o $(LOB)/HTString$o \
+	$(LOB)/HTRules$o $(LOB)/HTFormat$o  $(LOB)/HTMIME$o \
+	$(LOB)/HTNews$o  $(LOB)/HTGopher$o \
+	$(LOB)/HTTelnet$o $(LOB)/HTFinger$o $(LOB)/HTWSRC$o $(HTWAIS_o) \
+	$(LOB)/HTAAUtil$o $(LOB)/HTAABrow$o \
+	$(LOB)/HTGroup$o \
+	$(LOB)/HTAAProt$o \
+	$(LOB)/HTAssoc$o  $(LOB)/HTLex$o    $(LOB)/HTUU$o \
+	$(LOB)/HTDOS$o
 
 CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \
 	$(CMN)HTBTree.c \
@@ -149,9 +149,9 @@ all : $(LOB)/libwww.a
 lint:
 	$(LINT) $(LINTOPTS) $(CPPOPTS) $(srcdir)/../Implementation/*.c  > ../../../lint.libwww
 
-.SUFFIXES: $(_O) .i .h .html
+.SUFFIXES: $o .i .h .html
 
-.c$(_O):
+.c$o:
 @RULE_CC@
 	@ECHO_CC@$(CC) $(CPPOPTS) $(CFLAGS) -c $(srcdir)/$*.c
 
@@ -167,141 +167,141 @@ depend :
 #  On SGI, ranlib is unnecessary and does not exist so we ignore errors
 # for that step
 $(LOB)/libwww.a : $(COMMON)
-	ar r $(LOB)/libwww.a $(COMMON)
+	@AR@ @AR_OPTS@ $(LOB)/libwww.a $(COMMON)
 	-$(RANLIB) $(LOB)/libwww.a
 
 #	Clean up everything generatable except final products
 clean :
 	rm -f core *.core *.leaks *.[oi] *.bak tags TAGS
-	rm $(LOB)/*$(_O)
+	rm -f $(LOB)/*$o
 
 #			Common code
 #			-----------
 
-$(LOB)/HTList$(_O) : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h
+$(LOB)/HTList$o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h
 	$(COMPILE) $(CMN)HTList.c
 
-$(LOB)/HTAnchor$(_O) : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h
+$(LOB)/HTAnchor$o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h
 	$(COMPILE) $(CMN)HTAnchor.c
 
-$(LOB)/HTFormat$(_O) : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h
+$(LOB)/HTFormat$o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h
 	$(COMPILE) $(CMN)HTFormat.c
 
-$(LOB)/HTMIME$(_O) : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h
+$(LOB)/HTMIME$o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h
 	$(COMPILE) $(CMN)HTMIME.c
 
-$(LOB)/HTNews$(_O) : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h\
+$(LOB)/HTNews$o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h\
 	 $(CMN)HTMLDTD.h
 	$(COMPILE) $(CMN)HTNews.c
 
-$(LOB)/HTGopher$(_O) : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h \
+$(LOB)/HTGopher$o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h \
 	 $(CMN)HTMLDTD.h
 	$(COMPILE) $(CMN)HTGopher.c
 
-$(LOB)/HTTelnet$(_O) : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h $(CMN)../../../userdefs.h
+$(LOB)/HTTelnet$o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h $(CMN)../../../userdefs.h
 	$(COMPILE) $(CMN)HTTelnet.c
 
-$(LOB)/HTFinger$(_O) : $(OE) $(CMN)HTFinger.c $(CMN)HTUtils.h $(CMN)HTList.h \
+$(LOB)/HTFinger$o : $(OE) $(CMN)HTFinger.c $(CMN)HTUtils.h $(CMN)HTList.h \
 	$(CMN)HTMLDTD.h
 	$(COMPILE) $(CMN)HTFinger.c
 
-$(LOB)/HTStyle$(_O) : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h
+$(LOB)/HTStyle$o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h
 	$(COMPILE) $(CMN)HTStyle.c
 
-$(LOB)/HTAtom$(_O) : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h $(CMN)HTList.h
+$(LOB)/HTAtom$o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h $(CMN)HTList.h
 	$(COMPILE) $(CMN)HTAtom.c
 
-$(LOB)/HTChunk$(_O) : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h
+$(LOB)/HTChunk$o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h
 	$(COMPILE) $(CMN)HTChunk.c
 
-$(LOB)/HTString$(_O) : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make
+$(LOB)/HTString$o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make
 	$(COMPILE) -DVC=\"$(VC)\" $(CMN)HTString.c
 
-$(LOB)/HTRules$(_O) : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make \
+$(LOB)/HTRules$o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make \
 	 $(CMN)HTAAProt.h
 	$(COMPILE) -DVC=\"$(VC)\" $(CMN)HTRules.c
 
-$(LOB)/SGML$(_O) : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h $(CMN)UCAux.h
+$(LOB)/SGML$o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h $(CMN)UCAux.h
 	$(COMPILE) $(CMN)SGML.c
 
-$(LOB)/HTMLGen$(_O) : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h
+$(LOB)/HTMLGen$o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h
 	$(COMPILE) $(CMN)HTMLGen.c
 
-$(LOB)/HTMLDTD$(_O) : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h
+$(LOB)/HTMLDTD$o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h
 	$(COMPILE) $(CMN)HTMLDTD.c
 
-$(LOB)/HTPlain$(_O) : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h \
+$(LOB)/HTPlain$o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h \
 	 $(CMN)UCAux.h
 	$(COMPILE) $(CMN)HTPlain.c
 
-$(LOB)/HTWAIS$(_O) : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h
+$(LOB)/HTWAIS$o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h
 	$(COMPILE) $(WAISINC) $(CMN)HTWAIS.c
 
-$(LOB)/HTWSRC$(_O) : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h
+$(LOB)/HTWSRC$o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h
 	$(COMPILE) $(CMN)HTWSRC.c
 
 #	Access Authorization
 
-$(LOB)/HTAAUtil$(_O) : $(OE) $(CMN)HTAAUtil.c $(CMN)HTAAUtil.h \
+$(LOB)/HTAAUtil$o : $(OE) $(CMN)HTAAUtil.c $(CMN)HTAAUtil.h \
 	 $(CMN)HTUtils.h $(CMN)HTString.h
 	$(COMPILE) $(CMN)HTAAUtil.c
 
-$(LOB)/HTGroup$(_O) : $(OE) $(CMN)HTGroup.c $(CMN)HTGroup.h \
+$(LOB)/HTGroup$o : $(OE) $(CMN)HTGroup.c $(CMN)HTGroup.h \
 	 $(CMN)HTAAUtil.h \
 	 $(CMN)HTAssoc.h $(CMN)HTLex.h
 	$(COMPILE) $(CMN)HTGroup.c
 
-$(LOB)/HTAABrow$(_O) : $(OE) $(CMN)HTAABrow.c $(CMN)HTAABrow.h \
+$(LOB)/HTAABrow$o : $(OE) $(CMN)HTAABrow.c $(CMN)HTAABrow.h \
 	 $(CMN)HTAAUtil.h $(CMN)HTUU.h \
 	 $(CMN)HTUtils.h $(CMN)HTString.h \
 	 $(CMN)HTParse.h $(CMN)HTList.h \
 	 $(CMN)HTAssoc.h
 	$(COMPILE) $(CMN)HTAABrow.c
 
-$(LOB)/HTAAProt$(_O) : $(OE) $(CMN)HTAAProt.c $(CMN)HTAAProt.h \
+$(LOB)/HTAAProt$o : $(OE) $(CMN)HTAAProt.c $(CMN)HTAAProt.h \
 	 $(CMN)HTUtils.h $(CMN)HTAAUtil.h \
 	 $(CMN)HTAssoc.h $(CMN)HTLex.h
 	$(COMPILE) $(CMN)HTAAProt.c
 
-$(LOB)/HTAssoc$(_O) : $(OE) $(CMN)HTAssoc.c $(CMN)HTAssoc.h \
+$(LOB)/HTAssoc$o : $(OE) $(CMN)HTAssoc.c $(CMN)HTAssoc.h \
 	$(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTList.h
 	$(COMPILE) $(CMN)HTAssoc.c
 
-$(LOB)/HTLex$(_O) : $(OE) $(CMN)HTLex.c $(CMN)HTLex.h $(CMN)HTUtils.h
+$(LOB)/HTLex$o : $(OE) $(CMN)HTLex.c $(CMN)HTLex.h $(CMN)HTUtils.h
 	$(COMPILE) $(CMN)HTLex.c
 
-$(LOB)/HTUU$(_O) : $(OE) $(CMN)HTUU.c $(CMN)HTUU.h $(CMN)HTUtils.h
+$(LOB)/HTUU$o : $(OE) $(CMN)HTUU.c $(CMN)HTUU.h $(CMN)HTUtils.h
 	$(COMPILE) $(CMN)HTUU.c
 
 
 #	Communications & Files
 
-$(LOB)/HTTP$(_O) : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h $(CMN)HTAABrow.h
+$(LOB)/HTTP$o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h $(CMN)HTAABrow.h
 	$(COMPILE) $(CMN)HTTP.c
 
-$(LOB)/HTTCP$(_O) : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h
+$(LOB)/HTTCP$o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h
 	$(COMPILE) $(CMN)HTTCP.c
 
-$(LOB)/HTFile$(_O) : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h \
+$(LOB)/HTFile$o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h \
 	 $(CMN)HTMLDTD.h
 	$(COMPILE) $(CMN)HTFile.c
 
-$(LOB)/HTBTree$(_O) : $(OE) $(CMN)HTBTree.c $(CMN)HTUtils.h
+$(LOB)/HTBTree$o : $(OE) $(CMN)HTBTree.c $(CMN)HTUtils.h
 	$(COMPILE) $(CMN)HTBTree.c
 
-$(LOB)/HTFTP$(_O) : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h
+$(LOB)/HTFTP$o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h
 	$(COMPILE) $(CMN)HTFTP.c
 
-$(LOB)/HTAccess$(_O) : $(OE)  $(CMN)HTAccess.c $(CMN)HTUtils.h
+$(LOB)/HTAccess$o : $(OE)  $(CMN)HTAccess.c $(CMN)HTUtils.h
 	$(COMPILE) $(CMN)HTAccess.c
 
-$(LOB)/HTParse$(_O) : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h
+$(LOB)/HTParse$o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h
 	$(COMPILE) $(CMN)HTParse.c
 
-$(LOB)/HTVMS_WaisUI$(_O) : $(OE) $(CMN)HTVMS_WaisUI.c $(CMN)HTUtils.h
+$(LOB)/HTVMS_WaisUI$o : $(OE) $(CMN)HTVMS_WaisUI.c $(CMN)HTUtils.h
 	$(COMPILE) $(CMN)HTVMS_WaisUI.c
 
-$(LOB)/HTDOS$(_O) : $(OE) $(CMN)HTDOS.c $(CMN)HTUtils.h
+$(LOB)/HTDOS$o : $(OE) $(CMN)HTDOS.c $(CMN)HTUtils.h
 	$(COMPILE) $(CMN)HTDOS.c
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/patchlevel.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/patchlevel.h
deleted file mode 100644
index c37c8654d32..00000000000
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/patchlevel.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * UFC-crypt: ultra fast crypt(3) implementation
- *
- * Copyright (C) 1991, 1992, Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- 
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * @(#)patchlevel.h	1.11 7/15/92
- *
- */
-
-#define PATCHLEVEL "UFC-crypt, patchlevel 1e, @(#)patchlevel.h	1.11 7/15/92"
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/tcp.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/tcp.h
deleted file mode 100644
index c9d05dfa2a3..00000000000
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/tcp.h
+++ /dev/null
@@ -1,751 +0,0 @@
-/*                System dependencies in the W3 library
-                                   SYSTEM DEPENDENCIES
-
-   System-system differences for TCP include files and macros.  This
-   file includes for each system the files necessary for network and
-   file I/O.  It should be used in conjunction with HTUtils.h to help
-   ensure portability across as many platforms and flavors of platforms
-   as possible.
-
-  AUTHORS
-
-  TBL                Tim Berners-Lee, W3 project, CERN, <timbl@info.cern.ch>
-  EvA                     Eelco van Asperen <evas@cs.few.eur.nl>
-  MA                      Marc Andreessen NCSA
-  AT                      Aleksandar Totic <atotic@ncsa.uiuc.edu>
-  SCW                     Susan C. Weber <sweber@kyle.eitech.com>
-
-  HISTORY:
-  22 Feb 91               Written (TBL) as part of the WWW library.
-  16 Jan 92               PC code from EvA
-  22 Apr 93               Merged diffs bits from xmosaic release
-  29 Apr 93               Windows/NT code from SCW
-  20 May 94		  A.Harper Add support for VMS CMU TCP/IP transport
-   3 Oct 94		  A.Harper Add support for VMS SOCKETSHR/NETLIB
-  15 Jul 95               S. Bjorndahl Gnu C for VMS Globaldef/ref support
-
-*/
-
-#ifndef TCP_H
-#define TCP_H
-
-/*
-
-Default values
-
-   These values may be reset and altered by system-specific sections
-   later on.  there are also a bunch of defaults at the end .
-
- */
-/* Default values of those: */
-#define NETCLOSE close      /* Routine to close a TCP-IP socket         */
-#define NETREAD  HTDoRead       /* Routine to read from a TCP-IP socket     */
-#define NETWRITE write      /* Routine to write to a TCP-IP socket      */
-#define SOCKET_READ read    /* normal socket read routine */
-#define IOCTL ioctl	    /* normal ioctl routine for sockets */
-#define SOCKET_ERRNO errno	    /* normal socket errno */
-
-/* Unless stated otherwise, */
-#define SELECT                  /* Can handle >1 channel.               */
-#define GOT_SYSTEM              /* Can call shell with string           */
-
-#ifdef unix
-#define GOT_PIPE
-#endif /* unix */
-
-#define INVSOC (-1)             /* Unix invalid socket */
-		/* NB: newer libwww has something different for Windows */
-
-typedef struct sockaddr_in SockA;  /* See netinet/in.h */
-
-#ifndef VMS
-#include <sys/types.h>
-
-#if defined(__DJGPP__) || defined(__BORLANDC__)
-#undef HAVE_DIRENT_H
-#define HAVE_DIRENT_H
-#undef HAVE_SYS_FILIO_H
-#endif /* DJGPP or __BORLANDC__ */
-
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-# define D_NAMLEN(dirent) strlen((dirent)->d_name)
-# define STRUCT_DIRENT struct dirent
-#else
-# define D_NAMLEN(dirent) (dirent)->d_namlen
-# define STRUCT_DIRENT struct direct
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif /* HAVE_DIRENT_H */
-#endif /* !VMS */
-
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#if defined(_AIX) && !defined(AIX)
-#define AIX
-#endif /* _AIX */
-
-#if defined(AIX) && !defined(unix)
-#define unix
-#endif /* AIX */
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#else
-#ifdef HAVE_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>             /* For bzero etc */
-#endif /* HAVE_STRING_H */
-
-/*
-
-  MACROS FOR CONVERTING CHARACTERS
-
- */
-#ifndef TOASCII
-#ifdef EBCDIC  /* S/390 -- gil -- 1327 */
-
-extern       char un_IBM1047[];
-extern unsigned char IBM1047[];
-/* For debugging
-#include <assert.h>
-#define   TOASCII(c) (assert((c)>=0 && (c)<256), un_IBM1047[c])
-*/ /* for production */
-#define   TOASCII(c) (un_IBM1047[c])
-
-#define FROMASCII(c) (IBM1047[c])
-
-#else  /* EBCDIC */
-
-#if '0' != 48
- error Host character set is not ASCII.
-#endif
-
-#define TOASCII(c) (c)
-#define FROMASCII(c) (c)
-
-#endif /* EBCDIC */
-#endif /* !TOASCII */
-
-
-/*
-IBM-PC running Windows NT
-
-	These parameters providede by  Susan C. Weber <sweber@kyle.eitech.com>.
-*/
-
-#ifdef _WINDOWS
-#define _WINDOWS_NSL
-#include <fcntl.h>                      /* For HTFile.c */
-#include <sys\types.h>                  /* For HTFile.c */
-#include <sys\stat.h>                   /* For HTFile.c */
-#undef NETREAD
-#undef NETWRITE
-#undef NETCLOSE
-#undef IOCTL
-#define NETREAD(s,b,l)  recv((s),(b),(l),0)
-#define NETWRITE(s,b,l) send((s),(b),(l),0)
-#define NETCLOSE(s)     closesocket(s)
-#define IOCTL				ioctlsocket
-#include <io.h>
-#include <string.h>
-#include <process.h>
-#include <time.h>
-#include <errno.h>
-#include <direct.h>
-#include <winsock.h>
-typedef struct sockaddr_in SockA;  /* See netinet/in.h */
-#define EINPROGRESS          (WSABASEERR+36)
-#define EALREADY             (WSABASEERR+37)
-#define EISCONN              (WSABASEERR+56)
-#define EINTR                (WSABASEERR+4)
-#define EAGAIN               (WSABASEERR+1002)
-#define ENOTCONN             (WSABASEERR+57)
-#define ECONNRESET           (WSABASEERR+54)
-#define EINVAL                22
-#define INCLUDES_DONE
-#define TCP_INCLUDES_DONE
-#endif  /* WINDOWS */
-
-
-
-/*
-
-VAX/VMS
-
-   Under VMS, there are many versions of TCP-IP. Define one if you do
-   not use Digital's UCX product:
-
-  UCX                     DEC's "Ultrix connection" (default)
-  CMU_TCP                 Available via FTP from sacusr.mp.usbr.gov
-  SOCKETSHR		  Eckhart Meyer's interface to NETLIB
-  WIN_TCP                 From Wollongong, now GEC software.
-  MULTINET                From SRI, became TGV, then Cisco.
-  DECNET                  Cern's TCP socket emulation over DECnet
-
-   The last three do not interfere with the
-   unix i/o library, and so they need special calls to read, write and
-   close sockets.  In these cases the socket number is a VMS channel
-   number, so we make the @@@ HORRIBLE @@@ assumption that a channel
-   number will be greater than 10 but a unix file descriptor less than
-   10.  It works.
-
- */
-#ifdef VMS
-
-#ifdef UCX
-#undef IOCTL
-#define IOCTL HTioctl
-#endif /* UCX */
-
-#ifdef WIN_TCP
-#undef SOCKET_READ
-#undef NETWRITE
-#undef NETCLOSE
-#define SOCKET_READ(s,b,l)  ((s)>10 ? netread((s),(b),(l)) : read((s),(b),(l)))
-#define NETWRITE(s,b,l) ((s)>10 ? netwrite((s),(b),(l)) : write((s),(b),(l)))
-#define NETCLOSE(s)     ((s)>10 ? netclose(s) : close(s))
-#undef IOCTL
-#define IOCTL(a,b,c) -1 /* disables ioctl function	      */
-#define NO_IOCTL	/* flag to check if ioctl is disabled */
-#endif /* WIN_TCP */
-
-#ifdef CMU_TCP
-#undef SOCKET_READ
-#undef NETREAD
-#undef NETWRITE
-#undef NETCLOSE
-#define SOCKET_READ(s,b,l) (cmu_get_sdc((s)) != 0 ? cmu_read((s),(b),(l)) : read((s),(b),(l)))
-#define NETREAD(s,b,l) (cmu_get_sdc((s)) != 0 ? HTDoRead((s),(b),(l)) : read((s),(b),(l)))
-#define NETWRITE(s,b,l) (cmu_get_sdc((s)) != 0 ? cmu_write((s),(b),(l)) : write((s),(b),(l)))
-#define NETCLOSE(s) (cmu_get_sdc((s)) != 0 ? cmu_close((s)) : close((s)))
-#endif /* CMU_TCP */
-
-#ifdef MULTINET
-#undef NETCLOSE
-#undef SOCKET_READ
-#undef NETWRITE
-#undef IOCTL
-#undef SOCKET_ERRNO
-/*
-**  Delete these socket_foo() prototypes as MultiNet adds them
-**  to it's socket library headers.  Compiler warnings due to
-**  the absence of arguments in the generic prototypes here will
-**  include the names of those which can be deleted. - FM
-*/
-extern int socket_read();
-extern int socket_write();
-extern int socket_close();
-extern int socket_ioctl();
-
-#define SOCKET_READ(s,b,l)  ((s)>10 ? socket_read((s),(b),(l)) : \
-				read((s),(b),(l)))
-#define NETWRITE(s,b,l) ((s)>10 ? socket_write((s),(b),(l)) : \
-                                write((s),(b),(l)))
-#define NETCLOSE(s)     ((s)>10 ? socket_close(s) : close(s))
-#define IOCTL socket_ioctl
-#define SOCKET_ERRNO socket_errno
-#endif /* MULTINET */
-
-#ifdef SOCKETSHR_TCP
-#undef SOCKET_READ
-#undef NETREAD
-#undef NETWRITE
-#undef NETCLOSE
-#undef IOCTL
-#define SOCKET_READ(s,b,l) (si_get_sdc((s)) != 0 ? si_read((s),(b),(l)) : \
-                                read((s),(b),(l)))
-#define NETREAD(s,b,l) (si_get_sdc((s)) != 0 ? HTDoRead((s),(b),(l)) : \
-                                read((s),(b),(l)))
-#define NETWRITE(s,b,l) (si_get_sdc((s)) != 0 ? si_write((s),(b),(l)) : \
-                                write((s),(b),(l)))
-#define NETCLOSE(s) (si_get_sdc((s)) != 0 ? si_close((s)) : close((s)))
-#define IOCTL si_ioctl
-#endif /* SOCKETSHR_TCP */
-
-#include <string.h>
-
-#include <file.h>
-#include <stat.h>
-#include <unixio.h>
-#include <unixlib.h>
-
-#define INCLUDES_DONE
-
-#ifdef MULTINET  /* Include from standard Multinet directories */
-/*
-**  Delete any of these multinet_foo() and associated prototypes
-**  as MultiNet adds them to its socket library headers.  You'll
-**  get compiler warnings about them, due the absence of arguments
-**  in the generic prototyping here, and the warnings will include
-**  the names of the functions whose prototype entries can be
-**  deleted here. - FM
-*/
-extern int multinet_accept();
-extern int multinet_bind();
-extern int multinet_connect();
-extern int multinet_gethostname();
-extern int multinet_getsockname();
-extern unsigned short multinet_htons(unsigned short __val);
-extern unsigned short multinet_ntohs(unsigned short __val);
-extern int multinet_listen();
-extern int multinet_select();
-extern int multinet_socket();
-extern char *vms_errno_string();
-
-#ifndef __SOCKET_TYPEDEFS
-#define __SOCKET_TYPEDEFS 1
-#endif /* !__SOCKET_TYPEDEFS */
-#include <time.h>
-#include <types.h>
-#ifdef __TIME_T
-#undef  __TYPES
-#define __TYPES 1
-#define __TYPES_LOADED 1
-#endif /* __TIME_T */
-#ifdef __SOCKET_TYPEDEFS
-#undef __SOCKET_TYPEDEFS
-#endif /* __SOCKET_TYPEDEFS */
-#include "multinet_root:[multinet.include.sys]types.h"
-#ifndef __SOCKET_TYPEDEFS
-#define __SOCKET_TYPEDEFS 1
-#endif /* !__SOCKET_TYPEDEFS */
-#include "multinet_root:[multinet.include]errno.h"
-#ifdef __TYPES
-#undef  __TIME_T
-#define __TIME_T 1
-#endif /* __TYPE */
-#ifdef __TIME_LOADED
-#undef  __TIME
-#define __TIME 1  /* to avoid double definitions in in.h */
-#endif /* __TIME_LOADED */
-#include "multinet_root:[multinet.include.sys]time.h"
-#include "multinet_root:[multinet.include.sys]socket.h"
-#include "multinet_root:[multinet.include.netinet]in.h"
-#include "multinet_root:[multinet.include.arpa]inet.h"
-#include "multinet_root:[multinet.include]netdb.h"
-#include "multinet_root:[multinet.include.sys]ioctl.h"
-#define TCP_INCLUDES_DONE
-/*
-**  Uncomment this if you get compiler messages
-**  about struct timeval having no linkage. - FM
-*/
-/*#define NO_TIMEVAL*/
-#ifdef NO_TIMEVAL
-struct timeval {
-    long tv_sec;		/* seconds since Jan. 1, 1970 */
-    long tv_usec;		/* microseconds */
-};
-#endif /* NO_TIMEVAL */
-#endif /* MULTINET */
-
-
-#ifdef DECNET
-#include <types.h>
-#include <errno.h>
-#include <time.h>
-#include <types.h>  /* for socket.h */
-#include <socket.h>
-#include <dn>
-#include <dnetdb>
-/* #include "vms.h" */
-#define TCP_INCLUDES_DONE
-#endif /* DECNET */
-
-
-#ifdef UCX
-#include <types.h>
-#include <errno.h>
-#include <time.h>
-#include <socket.h>
-#include <in.h>
-#include <inet.h>
-#if defined(TCPWARE) && !defined(__DECC)
-#include "tcpware_include:netdb.h"
-#include "tcpware_include:ucx$inetdef.h"
-#else
-#include <netdb.h>
-#include <ucx$inetdef.h>
-#endif /* TCPWARE */
-#define TCP_INCLUDES_DONE
-#endif /* UCX */
-
-
-#ifdef CMU_TCP
-#include <types.h>
-#include <errno.h>
-#include "cmuip_root:[syslib]time.h"
-#include "cmuip_root:[syslib]socket.h"
-#include <in.h>
-#include <inet.h>
-#include <netdb.h>
-#include "cmuip_root:[syslib]ioctl.h"
-#define TCP_INCLUDES_DONE
-#endif /* CMU_TCP */
-
-
-#ifdef SOCKETSHR_TCP
-#include <types.h>
-#include <errno.h>
-#include <time.h>
-#include <socket.h>
-#include <in.h>
-#include <inet.h>
-#include <netdb.h>
-#include "socketshr_library:socketshr.h"
-#include "socketshr_library:ioctl.h"
-#define TCP_INCLUDES_DONE
-#endif /* SOCKETSHR_TCP */
-
-#ifdef WIN_TCP
-#include <types.h>
-#include <errno.h>
-#include <time.h>
-#include <socket.h>
-#include <in.h>
-#include <inet.h>
-#include <netdb.h>
-#ifndef NO_IOCTL
-#include <ioctl.h>
-#endif /* !NO_IOCTL */
-#define TCP_INCLUDES_DONE
-#endif /* WIN_TCP */
-
-#ifndef TCP_INCLUDES_DONE
-#include <types.h>
-#include <errno.h>
-#include <time.h>
-#ifdef VMS_SOCKET_HEADERS
-/*
-**  Not all versions of VMS have the full set of headers
-**  for socket library functions, because the TCP/IP
-**  packages were layered products.  If we want these
-**  specifically, instead of those for the above packages,
-**  the module should be compiled with VMS_SOCKET_HEADERS
-**  defined instead of layered product definitions, above.
-**  If the module is not using socket library functions,
-**  none of the definitions need be used, and we include
-**  only the above three headers. - FM
-*/
-#include <socket.h>
-#include <in.h>
-#include <inet.h>
-#include <netdb.h>
-#include <ioctl.h>
-#endif /* VMS_SOCKET_HEADERS */
-#define TCP_INCLUDES_DONE
-#endif /* !TCP_INCLUDES_DONE */
-
-/*
-
-   On VMS machines, the linker needs to be told to put global data sections into
- a data
-   segment using these storage classes. (MarkDonszelmann)
-
- */
-#if defined(VAXC) && !defined(__DECC)
-#define GLOBALDEF globaldef
-#define GLOBALREF globalref
-#else
-#ifdef __GNUC__		/* this added by Sterling Bjorndahl */
-#define GLOBALREF_IS_MACRO 1
-#define GLOBALDEF_IS_MACRO 1
-#include <gnu_hacks.h>	/* defines GLOBALREF and GLOBALDEF for GNUC on VMS */
-#endif  /* __GNUC__ */
-#endif /* VAXC && !DECC */
-
-#endif /* VMS */
-
-/*
- * On non-VMS machines and for DECC on VMS, the GLOBALDEF and GLOBALREF
- * storage types default to normal C storage types.
- */
-#ifndef GLOBALREF
-#define GLOBALDEF
-#define GLOBALREF extern
-#endif /* !GLOBALREF */
-
-#ifdef DJGPP
-#undef SELECT
-#define TCP_INCLUDES_DONE
-#define NO_IOCTL
-#include <errno.h>
-#include <sys/types.h>
-#include <socket.h>
-
-#undef NETWRITE
-#define NETWRITE write_s
-#undef NETREAD
-#define NETREAD read_s
-#undef NETCLOSE
-#define NETCLOSE close_s
-#define getsockname getsockname_s
-#ifdef HAVE_GETTEXT
-#define gettext gettext__
-#endif
-#endif /* DJGPP */
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif /* HAVE_SYS_FILIO_H */
-
-#ifdef DECL_ERRNO
-extern int errno;
-#endif /* DECL_ERRNO */
-
-/*
-Regular BSD unix versions
-=========================
-   These are a default unix where not already defined specifically.
- */
-#ifndef INCLUDES_DONE
-#include <sys/types.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif /* HAVE_STRING_H */
-#include <errno.h>          /* independent */
-#ifdef __MVS__  /* S/390 -- gil -- 1361 */
-#include <time.h>
-#endif /* __MVS__ */
-#ifdef SCO
-#include <sys/timeb.h>
-#include <time.h>
-#endif /* SCO */
-#if defined(AIX) || defined(SVR4)
-#include <time.h>
-#endif /* AIX || SVR4 */
-#include <sys/time.h>       /* independent */
-#include <sys/stat.h>
-#ifndef __MVS__  /* S/390 -- gil -- 1373 */
-#include <sys/param.h>
-#endif /* __MVS__ */
-#include <sys/file.h>       /* For open() etc */
-
-#if defined(NeXT) || defined(sony_news)
-#ifndef mode_t
-typedef unsigned short mode_t;
-#endif /* !mode_t */
-
-#ifndef pid_t
-typedef int pid_t;
-#endif /* !pid_t */
-
-#ifndef WEXITSTATUS
-#ifdef sony_news
-#define WEXITSTATUS(s) WIFEXITED(s)
-#else
-#define WEXITSTATUS(s) (((s).w_status >> 8) & 0377)
-#endif /* sony_news */
-#endif /* !WEXITSTATUS */
-
-#ifndef WTERMSIG
-#ifdef sony_news
-#define WTERMSIG(s) (s).w_termsig
-#else
-#define WTERMSIG(s) (((s).w_status >> 8) & 0177)
-#endif /* sony_news */
-#endif /* !WTERMSIG */
-
-#endif /* NeXT || sony_news */
-
-#define INCLUDES_DONE
-#endif  /* Normal includes */
-
-/* FIXME: this should be autoconf'd */
-/* Interactive UNIX for i386 and i486 -- Thanks to jeffrey@itm.itm.org */
-#ifdef ISC
-#include <net/errno.h>
-#include <sys/types.h>
-#include <sys/tty.h>
-#include <sys/sioctl.h>
-#include <sys/bsdtypes.h>
-#ifndef MERGE
-#define MERGE
-#include <sys/pty.h>
-#undef MERGE
-#else
-#include <sys/pty.h>
-#endif /* !MERGE */
-#ifndef USE_DIRENT
-#define USE_DIRENT     /* sys V style directory open */
-#endif /* USE_DIRENT */
-#include <sys/dirent.h>
-#endif /* ISC */
-
-/*	Directory reading stuff - BSD or SYS V
-*/
-#if defined(UNIX) && !defined(unix)
-#define unix
-#endif /* UNIX && !unix */
-
-#ifdef HAVE_CONFIG_H
-
-# ifdef HAVE_LIMITS_H
-#  include <limits.h>
-# endif /* HAVE_LIMITS_H */
-# if !defined(MAXINT) && defined(INT_MAX)
-#  define MAXINT INT_MAX
-# endif /* !MAXINT && INT_MAX */
-
-#else
-
-#ifndef VM
-#ifndef VMS
-#ifndef THINK_C
-#define DECL_SYS_ERRLIST 1
-#endif /* !THINK_C */
-#endif /* !VMS */
-#endif /* !VM */
-
-#endif /* !HAVE_CONFIG_H */
-
-#ifdef HAVE_LIBINTL_H
-#include <libintl.h>
-#endif
-
-#ifndef HAVE_GETTEXT
-#define gettext(s) s
-#endif
-
-/*
-Defaults
-========
-  INCLUDE FILES FOR TCP
- */
-#ifndef TCP_INCLUDES_DONE
-#ifndef NO_IOCTL
-#include <sys/ioctl.h> /* EJB */
-#endif /* !NO_IOCTL */
-#include <sys/socket.h>
-#include <netinet/in.h>
-#ifndef __hpux /* this may or may not be good -marc */
-#include <arpa/inet.h>      /* Must be after netinet/in.h */
-#endif /* !__hpux */
-#include <netdb.h>
-#endif  /* TCP includes */
-
-#ifndef S_ISLNK
-#define S_ISLNK(m)	(((m) & S_IFMT) == S_IFLNK)
-#endif /* S_ISLNK */
-
-#ifndef S_ISDIR
-#define S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
-#endif /* S_ISDIR */
-
-#ifndef S_ISREG
-#define S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)
-#endif /* S_ISREG */
-
-#ifndef S_ISUID
-#define S_ISUID  0004000
-#endif
-#ifndef S_ISGID
-#define S_ISGID  0002000
-#endif
-#ifndef S_ISVTX
-#define S_ISVTX  0001000
-#endif
-
-#ifndef S_IRWXU
-#define S_IRWXU 00700
-#endif
-
-#ifndef S_IRUSR
-#define S_IRUSR 00400
-#endif
-#ifndef S_IWUSR
-#define S_IWUSR 00200
-#endif
-#ifndef S_IXUSR
-#define S_IXUSR 00100
-#endif
-
-#ifndef S_IRWXG
-#define S_IRWXG 00070
-#endif
-
-#ifndef S_IRGRP
-#define S_IRGRP 00040
-#endif
-#ifndef S_IWGRP
-#define S_IWGRP 00020
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 00010
-#endif
-
-#ifndef S_IRWXO
-#define S_IRWXO 00007
-#endif
-
-#ifndef S_IROTH
-#define S_IROTH 00004
-#endif
-#ifndef S_IWOTH
-#define S_IWOTH 00002
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 00001
-#endif
-
-/*
-
-ROUGH ESTIMATE OF MAX PATH LENGTH
-
-*/
-#ifndef HT_MAX_PATH
-#ifdef MAXPATHLEN
-#define HT_MAX_PATH MAXPATHLEN
-#else
-#ifdef PATH_MAX
-#define HT_MAX_PATH PATH_MAX
-#else
-#define HT_MAX_PATH 1024                        /* Any better ideas? */
-#endif
-#endif
-#endif /* HT_MAX_PATH */
-
-#if HT_MAX_PATH < 256
-#undef HT_MAX_PATH
-#define HT_MAX_PATH 256
-#endif
-
-/*
-  MACROS FOR MANIPULATING MASKS FOR SELECT()
- */
-#ifdef SELECT
-#ifndef FD_SET
-typedef unsigned int fd_set;
-#define FD_SET(fd,pmask) (*(pmask)) |=  (1<<(fd))
-#define FD_CLR(fd,pmask) (*(pmask)) &= ~(1<<(fd))
-#define FD_ZERO(pmask)   (*(pmask))=0
-#define FD_ISSET(fd,pmask) (*(pmask) & (1<<(fd)))
-#endif  /* !FD_SET */
-#endif  /* SELECT */
-
-
-#endif /* TCP_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/ufc-crypt.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/ufc-crypt.h
deleted file mode 100644
index a7cf7d4fc0a..00000000000
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/ufc-crypt.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * UFC-crypt: ultra fast crypt(3) implementation
- *
- * Copyright (C) 1991, 1992, Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
-
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * @(#)ufc-crypt.h	1.16 09/21/92
- *
- * Definitions of datatypes
- *
- */
-
-/*
- * Requirements for datatypes:
- *
- * A datatype 'ufc_long' of at least 32 bit
- * *and*
- *   A type 'long32' of exactly 32 bits (_UFC_32_)
- *   *or*
- *   A type 'long64' of exactly 64 bits (_UFC_64_)
- *
- * 'int' is assumed to be at least 8 bit
- */
-
-/*
- * #ifdef's for various architectures
- */
-
-#ifdef cray
-/* thanks to <hutton@opus.sdsc.edu> (Tom Hutton)  for testing */
-typedef unsigned long ufc_long;
-typedef unsigned long long64;
-#define _UFC_64_
-#endif
-
-#ifdef convex
-/* thanks to pcl@convex.oxford.ac.uk (Paul Leyland) for testing */
-typedef unsigned long ufc_long;
-typedef long long     long64;
-#define _UFC_64_
-#endif
-
-#ifdef ksr
-/*
- * Note - the KSR machine does not define a unique symbol
- * which we can check.  So you MUST add '-Dksr' to your Makefile.
- * Thanks to lijewski@theory.tc.cornell.edu (Mike Lijewski) for
- * the patch.
- */
-typedef unsigned long ufc_long;
-typedef unsigned long long64;
-#define _UFC_64_
-#endif
-
-/*
- * For debugging 64 bit code etc with 'gcc'
- */
-
-#ifdef GCC3232
-typedef unsigned long ufc_long;
-typedef unsigned long long32;
-#define _UFC_32_
-#endif
-
-#ifdef GCC3264
-typedef unsigned long ufc_long;
-typedef long long     long64;
-#define _UFC_64_
-#endif
-
-#ifdef GCC6432
-typedef long long ufc_long;
-typedef unsigned long long32;
-#define _UFC_32_
-#endif
-
-#ifdef GCC6464
-typedef long long     ufc_long;
-typedef long long     long64;
-#define _UFC_64_
-#endif
-
-/*
- * Catch all for 99.95% of all UNIX machines
- */
-
-#ifndef _UFC_64_
-#ifndef _UFC_32_
-#define _UFC_32_
-typedef unsigned long ufc_long;
-typedef unsigned long long32;
-#endif
-#endif
-
-
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/www_tcp.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/www_tcp.h
index f3f5ac65a45..56f00cf729c 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/www_tcp.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/www_tcp.h
@@ -110,10 +110,7 @@ Default values
 #define AIX
 #endif /* _AIX */
 
-#ifdef __CYGWIN__
-#define _WINDOWS_NSL
-#define WIN_EX
-#else
+#ifndef __CYGWIN__
 #ifdef WIN_EX
 #define HAVE_FTIME 1
 #define HAVE_SYS_TIMEB_H 1
@@ -172,7 +169,11 @@ IBM-PC running Windows NT
 */
 
 #ifdef _WINDOWS
+
+#ifndef _WINDOWS_NSL
 #define _WINDOWS_NSL
+#endif
+
 #include <fcntl.h>                      /* For HTFile.c */
 #include <sys\types.h>                  /* For HTFile.c */
 #include <sys\stat.h>                   /* For HTFile.c */
@@ -549,20 +550,20 @@ extern int errno;
 #ifdef __DJGPP__
 #undef SELECT
 #define TCP_INCLUDES_DONE
-#define NO_IOCTL
+#undef  IOCTL
+#define IOCTL(s,cmd,arg) ioctlsocket(s,cmd,(char*)(arg))
 #define DECL_ERRNO
 #include <errno.h>
 #include <sys/types.h>
-#include <socket.h>
 #include <io.h>
-#ifdef WATT32
+#include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <arpa/inet.h>
 #include <tcp.h>
 #ifdef word
 #undef word
 #endif /* word */
 #define select select_s
-#endif /* WATT32 */
 
 #undef NETWRITE
 #define NETWRITE write_s
@@ -570,12 +571,18 @@ extern int errno;
 #define NETREAD read_s
 #undef NETCLOSE
 #define NETCLOSE close_s
-#ifndef WATT32
-#define getsockname getsockname_s
-#endif /* !WATT32 */
+#ifdef UNIX
+#undef UNIX
+#endif /* UNIX */
 #ifdef HAVE_GETTEXT
 #define gettext gettext__
 #endif
+#if !defined(NCURSES) && !defined(USE_SLANG)
+#define HAVE_CBREAK 1
+#endif /* !NCURSES && !USE_SLANG */
+#if defined(USE_SLANG) && !defined(NO_DJ_KEYHANDLER) && defined(HAVE_CONFIG_H)
+#define DJGPP_KEYHANDLER
+#endif /* USE_SLANG && !NO_DJ_KEYHANDLER  && HAVE_CONFIG_H */
 #endif /* DJGPP */
 
 #ifdef HAVE_UNISTD_H
@@ -627,10 +634,6 @@ Regular BSD unix versions
 typedef unsigned short mode_t;
 #endif /* !mode_t */
 
-#ifndef pid_t
-typedef int pid_t;
-#endif /* !pid_t */
-
 #endif /* NeXT || sony_news */
 
 #define INCLUDES_DONE
@@ -680,7 +683,11 @@ typedef int pid_t;
 #include <libintl.h>
 #endif
 
-#define N_(s) (s)
+#ifdef HAVE_LIBGETTEXT_H
+#include <libgettext.h>
+#endif
+
+#define N_(s) s
 
 #ifndef HAVE_GETTEXT
 #define gettext(s) s
@@ -840,4 +847,8 @@ typedef struct sockaddr_in SockA;  /* See netinet/in.h */
 #define SOCKADDR_LEN(soc_address) sizeof(soc_address)
 #endif /* INET6 */
 
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 64		/* Arbitrary limit */
+#endif /* MAXHOSTNAMELEN */
+
 #endif /* TCP_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/www_wait.h b/gnu/usr.bin/lynx/WWW/Library/Implementation/www_wait.h
index 730b3ec5428..3e40e889b6c 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/www_wait.h
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/www_wait.h
@@ -23,4 +23,12 @@
 # endif
 #endif
 
+#ifndef WSTOPSIG
+# ifdef HAVE_TYPE_UNIONWAIT
+#  define	WSTOPSIG(status)	(status.w_stopsig)
+# else
+#  define	WSTOPSIG(status)	WEXITSTATUS(status)
+# endif
+#endif
+
 #endif /* WWW_WAIT_H */
diff --git a/gnu/usr.bin/lynx/WWW/Library/djgpp/CommonMakefile b/gnu/usr.bin/lynx/WWW/Library/djgpp/CommonMakefile
index 99dc1f6a7b5..87a9306f9f9 100644
--- a/gnu/usr.bin/lynx/WWW/Library/djgpp/CommonMakefile
+++ b/gnu/usr.bin/lynx/WWW/Library/djgpp/CommonMakefile
@@ -69,7 +69,7 @@ include $(ABS)$(WWW)/Library/Implementation/Version.make
 # XMOsAIC hack is only for server to cope with xmosaic kludge for mmedia
 #
 # add -DNEW_GATEWAY here for the new gateway config stuff
-CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DXMOSAIC_HACK -DACCESS_AUTH
+CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DACCESS_AUTH
 
 CERNLIBBIN = $(WWW)/bin
 
diff --git a/gnu/usr.bin/lynx/WWW/Library/djgpp/makefile b/gnu/usr.bin/lynx/WWW/Library/djgpp/makefile
index 893f6cdb29b..f46ad1fc082 100644
--- a/gnu/usr.bin/lynx/WWW/Library/djgpp/makefile
+++ b/gnu/usr.bin/lynx/WWW/Library/djgpp/makefile
@@ -8,10 +8,7 @@ WWW_MACH = djgpp
 #ASIS_MACH = hardware/os
 
 # Use this option to enable optional and *experimental* color style.
-#ENABLE_COLOR_STYLE = \
- -DUSE_COLOR_STYLE \
- -DUSE_HASH \
- -DLINKEDSTYLES
+#ENABLE_COLOR_STYLE = -DUSE_COLOR_STYLE
 
 # comment this line to suppress DIRED support
 DIRED_DEFS = -DDIRED_SUPPORT
@@ -23,18 +20,16 @@ MCFLAGS = \
  $(ENABLE_COLOR_STYLE) \
  -DDISP_PARTIAL \
  -DDOSPATH \
- -DEXP_FILE_UPLOAD \
+ -DUSE_FILE_UPLOAD \
  -DNOUSERS \
- -DSOURCE_CACHE \
+ -DUSE_SOURCE_CACHE \
  -DUSE_PRETTYSRC \
  -DUSE_ZLIB \
- -DWATT32 \
  -I../Implementation \
  -I../../../src \
  -I../../.. \
- -I/djgpp/pdcur24 \
- -I/djgpp/watt32/inc \
- -I/djgpp/watt32/inc/sys
+ -I/djgpp/pdcur26 \
+ -I/djgpp/watt32/inc
 
 LFLAGS =
 CC = gcc
@@ -44,7 +39,7 @@ CC = gcc
 
 # Uncomment the following to enable SSL.
 #SSLFLAGS = -DUSE_SSL
-#SSLINC = -I/djgpp/include/openssl
+#SSLINC = -I/dev/env/DJDIR/include/openssl
 
 # Directory for installed binary:
 !BINDIR = /usr/local/bin
diff --git a/gnu/usr.bin/lynx/WWW/Library/djgpp/makefile.sla b/gnu/usr.bin/lynx/WWW/Library/djgpp/makefile.sla
index 540f9a33cba..79e87b88312 100644
--- a/gnu/usr.bin/lynx/WWW/Library/djgpp/makefile.sla
+++ b/gnu/usr.bin/lynx/WWW/Library/djgpp/makefile.sla
@@ -7,17 +7,21 @@ WWW_MACH = djgpp
 # The ASIS repository's name for the machine we are on
 #ASIS_MACH = hardware/os
 
-CFLAGS = -O1 -DUSE_SLANG -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDISP_PARTIAL \
--DDIRED_SUPPORT -DSOURCE_CACHE -DUSE_PRETTYSRC \
--DWATT32 \
+CFLAGS = -O2 -DUSE_SLANG -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDISP_PARTIAL \
+-DDIRED_SUPPORT -DUSE_SOURCE_CACHE -DUSE_PRETTYSRC \
 -I../Implementation \
--I../../../djgpp/watt32/inc -I../../../djgpp/watt32/inc/sys \
+-I/dev/env/DJDIR/watt32/inc \
 -I../../../src \
--I../../.. $(SLANGINC) $(INTLFLAGS)
+-I../../.. $(SLANGINC) $(INTLFLAGS) $(SSLFLAGS) $(SSLINC)
+
 LFLAGS =
 CC = gcc
 #INTLFLAGS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H
 
+# Uncomment the following to enable SSL.
+#SSLFLAGS = -DUSE_SSL
+#SSLINC = -I/dev/env/DJDIR/include/openssl
+
 # Directory for installed binary:
 !BINDIR = /usr/local/bin
 
diff --git a/gnu/usr.bin/lynx/WWW/Library/vms/libmake.com b/gnu/usr.bin/lynx/WWW/Library/vms/libmake.com
index 4ad07d1941f..bf905fe73bc 100644
--- a/gnu/usr.bin/lynx/WWW/Library/vms/libmake.com
+++ b/gnu/usr.bin/lynx/WWW/Library/vms/libmake.com
@@ -67,12 +67,20 @@ $!
 $ if transport .eqs. "SOCKETSHR_TCP" then extra = extra + ",_DECC_V4_SOURCE"
 $ if transport .eqs. "TCPWARE" then extra = extra + ",UCX"
 $!
+$ if p2 .nes. ""
+$ then
+$   ssl_arg = "openssl"
+$   extra = extra + ",USE_SSL,USE_OPENSSL_INCL"
+$ else
+$   ssl_arg = ""
+$ endif
+$!
 $!	Compiler options can be specified here.  If there was
 $!	a second argument (with any value), then debugger mode
 $!	with no optimization will be specified as well. - FM
 $!
 $ cc_opts = ""
-$ if p2 .nes. "" then cc_opts = cc_opts + "/DEBUG/NOOPT"
+$ if p3 .nes. "" then cc_opts = cc_opts + "/DEBUG/NOOPT"
 $!
 $ IF f$trnlnm("VAXCMSG") .eqs. "DECC$MSG" .or. -
      f$trnlnm("DECC$CC_DEFAULT") .eqs. "/DECC" .or. -
diff --git a/gnu/usr.bin/lynx/WWW/Makefile b/gnu/usr.bin/lynx/WWW/Makefile
deleted file mode 100644
index 41a90056fb3..00000000000
--- a/gnu/usr.bin/lynx/WWW/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#	Make basic WWW distribution
-#
-#  See the README and the documentation on the web.
-#  When you have done BUILD you will have www so you will be able to
-#  read the documentation online.
-#
-all :
-	BUILD
-
diff --git a/gnu/usr.bin/lynx/WWW/README.txt b/gnu/usr.bin/lynx/WWW/README.txt
deleted file mode 100644
index ad5d8bee56d..00000000000
--- a/gnu/usr.bin/lynx/WWW/README.txt
+++ /dev/null
@@ -1,208 +0,0 @@
-                                                                        Read Me
-                      WORLDWIDEWEB CERN-DISTRIBUTED CODE
-                                       
-   See the CERN copyright[1] .  This is the README file which you get when you
-   unwrap one of our tar files. These files contain information about
-   hypertext, hypertext systems, and the WorldWideWeb project. If you have
-   taken this with a .tar file, you will have only a subset of the files.
-   
-   THIS FILE IS A VERY ABRIDGED VERSION OF THE INFORMATION AVAILABLE ON THE
-   WEB.   IF IN DOUBT, READ THE WEB DIRECTLY. If you have not got ANY browser
-   installed yet, do this by telnet to info.cern.ch (no username or password).
-   
-   Files from info.cern.ch are also mirrored on ftp.ripe.net.
-   
-Archive Directory structure
-
-   Under /pub/www[2] , besides this README file, you'll find bin[3] , src[4]
-   and doc[5] directories.  The main archives are as follows:
-   
-  bin/xxx/bbbb            Executable binaries of program bbbb for system xxx.
-                         Check what's there before you bother compiling. (Note
-                         HP700/8800 series is "snake")
-                         
-  bin/next/WorldWideWeb_v.vv.tar.Z
-                         The Hypertext Browser/editor for the NeXT -- binary.
-                         
-  src/WWWLibrary_v.vv.tar.Z
-                          The W3 Library. All source, and Makefiles for
-                         selected systems.
-                         
-  src/WWWLineMode_v.vv.tar.Z
-                          The Line mode browser - all source, and Makefiles for
-                         selected systems. Requires the Library[6] .
-                         
-  src/WWWDaemon_v.vv.tar.Z
-                          The HTTP daemon, and WWW-WAIS  gateway programs.
-                         Source.  Requires the Library.
-                         
-  src/WWWMailRobot_v.vv.tar.Z
-                          The Mail Robot.
-                         
-  doc/WWWBook.tar.Z       A snapshot of our internal documentation - we prefer
-                         you to access this on line -- see warnings below.
-                         
-Basic WWW software installation from source
-
-   This applies to the line mode client and the server.  Below, $prod means
-   LineMode or Daemon depending on which you are building.
-   
-  GENERATED DIRECTORY STRUCTURE
-  
-   The tar files are all designed to be unwrapped in the same (this) directory.
-   They create different parts of a common directory tree under that directory.
-   There may be some duplication. They also generate a few files in this
-   directory: README.*, Copyright.*, and some installation instructions (.txt).
-   
-   The directory structure is, for product $prod  and machine $WWW_MACH
-   
-  WWW/$prod/Implementation
-                          Source files for a given product
-                         
-  WWW/$prod/Implementation/CommonMakefile
-                         The machine-independent parts of the Makefile for this
-                         product
-                         
-
-                                                                Read Me (65/66)
-  WWW/$prod/$WWW_MACH/    Area for compiling for a given system
-                         
-  WWW/All/$WWW_MACH/Makefile.include
-                         The machine-dependent parts of the makefile for any
-                         product
-                         
-  WWW/All/Implementation/Makefile.product
-                         A makefile which includes both parts above and so can
-                         be used from any product, any machine.
-                         
-  COMPILATION ON ALREADY SUPPORTED PLATFORMS
-  
-   You must get the WWWLibrary tar file as well as the products you want and
-   unwrap them all from the same directory.
-   
-   You must define the environmant variable WWW_MACH to be the architecure of
-   your machine (sun4, decstation, rs6000, sgi, snake, etc)
-   
-   In directory WWW, type BUILD.
-   
-  COMPILATION ON NEW PLATFORMS
-  
-   If your machine is not on the list:
-   
-      Make up a new subdirectory of that name under WWW/$prod and WWW/All,
-      copying the contents of a basically similar architecture's directory.
-      
-      Check the  WWW/All/$WWW_MACH/Makefile.include for suitable directory and
-      flag definitions.
-      
-      Check the file tcp.h for the system-specific include file coordinates,
-      etc.
-      
-      Send any changes you have to make back to www-request@info.cern.ch for
-      inclusion into future releases.
-      
-      Once you have this set up, type BUILD.
-      
-NeXTStep Browser/Editor
-
-   The browser for the NeXT is those files contained in the application
-   directory WWW/Next/Implementation/WorldWideWeb.app and is compiled. When you
-   install the app, you may want to configure the default page,
-   WorldWideWeb.app/default.html. These must point to some useful information!
-   You should keep it up to date with pointers to info on your site and
-   elsewhere. If you use the CERN home page note there is a link at the bottom
-   to the master copy on our server.   You should set up the address of your
-   local news server with
-   
-                      dwrite WorldWideWeb NewsHost  news
-
-   replacing the last word with the actual address of your news host. See
-   Installation instructions[7] .
-   
-Line Mode browser
-
-   Binaries of this for some systems are available in /pub/www/bin/ . The
-   binaries can be picked up, set executable, and run immediately.
-   
-   If there is no binary, see "Installation from source" above.
-   
-    (See Installation notes[8] ).  Do the same thing (in the same directory) to
-   the WWWLibrary_v.cc.tar.Z file to get the common library.
-   
-
-                                                               Read Me (65/130)
-   You will have an ASCII printable manual in the file
-   WWW/LineMode/Defaults/line-mode-guide.txt which you can print out at this
-   stage. This is a frozen copy of some of the online documentation.
-   
-   Whe you install the browser, you may configure a default page. This is
-   /usr/local/lib/WWW/default.html for the line mode browser. This must point
-   to some useful information! You should keep it up to date with pointers to
-   info on your site and elsewhere. If you use the CERN home page note there is
-   a link at the bottom to the master copy on our server.
-   
-   Some basic documentation on the browser is delivered with the home page in
-   the directory WWW/LineMode/Defaults. A separate tar file of that directory
-   (WWWLineModeDefaults.tar.Z) is available if you just want to update that.
-   
-   The rest of the documentation is in hypertext, and so wil be readable most
-   easily with a browser. We suggest that after installing the browser, you
-   browse through the basic documentation so that you are aware of the options
-   and customisation possibilities for example.
-   
-Server
-
-   The server can be run very simply under the internet  daemon, to export a
-   file directory tree as a browsable hypertext tree.  Binaries are avilable
-   for some platofrms, otherwise follow instructions above for compiling and
-   then go on to " Installing the basic W3 server[9] ".
-   
-XMosaic
-
-   XMosaic is an X11/Motif  W3 browser.
-   
-   The sources and binaries are distributed separately from
-   FTP.NCSA.UIUC.EDU[10] , in  /Web/xmosaic[11] .  Binaries are available for
-   some platforms.  If you have to build from source, check the README in the
-   distribution.
-   
-   The binaries can be picked up, uncompressed, set "executable" and run
-   immediately.
-   
-Viola browser for X11
-
-   Viola is an X11 application for reading global hypertext.  If a binary is
-   available from your machine, in /pub/www/bin/.../viola*, then take that and
-   also the Viola "apps" tar file which contains the scripts you will need.
-   
-   To generate this from source, you will need both the W3 library and the
-   Viola source files.  There is an Imakefile with the viola source directory.
-   You will need to generate the XPA and XPM libraries and the W3 library
-   befere you make viola itself.
-   
-Documentation
-
-   In the /pub/www/doc[12] directory are a number articles, preprints and
-   guides on the web.
-   
-   See the online WWW bibliography[13] for a list of these and other articles,
-   books, etc. and also the list of WWW Manuals[14] available in text and
-   postscript form.
-   
-General
-
-   Your comments will of course be most appreciated, on code, or information on
-   the web which is out of date or misleading. If you write your own hypertext
-   and make it available by anonymous ftp or using a server, tell us and we'll
-   put some pointers to it in ours. Thus spreads the web...
-
-                                                               Read Me (66/195)
-                                                                Tim Berners-Lee
-                                                                               
-                                                           WorldWideWeb project
-                                                                               
-                                              CERN, 1211 Geneva 23, Switzerland
-                                                                               
-          Tel: +41 22 767 3755; Fax: +41 22 767 7155; email: timbl@info.cern.ch
-                                                                               
-   
diff --git a/gnu/usr.bin/lynx/aclocal.m4 b/gnu/usr.bin/lynx/aclocal.m4
index 29e32a7954e..0d9f34f1331 100644
--- a/gnu/usr.bin/lynx/aclocal.m4
+++ b/gnu/usr.bin/lynx/aclocal.m4
@@ -4,18 +4,21 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl and Philippe De Muyter <phdm@macqel.be>
 dnl
 dnl Created: 1997/1/28
-dnl Updated: 2001/4/15
+dnl Updated: 2004/1/26
 dnl
-dnl The autoconf used in Lynx development is GNU autoconf, patched
+dnl The autoconf used in Lynx development is GNU autoconf 2.13, patched
 dnl by Tom Dickey.  See your local GNU archives, and this URL:
 dnl http://invisible-island.net/autoconf/autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
-dnl
-AC_DEFUN(AM_GNU_GETTEXT,
+dnl AM_GNU_GETTEXT version: 11 updated: 2004/01/26 20:58:40
+dnl --------------
+dnl Usage: Just like AM_WITH_NLS, which see.
+AC_DEFUN([AM_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_CANONICAL_HOST])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
    AC_REQUIRE([AC_ISC_POSIX])dnl
    AC_REQUIRE([AC_HEADER_STDC])dnl
@@ -25,21 +28,18 @@ AC_DEFUN(AM_GNU_GETTEXT,
    AC_REQUIRE([AC_TYPE_SIZE_T])dnl
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
    AC_REQUIRE([AC_FUNC_MMAP])dnl
+   AC_REQUIRE([jm_GLIBC21])dnl
 
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h sys/param.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-strdup __argz_count __argz_stringify __argz_next])
-
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     AC_CHECK_FUNCS(stpcpy)
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     AC_DEFINE(HAVE_STPCPY)
-   fi
+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h])
+   AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
+getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
+strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
 
+   AM_ICONV
+   AM_LANGINFO_CODESET
    AM_LC_MESSAGES
-   AM_WITH_NLS
+   AM_WITH_NLS([$1],[$2],[$3],[$4])
 
    if test "x$CATOBJEXT" != "x"; then
      if test "x$ALL_LINGUAS" = "x"; then
@@ -47,10 +47,21 @@ strdup __argz_count __argz_stringify __argz_next])
      else
        AC_MSG_CHECKING(for catalogs to be installed)
        NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
+           # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
        done
        LINGUAS=$NEW_LINGUAS
        AC_MSG_RESULT($LINGUAS)
@@ -62,54 +73,11 @@ strdup __argz_count __argz_stringify __argz_next])
      fi
    fi
 
-   dnl The reference to <locale.h> in the installed <libintl.h> file
-   dnl must be resolved because we cannot expect the users of this
-   dnl to define HAVE_LOCALE_H.
-   if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care of it yourself. */"
-   fi
-   AC_SUBST(INCLUDE_LOCALE_H)
-
-   dnl Determine which catalog format we have (if any is needed)
-   dnl For now we know about two different formats:
-   dnl   Linux libc-5 and the normal X/Open format
-   if test "$USE_NLS" = "yes"; then
-     test -d intl || mkdir intl
-     if test "$CATOBJEXT" = ".cat"; then
-       AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-
-       dnl Transform the SED scripts while copying because some dumb SEDs
-       dnl cannot handle comments.
-       sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
-     fi
-     dnl po2tbl.sed is always needed.
-     if test -f $srcdir/intl/po2tbl.sed.in ; then
-       rm -f intl/po2tbl.sed
-       sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-         $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
-     fi
-   fi
-
-   dnl In the intl/Makefile.in we have a special dependency which only
-   dnl makes sense for gettext.  We comment this out for non-gettext
-   dnl packages.
-   if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   AC_SUBST(GT_NO)
-   AC_SUBST(GT_YES)
-
    dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
    dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
    dnl Try to locate it.
    dnl changed mkinstalldirs to mkdirs.sh for Lynx /je spath 1998-Aug-21
+   dnl added check for separate locations of scripts -mirabile 2004-Jan-18
    MKINSTALLDIRS=
    if test -n "$ac_aux_dir"; then
      MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh"
@@ -117,69 +85,170 @@ strdup __argz_count __argz_stringify __argz_next])
    if test -z "$MKINSTALLDIRS"; then
      MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh"
    fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl *** For now the libtool support in intl/Makefile is not for real.
-   l=
-   AC_SUBST(l)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
+   if test -n "$GNUSYSTEM_AUX_DIR" ; then
+     if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then
+       MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs"
      fi
-   else
-     posrcprefix="../"
-   fi
-   if test -f $srcdir/po/POTFILES.in ; then
-   if test "$USE_NLS" = "yes"; then
-     test -d po || mkdir po
-     rm -f po/POTFILES
-     sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	  < $srcdir/po/POTFILES.in > po/POTFILES
-   fi
    fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl Enable libtool support if the surrounding package wishes it.
+   INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
+   AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl AM_ICONV version: 3 updated: 2002/10/27 23:21:42
+dnl --------
+dnl Inserted as requested by gettext 0.10.40
+dnl File from /usr/share/aclocal
+dnl iconv.m4
+dnl ====================
+dnl serial AM2
+dnl
+dnl From Bruno Haible.
+AC_DEFUN([AM_ICONV],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  AC_ARG_WITH([libiconv-prefix],
+[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+    done
+   ])
+
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      am_cv_func_iconv=yes)
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS -liconv"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes)
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL(am_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+  LIBICONV=
+  if test "$am_cv_lib_iconv" = yes; then
+    LIBICONV="-liconv"
+  fi
+  AC_SUBST(LIBICONV)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl AM_LANGINFO_CODESET version: 3 updated: 2002/10/27 23:21:42
+dnl -------------------
+dnl Inserted as requested by gettext 0.10.40
+dnl File from /usr/share/aclocal
+dnl codeset.m4
+dnl ====================
+dnl serial AM1
 dnl
+dnl From Bruno Haible.
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl AM_LC_MESSAGES version: 4 updated: 2002/10/27 23:21:42
+dnl --------------
+dnl Inserted as requested by gettext 0.10.40
+dnl File from /usr/share/aclocal
+dnl lcmessage.m4
+dnl ====================
 dnl Check whether LC_MESSAGES is available in <locale.h>.
 dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
 dnl
 dnl This file can be copied and used freely without restrictions.  It can
-dnl be used in projects which are not available under the GNU Public License
-dnl but which still want to provide support for the GNU gettext functionality.
-dnl Please note that the actual code is *not* freely available.
+dnl be used in projects which are not available under the GNU General Public
+dnl License or the GNU Library General Public License but which still want
+dnl to provide support for the GNU gettext functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
 dnl
-dnl serial 1
+dnl serial 2
 dnl
-AC_DEFUN(AM_LC_MESSAGES,
+AC_DEFUN([AM_LC_MESSAGES],
   [if test $ac_cv_header_locale_h = yes; then
     AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
       [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
        am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
     if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES)
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your <locale.h> file defines LC_MESSAGES.])
     fi
-  fi])
-
+  fi])dnl
 dnl ---------------------------------------------------------------------------
+dnl AM_PATH_PROG_WITH_TEST version: 5 updated: 2002/10/27 23:21:42
+dnl ----------------------
+dnl Inserted as requested by gettext 0.10.40
+dnl File from /usr/share/aclocal
+dnl progtest.m4
+dnl ====================
 dnl Search path for a program which passes the given test.
 dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
 dnl
 dnl This file can be copied and used freely without restrictions.  It can
-dnl be used in projects which are not available under the GNU Public License
-dnl but which still want to provide support for the GNU gettext functionality.
-dnl Please note that the actual code is *not* freely available.
-dnl
-dnl serial 1
+dnl be used in projects which are not available under the GNU General Public
+dnl License or the GNU Library General Public License but which still want
+dnl to provide support for the GNU gettext functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
 dnl
+dnl serial 2
 dnl
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
 [# Extract the first word of "$2", so it can be a program name with args.
 AC_REQUIRE([CF_PATHSEP])
 set dummy $2; ac_word=[$]2
@@ -208,39 +277,86 @@ ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
   ;;
 esac])dnl
 $1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
   AC_MSG_RESULT([$]$1)
 else
   AC_MSG_RESULT(no)
 fi
 AC_SUBST($1)dnl
-])
-
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl AM_WITH_NLS version: 17 updated: 2004/01/23 19:52:21
+dnl -----------
+dnl Inserted as requested by gettext 0.10.40
+dnl File from /usr/share/aclocal
+dnl gettext.m4
+dnl ====================
 dnl Macro to add for using GNU gettext.
 dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
 dnl
 dnl This file can be copied and used freely without restrictions.  It can
-dnl be used in projects which are not available under the GNU Public License
-dnl but which still want to provide support for the GNU gettext functionality.
-dnl Please note that the actual code is *not* freely available.
+dnl be used in projects which are not available under the GNU General Public
+dnl License or the GNU Library General Public License but which still want
+dnl to provide support for the GNU gettext functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+dnl
+dnl serial 10
 dnl
-dnl serial 5
+dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR], [ENABLED]).
+dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). Otherwise, a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.
+dnl LIBDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl ENABLED is used to control the default for the related --enable-nls, since
+dnl    not all application developers want this feature by default, e.g., lynx.
 dnl
-AC_DEFUN(AM_WITH_NLS,
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_WITH_NLS],
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
+    ifelse([$4],,[
+    AC_ARG_ENABLE(nls,
+      [  --disable-nls           do not use Native Language Support],
+      USE_NLS=$enableval, USE_NLS=yes)],[
     AC_ARG_ENABLE(nls,
       [  --enable-nls            use Native Language Support],
-      USE_NLS=$enableval, USE_NLS=no)
+      USE_NLS=$enableval, USE_NLS=no)])
     AC_MSG_RESULT($USE_NLS)
     AC_SUBST(USE_NLS)
 
+    BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
+    INTLLIBS=
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
+      AC_DEFINE(ENABLE_NLS, 1,
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -251,122 +367,118 @@ AC_DEFUN(AM_WITH_NLS,
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
         dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If gettext or catgets are available (in this order) we
-        dnl use this.  Else we have to fall back to GNU NLS library.
-	dnl catgets is only used if permitted by option --with-catgets.
-	nls_cv_header_intl=
-	nls_cv_header_libgt=
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
 	CATOBJEXT=NONE
 
+        dnl Add a version number to the cache macros.
+        define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
+        define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
+
 	AC_CHECK_HEADER(libintl.h,
-	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
-	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
-	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
-
-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     AC_CHECK_LIB(intl, bindtextdomain,
-	       [ gt_save_LIBS="$LIBS"
-		 LIBS="$gt_save_LIBS -lintl"
-	         AC_CACHE_CHECK([for gettext in libintl],
-		 gt_cv_func_gettext_libintl,
-		 [AC_TRY_LINK([], [return (int) gettext ("")],
-		 gt_cv_func_gettext_libintl=yes,
-		 gt_cv_func_gettext_libintl=no)])
-		 LIBS="$gt_save_LIBS"])
+	  [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+	    [AC_TRY_LINK([#include <libintl.h>
+extern int _nl_msg_cat_cntr;],
+	       [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
+	       gt_cv_func_gnugettext_libc=yes,
+	       gt_cv_func_gnugettext_libc=no)])
+
+	   if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+	     AC_CACHE_CHECK([for GNU gettext in libintl],
+	       gt_cv_func_gnugettext_libintl,
+	       [gt_save_LIBS="$LIBS"
+		LIBS="$LIBS -lintl $LIBICONV"
+		AC_TRY_LINK([#include <libintl.h>
+extern int _nl_msg_cat_cntr;],
+		  [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
+		  gt_cv_func_gnugettext_libintl=yes,
+		  gt_cv_func_gnugettext_libintl=no)
+		LIBS="$gt_save_LIBS"])
 	   fi
 
-	   if test "$gt_cv_func_gettext_libintl" = yes; then
-	     LIBS="$LIBS -lintl"
+	   dnl If an already present or preinstalled GNU gettext() is found,
+	   dnl use it.  But if this macro is used in GNU gettext, and GNU
+	   dnl gettext is already preinstalled in libintl, we update this
+	   dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+	   if test "$gt_cv_func_gnugettext_libc" = "yes" \
+	      || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+		   && test "$PACKAGE" != gettext; }; then
+	     AC_DEFINE(HAVE_GETTEXT, 1,
+               [Define if the GNU gettext() function is already present or preinstalled.])
+
+	     if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+	       dnl If iconv() is in a separate libiconv library, then anyone
+	       dnl linking with libintl{.a,.so} also needs to link with
+	       dnl libiconv.
+	       INTLLIBS="-lintl $LIBICONV"
+	     fi
+
+	     gt_save_LIBS="$LIBS"
+	     LIBS="$LIBS $INTLLIBS"
+	     AC_CHECK_FUNCS(dcgettext)
+	     LIBS="$gt_save_LIBS"
+
+	     dnl Search for GNU msgfmt in the PATH.
+	     AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	       [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
+	     AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+	     dnl Search for GNU xgettext in the PATH.
+	     AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	       [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
+
+	     CATOBJEXT=.gmo
 	   fi
-
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT)
-	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	      if test "$MSGFMT" != "no"; then
-		AC_CHECK_FUNCS(dcgettext)
-		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr],
-		  [CATOBJEXT=.gmo
-		   DATADIRNAME=share],
-		  [CATOBJEXT=.mo
-		   DATADIRNAME=lib])
-		INSTOBJEXT=.mo
-	      fi
-	    fi
 	])
 
         if test "$CATOBJEXT" = "NONE"; then
-	  AC_MSG_CHECKING([whether catgets can be used])
-	  AC_ARG_WITH(catgets,
-	    [  --with-catgets          use catgets functions if available],
-	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
-	  AC_MSG_RESULT($nls_cv_use_catgets)
-
-	  if test "$nls_cv_use_catgets" = "yes"; then
-	    dnl No gettext in C library.  Try catgets next.
-	    AC_CHECK_LIB(i, main)
-	    AC_CHECK_FUNC(catgets,
-	      [AC_DEFINE(HAVE_CATGETS)
-	       INTLOBJS="\$(CATOBJS)"
-	       AC_PATH_PROG(GENCAT, gencat, no)dnl
-	       if test "$GENCAT" != "no"; then
-		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-		 if test "$GMSGFMT" = "no"; then
-		   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-		 fi
-		 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		 USE_INCLUDED_LIBINTL=yes
-		 CATOBJEXT=.cat
-		 INSTOBJEXT=.cat
-		 DATADIRNAME=lib
-		 INTLDEPS='$(top_builddir)/intl/libintl.a'
-		 INTLLIBS=$INTLDEPS
-		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-		 nls_cv_header_intl=intl/libintl.h
-		 nls_cv_header_libgt=intl/libgettext.h
-	       fi])
-	  fi
-        fi
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  dnl Neither gettext nor catgets in included in the C library.
+	  dnl GNU gettext is not found in the C library.
 	  dnl Fall back on GNU gettext library.
 	  nls_cv_use_gnu_gettext=yes
         fi
       fi
 
       if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        if test ! -d $srcdir/intl ; then
+	  AC_MSG_ERROR(no NLS library is packaged with this application)
+	fi
         dnl Mark actions used to generate GNU NLS library.
         INTLOBJS="\$(GETTOBJS)"
         AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+	  [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
         AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
         AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+	  [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
         AC_SUBST(MSGFMT)
+	BUILD_INCLUDED_LIBINTL=yes
 	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
-        INSTOBJEXT=.mo
-        DATADIRNAME=share
-	INTLDEPS='$(top_builddir)/intl/libintl.a'
-	INTLLIBS=$INTLDEPS
-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=intl/libintl.h
-        nls_cv_header_libgt=intl/libgettext.h
+	INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
+	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+      dnl Test whether we really found GNU msgfmt.
+      if test "$GMSGFMT" != ":"; then
+	dnl If it is no GNU msgfmt we define it as : so that the
+	dnl Makefiles still can work.
+	if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
+	  : ;
+	else
+	  AC_MSG_RESULT(
+	    [found msgfmt program is not GNU msgfmt; ignore it])
+	  GMSGFMT=":"
+	fi
       fi
 
+      dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
       dnl Test whether we really found GNU xgettext.
       if test "$XGETTEXT" != ":"; then
 	dnl If it is no GNU xgettext we define it as : so that the
-	dnl makefiles still can work.
-	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+	dnl Makefiles still can work.
+	if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
 	  : ;
 	else
 	  AC_MSG_RESULT(
@@ -375,37 +487,81 @@ AC_DEFUN(AM_WITH_NLS,
 	fi
       fi
 
-      # We need to process the po/ directory.
+      dnl We need to process the po/ directory.
       POSUB=po
-    else
-      DATADIRNAME=share
-      nls_cv_header_intl=intl/libintl.h
-      nls_cv_header_libgt=intl/libgettext.h
     fi
 
-    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-    # because some of the sources are only built for this goal.
+    AC_OUTPUT_COMMANDS(
+     [for ac_file in $CONFIG_FILES; do
+        # Support "outfile[:infile[:infile...]]"
+        case "$ac_file" in
+          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+        esac
+        # PO directories have a Makefile.in generated from Makefile.inn.
+        case "$ac_file" in */[Mm]akefile.in)
+          # Adjust a relative srcdir.
+          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+	  ac_base=`basename $ac_file .in`
+          # In autoconf-2.13 it is called $ac_given_srcdir.
+          # In autoconf-2.50 it is called $srcdir.
+          test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+          case "$ac_given_srcdir" in
+            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+            /*) top_srcdir="$ac_given_srcdir" ;;
+            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+          esac
+          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+            rm -f "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/$ac_base" || echo "creating $ac_dir/$ac_base"
+            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/$ac_base.in" > "$ac_dir/$ac_base"
+          fi
+          ;;
+        esac
+      done])
+
+
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
     if test "$PACKAGE" = gettext; then
-      USE_NLS=yes
-      USE_INCLUDED_LIBINTL=yes
+      BUILD_INCLUDED_LIBINTL=yes
     fi
 
-    # If we really do not use included intl, suppress the command that
-    # would attempt to symlink the two copies of its header.
-    if test "$USE_INCLUDED_LIBINTL" != yes; then
-      nls_cv_header_libgt=
-      nls_cv_header_intl=
+    dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+    dnl because plural.y uses bison specific features. It requires at least
+    dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+    dnl compile.
+    dnl bison is only needed for the maintainer (who touches plural.y). But in
+    dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+    dnl the rule in general Makefile. Now, some people carelessly touch the
+    dnl files or have a broken "make" program, hence the plural.c rule will
+    dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+    dnl present or too old.
+    if test "$nls_cv_use_gnu_gettext" = "yes"; then
+    AC_CHECK_PROGS([INTLBISON], [bison])
+    if test -z "$INTLBISON"; then
+      ac_verc_fail=yes
+    else
+      dnl Found it, now check the version.
+      AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+      case $ac_prog_version in
+        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+      esac
+      AC_MSG_RESULT([$ac_prog_version])
+    fi
+    if test $ac_verc_fail = yes; then
+      INTLBISON=:
+    fi
     fi
-    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
-
-    AC_OUTPUT_COMMANDS([ #(vi
-      case "\$CONFIG_FILES" in
-      *po/makefile.in*) #(vi
-        sed -e "/POTFILES =/r po/POTFILES" po/makefile.in > po/makefile
-        ;;
-      *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
 
     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs
@@ -416,44 +572,78 @@ AC_DEFUN(AM_WITH_NLS,
     done
 
     dnl Make all variables we use known to autoconf.
+    AC_SUBST(BUILD_INCLUDED_LIBINTL)
     AC_SUBST(USE_INCLUDED_LIBINTL)
     AC_SUBST(CATALOGS)
     AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
     AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLDEPS)
     AC_SUBST(INTLLIBS)
     AC_SUBST(INTLOBJS)
     AC_SUBST(POFILES)
     AC_SUBST(POSUB)
-  ])
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST(DATADIRNAME)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST(INSTOBJEXT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST(GENCAT)
+  ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ADD_CFLAGS version: 5 updated: 2002/12/01 00:12:15
+dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
+dnl The second parameter if given makes this macro verbose.
 AC_DEFUN([CF_ADD_CFLAGS],
 [
+cf_new_cflags=
+cf_new_cppflags=
 for cf_add_cflags in $1
 do
 	case $cf_add_cflags in #(vi
 	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
 		case "$CPPFLAGS" in
-		*$cf_add_cflags)
+		*$cf_add_cflags) #(vi
 			;;
-		*)
-			CPPFLAGS="$CPPFLAGS $cf_add_cflags"
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
 		;;
 	*)
-		CFLAGS="$CFLAGS $cf_add_cflags"
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
 		;;
 	esac
 done
+
+if test -n "$cf_new_cflags" ; then
+	ifelse($2,,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+	ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ADD_INCDIR version: 4 updated: 2002/12/21 14:25:52
+dnl -------------
 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
-dnl but old versions (and some misinstalled ones) need that.
+dnl but old versions (and some misinstalled ones) need that.  To make things
+dnl worse, gcc 3.x gives error messages if -I/usr/local/include is added to
+dnl the include-path).
 AC_DEFUN([CF_ADD_INCDIR],
 [
 for cf_add_incdir in $1
@@ -463,17 +653,30 @@ do
 		case $cf_add_incdir in
 		/usr/include) # (vi
 			;;
+		/usr/local/include) # (vi
+			if test "$GCC" = yes
+			then
+				cf_save_CPPFLAGS="$CPPFLAGS"
+				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+				AC_TRY_COMPILE([#include <stdio.h>],
+						[printf("Hello")],
+						[],
+						[CPPFLAGS="$cf_save_CPPFLAGS"])
+			fi
+			;;
 		*) # (vi
 			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			;;
 		esac
-		cf_top_incdir=`echo $cf_add_incdir | sed -e 's:/include/.*$:/include:'`
+		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"
 	done
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ALT_CHAR_SET version: 6 updated: 1998/11/18 14:45:34
+dnl ---------------
 dnl Check for existence of alternate-character-set support in curses, so we
 dnl can decide to use it for box characters.
 dnl
@@ -495,12 +698,13 @@ AC_MSG_RESULT($cf_cv_alt_char_set)
 test $cf_cv_alt_char_set != no && AC_DEFINE_UNQUOTED(ALT_CHAR_SET,$cf_cv_alt_char_set)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34
+dnl ----------------
 dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
 dnl in the sharutils 4.2 distribution.
 AC_DEFUN([CF_ANSI_CC_CHECK],
 [
-AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
-AC_CACHE_VAL(cf_cv_ansi_cc,[
+AC_CACHE_CHECK(for ${CC-cc} option to accept ANSI C, cf_cv_ansi_cc,[
 cf_cv_ansi_cc=no
 cf_save_CFLAGS="$CFLAGS"
 cf_save_CPPFLAGS="$CPPFLAGS"
@@ -536,7 +740,6 @@ done
 CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 ])
-AC_MSG_RESULT($cf_cv_ansi_cc)
 
 if test "$cf_cv_ansi_cc" != "no"; then
 if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
@@ -547,14 +750,20 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
+dnl --------------
 dnl Allow user to disable a normally-on option.
 AC_DEFUN([CF_ARG_DISABLE],
 [CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31
+dnl -------------
 dnl Allow user to enable a normally-off option.
 AC_DEFUN([CF_ARG_ENABLE],
 [CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ARG_OPTION version: 3 updated: 1997/10/18 14:42:41
+dnl -------------
 dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
 dnl values.
 dnl
@@ -576,6 +785,8 @@ ifelse($3,,[    :]dnl
 ])dnl
   ])])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_BOOL_DEFS version: 3 updated: 1998/04/27 20:32:33
+dnl ------------
 dnl Check if curses.h defines TRUE/FALSE (it does under SVr4).
 AC_DEFUN([CF_BOOL_DEFS],
 [
@@ -593,10 +804,26 @@ if test "$cf_cv_bool_defs" = no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_BUNDLED_INTL version: 10 updated: 2003/09/14 18:49:13
+dnl ---------------
 dnl Top-level macro for configuring an application with a bundled copy of
 dnl the intl and po directories for gettext.
 dnl
 dnl $1 specifies either Makefile or makefile, defaulting to the former.
+dnl $2 if nonempty sets the option to --enable-nls rather than to --disable-nls
+dnl
+dnl Sets variables which can be used to substitute in makefiles:
+dnl	INTLDIR_MAKE - to make ./intl directory
+dnl	MSG_DIR_MAKE - to make ./po directory
+dnl	SUB_MAKEFILE - list of makefiles in ./intl, ./po directories
+dnl Defines
+dnl	HAVE_LIBGETTEXT_H if we're using ./intl
+dnl
+dnl Environment:
+dnl	ALL_LINGUAS if set, lists the root names of the ".po" files.
+dnl	CONFIG_H assumed to be "config.h"
+dnl	VERSION may be set, otherwise extract from "VERSION" file.
+dnl
 AC_DEFUN([CF_BUNDLED_INTL],[
 cf_makefile=ifelse($1,,Makefile,$1)
 
@@ -605,53 +832,73 @@ dnl setting $LINGUAS overrides $ALL_LINGUAS.  Some environments set $LINGUAS
 dnl rather than $LC_ALL
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
-AM_GNU_GETTEXT
+# Allow override of "config.h" definition:
+: ${CONFIG_H=config.h}
+AC_SUBST(CONFIG_H)
+
+if test -z "$VERSION" ; then
+if test -f $srcdir/VERSION ; then
+	VERSION=`sed -e '2,$d' $srcdir/VERSION|cut -f1`
+else
+	VERSION=unknown
+fi
+fi
+AC_SUBST(VERSION)
+
+AM_GNU_GETTEXT(,,,[$2])
 
 INTLDIR_MAKE=
 MSG_DIR_MAKE=
 SUB_MAKEFILE=
-CF_OUR_MESSAGES
+
+dnl this updates SUB_MAKEFILE and MSG_DIR_MAKE:
+CF_OUR_MESSAGES($1)
+
 if test "$USE_INCLUDED_LIBINTL" = yes ; then
         if test "$nls_cv_force_use_gnu_gettext" = yes ; then
-		SUB_MAKEFILE="intl/$cf_makefile"
+		:
 	elif test "$nls_cv_use_gnu_gettext" = yes ; then
-		SUB_MAKEFILE="intl/$cf_makefile"
+		:
 	else
 		INTLDIR_MAKE="#"
 	fi
-	if test $use_our_messages = no ; then
-		MSG_DIR_MAKE="#"
-		SUB_MAKEFILE=
-	fi
-	if test "$use_our_messages" = yes ; then
-		SUB_MAKEFILE="$SUB_MAKEFILE po/$cf_makefile.in:po/$cf_makefile.inn"
-	else
-		MSG_DIR_MAKE="#"
+	if test -z "$INTLDIR_MAKE"; then
+		AC_DEFINE(HAVE_LIBGETTEXT_H)
+		for cf_makefile in \
+			$srcdir/intl/Makefile.in \
+			$srcdir/intl/makefile.in
+		do
+			if test -f "$cf_makefile" ; then
+				SUB_MAKEFILE="$SUB_MAKEFILE `echo ${cf_makefile}|sed -e 's/\.in$//'`:${cf_makefile}"
+				break
+			fi
+		done
 	fi
-elif test "$USE_NLS" = yes ; then
-	AC_CHECK_HEADERS(libintl.h)
-	INTLDIR_MAKE="#"
-	SUB_MAKEFILE="po/$cf_makefile.in:po/$cf_makefile.inn"
 else
 	INTLDIR_MAKE="#"
-	MSG_DIR_MAKE="#"
-fi
-
-dnl We might want to use a preinstalled message library rather than the one
-dnl which is bundled with this program.
-if test -z "$MSG_DIR_MAKE" ; then
-	if test $use_our_messages = no ; then
-		MSG_DIR_MAKE="#"
-		SUB_MAKEFILE=
+	if test "$USE_NLS" = yes ; then
+		AC_CHECK_HEADERS(libintl.h)
 	fi
 fi
 
 if test -z "$INTLDIR_MAKE" ; then
-	CPPFLAGS="$CPPFLAGS -I../intl"
+	CPPFLAGS="-I../intl $CPPFLAGS"
+fi
+
+dnl FIXME:  we use this in lynx (the alternative is a spurious dependency upon
+dnl GNU make)
+if test "$BUILD_INCLUDED_LIBINTL" = yes ; then
+	GT_YES="#"
+	GT_NO=
+else
+	GT_YES=
+	GT_NO="#"
 fi
 
 AC_SUBST(INTLDIR_MAKE)
 AC_SUBST(MSG_DIR_MAKE)
+AC_SUBST(GT_YES)
+AC_SUBST(GT_NO)
 
 dnl FIXME:  the underlying AM_GNU_GETTEXT macro either needs some fixes or a
 dnl little documentation.  It doesn't define anything so that we can ifdef our
@@ -669,6 +916,8 @@ if test "$USE_INCLUDED_LIBINTL" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_CACHE version: 8 updated: 2004/01/26 20:58:40
+dnl --------------
 dnl Check if we're accidentally using a cache from a different machine.
 dnl Derive the system name, as a check for reusing the autoconf cache.
 dnl
@@ -678,7 +927,7 @@ dnl an extra parameter that we may override, e.g., for AC_CANONICAL_SYSTEM
 dnl which is useful in cross-compiles.
 AC_DEFUN([CF_CHECK_CACHE],
 [
-if test -f $srcdir/config.guess ; then
+if test -f $ac_config_sub ; then
 	ifelse([$1],,[AC_CANONICAL_HOST],[$1])
 	system_name="$host_os"
 else
@@ -691,7 +940,7 @@ test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name")
 AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"])
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && AC_MSG_RESULT("Configuring for $cf_cv_system_name")
+test -n "$cf_cv_system_name" && AC_MSG_RESULT(Configuring for $cf_cv_system_name)
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
 	AC_MSG_RESULT(Cached system name ($system_name) does not agree with actual ($cf_cv_system_name))
@@ -699,18 +948,38 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_CFLAGS version: 2 updated: 2001/12/30 19:09:58
+dnl ---------------
+dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from
+dnl a build-configuration such as imake.  These have the pitfall that they
+dnl often contain compiler-specific options which we cannot use, mixed with
+dnl preprocessor options that we usually can.
+AC_DEFUN([CF_CHECK_CFLAGS],
+[
+CF_VERBOSE(checking additions to CFLAGS)
+cf_check_cflags="$CFLAGS"
+cf_check_cppflags="$CPPFLAGS"
+CF_ADD_CFLAGS($1,yes)
+if test "$cf_check_cflags" != "$CFLAGS" ; then
+AC_TRY_LINK([#include <stdio.h>],[printf("Hello world");],,
+	[CF_VERBOSE(test-compile failed.  Undoing change to \$CFLAGS)
+	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+		 CF_VERBOSE(but keeping change to \$CPPFLAGS)
+	 fi
+	 CFLAGS="$cf_check_flags"])
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_ERRNO version: 9 updated: 2001/12/30 18:03:23
+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 (I would use AC_CACHE_CHECK here, but it will not work when called in a
-dnl loop from CF_SYS_ERRLIST).
-dnl
 dnl $1 = the name to check
 AC_DEFUN([CF_CHECK_ERRNO],
 [
-AC_MSG_CHECKING(if external $1 is declared)
-AC_CACHE_VAL(cf_cv_dcl_$1,[
+AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[
     AC_TRY_COMPILE([
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -719,16 +988,12 @@ AC_CACHE_VAL(cf_cv_dcl_$1,[
 #include <sys/types.h>
 #include <errno.h> ],
     [long x = (long) $1],
-    [eval 'cf_cv_dcl_'$1'=yes'],
-    [eval 'cf_cv_dcl_'$1'=no'])
+    [cf_cv_dcl_$1=yes],
+    [cf_cv_dcl_$1=no])
 ])
 
-eval 'cf_result=$cf_cv_dcl_'$1
-AC_MSG_RESULT($cf_result)
-
-if test "$cf_result" = no ; then
-    eval 'cf_result=DECL_'$1
-    CF_UPPER(cf_result,$cf_result)
+if test "$cf_cv_dcl_$1" = no ; then
+    CF_UPPER(cf_result,decl_$1)
     AC_DEFINE_UNQUOTED($cf_result)
 fi
 
@@ -736,33 +1001,33 @@ fi
 CF_CHECK_EXTERN_DATA($1,int)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_EXTERN_DATA version: 3 updated: 2001/12/30 18:03:23
+dnl --------------------
 dnl Check for existence of external data in the current set of libraries.  If
 dnl we can modify it, it's real enough.
 dnl $1 = the name to check
 dnl $2 = its type
 AC_DEFUN([CF_CHECK_EXTERN_DATA],
 [
-AC_MSG_CHECKING(if external $1 exists)
-AC_CACHE_VAL(cf_cv_have_$1,[
+AC_CACHE_CHECK(if external $1 exists, cf_cv_have_$1,[
     AC_TRY_LINK([
 #undef $1
 extern $2 $1;
 ],
     [$1 = 2],
-    [eval 'cf_cv_have_'$1'=yes'],
-    [eval 'cf_cv_have_'$1'=no'])])
-
-eval 'cf_result=$cf_cv_have_'$1
-AC_MSG_RESULT($cf_result)
+    [cf_cv_have_$1=yes],
+    [cf_cv_have_$1=no])
+])
 
-if test "$cf_result" = yes ; then
-    eval 'cf_result=HAVE_'$1
-    CF_UPPER(cf_result,$cf_result)
+if test "$cf_cv_have_$1" = yes ; then
+    CF_UPPER(cf_result,have_$1)
     AC_DEFINE_UNQUOTED($cf_result)
 fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_FUNCDECL version: 6 updated: 1999/03/30 12:24:31
+dnl -----------------
 dnl Check if a function is declared by including a set of include files.
 dnl Invoke the corresponding actions according to whether it is found or not.
 dnl
@@ -796,6 +1061,8 @@ ifelse([$4], , , [$4
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_FUNCDECLS version: 4 updated: 1999/03/30 12:24:31
+dnl ------------------
 dnl Check if functions are declared by including a set of include files.
 dnl and define DECL_XXX if not.
 dnl
@@ -811,6 +1078,8 @@ CF_CHECK_FUNCDECL([$1], $ac_func,
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_IPV6 version: 3 updated: 2004/01/22 17:38:22
+dnl -------------
 dnl Check for IPV6 configuration.
 AC_DEFUN([CF_CHECK_IPV6],[
 CF_FIND_IPV6_TYPE
@@ -820,7 +1089,7 @@ CF_FUNC_GETADDRINFO
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		AC_MSG_ERROR(
+		AC_MSG_WARN(
 [You must get working getaddrinfo() function,
 or you can specify "--disable-ipv6"])
 	else
@@ -833,6 +1102,8 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_COLOR_CURSES version: 6 updated: 2002/10/27 18:21:42
+dnl ---------------
 dnl Check if curses supports color.  (Note that while SVr3 curses supports
 dnl color, it does this differently from SVr4 curses; more work would be needed
 dnl to accommodate SVr3).
@@ -859,8 +1130,10 @@ if test $cf_cv_color_curses = yes ; then
 	AC_DEFINE(COLOR_CURSES)
 	test ".$cf_cv_ncurses_broken" != .yes && AC_DEFINE(HAVE_GETBKGD)
 fi
-])
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_CPPFLAGS version: 7 updated: 2003/06/06 00:48:41
+dnl ------------------
 dnl Look for the curses headers.
 AC_DEFUN([CF_CURSES_CPPFLAGS],[
 
@@ -878,10 +1151,10 @@ sunos3*|sunos4*)
 	;;
 esac
 ])
-test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
+test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
 AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
-cf_cv_ncurses_header=curses.h
+cf_cv_ncurses_header=none
 for cf_header in \
 	curses.h \
 	ncurses.h \
@@ -894,15 +1167,23 @@ AC_TRY_COMPILE([#include <${cf_header}>],
 done
 ])
 
+if test "$cf_cv_ncurses_header" = none ; then
+	AC_MSG_ERROR(No curses header-files found)
+fi
+
 # cheat, to get the right #define's for HAVE_NCURSES_H, etc.
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
 
-])
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_FUNCS version: 12 updated: 2003/11/06 19:59:57
+dnl ---------------
 dnl Curses-functions are a little complicated, since a lot of them are macros.
 AC_DEFUN([CF_CURSES_FUNCS],
 [
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_REQUIRE([CF_XOPEN_CURSES])
+AC_REQUIRE([CF_CURSES_TERM_H])
 for cf_func in $1
 do
 	CF_UPPER(cf_tr_func,$cf_func)
@@ -917,6 +1198,9 @@ do
 char * XCursesProgramName = "test";
 #else
 #include <${cf_cv_ncurses_header-curses.h}>
+#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
+#include <ncursesw/term.h>
+#else
 #if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
 #include <ncurses/term.h>
 #else
@@ -924,6 +1208,7 @@ char * XCursesProgramName = "test";
 #include <term.h>
 #endif
 #endif
+#endif
 #endif],
 			[
 #ifndef ${cf_func}
@@ -945,10 +1230,13 @@ exit(foo == 0);
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_LIBS version: 23 updated: 2003/11/06 19:59:57
+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.
 AC_DEFUN([CF_CURSES_LIBS],[
 
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_MSG_CHECKING(if we have identified curses libraries)
 AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
 	[initscr(); tgoto("?", 0,0)],
@@ -1040,8 +1328,50 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 fi
 fi
 
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_TERM_H version: 6 updated: 2003/11/06 19:59:57
+dnl ----------------
+dnl SVr4 curses should have term.h as well (where it puts the definitions of
+dnl the low-level interface).  This may not be true in old/broken implementations,
+dnl as well as in misconfigured systems (e.g., gcc configured for Solaris 2.4
+dnl running with Solaris 2.5.1).
+AC_DEFUN([CF_CURSES_TERM_H],
+[
+AC_CACHE_CHECK(for term.h, cf_cv_term_header,[
+
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
+# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
+# for <term.h> if we do not find the variant.
+for cf_header in \
+	`echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \
+	term.h
+do
+	AC_TRY_COMPILE([
+#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_header}>],
+	[WINDOW *x],
+	[cf_cv_term_header=$cf_header
+	 break],
+	[cf_cv_term_header=no])
+done
 ])
+
+case $cf_cv_term_header in #(vi
+term.h) #(vi
+	AC_DEFINE(HAVE_TERM_H)
+	;;
+ncurses/term.h)
+	AC_DEFINE(HAVE_NCURSES_TERM_H)
+	;;
+ncursesw/term.h)
+	AC_DEFINE(HAVE_NCURSESW_TERM_H)
+	;;
+esac
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CURS_PERFORMANCE version: 3 updated: 1998/04/27 20:32:33
+dnl -------------------
 dnl Solaris 2.x curses provides a "performance" tradeoff according to whether
 dnl CURS_PERFORMANCE is defined.  If defined, the implementation defines macros
 dnl that access the WINDOW structure.  Otherwise, function calls are used.
@@ -1071,6 +1401,8 @@ AC_MSG_RESULT($cf_cv_curs_performance)
 test $cf_cv_curs_performance = yes && AC_DEFINE(CURS_PERFORMANCE)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CURS_TOUCHLINE version: 2 updated: 2001/05/13 13:42:46
+dnl -----------------
 dnl Check for the flavor of the touchline function, to distinguish between BSD
 dnl and SYSV.  This is needed on NetBSD 1.5 which has a partial implementation
 dnl of SVR4 curses.
@@ -1095,6 +1427,8 @@ sysv)
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_DEFINE_PROG version: 3 updated: 2002/10/27 18:21:42
+dnl --------------
 dnl Check for a program in the given list $3, defining the corresponding
 dnl program variable $2.
 dnl
@@ -1112,15 +1446,20 @@ AC_CACHE_VAL(cf_cv_$2,[
 	])
 AC_MSG_RESULT($cf_cv_$2)
 AC_DEFINE_UNQUOTED($2,"$cf_cv_$2")
-])
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
+dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.
-AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's:/[[^/]]*$::'`])dnl
+AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_DISABLE_ECHO version: 10 updated: 2003/04/17 22:27:11
+dnl ---------------
 dnl You can always use "make -n" to see the actual options, but it's hard to
 dnl pick out/analyze warning messages when the compile-line is long.
 dnl
 dnl Sets:
+dnl	ECHO_LT - symbol to control if libtool is verbose
 dnl	ECHO_LD - symbol to prefix "cc -o" lines
 dnl	RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o)
 dnl	SHOW_CC - symbol to put before explicit "cc -c" lines
@@ -1131,29 +1470,36 @@ AC_MSG_CHECKING(if you want to see long compiling messages)
 CF_ARG_DISABLE(echo,
 	[  --disable-echo          display "compiling" commands],
 	[
+    ECHO_LT='--silent'
     ECHO_LD='@echo linking [$]@;'
     RULE_CC='	@echo compiling [$]<'
     SHOW_CC='	@echo compiling [$]@'
     ECHO_CC='@'
 ],[
+    ECHO_LT=''
     ECHO_LD=''
     RULE_CC='# compiling'
     SHOW_CC='# compiling'
     ECHO_CC=''
 ])
 AC_MSG_RESULT($enableval)
+AC_SUBST(ECHO_LT)
 AC_SUBST(ECHO_LD)
 AC_SUBST(RULE_CC)
 AC_SUBST(SHOW_CC)
 AC_SUBST(ECHO_CC)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39
+dnl --------
 dnl Check if 'errno' is declared in <errno.h>
 AC_DEFUN([CF_ERRNO],
 [
 CF_CHECK_ERRNO(errno)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_FANCY_CURSES version: 4 updated: 2002/10/27 18:21:42
+dnl ---------------
 AC_DEFUN([CF_FANCY_CURSES],
 [
 AC_MSG_CHECKING(if curses supports fancy attributes)
@@ -1171,8 +1517,10 @@ AC_CACHE_VAL(cf_cv_fancy_curses,[
 	])
 AC_MSG_RESULT($cf_cv_fancy_curses)
 test $cf_cv_fancy_curses = yes && AC_DEFINE(FANCY_CURSES)
-])
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_FIND_IPV6_LIBS version: 6 updated: 2002/11/09 09:05:18
+dnl -----------------
 dnl Based on the IPV6 stack type, look for the corresponding library.
 AC_DEFUN([CF_FIND_IPV6_LIBS],[
 AC_REQUIRE([CF_FIND_IPV6_TYPE])
@@ -1180,7 +1528,7 @@ AC_REQUIRE([CF_FIND_IPV6_TYPE])
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-AC_MSG_CHECKING(for ipv6 library if required)
+AC_MSG_CHECKING(for IPv6 library if required)
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
 	;;
@@ -1246,12 +1594,14 @@ if test "$cf_ipv6lib" != "none"; then
 	if test $cf_found_library = no ; then
 		AC_MSG_ERROR(
 [No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
-from an appropriate ipv6 kit and compile beforehand.])
+from an appropriate IPv6 kit and compile beforehand.])
 	fi
 fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_FIND_IPV6_TYPE version: 5 updated: 2001/10/11 20:46:17
+dnl -----------------
 AC_DEFUN([CF_FIND_IPV6_TYPE],[
 AC_CACHE_CHECK(ipv6 stack type, cf_cv_ipv6type, [
 cf_cv_ipv6type=unknown
@@ -1269,7 +1619,7 @@ do
 		;;
 	inria) #(vi
 		dnl http://www.kame.net/
-		AC_EGREP_CPP(yes, [dnl
+		AC_EGREP_CPP(yes, [
 #include <netinet/in.h>
 #ifdef IPV6_INRIA_VERSION
 yes
@@ -1277,7 +1627,7 @@ yes
 		;;
 	kame) #(vi
 		dnl http://www.kame.net/
-		AC_EGREP_CPP(yes, [dnl
+		AC_EGREP_CPP(yes, [
 #include <netinet/in.h>
 #ifdef __KAME__
 yes
@@ -1285,7 +1635,7 @@ yes
 		;;
 	linux-glibc) #(vi
 		dnl http://www.v6.linux.or.jp/
-		AC_EGREP_CPP(yes, [dnl
+		AC_EGREP_CPP(yes, [
 #include <features.h>
 #if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
 yes
@@ -1302,21 +1652,21 @@ yes
 		fi
 		;;
 	toshiba) #(vi
-		AC_EGREP_CPP(yes, [dnl
+		AC_EGREP_CPP(yes, [
 #include <sys/param.h>
 #ifdef _TOSHIBA_INET6
 yes
 #endif],	[cf_cv_ipv6type=$i])
 		;;
 	v6d) #(vi
-		AC_EGREP_CPP(yes, [dnl
+		AC_EGREP_CPP(yes, [
 #include </usr/local/v6/include/sys/v6config.h>
 #ifdef __V6D__
 yes
 #endif],	[cf_cv_ipv6type=$i])
 		;;
 	zeta)
-		AC_EGREP_CPP(yes, [dnl
+		AC_EGREP_CPP(yes, [
 #include <sys/param.h>
 #ifdef _ZETA_MINAMI_INET6
 yes
@@ -1330,6 +1680,8 @@ done
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_FIND_LIBRARY version: 7 updated: 2000/04/13 21:38:04
+dnl ---------------
 dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
 dnl prefer a standard location, and use -L options only if we do not find the
 dnl library in the standard library location(s).
@@ -1378,6 +1730,8 @@ fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_FIONBIO version: 2 updated: 1998/02/24 06:51:46
+dnl ----------
 dnl Check for availability of fcntl versus ioctl(,FIONBIO,).  Lynx uses this
 dnl for Sequent (ptx), and it is needed for OS/2 EMX.
 AC_DEFUN([CF_FIONBIO],
@@ -1406,6 +1760,8 @@ AC_TRY_LINK([
 test "$cf_cv_fionbio" = "fcntl" && AC_DEFINE(USE_FCNTL)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_GETADDRINFO version: 5 updated: 2000/09/28 06:18:08
+dnl -------------------
 dnl Look for a working version of getaddrinfo(), for IPV6 support.
 AC_DEFUN([CF_FUNC_GETADDRINFO],[
 AC_CACHE_CHECK(working getaddrinfo, cf_cv_getaddrinfo,[
@@ -1495,6 +1851,8 @@ if test "$cf_cv_getaddrinfo" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_LSTAT version: 2 updated: 1997/09/07 13:00:21
+dnl -------------
 dnl A conventional existence-check for 'lstat' won't work with the Linux
 dnl version of gcc 2.7.0, since the symbol is defined only within <sys/stat.h>
 dnl as an inline function.
@@ -1517,6 +1875,8 @@ if test $ac_cv_func_lstat = yes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_SIGACTION version: 2 updated: 1999/07/28 06:09:35
+dnl -----------------
 dnl Check if we have the sigaction function and related structures.
 AC_DEFUN([CF_FUNC_SIGACTION],[
 AC_CACHE_CHECK(for sigaction and structs,cf_cv_func_sigaction,[
@@ -1536,6 +1896,8 @@ AC_TRY_LINK([
 test "$cf_cv_func_sigaction" = yes && AC_DEFINE(HAVE_SIGACTION)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_WAIT version: 2 updated: 1997/10/21 19:45:33
+dnl ------------
 dnl Test for the presence of <sys/wait.h>, 'union wait', arg-type of 'wait()'
 dnl and/or 'waitpid()'.
 dnl
@@ -1574,6 +1936,8 @@ if test $cf_cv_type_unionwait = yes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_GCC_ATTRIBUTES version: 9 updated: 2002/12/21 19:25:52
+dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
 dnl to documentation, unrecognized directives cause older compilers to barf.
@@ -1638,8 +2002,6 @@ EOF
 		if AC_TRY_EVAL(ac_compile); then
 			test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
 			cat conftest.h >>confdefs.h
-#		else
-#			sed -e 's/__attr.*/\/*nothing*\//' conftest.h >>confdefs.h
 		fi
 	done
 else
@@ -1649,17 +2011,35 @@ rm -rf conftest*
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_GCC_VERSION version: 3 updated: 2003/09/06 19:16:57
+dnl --------------
+dnl Find version of gcc
+AC_DEFUN([CF_GCC_VERSION],[
+AC_REQUIRE([AC_PROG_CC])
+GCC_VERSION=none
+if test "$GCC" = yes ; then
+	AC_MSG_CHECKING(version of $CC)
+	GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+	AC_MSG_RESULT($GCC_VERSION)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_GCC_WARNINGS version: 15 updated: 2003/07/05 18:42:30
+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:
 dnl
 dnl	-Wconversion (useful in older versions of gcc, but not in gcc 2.7.x)
 dnl	-Wredundant-decls (system headers make this too noisy)
 dnl	-Wtraditional (combines too many unrelated messages, only a few useful)
-dnl	-Wwrite-strings (too noisy, but should review occasionally)
+dnl	-Wwrite-strings (too noisy, but should review occasionally).  This
+dnl		is enabled for ncurses using "--enable-const".
 dnl	-pedantic
 dnl
 AC_DEFUN([CF_GCC_WARNINGS],
 [
+AC_REQUIRE([CF_GCC_VERSION])
 if test "$GCC" = yes
 then
 	cat > conftest.$ac_ext <<EOF
@@ -1681,13 +2061,25 @@ EOF
 		Wnested-externs \
 		Wpointer-arith \
 		Wshadow \
-		Wstrict-prototypes $cf_warn_CONST
+		Wstrict-prototypes \
+		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 		if AC_TRY_EVAL(ac_compile); then
 			test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
+			case $cf_opt in #(vi
+			Wcast-qual) #(vi
+				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
+				;;
+			Winline) #(vi
+				case $GCC_VERSION in
+				3.3*)
+					CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
+					continue;;
+				esac
+				;;
+			esac
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-			test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
 		fi
 	done
 	rm -f conftest*
@@ -1696,6 +2088,8 @@ fi
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_GNU_SOURCE version: 3 updated: 2000/10/29 23:30:53
+dnl -------------
 dnl Check if we must define _GNU_SOURCE to get a reasonable value for
 dnl _XOPEN_SOURCE, upon which many POSIX definitions depend.  This is a defect
 dnl (or misfeature) of glibc2, which breaks portability of many applications,
@@ -1724,41 +2118,120 @@ make an error
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_GNUTLS version: 3 updated: 2003/10/05 17:34:54
+dnl ---------
+dnl Check for gnutls library (TLS "is" SSL)
+dnl $1 = the [optional] directory in which the library may be found
+AC_DEFUN([CF_GNUTLS],[
+cf_ssl_library="-lgnutls-extra -lgnutls -lcrypt"
+case "$1" in #(vi
+no) #(vi
+  ;;
+yes) #(vi
+  AC_CHECK_LIB(gnutls, SSL_connect,[],[
+  	if test -d /usr/local/gnutls ; then
+		CF_VERBOSE(assume it is in /usr/local/gnutls)
+		cf_ssl_library="-L/usr/local/gnutls/lib $cf_ssl_library"
+		CPPFLAGS="-I/usr/local/gnutls/include $CPPFLAGS"
+	else
+		AC_MSG_ERROR(cannot find gnutls library)
+	fi
+	],
+	[-lgnutls-extra -lgnutls -lcrypt])
+  ;;
+*)
+  if test -d $1 ; then
+    if test -d $1/include ; then
+      CPPFLAGS="$CPPFLAGS -I$1/include"
+      cf_ssl_library="-L$1/lib $cf_ssl_library"
+    else
+      cf_ssl_library="-L$1 $cf_ssl_library"
+      test -d $1/../include && CPPFLAGS="$CPPFLAGS -I$1/../include"
+    fi
+  else
+    AC_MSG_WARN(expected a directory: $1)
+  fi
+  ;;
+esac
+LIBS="$cf_ssl_library $LIBS"
+
+AC_MSG_CHECKING(for gnutls include directory)
+AC_TRY_COMPILE([
+#include <stdio.h>
+#include <gnutls/openssl.h>],
+	[SSL_shutdown((SSL *)0)],
+	[cf_openssl_incl=yes],
+	[cf_openssl_incl=no])
+AC_MSG_RESULT($cf_openssl_incl)
+test "$cf_openssl_incl" = yes && AC_DEFINE(USE_GNUTLS_INCL)
+
+AC_MSG_CHECKING(if we can link to gnutls library)
+AC_TRY_LINK([
+#include <stdio.h>
+#ifdef USE_GNUTLS_INCL
+#include <gnutls/openssl.h>
+#else
+#include <ssl.h>
+#endif
+],
+	[SSL_shutdown((SSL *)0)],
+	[cf_ssl_library=yes],
+	[cf_ssl_library=no])
+AC_MSG_RESULT($cf_ssl_library)
+if test "$cf_ssl_library" = yes ; then
+	AC_DEFINE(USE_SSL)
+else
+	AC_ERROR(Cannot link with gnutls library)
+fi
+
+AC_MSG_CHECKING(for X509 support)
+AC_TRY_LINK([
+#include <stdio.h>
+#ifdef USE_GNUTLS_INCL
+#include <gnutls/openssl.h>
+#else
+#include <ssl.h>
+#endif
+],
+	[X509_verify_cert_error_string(X509_STORE_CTX_get_error(X509_STORE_CTX *0))];
+	[cf_x509_support=yes],
+	[cf_x509_support=no])
+AC_MSG_RESULT($cf_x509_support)
+if test "$cf_x509_support" = yes ; then
+	AC_DEFINE(USE_X509_SUPPORT)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59
+dnl --------------
 dnl Construct a search-list for a nonstandard header-file
 AC_DEFUN([CF_HEADER_PATH],
-[$1=""
-
+[CF_SUBDIR_PATH($1,$2,include)
 test "$includedir" != NONE && \
-test -d "$includedir" && \
-$1="[$]$1 $includedir $includedir/$2"
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+	test -d $includedir &&    $1="[$]$1 $includedir"
+	test -d $includedir/$2 && $1="[$]$1 $includedir/$2"
+}
 
 test "$oldincludedir" != NONE && \
-test -d "$oldincludedir" && \
-$1="[$]$1 $oldincludedir $oldincludedir/$2"
-
-test "$prefix" != NONE && \
-test -d "$prefix" && \
-$1="[$]$1 $prefix/include $prefix/include/$2 $prefix/$2/include"
-
-test "$prefix" != /usr/local && \
-test -d /usr/local && \
-$1="[$]$1 /usr/local/include /usr/local/include/$2 /usr/local/$2/include"
-
-test "$prefix" != /usr && \
-$1="[$]$1 /usr/include /usr/include/$2 /usr/$2/include"
-
-test "$prefix" != /opt && \
-test -d /opt && \
-$1="[$]$1 /opt/include /opt/include/$2 /opt/$2/include"
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+	test -d $oldincludedir    && $1="[$]$1 $oldincludedir"
+	test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
+}
 
-$1="[$]$1 [$]HOME/lib [$]HOME/lib/$2 [$]HOME/$2/lib"
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
+dnl ---------------
 dnl Insert text into the help-message, for readability, from AC_ARG_WITH.
 AC_DEFUN([CF_HELP_MESSAGE],
 [AC_DIVERT_HELP([$1])dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_INET_ADDR version: 4 updated: 1999/03/30 12:24:31
+dnl ------------
 dnl For Lynx, check if the libraries we have found give us inet_aton, or
 dnl inet_addr.  If not, try to find the latter function with -lbind or
 dnl -lresolv, and put that on the end of the libraries, i.e., after the network
@@ -1811,6 +2284,8 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_LASTLOG version: 4 updated: 2002/10/27 23:21:42
+dnl ----------
 dnl Check for header defining _PATH_LASTLOG, or failing that, see if the lastlog
 dnl file exists.
 AC_DEFUN([CF_LASTLOG],
@@ -1834,44 +2309,18 @@ AC_TRY_COMPILE([
 	fi])
 ])
 test $cf_cv_path_lastlog != no && AC_DEFINE(USE_LASTLOG)
-]
-)dnl
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_LIBRARY_PATH version: 7 updated: 2002/11/10 14:46:59
+dnl ---------------
 dnl Construct a search-list for a nonstandard library-file
 AC_DEFUN([CF_LIBRARY_PATH],
-[$1=""
-
-test "$libdir" != NONE && \
-test -d $libdir && \
-$1="[$]$1 $libdir $libdir/$2"
-
-test "$exec_prefix" != NONE && \
-test -d $exec_prefix && \
-$1="[$]$1 $exec_prefix/lib $exec_prefix/lib/$2"
-
-test "$prefix" != NONE && \
-test "$prefix" != "$exec_prefix" && \
-test -d $prefix && \
-$1="[$]$1 $prefix/lib $prefix/lib/$2 $prefix/$2/lib"
-
-test "$prefix" != /usr/local && \
-test -d /usr/local && \
-$1="[$]$1 /usr/local/lib /usr/local/lib/$2 /usr/local/$2/lib"
-
-test "$prefix" != /usr && \
-$1="[$]$1 /usr/lib /usr/lib/$2 /usr/$2/lib"
-
-test "$prefix" != / && \
-$1="[$]$1 /lib /lib/$2 /$2/lib"
-
-test "$prefix" != /opt && \
-test -d /opt && \
-$1="[$]$1 /opt/lib /opt/lib/$2 /opt/$2/lib"
-
-$1="[$]$1 [$]HOME/lib [$]HOME/lib/$2 [$]HOME/$2/lib"
-])dnl
+[CF_SUBDIR_PATH($1,$2,lib)])dnl
 dnl ---------------------------------------------------------------------------
-dnl Check if we've got setlocale() and its header, <locale.h>
+dnl CF_LOCALE version: 4 updated: 2003/02/16 08:16:04
+dnl ---------
+dnl Check if we have setlocale() and its header, <locale.h>
+dnl The optional parameter $1 tells what to do if we do have locale support.
 AC_DEFUN([CF_LOCALE],
 [
 AC_MSG_CHECKING(for setlocale())
@@ -1882,15 +2331,19 @@ AC_TRY_LINK([#include <locale.h>],
 	[cf_cv_locale=no])
 	])
 AC_MSG_RESULT($cf_cv_locale)
-test $cf_cv_locale = yes && AC_DEFINE(LOCALE)
-])
+test $cf_cv_locale = yes && { ifelse($1,,AC_DEFINE(LOCALE),[$1]) }
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_MSG_LOG version: 3 updated: 1997/09/07 14:05:52
+dnl ----------
 dnl Write a debug message to config.log, along with the line number in the
 dnl configure script.
 AC_DEFUN([CF_MSG_LOG],[
 echo "(line __oline__) testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_NCURSES_BROKEN version: 6 updated: 1998/04/27 20:32:34
+dnl -----------------
 dnl Check for pre-1.9.9g ncurses (among other problems, the most obvious is
 dnl that color combinations don't work).
 AC_DEFUN([CF_NCURSES_BROKEN],
@@ -1918,6 +2371,41 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_NCURSES_CC_CHECK version: 3 updated: 2003/01/12 18:59:28
+dnl -------------------
+dnl Check if we can compile with ncurses' header file
+dnl $1 is the cache variable to set
+dnl $2 is the header-file to include
+dnl $3 is the root name (ncurses or ncursesw)
+AC_DEFUN([CF_NCURSES_CC_CHECK],[
+	AC_TRY_COMPILE([
+]ifelse($3,ncursesw,[
+#define _XOPEN_SOURCE_EXTENDED
+#undef  HAVE_LIBUTF8_H	/* in case we used CF_UTF8_LIB */
+#define HAVE_LIBUTF8_H	/* to force ncurses' header file to use cchar_t */
+])[
+#include <$2>],[
+#ifdef NCURSES_VERSION
+]ifelse($3,ncursesw,[
+#ifndef WACS_BSSB
+	make an error
+#endif
+])[
+printf("%s\n", NCURSES_VERSION);
+#else
+#ifdef __NCURSES_H
+printf("old\n");
+#else
+	make an error
+#endif
+#endif
+	]
+	,[$1=$cf_header]
+	,[$1=no])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_NCURSES_CPPFLAGS version: 17 updated: 2003/11/06 19:59:57
+dnl -------------------
 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
 dnl the CPPFLAGS variable so we can include its header.
 dnl
@@ -1934,63 +2422,62 @@ dnl If the installer has set $CFLAGS or $CPPFLAGS so that the ncurses header
 dnl is already in the include-path, don't even bother with this, since we cannot
 dnl easily determine which file it is.  In this case, it has to be <curses.h>.
 dnl
+dnl The optional parameter gives the root name of the library, in case it is
+dnl not installed as the default curses library.  That is how the
+dnl wide-character version of ncurses is installed.
 AC_DEFUN([CF_NCURSES_CPPFLAGS],
-[
-AC_CACHE_CHECK(for ncurses header in include-path, cf_cv_ncurses_h,[
-	for cf_header in \
-		curses.h \
-		ncurses.h \
-		ncurses/curses.h \
-		ncurses/ncurses.h
+[AC_REQUIRE([CF_WITH_CURSES_DIR])
+
+AC_PROVIDE([CF_CURSES_CPPFLAGS])dnl
+cf_ncuhdr_root=ifelse($1,,ncurses,$1)
+
+test -n "$cf_cv_curses_dir" && \
+test "$cf_cv_curses_dir" != "no" && \
+CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
+
+AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[
+	cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
+	( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h"
+	for cf_header in $cf_header_list
 	do
-	AC_TRY_COMPILE([#include <$cf_header>],[
-#ifdef NCURSES_VERSION
-printf("%s\n", NCURSES_VERSION);
-#else
-#ifdef __NCURSES_H
-printf("old\n");
-#else
-make an error
-#endif
-#endif
-	]
-	,[cf_cv_ncurses_h=$cf_header; break]
-	,[cf_cv_ncurses_h=no])
+		CF_NCURSES_CC_CHECK(cf_cv_ncurses_h,$cf_header,$1)
+		test "$cf_cv_ncurses_h" != no && break
 	done
 ])
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
-AC_CACHE_CHECK(for ncurses include-path, cf_cv_ncurses_h2,[
-	CF_HEADER_PATH(cf_search,ncurses)
+AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
 	test -n "$verbose" && echo
+	CF_HEADER_PATH(cf_search,$cf_ncuhdr_root)
+	test -n "$verbose" && echo search path $cf_search
+	cf_save2_CPPFLAGS="$CPPFLAGS"
 	for cf_incdir in $cf_search
 	do
+		CF_ADD_INCDIR($cf_incdir)
 		for cf_header in \
 			ncurses.h \
 			curses.h
 		do
-			if egrep "NCURSES_[[VH]]" $cf_incdir/$cf_header 1>&AC_FD_CC 2>&1; then
+			CF_NCURSES_CC_CHECK(cf_cv_ncurses_h2,$cf_header,$1)
+			if test "$cf_cv_ncurses_h2" != no ; then
 				cf_cv_ncurses_h2=$cf_incdir/$cf_header
 				test -n "$verbose" && echo $ac_n "	... found $ac_c" 1>&AC_FD_MSG
 				break
 			fi
 			test -n "$verbose" && echo "	... tested $cf_incdir/$cf_header" 1>&AC_FD_MSG
 		done
-		test -n "$cf_cv_ncurses_h2" && break
+		CPPFLAGS="$cf_save2_CPPFLAGS"
+		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test -z "$cf_cv_ncurses_h2" && AC_ERROR(not found)
+	test "$cf_cv_ncurses_h2" = no && AC_ERROR(not found)
 	])
 
 	CF_DIRNAME(cf_1st_incdir,$cf_cv_ncurses_h2)
-	CF_DIRNAME(cf_2nd_incdir,$cf_1st_incdir)
 	cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2`
-	echo cf_1st_include=$cf_1st_incdir
-	echo cf_2nd_include=$cf_2nd_incdir
-	if test `basename $cf_1st_incdir` = ncurses ; then
-		cf_cv_ncurses_header=ncurses/$cf_cv_ncurses_header
-		CF_ADD_INCDIR($cf_2nd_incdir)
+	if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then
+		cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
 	fi
 	CF_ADD_INCDIR($cf_1st_incdir)
 
@@ -1998,7 +2485,6 @@ fi
 
 AC_DEFINE(NCURSES)
 
-
 case $cf_cv_ncurses_header in # (vi
 *ncurses.h)
 	AC_DEFINE(HAVE_NCURSES_H)
@@ -2009,20 +2495,30 @@ case $cf_cv_ncurses_header in # (vi
 ncurses/curses.h|ncurses/ncurses.h)
 	AC_DEFINE(HAVE_NCURSES_NCURSES_H)
 	;;
+ncursesw/curses.h|ncursesw/ncurses.h)
+	AC_DEFINE(HAVE_NCURSESW_NCURSES_H)
+	;;
 esac
 
 CF_NCURSES_VERSION
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_NCURSES_LIBS version: 11 updated: 2002/12/22 14:22:25
+dnl ---------------
 dnl Look for the ncurses library.  This is a little complicated on Linux,
 dnl because it may be linked with the gpm (general purpose mouse) library.
 dnl Some distributions have gpm linked with (bsd) curses, which makes it
 dnl unusable with ncurses.  However, we don't want to link with gpm unless
 dnl ncurses has a dependency, since gpm is normally set up as a shared library,
 dnl and the linker will record a dependency.
+dnl
+dnl The optional parameter gives the root name of the library, in case it is
+dnl not installed as the default curses library.  That is how the
+dnl wide-character version of ncurses is installed.
 AC_DEFUN([CF_NCURSES_LIBS],
 [AC_REQUIRE([CF_NCURSES_CPPFLAGS])
 
+cf_nculib_root=ifelse($1,,ncurses,$1)
 	# This works, except for the special case where we find gpm, but
 	# ncurses is in a nonstandard location via $LIBS, and we really want
 	# to link gpm.
@@ -2042,16 +2538,22 @@ freebsd*)
 esac
 
 LIBS="$cf_ncurses_LIBS $LIBS"
-CF_FIND_LIBRARY(ncurses,ncurses,
-	[#include <${cf_cv_ncurses_header-curses.h}>],
-	[initscr()],
-	initscr)
+
+if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+then
+	LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS"
+else
+	CF_FIND_LIBRARY($cf_nculib_root,$cf_nculib_root,
+		[#include <${cf_cv_ncurses_header-curses.h}>],
+		[initscr()],
+		initscr)
+fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	AC_MSG_CHECKING(if we can link ncurses without $cf_ncurses_LIBS)
+	AC_MSG_CHECKING(if we can link $cf_nculib_root without $cf_ncurses_LIBS)
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
-		q=`echo $LIBS | sed -e 's/'$p' //' -e 's/'$p'$//'`
+		q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
 		if test "$q" != "$LIBS" ; then
 			LIBS="$q"
 		fi
@@ -2062,13 +2564,19 @@ if test -n "$cf_ncurses_LIBS" ; then
 		[AC_MSG_RESULT(no)
 		 LIBS="$cf_ncurses_SAVE"])
 fi
+
+CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root)
+AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_NCURSES_VERSION version: 11 updated: 2003/11/06 19:59:57
+dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
 dnl AC_REQUIRE since that does not work with the shell's if/then/else/fi.
 AC_DEFUN([CF_NCURSES_VERSION],
 [
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
 	cf_cv_ncurses_version=no
 	cf_tempfile=out$$
@@ -2113,7 +2621,7 @@ EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&AC_FD_CC | grep '^Autoconf ' >conftest.out"
 	AC_TRY_EVAL(cf_try)
 	if test -f conftest.out ; then
-		cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[[^"]]*"@@' -e 's@".*@@'`
+		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[[^"]]*"%%' -e 's%".*%%'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
 		rm -f conftest.out
 	fi
@@ -2121,8 +2629,10 @@ EOF
 	rm -f $cf_tempfile
 ])
 test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES)
-])
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_NETLIBS version: 4 updated: 1999/12/23 15:20:39
+dnl ----------
 dnl After checking for functions in the default $LIBS, make a further check
 dnl for the functions that are netlib-related (these aren't always in the
 dnl libc, etc., and have to be handled specially because there are conflicting
@@ -2164,6 +2674,8 @@ LIBS="$LIBS $cf_cv_netlibs"
 test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&AC_FD_MSG
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_NGROUPS version: 3 updated: 2001/12/27 07:55:07
+dnl ----------
 dnl Check for the symbol NGROUPS
 AC_DEFUN([CF_NGROUPS],
 [
@@ -2190,32 +2702,53 @@ AC_TRY_COMPILE([
 		[cf_cv_ngroups=no])
 	])
 AC_MSG_RESULT($cf_cv_ngroups)
+])
 if test "$cf_cv_ngroups" = no ; then
 	AC_DEFINE(NGROUPS,16)
 elif test "$cf_cv_ngroups" = NGROUPS_MAX ; then
 	AC_DEFINE(NGROUPS,NGROUPS_MAX)
 fi
-])
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_OUR_MESSAGES version: 6 updated: 2004/01/03 10:56:43
+dnl ---------------
 dnl Check if we use the messages included with this program
+dnl
+dnl $1 specifies either Makefile or makefile, defaulting to the former.
+dnl
+dnl Sets variables which can be used to substitute in makefiles:
+dnl	MSG_DIR_MAKE - to make ./po directory
+dnl	SUB_MAKEFILE - makefile in ./po directory (see CF_BUNDLED_INTL)
+dnl
 AC_DEFUN([CF_OUR_MESSAGES],
 [
+cf_makefile=ifelse($1,,Makefile,$1)
+
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
 AC_MSG_CHECKING(if we should use included message-library)
 	AC_ARG_ENABLE(included-msgs,
-	[  --enable-included-msgs  use included messages, for i18n support],
+	[  --disable-included-msgs use included messages, for i18n support],
 	[use_our_messages=$enableval],
 	[use_our_messages=yes])
 fi
 AC_MSG_RESULT($use_our_messages)
 fi
-test $use_our_messages = yes && USE_OUR_MESSAGES=
-AC_SUBST(USE_OUR_MESSAGES)
+
+MSG_DIR_MAKE="#"
+if test "$use_our_messages" = yes
+then
+	SUB_MAKEFILE="$SUB_MAKEFILE $srcdir/po/$cf_makefile.in:$srcdir/po/$cf_makefile.inn"
+	MSG_DIR_MAKE=
+fi
+
+AC_SUBST(MSG_DIR_MAKE)
+AC_SUBST(SUB_MAKEFILE)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_PATHSEP version: 3 updated: 2001/01/12 01:23:53
+dnl ----------
 dnl Provide a value for the $PATH and similar separator
 AC_DEFUN([CF_PATHSEP],
 [
@@ -2227,9 +2760,12 @@ ifelse($1,,,[$1=$PATHSEP])
 	AC_SUBST(PATHSEP)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_PATH_PROG version: 6 updated: 2004/01/26 20:58:41
+dnl ------------
 dnl Check for a given program, defining corresponding symbol.
 dnl	$1 = environment variable, which is suffixed by "_PATH" in the #define.
 dnl	$2 = program name to find.
+dnl	$3 = optional list of additional program names to test.
 dnl
 dnl If there is more than one token in the result, #define the remaining tokens
 dnl to $1_ARGS.  We need this for 'install' in particular.
@@ -2238,13 +2774,8 @@ dnl FIXME: we should allow this to be overridden by environment variables
 dnl
 AC_DEFUN([CF_PATH_PROG],[
 test -z "[$]$1" && $1=$2
-if test "$with_full_paths" = yes ; then
-	AC_PATH_PROG($1,$2,[$]$1)
-else
-	AC_MSG_CHECKING(for $2)
-	AC_MSG_RESULT([$]$1)
-	eval 'ac_cv_path_'$1'="'$2'"'
-fi
+AC_PATH_PROGS($1,[$]$1 $2 $3,[$]$1)
+
 cf_path_prog=""
 cf_path_args=""
 IFS="${IFS= 	}"; cf_save_ifs="$IFS"
@@ -2256,10 +2787,16 @@ os2*) #(vi
 	IFS="${IFS}:"
 	;;
 esac
+
 for cf_temp in $ac_cv_path_$1
 do
 	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
+		if test "$with_full_paths" = yes ; then
+			CF_PATH_SYNTAX(cf_temp,break)
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
 	elif test -z "$cf_path_args" ; then
 		cf_path_args="$cf_temp"
 	else
@@ -2268,17 +2805,24 @@ do
 done
 IFS="$cf_save_ifs"
 
-AC_DEFINE_UNQUOTED($1_PATH,"$cf_path_prog")
-test -n "$cf_path_args" && AC_DEFINE_UNQUOTED($1_ARGS,"$cf_path_args")
+if test -n "$cf_path_prog" ; then
+	CF_MSG_LOG(defining path for ${cf_path_prog})
+	AC_DEFINE_UNQUOTED($1_PATH,"$cf_path_prog")
+	test -n "$cf_path_args" && AC_DEFINE_UNQUOTED($1_ARGS,"$cf_path_args")
+fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_PATH_SYNTAX version: 9 updated: 2002/09/17 23:03:38
+dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
-dnl result begins with 'NONE'.  This is necessary to workaround autoconf's
+dnl result begins with 'NONE'.  This is necessary to work around autoconf's
 dnl delayed evaluation of those symbols.
 AC_DEFUN([CF_PATH_SYNTAX],[
 case ".[$]$1" in #(vi
-./*) #(vi
+.\[$]\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
   ;;
 .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
   ;;
@@ -2286,24 +2830,26 @@ case ".[$]$1" in #(vi
   eval $1="[$]$1"
   case ".[$]$1" in #(vi
   .NONE/*)
-    $1=`echo [$]$1 | sed -e s@NONE@$ac_default_prefix@`
+    $1=`echo [$]$1 | sed -e s%NONE%$ac_default_prefix%`
     ;;
   esac
   ;; #(vi
 .NONE/*)
-  $1=`echo [$]$1 | sed -e s@NONE@$ac_default_prefix@`
+  $1=`echo [$]$1 | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  AC_ERROR(expected a pathname, not "[$]$1")
+  ifelse($2,,[AC_ERROR([expected a pathname, not \"[$]$1\"])],$2)
   ;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_PDCURSES_X11 version: 6 updated: 2002/10/27 18:21:42
+dnl ---------------
 dnl Configure for PDCurses' X11 library
 AC_DEFUN([CF_PDCURSES_X11],[
 AC_REQUIRE([CF_X_ATHENA])
 LDFLAGS="$LDFLAGS $X_LIBS"
-CF_ADD_CFLAGS($X_CFLAGS)
+CF_CHECK_CFLAGS($X_CFLAGS)
 AC_CHECK_LIB(X11,XOpenDisplay,
 	[LIBS="-lX11 $LIBS"],,
 	[$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])
@@ -2323,8 +2869,35 @@ if test $cf_cv_lib_XCurses = yes ; then
 else
 	AC_ERROR(Cannot link with XCurses)
 fi
-])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18
+dnl -----------
+dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
+AC_DEFUN([CF_PROG_EXT],
+[
+AC_REQUIRE([CF_CHECK_CACHE])
+case $cf_cv_system_name in
+os2*)
+    CFLAGS="$CFLAGS -Zmt"
+    CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
+    CXXFLAGS="$CXXFLAGS -Zmt"
+    # autoconf's macro sets -Zexe and suffix both, which conflict:w
+    LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
+    ac_cv_exeext=.exe
+    ;;
+esac
+
+AC_EXEEXT
+AC_OBJEXT
+
+PROG_EXT="$EXEEXT"
+AC_SUBST(PROG_EXT)
+test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_RECHECK_FUNC version: 3 updated: 2000/10/18 19:29:13
+dnl ---------------
 dnl Re-check on a function to see if we can pick it up by adding a library.
 dnl	$1 = function to check
 dnl	$2 = library to check in
@@ -2349,6 +2922,8 @@ AC_CHECK_LIB($2,$1,[
 	[[$]$3])
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_REMOVE_BROKEN version: 3 updated: 1997/11/23 14:49:44
+dnl ----------------
 dnl Check for broken definition of 'remove()'.  This is (in particular) broken
 dnl on the older version of SCO (I'd cite version if I knew where to look) by
 dnl having <stdio.h> #define remove to __unlink, which appears in no library.
@@ -2377,6 +2952,8 @@ AC_MSG_RESULT($cf_cv_baddef_remove)
 test "$cf_cv_baddef_remove" != no && AC_DEFINE(NEED_REMOVE)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SET_ERRNO version: 2 updated: 2000/03/26 22:37:59
+dnl ------------
 dnl Check if 'errno' is declared in a fashion that lets us set it.
 AC_DEFUN([CF_SET_ERRNO],
 [
@@ -2399,6 +2976,8 @@ int main()
 test "$cf_cv_set_errno" != no && AC_DEFINE(CAN_SET_ERRNO)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SIZECHANGE version: 8 updated: 2000/11/04 12:22:16
+dnl -------------
 dnl Check for definitions & structures needed for window size-changing
 dnl FIXME: check that this works with "snake" (HP-UX 10.x)
 AC_DEFUN([CF_SIZECHANGE],
@@ -2467,13 +3046,14 @@ if test "$cf_cv_sizechange" != no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SLANG_CPPFLAGS version: 7 updated: 2003/09/14 19:08:00
+dnl -----------------
 dnl Look for the slang header files in the standard places, adjusting the
 dnl CPPFLAGS variable.
 dnl
 AC_DEFUN([CF_SLANG_CPPFLAGS],
 [
-AC_MSG_CHECKING(for slang header file)
-AC_CACHE_VAL(cf_cv_slang_header,[
+AC_CACHE_CHECK(for slang header file,cf_cv_slang_header,[
 	AC_TRY_COMPILE([#include <slang.h>],
 	[printf("%s\n", SLANG_VERSION)],
 	[cf_cv_slang_header=predefined],[
@@ -2493,7 +3073,6 @@ AC_CACHE_VAL(cf_cv_slang_header,[
 	done
 	test -z "$cf_cv_slang_header" && AC_ERROR(not found)
 	])])
-AC_MSG_RESULT($cf_cv_slang_header)
 AC_DEFINE(USE_SLANG)
 
 CF_DIRNAME(cf_incdir,$cf_cv_slang_header)
@@ -2505,8 +3084,30 @@ predefined) # (vi
 	CF_ADD_INCDIR($cf_incdir)
 	;;
 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.
+AC_CACHE_CHECK(if we must define UTF8,cf_cv_slang_utf8,[
+	AC_TRY_COMPILE([
+#include <slang.h>],
+	[SLtt_get_screen_size()],
+	[cf_cv_slang_utf8=no],
+	[
+	AC_TRY_COMPILE([
+#define UTF8
+#include <slang.h>],
+	[SLtt_get_screen_size()],
+	[cf_cv_slang_utf8=yes],
+	[cf_cv_slang_utf8=unknown])])
+])
+
+if test "$cf_cv_slang_utf8" = yes ; then
+	AC_DEFINE(UTF8)
+fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SLANG_LIBS version: 7 updated: 2002/09/17 19:03:38
+dnl -------------
 dnl Look for the slang library.
 AC_DEFUN([CF_SLANG_LIBS],
 [
@@ -2529,11 +3130,11 @@ CF_FIND_LIBRARY(slang,slang,
 cf_slang_LIBS3="$LIBS"
 AC_MSG_CHECKING(if we can link slang without termcap)
 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@^.@@'`
+	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
 else
 	cf_exclude="$cf_slang_LIBS2"
 fi
-LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'`
+LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 AC_TRY_LINK([#include <slang.h>],
 	[SLtt_get_screen_size()],
 	[cf_result=yes],
@@ -2542,6 +3143,8 @@ AC_MSG_RESULT($cf_result)
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SLANG_UNIX_DEFS version: 3 updated: 2000/05/20 11:59:59
+dnl ------------------
 dnl Slang's header files rely on some predefined symbols to declare variables
 dnl that we might find useful.  This check is needed, because those symbols
 dnl are generally not available.
@@ -2565,6 +3168,8 @@ SLang_TT_Baud_Rate = 1
 test $cf_cv_slang_unix = yes && AC_DEFINE(REAL_UNIX_SYSTEM)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SOCKS version: 3 updated: 2001/01/01 09:54:40
+dnl --------
 dnl Check for socks library
 dnl $1 = the [optional] directory in which the library may be found
 AC_DEFUN([CF_SOCKS],[
@@ -2601,6 +3206,8 @@ AC_TRY_LINK([
 	[AC_ERROR(Cannot link with socks library)])
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SOCKS5 version: 7 updated: 2001/01/01 09:54:40
+dnl ---------
 dnl Check for socks5 configuration
 dnl $1 = the [optional] directory in which the library may be found
 AC_DEFUN([CF_SOCKS5],[
@@ -2662,16 +3269,18 @@ AC_MSG_RESULT($cf_use_socks5p_h)
 test "$cf_use_socks5p_h" = yes && AC_DEFINE(INCLUDE_PROTOTYPES)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SRAND version: 6 updated: 2002/09/17 19:03:38
+dnl --------
 dnl Check for functions similar to srand() and rand().  lrand48() and random()
 dnl return a 31-bit value, while rand() returns a value less than RAND_MAX
 dnl which usually is only 16-bits.
 AC_DEFUN([CF_SRAND],[
 AC_CACHE_CHECK(for random-integer functions, cf_cv_srand_func,[
 cf_cv_srand_func=unknown
-for cf_func in srand48/lrand48 srandom/random srand/rand
+for cf_func in srandom/random srand48/lrand48 srand/rand
 do
-	cf_srand_func=`echo $cf_func | sed -e 's@/.*@@'`
-	cf_rand_func=`echo  $cf_func | sed -e 's@.*/@@'`
+	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
+	cf_rand_func=`echo  $cf_func | sed -e 's%.*/%%'`
 AC_TRY_LINK([
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -2706,8 +3315,8 @@ if test "$cf_cv_srand_func" != unknown ; then
 		],[long x = $cf_cv_rand_max],,
 		[cf_cv_rand_max="(1L<<$cf_rand_max)-1"])
 	])
-	cf_srand_func=`echo $cf_func | sed -e 's@/.*@@'`
-	cf_rand_func=`echo  $cf_func | sed -e 's@.*/@@'`
+	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
+	cf_rand_func=`echo  $cf_func | sed -e 's%.*/%%'`
 	CF_UPPER(cf_rand_max,ifelse($1,,my_,$1)rand_max)
 	AC_DEFINE_UNQUOTED(ifelse($1,,my_,$1)srand,$cf_srand_func)
 	AC_DEFINE_UNQUOTED(ifelse($1,,my_,$1)rand, $cf_rand_func)
@@ -2715,6 +3324,8 @@ if test "$cf_cv_srand_func" != unknown ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SSL version: 3 updated: 2003/10/05 17:34:54
+dnl ------
 dnl Check for ssl library
 dnl $1 = the [optional] directory in which the library may be found
 AC_DEFUN([CF_SSL],[
@@ -2775,20 +3386,27 @@ AC_TRY_LINK([
 AC_MSG_RESULT($cf_ssl_library)
 if test "$cf_ssl_library" = yes ; then
 	AC_DEFINE(USE_SSL)
+	AC_DEFINE(USE_X509_SUPPORT)
 else
 	AC_ERROR(Cannot link with ssl library)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_STRIP_G_OPT version: 3 updated: 2002/12/21 19:25:52
+dnl --------------
 dnl	Remove "-g" option from the compiler options
 AC_DEFUN([CF_STRIP_G_OPT],
-[$1=`echo ${$1} | sed -e 's/-g //' -e 's/-g$//'`])dnl
+[$1=`echo ${$1} | sed -e 's%-g %%' -e 's%-g$%%'`])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_STRIP_O_OPT version: 3 updated: 2001/02/02 19:06:08
+dnl --------------
 dnl	Remove "-O" option from the compiler options
 AC_DEFUN([CF_STRIP_O_OPT],[
 $1=`echo ${$1} | sed -e 's/-O[[1-9]]\? //' -e 's/-O[[1-9]]\?$//'`
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_STRUCT_TERMIOS version: 5 updated: 2000/11/04 12:22:46
+dnl -----------------
 dnl Some machines require _POSIX_SOURCE to completely define struct termios.
 dnl If so, define SVR4_TERMIO
 AC_DEFUN([CF_STRUCT_TERMIOS],[
@@ -2823,6 +3441,90 @@ if test "$ac_cv_header_termios_h" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SUBDIR_PATH version: 3 updated: 2002/12/29 18:30:46
+dnl --------------
+dnl Construct a search-list for a nonstandard header/lib-file
+dnl	$1 = the variable to return as result
+dnl	$2 = the package name
+dnl	$3 = the subdirectory, e.g., bin, include or lib
+AC_DEFUN([CF_SUBDIR_PATH],
+[$1=""
+
+test -d [$]HOME && {
+	test -n "$verbose" && echo "	... testing $3-directories under [$]HOME"
+	test -d [$]HOME/$3 &&          $1="[$]$1 [$]HOME/$3"
+	test -d [$]HOME/$3/$2 &&       $1="[$]$1 [$]HOME/$3/$2"
+	test -d [$]HOME/$3/$2/$3 &&    $1="[$]$1 [$]HOME/$3/$2/$3"
+}
+
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/$2 to the actual package location:
+test -d [$]HOME/$2 && {
+	test -n "$verbose" && echo "	... testing $3-directories under [$]HOME/$2"
+	test -d [$]HOME/$2/$3 &&       $1="[$]$1 [$]HOME/$2/$3"
+	test -d [$]HOME/$2/$3/$2 &&    $1="[$]$1 [$]HOME/$2/$3/$2"
+}
+
+test "$prefix" != /usr/local && \
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing $3-directories under /usr/local"
+	test -d /usr/local/$3 &&       $1="[$]$1 /usr/local/$3"
+	test -d /usr/local/$3/$2 &&    $1="[$]$1 /usr/local/$3/$2"
+	test -d /usr/local/$3/$2/$3 && $1="[$]$1 /usr/local/$3/$2/$3"
+	test -d /usr/local/$2/$3 &&    $1="[$]$1 /usr/local/$2/$3"
+	test -d /usr/local/$2/$3/$2 && $1="[$]$1 /usr/local/$2/$3/$2"
+}
+
+test "$prefix" != NONE && \
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing $3-directories under $prefix"
+	test -d $prefix/$3 &&          $1="[$]$1 $prefix/$3"
+	test -d $prefix/$3/$2 &&       $1="[$]$1 $prefix/$3/$2"
+	test -d $prefix/$3/$2/$3 &&    $1="[$]$1 $prefix/$3/$2/$3"
+	test -d $prefix/$2/$3 &&       $1="[$]$1 $prefix/$2/$3"
+	test -d $prefix/$2/$3/$2 &&    $1="[$]$1 $prefix/$2/$3/$2"
+}
+
+test "$prefix" != /opt && \
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing $3-directories under /opt"
+	test -d /opt/$3 &&             $1="[$]$1 /opt/$3"
+	test -d /opt/$3/$2 &&          $1="[$]$1 /opt/$3/$2"
+	test -d /opt/$3/$2/$3 &&       $1="[$]$1 /opt/$3/$2/$3"
+	test -d /opt/$2/$3 &&          $1="[$]$1 /opt/$2/$3"
+	test -d /opt/$2/$3/$2 &&       $1="[$]$1 /opt/$2/$3/$2"
+}
+
+test "$prefix" != /usr && \
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing $3-directories under /usr"
+	test -d /usr/$3 &&             $1="[$]$1 /usr/$3"
+	test -d /usr/$3/$2 &&          $1="[$]$1 /usr/$3/$2"
+	test -d /usr/$3/$2/$3 &&       $1="[$]$1 /usr/$3/$2/$3"
+	test -d /usr/$2/$3 &&          $1="[$]$1 /usr/$2/$3"
+}
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_SUBST version: 2 updated: 1997/09/06 23:41:28
+dnl --------
+dnl	Shorthand macro for substituting things that the user may override
+dnl	with an environment variable.
+dnl
+dnl	$1 = long/descriptive name
+dnl	$2 = environment variable
+dnl	$3 = default value
+AC_DEFUN([CF_SUBST],
+[AC_CACHE_VAL(cf_cv_subst_$2,[
+AC_MSG_CHECKING(for $1 (symbol $2))
+test -z "[$]$2" && $2=$3
+AC_MSG_RESULT([$]$2)
+AC_SUBST($2)
+cf_cv_subst_$2=[$]$2])
+$2=${cf_cv_subst_$2}
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_SYSTEM_MAIL_FLAGS version: 3 updated: 1998/11/18 14:45:34
+dnl --------------------
 AC_DEFUN([CF_SYSTEM_MAIL_FLAGS],
 [
 AC_MSG_CHECKING([system mail flags])
@@ -2839,10 +3541,11 @@ AC_MSG_RESULT($cf_cv_system_mail_flags)
 AC_DEFINE_UNQUOTED(SYSTEM_MAIL_FLAGS, "$cf_cv_system_mail_flags")
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SYSV_UTMP version: 5 updated: 2001/12/27 12:55:07
+dnl ------------
 dnl Check if this is a SYSV flavor of UTMP
 AC_DEFUN([CF_SYSV_UTMP],
 [
-AC_REQUIRE([CF_UTMP])
 AC_CACHE_CHECK(if $cf_cv_have_utmp is SYSV flavor,cf_cv_sysv_utmp,[
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 AC_TRY_LINK([
@@ -2859,17 +3562,53 @@ struct $cf_cv_have_utmp x;
 test $cf_cv_sysv_utmp = yes && AC_DEFINE(USE_SYSV_UTMP)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SYS_ERRLIST version: 6 updated: 2001/12/30 13:03:23
+dnl --------------
 dnl Check for declaration of sys_nerr and sys_errlist in one of stdio.h and
 dnl errno.h.  Declaration of sys_errlist on BSD4.4 interferes with our
 dnl declaration.  Reported by Keith Bostic.
 AC_DEFUN([CF_SYS_ERRLIST],
 [
-for cf_name in sys_nerr sys_errlist
-do
-    CF_CHECK_ERRNO($cf_name)
-done
+    CF_CHECK_ERRNO(sys_nerr)
+    CF_CHECK_ERRNO(sys_errlist)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_TAR_OPTIONS version: 1 updated: 2004/01/26 20:58:41
+dnl --------------
+dnl This is just a list of the most common tar options, allowing for variants
+dnl that can operate with the "-" standard input/output option.
+AC_DEFUN([CF_TAR_OPTIONS],
+[
+case ifelse($1,,tar,$1) in
+*pax)
+	TAR_UP_OPTIONS="-w"
+	TAR_DOWN_OPTIONS="-r"
+	TAR_PIPE_OPTIONS=""
+	TAR_FILE_OPTIONS="-f"
+	;;
+*star)
+	TAR_UP_OPTIONS="-c -f"
+	TAR_DOWN_OPTIONS="-x -U -f"
+	TAR_PIPE_OPTIONS="-"
+	TAR_FILE_OPTIONS=""
+	;;
+*tar)
+	# FIXME: some versions of tar require, some don't allow the "-"
+	TAR_UP_OPTIONS="-cf"
+	TAR_DOWN_OPTIONS="-xf"
+	TAR_PIPE_OPTIONS="-"
+	TAR_FILE_OPTIONS=""
+	;;
+esac
+
+AC_SUBST(TAR_UP_OPTIONS)
+AC_SUBST(TAR_DOWN_OPTIONS)
+AC_SUBST(TAR_FILE_OPTIONS)
+AC_SUBST(TAR_PIPE_OPTIONS)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_TERMCAP_LIBS version: 10 updated: 2001/10/18 20:42:39
+dnl ---------------
 dnl Look for termcap libraries, or the equivalent in terminfo.
 AC_DEFUN([CF_TERMCAP_LIBS],
 [
@@ -2882,11 +3621,13 @@ AC_TRY_LINK([],[char *x=(char*)tgoto("",0,0)],
 	CF_VERBOSE(using functions in predefined $cf_cv_termlib LIBS)
 ],[
 ifelse([$1],,,[
-if test "$1" = ncurses; then
-	CF_NCURSES_CPPFLAGS
-	CF_NCURSES_LIBS
+case "$1" in # (vi
+ncurses*)
+	CF_NCURSES_CPPFLAGS($1)
+	CF_NCURSES_LIBS($1)
 	cf_cv_termlib=terminfo
-fi
+	;;
+esac
 ])
 if test "$cf_cv_termlib" = none; then
 	# FreeBSD's linker gives bogus results for AC_CHECK_LIB, saying that
@@ -2924,6 +3665,8 @@ if test "$cf_cv_termlib" = none; then
 fi
 ])])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_TERMIO_AND_CURSES version: 3 updated: 2000/12/31 19:47:37
+dnl --------------------
 dnl Check if including termio.h with <curses.h> dies like on sysv68
 dnl FIXME: this is too Lynx-specific
 AC_DEFUN([CF_TERMIO_AND_CURSES],
@@ -2945,6 +3688,8 @@ AC_CACHE_CHECK(if we can include termio.h with curses,cf_cv_termio_and_curses,[
 test $cf_cv_termio_and_curses = yes && AC_DEFINE(TERMIO_AND_CURSES)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_TERMIO_AND_TERMIOS version: 2 updated: 1997/08/28 20:22:00
+dnl ---------------------
 dnl Check if including both termio.h and termios.h die like on DG.UX
 AC_DEFUN([CF_TERMIO_AND_TERMIOS],
 [
@@ -2964,6 +3709,8 @@ AC_MSG_RESULT($cf_cv_termio_and_termios)
 test $cf_cv_termio_and_termios = no && AC_DEFINE(TERMIO_AND_TERMIOS)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_TTYTYPE version: 4 updated: 2002/10/27 18:21:42
+dnl ----------
 AC_DEFUN([CF_TTYTYPE],
 [
 AC_MSG_CHECKING(if ttytype is declared in curses library)
@@ -2975,8 +3722,10 @@ AC_CACHE_VAL(cf_cv_have_ttytype,[
 	])
 AC_MSG_RESULT($cf_cv_have_ttytype)
 test $cf_cv_have_ttytype = yes && AC_DEFINE(HAVE_TTYTYPE)
-])
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_UNION_WAIT version: 5 updated: 1997/11/23 14:49:44
+dnl -------------
 dnl Check to see if the BSD-style union wait is declared.  Some platforms may
 dnl use this, though it is deprecated in favor of the 'int' type in Posix.
 dnl Some vendors provide a bogus implementation that declares union wait, but
@@ -3021,6 +3770,8 @@ AC_MSG_RESULT($cf_cv_type_unionwait)
 test $cf_cv_type_unionwait = yes && AC_DEFINE(HAVE_TYPE_UNIONWAIT)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59
+dnl --------
 dnl Make an uppercase version of a variable
 dnl $1=uppercase($2)
 AC_DEFUN([CF_UPPER],
@@ -3028,40 +3779,62 @@ 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 -----------
+dnl Check for multibyte support, and if not found, utf8 compatibility library
+AC_DEFUN([CF_UTF8_LIB],
+[
+AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
+	cf_save_LIBS="$LIBS"
+	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_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)
+	LIBS="-lutf8 $LIBS"
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_UTMP version: 8 updated: 2002/10/27 23:21:42
+dnl -------
 dnl Check for UTMP/UTMPX headers
 AC_DEFUN([CF_UTMP],
 [
 AC_REQUIRE([CF_LASTLOG])
+
 AC_CACHE_CHECK(for utmp implementation,cf_cv_have_utmp,[
 	cf_cv_have_utmp=no
 for cf_header in utmpx utmp ; do
-	AC_TRY_COMPILE([
+cf_utmp_includes="
 #include <sys/types.h>
 #include <${cf_header}.h>
 #define getutent getutxent
 #ifdef USE_LASTLOG
 #include <lastlog.h>	/* may conflict with utmpx.h on Linux */
 #endif
-],
+"
+	AC_TRY_COMPILE([$cf_utmp_includes],
 	[struct $cf_header x;
 	 char *name = x.ut_name; /* utmp.h and compatible definitions */
 	],
 	[cf_cv_have_utmp=$cf_header
 	 break],
 	[
-	AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <${cf_header}.h>
-#define getutent getutxent
-#ifdef USE_LASTLOG
-#include <lastlog.h>	/* may conflict with utmpx.h on Linux */
-#endif
-],
+	AC_TRY_COMPILE([$cf_utmp_includes],
 	[struct $cf_header x;
 	 char *name = x.ut_user; /* utmpx.h must declare this */
 	],
 	[cf_cv_have_utmp=$cf_header
-	 AC_DEFINE(ut_name,ut_user)
 	 break
 	])])
 done
@@ -3071,17 +3844,19 @@ if test $cf_cv_have_utmp != no ; then
 	AC_DEFINE(HAVE_UTMP)
 	test $cf_cv_have_utmp = utmpx && AC_DEFINE(UTMPX_FOR_UTMP)
 	CF_UTMP_UT_HOST
+	CF_UTMP_UT_NAME
 	CF_UTMP_UT_XSTATUS
 	CF_UTMP_UT_XTIME
 	CF_UTMP_UT_SESSION
 	CF_SYSV_UTMP
 fi
-])
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_UTMP_UT_HOST version: 6 updated: 2002/10/27 23:21:42
+dnl ---------------
 dnl Check if UTMP/UTMPX struct defines ut_host member
 AC_DEFUN([CF_UTMP_UT_HOST],
 [
-AC_REQUIRE([CF_UTMP])
 if test $cf_cv_have_utmp != no ; then
 AC_MSG_CHECKING(if utmp.ut_host is declared)
 AC_CACHE_VAL(cf_cv_have_utmp_ut_host,[
@@ -3095,12 +3870,50 @@ AC_CACHE_VAL(cf_cv_have_utmp_ut_host,[
 AC_MSG_RESULT($cf_cv_have_utmp_ut_host)
 test $cf_cv_have_utmp_ut_host != no && AC_DEFINE(HAVE_UTMP_UT_HOST)
 fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_UTMP_UT_NAME version: 3 updated: 2002/10/27 23:21:42
+dnl ---------------
+dnl Check if UTMP/UTMPX struct defines ut_name member
+AC_DEFUN([CF_UTMP_UT_NAME],
+[
+if test $cf_cv_have_utmp != no ; then
+AC_CACHE_CHECK(if utmp.ut_name is declared,cf_cv_have_utmp_ut_name,[
+	cf_cv_have_utmp_ut_name=no
+cf_utmp_includes="
+#include <sys/types.h>
+#include <${cf_cv_have_utmp}.h>
+#define getutent getutxent
+#ifdef USE_LASTLOG
+#include <lastlog.h>		/* may conflict with utmpx.h on Linux */
+#endif
+"
+for cf_header in ut_name ut_user ; do
+	AC_TRY_COMPILE([$cf_utmp_includes],
+	[struct $cf_cv_have_utmp x;
+	 char *name = x.$cf_header;
+	],
+	[cf_cv_have_utmp_ut_name=$cf_header
+	 break])
+done
 ])
+
+case $cf_cv_have_utmp_ut_name in #(vi
+no) #(vi
+	AC_MSG_ERROR(Cannot find declaration for ut.ut_name)
+	;;
+ut_user)
+	AC_DEFINE(ut_name,ut_user)
+	;;
+esac
+fi
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_UTMP_UT_SESSION version: 4 updated: 2002/10/27 23:21:42
+dnl ------------------
 dnl Check if UTMP/UTMPX struct defines ut_session member
 AC_DEFUN([CF_UTMP_UT_SESSION],
 [
-AC_REQUIRE([CF_UTMP])
 if test $cf_cv_have_utmp != no ; then
 AC_CACHE_CHECK(if utmp.ut_session is declared, cf_cv_have_utmp_ut_session,[
 	AC_TRY_COMPILE([
@@ -3114,8 +3927,10 @@ if test $cf_cv_have_utmp_ut_session != no ; then
 	AC_DEFINE(HAVE_UTMP_UT_SESSION)
 fi
 fi
-])
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_UTMP_UT_XSTATUS version: 3 updated: 2001/12/27 12:55:07
+dnl ------------------
 dnl Check for known variants on the UTMP/UTMPX struct's exit-status as reported
 dnl by various people:
 dnl
@@ -3128,7 +3943,6 @@ dnl Note: utmp_xstatus is not a conventional compatibility definition in the
 dnl system header files.
 AC_DEFUN([CF_UTMP_UT_XSTATUS],
 [
-AC_REQUIRE([CF_UTMP])
 if test $cf_cv_have_utmp != no ; then
 AC_CACHE_CHECK(for exit-status in $cf_cv_have_utmp,cf_cv_have_utmp_ut_xstatus,[
 for cf_result in \
@@ -3153,10 +3967,11 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_UTMP_UT_XTIME version: 6 updated: 2002/10/27 23:21:42
+dnl ----------------
 dnl Check if UTMP/UTMPX struct defines ut_xtime member
 AC_DEFUN([CF_UTMP_UT_XTIME],
 [
-AC_REQUIRE([CF_UTMP])
 if test $cf_cv_have_utmp != no ; then
 AC_CACHE_CHECK(if utmp.ut_xtime is declared, cf_cv_have_utmp_ut_xtime,[
 	AC_TRY_COMPILE([
@@ -3179,8 +3994,10 @@ if test $cf_cv_have_utmp_ut_xtime != no ; then
 	fi
 fi
 fi
-])
+])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_VARARGS version: 3 updated: 1998/12/10 20:06:29
+dnl ----------
 dnl Check for ANSI stdarg.h vs varargs.h.  Note that some systems include
 dnl <varargs.h> within <stdarg.h>.
 AC_DEFUN([CF_VARARGS],
@@ -3205,11 +4022,15 @@ AC_MSG_RESULT($cf_cv_ansi_varargs)
 test $cf_cv_ansi_varargs = yes && AC_DEFINE(ANSI_VARARGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_VERBOSE version: 2 updated: 1997/09/05 10:45:14
+dnl ----------
 dnl Use AC_VERBOSE w/o the warnings
 AC_DEFUN([CF_VERBOSE],
 [test -n "$verbose" && echo "	$1" 1>&AC_FD_MSG
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_WAIT_HEADERS version: 2 updated: 1997/10/21 19:45:33
+dnl ---------------
 dnl Build up an expression $cf_wait_headers with the header files needed to
 dnl compile against the prototypes for 'wait()', 'waitpid()', etc.  Assume it's
 dnl Posix, which uses <sys/types.h> and <sys/wait.h>, but allow SVr4 variation
@@ -3239,6 +4060,92 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_WIDEC_CURSES version: 3 updated: 2001/11/18 20:52:38
+dnl ---------------
+dnl Check for curses implementations that can handle wide-characters
+AC_DEFUN([CF_WIDEC_CURSES],
+[
+AC_CACHE_CHECK(if curses supports wide characters,cf_cv_widec_curses,[
+AC_TRY_LINK([
+#include <stdlib.h>
+#include <${cf_cv_ncurses_header-curses.h}>],[
+    wchar_t temp[2];
+    wchar_t wch = 'A';
+    temp[0] = wch;
+    waddnwstr(stdscr, temp, 1);
+],
+[cf_cv_widec_curses=yes],
+[cf_cv_widec_curses=no])
+])
+
+if test "$cf_cv_widec_curses" = yes ; then
+	AC_DEFINE(WIDEC_CURSES)
+
+	# This is needed on Tru64 5.0 to declare mbstate_t
+	AC_CACHE_CHECK(if we must include wchar.h to declare mbstate_t,cf_cv_widec_mbstate,[
+	AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <${cf_cv_ncurses_header-curses.h}>],
+[mbstate_t state],
+[cf_cv_widec_mbstate=no],
+[AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <wchar.h>
+#include <${cf_cv_ncurses_header-curses.h}>],
+[mbstate_t state],
+[cf_cv_widec_mbstate=yes],
+[cf_cv_widec_mbstate=unknown])])])
+
+if test "$cf_cv_widec_mbstate" = yes ; then
+	AC_DEFINE(NEED_WCHAR_H)
+fi
+
+if test "$cf_cv_widec_mbstate" != unknown ; then
+	AC_DEFINE(HAVE_MBSTATE_T)
+fi
+
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_BZLIB version: 2 updated: 2004/01/24 17:45:25
+dnl -------------
+dnl Check for libbz2 aka "bzlib"
+AC_DEFUN([CF_WITH_BZLIB],[
+AC_MSG_CHECKING(if we need to add -I option to get bzlib.h)
+AC_TRY_COMPILE([#include <zlib.h>],[],[AC_MSG_RESULT(no)],[
+AC_MSG_RESULT(yes)
+CF_HEADER_PATH(cf_search,bzlib)
+for cf_incdir in $cf_search
+do
+	if test -f $cf_incdir/bzlib.h ; then
+		CF_ADD_CFLAGS(-I$cf_incdir)
+		CF_VERBOSE(... found in $cf_incdir)
+		break
+	fi
+	CF_VERBOSE(... tested $cf_incdir)
+done
+])
+CF_FIND_LIBRARY(bz2,bz2, [
+#include <stdio.h>
+#include <bzlib.h>],
+	[BZ2_bzopen("name","mode")],
+	BZ2_bzopen)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_CURSES_DIR version: 2 updated: 2002/11/10 14:46:59
+dnl ------------------
+dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses
+dnl libraries.
+AC_DEFUN([CF_WITH_CURSES_DIR],[
+AC_ARG_WITH(curses-dir,
+	[  --with-curses-dir=DIR   directory in which (n)curses is installed],
+	[CF_PATH_SYNTAX(withval)
+	 cf_cv_curses_dir=$withval],
+	[cf_cv_curses_dir=no])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_PATH version: 6 updated: 1998/10/11 00:40:17
+dnl ------------
 dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
 dnl defaulting to yes/no.
 dnl
@@ -3256,26 +4163,141 @@ eval $3="$withval"
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_WITH_ZLIB version: 1 updated: 2003/10/05 17:36:14
+dnl ------------
+dnl check for libz aka "zlib"
+AC_DEFUN([CF_WITH_ZLIB],[
+AC_MSG_CHECKING(if we need to add -I option to get zlib.h)
+AC_TRY_COMPILE([#include <zlib.h>],[],[AC_MSG_RESULT(no)],[
+AC_MSG_RESULT(yes)
+CF_HEADER_PATH(cf_search,zlib)
+for cf_incdir in $cf_search
+do
+	if test -f $cf_incdir/zlib.h ; then
+		CF_ADD_CFLAGS(-I$cf_incdir)
+		CF_VERBOSE(... found in $cf_incdir)
+		break
+	fi
+	CF_VERBOSE(... tested $cf_incdir)
+done
+])
+CF_FIND_LIBRARY(z,z,
+	[#include <zlib.h>],
+	[gzopen("name","mode")],
+	gzopen)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_XOPEN_CURSES version: 8 updated: 2003/11/07 19:47:46
+dnl ---------------
 dnl Test if we should define X/Open source for curses, needed on Digital Unix
 dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.
+dnl
+dnl The getbegyx() check is needed for HPUX, which omits legacy macros such
+dnl as getbegy().  The latter is better design, but the former is standard.
 AC_DEFUN([CF_XOPEN_CURSES],
 [
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_CACHE_CHECK(if we must define _XOPEN_SOURCE_EXTENDED,cf_cv_need_xopen_extension,[
 AC_TRY_LINK([
 #include <stdlib.h>
 #include <${cf_cv_ncurses_header-curses.h}>],[
-	long x = winnstr(stdscr, "", 0)],
+	long x = winnstr(stdscr, "", 0);
+	int x1, y1;
+	getbegyx(stdscr, y1, x1)],
 	[cf_cv_need_xopen_extension=no],
 	[AC_TRY_LINK([
 #define _XOPEN_SOURCE_EXTENDED
 #include <stdlib.h>
 #include <${cf_cv_ncurses_header-curses.h}>],[
-	long x = winnstr(stdscr, "", 0)],
+	long x = winnstr(stdscr, "", 0);
+	int x1, y1;
+	getbegyx(stdscr, y1, x1)],
 	[cf_cv_need_xopen_extension=yes],
-	[cf_cv_need_xopen_extension=no])])])
+	[cf_cv_need_xopen_extension=unknown])])])
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_XOPEN_SOURCE version: 11 updated: 2004/01/26 20:58:41
+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.
+AC_DEFUN([CF_XOPEN_SOURCE],[
+case $host_os in #(vi
+freebsd*) #(vi
+	CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600"
+	;;
+hpux*) #(vi
+	CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
+	;;
+irix6.*) #(vi
+	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
+	;;
+linux*) #(vi
+	CF_GNU_SOURCE
+	;;
+mirbsd*) #(vi
+	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
+	;;
+netbsd*) #(vi
+	# setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
+	;;
+openbsd*) #(vi
+	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
+	;;
+osf[[45]]*) #(vi
+	CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE"
+	;;
+sco*) #(vi
+	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
+	;;
+solaris*) #(vi
+	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
+	;;
+*)
+	AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
+	AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifndef _XOPEN_SOURCE
+make an error
+#endif],
+	[cf_cv_xopen_source=no],
+	[cf_save="$CPPFLAGS"
+	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
+	 AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifdef _XOPEN_SOURCE
+make an error
+#endif],
+	[cf_cv_xopen_source=no],
+	[cf_cv_xopen_source=yes])
+	CPPFLAGS="$cf_save"
+	])
+])
+test "$cf_cv_xopen_source" = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
+
+	# FreeBSD 5.x headers demand this...
+	AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_xopen_source,[
+	AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifndef _POSIX_C_SOURCE
+make an error
+#endif],
+	[cf_cv_xopen_source=no],
+	[cf_save="$CPPFLAGS"
+	 CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE"
+	 AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifdef _POSIX_C_SOURCE
+make an error
+#endif],
+	[cf_cv_xopen_source=no],
+	[cf_cv_xopen_source=yes])
+	CPPFLAGS="$cf_save"
+	])
+])
+test "$cf_cv_xopen_source" = yes && CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE"
+	;;
+esac
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_X_ATHENA version: 11 updated: 2002/12/26 20:56:10
+dnl -----------
 dnl Check for Xaw (Athena) libraries
 dnl
 AC_DEFUN([CF_X_ATHENA],
@@ -3290,23 +4312,37 @@ AC_ARG_WITH(neXtaw,
 	[  --with-neXtaw           link with neXT Athena library],
 	[cf_x_athena=neXtaw])
 
+AC_ARG_WITH(XawPlus,
+	[  --with-XawPlus          link with Athena-Plus library],
+	[cf_x_athena=XawPlus])
 
 AC_CHECK_LIB(Xext,XextCreateExtension,
 	[LIBS="-lXext $LIBS"])
 
-cf_x_athena_include=""
 cf_x_athena_lib=""
 
+CF_X_ATHENA_CPPFLAGS($cf_x_athena)
+CF_X_ATHENA_LIBS($cf_x_athena)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_X_ATHENA_CPPFLAGS version: 2 updated: 2002/10/09 20:00:37
+dnl --------------------
+dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
+dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
+AC_DEFUN([CF_X_ATHENA_CPPFLAGS],
+[
+cf_x_athena_root=ifelse($1,,Xaw,$1)
+cf_x_athena_include=""
+
 for cf_path in default \
 	/usr/contrib/X11R6 \
 	/usr/contrib/X11R5 \
 	/usr/lib/X11R5 \
 	/usr/local
 do
-
 	if test -z "$cf_x_athena_include" ; then
 		cf_save="$CPPFLAGS"
-		cf_test=X11/$cf_x_athena/SimpleMenu.h
+		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="-I$cf_path/include $cf_save"
 			AC_MSG_CHECKING(for $cf_test in $cf_path)
@@ -3321,12 +4357,40 @@ do
 		AC_MSG_RESULT($cf_result)
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
+			break
 		else
 			CPPFLAGS="$cf_save"
 		fi
 	fi
+done
+
+if test -z "$cf_x_athena_include" ; then
+	AC_MSG_WARN(
+[Unable to successfully find Athena header files with test program])
+elif test "$cf_x_athena_include" != default ; then
+	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include"
+fi
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_X_ATHENA_LIBS version: 3 updated: 2003/02/16 15:24:54
+dnl ----------------
+dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
+dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
+AC_DEFUN([CF_X_ATHENA_LIBS],
+[AC_REQUIRE([CF_X_TOOLKIT])
+cf_x_athena_root=ifelse($1,,Xaw,$1)
+cf_x_athena_lib=""
 
-	for cf_lib in "-l$cf_x_athena -lXmu" "-l${cf_x_athena}_s -lXmu_s"
+for cf_path in default \
+	/usr/contrib/X11R6 \
+	/usr/contrib/X11R5 \
+	/usr/lib/X11R5 \
+	/usr/local
+do
+	for cf_lib in \
+		"-l$cf_x_athena_root -lXmu" \
+		"-l$cf_x_athena_root -lXpm -lXmu" \
+		"-l${cf_x_athena_root}_s -lXmu_s"
 	do
 		if test -z "$cf_x_athena_lib" ; then
 			cf_save="$LIBS"
@@ -3338,13 +4402,16 @@ do
 				LIBS="$cf_lib $LIBS"
 				AC_MSG_CHECKING(for $cf_test in $cf_lib)
 			fi
+			cf_SAVE="$LIBS"
+			LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
 			AC_TRY_LINK([],[$cf_test()],
 				[cf_result=yes],
-				[cf_result=no],
-				[$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])
+				[cf_result=no])
 			AC_MSG_RESULT($cf_result)
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
+				LIBS="$cf_SAVE"
+				break
 			else
 				LIBS="$cf_save"
 			fi
@@ -3352,20 +4419,17 @@ do
 	done
 done
 
-if test -z "$cf_x_athena_include" ; then
-	AC_MSG_WARN(
-[Unable to successfully find Athena header files with test program])
-fi
-
 if test -z "$cf_x_athena_lib" ; then
 	AC_ERROR(
-[Unable to successfully link Athena library (-l$cf_x_athena) with test program])
+[Unable to successfully link Athena library (-l$cf_x_athena_root) with test program])
 fi
 
-CF_UPPER(CF_X_ATHENA_LIBS,HAVE_LIB_$cf_x_athena)
-AC_DEFINE_UNQUOTED($CF_X_ATHENA_LIBS)
-])dnl
+CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
+AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
+])
 dnl ---------------------------------------------------------------------------
+dnl CF_X_TOOLKIT version: 9 updated: 2001/12/30 19:09:58
+dnl ------------
 dnl Check for X Toolkit libraries
 dnl
 AC_DEFUN([CF_X_TOOLKIT],
@@ -3404,7 +4468,7 @@ esac
 if test $cf_have_X_LIBS = no ; then
 	AC_PATH_XTRA
 	LDFLAGS="$LDFLAGS $X_LIBS"
-	CF_ADD_CFLAGS($X_CFLAGS)
+	CF_CHECK_CFLAGS($X_CFLAGS)
 	AC_CHECK_LIB(X11,XOpenDisplay,
 		[LIBS="-lX11 $LIBS"],,
 		[$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])
@@ -3415,7 +4479,7 @@ if test $cf_have_X_LIBS = no ; then
 		[$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])
 else
 	LDFLAGS="$LDFLAGS $X_LIBS"
-	CF_ADD_CFLAGS($X_CFLAGS)
+	CF_CHECK_CFLAGS($X_CFLAGS)
 fi
 
 if test $cf_have_X_LIBS = no ; then
@@ -3425,3 +4489,35 @@ test program.  You will have to check and add the proper libraries by hand
 to makefile.])
 fi
 ])dnl
+dnl ---------------------------------------------------------------------------
+dnl jm_GLIBC21 version: 3 updated: 2002/10/27 23:21:42
+dnl ----------
+dnl Inserted as requested by gettext 0.10.40
+dnl File from /usr/share/aclocal
+dnl glibc21.m4
+dnl ====================
+dnl serial 2
+dnl
+dnl Test for the GNU C Library, version 2.1 or newer.
+dnl From Bruno Haible.
+AC_DEFUN([jm_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2_1=yes,
+	ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
diff --git a/gnu/usr.bin/lynx/cfg_defs.sh b/gnu/usr.bin/lynx/cfg_defs.sh
index 80a7c852c61..1be17106904 100644
--- a/gnu/usr.bin/lynx/cfg_defs.sh
+++ b/gnu/usr.bin/lynx/cfg_defs.sh
@@ -5,6 +5,9 @@
 TOP="${1-.}"
 OUT=cfg_defs.h
 
+# just in case we want to run this outside the makefile
+: ${SHELL:=/bin/sh}
+
 cat >$OUT <<EOF
 #ifndef CFG_DEFS_H
 #define CFG_DEFS_H 1
@@ -20,7 +23,7 @@ sed \
 	-e 's/^.[^=]*_cv_//' \
 	-e 's/=\${.*=/=/'  \
 	-e 's/}$//'          \
-	config.cache | /bin/sh $TOP/cfg_edit.sh >>$OUT
+	config.cache | $SHELL $TOP/cfg_edit.sh >>$OUT
 
 cat >>$OUT <<EOF
 };
@@ -36,7 +39,7 @@ sed	-e 's@	@ @g' \
 	-e 's@^[ 	]*#define[ 	]*@@' \
 	-e 's@[ ]*/\*.*\*/@@' \
 	-e 's@[ 	][ 	]*@=@' \
-    | /bin/sh $TOP/cfg_edit.sh >>$OUT
+    | $SHELL $TOP/cfg_edit.sh >>$OUT
 
 cat >>$OUT <<EOF
 };
diff --git a/gnu/usr.bin/lynx/config.guess b/gnu/usr.bin/lynx/config.guess
index 815aa848eb3..228c5fd0e04 100644
--- a/gnu/usr.bin/lynx/config.guess
+++ b/gnu/usr.bin/lynx/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2002-02-19'
+timestamp='2004-06-11'
 
 # 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
@@ -88,30 +88,42 @@ if test $# != 0; then
   exit 1
 fi
 
+trap 'exit 1' 1 2 15
 
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
 
-# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -138,9 +150,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	#
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
-	UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \
-	    UNAME_MACHINE_ARCH=unknown
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
@@ -166,12 +180,26 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		;;
 	esac
 	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -185,7 +213,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     luna88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
@@ -202,9 +230,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    pegasos:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -221,67 +246,60 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -304,6 +322,9 @@ EOF
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -321,6 +342,13 @@ EOF
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
@@ -389,6 +417,9 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -427,15 +458,20 @@ EOF
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && exit 0
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
 	exit 0 ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -508,8 +544,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -607,11 +642,21 @@ EOF
                   exit (0);
               }
 EOF
-		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     ia64:HP-UX:*:*)
@@ -645,8 +690,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -704,21 +748,26 @@ EOF
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
+    *:UNICOS/mp:*:*)
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -729,7 +778,21 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	# Determine whether the default compiler uses glibc.
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#if __GLIBC__ >= 2
+	LIBC=gnu
+	#else
+	LIBC=
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -740,14 +803,17 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:3*)
-	echo i386-pc-interix3
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+	exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
 	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
+	echo i586-pc-interix
 	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
@@ -759,16 +825,27 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -779,19 +856,37 @@ EOF
 	#undef CPU
 	#undef mips
 	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
-	CPU=mipsel 
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
 	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 	CPU=mips
 	#else
 	CPU=
 	#endif
-	#endif 
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c
-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
@@ -827,6 +922,9 @@ EOF
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -853,7 +951,7 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
+		exit 0 ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit 0 ;;
@@ -884,9 +982,11 @@ EOF
 	LIBC=gnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
@@ -904,6 +1004,26 @@ EOF
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -925,22 +1045,19 @@ EOF
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -964,9 +1081,15 @@ EOF
 	# "miniframe"
 	echo m68010-convergent-sysv
 	exit 0 ;;
-    M68*:*:R3V[567]*:*)
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit 0 ;;
+    M68*:*:R3V[5678]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -983,9 +1106,6 @@ EOF
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1057,6 +1177,9 @@ EOF
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
 	exit 0 ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
@@ -1064,20 +1187,24 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	case `uname -p` in
+	    *86) UNAME_PROCESSOR=i686 ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
-		echo i386-${UNAME_MACHINE}-nto-qnx
-	else
-		echo `uname -p`-${UNAME_MACHINE}-nto-qnx
 	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1100,11 +1227,6 @@ EOF
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
 	exit 0 ;;
@@ -1123,11 +1245,11 @@ EOF
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
 	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
 esac
 
@@ -1249,8 +1371,7 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
diff --git a/gnu/usr.bin/lynx/config.hin b/gnu/usr.bin/lynx/config.hin
index 9ea3918d177..faac6ace20f 100644
--- a/gnu/usr.bin/lynx/config.hin
+++ b/gnu/usr.bin/lynx/config.hin
@@ -10,7 +10,7 @@
 #undef CAN_SET_ERRNO		/* CF_SET_ERRNO */
 #undef CHMOD_PATH		/* CF_PATH_PROG(chmod) */
 #undef CJK_EX			/* CF_ARG_ENABLE(cjk) */
-#undef COLOR_CURSES		/* defined by CF_COLOR_CURSES */
+#undef COLOR_CURSES		/* CF_COLOR_CURSES */
 #undef COMPRESS_PATH		/* CF_PATH_PROG(compress) */
 #undef COPY_PATH		/* CF_PATH_PROG(cp) */
 #undef CURS_PERFORMANCE		/* CF_CURS_PERFORMANCE */
@@ -37,22 +37,20 @@
 #undef EXP_ALT_BINDINGS		/* CF_ARG_ENABLE(alt-bindings) */
 #undef EXP_CHARSET_CHOICE	/* CF_ARG_ENABLE(charset-choice) */
 #undef EXP_CHARTRANS_AUTOSWITCH	/* CF_ARG_ENABLE(font-switch) */
-#undef EXP_FILE_UPLOAD		/* CF_ARG_ENABLE(file-upload) */
 #undef EXP_JUSTIFY_ELTS		/* CF_ARG_ENABLE(justify-elts) */
 #undef EXP_KEYBOARD_LAYOUT	/* CF_ARG_ENABLE(kbd-layout) */
+#undef EXP_LOCALE_CHARSET	/* CF_ARG_ENABLE(locale-charset) */
 #undef EXP_LIBJS		/* CF_ARG_ENABLE(libjs) */
 #undef EXP_NESTED_TABLES	/* CF_ARG_ENABLE(nested-tables) */
-#undef EXP_PERSISTENT_COOKIES	/* CF_ARG_ENABLE(persistent-cookies) */
-#undef EXP_READPROGRESS		/* CF_ARG_ENABLE(read-eta) */
-#undef FANCY_CURSES		/* defined by CF_FANCY_CURSES */
+#undef FANCY_CURSES		/* CF_FANCY_CURSES */
 #undef GCC_NORETURN		/* CF_GCC_ATTRIBUTES */
 #undef GCC_PRINTF		/* CF_GCC_ATTRIBUTES */
 #undef GCC_UNUSED		/* CF_GCC_ATTRIBUTES */
 #undef GETGROUPS_T		/* AC_TYPE_GETGROUPS */
 #undef GZIP_PATH		/* CF_PATH_PROG(gzip) */
-#undef HAVE_ALLOCA		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_ALLOCA_H		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_ARGZ_H		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_ALLOCA		/* AM_GNU_GETTEXT/AC_FUNC_ALLOCA */
+#undef HAVE_ALLOCA_H		/* AM_GNU_GETTEXT/AC_FUNC_ALLOCA */
+#undef HAVE_ARGZ_H		/* AM_GNU_GETTEXT */
 #undef HAVE_ARPA_INET_H
 #undef HAVE_ASSUME_DEFAULT_COLORS /* ncurses extension */
 #undef HAVE_BSD_TOUCHLINE	/* CF_CURS_TOUCHLINE */
@@ -60,10 +58,10 @@
 #undef HAVE_CBREAK
 #undef HAVE_CURSESX_H
 #undef HAVE_CUSERID
-#undef HAVE_DCGETTEXT		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_DCGETTEXT		/* AM_GNU_GETTEXT */
 #undef HAVE_DEFINE_KEY
-#undef HAVE_DELSCREEN		/* defined by CF_CURSES_FUNCS  */
-#undef HAVE_DIRENT_H		/* defined by AC_HEADER_DIRENT */
+#undef HAVE_DELSCREEN		/* CF_CURSES_FUNCS  */
+#undef HAVE_DIRENT_H		/* AC_HEADER_DIRENT */
 #undef HAVE_FCNTL_H		/* have <fcntl.h> */
 #undef HAVE_FTIME
 #undef HAVE_GAI_STRERROR	/* CF_CHECK_IPV6 */
@@ -71,7 +69,7 @@
 #undef HAVE_GETATTRS
 #undef HAVE_GETBEGX
 #undef HAVE_GETBEGY
-#undef HAVE_GETBKGD		/* defined by CF_COLOR_CURSES */
+#undef HAVE_GETBKGD		/* CF_COLOR_CURSES */
 #undef HAVE_GETCWD
 #undef HAVE_GETGROUPS
 #undef HAVE_GETTEXT		/* defined if you want to use non-GNU gettext */
@@ -81,49 +79,57 @@
 #undef HAVE_INET_ATON		/* CF_INET_ADDR */
 #undef HAVE_JCURSES_H
 #undef HAVE_KEYPAD
+#undef HAVE_LANGINFO_CODESET	/* AM_LANGINFO_CODESET */
 #undef HAVE_LC_MESSAGES		/* locale messages */
+#undef HAVE_LIBDBMALLOC		/* --with-dbmalloc */
+#undef HAVE_LIBDMALLOC		/* --with-dmalloc */
+#undef HAVE_LIBGETTEXT_H	/* defined if you want to use bundled gettext */
 #undef HAVE_LIBINTL_H		/* AM_GNU_GETTEXT, or cleanup from that */
+#undef HAVE_LIBUTF8_H		/* may be needed for libncursesw */
 #undef HAVE_LIMITS_H
 #undef HAVE_LOCALE_H
-#undef HAVE_LSTAT		/* defined by CF_FUNC_LSTAT */
-#undef HAVE_MALLOC_H		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_MKSTEMP
+#undef HAVE_LSTAT		/* CF_FUNC_LSTAT */
+#undef HAVE_MALLOC_H		/* AM_GNU_GETTEXT */
+#undef HAVE_MBSTATE_T		/* CF_WIDEC_CURSES */
+#undef HAVE_MKDTEMP
 #undef HAVE_MKTEMP
-#undef HAVE_MMAP		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_MUNMAP		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_MMAP		/* AM_GNU_GETTEXT */
+#undef HAVE_MUNMAP		/* AM_GNU_GETTEXT */
 #undef HAVE_NAPMS
+#undef HAVE_NCURSESW_NCURSES_H	/* defined if we include <ncursesw/ncurses.h> */
+#undef HAVE_NCURSESW_TERM_H	/* have <ncursesw/term.h> */
 #undef HAVE_NCURSES_H		/* defined if we include <ncurses.h> */
 #undef HAVE_NCURSES_NCURSES_H	/* defined if we include <ncurses/ncurses.h> */
 #undef HAVE_NCURSES_TERM_H	/* have <ncurses/term.h> */
 #undef HAVE_NEWPAD
 #undef HAVE_NEWTERM
-#undef HAVE_NL_TYPES_H		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_NL_TYPES_H		/* AM_GNU_GETTEXT */
 #undef HAVE_PNOUTREFRESH
 #undef HAVE_POPEN
 #undef HAVE_PUTENV
 #undef HAVE_READDIR
 #undef HAVE_RESIZETERM
 #undef HAVE_RESOLV_H
-#undef HAVE_SETENV		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_SETENV		/* AM_GNU_GETTEXT */
 #undef HAVE_SETLOCALE
 #undef HAVE_SETUID
 #undef HAVE_SIGACTION		/* CF_FUNC_SIGACTION */
-#undef HAVE_SIZECHANGE		/* defined by CF_SIZECHANGE */
+#undef HAVE_SIZECHANGE		/* CF_SIZECHANGE */
 #undef HAVE_STDARG_H		/* CF_VARARGS */
 #undef HAVE_STDLIB_H
-#undef HAVE_STPCPY		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_STRCASECMP		/* defined by AM_GNU_GETTEXT */
-#undef HAVE_STRCHR		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_STPCPY		/* AM_GNU_GETTEXT */
+#undef HAVE_STRCASECMP		/* AM_GNU_GETTEXT */
+#undef HAVE_STRCHR		/* AM_GNU_GETTEXT */
 #undef HAVE_STRERROR
 #undef HAVE_STRING_H
 #undef HAVE_SYSLOG_H
 #undef HAVE_SYSV_TOUCHLINE	/* CF_CURS_TOUCHLINE */
-#undef HAVE_SYS_DIR_H		/* defined by AC_HEADER_DIRENT */
+#undef HAVE_SYS_DIR_H		/* AC_HEADER_DIRENT */
 #undef HAVE_SYS_FCNTL_H		/* have <sys/fcntl.h> */
 #undef HAVE_SYS_FILIO_H		/* have <sys/filio.h> */
 #undef HAVE_SYS_IOCTL_H		/* have <sys/ioctl.h> */
-#undef HAVE_SYS_NDIR_H		/* defined by AC_HEADER_DIRENT */
-#undef HAVE_SYS_PARAM_H		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_SYS_NDIR_H		/* AC_HEADER_DIRENT */
+#undef HAVE_SYS_PARAM_H		/* AM_GNU_GETTEXT */
 #undef HAVE_SYS_TIMEB_H		/* have <sys/timeb.h> */
 #undef HAVE_SYS_WAIT_H		/* have <sys/wait.h> */
 #undef HAVE_TERMIOS_H		/* have <termios.h> */
@@ -143,18 +149,19 @@
 #undef HAVE_UTMP_UT_SESSION	/* CF_UTMP_UT_SESSION */
 #undef HAVE_UTMP_UT_XSTATUS	/* CF_UTMP_UT_XSTATUS */
 #undef HAVE_UTMP_UT_XTIME	/* CF_UTMP_UT_XTIME */
-#undef HAVE_VALUES_H		/* defined by AM_GNU_GETTEXT */
+#undef HAVE_VALUES_H		/* AM_GNU_GETTEXT */
 #undef HAVE_VARARGS_H		/* CF_VARARGS */
 #undef HAVE_VASPRINTF
 #undef HAVE_VFORK_H		/* have <vfork.h> */
 #undef HAVE_WAITPID
+#undef HAVE_WATTR_GET
 #undef HAVE_WBORDER
 #undef HAVE_WREDRAWLN
 #undef HAVE_WRESIZE
 #undef HAVE_XCURSES		/* CF_PDCURSES_X11 */
-#undef HAVE___ARGZ_COUNT	/* defined by AM_GNU_GETTEXT */
-#undef HAVE___ARGZ_NEXT		/* defined by AM_GNU_GETTEXT */
-#undef HAVE___ARGZ_STRINGIFY	/* defined by AM_GNU_GETTEXT */
+#undef HAVE___ARGZ_COUNT	/* AM_GNU_GETTEXT */
+#undef HAVE___ARGZ_NEXT		/* AM_GNU_GETTEXT */
+#undef HAVE___ARGZ_STRINGIFY	/* AM_GNU_GETTEXT */
 #undef IGNORE_CTRL_C		/* FIXME: make tests? */
 #undef INCLUDE_PROTOTYPES	/* CF_SOCKS5 */
 #undef INSTALL_ARGS		/* CF_PATH_PROG(install) */
@@ -172,9 +179,10 @@
 #undef MV_PATH			/* CF_PATH_PROG(mv) */
 #undef NCURSES			/* defined for ncurses support */
 #undef NCURSES_BROKEN		/* defined for ncurses color support */
-#undef NEED_PTEM_H		/* defined by CF_SIZECHANGE */
-#undef NEED_REMOVE		/* defined by CF_REMOVE_BROKEN */
-#undef NGROUPS			/* defined by CF_NGROUPS */
+#undef NEED_PTEM_H		/* CF_SIZECHANGE */
+#undef NEED_REMOVE		/* CF_REMOVE_BROKEN */
+#undef NEED_WCHAR_H		/* CF_WIDEC_CURSES */
+#undef NGROUPS			/* CF_NGROUPS */
 #undef NO_CHANGE_EXECUTE_PERMS	/* CF_ARG_DISABLE(dired-xpermit) */
 #undef NO_CONFIG_INFO		/* CF_ARG_DISABLE(config-info) */
 #undef NO_EXTENDED_HTMLDTD	/* CF_ARG_DISABLE(extended-dtd) */
@@ -183,23 +191,22 @@
 #undef NO_OPTION_MENU		/* CF_ARG_DISABLE(option-menu) */
 #undef NO_PARENT_DIR_REFERENCE	/* CF_ARG_DISABLE(parent-dir-refs) */
 #undef NSL_FORK			/* CF_ARG_ENABLE(nsl-fork) */
-#undef OK_GZIP			/* CF_ARG_DISABLE(dired-gzip) */
 #undef OK_INSTALL
 #undef OK_OVERRIDE		/* CF_ARG_DISABLE(dired-override) */
 #undef OK_PERMIT		/* CF_ARG_DISABLE(dired-permit) */
-#undef OK_TAR			/* CF_ARG_DISABLE(dired-tar) */
-#undef OK_UUDECODE		/* CF_ARG_DISABLE(dired-uudecode) */
-#undef OK_ZIP			/* CF_ARG_DISABLE(dired-zip) */
 #undef REAL_UNIX_SYSTEM		/* CF_SLANG_UNIX_DEFS */
 #undef RLOGIN_PATH		/* CF_PATH_PROG(rlogin) */
 #undef RM_PATH			/* CF_PATH_PROG(rm) */
 #undef SOCKS			/* CF_SOCKS, CF_SOCKS5 */
-#undef SOURCE_CACHE		/* CF_ARG_ENABLE(source-cache) */
 #undef STDC_HEADERS
 #undef SYSTEM_MAIL		/* CF_DEFINE_PROG */
-#undef SYSTEM_MAIL_FLAGS	/* defined by CF_SYSTEM_MAIL_FLAGS */
+#undef SYSTEM_MAIL_FLAGS	/* CF_SYSTEM_MAIL_FLAGS */
 #undef SYSTEM_NAME		/* CF_CHECK_CACHE */
+#undef TAR_DOWN_OPTIONS		/* CF_TAR_OPTIONS */
+#undef TAR_FILE_OPTIONS		/* CF_TAR_OPTIONS */
 #undef TAR_PATH			/* CF_PATH_PROG(tar) */
+#undef TAR_PIPE_OPTIONS		/* CF_TAR_OPTIONS */
+#undef TAR_UP_OPTIONS		/* CF_TAR_OPTIONS */
 #undef TELNET_PATH		/* CF_PATH_PROG(telnet) */
 #undef TERMIO_AND_CURSES	/* CF_TERMIO_AND_CURSES workaround */
 #undef TERMIO_AND_TERMIOS	/* CF_TERMIO_AND_TERMIOS workaround */
@@ -210,44 +217,69 @@
 #undef UNDERLINE_LINKS		/* CF_ARG_ENABLE(underlines) */
 #undef UNIX
 #undef UNZIP_PATH		/* CF_PATH_PROG(unzip) */
+#undef USE_BZLIB		/* AC_ARG_WITH(bzlib) */
 #undef USE_COLOR_STYLE		/* CF_ARG_ENABLE(color-style) */
 #undef USE_DEFAULT_COLORS	/* CF_ARG_ENABLE(default-colors) */
 #undef USE_EXECVP		/* CF_ARG_DISABLE(full-paths) */
 #undef USE_EXTERNALS		/* CF_ARG_ENABLE(externs) */
 #undef USE_FCNTL		/* CF_FIONBIO */
+#undef USE_FILE_UPLOAD		/* CF_ARG_ENABLE(file-upload) */
+#undef USE_GNUTLS_INCL		/* CF_GNUTLS */
 #undef USE_OPENSSL_INCL		/* CF_SSL */
+#undef USE_PERSISTENT_COOKIES	/* CF_ARG_ENABLE(persistent-cookies) */
 #undef USE_PRETTYSRC		/* CF_ARG_ENABLE(prettysrc) */
+#undef USE_READPROGRESS		/* CF_ARG_ENABLE(read-eta) */
 #undef USE_SCROLLBAR		/* CF_ARG_ENABLE(scrollbar) */
 #undef USE_SLANG		/* AC_ARG_WITH(screen=slang) */
 #undef USE_SOCKS4_PREFIX	/* CF_SOCKS5 */
 #undef USE_SOCKS5		/* CF_SOCKS5 */
+#undef USE_SOURCE_CACHE		/* CF_ARG_ENABLE(source-cache) */
 #undef USE_SSL			/* CF_SSL */
 #undef USE_SYSV_UTMP		/* CF_UTMP */
+#undef USE_X509_SUPPORT		/* CF_GNUTLS, CF_SSL */
 #undef USE_ZLIB			/* AC_ARG_WITH(zlib) */
+#undef UTF8			/* CF_SLANG_CPPFLAGS */
 #undef UTMPX_FOR_UTMP		/* use <utmpx.h> since <utmp.h> not found */
 #undef UUDECODE_PATH		/* CF_PATH_PROG(uudecode) */
 #undef WAITPID_USES_UNION	/* CF_FUNC_WAIT */
 #undef WAIT_USES_UNION		/* CF_FUNC_WAIT */
+#undef WIDEC_CURSES		/* CF_WIDEC_CURSES */
 #undef XCURSES			/* CF_PDCURSES_X11 */
 #undef ZCAT_PATH		/* CF_PATH_PROG(zcat) */
 #undef ZIP_PATH			/* CF_PATH_PROG(zip) */
 #undef _ALL_SOURCE		/* AC_AIX */
-#undef inline			/* defined by AC_C_INLINE */
+#undef inline			/* AC_C_INLINE */
 #undef lynx_rand		/* CF_SRAND */
 #undef lynx_srand		/* CF_SRAND */
-#undef mode_t			/* defined by AC_TYPE_MODE_T */
-#undef off_t			/* defined by AC_TYPE_OFF_T */
-#undef pid_t			/* defined by AC_TYPE_PID_T */
-#undef uid_t			/* defined by AC_TYPE_UID_T */
+#undef mode_t			/* AC_TYPE_MODE_T */
+#undef off_t			/* AC_TYPE_OFF_T */
+#undef pid_t			/* AC_TYPE_PID_T */
+#undef uid_t			/* AC_TYPE_UID_T */
 #undef ut_name			/* CF_UTMP */
 #undef ut_xstatus		/* CF_UTMP_UT_XSTATUS */
 #undef ut_xtime			/* CF_UTMP_UT_XTIME */
 
+#ifdef GZIP_PATH
+#undef OK_GZIP			/* CF_ARG_DISABLE(dired-gzip) */
+#endif
+
+#ifdef TAR_PATH
+#undef OK_TAR			/* CF_ARG_DISABLE(dired-tar) */
+#endif
+
+#ifdef UUDECODE_PATH
+#undef OK_UUDECODE		/* CF_ARG_DISABLE(dired-uudecode) */
+#endif
+
+#ifdef ZIP_PATH
+#undef OK_ZIP			/* CF_ARG_DISABLE(dired-zip) */
+#endif
+
 /*
  * U/Win defines vfork() as a macro in vfork.h, which is included from unistd.h.
  */
 #ifndef HAVE_VFORK_H
-#undef vfork			/* defined by AC_FUNC_FORK */
+#undef vfork			/* AC_FUNC_FORK */
 #endif
 
 /* 'const' may be defined externally by the compiler-wrapper, as in 'unproto'
diff --git a/gnu/usr.bin/lynx/config.sub b/gnu/usr.bin/lynx/config.sub
index 9df4e53f809..6b6c9d6d438 100644
--- a/gnu/usr.bin/lynx/config.sub
+++ b/gnu/usr.bin/lynx/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2001-03-09'
+timestamp='2004-01-05'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-03-09'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -117,7 +118,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -157,6 +159,14 @@ case $os in
 		os=-vxworks
 		basic_machine=$1
 		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -215,24 +225,50 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
-	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
-		| pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| hppa64 \
-		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-		| alphaev6[78] \
-		| we32k | ns16k | clipper | i370 | sh | sh[34] \
-		| powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp10 | pdp11 \
-		| mips16 | mips64 | mipsel | mips64el \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v | d30v | fr30 | avr | openrisc)
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| msp430 \
+	| ns16k | ns32k \
+	| openrisc | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xscale | xstormy16 | xtensa \
+	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -240,45 +276,76 @@ case $basic_machine in
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[234567]86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
+	i*86 | x86_64)
+		basic_machine=$basic_machine-pc
+		;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	# FIXME: clean up the formatting here.
-	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
-	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-	      | hppa2.0n-* | hppa64-* \
-	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-	      | alphaev6[78]-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-	      | clipper-* | orion-* \
-	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
-	      | [cjt]90-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
-	      | bs2000-* | tic54x-* | c54x-* | x86_64-*)
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| msp430-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
+	| ymp-* \
+	| z8k-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -310,6 +377,12 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -341,6 +414,10 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -361,16 +438,8 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
+	cray | j90)
+		basic_machine=j90-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -385,6 +454,14 @@ case $basic_machine in
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -505,19 +582,19 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
+	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[34567]86v4*)
+	i*86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[34567]86v)
+	i*86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[34567]86sol2)
+	i*86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -565,14 +642,6 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -587,6 +656,10 @@ case $basic_machine in
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -659,6 +732,10 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -666,6 +743,14 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -688,42 +773,58 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-        pc532 | pc532-*)
+	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-	        ;;
+		;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-	        ;;
+		;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
@@ -741,10 +842,26 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -752,7 +869,10 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -819,22 +939,42 @@ case $basic_machine in
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=t3e-cray
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -856,8 +996,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+		basic_machine=f301-fujitsu
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -878,13 +1018,13 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
+	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -905,13 +1045,6 @@ case $basic_machine in
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
@@ -931,13 +1064,16 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv9)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-        cydra)
+	cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -952,9 +1088,8 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -979,8 +1114,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|'`
@@ -1008,28 +1143,34 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
 		case $basic_machine in
-		    x86-* | i[34567]86-*)
+		    x86-* | i*86-*)
 			;;
 		    *)
 			os=-nto$os
 			;;
 		esac
 		;;
+	-nto-qnx*)
+		;;
 	-nto*)
-		os=-nto-qnx
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1038,6 +1179,9 @@ case $os in
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1050,6 +1194,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+	-os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1068,14 +1215,23 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
 	-ns2 )
-	        os=-nextstep2
+		os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1087,6 +1243,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+	-tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1114,8 +1273,14 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
 		;;
 	-none)
 		;;
@@ -1148,10 +1313,14 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-        pdp11-*)
+	pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1178,6 +1347,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or32-*)
+		os=-coff
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1241,19 +1413,19 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-        *-gould)
+	*-gould)
 		os=-sysv
 		;;
-        *-highlevel)
+	*-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-        *-sgi)
+	*-sgi)
 		os=-irix
 		;;
-        *-siemens)
+	*-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1322,10 +1494,16 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks*)
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)
@@ -1340,6 +1518,9 @@ case $basic_machine in
 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
+			-vos*)
+				vendor=stratus
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
diff --git a/gnu/usr.bin/lynx/configure b/gnu/usr.bin/lynx/configure
index 519f4114d95..a82757bbb0f 100644
--- a/gnu/usr.bin/lynx/configure
+++ b/gnu/usr.bin/lynx/configure
@@ -1,7 +1,23 @@
 #! /bin/sh
 
+# From configure.in 2.8.5pre.5
+
+# Save the original $CFLAGS so we can distinguish whether the user set those
+# in the environment, or whether autoconf added -O and -g options:
+ORIGINAL_CFLAGS="$CFLAGS"
+
+# For autoconf 2.13, make sure we have no cache file at the beginning of this
+# script.  That fixes problems with tests whose cached values change from one
+# run to the next, as well as with tests that are order-dependent.
+rm -f config.cache
+
+
+
+
+
+
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13.20000819 
+# Generated automatically using autoconf version 2.13.20030927 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -182,7 +198,7 @@ Features and packages:
   --x-includes=DIR        X include files are in DIR
   --x-libraries=DIR       X library files are in DIR
 EOF
-cat <<EOF
+cat <<\EOF
 --enable and --with options recognized:
 Development Options:
   --disable-echo          display "compiling" commands
@@ -191,77 +207,85 @@ Development Options:
   --disable-trace         disable logic for trace code
   --enable-vertrace       verbose trace code
   --enable-warnings       GCC compiler warnings
+  --with-dbmalloc         test: use Conor Cahill's dbmalloc library
+  --with-dmalloc          test: use Gray Watson's dmalloc library
 Basic Configuration Options:
+  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
   --enable-nls            use Native Language Support
   --with-included-gettext use the GNU gettext library included here
-  --with-catgets          use catgets functions if available
-  --enable-included-msgs  use included messages, for i18n support
-  --with-nls-datadir=DIR  NLS data, parent of locale (default: PREFIX/DATADIR)
 EOF
-cat <<EOF
+cat <<\EOF
+  --disable-included-msgs use included messages, for i18n support
+  --with-nls-datadir=DIR  NLS data, parent of locale (default: PREFIX/DATADIR)
   --disable-full-paths    control whether full utility pathnames are used
   --with-ssl[=path]       link with ssl library if available
+  --with-gnutls[=path]    link with experimental gnutls support
   --with-socks[=path]     link with socks library if available
   --with-socks5[=path]    link with socks5 library if available
   --with-screen=XXX       select screen type
                           (XXX is curses (default), ncurses or slang)
+  --with-curses-dir=DIR   directory in which (n)curses is installed
   --with-charsets=list    limit charsets to given list of MIME names
 Experimental Options:
   --disable-bibp-urls     disable support for bibp: URLs
+EOF
+cat <<\EOF
   --disable-config-info   disable browsable configuration-info
-  --disable-forms-options disable experimental forms-based options
+  --disable-forms-options disable forms-based options
   --disable-menu-options  disable old-style option menu
   --enable-addrlist-page  use experimental address-list page
-EOF
-cat <<EOF
   --enable-charset-choice use experimental charset-selection logic
   --enable-cjk            use experimental CJK logic
   --enable-color-style    use optional/experimental color style (ncurses/curses)
   --enable-default-colors enable use of default-colors (ncurses/slang)
-  --enable-file-upload    use experimental file-upload support
   --enable-htmlized-cfg   build experimental htmlized lynx.cfg
   --enable-ipv6           use experimental ipv6 (with ipv4) support
   --enable-justify-elts   use experimental element-justification logic
   --enable-kbd-layout     use experimental keyboard-layout support
-  --enable-libjs          use experimental JavaScript support (Mozilla libjs)
-  --enable-nested-tables  use experimental nested-table support
-  --enable-prettysrc      colorize HTML source
 EOF
-cat <<EOF
-  --enable-read-eta       experimental read-progress message shows ETA
+cat <<\EOF
+  --enable-locale-charset use experimental locale-charset selection logic
+  --enable-nested-tables  use experimental nested-table support
   --enable-scrollbar      use experimental scrollbar, with mouse
-  --enable-source-cache   cache HTML source for parse mode changes
 Miscellaneous Options:
   --disable-alt-bindings  disable alternative line-edit bindings
   --disable-extended-dtd  disable extended HTML DTD logic
+  --disable-file-upload   use file-upload support
   --disable-partial       use partial-display logic
+  --disable-persistent-cookies  disable persistent-cookie support
+  --disable-prettysrc     colorize HTML source
+  --disable-read-eta      read-progress message shows ETA
+  --disable-source-cache  cache HTML source for parse mode changes
+EOF
+cat <<\EOF
   --enable-externs        use external commands
   --enable-font-switch    use Linux setfont for character-translation
   --enable-cgi-links      support cgi links w/o a http daemon
   --enable-change-exec    allow users to change exec options
   --enable-exec-links     allow lynx to execute programs accessed via a link
-EOF
-cat <<EOF
   --enable-exec-scripts   allow lynx to execute programs inferred from a link
   --enable-internal-links handle following links to same doc differently
   --enable-nsl-fork       fork NSL requests, allowing them to be aborted
   --enable-syslog         log URL requests via syslog
-  --disable-persistent-cookies  disable persistent-cookie support
   --enable-underlines     underline links rather than using boldface
   --enable-gzip-help      install gzip'ed help files
+  --with-bzlib            use libbz2 for decompression of some bzip2 files
+EOF
+cat <<\EOF
   --with-zlib             use zlib for decompression of some gzip files
+Other Network Services:
   --disable-finger        disable FINGER logic
   --disable-gopher        disable GOPHER logic
   --disable-news          disable NEWS logic
   --disable-ftp           disable FTP logic
-EOF
-cat <<EOF
 Directory Editor Options:
   --disable-dired          disable optional directory-editor, DirEd
-  --disable-dired-archive  disable dearchiving commands
+  --disable-dired-dearchive disable dearchiving commands
   --disable-dired-override disable DirEd override keymap
   --disable-dired-permit  disable chmod/attrib commands
   --disable-dired-xpermit disable chmod/attrib commands
+EOF
+cat <<\EOF
   --disable-dired-tar     disable "tar" command
   --disable-dired-uudecode disable "uudecode" command
   --disable-dired-zip     disable "zip", "unzip"  commands
@@ -269,12 +293,11 @@ Directory Editor Options:
   --disable-long-list     disable long "ls -l" directory listings
   --disable-parent-dir-refs
                           disable "Up-to" links in directory listings
-EOF
-cat <<EOF
 Special Libraries for PDCurses X11:
   --with-x                use the X Window System
   --with-Xaw3d            link with Xaw 3d library
   --with-neXtaw           link with neXT Athena library
+  --with-XawPlus          link with Athena-Plus library
 EOF
     exit 0 ;;
 
@@ -425,7 +448,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13.20000819"
+    echo "configure generated by autoconf version 2.13.20030927"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -613,9 +636,16 @@ else
 fi
 
 
-cat config.cache; rm -f config.cache; touch config.cache
+
+# autoconf 2.5x defaults to no cache file; we need the cache file's information
+# for building the config page.  But start with it empty to avoid confusion by
+# people who don't do a "make distclean" after applying patches.
+cache_file=config.cache
+rm -f config.cache; touch config.cache
+
 CONFIG_H=lynx_cfg.h
 
+
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -636,7 +666,7 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-if test -f $srcdir/config.guess ; then
+if test -f $ac_config_sub ; then
 	
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
@@ -644,7 +674,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:648: checking host system type" >&5
+echo "configure:678: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -683,7 +713,7 @@ fi
 
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$ac_t"""Configuring for $cf_cv_system_name"" 1>&6
+test -n "$cf_cv_system_name" && echo "$ac_t""Configuring for $cf_cv_system_name" 1>&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
 	echo "$ac_t""Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" 1>&6
@@ -692,8 +722,8 @@ fi
 
 
 PACKAGE=lynx
-VERSION=2.8.4
-
+# $Format: "VERSION=$ProjectVersion$"$
+VERSION=2.8.5rel.1
 
 
 
@@ -714,7 +744,7 @@ esac
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:718: checking for $ac_word" >&5
+echo "configure:748: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -744,7 +774,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:748: checking for $ac_word" >&5
+echo "configure:778: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -795,7 +825,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:799: checking for $ac_word" >&5
+echo "configure:829: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -827,7 +857,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:831: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:861: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -838,12 +868,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 842 "configure"
+#line 872 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -869,12 +899,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:873: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:903: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:878: checking whether we are using GNU C" >&5
+echo "configure:908: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -883,7 +913,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -902,7 +932,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:906: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:936: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -934,7 +964,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:938: checking how to run the C preprocessor" >&5
+echo "configure:968: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -949,13 +979,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 953 "configure"
+#line 983 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -966,13 +996,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 970 "configure"
+#line 1000 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -983,13 +1013,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 987 "configure"
+#line 1017 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1014,7 +1044,7 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1018: checking whether ln -s works" >&5
+echo "configure:1048: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1034,36 +1064,6 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1041: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
 echo "configure:1069: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
@@ -1190,10 +1190,183 @@ test -n "$LINT" && break
 done
 
 
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1195: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+if test $host != $build; then
+  ac_tool_prefix=${host_alias}-
+else
+  ac_tool_prefix=
+fi
+
+# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1221: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+if test -z "$ac_cv_prog_RANLIB"; then
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1253: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB="':'"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  RANLIB="':'"
+fi
+fi
+
+# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1288: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AR="${ac_tool_prefix}ar"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+AR="$ac_cv_prog_AR"
+if test -n "$AR"; then
+  echo "$ac_t""$AR" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+if test -z "$ac_cv_prog_AR"; then
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1320: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AR="ar"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
+fi
+fi
+AR="$ac_cv_prog_AR"
+if test -n "$AR"; then
+  echo "$ac_t""$AR" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  AR="ar"
+fi
+fi
+
+if eval "test \"`echo '$''{'cf_cv_subst_AR_OPTS'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6
+echo "configure:1357: checking for archiver options (symbol AR_OPTS)" >&5
+test -z "$AR_OPTS" && AR_OPTS=rv
+echo "$ac_t""$AR_OPTS" 1>&6
+
+cf_cv_subst_AR_OPTS=$AR_OPTS
+fi
+
+AR_OPTS=${cf_cv_subst_AR_OPTS}
+
+
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1195: checking for AIX" >&5
+echo "configure:1368: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1197 "configure"
+#line 1370 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -1215,7 +1388,7 @@ rm -f conftest*
 
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1219: checking for POSIXized ISC" >&5
+echo "configure:1392: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
@@ -1241,7 +1414,7 @@ fi
 
 
 echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:1245: checking if you want to see long compiling messages" >&5
+echo "configure:1418: checking if you want to see long compiling messages" >&5
 
 # Check whether --enable-echo or --disable-echo was given.
 if test "${enable_echo+set}" = set; then
@@ -1249,6 +1422,7 @@ if test "${enable_echo+set}" = set; then
   test "$enableval" != no && enableval=yes
   if test "$enableval" != "yes" ; then
     
+    ECHO_LT='--silent'
     ECHO_LD='@echo linking $@;'
     RULE_CC='	@echo compiling $<'
     SHOW_CC='	@echo compiling $@'
@@ -1256,6 +1430,7 @@ if test "${enable_echo+set}" = set; then
  
   else
     
+    ECHO_LT=''
     ECHO_LD=''
     RULE_CC='# compiling'
     SHOW_CC='# compiling'
@@ -1265,6 +1440,7 @@ if test "${enable_echo+set}" = set; then
 else
   enableval=yes 
   
+    ECHO_LT=''
     ECHO_LD=''
     RULE_CC='# compiling'
     SHOW_CC='# compiling'
@@ -1280,6 +1456,7 @@ echo "$ac_t""$enableval" 1>&6
 
 
 
+
 # special case for WWW/*
 if test -n "$ECHO_CC" ; then
 	DONT_ECHO_CC="$SHOW_CC ;"
@@ -1289,7 +1466,7 @@ fi
 
 
 echo $ac_n "checking if you want to check memory-leaks""... $ac_c" 1>&6
-echo "configure:1293: checking if you want to check memory-leaks" >&5
+echo "configure:1470: checking if you want to check memory-leaks" >&5
 
 # Check whether --enable-find-leaks or --disable-find-leaks was given.
 if test "${enable_find_leaks+set}" = set; then
@@ -1312,8 +1489,11 @@ test "$with_leak_checks" = "yes" && cat >> confdefs.h <<\EOF
 EOF
 
 
+# The comment about adding -g to $CFLAGS is unclear.  Autoconf tries to add
+# a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
+# disabled.
 echo $ac_n "checking if you want to enable debug-code""... $ac_c" 1>&6
-echo "configure:1317: checking if you want to enable debug-code" >&5
+echo "configure:1497: checking if you want to enable debug-code" >&5
 
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
@@ -1334,7 +1514,7 @@ echo "$ac_t""$with_debug" 1>&6
 if test "$with_debug" = "yes" ; then
 	case $host_os in
 	ultrix*|osf*)
-		
+		test -z "$ORIGINAL_CFLAGS" && 
 CFLAGS=`echo ${CFLAGS} | sed -e 's/-O[1-9]\? //' -e 's/-O[1-9]\?$//'`
 
 		if test -z "$GCC" ; then
@@ -1346,16 +1526,16 @@ else
 	case $host_os in
 	osf*) #(vi
 		test -z "$GCC" && CFLAGS="$CFLAGS -std1"
-		CFLAGS=`echo ${CFLAGS} | sed -e 's/-g //' -e 's/-g$//'`
+		test -z "$ORIGINAL_CFLAGS" && CFLAGS=`echo ${CFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
 		;;
 	*)
-		CFLAGS=`echo ${CFLAGS} | sed -e 's/-g //' -e 's/-g$//'`
+		test -z "$ORIGINAL_CFLAGS" && CFLAGS=`echo ${CFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
 		;;
 	esac
 fi
 
 echo $ac_n "checking if you want to enable lynx trace code *recommended* ""... $ac_c" 1>&6
-echo "configure:1359: checking if you want to enable lynx trace code *recommended* " >&5
+echo "configure:1539: checking if you want to enable lynx trace code *recommended* " >&5
 
 # Check whether --enable-trace or --disable-trace was given.
 if test "${enable_trace+set}" = set; then
@@ -1379,7 +1559,7 @@ EOF
 
 
 echo $ac_n "checking if you want verbose trace code""... $ac_c" 1>&6
-echo "configure:1383: checking if you want verbose trace code" >&5
+echo "configure:1563: checking if you want verbose trace code" >&5
 
 # Check whether --enable-vertrace or --disable-vertrace was given.
 if test "${enable_vertrace+set}" = set; then
@@ -1405,7 +1585,7 @@ EOF
 if test -n "$GCC"
 then
 echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:1409: checking if you want to turn on gcc warnings" >&5
+echo "configure:1589: checking if you want to turn on gcc warnings" >&5
 
 # Check whether --enable-warnings or --disable-warnings was given.
 if test "${enable_warnings+set}" = set; then
@@ -1445,9 +1625,9 @@ EOF
 if test "$GCC" = yes
 then
 	echo "checking for $CC __attribute__ directives" 1>&6
-echo "configure:1449: checking for $CC __attribute__ directives" >&5
+echo "configure:1629: checking for $CC __attribute__ directives" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1451 "configure"
+#line 1631 "configure"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -1485,11 +1665,9 @@ EOF
 EOF
 			;;
 		esac
-		if { (eval echo configure:1489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+		if { (eval echo configure:1669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 			test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6
 			cat conftest.h >>confdefs.h
-#		else
-#			sed -e 's/__attr.*/\/*nothing*\//' conftest.h >>confdefs.h
 		fi
 	done
 else
@@ -1499,14 +1677,26 @@ rm -rf conftest*
 fi
 
 	
+
+GCC_VERSION=none
+if test "$GCC" = yes ; then
+	echo $ac_n "checking version of $CC""... $ac_c" 1>&6
+echo "configure:1685: checking version of $CC" >&5
+	GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+	echo "$ac_t""$GCC_VERSION" 1>&6
+fi
+
+
+
 if test "$GCC" = yes
 then
 	cat > conftest.$ac_ext <<EOF
-#line 1506 "configure"
+#line 1696 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 	echo "checking for $CC warning options" 1>&6
-echo "configure:1510: checking for $CC warning options" >&5
+echo "configure:1700: checking for $CC warning options" >&5
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
 	cf_warn_CONST=""
@@ -1521,13 +1711,26 @@ echo "configure:1510: checking for $CC warning options" >&5
 		Wnested-externs \
 		Wpointer-arith \
 		Wshadow \
-		Wstrict-prototypes $cf_warn_CONST
+		Wstrict-prototypes \
+		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo configure:1528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+		if { (eval echo configure:1719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
+			case $cf_opt in #(vi
+			Wcast-qual) #(vi
+				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
+				;;
+			Winline) #(vi
+				case $GCC_VERSION in
+				3.3*)
+					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+
+					continue;;
+				esac
+				;;
+			esac
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-			test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
 		fi
 	done
 	rm -f conftest*
@@ -1538,6 +1741,130 @@ fi
 fi
 fi
 
+echo $ac_n "checking if you want to link with dbmalloc for testing""... $ac_c" 1>&6
+echo "configure:1746: checking if you want to link with dbmalloc for testing" >&5
+
+# Check whether --with-dbmalloc or --without-dbmalloc was given.
+if test "${with_dbmalloc+set}" = set; then
+  withval="$with_dbmalloc"
+  with_dbmalloc=$withval
+else
+  with_dbmalloc=no
+fi
+
+echo "$ac_t""$with_dbmalloc" 1>&6
+if test $with_dbmalloc = yes ; then
+	echo $ac_n "checking for debug_malloc in -ldbmalloc""... $ac_c" 1>&6
+echo "configure:1759: checking for debug_malloc in -ldbmalloc" >&5
+ac_lib_var=`echo dbmalloc'_'debug_malloc | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldbmalloc  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1767 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char debug_malloc();
+
+int main() {
+debug_malloc()
+; return 0; }
+EOF
+if { (eval echo configure:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo dbmalloc | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ldbmalloc $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+echo $ac_n "checking if you want to link with dmalloc for testing""... $ac_c" 1>&6
+echo "configure:1808: checking if you want to link with dmalloc for testing" >&5
+
+# Check whether --with-dmalloc or --without-dmalloc was given.
+if test "${with_dmalloc+set}" = set; then
+  withval="$with_dmalloc"
+  with_dmalloc=$withval
+else
+  with_dmalloc=no
+fi
+
+echo "$ac_t""$with_dmalloc" 1>&6
+if test $with_dmalloc = yes ; then
+	echo $ac_n "checking for dmalloc_debug in -ldmalloc""... $ac_c" 1>&6
+echo "configure:1821: checking for dmalloc_debug in -ldmalloc" >&5
+ac_lib_var=`echo dmalloc'_'dmalloc_debug | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldmalloc  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1829 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dmalloc_debug();
+
+int main() {
+dmalloc_debug()
+; return 0; }
+EOF
+if { (eval echo configure:1840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo dmalloc | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ldmalloc $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
 
 cat >> confdefs.h <<\EOF
 #define UNIX 1
@@ -1545,12 +1872,12 @@ EOF
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1549: checking for working const" >&5
+echo "configure:1876: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1554 "configure"
+#line 1881 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1599,7 +1926,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1620,7 +1947,146 @@ EOF
 fi
 
 
-PROG_EXT=
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+echo "configure:1952: checking for Cygwin environment" >&5
+if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1957 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:1968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_cygwin=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_cygwin=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_cygwin" 1>&6
+CYGWIN=
+test "$ac_cv_cygwin" = yes && CYGWIN=yes
+echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
+echo "configure:1985: checking for mingw32 environment" >&5
+if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1990 "configure"
+#include "confdefs.h"
+
+int main() {
+return __MINGW32__;
+; return 0; }
+EOF
+if { (eval echo configure:1997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_mingw32=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_mingw32=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_mingw32" 1>&6
+MINGW32=
+test "$ac_cv_mingw32" = yes && MINGW32=yes
+
+
+case $cf_cv_system_name in
+os2*)
+    CFLAGS="$CFLAGS -Zmt"
+    CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
+    CXXFLAGS="$CXXFLAGS -Zmt"
+    # autoconf's macro sets -Zexe and suffix both, which conflict:w
+    LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
+    ac_cv_exeext=.exe
+    ;;
+esac
+
+
+
+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+echo "configure:2029: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+  ac_cv_exeext=.exe
+else
+  rm -f conftest*
+  echo 'int main () { return 0; }' > conftest.$ac_ext
+  ac_cv_exeext=
+  if { (eval echo configure:2039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+    for file in conftest.*; do
+      case $file in
+      *.c | *.o | *.obj) ;;
+      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+      esac
+    done
+  else
+    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+  fi
+  rm -f conftest*
+  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+fi
+fi
+
+EXEEXT=""
+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+echo "$ac_t""${ac_cv_exeext}" 1>&6
+ac_exeext=$EXEEXT
+
+echo $ac_n "checking for object suffix""... $ac_c" 1>&6
+echo "configure:2060: checking for object suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  rm -f conftest*
+echo 'int i = 1;' > conftest.$ac_ext
+if { (eval echo configure:2066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  for ac_file in conftest.*; do
+    case $ac_file in
+    *.c) ;;
+    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
+    esac
+  done
+else
+  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_objext" 1>&6
+OBJEXT=$ac_cv_objext
+ac_objext=$ac_cv_objext
+
+
+PROG_EXT="$EXEEXT"
+
+test -n "$PROG_EXT" && cat >> confdefs.h <<EOF
+#define PROG_EXT "$PROG_EXT"
+EOF
+
+
 TRY_CFLAGS=
 case $host_os in
 aix4*)
@@ -1628,6 +2094,7 @@ aix4*)
 	LIBS="$LIBS -lbsd"
 	;;
 aix*)
+	TRY_CFLAGS="$TRY_CFLAGS -D_ACS_COMPAT_CODE"
 	LIBS="$LIBS -lbsd"
 	;;
 apollo*)
@@ -1641,7 +2108,7 @@ clix*)
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 	echo $ac_n "checking for strcmp in -lc_s""... $ac_c" 1>&6
-echo "configure:1645: checking for strcmp in -lc_s" >&5
+echo "configure:2112: checking for strcmp in -lc_s" >&5
 ac_lib_var=`echo c_s'_'strcmp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1649,7 +2116,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1653 "configure"
+#line 2120 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1660,7 +2127,7 @@ int main() {
 strcmp()
 ; return 0; }
 EOF
-if { (eval echo configure:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1692,7 +2159,7 @@ convex*)
 	TRY_CFLAGS="$TRY_CFLAGS -D__STDC__ -Dunix"
 	;;
 cygwin*)
-	PROG_EXT=".exe"
+	TRY_CFLAGS="$TRY_CFLAGS -DWIN_EX -D_WINDOWS_NSL"
 	LIBS="$LIBS -luser32"
 	;;
 dgux*)
@@ -1715,18 +2182,16 @@ irix*)
 linux*)
 	TRY_CFLAGS="$TRY_CFLAGS -DLINUX"
 	;;
+msdosdjgpp*)
+	LIBS="$LIBS -lwatt"
+	TRY_CFLAGS="$TRY_CFLAGS -DDOSPATH -DNOUSERS"
+	;;
 next*)
-	TRY_CFLAGS="$TRY_CFLAGS -DNEXT -DXMOSAIC_HACK"
+	TRY_CFLAGS="$TRY_CFLAGS -DNEXT"
 	;;
-openbsd*)
+openbsd* | ekkobsd* | mirbsd*)
 	LIBS="$LIBS -lcompat"
 	;;
-os2*)
-	# We make sure -Zexe is not used -- it would interfere with @PROG_EXT@
-	TRY_CFLAGS="$TRY_CFLAGS -Zmt -D__ST_MT_ERRNO__"
-	LDFLAGS=`echo "$LDFLAGS -Zmt -Zcrtdll" | sed "s/-Zexe//g"`
-	PROG_EXT=".exe"
-	;;
 osf4*)
 	# The -Olimit flag (see below) is no longer available with
 	# Digital C 5.2, which is bundled with Digital UNIX 4.0.
@@ -1753,7 +2218,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1757: checking for $ac_word" >&5
+echo "configure:2222: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1798,17 +2263,17 @@ sony-newsos*)
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1802: checking for $ac_hdr" >&5
+echo "configure:2267: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1807 "configure"
+#line 2272 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1852,17 +2317,17 @@ ultrix*)
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1856: checking for $ac_hdr" >&5
+echo "configure:2321: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1861 "configure"
+#line 2326 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1895,11 +2360,10 @@ done
 	;;
 esac
 
-
 if test -z "$GCC" ; then
 	
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1903: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:2367: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1923,26 +2387,39 @@ for cf_arg in "-DCC_HAS_PROTOS" \
 	-Xc
 do
 	
+cf_new_cflags=
+cf_new_cppflags=
 for cf_add_cflags in $cf_arg
 do
 	case $cf_add_cflags in #(vi
 	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
 		case "$CPPFLAGS" in
-		*$cf_add_cflags)
+		*$cf_add_cflags) #(vi
 			;;
-		*)
-			CPPFLAGS="$CPPFLAGS $cf_add_cflags"
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
 		;;
 	*)
-		CFLAGS="$CFLAGS $cf_add_cflags"
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
 		;;
 	esac
 done
 
+if test -n "$cf_new_cflags" ; then
+	
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+	
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+
 	cat > conftest.$ac_ext <<EOF
-#line 1946 "configure"
+#line 2423 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -1958,7 +2435,7 @@ int main() {
 	struct s2 {int (*f) (double a);};
 ; return 0; }
 EOF
-if { (eval echo configure:1962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -1977,24 +2454,37 @@ echo "$ac_t""$cf_cv_ansi_cc" 1>&6
 if test "$cf_cv_ansi_cc" != "no"; then
 if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
 	
+cf_new_cflags=
+cf_new_cppflags=
 for cf_add_cflags in $cf_cv_ansi_cc
 do
 	case $cf_add_cflags in #(vi
 	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
 		case "$CPPFLAGS" in
-		*$cf_add_cflags)
+		*$cf_add_cflags) #(vi
 			;;
-		*)
-			CPPFLAGS="$CPPFLAGS $cf_add_cflags"
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
 		;;
 	*)
-		CFLAGS="$CFLAGS $cf_add_cflags"
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
 		;;
 	esac
 done
 
+if test -n "$cf_new_cflags" ; then
+	
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+	
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+
 else
 	cat >> confdefs.h <<\EOF
 #define CC_HAS_PROTOS 1
@@ -2008,13 +2498,43 @@ fi
 
 
 
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2505: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2013: checking for ANSI C header files" >&5
+echo "configure:2533: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2018 "configure"
+#line 2538 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2022,7 +2542,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2039,7 +2559,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2043 "configure"
+#line 2563 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2057,7 +2577,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2061 "configure"
+#line 2581 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2078,7 +2598,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2082 "configure"
+#line 2602 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2089,7 +2609,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:2093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2113,21 +2633,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2117: checking for inline" >&5
+echo "configure:2637: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2124 "configure"
+#line 2644 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2153,12 +2673,12 @@ EOF
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2157: checking for off_t" >&5
+echo "configure:2677: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2162 "configure"
+#line 2682 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2186,12 +2706,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2190: checking for size_t" >&5
+echo "configure:2710: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2195 "configure"
+#line 2715 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2221,19 +2741,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2225: checking for working alloca.h" >&5
+echo "configure:2745: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2230 "configure"
+#line 2750 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:2237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -2254,12 +2774,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2258: checking for alloca" >&5
+echo "configure:2778: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2263 "configure"
+#line 2783 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -2287,7 +2807,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -2319,12 +2839,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2323: checking whether alloca needs Cray hooks" >&5
+echo "configure:2843: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2328 "configure"
+#line 2848 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -2349,12 +2869,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2353: checking for $ac_func" >&5
+echo "configure:2873: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2358 "configure"
+#line 2878 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2377,7 +2897,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2404,7 +2924,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2408: checking stack direction for C alloca" >&5
+echo "configure:2928: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2412,7 +2932,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2416 "configure"
+#line 2936 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2431,7 +2951,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -2456,17 +2976,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2460: checking for $ac_hdr" >&5
+echo "configure:2980: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2465 "configure"
+#line 2985 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2495,12 +3015,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2499: checking for $ac_func" >&5
+echo "configure:3019: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2504 "configure"
+#line 3024 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2523,7 +3043,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2548,7 +3068,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2552: checking for working mmap" >&5
+echo "configure:3072: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2556,7 +3076,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2560 "configure"
+#line 3080 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -2696,7 +3216,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -2719,6 +3239,43 @@ EOF
 fi
 
 
+    echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
+echo "configure:3244: checking whether we are using the GNU C Library 2.1 or newer" >&5
+if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3249 "configure"
+#include "confdefs.h"
+
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "Lucky GNU user" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_gnu_library_2_1=yes
+else
+  rm -rf conftest*
+  ac_cv_gnu_library_2_1=no
+fi
+rm -f conftest*
+
+      
+    
+fi
+
+echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6
+    
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  
+
+
 	case $cf_cv_system_name in
 	os2*)	PATHSEP=';'  ;;
 	*)	PATHSEP=':'  ;;
@@ -2731,23 +3288,36 @@ cf_makefile=makefile
 
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
-                              
-   for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h sys/param.h
+# Allow override of "config.h" definition:
+: ${CONFIG_H=config.h}
+
+
+if test -z "$VERSION" ; then
+if test -f $srcdir/VERSION ; then
+	VERSION=`sed -e '2,$d' $srcdir/VERSION|cut -f1`
+else
+	VERSION=unknown
+fi
+fi
+
+
+                                    
+   for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2741: checking for $ac_hdr" >&5
+echo "configure:3311: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2746 "configure"
+#line 3316 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2773,16 +3343,17 @@ else
 fi
 done
 
-   for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
-strdup __argz_count __argz_stringify __argz_next
+   for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \
+getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
+strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2781: checking for $ac_func" >&5
+echo "configure:3352: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2786 "configure"
+#line 3357 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2805,7 +3376,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2830,85 +3401,185 @@ fi
 done
 
 
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     for ac_func in stpcpy
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2838: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   
+    
+  
+# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then
+  withval="$with_libiconv_prefix"
+  
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+    done
+   
+fi
+
+
+  echo $ac_n "checking for iconv""... $ac_c" 1>&6
+echo "configure:3421: checking for iconv" >&5
+if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
+  
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    cat > conftest.$ac_ext <<EOF
+#line 3429 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
+#include <stdlib.h>
+#include <iconv.h>
 int main() {
+iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);
+; return 0; }
+EOF
+if { (eval echo configure:3439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  am_cv_func_iconv=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS -liconv"
+      cat > conftest.$ac_ext <<EOF
+#line 3451 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <iconv.h>
+int main() {
+iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);
+; return 0; }
+EOF
+if { (eval echo configure:3461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+      LIBS="$am_save_LIBS"
+    fi
+  
+fi
 
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
+echo "$ac_t""$am_cv_func_iconv" 1>&6
+  if test "$am_cv_func_iconv" = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_ICONV 1
+EOF
+
+    echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
+echo "configure:3482: checking for iconv declaration" >&5
+    if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+      cat > conftest.$ac_ext <<EOF
+#line 3488 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
-$ac_func();
+size_t iconv();
 #endif
 
+int main() {
+
 ; return 0; }
 EOF
-if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  am_cv_proto_iconv_arg1=""
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  am_cv_proto_iconv_arg1="const"
 fi
 rm -f conftest*
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
 fi
 
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
+    am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    echo "$ac_t""${ac_t:-
+         }$am_cv_proto_iconv" 1>&6
+    cat >> confdefs.h <<EOF
+#define ICONV_CONST $am_cv_proto_iconv_arg1
 EOF
- 
+
+  fi
+  LIBICONV=
+  if test "$am_cv_lib_iconv" = yes; then
+    LIBICONV="-liconv"
+  fi
+  
+
+   
+  echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
+echo "configure:3536: checking for nl_langinfo and CODESET" >&5
+if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  echo "$ac_t""no" 1>&6
+  cat > conftest.$ac_ext <<EOF
+#line 3541 "configure"
+#include "confdefs.h"
+#include <langinfo.h>
+int main() {
+char* cs = nl_langinfo(CODESET);
+; return 0; }
+EOF
+if { (eval echo configure:3548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  am_cv_langinfo_codeset=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  am_cv_langinfo_codeset=no
+fi
+rm -f conftest*
+    
 fi
-done
 
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     cat >> confdefs.h <<\EOF
-#define HAVE_STPCPY 1
+echo "$ac_t""$am_cv_langinfo_codeset" 1>&6
+  if test $am_cv_langinfo_codeset = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_LANGINFO_CODESET 1
 EOF
 
-   fi
+  fi
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2900: checking for LC_MESSAGES" >&5
+echo "configure:3571: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2905 "configure"
+#line 3576 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:2912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -2929,8 +3600,9 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2933: checking whether NLS is requested" >&5
+echo "configure:3604: checking whether NLS is requested" >&5
         
+    
 # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -2942,7 +3614,9 @@ fi
     echo "$ac_t""$USE_NLS" 1>&6
     
 
+    BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
+    INTLLIBS=
 
         if test "$USE_NLS" = "yes"; then
       cat >> confdefs.h <<\EOF
@@ -2950,7 +3624,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2954: checking whether included gettext is requested" >&5
+echo "configure:3628: checking whether included gettext is requested" >&5
       
 # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
@@ -2964,23 +3638,24 @@ fi
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-                        		nls_cv_header_intl=
-	nls_cv_header_libgt=
-	CATOBJEXT=NONE
+                        	CATOBJEXT=NONE
+
+                
+        
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2974: checking for libintl.h" >&5
+echo "configure:3649: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2979 "configure"
+#line 3654 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2996,158 +3671,92 @@ rm -f conftest*
 fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:3001: checking for gettext in libc" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
+  echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
+echo "configure:3676: checking for GNU gettext in libc" >&5
+if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3006 "configure"
+#line 3681 "configure"
 #include "confdefs.h"
 #include <libintl.h>
+extern int _nl_msg_cat_cntr;
 int main() {
-return (int) gettext ("")
+bindtextdomain ("", "");
+return (int) gettext ("") + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:3013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  gt_cv_func_gettext_libc=yes
+  gt_cv_func_gnugettext1_libc=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  gt_cv_func_gettext_libc=no
+  gt_cv_func_gnugettext1_libc=no
 fi
 rm -f conftest*
 fi
 
-echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
-
-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:3029: checking for bindtextdomain in -lintl" >&5
-ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lintl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3037 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char bindtextdomain();
-
-int main() {
-bindtextdomain()
-; return 0; }
-EOF
-if { (eval echo configure:3048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6
 
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-   gt_save_LIBS="$LIBS"
-		 LIBS="$gt_save_LIBS -lintl"
-	         echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:3066: checking for gettext in libintl" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
+	   if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+	     echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
+echo "configure:3706: checking for GNU gettext in libintl" >&5
+if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 3071 "configure"
+  gt_save_LIBS="$LIBS"
+		LIBS="$LIBS -lintl $LIBICONV"
+		cat > conftest.$ac_ext <<EOF
+#line 3713 "configure"
 #include "confdefs.h"
-
+#include <libintl.h>
+extern int _nl_msg_cat_cntr;
 int main() {
-return (int) gettext ("")
+bindtextdomain ("", "");
+return (int) gettext ("") + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:3078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  gt_cv_func_gettext_libintl=yes
+  gt_cv_func_gnugettext1_libintl=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  gt_cv_func_gettext_libintl=no
+  gt_cv_func_gnugettext1_libintl=no
 fi
 rm -f conftest*
+		LIBS="$gt_save_LIBS"
 fi
 
-echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
-		 LIBS="$gt_save_LIBS"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
+echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6
 	   fi
 
-	   if test "$gt_cv_func_gettext_libintl" = yes; then
-	     LIBS="$LIBS -lintl"
-	   fi
-
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      cat >> confdefs.h <<\EOF
+	   	   	   	   	   if test "$gt_cv_func_gnugettext1_libc" = "yes" \
+	      || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
+		   && test "$PACKAGE" != gettext; }; then
+	     cat >> confdefs.h <<\EOF
 #define HAVE_GETTEXT 1
 EOF
 
-	      # Extract the first word of "msgfmt", so it can be a program name with args.
 
-set dummy msgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3112: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$MSGFMT" in
-  /*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
-  ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
-  echo "$ac_t""$MSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-	      if test "$MSGFMT" != "no"; then
-		for ac_func in dcgettext
+	     if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+	       	       	       	       INTLLIBS="-lintl $LIBICONV"
+	     fi
+
+	     gt_save_LIBS="$LIBS"
+	     LIBS="$LIBS $INTLLIBS"
+	     for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3146: checking for $ac_func" >&5
+echo "configure:3755: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3151 "configure"
+#line 3760 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3170,7 +3779,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3194,253 +3803,47 @@ else
 fi
 done
 
-		# Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3201: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$GMSGFMT" in
-  /*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
-  echo "$ac_t""$GMSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+	     LIBS="$gt_save_LIBS"
 
-		# Extract the first word of "xgettext", so it can be a program name with args.
+	     	     # Extract the first word of "msgfmt", so it can be a program name with args.
 
-set dummy xgettext; ac_word=$2
+set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3238: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+echo "configure:3813: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$XGETTEXT" in
+  case "$MSGFMT" in
   /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
   ;;
   *)
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+      if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then
+	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
 	break
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
   ;;
 esac
 fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
-  echo "$ac_t""$XGETTEXT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-		cat > conftest.$ac_ext <<EOF
-#line 3270 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr
-; return 0; }
-EOF
-if { (eval echo configure:3278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  CATOBJEXT=.gmo
-		   DATADIRNAME=share
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CATOBJEXT=.mo
-		   DATADIRNAME=lib
-fi
-rm -f conftest*
-		INSTOBJEXT=.mo
-	      fi
-	    fi
-	
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:3301: checking whether catgets can be used" >&5
-	  
-# Check whether --with-catgets or --without-catgets was given.
-if test "${with_catgets+set}" = set; then
-  withval="$with_catgets"
-  nls_cv_use_catgets=$withval
-else
-  nls_cv_use_catgets=no
-fi
-
-	  echo "$ac_t""$nls_cv_use_catgets" 1>&6
-
-	  if test "$nls_cv_use_catgets" = "yes"; then
-	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:3315: checking for main in -li" >&5
-ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-li  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3323 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:3330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo i | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-li $LIBS"
-
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+  echo "$ac_t""$MSGFMT" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:3358: checking for catgets" >&5
-if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3363 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char catgets(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char catgets();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_catgets) || defined (__stub___catgets)
-choke me
-#else
-catgets();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_catgets=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_catgets=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'catgets`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_CATGETS 1
-EOF
-
-	       INTLOBJS="\$(CATOBJS)"
-	       # Extract the first word of "gencat", so it can be a program name with args.
-set dummy gencat; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3408: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$GENCAT" in
-  /*)
-  ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GENCAT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no"
-  ;;
-esac
-fi
-GENCAT="$ac_cv_path_GENCAT"
-if test -n "$GENCAT"; then
-  echo "$ac_t""$GENCAT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-	       if test "$GENCAT" != "no"; then
-		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
+	     # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3444: checking for $ac_word" >&5
+echo "configure:3847: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3462,7 +3865,7 @@ else
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
   ;;
 esac
 fi
@@ -3473,48 +3876,12 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-		 if test "$GMSGFMT" = "no"; then
-		   # Extract the first word of "msgfmt", so it can be a program name with args.
-
-set dummy msgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3482: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$GMSGFMT" in
-  /*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-	ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
-  ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
-  echo "$ac_t""$GMSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
 
-		 fi
-		 # Extract the first word of "xgettext", so it can be a program name with args.
+	     	     # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3518: checking for $ac_word" >&5
+echo "configure:3885: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3527,7 +3894,7 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+      if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then
 	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
 	break
       fi
@@ -3539,28 +3906,20 @@ else
 esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
+if test "$XGETTEXT" != ":"; then
   echo "$ac_t""$XGETTEXT" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-		 USE_INCLUDED_LIBINTL=yes
-		 CATOBJEXT=.cat
-		 INSTOBJEXT=.cat
-		 DATADIRNAME=lib
-		 INTLDEPS='$(top_builddir)/intl/libintl.a'
-		 INTLLIBS=$INTLDEPS
-		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-		 nls_cv_header_intl=intl/libintl.h
-		 nls_cv_header_libgt=intl/libgettext.h
-	       fi
+
+	     CATOBJEXT=.gmo
+	   fi
+	
 else
   echo "$ac_t""no" 1>&6
 fi
 
-	  fi
-        fi
 
         if test "$CATOBJEXT" = "NONE"; then
 	  	  	  nls_cv_use_gnu_gettext=yes
@@ -3568,12 +3927,15 @@ fi
       fi
 
       if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        if test ! -d $srcdir/intl ; then
+	  { echo "configure: error: no NLS library is packaged with this application" 1>&2; exit 1; }
+	fi
                 INTLOBJS="\$(GETTOBJS)"
         # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3577: checking for $ac_word" >&5
+echo "configure:3939: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3586,19 +3948,19 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+      if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then
 	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
 	break
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
   ;;
 esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
+if test "$MSGFMT" != ":"; then
   echo "$ac_t""$MSGFMT" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -3607,7 +3969,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3611: checking for $ac_word" >&5
+echo "configure:3973: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3644,7 +4006,7 @@ fi
 
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3648: checking for $ac_word" >&5
+echo "configure:4010: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3657,7 +4019,7 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+      if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then
 	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
 	break
       fi
@@ -3669,26 +4031,31 @@ else
 esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
+if test "$XGETTEXT" != ":"; then
   echo "$ac_t""$XGETTEXT" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
         
+	BUILD_INCLUDED_LIBINTL=yes
 	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
-        INSTOBJEXT=.mo
-        DATADIRNAME=share
-	INTLDEPS='$(top_builddir)/intl/libintl.a'
-	INTLLIBS=$INTLDEPS
-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=intl/libintl.h
-        nls_cv_header_libgt=intl/libgettext.h
+	INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
+	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
-            if test "$XGETTEXT" != ":"; then
-			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+                  if test "$GMSGFMT" != ":"; then
+			if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
+	  : ;
+	else
+	  echo "$ac_t""found msgfmt program is not GNU msgfmt; ignore it" 1>&6
+	  GMSGFMT=":"
+	fi
+      fi
+
+                  if test "$XGETTEXT" != ":"; then
+			if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
 	  : ;
 	else
 	  echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6
@@ -3696,30 +4063,69 @@ fi
 	fi
       fi
 
-      # We need to process the po/ directory.
-      POSUB=po
-    else
-      DATADIRNAME=share
-      nls_cv_header_intl=intl/libintl.h
-      nls_cv_header_libgt=intl/libgettext.h
+            POSUB=po
     fi
 
-    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-    # because some of the sources are only built for this goal.
-    if test "$PACKAGE" = gettext; then
-      USE_NLS=yes
-      USE_INCLUDED_LIBINTL=yes
+    
+
+
+            if test "$PACKAGE" = gettext; then
+      BUILD_INCLUDED_LIBINTL=yes
     fi
 
-    # If we really do not use included intl, suppress the command that
-    # would attempt to symlink the two copies of its header.
-    if test "$USE_INCLUDED_LIBINTL" != yes; then
-      nls_cv_header_libgt=
-      nls_cv_header_intl=
+                                            if test "$nls_cv_use_gnu_gettext" = "yes"; then
+    for ac_prog in bison
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:4083: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$INTLBISON"; then
+  ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_INTLBISON="$ac_prog"
+      break
     fi
-    
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+INTLBISON="$ac_cv_prog_INTLBISON"
+if test -n "$INTLBISON"; then
+  echo "$ac_t""$INTLBISON" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-    
+test -n "$INTLBISON" && break
+done
+
+    if test -z "$INTLBISON"; then
+      ac_verc_fail=yes
+    else
+            echo $ac_n "checking version of bison""... $ac_c" 1>&6
+echo "configure:4116: checking version of bison" >&5
+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+      case $ac_prog_version in
+        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+      esac
+      echo "$ac_t""$ac_prog_version" 1>&6
+    fi
+    if test $ac_verc_fail = yes; then
+      INTLBISON=:
+    fi
+    fi
 
                 for lang in $ALL_LINGUAS; do
       GMOFILES="$GMOFILES $lang.gmo"
@@ -3735,7 +4141,17 @@ fi
     
     
     
+
+        nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+        DATADIRNAME=share
     
+
+        INSTOBJEXT=.mo
+    
+
+        GENCAT=gencat
     
   
 
@@ -3744,12 +4160,23 @@ fi
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:3748: checking for catalogs to be installed" >&5
+echo "configure:4164: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
+           # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
        done
        LINGUAS=$NEW_LINGUAS
        echo "$ac_t""$LINGUAS" 1>&6
@@ -3760,111 +4187,36 @@ echo "configure:3748: checking for catalogs to be installed" >&5
      fi
    fi
 
-            if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care of it yourself. */"
-   fi
-   
-
-            if test "$USE_NLS" = "yes"; then
-     test -d intl || mkdir intl
-     if test "$CATOBJEXT" = ".cat"; then
-       ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:3777: checking for linux/version.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3782 "configure"
-#include "confdefs.h"
-#include <linux/version.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  msgformat=linux
-else
-  echo "$ac_t""no" 1>&6
-msgformat=xopen
-fi
-
-
-                     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
-     fi
-          if test -f $srcdir/intl/po2tbl.sed.in ; then
-       rm -f intl/po2tbl.sed
-       sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-         $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
-     fi
-   fi
-
-            if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   
-   
-
-               MKINSTALLDIRS=
+                  MKINSTALLDIRS=
    if test -n "$ac_aux_dir"; then
      MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh"
    fi
    if test -z "$MKINSTALLDIRS"; then
      MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh"
    fi
+   if test -n "$GNUSYSTEM_AUX_DIR" ; then
+     if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then
+       MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs"
+     fi
+   fi
    
 
-      l=
+      INTL_LIBTOOL_SUFFIX_PREFIX=
    
 
-         if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   if test -f $srcdir/po/POTFILES.in ; then
-   if test "$USE_NLS" = "yes"; then
-     test -d po || mkdir po
-     rm -f po/POTFILES
-     sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	  < $srcdir/po/POTFILES.in > po/POTFILES
-   fi
-   fi
-
 
 INTLDIR_MAKE=
 MSG_DIR_MAKE=
 SUB_MAKEFILE=
 
+
+cf_makefile=makefile
+
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
 echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6
-echo "configure:3868: checking if we should use included message-library" >&5
+echo "configure:4220: checking if we should use included message-library" >&5
 	
 # Check whether --enable-included-msgs or --disable-included-msgs was given.
 if test "${enable_included_msgs+set}" = set; then
@@ -3877,42 +4229,59 @@ fi
 fi
 echo "$ac_t""$use_our_messages" 1>&6
 fi
-test $use_our_messages = yes && USE_OUR_MESSAGES=
+
+MSG_DIR_MAKE="#"
+if test "$use_our_messages" = yes
+then
+	SUB_MAKEFILE="$SUB_MAKEFILE $srcdir/po/$cf_makefile.in:$srcdir/po/$cf_makefile.inn"
+	MSG_DIR_MAKE=
+fi
+
+
+
 
 
 if test "$USE_INCLUDED_LIBINTL" = yes ; then
         if test "$nls_cv_force_use_gnu_gettext" = yes ; then
-		SUB_MAKEFILE="intl/$cf_makefile"
+		:
 	elif test "$nls_cv_use_gnu_gettext" = yes ; then
-		SUB_MAKEFILE="intl/$cf_makefile"
+		:
 	else
 		INTLDIR_MAKE="#"
 	fi
-	if test $use_our_messages = no ; then
-		MSG_DIR_MAKE="#"
-		SUB_MAKEFILE=
-	fi
-	if test "$use_our_messages" = yes ; then
-		SUB_MAKEFILE="$SUB_MAKEFILE po/$cf_makefile.in:po/$cf_makefile.inn"
-	else
-		MSG_DIR_MAKE="#"
+	if test -z "$INTLDIR_MAKE"; then
+		cat >> confdefs.h <<\EOF
+#define HAVE_LIBGETTEXT_H 1
+EOF
+
+		for cf_makefile in \
+			$srcdir/intl/Makefile.in \
+			$srcdir/intl/makefile.in
+		do
+			if test -f "$cf_makefile" ; then
+				SUB_MAKEFILE="$SUB_MAKEFILE `echo ${cf_makefile}|sed -e 's/\.in$//'`:${cf_makefile}"
+				break
+			fi
+		done
 	fi
-elif test "$USE_NLS" = yes ; then
-	for ac_hdr in libintl.h
+else
+	INTLDIR_MAKE="#"
+	if test "$USE_NLS" = yes ; then
+		for ac_hdr in libintl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3906: checking for $ac_hdr" >&5
+echo "configure:4275: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3911 "configure"
+#line 4280 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3938,24 +4307,23 @@ else
 fi
 done
 
-	INTLDIR_MAKE="#"
-	SUB_MAKEFILE="po/$cf_makefile.in:po/$cf_makefile.inn"
-else
-	INTLDIR_MAKE="#"
-	MSG_DIR_MAKE="#"
-fi
-
-if test -z "$MSG_DIR_MAKE" ; then
-	if test $use_our_messages = no ; then
-		MSG_DIR_MAKE="#"
-		SUB_MAKEFILE=
 	fi
 fi
 
 if test -z "$INTLDIR_MAKE" ; then
-	CPPFLAGS="$CPPFLAGS -I../intl"
+	CPPFLAGS="-I../intl $CPPFLAGS"
 fi
 
+if test "$BUILD_INCLUDED_LIBINTL" = yes ; then
+	GT_YES="#"
+	GT_NO=
+else
+	GT_YES=
+	GT_NO="#"
+fi
+
+
+
 
 
 
@@ -3998,7 +4366,9 @@ else
 fi
 
 case ".$withval" in #(vi
-./*) #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
   ;;
 .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
   ;;
@@ -4006,15 +4376,15 @@ case ".$withval" in #(vi
   eval withval="$withval"
   case ".$withval" in #(vi
   .NONE/*)
-    withval=`echo $withval | sed -e s@NONE@$ac_default_prefix@`
+    withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
     ;;
   esac
   ;; #(vi
 .NONE/*)
-  withval=`echo $withval | sed -e s@NONE@$ac_default_prefix@`
+  withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { echo "configure: error: expected a pathname" 1>&2; exit 1; }
+  { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; }
   ;;
 esac
 
@@ -4022,7 +4392,7 @@ eval NLS_DATADIR="$withval"
 
 
 echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6
-echo "configure:4026: checking if you want full utility pathnames" >&5
+echo "configure:4396: checking if you want full utility pathnames" >&5
 
 # Check whether --enable-full-paths or --disable-full-paths was given.
 if test "${enable_full_paths+set}" = set; then
@@ -4047,7 +4417,7 @@ EOF
 
 
 echo $ac_n "checking for system mailer""... $ac_c" 1>&6
-echo "configure:4051: checking for system mailer" >&5
+echo "configure:4421: checking for system mailer" >&5
 if eval "test \"`echo '$''{'cf_cv_SYSTEM_MAIL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4074,7 +4444,7 @@ EOF
 
 
 echo $ac_n "checking system mail flags""... $ac_c" 1>&6
-echo "configure:4078: checking system mail flags" >&5
+echo "configure:4448: checking system mail flags" >&5
 if eval "test \"`echo '$''{'cf_cv_system_mail_flags'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4095,1530 +4465,205 @@ cat >> confdefs.h <<EOF
 EOF
 
 
-
-
-test -z "$CHMOD" && CHMOD=chmod
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "chmod", so it can be a program name with args.
-set dummy chmod; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4106: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$CHMOD" in
-  /*)
-  ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_CHMOD="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_CHMOD" && ac_cv_path_CHMOD="$CHMOD"
-  ;;
-esac
-fi
-CHMOD="$ac_cv_path_CHMOD"
-if test -n "$CHMOD"; then
-  echo "$ac_t""$CHMOD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for chmod""... $ac_c" 1>&6
-echo "configure:4141: checking for chmod" >&5
-	echo "$ac_t""$CHMOD" 1>&6
-	eval 'ac_cv_path_'CHMOD'="'chmod'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_CHMOD
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define CHMOD_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define CHMOD_ARGS "$cf_path_args"
-EOF
-
-
-
-test -z "$COMPRESS" && COMPRESS=compress
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "compress", so it can be a program name with args.
-set dummy compress; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4183: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$COMPRESS" in
-  /*)
-  ac_cv_path_COMPRESS="$COMPRESS" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_COMPRESS="$COMPRESS" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_COMPRESS="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_COMPRESS" && ac_cv_path_COMPRESS="$COMPRESS"
-  ;;
-esac
-fi
-COMPRESS="$ac_cv_path_COMPRESS"
-if test -n "$COMPRESS"; then
-  echo "$ac_t""$COMPRESS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for compress""... $ac_c" 1>&6
-echo "configure:4218: checking for compress" >&5
-	echo "$ac_t""$COMPRESS" 1>&6
-	eval 'ac_cv_path_'COMPRESS'="'compress'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_COMPRESS
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define COMPRESS_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define COMPRESS_ARGS "$cf_path_args"
-EOF
-
-
-
-test -z "$COPY" && COPY=cp
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "cp", so it can be a program name with args.
-set dummy cp; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4260: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_COPY'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$COPY" in
-  /*)
-  ac_cv_path_COPY="$COPY" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_COPY="$COPY" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_COPY="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_COPY" && ac_cv_path_COPY="$COPY"
-  ;;
-esac
-fi
-COPY="$ac_cv_path_COPY"
-if test -n "$COPY"; then
-  echo "$ac_t""$COPY" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for cp""... $ac_c" 1>&6
-echo "configure:4295: checking for cp" >&5
-	echo "$ac_t""$COPY" 1>&6
-	eval 'ac_cv_path_'COPY'="'cp'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_COPY
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define COPY_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define COPY_ARGS "$cf_path_args"
-EOF
-
-
-
-test -z "$GZIP" && GZIP=gzip
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "gzip", so it can be a program name with args.
-set dummy gzip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4337: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$GZIP" in
-  /*)
-  ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_GZIP="$GZIP" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GZIP="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GZIP" && ac_cv_path_GZIP="$GZIP"
-  ;;
-esac
-fi
-GZIP="$ac_cv_path_GZIP"
-if test -n "$GZIP"; then
-  echo "$ac_t""$GZIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for gzip""... $ac_c" 1>&6
-echo "configure:4372: checking for gzip" >&5
-	echo "$ac_t""$GZIP" 1>&6
-	eval 'ac_cv_path_'GZIP'="'gzip'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_GZIP
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define GZIP_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define GZIP_ARGS "$cf_path_args"
-EOF
-
-
-
-test -z "$MKDIR" && MKDIR=mkdir
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "mkdir", so it can be a program name with args.
-set dummy mkdir; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4414: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$MKDIR" in
-  /*)
-  ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_MKDIR="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MKDIR" && ac_cv_path_MKDIR="$MKDIR"
-  ;;
-esac
-fi
-MKDIR="$ac_cv_path_MKDIR"
-if test -n "$MKDIR"; then
-  echo "$ac_t""$MKDIR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+if test -n "$SYSTEM_MAIL" ; then
+if test $with_full_paths = no ; then
+	SYSTEM_MAIL=`basename $SYSTEM_MAIL`
 fi
-
-else
-	echo $ac_n "checking for mkdir""... $ac_c" 1>&6
-echo "configure:4449: checking for mkdir" >&5
-	echo "$ac_t""$MKDIR" 1>&6
-	eval 'ac_cv_path_'MKDIR'="'mkdir'"'
 fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_MKDIR
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define MKDIR_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define MKDIR_ARGS "$cf_path_args"
-EOF
 
 
-
-test -z "$MV" && MV=mv
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "mv", so it can be a program name with args.
-set dummy mv; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4491: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$MV" in
-  /*)
-  ac_cv_path_MV="$MV" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_MV="$MV" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_MV="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MV" && ac_cv_path_MV="$MV"
-  ;;
-esac
-fi
-MV="$ac_cv_path_MV"
-if test -n "$MV"; then
-  echo "$ac_t""$MV" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for mv""... $ac_c" 1>&6
-echo "configure:4526: checking for mv" >&5
-	echo "$ac_t""$MV" 1>&6
-	eval 'ac_cv_path_'MV'="'mv'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
 case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
+freebsd*) #(vi
+	CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600"
 	;;
-*)
-	IFS="${IFS}:"
+hpux*) #(vi
+	CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
 	;;
-esac
-for cf_temp in $ac_cv_path_MV
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define MV_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define MV_ARGS "$cf_path_args"
-EOF
-
-
-
-test -z "$RM" && RM=rm
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "rm", so it can be a program name with args.
-set dummy rm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4568: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$RM" in
-  /*)
-  ac_cv_path_RM="$RM" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_RM="$RM" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_RM="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_RM" && ac_cv_path_RM="$RM"
-  ;;
-esac
-fi
-RM="$ac_cv_path_RM"
-if test -n "$RM"; then
-  echo "$ac_t""$RM" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for rm""... $ac_c" 1>&6
-echo "configure:4603: checking for rm" >&5
-	echo "$ac_t""$RM" 1>&6
-	eval 'ac_cv_path_'RM'="'rm'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
+irix6.*) #(vi
+	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
 	;;
-esac
-for cf_temp in $ac_cv_path_RM
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define RM_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define RM_ARGS "$cf_path_args"
-EOF
-
-
-
-test -z "$TAR" && TAR=tar
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "tar", so it can be a program name with args.
-set dummy tar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4645: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$TAR" in
-  /*)
-  ac_cv_path_TAR="$TAR" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_TAR="$TAR" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_TAR="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_TAR" && ac_cv_path_TAR="$TAR"
-  ;;
-esac
-fi
-TAR="$ac_cv_path_TAR"
-if test -n "$TAR"; then
-  echo "$ac_t""$TAR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for tar""... $ac_c" 1>&6
-echo "configure:4680: checking for tar" >&5
-	echo "$ac_t""$TAR" 1>&6
-	eval 'ac_cv_path_'TAR'="'tar'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_TAR
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define TAR_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define TAR_ARGS "$cf_path_args"
-EOF
-
-
-
-test -z "$TOUCH" && TOUCH=touch
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "touch", so it can be a program name with args.
-set dummy touch; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4722: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_TOUCH'+set}'`\" = set"; then
+linux*) #(vi
+	
+echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
+echo "configure:4489: checking if we must define _GNU_SOURCE" >&5
+if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$TOUCH" in
-  /*)
-  ac_cv_path_TOUCH="$TOUCH" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_TOUCH="$TOUCH" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_TOUCH="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_TOUCH" && ac_cv_path_TOUCH="$TOUCH"
-  ;;
-esac
-fi
-TOUCH="$ac_cv_path_TOUCH"
-if test -n "$TOUCH"; then
-  echo "$ac_t""$TOUCH" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for touch""... $ac_c" 1>&6
-echo "configure:4757: checking for touch" >&5
-	echo "$ac_t""$TOUCH" 1>&6
-	eval 'ac_cv_path_'TOUCH'="'touch'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_TOUCH
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define TOUCH_PATH "$cf_path_prog"
-EOF
+  
+cat > conftest.$ac_ext <<EOF
+#line 4495 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int main() {
 
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define TOUCH_ARGS "$cf_path_args"
+#ifndef _XOPEN_SOURCE
+make an error
+#endif
+; return 0; }
 EOF
-
-
-
-test -z "$UNCOMPRESS" && UNCOMPRESS=gunzip
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "gunzip", so it can be a program name with args.
-set dummy gunzip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4799: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_UNCOMPRESS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$UNCOMPRESS" in
-  /*)
-  ac_cv_path_UNCOMPRESS="$UNCOMPRESS" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_UNCOMPRESS="$UNCOMPRESS" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_UNCOMPRESS="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_UNCOMPRESS" && ac_cv_path_UNCOMPRESS="$UNCOMPRESS"
-  ;;
-esac
-fi
-UNCOMPRESS="$ac_cv_path_UNCOMPRESS"
-if test -n "$UNCOMPRESS"; then
-  echo "$ac_t""$UNCOMPRESS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
+if { (eval echo configure:4505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_gnu_source=no
 else
-	echo $ac_n "checking for gunzip""... $ac_c" 1>&6
-echo "configure:4834: checking for gunzip" >&5
-	echo "$ac_t""$UNCOMPRESS" 1>&6
-	eval 'ac_cv_path_'UNCOMPRESS'="'gunzip'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_UNCOMPRESS
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define UNCOMPRESS_PATH "$cf_path_prog"
-EOF
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_save="$CPPFLAGS"
+	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+	 cat > conftest.$ac_ext <<EOF
+#line 4515 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int main() {
 
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define UNCOMPRESS_ARGS "$cf_path_args"
+#ifdef _XOPEN_SOURCE
+make an error
+#endif
+; return 0; }
 EOF
-
-
-
-test -z "$UNZIP" && UNZIP=unzip
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "unzip", so it can be a program name with args.
-set dummy unzip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4876: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if { (eval echo configure:4525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_gnu_source=no
 else
-  case "$UNZIP" in
-  /*)
-  ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_UNZIP="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_UNZIP" && ac_cv_path_UNZIP="$UNZIP"
-  ;;
-esac
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_gnu_source=yes
 fi
-UNZIP="$ac_cv_path_UNZIP"
-if test -n "$UNZIP"; then
-  echo "$ac_t""$UNZIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+rm -f conftest*
+	CPPFLAGS="$cf_save"
+	
 fi
+rm -f conftest*
 
-else
-	echo $ac_n "checking for unzip""... $ac_c" 1>&6
-echo "configure:4911: checking for unzip" >&5
-	echo "$ac_t""$UNZIP" 1>&6
-	eval 'ac_cv_path_'UNZIP'="'unzip'"'
 fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_UNZIP
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define UNZIP_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define UNZIP_ARGS "$cf_path_args"
-EOF
 
+echo "$ac_t""$cf_cv_gnu_source" 1>&6
+test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 
-
-test -z "$BZIP2" && BZIP2=bzip2
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "bzip2", so it can be a program name with args.
-set dummy bzip2; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4953: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_BZIP2'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$BZIP2" in
-  /*)
-  ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_BZIP2="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_BZIP2" && ac_cv_path_BZIP2="$BZIP2"
-  ;;
-esac
-fi
-BZIP2="$ac_cv_path_BZIP2"
-if test -n "$BZIP2"; then
-  echo "$ac_t""$BZIP2" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for bzip2""... $ac_c" 1>&6
-echo "configure:4988: checking for bzip2" >&5
-	echo "$ac_t""$BZIP2" 1>&6
-	eval 'ac_cv_path_'BZIP2'="'bzip2'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
 	;;
-*)
-	IFS="${IFS}:"
+mirbsd*) #(vi
+	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
 	;;
-esac
-for cf_temp in $ac_cv_path_BZIP2
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define BZIP2_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define BZIP2_ARGS "$cf_path_args"
-EOF
-
-
-
-test -z "$UUDECODE" && UUDECODE=uudecode
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "uudecode", so it can be a program name with args.
-set dummy uudecode; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5030: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_UUDECODE'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$UUDECODE" in
-  /*)
-  ac_cv_path_UUDECODE="$UUDECODE" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_UUDECODE="$UUDECODE" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_UUDECODE="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_UUDECODE" && ac_cv_path_UUDECODE="$UUDECODE"
-  ;;
-esac
-fi
-UUDECODE="$ac_cv_path_UUDECODE"
-if test -n "$UUDECODE"; then
-  echo "$ac_t""$UUDECODE" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for uudecode""... $ac_c" 1>&6
-echo "configure:5065: checking for uudecode" >&5
-	echo "$ac_t""$UUDECODE" 1>&6
-	eval 'ac_cv_path_'UUDECODE'="'uudecode'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
+netbsd*) #(vi
+	# setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
 	;;
-*)
-	IFS="${IFS}:"
+openbsd*) #(vi
+	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
 	;;
-esac
-for cf_temp in $ac_cv_path_UUDECODE
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define UUDECODE_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define UUDECODE_ARGS "$cf_path_args"
-EOF
-
-
-
-test -z "$ZCAT" && ZCAT=zcat
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "zcat", so it can be a program name with args.
-set dummy zcat; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5107: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_ZCAT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$ZCAT" in
-  /*)
-  ac_cv_path_ZCAT="$ZCAT" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_ZCAT="$ZCAT" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_ZCAT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_ZCAT" && ac_cv_path_ZCAT="$ZCAT"
-  ;;
-esac
-fi
-ZCAT="$ac_cv_path_ZCAT"
-if test -n "$ZCAT"; then
-  echo "$ac_t""$ZCAT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for zcat""... $ac_c" 1>&6
-echo "configure:5142: checking for zcat" >&5
-	echo "$ac_t""$ZCAT" 1>&6
-	eval 'ac_cv_path_'ZCAT'="'zcat'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
+osf[45]*) #(vi
+	CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE"
 	;;
-*)
-	IFS="${IFS}:"
+sco*) #(vi
+	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
 	;;
-esac
-for cf_temp in $ac_cv_path_ZCAT
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define ZCAT_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define ZCAT_ARGS "$cf_path_args"
-EOF
-
-
-
-test -z "$ZIP" && ZIP=zip
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "zip", so it can be a program name with args.
-set dummy zip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5184: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$ZIP" in
-  /*)
-  ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_ZIP="$ZIP" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_ZIP="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_ZIP" && ac_cv_path_ZIP="$ZIP"
-  ;;
-esac
-fi
-ZIP="$ac_cv_path_ZIP"
-if test -n "$ZIP"; then
-  echo "$ac_t""$ZIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for zip""... $ac_c" 1>&6
-echo "configure:5219: checking for zip" >&5
-	echo "$ac_t""$ZIP" 1>&6
-	eval 'ac_cv_path_'ZIP'="'zip'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
+solaris*) #(vi
+	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
 	;;
 *)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_ZIP
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define ZIP_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define ZIP_ARGS "$cf_path_args"
-EOF
-
-
-
-test -z "$TELNET" && TELNET=telnet
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "telnet", so it can be a program name with args.
-set dummy telnet; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_TELNET'+set}'`\" = set"; then
+	echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6
+echo "configure:4566: checking if we should define _XOPEN_SOURCE" >&5
+if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$TELNET" in
-  /*)
-  ac_cv_path_TELNET="$TELNET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_TELNET="$TELNET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_TELNET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_TELNET" && ac_cv_path_TELNET="$TELNET"
-  ;;
-esac
-fi
-TELNET="$ac_cv_path_TELNET"
-if test -n "$TELNET"; then
-  echo "$ac_t""$TELNET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-	echo $ac_n "checking for telnet""... $ac_c" 1>&6
-echo "configure:5296: checking for telnet" >&5
-	echo "$ac_t""$TELNET" 1>&6
-	eval 'ac_cv_path_'TELNET'="'telnet'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_TELNET
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define TELNET_PATH "$cf_path_prog"
-EOF
+  
+	cat > conftest.$ac_ext <<EOF
+#line 4572 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int main() {
 
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define TELNET_ARGS "$cf_path_args"
+#ifndef _XOPEN_SOURCE
+make an error
+#endif
+; return 0; }
 EOF
-
-
-
-test -z "$TN3270" && TN3270=tn3270
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "tn3270", so it can be a program name with args.
-set dummy tn3270; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5338: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_TN3270'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$TN3270" in
-  /*)
-  ac_cv_path_TN3270="$TN3270" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_TN3270="$TN3270" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_TN3270="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_TN3270" && ac_cv_path_TN3270="$TN3270"
-  ;;
-esac
-fi
-TN3270="$ac_cv_path_TN3270"
-if test -n "$TN3270"; then
-  echo "$ac_t""$TN3270" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
+if { (eval echo configure:4582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_xopen_source=no
 else
-	echo $ac_n "checking for tn3270""... $ac_c" 1>&6
-echo "configure:5373: checking for tn3270" >&5
-	echo "$ac_t""$TN3270" 1>&6
-	eval 'ac_cv_path_'TN3270'="'tn3270'"'
-fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_TN3270
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define TN3270_PATH "$cf_path_prog"
-EOF
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_save="$CPPFLAGS"
+	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
+	 cat > conftest.$ac_ext <<EOF
+#line 4592 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int main() {
 
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define TN3270_ARGS "$cf_path_args"
+#ifdef _XOPEN_SOURCE
+make an error
+#endif
+; return 0; }
 EOF
-
-
-
-test -z "$RLOGIN" && RLOGIN=rlogin
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "rlogin", so it can be a program name with args.
-set dummy rlogin; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5415: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_RLOGIN'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$RLOGIN" in
-  /*)
-  ac_cv_path_RLOGIN="$RLOGIN" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_RLOGIN="$RLOGIN" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_RLOGIN="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_RLOGIN" && ac_cv_path_RLOGIN="$RLOGIN"
-  ;;
-esac
-fi
-RLOGIN="$ac_cv_path_RLOGIN"
-if test -n "$RLOGIN"; then
-  echo "$ac_t""$RLOGIN" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
+if { (eval echo configure:4602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_xopen_source=no
 else
-	echo $ac_n "checking for rlogin""... $ac_c" 1>&6
-echo "configure:5450: checking for rlogin" >&5
-	echo "$ac_t""$RLOGIN" 1>&6
-	eval 'ac_cv_path_'RLOGIN'="'rlogin'"'
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_xopen_source=yes
 fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_RLOGIN
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define RLOGIN_PATH "$cf_path_prog"
-EOF
-
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define RLOGIN_ARGS "$cf_path_args"
-EOF
-
-
-
-case "$INSTALL" in
-$srcdir*) # (vi
-	cat >> confdefs.h <<EOF
-#define INSTALL_PATH "install"
-EOF
-
-	;;
-*) # (vi
-	cf_save_INSTALL="$INSTALL"
+rm -f conftest*
+	CPPFLAGS="$cf_save"
 	
-test -z "$INSTALL" && INSTALL=install
-if test "$with_full_paths" = yes ; then
-	# Extract the first word of "install", so it can be a program name with args.
-set dummy install; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5502: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_INSTALL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$INSTALL" in
-  /*)
-  ac_cv_path_INSTALL="$INSTALL" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_INSTALL="$INSTALL" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_INSTALL="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_INSTALL" && ac_cv_path_INSTALL="$INSTALL"
-  ;;
-esac
-fi
-INSTALL="$ac_cv_path_INSTALL"
-if test -n "$INSTALL"; then
-  echo "$ac_t""$INSTALL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
 fi
+rm -f conftest*
 
-else
-	echo $ac_n "checking for install""... $ac_c" 1>&6
-echo "configure:5537: checking for install" >&5
-	echo "$ac_t""$INSTALL" 1>&6
-	eval 'ac_cv_path_'INSTALL'="'install'"'
 fi
-cf_path_prog=""
-cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"
-case $host_os in #(vi
-os2*) #(vi
-	IFS="${IFS};"
-	;;
-*)
-	IFS="${IFS}:"
-	;;
-esac
-for cf_temp in $ac_cv_path_INSTALL
-do
-	if test -z "$cf_path_prog" ; then
-		cf_path_prog="$cf_temp"
-	elif test -z "$cf_path_args" ; then
-		cf_path_args="$cf_temp"
-	else
-		cf_path_args="$cf_path_args $cf_temp"
-	fi
-done
-IFS="$cf_save_ifs"
-
-cat >> confdefs.h <<EOF
-#define INSTALL_PATH "$cf_path_prog"
-EOF
 
-test -n "$cf_path_args" && cat >> confdefs.h <<EOF
-#define INSTALL_ARGS "$cf_path_args"
-EOF
-
-
-	INSTALL="$cf_save_INSTALL"
-	;;
-esac
+echo "$ac_t""$cf_cv_xopen_source" 1>&6
+test "$cf_cv_xopen_source" = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
 
-
-echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
-echo "configure:5579: checking if we must define _GNU_SOURCE" >&5
-if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
+	# FreeBSD 5.x headers demand this...
+	echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6
+echo "configure:4624: checking if we should define _POSIX_C_SOURCE" >&5
+if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
-cat > conftest.$ac_ext <<EOF
-#line 5585 "configure"
+	cat > conftest.$ac_ext <<EOF
+#line 4630 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 
-#ifndef _XOPEN_SOURCE
+#ifndef _POSIX_C_SOURCE
 make an error
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  cf_cv_gnu_source=no
+  cf_cv_xopen_source=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cf_save="$CPPFLAGS"
-	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+	 CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE"
 	 cat > conftest.$ac_ext <<EOF
-#line 5605 "configure"
+#line 4650 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 
-#ifdef _XOPEN_SOURCE
+#ifdef _POSIX_C_SOURCE
 make an error
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  cf_cv_gnu_source=no
+  cf_cv_xopen_source=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  cf_cv_gnu_source=yes
+  cf_cv_xopen_source=yes
 fi
 rm -f conftest*
 	CPPFLAGS="$cf_save"
@@ -5628,64 +4673,85 @@ rm -f conftest*
 
 fi
 
-echo "$ac_t""$cf_cv_gnu_source" 1>&6
-test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+echo "$ac_t""$cf_cv_xopen_source" 1>&6
+test "$cf_cv_xopen_source" = yes && CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE"
+	;;
+esac
 
 
 if test -n "$TRY_CFLAGS" ; then
-	cf_save_CFLAGS="$CFLAGS"
-	cf_save_CPPFLAGS="$CPPFLAGS"
 	
+test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+
+cf_check_cflags="$CFLAGS"
+cf_check_cppflags="$CPPFLAGS"
+
+cf_new_cflags=
+cf_new_cppflags=
 for cf_add_cflags in $TRY_CFLAGS
 do
 	case $cf_add_cflags in #(vi
 	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
 		case "$CPPFLAGS" in
-		*$cf_add_cflags)
+		*$cf_add_cflags) #(vi
 			;;
-		*)
-			CPPFLAGS="$CPPFLAGS $cf_add_cflags"
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
 		;;
 	*)
-		CFLAGS="$CFLAGS $cf_add_cflags"
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
 		;;
 	esac
 done
 
-	echo $ac_n "checking if we should use compile options $TRY_CFLAGS""... $ac_c" 1>&6
-echo "configure:5659: checking if we should use compile options $TRY_CFLAGS" >&5
-	cat > conftest.$ac_ext <<EOF
-#line 5661 "configure"
+if test -n "$cf_new_cflags" ; then
+	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+
+if test "$cf_check_cflags" != "$CFLAGS" ; then
+cat > conftest.$ac_ext <<EOF
+#line 4725 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
-FILE *fp = stdin
+printf("Hello world");
 ; return 0; }
 EOF
-if { (eval echo configure:5668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  cf_result=yes
+if { (eval echo configure:4732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  :
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  cf_result=no
+  test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+
+	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+
+	 fi
+	 CFLAGS="$cf_check_flags"
 fi
 rm -f conftest*
-	echo "$ac_t""$cf_result" 1>&6
-	if test "$cf_result" = no ; then
-		CFLAGS="$cf_save_CFLAGS"
-		CPPFLAGS="$cf_save_CPPFLAGS"
-	fi
+fi
+
 fi
 
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
 echo $ac_n "checking if you want ssl library""... $ac_c" 1>&6
-echo "configure:5689: checking if you want ssl library" >&5
+echo "configure:4755: checking if you want ssl library" >&5
 if eval "test \"`echo '$''{'cf_cv_use_libssl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5704,8 +4770,30 @@ fi
 
 echo "$ac_t""$cf_cv_use_libssl" 1>&6
 
+if test "x$cf_cv_use_libssl" = "xno" ; then
+echo $ac_n "checking if you want experimental gnutls support""... $ac_c" 1>&6
+echo "configure:4776: checking if you want experimental gnutls support" >&5
+if eval "test \"`echo '$''{'cf_cv_use_libgnutls'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+
+# Check whether --with-gnutls or --without-gnutls was given.
+if test "${with_gnutls+set}" = set; then
+  withval="$with_gnutls"
+  cf_cv_use_libgnutls=$withval
+else
+  cf_cv_use_libgnutls=no
+fi
+
+
+fi
+
+echo "$ac_t""$cf_cv_use_libgnutls" 1>&6
+fi
+
 echo $ac_n "checking if you want socks library""... $ac_c" 1>&6
-echo "configure:5709: checking if you want socks library" >&5
+echo "configure:4797: checking if you want socks library" >&5
 if eval "test \"`echo '$''{'cf_cv_use_libsocks'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5725,7 +4813,7 @@ fi
 echo "$ac_t""$cf_cv_use_libsocks" 1>&6
 
 echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6
-echo "configure:5729: checking if you want socks5 library" >&5
+echo "configure:4817: checking if you want socks5 library" >&5
 if eval "test \"`echo '$''{'cf_cv_use_libsocks5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5801,7 +4889,7 @@ cat >> confdefs.h <<\EOF
 EOF
 
 cat > conftest.$ac_ext <<EOF
-#line 5805 "configure"
+#line 4893 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5810,7 +4898,7 @@ int main() {
 	accept((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -5849,10 +4937,10 @@ cat >> confdefs.h <<\EOF
 EOF
 
 echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6
-echo "configure:5853: checking if the socks library uses socks4 prefix" >&5
+echo "configure:4941: checking if the socks library uses socks4 prefix" >&5
 cf_use_socks4=error
 cat > conftest.$ac_ext <<EOF
-#line 5856 "configure"
+#line 4944 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -5861,7 +4949,7 @@ int main() {
 	Rinit((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define USE_SOCKS4_PREFIX 1
@@ -5873,14 +4961,14 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 5877 "configure"
+#line 4965 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int main() {
 SOCKSinit((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_use_socks4=no
 else
@@ -5945,9 +5033,9 @@ EOF
 
 fi
 echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6
-echo "configure:5949: checking if socks5p.h is available" >&5
+echo "configure:5037: checking if socks5p.h is available" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5951 "configure"
+#line 5039 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -5957,7 +5045,7 @@ int main() {
 	init((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:5961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_use_socks5p_h=yes
 else
@@ -5977,7 +5065,7 @@ else
 	
 cf_test_netlibs=no
 echo $ac_n "checking for network libraries""... $ac_c" 1>&6
-echo "configure:5981: checking for network libraries" >&5
+echo "configure:5069: checking for network libraries" >&5
 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5988,12 +5076,12 @@ cf_test_netlibs=yes
 for ac_func in gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5992: checking for $ac_func" >&5
+echo "configure:5080: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5997 "configure"
+#line 5085 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6016,7 +5104,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6039,7 +5127,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:6043: checking for gethostname in -lnsl" >&5
+echo "configure:5131: checking for gethostname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6047,7 +5135,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6051 "configure"
+#line 5139 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6058,7 +5146,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:6062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6091,7 +5179,7 @@ else
 	
 		
 echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6
-echo "configure:6095: checking for gethostname in -lsocket" >&5
+echo "configure:5183: checking for gethostname in -lsocket" >&5
 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6099,7 +5187,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6103 "configure"
+#line 5191 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6110,7 +5198,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:6114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6155,7 +5243,7 @@ done
 # I don't know the entrypoints - 97/7/22 TD
 # AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs")
 echo $ac_n "checking for main in -linet""... $ac_c" 1>&6
-echo "configure:6159: checking for main in -linet" >&5
+echo "configure:5247: checking for main in -linet" >&5
 ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6163,14 +5251,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-linet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6167 "configure"
+#line 5255 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6195,12 +5283,12 @@ if test "$ac_cv_func_lsocket" != no ; then
 for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6199: checking for $ac_func" >&5
+echo "configure:5287: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6204 "configure"
+#line 5292 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6223,7 +5311,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6246,7 +5334,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:6250: checking for socket in -lsocket" >&5
+echo "configure:5338: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6254,7 +5342,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6258 "configure"
+#line 5346 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6265,7 +5353,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:6269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6298,7 +5386,7 @@ else
 	
 		
 echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
-echo "configure:6302: checking for socket in -lbsd" >&5
+echo "configure:5390: checking for socket in -lbsd" >&5
 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6306,7 +5394,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6310 "configure"
+#line 5398 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6317,7 +5405,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:6321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6362,12 +5450,12 @@ fi
 for ac_func in gethostbyname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6366: checking for $ac_func" >&5
+echo "configure:5454: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6371 "configure"
+#line 5459 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6390,7 +5478,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6413,7 +5501,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6417: checking for gethostbyname in -lnsl" >&5
+echo "configure:5505: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6421,7 +5509,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6425 "configure"
+#line 5513 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6432,7 +5520,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:6436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6473,12 +5561,12 @@ done
 for ac_func in strcasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6477: checking for $ac_func" >&5
+echo "configure:5565: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6482 "configure"
+#line 5570 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6501,7 +5589,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6524,7 +5612,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6
-echo "configure:6528: checking for strcasecmp in -lresolv" >&5
+echo "configure:5616: checking for strcasecmp in -lresolv" >&5
 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6532,7 +5620,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6536 "configure"
+#line 5624 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6543,7 +5631,7 @@ int main() {
 strcasecmp()
 ; return 0; }
 EOF
-if { (eval echo configure:6547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6589,13 +5677,13 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 fi
 
 echo $ac_n "checking for inet_aton function""... $ac_c" 1>&6
-echo "configure:6593: checking for inet_aton function" >&5
+echo "configure:5681: checking for inet_aton function" >&5
 if eval "test \"`echo '$''{'cf_cv_have_inet_aton'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 6599 "configure"
+#line 5687 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -6606,7 +5694,7 @@ int main() {
 inet_aton(0, (struct in_addr *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:6610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_inet_aton=yes
 else
@@ -6626,13 +5714,13 @@ EOF
 
 else
     echo $ac_n "checking for inet_addr function""... $ac_c" 1>&6
-echo "configure:6630: checking for inet_addr function" >&5
+echo "configure:5718: checking for inet_addr function" >&5
 if eval "test \"`echo '$''{'cf_cv_have_inet_addr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 6636 "configure"
+#line 5724 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -6643,7 +5731,7 @@ int main() {
 inet_addr(0)
 ; return 0; }
 EOF
-if { (eval echo configure:6647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_inet_addr=yes
 else
@@ -6658,7 +5746,7 @@ fi
 echo "$ac_t""$cf_cv_have_inet_addr" 1>&6
     if test "$cf_cv_have_inet_addr" = no ; then
 	echo $ac_n "checking for library with inet_addr""... $ac_c" 1>&6
-echo "configure:6662: checking for library with inet_addr" >&5
+echo "configure:5750: checking for library with inet_addr" >&5
 if eval "test \"`echo '$''{'cf_cv_lib_inet_addr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6668,7 +5756,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat > conftest.$ac_ext <<EOF
-#line 6672 "configure"
+#line 5760 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -6679,7 +5767,7 @@ int main() {
 inet_addr(0)
 ; return 0; }
 EOF
-if { (eval echo configure:6683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -6712,7 +5800,7 @@ no) #(vi
   ;;
 yes) #(vi
   echo $ac_n "checking for SSL_get_version in -lssl""... $ac_c" 1>&6
-echo "configure:6716: checking for SSL_get_version in -lssl" >&5
+echo "configure:5804: checking for SSL_get_version in -lssl" >&5
 ac_lib_var=`echo ssl'_'SSL_get_version | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6720,7 +5808,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lssl -lcrypto $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6724 "configure"
+#line 5812 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6731,7 +5819,7 @@ int main() {
 SSL_get_version()
 ; return 0; }
 EOF
-if { (eval echo configure:6735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6786,9 +5874,9 @@ esac
 LIBS="$cf_ssl_library $LIBS"
 
 echo $ac_n "checking for openssl include directory""... $ac_c" 1>&6
-echo "configure:6790: checking for openssl include directory" >&5
+echo "configure:5878: checking for openssl include directory" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6792 "configure"
+#line 5880 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6797,7 +5885,7 @@ int main() {
 SSL_shutdown((SSL *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:6801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_openssl_incl=yes
 else
@@ -6814,9 +5902,9 @@ EOF
 
 
 echo $ac_n "checking if we can link to ssl library""... $ac_c" 1>&6
-echo "configure:6818: checking if we can link to ssl library" >&5
+echo "configure:5906: checking if we can link to ssl library" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6820 "configure"
+#line 5908 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6830,7 +5918,7 @@ int main() {
 SSL_shutdown((SSL *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:6834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_ssl_library=yes
 else
@@ -6846,14 +5934,198 @@ if test "$cf_ssl_library" = yes ; then
 #define USE_SSL 1
 EOF
 
+	cat >> confdefs.h <<\EOF
+#define USE_X509_SUPPORT 1
+EOF
+
 else
 	{ echo "configure: error: Cannot link with ssl library" 1>&2; exit 1; }
 fi
 
+elif test "x$cf_cv_use_libgnutls" != xno ; then
+	
+cf_ssl_library="-lgnutls-extra -lgnutls -lcrypt"
+case "$cf_cv_use_libgnutls" in #(vi
+no) #(vi
+  ;;
+yes) #(vi
+  echo $ac_n "checking for SSL_connect in -lgnutls""... $ac_c" 1>&6
+echo "configure:5954: checking for SSL_connect in -lgnutls" >&5
+ac_lib_var=`echo gnutls'_'SSL_connect | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lgnutls -lgnutls-extra -lgnutls -lcrypt $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5962 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char SSL_connect();
+
+int main() {
+SSL_connect()
+; return 0; }
+EOF
+if { (eval echo configure:5973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo gnutls | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lgnutls $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+
+  	if test -d /usr/local/gnutls ; then
+		test -n "$verbose" && echo "	assume it is in /usr/local/gnutls" 1>&6
+
+		cf_ssl_library="-L/usr/local/gnutls/lib $cf_ssl_library"
+		CPPFLAGS="-I/usr/local/gnutls/include $CPPFLAGS"
+	else
+		{ echo "configure: error: cannot find gnutls library" 1>&2; exit 1; }
+	fi
+	
+fi
+
+  ;;
+*)
+  if test -d $cf_cv_use_libgnutls ; then
+    if test -d $cf_cv_use_libgnutls/include ; then
+      CPPFLAGS="$CPPFLAGS -I$cf_cv_use_libgnutls/include"
+      cf_ssl_library="-L$cf_cv_use_libgnutls/lib $cf_ssl_library"
+    else
+      cf_ssl_library="-L$cf_cv_use_libgnutls $cf_ssl_library"
+      test -d $cf_cv_use_libgnutls/../include && CPPFLAGS="$CPPFLAGS -I$cf_cv_use_libgnutls/../include"
+    fi
+  else
+    echo "configure: warning: expected a directory: $cf_cv_use_libgnutls" 1>&2
+  fi
+  ;;
+esac
+LIBS="$cf_ssl_library $LIBS"
+
+echo $ac_n "checking for gnutls include directory""... $ac_c" 1>&6
+echo "configure:6028: checking for gnutls include directory" >&5
+cat > conftest.$ac_ext <<EOF
+#line 6030 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#include <gnutls/openssl.h>
+int main() {
+SSL_shutdown((SSL *)0)
+; return 0; }
+EOF
+if { (eval echo configure:6039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_openssl_incl=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_openssl_incl=no
+fi
+rm -f conftest*
+echo "$ac_t""$cf_openssl_incl" 1>&6
+test "$cf_openssl_incl" = yes && cat >> confdefs.h <<\EOF
+#define USE_GNUTLS_INCL 1
+EOF
+
+
+echo $ac_n "checking if we can link to gnutls library""... $ac_c" 1>&6
+echo "configure:6056: checking if we can link to gnutls library" >&5
+cat > conftest.$ac_ext <<EOF
+#line 6058 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#ifdef USE_GNUTLS_INCL
+#include <gnutls/openssl.h>
+#else
+#include <ssl.h>
+#endif
+
+int main() {
+SSL_shutdown((SSL *)0)
+; return 0; }
+EOF
+if { (eval echo configure:6072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_ssl_library=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_ssl_library=no
+fi
+rm -f conftest*
+echo "$ac_t""$cf_ssl_library" 1>&6
+if test "$cf_ssl_library" = yes ; then
+	cat >> confdefs.h <<\EOF
+#define USE_SSL 1
+EOF
+
+else
+	{ echo "configure: error: Cannot link with gnutls library" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking for X509 support""... $ac_c" 1>&6
+echo "configure:6093: checking for X509 support" >&5
+cat > conftest.$ac_ext <<EOF
+#line 6095 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#ifdef USE_GNUTLS_INCL
+#include <gnutls/openssl.h>
+#else
+#include <ssl.h>
+#endif
+
+int main() {
+X509_verify_cert_error_string(X509_STORE_CTX_get_error(X509_STORE_CTX *0));
+	cf_x509_support=yes
+; return 0; }
+EOF
+if { (eval echo configure:6110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_x509_support=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+echo "$ac_t""$cf_x509_support" 1>&6
+if test "$cf_x509_support" = yes ; then
+	cat >> confdefs.h <<\EOF
+#define USE_X509_SUPPORT 1
+EOF
+
+fi
+
 fi
 
 echo $ac_n "checking for screen type""... $ac_c" 1>&6
-echo "configure:6857: checking for screen type" >&5
+echo "configure:6129: checking for screen type" >&5
 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6864,7 +6136,7 @@ if test "${with_screen+set}" = set; then
   withval="$with_screen"
   
 case $withval in
-curses|ncurses|pdcurses|slang)
+curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
 *)	{ echo "configure: error: Unexpected value" 1>&2; exit 1; }
@@ -6879,15 +6151,42 @@ fi
 echo "$ac_t""$cf_cv_screen" 1>&6
 
 case $cf_cv_screen in
-ncurses|slang)
-	;;
-pdcurses)
-	cf_cv_ncurses_header=xcurses.h
-	;;
-curses)
-	if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" != set"; then
-		cf_cv_ncurses_header=curses.h
-	fi
+curses|ncurses*)
+	
+
+# Check whether --with-curses-dir or --without-curses-dir was given.
+if test "${with_curses_dir+set}" = set; then
+  withval="$with_curses_dir"
+  
+case ".$withval" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval withval="$withval"
+  case ".$withval" in #(vi
+  .NONE/*)
+    withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; }
+  ;;
+esac
+
+	 cf_cv_curses_dir=$withval
+else
+  cf_cv_curses_dir=no
+fi
+
+
 	;;
 esac
 
@@ -6896,7 +6195,7 @@ curses)
 	
 
 echo $ac_n "checking for extra include directories""... $ac_c" 1>&6
-echo "configure:6900: checking for extra include directories" >&5
+echo "configure:6199: checking for extra include directories" >&5
 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6917,15 +6216,15 @@ esac
 fi
 
 echo "$ac_t""$cf_cv_curses_incdir" 1>&6
-test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
+test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
 echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6
-echo "configure:6924: checking if we have identified curses headers" >&5
+echo "configure:6223: checking if we have identified curses headers" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
-cf_cv_ncurses_header=curses.h
+cf_cv_ncurses_header=none
 for cf_header in \
 	curses.h \
 	ncurses.h \
@@ -6933,14 +6232,14 @@ for cf_header in \
 	ncurses/ncurses.h
 do
 cat > conftest.$ac_ext <<EOF
-#line 6937 "configure"
+#line 6236 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int main() {
 initscr(); tgoto("?", 0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:6944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -6954,22 +6253,26 @@ fi
 
 echo "$ac_t""$cf_cv_ncurses_header" 1>&6
 
+if test "$cf_cv_ncurses_header" = none ; then
+	{ echo "configure: error: No curses header-files found" 1>&2; exit 1; }
+fi
+
 # cheat, to get the right #define's for HAVE_NCURSES_H, etc.
 for ac_hdr in $cf_cv_ncurses_header
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6963: checking for $ac_hdr" >&5
+echo "configure:6266: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6968 "configure"
+#line 6271 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6999,7 +6302,7 @@ done
 
 	
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:7003: checking for ncurses version" >&5
+echo "configure:6306: checking for ncurses version" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7025,16 +6328,16 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:7029: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:6332: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
 	if test -f conftest.out ; then
-		cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'`
+		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
 		rm -f conftest.out
 	fi
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 7038 "configure"
+#line 6341 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -7058,7 +6361,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:7062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -7082,16 +6385,16 @@ EOF
 	
 
 echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6
-echo "configure:7086: checking if we have identified curses libraries" >&5
+echo "configure:6389: checking if we have identified curses libraries" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7088 "configure"
+#line 6391 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr(); tgoto("?", 0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:7095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -7107,7 +6410,7 @@ if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:7111: checking for tgoto in -lmytinfo" >&5
+echo "configure:6414: checking for tgoto in -lmytinfo" >&5
 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7115,7 +6418,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7119 "configure"
+#line 6422 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7126,7 +6429,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7149,7 +6452,7 @@ fi
 	;;
 hpux10.*|hpux11.*) #(vi
 	echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6
-echo "configure:7153: checking for initscr in -lcur_colr" >&5
+echo "configure:6456: checking for initscr in -lcur_colr" >&5
 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7157,7 +6460,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcur_colr  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7161 "configure"
+#line 6464 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7168,7 +6471,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7191,7 +6494,7 @@ else
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6
-echo "configure:7195: checking for initscr in -lHcurses" >&5
+echo "configure:6498: checking for initscr in -lHcurses" >&5
 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7199,7 +6502,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lHcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7203 "configure"
+#line 6506 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7210,7 +6513,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7263,12 +6566,12 @@ 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 $ac_n "checking for tgoto""... $ac_c" 1>&6
-echo "configure:7267: checking for tgoto" >&5
+echo "configure:6570: checking for tgoto" >&5
 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7272 "configure"
+#line 6575 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto(); below.  */
@@ -7291,7 +6594,7 @@ tgoto();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_tgoto=yes"
 else
@@ -7312,7 +6615,7 @@ else
 		for cf_term_lib in $cf_check_list termcap termlib unknown
 		do
 			echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6
-echo "configure:7316: checking for tgoto in -l$cf_term_lib" >&5
+echo "configure:6619: checking for tgoto in -l$cf_term_lib" >&5
 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7320,7 +6623,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$cf_term_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7324 "configure"
+#line 6627 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7331,7 +6634,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7361,7 +6664,7 @@ fi
 	for cf_curs_lib in $cf_check_list xcurses jcurses unknown
 	do
 		echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6
-echo "configure:7365: checking for initscr in -l$cf_curs_lib" >&5
+echo "configure:6668: checking for initscr in -l$cf_curs_lib" >&5
 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7369,7 +6672,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$cf_curs_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7373 "configure"
+#line 6676 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7380,7 +6683,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7406,16 +6709,16 @@ fi
 	LIBS="-l$cf_curs_lib $cf_save_LIBS"
 	if test "$cf_term_lib" = unknown ; then
 		echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6
-echo "configure:7410: checking if we can link with $cf_curs_lib library" >&5
+echo "configure:6713: checking if we can link with $cf_curs_lib library" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 7412 "configure"
+#line 6715 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -7431,16 +6734,16 @@ rm -f conftest*
 		:
 	elif test "$cf_term_lib" != predefined ; then
 		echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6
-echo "configure:7435: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+echo "configure:6738: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 7437 "configure"
+#line 6740 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr(); tgoto((char *)0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=no
 else
@@ -7450,14 +6753,14 @@ else
   
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat > conftest.$ac_ext <<EOF
-#line 7454 "configure"
+#line 6757 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -7478,14 +6781,14 @@ fi
 
 	
 echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6
-echo "configure:7482: checking for curses performance tradeoff" >&5
+echo "configure:6785: checking for curses performance tradeoff" >&5
 if eval "test \"`echo '$''{'cf_cv_curs_performance'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cf_cv_curs_performance=no
     cat > conftest.$ac_ext <<EOF
-#line 7489 "configure"
+#line 6792 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -7499,11 +6802,11 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:7503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 7507 "configure"
+#line 6810 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -7518,7 +6821,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:7522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_curs_performance=yes
 else
@@ -7541,13 +6844,13 @@ EOF
 
 	
 echo $ac_n "checking for curses touchline function""... $ac_c" 1>&6
-echo "configure:7545: checking for curses touchline function" >&5
+echo "configure:6848: checking for curses touchline function" >&5
 if eval "test \"`echo '$''{'cf_cv_curs_touchline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 7551 "configure"
+#line 6854 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -7555,7 +6858,7 @@ int main() {
 touchline(stdscr, 1,2,3);
 ; return 0; }
 EOF
-if { (eval echo configure:7559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_curs_touchline=bsd
 else
@@ -7563,7 +6866,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 7567 "configure"
+#line 6870 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -7571,7 +6874,7 @@ int main() {
 touchline(stdscr, 1,2);
 ; return 0; }
 EOF
-if { (eval echo configure:7575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_curs_touchline=sysv
 else
@@ -7604,40 +6907,49 @@ esac
 	;;
 ncurses)
 	
-echo $ac_n "checking for ncurses header in include-path""... $ac_c" 1>&6
-echo "configure:7609: checking for ncurses header in include-path" >&5
+
+cf_ncuhdr_root=ncurses
+
+test -n "$cf_cv_curses_dir" && \
+test "$cf_cv_curses_dir" != "no" && \
+CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
+
+echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6
+echo "configure:6919: checking for $cf_ncuhdr_root header in include-path" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
-	for cf_header in \
-		curses.h \
-		ncurses.h \
-		ncurses/curses.h \
-		ncurses/ncurses.h
+	cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
+	( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h"
+	for cf_header in $cf_header_list
 	do
+		
 	cat > conftest.$ac_ext <<EOF
-#line 7621 "configure"
+#line 6930 "configure"
 #include "confdefs.h"
+
+
 #include <$cf_header>
 int main() {
 
 #ifdef NCURSES_VERSION
+
 printf("%s\n", NCURSES_VERSION);
 #else
 #ifdef __NCURSES_H
 printf("old\n");
 #else
-make an error
+	make an error
 #endif
 #endif
 	
 	
 ; return 0; }
 EOF
-if { (eval echo configure:7639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  cf_cv_ncurses_h=$cf_header; break
+  cf_cv_ncurses_h=$cf_header
 	
 else
   echo "configure: failed program was:" >&5
@@ -7646,6 +6958,8 @@ else
   cf_cv_ncurses_h=no
 fi
 rm -f conftest*
+
+		test "$cf_cv_ncurses_h" != no && break
 	done
 
 fi
@@ -7655,86 +6969,1106 @@ echo "$ac_t""$cf_cv_ncurses_h" 1>&6
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
-echo $ac_n "checking for ncurses include-path""... $ac_c" 1>&6
-echo "configure:7660: checking for ncurses include-path" >&5
+echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6
+echo "configure:6974: checking for $cf_ncuhdr_root include-path" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
+	test -n "$verbose" && echo
 	cf_search=""
 
-test "$includedir" != NONE && \
-test -d "$includedir" && \
-cf_search="$cf_search $includedir $includedir/ncurses"
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing include-directories under $HOME"
+	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
+	test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
+	test -d $HOME/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
+}
 
-test "$oldincludedir" != NONE && \
-test -d "$oldincludedir" && \
-cf_search="$cf_search $oldincludedir $oldincludedir/ncurses"
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/$cf_ncuhdr_root to the actual package location:
+test -d $HOME/$cf_ncuhdr_root && {
+	test -n "$verbose" && echo "	... testing include-directories under $HOME/$cf_ncuhdr_root"
+	test -d $HOME/$cf_ncuhdr_root/include &&       cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
+	test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
+
+test "$prefix" != /usr/local && \
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing include-directories under /usr/local"
+	test -d /usr/local/include &&       cf_search="$cf_search /usr/local/include"
+	test -d /usr/local/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
+	test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
+	test -d /usr/local/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
+	test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
 
 test "$prefix" != NONE && \
-test -d "$prefix" && \
-cf_search="$cf_search $prefix/include $prefix/include/ncurses $prefix/ncurses/include"
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing include-directories under $prefix"
+	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
+	test -d $prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
+	test -d $prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
+	test -d $prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $prefix/$cf_ncuhdr_root/include"
+	test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
 
-test "$prefix" != /usr/local && \
-test -d /usr/local && \
-cf_search="$cf_search /usr/local/include /usr/local/include/ncurses /usr/local/ncurses/include"
+test "$prefix" != /opt && \
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing include-directories under /opt"
+	test -d /opt/include &&             cf_search="$cf_search /opt/include"
+	test -d /opt/include/$cf_ncuhdr_root &&          cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
+	test -d /opt/include/$cf_ncuhdr_root/include &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
+	test -d /opt/$cf_ncuhdr_root/include &&          cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
+	test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
 
 test "$prefix" != /usr && \
-cf_search="$cf_search /usr/include /usr/include/ncurses /usr/ncurses/include"
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing include-directories under /usr"
+	test -d /usr/include &&             cf_search="$cf_search /usr/include"
+	test -d /usr/include/$cf_ncuhdr_root &&          cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
+	test -d /usr/include/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
+	test -d /usr/$cf_ncuhdr_root/include &&          cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
+}
 
-test "$prefix" != /opt && \
-test -d /opt && \
-cf_search="$cf_search /opt/include /opt/include/ncurses /opt/ncurses/include"
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+	test -d $includedir &&    cf_search="$cf_search $includedir"
+	test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root"
+}
 
-cf_search="$cf_search $HOME/lib $HOME/lib/ncurses $HOME/ncurses/lib"
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+	test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
+	test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"
+}
 
-	test -n "$verbose" && echo
+
+	test -n "$verbose" && echo search path $cf_search
+	cf_save2_CPPFLAGS="$CPPFLAGS"
 	for cf_incdir in $cf_search
 	do
+		
+for cf_add_incdir in $cf_incdir
+do
+	while true
+	do
+		case $cf_add_incdir in
+		/usr/include) # (vi
+			;;
+		/usr/local/include) # (vi
+			if test "$GCC" = yes
+			then
+				cf_save_CPPFLAGS="$CPPFLAGS"
+				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+				cat > conftest.$ac_ext <<EOF
+#line 7069 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+printf("Hello")
+; return 0; }
+EOF
+if { (eval echo configure:7076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPPFLAGS="$cf_save_CPPFLAGS"
+fi
+rm -f conftest*
+			fi
+			;;
+		*) # (vi
+			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+			;;
+		esac
+		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"
+	done
+done
+
 		for cf_header in \
 			ncurses.h \
 			curses.h
 		do
-			if egrep "NCURSES_[VH]" $cf_incdir/$cf_header 1>&5 2>&1; then
+			
+	cat > conftest.$ac_ext <<EOF
+#line 7103 "configure"
+#include "confdefs.h"
+
+
+#include <$cf_header>
+int main() {
+
+#ifdef NCURSES_VERSION
+
+printf("%s\n", NCURSES_VERSION);
+#else
+#ifdef __NCURSES_H
+printf("old\n");
+#else
+	make an error
+#endif
+#endif
+	
+	
+; return 0; }
+EOF
+if { (eval echo configure:7124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_ncurses_h2=$cf_header
+	
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_ncurses_h2=no
+fi
+rm -f conftest*
+
+			if test "$cf_cv_ncurses_h2" != no ; then
 				cf_cv_ncurses_h2=$cf_incdir/$cf_header
 				test -n "$verbose" && echo $ac_n "	... found $ac_c" 1>&6
 				break
 			fi
 			test -n "$verbose" && echo "	... tested $cf_incdir/$cf_header" 1>&6
 		done
-		test -n "$cf_cv_ncurses_h2" && break
+		CPPFLAGS="$cf_save2_CPPFLAGS"
+		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test -z "$cf_cv_ncurses_h2" && { echo "configure: error: not found" 1>&2; exit 1; }
+	test "$cf_cv_ncurses_h2" = no && { echo "configure: error: not found" 1>&2; exit 1; }
 	
 fi
 
 echo "$ac_t""$cf_cv_ncurses_h2" 1>&6
 
-	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's:/[^/]*$::'`
-	cf_2nd_incdir=`echo $cf_1st_incdir | sed -e 's:/[^/]*$::'`
+	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
 	cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2`
-	echo cf_1st_include=$cf_1st_incdir
-	echo cf_2nd_include=$cf_2nd_incdir
-	if test `basename $cf_1st_incdir` = ncurses ; then
-		cf_cv_ncurses_header=ncurses/$cf_cv_ncurses_header
+	if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then
+		cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
+	fi
+	
+for cf_add_incdir in $cf_1st_incdir
+do
+	while true
+	do
+		case $cf_add_incdir in
+		/usr/include) # (vi
+			;;
+		/usr/local/include) # (vi
+			if test "$GCC" = yes
+			then
+				cf_save_CPPFLAGS="$CPPFLAGS"
+				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+				cat > conftest.$ac_ext <<EOF
+#line 7171 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+printf("Hello")
+; return 0; }
+EOF
+if { (eval echo configure:7178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPPFLAGS="$cf_save_CPPFLAGS"
+fi
+rm -f conftest*
+			fi
+			;;
+		*) # (vi
+			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+			;;
+		esac
+		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"
+	done
+done
+
+
+fi
+
+cat >> confdefs.h <<\EOF
+#define NCURSES 1
+EOF
+
+
+case $cf_cv_ncurses_header in # (vi
+*ncurses.h)
+	cat >> confdefs.h <<\EOF
+#define HAVE_NCURSES_H 1
+EOF
+
+	;;
+esac
+
+case $cf_cv_ncurses_header in # (vi
+ncurses/curses.h|ncurses/ncurses.h)
+	cat >> confdefs.h <<\EOF
+#define HAVE_NCURSES_NCURSES_H 1
+EOF
+
+	;;
+ncursesw/curses.h|ncursesw/ncurses.h)
+	cat >> confdefs.h <<\EOF
+#define HAVE_NCURSESW_NCURSES_H 1
+EOF
+
+	;;
+esac
+
+
+echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
+echo "configure:7233: checking for ncurses version" >&5
+if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	cf_cv_ncurses_version=no
+	cf_tempfile=out$$
+	rm -f $cf_tempfile
+	if test "$cross_compiling" = yes; then
+  
+
+	# This will not work if the preprocessor splits the line after the
+	# Autoconf token.  The 'unproto' program does that.
+	cat > conftest.$ac_ext <<EOF
+#include <${cf_cv_ncurses_header-curses.h}>
+#undef Autoconf
+#ifdef NCURSES_VERSION
+Autoconf NCURSES_VERSION
+#else
+#ifdef __NCURSES_H
+Autoconf "old"
+#endif
+;
+#endif
+EOF
+	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+	{ (eval echo configure:7259: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	if test -f conftest.out ; then
+		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
+		rm -f conftest.out
+	fi
+
+else
+  cat > conftest.$ac_ext <<EOF
+#line 7268 "configure"
+#include "confdefs.h"
+
+#include <${cf_cv_ncurses_header-curses.h}>
+#include <stdio.h>
+int main()
+{
+	FILE *fp = fopen("$cf_tempfile", "w");
+#ifdef NCURSES_VERSION
+# ifdef NCURSES_VERSION_PATCH
+	fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+# else
+	fprintf(fp, "%s\n", NCURSES_VERSION);
+# endif
+#else
+# ifdef __NCURSES_H
+	fprintf(fp, "old\n");
+# else
+	make an error
+# endif
+#endif
+	exit(0);
+}
+EOF
+if { (eval echo configure:7292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
+	cf_cv_ncurses_version=`cat $cf_tempfile`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -fr conftest*
+fi
+
+	rm -f $cf_tempfile
+
+fi
+
+echo "$ac_t""$cf_cv_ncurses_version" 1>&6
+test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF
+#define NCURSES 1
+EOF
+
+
+
+	
+
+cf_nculib_root=ncurses
+	# This works, except for the special case where we find gpm, but
+	# ncurses is in a nonstandard location via $LIBS, and we really want
+	# to link gpm.
+cf_ncurses_LIBS=""
+cf_ncurses_SAVE="$LIBS"
+echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
+echo "configure:7323: checking for Gpm_Open in -lgpm" >&5
+ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lgpm  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7331 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char Gpm_Open();
+
+int main() {
+Gpm_Open()
+; return 0; }
+EOF
+if { (eval echo configure:7342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
+echo "configure:7358: checking for initscr in -lgpm" >&5
+ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lgpm  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7366 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char initscr();
+
+int main() {
+initscr()
+; return 0; }
+EOF
+if { (eval echo configure:7377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$cf_ncurses_SAVE"
+else
+  echo "$ac_t""no" 1>&6
+cf_ncurses_LIBS="-lgpm"
+fi
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+case $host_os in #(vi
+freebsd*)
+	# This is only necessary if you are linking against an obsolete
+	# version of ncurses (but it should do no harm, since it's static).
+	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
+echo "configure:7408: checking for tgoto in -lmytinfo" >&5
+ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lmytinfo  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7416 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char tgoto();
+
+int main() {
+tgoto()
+; return 0; }
+EOF
+if { (eval echo configure:7427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+	;;
+esac
+
+LIBS="$cf_ncurses_LIBS $LIBS"
+
+if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+then
+	LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS"
+else
+	
+	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+	cf_libdir=""
+	echo $ac_n "checking for initscr""... $ac_c" 1>&6
+echo "configure:7460: checking for initscr" >&5
+if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 7465 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char initscr(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char initscr();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_initscr) || defined (__stub___initscr)
+choke me
+#else
+initscr();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:7488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_initscr=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_initscr=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+else
+  echo "$ac_t""no" 1>&6
+
+		cf_save_LIBS="$LIBS"
+		echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6
+echo "configure:7508: checking for initscr in -l$cf_nculib_root" >&5
+		LIBS="-l$cf_nculib_root $LIBS"
+		cat > conftest.$ac_ext <<EOF
+#line 7511 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header-curses.h}>
+int main() {
+initscr()
+; return 0; }
+EOF
+if { (eval echo configure:7518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+			
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+			cf_search=""
+
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME"
+	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
+	test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
+	test -d $HOME/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
+}
+
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/$cf_nculib_root to the actual package location:
+test -d $HOME/$cf_nculib_root && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME/$cf_nculib_root"
+	test -d $HOME/$cf_nculib_root/lib &&       cf_search="$cf_search $HOME/$cf_nculib_root/lib"
+	test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
+}
+
+test "$prefix" != /usr/local && \
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr/local"
+	test -d /usr/local/lib &&       cf_search="$cf_search /usr/local/lib"
+	test -d /usr/local/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
+	test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
+	test -d /usr/local/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
+	test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
+}
+
+test "$prefix" != NONE && \
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing lib-directories under $prefix"
+	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
+	test -d $prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
+	test -d $prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
+	test -d $prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
+	test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
+}
+
+test "$prefix" != /opt && \
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing lib-directories under /opt"
+	test -d /opt/lib &&             cf_search="$cf_search /opt/lib"
+	test -d /opt/lib/$cf_nculib_root &&          cf_search="$cf_search /opt/lib/$cf_nculib_root"
+	test -d /opt/lib/$cf_nculib_root/lib &&       cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
+	test -d /opt/$cf_nculib_root/lib &&          cf_search="$cf_search /opt/$cf_nculib_root/lib"
+	test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
+}
+
+test "$prefix" != /usr && \
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr"
+	test -d /usr/lib &&             cf_search="$cf_search /usr/lib"
+	test -d /usr/lib/$cf_nculib_root &&          cf_search="$cf_search /usr/lib/$cf_nculib_root"
+	test -d /usr/lib/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
+	test -d /usr/$cf_nculib_root/lib &&          cf_search="$cf_search /usr/$cf_nculib_root/lib"
+}
+
+			for cf_libdir in $cf_search
+			do
+				echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6
+echo "configure:7587: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+				cat > conftest.$ac_ext <<EOF
+#line 7590 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header-curses.h}>
+int main() {
+initscr()
+; return 0; }
+EOF
+if { (eval echo configure:7597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+					 break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+					 LIBS="$cf_save_LIBS"
+fi
+rm -f conftest*
+			done
+			
+fi
+rm -f conftest*
+		
+fi
+
+eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+
+if test $cf_found_library = no ; then
+	{ echo "configure: error: Cannot link $cf_nculib_root library" 1>&2; exit 1; }
+fi
+
+
+fi
+
+if test -n "$cf_ncurses_LIBS" ; then
+	echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6
+echo "configure:7628: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	cf_ncurses_SAVE="$LIBS"
+	for p in $cf_ncurses_LIBS ; do
+		q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
+		if test "$q" != "$LIBS" ; then
+			LIBS="$q"
+		fi
+	done
+	cat > conftest.$ac_ext <<EOF
+#line 7637 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header-curses.h}>
+int main() {
+initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+; return 0; }
+EOF
+if { (eval echo configure:7644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+		 LIBS="$cf_ncurses_SAVE"
+fi
+rm -f conftest*
+fi
+
+
+cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+cat >> confdefs.h <<EOF
+#define $cf_nculib_ROOT 1
+EOF
+
+
+	
+echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
+echo "configure:7667: checking for ncurses version" >&5
+if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	cf_cv_ncurses_version=no
+	cf_tempfile=out$$
+	rm -f $cf_tempfile
+	if test "$cross_compiling" = yes; then
+  
+
+	# This will not work if the preprocessor splits the line after the
+	# Autoconf token.  The 'unproto' program does that.
+	cat > conftest.$ac_ext <<EOF
+#include <${cf_cv_ncurses_header-curses.h}>
+#undef Autoconf
+#ifdef NCURSES_VERSION
+Autoconf NCURSES_VERSION
+#else
+#ifdef __NCURSES_H
+Autoconf "old"
+#endif
+;
+#endif
+EOF
+	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+	{ (eval echo configure:7693: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	if test -f conftest.out ; then
+		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
+		rm -f conftest.out
+	fi
+
+else
+  cat > conftest.$ac_ext <<EOF
+#line 7702 "configure"
+#include "confdefs.h"
+
+#include <${cf_cv_ncurses_header-curses.h}>
+#include <stdio.h>
+int main()
+{
+	FILE *fp = fopen("$cf_tempfile", "w");
+#ifdef NCURSES_VERSION
+# ifdef NCURSES_VERSION_PATCH
+	fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+# else
+	fprintf(fp, "%s\n", NCURSES_VERSION);
+# endif
+#else
+# ifdef __NCURSES_H
+	fprintf(fp, "old\n");
+# else
+	make an error
+# endif
+#endif
+	exit(0);
+}
+EOF
+if { (eval echo configure:7726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  
+	cf_cv_ncurses_version=`cat $cf_tempfile`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -fr conftest*
+fi
+
+	rm -f $cf_tempfile
+
+fi
+
+echo "$ac_t""$cf_cv_ncurses_version" 1>&6
+test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF
+#define NCURSES 1
+EOF
+
+
+	;;
+ncursesw)
+	
+echo $ac_n "checking for multibyte character support""... $ac_c" 1>&6
+echo "configure:7751: checking for multibyte character support" >&5
+if eval "test \"`echo '$''{'cf_cv_utf8_lib'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	cf_save_LIBS="$LIBS"
+	cat > conftest.$ac_ext <<EOF
+#line 7758 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+int main() {
+putwc(0,0);
+; return 0; }
+EOF
+if { (eval echo configure:7766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_cv_utf8_lib=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  LIBS="-lutf8 $LIBS"
+	 cat > conftest.$ac_ext <<EOF
+#line 7775 "configure"
+#include "confdefs.h"
+
+#include <libutf8.h>
+int main() {
+putwc(0,0);
+; return 0; }
+EOF
+if { (eval echo configure:7783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_cv_utf8_lib=add-on
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_utf8_lib=no
+fi
+rm -f conftest*
+	LIBS="$cf_save_LIBS"
+
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$cf_cv_utf8_lib" 1>&6
+
+# HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
+# ncurses/ncursesw:
+if test "$cf_cv_utf8_lib" = "add-on" ; then
+	cat >> confdefs.h <<\EOF
+#define HAVE_LIBUTF8_H 1
+EOF
+
+	LIBS="-lutf8 $LIBS"
+fi
+
+	
+
+cf_ncuhdr_root=ncursesw
+
+test -n "$cf_cv_curses_dir" && \
+test "$cf_cv_curses_dir" != "no" && \
+CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
+
+echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6
+echo "configure:7820: checking for $cf_ncuhdr_root header in include-path" >&5
+if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
+	( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h"
+	for cf_header in $cf_header_list
+	do
 		
-for cf_add_incdir in $cf_2nd_incdir
+	cat > conftest.$ac_ext <<EOF
+#line 7831 "configure"
+#include "confdefs.h"
+
+
+#define _XOPEN_SOURCE_EXTENDED
+#undef  HAVE_LIBUTF8_H	/* in case we used CF_UTF8_LIB */
+#define HAVE_LIBUTF8_H	/* to force ncurses' header file to use cchar_t */
+
+#include <$cf_header>
+int main() {
+
+#ifdef NCURSES_VERSION
+
+#ifndef WACS_BSSB
+	make an error
+#endif
+
+printf("%s\n", NCURSES_VERSION);
+#else
+#ifdef __NCURSES_H
+printf("old\n");
+#else
+	make an error
+#endif
+#endif
+	
+	
+; return 0; }
+EOF
+if { (eval echo configure:7860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_ncurses_h=$cf_header
+	
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_ncurses_h=no
+fi
+rm -f conftest*
+
+		test "$cf_cv_ncurses_h" != no && break
+	done
+
+fi
+
+echo "$ac_t""$cf_cv_ncurses_h" 1>&6
+
+if test "$cf_cv_ncurses_h" != no ; then
+	cf_cv_ncurses_header=$cf_cv_ncurses_h
+else
+echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6
+echo "configure:7883: checking for $cf_ncuhdr_root include-path" >&5
+if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	test -n "$verbose" && echo
+	cf_search=""
+
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing include-directories under $HOME"
+	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
+	test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
+	test -d $HOME/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
+}
+
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/$cf_ncuhdr_root to the actual package location:
+test -d $HOME/$cf_ncuhdr_root && {
+	test -n "$verbose" && echo "	... testing include-directories under $HOME/$cf_ncuhdr_root"
+	test -d $HOME/$cf_ncuhdr_root/include &&       cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
+	test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
+
+test "$prefix" != /usr/local && \
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing include-directories under /usr/local"
+	test -d /usr/local/include &&       cf_search="$cf_search /usr/local/include"
+	test -d /usr/local/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
+	test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
+	test -d /usr/local/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
+	test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
+
+test "$prefix" != NONE && \
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing include-directories under $prefix"
+	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
+	test -d $prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
+	test -d $prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
+	test -d $prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $prefix/$cf_ncuhdr_root/include"
+	test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
+
+test "$prefix" != /opt && \
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing include-directories under /opt"
+	test -d /opt/include &&             cf_search="$cf_search /opt/include"
+	test -d /opt/include/$cf_ncuhdr_root &&          cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
+	test -d /opt/include/$cf_ncuhdr_root/include &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
+	test -d /opt/$cf_ncuhdr_root/include &&          cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
+	test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
+
+test "$prefix" != /usr && \
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing include-directories under /usr"
+	test -d /usr/include &&             cf_search="$cf_search /usr/include"
+	test -d /usr/include/$cf_ncuhdr_root &&          cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
+	test -d /usr/include/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
+	test -d /usr/$cf_ncuhdr_root/include &&          cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
+}
+
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+	test -d $includedir &&    cf_search="$cf_search $includedir"
+	test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root"
+}
+
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+	test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
+	test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"
+}
+
+
+	test -n "$verbose" && echo search path $cf_search
+	cf_save2_CPPFLAGS="$CPPFLAGS"
+	for cf_incdir in $cf_search
+	do
+		
+for cf_add_incdir in $cf_incdir
 do
 	while true
 	do
 		case $cf_add_incdir in
 		/usr/include) # (vi
 			;;
+		/usr/local/include) # (vi
+			if test "$GCC" = yes
+			then
+				cf_save_CPPFLAGS="$CPPFLAGS"
+				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+				cat > conftest.$ac_ext <<EOF
+#line 7978 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+printf("Hello")
+; return 0; }
+EOF
+if { (eval echo configure:7985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPPFLAGS="$cf_save_CPPFLAGS"
+fi
+rm -f conftest*
+			fi
+			;;
 		*) # (vi
 			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			;;
 		esac
-		cf_top_incdir=`echo $cf_add_incdir | sed -e 's:/include/.*$:/include:'`
+		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"
 	done
 done
 
+		for cf_header in \
+			ncurses.h \
+			curses.h
+		do
+			
+	cat > conftest.$ac_ext <<EOF
+#line 8012 "configure"
+#include "confdefs.h"
+
+
+#define _XOPEN_SOURCE_EXTENDED
+#undef  HAVE_LIBUTF8_H	/* in case we used CF_UTF8_LIB */
+#define HAVE_LIBUTF8_H	/* to force ncurses' header file to use cchar_t */
+
+#include <$cf_header>
+int main() {
+
+#ifdef NCURSES_VERSION
+
+#ifndef WACS_BSSB
+	make an error
+#endif
+
+printf("%s\n", NCURSES_VERSION);
+#else
+#ifdef __NCURSES_H
+printf("old\n");
+#else
+	make an error
+#endif
+#endif
+	
+	
+; return 0; }
+EOF
+if { (eval echo configure:8041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_ncurses_h2=$cf_header
+	
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_ncurses_h2=no
+fi
+rm -f conftest*
+
+			if test "$cf_cv_ncurses_h2" != no ; then
+				cf_cv_ncurses_h2=$cf_incdir/$cf_header
+				test -n "$verbose" && echo $ac_n "	... found $ac_c" 1>&6
+				break
+			fi
+			test -n "$verbose" && echo "	... tested $cf_incdir/$cf_header" 1>&6
+		done
+		CPPFLAGS="$cf_save2_CPPFLAGS"
+		test "$cf_cv_ncurses_h2" != no && break
+	done
+	test "$cf_cv_ncurses_h2" = no && { echo "configure: error: not found" 1>&2; exit 1; }
+	
+fi
+
+echo "$ac_t""$cf_cv_ncurses_h2" 1>&6
+
+	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
+	cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2`
+	if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then
+		cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
 	fi
 	
 for cf_add_incdir in $cf_1st_incdir
@@ -7744,11 +8078,35 @@ do
 		case $cf_add_incdir in
 		/usr/include) # (vi
 			;;
+		/usr/local/include) # (vi
+			if test "$GCC" = yes
+			then
+				cf_save_CPPFLAGS="$CPPFLAGS"
+				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+				cat > conftest.$ac_ext <<EOF
+#line 8088 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+printf("Hello")
+; return 0; }
+EOF
+if { (eval echo configure:8095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPPFLAGS="$cf_save_CPPFLAGS"
+fi
+rm -f conftest*
+			fi
+			;;
 		*) # (vi
 			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			;;
 		esac
-		cf_top_incdir=`echo $cf_add_incdir | sed -e 's:/include/.*$:/include:'`
+		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"
 	done
@@ -7762,7 +8120,6 @@ cat >> confdefs.h <<\EOF
 EOF
 
 
-
 case $cf_cv_ncurses_header in # (vi
 *ncurses.h)
 	cat >> confdefs.h <<\EOF
@@ -7779,11 +8136,17 @@ ncurses/curses.h|ncurses/ncurses.h)
 EOF
 
 	;;
+ncursesw/curses.h|ncursesw/ncurses.h)
+	cat >> confdefs.h <<\EOF
+#define HAVE_NCURSESW_NCURSES_H 1
+EOF
+
+	;;
 esac
 
 
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:7787: checking for ncurses version" >&5
+echo "configure:8150: checking for ncurses version" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7809,16 +8172,16 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:7813: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:8176: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
 	if test -f conftest.out ; then
-		cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'`
+		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
 		rm -f conftest.out
 	fi
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 7822 "configure"
+#line 8185 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -7842,7 +8205,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:7846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -7866,13 +8229,14 @@ EOF
 
 	
 
+cf_nculib_root=ncursesw
 	# This works, except for the special case where we find gpm, but
 	# ncurses is in a nonstandard location via $LIBS, and we really want
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:7876: checking for Gpm_Open in -lgpm" >&5
+echo "configure:8240: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7880,7 +8244,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7884 "configure"
+#line 8248 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7891,7 +8255,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:7895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7907,7 +8271,7 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
-echo "configure:7911: checking for initscr in -lgpm" >&5
+echo "configure:8275: checking for initscr in -lgpm" >&5
 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7915,7 +8279,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7919 "configure"
+#line 8283 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7926,7 +8290,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:7930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7957,7 +8321,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:7961: checking for tgoto in -lmytinfo" >&5
+echo "configure:8325: checking for tgoto in -lmytinfo" >&5
 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7965,7 +8329,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7969 "configure"
+#line 8333 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7976,7 +8340,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:7980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8001,15 +8365,20 @@ esac
 
 LIBS="$cf_ncurses_LIBS $LIBS"
 
-	eval 'cf_cv_have_lib_'ncurses'=no'
+if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+then
+	LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS"
+else
+	
+	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:8008: checking for initscr" >&5
+echo "configure:8377: checking for initscr" >&5
 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8013 "configure"
+#line 8382 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr(); below.  */
@@ -8032,7 +8401,7 @@ initscr();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_initscr=yes"
 else
@@ -8046,26 +8415,26 @@ fi
 
 if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  eval 'cf_cv_have_lib_'ncurses'=yes'
+  eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
   echo "$ac_t""no" 1>&6
 
 		cf_save_LIBS="$LIBS"
-		echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:8056: checking for initscr in -lncurses" >&5
-		LIBS="-lncurses $LIBS"
+		echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6
+echo "configure:8425: checking for initscr in -l$cf_nculib_root" >&5
+		LIBS="-l$cf_nculib_root $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 8059 "configure"
+#line 8428 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:8066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
-			 eval 'cf_cv_have_lib_'ncurses'=yes'
+			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 			
 else
   echo "configure: failed program was:" >&5
@@ -8074,52 +8443,77 @@ else
   echo "$ac_t""no" 1>&6
 			cf_search=""
 
-test "$libdir" != NONE && \
-test -d $libdir && \
-cf_search="$cf_search $libdir $libdir/ncurses"
-
-test "$exec_prefix" != NONE && \
-test -d $exec_prefix && \
-cf_search="$cf_search $exec_prefix/lib $exec_prefix/lib/ncurses"
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME"
+	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
+	test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
+	test -d $HOME/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
+}
 
-test "$prefix" != NONE && \
-test "$prefix" != "$exec_prefix" && \
-test -d $prefix && \
-cf_search="$cf_search $prefix/lib $prefix/lib/ncurses $prefix/ncurses/lib"
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/$cf_nculib_root to the actual package location:
+test -d $HOME/$cf_nculib_root && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME/$cf_nculib_root"
+	test -d $HOME/$cf_nculib_root/lib &&       cf_search="$cf_search $HOME/$cf_nculib_root/lib"
+	test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
+}
 
 test "$prefix" != /usr/local && \
-test -d /usr/local && \
-cf_search="$cf_search /usr/local/lib /usr/local/lib/ncurses /usr/local/ncurses/lib"
-
-test "$prefix" != /usr && \
-cf_search="$cf_search /usr/lib /usr/lib/ncurses /usr/ncurses/lib"
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr/local"
+	test -d /usr/local/lib &&       cf_search="$cf_search /usr/local/lib"
+	test -d /usr/local/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
+	test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
+	test -d /usr/local/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
+	test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
+}
 
-test "$prefix" != / && \
-cf_search="$cf_search /lib /lib/ncurses /ncurses/lib"
+test "$prefix" != NONE && \
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing lib-directories under $prefix"
+	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
+	test -d $prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
+	test -d $prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
+	test -d $prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
+	test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
+}
 
 test "$prefix" != /opt && \
-test -d /opt && \
-cf_search="$cf_search /opt/lib /opt/lib/ncurses /opt/ncurses/lib"
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing lib-directories under /opt"
+	test -d /opt/lib &&             cf_search="$cf_search /opt/lib"
+	test -d /opt/lib/$cf_nculib_root &&          cf_search="$cf_search /opt/lib/$cf_nculib_root"
+	test -d /opt/lib/$cf_nculib_root/lib &&       cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
+	test -d /opt/$cf_nculib_root/lib &&          cf_search="$cf_search /opt/$cf_nculib_root/lib"
+	test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
+}
 
-cf_search="$cf_search $HOME/lib $HOME/lib/ncurses $HOME/ncurses/lib"
+test "$prefix" != /usr && \
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr"
+	test -d /usr/lib &&             cf_search="$cf_search /usr/lib"
+	test -d /usr/lib/$cf_nculib_root &&          cf_search="$cf_search /usr/lib/$cf_nculib_root"
+	test -d /usr/lib/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
+	test -d /usr/$cf_nculib_root/lib &&          cf_search="$cf_search /usr/$cf_nculib_root/lib"
+}
 
 			for cf_libdir in $cf_search
 			do
-				echo $ac_n "checking for -lncurses in $cf_libdir""... $ac_c" 1>&6
-echo "configure:8110: checking for -lncurses in $cf_libdir" >&5
-				LIBS="-L$cf_libdir -lncurses $cf_save_LIBS"
+				echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6
+echo "configure:8504: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 8113 "configure"
+#line 8507 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:8120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
-			 		 eval 'cf_cv_have_lib_'ncurses'=yes'
+			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "configure: failed program was:" >&5
@@ -8136,33 +8530,34 @@ rm -f conftest*
 		
 fi
 
-eval 'cf_found_library=$cf_cv_have_lib_'ncurses
+eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ echo "configure: error: Cannot link ncurses library" 1>&2; exit 1; }
+	{ echo "configure: error: Cannot link $cf_nculib_root library" 1>&2; exit 1; }
 fi
 
 
+fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo $ac_n "checking if we can link ncurses without $cf_ncurses_LIBS""... $ac_c" 1>&6
-echo "configure:8150: checking if we can link ncurses without $cf_ncurses_LIBS" >&5
+	echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6
+echo "configure:8545: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
-		q=`echo $LIBS | sed -e 's/'$p' //' -e 's/'$p'$//'`
+		q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
 		if test "$q" != "$LIBS" ; then
 			LIBS="$q"
 		fi
 	done
 	cat > conftest.$ac_ext <<EOF
-#line 8159 "configure"
+#line 8554 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:8166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -8175,9 +8570,17 @@ fi
 rm -f conftest*
 fi
 
+
+cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+cat >> confdefs.h <<EOF
+#define $cf_nculib_ROOT 1
+EOF
+
+
 	
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:8181: checking for ncurses version" >&5
+echo "configure:8584: checking for ncurses version" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8203,16 +8606,16 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:8207: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:8610: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
 	if test -f conftest.out ; then
-		cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'`
+		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
 		rm -f conftest.out
 	fi
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 8216 "configure"
+#line 8619 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -8236,7 +8639,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:8240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -8259,25 +8662,26 @@ EOF
 
 	;;
 pdcurses)
+	cf_cv_ncurses_header=xcurses.h
 	# do this last, since it changes definition of main: CF_PDCURSES_X11
 	;;
 slang)
 	
 echo $ac_n "checking for slang header file""... $ac_c" 1>&6
-echo "configure:8268: checking for slang header file" >&5
+echo "configure:8672: checking for slang header file" >&5
 if eval "test \"`echo '$''{'cf_cv_slang_header'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 8274 "configure"
+#line 8678 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 printf("%s\n", SLANG_VERSION)
 ; return 0; }
 EOF
-if { (eval echo configure:8281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_slang_header=predefined
 else
@@ -8287,30 +8691,74 @@ else
   
 	cf_search=""
 
-test "$includedir" != NONE && \
-test -d "$includedir" && \
-cf_search="$cf_search $includedir $includedir/slang"
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing include-directories under $HOME"
+	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
+	test -d $HOME/include/slang &&       cf_search="$cf_search $HOME/include/slang"
+	test -d $HOME/include/slang/include &&    cf_search="$cf_search $HOME/include/slang/include"
+}
 
-test "$oldincludedir" != NONE && \
-test -d "$oldincludedir" && \
-cf_search="$cf_search $oldincludedir $oldincludedir/slang"
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/slang to the actual package location:
+test -d $HOME/slang && {
+	test -n "$verbose" && echo "	... testing include-directories under $HOME/slang"
+	test -d $HOME/slang/include &&       cf_search="$cf_search $HOME/slang/include"
+	test -d $HOME/slang/include/slang &&    cf_search="$cf_search $HOME/slang/include/slang"
+}
+
+test "$prefix" != /usr/local && \
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing include-directories under /usr/local"
+	test -d /usr/local/include &&       cf_search="$cf_search /usr/local/include"
+	test -d /usr/local/include/slang &&    cf_search="$cf_search /usr/local/include/slang"
+	test -d /usr/local/include/slang/include && cf_search="$cf_search /usr/local/include/slang/include"
+	test -d /usr/local/slang/include &&    cf_search="$cf_search /usr/local/slang/include"
+	test -d /usr/local/slang/include/slang && cf_search="$cf_search /usr/local/slang/include/slang"
+}
 
 test "$prefix" != NONE && \
-test -d "$prefix" && \
-cf_search="$cf_search $prefix/include $prefix/include/slang $prefix/slang/include"
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing include-directories under $prefix"
+	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
+	test -d $prefix/include/slang &&       cf_search="$cf_search $prefix/include/slang"
+	test -d $prefix/include/slang/include &&    cf_search="$cf_search $prefix/include/slang/include"
+	test -d $prefix/slang/include &&       cf_search="$cf_search $prefix/slang/include"
+	test -d $prefix/slang/include/slang &&    cf_search="$cf_search $prefix/slang/include/slang"
+}
 
-test "$prefix" != /usr/local && \
-test -d /usr/local && \
-cf_search="$cf_search /usr/local/include /usr/local/include/slang /usr/local/slang/include"
+test "$prefix" != /opt && \
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing include-directories under /opt"
+	test -d /opt/include &&             cf_search="$cf_search /opt/include"
+	test -d /opt/include/slang &&          cf_search="$cf_search /opt/include/slang"
+	test -d /opt/include/slang/include &&       cf_search="$cf_search /opt/include/slang/include"
+	test -d /opt/slang/include &&          cf_search="$cf_search /opt/slang/include"
+	test -d /opt/slang/include/slang &&       cf_search="$cf_search /opt/slang/include/slang"
+}
 
 test "$prefix" != /usr && \
-cf_search="$cf_search /usr/include /usr/include/slang /usr/slang/include"
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing include-directories under /usr"
+	test -d /usr/include &&             cf_search="$cf_search /usr/include"
+	test -d /usr/include/slang &&          cf_search="$cf_search /usr/include/slang"
+	test -d /usr/include/slang/include &&       cf_search="$cf_search /usr/include/slang/include"
+	test -d /usr/slang/include &&          cf_search="$cf_search /usr/slang/include"
+}
 
-test "$prefix" != /opt && \
-test -d /opt && \
-cf_search="$cf_search /opt/include /opt/include/slang /opt/slang/include"
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+	test -d $includedir &&    cf_search="$cf_search $includedir"
+	test -d $includedir/slang && cf_search="$cf_search $includedir/slang"
+}
+
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+	test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
+	test -d $oldincludedir/slang && cf_search="$cf_search $oldincludedir/slang"
+}
 
-cf_search="$cf_search $HOME/lib $HOME/lib/slang $HOME/slang/lib"
 
 	for cf_incdir in $cf_search
 	do
@@ -8337,7 +8785,7 @@ cat >> confdefs.h <<\EOF
 EOF
 
 
-cf_incdir=`echo $cf_cv_slang_header | sed -e 's:/[^/]*$::'`
+cf_incdir=`echo $cf_cv_slang_header | sed -e 's%/[^/]*$%%'`
 
 case $cf_cv_slang_header in # (vi
 predefined) # (vi
@@ -8351,11 +8799,35 @@ do
 		case $cf_add_incdir in
 		/usr/include) # (vi
 			;;
+		/usr/local/include) # (vi
+			if test "$GCC" = yes
+			then
+				cf_save_CPPFLAGS="$CPPFLAGS"
+				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+				cat > conftest.$ac_ext <<EOF
+#line 8809 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+printf("Hello")
+; return 0; }
+EOF
+if { (eval echo configure:8816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPPFLAGS="$cf_save_CPPFLAGS"
+fi
+rm -f conftest*
+			fi
+			;;
 		*) # (vi
 			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			;;
 		esac
-		cf_top_incdir=`echo $cf_add_incdir | sed -e 's:/include/.*$:/include:'`
+		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"
 	done
@@ -8364,6 +8836,65 @@ done
 	;;
 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 $ac_n "checking if we must define UTF8""... $ac_c" 1>&6
+echo "configure:8843: checking if we must define UTF8" >&5
+if eval "test \"`echo '$''{'cf_cv_slang_utf8'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	cat > conftest.$ac_ext <<EOF
+#line 8849 "configure"
+#include "confdefs.h"
+
+#include <slang.h>
+int main() {
+SLtt_get_screen_size()
+; return 0; }
+EOF
+if { (eval echo configure:8857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_slang_utf8=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+	cat > conftest.$ac_ext <<EOF
+#line 8866 "configure"
+#include "confdefs.h"
+
+#define UTF8
+#include <slang.h>
+int main() {
+SLtt_get_screen_size()
+; return 0; }
+EOF
+if { (eval echo configure:8875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_slang_utf8=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_slang_utf8=unknown
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_slang_utf8" 1>&6
+
+if test "$cf_cv_slang_utf8" = yes ; then
+	cat >> confdefs.h <<\EOF
+#define UTF8 1
+EOF
+
+fi
+
 
 cf_slang_LIBS1="$LIBS"
 
@@ -8373,24 +8904,24 @@ else
   
 cf_cv_termlib=none
 cat > conftest.$ac_ext <<EOF
-#line 8377 "configure"
+#line 8908 "configure"
 #include "confdefs.h"
 
 int main() {
 char *x=(char*)tgoto("",0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:8384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 8387 "configure"
+#line 8918 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=tigetstr("")
 ; return 0; }
 EOF
-if { (eval echo configure:8394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_termlib=terminfo
 else
@@ -8419,16 +8950,16 @@ if test "$cf_cv_termlib" = none; then
 	for cf_func in tigetstr tgetstr
 	do
 		echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6
-echo "configure:8423: checking for $cf_func in -l$cf_lib" >&5
+echo "configure:8954: checking for $cf_func in -l$cf_lib" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 8425 "configure"
+#line 8956 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=$cf_func("")
 ; return 0; }
 EOF
-if { (eval echo configure:8432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -8455,7 +8986,7 @@ fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
 	echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:8459: checking for initscr in -lcurses" >&5
+echo "configure:8990: checking for initscr in -lcurses" >&5
 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8463,7 +8994,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8467 "configure"
+#line 8998 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8474,7 +9005,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:8478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8495,7 +9026,7 @@ else
 fi
 
 	echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:8499: checking for tgoto in -ltermcap" >&5
+echo "configure:9030: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8503,7 +9034,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8507 "configure"
+#line 9038 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8514,7 +9045,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:8518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8546,12 +9077,12 @@ fi
 
 cf_slang_LIBS2="$LIBS"
 echo $ac_n "checking for acos""... $ac_c" 1>&6
-echo "configure:8550: checking for acos" >&5
+echo "configure:9081: checking for acos" >&5
 if eval "test \"`echo '$''{'ac_cv_func_acos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8555 "configure"
+#line 9086 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos(); below.  */
@@ -8574,7 +9105,7 @@ acos();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_acos=yes"
 else
@@ -8593,7 +9124,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6
-echo "configure:8597: checking for acos in -lm" >&5
+echo "configure:9128: checking for acos in -lm" >&5
 ac_lib_var=`echo m'_'acos | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8601,7 +9132,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8605 "configure"
+#line 9136 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8612,7 +9143,7 @@ int main() {
 acos()
 ; return 0; }
 EOF
-if { (eval echo configure:8616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8654,12 +9185,12 @@ os2*)
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
 	echo $ac_n "checking for v_init""... $ac_c" 1>&6
-echo "configure:8658: checking for v_init" >&5
+echo "configure:9189: checking for v_init" >&5
 if eval "test \"`echo '$''{'ac_cv_func_v_init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8663 "configure"
+#line 9194 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init(); below.  */
@@ -8682,7 +9213,7 @@ v_init();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_v_init=yes"
 else
@@ -8702,17 +9233,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for v_init in -lvideo""... $ac_c" 1>&6
-echo "configure:8706: checking for v_init in -lvideo" >&5
+echo "configure:9237: checking for v_init in -lvideo" >&5
 		LIBS="-lvideo $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 8709 "configure"
+#line 9240 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int main() {
 v_init()
 ; return 0; }
 EOF
-if { (eval echo configure:8716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'video'=yes'
@@ -8724,49 +9255,74 @@ else
   echo "$ac_t""no" 1>&6
 			cf_search=""
 
-test "$libdir" != NONE && \
-test -d $libdir && \
-cf_search="$cf_search $libdir $libdir/video"
-
-test "$exec_prefix" != NONE && \
-test -d $exec_prefix && \
-cf_search="$cf_search $exec_prefix/lib $exec_prefix/lib/video"
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME"
+	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
+	test -d $HOME/lib/video &&       cf_search="$cf_search $HOME/lib/video"
+	test -d $HOME/lib/video/lib &&    cf_search="$cf_search $HOME/lib/video/lib"
+}
 
-test "$prefix" != NONE && \
-test "$prefix" != "$exec_prefix" && \
-test -d $prefix && \
-cf_search="$cf_search $prefix/lib $prefix/lib/video $prefix/video/lib"
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/video to the actual package location:
+test -d $HOME/video && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME/video"
+	test -d $HOME/video/lib &&       cf_search="$cf_search $HOME/video/lib"
+	test -d $HOME/video/lib/video &&    cf_search="$cf_search $HOME/video/lib/video"
+}
 
 test "$prefix" != /usr/local && \
-test -d /usr/local && \
-cf_search="$cf_search /usr/local/lib /usr/local/lib/video /usr/local/video/lib"
-
-test "$prefix" != /usr && \
-cf_search="$cf_search /usr/lib /usr/lib/video /usr/video/lib"
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr/local"
+	test -d /usr/local/lib &&       cf_search="$cf_search /usr/local/lib"
+	test -d /usr/local/lib/video &&    cf_search="$cf_search /usr/local/lib/video"
+	test -d /usr/local/lib/video/lib && cf_search="$cf_search /usr/local/lib/video/lib"
+	test -d /usr/local/video/lib &&    cf_search="$cf_search /usr/local/video/lib"
+	test -d /usr/local/video/lib/video && cf_search="$cf_search /usr/local/video/lib/video"
+}
 
-test "$prefix" != / && \
-cf_search="$cf_search /lib /lib/video /video/lib"
+test "$prefix" != NONE && \
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing lib-directories under $prefix"
+	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
+	test -d $prefix/lib/video &&       cf_search="$cf_search $prefix/lib/video"
+	test -d $prefix/lib/video/lib &&    cf_search="$cf_search $prefix/lib/video/lib"
+	test -d $prefix/video/lib &&       cf_search="$cf_search $prefix/video/lib"
+	test -d $prefix/video/lib/video &&    cf_search="$cf_search $prefix/video/lib/video"
+}
 
 test "$prefix" != /opt && \
-test -d /opt && \
-cf_search="$cf_search /opt/lib /opt/lib/video /opt/video/lib"
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing lib-directories under /opt"
+	test -d /opt/lib &&             cf_search="$cf_search /opt/lib"
+	test -d /opt/lib/video &&          cf_search="$cf_search /opt/lib/video"
+	test -d /opt/lib/video/lib &&       cf_search="$cf_search /opt/lib/video/lib"
+	test -d /opt/video/lib &&          cf_search="$cf_search /opt/video/lib"
+	test -d /opt/video/lib/video &&       cf_search="$cf_search /opt/video/lib/video"
+}
 
-cf_search="$cf_search $HOME/lib $HOME/lib/video $HOME/video/lib"
+test "$prefix" != /usr && \
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr"
+	test -d /usr/lib &&             cf_search="$cf_search /usr/lib"
+	test -d /usr/lib/video &&          cf_search="$cf_search /usr/lib/video"
+	test -d /usr/lib/video/lib &&       cf_search="$cf_search /usr/lib/video/lib"
+	test -d /usr/video/lib &&          cf_search="$cf_search /usr/video/lib"
+}
 
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lvideo in $cf_libdir""... $ac_c" 1>&6
-echo "configure:8760: checking for -lvideo in $cf_libdir" >&5
+echo "configure:9316: checking for -lvideo in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 8763 "configure"
+#line 9319 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int main() {
 v_init()
 ; return 0; }
 EOF
-if { (eval echo configure:8770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
@@ -8799,12 +9355,12 @@ esac
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
 	echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6
-echo "configure:8803: checking for SLtt_get_screen_size" >&5
+echo "configure:9359: checking for SLtt_get_screen_size" >&5
 if eval "test \"`echo '$''{'ac_cv_func_SLtt_get_screen_size'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8808 "configure"
+#line 9364 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size(); below.  */
@@ -8827,7 +9383,7 @@ SLtt_get_screen_size();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_SLtt_get_screen_size=yes"
 else
@@ -8847,17 +9403,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6
-echo "configure:8851: checking for SLtt_get_screen_size in -lslang" >&5
+echo "configure:9407: checking for SLtt_get_screen_size in -lslang" >&5
 		LIBS="-lslang $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 8854 "configure"
+#line 9410 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:8861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'slang'=yes'
@@ -8869,49 +9425,74 @@ else
   echo "$ac_t""no" 1>&6
 			cf_search=""
 
-test "$libdir" != NONE && \
-test -d $libdir && \
-cf_search="$cf_search $libdir $libdir/slang"
-
-test "$exec_prefix" != NONE && \
-test -d $exec_prefix && \
-cf_search="$cf_search $exec_prefix/lib $exec_prefix/lib/slang"
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME"
+	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
+	test -d $HOME/lib/slang &&       cf_search="$cf_search $HOME/lib/slang"
+	test -d $HOME/lib/slang/lib &&    cf_search="$cf_search $HOME/lib/slang/lib"
+}
 
-test "$prefix" != NONE && \
-test "$prefix" != "$exec_prefix" && \
-test -d $prefix && \
-cf_search="$cf_search $prefix/lib $prefix/lib/slang $prefix/slang/lib"
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/slang to the actual package location:
+test -d $HOME/slang && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME/slang"
+	test -d $HOME/slang/lib &&       cf_search="$cf_search $HOME/slang/lib"
+	test -d $HOME/slang/lib/slang &&    cf_search="$cf_search $HOME/slang/lib/slang"
+}
 
 test "$prefix" != /usr/local && \
-test -d /usr/local && \
-cf_search="$cf_search /usr/local/lib /usr/local/lib/slang /usr/local/slang/lib"
-
-test "$prefix" != /usr && \
-cf_search="$cf_search /usr/lib /usr/lib/slang /usr/slang/lib"
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr/local"
+	test -d /usr/local/lib &&       cf_search="$cf_search /usr/local/lib"
+	test -d /usr/local/lib/slang &&    cf_search="$cf_search /usr/local/lib/slang"
+	test -d /usr/local/lib/slang/lib && cf_search="$cf_search /usr/local/lib/slang/lib"
+	test -d /usr/local/slang/lib &&    cf_search="$cf_search /usr/local/slang/lib"
+	test -d /usr/local/slang/lib/slang && cf_search="$cf_search /usr/local/slang/lib/slang"
+}
 
-test "$prefix" != / && \
-cf_search="$cf_search /lib /lib/slang /slang/lib"
+test "$prefix" != NONE && \
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing lib-directories under $prefix"
+	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
+	test -d $prefix/lib/slang &&       cf_search="$cf_search $prefix/lib/slang"
+	test -d $prefix/lib/slang/lib &&    cf_search="$cf_search $prefix/lib/slang/lib"
+	test -d $prefix/slang/lib &&       cf_search="$cf_search $prefix/slang/lib"
+	test -d $prefix/slang/lib/slang &&    cf_search="$cf_search $prefix/slang/lib/slang"
+}
 
 test "$prefix" != /opt && \
-test -d /opt && \
-cf_search="$cf_search /opt/lib /opt/lib/slang /opt/slang/lib"
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing lib-directories under /opt"
+	test -d /opt/lib &&             cf_search="$cf_search /opt/lib"
+	test -d /opt/lib/slang &&          cf_search="$cf_search /opt/lib/slang"
+	test -d /opt/lib/slang/lib &&       cf_search="$cf_search /opt/lib/slang/lib"
+	test -d /opt/slang/lib &&          cf_search="$cf_search /opt/slang/lib"
+	test -d /opt/slang/lib/slang &&       cf_search="$cf_search /opt/slang/lib/slang"
+}
 
-cf_search="$cf_search $HOME/lib $HOME/lib/slang $HOME/slang/lib"
+test "$prefix" != /usr && \
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr"
+	test -d /usr/lib &&             cf_search="$cf_search /usr/lib"
+	test -d /usr/lib/slang &&          cf_search="$cf_search /usr/lib/slang"
+	test -d /usr/lib/slang/lib &&       cf_search="$cf_search /usr/lib/slang/lib"
+	test -d /usr/slang/lib &&          cf_search="$cf_search /usr/slang/lib"
+}
 
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6
-echo "configure:8905: checking for -lslang in $cf_libdir" >&5
+echo "configure:9486: checking for -lslang in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 8908 "configure"
+#line 9489 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:8915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'slang'=yes'
@@ -8940,22 +9521,22 @@ fi
 
 cf_slang_LIBS3="$LIBS"
 echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6
-echo "configure:8944: checking if we can link slang without termcap" >&5
+echo "configure:9525: checking if we can link slang without termcap" >&5
 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@^.@@'`
+	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
 else
 	cf_exclude="$cf_slang_LIBS2"
 fi
-LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'`
+LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat > conftest.$ac_ext <<EOF
-#line 8952 "configure"
+#line 9533 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
 SLtt_get_screen_size()
 ; return 0; }
 EOF
-if { (eval echo configure:8959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -8972,13 +9553,13 @@ test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 
 echo $ac_n "checking if we must tell slang this is UNIX""... $ac_c" 1>&6
-echo "configure:8976: checking if we must tell slang this is UNIX" >&5
+echo "configure:9557: checking if we must tell slang this is UNIX" >&5
 if eval "test \"`echo '$''{'cf_cv_slang_unix'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 8982 "configure"
+#line 9563 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int main() {
@@ -8992,7 +9573,7 @@ SLang_TT_Baud_Rate = 1
 
 ; return 0; }
 EOF
-if { (eval echo configure:8996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_slang_unix=yes
 else
@@ -9015,10 +9596,10 @@ EOF
 esac
 
 eval cf_libdir=$libdir
-cf_libdir=`echo $cf_libdir | sed -e s@'^NONE/'@$prefix/@ -e s@'^NONE/'@$ac_default_prefix/@`
+cf_libdir=`echo $cf_libdir | sed -e s%'^NONE/'%$prefix/% -e s%'^NONE/'%$ac_default_prefix/%`
 
 echo $ac_n "checking for location of config-file""... $ac_c" 1>&6
-echo "configure:9022: checking for location of config-file" >&5
+echo "configure:9603: checking for location of config-file" >&5
 LYNX_CFG_FILE=$cf_libdir/lynx.cfg
 cat >> confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
@@ -9030,7 +9611,7 @@ CHARSET_DEFS=
 
 
 echo $ac_n "checking if you want only a few charsets""... $ac_c" 1>&6
-echo "configure:9034: checking if you want only a few charsets" >&5
+echo "configure:9615: checking if you want only a few charsets" >&5
 
 # Check whether --with-charsets or --without-charsets was given.
 if test "${with_charsets+set}" = set; then
@@ -9091,12 +9672,12 @@ fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:9095: checking for ANSI C header files" >&5
+echo "configure:9676: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9100 "configure"
+#line 9681 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -9104,7 +9685,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9121,7 +9702,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 9125 "configure"
+#line 9706 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -9139,7 +9720,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 9143 "configure"
+#line 9724 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -9160,7 +9741,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 9164 "configure"
+#line 9745 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -9171,7 +9752,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:9175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -9195,12 +9776,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:9199: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:9780: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9204 "configure"
+#line 9785 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -9209,7 +9790,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:9213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -9234,12 +9815,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:9238: checking for $ac_hdr that defines DIR" >&5
+echo "configure:9819: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9243 "configure"
+#line 9824 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -9247,7 +9828,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:9251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -9272,7 +9853,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:9276: checking for opendir in -ldir" >&5
+echo "configure:9857: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9280,7 +9861,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9284 "configure"
+#line 9865 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9291,7 +9872,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:9295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9313,7 +9894,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:9317: checking for opendir in -lx" >&5
+echo "configure:9898: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9321,7 +9902,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9325 "configure"
+#line 9906 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9332,7 +9913,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:9336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9375,17 +9956,17 @@ for ac_hdr in \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9379: checking for $ac_hdr" >&5
+echo "configure:9960: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9384 "configure"
+#line 9965 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9413,13 +9994,13 @@ done
 
 
 echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6
-echo "configure:9417: checking termio.h and termios.h" >&5
+echo "configure:9998: checking termio.h and termios.h" >&5
 if eval "test \"`echo '$''{'cf_cv_termio_and_termios'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 9423 "configure"
+#line 10004 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -9432,7 +10013,7 @@ int main() {
 putchar (0x0a)
 ; return 0; }
 EOF
-if { (eval echo configure:9436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_termio_and_termios=yes
 else
@@ -9452,13 +10033,13 @@ EOF
 
 
 echo $ac_n "checking for sigaction and structs""... $ac_c" 1>&6
-echo "configure:9456: checking for sigaction and structs" >&5
+echo "configure:10037: checking for sigaction and structs" >&5
 if eval "test \"`echo '$''{'cf_cv_func_sigaction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 9462 "configure"
+#line 10043 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9473,7 +10054,7 @@ struct sigaction act;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:9477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_func_sigaction=yes
 else
@@ -9497,17 +10078,17 @@ for ac_hdr in sys/wait.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9501: checking for $ac_hdr" >&5
+echo "configure:10082: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9506 "configure"
+#line 10087 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9544,17 +10125,17 @@ for ac_hdr in wait.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9548: checking for $ac_hdr" >&5
+echo "configure:10129: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9553 "configure"
+#line 10134 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9584,17 +10165,17 @@ for ac_hdr in waitstatus.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9588: checking for $ac_hdr" >&5
+echo "configure:10169: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9593 "configure"
+#line 10174 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9635,13 +10216,13 @@ fi
 
 
 echo $ac_n "checking for union wait""... $ac_c" 1>&6
-echo "configure:9639: checking for union wait" >&5
+echo "configure:10220: checking for union wait" >&5
 if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 9645 "configure"
+#line 10226 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
@@ -9652,7 +10233,7 @@ int x;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:9656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -9663,7 +10244,7 @@ else
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 9667 "configure"
+#line 10248 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
@@ -9678,7 +10259,7 @@ union wait x;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:9682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -9705,20 +10286,20 @@ EOF
 if test $cf_cv_type_unionwait = yes; then
 
 	echo $ac_n "checking if union wait can be used as wait-arg""... $ac_c" 1>&6
-echo "configure:9709: checking if union wait can be used as wait-arg" >&5
+echo "configure:10290: checking if union wait can be used as wait-arg" >&5
 	if eval "test \"`echo '$''{'cf_cv_arg_union_wait'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 9715 "configure"
+#line 10296 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
 union wait x; wait(&x)
 ; return 0; }
 EOF
-if { (eval echo configure:9722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_arg_union_wait=yes
 else
@@ -9738,20 +10319,20 @@ EOF
 
 
 	echo $ac_n "checking if union wait can be used as waitpid-arg""... $ac_c" 1>&6
-echo "configure:9742: checking if union wait can be used as waitpid-arg" >&5
+echo "configure:10323: checking if union wait can be used as waitpid-arg" >&5
 	if eval "test \"`echo '$''{'cf_cv_arg_union_waitpid'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 9748 "configure"
+#line 10329 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
 union wait x; waitpid(0, &x, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:9755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_arg_union_waitpid=yes
 else
@@ -9777,17 +10358,17 @@ for ac_hdr in stdarg.h varargs.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9781: checking for $ac_hdr" >&5
+echo "configure:10362: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9786 "configure"
+#line 10367 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9814,13 +10395,13 @@ fi
 done
 
 echo $ac_n "checking for standard varargs""... $ac_c" 1>&6
-echo "configure:9818: checking for standard varargs" >&5
+echo "configure:10399: checking for standard varargs" >&5
 if eval "test \"`echo '$''{'cf_cv_ansi_varargs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 9824 "configure"
+#line 10405 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDARG_H
@@ -9835,7 +10416,7 @@ int main() {
 return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args)
 ; return 0; }
 EOF
-if { (eval echo configure:9839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ansi_varargs=yes
 else
@@ -9855,12 +10436,12 @@ EOF
 
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:9859: checking for uid_t in sys/types.h" >&5
+echo "configure:10440: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9864 "configure"
+#line 10445 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -9889,7 +10470,7 @@ EOF
 fi
 
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:9893: checking type of array argument to getgroups" >&5
+echo "configure:10474: checking type of array argument to getgroups" >&5
 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9897,7 +10478,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 9901 "configure"
+#line 10482 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Rendell for this test.  */
@@ -9922,7 +10503,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:9926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
     ac_cv_type_getgroups=gid_t
 else
@@ -9936,7 +10517,7 @@ fi
 
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 9940 "configure"
+#line 10521 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -9960,12 +10541,12 @@ EOF
 
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:9964: checking for pid_t" >&5
+echo "configure:10545: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9969 "configure"
+#line 10550 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9993,12 +10574,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:9997: checking for uid_t in sys/types.h" >&5
+echo "configure:10578: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10002 "configure"
+#line 10583 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -10027,12 +10608,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:10031: checking for mode_t" >&5
+echo "configure:10612: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10036 "configure"
+#line 10617 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -10061,19 +10642,253 @@ fi
 
 
 
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+echo "configure:10649: checking for working alloca.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10654 "configure"
+#include "confdefs.h"
+#include <alloca.h>
+int main() {
+char *p = alloca(2 * sizeof(int));
+; return 0; }
+EOF
+if { (eval echo configure:10661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_header_alloca_h=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_alloca_h=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
+if test $ac_cv_header_alloca_h = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_ALLOCA_H 1
+EOF
+
+fi
+
+echo $ac_n "checking for alloca""... $ac_c" 1>&6
+echo "configure:10682: checking for alloca" >&5
+if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10687 "configure"
+#include "confdefs.h"
+
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  if HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+int main() {
+char *p = (char *) alloca(1);
+; return 0; }
+EOF
+if { (eval echo configure:10715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_func_alloca_works=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_func_alloca_works=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
+if test $ac_cv_func_alloca_works = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_ALLOCA 1
+EOF
+
+fi
+
+if test $ac_cv_func_alloca_works = no; then
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+  # that cause trouble.  Some versions do not even contain alloca or
+  # contain a buggy version.  If you still want to use their alloca,
+  # use ar to extract alloca.o from them instead of compiling alloca.c.
+  ALLOCA=alloca.${ac_objext}
+  cat >> confdefs.h <<\EOF
+#define C_ALLOCA 1
+EOF
+
+
+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+echo "configure:10747: checking whether alloca needs Cray hooks" >&5
+if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10752 "configure"
+#include "confdefs.h"
+#if defined(CRAY) && ! defined(CRAY2)
+webecray
+#else
+wenotbecray
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "webecray" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_os_cray=yes
+else
+  rm -rf conftest*
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_os_cray" 1>&6
+if test $ac_cv_os_cray = yes; then
+for ac_func in _getb67 GETB67 getb67; do
+  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:10777: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10782 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:10805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<EOF
+#define CRAY_STACKSEG_END $ac_func
+EOF
+
+  break
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+done
+fi
+
+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+echo "configure:10832: checking stack direction for C alloca" >&5
+if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_c_stack_direction=0
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10840 "configure"
+#include "confdefs.h"
+find_stack_direction ()
+{
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
+main ()
+{
+  exit (find_stack_direction() < 0);
+}
+EOF
+if { (eval echo configure:10859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_c_stack_direction=1
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_stack_direction=-1
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
+cat >> confdefs.h <<EOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+EOF
+
+fi
+
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:10067: checking for vfork.h" >&5
+echo "configure:10882: checking for vfork.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10072 "configure"
+#line 10887 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10098,18 +10913,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:10102: checking for working vfork" >&5
+echo "configure:10917: checking for working vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:10108: checking for vfork" >&5
+echo "configure:10923: checking for vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10113 "configure"
+#line 10928 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -10132,7 +10947,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vfork=yes"
 else
@@ -10154,7 +10969,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 10158 "configure"
+#line 10973 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -10249,7 +11064,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:10253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_vfork_works=yes
 else
@@ -10273,13 +11088,13 @@ fi
 
 
 echo $ac_n "checking if we should use fcntl or ioctl""... $ac_c" 1>&6
-echo "configure:10277: checking if we should use fcntl or ioctl" >&5
+echo "configure:11092: checking if we should use fcntl or ioctl" >&5
 if eval "test \"`echo '$''{'cf_cv_fionbio'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 10283 "configure"
+#line 11098 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10291,7 +11106,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:10295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_fionbio=ioctl
 else
@@ -10300,7 +11115,7 @@ else
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 10304 "configure"
+#line 11119 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10317,7 +11132,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:10321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_fionbio=fcntl
 else
@@ -10340,20 +11155,20 @@ EOF
 
 
 echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6
-echo "configure:10344: checking for broken/missing definition of remove" >&5
+echo "configure:11159: checking for broken/missing definition of remove" >&5
 if eval "test \"`echo '$''{'cf_cv_baddef_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 10350 "configure"
+#line 11165 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 remove("dummy")
 ; return 0; }
 EOF
-if { (eval echo configure:10357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_baddef_remove=no
 else
@@ -10361,7 +11176,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 10365 "configure"
+#line 11180 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); } 
@@ -10369,7 +11184,7 @@ int main() {
 remove("dummy")
 ; return 0; }
 EOF
-if { (eval echo configure:10373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_baddef_remove=yes
 else
@@ -10393,13 +11208,13 @@ EOF
 
 
 echo $ac_n "checking for lstat""... $ac_c" 1>&6
-echo "configure:10397: checking for lstat" >&5
+echo "configure:11212: checking for lstat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_lstat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 10403 "configure"
+#line 11218 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10408,7 +11223,7 @@ int main() {
 lstat(".", (struct stat *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:10412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_lstat=yes
 else
@@ -10436,8 +11251,8 @@ for ac_func in \
 	getgroups \
 	gettimeofday \
 	getuid \
-	mkstemp \
 	mktemp \
+	mkdtemp \
 	popen \
 	putenv \
 	readdir \
@@ -10451,12 +11266,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10455: checking for $ac_func" >&5
+echo "configure:11270: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10460 "configure"
+#line 11275 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10479,7 +11294,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10509,12 +11324,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10513: checking for $ac_func" >&5
+echo "configure:11328: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10518 "configure"
+#line 11333 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10537,7 +11352,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10566,18 +11381,18 @@ done
 
 
 echo $ac_n "checking for random-integer functions""... $ac_c" 1>&6
-echo "configure:10570: checking for random-integer functions" >&5
+echo "configure:11385: checking for random-integer functions" >&5
 if eval "test \"`echo '$''{'cf_cv_srand_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cf_cv_srand_func=unknown
-for cf_func in srand48/lrand48 srandom/random srand/rand
+for cf_func in srandom/random srand48/lrand48 srand/rand
 do
-	cf_srand_func=`echo $cf_func | sed -e 's@/.*@@'`
-	cf_rand_func=`echo  $cf_func | sed -e 's@.*/@@'`
+	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
+	cf_rand_func=`echo  $cf_func | sed -e 's%.*/%%'`
 cat > conftest.$ac_ext <<EOF
-#line 10581 "configure"
+#line 11396 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -10591,7 +11406,7 @@ int main() {
 long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
 ; return 0; }
 EOF
-if { (eval echo configure:10595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_srand_func=$cf_func
  break
@@ -10607,7 +11422,7 @@ fi
 echo "$ac_t""$cf_cv_srand_func" 1>&6
 if test "$cf_cv_srand_func" != unknown ; then
 	echo $ac_n "checking for range of random-integers""... $ac_c" 1>&6
-echo "configure:10611: checking for range of random-integers" >&5
+echo "configure:11426: checking for range of random-integers" >&5
 if eval "test \"`echo '$''{'cf_cv_rand_max'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10623,7 +11438,7 @@ else
 			;;
 		esac
 		cat > conftest.$ac_ext <<EOF
-#line 10627 "configure"
+#line 11442 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -10637,7 +11452,7 @@ int main() {
 long x = $cf_cv_rand_max
 ; return 0; }
 EOF
-if { (eval echo configure:10641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -10650,8 +11465,8 @@ rm -f conftest*
 fi
 
 echo "$ac_t""$cf_cv_rand_max" 1>&6
-	cf_srand_func=`echo $cf_func | sed -e 's@/.*@@'`
-	cf_rand_func=`echo  $cf_func | sed -e 's@.*/@@'`
+	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
+	cf_rand_func=`echo  $cf_func | sed -e 's%.*/%%'`
 	
 cf_rand_max=`echo "lynx_rand_max" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
@@ -10673,12 +11488,12 @@ for ac_func in strstr
 do
 
 echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6
-echo "configure:10677: checking for $ac_func declaration" >&5
+echo "configure:11492: checking for $ac_func declaration" >&5
 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10682 "configure"
+#line 11497 "configure"
 #include "confdefs.h"
 #include <string.h>
 int main() {
@@ -10687,11 +11502,11 @@ extern	int	${ac_func}();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 10695 "configure"
+#line 11510 "configure"
 #include "confdefs.h"
 #include <string.h>
 int main() {
@@ -10700,7 +11515,7 @@ int	(*p)() = ${ac_func};
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -10742,12 +11557,12 @@ for ac_func in getgrgid getgrnam
 do
 
 echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6
-echo "configure:10746: checking for $ac_func declaration" >&5
+echo "configure:11561: checking for $ac_func declaration" >&5
 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10751 "configure"
+#line 11566 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10758,11 +11573,11 @@ extern	int	${ac_func}();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 10766 "configure"
+#line 11581 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10773,7 +11588,7 @@ int	(*p)() = ${ac_func};
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -10815,13 +11630,13 @@ done
 
 
 echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6
-echo "configure:10819: checking if TRUE/FALSE are defined" >&5
+echo "configure:11634: checking if TRUE/FALSE are defined" >&5
 if eval "test \"`echo '$''{'cf_cv_bool_defs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 10825 "configure"
+#line 11640 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10830,7 +11645,7 @@ int main() {
 int x = TRUE, y = FALSE
 ; return 0; }
 EOF
-if { (eval echo configure:10834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_bool_defs=yes
 else
@@ -10857,13 +11672,13 @@ fi
 
 
 echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6
-echo "configure:10861: checking if external errno is declared" >&5
+echo "configure:11676: checking if external errno is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 10867 "configure"
+#line 11682 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -10876,27 +11691,24 @@ int main() {
 long x = (long) errno
 ; return 0; }
 EOF
-if { (eval echo configure:10880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval 'cf_cv_dcl_'errno'=yes'
+  cf_cv_dcl_errno=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval 'cf_cv_dcl_'errno'=no'
+  cf_cv_dcl_errno=no
 fi
 rm -f conftest*
 
 fi
 
+echo "$ac_t""$cf_cv_dcl_errno" 1>&6
 
-eval 'cf_result=$cf_cv_dcl_'errno
-echo "$ac_t""$cf_result" 1>&6
-
-if test "$cf_result" = no ; then
-    eval 'cf_result=DECL_'errno
+if test "$cf_cv_dcl_errno" = no ; then
     
-cf_result=`echo "$cf_result" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+cf_result=`echo "decl_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
     cat >> confdefs.h <<EOF
 #define $cf_result 1
@@ -10907,13 +11719,13 @@ fi
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 echo $ac_n "checking if external errno exists""... $ac_c" 1>&6
-echo "configure:10911: checking if external errno exists" >&5
+echo "configure:11723: checking if external errno exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 10917 "configure"
+#line 11729 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -10923,26 +11735,24 @@ int main() {
 errno = 2
 ; return 0; }
 EOF
-if { (eval echo configure:10927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval 'cf_cv_have_'errno'=yes'
+  cf_cv_have_errno=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval 'cf_cv_have_'errno'=no'
+  cf_cv_have_errno=no
 fi
 rm -f conftest*
-fi
 
+fi
 
-eval 'cf_result=$cf_cv_have_'errno
-echo "$ac_t""$cf_result" 1>&6
+echo "$ac_t""$cf_cv_have_errno" 1>&6
 
-if test "$cf_result" = yes ; then
-    eval 'cf_result=HAVE_'errno
+if test "$cf_cv_have_errno" = yes ; then
     
-cf_result=`echo "$cf_result" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+cf_result=`echo "have_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
     cat >> confdefs.h <<EOF
 #define $cf_result 1
@@ -10955,21 +11765,21 @@ fi
 
 
 echo $ac_n "checking if we can set errno""... $ac_c" 1>&6
-echo "configure:10959: checking if we can set errno" >&5
+echo "configure:11769: checking if we can set errno" >&5
 if eval "test \"`echo '$''{'cf_cv_set_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 if test "$cross_compiling" = yes; then
   cat > conftest.$ac_ext <<EOF
-#line 10966 "configure"
+#line 11776 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int main() {
 errno = 255
 ; return 0; }
 EOF
-if { (eval echo configure:10973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_set_errno=maybe
 else
@@ -10981,7 +11791,7 @@ fi
 rm -f conftest*
 else
   cat > conftest.$ac_ext <<EOF
-#line 10985 "configure"
+#line 11795 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -10991,7 +11801,7 @@ int main()
 	exit(errno != 255);
 }
 EOF
-if { (eval echo configure:10995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_set_errno=yes
 else
@@ -11014,20 +11824,20 @@ EOF
 
 
 echo $ac_n "checking for setlocale()""... $ac_c" 1>&6
-echo "configure:11018: checking for setlocale()" >&5
+echo "configure:11828: checking for setlocale()" >&5
 if eval "test \"`echo '$''{'cf_cv_locale'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 11024 "configure"
+#line 11834 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 setlocale(LC_ALL, "")
 ; return 0; }
 EOF
-if { (eval echo configure:11031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_locale=yes
 else
@@ -11041,20 +11851,20 @@ rm -f conftest*
 fi
 
 echo "$ac_t""$cf_cv_locale" 1>&6
-test $cf_cv_locale = yes && cat >> confdefs.h <<\EOF
+test $cf_cv_locale = yes && { cat >> confdefs.h <<\EOF
 #define LOCALE 1
 EOF
-
+ }
 
 
 echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6
-echo "configure:11052: checking if NGROUPS is defined" >&5
+echo "configure:11862: checking if NGROUPS is defined" >&5
 if eval "test \"`echo '$''{'cf_cv_ngroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 11058 "configure"
+#line 11868 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -11068,7 +11878,7 @@ int main() {
 int x = NGROUPS
 ; return 0; }
 EOF
-if { (eval echo configure:11072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ngroups=yes
 else
@@ -11076,7 +11886,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 11080 "configure"
+#line 11890 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -11090,7 +11900,7 @@ int main() {
 int x = NGROUPS_MAX
 ; return 0; }
 EOF
-if { (eval echo configure:11094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -11104,6 +11914,9 @@ rm -f conftest*
 fi
 rm -f conftest*
 echo "$ac_t""$cf_cv_ngroups" 1>&6
+
+fi
+
 if test "$cf_cv_ngroups" = no ; then
 	cat >> confdefs.h <<\EOF
 #define NGROUPS 16
@@ -11116,21 +11929,108 @@ EOF
 
 fi
 
+
+    
+echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6
+echo "configure:11936: checking if external sys_nerr is declared" >&5
+if eval "test \"`echo '$''{'cf_cv_dcl_sys_nerr'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    cat > conftest.$ac_ext <<EOF
+#line 11942 "configure"
+#include "confdefs.h"
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <stdio.h>
+#include <sys/types.h>
+#include <errno.h> 
+int main() {
+long x = (long) sys_nerr
+; return 0; }
+EOF
+if { (eval echo configure:11955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_dcl_sys_nerr=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_dcl_sys_nerr=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_dcl_sys_nerr" 1>&6
+
+if test "$cf_cv_dcl_sys_nerr" = no ; then
+    
+cf_result=`echo "decl_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+    cat >> confdefs.h <<EOF
+#define $cf_result 1
+EOF
+
+fi
+
+# It's possible (for near-UNIX clones) that the data doesn't exist
+
+echo $ac_n "checking if external sys_nerr exists""... $ac_c" 1>&6
+echo "configure:11983: checking if external sys_nerr exists" >&5
+if eval "test \"`echo '$''{'cf_cv_have_sys_nerr'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    cat > conftest.$ac_ext <<EOF
+#line 11989 "configure"
+#include "confdefs.h"
+
+#undef sys_nerr
+extern int sys_nerr;
+
+int main() {
+sys_nerr = 2
+; return 0; }
+EOF
+if { (eval echo configure:11999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_cv_have_sys_nerr=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_have_sys_nerr=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_have_sys_nerr" 1>&6
+
+if test "$cf_cv_have_sys_nerr" = yes ; then
+    
+cf_result=`echo "have_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+    cat >> confdefs.h <<EOF
+#define $cf_result 1
+EOF
+
 fi
 
 
 
-for cf_name in sys_nerr sys_errlist
-do
     
-echo $ac_n "checking if external $cf_name is declared""... $ac_c" 1>&6
-echo "configure:11128: checking if external $cf_name is declared" >&5
-if eval "test \"`echo '$''{'cf_cv_dcl_$cf_name'+set}'`\" = set"; then
+echo $ac_n "checking if external sys_errlist is declared""... $ac_c" 1>&6
+echo "configure:12028: checking if external sys_errlist is declared" >&5
+if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 11134 "configure"
+#line 12034 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -11140,30 +12040,27 @@ else
 #include <sys/types.h>
 #include <errno.h> 
 int main() {
-long x = (long) $cf_name
+long x = (long) sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:11147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval 'cf_cv_dcl_'$cf_name'=yes'
+  cf_cv_dcl_sys_errlist=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval 'cf_cv_dcl_'$cf_name'=no'
+  cf_cv_dcl_sys_errlist=no
 fi
 rm -f conftest*
 
 fi
 
+echo "$ac_t""$cf_cv_dcl_sys_errlist" 1>&6
 
-eval 'cf_result=$cf_cv_dcl_'$cf_name
-echo "$ac_t""$cf_result" 1>&6
-
-if test "$cf_result" = no ; then
-    eval 'cf_result=DECL_'$cf_name
+if test "$cf_cv_dcl_sys_errlist" = no ; then
     
-cf_result=`echo "$cf_result" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+cf_result=`echo "decl_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
     cat >> confdefs.h <<EOF
 #define $cf_result 1
@@ -11173,43 +12070,41 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo $ac_n "checking if external $cf_name exists""... $ac_c" 1>&6
-echo "configure:11178: checking if external $cf_name exists" >&5
-if eval "test \"`echo '$''{'cf_cv_have_$cf_name'+set}'`\" = set"; then
+echo $ac_n "checking if external sys_errlist exists""... $ac_c" 1>&6
+echo "configure:12075: checking if external sys_errlist exists" >&5
+if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 11184 "configure"
+#line 12081 "configure"
 #include "confdefs.h"
 
-#undef $cf_name
-extern int $cf_name;
+#undef sys_errlist
+extern int sys_errlist;
 
 int main() {
-$cf_name = 2
+sys_errlist = 2
 ; return 0; }
 EOF
-if { (eval echo configure:11194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval 'cf_cv_have_'$cf_name'=yes'
+  cf_cv_have_sys_errlist=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval 'cf_cv_have_'$cf_name'=no'
+  cf_cv_have_sys_errlist=no
 fi
 rm -f conftest*
-fi
 
+fi
 
-eval 'cf_result=$cf_cv_have_'$cf_name
-echo "$ac_t""$cf_result" 1>&6
+echo "$ac_t""$cf_cv_have_sys_errlist" 1>&6
 
-if test "$cf_result" = yes ; then
-    eval 'cf_result=HAVE_'$cf_name
+if test "$cf_cv_have_sys_errlist" = yes ; then
     
-cf_result=`echo "$cf_result" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+cf_result=`echo "have_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
     cat >> confdefs.h <<EOF
 #define $cf_result 1
@@ -11219,24 +12114,23 @@ fi
 
 
 
-done
 
 
 for ac_hdr in lastlog.h paths.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11230: checking for $ac_hdr" >&5
+echo "configure:12124: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11235 "configure"
+#line 12129 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11263,13 +12157,13 @@ fi
 done
 
 echo $ac_n "checking for lastlog path""... $ac_c" 1>&6
-echo "configure:11267: checking for lastlog path" >&5
+echo "configure:12161: checking for lastlog path" >&5
 if eval "test \"`echo '$''{'cf_cv_path_lastlog'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 11273 "configure"
+#line 12167 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11284,7 +12178,7 @@ int main() {
 char *path = _PATH_LASTLOG
 ; return 0; }
 EOF
-if { (eval echo configure:11288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -11311,31 +12205,32 @@ EOF
 
 
 echo $ac_n "checking for utmp implementation""... $ac_c" 1>&6
-echo "configure:11315: checking for utmp implementation" >&5
+echo "configure:12209: checking for utmp implementation" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cf_cv_have_utmp=no
 for cf_header in utmpx utmp ; do
-	cat > conftest.$ac_ext <<EOF
-#line 11323 "configure"
-#include "confdefs.h"
-
+cf_utmp_includes="
 #include <sys/types.h>
 #include <${cf_header}.h>
 #define getutent getutxent
 #ifdef USE_LASTLOG
 #include <lastlog.h>	/* may conflict with utmpx.h on Linux */
 #endif
-
+"
+	cat > conftest.$ac_ext <<EOF
+#line 12225 "configure"
+#include "confdefs.h"
+$cf_utmp_includes
 int main() {
 struct $cf_header x;
 	 char *name = x.ut_name; /* utmp.h and compatible definitions */
 	
 ; return 0; }
 EOF
-if { (eval echo configure:11339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=$cf_header
 	 break
@@ -11345,29 +12240,18 @@ else
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 11349 "configure"
+#line 12244 "configure"
 #include "confdefs.h"
-
-#include <sys/types.h>
-#include <${cf_header}.h>
-#define getutent getutxent
-#ifdef USE_LASTLOG
-#include <lastlog.h>	/* may conflict with utmpx.h on Linux */
-#endif
-
+$cf_utmp_includes
 int main() {
 struct $cf_header x;
 	 char *name = x.ut_user; /* utmpx.h must declare this */
 	
 ; return 0; }
 EOF
-if { (eval echo configure:11365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp=$cf_header
-	 cat >> confdefs.h <<\EOF
-#define ut_name ut_user
-EOF
-
 	 break
 	
 else
@@ -11393,16 +12277,15 @@ EOF
 EOF
 
 	
-
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking if utmp.ut_host is declared""... $ac_c" 1>&6
-echo "configure:11400: checking if utmp.ut_host is declared" >&5
+echo "configure:12283: checking if utmp.ut_host is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_host'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 11406 "configure"
+#line 12289 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11411,7 +12294,7 @@ int main() {
 struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 ; return 0; }
 EOF
-if { (eval echo configure:11415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_host=yes
 else
@@ -11432,10 +12315,65 @@ EOF
 fi
 
 	
+if test $cf_cv_have_utmp != no ; then
+echo $ac_n "checking if utmp.ut_name is declared""... $ac_c" 1>&6
+echo "configure:12321: checking if utmp.ut_name is declared" >&5
+if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_name'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	cf_cv_have_utmp_ut_name=no
+cf_utmp_includes="
+#include <sys/types.h>
+#include <${cf_cv_have_utmp}.h>
+#define getutent getutxent
+#ifdef USE_LASTLOG
+#include <lastlog.h>		/* may conflict with utmpx.h on Linux */
+#endif
+"
+for cf_header in ut_name ut_user ; do
+	cat > conftest.$ac_ext <<EOF
+#line 12337 "configure"
+#include "confdefs.h"
+$cf_utmp_includes
+int main() {
+struct $cf_cv_have_utmp x;
+	 char *name = x.$cf_header;
+	
+; return 0; }
+EOF
+if { (eval echo configure:12346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_have_utmp_ut_name=$cf_header
+	 break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+
+fi
+
+echo "$ac_t""$cf_cv_have_utmp_ut_name" 1>&6
 
+case $cf_cv_have_utmp_ut_name in #(vi
+no) #(vi
+	{ echo "configure: error: Cannot find declaration for ut.ut_name" 1>&2; exit 1; }
+	;;
+ut_user)
+	cat >> confdefs.h <<\EOF
+#define ut_name ut_user
+EOF
+
+	;;
+esac
+fi
+
+	
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking for exit-status in $cf_cv_have_utmp""... $ac_c" 1>&6
-echo "configure:11439: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "configure:12377: checking for exit-status in $cf_cv_have_utmp" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xstatus'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11447,7 +12385,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat > conftest.$ac_ext <<EOF
-#line 11451 "configure"
+#line 12389 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11456,7 +12394,7 @@ int main() {
 struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 ; return 0; }
 EOF
-if { (eval echo configure:11460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -11485,16 +12423,15 @@ fi
 fi
 
 	
-
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking if utmp.ut_xtime is declared""... $ac_c" 1>&6
-echo "configure:11492: checking if utmp.ut_xtime is declared" >&5
+echo "configure:12429: checking if utmp.ut_xtime is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xtime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 11498 "configure"
+#line 12435 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11503,7 +12440,7 @@ int main() {
 struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 ; return 0; }
 EOF
-if { (eval echo configure:11507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_xtime=yes
 else
@@ -11511,7 +12448,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 11515 "configure"
+#line 12452 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11520,7 +12457,7 @@ int main() {
 struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
 ; return 0; }
 EOF
-if { (eval echo configure:11524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -11552,16 +12489,15 @@ fi
 fi
 
 	
-
 if test $cf_cv_have_utmp != no ; then
 echo $ac_n "checking if utmp.ut_session is declared""... $ac_c" 1>&6
-echo "configure:11559: checking if utmp.ut_session is declared" >&5
+echo "configure:12495: checking if utmp.ut_session is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_session'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 11565 "configure"
+#line 12501 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11570,7 +12506,7 @@ int main() {
 struct $cf_cv_have_utmp x; long y = x.ut_session
 ; return 0; }
 EOF
-if { (eval echo configure:11574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_have_utmp_ut_session=yes
 else
@@ -11593,16 +12529,15 @@ fi
 fi
 
 	
-
 echo $ac_n "checking if $cf_cv_have_utmp is SYSV flavor""... $ac_c" 1>&6
-echo "configure:11599: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "configure:12534: checking if $cf_cv_have_utmp is SYSV flavor" >&5
 if eval "test \"`echo '$''{'cf_cv_sysv_utmp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat > conftest.$ac_ext <<EOF
-#line 11606 "configure"
+#line 12541 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11616,7 +12551,7 @@ struct $cf_cv_have_utmp x;
 	end${cf_prefix}ent();
 ; return 0; }
 EOF
-if { (eval echo configure:11620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_sysv_utmp=yes
 else
@@ -11639,13 +12574,13 @@ fi
 
 
 echo $ac_n "checking if external h_errno exists""... $ac_c" 1>&6
-echo "configure:11643: checking if external h_errno exists" >&5
+echo "configure:12578: checking if external h_errno exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_h_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 11649 "configure"
+#line 12584 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -11655,26 +12590,24 @@ int main() {
 h_errno = 2
 ; return 0; }
 EOF
-if { (eval echo configure:11659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval 'cf_cv_have_'h_errno'=yes'
+  cf_cv_have_h_errno=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval 'cf_cv_have_'h_errno'=no'
+  cf_cv_have_h_errno=no
 fi
 rm -f conftest*
-fi
 
+fi
 
-eval 'cf_result=$cf_cv_have_'h_errno
-echo "$ac_t""$cf_result" 1>&6
+echo "$ac_t""$cf_cv_have_h_errno" 1>&6
 
-if test "$cf_result" = yes ; then
-    eval 'cf_result=HAVE_'h_errno
+if test "$cf_cv_have_h_errno" = yes ; then
     
-cf_result=`echo "$cf_result" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+cf_result=`echo "have_h_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
     cat >> confdefs.h <<EOF
 #define $cf_result 1
@@ -11684,643 +12617,11 @@ fi
 
 
 
-### These tests must be run after establishing the curses library.
-if test $cf_cv_screen != slang ; then
-	if test $cf_cv_screen != pdcurses ; then
-		for ac_hdr in ncurses/term.h term.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11695: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11700 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-	fi
-	
-echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6
-echo "configure:11734: checking if curses supports alternate-character set" >&5
-if eval "test \"`echo '$''{'cf_cv_alt_char_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-for mapname in acs_map _acs_map
-do
-	cat > conftest.$ac_ext <<EOF
-#line 11742 "configure"
-#include "confdefs.h"
-
-#include <${cf_cv_ncurses_header-curses.h}>
-	
-int main() {
-chtype x = $mapname['l']; $mapname['m'] = 0
-; return 0; }
-EOF
-if { (eval echo configure:11751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  cf_cv_alt_char_set=$mapname
-	 break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cf_cv_alt_char_set=no
-fi
-rm -f conftest*
-done
-	
-fi
-
-echo "$ac_t""$cf_cv_alt_char_set" 1>&6
-test $cf_cv_alt_char_set != no && cat >> confdefs.h <<EOF
-#define ALT_CHAR_SET $cf_cv_alt_char_set
-EOF
-
-
-	
-echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6
-echo "configure:11774: checking if curses supports fancy attributes" >&5
-if eval "test \"`echo '$''{'cf_cv_fancy_curses'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-	cat > conftest.$ac_ext <<EOF
-#line 11780 "configure"
-#include "confdefs.h"
-
-#include <${cf_cv_ncurses_header-curses.h}>
-
-int main() {
-attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
-	 wattrset(stdscr, A_BLINK|A_DIM);
-	 attroff(A_BOLD);
-	 keypad(stdscr,TRUE);
-	
-; return 0; }
-EOF
-if { (eval echo configure:11793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  cf_cv_fancy_curses=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cf_cv_fancy_curses=no
-fi
-rm -f conftest*
-	
-fi
-
-echo "$ac_t""$cf_cv_fancy_curses" 1>&6
-test $cf_cv_fancy_curses = yes && cat >> confdefs.h <<\EOF
-#define FANCY_CURSES 1
-EOF
-
-
-	
-
-if test "$cf_cv_ncurses_version" != no ; then
-echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6
-echo "configure:11816: checking for obsolete/broken version of ncurses" >&5
-if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 11822 "configure"
-#include "confdefs.h"
-
-#include <${cf_cv_ncurses_header-curses.h}>
-int main() {
-
-#if defined(NCURSES_VERSION) && defined(wgetbkgd)
-	make an error
-#else
-	int x = 1
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:11836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  cf_cv_ncurses_broken=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cf_cv_ncurses_broken=yes
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$cf_cv_ncurses_broken" 1>&6
-if test "$cf_cv_ncurses_broken" = yes ; then
-	echo "configure: warning: hmm... you should get an up-to-date version of ncurses" 1>&2
-	cat >> confdefs.h <<\EOF
-#define NCURSES_BROKEN 1
-EOF
-
-fi
-fi
-
-	
-echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6
-echo "configure:11861: checking if curses supports color attributes" >&5
-if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-	cat > conftest.$ac_ext <<EOF
-#line 11867 "configure"
-#include "confdefs.h"
-
-#include <${cf_cv_ncurses_header-curses.h}>
-
-int main() {
-chtype x = COLOR_BLUE;
-	 has_colors();
-	 start_color();
-#ifndef NCURSES_BROKEN
-	 wbkgd(curscr, getbkgd(stdscr)); /* X/Open XPG4 aka SVr4 Curses */
-#endif
-	
-; return 0; }
-EOF
-if { (eval echo configure:11882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  cf_cv_color_curses=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cf_cv_color_curses=no
-fi
-rm -f conftest*
-	
-fi
-
-echo "$ac_t""$cf_cv_color_curses" 1>&6
-if test $cf_cv_color_curses = yes ; then
-	cat >> confdefs.h <<\EOF
-#define COLOR_CURSES 1
-EOF
-
-	test ".$cf_cv_ncurses_broken" != .yes && cat >> confdefs.h <<\EOF
-#define HAVE_GETBKGD 1
-EOF
-
-fi
-
-	
-for ac_hdr in \
-termio.h \
-termios.h \
-unistd.h \
-
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11916: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11921 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-if test "$ISC" = yes ; then
-	for ac_hdr in sys/termio.h 
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11957: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11962 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-fi
-if test "$ac_cv_header_termios_h" = yes ; then
-	case "$CFLAGS $CPPFLAGS" in
-	*-D_POSIX_SOURCE*)
-		termios_bad=dunno ;;
-	*)	termios_bad=maybe ;;
-	esac
-	if test "$termios_bad" = maybe ; then
-	echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6
-echo "configure:12002: checking whether termios.h needs _POSIX_SOURCE" >&5
-	cat > conftest.$ac_ext <<EOF
-#line 12004 "configure"
-#include "confdefs.h"
-#include <termios.h>
-int main() {
-struct termios foo; int x = foo.c_iflag
-; return 0; }
-EOF
-if { (eval echo configure:12011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  termios_bad=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-		cat > conftest.$ac_ext <<EOF
-#line 12020 "configure"
-#include "confdefs.h"
-
-#define _POSIX_SOURCE
-#include <termios.h>
-int main() {
-struct termios foo; int x = foo.c_iflag
-; return 0; }
-EOF
-if { (eval echo configure:12029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  termios_bad=unknown
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  termios_bad=yes cat >> confdefs.h <<\EOF
-#define SVR4_TERMIO 1
-EOF
-
-fi
-rm -f conftest*
-			
-fi
-rm -f conftest*
-	echo "$ac_t""$termios_bad" 1>&6
-	fi
-fi
-
-
-
-echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6
-echo "configure:12052: checking declaration of size-change" >&5
-if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cf_cv_sizechange=unknown
-    cf_save_CPPFLAGS="$CPPFLAGS"
-
-for cf_opts in "" "NEED_PTEM_H"
-do
-
-    CPPFLAGS="$cf_save_CPPFLAGS"
-    test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
-    cat > conftest.$ac_ext <<EOF
-#line 12066 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#else
-#ifdef HAVE_TERMIO_H
-#include <termio.h>
-#endif
-#endif
-#ifdef NEED_PTEM_H
-/* This is a workaround for SCO:  they neglected to define struct winsize in
- * termios.h -- it's only in termio.h and ptem.h
- */
-#include        <sys/stream.h>
-#include        <sys/ptem.h>
-#endif
-#if !defined(sun) || !defined(HAVE_TERMIOS_H)
-#include <sys/ioctl.h>
-#endif
-
-int main() {
-
-#ifdef TIOCGSIZE
-	struct ttysize win;	/* FIXME: what system is this? */
-	int y = win.ts_lines;
-	int x = win.ts_cols;
-#else
-#ifdef TIOCGWINSZ
-	struct winsize win;
-	int y = win.ws_row;
-	int x = win.ws_col;
-#else
-	no TIOCGSIZE or TIOCGWINSZ
-#endif /* TIOCGWINSZ */
-#endif /* TIOCGSIZE */
-	
-; return 0; }
-EOF
-if { (eval echo configure:12105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  cf_cv_sizechange=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cf_cv_sizechange=no
-fi
-rm -f conftest*
-
-	CPPFLAGS="$cf_save_CPPFLAGS"
-	if test "$cf_cv_sizechange" = yes ; then
-		echo "size-change succeeded ($cf_opts)" >&5
-		test -n "$cf_opts" && cf_cv_sizechange="$cf_opts"
-		break
-	fi
-done
-
-fi
-
-echo "$ac_t""$cf_cv_sizechange" 1>&6
-if test "$cf_cv_sizechange" != no ; then
-	cat >> confdefs.h <<\EOF
-#define HAVE_SIZECHANGE 1
-EOF
-
-	case $cf_cv_sizechange in #(vi
-	NEED*)
-		cat >> confdefs.h <<EOF
-#define $cf_cv_sizechange  1
-EOF
-
-		;;
-	esac
-fi
-
-	
-echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6
-echo "configure:12144: checking if ttytype is declared in curses library" >&5
-if eval "test \"`echo '$''{'cf_cv_have_ttytype'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-	cat > conftest.$ac_ext <<EOF
-#line 12150 "configure"
-#include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
-int main() {
-char *x = &ttytype[1]; *x = 1
-; return 0; }
-EOF
-if { (eval echo configure:12157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  cf_cv_have_ttytype=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cf_cv_have_ttytype=no
-fi
-rm -f conftest*
-	
-fi
-
-echo "$ac_t""$cf_cv_have_ttytype" 1>&6
-test $cf_cv_have_ttytype = yes && cat >> confdefs.h <<\EOF
-#define HAVE_TTYTYPE 1
-EOF
-
-
-	
-echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6
-echo "configure:12178: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-cat > conftest.$ac_ext <<EOF
-#line 12184 "configure"
-#include "confdefs.h"
-
-#include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>
-int main() {
-
-	long x = winnstr(stdscr, "", 0)
-; return 0; }
-EOF
-if { (eval echo configure:12194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  cf_cv_need_xopen_extension=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat > conftest.$ac_ext <<EOF
-#line 12202 "configure"
-#include "confdefs.h"
-
-#define _XOPEN_SOURCE_EXTENDED
-#include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>
-int main() {
-
-	long x = winnstr(stdscr, "", 0)
-; return 0; }
-EOF
-if { (eval echo configure:12213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  cf_cv_need_xopen_extension=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cf_cv_need_xopen_extension=no
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$cf_cv_need_xopen_extension" 1>&6
-test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
-
-
-
-for cf_func in \
-		assume_default_colors \
-		cbreak \
-		define_key \
-		delscreen \
-		getattrs \
-		getbegx \
-		getbegy \
-		keypad \
-		napms \
-		newpad \
-		newterm \
-		pnoutrefresh \
-		wresize resizeterm \
-		touchline \
-		touchwin \
-		use_default_colors \
-		wborder \
-		wredrawln 
-do
-	
-cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-
-	echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6
-echo "configure:12256: checking for ${cf_func}" >&5
-	
-echo "(line 12258) testing ${cf_func} ..." 1>&5
-
-	if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-		eval cf_result='$ac_cv_func_'$cf_func
-		if test ".$cf_result" != ".no"; then
-			cat > conftest.$ac_ext <<EOF
-#line 12267 "configure"
-#include "confdefs.h"
-
-#ifdef HAVE_XCURSES
-#include <xcurses.h>
-char * XCursesProgramName = "test";
-#else
-#include <${cf_cv_ncurses_header-curses.h}>
-#if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
-#include <ncurses/term.h>
-#else
-#ifdef HAVE_TERM_H
-#include <term.h>
-#endif
-#endif
-#endif
-int main() {
-
-#ifndef ${cf_func}
-long foo = (long)(&${cf_func});
-exit(foo == 0);
-#endif
-			
-; return 0; }
-EOF
-if { (eval echo configure:12292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  cf_result=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cf_result=no
-fi
-rm -f conftest*
-		fi
-		eval 'cf_cv_func_'$cf_func'=$cf_result'
-	
-fi
-
-	# use the computed/retrieved cache-value:
-	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$ac_t""$cf_result" 1>&6
-	if test $cf_result != no; then
-		cat >> confdefs.h <<EOF
-#define HAVE_${cf_tr_func} 1
-EOF
-
-	fi
-done
-
-fi
-
 
 
 
 echo $ac_n "checking if bibp: URLs should be supported""... $ac_c" 1>&6
-echo "configure:12324: checking if bibp: URLs should be supported" >&5
+echo "configure:12625: checking if bibp: URLs should be supported" >&5
 
 # Check whether --enable-bibp-urls or --disable-bibp-urls was given.
 if test "${enable_bibp_urls+set}" = set; then
@@ -12344,7 +12645,7 @@ EOF
 
 
 echo $ac_n "checking if configuration info should be browsable""... $ac_c" 1>&6
-echo "configure:12348: checking if configuration info should be browsable" >&5
+echo "configure:12649: checking if configuration info should be browsable" >&5
 
 # Check whether --enable-config-info or --disable-config-info was given.
 if test "${enable_config_info+set}" = set; then
@@ -12368,7 +12669,7 @@ EOF
 
 
 echo $ac_n "checking if new-style forms-based options screen should be used""... $ac_c" 1>&6
-echo "configure:12372: checking if new-style forms-based options screen should be used" >&5
+echo "configure:12673: checking if new-style forms-based options screen should be used" >&5
 
 # Check whether --enable-forms-options or --disable-forms-options was given.
 if test "${enable_forms_options+set}" = set; then
@@ -12392,7 +12693,7 @@ EOF
 
 
 echo $ac_n "checking if old-style options menu should be used""... $ac_c" 1>&6
-echo "configure:12396: checking if old-style options menu should be used" >&5
+echo "configure:12697: checking if old-style options menu should be used" >&5
 
 # Check whether --enable-menu-options or --disable-menu-options was given.
 if test "${enable_menu_options+set}" = set; then
@@ -12416,7 +12717,7 @@ EOF
 
 
 echo $ac_n "checking if experimental address-list page should be used""... $ac_c" 1>&6
-echo "configure:12420: checking if experimental address-list page should be used" >&5
+echo "configure:12721: checking if experimental address-list page should be used" >&5
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
 if test "${enable_addrlist_page+set}" = set; then
@@ -12440,7 +12741,7 @@ EOF
 
 
 echo $ac_n "checking if experimental charset-selection logic should be used""... $ac_c" 1>&6
-echo "configure:12444: checking if experimental charset-selection logic should be used" >&5
+echo "configure:12745: checking if experimental charset-selection logic should be used" >&5
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
 if test "${enable_charset_choice+set}" = set; then
@@ -12464,7 +12765,7 @@ EOF
 
 
 echo $ac_n "checking if experimental CJK logic should be used""... $ac_c" 1>&6
-echo "configure:12468: checking if experimental CJK logic should be used" >&5
+echo "configure:12769: checking if experimental CJK logic should be used" >&5
 
 # Check whether --enable-cjk or --disable-cjk was given.
 if test "${enable_cjk+set}" = set; then
@@ -12488,7 +12789,7 @@ EOF
 
 
 echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6
-echo "configure:12492: checking if color-style code should be used" >&5
+echo "configure:12793: checking if color-style code should be used" >&5
 
 # Check whether --enable-color-style or --disable-color-style was given.
 if test "${enable_color_style+set}" = set; then
@@ -12506,15 +12807,6 @@ else
 fi
 
 
-if test $use_color_style != no ; then
-	if test .$cf_cv_color_curses != .yes ; then
-		{ echo "configure: error: Configuration does not support color-styles" 1>&2; exit 1; }
-	fi
-	if test $cf_cv_screen = slang ; then
-		{ echo "configure: error: Configuration does not support color-styles" 1>&2; exit 1; }
-	fi
-fi
-
 case $use_color_style in
 no)
 	echo "$ac_t""no" 1>&6
@@ -12528,7 +12820,7 @@ EOF
 	echo "$ac_t""yes" 1>&6
 
 	echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6
-echo "configure:12532: checking for location of style-sheet file" >&5
+echo "configure:12824: checking for location of style-sheet file" >&5
 	LYNX_LSS_FILE=$cf_libdir/lynx.lss
 	cat >> confdefs.h <<EOF
 #define LYNX_LSS_FILE "$LYNX_LSS_FILE"
@@ -12541,12 +12833,15 @@ esac
 
 
 use_dft_colors=no
-test ".$cf_cv_screen" = ".slang"                && use_dft_colors=maybe
-test ".$cf_cv_func_use_default_colors" = ".yes" && use_dft_colors=maybe
+case $cf_cv_screen in
+slang|ncurses*)
+	use_dft_colors=maybe
+	;;
+esac
 
 if test "$use_dft_colors" != no ; then
 echo $ac_n "checking if you want to use default-colors""... $ac_c" 1>&6
-echo "configure:12550: checking if you want to use default-colors" >&5
+echo "configure:12845: checking if you want to use default-colors" >&5
 
 # Check whether --enable-default-colors or --disable-default-colors was given.
 if test "${enable_default_colors+set}" = set; then
@@ -12570,32 +12865,8 @@ EOF
 
 fi
 
-echo $ac_n "checking if experimental file-upload logic should be used""... $ac_c" 1>&6
-echo "configure:12575: checking if experimental file-upload logic should be used" >&5
-
-# Check whether --enable-file-upload or --disable-file-upload was given.
-if test "${enable_file_upload+set}" = set; then
-  enableval="$enable_file_upload"
-  test "$enableval" != yes && enableval=no
-  if test "$enableval" != "no" ; then
-    use_file_upload=$enableval 
-  else
-    use_file_upload=no
-  fi
-else
-  enableval=no 
-  use_file_upload=no
-  
-fi
-
-echo "$ac_t""$use_file_upload" 1>&6
-test $use_file_upload != no && cat >> confdefs.h <<\EOF
-#define EXP_FILE_UPLOAD 1
-EOF
-
-
 echo $ac_n "checking if experimental htmlized lynx.cfg should be built""... $ac_c" 1>&6
-echo "configure:12599: checking if experimental htmlized lynx.cfg should be built" >&5
+echo "configure:12870: checking if experimental htmlized lynx.cfg should be built" >&5
 
 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
 if test "${enable_htmlized_cfg+set}" = set; then
@@ -12625,7 +12896,7 @@ fi
 
 ### check for ipv6 support
 echo $ac_n "checking whether to enable ipv6""... $ac_c" 1>&6
-echo "configure:12629: checking whether to enable ipv6" >&5
+echo "configure:12900: checking whether to enable ipv6" >&5
 
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
 if test "${enable_ipv6+set}" = set; then
@@ -12646,7 +12917,7 @@ if test "$enableval" = "yes"; then
 	
 
 echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6
-echo "configure:12650: checking ipv6 stack type" >&5
+echo "configure:12921: checking ipv6 stack type" >&5
 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -12666,9 +12937,9 @@ do
 		;;
 	inria) #(vi
 				cat > conftest.$ac_ext <<EOF
-#line 12670 "configure"
+#line 12941 "configure"
 #include "confdefs.h"
-dnl
+
 #include <netinet/in.h>
 #ifdef IPV6_INRIA_VERSION
 yes
@@ -12684,9 +12955,9 @@ rm -f conftest*
 		;;
 	kame) #(vi
 				cat > conftest.$ac_ext <<EOF
-#line 12688 "configure"
+#line 12959 "configure"
 #include "confdefs.h"
-dnl
+
 #include <netinet/in.h>
 #ifdef __KAME__
 yes
@@ -12702,9 +12973,9 @@ rm -f conftest*
 		;;
 	linux-glibc) #(vi
 				cat > conftest.$ac_ext <<EOF
-#line 12706 "configure"
+#line 12977 "configure"
 #include "confdefs.h"
-dnl
+
 #include <features.h>
 #if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
 yes
@@ -12729,9 +13000,9 @@ rm -f conftest*
 		;;
 	toshiba) #(vi
 		cat > conftest.$ac_ext <<EOF
-#line 12733 "configure"
+#line 13004 "configure"
 #include "confdefs.h"
-dnl
+
 #include <sys/param.h>
 #ifdef _TOSHIBA_INET6
 yes
@@ -12747,9 +13018,9 @@ rm -f conftest*
 		;;
 	v6d) #(vi
 		cat > conftest.$ac_ext <<EOF
-#line 12751 "configure"
+#line 13022 "configure"
 #include "confdefs.h"
-dnl
+
 #include </usr/local/v6/include/sys/v6config.h>
 #ifdef __V6D__
 yes
@@ -12765,9 +13036,9 @@ rm -f conftest*
 		;;
 	zeta)
 		cat > conftest.$ac_ext <<EOF
-#line 12769 "configure"
+#line 13040 "configure"
 #include "confdefs.h"
-dnl
+
 #include <sys/param.h>
 #ifdef _ZETA_MINAMI_INET6
 yes
@@ -12797,8 +13068,8 @@ echo "$ac_t""$cf_cv_ipv6type" 1>&6
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo $ac_n "checking for ipv6 library if required""... $ac_c" 1>&6
-echo "configure:12802: checking for ipv6 library if required" >&5
+echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6
+echo "configure:13073: checking for IPv6 library if required" >&5
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
 	;;
@@ -12832,7 +13103,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6
 if test "$cf_ipv6lib" != "none"; then
 
 	cat > conftest.$ac_ext <<EOF
-#line 12836 "configure"
+#line 13107 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12843,7 +13114,7 @@ int main() {
 getaddrinfo(0, 0, 0, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:12847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -12852,30 +13123,74 @@ else
   
 	cf_search=""
 
-test "$includedir" != NONE && \
-test -d "$includedir" && \
-cf_search="$cf_search $includedir $includedir/$cf_ipv6dir"
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing include-directories under $HOME"
+	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
+	test -d $HOME/include/$cf_ipv6dir &&       cf_search="$cf_search $HOME/include/$cf_ipv6dir"
+	test -d $HOME/include/$cf_ipv6dir/include &&    cf_search="$cf_search $HOME/include/$cf_ipv6dir/include"
+}
 
-test "$oldincludedir" != NONE && \
-test -d "$oldincludedir" && \
-cf_search="$cf_search $oldincludedir $oldincludedir/$cf_ipv6dir"
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/$cf_ipv6dir to the actual package location:
+test -d $HOME/$cf_ipv6dir && {
+	test -n "$verbose" && echo "	... testing include-directories under $HOME/$cf_ipv6dir"
+	test -d $HOME/$cf_ipv6dir/include &&       cf_search="$cf_search $HOME/$cf_ipv6dir/include"
+	test -d $HOME/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search $HOME/$cf_ipv6dir/include/$cf_ipv6dir"
+}
+
+test "$prefix" != /usr/local && \
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing include-directories under /usr/local"
+	test -d /usr/local/include &&       cf_search="$cf_search /usr/local/include"
+	test -d /usr/local/include/$cf_ipv6dir &&    cf_search="$cf_search /usr/local/include/$cf_ipv6dir"
+	test -d /usr/local/include/$cf_ipv6dir/include && cf_search="$cf_search /usr/local/include/$cf_ipv6dir/include"
+	test -d /usr/local/$cf_ipv6dir/include &&    cf_search="$cf_search /usr/local/$cf_ipv6dir/include"
+	test -d /usr/local/$cf_ipv6dir/include/$cf_ipv6dir && cf_search="$cf_search /usr/local/$cf_ipv6dir/include/$cf_ipv6dir"
+}
 
 test "$prefix" != NONE && \
-test -d "$prefix" && \
-cf_search="$cf_search $prefix/include $prefix/include/$cf_ipv6dir $prefix/$cf_ipv6dir/include"
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing include-directories under $prefix"
+	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
+	test -d $prefix/include/$cf_ipv6dir &&       cf_search="$cf_search $prefix/include/$cf_ipv6dir"
+	test -d $prefix/include/$cf_ipv6dir/include &&    cf_search="$cf_search $prefix/include/$cf_ipv6dir/include"
+	test -d $prefix/$cf_ipv6dir/include &&       cf_search="$cf_search $prefix/$cf_ipv6dir/include"
+	test -d $prefix/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search $prefix/$cf_ipv6dir/include/$cf_ipv6dir"
+}
 
-test "$prefix" != /usr/local && \
-test -d /usr/local && \
-cf_search="$cf_search /usr/local/include /usr/local/include/$cf_ipv6dir /usr/local/$cf_ipv6dir/include"
+test "$prefix" != /opt && \
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing include-directories under /opt"
+	test -d /opt/include &&             cf_search="$cf_search /opt/include"
+	test -d /opt/include/$cf_ipv6dir &&          cf_search="$cf_search /opt/include/$cf_ipv6dir"
+	test -d /opt/include/$cf_ipv6dir/include &&       cf_search="$cf_search /opt/include/$cf_ipv6dir/include"
+	test -d /opt/$cf_ipv6dir/include &&          cf_search="$cf_search /opt/$cf_ipv6dir/include"
+	test -d /opt/$cf_ipv6dir/include/$cf_ipv6dir &&       cf_search="$cf_search /opt/$cf_ipv6dir/include/$cf_ipv6dir"
+}
 
 test "$prefix" != /usr && \
-cf_search="$cf_search /usr/include /usr/include/$cf_ipv6dir /usr/$cf_ipv6dir/include"
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing include-directories under /usr"
+	test -d /usr/include &&             cf_search="$cf_search /usr/include"
+	test -d /usr/include/$cf_ipv6dir &&          cf_search="$cf_search /usr/include/$cf_ipv6dir"
+	test -d /usr/include/$cf_ipv6dir/include &&       cf_search="$cf_search /usr/include/$cf_ipv6dir/include"
+	test -d /usr/$cf_ipv6dir/include &&          cf_search="$cf_search /usr/$cf_ipv6dir/include"
+}
 
-test "$prefix" != /opt && \
-test -d /opt && \
-cf_search="$cf_search /opt/include /opt/include/$cf_ipv6dir /opt/$cf_ipv6dir/include"
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+	test -d $includedir &&    cf_search="$cf_search $includedir"
+	test -d $includedir/$cf_ipv6dir && cf_search="$cf_search $includedir/$cf_ipv6dir"
+}
+
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+	test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
+	test -d $oldincludedir/$cf_ipv6dir && cf_search="$cf_search $oldincludedir/$cf_ipv6dir"
+}
 
-cf_search="$cf_search $HOME/lib $HOME/lib/$cf_ipv6dir $HOME/$cf_ipv6dir/lib"
 
 	for cf_incdir in $cf_search
 	do
@@ -12896,12 +13211,12 @@ rm -f conftest*
 	eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
 	cf_libdir=""
 	echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
-echo "configure:12900: checking for getaddrinfo" >&5
+echo "configure:13215: checking for getaddrinfo" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12905 "configure"
+#line 13220 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo(); below.  */
@@ -12924,7 +13239,7 @@ getaddrinfo();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_getaddrinfo=yes"
 else
@@ -12944,10 +13259,10 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6
-echo "configure:12948: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+echo "configure:13263: checking for getaddrinfo in -l$cf_ipv6lib" >&5
 		LIBS="-l$cf_ipv6lib $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 12951 "configure"
+#line 13266 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12958,7 +13273,7 @@ int main() {
 getaddrinfo(0, 0, 0, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:12962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
@@ -12970,42 +13285,67 @@ else
   echo "$ac_t""no" 1>&6
 			cf_search=""
 
-test "$libdir" != NONE && \
-test -d $libdir && \
-cf_search="$cf_search $libdir $libdir/$cf_ipv6dir"
-
-test "$exec_prefix" != NONE && \
-test -d $exec_prefix && \
-cf_search="$cf_search $exec_prefix/lib $exec_prefix/lib/$cf_ipv6dir"
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME"
+	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
+	test -d $HOME/lib/$cf_ipv6dir &&       cf_search="$cf_search $HOME/lib/$cf_ipv6dir"
+	test -d $HOME/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search $HOME/lib/$cf_ipv6dir/lib"
+}
 
-test "$prefix" != NONE && \
-test "$prefix" != "$exec_prefix" && \
-test -d $prefix && \
-cf_search="$cf_search $prefix/lib $prefix/lib/$cf_ipv6dir $prefix/$cf_ipv6dir/lib"
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/$cf_ipv6dir to the actual package location:
+test -d $HOME/$cf_ipv6dir && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME/$cf_ipv6dir"
+	test -d $HOME/$cf_ipv6dir/lib &&       cf_search="$cf_search $HOME/$cf_ipv6dir/lib"
+	test -d $HOME/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search $HOME/$cf_ipv6dir/lib/$cf_ipv6dir"
+}
 
 test "$prefix" != /usr/local && \
-test -d /usr/local && \
-cf_search="$cf_search /usr/local/lib /usr/local/lib/$cf_ipv6dir /usr/local/$cf_ipv6dir/lib"
-
-test "$prefix" != /usr && \
-cf_search="$cf_search /usr/lib /usr/lib/$cf_ipv6dir /usr/$cf_ipv6dir/lib"
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr/local"
+	test -d /usr/local/lib &&       cf_search="$cf_search /usr/local/lib"
+	test -d /usr/local/lib/$cf_ipv6dir &&    cf_search="$cf_search /usr/local/lib/$cf_ipv6dir"
+	test -d /usr/local/lib/$cf_ipv6dir/lib && cf_search="$cf_search /usr/local/lib/$cf_ipv6dir/lib"
+	test -d /usr/local/$cf_ipv6dir/lib &&    cf_search="$cf_search /usr/local/$cf_ipv6dir/lib"
+	test -d /usr/local/$cf_ipv6dir/lib/$cf_ipv6dir && cf_search="$cf_search /usr/local/$cf_ipv6dir/lib/$cf_ipv6dir"
+}
 
-test "$prefix" != / && \
-cf_search="$cf_search /lib /lib/$cf_ipv6dir /$cf_ipv6dir/lib"
+test "$prefix" != NONE && \
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing lib-directories under $prefix"
+	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
+	test -d $prefix/lib/$cf_ipv6dir &&       cf_search="$cf_search $prefix/lib/$cf_ipv6dir"
+	test -d $prefix/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search $prefix/lib/$cf_ipv6dir/lib"
+	test -d $prefix/$cf_ipv6dir/lib &&       cf_search="$cf_search $prefix/$cf_ipv6dir/lib"
+	test -d $prefix/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search $prefix/$cf_ipv6dir/lib/$cf_ipv6dir"
+}
 
 test "$prefix" != /opt && \
-test -d /opt && \
-cf_search="$cf_search /opt/lib /opt/lib/$cf_ipv6dir /opt/$cf_ipv6dir/lib"
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing lib-directories under /opt"
+	test -d /opt/lib &&             cf_search="$cf_search /opt/lib"
+	test -d /opt/lib/$cf_ipv6dir &&          cf_search="$cf_search /opt/lib/$cf_ipv6dir"
+	test -d /opt/lib/$cf_ipv6dir/lib &&       cf_search="$cf_search /opt/lib/$cf_ipv6dir/lib"
+	test -d /opt/$cf_ipv6dir/lib &&          cf_search="$cf_search /opt/$cf_ipv6dir/lib"
+	test -d /opt/$cf_ipv6dir/lib/$cf_ipv6dir &&       cf_search="$cf_search /opt/$cf_ipv6dir/lib/$cf_ipv6dir"
+}
 
-cf_search="$cf_search $HOME/lib $HOME/lib/$cf_ipv6dir $HOME/$cf_ipv6dir/lib"
+test "$prefix" != /usr && \
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr"
+	test -d /usr/lib &&             cf_search="$cf_search /usr/lib"
+	test -d /usr/lib/$cf_ipv6dir &&          cf_search="$cf_search /usr/lib/$cf_ipv6dir"
+	test -d /usr/lib/$cf_ipv6dir/lib &&       cf_search="$cf_search /usr/lib/$cf_ipv6dir/lib"
+	test -d /usr/$cf_ipv6dir/lib &&          cf_search="$cf_search /usr/$cf_ipv6dir/lib"
+}
 
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -l$cf_ipv6lib in $cf_libdir""... $ac_c" 1>&6
-echo "configure:13006: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+echo "configure:13346: checking for -l$cf_ipv6lib in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 13009 "configure"
+#line 13349 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13016,7 +13356,7 @@ int main() {
 getaddrinfo(0, 0, 0, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:13020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
@@ -13041,7 +13381,7 @@ eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
 		{ echo "configure: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
-from an appropriate ipv6 kit and compile beforehand." 1>&2; exit 1; }
+from an appropriate IPv6 kit and compile beforehand." 1>&2; exit 1; }
 	fi
 fi
 
@@ -13049,7 +13389,7 @@ fi
 
 
 echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6
-echo "configure:13053: checking working getaddrinfo" >&5
+echo "configure:13393: checking working getaddrinfo" >&5
 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -13058,7 +13398,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 13062 "configure"
+#line 13402 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13137,7 +13477,7 @@ int main()
 }
 
 EOF
-if { (eval echo configure:13141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_getaddrinfo=yes
 else
@@ -13167,8 +13507,8 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "configure: error: You must get working getaddrinfo() function,
-or you can specify "--disable-ipv6"" 1>&2; exit 1; }
+		echo "configure: warning: You must get working getaddrinfo() function,
+or you can specify "--disable-ipv6"" 1>&2
 	else
 		echo "configure: warning: The getaddrinfo() implementation on your system seems be buggy.
 You should upgrade your system library to the newest version
@@ -13180,7 +13520,7 @@ fi
 fi
 
 echo $ac_n "checking if experimental element-justification logic should be used""... $ac_c" 1>&6
-echo "configure:13184: checking if experimental element-justification logic should be used" >&5
+echo "configure:13524: checking if experimental element-justification logic should be used" >&5
 
 # Check whether --enable-justify-elts or --disable-justify-elts was given.
 if test "${enable_justify_elts+set}" = set; then
@@ -13204,7 +13544,7 @@ EOF
 
 
 echo $ac_n "checking if experimental keyboard-layout logic should be used""... $ac_c" 1>&6
-echo "configure:13208: checking if experimental keyboard-layout logic should be used" >&5
+echo "configure:13548: checking if experimental keyboard-layout logic should be used" >&5
 
 # Check whether --enable-kbd-layout or --disable-kbd-layout was given.
 if test "${enable_kbd_layout+set}" = set; then
@@ -13227,32 +13567,33 @@ test $use_kbd_layout != no && cat >> confdefs.h <<\EOF
 EOF
 
 
-echo $ac_n "checking if experimental JavaScript support should be used""... $ac_c" 1>&6
-echo "configure:13232: checking if experimental JavaScript support should be used" >&5
 
-# Check whether --enable-libjs or --disable-libjs was given.
-if test "${enable_libjs+set}" = set; then
-  enableval="$enable_libjs"
+echo $ac_n "checking if experimental locale-charset selection logic should be used""... $ac_c" 1>&6
+echo "configure:13573: checking if experimental locale-charset selection logic should be used" >&5
+
+# Check whether --enable-locale-charset or --disable-locale-charset was given.
+if test "${enable_locale_charset+set}" = set; then
+  enableval="$enable_locale_charset"
   test "$enableval" != yes && enableval=no
   if test "$enableval" != "no" ; then
-    use_libjs=$enableval 
+    use_locale_charset=$enableval 
   else
-    use_libjs=no
+    use_locale_charset=yes
   fi
 else
   enableval=no 
-  use_libjs=no
+  use_locale_charset=yes
   
 fi
 
-echo "$ac_t""$use_libjs" 1>&6
-test $use_libjs != no && cat >> confdefs.h <<\EOF
-#define EXP_LIBJS 1
+echo "$ac_t""$use_locale_charset" 1>&6
+test $use_locale_charset != no && cat >> confdefs.h <<\EOF
+#define EXP_LOCALE_CHARSET 1
 EOF
 
 
 echo $ac_n "checking if experimental nested-table logic should be used""... $ac_c" 1>&6
-echo "configure:13256: checking if experimental nested-table logic should be used" >&5
+echo "configure:13597: checking if experimental nested-table logic should be used" >&5
 
 # Check whether --enable-nested-tables or --disable-nested-tables was given.
 if test "${enable_nested_tables+set}" = set; then
@@ -13275,56 +13616,8 @@ test $use_nested_tables != no && cat >> confdefs.h <<\EOF
 EOF
 
 
-echo $ac_n "checking if html source should be colorized""... $ac_c" 1>&6
-echo "configure:13280: checking if html source should be colorized" >&5
-
-# Check whether --enable-prettysrc or --disable-prettysrc was given.
-if test "${enable_prettysrc+set}" = set; then
-  enableval="$enable_prettysrc"
-  test "$enableval" != yes && enableval=no
-  if test "$enableval" != "no" ; then
-    use_prettysrc=$enableval 
-  else
-    use_prettysrc=no
-  fi
-else
-  enableval=no 
-  use_prettysrc=no
-  
-fi
-
-echo "$ac_t""$use_prettysrc" 1>&6
-test $use_prettysrc != no && cat >> confdefs.h <<\EOF
-#define USE_PRETTYSRC 1
-EOF
-
-
-echo $ac_n "checking if read-progress message should show ETA""... $ac_c" 1>&6
-echo "configure:13304: checking if read-progress message should show ETA" >&5
-
-# Check whether --enable-read-eta or --disable-read-eta was given.
-if test "${enable_read_eta+set}" = set; then
-  enableval="$enable_read_eta"
-  test "$enableval" != yes && enableval=no
-  if test "$enableval" != "no" ; then
-    use_read_eta=$enableval 
-  else
-    use_read_eta=no
-  fi
-else
-  enableval=no 
-  use_read_eta=no
-  
-fi
-
-echo "$ac_t""$use_read_eta" 1>&6
-test $use_read_eta != no && cat >> confdefs.h <<\EOF
-#define EXP_READPROGRESS 1
-EOF
-
-
 echo $ac_n "checking if scrollbar code should be used""... $ac_c" 1>&6
-echo "configure:13328: checking if scrollbar code should be used" >&5
+echo "configure:13621: checking if scrollbar code should be used" >&5
 
 # Check whether --enable-scrollbar or --disable-scrollbar was given.
 if test "${enable_scrollbar+set}" = set; then
@@ -13343,46 +13636,11 @@ fi
 
 echo "$ac_t""$use_scrollbar" 1>&6
 
-if test $use_scrollbar != no ; then
-	if test .$cf_cv_fancy_curses != .yes ; then
-		echo "configure: warning: Configuration does not support ACS_xxx definitions" 1>&2
-	else
-		cat >> confdefs.h <<\EOF
-#define USE_SCROLLBAR 1
-EOF
-
-	fi
-fi
-
-echo $ac_n "checking if source caching should be used""... $ac_c" 1>&6
-echo "configure:13359: checking if source caching should be used" >&5
-
-# Check whether --enable-source-cache or --disable-source-cache was given.
-if test "${enable_source_cache+set}" = set; then
-  enableval="$enable_source_cache"
-  test "$enableval" != yes && enableval=no
-  if test "$enableval" != "no" ; then
-    use_source_cache=$enableval 
-  else
-    use_source_cache=no
-  fi
-else
-  enableval=no 
-  use_source_cache=no
-  
-fi
-
-echo "$ac_t""$use_source_cache" 1>&6
-test $use_source_cache != no && cat >> confdefs.h <<\EOF
-#define SOURCE_CACHE 1
-EOF
-
-
 
 
 
 echo $ac_n "checking if alternative line-edit bindings should be used""... $ac_c" 1>&6
-echo "configure:13386: checking if alternative line-edit bindings should be used" >&5
+echo "configure:13644: checking if alternative line-edit bindings should be used" >&5
 
 # Check whether --enable-alt-bindings or --disable-alt-bindings was given.
 if test "${enable_alt_bindings+set}" = set; then
@@ -13406,7 +13664,7 @@ EOF
 
 
 echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6
-echo "configure:13410: checking if you want to use extended HTML DTD logic" >&5
+echo "configure:13668: checking if you want to use extended HTML DTD logic" >&5
 
 # Check whether --enable-extended-dtd or --disable-extended-dtd was given.
 if test "${enable_extended_dtd+set}" = set; then
@@ -13429,8 +13687,32 @@ test $use_ext_htmldtd = "no" && cat >> confdefs.h <<\EOF
 EOF
 
 
+echo $ac_n "checking if file-upload logic should be used""... $ac_c" 1>&6
+echo "configure:13692: checking if file-upload logic should be used" >&5
+
+# Check whether --enable-file-upload or --disable-file-upload was given.
+if test "${enable_file_upload+set}" = set; then
+  enableval="$enable_file_upload"
+  test "$enableval" != no && enableval=yes
+  if test "$enableval" != "yes" ; then
+    use_file_upload=$enableval 
+  else
+    use_file_upload=yes
+  fi
+else
+  enableval=yes 
+  use_file_upload=yes
+  
+fi
+
+echo "$ac_t""$use_file_upload" 1>&6
+test $use_file_upload != no && cat >> confdefs.h <<\EOF
+#define USE_FILE_UPLOAD 1
+EOF
+
+
 echo $ac_n "checking if partial-display should be used""... $ac_c" 1>&6
-echo "configure:13434: checking if partial-display should be used" >&5
+echo "configure:13716: checking if partial-display should be used" >&5
 
 # Check whether --enable-partial or --disable-partial was given.
 if test "${enable_partial+set}" = set; then
@@ -13453,8 +13735,104 @@ test $use_partial_display != no && cat >> confdefs.h <<\EOF
 EOF
 
 
+echo $ac_n "checking if persistent-cookie logic should be used""... $ac_c" 1>&6
+echo "configure:13740: checking if persistent-cookie logic should be used" >&5
+
+# Check whether --enable-persistent-cookies or --disable-persistent-cookies was given.
+if test "${enable_persistent_cookies+set}" = set; then
+  enableval="$enable_persistent_cookies"
+  test "$enableval" != no && enableval=yes
+  if test "$enableval" != "yes" ; then
+    use_filed_cookies=$enableval 
+  else
+    use_filed_cookies=yes
+  fi
+else
+  enableval=yes 
+  use_filed_cookies=yes
+  
+fi
+
+echo "$ac_t""$use_filed_cookies" 1>&6
+test $use_filed_cookies != no && cat >> confdefs.h <<\EOF
+#define USE_PERSISTENT_COOKIES 1
+EOF
+
+
+echo $ac_n "checking if html source should be colorized""... $ac_c" 1>&6
+echo "configure:13764: checking if html source should be colorized" >&5
+
+# Check whether --enable-prettysrc or --disable-prettysrc was given.
+if test "${enable_prettysrc+set}" = set; then
+  enableval="$enable_prettysrc"
+  test "$enableval" != no && enableval=yes
+  if test "$enableval" != "yes" ; then
+    use_prettysrc=$enableval 
+  else
+    use_prettysrc=yes
+  fi
+else
+  enableval=yes 
+  use_prettysrc=yes
+  
+fi
+
+echo "$ac_t""$use_prettysrc" 1>&6
+test $use_prettysrc != no && cat >> confdefs.h <<\EOF
+#define USE_PRETTYSRC 1
+EOF
+
+
+echo $ac_n "checking if read-progress message should show ETA""... $ac_c" 1>&6
+echo "configure:13788: checking if read-progress message should show ETA" >&5
+
+# Check whether --enable-read-eta or --disable-read-eta was given.
+if test "${enable_read_eta+set}" = set; then
+  enableval="$enable_read_eta"
+  test "$enableval" != no && enableval=yes
+  if test "$enableval" != "yes" ; then
+    use_read_eta=$enableval 
+  else
+    use_read_eta=yes
+  fi
+else
+  enableval=yes 
+  use_read_eta=yes
+  
+fi
+
+echo "$ac_t""$use_read_eta" 1>&6
+test $use_read_eta != no && cat >> confdefs.h <<\EOF
+#define USE_READPROGRESS 1
+EOF
+
+
+echo $ac_n "checking if source caching should be used""... $ac_c" 1>&6
+echo "configure:13812: checking if source caching should be used" >&5
+
+# Check whether --enable-source-cache or --disable-source-cache was given.
+if test "${enable_source_cache+set}" = set; then
+  enableval="$enable_source_cache"
+  test "$enableval" != no && enableval=yes
+  if test "$enableval" != "yes" ; then
+    use_source_cache=$enableval 
+  else
+    use_source_cache=yes
+  fi
+else
+  enableval=yes 
+  use_source_cache=yes
+  
+fi
+
+echo "$ac_t""$use_source_cache" 1>&6
+test $use_source_cache != no && cat >> confdefs.h <<\EOF
+#define USE_SOURCE_CACHE 1
+EOF
+
+
 echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6
-echo "configure:13458: checking if you want to use external commands" >&5
+echo "configure:13836: checking if you want to use external commands" >&5
 
 # Check whether --enable-externs or --disable-externs was given.
 if test "${enable_externs+set}" = set; then
@@ -13477,11 +13855,11 @@ if test $use_externs != "no" ; then
 #define USE_EXTERNALS 1
 EOF
 
-	LIBOBJS="$LIBOBJS LYExtern.o"
+	LIBOBJS="$LIBOBJS LYExtern\$o"
 fi
 
 echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6
-echo "configure:13485: checking if you want to use setfont support" >&5
+echo "configure:13863: checking if you want to use setfont support" >&5
 
 # Check whether --enable-font-switch or --disable-font-switch was given.
 if test "${enable_font_switch+set}" = set; then
@@ -13505,7 +13883,7 @@ EOF
 
 
 echo $ac_n "checking if you want cgi-link support""... $ac_c" 1>&6
-echo "configure:13509: checking if you want cgi-link support" >&5
+echo "configure:13887: checking if you want cgi-link support" >&5
 
 # Check whether --enable-cgi-links or --disable-cgi-links was given.
 if test "${enable_cgi_links+set}" = set; then
@@ -13524,7 +13902,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if you want change-exec support""... $ac_c" 1>&6
-echo "configure:13528: checking if you want change-exec support" >&5
+echo "configure:13906: checking if you want change-exec support" >&5
 
 # Check whether --enable-change-exec or --disable-change-exec was given.
 if test "${enable_change_exec+set}" = set; then
@@ -13548,7 +13926,7 @@ EOF
 
 
 echo $ac_n "checking if you want exec-links support""... $ac_c" 1>&6
-echo "configure:13552: checking if you want exec-links support" >&5
+echo "configure:13930: checking if you want exec-links support" >&5
 
 # Check whether --enable-exec-links or --disable-exec-links was given.
 if test "${enable_exec_links+set}" = set; then
@@ -13572,7 +13950,7 @@ EOF
 
 
 echo $ac_n "checking if you want exec-scripts support""... $ac_c" 1>&6
-echo "configure:13576: checking if you want exec-scripts support" >&5
+echo "configure:13954: checking if you want exec-scripts support" >&5
 
 # Check whether --enable-exec-scripts or --disable-exec-scripts was given.
 if test "${enable_exec_scripts+set}" = set; then
@@ -13596,7 +13974,7 @@ EOF
 
 
 echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6
-echo "configure:13600: checking if you want internal-links feature" >&5
+echo "configure:13978: checking if you want internal-links feature" >&5
 
 # Check whether --enable-internal-links or --disable-internal-links was given.
 if test "${enable_internal_links+set}" = set; then
@@ -13620,7 +13998,7 @@ EOF
 
 
 echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6
-echo "configure:13624: checking if you want to fork NSL requests" >&5
+echo "configure:14002: checking if you want to fork NSL requests" >&5
 
 # Check whether --enable-nsl-fork or --disable-nsl-fork was given.
 if test "${enable_nsl_fork+set}" = set; then
@@ -13644,7 +14022,7 @@ EOF
 
 
 echo $ac_n "checking if you want to log URL requests via syslog""... $ac_c" 1>&6
-echo "configure:13648: checking if you want to log URL requests via syslog" >&5
+echo "configure:14026: checking if you want to log URL requests via syslog" >&5
 
 # Check whether --enable-syslog or --disable-syslog was given.
 if test "${enable_syslog+set}" = set; then
@@ -13667,32 +14045,8 @@ test $use_syslog = yes && cat >> confdefs.h <<\EOF
 EOF
 
 
-echo $ac_n "checking if persistent-cookie logic should be used""... $ac_c" 1>&6
-echo "configure:13672: checking if persistent-cookie logic should be used" >&5
-
-# Check whether --enable-persistent-cookies or --disable-persistent-cookies was given.
-if test "${enable_persistent_cookies+set}" = set; then
-  enableval="$enable_persistent_cookies"
-  test "$enableval" != no && enableval=yes
-  if test "$enableval" != "yes" ; then
-    use_filed_cookies=$enableval 
-  else
-    use_filed_cookies=yes
-  fi
-else
-  enableval=yes 
-  use_filed_cookies=yes
-  
-fi
-
-echo "$ac_t""$use_filed_cookies" 1>&6
-test $use_filed_cookies != no && cat >> confdefs.h <<\EOF
-#define EXP_PERSISTENT_COOKIES 1
-EOF
-
-
 echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6
-echo "configure:13696: checking if you want to underline links" >&5
+echo "configure:14050: checking if you want to underline links" >&5
 
 # Check whether --enable-underlines or --disable-underlines was given.
 if test "${enable_underlines+set}" = set; then
@@ -13714,9 +14068,13 @@ test $use_underline = yes && cat >> confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
 EOF
 
+test $use_underline = no  && cat >> confdefs.h <<\EOF
+#define UNDERLINE_LINKS 0
+EOF
+
 
 echo $ac_n "checking if help files should be gzip'ed""... $ac_c" 1>&6
-echo "configure:13720: checking if help files should be gzip'ed" >&5
+echo "configure:14078: checking if help files should be gzip'ed" >&5
 
 # Check whether --enable-gzip-help or --disable-gzip-help was given.
 if test "${enable_gzip_help+set}" = set; then
@@ -13735,17 +14093,337 @@ fi
 
 echo "$ac_t""$use_gzip_help" 1>&6
 
-COMPRESS_PROG=
-COMPRESS_EXT=
-if test $use_gzip_help = yes ; then
-	COMPRESS_PROG=$ac_cv_path_GZIP
-	COMPRESS_EXT=.gz
+echo $ac_n "checking if you want to use libbz2 for decompression of some bzip2 files""... $ac_c" 1>&6
+echo "configure:14098: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+
+# Check whether --with-bzlib or --without-bzlib was given.
+if test "${with_bzlib+set}" = set; then
+  withval="$with_bzlib"
+  use_bzlib=$withval
+else
+  use_bzlib=no
+fi
+
+echo "$ac_t""$use_bzlib" 1>&6
+
+if test ".$use_bzlib" != ".no" ; then
+	
+echo $ac_n "checking if we need to add -I option to get bzlib.h""... $ac_c" 1>&6
+echo "configure:14113: checking if we need to add -I option to get bzlib.h" >&5
+cat > conftest.$ac_ext <<EOF
+#line 14115 "configure"
+#include "confdefs.h"
+#include <zlib.h>
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:14122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+echo "$ac_t""yes" 1>&6
+cf_search=""
+
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing include-directories under $HOME"
+	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
+	test -d $HOME/include/bzlib &&       cf_search="$cf_search $HOME/include/bzlib"
+	test -d $HOME/include/bzlib/include &&    cf_search="$cf_search $HOME/include/bzlib/include"
+}
+
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/bzlib to the actual package location:
+test -d $HOME/bzlib && {
+	test -n "$verbose" && echo "	... testing include-directories under $HOME/bzlib"
+	test -d $HOME/bzlib/include &&       cf_search="$cf_search $HOME/bzlib/include"
+	test -d $HOME/bzlib/include/bzlib &&    cf_search="$cf_search $HOME/bzlib/include/bzlib"
+}
+
+test "$prefix" != /usr/local && \
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing include-directories under /usr/local"
+	test -d /usr/local/include &&       cf_search="$cf_search /usr/local/include"
+	test -d /usr/local/include/bzlib &&    cf_search="$cf_search /usr/local/include/bzlib"
+	test -d /usr/local/include/bzlib/include && cf_search="$cf_search /usr/local/include/bzlib/include"
+	test -d /usr/local/bzlib/include &&    cf_search="$cf_search /usr/local/bzlib/include"
+	test -d /usr/local/bzlib/include/bzlib && cf_search="$cf_search /usr/local/bzlib/include/bzlib"
+}
+
+test "$prefix" != NONE && \
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing include-directories under $prefix"
+	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
+	test -d $prefix/include/bzlib &&       cf_search="$cf_search $prefix/include/bzlib"
+	test -d $prefix/include/bzlib/include &&    cf_search="$cf_search $prefix/include/bzlib/include"
+	test -d $prefix/bzlib/include &&       cf_search="$cf_search $prefix/bzlib/include"
+	test -d $prefix/bzlib/include/bzlib &&    cf_search="$cf_search $prefix/bzlib/include/bzlib"
+}
+
+test "$prefix" != /opt && \
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing include-directories under /opt"
+	test -d /opt/include &&             cf_search="$cf_search /opt/include"
+	test -d /opt/include/bzlib &&          cf_search="$cf_search /opt/include/bzlib"
+	test -d /opt/include/bzlib/include &&       cf_search="$cf_search /opt/include/bzlib/include"
+	test -d /opt/bzlib/include &&          cf_search="$cf_search /opt/bzlib/include"
+	test -d /opt/bzlib/include/bzlib &&       cf_search="$cf_search /opt/bzlib/include/bzlib"
+}
+
+test "$prefix" != /usr && \
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing include-directories under /usr"
+	test -d /usr/include &&             cf_search="$cf_search /usr/include"
+	test -d /usr/include/bzlib &&          cf_search="$cf_search /usr/include/bzlib"
+	test -d /usr/include/bzlib/include &&       cf_search="$cf_search /usr/include/bzlib/include"
+	test -d /usr/bzlib/include &&          cf_search="$cf_search /usr/bzlib/include"
+}
+
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+	test -d $includedir &&    cf_search="$cf_search $includedir"
+	test -d $includedir/bzlib && cf_search="$cf_search $includedir/bzlib"
+}
+
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+	test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
+	test -d $oldincludedir/bzlib && cf_search="$cf_search $oldincludedir/bzlib"
+}
+
+
+for cf_incdir in $cf_search
+do
+	if test -f $cf_incdir/bzlib.h ; then
+		
+cf_new_cflags=
+cf_new_cppflags=
+for cf_add_cflags in -I$cf_incdir
+do
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+done
+
+if test -n "$cf_new_cflags" ; then
+	
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+	
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+
+		test -n "$verbose" && echo "	... found in $cf_incdir" 1>&6
+
+		break
+	fi
+	test -n "$verbose" && echo "	... tested $cf_incdir" 1>&6
+
+done
+
+fi
+rm -f conftest*
+
+	eval 'cf_cv_have_lib_'bz2'=no'
+	cf_libdir=""
+	echo $ac_n "checking for BZ2_bzopen""... $ac_c" 1>&6
+echo "configure:14251: checking for BZ2_bzopen" >&5
+if eval "test \"`echo '$''{'ac_cv_func_BZ2_bzopen'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 14256 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char BZ2_bzopen(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char BZ2_bzopen();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_BZ2_bzopen) || defined (__stub___BZ2_bzopen)
+choke me
+#else
+BZ2_bzopen();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:14279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_BZ2_bzopen=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_BZ2_bzopen=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'BZ2_bzopen`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  eval 'cf_cv_have_lib_'bz2'=yes'
+else
+  echo "$ac_t""no" 1>&6
+
+		cf_save_LIBS="$LIBS"
+		echo $ac_n "checking for BZ2_bzopen in -lbz2""... $ac_c" 1>&6
+echo "configure:14299: checking for BZ2_bzopen in -lbz2" >&5
+		LIBS="-lbz2 $LIBS"
+		cat > conftest.$ac_ext <<EOF
+#line 14302 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#include <bzlib.h>
+int main() {
+BZ2_bzopen("name","mode")
+; return 0; }
+EOF
+if { (eval echo configure:14311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+			 eval 'cf_cv_have_lib_'bz2'=yes'
+			
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+			cf_search=""
+
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME"
+	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
+	test -d $HOME/lib/bz2 &&       cf_search="$cf_search $HOME/lib/bz2"
+	test -d $HOME/lib/bz2/lib &&    cf_search="$cf_search $HOME/lib/bz2/lib"
+}
+
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/bz2 to the actual package location:
+test -d $HOME/bz2 && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME/bz2"
+	test -d $HOME/bz2/lib &&       cf_search="$cf_search $HOME/bz2/lib"
+	test -d $HOME/bz2/lib/bz2 &&    cf_search="$cf_search $HOME/bz2/lib/bz2"
+}
+
+test "$prefix" != /usr/local && \
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr/local"
+	test -d /usr/local/lib &&       cf_search="$cf_search /usr/local/lib"
+	test -d /usr/local/lib/bz2 &&    cf_search="$cf_search /usr/local/lib/bz2"
+	test -d /usr/local/lib/bz2/lib && cf_search="$cf_search /usr/local/lib/bz2/lib"
+	test -d /usr/local/bz2/lib &&    cf_search="$cf_search /usr/local/bz2/lib"
+	test -d /usr/local/bz2/lib/bz2 && cf_search="$cf_search /usr/local/bz2/lib/bz2"
+}
+
+test "$prefix" != NONE && \
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing lib-directories under $prefix"
+	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
+	test -d $prefix/lib/bz2 &&       cf_search="$cf_search $prefix/lib/bz2"
+	test -d $prefix/lib/bz2/lib &&    cf_search="$cf_search $prefix/lib/bz2/lib"
+	test -d $prefix/bz2/lib &&       cf_search="$cf_search $prefix/bz2/lib"
+	test -d $prefix/bz2/lib/bz2 &&    cf_search="$cf_search $prefix/bz2/lib/bz2"
+}
+
+test "$prefix" != /opt && \
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing lib-directories under /opt"
+	test -d /opt/lib &&             cf_search="$cf_search /opt/lib"
+	test -d /opt/lib/bz2 &&          cf_search="$cf_search /opt/lib/bz2"
+	test -d /opt/lib/bz2/lib &&       cf_search="$cf_search /opt/lib/bz2/lib"
+	test -d /opt/bz2/lib &&          cf_search="$cf_search /opt/bz2/lib"
+	test -d /opt/bz2/lib/bz2 &&       cf_search="$cf_search /opt/bz2/lib/bz2"
+}
+
+test "$prefix" != /usr && \
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr"
+	test -d /usr/lib &&             cf_search="$cf_search /usr/lib"
+	test -d /usr/lib/bz2 &&          cf_search="$cf_search /usr/lib/bz2"
+	test -d /usr/lib/bz2/lib &&       cf_search="$cf_search /usr/lib/bz2/lib"
+	test -d /usr/bz2/lib &&          cf_search="$cf_search /usr/bz2/lib"
+}
+
+			for cf_libdir in $cf_search
+			do
+				echo $ac_n "checking for -lbz2 in $cf_libdir""... $ac_c" 1>&6
+echo "configure:14380: checking for -lbz2 in $cf_libdir" >&5
+				LIBS="-L$cf_libdir -lbz2 $cf_save_LIBS"
+				cat > conftest.$ac_ext <<EOF
+#line 14383 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#include <bzlib.h>
+int main() {
+BZ2_bzopen("name","mode")
+; return 0; }
+EOF
+if { (eval echo configure:14392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+			 		 eval 'cf_cv_have_lib_'bz2'=yes'
+					 break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+					 LIBS="$cf_save_LIBS"
+fi
+rm -f conftest*
+			done
+			
+fi
+rm -f conftest*
+		
+fi
+
+eval 'cf_found_library=$cf_cv_have_lib_'bz2
+
+if test $cf_found_library = no ; then
+	{ echo "configure: error: Cannot link bz2 library" 1>&2; exit 1; }
 fi
 
 
 
+	cat >> confdefs.h <<\EOF
+#define USE_BZLIB 1
+EOF
+
+fi
+
 echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6
-echo "configure:13749: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "configure:14427: checking if you want to use zlib for decompression of some gzip files" >&5
 
 # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
@@ -13758,17 +14436,18 @@ fi
 echo "$ac_t""$use_zlib" 1>&6
 
 if test ".$use_zlib" != ".no" ; then
-	echo $ac_n "checking if we need to add -I option to get zlib.h""... $ac_c" 1>&6
-echo "configure:13763: checking if we need to add -I option to get zlib.h" >&5
-	cat > conftest.$ac_ext <<EOF
-#line 13765 "configure"
+	
+echo $ac_n "checking if we need to add -I option to get zlib.h""... $ac_c" 1>&6
+echo "configure:14442: checking if we need to add -I option to get zlib.h" >&5
+cat > conftest.$ac_ext <<EOF
+#line 14444 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -13776,76 +14455,133 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   
-	echo "$ac_t""yes" 1>&6
-	cf_search=""
+echo "$ac_t""yes" 1>&6
+cf_search=""
+
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing include-directories under $HOME"
+	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
+	test -d $HOME/include/zlib &&       cf_search="$cf_search $HOME/include/zlib"
+	test -d $HOME/include/zlib/include &&    cf_search="$cf_search $HOME/include/zlib/include"
+}
 
-test "$includedir" != NONE && \
-test -d "$includedir" && \
-cf_search="$cf_search $includedir $includedir/zlib"
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/zlib to the actual package location:
+test -d $HOME/zlib && {
+	test -n "$verbose" && echo "	... testing include-directories under $HOME/zlib"
+	test -d $HOME/zlib/include &&       cf_search="$cf_search $HOME/zlib/include"
+	test -d $HOME/zlib/include/zlib &&    cf_search="$cf_search $HOME/zlib/include/zlib"
+}
 
-test "$oldincludedir" != NONE && \
-test -d "$oldincludedir" && \
-cf_search="$cf_search $oldincludedir $oldincludedir/zlib"
+test "$prefix" != /usr/local && \
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing include-directories under /usr/local"
+	test -d /usr/local/include &&       cf_search="$cf_search /usr/local/include"
+	test -d /usr/local/include/zlib &&    cf_search="$cf_search /usr/local/include/zlib"
+	test -d /usr/local/include/zlib/include && cf_search="$cf_search /usr/local/include/zlib/include"
+	test -d /usr/local/zlib/include &&    cf_search="$cf_search /usr/local/zlib/include"
+	test -d /usr/local/zlib/include/zlib && cf_search="$cf_search /usr/local/zlib/include/zlib"
+}
 
 test "$prefix" != NONE && \
-test -d "$prefix" && \
-cf_search="$cf_search $prefix/include $prefix/include/zlib $prefix/zlib/include"
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing include-directories under $prefix"
+	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
+	test -d $prefix/include/zlib &&       cf_search="$cf_search $prefix/include/zlib"
+	test -d $prefix/include/zlib/include &&    cf_search="$cf_search $prefix/include/zlib/include"
+	test -d $prefix/zlib/include &&       cf_search="$cf_search $prefix/zlib/include"
+	test -d $prefix/zlib/include/zlib &&    cf_search="$cf_search $prefix/zlib/include/zlib"
+}
 
-test "$prefix" != /usr/local && \
-test -d /usr/local && \
-cf_search="$cf_search /usr/local/include /usr/local/include/zlib /usr/local/zlib/include"
+test "$prefix" != /opt && \
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing include-directories under /opt"
+	test -d /opt/include &&             cf_search="$cf_search /opt/include"
+	test -d /opt/include/zlib &&          cf_search="$cf_search /opt/include/zlib"
+	test -d /opt/include/zlib/include &&       cf_search="$cf_search /opt/include/zlib/include"
+	test -d /opt/zlib/include &&          cf_search="$cf_search /opt/zlib/include"
+	test -d /opt/zlib/include/zlib &&       cf_search="$cf_search /opt/zlib/include/zlib"
+}
 
 test "$prefix" != /usr && \
-cf_search="$cf_search /usr/include /usr/include/zlib /usr/zlib/include"
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing include-directories under /usr"
+	test -d /usr/include &&             cf_search="$cf_search /usr/include"
+	test -d /usr/include/zlib &&          cf_search="$cf_search /usr/include/zlib"
+	test -d /usr/include/zlib/include &&       cf_search="$cf_search /usr/include/zlib/include"
+	test -d /usr/zlib/include &&          cf_search="$cf_search /usr/zlib/include"
+}
 
-test "$prefix" != /opt && \
-test -d /opt && \
-cf_search="$cf_search /opt/include /opt/include/zlib /opt/zlib/include"
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+	test -d $includedir &&    cf_search="$cf_search $includedir"
+	test -d $includedir/zlib && cf_search="$cf_search $includedir/zlib"
+}
 
-cf_search="$cf_search $HOME/lib $HOME/lib/zlib $HOME/zlib/lib"
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+	test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
+	test -d $oldincludedir/zlib && cf_search="$cf_search $oldincludedir/zlib"
+}
 
-	for cf_incdir in $cf_search
-	do
-		if test -f $cf_incdir/zlib.h ; then
-			
+
+for cf_incdir in $cf_search
+do
+	if test -f $cf_incdir/zlib.h ; then
+		
+cf_new_cflags=
+cf_new_cppflags=
 for cf_add_cflags in -I$cf_incdir
 do
 	case $cf_add_cflags in #(vi
 	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
 		case "$CPPFLAGS" in
-		*$cf_add_cflags)
+		*$cf_add_cflags) #(vi
 			;;
-		*)
-			CPPFLAGS="$CPPFLAGS $cf_add_cflags"
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
 		;;
 	*)
-		CFLAGS="$CFLAGS $cf_add_cflags"
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
 		;;
 	esac
 done
 
-			test -n "$verbose" && echo "	... found in $cf_incdir" 1>&6
-
-			break
-		fi
-		test -n "$verbose" && echo "	... tested $cf_incdir" 1>&6
+if test -n "$cf_new_cflags" ; then
+	
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
 
-	done
+if test -n "$cf_new_cppflags" ; then
 	
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+
+		test -n "$verbose" && echo "	... found in $cf_incdir" 1>&6
+
+		break
+	fi
+	test -n "$verbose" && echo "	... tested $cf_incdir" 1>&6
+
+done
+
 fi
 rm -f conftest*
-	
+
 	eval 'cf_cv_have_lib_'z'=no'
 	cf_libdir=""
 	echo $ac_n "checking for gzopen""... $ac_c" 1>&6
-echo "configure:13844: checking for gzopen" >&5
+echo "configure:14580: checking for gzopen" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gzopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13849 "configure"
+#line 14585 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gzopen(); below.  */
@@ -13868,7 +14604,7 @@ gzopen();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gzopen=yes"
 else
@@ -13888,17 +14624,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6
-echo "configure:13892: checking for gzopen in -lz" >&5
+echo "configure:14628: checking for gzopen in -lz" >&5
 		LIBS="-lz $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 13895 "configure"
+#line 14631 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int main() {
 gzopen("name","mode")
 ; return 0; }
 EOF
-if { (eval echo configure:13902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'z'=yes'
@@ -13910,49 +14646,74 @@ else
   echo "$ac_t""no" 1>&6
 			cf_search=""
 
-test "$libdir" != NONE && \
-test -d $libdir && \
-cf_search="$cf_search $libdir $libdir/z"
-
-test "$exec_prefix" != NONE && \
-test -d $exec_prefix && \
-cf_search="$cf_search $exec_prefix/lib $exec_prefix/lib/z"
+test -d $HOME && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME"
+	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
+	test -d $HOME/lib/z &&       cf_search="$cf_search $HOME/lib/z"
+	test -d $HOME/lib/z/lib &&    cf_search="$cf_search $HOME/lib/z/lib"
+}
 
-test "$prefix" != NONE && \
-test "$prefix" != "$exec_prefix" && \
-test -d $prefix && \
-cf_search="$cf_search $prefix/lib $prefix/lib/z $prefix/z/lib"
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/z to the actual package location:
+test -d $HOME/z && {
+	test -n "$verbose" && echo "	... testing lib-directories under $HOME/z"
+	test -d $HOME/z/lib &&       cf_search="$cf_search $HOME/z/lib"
+	test -d $HOME/z/lib/z &&    cf_search="$cf_search $HOME/z/lib/z"
+}
 
 test "$prefix" != /usr/local && \
-test -d /usr/local && \
-cf_search="$cf_search /usr/local/lib /usr/local/lib/z /usr/local/z/lib"
-
-test "$prefix" != /usr && \
-cf_search="$cf_search /usr/lib /usr/lib/z /usr/z/lib"
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr/local"
+	test -d /usr/local/lib &&       cf_search="$cf_search /usr/local/lib"
+	test -d /usr/local/lib/z &&    cf_search="$cf_search /usr/local/lib/z"
+	test -d /usr/local/lib/z/lib && cf_search="$cf_search /usr/local/lib/z/lib"
+	test -d /usr/local/z/lib &&    cf_search="$cf_search /usr/local/z/lib"
+	test -d /usr/local/z/lib/z && cf_search="$cf_search /usr/local/z/lib/z"
+}
 
-test "$prefix" != / && \
-cf_search="$cf_search /lib /lib/z /z/lib"
+test "$prefix" != NONE && \
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing lib-directories under $prefix"
+	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
+	test -d $prefix/lib/z &&       cf_search="$cf_search $prefix/lib/z"
+	test -d $prefix/lib/z/lib &&    cf_search="$cf_search $prefix/lib/z/lib"
+	test -d $prefix/z/lib &&       cf_search="$cf_search $prefix/z/lib"
+	test -d $prefix/z/lib/z &&    cf_search="$cf_search $prefix/z/lib/z"
+}
 
 test "$prefix" != /opt && \
-test -d /opt && \
-cf_search="$cf_search /opt/lib /opt/lib/z /opt/z/lib"
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing lib-directories under /opt"
+	test -d /opt/lib &&             cf_search="$cf_search /opt/lib"
+	test -d /opt/lib/z &&          cf_search="$cf_search /opt/lib/z"
+	test -d /opt/lib/z/lib &&       cf_search="$cf_search /opt/lib/z/lib"
+	test -d /opt/z/lib &&          cf_search="$cf_search /opt/z/lib"
+	test -d /opt/z/lib/z &&       cf_search="$cf_search /opt/z/lib/z"
+}
 
-cf_search="$cf_search $HOME/lib $HOME/lib/z $HOME/z/lib"
+test "$prefix" != /usr && \
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing lib-directories under /usr"
+	test -d /usr/lib &&             cf_search="$cf_search /usr/lib"
+	test -d /usr/lib/z &&          cf_search="$cf_search /usr/lib/z"
+	test -d /usr/lib/z/lib &&       cf_search="$cf_search /usr/lib/z/lib"
+	test -d /usr/z/lib &&          cf_search="$cf_search /usr/z/lib"
+}
 
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6
-echo "configure:13946: checking for -lz in $cf_libdir" >&5
+echo "configure:14707: checking for -lz in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -lz $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 13949 "configure"
+#line 14710 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 int main() {
 gzopen("name","mode")
 ; return 0; }
 EOF
-if { (eval echo configure:13956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'z'=yes'
@@ -13979,14 +14740,17 @@ if test $cf_found_library = no ; then
 fi
 
 
+
 	cat >> confdefs.h <<\EOF
 #define USE_ZLIB 1
 EOF
 
 fi
 
+
+
 echo $ac_n "checking if you want to exclude FINGER code""... $ac_c" 1>&6
-echo "configure:13990: checking if you want to exclude FINGER code" >&5
+echo "configure:14754: checking if you want to exclude FINGER code" >&5
 
 # Check whether --enable-finger or --disable-finger was given.
 if test "${enable_finger+set}" = set; then
@@ -14010,7 +14774,7 @@ EOF
 
 
 echo $ac_n "checking if you want to exclude GOPHER code""... $ac_c" 1>&6
-echo "configure:14014: checking if you want to exclude GOPHER code" >&5
+echo "configure:14778: checking if you want to exclude GOPHER code" >&5
 
 # Check whether --enable-gopher or --disable-gopher was given.
 if test "${enable_gopher+set}" = set; then
@@ -14034,7 +14798,7 @@ EOF
 
 
 echo $ac_n "checking if you want to exclude NEWS code""... $ac_c" 1>&6
-echo "configure:14038: checking if you want to exclude NEWS code" >&5
+echo "configure:14802: checking if you want to exclude NEWS code" >&5
 
 # Check whether --enable-news or --disable-news was given.
 if test "${enable_news+set}" = set; then
@@ -14058,7 +14822,7 @@ EOF
 
 
 echo $ac_n "checking if you want to exclude FTP code""... $ac_c" 1>&6
-echo "configure:14062: checking if you want to exclude FTP code" >&5
+echo "configure:14826: checking if you want to exclude FTP code" >&5
 
 # Check whether --enable-ftp or --disable-ftp was given.
 if test "${enable_ftp+set}" = set; then
@@ -14087,7 +14851,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 $ac_n "checking if directory-editor code should be used""... $ac_c" 1>&6
-echo "configure:14091: checking if directory-editor code should be used" >&5
+echo "configure:14855: checking if directory-editor code should be used" >&5
 
 # Check whether --enable-dired or --disable-dired was given.
 if test "${enable_dired+set}" = set; then
@@ -14107,14 +14871,14 @@ fi
 echo "$ac_t""$use_dired" 1>&6
 
 if test ".$use_dired" != ".no" ; then
-	LIBOBJS="$LIBOBJS LYLocal.o"
+	LIBOBJS="$LIBOBJS LYLocal\$o"
 	cat >> confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
 
 	echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6
-echo "configure:14118: checking if you wish to allow extracting from archives via DirEd" >&5
+echo "configure:14882: checking if you wish to allow extracting from archives via DirEd" >&5
 	
 # Check whether --enable-dired-dearchive or --disable-dired-dearchive was given.
 if test "${enable_dired_dearchive+set}" = set; then
@@ -14133,7 +14897,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if DirEd mode should override keys""... $ac_c" 1>&6
-echo "configure:14137: checking if DirEd mode should override keys" >&5
+echo "configure:14901: checking if DirEd mode should override keys" >&5
 	
 # Check whether --enable-dired-override or --disable-dired-override was given.
 if test "${enable_dired_override+set}" = set; then
@@ -14159,7 +14923,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow permissions commands via DirEd""... $ac_c" 1>&6
-echo "configure:14163: checking if you wish to allow permissions commands via DirEd" >&5
+echo "configure:14927: checking if you wish to allow permissions commands via DirEd" >&5
 	
 # Check whether --enable-dired-permit or --disable-dired-permit was given.
 if test "${enable_dired_permit+set}" = set; then
@@ -14185,7 +14949,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow executable-permission commands via DirEd""... $ac_c" 1>&6
-echo "configure:14189: checking if you wish to allow executable-permission commands via DirEd" >&5
+echo "configure:14953: checking if you wish to allow executable-permission commands via DirEd" >&5
 	
 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given.
 if test "${enable_dired_xpermit+set}" = set; then
@@ -14204,7 +14968,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow "tar" commands from DirEd""... $ac_c" 1>&6
-echo "configure:14208: checking if you wish to allow "tar" commands from DirEd" >&5
+echo "configure:14972: checking if you wish to allow "tar" commands from DirEd" >&5
 	
 # Check whether --enable-dired-tar or --disable-dired-tar was given.
 if test "${enable_dired_tar+set}" = set; then
@@ -14230,7 +14994,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow "uudecode" commands from DirEd""... $ac_c" 1>&6
-echo "configure:14234: checking if you wish to allow "uudecode" commands from DirEd" >&5
+echo "configure:14998: checking if you wish to allow "uudecode" commands from DirEd" >&5
 	
 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given.
 if test "${enable_dired_uudecode+set}" = set; then
@@ -14256,7 +15020,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow "zip" and "unzip" commands from DirEd""... $ac_c" 1>&6
-echo "configure:14260: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5
+echo "configure:15024: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5
 	
 # Check whether --enable-dired-zip or --disable-dired-zip was given.
 if test "${enable_dired_zip+set}" = set; then
@@ -14282,7 +15046,7 @@ fi
 	echo "$ac_t""$enableval" 1>&6
 
 	echo $ac_n "checking if you wish to allow "gzip" and "gunzip" commands from DirEd""... $ac_c" 1>&6
-echo "configure:14286: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5
+echo "configure:15050: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5
 	
 # Check whether --enable-dired-gzip or --disable-dired-gzip was given.
 if test "${enable_dired_gzip+set}" = set; then
@@ -14309,7 +15073,7 @@ fi
 fi
 
 echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6
-echo "configure:14313: checking if you want long-directory listings" >&5
+echo "configure:15077: checking if you want long-directory listings" >&5
 
 # Check whether --enable-long-list or --disable-long-list was given.
 if test "${enable_long_list+set}" = set; then
@@ -14335,7 +15099,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6
-echo "configure:14339: checking if parent-directory references are permitted" >&5
+echo "configure:15103: checking if parent-directory references are permitted" >&5
 
 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given.
 if test "${enable_parent_dir_refs+set}" = set; then
@@ -14353,6 +15117,1730 @@ fi
 
 echo "$ac_t""$enableval" 1>&6
 
+
+test -z "$TELNET" && TELNET=telnet
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:15128: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_TELNET'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$TELNET" in
+  /*)
+  ac_cv_path_TELNET="$TELNET" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_TELNET="$TELNET" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_TELNET="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+TELNET="$ac_cv_path_TELNET"
+if test -n "$TELNET"; then
+  echo "$ac_t""$TELNET" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$TELNET" && break
+done
+test -n "$TELNET" || TELNET="$TELNET"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_TELNET
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 15219) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define TELNET_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define TELNET_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+test -z "$TN3270" && TN3270=tn3270
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:15238: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_TN3270'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$TN3270" in
+  /*)
+  ac_cv_path_TN3270="$TN3270" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_TN3270="$TN3270" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_TN3270="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+TN3270="$ac_cv_path_TN3270"
+if test -n "$TN3270"; then
+  echo "$ac_t""$TN3270" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$TN3270" && break
+done
+test -n "$TN3270" || TN3270="$TN3270"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_TN3270
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 15329) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define TN3270_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define TN3270_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+test -z "$RLOGIN" && RLOGIN=rlogin
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:15348: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_RLOGIN'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$RLOGIN" in
+  /*)
+  ac_cv_path_RLOGIN="$RLOGIN" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_RLOGIN="$RLOGIN" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_RLOGIN="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+RLOGIN="$ac_cv_path_RLOGIN"
+if test -n "$RLOGIN"; then
+  echo "$ac_t""$RLOGIN" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$RLOGIN" && break
+done
+test -n "$RLOGIN" || RLOGIN="$RLOGIN"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_RLOGIN
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 15439) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define RLOGIN_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define RLOGIN_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+
+test -z "$MV" && MV=mv
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:15459: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$MV" in
+  /*)
+  ac_cv_path_MV="$MV" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_MV="$MV" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_MV="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+MV="$ac_cv_path_MV"
+if test -n "$MV"; then
+  echo "$ac_t""$MV" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$MV" && break
+done
+test -n "$MV" || MV="$MV"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_MV
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 15550) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define MV_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define MV_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+
+test -z "$GZIP" && GZIP=gzip
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:15570: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$GZIP" in
+  /*)
+  ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_GZIP="$GZIP" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_GZIP="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+GZIP="$ac_cv_path_GZIP"
+if test -n "$GZIP"; then
+  echo "$ac_t""$GZIP" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$GZIP" && break
+done
+test -n "$GZIP" || GZIP="$GZIP"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_GZIP
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 15661) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define GZIP_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define GZIP_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+test -z "$UNCOMPRESS" && UNCOMPRESS=gunzip
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:15680: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_UNCOMPRESS'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$UNCOMPRESS" in
+  /*)
+  ac_cv_path_UNCOMPRESS="$UNCOMPRESS" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_UNCOMPRESS="$UNCOMPRESS" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_UNCOMPRESS="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+UNCOMPRESS="$ac_cv_path_UNCOMPRESS"
+if test -n "$UNCOMPRESS"; then
+  echo "$ac_t""$UNCOMPRESS" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$UNCOMPRESS" && break
+done
+test -n "$UNCOMPRESS" || UNCOMPRESS="$UNCOMPRESS"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_UNCOMPRESS
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 15771) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define UNCOMPRESS_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define UNCOMPRESS_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+test -z "$UNZIP" && UNZIP=unzip
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:15790: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$UNZIP" in
+  /*)
+  ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_UNZIP="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+UNZIP="$ac_cv_path_UNZIP"
+if test -n "$UNZIP"; then
+  echo "$ac_t""$UNZIP" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$UNZIP" && break
+done
+test -n "$UNZIP" || UNZIP="$UNZIP"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_UNZIP
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 15881) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define UNZIP_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define UNZIP_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+test -z "$BZIP2" && BZIP2=bzip2
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:15900: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_BZIP2'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$BZIP2" in
+  /*)
+  ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_BZIP2="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+BZIP2="$ac_cv_path_BZIP2"
+if test -n "$BZIP2"; then
+  echo "$ac_t""$BZIP2" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$BZIP2" && break
+done
+test -n "$BZIP2" || BZIP2="$BZIP2"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_BZIP2
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 15991) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define BZIP2_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define BZIP2_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+if test ".$use_dired" != ".no" ; then
+
+
+test -z "$COMPRESS" && COMPRESS=compress
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16013: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$COMPRESS" in
+  /*)
+  ac_cv_path_COMPRESS="$COMPRESS" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_COMPRESS="$COMPRESS" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_COMPRESS="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+COMPRESS="$ac_cv_path_COMPRESS"
+if test -n "$COMPRESS"; then
+  echo "$ac_t""$COMPRESS" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$COMPRESS" && break
+done
+test -n "$COMPRESS" || COMPRESS="$COMPRESS"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_COMPRESS
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 16104) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define COMPRESS_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define COMPRESS_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+test -z "$RM" && RM=rm
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16123: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$RM" in
+  /*)
+  ac_cv_path_RM="$RM" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_RM="$RM" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_RM="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+RM="$ac_cv_path_RM"
+if test -n "$RM"; then
+  echo "$ac_t""$RM" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$RM" && break
+done
+test -n "$RM" || RM="$RM"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_RM
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 16214) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define RM_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define RM_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+test -z "$TAR" && TAR=tar
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16233: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$TAR" in
+  /*)
+  ac_cv_path_TAR="$TAR" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_TAR="$TAR" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_TAR="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+TAR="$ac_cv_path_TAR"
+if test -n "$TAR"; then
+  echo "$ac_t""$TAR" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$TAR" && break
+done
+test -n "$TAR" || TAR="$TAR"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_TAR
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 16324) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define TAR_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define TAR_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+test -z "$UUDECODE" && UUDECODE=uudecode
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16343: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_UUDECODE'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$UUDECODE" in
+  /*)
+  ac_cv_path_UUDECODE="$UUDECODE" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_UUDECODE="$UUDECODE" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_UUDECODE="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+UUDECODE="$ac_cv_path_UUDECODE"
+if test -n "$UUDECODE"; then
+  echo "$ac_t""$UUDECODE" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$UUDECODE" && break
+done
+test -n "$UUDECODE" || UUDECODE="$UUDECODE"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_UUDECODE
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 16434) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define UUDECODE_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define UUDECODE_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+test -z "$ZCAT" && ZCAT=zcat
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16453: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_ZCAT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$ZCAT" in
+  /*)
+  ac_cv_path_ZCAT="$ZCAT" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_ZCAT="$ZCAT" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_ZCAT="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+ZCAT="$ac_cv_path_ZCAT"
+if test -n "$ZCAT"; then
+  echo "$ac_t""$ZCAT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$ZCAT" && break
+done
+test -n "$ZCAT" || ZCAT="$ZCAT"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_ZCAT
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 16544) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define ZCAT_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define ZCAT_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+test -z "$ZIP" && ZIP=zip
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16563: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$ZIP" in
+  /*)
+  ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_ZIP="$ZIP" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_ZIP="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+ZIP="$ac_cv_path_ZIP"
+if test -n "$ZIP"; then
+  echo "$ac_t""$ZIP" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$ZIP" && break
+done
+test -n "$ZIP" || ZIP="$ZIP"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_ZIP
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 16654) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define ZIP_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define ZIP_ARGS "$cf_path_args"
+EOF
+
+fi
+
+
+
+case $TAR in
+*pax)
+	TAR_UP_OPTIONS="-w"
+	TAR_DOWN_OPTIONS="-r"
+	TAR_PIPE_OPTIONS=""
+	TAR_FILE_OPTIONS="-f"
+	;;
+*star)
+	TAR_UP_OPTIONS="-c -f"
+	TAR_DOWN_OPTIONS="-x -U -f"
+	TAR_PIPE_OPTIONS="-"
+	TAR_FILE_OPTIONS=""
+	;;
+*tar)
+	# FIXME: some versions of tar require, some don't allow the "-"
+	TAR_UP_OPTIONS="-cf"
+	TAR_DOWN_OPTIONS="-xf"
+	TAR_PIPE_OPTIONS="-"
+	TAR_FILE_OPTIONS=""
+	;;
+esac
+
+
+
+
+
+
+cat >> confdefs.h <<EOF
+#define TAR_UP_OPTIONS "$TAR_UP_OPTIONS"
+EOF
+
+cat >> confdefs.h <<EOF
+#define TAR_DOWN_OPTIONS "$TAR_DOWN_OPTIONS"
+EOF
+
+cat >> confdefs.h <<EOF
+#define TAR_FILE_OPTIONS "$TAR_FILE_OPTIONS"
+EOF
+
+cat >> confdefs.h <<EOF
+#define TAR_PIPE_OPTIONS "$TAR_PIPE_OPTIONS"
+EOF
+
+
+case "$INSTALL" in
+$srcdir*) # (vi
+	cat >> confdefs.h <<EOF
+#define INSTALL_PATH "install"
+EOF
+
+	;;
+*) # (vi
+	cf_save_INSTALL="$INSTALL"
+	
+test -z "$INSTALL" && INSTALL=install
+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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16728: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_INSTALL'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$INSTALL" in
+  /*)
+  ac_cv_path_INSTALL="$INSTALL" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_INSTALL="$INSTALL" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_INSTALL="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+INSTALL="$ac_cv_path_INSTALL"
+if test -n "$INSTALL"; then
+  echo "$ac_t""$INSTALL" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$INSTALL" && break
+done
+test -n "$INSTALL" || INSTALL="$INSTALL"
+
+
+cf_path_prog=""
+cf_path_args=""
+IFS="${IFS= 	}"; cf_save_ifs="$IFS"
+case $host_os in #(vi
+os2*) #(vi
+	IFS="${IFS};"
+	;;
+*)
+	IFS="${IFS}:"
+	;;
+esac
+
+for cf_temp in $ac_cv_path_INSTALL
+do
+	if test -z "$cf_path_prog" ; then
+		if test "$with_full_paths" = yes ; then
+			
+case ".$cf_temp" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval cf_temp="$cf_temp"
+  case ".$cf_temp" in #(vi
+  .NONE/*)
+    cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+    ;;
+  esac
+  ;; #(vi
+.NONE/*)
+  cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%`
+  ;;
+*)
+  break
+  ;;
+esac
+
+			cf_path_prog="$cf_temp"
+		else
+			cf_path_prog="`basename $cf_temp`"
+		fi
+	elif test -z "$cf_path_args" ; then
+		cf_path_args="$cf_temp"
+	else
+		cf_path_args="$cf_path_args $cf_temp"
+	fi
+done
+IFS="$cf_save_ifs"
+
+if test -n "$cf_path_prog" ; then
+	
+echo "(line 16819) testing defining path for ${cf_path_prog} ..." 1>&5
+
+	cat >> confdefs.h <<EOF
+#define INSTALL_PATH "$cf_path_prog"
+EOF
+
+	test -n "$cf_path_args" && cat >> confdefs.h <<EOF
+#define INSTALL_ARGS "$cf_path_args"
+EOF
+
+fi
+
+	INSTALL="$cf_save_INSTALL"
+	;;
+esac
+fi
+
+COMPRESS_PROG=
+COMPRESS_EXT=
+if test $use_gzip_help = yes ; then
+	COMPRESS_PROG="$ac_cv_path_GZIP -9"
+	COMPRESS_EXT=.gz
+fi
+
+
+
 if test $cf_cv_screen = pdcurses ; then
 	
 	# If we find X, set shell vars x_includes and x_libraries to the
@@ -14360,7 +16848,7 @@ if test $cf_cv_screen = pdcurses ; then
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:14364: checking for X" >&5
+echo "configure:16852: checking for X" >&5
 
 
 # Check whether --with-x or --without-x was given.
@@ -14423,12 +16911,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 14427 "configure"
+#line 16915 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14497,14 +16985,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14501 "configure"
+#line 16989 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:14508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -14604,7 +17092,7 @@ clix*)
 	# FIXME: modify the library lookup in autoconf to
 	# allow _s.a suffix ahead of .a
 	echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6
-echo "configure:14608: checking for open in -lc_s" >&5
+echo "configure:17096: checking for open in -lc_s" >&5
 ac_lib_var=`echo c_s'_'open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14612,7 +17100,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14616 "configure"
+#line 17104 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14623,7 +17111,7 @@ int main() {
 open()
 ; return 0; }
 EOF
-if { (eval echo configure:14627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14640,7 +17128,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   LIBS="-lc_s $LIBS"
 	echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6
-echo "configure:14644: checking for gethostname in -lbsd" >&5
+echo "configure:17132: checking for gethostname in -lbsd" >&5
 ac_lib_var=`echo bsd'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14648,7 +17136,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14652 "configure"
+#line 17140 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14659,7 +17147,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:14663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14676,7 +17164,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   LIBS="-lbsd $LIBS"
 	echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6
-echo "configure:14680: checking for gethostname in -lnsl_s" >&5
+echo "configure:17168: checking for gethostname in -lnsl_s" >&5
 ac_lib_var=`echo nsl_s'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14684,7 +17172,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14688 "configure"
+#line 17176 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14695,7 +17183,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:14699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14712,7 +17200,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   LIBS="-lnsl_s $LIBS"
 	echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6
-echo "configure:14716: checking for XOpenDisplay in -lX11_s" >&5
+echo "configure:17204: checking for XOpenDisplay in -lX11_s" >&5
 ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14720,7 +17208,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lX11_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14724 "configure"
+#line 17212 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14731,7 +17219,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:14735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14748,7 +17236,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   LIBS="-lX11_s $LIBS"
 	echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6
-echo "configure:14752: checking for XtAppInitialize in -lXt_s" >&5
+echo "configure:17240: checking for XtAppInitialize in -lXt_s" >&5
 ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14756,7 +17244,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXt_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14760 "configure"
+#line 17248 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14767,7 +17255,7 @@ int main() {
 XtAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:14771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14808,7 +17296,7 @@ fi
 	;;
 *)
 	echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:14812: checking for socket in -lsocket" >&5
+echo "configure:17300: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14816,7 +17304,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14820 "configure"
+#line 17308 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14827,7 +17315,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:14831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14855,7 +17343,7 @@ else
 fi
 
 	echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:14859: checking for gethostname in -lnsl" >&5
+echo "configure:17347: checking for gethostname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14863,7 +17351,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14867 "configure"
+#line 17355 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14874,7 +17362,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:14878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14925,17 +17413,17 @@ else
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:14929: checking whether -R must be followed by a space" >&5
+echo "configure:17417: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 14932 "configure"
+#line 17420 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:14939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -14951,14 +17439,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 14955 "configure"
+#line 17443 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:14962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -14990,7 +17478,7 @@ rm -f conftest*
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:14994: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:17482: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14998,7 +17486,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15002 "configure"
+#line 17490 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15009,7 +17497,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:15013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15031,7 +17519,7 @@ fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:15035: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:17523: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15039,7 +17527,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15043 "configure"
+#line 17531 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15050,7 +17538,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:15054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15079,12 +17567,12 @@ fi
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:15083: checking for gethostbyname" >&5
+echo "configure:17571: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15088 "configure"
+#line 17576 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -15107,7 +17595,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -15128,7 +17616,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:15132: checking for gethostbyname in -lnsl" >&5
+echo "configure:17620: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15136,7 +17624,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15140 "configure"
+#line 17628 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15147,7 +17635,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:15151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15177,12 +17665,12 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:15181: checking for connect" >&5
+echo "configure:17669: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15186 "configure"
+#line 17674 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -15205,7 +17693,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -15226,7 +17714,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:15230: checking for connect in -lsocket" >&5
+echo "configure:17718: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15234,7 +17722,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15238 "configure"
+#line 17726 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15245,7 +17733,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:15249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15269,12 +17757,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:15273: checking for remove" >&5
+echo "configure:17761: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15278 "configure"
+#line 17766 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -15297,7 +17785,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -15318,7 +17806,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:15322: checking for remove in -lposix" >&5
+echo "configure:17810: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15326,7 +17814,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15330 "configure"
+#line 17818 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15337,7 +17825,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:15341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15361,12 +17849,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:15365: checking for shmat" >&5
+echo "configure:17853: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15370 "configure"
+#line 17858 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -15389,7 +17877,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -15410,7 +17898,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:15414: checking for shmat in -lipc" >&5
+echo "configure:17902: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15418,7 +17906,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15422 "configure"
+#line 17910 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15429,7 +17917,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:15433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15462,7 +17950,7 @@ fi
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:15466: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:17954: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15470,7 +17958,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15474 "configure"
+#line 17962 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15481,7 +17969,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:15485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15507,26 +17995,72 @@ fi
 
 	LDFLAGS="$LDFLAGS $X_LIBS"
 	
+test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+
+cf_check_cflags="$CFLAGS"
+cf_check_cppflags="$CPPFLAGS"
+
+cf_new_cflags=
+cf_new_cppflags=
 for cf_add_cflags in $X_CFLAGS
 do
 	case $cf_add_cflags in #(vi
 	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
 		case "$CPPFLAGS" in
-		*$cf_add_cflags)
+		*$cf_add_cflags) #(vi
 			;;
-		*)
-			CPPFLAGS="$CPPFLAGS $cf_add_cflags"
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
 		;;
 	*)
-		CFLAGS="$CFLAGS $cf_add_cflags"
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
 		;;
 	esac
 done
 
+if test -n "$cf_new_cflags" ; then
+	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+
+if test "$cf_check_cflags" != "$CFLAGS" ; then
+cat > conftest.$ac_ext <<EOF
+#line 18039 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+printf("Hello world");
+; return 0; }
+EOF
+if { (eval echo configure:18046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+
+	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+
+	 fi
+	 CFLAGS="$cf_check_flags"
+fi
+rm -f conftest*
+fi
+
 	echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:15530: checking for XOpenDisplay in -lX11" >&5
+echo "configure:18064: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15534,7 +18068,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15538 "configure"
+#line 18072 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15545,7 +18079,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:15549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15566,7 +18100,7 @@ else
 fi
 
 	echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:15570: checking for XtAppInitialize in -lXt" >&5
+echo "configure:18104: checking for XtAppInitialize in -lXt" >&5
 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15574,7 +18108,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15578 "configure"
+#line 18112 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15585,7 +18119,7 @@ int main() {
 XtAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:15589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15613,24 +18147,70 @@ fi
 else
 	LDFLAGS="$LDFLAGS $X_LIBS"
 	
+test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+
+cf_check_cflags="$CFLAGS"
+cf_check_cppflags="$CPPFLAGS"
+
+cf_new_cflags=
+cf_new_cppflags=
 for cf_add_cflags in $X_CFLAGS
 do
 	case $cf_add_cflags in #(vi
 	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
 		case "$CPPFLAGS" in
-		*$cf_add_cflags)
+		*$cf_add_cflags) #(vi
 			;;
-		*)
-			CPPFLAGS="$CPPFLAGS $cf_add_cflags"
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
 		;;
 	*)
-		CFLAGS="$CFLAGS $cf_add_cflags"
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
 		;;
 	esac
 done
 
+if test -n "$cf_new_cflags" ; then
+	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+
+if test "$cf_check_cflags" != "$CFLAGS" ; then
+cat > conftest.$ac_ext <<EOF
+#line 18191 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+printf("Hello world");
+; return 0; }
+EOF
+if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+
+	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+
+	 fi
+	 CFLAGS="$cf_check_flags"
+fi
+rm -f conftest*
+fi
+
 fi
 
 if test $cf_have_X_LIBS = no ; then
@@ -15659,8 +18239,15 @@ fi
 
 
 
+# Check whether --with-XawPlus or --without-XawPlus was given.
+if test "${with_XawPlus+set}" = set; then
+  withval="$with_XawPlus"
+  cf_x_athena=XawPlus
+fi
+
+
 echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:15664: checking for XextCreateExtension in -lXext" >&5
+echo "configure:18251: checking for XextCreateExtension in -lXext" >&5
 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15668,7 +18255,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXext  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15672 "configure"
+#line 18259 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15679,7 +18266,7 @@ int main() {
 XextCreateExtension()
 ; return 0; }
 EOF
-if { (eval echo configure:15683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15700,29 +18287,31 @@ else
 fi
 
 
-cf_x_athena_include=""
 cf_x_athena_lib=""
 
+
+cf_x_athena_root=$cf_x_athena
+cf_x_athena_include=""
+
 for cf_path in default \
 	/usr/contrib/X11R6 \
 	/usr/contrib/X11R5 \
 	/usr/lib/X11R5 \
 	/usr/local
 do
-
 	if test -z "$cf_x_athena_include" ; then
 		cf_save="$CPPFLAGS"
-		cf_test=X11/$cf_x_athena/SimpleMenu.h
+		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="-I$cf_path/include $cf_save"
 			echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6
-echo "configure:15720: checking for $cf_test in $cf_path" >&5
+echo "configure:18309: checking for $cf_test in $cf_path" >&5
 		else
 			echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
-echo "configure:15723: checking for $cf_test" >&5
+echo "configure:18312: checking for $cf_test" >&5
 		fi
 		cat > conftest.$ac_ext <<EOF
-#line 15726 "configure"
+#line 18315 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -15731,7 +18320,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:15735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -15744,12 +18333,33 @@ rm -f conftest*
 		echo "$ac_t""$cf_result" 1>&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
+			break
 		else
 			CPPFLAGS="$cf_save"
 		fi
 	fi
+done
+
+if test -z "$cf_x_athena_include" ; then
+	echo "configure: warning: Unable to successfully find Athena header files with test program" 1>&2
+elif test "$cf_x_athena_include" != default ; then
+	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include"
+fi
+
+
+cf_x_athena_root=$cf_x_athena
+cf_x_athena_lib=""
 
-	for cf_lib in "-l$cf_x_athena -lXmu" "-l${cf_x_athena}_s -lXmu_s"
+for cf_path in default \
+	/usr/contrib/X11R6 \
+	/usr/contrib/X11R5 \
+	/usr/lib/X11R5 \
+	/usr/local
+do
+	for cf_lib in \
+		"-l$cf_x_athena_root -lXmu" \
+		"-l$cf_x_athena_root -lXpm -lXmu" \
+		"-l${cf_x_athena_root}_s -lXmu_s"
 	do
 		if test -z "$cf_x_athena_lib" ; then
 			cf_save="$LIBS"
@@ -15757,21 +18367,23 @@ rm -f conftest*
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
 				echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6
-echo "configure:15761: checking for $cf_lib in $cf_path" >&5
+echo "configure:18371: checking for $cf_lib in $cf_path" >&5
 			else
 				LIBS="$cf_lib $LIBS"
 				echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6
-echo "configure:15765: checking for $cf_test in $cf_lib" >&5
+echo "configure:18375: checking for $cf_test in $cf_lib" >&5
 			fi
+			cf_SAVE="$LIBS"
+			LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
 			cat > conftest.$ac_ext <<EOF
-#line 15768 "configure"
+#line 18380 "configure"
 #include "confdefs.h"
 
 int main() {
 $cf_test()
 ; return 0; }
 EOF
-if { (eval echo configure:15775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -15784,6 +18396,8 @@ rm -f conftest*
 			echo "$ac_t""$cf_result" 1>&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
+				LIBS="$cf_SAVE"
+				break
 			else
 				LIBS="$cf_save"
 			fi
@@ -15791,46 +18405,89 @@ rm -f conftest*
 	done
 done
 
-if test -z "$cf_x_athena_include" ; then
-	echo "configure: warning: Unable to successfully find Athena header files with test program" 1>&2
-fi
-
 if test -z "$cf_x_athena_lib" ; then
-	{ echo "configure: error: Unable to successfully link Athena library (-l$cf_x_athena) with test program" 1>&2; exit 1; }
+	{ echo "configure: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" 1>&2; exit 1; }
 fi
 
 
-CF_X_ATHENA_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 cat >> confdefs.h <<EOF
-#define $CF_X_ATHENA_LIBS 1
+#define $cf_x_athena_LIBS 1
 EOF
 
 
 
 
+
 LDFLAGS="$LDFLAGS $X_LIBS"
 
+test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+
+cf_check_cflags="$CFLAGS"
+cf_check_cppflags="$CPPFLAGS"
+
+cf_new_cflags=
+cf_new_cppflags=
 for cf_add_cflags in $X_CFLAGS
 do
 	case $cf_add_cflags in #(vi
 	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
 		case "$CPPFLAGS" in
-		*$cf_add_cflags)
+		*$cf_add_cflags) #(vi
 			;;
-		*)
-			CPPFLAGS="$CPPFLAGS $cf_add_cflags"
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
 		;;
 	*)
-		CFLAGS="$CFLAGS $cf_add_cflags"
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
 		;;
 	esac
 done
 
+if test -n "$cf_new_cflags" ; then
+	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+
+if test "$cf_check_cflags" != "$CFLAGS" ; then
+cat > conftest.$ac_ext <<EOF
+#line 18466 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int main() {
+printf("Hello world");
+; return 0; }
+EOF
+if { (eval echo configure:18473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+
+	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+
+	 fi
+	 CFLAGS="$cf_check_flags"
+fi
+rm -f conftest*
+fi
+
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:15834: checking for XOpenDisplay in -lX11" >&5
+echo "configure:18491: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15838,7 +18495,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15842 "configure"
+#line 18499 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15849,7 +18506,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:15853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15870,14 +18527,14 @@ else
 fi
 
 echo $ac_n "checking for XCurses library""... $ac_c" 1>&6
-echo "configure:15874: checking for XCurses library" >&5
+echo "configure:18531: checking for XCurses library" >&5
 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 LIBS="-lXCurses $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15881 "configure"
+#line 18538 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -15887,7 +18544,7 @@ int main() {
 XCursesExit();
 ; return 0; }
 EOF
-if { (eval echo configure:15891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_lib_XCurses=yes
 else
@@ -15921,7 +18578,7 @@ fi
 else
 	
 echo $ac_n "checking if we can include termio.h with curses""... $ac_c" 1>&6
-echo "configure:15925: checking if we can include termio.h with curses" >&5
+echo "configure:18582: checking if we can include termio.h with curses" >&5
 if eval "test \"`echo '$''{'cf_cv_termio_and_curses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -15930,7 +18587,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 <<EOF
-#line 15934 "configure"
+#line 18591 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -15939,7 +18596,7 @@ int main() {
 putchar(0x0a)
 ; return 0; }
 EOF
-if { (eval echo configure:15943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_termio_and_curses=yes
 else
@@ -15963,21 +18620,855 @@ EOF
 
 fi
 
+### These tests must be run after establishing the curses library.
+if test $cf_cv_screen != slang ; then
+	for ac_hdr in $cf_cv_screen/term.h term.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:18630: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 18635 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:18640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+	
+echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6
+echo "configure:18668: checking if curses supports alternate-character set" >&5
+if eval "test \"`echo '$''{'cf_cv_alt_char_set'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+for mapname in acs_map _acs_map
+do
+	cat > conftest.$ac_ext <<EOF
+#line 18676 "configure"
+#include "confdefs.h"
+
+#include <${cf_cv_ncurses_header-curses.h}>
+	
+int main() {
+chtype x = $mapname['l']; $mapname['m'] = 0
+; return 0; }
+EOF
+if { (eval echo configure:18685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_cv_alt_char_set=$mapname
+	 break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_alt_char_set=no
+fi
+rm -f conftest*
+done
+	
+fi
+
+echo "$ac_t""$cf_cv_alt_char_set" 1>&6
+test $cf_cv_alt_char_set != no && cat >> confdefs.h <<EOF
+#define ALT_CHAR_SET $cf_cv_alt_char_set
+EOF
+
+
+	
+echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6
+echo "configure:18708: checking if curses supports fancy attributes" >&5
+if eval "test \"`echo '$''{'cf_cv_fancy_curses'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	cat > conftest.$ac_ext <<EOF
+#line 18714 "configure"
+#include "confdefs.h"
+
+#include <${cf_cv_ncurses_header-curses.h}>
+
+int main() {
+attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
+	 wattrset(stdscr, A_BLINK|A_DIM);
+	 attroff(A_BOLD);
+	 keypad(stdscr,TRUE);
+	
+; return 0; }
+EOF
+if { (eval echo configure:18727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_cv_fancy_curses=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_fancy_curses=no
+fi
+rm -f conftest*
+	
+fi
+
+echo "$ac_t""$cf_cv_fancy_curses" 1>&6
+test $cf_cv_fancy_curses = yes && cat >> confdefs.h <<\EOF
+#define FANCY_CURSES 1
+EOF
+
+
+	
+
+if test "$cf_cv_ncurses_version" != no ; then
+echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6
+echo "configure:18750: checking for obsolete/broken version of ncurses" >&5
+if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+cat > conftest.$ac_ext <<EOF
+#line 18756 "configure"
+#include "confdefs.h"
+
+#include <${cf_cv_ncurses_header-curses.h}>
+int main() {
+
+#if defined(NCURSES_VERSION) && defined(wgetbkgd)
+	make an error
+#else
+	int x = 1
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:18770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_ncurses_broken=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_ncurses_broken=yes
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_ncurses_broken" 1>&6
+if test "$cf_cv_ncurses_broken" = yes ; then
+	echo "configure: warning: hmm... you should get an up-to-date version of ncurses" 1>&2
+	cat >> confdefs.h <<\EOF
+#define NCURSES_BROKEN 1
+EOF
+
+fi
+fi
+
+	
+echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6
+echo "configure:18795: checking if curses supports color attributes" >&5
+if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	cat > conftest.$ac_ext <<EOF
+#line 18801 "configure"
+#include "confdefs.h"
+
+#include <${cf_cv_ncurses_header-curses.h}>
+
+int main() {
+chtype x = COLOR_BLUE;
+	 has_colors();
+	 start_color();
+#ifndef NCURSES_BROKEN
+	 wbkgd(curscr, getbkgd(stdscr)); /* X/Open XPG4 aka SVr4 Curses */
+#endif
+	
+; return 0; }
+EOF
+if { (eval echo configure:18816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_cv_color_curses=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_color_curses=no
+fi
+rm -f conftest*
+	
+fi
+
+echo "$ac_t""$cf_cv_color_curses" 1>&6
+if test $cf_cv_color_curses = yes ; then
+	cat >> confdefs.h <<\EOF
+#define COLOR_CURSES 1
+EOF
+
+	test ".$cf_cv_ncurses_broken" != .yes && cat >> confdefs.h <<\EOF
+#define HAVE_GETBKGD 1
+EOF
+
+fi
+
+	
+for ac_hdr in \
+termio.h \
+termios.h \
+unistd.h \
+
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:18850: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 18855 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:18860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+if test "$ISC" = yes ; then
+	for ac_hdr in sys/termio.h 
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:18891: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 18896 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:18901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+fi
+if test "$ac_cv_header_termios_h" = yes ; then
+	case "$CFLAGS $CPPFLAGS" in
+	*-D_POSIX_SOURCE*)
+		termios_bad=dunno ;;
+	*)	termios_bad=maybe ;;
+	esac
+	if test "$termios_bad" = maybe ; then
+	echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6
+echo "configure:18936: checking whether termios.h needs _POSIX_SOURCE" >&5
+	cat > conftest.$ac_ext <<EOF
+#line 18938 "configure"
+#include "confdefs.h"
+#include <termios.h>
+int main() {
+struct termios foo; int x = foo.c_iflag
+; return 0; }
+EOF
+if { (eval echo configure:18945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  termios_bad=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+		cat > conftest.$ac_ext <<EOF
+#line 18954 "configure"
+#include "confdefs.h"
+
+#define _POSIX_SOURCE
+#include <termios.h>
+int main() {
+struct termios foo; int x = foo.c_iflag
+; return 0; }
+EOF
+if { (eval echo configure:18963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  termios_bad=unknown
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  termios_bad=yes cat >> confdefs.h <<\EOF
+#define SVR4_TERMIO 1
+EOF
+
+fi
+rm -f conftest*
+			
+fi
+rm -f conftest*
+	echo "$ac_t""$termios_bad" 1>&6
+	fi
+fi
+
+
+
+echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6
+echo "configure:18986: checking declaration of size-change" >&5
+if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    cf_cv_sizechange=unknown
+    cf_save_CPPFLAGS="$CPPFLAGS"
+
+for cf_opts in "" "NEED_PTEM_H"
+do
+
+    CPPFLAGS="$cf_save_CPPFLAGS"
+    test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
+    cat > conftest.$ac_ext <<EOF
+#line 19000 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#else
+#ifdef HAVE_TERMIO_H
+#include <termio.h>
+#endif
+#endif
+#ifdef NEED_PTEM_H
+/* This is a workaround for SCO:  they neglected to define struct winsize in
+ * termios.h -- it's only in termio.h and ptem.h
+ */
+#include        <sys/stream.h>
+#include        <sys/ptem.h>
+#endif
+#if !defined(sun) || !defined(HAVE_TERMIOS_H)
+#include <sys/ioctl.h>
+#endif
+
+int main() {
+
+#ifdef TIOCGSIZE
+	struct ttysize win;	/* FIXME: what system is this? */
+	int y = win.ts_lines;
+	int x = win.ts_cols;
+#else
+#ifdef TIOCGWINSZ
+	struct winsize win;
+	int y = win.ws_row;
+	int x = win.ws_col;
+#else
+	no TIOCGSIZE or TIOCGWINSZ
+#endif /* TIOCGWINSZ */
+#endif /* TIOCGSIZE */
+	
+; return 0; }
+EOF
+if { (eval echo configure:19039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_sizechange=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_sizechange=no
+fi
+rm -f conftest*
+
+	CPPFLAGS="$cf_save_CPPFLAGS"
+	if test "$cf_cv_sizechange" = yes ; then
+		echo "size-change succeeded ($cf_opts)" >&5
+		test -n "$cf_opts" && cf_cv_sizechange="$cf_opts"
+		break
+	fi
+done
+
+fi
+
+echo "$ac_t""$cf_cv_sizechange" 1>&6
+if test "$cf_cv_sizechange" != no ; then
+	cat >> confdefs.h <<\EOF
+#define HAVE_SIZECHANGE 1
+EOF
+
+	case $cf_cv_sizechange in #(vi
+	NEED*)
+		cat >> confdefs.h <<EOF
+#define $cf_cv_sizechange  1
+EOF
+
+		;;
+	esac
+fi
+
+	
+echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6
+echo "configure:19078: checking if ttytype is declared in curses library" >&5
+if eval "test \"`echo '$''{'cf_cv_have_ttytype'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	cat > conftest.$ac_ext <<EOF
+#line 19084 "configure"
+#include "confdefs.h"
+#include <${cf_cv_ncurses_header-curses.h}>
+int main() {
+char *x = &ttytype[1]; *x = 1
+; return 0; }
+EOF
+if { (eval echo configure:19091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_cv_have_ttytype=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_have_ttytype=no
+fi
+rm -f conftest*
+	
+fi
+
+echo "$ac_t""$cf_cv_have_ttytype" 1>&6
+test $cf_cv_have_ttytype = yes && cat >> confdefs.h <<\EOF
+#define HAVE_TTYTYPE 1
+EOF
+
+
+	
+echo $ac_n "checking if curses supports wide characters""... $ac_c" 1>&6
+echo "configure:19112: checking if curses supports wide characters" >&5
+if eval "test \"`echo '$''{'cf_cv_widec_curses'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+cat > conftest.$ac_ext <<EOF
+#line 19118 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <${cf_cv_ncurses_header-curses.h}>
+int main() {
+
+    wchar_t temp[2];
+    wchar_t wch = 'A';
+    temp[0] = wch;
+    waddnwstr(stdscr, temp, 1);
+
+; return 0; }
+EOF
+if { (eval echo configure:19132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_cv_widec_curses=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_widec_curses=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_widec_curses" 1>&6
+
+if test "$cf_cv_widec_curses" = yes ; then
+	cat >> confdefs.h <<\EOF
+#define WIDEC_CURSES 1
+EOF
+
+
+	# This is needed on Tru64 5.0 to declare mbstate_t
+	echo $ac_n "checking if we must include wchar.h to declare mbstate_t""... $ac_c" 1>&6
+echo "configure:19155: checking if we must include wchar.h to declare mbstate_t" >&5
+if eval "test \"`echo '$''{'cf_cv_widec_mbstate'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	cat > conftest.$ac_ext <<EOF
+#line 19161 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <${cf_cv_ncurses_header-curses.h}>
+int main() {
+mbstate_t state
+; return 0; }
+EOF
+if { (eval echo configure:19170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_widec_mbstate=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 19178 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <wchar.h>
+#include <${cf_cv_ncurses_header-curses.h}>
+int main() {
+mbstate_t state
+; return 0; }
+EOF
+if { (eval echo configure:19188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_widec_mbstate=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_widec_mbstate=unknown
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$cf_cv_widec_mbstate" 1>&6
+
+if test "$cf_cv_widec_mbstate" = yes ; then
+	cat >> confdefs.h <<\EOF
+#define NEED_WCHAR_H 1
+EOF
+
+fi
+
+if test "$cf_cv_widec_mbstate" != unknown ; then
+	cat >> confdefs.h <<\EOF
+#define HAVE_MBSTATE_T 1
+EOF
+
+fi
+
+fi
+
+	
+echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6
+echo "configure:19222: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+cat > conftest.$ac_ext <<EOF
+#line 19228 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <${cf_cv_ncurses_header-curses.h}>
+int main() {
+
+	long x = winnstr(stdscr, "", 0);
+	int x1, y1;
+	getbegyx(stdscr, y1, x1)
+; return 0; }
+EOF
+if { (eval echo configure:19240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_cv_need_xopen_extension=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 19248 "configure"
+#include "confdefs.h"
+
+#define _XOPEN_SOURCE_EXTENDED
+#include <stdlib.h>
+#include <${cf_cv_ncurses_header-curses.h}>
+int main() {
+
+	long x = winnstr(stdscr, "", 0);
+	int x1, y1;
+	getbegyx(stdscr, y1, x1)
+; return 0; }
+EOF
+if { (eval echo configure:19261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_cv_need_xopen_extension=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_need_xopen_extension=unknown
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$cf_cv_need_xopen_extension" 1>&6
+test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+
+
+echo $ac_n "checking for term.h""... $ac_c" 1>&6
+echo "configure:19280: checking for term.h" >&5
+if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+
+# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
+# for <term.h> if we do not find the variant.
+for cf_header in \
+	`echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \
+	term.h
+do
+	cat > conftest.$ac_ext <<EOF
+#line 19293 "configure"
+#include "confdefs.h"
+
+#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_header}>
+int main() {
+WINDOW *x
+; return 0; }
+EOF
+if { (eval echo configure:19302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cf_cv_term_header=$cf_header
+	 break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_cv_term_header=no
+fi
+rm -f conftest*
+done
+
+fi
+
+echo "$ac_t""$cf_cv_term_header" 1>&6
+
+case $cf_cv_term_header in #(vi
+term.h) #(vi
+	cat >> confdefs.h <<\EOF
+#define HAVE_TERM_H 1
+EOF
+
+	;;
+ncurses/term.h)
+	cat >> confdefs.h <<\EOF
+#define HAVE_NCURSES_TERM_H 1
+EOF
+
+	;;
+ncursesw/term.h)
+	cat >> confdefs.h <<\EOF
+#define HAVE_NCURSESW_TERM_H 1
+EOF
+
+	;;
+esac
+
+
+
+
+for cf_func in \
+		assume_default_colors \
+		cbreak \
+		define_key \
+		delscreen \
+		getattrs \
+		getbegx \
+		getbegy \
+		keypad \
+		napms \
+		newpad \
+		newterm \
+		pnoutrefresh \
+		resizeterm \
+		touchline \
+		touchwin \
+		use_default_colors \
+		wattr_get \
+		wborder \
+		wredrawln \
+		wresize \
+		
+do
+	
+cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+	echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6
+echo "configure:19370: checking for ${cf_func}" >&5
+	
+echo "(line 19372) testing ${cf_func} ..." 1>&5
+
+	if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+		eval cf_result='$ac_cv_func_'$cf_func
+		if test ".$cf_result" != ".no"; then
+			cat > conftest.$ac_ext <<EOF
+#line 19381 "configure"
+#include "confdefs.h"
+
+#ifdef HAVE_XCURSES
+#include <xcurses.h>
+char * XCursesProgramName = "test";
+#else
+#include <${cf_cv_ncurses_header-curses.h}>
+#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
+#include <ncursesw/term.h>
+#else
+#if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
+#include <ncurses/term.h>
+#else
+#ifdef HAVE_TERM_H
+#include <term.h>
+#endif
+#endif
+#endif
+#endif
+int main() {
+
+#ifndef ${cf_func}
+long foo = (long)(&${cf_func});
+exit(foo == 0);
+#endif
+			
+; return 0; }
+EOF
+if { (eval echo configure:19410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  cf_result=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cf_result=no
+fi
+rm -f conftest*
+		fi
+		eval 'cf_cv_func_'$cf_func'=$cf_result'
+	
+fi
+
+	# use the computed/retrieved cache-value:
+	eval 'cf_result=$cf_cv_func_'$cf_func
+	echo "$ac_t""$cf_result" 1>&6
+	if test $cf_result != no; then
+		cat >> confdefs.h <<EOF
+#define HAVE_${cf_tr_func} 1
+EOF
+
+	fi
+done
+
+fi
+
+if test $use_color_style != no ; then
+	if test .$cf_cv_color_curses != .yes ; then
+		{ echo "configure: error: Configuration does not support color-styles" 1>&2; exit 1; }
+	fi
+	if test $cf_cv_screen = slang ; then
+		{ echo "configure: error: Configuration does not support color-styles" 1>&2; exit 1; }
+	fi
+fi
+
+if test $use_scrollbar != no ; then
+	if test .$cf_cv_fancy_curses != .yes ; then
+		echo "configure: warning: Configuration does not support ACS_xxx definitions" 1>&2
+	else
+		cat >> confdefs.h <<\EOF
+#define USE_SCROLLBAR 1
+EOF
+
+	fi
+fi
+
 ### Finally, build config.h and the makefiles
+test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
+
+
 CFLAGS="$CFLAGS $EXTRA_CFLAGS"
 srcdir="$srcdir"
 SRCDIR_CLEAN="#"
 if test -n "$srcdir" ; then
 	echo srcdir is $srcdir
-	/bin/sh $srcdir/mkdirs.sh WWW/Library/Implementation
-	/bin/sh $srcdir/mkdirs.sh src/chrtrans
-	test "$USE_INCLUDED_LIBINTL" = yes && $srcdir/mkdirs.sh intl
+	$CONFIG_SHELL $MKINSTALLDIRS WWW/Library/Implementation
+	$CONFIG_SHELL $MKINSTALLDIRS src/chrtrans
+	test "$USE_INCLUDED_LIBINTL" = yes && $CONFIG_SHELL $MKINSTALLDIRS intl
 	test "$srcdir" != "." && SRCDIR_CLEAN=""
 fi
 
-test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
-
-
 
 trap '' 1 2 15
 cat > confcache <<\EOF
@@ -16069,7 +19560,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13.20000819"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13.20030927"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -16129,71 +19620,83 @@ s%@CONFIG_H@%$CONFIG_H%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
 s%@LN_S@%$LN_S%g
-s%@RANLIB@%$RANLIB%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@LINT@%$LINT%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
+s%@RANLIB@%$RANLIB%g
+s%@AR@%$AR%g
+s%@AR_OPTS@%$AR_OPTS%g
+s%@ECHO_LT@%$ECHO_LT%g
 s%@ECHO_LD@%$ECHO_LD%g
 s%@RULE_CC@%$RULE_CC%g
 s%@SHOW_CC@%$SHOW_CC%g
 s%@ECHO_CC@%$ECHO_CC%g
 s%@DONT_ECHO_CC@%$DONT_ECHO_CC%g
 s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g
+s%@EXEEXT@%$EXEEXT%g
+s%@OBJEXT@%$OBJEXT%g
 s%@PROG_EXT@%$PROG_EXT%g
 s%@ALLOCA@%$ALLOCA%g
+s%@GLIBC21@%$GLIBC21%g
+s%@LIBICONV@%$LIBICONV%g
 s%@USE_NLS@%$USE_NLS%g
 s%@PATHSEP@%$PATHSEP%g
 s%@MSGFMT@%$MSGFMT%g
 s%@GMSGFMT@%$GMSGFMT%g
 s%@XGETTEXT@%$XGETTEXT%g
-s%@GENCAT@%$GENCAT%g
+s%@INTLBISON@%$INTLBISON%g
+s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g
 s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
 s%@CATALOGS@%$CATALOGS%g
 s%@CATOBJEXT@%$CATOBJEXT%g
-s%@DATADIRNAME@%$DATADIRNAME%g
 s%@GMOFILES@%$GMOFILES%g
-s%@INSTOBJEXT@%$INSTOBJEXT%g
-s%@INTLDEPS@%$INTLDEPS%g
 s%@INTLLIBS@%$INTLLIBS%g
 s%@INTLOBJS@%$INTLOBJS%g
 s%@POFILES@%$POFILES%g
 s%@POSUB@%$POSUB%g
-s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g
-s%@GT_NO@%$GT_NO%g
-s%@GT_YES@%$GT_YES%g
+s%@DATADIRNAME@%$DATADIRNAME%g
+s%@INSTOBJEXT@%$INSTOBJEXT%g
+s%@GENCAT@%$GENCAT%g
 s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
-s%@l@%$l%g
-s%@USE_OUR_MESSAGES@%$USE_OUR_MESSAGES%g
-s%@INTLDIR_MAKE@%$INTLDIR_MAKE%g
+s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g
 s%@MSG_DIR_MAKE@%$MSG_DIR_MAKE%g
+s%@SUB_MAKEFILE@%$SUB_MAKEFILE%g
+s%@INTLDIR_MAKE@%$INTLDIR_MAKE%g
+s%@GT_YES@%$GT_YES%g
+s%@GT_NO@%$GT_NO%g
 s%@INTLDIR_CPPFLAGS@%$INTLDIR_CPPFLAGS%g
 s%@NLS_DATADIR@%$NLS_DATADIR%g
-s%@CHMOD@%$CHMOD%g
-s%@COMPRESS@%$COMPRESS%g
-s%@COPY@%$COPY%g
-s%@GZIP@%$GZIP%g
-s%@MKDIR@%$MKDIR%g
+s%@CHARSET_DEFS@%$CHARSET_DEFS%g
+s%@LIBOBJS@%$LIBOBJS%g
+s%@INSTALL_LSS@%$INSTALL_LSS%g
+s%@LYNXCFG_MAKE@%$LYNXCFG_MAKE%g
+s%@LYNXCFG_URL@%$LYNXCFG_URL%g
+s%@TELNET@%$TELNET%g
+s%@TN3270@%$TN3270%g
+s%@RLOGIN@%$RLOGIN%g
 s%@MV@%$MV%g
-s%@RM@%$RM%g
-s%@TAR@%$TAR%g
-s%@TOUCH@%$TOUCH%g
+s%@GZIP@%$GZIP%g
 s%@UNCOMPRESS@%$UNCOMPRESS%g
 s%@UNZIP@%$UNZIP%g
 s%@BZIP2@%$BZIP2%g
+s%@COMPRESS@%$COMPRESS%g
+s%@RM@%$RM%g
+s%@TAR@%$TAR%g
 s%@UUDECODE@%$UUDECODE%g
 s%@ZCAT@%$ZCAT%g
 s%@ZIP@%$ZIP%g
-s%@TELNET@%$TELNET%g
-s%@TN3270@%$TN3270%g
-s%@RLOGIN@%$RLOGIN%g
+s%@TAR_UP_OPTIONS@%$TAR_UP_OPTIONS%g
+s%@TAR_DOWN_OPTIONS@%$TAR_DOWN_OPTIONS%g
+s%@TAR_FILE_OPTIONS@%$TAR_FILE_OPTIONS%g
+s%@TAR_PIPE_OPTIONS@%$TAR_PIPE_OPTIONS%g
 s%@INSTALL@%$INSTALL%g
-s%@CHARSET_DEFS@%$CHARSET_DEFS%g
-s%@LIBOBJS@%$LIBOBJS%g
-s%@INSTALL_LSS@%$INSTALL_LSS%g
-s%@LYNXCFG_MAKE@%$LYNXCFG_MAKE%g
-s%@LYNXCFG_URL@%$LYNXCFG_URL%g
 s%@COMPRESS_PROG@%$COMPRESS_PROG%g
 s%@COMPRESS_EXT@%$COMPRESS_EXT%g
 s%@X_CFLAGS@%$X_CFLAGS%g
@@ -16417,60 +19920,7 @@ cat >> $CONFIG_STATUS <<\EOF
 fi; done
 
 EOF
-
 cat >> $CONFIG_STATUS <<EOF
-ac_sources="$nls_cv_header_libgt"
-ac_dests="$nls_cv_header_intl"
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-srcdir=$ac_given_srcdir
-while test -n "$ac_sources"; do
-  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
-  set $ac_sources; ac_source=$1; shift; ac_sources=$*
-
-  echo "linking $srcdir/$ac_source to $ac_dest"
-
-  if test ! -r $srcdir/$ac_source; then
-    { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
-  fi
-  rm -f $ac_dest
-
-  # Make relative symlinks.
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
-    # The dest file is in a subdirectory.
-    test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
-    ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dest_dir_suffix.
-    ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dest_dir_suffix= ac_dots=
-  fi
-
-  case "$srcdir" in
-  [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
-  *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
-  esac
-
-  # Make a symlink if possible; otherwise try a hard link.
-  if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
-    ln $srcdir/$ac_source $ac_dest; then :
-  else
-    { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
-  fi
-done
-EOF
-cat >> $CONFIG_STATUS <<EOF
- #(vi
-      case "\$CONFIG_FILES" in
-      *po/makefile.in*) #(vi
-        sed -e "/POTFILES =/r po/POTFILES" po/makefile.in > po/makefile
-        ;;
-      *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac
 
 # Extra initialization commands, if any
 
@@ -16480,13 +19930,43 @@ cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
+for ac_file in $CONFIG_FILES; do
+        # Support "outfile[:infile[:infile...]]"
+        case "$ac_file" in
+          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+        esac
+        # PO directories have a Makefile.in generated from Makefile.inn.
+        case "$ac_file" in */[Mm]akefile.in)
+          # Adjust a relative srcdir.
+          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+	  ac_base=`basename $ac_file .in`
+          # In autoconf-2.13 it is called $ac_given_srcdir.
+          # In autoconf-2.50 it is called $srcdir.
+          test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+          case "$ac_given_srcdir" in
+            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+            /*) top_srcdir="$ac_given_srcdir" ;;
+            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+          esac
+          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+            rm -f "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/$ac_base" || echo "creating $ac_dir/$ac_base"
+            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/$ac_base.in" > "$ac_dir/$ac_base"
+          fi
+          ;;
+        esac
+      done
 # Extra commands, if any
 
 	if test "$USE_NLS" = yes ; then
 	if test "$use_our_messages" = yes ; then
 		echo creating po/makefile
 		rm -f	po/temp$$
-		sed	-e 's@^.*LYMessages.c@	../LYMessages.c@' \
+		sed	-e 's%^.*LYMessages.c%	../LYMessages.c%' \
 			-e '$s/\\//' po/POTFILES >po/temp$$
 		sed	-e "/POTFILES =/r po/temp$$" \
 			po/makefile.in > po/makefile
diff --git a/gnu/usr.bin/lynx/configure.in b/gnu/usr.bin/lynx/configure.in
index 9955b5d59f2..e4f239d3662 100644
--- a/gnu/usr.bin/lynx/configure.in
+++ b/gnu/usr.bin/lynx/configure.in
@@ -2,19 +2,38 @@ dnl Process this file with autoconf to produce a configure script.
 dnl written jan/1997
 dnl by T.E.Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
+dnl
+dnl ask PRCS to plug-in the project-version for the configure-script.
+dnl $Format: "AC_REVISION($ProjectVersion$)"$
+AC_REVISION(2.8.5rel.1)
 
-AC_PREREQ(2.13)
+# Save the original $CFLAGS so we can distinguish whether the user set those
+# in the environment, or whether autoconf added -O and -g options:
+ORIGINAL_CFLAGS="$CFLAGS"
 
+# For autoconf 2.13, make sure we have no cache file at the beginning of this
+# script.  That fixes problems with tests whose cached values change from one
+# run to the next, as well as with tests that are order-dependent.
+rm -f config.cache
+
+AC_PREREQ(2.13.20020210)
 AC_INIT(userdefs.h)
+
+# autoconf 2.5x defaults to no cache file; we need the cache file's information
+# for building the config page.  But start with it empty to avoid confusion by
+# people who don't do a "make distclean" after applying patches.
+cache_file=config.cache
 rm -f config.cache; touch config.cache
+
 CONFIG_H=lynx_cfg.h
 AC_CONFIG_HEADER($CONFIG_H:config.hin)
 
 CF_CHECK_CACHE
 
 PACKAGE=lynx
-VERSION=2.8.4
-
+dnl ask PRCS to plug-in the project-version for the packages.
+# $Format: "VERSION=$ProjectVersion$"$
+VERSION=2.8.5rel.1
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(DESTDIR)
@@ -41,11 +60,14 @@ esac
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_LN_S
-AC_PROG_RANLIB
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_CHECK_PROGS(LINT, lint alint lclint tdlint, [])
 
+AC_CHECK_TOOL(RANLIB, ranlib, ':')
+AC_CHECK_TOOL(AR, ar, ar)
+CF_SUBST(archiver options,AR_OPTS,rv)
+
 AC_AIX
 AC_ISC_POSIX
 
@@ -74,6 +96,9 @@ CF_ARG_ENABLE(find-leaks,
 AC_MSG_RESULT($with_leak_checks)
 test "$with_leak_checks" = "yes" && AC_DEFINE(LY_FIND_LEAKS)
 
+# The comment about adding -g to $CFLAGS is unclear.  Autoconf tries to add
+# a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
+# disabled.
 AC_MSG_CHECKING(if you want to enable debug-code)
 CF_ARG_ENABLE(debug,
 	[  --enable-debug          compile w/ debugging (if \$CFLAGS is set, add -g there, too)],
@@ -83,7 +108,7 @@ AC_MSG_RESULT($with_debug)
 if test "$with_debug" = "yes" ; then
 	case $host_os in
 	ultrix*|osf*)
-		CF_STRIP_O_OPT(CFLAGS)
+		test -z "$ORIGINAL_CFLAGS" && CF_STRIP_O_OPT(CFLAGS)
 		if test -z "$GCC" ; then
 			CFLAGS="$CFLAGS -g3"
 		fi
@@ -93,10 +118,10 @@ else
 	case $host_os in
 	osf*) #(vi
 		test -z "$GCC" && CFLAGS="$CFLAGS -std1"
-		CF_STRIP_G_OPT(CFLAGS)
+		test -z "$ORIGINAL_CFLAGS" && CF_STRIP_G_OPT(CFLAGS)
 		;;
 	*)
-		CF_STRIP_G_OPT(CFLAGS)
+		test -z "$ORIGINAL_CFLAGS" && CF_STRIP_G_OPT(CFLAGS)
 		;;
 	esac
 fi
@@ -132,6 +157,26 @@ then
 fi
 fi
 
+AC_MSG_CHECKING(if you want to link with dbmalloc for testing)
+AC_ARG_WITH(dbmalloc,
+	[  --with-dbmalloc         test: use Conor Cahill's dbmalloc library],
+	[with_dbmalloc=$withval],
+	[with_dbmalloc=no])
+AC_MSG_RESULT($with_dbmalloc)
+if test $with_dbmalloc = yes ; then
+	AC_CHECK_LIB(dbmalloc,debug_malloc)
+fi
+
+AC_MSG_CHECKING(if you want to link with dmalloc for testing)
+AC_ARG_WITH(dmalloc,
+	[  --with-dmalloc          test: use Gray Watson's dmalloc library],
+	[with_dmalloc=$withval],
+	[with_dmalloc=no])
+AC_MSG_RESULT($with_dmalloc)
+if test $with_dmalloc = yes ; then
+	AC_CHECK_LIB(dmalloc,dmalloc_debug)
+fi
+
 dnl --------------------------------------------------------------------------
 dnl Checks for compiler & standard-library characteristics
 dnl --------------------------------------------------------------------------
@@ -142,7 +187,7 @@ AC_DEFINE(UNIX)
 AC_C_CONST
 
 dnl Only add to this case statement things that we cannot design tests for.
-PROG_EXT=
+CF_PROG_EXT
 TRY_CFLAGS=
 case $host_os in
 aix4*)
@@ -150,6 +195,7 @@ aix4*)
 	LIBS="$LIBS -lbsd"
 	;;
 aix*)
+	TRY_CFLAGS="$TRY_CFLAGS -D_ACS_COMPAT_CODE"
 	LIBS="$LIBS -lbsd"
 	;;
 apollo*)
@@ -168,7 +214,7 @@ convex*)
 	TRY_CFLAGS="$TRY_CFLAGS -D__STDC__ -Dunix"
 	;;
 cygwin*)
-	PROG_EXT=".exe"
+	TRY_CFLAGS="$TRY_CFLAGS -DWIN_EX -D_WINDOWS_NSL"
 	LIBS="$LIBS -luser32"
 	;;
 dgux*)
@@ -191,18 +237,16 @@ irix*)
 linux*)
 	TRY_CFLAGS="$TRY_CFLAGS -DLINUX"
 	;;
+msdosdjgpp*)
+	LIBS="$LIBS -lwatt"
+	TRY_CFLAGS="$TRY_CFLAGS -DDOSPATH -DNOUSERS"
+	;;
 next*)
-	TRY_CFLAGS="$TRY_CFLAGS -DNEXT -DXMOSAIC_HACK"
+	TRY_CFLAGS="$TRY_CFLAGS -DNEXT"
 	;;
-openbsd*)
+openbsd* | ekkobsd* | mirbsd*)
 	LIBS="$LIBS -lcompat"
 	;;
-os2*)
-	# We make sure -Zexe is not used -- it would interfere with @PROG_EXT@
-	TRY_CFLAGS="$TRY_CFLAGS -Zmt -D__ST_MT_ERRNO__"
-	LDFLAGS=`echo "$LDFLAGS -Zmt -Zcrtdll" | sed "s/-Zexe//g"`
-	PROG_EXT=".exe"
-	;;
 osf4*)
 	# The -Olimit flag (see below) is no longer available with
 	# Digital C 5.2, which is bundled with Digital UNIX 4.0.
@@ -256,7 +300,6 @@ ultrix*)
 		 cf_cv_ncurses_header=cursesX.h])
 	;;
 esac
-AC_SUBST(PROG_EXT)
 
 if test -z "$GCC" ; then
 	CF_ANSI_CC_CHECK
@@ -269,7 +312,7 @@ CF_HELP_MESSAGE(
 Basic Configuration Options:)
 
 dnl internationalization macros
-CF_BUNDLED_INTL(makefile)
+CF_BUNDLED_INTL(makefile,disable)
 
 INTLDIR_CPPFLAGS="#"
 if test -z "$INTLDIR_MAKE" ; then
@@ -298,53 +341,17 @@ CF_DEFINE_PROG(system mailer, SYSTEM_MAIL,
 	/usr/lib/sendmail  \
 	)
 CF_SYSTEM_MAIL_FLAGS
+if test -n "$SYSTEM_MAIL" ; then
+if test $with_full_paths = no ; then
+	SYSTEM_MAIL=`basename $SYSTEM_MAIL`
+fi
+fi
 
-CF_PATH_PROG(CHMOD,	chmod)
-CF_PATH_PROG(COMPRESS,	compress)
-CF_PATH_PROG(COPY,	cp)
-CF_PATH_PROG(GZIP,	gzip)
-CF_PATH_PROG(MKDIR,	mkdir)
-CF_PATH_PROG(MV,	mv)
-CF_PATH_PROG(RM,	rm)
-CF_PATH_PROG(TAR,	tar)
-CF_PATH_PROG(TOUCH,	touch)
-CF_PATH_PROG(UNCOMPRESS,gunzip)
-CF_PATH_PROG(UNZIP,	unzip)
-CF_PATH_PROG(BZIP2,	bzip2)
-CF_PATH_PROG(UUDECODE,	uudecode)
-CF_PATH_PROG(ZCAT,	zcat)
-CF_PATH_PROG(ZIP,	zip)
-CF_PATH_PROG(TELNET,	telnet)
-CF_PATH_PROG(TN3270,	tn3270)
-CF_PATH_PROG(RLOGIN,	rlogin)
-
-dnl 'INSTALL' is a special case, since the configure script has to find a
-dnl BSD-compatible one so the build/install works properly.
-case "$INSTALL" in
-$srcdir*) # (vi
-	AC_DEFINE_UNQUOTED(INSTALL_PATH,"install")
-	;;
-*) # (vi
-	cf_save_INSTALL="$INSTALL"
-	CF_PATH_PROG(INSTALL,	install)
-	INSTALL="$cf_save_INSTALL"
-	;;
-esac
-
-CF_GNU_SOURCE
+CF_XOPEN_SOURCE
 
 dnl Collect tests for compiler options into one place
 if test -n "$TRY_CFLAGS" ; then
-	cf_save_CFLAGS="$CFLAGS"
-	cf_save_CPPFLAGS="$CPPFLAGS"
-	CF_ADD_CFLAGS($TRY_CFLAGS)
-	AC_MSG_CHECKING(if we should use compile options $TRY_CFLAGS)
-	AC_TRY_COMPILE([#include <stdio.h>],[FILE *fp = stdin],[cf_result=yes],[cf_result=no])
-	AC_MSG_RESULT($cf_result)
-	if test "$cf_result" = no ; then
-		CFLAGS="$cf_save_CFLAGS"
-		CPPFLAGS="$cf_save_CPPFLAGS"
-	fi
+	CF_CHECK_CFLAGS($TRY_CFLAGS)
 fi
 
 dnl --------------------------------------------------------------------------
@@ -360,6 +367,15 @@ AC_ARG_WITH(ssl,
 	[cf_cv_use_libssl=no])
 ])
 
+if test "x$cf_cv_use_libssl" = "xno" ; then
+AC_CACHE_CHECK(if you want experimental gnutls support,cf_cv_use_libgnutls,[
+AC_ARG_WITH(gnutls,
+	[  --with-gnutls[=path]    link with experimental gnutls support],
+	[cf_cv_use_libgnutls=$withval],
+	[cf_cv_use_libgnutls=no])
+])
+fi
+
 AC_CACHE_CHECK(if you want socks library,cf_cv_use_libsocks,[
 AC_ARG_WITH(socks,
 	[  --with-socks[=path]     link with socks library if available],
@@ -384,6 +400,8 @@ fi
 CF_INET_ADDR
 if test "x$cf_cv_use_libssl"  != xno ; then
 	CF_SSL($cf_cv_use_libssl)
+elif test "x$cf_cv_use_libgnutls" != xno ; then
+	CF_GNUTLS($cf_cv_use_libgnutls)
 fi
 
 dnl This has to be cached, since there's a lot of interdependent tests.
@@ -393,7 +411,7 @@ AC_ARG_WITH(screen,
                           (XXX is curses (default), ncurses or slang)],
 	[
 case $withval in
-curses|ncurses|pdcurses|slang)
+curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
 *)	AC_ERROR(Unexpected value)
@@ -402,15 +420,8 @@ esac],
 	[cf_cv_screen=curses])])
 
 case $cf_cv_screen in
-ncurses|slang)
-	;;
-pdcurses)
-	cf_cv_ncurses_header=xcurses.h
-	;;
-curses)
-	if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" != set"; then
-		cf_cv_ncurses_header=curses.h
-	fi
+curses|ncurses*)
+	CF_WITH_CURSES_DIR
 	;;
 esac
 
@@ -427,7 +438,14 @@ ncurses)
 	CF_NCURSES_LIBS
 	CF_NCURSES_VERSION
 	;;
+ncursesw)
+	CF_UTF8_LIB
+	CF_NCURSES_CPPFLAGS(ncursesw)
+	CF_NCURSES_LIBS(ncursesw)
+	CF_NCURSES_VERSION
+	;;
 pdcurses)
+	cf_cv_ncurses_header=xcurses.h
 	# do this last, since it changes definition of main: CF_PDCURSES_X11
 	;;
 slang)
@@ -438,7 +456,7 @@ esac
 dnl Get the actual value for $libdir, which we will compile into Lynx as part of
 dnl the config pathnames.
 eval cf_libdir=$libdir
-cf_libdir=`echo $cf_libdir | sed -e s@'^NONE/'@$prefix/@ -e s@'^NONE/'@$ac_default_prefix/@`
+cf_libdir=`echo $cf_libdir | sed -e s%'^NONE/'%$prefix/% -e s%'^NONE/'%$ac_default_prefix/%`
 
 AC_MSG_CHECKING(for location of config-file)
 LYNX_CFG_FILE=$cf_libdir/lynx.cfg
@@ -538,6 +556,7 @@ dnl --------------------------------------------------------------------------
 dnl Checks for library units
 dnl --------------------------------------------------------------------------
 
+AC_FUNC_ALLOCA
 AC_FUNC_VFORK
 CF_FIONBIO
 CF_REMOVE_BROKEN
@@ -549,7 +568,8 @@ AC_CHECK_FUNCS( \
 	getgroups \
 	gettimeofday \
 	getuid \
-	mkstemp \
+	mktemp \
+	mkdtemp \
 	popen \
 	putenv \
 	readdir \
@@ -585,38 +605,6 @@ CF_SYS_ERRLIST
 CF_UTMP
 CF_CHECK_EXTERN_DATA(h_errno,int)
 
-### These tests must be run after establishing the curses library.
-if test $cf_cv_screen != slang ; then
-	if test $cf_cv_screen != pdcurses ; then
-		AC_CHECK_HEADERS(ncurses/term.h term.h)
-	fi
-	CF_ALT_CHAR_SET
-	CF_FANCY_CURSES
-	CF_NCURSES_BROKEN
-	CF_COLOR_CURSES
-	CF_SIZECHANGE
-	CF_TTYTYPE
-	CF_CURSES_FUNCS( \
-		assume_default_colors \
-		cbreak \
-		define_key \
-		delscreen \
-		getattrs \
-		getbegx \
-		getbegy \
-		keypad \
-		napms \
-		newpad \
-		newterm \
-		pnoutrefresh \
-		wresize resizeterm \
-		touchline \
-		touchwin \
-		use_default_colors \
-		wborder \
-		wredrawln )
-fi
-
 dnl --------------------------------------------------------------------------
 dnl Experimental options that don't need to test system features
 dnl --------------------------------------------------------------------------
@@ -642,7 +630,7 @@ test $use_config_info = no && AC_DEFINE(NO_CONFIG_INFO)
 
 AC_MSG_CHECKING(if new-style forms-based options screen should be used)
 CF_ARG_DISABLE(forms-options,
-[  --disable-forms-options disable experimental forms-based options],
+[  --disable-forms-options disable forms-based options],
 	[use_forms_options=$enableval],
 	[use_forms_options=yes])
 AC_MSG_RESULT($use_forms_options)
@@ -686,15 +674,6 @@ CF_ARG_ENABLE(color-style,
 	[use_color_style=$enableval],
 	[use_color_style=no])
 
-if test $use_color_style != no ; then
-	if test .$cf_cv_color_curses != .yes ; then
-		AC_ERROR(Configuration does not support color-styles)
-	fi
-	if test $cf_cv_screen = slang ; then
-		AC_ERROR(Configuration does not support color-styles)
-	fi
-fi
-
 case $use_color_style in
 no)
 	AC_MSG_RESULT(no)
@@ -714,8 +693,11 @@ esac
 AC_SUBST(INSTALL_LSS)
 
 use_dft_colors=no
-test ".$cf_cv_screen" = ".slang"                && use_dft_colors=maybe
-test ".$cf_cv_func_use_default_colors" = ".yes" && use_dft_colors=maybe
+case $cf_cv_screen in
+slang|ncurses*)
+	use_dft_colors=maybe
+	;;
+esac
 
 if test "$use_dft_colors" != no ; then
 AC_MSG_CHECKING(if you want to use default-colors)
@@ -727,14 +709,6 @@ AC_MSG_RESULT($use_dft_colors)
 test $use_dft_colors = "yes" && AC_DEFINE(USE_DEFAULT_COLORS)
 fi
 
-AC_MSG_CHECKING(if experimental file-upload logic should be used)
-CF_ARG_ENABLE(file-upload,
-[  --enable-file-upload    use experimental file-upload support],
-	[use_file_upload=$enableval],
-	[use_file_upload=no])
-AC_MSG_RESULT($use_file_upload)
-test $use_file_upload != no && AC_DEFINE(EXP_FILE_UPLOAD)
-
 AC_MSG_CHECKING(if experimental htmlized lynx.cfg should be built)
 CF_ARG_ENABLE(htmlized-cfg,
 [  --enable-htmlized-cfg   build experimental htmlized lynx.cfg],
@@ -778,13 +752,21 @@ CF_ARG_ENABLE(kbd-layout,
 AC_MSG_RESULT($use_kbd_layout)
 test $use_kbd_layout != no && AC_DEFINE(EXP_KEYBOARD_LAYOUT)
 
-AC_MSG_CHECKING(if experimental JavaScript support should be used)
-CF_ARG_ENABLE(libjs,
-[  --enable-libjs          use experimental JavaScript support (Mozilla libjs)],
-	[use_libjs=$enableval],
-	[use_libjs=no])
-AC_MSG_RESULT($use_libjs)
-test $use_libjs != no && AC_DEFINE(EXP_LIBJS)
+dnl AC_MSG_CHECKING(if experimental JavaScript support should be used)
+dnl CF_ARG_ENABLE(libjs,
+dnl [  --enable-libjs          use experimental JavaScript support (Mozilla libjs)],
+dnl 	[use_libjs=$enableval],
+dnl 	[use_libjs=no])
+dnl AC_MSG_RESULT($use_libjs)
+dnl test $use_libjs != no && AC_DEFINE(EXP_LIBJS)
+
+AC_MSG_CHECKING(if experimental locale-charset selection logic should be used)
+CF_ARG_ENABLE(locale-charset,
+[  --enable-locale-charset use experimental locale-charset selection logic],
+	[use_locale_charset=$enableval],
+	[use_locale_charset=yes])
+AC_MSG_RESULT($use_locale_charset)
+test $use_locale_charset != no && AC_DEFINE(EXP_LOCALE_CHARSET)
 
 AC_MSG_CHECKING(if experimental nested-table logic should be used)
 CF_ARG_ENABLE(nested-tables,
@@ -794,22 +776,6 @@ CF_ARG_ENABLE(nested-tables,
 AC_MSG_RESULT($use_nested_tables)
 test $use_nested_tables != no && AC_DEFINE(EXP_NESTED_TABLES)
 
-AC_MSG_CHECKING(if html source should be colorized)
-CF_ARG_ENABLE(prettysrc,
-[  --enable-prettysrc      colorize HTML source],
-	[use_prettysrc=$enableval],
-	[use_prettysrc=no])
-AC_MSG_RESULT($use_prettysrc)
-test $use_prettysrc != no && AC_DEFINE(USE_PRETTYSRC)
-
-AC_MSG_CHECKING(if read-progress message should show ETA)
-CF_ARG_ENABLE(read-eta,
-[  --enable-read-eta       experimental read-progress message shows ETA],
-	[use_read_eta=$enableval],
-	[use_read_eta=no])
-AC_MSG_RESULT($use_read_eta)
-test $use_read_eta != no && AC_DEFINE(EXP_READPROGRESS)
-
 AC_MSG_CHECKING(if scrollbar code should be used)
 CF_ARG_ENABLE(scrollbar,
 [  --enable-scrollbar      use experimental scrollbar, with mouse],
@@ -817,22 +783,6 @@ CF_ARG_ENABLE(scrollbar,
 	[use_scrollbar=no])
 AC_MSG_RESULT($use_scrollbar)
 
-if test $use_scrollbar != no ; then
-	if test .$cf_cv_fancy_curses != .yes ; then
-		AC_MSG_WARN(Configuration does not support ACS_xxx definitions)
-	else
-		AC_DEFINE(USE_SCROLLBAR)
-	fi
-fi
-
-AC_MSG_CHECKING(if source caching should be used)
-CF_ARG_ENABLE(source-cache,
-[  --enable-source-cache   cache HTML source for parse mode changes],
-	[use_source_cache=$enableval],
-	[use_source_cache=no])
-AC_MSG_RESULT($use_source_cache)
-test $use_source_cache != no && AC_DEFINE(SOURCE_CACHE)
-
 dnl --------------------------------------------------------------------------
 dnl Miscellaneous options that don't need to test system features
 dnl --------------------------------------------------------------------------
@@ -856,6 +806,14 @@ CF_ARG_DISABLE(extended-dtd,
 AC_MSG_RESULT($use_ext_htmldtd)
 test $use_ext_htmldtd = "no" && AC_DEFINE(NO_EXTENDED_HTMLDTD)
 
+AC_MSG_CHECKING(if file-upload logic should be used)
+CF_ARG_DISABLE(file-upload,
+[  --disable-file-upload   use file-upload support],
+	[use_file_upload=$enableval],
+	[use_file_upload=yes])
+AC_MSG_RESULT($use_file_upload)
+test $use_file_upload != no && AC_DEFINE(USE_FILE_UPLOAD)
+
 AC_MSG_CHECKING(if partial-display should be used)
 CF_ARG_DISABLE(partial,
 [  --disable-partial       use partial-display logic],
@@ -864,6 +822,38 @@ CF_ARG_DISABLE(partial,
 AC_MSG_RESULT($use_partial_display)
 test $use_partial_display != no && AC_DEFINE(DISP_PARTIAL)
 
+AC_MSG_CHECKING(if persistent-cookie logic should be used)
+CF_ARG_DISABLE(persistent-cookies,
+[  --disable-persistent-cookies  disable persistent-cookie support],
+	[use_filed_cookies=$enableval],
+	[use_filed_cookies=yes])
+AC_MSG_RESULT($use_filed_cookies)
+test $use_filed_cookies != no && AC_DEFINE(USE_PERSISTENT_COOKIES)
+
+AC_MSG_CHECKING(if html source should be colorized)
+CF_ARG_DISABLE(prettysrc,
+[  --disable-prettysrc     colorize HTML source],
+	[use_prettysrc=$enableval],
+	[use_prettysrc=yes])
+AC_MSG_RESULT($use_prettysrc)
+test $use_prettysrc != no && AC_DEFINE(USE_PRETTYSRC)
+
+AC_MSG_CHECKING(if read-progress message should show ETA)
+CF_ARG_DISABLE(read-eta,
+[  --disable-read-eta      read-progress message shows ETA],
+	[use_read_eta=$enableval],
+	[use_read_eta=yes])
+AC_MSG_RESULT($use_read_eta)
+test $use_read_eta != no && AC_DEFINE(USE_READPROGRESS)
+
+AC_MSG_CHECKING(if source caching should be used)
+CF_ARG_DISABLE(source-cache,
+[  --disable-source-cache  cache HTML source for parse mode changes],
+	[use_source_cache=$enableval],
+	[use_source_cache=yes])
+AC_MSG_RESULT($use_source_cache)
+test $use_source_cache != no && AC_DEFINE(USE_SOURCE_CACHE)
+
 AC_MSG_CHECKING(if you want to use external commands)
 CF_ARG_ENABLE(externs,
 [  --enable-externs        use external commands],
@@ -872,7 +862,7 @@ CF_ARG_ENABLE(externs,
 AC_MSG_RESULT($use_externs)
 if test $use_externs != "no" ; then
 	AC_DEFINE(USE_EXTERNALS)
-	LIBOBJS="$LIBOBJS LYExtern.o"
+	LIBOBJS="$LIBOBJS LYExtern\$o"
 fi
 
 AC_MSG_CHECKING(if you want to use setfont support)
@@ -939,21 +929,14 @@ CF_ARG_ENABLE(syslog,
 AC_MSG_RESULT($use_syslog)
 test $use_syslog = yes && AC_DEFINE(SYSLOG_REQUESTED_URLS)
 
-AC_MSG_CHECKING(if persistent-cookie logic should be used)
-CF_ARG_DISABLE(persistent-cookies,
-[  --disable-persistent-cookies  disable persistent-cookie support],
-	[use_filed_cookies=$enableval],
-	[use_filed_cookies=yes])
-AC_MSG_RESULT($use_filed_cookies)
-test $use_filed_cookies != no && AC_DEFINE(EXP_PERSISTENT_COOKIES)
-
 AC_MSG_CHECKING(if you want to underline links)
 CF_ARG_ENABLE(underlines,
 [  --enable-underlines     underline links rather than using boldface],
 	[use_underline=yes],
 	[use_underline=no])
 AC_MSG_RESULT($use_underline)
-test $use_underline = yes && AC_DEFINE(UNDERLINE_LINKS)
+test $use_underline = yes && AC_DEFINE(UNDERLINE_LINKS,1)
+test $use_underline = no  && AC_DEFINE(UNDERLINE_LINKS,0)
 
 AC_MSG_CHECKING(if help files should be gzip'ed)
 CF_ARG_ENABLE(gzip-help,
@@ -962,14 +945,17 @@ CF_ARG_ENABLE(gzip-help,
 	[use_gzip_help=no])
 AC_MSG_RESULT($use_gzip_help)
 
-COMPRESS_PROG=
-COMPRESS_EXT=
-if test $use_gzip_help = yes ; then
-	COMPRESS_PROG=$ac_cv_path_GZIP
-	COMPRESS_EXT=.gz
+AC_MSG_CHECKING(if you want to use libbz2 for decompression of some bzip2 files)
+AC_ARG_WITH(bzlib,
+[  --with-bzlib            use libbz2 for decompression of some bzip2 files],
+	[use_bzlib=$withval],
+	[use_bzlib=no])
+AC_MSG_RESULT($use_bzlib)
+
+if test ".$use_bzlib" != ".no" ; then
+	CF_WITH_BZLIB
+	AC_DEFINE(USE_BZLIB)
 fi
-AC_SUBST(COMPRESS_PROG)
-AC_SUBST(COMPRESS_EXT)
 
 AC_MSG_CHECKING(if you want to use zlib for decompression of some gzip files)
 AC_ARG_WITH(zlib,
@@ -979,27 +965,13 @@ AC_ARG_WITH(zlib,
 AC_MSG_RESULT($use_zlib)
 
 if test ".$use_zlib" != ".no" ; then
-	AC_MSG_CHECKING(if we need to add -I option to get zlib.h)
-	AC_TRY_COMPILE([#include <zlib.h>],[],[AC_MSG_RESULT(no)],[
-	AC_MSG_RESULT(yes)
-	CF_HEADER_PATH(cf_search,zlib)
-	for cf_incdir in $cf_search
-	do
-		if test -f $cf_incdir/zlib.h ; then
-			CF_ADD_CFLAGS(-I$cf_incdir)
-			CF_VERBOSE(... found in $cf_incdir)
-			break
-		fi
-		CF_VERBOSE(... tested $cf_incdir)
-	done
-	])
-	CF_FIND_LIBRARY(z,z,
-		[#include <zlib.h>],
-		[gzopen("name","mode")],
-		gzopen)
+	CF_WITH_ZLIB
 	AC_DEFINE(USE_ZLIB)
 fi
 
+CF_HELP_MESSAGE(
+Other Network Services:)
+
 AC_MSG_CHECKING(if you want to exclude FINGER code)
 CF_ARG_DISABLE(finger,
 [  --disable-finger        disable FINGER logic],
@@ -1049,12 +1021,12 @@ CF_ARG_DISABLE(dired,
 AC_MSG_RESULT($use_dired)
 
 if test ".$use_dired" != ".no" ; then
-	LIBOBJS="$LIBOBJS LYLocal.o"
+	LIBOBJS="$LIBOBJS LYLocal\$o"
 	AC_DEFINE(DIRED_SUPPORT)
 
 	AC_MSG_CHECKING(if you wish to allow extracting from archives via DirEd)
 	CF_ARG_DISABLE(dired-dearchive,
-	[  --disable-dired-archive  disable dearchiving commands],[AC_DEFINE(ARCHIVE_ONLY)])
+	[  --disable-dired-dearchive disable dearchiving commands],[AC_DEFINE(ARCHIVE_ONLY)])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if DirEd mode should override keys)
@@ -1106,9 +1078,58 @@ CF_ARG_DISABLE(parent-dir-refs,
 	[AC_DEFINE(NO_PARENT_DIR_REFERENCE)])
 AC_MSG_RESULT($enableval)
 
+CF_PATH_PROG(TELNET,	telnet)
+CF_PATH_PROG(TN3270,	tn3270)
+CF_PATH_PROG(RLOGIN,	rlogin)
+
+CF_PATH_PROG(MV,	mv)
+
+CF_PATH_PROG(GZIP,	gzip)
+CF_PATH_PROG(UNCOMPRESS,gunzip)
+CF_PATH_PROG(UNZIP,	unzip)
+CF_PATH_PROG(BZIP2,	bzip2)
+
 dnl --------------------------------------------------------------------------
 dnl Test features that rely on configure-definitions
 dnl --------------------------------------------------------------------------
+if test ".$use_dired" != ".no" ; then
+
+CF_PATH_PROG(COMPRESS,	compress)
+CF_PATH_PROG(RM,	rm)
+CF_PATH_PROG(TAR,	tar, pax gtar gnutar bsdtar star)
+CF_PATH_PROG(UUDECODE,	uudecode)
+CF_PATH_PROG(ZCAT,	zcat)
+CF_PATH_PROG(ZIP,	zip)
+
+CF_TAR_OPTIONS($TAR)
+AC_DEFINE_UNQUOTED(TAR_UP_OPTIONS,   "$TAR_UP_OPTIONS")
+AC_DEFINE_UNQUOTED(TAR_DOWN_OPTIONS, "$TAR_DOWN_OPTIONS")
+AC_DEFINE_UNQUOTED(TAR_FILE_OPTIONS, "$TAR_FILE_OPTIONS")
+AC_DEFINE_UNQUOTED(TAR_PIPE_OPTIONS, "$TAR_PIPE_OPTIONS")
+
+dnl 'INSTALL' is a special case, since the configure script has to find a
+dnl BSD-compatible one so the build/install works properly.
+case "$INSTALL" in
+$srcdir*) # (vi
+	AC_DEFINE_UNQUOTED(INSTALL_PATH,"install")
+	;;
+*) # (vi
+	cf_save_INSTALL="$INSTALL"
+	CF_PATH_PROG(INSTALL,	install)
+	INSTALL="$cf_save_INSTALL"
+	;;
+esac
+fi
+
+COMPRESS_PROG=
+COMPRESS_EXT=
+if test $use_gzip_help = yes ; then
+	COMPRESS_PROG="$ac_cv_path_GZIP -9"
+	COMPRESS_EXT=.gz
+fi
+AC_SUBST(COMPRESS_PROG)
+AC_SUBST(COMPRESS_EXT)
+
 if test $cf_cv_screen = pdcurses ; then
 	CF_HELP_MESSAGE(Special Libraries for PDCurses X11:)
 	CF_PDCURSES_X11
@@ -1116,21 +1137,72 @@ else
 	CF_TERMIO_AND_CURSES(LYCurses.h)
 fi
 
+### These tests must be run after establishing the curses library.
+if test $cf_cv_screen != slang ; then
+	AC_CHECK_HEADERS($cf_cv_screen/term.h term.h)
+	CF_ALT_CHAR_SET
+	CF_FANCY_CURSES
+	CF_NCURSES_BROKEN
+	CF_COLOR_CURSES
+	CF_SIZECHANGE
+	CF_TTYTYPE
+	CF_WIDEC_CURSES
+	CF_CURSES_FUNCS( \
+		assume_default_colors \
+		cbreak \
+		define_key \
+		delscreen \
+		getattrs \
+		getbegx \
+		getbegy \
+		keypad \
+		napms \
+		newpad \
+		newterm \
+		pnoutrefresh \
+		resizeterm \
+		touchline \
+		touchwin \
+		use_default_colors \
+		wattr_get \
+		wborder \
+		wredrawln \
+		wresize \
+		)
+fi
+
+if test $use_color_style != no ; then
+	if test .$cf_cv_color_curses != .yes ; then
+		AC_ERROR(Configuration does not support color-styles)
+	fi
+	if test $cf_cv_screen = slang ; then
+		AC_ERROR(Configuration does not support color-styles)
+	fi
+fi
+
+if test $use_scrollbar != no ; then
+	if test .$cf_cv_fancy_curses != .yes ; then
+		AC_MSG_WARN(Configuration does not support ACS_xxx definitions)
+	else
+		AC_DEFINE(USE_SCROLLBAR)
+	fi
+fi
+
 ### Finally, build config.h and the makefiles
+test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
+AC_SUBST(CONFIG_SHELL)
+
 CFLAGS="$CFLAGS $EXTRA_CFLAGS"
 srcdir="$srcdir"
 SRCDIR_CLEAN="#"
 if test -n "$srcdir" ; then
 	echo srcdir is $srcdir
-	/bin/sh $srcdir/mkdirs.sh WWW/Library/Implementation
-	/bin/sh $srcdir/mkdirs.sh src/chrtrans
-	test "$USE_INCLUDED_LIBINTL" = yes && $srcdir/mkdirs.sh intl
+	$CONFIG_SHELL $MKINSTALLDIRS WWW/Library/Implementation
+	$CONFIG_SHELL $MKINSTALLDIRS src/chrtrans
+	test "$USE_INCLUDED_LIBINTL" = yes && $CONFIG_SHELL $MKINSTALLDIRS intl
 	test "$srcdir" != "." && SRCDIR_CLEAN=""
 fi
 
-test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
-AC_SUBST(CONFIG_SHELL)
-
 AC_SUBST(SRCDIR_CLEAN)
 AC_OUTPUT(
 	[makefile \
@@ -1143,7 +1215,7 @@ AC_OUTPUT(
 	if test "$use_our_messages" = yes ; then
 		echo creating po/makefile
 		rm -f	po/temp$$
-		sed	-e 's@^.*LYMessages.c@	../LYMessages.c@' \
+		sed	-e 's%^.*LYMessages.c%	../LYMessages.c%' \
 			-e '$s/\\//' po/POTFILES >po/temp$$
 		sed	-e "/POTFILES =/r po/temp$$" \
 			po/makefile.in > po/makefile
diff --git a/gnu/usr.bin/lynx/docs/OS-390.announce b/gnu/usr.bin/lynx/docs/OS-390.announce
index 47cbae06092..0cc49d5c4b6 100644
--- a/gnu/usr.bin/lynx/docs/OS-390.announce
+++ b/gnu/usr.bin/lynx/docs/OS-390.announce
@@ -1,24 +1,24 @@
 This document suggests steps to install Lynx on OS/390 systems.
 
 ========================================================================
-o Download the archive file lynx2-8-4.tar.Z in BINARY from the site
+o Download the archive file lynx2-8-5.tar.Z in BINARY from the site
   where you found this announcement or from a site listed at
-  http://lynx.browser.org/
+  http://lynx.isc.org/
 
 o Unpack with:
 
-	uncompress <lynx2-8-4.tar.Z | pax -rv -o to=IBM-1047
+	uncompress <lynx2-8-5.tar.Z | pax -rv -o to=IBM-1047
 
   The "-o to=IBM-1047" is needed to convert the ASCII archive
   to EBCDIC.  You must not download as a text file; the conversion
   must be performed after the uncompress.
 
 ========================================================================
-o Alternatively, download the PKZIPped archive lynx2-8-4.zip in BINARY.
+o Alternatively, download the PKZIPped archive lynx2-8-5.zip in BINARY.
 
 o Unpack with:
 
-	unzip -aa lynx2-8-4.zip
+	unzip -aa lynx2-8-5.zip
 
   The "-aa" is needed to convert the ASCII archive
   to EBCDIC.  (unzip is not shipped with OS/390.  You can
@@ -38,7 +38,7 @@ o Run the configure script:
 	cd       ./OS390
 	rm -f config.cache
 	CC=c89 CFLAGS="-D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE" \
-	    ../lynx2-8-4/configure
+	    ../lynx2-8-5/configure
 
   The definitions select the ANSI C compiler (c89) and options
   to select the right header file directories.  You may also
@@ -64,8 +64,8 @@ o Build Lynx
 ========================================================================
 o Test Lynx:
 
-	./lynx -cfg=../lynx2-8-4/lynx.cfg \
-	    ../lynx2-8-4/lynx_help/lynx_help_main.html
+	./lynx -cfg=../lynx2-8-5/lynx.cfg \
+	    ../lynx2-8-5/lynx_help/lynx_help_main.html
 
 ========================================================================
 o Install Lynx:
diff --git a/gnu/usr.bin/lynx/docs/README.defines b/gnu/usr.bin/lynx/docs/README.defines
index 2ec2ac46426..801a25330dd 100644
--- a/gnu/usr.bin/lynx/docs/README.defines
+++ b/gnu/usr.bin/lynx/docs/README.defines
@@ -88,12 +88,14 @@ Using curses or ncurses library:
                    for UNIX handled by ./configure, may be set in HTUtils.h
 # -DCOLOR_CURSES    whether curses lib supports color (in the right way).
                    for UNIX handled by ./configure
+# -DUSE_COLOR_STYLE (see INSTALLATION, Section II-1c) needs SVr4 curses
 # -DUNDERLINE_LINKS  Define if you want links underlined instead of bold.
 # -DHP_TERMINAL    For DIM workaround to REVERSE problems on HP terminals.
 # -DNO_SIZECHANGE (old) or HAVE_SIZECHANGE (new) whether using code to detect
                    new size after size changes of the terminal (window).
                    for UNIX handled by ./configure, may be set in HTUtils.h
 # -DUSE_SCROLLBAR  supports scrollbar when built with ncurses
+# -DWIDEC_CURSES   whether curses lib supports wide/multibyte characters.
 
 Using slang library:
 # -DUSE_SLANG      (see INSTALLATION, Section II-1c)
@@ -103,19 +105,15 @@ Both:
 # 	if you have the reverse clear screen problem of some SUN4 systems, or
 # 	to work around some other "garbage on the screen" problems
 
-Related to experimental (unsupported) character style code
-------------------------------------------------------------
-# -DUSE_COLOR_STYLE (see INSTALLATION, Section II-1c) needs SVr4 curses
-
 Other general
 -------------
+# -DEXP_ASCII_CTYPES use POSIX locale for toupper/tolower/isupper
 # -DIGNORE_CTRL_C  Define if Control-C shouldn't exit lynx.
-# -DNO_CPU_LIMIT   Disables Max CPU timeout (includes CLOCKS_PER_SECOND)
+# -DINACTIVE_INPUT_STYLE_VH  Different style for showing inactive text fields
+# -DMISC_EXP       Enable some truly experimental stuff
 # -DNO_DUMP_WITH_BACKSPACES Disables -with_backspaces code
-# -DUSE_VASPRINT   Use vasprintf() function
 # -DNO_RULES	   Disables code for CERN-style rules files
-# -DMISC_EXP       Enable some truly experimental stuff
-# -DINACTIVE_INPUT_STYLE_VH  Different style for showing inactive text fields
+# -DUSE_VASPRINT   Use vasprintf() function
 
 Untested
 --------
diff --git a/gnu/usr.bin/lynx/docs/README.rootcerts b/gnu/usr.bin/lynx/docs/README.rootcerts
new file mode 100644
index 00000000000..fb294d11968
--- /dev/null
+++ b/gnu/usr.bin/lynx/docs/README.rootcerts
@@ -0,0 +1,308 @@
+	DOS/Windows-oriented notes on Root Certificates
+
+To use certificates or a cert bundle within an SSL enabled
+application such as lynx you must place your certificate
+files into a known directory, and set the environment
+variables to a proper value (e.g. in CONFIG.SYS file).
+
+ set SSL_CERT_DIR=x:/usr/local/ssl/certs
+ set SSL_CERT_FILE=x:/usr/local/ssl/cert.pem
+
+(See "What are root certificates" below.)
+
+
+Q.  Why would I want to install openssl.exe?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+openssl.exe is used to manage certificates.  (See "What are root certificates"
+below.)
+
+Q.  How to install openssl.exe?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Put openssl.exe in a directory in your PATH and the DLLs to a directory
+in your LIBPATH.
+
+Copy conf\openssl.cnf.demoCA to a directory of your
+choice, rename it to openssl.conf and set the environment variable
+OPENSSL_CONF by putting
+
+SET OPENSSL_CONF=<your-directory>\openssl.cnf
+
+into CONFIG.SYS.
+
+
+Q. Why is this document so paranoid?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you want to use OpenSSL, then probably your Internet transactions have
+*real* monetary value embedded in them.  And as usual, the security is as good
+as the weakest link.  This document unravels only the tip of the iceberg
+of what can go wrong with improperly established "secure" connections.  And
+given the monetary value involved, "bad guys" have a high incentive to exploit
+the weakest links.  As experience shows, do not underestimate the intelligence
+of bad guys...
+
+Really, with security, a little knowledge is a dangerous thing; one can
+suspect that many people, if they really understood the trust structures
+associated with SSL, would be rather careful about checking the details
+of certificates.
+
+Q. What are root certificates?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Making a secure connection is like sending your valuables (for storage or
+consumption) to somebody who agreed to be at a prearranged place.  To
+guard the valuables on the way there, you can ask for a police escort; this is
+what https:// connections are about.  However, it does not make any sense to
+have an escort if the goods are transfered to a random person who happens to be
+at this place; one needs to certify the identity of the receiver as well.
+
+The certification process is a chain; when site A wants to certify that it is
+actually what it claims, it actually says "Check this certificate with site B";
+to proceed, one needs to certify that site B is what it claims, so B may
+redirect to site C etc.  For this process to stop, some sites claim
+"You must know my certificate, check it yourself".  These certificates are
+"root certificates"; one cannot verify such a site unless one has the
+certificate for the "end of its certification chain".  If you don't have the
+relevant root certificate in your local certificates file, it means that
+you don't trust anyone to vouch for the authenticity of the site.
+
+So one should have a collection of known certificates from several well-known
+sites known as "Root Certification Authorities".  Most sites for large-scale
+businesses have certificates which will eventually resolve to these places.
+Such certicates represent people like Verisign that are in the business of
+confirming the identity of servers, etc.
+
+Additionally, since having yourself certified through another site costs,
+some sites avoid this cost via presenting "end-of-chain certificates".
+One should have a way to obtain these certificates via other means than
+insecure Internet connection (e.g., one can walk into the office and copy
+the certificate file to a floppy).  These are so-called "Self-signed
+certificates"; they are "root certificates" as well.  The locally-installed
+securely obtained copies of such certificates are referred to as
+"local certificates".  (See 'What is "Snake Oil Ltd."' below.)
+
+If you are presented with a locally-unresolvable root certificate, and you
+*believe* that you are really talking to the site, and not someone
+in between (who is either completely simulating the site or relaying
+your requests onto the real site - called a "man in the middle" attack),
+you will still have an encrypted connection.  Otherwise, you should act
+as though the site was an impostor, unless and until you manage to get
+a root certificate from a trustworthy source, and that root certificate
+represents someone that you would trust to have vetted the site you
+want to connect to.
+
+Local certificates are stored in SSL_CERT_FILE (this "cert bundle", usually
+named cert.pem, contains several signatures for "Root Certification
+Authorities") and SSL_CERT_DIR (which has a signature per file, and usually
+contain local copies of self-signed certificates).
+
+There are three crucial considerations to be added to this picture:
+
+  a) While there are ways to ensure that the receivers are who they claim,
+     there is absolutely no technological way to verify how *trustworthy*
+     the receiving party is.  It does not make sense to secure-send your
+     valuables to a certified receiver if this receiver is a crook (or will
+     just keep them later in a publicly accessible place).
+
+  b) "VeriSign Syndrome".  For the above scheme of "a chain of trust" to work,
+     the "Root Certification Authorities" should be *very* trustworthy
+     high-integrity entities.  Unfortunately, there are certain doubts that
+     this is so.  E.g., fall 2003, VeriSign started an attack on DNS scheme
+     which could disrupt the whole architecture of Internet (hijacking *all*
+     unclaimed Internet addresses and redirecting them to a promotional site;
+     google for VeriSign DNS hijack).
+
+     One major company even issued a Microsoft certificate to a company
+     other than Microsoft, and there had to be a Windows critical update
+     to block that certificate.
+
+  c) Keep in mind that the "big 2 browsers" are adding an increasing
+     number of root certificates, and most users fail to realise that they
+     are putting a trust in the supply chain for the browser to give them
+     the certificates of reliable organisations (the browser suppliers could
+     make bad choices, or the browser could have been hacked before you got
+     it).
+
+     Incidentally, standard browsers come with certificates representing
+     very different levels of identity verification, but most people accept
+     all of those supplied with the big 2 as equally valid.
+
+Q. How to obtain root certificates?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Certificate files, such as cert.pem, are security critical; you have to
+trust whoever supplies it to you; all your certification process is no more
+trustworthy than the site you downloaded cert.pem from.  So you shouldn't just
+accept any offer.
+
+One way is to copy them from a machine which already obtained them in a secure
+way.  Another one is to extract them from a web browser which was itself
+obtained in a secure way (see "How to extract certificates from Internet
+Explorer" below).  If anything else fails, obtaining a privately-generated
+bundle from third-parties, such as
+
+  http://www.kfu.com/~nsayer/encryption/ca-bundle.crt.text
+
+is *not* much better than no certificates at all, but may avoid some warnings
+from applications.  One of the places which has a bundle is the mod_ssl site.
+
+Q. Should you trust this distribution system?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+It is very hard to imagine a situation when the answer is different from
+"Absolutely not!".
+
+Indeed, obtaining the certificates is only half of the problem.
+The certificates are going to be checked by the SSL library.  Can you trust
+these executables (DLLs)?  Did you obtain the library via a secure connection?
+Are you sure that the place you obtained it from has reasonable security
+practice, so that the archive could not be tampered with?  The latter place
+most probably did not build the DLLs themselves; chances are they just
+store what a fourth-party supplied them.  Was *that* file transfer done via
+secure channels?  Can you trust this fourth-party so that it did not insert
+Trojans?
+
+Chances are that all of these questions are answered "No".  There are still
+major problems with bootstrapping security via the Internet...
+
+What about the application which uses these DLLs?  Do you have any reason to
+trust it?  What about the OS itself?  Did it come from a trustworthy source
+via trustworthy channels?  Are you sure it was not tampered with?
+
+Q.  How to compile and link with OpenSSL libraries?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Put the files from include and lib to your emx directory,
+or directories on C_INCLUDE_PATH and LIBRARY_PATH.
+Note that openssl should become a subdirectory of your include directory.
+If you need .lib files you can create them using emxomf.
+
+The supplied library files link against the new renamed dlls open_ssl and
+cryptsll.
+
+See the doc directory for some information and visit
+http://www.columbia.edu/~ariel/ssleay/ for more infos.
+
+
+Q. Why do you need your own keys and certificates?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There are several situations: having a server which accepts secure connections;
+authenticating yourself to a server by means other than login/password,
+sending S-Mime crypto-mail, authenticating from a client browser to a server.
+In each of these situations one needs keys.
+
+The following sites may be useful:
+
+   http://www.pseudonym.org/ssl/ssl_cook.html#environment
+   http://the.earth.li/~sgtatham/putty/0.53b/htmldoc/Chapter8.html#8.2
+
+Q. How to generate your own keys and certificates?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There are many ways. A good solution is to use sslRexx. It provides everything
+you need. PuTTYgen is a key generator that will work.
+
+Below is a short description of how I made my own Certification Authority,
+a Server Key for Apache and a client Key/Certificate for me, signed by my
+own CA.
+
+
+Q. Howto: Root CA (needed to self-sign all certificates)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Generate a CA-Key and store it in sub-directory private:
+
+  openssl genrsa -des3  -out private/MyOwnCA.pem 2048
+
+Make a selfsigned certificate based on above key.
+
+  openssl req -new -x509 -days 730 -key private/CAkey.pem -out CAcert.pem
+
+This certificate will expire in 2 years.
+
+Optional: generate text output of this certificate:
+
+  openssl x509 -in ./CAcert.pem -text > CAcert.txt
+
+Now you have a key and certificate for your own CA which can be used
+to sign user and server keys. The CAcert is also needed to configure
+Apache and Netscape. You can/should give away the CA certificate but
+never give the CA key to anybody.
+
+
+Q. Howto: Your Client Certificate/Key
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Generate a private key
+----------------------
+
+  openssl genrsa -des3 -out hrom-key.pem 2048
+
+
+Create a signing request (same command again)
+------------------------
+
+  openssl req -new -key hrom-key.pem -out hrom-req.pem
+
+Let the CA sign it (same command again)
+------------------
+
+  openssl ca -in hrom-req.pem -out hrom-cert.pem -outdir MyOwnCA/newcerts
+
+After you get back the certificate from the CA, combine it with
+your private key and store the result as p12 file. This file can
+be imported into your browser.  The browser will use this file to present
+to a server requiring it for access.
+
+  openssl pkcs12 -export -name Hromadka -in hrom-cert.pem -inkey hrom-key.pem -out hrom.p12
+
+
+Security Notes: Never give your private key to a CA, they only need the
+signing request. Never give away your p12 file. Always secure your private
+keys with a passphrase.
+
+
+Q. How to use c_rehash?
+~~~~~~~~~~~~~~~~~~~~~~
+
+One needs a working port of Perl and cp.exe to run this.  Set OPENSSL to the
+full name of openssl executable.  One may also need to change some ':' to
+$Config{path_sep}.  c_rehash finds certs from enviroment variables and allows
+them to be recognized by openssl.
+
+Q. How to extract certificates from Internet Explorer?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To make your own file of certificates, go to the
+"Tools/Internet Options/Content/Certificates/Trusted Root Certificates"
+section of IE. Select all the certificates, then "export" to a file.
+It will be saved as a PKCS#7 file, with suffix ".p7b". You can call
+it "ca_bundle.p7b". Then use openssl to convert it with the command:
+"openssl pkcs7 -inform DER -in ca_bundle.p7b -print_certs -text -out cert.pem".
+Ask your system administrator to put the file "cert.pem" in the openssl
+directory and c_rehash it. Then lynx can check the certificates against the
+set of certificates that you (or Microsoft) trusts, and you won't get the
+warning message any more.
+
+Q. How to install a self-signed certificate?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When you would like to trust a self-signed (non-commercial) certificate you will
+need to get hold of the actual file. If it's a cert local to your network you
+can ask the sysadmin to make it available for download as a link on a webpage.
+
+If such file is not human-readable it's probably DER formatted and will need to
+be converted to PEM format to allow openssl to use it.
+
+To convert DER formatted certificates into something openssl can deal with:
+
+Save the cert as site_name.crt in a directory. In that directory, type:
+
+  openssl x509 -inform DER -in site_name.crt -outform PEM -out site_name.pem
+
+You can now copy this individual cert into the directory for that and hash the
+cert by running c_rehash. A complete discussion of this procedure for unix is
+in the document README.sslcerts.
diff --git a/gnu/usr.bin/lynx/docs/README.ssl b/gnu/usr.bin/lynx/docs/README.ssl
index a560f476045..c9d1c79efbd 100644
--- a/gnu/usr.bin/lynx/docs/README.ssl
+++ b/gnu/usr.bin/lynx/docs/README.ssl
@@ -1,5 +1,5 @@
-SSL support for Lynx 2.8.4 (SSL-MM 1.4.1)
--- adapted from http://www.moxienet.com/lynx/
+SSL support for Lynx 2.8.5pre.1
+-- adapted from http://www.mentovai.com/lynx/
 
 Lynx, in its unmodified form, will not allow you to make secure socket layer
 (SSL) connections.  SSL is used for the secure transfer of information over the
@@ -16,23 +16,45 @@ through the same interface for both secure and standard transfers.
 This is based on, and requires, the OpenSSL library.  OpenSSL's distribution
 and use may be restricted by licenses and laws.  For information on obtaining
 OpenSSL, as well as information on its distribution, see
-http://www.openssl.org/.  The main distribution site is ftp://ftp.openssl.org/. 
 
-To test your version of Lynx for its SSL support, try it out with an SSL site. 
-http://www.moxienet.com/lynx/ssl-test will redirect you to a secure (https)
-page which will load if your browser contains SSL support, and give you some
-information about the connection.  Note that the server that you are redirected
-to may not have a valid certificate.  Lynx will not complain, as it does not
-yet support certificates, but other browsers may.  Since you will not be
-sending any sensitive data to the test page, this should not present a problem.
+	http://www.openssl.org/
 
-It is the user's responsibility to ensure that all patent laws,
-export restrictions, and other considerations have been taken into account
-before using this software.
+The main distribution site is at
 
--- Note:
+	ftp://ftp.openssl.org/source/
 
-Lynx is GPL'd, so it falls under the regulations in EAR section
+Lynx also has experimental support for GnuTLS (configure option --with-gnutls).
+For information on GnuTLS, see
+
+	http://www.gnu.org/software/gnutls/
+
+To test your version of Lynx for SSL support, try it out with an SSL site.
+Below are secure (https) pages which will load if your browser contains SSL
+support and you accept their certificates; they give you some information about
+the connection.
+
+	https://www.gnutls.org:5555/
+	https://www2.ggn.net/cgi-bin/ssl
+
+Lynx will complain about the certificate, since the certificate presented is
+untrusted.  You may accept this certificate to test your configuration, since
+it is a test, but it is a bad idea to blindly accept certificates from unknown
+websites if you are transmitting form data or files.
+
+You should review the document README.sslcerts for a detailed discussion of
+correct certificate handling possibilities and procedures in lynx.
+
+Users are reminded to check the laws and regulations about encryption software
+in their own countries.
+
+Here is the URL for US notification rules:
+
+	http://www.bxa.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html
+
+Note that that isn't a typo; it really is "Nofify". The site contains
+links to the full EAR regulations.
+
+Lynx is GPL'd, for our own use it falls under the regulations in EAR section
 740.13(e)(1):
 
     (1) Encryption source code controlled under 5D002, which would be
diff --git a/gnu/usr.bin/lynx/docs/README.sslcerts b/gnu/usr.bin/lynx/docs/README.sslcerts
new file mode 100644
index 00000000000..09de6277b9d
--- /dev/null
+++ b/gnu/usr.bin/lynx/docs/README.sslcerts
@@ -0,0 +1,236 @@
+	Lynx SSL support for certificates - README.sslcerts file
+
+BACKGROUND:
+
+The original README.ssl document for lynx stated:
+
+	Note that the server... may not have a valid certificate. Lynx will not 
+	complain, as it does not yet support certificates...
+
+Such lack of support is no longer the case.  Lynx now features excellent 
+certificate management through the openssl project.  There is almost no 
+online documentation available regarding how to use openssl's certificate 
+management with other programs, so this will accompany lynx and hopefully 
+encourage good practical security for unix clients. 
+
+Lynx relies on openssl to not only encrypt connections over https, but also to
+determine whether it should even accept a certificate and establish a secure 
+connection with a remote host. Because of this reliance upon openssl by lynx, 
+most of this tutorial deals with how to use openssl to "install" both
+commercial CA cert bundles as well as self-signed certs from trusted sources 
+and, most importantly, how to get them recognized by lynx. 
+
+While lynx on many systems will transparently accept valid certificates, not 
+all systems enjoy such functionality. Further, as noted above, older versions 
+of lynx do not perform any validity checks on a certificate. 
+
+There is also the common case of wanting to trust, use and install a 
+self-signed certificate from a known server source and have it be trusted by 
+client programs.
+
+Briefly, the procedure will involve confirming the default system location for
+certificates, possibly setting values for SSL_CERT_DIR and SSL_CERT_FILE in 
+the environment, and converting and hashing the certificates using openssl 
+utilities to enable recognition.
+
+THE CURRENT SITUATION:
+
+Prior to lynx2.8.5dev9, lynx did not check at all for certificate validity.
+
+Since lynx2.8.5.dev9, lynx has reported this openssl error:
+
+SSL error:unable to get local issuer certificate-Continue? (y)
+
+whenever an https connection was initiated and the certificate could not be
+found,  for whatever reason, by openssl, and therefore lynx. 
+
+This checking for a certificate is an enhancement to security, but rather 
+tediously generates errors at each https browser request. 
+
+The ability to turn off reporting of this error to the user was added to 
+lynx2.8.5dev16 as the FORCE_SSL_PROMPT setting in lynx.cfg as noted in the
+CHANGELOG:
+
+	This lets the user decide whether to ignore prompting for questionable 
+	aspects of an SSL connection.  
+
+While this is a convenient setting to employ when using lynx to script 
+https -dumps, it by definition ignores the issue of certificate validity 
+altogether. Those concerned with proper certificate management and 
+the maintenance of a store of updated CA certificates will be uncomfortable 
+with this relaxed security setting.
+
+PRELIMINARY PROCEDURES:
+
+It is assumed that openssl has been installed correctly, that the default 
+cert directory is /usr/local/ssl/certs, (it's often /etc/ssl/certs, but we 
+need a point of departure for the discussion) and that lynx has been compiled 
+--with-ssl. 
+
+The default location for certs on your system may be different, or there may not
+be one. You will have to substitute that location for /usr/local/ssl/certs in 
+the following instructions, and/or set environment variables.
+
+To determine the default location for certs on your system you may run the 
+following command: 
+
+strings libcrypto.a  | grep -in cert | less
+
+Look in this output for SSL_CERT_DIR and SSL_CERT_FILE, and the lines just
+above them. This is your default location, respectively, for certificates, 
+and the CA cert bundle, cert.pem. You will need to know where libcrypto.a is 
+found of course.
+
+Example output:
+
+<snip>
+7490:/etc/ssl/certs
+7491:/etc/ssl/cert.pem
+7492:SSL_CERT_DIR
+7493:SSL_CERT_FILE
+<snip>
+
+Other possible example output:
+
+<snip>
+31555:/usr/local/ssl/certs
+31556:/usr/local/ssl/cert.pem
+31557:SSL_CERT_DIR
+31558:SSL_CERT_FILE
+<snip>
+
+Note that when OpenSSL is installed, the c_rehash utility is installed in a 
+binary directory (default /usr/local/ssl/bin).  You will need to know where it 
+is on your system. The command:
+
+whereis c_rehash 
+
+will probably give useful results.
+
+Note also that there is no CA cert bundle distributed with OpenSSL. The 
+OpenSSL team specifically decided NOT to do that. Getting a set of trusted 
+certificates is left up to the installer. 
+
+It is a fairly trivial procedure to pull the bundle of trusted root certs out 
+of a recent version of Internet Explorer. The mod_ssl project also provides 
+them.  The procedure to convert and install them is detailed later in this 
+document, and if you simply need to have commercially provided certificates 
+trusted by lynx, you can skip down a few lines to the INSTALLING OR UPDATING 
+THE CA BUNDLE section.
+
+INSTALLING A SELF-SIGNED CERTIFICATE:
+
+When you would like to trust a self-signed (non-commercial) certificate you will
+need to get hold of the actual file. If it's a cert local to your network you
+can ask the sysadmin to make it available for download as a link on a webpage.
+
+If such file is not human-readable it's probably DER formatted and will need to 
+be converted to PEM format to allow openssl to use it.
+
+To convert DER formatted certificates into something openssl can deal with:
+
+Save the cert as site_name.crt in a directory. In that directory, type:
+
+openssl x509 -inform DER -in site_name.crt -outform PEM -out site_name.pem
+
+You can now copy this individual cert into the directory for that, usually
+/usr/local/ssl/certs.  The alternative is to concatenate the individual certs 
+to the cert.pem bundle in /usr/local/ssl. (Please see INSTALLING OR UPDATING 
+THE CA BUNDLE below). 
+
+The cert file will now be in an acceptable format to openssl, PEM encoded. 
+However, openssl, and by extension lynx, will not know about it until that 
+cert is present in a file named after the hash value of that cert, in the 
+default directory /usr/local/ssl/certs.
+
+So the next thing to do is to hash the cert using c_rehash.
+
+INSTALLING OR UPDATING THE CA BUNDLE:
+
+Now would be a good time to check to see if you have the bundle of CA certs
+/usr/local/ssl/cert.pem, or to update them.
+
+CA bundles are available in various places, such as the modssl distribution, 
+for those who want to take that route, or you can extract the current bundle 
+from a current version of Netscape or Internet Explorer (export them all from 
+IE and transfer it onto your system). 
+
+From IE it extracts as a PKCS7 file and needs to be converted with something 
+like:
+
+openssl pkcs7 -inform DER -in bundle.crt -outform PEM -out cert.pem \ 
+-print_certs -text
+
+The resulting cert.pem file should be copied to the default directory for 
+bundles (usually /usr/local/ssl) and renamed to "cert.pem". It will also 
+process just fine if it is present and hashed in /usr/local/ssl/certs.
+
+We now have all of the individual certs we wish to trust in our certs 
+directory, and the most recent bundle of CA certs as well. 
+
+Confirm that you have the script c_rehash (See PRELIMINARY PROCEDURES; if it is 
+not found, a copy is usually located in the tools directory of the openssl 
+source tree. If you use this copy, it needs the execute bit set or it will not
+run).
+
+Run:
+
+./c_rehash
+
+The c_rehash utility is a perl script that runs openssl commands which creates 
+the files named after the hash values of the certs in the default directory 
+for certs. 
+
+Its output looks like this:
+
+Doing /usr/local/ssl/certs
+vsignss.pem => f73e89fd.0
+vsign3.pem => 7651b327.0
+...more output
+<snip>
+
+All pem encoded certs in /usr/local/ssl/certs will now be recognized.
+
+SETTING AND EXPORTING ENVIRONMENT VARIABLES:
+
+If lynx is still not recognizing certs, environment variables may need
+to be set; if on a sh type shell, the variables also need to be exported.
+
+The environment variables SSL_CERT_DIR and SSL_CERT_FILE only need to be set 
+if a non-default location is used for certificates, or if certs just can't be
+found by lynx. They may be set as follows in /etc/profile, or a shell 
+initialization .profile or .*shrc, if we run a non csh type shell, according 
+to the results of the search for the default location for certs procedure 
+(See PRELIMINARY PROCEDURES):
+
+SSL_CERT_DIR="/usr/local/ssl/certs"
+SSL_CERT_FILE="/usr/local/ssl/cert.pem"
+export SSL_CERT_DIR SSL_CERT_FILE
+
+On csh type shells, you can use:
+setenv SSL_CERT_DIR "/usr/local/ssl/certs"
+setenv SSL_CERT_FILE "/usr/local/ssl/cert.pem"
+
+On some systems setting and exporting them makes all the difference. Apparently 
+this is often not an issue on other systems, but this might help someone 
+somewhere.
+
+Note that the environment variable SSL_CERT_FILE applies to the cert-bundle 
+if used outside of the default location (/usr/local/ssl/cert.pem) compiled 
+into OpenSSL. There are issues with SSL_CERT_FILE in 0.9.6x versions of openssl.
+
+Make sure you have FORCE_SSL_PROMPT set to PROMPT in lynx.cfg like so:
+
+FORCE_SSL_PROMPT:PROMPT
+
+You will now connect without error to https servers with trusted certs, but
+will still get this error for untrusted certs:
+
+SSL error:self signed certificate-Continue? (y)
+
+A quick check confirms that these procedures have the same effect with ssl 
+errors in the pine program.
+
+--Stef Caunter <cauntes@mail.mohawkc.on.ca>
+Mohawk College Department of Computer Science
+Hamilton Ontario Canada
diff --git a/gnu/usr.bin/lynx/install.sh b/gnu/usr.bin/lynx/install.sh
index a9611d9e68c..9f59f0be50e 100644
--- a/gnu/usr.bin/lynx/install.sh
+++ b/gnu/usr.bin/lynx/install.sh
@@ -1,15 +1,27 @@
 #! /bin/sh
 #
 # install - install a program, script, or datafile
-# This comes from X11R5.
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.
-#
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
 
 
 # set DOITPROG to echo to test this script
@@ -29,7 +41,7 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-tranformbasename=""
+transformbasename=""
 transform_arg=""
 instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
@@ -97,7 +109,7 @@ then
 	echo "install:	no input file specified"
 	exit 1
 else
-	true
+	:
 fi
 
 if [ x"$dir_arg" != x ]; then
@@ -106,8 +118,9 @@ if [ x"$dir_arg" != x ]; then
 
 	if [ -d $dst ]; then
 		instcmd=:
+		chmodcmd=""
 	else
-		instcmd=mkdir
+		instcmd=$mkdirprog
 	fi
 else
 
@@ -117,7 +130,7 @@ else
 
 	if [ -f $src -o -d $src ]
 	then
-		true
+		:
 	else
 		echo "install:  $src does not exist"
 		exit 1
@@ -128,7 +141,7 @@ else
 		echo "install:	no destination specified"
 		exit 1
 	else
-		true
+		:
 	fi
 
 # If destination is a directory, append the input filename; if your system
@@ -138,7 +151,7 @@ else
 	then
 		dst="$dst"/`basename $src`
 	else
-		true
+		:
 	fi
 fi
 
@@ -150,8 +163,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
+defaultIFS='
+	'
 IFS="${IFS-${defaultIFS}}"
 
 oIFS="${IFS}"
@@ -170,7 +183,7 @@ while [ $# -ne 0 ] ; do
         then
 		$mkdirprog "${pathcomp}"
 	else
-		true
+		:
 	fi
 
 	pathcomp="${pathcomp}/"
@@ -181,10 +194,10 @@ if [ x"$dir_arg" != x ]
 then
 	$doit $instcmd $dst &&
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
 else
 
 # If we're going to rename the final executable, determine the name now.
@@ -203,7 +216,7 @@ else
 	then
 		dstfile=`basename $dst`
 	else
-		true
+		:
 	fi
 
 # Make a temp file name in the proper directory.
@@ -222,10 +235,10 @@ else
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
 
 # Now rename the file to the real destination.
 
diff --git a/gnu/usr.bin/lynx/intl/ChangeLog b/gnu/usr.bin/lynx/intl/ChangeLog
deleted file mode 100644
index 198950159da..00000000000
--- a/gnu/usr.bin/lynx/intl/ChangeLog
+++ /dev/null
@@ -1,1086 +0,0 @@
-1998-04-29  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intl/localealias.c (read_alias_file): Use unsigned char for
-	local variables.  Remove unused variable tp.
-	* intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char *
-	for type of codeset.  For loosing Solaris systems.
-	* intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset.
-	* intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable
-	len if not needed.
-	Patches by Jim Meyering.
-
-1998-04-28  Ulrich Drepper  <drepper@cygnus.com>
-
-	* loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if
-	mmap is not supported.
-
-	* hash-string.h: Don't include <values.h>.
-
-1998-04-27  Ulrich Drepper  <drepper@cygnus.com>
-
-	* textdomain.c: Use strdup is available.
-
-	* localealias.c: Define HAVE_MEMPCPY so that we can use this
-	function.  Define and use semapahores to protect modfication of
-	global objects when compiling for glibc.  Add code to allow
-	freeing alias table.
-
-	* l10nflist.c: Don't assume stpcpy not being a macro.
-
-	* gettextP.h: Define internal_function macri if not already done.
-	Use glibc byte-swap macros instead of defining SWAP when compiled
-	for glibc.
-	(struct loaded_domain): Add elements to allow unloading.
-
-	* Makefile.in (distclean): Don't remove libintl.h here.
-
-	* bindtextdomain.c: Carry over changes from glibc.  Use strdup if
-	available.
-
-	* dcgettext.c: Don't assume stpcpy not being a macro.  Mark internal
-	functions.  Add memory freeing code for glibc.
-
-	* dgettext.c: Update copyright.
-
-	* explodename.c: Include stdlib.h and string.h only if they exist.
-	Use strings.h eventually.
-
-	* finddomain.c: Mark internal functions.  Use strdup if available.
-	Add memory freeing code for glibc.
-
-1997-10-10 20:00  Ulrich Drepper  <drepper@cygnus.com>
-
-	* libgettext.h: Fix dummy textdomain and bindtextdomain macros.
-	They should return reasonable values.
-	Reported by Tom Tromey <tromey@cygnus.com>.
-
-1997-09-16 03:33  Ulrich Drepper  <drepper@cygnus.com>
-
-	* libgettext.h: Define PARAMS also to `args' if __cplusplus is defined.
-	* intlh.inst.in: Likewise.
-	Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>.
-
-	* libintl.glibc: Update from current glibc version.
-
-1997-09-06 02:10  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intlh.inst.in: Reformat copyright.
-
-1997-08-19 15:22  Ulrich Drepper  <drepper@cygnus.com>
-
-	* dcgettext.c (DCGETTEXT): Remove wrong comment.
-
-1997-08-16 00:13  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install-data): Don't change directory to install.
-
-1997-08-01 14:30  Ulrich Drepper  <drepper@cygnus.com>
-
-	* cat-compat.c: Fix copyright.
-
-	* localealias.c: Don't define strchr unless !HAVE_STRCHR.
-
-	* loadmsgcat.c: Update copyright.  Fix typos.
-
-	* l10nflist.c: Don't define strchr unless !HAVE_STRCHR.
-	(_nl_make_l10nflist): Handle sponsor and revision correctly.
-
-	* gettext.c: Update copyright.
-	* gettext.h: Likewise.
-	* hash-string.h: Likewise.
-
-	* finddomain.c: Remoave dead code.  Define strchr only if
-	!HAVE_STRCHR.
-
-	* explodename.c: Include <sys/types.h>.
-
-	* explodename.c: Reformat copyright text.
-	(_nl_explode_name): Fix typo.
-
-	* dcgettext.c: Define and use __set_errno.
-	(guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is
-	not defined.
-
-	* bindtextdom.c: Pretty printing.
-
-1997-05-01 02:25  Ulrich Drepper  <drepper@cygnus.com>
-
-	* dcgettext.c (guess_category_value): Don't depend on
-	HAVE_LC_MESSAGES.  We don't need the macro here.
-	Patch by Bruno Haible <haible@ilog.fr>.
-
-	* cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL
-	macro.  Instead use HAVE_LOCALE_NULL and define it when using
-	glibc, as in dcgettext.c.
-	Patch by Bruno Haible <haible@ilog.fr>.
-
-	* Makefile.in (CPPFLAGS): New variable.  Reported by Franc,ois
-	Pinard.
-
-Mon Mar 10 06:51:17 1997  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in: Implement handling of libtool.
-
-	* gettextP.h: Change data structures for use of generic lowlevel
-	i18n file handling.
-
-Wed Dec  4 20:21:18 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* textdomain.c: Put parentheses around arguments of memcpy macro
-	definition.
-	* localealias.c: Likewise.
-	* l10nflist.c: Likewise.
-	* finddomain.c: Likewise.
-	* bindtextdom.c: Likewise.
-	Reported by Thomas Esken.
-
-Mon Nov 25 22:57:51 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* textdomain.c: Move definition of `memcpy` macro to right
-	position.
-
-Fri Nov 22 04:01:58 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using
- 	bcopy if not already defined.  Reported by Thomas Esken.
-	* bindtextdom.c: Likewise.
-	* l10nflist.c: Likewise.
-	* localealias.c: Likewise.
-	* textdomain.c: Likewise.
-
-Tue Oct 29 11:10:27 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (libdir): Change to use exec_prefix instead of
- 	prefix.  Reported by Knut-HåvardAksnes <etokna@eto.ericsson.se>.
-
-Sat Aug 31 03:07:09 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c (_nl_normalize_codeset): We convert to lower case,
-	so don't prepend uppercase `ISO' for only numeric arg.
-
-Fri Jul 19 00:15:46 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after
-	definition of _GNU_SOURCE.  Patch by Roland McGrath.
-
-	* Makefile.in (uninstall): Fix another bug with `for' loop and
-	empty arguments.  Patch by Jim Meyering.  Correct name os
-	uninstalled files: no intl- prefix anymore.
-
-	* Makefile.in (install-data): Again work around shells which
-	cannot handle mpty for list.  Reported by Jim Meyering.
-
-Sat Jul 13 18:11:35 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install): Split goal.  Now depend on install-exec
-        and install-data.
-	(install-exec, install-data): New goals.  Created from former
-	install goal.
-	Reported by Karl Berry.
-
-Sat Jun 22 04:58:14 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (MKINSTALLDIRS): New variable.  Path to
-        mkinstalldirs script.
-	(install): use MKINSTALLDIRS variable or if the script is not present
-	try to find it in the $top_scrdir).
-
-Wed Jun 19 02:56:56 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c: Linux libc *partly* includes the argz_* functions.
-	Grr.  Work around by renaming the static version and use macros
-	for renaming.
-
-Tue Jun 18 20:11:17 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c: Correct presence test macros of __argz_* functions.
-
-	* l10nflist.c: Include <argz.h> based on test of it instead when
-	__argz_* functions are available.
-	Reported by Andreas Schwab.
-
-Thu Jun 13 15:17:44 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* explodename.c, l10nflist.c: Define NULL for dumb systems.
-
-Tue Jun 11 17:05:13 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intlh.inst.in, libgettext.h (dcgettext): Rename local variable
-	result to __result to prevent name clash.
-
-	* l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to
-        get prototype for stpcpy and strcasecmp.
-
-	* intlh.inst.in, libgettext.h: Move declaration of
-	`_nl_msg_cat_cntr' outside __extension__ block to prevent warning
-	from gcc's -Wnested-extern option.
-
-Fri Jun  7 01:58:00 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install): Remove comment.
-
-Thu Jun  6 17:28:17 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install): Work around for another Buglix stupidity.
-	Always use an `else' close for `if's.  Reported by Nelson Beebe.
-
-	* Makefile.in (intlh.inst): Correct typo in phony rule.
-	Reported by Nelson Beebe.
-
-Thu Jun  6 01:49:52 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* dcgettext.c (read_alias_file): Rename variable alloca_list to
-	block_list as the macro calls assume.
-	Patch by Eric Backus.
-
-	* localealias.c [!HAVE_ALLOCA]: Define alloca as macro using
-        malloc.
-	(read_alias_file): Rename varriabe alloca_list to block_list as the
-	macro calls assume.
-	Patch by Eric Backus.
-
-	* l10nflist.c: Correct conditional for <argz.h> inclusion.
-	Reported by Roland McGrath.
-
-	* Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not
-        all-@USE_NLS@.
-
-	* Makefile.in (install): intlh.inst comes from local dir, not
-        $(srcdir).
-
-	* Makefile.in (intlh.inst): Special handling of this goal.  If
-	used in gettext, this is really a rul to construct this file.  If
-	used in any other package it is defined as a .PHONY rule with
-	empty body.
-
-	* finddomain.c: Extract locale file information handling into
-	l10nfile.c.  Rename local stpcpy__ function to stpcpy.
-
-	* dcgettext.c (stpcpy): Add local definition.
-
-	* l10nflist.c: Solve some portability problems.  Patches partly by
-	Thomas Esken.  Add local definition of stpcpy.
-
-Tue Jun  4 02:47:49 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intlh.inst.in: Don't depend including <locale.h> on
-	HAVE_LOCALE_H.  Instead configure must rewrite this fiile
-	depending on the result of the configure run.
-
-	* Makefile.in (install): libintl.inst is now called intlh.inst.
-	Add rules for updating intlh.inst from intlh.inst.in.
-
-	* libintl.inst: Renamed to intlh.inst.in.
-
-	* localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1
-        because gcc has __buitlin_alloca.
-	Reported by Roland McGrath.
-
-Mon Jun  3 00:32:16 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (installcheck): New goal to fulfill needs of
-        automake's distcheck.
-
-	* Makefile.in (install): Reorder commands so that VERSION is
-        found.
-
-	* Makefile.in (gettextsrcdir): Now use subdirectory intl/ in
-        @datadir@/gettext.
-	(COMSRCS): Add l10nfile.c.
-	(OBJECTS): Add l10nfile.o.
-	(DISTFILES): Rename to DISTFILE.normal.  Remove $(DISTFILES.common).
-	(DISTFILE.gettext): Remove $(DISTFILES.common).
-	(all-gettext): Remove goal.
-	(install): If $(PACKAGE) = gettext install, otherwose do nothing.  No
-	package but gettext itself should install libintl.h + headers.
-	(dist): Extend goal to work for gettext, too.
-	(dist-gettext): Remove goal.
-
-	* dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc.
-
-Sun Jun  2 17:33:06 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* loadmsgcat.c (_nl_load_domain): Parameter is now comes from
-        find_l10nfile.
-
-Sat Jun  1 02:23:03 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c (__argz_next): Add definition.
-
-	* dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca
-	code.  Use new l10nfile handling.
-
-	* localealias.c [!HAVE_ALLOCA]: Add code for handling missing
-        alloca code.
-
-	* l10nflist.c: Initial revision.
-
-Tue Apr  2 18:51:18 1996  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (all-gettext): New goal.  Same as all-yes.
-
-Thu Mar 28 23:01:22 1996  Karl Eichwalder  <ke@ke.central.de>
-
-	* Makefile.in (gettextsrcdir): Define using @datadir@.
-
-Tue Mar 26 12:39:14 1996  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c: Include <ctype.h>.  Reported by Roland McGrath.
-
-Sat Mar 23 02:00:35 1996  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing
-        with external declaration.
-
-Sat Mar  2 00:47:09 1996  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (all-no): Rename from all_no.
-
-Sat Feb 17 00:25:59 1996  Ulrich Drepper  <drepper@myware>
-
-	* gettextP.h [loaded_domain]: Array `successor' must now contain up
-        to 63 elements (because of codeset name normalization).
-
-	* finddomain.c: Implement codeset name normalization.
-
-Thu Feb 15 04:39:09 1996  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (all): Define to `all-@USE_NLS@'.
-	(all-yes, all_no): New goals.  `all-no' is noop, `all-yes'
-	is former all.
-
-Mon Jan 15 21:46:01 1996  Howard Gayle  <howard@hal.com>
-
-	* localealias.c (alias_compare): Increment string pointers in loop
-        of strcasecmp replacement.
-
-Fri Dec 29 21:16:34 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (install-src): Who commented this goal out ? :-)
-
-Fri Dec 29 15:08:16 1995  Ulrich Drepper  <drepper@myware>
-
-	* dcgettext.c (DCGETTEXT): Save `errno'.  Failing system calls
-	should not effect it because a missing catalog is no error.
-	Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>.
-
-Tue Dec 19 22:09:13 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (Makefile): Explicitly use $(SHELL) for running
-        shell scripts.
-
-Fri Dec 15 17:34:59 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* Makefile.in (install-src): Only install library and header when
-	we use the own implementation.  Don't do it when using the
-	system's gettext or catgets functions.
-
-	* dcgettext.c (find_msg): Must not swap domain->hash_size here.
-
-Sat Dec  9 16:24:37 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c, libintl.inst, libgettext.h, hash-string.h,
-	gettextP.h, finddomain.c, dcgettext.c, cat-compat.c:
-	Use PARAMS instead of __P.  Suggested by Roland McGrath.
-
-Tue Dec  5 11:39:14 1995  Larry Schwimmer  <rosebud@cyclone.stanford.edu>
-
-	* libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if
-	!_LIBINTL_H' because Solaris defines _LIBINTL_H as empty.
-
-Mon Dec  4 15:42:07 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (install-src):
-	Install libintl.inst instead of libintl.h.install.
-
-Sat Dec  2 22:51:38 1995  Marcus Daniels  <marcus@sysc.pdx.edu>
-
-	* cat-compat.c (textdomain):
-	Reverse order in which files are tried you load.  First
-	try local file, when this failed absolute path.
-
-Wed Nov 29 02:03:53 1995  Nelson H. F. Beebe  <beebe@math.utah.edu>
-
-	* cat-compat.c (bindtextdomain): Add missing { }.
-
-Sun Nov 26 18:21:41 1995  Ulrich Drepper  <drepper@myware>
-
-	* libintl.inst: Add missing __P definition.  Reported by Nelson Beebe.
-
-	* Makefile.in:
-	Add dummy `all' and `dvi' goals.  Reported by Tom Tromey.
-
-Sat Nov 25 16:12:01 1995  Franc,ois Pinard  <pinard@iro.umontreal.ca>
-
-	* hash-string.h: Capitalize arguments of macros.
-
-Sat Nov 25 12:01:36 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): Prevent files names longer than 13
-	characters.  libintl.h.glibc->libintl.glibc,
-	libintl.h.install->libintl.inst.  Reported by Joshua R. Poulson.
-
-Sat Nov 25 11:31:12 1995  Eric Backus  <ericb@lsid.hp.com>
-
-	* dcgettext.c: Fix bug in preprocessor conditionals.
-
-Sat Nov 25 02:35:27 1995  Nelson H. F. Beebe  <beebe@math.utah.edu>
-
-	* libgettext.h: Solaris cc does not understand
-	 #if !SYMBOL1 && !SYMBOL2.  Sad	but true.
-
-Thu Nov 23 16:22:14 1995  Ulrich Drepper  <drepper@myware>
-
-	* hash-string.h (hash_string):
-	Fix for machine with >32 bit `unsigned long's.
-
-	* dcgettext.c (DCGETTEXT):
-	Fix horrible bug in loop for alternative translation.
-
-Thu Nov 23 01:45:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* po2tbl.sed.in, linux-msg.sed, xopen-msg.sed:
-	Some further simplifications in message number generation.
-
-Mon Nov 20 21:08:43 1995  Ulrich Drepper  <drepper@myware>
-
-	* libintl.h.glibc: Use __const instead of const in prototypes.
-
-	* Makefile.in (install-src):
-	Install libintl.h.install instead of libintl.h.  This
-	is a stripped-down version.  Suggested by Peter Miller.
-
-	* libintl.h.install, libintl.h.glibc: Initial revision.
-
-	* localealias.c (_nl_expand_alias, read_alias_file):
-	Protect prototypes in type casts by __P.
-
-Tue Nov 14 16:43:58 1995  Ulrich Drepper  <drepper@myware>
-
-	* hash-string.h: Correct prototype for hash_string.
-
-Sun Nov 12 12:42:30 1995  Ulrich Drepper  <drepper@myware>
-
-	* hash-string.h (hash_string): Add prototype.
-
-	* gettextP.h: Fix copyright.
-	(SWAP): Add prototype.
-
-Wed Nov  8 22:56:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (read_alias_file): Forgot sizeof.
-	Avoid calling *printf function.  This introduces a big overhead.
-	Patch by Roland McGrath.
-
-Tue Nov  7 14:21:08 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy.
-
-	* finddomain.c (stpcpy):
-	Define substitution function local.  The macro was to flaky.
-
-	* cat-compat.c: Fix typo.
-
-	* xopen-msg.sed, linux-msg.sed:
-	While bringing message number to right place only accept digits.
-
-	* linux-msg.sed, xopen-msg.sed: Now that the counter does not have
-	leading 0s we don't need to remove them.  Reported by Marcus
-	Daniels.
-
-	* Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in
-	dependency.  Reported by Marcus Daniels.
-
-	* cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement.
-	Generally cleanup using #if instead of #ifndef.
-
-	* Makefile.in: Correct typos in comment.  By Franc,ois Pinard.
-
-Mon Nov  6 00:27:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (install-src): Don't install libintl.h and libintl.a
-	if we use an available gettext implementation.
-
-Sun Nov  5 22:02:08 1995  Ulrich Drepper  <drepper@myware>
-
-	* libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS.  Reported
-	by Franc,ois Pinard.
-
-	* libgettext.h: Use #if instead of #ifdef/#ifndef.
-
-	* finddomain.c:
-	Comments describing what has to be done should start with FIXME.
-
-Sun Nov  5 19:38:01 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): Split.  Use DISTFILES with normal meaning.
-	DISTFILES.common names the files common to both dist goals.
-	DISTFILES.gettext are the files only distributed in GNU gettext.
-
-Sun Nov  5 17:32:54 1995  Ulrich Drepper  <drepper@myware>
-
-	* dcgettext.c (DCGETTEXT): Correct searching in derived locales.
-	This was necessary since a change in _nl_find_msg several weeks
-	ago.  I really don't know this is still not fixed.
-
-Sun Nov  5 12:43:12 1995  Ulrich Drepper  <drepper@myware>
-
-	* loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL.  This
-	might mark a special condition.
-
-	* finddomain.c (make_entry_rec): Don't make illegal entry as decided.
-
-	* Makefile.in (dist): Suppress error message when ln failed.
-	Get files from $(srcdir) explicitly.
-
-	* libgettext.h (gettext_const): Rename to gettext_noop.
-
-Fri Nov  3 07:36:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (make_entry_rec):
-	Protect against wrong locale names by testing mask.
-
-	* libgettext.h (gettext_const): Add macro definition.
-	Capitalize macro arguments.
-
-Thu Nov  2 23:15:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (_nl_find_domain):
-	Test for pointer != NULL before accessing value.
-	Reported by Tom Tromey.
-
-	* gettext.c (NULL):
-	Define as (void*)0 instad of 0.  Reported by Franc,ois Pinard.
-
-Mon Oct 30 21:28:52 1995  Ulrich Drepper  <drepper@myware>
-
-	* po2tbl.sed.in: Serious typo bug fixed by Jim Meyering.
-
-Sat Oct 28 23:20:47 1995  Ulrich Drepper  <drepper@myware>
-
-	* libgettext.h: Disable dcgettext optimization for Solaris 2.3.
-
-	* localealias.c (alias_compare):
-	Peter Miller reported that tolower in some systems is
-	even dumber than I thought.  Protect call by `isupper'.
-
-Fri Oct 27 22:22:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (libdir, includedir): New variables.
-	(install-src): Install libintl.a and libintl.h in correct dirs.
-
-Fri Oct 27 22:07:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c.
-
-	* po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques.
-
-	* localealias.c:
-	Fix typo and superflous test.  Reported by Christian von Roques.
-
-Fri Oct  6 11:52:05 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (_nl_find_domain):
-	Correct some remainder from the pre-CEN syntax.  Now
-	we don't have a constant number of successors anymore.
-
-Wed Sep 27 21:41:13 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): Add libintl.h.glibc.
-
-	* Makefile.in (dist-libc): Add goal for packing sources for glibc.
-	(COMSRCS, COMHDRS): Splitted to separate sources shared with glibc.
-
-	* loadmsgcat.c: Forget to continue #if line.
-
-	* localealias.c:
-	[_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name
-	space clean.
-
-	* dcgettext.c, finddomain.c: Better comment to last change.
-
-	* loadmsgcat.c:
-	[_LIBC]: Rename fstat, open, close, read, mmap, and munmap to
-	__fstat, __open, __close, __read, __mmap, and __munmap resp
-	to keep ANSI C name space clean.
-
-	* finddomain.c:
-	[_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean.
-
-	* dcgettext.c:
-	[_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to
-	keep ANSI C name space clean.
-
-	* libgettext.h:
-	Include sys/types.h for those old SysV systems out there.
-	Reported by Francesco Potorti`.
-
-	* loadmsgcat.c (use_mmap): Define if compiled for glibc.
-
-	* bindtextdom.c: Include all those standard headers
-	unconditionally if _LIBC is defined.
-
-	* finddomain.c: Fix 2 times defiend -> defined.
-
-	* textdomain.c: Include libintl.h instead of libgettext.h when
-	compiling for glibc.  Include all those standard headers
-	unconditionally if _LIBC is defined.
-
-	* localealias.c, loadmsgcat.c: Prepare to be compiled in glibc.
-
-	* gettext.c:
-	Include libintl.h instead of libgettext.h when compiling for glibc.
-	Get NULL from stddef.h if we compile for glibc.
-
-	* finddomain.c: Include libintl.h instead of libgettext.h when
-	compiling for glibc.  Include all those standard headers
-	unconditionally if _LIBC is defined.
-
-	* dcgettext.c: Include all those standard headers unconditionally
-	if _LIBC is defined.
-
-	* dgettext.c: If compiled in glibc include libintl.h instead of
-	libgettext.h.
-	(locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc.
-
-	* dcgettext.c: If compiled in glibc include libintl.h instead of
-	libgettext.h.
-	(getcwd): Don't rely on HAVE_GETCWD when compiling for glibc.
-
-	* bindtextdom.c:
-	If compiled in glibc include libintl.h instead of libgettext.h.
-
-Mon Sep 25 22:23:06 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0.
-	Reported by Marcus Daniels.
-
-	* cat-compat.c (bindtextdomain):
-	String used in putenv must not be recycled.
-	Reported by Marcus Daniels.
-
-	* libgettext.h (__USE_GNU_GETTEXT):
-	Additional symbol to signal that we use GNU gettext
-	library.
-
-	* cat-compat.c (bindtextdomain):
-	Fix bug with the strange stpcpy replacement.
-	Reported by Nelson Beebe.
-
-Sat Sep 23 08:23:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* cat-compat.c: Include <string.h> for stpcpy prototype.
-
-	* localealias.c (read_alias_file):
-	While expand strdup code temporary variable `cp' hided
-	higher level variable with same name.  Rename to `tp'.
-
-	* textdomain.c (textdomain):
-	Avoid warning by using temporary variable in strdup code.
-
-	* finddomain.c (_nl_find_domain): Remove unused variable `application'.
-
-Thu Sep 21 15:51:44 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (alias_compare):
-	Use strcasecmp() only if available.  Else use
-	implementation in place.
-
-	* intl-compat.c:
-	Wrapper functions now call *__ functions instead of __*.
-
-	* libgettext.h: Declare prototypes for *__ functions instead for __*.
-
-	* cat-compat.c, loadmsgcat.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-
-	* bindtextdom.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-	Rename to bindtextdomain__ if not used in GNU C Library.
-
-	* dgettext.c:
-	Rename function to dgettext__ if not used in GNU C Library.
-
-	* gettext.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-	Functions now called gettext__ if not used in GNU C Library.
-
-	* dcgettext.c, localealias.c, textdomain.c, finddomain.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-
-Sun Sep 17 23:14:49 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c: Correct some bugs in handling of CEN standard
- 	locale definitions.
-
-Thu Sep  7 01:49:28 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c: Implement CEN syntax.
-
-	* gettextP.h (loaded_domain): Extend number of successors to 31.
-
-Sat Aug 19 19:25:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (aliaspath): Remove path to X11 locale dir.
-
-	* Makefile.in: Make install-src depend on install.  This helps
- 	gettext to install the sources and other packages can use the
- 	install goal.
-
-Sat Aug 19 15:19:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (uninstall): Remove stuff installed by install-src.
-
-Tue Aug 15 13:13:53 1995  Ulrich Drepper  <drepper@myware>
-
-	* VERSION.in: Initial revision.
-
-	* Makefile.in (DISTFILES):
-	Add VERSION file.  This is not necessary for gettext, but
-	for other packages using this library.
-
-Tue Aug 15 06:16:44 1995  Ulrich Drepper  <drepper@myware>
-
-	* gettextP.h (_nl_find_domain):
-	New prototype after changing search strategy.
-
-	* finddomain.c (_nl_find_domain):
-	We now try only to find a specified catalog.  Fall back to other
-	catalogs listed in the locale list is now done in __dcgettext.
-
-	* dcgettext.c (__dcgettext):
-	Now we provide message fall back even to different languages.
-	I.e. if a message is not available in one language all the other
- 	in the locale list a tried.  Formerly fall back was only possible
- 	within one language.  Implemented by moving one loop from
- 	_nl_find_domain to here.
-
-Mon Aug 14 23:45:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (gettextsrcdir):
-	Directory where source of GNU gettext library are made
-	available.
-	(INSTALL, INSTALL_DATA): Programs used for installing sources.
-	(gettext-src): New.  Rule to install GNU gettext sources for use in
-	gettextize shell script.
-
-Sun Aug 13 14:40:48 1995  Ulrich Drepper  <drepper@myware>
-
-	* loadmsgcat.c (_nl_load_domain):
-	Use mmap for loading only when munmap function is
-	also available.
-
-	* Makefile.in (install): Depend on `all' goal.
-
-Wed Aug  9 11:04:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (read_alias_file):
-	Do not overwrite '\n' when terminating alias value string.
-
-	* localealias.c (read_alias_file):
-	Handle long lines.  Ignore the rest not fitting in
-	the buffer after the initial `fgets' call.
-
-Wed Aug  9 00:54:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* gettextP.h (_nl_load_domain):
-	Add prototype, replacing prototype for _nl_load_msg_cat.
-
-	* finddomain.c (_nl_find_domain):
-	Remove unneeded variable filename and filename_len.
-	(expand_alias): Remove prototype because functions does not
- 	exist anymore.
-
-	* localealias.c (read_alias_file):
-	Change type of fname_len parameter to int.
-	(xmalloc): Add prototype.
-
-	* loadmsgcat.c: Better prototypes for xmalloc.
-
-Tue Aug  8 22:30:39 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (_nl_find_domain):
-	Allow alias name to be constructed from the four components.
-
-	* Makefile.in (aliaspath): New variable.  Set to preliminary value.
-	(SOURCES): Add localealias.c.
-	(OBJECTS): Add localealias.o.
-
-	* gettextP.h: Add prototype for _nl_expand_alias.
-
-	* finddomain.c: Aliasing handled in intl/localealias.c.
-
-	* localealias.c: Aliasing for locale names.
-
-	* bindtextdom.c: Better prototypes for xmalloc and xstrdup.
-
-Mon Aug  7 23:47:42 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): gettext.perl is now found in misc/.
-
-	* cat-compat.c (bindtextdomain):
-	Correct implementation.  dirname parameter was not used.
-	Reported by Marcus Daniels.
-
-	* gettextP.h (loaded_domain):
-	New fields `successor' and `decided' for oo, lazy
-	message handling implementation.
-
-	* dcgettext.c:
-	Adopt for oo, lazy message handliing.
-  	Now we can inherit translations from less specific locales.
-	(find_msg): New function.
-
-	* loadmsgcat.c, finddomain.c:
-	Complete rewrite.  Implement oo, lazy message handling :-).
-  	We now have an additional environment variable `LANGUAGE' with
- 	a higher priority than LC_ALL for the LC_MESSAGE locale.
-  	Here we can set a colon separated list of specifications each
- 	of the form `language[_territory[.codeset]][@modifier]'.
-
-Sat Aug  5 09:55:42 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (unistd.h):
-	Include to get _PC_PATH_MAX defined on system having it.
-
-Fri Aug  4 22:42:00 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (stpcpy): Include prototype.
-
-	* Makefile.in (dist): Remove `copying instead' message.
-
-Wed Aug  2 18:52:03 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (ID, TAGS): Do not use $^.
-
-Tue Aug  1 20:07:11 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (TAGS, ID): Use $^ as command argument.
-	(TAGS): Give etags -o option t write to current directory,
- 	not $(srcdir).
-	(ID): Use $(srcdir) instead os $(top_srcdir)/src.
-	(distclean): Remove ID.
-
-Sun Jul 30 11:51:46 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (gnulocaledir):
-	New variable, always using share/ for data directory.
-	(DEFS): Add GNULOCALEDIR, used in finddomain.c.
-
-	* finddomain.c (_nl_default_dirname):
-	Set to GNULOCALEDIR, because it always has to point
-	to the directory where GNU gettext Library writes it to.
-
-	* intl-compat.c (textdomain, bindtextdomain):
-	Undefine macros before function definition.
-
-Sat Jul 22 01:10:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* libgettext.h (_LIBINTL_H):
-	Protect definition in case where this file is included as
-	libgettext.h on Solaris machines.  Add comment about this.
-
-Wed Jul 19 02:36:42 1995  Ulrich Drepper  <drepper@myware>
-
-	* intl-compat.c (textdomain): Correct typo.
-
-Wed Jul 19 01:51:35 1995  Ulrich Drepper  <drepper@myware>
-
-	* dcgettext.c (dcgettext): Function now called __dcgettext.
-
-	* dgettext.c (dgettext): Now called __dgettext and calls
- 	__dcgettext.
-
-	* gettext.c (gettext):
-	Function now called __gettext and calls __dgettext.
-
-	* textdomain.c (textdomain): Function now called __textdomain.
-
-	* bindtextdom.c (bindtextdomain): Function now called
- 	__bindtextdomain.
-
-	* intl-compat.c: Initial revision.
-
-	* Makefile.in (SOURCES): Add intl-compat.c.
-	(OBJECTS): We always compile the GNU gettext library functions.
-  	OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o,
- 	and intl-compat.o.
-  	(GETTOBJS): Contains now only intl-compat.o.
-
-	* libgettext.h:
-	Re-include protection matches dualistic character of libgettext.h.
-	For all functions in GNU gettext library define __ counter part.
-
-	* finddomain.c (strchr): Define as index if not found in C library.
-	(_nl_find_domain): For relative paths paste / in between.
-
-Tue Jul 18 16:37:45 1995  Ulrich Drepper  <drepper@myware>
-
-	* loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h.
-
-	* xopen-msg.sed: Fix bug with `msgstr ""' lines.
-	A little bit better comments.
-
-Tue Jul 18 01:18:27 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in:
-	po-mode.el, makelinks, combine-sh are now found in ../misc.
-
-	* po-mode.el, makelinks, combine-sh, elisp-comp:
-	Moved to ../misc/.
-
-	* libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__.
-
-Sun Jul 16 22:33:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (INSTALL, INSTALL_DATA): New variables.
-	(install-data, uninstall): Install/uninstall .elc file.
-
-	* po-mode.el (Installation comment):
-	Add .pox as possible extension of .po files.
-
-Sun Jul 16 13:23:27 1995  Ulrich Drepper  <drepper@myware>
-
-	* elisp-comp: Complete new version by Franc,ois: This does not
- 	fail when not compiling in the source directory.
-
-Sun Jul 16 00:12:17 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (../po/cat-id-tbl.o):
-	Use $(MAKE) instead of make for recursive make.
-
-	* Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh.
-	(install-exec): Add missing dummy goal.
-	(install-data, uninstall): @ in multi-line shell command at
- 	beginning, not in front of echo.  Reported by Eric Backus.
-
-Sat Jul 15 00:21:28 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES):
-	Rename libgettext.perl to gettext.perl to fit in 14 chars
-	file systems.
-
-	* gettext.perl:
- 	Rename to gettext.perl to fit in 14 chars file systems.
-
-Thu Jul 13 23:17:20 1995  Ulrich Drepper  <drepper@myware>
-
-	* cat-compat.c: If !STDC_HEADERS try to include malloc.h.
-
-Thu Jul 13 20:55:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* po2tbl.sed.in: Pretty printing.
-
-	* linux-msg.sed, xopen-msg.sed:
-	Correct bugs with handling substitute flags in branches.
-
-	* hash-string.h (hash_string):
-	Old K&R compilers don't under stand `unsigned char'.
-
-	* gettext.h (nls_uint32):
-	Some old K&R compilers (eg HP) don't understand `unsigned int'.
-
-	* cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes.
-
-Thu Jul 13 01:34:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (ELCFILES): New variable.
-	(DISTFILES): Add elisp-comp.
-	Add implicit rule for .el -> .elc compilation.
-	(install-data): install $ELCFILES
-	(clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp.
-
-	* elisp-comp: Initial revision
-
-Wed Jul 12 16:14:52 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in:
-	cat-id-tbl.c is now found in po/.  This enables us to use an identical
-	intl/ directory in all packages.
-
-	* dcgettext.c (dcgettext): hashing does not work for table size <= 2.
-
-	* textdomain.c: fix typo (#if def -> #if defined)
-
-Tue Jul 11 18:44:43 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (stamp-cat-id): use top_srcdir to address source files
-	(DISTFILES,distclean): move tupdate.perl to src/
-
-	* po-to-tbl.sed.in:
-	add additional jump to clear change flag to recognize multiline strings
-
-Tue Jul 11 01:32:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* textdomain.c: Protect inclusion of stdlib.h and string.h.
-
-	* loadmsgcat.c: Protect inclusion of stdlib.h.
-
-	* libgettext.h: Protect inclusion of locale.h.
-	Allow use in C++ programs.
-	Define NULL is not happened already.
-
-	* Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of
-	po-to-tbl.sed.
-	(distclean): remove po-to-tbl.sed and tupdate.perl.
-
-	* tupdate.perl.in: Substitute Perl path even in exec line.
-	Don't include entries without translation from old .po file.
-
-Tue Jul  4 00:41:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* tupdate.perl.in: use "Updated: " in msgid "".
-
-	* cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR).
- 	Define getenv if !__STDC__.
-
-	* bindtextdom.c: Protect stdlib.h and string.h inclusion.
- 	Define free if !__STDC__.
-
-	* finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
- 	Define free if !__STDC__.
-
-	* cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
-
-Mon Jul  3 23:56:30 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR.
-	Remove unneeded $(srcdir) from Makefile.in dependency.
-
-	* makelinks: Add copyright and short description.
-
-	* po-mode.el: Last version for 0.7.
-
-	* tupdate.perl.in: Fix die message.
-
-	* dcgettext.c: Protect include of string.h.
-
-	* gettext.c: Protect include of stdlib.h and further tries to get NULL.
-
-	* finddomain.c: Some corrections in includes.
-
-	* Makefile.in (INCLUDES): Prune list correct path to Makefile.in.
-
-	* po-to-tbl.sed: Adopt for new .po file format.
-
-	* linux-msg.sed, xopen-msg.sed: Adopt for new .po file format.
-
-Sun Jul  2 23:55:03 1995  Ulrich Drepper  <drepper@myware>
-
-	* tupdate.perl.in: Complete rewrite for new .po file format.
-
-Sun Jul  2 02:06:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* First official release.  This directory contains all the code
-	needed to internationalize own packages.  It provides functions
-	which allow to use the X/Open catgets function with an interface
-	like the Uniforum gettext function.  For system which does not
-	have neither of those a complete implementation is provided.
diff --git a/gnu/usr.bin/lynx/intl/VERSION b/gnu/usr.bin/lynx/intl/VERSION
deleted file mode 100644
index ee66b0612bc..00000000000
--- a/gnu/usr.bin/lynx/intl/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-GNU gettext library from gettext-0.10.35
diff --git a/gnu/usr.bin/lynx/intl/bindtextdom.c b/gnu/usr.bin/lynx/intl/bindtextdom.c
deleted file mode 100644
index d9c3f349e04..00000000000
--- a/gnu/usr.bin/lynx/intl/bindtextdom.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-#include "gettext.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-/* Contains the default location of the message catalogs.  */
-extern const char _nl_default_dirname[];
-
-/* List with bindings of specific domains.  */
-extern struct binding *_nl_domain_bindings;
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define BINDTEXTDOMAIN __bindtextdomain
-# ifndef strdup
-#  define strdup(str) __strdup (str)
-# endif
-#else
-# define BINDTEXTDOMAIN bindtextdomain__
-#endif
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *
-BINDTEXTDOMAIN (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  struct binding *binding;
-
-  /* Some sanity checks.  */
-  if (domainname == NULL || domainname[0] == '\0')
-    return NULL;
-
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (dirname == NULL)
-    /* The current binding has be to returned.  */
-    return binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
-
-  if (binding != NULL)
-    {
-      /* The domain is already bound.  If the new value and the old
-	 one are equal we simply do nothing.  Otherwise replace the
-	 old binding.  */
-      if (strcmp (dirname, binding->dirname) != 0)
-	{
-	  char *new_dirname;
-
-	  if (strcmp (dirname, _nl_default_dirname) == 0)
-	    new_dirname = (char *) _nl_default_dirname;
-	  else
-	    {
-#if defined _LIBC || defined HAVE_STRDUP
-	      new_dirname = strdup (dirname);
-	      if (new_dirname == NULL)
-		return NULL;
-#else
-	      size_t len = strlen (dirname) + 1;
-	      new_dirname = (char *) malloc (len);
-	      if (new_dirname == NULL)
-		return NULL;
-
-	      memcpy (new_dirname, dirname, len);
-#endif
-	    }
-
-	  if (binding->dirname != _nl_default_dirname)
-	    free (binding->dirname);
-
-	  binding->dirname = new_dirname;
-	}
-    }
-  else
-    {
-      /* We have to create a new binding.  */
-#if !defined _LIBC && !defined HAVE_STRDUP
-      size_t len;
-#endif
-      struct binding *new_binding =
-	(struct binding *) malloc (sizeof (*new_binding));
-
-      if (new_binding == NULL)
-	return NULL;
-
-#if defined _LIBC || defined HAVE_STRDUP
-      new_binding->domainname = strdup (domainname);
-      if (new_binding->domainname == NULL)
-	return NULL;
-#else
-      len = strlen (domainname) + 1;
-      new_binding->domainname = (char *) malloc (len);
-      if (new_binding->domainname == NULL)
-	return NULL;
-      memcpy (new_binding->domainname, domainname, len);
-#endif
-
-      if (strcmp (dirname, _nl_default_dirname) == 0)
-	new_binding->dirname = (char *) _nl_default_dirname;
-      else
-	{
-#if defined _LIBC || defined HAVE_STRDUP
-	  new_binding->dirname = strdup (dirname);
-	  if (new_binding->dirname == NULL)
-	    return NULL;
-#else
-	  len = strlen (dirname) + 1;
-	  new_binding->dirname = (char *) malloc (len);
-	  if (new_binding->dirname == NULL)
-	    return NULL;
-	  memcpy (new_binding->dirname, dirname, len);
-#endif
-	}
-
-      /* Now enqueue it.  */
-      if (_nl_domain_bindings == NULL
-	  || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
-	{
-	  new_binding->next = _nl_domain_bindings;
-	  _nl_domain_bindings = new_binding;
-	}
-      else
-	{
-	  binding = _nl_domain_bindings;
-	  while (binding->next != NULL
-		 && strcmp (domainname, binding->next->domainname) > 0)
-	    binding = binding->next;
-
-	  new_binding->next = binding->next;
-	  binding->next = new_binding;
-	}
-
-      binding = new_binding;
-    }
-
-  return binding->dirname;
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__bindtextdomain, bindtextdomain);
-#endif
diff --git a/gnu/usr.bin/lynx/intl/cat-compat.c b/gnu/usr.bin/lynx/intl/cat-compat.c
deleted file mode 100644
index 867d901b8ff..00000000000
--- a/gnu/usr.bin/lynx/intl/cat-compat.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/* Compatibility code for gettext-using-catgets interface.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# endif
-#endif
-
-#ifdef HAVE_NL_TYPES_H
-# include <nl_types.h>
-#endif
-
-#include "libgettext.h"
-
-/* @@ end of prolog @@ */
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
-   ``Directs `setlocale()' to query `category' and return the current
-     setting of `local'.''
-   However it does not specify the exact format.  And even worse: POSIX
-   defines this not at all.  So we can use this feature only on selected
-   system (e.g. those using GNU C Library).  */
-#ifdef _LIBC
-# define HAVE_LOCALE_NULL
-#endif
-
-/* The catalog descriptor.  */
-static nl_catd catalog = (nl_catd) -1;
-
-/* Name of the default catalog.  */
-static const char default_catalog_name[] = "messages";
-
-/* Name of currently used catalog.  */
-static const char *catalog_name = default_catalog_name;
-
-/* Get ID for given string.  If not found return -1.  */
-static int msg_to_cat_id PARAMS ((const char *msg));
-
-/* Substitution for systems lacking this function in their C library.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-#endif
-
-
-/* Set currently used domain/catalog.  */
-char *
-textdomain (domainname)
-     const char *domainname;
-{
-  nl_catd new_catalog;
-  char *new_name;
-  size_t new_name_len;
-  char *lang;
-
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \
-    && defined HAVE_LOCALE_NULL
-  lang = setlocale (LC_MESSAGES, NULL);
-#else
-  lang = getenv ("LC_ALL");
-  if (lang == NULL || lang[0] == '\0')
-    {
-      lang = getenv ("LC_MESSAGES");
-      if (lang == NULL || lang[0] == '\0')
-	lang = getenv ("LANG");
-    }
-#endif
-  if (lang == NULL || lang[0] == '\0')
-    lang = "C";
-
-  /* See whether name of currently used domain is asked.  */
-  if (domainname == NULL)
-    return (char *) catalog_name;
-
-  if (domainname[0] == '\0')
-    domainname = default_catalog_name;
-
-  /* Compute length of added path element.  */
-  new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang)
-		 + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1
-		 + sizeof (".cat");
-
-  new_name = (char *) malloc (new_name_len);
-  if (new_name == NULL)
-    return NULL;
-
-  strcpy (new_name, PACKAGE);
-  new_catalog = catopen (new_name, 0);
-
-  if (new_catalog == (nl_catd) -1)
-    {
-      /* NLSPATH search didn't work, try absolute path */
-      sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang,
-	       PACKAGE);
-      new_catalog = catopen (new_name, 0);
-
-      if (new_catalog == (nl_catd) -1)
-	{
-	  free (new_name);
-	  return (char *) catalog_name;
-	}
-    }
-
-  /* Close old catalog.  */
-  if (catalog != (nl_catd) -1)
-    catclose (catalog);
-  if (catalog_name != default_catalog_name)
-    free ((char *) catalog_name);
-
-  catalog = new_catalog;
-  catalog_name = new_name;
-
-  return (char *) catalog_name;
-}
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-#if HAVE_SETENV || HAVE_PUTENV
-  char *old_val, *new_val, *cp;
-  size_t new_val_len;
-
-  /* This does not make much sense here but to be compatible do it.  */
-  if (domainname == NULL)
-    return NULL;
-
-  /* Compute length of added path element.  If we use setenv we don't need
-     the first byts for NLSPATH=, but why complicate the code for this
-     peanuts.  */
-  new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname)
-		+ sizeof ("/%L/LC_MESSAGES/%N.cat");
-
-  old_val = getenv ("NLSPATH");
-  if (old_val == NULL || old_val[0] == '\0')
-    {
-      old_val = NULL;
-      new_val_len += 1 + sizeof (LOCALEDIR) - 1
-	             + sizeof ("/%L/LC_MESSAGES/%N.cat");
-    }
-  else
-    new_val_len += strlen (old_val);
-
-  new_val = (char *) malloc (new_val_len);
-  if (new_val == NULL)
-    return NULL;
-
-# if HAVE_SETENV
-  cp = new_val;
-# else
-  cp = stpcpy (new_val, "NLSPATH=");
-# endif
-
-  cp = stpcpy (cp, dirname);
-  cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:");
-
-  if (old_val == NULL)
-    {
-# if __STDC__
-      stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat");
-# else
-
-      cp = stpcpy (cp, LOCALEDIR);
-      stpcpy (cp, "/%L/LC_MESSAGES/%N.cat");
-# endif
-    }
-  else
-    stpcpy (cp, old_val);
-
-# if HAVE_SETENV
-  setenv ("NLSPATH", new_val, 1);
-  free (new_val);
-# else
-  putenv (new_val);
-  /* Do *not* free the environment entry we just entered.  It is used
-     from now on.   */
-# endif
-
-#endif
-
-  return (char *) domainname;
-}
-
-#undef gettext
-char *
-gettext (msg)
-     const char *msg;
-{
-  int msgid;
-
-  if (msg == NULL || catalog == (nl_catd) -1)
-    return (char *) msg;
-
-  /* Get the message from the catalog.  We always use set number 1.
-     The message ID is computed by the function `msg_to_cat_id'
-     which works on the table generated by `po-to-tbl'.  */
-  msgid = msg_to_cat_id (msg);
-  if (msgid == -1)
-    return (char *) msg;
-
-  return catgets (catalog, 1, msgid, (char *) msg);
-}
-
-/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries
-   for the one equal to msg.  If it is found return the ID.  In case when
-   the string is not found return -1.  */
-static int
-msg_to_cat_id (msg)
-     const char *msg;
-{
-  int cnt;
-
-  for (cnt = 0; cnt < _msg_tbl_length; ++cnt)
-    if (strcmp (msg, _msg_tbl[cnt]._msg) == 0)
-      return _msg_tbl[cnt]._msg_number;
-
-  return -1;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
diff --git a/gnu/usr.bin/lynx/intl/dcgettext.c b/gnu/usr.bin/lynx/intl/dcgettext.c
deleted file mode 100644
index eeaafcceac9..00000000000
--- a/gnu/usr.bin/lynx/intl/dcgettext.c
+++ /dev/null
@@ -1,624 +0,0 @@
-/* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-#include "hash-string.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define getcwd __getcwd
-# ifndef stpcpy
-#  define stpcpy __stpcpy
-# endif
-#else
-# if !defined HAVE_GETCWD
-char *getwd ();
-#  define getcwd(buf, max) getwd (buf)
-# else
-char *getcwd ();
-# endif
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
-/* Amount to increase buffer size by in each try.  */
-#define PATH_INCR 32
-
-/* The following is from pathmax.h.  */
-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
-   PATH_MAX but might cause redefinition warnings when sys/param.h is
-   later included (as on MORE/BSD 4.3).  */
-#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
-# include <limits.h>
-#endif
-
-#ifndef _POSIX_PATH_MAX
-# define _POSIX_PATH_MAX 255
-#endif
-
-#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
-#endif
-
-/* Don't include sys/param.h if it already has been.  */
-#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
-# include <sys/param.h>
-#endif
-
-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
-# define PATH_MAX MAXPATHLEN
-#endif
-
-#ifndef PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
-   ``Directs `setlocale()' to query `category' and return the current
-     setting of `local'.''
-   However it does not specify the exact format.  And even worse: POSIX
-   defines this not at all.  So we can use this feature only on selected
-   system (e.g. those using GNU C Library).  */
-#ifdef _LIBC
-# define HAVE_LOCALE_NULL
-#endif
-
-/* Name of the default domain used for gettext(3) prior any call to
-   textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] = "messages";
-
-/* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain = _nl_default_default_domain;
-
-/* Contains the default location of the message catalogs.  */
-const char _nl_default_dirname[] = GNULOCALEDIR;
-
-/* List with bindings of specific domains created by bindtextdomain()
-   calls.  */
-struct binding *_nl_domain_bindings;
-
-/* Prototypes for local functions.  */
-static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
-			       const char *msgid)) internal_function;
-static const char *category_to_name PARAMS ((int category)) internal_function;
-static const char *guess_category_value PARAMS ((int category,
-						 const char *categoryname))
-     internal_function;
-
-
-/* For those loosing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCGETTEXT __dcgettext
-#else
-# define DCGETTEXT dcgettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCGETTEXT (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
-{
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
-  struct loaded_l10nfile *domain;
-  struct binding *binding;
-  const char *categoryname;
-  const char *categoryvalue;
-  char *dirname, *xdomainname;
-  char *single_locale;
-  char *retval;
-  int saved_errno = errno;
-
-  /* If no real MSGID is given return NULL.  */
-  if (msgid == NULL)
-    return NULL;
-
-  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
-     CATEGORY is not LC_MESSAGES this might not make much sense but the
-     defintion left this undefined.  */
-  if (domainname == NULL)
-    domainname = _nl_current_default_domain;
-
-  /* First find matching binding.  */
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding == NULL)
-    dirname = (char *) _nl_default_dirname;
-  else if (binding->dirname[0] == '/')
-    dirname = binding->dirname;
-  else
-    {
-      /* We have a relative path.  Make it absolute now.  */
-      size_t dirname_len = strlen (binding->dirname) + 1;
-      size_t path_max;
-      char *ret;
-
-      path_max = (unsigned) PATH_MAX;
-      path_max += 2;		/* The getcwd docs say to do this.  */
-
-      dirname = (char *) alloca (path_max + dirname_len);
-      ADD_BLOCK (block_list, dirname);
-
-      __set_errno (0);
-      while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
-	{
-	  path_max += PATH_INCR;
-	  dirname = (char *) alloca (path_max + dirname_len);
-	  ADD_BLOCK (block_list, dirname);
-	  __set_errno (0);
-	}
-
-      if (ret == NULL)
-	{
-	  /* We cannot get the current working directory.  Don't signal an
-	     error but simply return the default string.  */
-	  FREE_BLOCKS (block_list);
-	  __set_errno (saved_errno);
-	  return (char *) msgid;
-	}
-
-      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
-    }
-
-  /* Now determine the symbolic name of CATEGORY and its value.  */
-  categoryname = category_to_name (category);
-  categoryvalue = guess_category_value (category, categoryname);
-
-  xdomainname = (char *) alloca (strlen (categoryname)
-				 + strlen (domainname) + 5);
-  ADD_BLOCK (block_list, xdomainname);
-
-  stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
-		  domainname),
-	  ".mo");
-
-  /* Creating working area.  */
-  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
-  ADD_BLOCK (block_list, single_locale);
-
-
-  /* Search for the given string.  This is a loop because we perhaps
-     got an ordered list of languages to consider for th translation.  */
-  while (1)
-    {
-      /* Make CATEGORYVALUE point to the next element of the list.  */
-      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
-	++categoryvalue;
-      if (categoryvalue[0] == '\0')
-	{
-	  /* The whole contents of CATEGORYVALUE has been searched but
-	     no valid entry has been found.  We solve this situation
-	     by implicitly appending a "C" entry, i.e. no translation
-	     will take place.  */
-	  single_locale[0] = 'C';
-	  single_locale[1] = '\0';
-	}
-      else
-	{
-	  char *cp = single_locale;
-	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
-	    *cp++ = *categoryvalue++;
-	  *cp = '\0';
-	}
-
-      /* If the current locale value is C (or POSIX) we don't load a
-	 domain.  Return the MSGID.  */
-      if (strcmp (single_locale, "C") == 0
-	  || strcmp (single_locale, "POSIX") == 0)
-	{
-	  FREE_BLOCKS (block_list);
-	  __set_errno (saved_errno);
-	  return (char *) msgid;
-	}
-
-
-      /* Find structure describing the message catalog matching the
-	 DOMAINNAME and CATEGORY.  */
-      domain = _nl_find_domain (dirname, single_locale, xdomainname);
-
-      if (domain != NULL)
-	{
-	  retval = find_msg (domain, msgid);
-
-	  if (retval == NULL)
-	    {
-	      int cnt;
-
-	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
-		{
-		  retval = find_msg (domain->successor[cnt], msgid);
-
-		  if (retval != NULL)
-		    break;
-		}
-	    }
-
-	  if (retval != NULL)
-	    {
-	      FREE_BLOCKS (block_list);
-	      __set_errno (saved_errno);
-	      return retval;
-	    }
-	}
-    }
-  /* NOTREACHED */
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dcgettext, dcgettext);
-#endif
-
-
-static char *
-internal_function
-find_msg (domain_file, msgid)
-     struct loaded_l10nfile *domain_file;
-     const char *msgid;
-{
-  size_t top, act, bottom;
-  struct loaded_domain *domain;
-
-  if (domain_file->decided == 0)
-    _nl_load_domain (domain_file);
-
-  if (domain_file->data == NULL)
-    return NULL;
-
-  domain = (struct loaded_domain *) domain_file->data;
-
-  /* Locate the MSGID and its translation.  */
-  if (domain->hash_size > 2 && domain->hash_tab != NULL)
-    {
-      /* Use the hashing table.  */
-      nls_uint32 len = strlen (msgid);
-      nls_uint32 hash_val = hash_string (msgid);
-      nls_uint32 idx = hash_val % domain->hash_size;
-      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
-      nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
-
-      if (nstr == 0)
-	/* Hash table entry is empty.  */
-	return NULL;
-
-      if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
-	  && strcmp (msgid,
-		     domain->data + W (domain->must_swap,
-				       domain->orig_tab[nstr - 1].offset)) == 0)
-	return (char *) domain->data + W (domain->must_swap,
-					  domain->trans_tab[nstr - 1].offset);
-
-      while (1)
-	{
-	  if (idx >= domain->hash_size - incr)
-	    idx -= domain->hash_size - incr;
-	  else
-	    idx += incr;
-
-	  nstr = W (domain->must_swap, domain->hash_tab[idx]);
-	  if (nstr == 0)
-	    /* Hash table entry is empty.  */
-	    return NULL;
-
-	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
-	      && strcmp (msgid,
-			 domain->data + W (domain->must_swap,
-					   domain->orig_tab[nstr - 1].offset))
-	         == 0)
-	    return (char *) domain->data
-	      + W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
-	}
-      /* NOTREACHED */
-    }
-
-  /* Now we try the default method:  binary search in the sorted
-     array of messages.  */
-  bottom = 0;
-  top = domain->nstrings;
-  while (bottom < top)
-    {
-      int cmp_val;
-
-      act = (bottom + top) / 2;
-      cmp_val = strcmp (msgid, domain->data
-			       + W (domain->must_swap,
-				    domain->orig_tab[act].offset));
-      if (cmp_val < 0)
-	top = act;
-      else if (cmp_val > 0)
-	bottom = act + 1;
-      else
-	break;
-    }
-
-  /* If an translation is found return this.  */
-  return bottom >= top ? NULL : (char *) domain->data
-                                + W (domain->must_swap,
-				     domain->trans_tab[act].offset);
-}
-
-
-/* Return string representation of locale CATEGORY.  */
-static const char *
-internal_function
-category_to_name (category)
-     int category;
-{
-  const char *retval;
-
-  switch (category)
-  {
-#ifdef LC_COLLATE
-  case LC_COLLATE:
-    retval = "LC_COLLATE";
-    break;
-#endif
-#ifdef LC_CTYPE
-  case LC_CTYPE:
-    retval = "LC_CTYPE";
-    break;
-#endif
-#ifdef LC_MONETARY
-  case LC_MONETARY:
-    retval = "LC_MONETARY";
-    break;
-#endif
-#ifdef LC_NUMERIC
-  case LC_NUMERIC:
-    retval = "LC_NUMERIC";
-    break;
-#endif
-#ifdef LC_TIME
-  case LC_TIME:
-    retval = "LC_TIME";
-    break;
-#endif
-#ifdef LC_MESSAGES
-  case LC_MESSAGES:
-    retval = "LC_MESSAGES";
-    break;
-#endif
-#ifdef LC_RESPONSE
-  case LC_RESPONSE:
-    retval = "LC_RESPONSE";
-    break;
-#endif
-#ifdef LC_ALL
-  case LC_ALL:
-    /* This might not make sense but is perhaps better than any other
-       value.  */
-    retval = "LC_ALL";
-    break;
-#endif
-  default:
-    /* If you have a better idea for a default value let me know.  */
-    retval = "LC_XXX";
-  }
-
-  return retval;
-}
-
-/* Guess value of current locale from value of the environment variables.  */
-static const char *
-internal_function
-guess_category_value (category, categoryname)
-     int category;
-     const char *categoryname;
-{
-  const char *retval;
-
-  /* The highest priority value is the `LANGUAGE' environment
-     variable.  This is a GNU extension.  */
-  retval = getenv ("LANGUAGE");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* `LANGUAGE' is not set.  So we have to proceed with the POSIX
-     methods of looking to `LC_ALL', `LC_xxx', and `LANG'.  On some
-     systems this can be done by the `setlocale' function itself.  */
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
-  return setlocale (category, NULL);
-#else
-  /* Setting of LC_ALL overwrites all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* Next comes the name of the desired category.  */
-  retval = getenv (categoryname);
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* Last possibility is the LANG environment variable.  */
-  retval = getenv ("LANG");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* We use C as the default domain.  POSIX says this is implementation
-     defined.  */
-  return "C";
-#endif
-}
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !defined(_LIBC) && !defined(HAVE_STPCPY)
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
-
-
-#ifdef _LIBC
-/* If we want to free all resources we have to do some work at
-   program's end.  */
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  struct binding *runp;
-
-  for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next)
-    {
-      free (runp->domainname);
-      if (runp->dirname != _nl_default_dirname)
-	/* Yes, this is a pointer comparison.  */
-	free (runp->dirname);
-    }
-
-  if (_nl_current_default_domain != _nl_default_default_domain)
-    /* Yes, again a pointer comparison.  */
-    free ((char *) _nl_current_default_domain);
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
diff --git a/gnu/usr.bin/lynx/intl/dgettext.c b/gnu/usr.bin/lynx/intl/dgettext.c
deleted file mode 100644
index 0510c2b071f..00000000000
--- a/gnu/usr.bin/lynx/intl/dgettext.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Implementation of the dgettext(3) function
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DGETTEXT __dgettext
-# define DCGETTEXT __dcgettext
-#else
-# define DGETTEXT dgettext__
-# define DCGETTEXT dcgettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale.  */
-char *
-DGETTEXT (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
-{
-  return DCGETTEXT (domainname, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dgettext, dgettext);
-#endif
diff --git a/gnu/usr.bin/lynx/intl/explodename.c b/gnu/usr.bin/lynx/intl/explodename.c
deleted file mode 100644
index 8066dc29962..00000000000
--- a/gnu/usr.bin/lynx/intl/explodename.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#include <sys/types.h>
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-int
-_nl_explode_name (name, language, modifier, territory, codeset,
-		  normalized_codeset, special, sponsor, revision)
-     char *name;
-     const char **language;
-     const char **modifier;
-     const char **territory;
-     const char **codeset;
-     const char **normalized_codeset;
-     const char **special;
-     const char **sponsor;
-     const char **revision;
-{
-  enum { undecided, xpg, cen } syntax;
-  char *cp;
-  int mask;
-
-  *modifier = NULL;
-  *territory = NULL;
-  *codeset = NULL;
-  *normalized_codeset = NULL;
-  *special = NULL;
-  *sponsor = NULL;
-  *revision = NULL;
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
-  mask = 0;
-  syntax = undecided;
-  *language = cp = name;
-  while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@'
-	 && cp[0] != '+' && cp[0] != ',')
-    ++cp;
-
-  if (*language == cp)
-    /* This does not make sense: language has to be specified.  Use
-       this entry as it is without exploding.  Perhaps it is an alias.  */
-    cp = strchr (*language, '\0');
-  else if (cp[0] == '_')
-    {
-      /* Next is the territory.  */
-      cp[0] = '\0';
-      *territory = ++cp;
-
-      while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
-	     && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= TERRITORY;
-
-      if (cp[0] == '.')
-	{
-	  /* Next is the codeset.  */
-	  syntax = xpg;
-	  cp[0] = '\0';
-	  *codeset = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '@')
-	    ++cp;
-
-	  mask |= XPG_CODESET;
-
-	  if (*codeset != cp && (*codeset)[0] != '\0')
-	    {
-	      *normalized_codeset = _nl_normalize_codeset (*codeset,
-							   cp - *codeset);
-	      if (strcmp (*codeset, *normalized_codeset) == 0)
-		free ((char *) *normalized_codeset);
-	      else
-		mask |= XPG_NORM_CODESET;
-	    }
-	}
-    }
-
-  if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
-    {
-      /* Next is the modifier.  */
-      syntax = cp[0] == '@' ? xpg : cen;
-      cp[0] = '\0';
-      *modifier = ++cp;
-
-      while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
-	     && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= XPG_MODIFIER | CEN_AUDIENCE;
-    }
-
-  if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
-    {
-      syntax = cen;
-
-      if (cp[0] == '+')
-	{
- 	  /* Next is special application (CEN syntax).  */
-	  cp[0] = '\0';
-	  *special = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPECIAL;
-	}
-
-      if (cp[0] == ',')
-	{
- 	  /* Next is sponsor (CEN syntax).  */
-	  cp[0] = '\0';
-	  *sponsor = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPONSOR;
-	}
-
-      if (cp[0] == '_')
-	{
- 	  /* Next is revision (CEN syntax).  */
-	  cp[0] = '\0';
-	  *revision = ++cp;
-
-	  mask |= CEN_REVISION;
-	}
-    }
-
-  /* For CEN syntax values it might be important to have the
-     separator character in the file name, not for XPG syntax.  */
-  if (syntax == xpg)
-    {
-      if (*territory != NULL && (*territory)[0] == '\0')
-	mask &= ~TERRITORY;
-
-      if (*codeset != NULL && (*codeset)[0] == '\0')
-	mask &= ~XPG_CODESET;
-
-      if (*modifier != NULL && (*modifier)[0] == '\0')
-	mask &= ~XPG_MODIFIER;
-    }
-
-  return mask;
-}
diff --git a/gnu/usr.bin/lynx/intl/finddomain.c b/gnu/usr.bin/lynx/intl/finddomain.c
deleted file mode 100644
index 81ea29bf4e4..00000000000
--- a/gnu/usr.bin/lynx/intl/finddomain.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* Handle list of needed message catalogs
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-
-/* @@ end of prolog @@ */
-/* List of already loaded domains.  */
-static struct loaded_l10nfile *_nl_loaded_domains;
-
-
-/* Return a data structure describing the message catalog described by
-   the DOMAINNAME and CATEGORY parameters with respect to the currently
-   established bindings.  */
-struct loaded_l10nfile *
-internal_function
-_nl_find_domain (dirname, locale, domainname)
-     const char *dirname;
-     char *locale;
-     const char *domainname;
-{
-  struct loaded_l10nfile *retval;
-  const char *language;
-  const char *modifier;
-  const char *territory;
-  const char *codeset;
-  const char *normalized_codeset;
-  const char *special;
-  const char *sponsor;
-  const char *revision;
-  const char *alias_value;
-  int mask;
-
-  /* LOCALE can consist of up to four recognized parts for the XPG syntax:
-
-		language[_territory[.codeset]][@modifier]
-
-     and six parts for the CEN syntax:
-
-	language[_territory][+audience][+special][,[sponsor][_revision]]
-
-     Beside the first part all of them are allowed to be missing.  If
-     the full specified locale is not found, the less specific one are
-     looked for.  The various parts will be stripped off according to
-     the following order:
-		(1) revision
-		(2) sponsor
-		(3) special
-		(4) codeset
-		(5) normalized codeset
-		(6) territory
-		(7) audience/modifier
-   */
-
-  /* If we have already tested for this locale entry there has to
-     be one data set in the list of loaded domains.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, 0, locale, NULL, NULL,
-			       NULL, NULL, NULL, NULL, NULL, domainname, 0);
-  if (retval != NULL)
-    {
-      /* We know something about this locale.  */
-      int cnt;
-
-      if (retval->decided == 0)
-	_nl_load_domain (retval);
-
-      if (retval->data != NULL)
-	return retval;
-
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt]);
-
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-      return cnt >= 0 ? retval : NULL;
-      /* NOTREACHED */
-    }
-
-  /* See whether the locale value is an alias.  If yes its value
-     *overwrites* the alias name.  No test for the original value is
-     done.  */
-  alias_value = _nl_expand_alias (locale);
-  if (alias_value != NULL)
-    {
-#if defined _LIBC || defined HAVE_STRDUP
-      locale = strdup (alias_value);
-      if (locale == NULL)
-	return NULL;
-#else
-      size_t len = strlen (alias_value) + 1;
-      locale = (char *) malloc (len);
-      if (locale == NULL)
-	return NULL;
-
-      memcpy (locale, alias_value, len);
-#endif
-    }
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
-  mask = _nl_explode_name (locale, &language, &modifier, &territory,
-			   &codeset, &normalized_codeset, &special,
-			   &sponsor, &revision);
-
-  /* Create all possible locale entries which might be interested in
-     generalization.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, mask, language, territory,
-			       codeset, normalized_codeset, modifier, special,
-			       sponsor, revision, domainname, 1);
-  if (retval == NULL)
-    /* This means we are out of core.  */
-    return NULL;
-
-  if (retval->decided == 0)
-    _nl_load_domain (retval);
-  if (retval->data == NULL)
-    {
-      int cnt;
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt]);
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-    }
-
-  /* The room for an alias was dynamically allocated.  Free it now.  */
-  if (alias_value != NULL)
-    free (locale);
-
-  return retval;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  struct loaded_l10nfile *runp = _nl_loaded_domains;
-
-  while (runp != NULL)
-    {
-      struct loaded_l10nfile *here = runp;
-      if (runp->data != NULL)
-	_nl_unload_domain ((struct loaded_domain *) runp->data);
-      runp = runp->next;
-      free (here);
-    }
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
diff --git a/gnu/usr.bin/lynx/intl/gettext.c b/gnu/usr.bin/lynx/intl/gettext.c
deleted file mode 100644
index d929f98d68a..00000000000
--- a/gnu/usr.bin/lynx/intl/gettext.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# ifdef STDC_HEADERS
-#  include <stdlib.h>		/* Just for NULL.  */
-# else
-#  ifdef HAVE_STRING_H
-#   include <string.h>
-#  else
-#   define NULL ((void *) 0)
-#  endif
-# endif
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define GETTEXT __gettext
-# define DGETTEXT __dgettext
-#else
-# define GETTEXT gettext__
-# define DGETTEXT dgettext__
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-GETTEXT (msgid)
-     const char *msgid;
-{
-  return DGETTEXT (NULL, msgid);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__gettext, gettext);
-#endif
diff --git a/gnu/usr.bin/lynx/intl/gettext.h b/gnu/usr.bin/lynx/intl/gettext.h
deleted file mode 100644
index d0d608b78df..00000000000
--- a/gnu/usr.bin/lynx/intl/gettext.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Internal header for GNU gettext internationalization functions.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _GETTEXT_H
-#define _GETTEXT_H 1
-
-#include <stdio.h>
-
-#if defined(HAVE_LIMITS_H) || defined(_LIBC)
-# include <limits.h>
-#endif
-
-/* @@ end of prolog @@ */
-
-/* The magic number of the GNU message catalog format.  */
-#define _MAGIC 0x950412de
-#define _MAGIC_SWAPPED 0xde120495
-
-/* Revision number of the currently used .mo (binary) file format.  */
-#define MO_REVISION_NUMBER 0
-
-/* The following contortions are an attempt to use the C preprocessor
-   to determine an unsigned integral type that is 32 bits wide.  An
-   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   doing that would require that the configure script compile and *run*
-   the resulting executable.  Locally running cross-compiled executables
-   is usually not possible.  */
-
-#if __STDC__
-# define UINT_MAX_32_BITS 4294967295U
-#else
-# define UINT_MAX_32_BITS 0xFFFFFFFF
-#endif
-
-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
-   This should be valid for all systems GNU cares about because
-   that doesn't include 16-bit systems, and only modern systems
-   (that certainly have <limits.h>) have 64+-bit integral types.  */
-
-#ifndef UINT_MAX
-# define UINT_MAX UINT_MAX_32_BITS
-#endif
-
-#if UINT_MAX == UINT_MAX_32_BITS
-typedef unsigned nls_uint32;
-#else
-# if USHRT_MAX == UINT_MAX_32_BITS
-typedef unsigned short nls_uint32;
-# else
-#  if ULONG_MAX == UINT_MAX_32_BITS
-typedef unsigned long nls_uint32;
-#  else
-  /* The following line is intended to throw an error.  Using #error is
-     not portable enough.  */
-  "Cannot determine unsigned 32-bit data type."
-#  endif
-# endif
-#endif
-
-
-/* Header for binary .mo file format.  */
-struct mo_file_header
-{
-  /* The magic number.  */
-  nls_uint32 magic;
-  /* The revision number of the file format.  */
-  nls_uint32 revision;
-  /* The number of strings pairs.  */
-  nls_uint32 nstrings;
-  /* Offset of table with start offsets of original strings.  */
-  nls_uint32 orig_tab_offset;
-  /* Offset of table with start offsets of translation strings.  */
-  nls_uint32 trans_tab_offset;
-  /* Size of hashing table.  */
-  nls_uint32 hash_tab_size;
-  /* Offset of first hashing entry.  */
-  nls_uint32 hash_tab_offset;
-};
-
-struct string_desc
-{
-  /* Length of addressed string.  */
-  nls_uint32 length;
-  /* Offset of string in file.  */
-  nls_uint32 offset;
-};
-
-/* @@ begin of epilog @@ */
-
-#endif	/* gettext.h  */
diff --git a/gnu/usr.bin/lynx/intl/gettextP.h b/gnu/usr.bin/lynx/intl/gettextP.h
deleted file mode 100644
index 00c52031972..00000000000
--- a/gnu/usr.bin/lynx/intl/gettextP.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Header describing internals of gettext library
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef _GETTEXTP_H
-#define _GETTEXTP_H
-
-#include "loadinfo.h"
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-#ifndef W
-# define W(flag, data) ((flag) ? SWAP (data) : (data))
-#endif
-
-
-#ifdef _LIBC
-# include <byteswap.h>
-# define SWAP(i) bswap_32 (i)
-#else
-static nls_uint32 SWAP PARAMS ((nls_uint32 i));
-
-static inline nls_uint32
-SWAP (i)
-     nls_uint32 i;
-{
-  return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
-}
-#endif
-
-
-struct loaded_domain
-{
-  const char *data;
-  int use_mmap;
-  size_t mmap_size;
-  int must_swap;
-  nls_uint32 nstrings;
-  struct string_desc *orig_tab;
-  struct string_desc *trans_tab;
-  nls_uint32 hash_size;
-  nls_uint32 *hash_tab;
-};
-
-struct binding
-{
-  struct binding *next;
-  char *domainname;
-  char *dirname;
-};
-
-struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
-						 char *__locale,
-						 const char *__domainname))
-     internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain))
-     internal_function;
-void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
-     internal_function;
-
-/* @@ begin of epilog @@ */
-
-#endif /* gettextP.h  */
diff --git a/gnu/usr.bin/lynx/intl/hash-string.h b/gnu/usr.bin/lynx/intl/hash-string.h
deleted file mode 100644
index cacb38e479f..00000000000
--- a/gnu/usr.bin/lynx/intl/hash-string.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Implements a string hashing function.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-/* We assume to have `unsigned long int' value with at least 32 bits.  */
-#define HASHWORDBITS 32
-
-
-/* Defines the so called `hashpjw' function by P.J. Weinberger
-   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-   1986, 1987 Bell Telephone Laboratories, Inc.]  */
-static unsigned long hash_string PARAMS ((const char *__str_param));
-
-static inline unsigned long
-hash_string (str_param)
-     const char *str_param;
-{
-  unsigned long int hval, g;
-  const char *str = str_param;
-
-  /* Compute the hash value for the given string.  */
-  hval = 0;
-  while (*str != '\0')
-    {
-      hval <<= 4;
-      hval += (unsigned long) *str++;
-      g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4));
-      if (g != 0)
-	{
-	  hval ^= g >> (HASHWORDBITS - 8);
-	  hval ^= g;
-	}
-    }
-  return hval;
-}
diff --git a/gnu/usr.bin/lynx/intl/intl-compat.c b/gnu/usr.bin/lynx/intl/intl-compat.c
deleted file mode 100644
index 503efa0fa9c..00000000000
--- a/gnu/usr.bin/lynx/intl/intl-compat.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
-   Library.
-   Copyright (C) 1995 Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "libgettext.h"
-
-/* @@ end of prolog @@ */
-
-
-#undef gettext
-#undef dgettext
-#undef dcgettext
-#undef textdomain
-#undef bindtextdomain
-
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  return bindtextdomain__ (domainname, dirname);
-}
-
-
-char *
-dcgettext (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
-{
-  return dcgettext__ (domainname, msgid, category);
-}
-
-
-char *
-dgettext (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
-{
-  return dgettext__ (domainname, msgid);
-}
-
-
-char *
-gettext (msgid)
-     const char *msgid;
-{
-  return gettext__ (msgid);
-}
-
-
-char *
-textdomain (domainname)
-     const char *domainname;
-{
-  return textdomain__ (domainname);
-}
diff --git a/gnu/usr.bin/lynx/intl/l10nflist.c b/gnu/usr.bin/lynx/intl/l10nflist.c
deleted file mode 100644
index 9c7dc18360f..00000000000
--- a/gnu/usr.bin/lynx/intl/l10nflist.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/* Handle list of needed message catalogs
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined _LIBC || defined HAVE_ARGZ_H
-# include <argz.h>
-#endif
-#include <ctype.h>
-#include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# ifndef stpcpy
-#  define stpcpy(dest, src) __stpcpy(dest, src)
-# endif
-#else
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
-/* Define function which are usually not available.  */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
-/* Returns the number of strings in ARGZ.  */
-static size_t argz_count__ PARAMS ((const char *argz, size_t len));
-
-static size_t
-argz_count__ (argz, len)
-     const char *argz;
-     size_t len;
-{
-  size_t count = 0;
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len + 1;
-      len -= part_len + 1;
-      count++;
-    }
-  return count;
-}
-# undef __argz_count
-# define __argz_count(argz, len) argz_count__ (argz, len)
-#endif	/* !_LIBC && !HAVE___ARGZ_COUNT */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
-/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
-   except the last into the character SEP.  */
-static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
-
-static void
-argz_stringify__ (argz, len, sep)
-     char *argz;
-     size_t len;
-     int sep;
-{
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len;
-      len -= part_len + 1;
-      if (len > 0)
-	*argz++ = sep;
-    }
-}
-# undef __argz_stringify
-# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
-#endif	/* !_LIBC && !HAVE___ARGZ_STRINGIFY */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
-static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
-				  const char *entry));
-
-static char *
-argz_next__ (argz, argz_len, entry)
-     char *argz;
-     size_t argz_len;
-     const char *entry;
-{
-  if (entry)
-    {
-      if (entry < argz + argz_len)
-        entry = strchr (entry, '\0') + 1;
-
-      return entry >= argz + argz_len ? NULL : (char *) entry;
-    }
-  else
-    if (argz_len > 0)
-      return argz;
-    else
-      return 0;
-}
-# undef __argz_next
-# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
-#endif	/* !_LIBC && !HAVE___ARGZ_NEXT */
-
-
-/* Return number of bits set in X.  */
-static int pop PARAMS ((int x));
-
-static inline int
-pop (x)
-     int x;
-{
-  /* We assume that no more than 16 bits are used.  */
-  x = ((x & ~0x5555) >> 1) + (x & 0x5555);
-  x = ((x & ~0x3333) >> 2) + (x & 0x3333);
-  x = ((x >> 4) + x) & 0x0f0f;
-  x = ((x >> 8) + x) & 0xff;
-
-  return x;
-}
-
-
-struct loaded_l10nfile *
-_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
-		    territory, codeset, normalized_codeset, modifier, special,
-		    sponsor, revision, filename, do_allocate)
-     struct loaded_l10nfile **l10nfile_list;
-     const char *dirlist;
-     size_t dirlist_len;
-     int mask;
-     const char *language;
-     const char *territory;
-     const char *codeset;
-     const char *normalized_codeset;
-     const char *modifier;
-     const char *special;
-     const char *sponsor;
-     const char *revision;
-     const char *filename;
-     int do_allocate;
-{
-  char *abs_filename;
-  struct loaded_l10nfile *last = NULL;
-  struct loaded_l10nfile *retval;
-  char *cp;
-  size_t entries;
-  int cnt;
-
-  /* Allocate room for the full file name.  */
-  abs_filename = (char *) malloc (dirlist_len
-				  + strlen (language)
-				  + ((mask & TERRITORY) != 0
-				     ? strlen (territory) + 1 : 0)
-				  + ((mask & XPG_CODESET) != 0
-				     ? strlen (codeset) + 1 : 0)
-				  + ((mask & XPG_NORM_CODESET) != 0
-				     ? strlen (normalized_codeset) + 1 : 0)
-				  + (((mask & XPG_MODIFIER) != 0
-				      || (mask & CEN_AUDIENCE) != 0)
-				     ? strlen (modifier) + 1 : 0)
-				  + ((mask & CEN_SPECIAL) != 0
-				     ? strlen (special) + 1 : 0)
-				  + (((mask & CEN_SPONSOR) != 0
-				      || (mask & CEN_REVISION) != 0)
-				     ? (1 + ((mask & CEN_SPONSOR) != 0
-					     ? strlen (sponsor) + 1 : 0)
-					+ ((mask & CEN_REVISION) != 0
-					   ? strlen (revision) + 1 : 0)) : 0)
-				  + 1 + strlen (filename) + 1);
-
-  if (abs_filename == NULL)
-    return NULL;
-
-  retval = NULL;
-  last = NULL;
-
-  /* Construct file name.  */
-  memcpy (abs_filename, dirlist, dirlist_len);
-  __argz_stringify (abs_filename, dirlist_len, ':');
-  cp = abs_filename + (dirlist_len - 1);
-  *cp++ = '/';
-  cp = stpcpy (cp, language);
-
-  if ((mask & TERRITORY) != 0)
-    {
-      *cp++ = '_';
-      cp = stpcpy (cp, territory);
-    }
-  if ((mask & XPG_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, codeset);
-    }
-  if ((mask & XPG_NORM_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, normalized_codeset);
-    }
-  if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
-    {
-      /* This component can be part of both syntaces but has different
-	 leading characters.  For CEN we use `+', else `@'.  */
-      *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
-      cp = stpcpy (cp, modifier);
-    }
-  if ((mask & CEN_SPECIAL) != 0)
-    {
-      *cp++ = '+';
-      cp = stpcpy (cp, special);
-    }
-  if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
-    {
-      *cp++ = ',';
-      if ((mask & CEN_SPONSOR) != 0)
-	cp = stpcpy (cp, sponsor);
-      if ((mask & CEN_REVISION) != 0)
-	{
-	  *cp++ = '_';
-	  cp = stpcpy (cp, revision);
-	}
-    }
-
-  *cp++ = '/';
-  stpcpy (cp, filename);
-
-  /* Look in list of already loaded domains whether it is already
-     available.  */
-  last = NULL;
-  for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
-    if (retval->filename != NULL)
-      {
-	int compare = strcmp (retval->filename, abs_filename);
-	if (compare == 0)
-	  /* We found it!  */
-	  break;
-	if (compare < 0)
-	  {
-	    /* It's not in the list.  */
-	    retval = NULL;
-	    break;
-	  }
-
-	last = retval;
-      }
-
-  if (retval != NULL || do_allocate == 0)
-    {
-      free (abs_filename);
-      return retval;
-    }
-
-  retval = (struct loaded_l10nfile *)
-    malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len)
-				* (1 << pop (mask))
-				* sizeof (struct loaded_l10nfile *)));
-  if (retval == NULL)
-    return NULL;
-
-  retval->filename = abs_filename;
-  retval->decided = (__argz_count (dirlist, dirlist_len) != 1
-		     || ((mask & XPG_CODESET) != 0
-			 && (mask & XPG_NORM_CODESET) != 0));
-  retval->data = NULL;
-
-  if (last == NULL)
-    {
-      retval->next = *l10nfile_list;
-      *l10nfile_list = retval;
-    }
-  else
-    {
-      retval->next = last->next;
-      last->next = retval;
-    }
-
-  entries = 0;
-  /* If the DIRLIST is a real list the RETVAL entry corresponds not to
-     a real file.  So we have to use the DIRLIST separation mechanism
-     of the inner loop.  */
-  cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
-  for (; cnt >= 0; --cnt)
-    if ((cnt & ~mask) == 0
-	&& ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
-	&& ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
-      {
-	/* Iterate over all elements of the DIRLIST.  */
-	char *dir = NULL;
-
-	while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
-	       != NULL)
-	  retval->successor[entries++]
-	    = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
-				  language, territory, codeset,
-				  normalized_codeset, modifier, special,
-				  sponsor, revision, filename, 1);
-      }
-  retval->successor[entries] = NULL;
-
-  return retval;
-}
-
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  */
-const char *
-_nl_normalize_codeset (codeset, name_len)
-     const unsigned char *codeset;
-     size_t name_len;
-{
-  int len = 0;
-  int only_digit = 1;
-  char *retval;
-  char *wp;
-  size_t cnt;
-
-  for (cnt = 0; cnt < name_len; ++cnt)
-    if (isalnum (codeset[cnt]))
-      {
-	++len;
-
-	if (isalpha (codeset[cnt]))
-	  only_digit = 0;
-      }
-
-  retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
-
-  if (retval != NULL)
-    {
-      if (only_digit)
-	wp = stpcpy (retval, "iso");
-      else
-	wp = retval;
-
-      for (cnt = 0; cnt < name_len; ++cnt)
-	if (isalpha (codeset[cnt]))
-	  *wp++ = tolower (codeset[cnt]);
-	else if (isdigit (codeset[cnt]))
-	  *wp++ = codeset[cnt];
-
-      *wp = '\0';
-    }
-
-  return (const char *) retval;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
diff --git a/gnu/usr.bin/lynx/intl/libgettext.h b/gnu/usr.bin/lynx/intl/libgettext.h
deleted file mode 100644
index 248e0635375..00000000000
--- a/gnu/usr.bin/lynx/intl/libgettext.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Because on some systems (e.g. Solaris) we sometimes have to include
-   the systems libintl.h as well as this file we have more complex
-   include protection above.  But the systems header might perhaps also
-   define _LIBINTL_H and therefore we have to protect the definition here.  */
-
-#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H
-#ifndef _LIBINTL_H
-# define _LIBINTL_H	1
-#endif
-#define _LIBGETTEXT_H	1
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-#include <sys/types.h>
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef NULL
-# if !defined __cplusplus || defined __GNUC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL (0)
-# endif
-#endif
-
-#if !HAVE_LC_MESSAGES
-/* This value determines the behaviour of the gettext() and dgettext()
-   function.  But some system does not have this defined.  Define it
-   to a default value.  */
-# define LC_MESSAGES (-1)
-#endif
-
-
-/* Declarations for gettext-using-catgets interface.  Derived from
-   Jim Meyering's libintl.h.  */
-struct _msg_ent
-{
-  const char *_msg;
-  int _msg_number;
-};
-
-
-#ifdef HAVE_CATGETS
-/* These two variables are defined in the automatically by po-to-tbl.sed
-   generated file `cat-id-tbl.c'.  */
-extern const struct _msg_ent _msg_tbl[];
-extern int _msg_tbl_length;
-#endif
-
-
-/* For automatical extraction of messages sometimes no real
-   translation is needed.  Instead the string itself is the result.  */
-#define gettext_noop(Str) (Str)
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext PARAMS ((const char *__msgid));
-extern char *gettext__ PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				  const char *__dirname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				    const char *__dirname));
-
-#if ENABLE_NLS
-
-/* Solaris 2.3 has the gettext function but dcgettext is missing.
-   So we omit this optimization for Solaris 2.3.  BTW, Solaris 2.4
-   has dcgettext.  */
-# if !defined(HAVE_CATGETS) && (!defined(HAVE_GETTEXT) || defined(HAVE_DCGETTEXT))
-
-#  define gettext(Msgid)						      \
-     dgettext (NULL, Msgid)
-
-#  define dgettext(Domainname, Msgid)					      \
-     dcgettext (Domainname, Msgid, LC_MESSAGES)
-
-#  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-/* This global variable is defined in loadmsgcat.c.  We need a sign,
-   whether a new catalog was loaded, which can be associated with all
-   translations.  */
-extern int _nl_msg_cat_cntr;
-
-#   define dcgettext(Domainname, Msgid, Category)			      \
-  (__extension__							      \
-   ({									      \
-     char *__result;							      \
-     if (__builtin_constant_p (Msgid))					      \
-       {								      \
-	 static char *__translation__;					      \
-	 static int __catalog_counter__;				      \
-	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
-	   {								      \
-	     __translation__ =						      \
-	       dcgettext__ (Domainname, Msgid, Category);		      \
-	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
-	   }								      \
-	 __result = __translation__;					      \
-       }								      \
-     else								      \
-       __result = dcgettext__ (Domainname, Msgid, Category);		      \
-     __result;								      \
-    }))
-#  endif
-# endif
-
-#else
-
-# define gettext(Msgid) (Msgid)
-# define dgettext(Domainname, Msgid) (Msgid)
-# define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define textdomain(Domainname) ((char *) Domainname)
-# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
-
-#endif
-
-/* @@ begin of epilog @@ */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/gnu/usr.bin/lynx/intl/libintl.h b/gnu/usr.bin/lynx/intl/libintl.h
deleted file mode 100644
index 4b91230f884..00000000000
--- a/gnu/usr.bin/lynx/intl/libintl.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* libintl.h -- Message catalogs for internationalization.
-Copyright (C) 1995 Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-#ifndef __P
-# if __STDC__
-#  define __P(args) args
-# else
-#  define __P(args) ()
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext __P ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext __P ((const char *__domainname, const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext __P ((const char *__domainname, const char *__msgid,
-			     int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain __P ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain __P ((const char *__domainname,
-				  const char *__dirname));
-
-
-/* Optimized version of the functions above.  */
-#if defined __OPTIMIZED
-/* These must be a macro.  Inlined functions are useless because the
-   `__builtin_constant_p' predicate in dcgettext would always return
-   false.  */
-
-# define gettext(msgid) dgettext ((char *) 0, msgid)
-
-# define dgettext(domainname, msgid)					      \
-  dcgettext (domainname, msgid, LC_MESSAGES)
-
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-#  define dcgettext(domainname, msgid, category)			      \
-  (__extension__							      \
-   ({									      \
-     char *result;							      \
-     if (__builtin_constant_p (msgid))					      \
-       {								      \
-	 extern int _nl_msg_cat_cntr;					      \
-	 static char *__translation__;					      \
-	 static int __catalog_counter__;				      \
-	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
-	   {								      \
-	     __translation__ =						      \
-	       (dcgettext) ((domainname), (msgid), (category));		      \
-	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
-	   }								      \
-	 result = __translation__;					      \
-       }								      \
-     else								      \
-       result = (dcgettext) ((domainname), (msgid), (category));	      \
-     result;								      \
-    }))
-# endif
-#endif /* Optimizing. */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
diff --git a/gnu/usr.bin/lynx/intl/linux-msg.sed b/gnu/usr.bin/lynx/intl/linux-msg.sed
deleted file mode 100644
index 5918e720a9a..00000000000
--- a/gnu/usr.bin/lynx/intl/linux-msg.sed
+++ /dev/null
@@ -1,100 +0,0 @@
-# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number.  We use always set number 1.
-#
-1 {
-  i\
-$set 1 # Automatically created by po2msg.sed
-  h
-  s/.*/0/
-  x
-}
-#
-# Mitch's old catalog format does not allow comments.
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-  s/msgid[ 	]*"//
-#
-# This does not work now with the new format.
-# /"$/! {
-#   s/\\$//
-#   s/$/ ... (more lines following)"/
-# }
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID.  Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here.  (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
-  s/msgstr[ 	]*"\(.*\)"/# \1/
-# Clear substitution flag.
-  tb
-# Append the next line.
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
-  ta
-  P
-  D
-# Note that D includes a jump to the start!!
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-  tb
-}
-d
diff --git a/gnu/usr.bin/lynx/intl/loadinfo.h b/gnu/usr.bin/lynx/intl/loadinfo.h
deleted file mode 100644
index f4ebf6d8112..00000000000
--- a/gnu/usr.bin/lynx/intl/loadinfo.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-/* Encoding of locale name parts.  */
-#define CEN_REVISION		1
-#define CEN_SPONSOR		2
-#define CEN_SPECIAL		4
-#define XPG_NORM_CODESET	8
-#define XPG_CODESET		16
-#define TERRITORY		32
-#define CEN_AUDIENCE		64
-#define XPG_MODIFIER		128
-
-#define CEN_SPECIFIC	(CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
-#define XPG_SPECIFIC	(XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
-
-
-struct loaded_l10nfile
-{
-  const char *filename;
-  int decided;
-
-  const void *data;
-
-  struct loaded_l10nfile *next;
-  struct loaded_l10nfile *successor[1];
-};
-
-
-extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset,
-						  size_t name_len));
-
-extern struct loaded_l10nfile *
-_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
-			    const char *dirlist, size_t dirlist_len, int mask,
-			    const char *language, const char *territory,
-			    const char *codeset,
-			    const char *normalized_codeset,
-			    const char *modifier, const char *special,
-			    const char *sponsor, const char *revision,
-			    const char *filename, int do_allocate));
-
-
-extern const char *_nl_expand_alias PARAMS ((const char *name));
-
-extern int _nl_explode_name PARAMS ((char *name, const char **language,
-				     const char **modifier,
-				     const char **territory,
-				     const char **codeset,
-				     const char **normalized_codeset,
-				     const char **special,
-				     const char **sponsor,
-				     const char **revision));
diff --git a/gnu/usr.bin/lynx/intl/loadmsgcat.c b/gnu/usr.bin/lynx/intl/loadmsgcat.c
deleted file mode 100644
index 515892dfb86..00000000000
--- a/gnu/usr.bin/lynx/intl/loadmsgcat.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Load needed message catalogs.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC
-# include <sys/mman.h>
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ISO C functions.  This is required by the standard
-   because some ISO C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define open   __open
-# define close  __close
-# define read   __read
-# define mmap   __mmap
-# define munmap __munmap
-#endif
-
-/* We need a sign, whether a new catalog was loaded, which can be associated
-   with all translations.  This is important if the translations are
-   cached by one of GCC's features.  */
-int _nl_msg_cat_cntr = 0;
-
-
-/* Load the message catalogs specified by FILENAME.  If it is no valid
-   message catalog do nothing.  */
-void
-internal_function
-_nl_load_domain (domain_file)
-     struct loaded_l10nfile *domain_file;
-{
-  int fd;
-  size_t size;
-  struct stat st;
-  struct mo_file_header *data = (struct mo_file_header *) -1;
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-  int use_mmap = 0;
-#endif
-  struct loaded_domain *domain;
-
-  domain_file->decided = 1;
-  domain_file->data = NULL;
-
-  /* If the record does not represent a valid locale the FILENAME
-     might be NULL.  This can happen when according to the given
-     specification the locale file name is different for XPG and CEN
-     syntax.  */
-  if (domain_file->filename == NULL)
-    return;
-
-  /* Try to open the addressed file.  */
-  fd = open (domain_file->filename, O_RDONLY);
-  if (fd == -1)
-    return;
-
-  /* We must know about the size of the file.  */
-  if (fstat (fd, &st) != 0
-      || (size = (size_t) st.st_size) != st.st_size
-      || size < sizeof (struct mo_file_header))
-    {
-      /* Something went wrong.  */
-      close (fd);
-      return;
-    }
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-  /* Now we are ready to load the file.  If mmap() is available we try
-     this first.  If not available or it failed we try to load it.  */
-  data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
-					 MAP_PRIVATE, fd, 0);
-
-  if (data != (struct mo_file_header *) -1)
-    {
-      /* mmap() call was successful.  */
-      close (fd);
-      use_mmap = 1;
-    }
-#endif
-
-  /* If the data is not yet available (i.e. mmap'ed) we try to load
-     it manually.  */
-  if (data == (struct mo_file_header *) -1)
-    {
-      size_t to_read;
-      char *read_ptr;
-
-      data = (struct mo_file_header *) malloc (size);
-      if (data == NULL)
-	return;
-
-      to_read = size;
-      read_ptr = (char *) data;
-      do
-	{
-	  long int nb = (long int) read (fd, read_ptr, to_read);
-	  if (nb == -1)
-	    {
-	      close (fd);
-	      return;
-	    }
-
-	  read_ptr += nb;
-	  to_read -= nb;
-	}
-      while (to_read > 0);
-
-      close (fd);
-    }
-
-  /* Using the magic number we can test whether it really is a message
-     catalog file.  */
-  if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
-    {
-      /* The magic number is wrong: not a message catalog file.  */
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      return;
-    }
-
-  domain_file->data
-    = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
-  if (domain_file->data == NULL)
-    return;
-
-  domain = (struct loaded_domain *) domain_file->data;
-  domain->data = (char *) data;
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-  domain->use_mmap = use_mmap;
-#endif
-  domain->mmap_size = size;
-  domain->must_swap = data->magic != _MAGIC;
-
-  /* Fill in the information about the available tables.  */
-  switch (W (domain->must_swap, data->revision))
-    {
-    case 0:
-      domain->nstrings = W (domain->must_swap, data->nstrings);
-      domain->orig_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->orig_tab_offset));
-      domain->trans_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->trans_tab_offset));
-      domain->hash_size = W (domain->must_swap, data->hash_tab_size);
-      domain->hash_tab = (nls_uint32 *)
-	((char *) data + W (domain->must_swap, data->hash_tab_offset));
-      break;
-    default:
-      /* This is an illegal revision.  */
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      free (domain);
-      domain_file->data = NULL;
-      return;
-    }
-
-  /* Show that one domain is changed.  This might make some cached
-     translations invalid.  */
-  ++_nl_msg_cat_cntr;
-}
-
-
-#ifdef _LIBC
-void
-internal_function
-_nl_unload_domain (domain)
-     struct loaded_domain *domain;
-{
-  if (domain->use_mmap)
-    munmap ((caddr_t) domain->data, domain->mmap_size);
-  else
-    free ((void *) domain->data);
-
-  free (domain);
-}
-#endif
diff --git a/gnu/usr.bin/lynx/intl/localealias.c b/gnu/usr.bin/lynx/intl/localealias.c
deleted file mode 100644
index bca555a610f..00000000000
--- a/gnu/usr.bin/lynx/intl/localealias.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/* Handle aliases for locale names.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define strcasecmp __strcasecmp
-
-# define mempcpy __mempcpy
-# define HAVE_MEMPCPY	1
-
-/* We need locking here since we can be called from different places.  */
-# include <bits/libc-lock.h>
-
-__libc_lock_define_initialized (static, lock);
-#endif
-
-
-/* For those loosing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
-
-
-struct alias_map
-{
-  const char *alias;
-  const char *value;
-};
-
-
-static char *string_space = NULL;
-static size_t string_space_act = 0;
-static size_t string_space_max = 0;
-static struct alias_map *map;
-static size_t nmap = 0;
-static size_t maxmap = 0;
-
-
-/* Prototypes for local functions.  */
-static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
-     internal_function;
-static void extend_alias_table PARAMS ((void));
-static int alias_compare PARAMS ((const struct alias_map *map1,
-				  const struct alias_map *map2));
-
-
-const char *
-_nl_expand_alias (name)
-    const char *name;
-{
-  static const char *locale_alias_path = LOCALE_ALIAS_PATH;
-  struct alias_map *retval;
-  const char *result = NULL;
-  size_t added;
-
-#ifdef _LIBC
-  __libc_lock_lock (lock);
-#endif
-
-  do
-    {
-      struct alias_map item;
-
-      item.alias = name;
-
-      if (nmap > 0)
-	retval = (struct alias_map *) bsearch (&item, map, nmap,
-					       sizeof (struct alias_map),
-					       (int (*) PARAMS ((const void *,
-								 const void *))
-						) alias_compare);
-      else
-	retval = NULL;
-
-      /* We really found an alias.  Return the value.  */
-      if (retval != NULL)
-	{
-	  result = retval->value;
-	  break;
-	}
-
-      /* Perhaps we can find another alias file.  */
-      added = 0;
-      while (added == 0 && locale_alias_path[0] != '\0')
-	{
-	  const char *start;
-
-	  while (locale_alias_path[0] == ':')
-	    ++locale_alias_path;
-	  start = locale_alias_path;
-
-	  while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
-	    ++locale_alias_path;
-
-	  if (start < locale_alias_path)
-	    added = read_alias_file (start, locale_alias_path - start);
-	}
-    }
-  while (added != 0);
-
-#ifdef _LIBC
-  __libc_lock_unlock (lock);
-#endif
-
-  return result;
-}
-
-
-static size_t
-internal_function
-read_alias_file (fname, fname_len)
-     const char *fname;
-     int fname_len;
-{
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
-  FILE *fp;
-  char *full_fname;
-  size_t added;
-  static const char aliasfile[] = "/locale.alias";
-
-  full_fname = (char *) alloca (fname_len + sizeof aliasfile);
-  ADD_BLOCK (block_list, full_fname);
-#ifdef HAVE_MEMPCPY
-  mempcpy (mempcpy (full_fname, fname, fname_len),
-	   aliasfile, sizeof aliasfile);
-#else
-  memcpy (full_fname, fname, fname_len);
-  memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
-#endif
-
-  fp = fopen (full_fname, "r");
-  if (fp == NULL)
-    {
-      FREE_BLOCKS (block_list);
-      return 0;
-    }
-
-  added = 0;
-  while (!feof (fp))
-    {
-      /* It is a reasonable approach to use a fix buffer here because
-	 a) we are only interested in the first two fields
-	 b) these fields must be usable as file names and so must not
-	    be that long
-       */
-      unsigned char buf[BUFSIZ];
-      unsigned char *alias;
-      unsigned char *value;
-      unsigned char *cp;
-
-      if (fgets (buf, sizeof buf, fp) == NULL)
-	/* EOF reached.  */
-	break;
-
-      /* Possibly not the whole line fits into the buffer.  Ignore
-	 the rest of the line.  */
-      if (strchr (buf, '\n') == NULL)
-	{
-	  char altbuf[BUFSIZ];
-	  do
-	    if (fgets (altbuf, sizeof altbuf, fp) == NULL)
-	      /* Make sure the inner loop will be left.  The outer loop
-		 will exit at the `feof' test.  */
-	      break;
-	  while (strchr (altbuf, '\n') == NULL);
-	}
-
-      cp = buf;
-      /* Ignore leading white space.  */
-      while (isspace (cp[0]))
-	++cp;
-
-      /* A leading '#' signals a comment line.  */
-      if (cp[0] != '\0' && cp[0] != '#')
-	{
-	  alias = cp++;
-	  while (cp[0] != '\0' && !isspace (cp[0]))
-	    ++cp;
-	  /* Terminate alias name.  */
-	  if (cp[0] != '\0')
-	    *cp++ = '\0';
-
-	  /* Now look for the beginning of the value.  */
-	  while (isspace (cp[0]))
-	    ++cp;
-
-	  if (cp[0] != '\0')
-	    {
-	      size_t alias_len;
-	      size_t value_len;
-
-	      value = cp++;
-	      while (cp[0] != '\0' && !isspace (cp[0]))
-		++cp;
-	      /* Terminate value.  */
-	      if (cp[0] == '\n')
-		{
-		  /* This has to be done to make the following test
-		     for the end of line possible.  We are looking for
-		     the terminating '\n' which do not overwrite here.  */
-		  *cp++ = '\0';
-		  *cp = '\n';
-		}
-	      else if (cp[0] != '\0')
-		*cp++ = '\0';
-
-	      if (nmap >= maxmap)
-		extend_alias_table ();
-
-	      alias_len = strlen (alias) + 1;
-	      value_len = strlen (value) + 1;
-
-	      if (string_space_act + alias_len + value_len > string_space_max)
-		{
-		  /* Increase size of memory pool.  */
-		  size_t new_size = (string_space_max
-				     + (alias_len + value_len > 1024
-					? alias_len + value_len : 1024));
-		  char *new_pool = (char *) realloc (string_space, new_size);
-		  if (new_pool == NULL)
-		    {
-		      FREE_BLOCKS (block_list);
-		      return added;
-		    }
-		  string_space = new_pool;
-		  string_space_max = new_size;
-		}
-
-	      map[nmap].alias = memcpy (&string_space[string_space_act],
-					alias, alias_len);
-	      string_space_act += alias_len;
-
-	      map[nmap].value = memcpy (&string_space[string_space_act],
-					value, value_len);
-	      string_space_act += value_len;
-
-	      ++nmap;
-	      ++added;
-	    }
-	}
-    }
-
-  /* Should we test for ferror()?  I think we have to silently ignore
-     errors.  --drepper  */
-  fclose (fp);
-
-  if (added > 0)
-    qsort (map, nmap, sizeof (struct alias_map),
-	   (int (*) PARAMS ((const void *, const void *))) alias_compare);
-
-  FREE_BLOCKS (block_list);
-  return added;
-}
-
-
-static void
-extend_alias_table ()
-{
-  size_t new_size;
-  struct alias_map *new_map;
-
-  new_size = maxmap == 0 ? 100 : 2 * maxmap;
-  new_map = (struct alias_map *) realloc (map, (new_size
-						* sizeof (struct alias_map)));
-  if (new_map == NULL)
-    /* Simply don't extend: we don't have any more core.  */
-    return;
-
-  map = new_map;
-  maxmap = new_size;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  if (string_space != NULL)
-    free (string_space);
-  if (map != NULL)
-    free (map);
-}
-text_set_element (__libc_subfreeres, free_mem);
-#endif
-
-
-static int
-alias_compare (map1, map2)
-     const struct alias_map *map1;
-     const struct alias_map *map2;
-{
-#if defined _LIBC || defined HAVE_STRCASECMP
-  return strcasecmp (map1->alias, map2->alias);
-#else
-  const unsigned char *p1 = (const unsigned char *) map1->alias;
-  const unsigned char *p2 = (const unsigned char *) map2->alias;
-  unsigned char c1, c2;
-
-  if (p1 == p2)
-    return 0;
-
-  do
-    {
-      /* I know this seems to be odd but the tolower() function in
-	 some systems libc cannot handle nonalpha characters.  */
-      c1 = isupper (*p1) ? tolower (*p1) : *p1;
-      c2 = isupper (*p2) ? tolower (*p2) : *p2;
-      if (c1 == '\0')
-	break;
-      ++p1;
-      ++p2;
-    }
-  while (c1 == c2);
-
-  return c1 - c2;
-#endif
-}
diff --git a/gnu/usr.bin/lynx/intl/makefile.in b/gnu/usr.bin/lynx/intl/makefile.in
deleted file mode 100644
index 390e8d30b17..00000000000
--- a/gnu/usr.bin/lynx/intl/makefile.in
+++ /dev/null
@@ -1,231 +0,0 @@
-# Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# Changes:
-# #	Added a variable $(MAKEFILE) permitting us to use "makefile.in" for
-#	ease of porting to systems with case-independent filenames.
-# #	Renamed po2tbl.sed.in to po2tbl.sed_in to allow bundling in VMS zips.
-# #	Set CDPATH to . in the makefile.in's that use cd, in case user has set
-#	CDPATH without . at the beginning.
-# #	Add variable $(CONFIG_H) permitting us to use a different name than
-#	"config.h" in the parent package.
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = @CONFIG_SHELL@
-CDPATH = .
-MAKEFILE = makefile
-CONFIG_H = @CONFIG_H@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-transform = @program_transform_name@
-libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
-datadir = @NLS_DATADIR@
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = @datadir@/gettext/intl
-aliaspath = $(localedir):.
-subdir = intl
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-DESTDIR = @DESTDIR@
-
-l = @l@
-
-AR = ar
-CC = @CC@
-LN_S = @LN_S@
-LIBTOOL = @LIBTOOL@
-RANLIB = @RANLIB@
-
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
--DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-HEADERS = $(COMHDRS) libgettext.h loadinfo.h
-COMHDRS = gettext.h gettextP.h hash-string.h
-SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
-COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
-finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c
-OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo
-CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
-GETTOBJS = intl-compat.$lo
-DISTFILES.common = ChangeLog $(MAKEFILE).in linux-msg.sed po2tbl.sed_in \
-xopen-msg.sed $(HEADERS) $(SOURCES)
-DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc intlh.inst.in
-
-.SUFFIXES:
-.SUFFIXES: .c .o .lo
-.c.o:
-	$(COMPILE) $<
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) $<
-
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
-
-all: all-@USE_INCLUDED_LIBINTL@
-
-all-yes: libintl.$la intlh.inst
-all-no:
-
-libintl.a: $(OBJECTS)
-	rm -f $@
-	$(AR) cru $@ $(OBJECTS)
-	$(RANLIB) $@
-
-libintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
-		   -version-info 1:0 -rpath $(libdir)
-
-../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
-	cd ../po && $(MAKE) cat-id-tbl.$lo
-
-check: all
-
-# This installation goal is only used in GNU gettext.  Packages which
-# only use the library should use install instead.
-
-# We must not install the libintl.h/libintl.a files if we are on a
-# system which has the gettext() function in its C library or in a
-# separate library or use the catgets interface.  A special case is
-# where configure found a previously installed GNU gettext library.
-# If you want to use the one which comes with this version of the
-# package, you have to use `configure --with-included-gettext'.
-install: install-exec install-data
-install-exec: all
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	  fi; \
-	  $(INSTALL_DATA) intlh.inst $(DESTDIR)$(includedir)/libintl.h; \
-	  $(INSTALL_DATA) libintl.a $(DESTDIR)$(libdir)/libintl.a; \
-	else \
-	  : ; \
-	fi
-install-data: all
-	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
-	  dists="$(DISTFILES.common)"; \
-	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	dists="$(DISTFILES.common)"; \
-	for file in $$dists; do \
-	  rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	done
-
-info dvi:
-
-$(OBJECTS): config.h libgettext.h
-config.h : $(top_srcdir)/@CONFIG_H@
-	cp $(top_srcdir)/@CONFIG_H@ $@
-bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
-dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
-
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
-
-id: ID
-
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
-
-
-mostlyclean:
-	rm -f *.a *.o *.lo core core.*
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f $(MAKEFILE) ID TAGS po2msg.sed po2tbl.sed libintl.h
-	rm -f config.h
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-
-# GNU gettext needs not contain the file `VERSION' but contains some
-# other files which should not be distributed in other packages.
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(MAKEFILE) $(DISTFILES)
-	if test "$(PACKAGE)" = gettext; then \
-	  additional="$(DISTFILES.gettext)"; \
-	else \
-	  additional="$(DISTFILES.normal)"; \
-	fi; \
-	for file in $(DISTFILES.common) $$additional; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
-	done
-
-dist-libc:
-	tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
-
-$(MAKEFILE): $(MAKEFILE).in ../config.status
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-# The dependency for intlh.inst is different in gettext and all other
-# packages.  Because we cannot use GNU make features we have to solve
-# the problem while rewriting $(MAKEFILE).in.
-@GT_YES@intlh.inst: intlh.inst.in ../config.status
-@GT_YES@	cd .. \
-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-@GT_YES@	  $(SHELL) ./config.status
-@GT_NO@.PHONY: intlh.inst
-@GT_NO@intlh.inst:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/gnu/usr.bin/lynx/intl/po2tbl.sed.in b/gnu/usr.bin/lynx/intl/po2tbl.sed.in
deleted file mode 100644
index b3bcca4d730..00000000000
--- a/gnu/usr.bin/lynx/intl/po2tbl.sed.in
+++ /dev/null
@@ -1,102 +0,0 @@
-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-1 {
-  i\
-/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot.  */\
-\
-#if HAVE_CONFIG_H\
-# include <config.h>\
-#endif\
-\
-#include "libgettext.h"\
-\
-const struct _msg_ent _msg_tbl[] = {
-  h
-  s/.*/0/
-  x
-}
-#
-# Write msgid entries in C array form.
-#
-/^msgid/ {
-  s/msgid[ 	]*\(".*"\)/  {\1/
-  tb
-# Append the next line
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
-# Yes, then branch.
-  ta
-# Because we assume that the input file correctly formed the line
-# just read cannot be again be a msgid line.  So it's safe to ignore
-# it.
-  s/\(.*\)\n.*/\1/
-  bc
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-# Some buggy seds do not clear the `successful substitution since last ``t'''
-# flag on `N', so we do a `t' here to clear it.
-  tb
-# Not reached
-  :c
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)\n\([0-9]*\)/\1, \2},/
-  s/\(.*\)"$/\1/
-  p
-}
-#
-# Last line.
-#
-$ {
-  i\
-};\
-
-  g
-  s/0*\(.*\)/int _msg_tbl_length = \1;/p
-}
-d
diff --git a/gnu/usr.bin/lynx/intl/po2tbl.sed_in b/gnu/usr.bin/lynx/intl/po2tbl.sed_in
deleted file mode 100644
index b3bcca4d730..00000000000
--- a/gnu/usr.bin/lynx/intl/po2tbl.sed_in
+++ /dev/null
@@ -1,102 +0,0 @@
-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-1 {
-  i\
-/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot.  */\
-\
-#if HAVE_CONFIG_H\
-# include <config.h>\
-#endif\
-\
-#include "libgettext.h"\
-\
-const struct _msg_ent _msg_tbl[] = {
-  h
-  s/.*/0/
-  x
-}
-#
-# Write msgid entries in C array form.
-#
-/^msgid/ {
-  s/msgid[ 	]*\(".*"\)/  {\1/
-  tb
-# Append the next line
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
-# Yes, then branch.
-  ta
-# Because we assume that the input file correctly formed the line
-# just read cannot be again be a msgid line.  So it's safe to ignore
-# it.
-  s/\(.*\)\n.*/\1/
-  bc
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-# Some buggy seds do not clear the `successful substitution since last ``t'''
-# flag on `N', so we do a `t' here to clear it.
-  tb
-# Not reached
-  :c
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)\n\([0-9]*\)/\1, \2},/
-  s/\(.*\)"$/\1/
-  p
-}
-#
-# Last line.
-#
-$ {
-  i\
-};\
-
-  g
-  s/0*\(.*\)/int _msg_tbl_length = \1;/p
-}
-d
diff --git a/gnu/usr.bin/lynx/intl/textdomain.c b/gnu/usr.bin/lynx/intl/textdomain.c
deleted file mode 100644
index 88557460f3b..00000000000
--- a/gnu/usr.bin/lynx/intl/textdomain.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Implementation of the textdomain(3) function.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Name of the default text domain.  */
-extern const char _nl_default_default_domain[];
-
-/* Default text domain in which entries for gettext(3) are to be found.  */
-extern const char *_nl_current_default_domain;
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define TEXTDOMAIN __textdomain
-# ifndef strdup
-#  define strdup(str) __strdup (str)
-# endif
-#else
-# define TEXTDOMAIN textdomain__
-#endif
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-char *
-TEXTDOMAIN (domainname)
-     const char *domainname;
-{
-  char *old;
-
-  /* A NULL pointer requests the current setting.  */
-  if (domainname == NULL)
-    return (char *) _nl_current_default_domain;
-
-  old = (char *) _nl_current_default_domain;
-
-  /* If domain name is the null string set to default domain "messages".  */
-  if (domainname[0] == '\0'
-      || strcmp (domainname, _nl_default_default_domain) == 0)
-    _nl_current_default_domain = _nl_default_default_domain;
-  else
-    {
-      /* If the following malloc fails `_nl_current_default_domain'
-	 will be NULL.  This value will be returned and so signals we
-	 are out of core.  */
-#if defined _LIBC || defined HAVE_STRDUP
-      _nl_current_default_domain = strdup (domainname);
-#else
-      size_t len = strlen (domainname) + 1;
-      char *cp = (char *) malloc (len);
-      if (cp != NULL)
-	memcpy (cp, domainname, len);
-      _nl_current_default_domain = cp;
-#endif
-    }
-
-  if (old != _nl_default_default_domain)
-    free (old);
-
-  return (char *) _nl_current_default_domain;
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__textdomain, textdomain);
-#endif
diff --git a/gnu/usr.bin/lynx/intl/xopen-msg.sed b/gnu/usr.bin/lynx/intl/xopen-msg.sed
deleted file mode 100644
index b19c0bbd0ec..00000000000
--- a/gnu/usr.bin/lynx/intl/xopen-msg.sed
+++ /dev/null
@@ -1,104 +0,0 @@
-# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number.  We use always set number 1.
-#
-1 {
-  i\
-$set 1 # Automatically created by po2msg.sed
-  h
-  s/.*/0/
-  x
-}
-#
-# We copy all comments into the .msg file.  Perhaps they can help.
-#
-/^#/ s/^#[ 	]*/$ /p
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-# Does not work now
-#  /"$/! {
-#    s/\\$//
-#    s/$/ ... (more lines following)"/
-#  }
-  s/^msgid[ 	]*"\(.*\)"$/$ Original Message: \1/
-  p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID.  Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here.  (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
-  s/msgstr[ 	]*"\(.*\)"/\1/
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-# Bring the line in the format `<number> <message>'
-  G
-  s/^[^\n]*$/& /
-  s/\(.*\)\n\([0-9]*\)/\2 \1/
-# Clear flag from last substitution.
-  tb
-# Append the next line.
-  :b
-  N
-# Look whether second part is a continuation line.
-  s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
-  ta
-  P
-  D
-# Note that `D' includes a jump to the start!!
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use the sed command `D' here
-  s/.*\n\(.*\)/\1/
-  tb
-}
-d
diff --git a/gnu/usr.bin/lynx/lynx.cfg b/gnu/usr.bin/lynx/lynx.cfg
index 13093d89d03..91c17085f04 100644
--- a/gnu/usr.bin/lynx/lynx.cfg
+++ b/gnu/usr.bin/lynx/lynx.cfg
@@ -1,10 +1,17 @@
 # lynx.cfg file.
-# The default placement for this file is /etc/lynx.cfg
+# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
+#                                     or Lynx_Dir:lynx.cfg (VMS)
+#
+# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
+#PRCS LYNX_VERSION "2.8.5rel.1"
+#
+# $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
+#PRCS LYNX_DATE "Wed, 04 Feb 2004 04:07:09 -0800"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
 #
-#  If you do not have write access to /etc you may change
+#  If you do not have write access to /usr/local/lib you may change
 #  the default location of this file in the userdefs.h file and recompile,
 #  or specify its location on the command line with the "-cfg"
 #  command line option.
@@ -85,7 +92,7 @@
 #
 # Normally we expect you will connect to a remote site, e.g., the Lynx starting
 # site:
-#STARTFILE:http://www.OpenBSD.org
+STARTFILE:http://www.OpenBSD.org/
 #
 # As an alternative, you may want to use a local URL.  A good choice for this is
 # the user's home directory:
@@ -105,12 +112,12 @@
 #   for this distribution (use SHELL syntax including the device
 #   on VMS systems).
 # The default HELPFILE is:
-# http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html
+# http://www.subir.com/lynx/lynx_help/lynx_help_main.html
 #   This should be changed to the local path.
 #
-#HELPFILE:http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html
+HELPFILE:file:///usr/share/doc/html/lynx_help/lynx_help_main.html
 .ex
-#HELPFILE:file://localhost/usr/share/doc/html/lynx_help/lynx_help_main.html
+#HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
 
 
 .h2 DEFAULT_INDEX_FILE
@@ -388,6 +395,15 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 #
 #CHARACTER_SET:iso-8859-1
 
+.h2 LOCALE_CHARSET
+# LOCALE_CHARSET overrides CHARACTER_SET if true, using the current locale to
+# lookup a MIME name that corresponds, and use that as the display charset. 
+# This feature is experimental because while nl_langinfo(CODESET) itself is
+# standardized, the return values and their relationship to the locale value is
+# not.  GNU libiconv happens to give useful values, but other implementations
+# are not guaranteed to do this.
+#LOCALE_CHARSET:FALSE
+
 
 .h2 ASSUME_CHARSET
 # ASSUME_CHARSET changes the handling of documents which do not
@@ -554,7 +570,7 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 .h2 CHARSETS_DIRECTORY
 # CHARSETS_DIRECTORY specifies the directory with the fonts (glyph data)
 # used by Lynx to switch the display-font to a font best suited for the
-# given document.  The font should be in a format understood by the 
+# given document.  The font should be in a format understood by the
 # platforms TTY-display-font-switching API.  Currently supported on OS/2 only.
 #
 # Lynx expects the glyphs for the charset CHARSET with character cell
@@ -566,9 +582,9 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 
 
 .h2 CHARSET_SWITCH_RULES
-# CHARSET_SWITCH_RULES hints lynx on how to choose the best display
-# font given the document encoding.  This strings is a sequence of
-# chunks, each chunk having the following form:
+# CHARSET_SWITCH_RULES hints lynx on how to choose the best display font given
+# the document encoding.  This string is a sequence of chunks, each chunk
+# having the following form:
 #
 # IN_CHARSET1 IN_CHARSET2 ... IN_CHARSET5 :OUT_CHARSET
 #
@@ -634,22 +650,37 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 
 .h2 SHOW_KB_RATE
 # While getting large files, Lynx shows the approximate rate of transfer.
-# Set this to change the units shown:
+# Set this to change the units shown.  "Kilobytes" denotes 1024 bytes:
 #	NONE to disable the display of transfer rate altogether.
-#	TRUE or KB for KB/sec.
-#	FALSE or BYTES for bytes/sec.
-#	KB,ETA to show KB/sec with estimated completion time.
-#	BYTES,ETA to show BYTES/sec with estimated completion time.
-# Note that the "ETA" values are available if EXP_READPROGRESS was defined.
+#	TRUE or KB for Kilobytes/second.
+#	FALSE or BYTES for bytes/second.
+#	KB,ETA to show Kilobytes/second with estimated completion time.
+#	BYTES,ETA to show BYTES/second with estimated completion time.
+# Note that the "ETA" values are available if USE_READPROGRESS was defined.
 #SHOW_KB_RATE:TRUE
 
+.h2 SHOW_KB_NAME
+# Set the abbreviation for Kilobytes (1024).
+# Quoting from
+#	http://www.romulus2.com/articles/guides/misc/bitsbytes.shtml
+# In December 1998, the International Electrotechnical Commission (IEC)
+# approved a new IEC International Standard.  Instead of using the metric
+# prefixes for multiples in binary code, the new IEC standard invented specific
+# prefixes for binary multiples made up of only the first two letters of the
+# metric prefixes and adding the first two letters of the word "binary".  Thus,
+# for instance, instead of Kilobyte (KB) or Gigabyte (GB), the new terms would
+# be kibibyte (KiB) or gibibyte (GiB).
+#
+# If you prefer using the conventional (and more common) "KB", modify this
+# setting.
+#SHOW_KB_NAME:KiB
 
 .h1 Timeouts
 
 .h2 INFOSECS
 .h2 MESSAGESECS
 .h2 ALERTSECS
-# The following three definitions set the number of seconds for
+# The following definitions set the number of seconds for
 # pauses following statusline messages that would otherwise be
 # replaced immediately, and are more important than the unpaused
 # progress messages.  Those set by INFOSECS are also basically
@@ -669,6 +700,15 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 #MESSAGESECS:2
 #ALERTSECS:3
 
+.h2 DEBUGSECS
+# Set DEBUGSECS to a nonzero value to slow down progress messages
+# (see "-delay" option).
+#DEBUGSECS:0
+
+.h2 REPLAYSECS
+# Set REPLAYSECS to a nonzero value to allow for slow replaying of
+# command scripts (see "-cmd_script" option).
+#REPLAYSECS:0
 
 .h1 Appearance
 # These settings control the appearance of Lynx's screen and the way
@@ -701,6 +741,11 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 #
 #SHOW_CURSOR:FALSE
 
+.h2 UNDERLINE_LINKS
+# UNDERLINE_LINKS controls whether links are underlined by default, or shown
+# in bold.  Normally this default is set from the configure script.
+#
+#UNDERLINE_LINKS:FALSE
 
 .h2 BOLD_HEADERS
 # If BOLD_HEADERS is set to TRUE the HT_BOLD default style will be acted
@@ -1297,7 +1342,7 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 .h2 PERSISTENT_COOKIES
 # PERSISTENT_COOKIES indicates that cookies should be read at startup from
 # the COOKIE_FILE, and saved at exit for storage between Lynx sessions.
-# It is not used if Lynx was compiled without EXP_PERSISTENT_COOKIES.
+# It is not used if Lynx was compiled without USE_PERSISTENT_COOKIES.
 # The default is FALSE, so that the feature needs to be enabled here
 # explicitly if you want it.
 #
@@ -1307,7 +1352,7 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 .h2 COOKIE_FILE
 # COOKIE_FILE is the default file from which persistent cookies are read
 # at startup (if the file exists), if Lynx was compiled with
-# EXP_PERSISTENT_COOKIES and the PERSISTENT_COOKIES option is enabled.
+# USE_PERSISTENT_COOKIES and the PERSISTENT_COOKIES option is enabled.
 # The cookie file can also be specified in .lynxrc or on the command line.
 #
 #COOKIE_FILE:~/.lynx_cookies
@@ -1315,7 +1360,7 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 
 .h2 COOKIE_SAVE_FILE
 # COOKIE_SAVE_FILE is the default file in which persistent cookies are
-# stored at exit, if Lynx was compiled with EXP_PERSISTENT_COOKIES and the
+# stored at exit, if Lynx was compiled with USE_PERSISTENT_COOKIES and the
 # PERSISTENT_COOKIES option is enabled.  The cookie save file can also be
 # specified on the command line.
 #
@@ -1417,18 +1462,28 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
 
 .h2 DEFAULT_KEYPAD_MODE
 # DEFAULT_KEYPAD_MODE may be set to NUMBERS_AS_ARROWS
+#                                or LINKS_ARE_NOT_NUMBERED (the same)
 #                                or LINKS_ARE_NUMBERED
 #                                or LINKS_AND_FIELDS_ARE_NUMBERED
-# to specify whether numbers (e.g. [10]) appear before all links,
+#                                or FIELDS_ARE_NUMBERED
+# to specify whether numbers (e.g. [10]) appear next to all links,
 # allowing immediate access by entering the number on the keyboard,
 # or numbers on the numeric key-pad work like arrows;
-# the 3rd option causes form fields also to be preceded by numbers.
-# The first two options (but not the last) can be changed in lynx.cfg
-# and all three can be changed via the Options Menu.
+# the "FIELDS" options cause form fields also to be numbered.
+# This may be overridden by the keypad_mode setting in .lynxrc,
+# and can also be changed via the Options Menu.
 #
 #DEFAULT_KEYPAD_MODE:NUMBERS_AS_ARROWS
 
 
+.h2 NUMBER_LINKS_ON_LEFT
+.h2 NUMBER_FIELDS_ON_LEFT
+# Denotes the position for link- and field-numbers (whether it is on the left
+# or right of the anchor).  These are subject to DEFAULT_KEYPAD_MODE, which
+# determines whether numbers are shown.
+#NUMBER_LINKS_ON_LEFT:TRUE
+#NUMBER_FIELDS_ON_LEFT:TRUE
+
 .h2 DEFAULT_KEYPAD_MODE_IS_NUMBERS_AS_ARROWS
 # Obsolete form of DEFAULT_KEYPAD_MODE,
 # numbers work like arrows or numbered links.
@@ -2158,9 +2213,8 @@ MINIMAL_COMMENTS:TRUE
 # in userdefs.h and can be overridden here, or via the global or
 # personal mailcap files (see below).
 #
-# Make this empty (but no commented out) if you don't have such a
-# viewer or don't want to disable the built-in default viewer
-# mappings for image types.
+# Make this empty (but not commented out) if you don't have such a viewer or
+# want to disable the built-in default viewer mappings for image types.
 #
 #XLOADIMAGE_COMMAND:xv %s
 
@@ -2407,7 +2461,7 @@ MINIMAL_COMMENTS:TRUE
 #KEYMAP:{:SHIFT_LEFT		# shift the screen left
 #KEYMAP:}:SHIFT_RIGHT		# shift the screen right
 #KEYMAP:|:LINEWRAP_TOGGLE	# toggle linewrap on/off, for shift-commands
-#KEYMAP:~:NESTED_TABLES_TOGGLE	# toggle nested-tables parsing on/off
+#KEYMAP:~:NESTED_TABLES		# toggle nested-tables parsing on/off
 #
 .fi
 # In addition to the bindings available by default, the following functions
@@ -2825,11 +2879,13 @@ MINIMAL_COMMENTS:TRUE
 #   blue          magenta        cyan          lightgray
 #   gray          brightred      brightgreen   yellow
 #   brightblue    brightmagenta  brightcyan    white
-#
 .fi
 # or (if you have configured using --enable-default-colors with ncurses or
 # slang), "default" may be used for foreground and background.
 #
+# Note that in most cases a white background is really "lightgray", since
+# terminals generally do not implement bright backgrounds.
+#
 # Uncomment and change any of the compilation defaults.
 #
 #COLOR:0:black:white
@@ -2844,13 +2900,23 @@ COLOR:6:brightred:black
 
 
 .h2 ASSUMED_COLOR
-# If built with a library that recognizes default colors, initializes it
-# to assume the corresponding foreground and background colors.  Default
-# colors are those that the terminal (emulator) itself is initialized to.
-# For instance, you might have an xterm running with black text on a white
-# background, and want lynx to display colored text on the white background,
-# but leave the possibility of using the same configuration to draw colored
-# text on a different xterm, this time using its background set to black.
+# If built with a library that recognizes default colors (usually ncurses or
+# slang), lynx initializes it to assume the corresponding foreground and
+# background colors.  Default colors are those that the terminal (emulator)
+# itself is initialized to.  For instance, you might have an xterm running with
+# black text on a white background, and want lynx to display colored text on
+# the white background, but leave the possibility of using the same
+# configuration to draw colored text on a different xterm, this time using its
+# background set to black.
+#
+# If built with conventional SVr3/SVr4 curses, tells lynx to use color pair 0
+# when the given colors match this setting.  That gives a similar effect,
+# though not as flexible.  You will get the best results by setting the
+# terminal's default colors to match the prevailing text and background colors
+# that you have setup with lynx, and then alter the ASSUMED_COLOR setting to
+# match that.  If you do not alter the ASSUMED_COLOR setting, curses assumes
+# color pair 0's background is black, which implies that its foreground (text)
+# is white.
 #
 # The first value given is the foreground, the second is the background.
 #ASSUMED_COLOR:default:default
@@ -3138,8 +3204,7 @@ COLOR:6:brightred:black
 .h1 Timeouts
 
 .h2 CONNECT_TIMEOUT
-# Specifies (in seconds) connect timeout. Not available under DOS (use
-# sockdelay parameter of wattcp). Default value is rather huge.
+# Specifies (in seconds) connect timeout. Default value is rather huge.
 #CONNECT_TIMEOUT:18000
 
 
@@ -3169,9 +3234,8 @@ COLOR:6:brightred:black
 # Note that a few settings (Cookies and Show images) are comprised of more than
 # one lynx.cfg setting.
 .nf
-#ENABLE_LYNXRC:DTD_recovery:OFF
 #ENABLE_LYNXRC:accept_all_cookies:ON
-#ENABLE_LYNXRC:assume_char_set:OFF
+#ENABLE_LYNXRC:assume_charset:OFF
 #ENABLE_LYNXRC:bookmark_file:ON
 #ENABLE_LYNXRC:case_sensitive_searching:ON
 #ENABLE_LYNXRC:character_set:ON
@@ -3186,11 +3250,14 @@ COLOR:6:brightred:black
 #ENABLE_LYNXRC:emacs_keys:ON
 #ENABLE_LYNXRC:file_editor:ON
 #ENABLE_LYNXRC:file_sorting_method:ON
+#ENABLE_LYNXRC:force_cookie_prompt:OFF
+#ENABLE_LYNXRC:force_ssl_prompt:OFF
 #ENABLE_LYNXRC:kblayout:ON
 #ENABLE_LYNXRC:keypad_mode:ON
 #ENABLE_LYNXRC:lineedit_mode:ON
-#ENABLE_LYNXRC:make_pseudo_alts_for_inlines:OFF
+#ENABLE_LYNXRC:locale_charset:ON
 #ENABLE_LYNXRC:make_links_for_all_images:OFF
+#ENABLE_LYNXRC:make_pseudo_alts_for_inlines:OFF
 #ENABLE_LYNXRC:multi_bookmark:ON
 #ENABLE_LYNXRC:personal_mail_address:ON
 #ENABLE_LYNXRC:preferred_charset:ON
@@ -3198,16 +3265,68 @@ COLOR:6:brightred:black
 #ENABLE_LYNXRC:raw_mode:OFF
 #ENABLE_LYNXRC:run_all_execution_links:ON
 #ENABLE_LYNXRC:run_execution_links_on_local_files:ON
+#ENABLE_LYNXRC:scrollbar:OFF
 #ENABLE_LYNXRC:select_popups:ON
 #ENABLE_LYNXRC:set_cookies:OFF
 #ENABLE_LYNXRC:show_color:ON
 #ENABLE_LYNXRC:show_cursor:ON
 #ENABLE_LYNXRC:show_dotfiles:ON
-#ENABLE_LYNXRC:show_rate:OFF
+#ENABLE_LYNXRC:show_kb_rate:OFF
 #ENABLE_LYNXRC:sub_bookmarks:ON
-#ENABLE_LYNXRC:user_agent:OFF
+#ENABLE_LYNXRC:tagsoup:OFF
+#ENABLE_LYNXRC:underline_links:OFF
 #ENABLE_LYNXRC:user_mode:ON
+#ENABLE_LYNXRC:useragent:OFF
 #ENABLE_LYNXRC:verbose_images:ON
 #ENABLE_LYNXRC:vi_keys:ON
 #ENABLE_LYNXRC:visited_links:ON
 .fi
+
+.h1 External Programs
+# Any of the compiled-in pathnames of external programs can be overridden
+# by specifying the corresponding xxx_PATH variable.  If the variable is
+# given as an empty string, lynx will not use the program.  For a few cases,
+# there are internal functions (such as mkdir) which can be used instead.
+#BZIP2_PATH:
+#CHMOD_PATH:
+#COMPRESS_PATH:
+#COPY_PATH:
+#GZIP_PATH:
+#INSTALL_PATH:
+#MKDIR_PATH:
+#MV_PATH:
+#RLOGIN_PATH:
+#RMDIR_PATH:
+#RM_PATH:
+#TAR_PATH:
+#TELNET_PATH:
+#TN3270_PATH:
+#TOUCH_PATH:
+#UNCOMPRESS_PATH:
+#UNZIP_PATH:
+#UUDECODE_PATH:
+#ZCAT_PATH:
+#ZIP_PATH:
+
+.h1 Interaction
+
+.h2 FORCE_SSL_PROMPT
+# If FORCE_SSL_PROMPT is set to "yes", then questionable conditions, such as
+# self-signed certificates will be ignored.  If set to "no", these will be
+# reported, but not attempted.  The default "prompt" permits the user to make
+# this choice on a case-by-case basis.
+#
+#FORCE_SSL_PROMPT:PROMPT
+
+.h2 FORCE_COOKIE_PROMPT
+# If FORCE_COOKIE_PROMPT is set to "yes", then questionable conditions, such as
+# cookies with invalid syntax will be ignored.  If set to "no", these will be
+# reported, but not attempted.  The default "prompt" permits the user to make
+# this choice on a case-by-case basis.
+#
+#FORCE_COOKIE_PROMPT:PROMPT
+
+.h1 Appearance
+# For win32, allow the console window to be resized to the given values.  This
+# requires PDCurses 2.5.  The values given are width,height.
+#SCREEN_SIZE:80,24
diff --git a/gnu/usr.bin/lynx/lynx.hlp b/gnu/usr.bin/lynx/lynx.hlp
index 843cb202725..a4b260c1df8 100644
--- a/gnu/usr.bin/lynx/lynx.hlp
+++ b/gnu/usr.bin/lynx/lynx.hlp
@@ -39,7 +39,7 @@
        intermixed in option names (in the reference below options
        are with one dash before them and with underscores).
 
-       -      If  the  argument is only '-', then Lynx expects to
+       -      If  the  argument is only `-', then Lynx expects to
               receive the arguments from stdin.  This is to allow
               for the potentially very long command line that can
               be associated  with  the  -get_data  or  -post_data
@@ -119,28 +119,40 @@
               You  can  use  the  data written using the -cmd_log
               option.  Lynx will ignore other  information  which
               the   command-logging   may  have  written  to  the
-              logfile.
-
-       -color forces color mode on, if available.  Default  color
-              control  sequences  which  work  for  many terminal
-              types  are  assumed  if  the  terminal   capability
-              description  does  not specify how to handle color.
-              Lynx needs to be compiled with  the  slang  library
-              for  this  flag,  it  is  equivalent to setting the
-              COLORTERM environment variable.  (If color  support
+              logfile.  Each line of the command script  contains
+              either a comment beginning with "#", or a keyword:
+
+            exit causes  the  script  to stop, and forces lynx to
+                 exit immediately.
+
+            key  the character value, in printable form.   Cursor
+                 and other special keys are given as names, e.g.,
+                 "Down Arrow".  Printable 7-bit ASCII  codes  are
+                 given  as-is,  and  hexadecimal values represent
+                 other 8-bit codes.
+
+            set  followed  by  a  "name=value"  allows   one   to
+                 override values set in the lynx.cfg file.
+
+       -color forces  color mode on, if available.  Default color
+              control sequences  which  work  for  many  terminal
+              types   are  assumed  if  the  terminal  capability
+              description does not specify how to  handle  color.
+              Lynx  needs  to  be compiled with the slang library
+              for this flag, it  is  equivalent  to  setting  the
+              COLORTERM  environment variable.  (If color support
               is  instead  provided  by  a  color-capable  curses
               library like ncurses, Lynx relies completely on the
-              terminal  description  to  determine  whether color
-              mode is possible, and this flag is not  needed  and
-              thus   unavailable.)    A  saved  show_color=always
-              setting found in a .lynxrc file at startup has  the
-              same  effect.   A  saved  show_color=never found in
+              terminal description  to  determine  whether  color
+              mode  is  possible, and this flag is not needed and
+              thus  unavailable.)   A   saved   show_color=always
+              setting  found in a .lynxrc file at startup has the
+              same effect.  A  saved  show_color=never  found  in
               .lynxrc on startup is overridden by this flag.
 
        -connect_timeout=N
-              Sets the connection timeout, where N  is  given  in
-              seconds.   This is not available under DOS (use the
-              sockdelay parameter of WATTCP under DOS).
+              Sets  the  connection  timeout, where N is given in
+              seconds.
 
        -cookie_file=FILENAME
               specifies a file to use to read cookies.   If  none
@@ -155,7 +167,9 @@
        -cookies
               toggles handling of Set-Cookie headers.
 
-       -core  toggles forced core dumps on fatal errors.
+       -core  toggles forced core dumps on  fatal  errors.   Turn
+              this option off to ask lynx to force a core dump if
+              a fatal error occurs.
 
        -crawl with -traversal, output each page to a file.   with
               -dump,  format  output  as  with -traversal, but to
@@ -169,6 +183,8 @@
               separate    incremental    display    stages   with
               MessageSecs delay
 
+       -delay add DebugSecs delay after each progress-message
+
        -display=DISPLAY
               set the display variable for X rexec-ed programs.
 
@@ -184,7 +200,7 @@
               or  one  specified  on the command line to standard
               output.  This can be used in the following way:
 
-              lynx -dump http://www.trill-home.com/lynx.html
+              lynx -dump http://www.subir.com/lynx.html
 
        -editor=EDITOR
               enable  external  editing,  using   the   specified
@@ -209,13 +225,17 @@
               include   all   versions  of  files  in  local  VMS
               directory listings.
 
+       -find_leaks
+              toggle memory leak-checking.  Normally this is  not
+              compiled-into  your  executable, but when it is, it
+              can be disabled for a session.
+
        -force_empty_hrefless_a
-              force HREF-less 'A' elements  to  be  empty  (close
+              force HREF-less `A' elements  to  be  empty  (close
               them as soon as they are seen).
 
        -force_html
               forces  the  first  document  to  be interpreted as
-
               HTML.
 
        -force_secure
@@ -232,7 +252,7 @@
        -get_data
               properly formatted data for a get form are read  in
               from  stdin  and  passed  to  the  form.   Input is
-              terminated by a line that starts with '---'.
+              terminated by a line that starts with `---'.
 
        -head  send a HEAD request for the mime headers.
 
@@ -253,7 +273,7 @@
               ignore hidden links do not appear even in listings.
 
        -historical
-              toggles use of '>' or '-->'  as  a  terminator  for
+              toggles use of `>' or `-->'  as  a  terminator  for
               comments.
 
        -homepage=URL
@@ -294,6 +314,9 @@
        -minimal
               toggles minimal versus valid comment parsing.
 
+       -nested_tables
+              toggles nested-tables logic (for debugging).
+
        -newschunksize=NUMBER
               number of articles in chunked news listings.
 
@@ -385,7 +408,7 @@
        -post_data
               properly formatted data for a post form are read in
               from  stdin  and  passed  to  the  form.   Input is
-              terminated by a line that starts with '---'.
+              terminated by a line that starts with `---'.
 
        -preparsed
               show HTML source  preparsed  and  reformatted  when
@@ -433,7 +456,6 @@
               to  all  restricted,  except  for:   inside_telnet,
               outside_telnet,       inside_ftp,      outside_ftp,
               inside_rlogin,     outside_rlogin,     inside_news,
-
               outside_news, telnet_port, jump, mail, print, exec,
               and goto.  The  settings  for  these,  as  well  as
               additional   goto  restrictions  for  specific  URL
@@ -467,7 +489,7 @@
               file_url  -  disallow  using G)oto, served links or
               bookmarks for file: URLs.
 
-              goto - disable the 'g' (goto) command.
+              goto - disable the `g' (goto) command.
 
               inside_ftp - disallow ftps for people  coming  from
               inside your domain (utmp required for selectivity).
@@ -484,9 +506,10 @@
               from   inside   your   domain  (utmp  required  for
               selectivity).
 
-              jump - disable the 'j' (jump) command.
+              jump - disable the `j' (jump) command.
 
               multibook - disallow multiple bookmarks.
+
               mail - disallow mail.
 
               news_post - disallow USENET News posting.
@@ -568,7 +591,7 @@
 
        -soft_dquotes
               toggles  emulation  of  the old Netscape and Mosaic
-              bug  which  treated  '>'  as  a  co-terminator  for
+              bug  which  treated  `>'  as  a  co-terminator  for
               double-quotes and tags.
 
        -source
@@ -620,42 +643,48 @@
               1=SGML character parsing states
               2=color-style
               4=TRST (table layout)
+              8=config (lynx.cfg and .lynxrc contents)
+              16=binary string copy/append,  used  in  form  data
+              construction.
 
        -traversal
-              traverse all http  links  derived  from  startfile.
-              When  used  with -crawl, each link that begins with
-              the same string as startfile is output to  a  file,
+              traverse  all  http  links  derived from startfile.
+              When used with -crawl, each link that  begins  with
+              the  same  string as startfile is output to a file,
               intended for indexing.  See CRAWL.announce for more
               information.
 
        trim_input_fields
               trim input text/textarea fields in forms.
 
+       -underline_links
+              toggles use of underline/bold attribute for links.
+
        -underscore
               toggles use of _underline_ format in dumps.
 
        -use_mouse
-              turn on mouse support, if available.  Clicking  the
+              turn  on mouse support, if available.  Clicking the
               left mouse button on a link traverses it.  Clicking
               the right mouse button pops back.  Click on the top
-              line  to  scroll  up.   Click on the bottom line to
-              scroll down.  The first few positions  in  the  top
-              and  bottom  line  may invoke additional functions.
-              Lynx must be compiled  with  ncurses  or  slang  to
+              line to scroll up.  Click on  the  bottom  line  to
+              scroll  down.   The  first few positions in the top
+              and bottom line may  invoke  additional  functions.
+              Lynx  must  be  compiled  with  ncurses or slang to
               support this feature.  If ncurses is used, clicking
-              the middle mouse button  pops  up  a  simple  menu.
-              Mouse  clicks  may only work reliably while Lynx is
+              the  middle  mouse  button  pops  up a simple menu.
+              Mouse clicks may only work reliably while  Lynx  is
               idle waiting for input.
 
        -useragent=Name
               set alternate Lynx User-Agent header.
 
        -validate
-              accept only http URLs (for  validation).   Complete
+              accept  only  http URLs (for validation).  Complete
               security restrictions also are implemented.
 
        -verbose
-              toggle  [LINK],  [IMAGE] and [INLINE] comments with
+              toggle [LINK], [IMAGE] and [INLINE]  comments  with
               filenames of these images.
 
        -version
@@ -665,65 +694,70 @@
               enable vi-like key movement.
 
        -wdebug
-              enable Waterloo tcp/ip packet debug (print to  watt
-              debugfile).   This  applies  only  to  DOS versions
+              enable  Waterloo tcp/ip packet debug (print to watt
+              debugfile).  This  applies  only  to  DOS  versions
               compiled with WATTCP or WATT-32.
 
        -width=NUMBER
-              number of columns for formatting of dumps,  default
+              number  of columns for formatting of dumps, default
               is 80.
 
        -with_backspaces
-              emit  backspaces in output if -dumping or -crawling
-              (like 'man' does)
+              emit  backspaces  in   output   if   -dump'ing   or
+              -crawl'ing (like `man' does)
 
 2 Commands
-       o Use Up arrow and Down arrow to scroll through  hypertext
+       o  Use Up arrow and Down arrow to scroll through hypertext
        links.
-       o   Right  arrow  or  Return  will  follow  a  highlighted
+       o  Right  arrow  or  Return  will  follow  a   highlighted
        hypertext link.
        o Left Arrow will retreat from a link.
        o Type "H" or "?" for online help and descriptions of key-
        stroke commands.
-       o  Type  "K" for a complete list of the current key-stroke
+       o Type "K" for a complete list of the  current  key-stroke
        command mappings.
 
 2 Environment
-       In addition to various  "standard"  environment  variables
-       such  as  HOME,  PATH,  USER,  DISPLAY,  TMPDIR, etc, Lynx
-       utilizes several Lynx-specific environment  variables,  if
+       In  addition  to  various "standard" environment variables
+       such as HOME,  PATH,  USER,  DISPLAY,  TMPDIR,  etc,  Lynx
+       utilizes  several  Lynx-specific environment variables, if
        they exist.
 
-       Others  may be created or modified by Lynx to pass data to
-       an external program, or  for  other  reasons.   These  are
+       Others may be created or modified by Lynx to pass data  to
+       an  external  program,  or  for  other reasons.  These are
        listed separately below.
 
-       See  also the sections on SIMULATED CGI SUPPORT and NATIVE
+       See also the sections on SIMULATED CGI SUPPORT and  NATIVE
        LANGUAGE SUPPORT, below.
 
        Note:  Not all environment variables apply to all types of
-       platforms  supported by Lynx, though most do.  Feedback on
+       platforms supported by Lynx, though most do.  Feedback  on
        platform dependencies is solicited.
 
        Environment Variables Used By Lynx:
 
-       COLORTERM           If  set,  color  capability  for   the
+       COLORTERM           If   set,  color  capability  for  the
                            terminal is forced on at startup time.
-                           The  actual  value  assigned  to   the
+                           The   actual  value  assigned  to  the
                            variable is ignored.  This variable is
                            only  meaningful  if  Lynx  was  built
-                           using    the   slang   screen-handling
+                           using   the   slang    screen-handling
                            library.
 
-       LYNX_CFG            This variable, if set,  will  override
-                           the  default  location and name of the
-                           global configuration  file  (normally,
+       LYNX_CFG            This  variable,  if set, will override
+                           the default location and name  of  the
+                           global  configuration  file (normally,
                            lynx.cfg)  that  was  defined  by  the
                            LYNX_CFG_FILE    constant    in    the
-                           userdefs.h  file, during installation.
-                           See  the  userdefs.h  file  for   more
+                           userdefs.h file, during  installation.
+                           See   the  userdefs.h  file  for  more
                            information.
 
+       LYNX_LOCALEDIR      If set, this  variable  overrides  the
+                           compiled-in  location  of  the  locale
+                           directory   which   contains    native
+                           language (NLS) message text.
+
        LYNX_LSS            This  variable,  if set, specifies the
                            location of the default Lynx character
                            style  sheet  file.   [Currently  only
@@ -755,7 +789,6 @@
                            will   override  the  setting  of  the
                            ORGANIZATION environment variable,  if
                            it  is  also  set  (and,  on UNIX, the
-
                            contents of an /etc/organization file,
                            if present).
 
@@ -785,6 +818,12 @@
                            Lynx   Users   Guide   for  additional
                            details and examples.
 
+       SSL_CERT_DIR        Set  to   the   directory   containing
+                           trusted certificates.
+
+       SSL_CERT_FILE       Set  to the full path and filename for
+                           your file of trusted certificates.
+
        WWW_access_GATEWAY  Lynx still  supports  use  of  gateway
                            servers,  with  the  servers specified
                            via   "WWW_access_GATEWAY"   variables
@@ -792,7 +831,7 @@
                            be "http", "ftp", "gopher" or "wais"),
                            however most gateway servers have been
                            discontinued.  Note that  you  do  not
-                           include  a  terminal '/' for gateways,
+                           include  a  terminal `/' for gateways,
                            but  do  for  proxies   specified   by
                            PROTOCOL_proxy  environment variables.
                            See Lynx Users Guide for details.
@@ -853,35 +892,41 @@
                            file  as  if  the  -trace  option were
                            supplied.
 
-       LYNX_VERSION        This variable is always set  by  Lynx,
+       LYNX_TRACE_FILE     If set, overrides the compiled-in name
+                           of  the  trace  file,  which is either
+                           Lynx.trace or LY-TRACE.LOG (the latter
+                           on  the DOS platform).  The trace file
+                           is in either case relative to the home
+                           directory.
+
+       LYNX_VERSION        This  variable  is always set by Lynx,
                            and may be used by an external program
-                           to determine  if  it  was  invoked  by
-                           Lynx.   See  also  the comments in the
+                           to  determine  if  it  was  invoked by
+                           Lynx.  See also the  comments  in  the
                            distribution's  sample  mailcap  file,
                            for notes on usage in such a file.
 
-       TERM                Normally,  this  variable  is  used by
-                           Lynx to determine  the  terminal  type
-                           being   used   to  invoke  Lynx.   If,
-                           however, it is unset at  startup  time
-
-                           (or  has  the  value "unknown"), or if
-                           the -term command-line option is  used
+       TERM                Normally, this  variable  is  used  by
+                           Lynx  to  determine  the terminal type
+                           being  used  to  invoke   Lynx.    If,
+                           however,  it  is unset at startup time
+                           (or has the value  "unknown"),  or  if
+                           the  -term command-line option is used
                            (see OPTIONS section above), Lynx will
-                           set or modify its value  to  the  user
-                           specified  terminal type (for the Lynx
-                           execution  environment).    Note:   If
-                           set/modified  by  Lynx,  the values of
-                           the LINES and/or  COLUMNS  environment
+                           set  or  modify  its value to the user
+                           specified terminal type (for the  Lynx
+                           execution   environment).    Note:  If
+                           set/modified by Lynx,  the  values  of
+                           the  LINES  and/or COLUMNS environment
                            variables may also be changed.
 
 2 Simulated Cgi Support
-       If  built  with  the cgi-links option enabled, Lynx allows
-       access to a cgi script directly without the  need  for  an
+       If built with the cgi-links option  enabled,  Lynx  allows
+       access  to  a  cgi script directly without the need for an
        http daemon.
 
-       When  executing  such  "lynxcgi scripts" (if enabled), the
-       following variables  may  be  set  for  simulating  a  CGI
+       When executing such "lynxcgi scripts"  (if  enabled),  the
+       following  variables  may  be  set  for  simulating  a CGI
        environment:
 
        CONTENT_LENGTH
@@ -910,115 +955,114 @@
 
        SERVER_SOFTWARE
 
-       Other  environment  variables  are  not  inherited  by the
+       Other environment  variables  are  not  inherited  by  the
        script, unless they are provided via a LYNXCGI_ENVIRONMENT
-       statement  in  the  configuration  file.  See the lynx.cfg
-       file,   and   the   (draft)    CGI    1.1    Specification
+       statement in the configuration  file.   See  the  lynx.cfg
+       file,    and    the    (draft)   CGI   1.1   Specification
        <http://Web.Golux.Com/coar/cgi/draft-coar-cgi-v11-00.txt>
        for the definition and usage of these variables.
 
        The CGI Specification, and other associated documentation,
-       should  be consulted for general information on CGI script
+       should be consulted for general information on CGI  script
        programming.
 
 2 Native Language Support
-       If configured and installed with Native Language  Support,
-       Lynx  will display status and other messages in your local
-       language.   See  the  file   ABOUT_NLS   in   the   source
-       distribution,   or  at  your  local  GNU  site,  for  more
+       If  configured and installed with Native Language Support,
+       Lynx will display status and other messages in your  local
+       language.    See   the   file   ABOUT_NLS  in  the  source
+       distribution,  or  at  your  local  GNU  site,  for   more
        information about internationalization.
 
-       The following environment variables may be used  to  alter
+       The  following  environment variables may be used to alter
        default settings:
 
-       LANG                This  variable,  if set, will override
-                           the default message language.   It  is
+       LANG                This variable, if set,  will  override
+                           the  default  message language.  It is
                            an ISO 639 two-letter code identifying
-                           the language.  Language codes are  NOT
+                           the  language.  Language codes are NOT
                            the same as the country codes given in
                            ISO 3166.
 
-       LANGUAGE            This variable, if set,  will  override
+       LANGUAGE            This  variable,  if set, will override
                            the default message language.  This is
-                           a  GNU  extension  that   has   higher
-                           priority   for   setting  the  message
+                           a   GNU   extension  that  has  higher
+                           priority  for  setting   the   message
                            catalog than LANG or LC_ALL.
 
        LC_ALL              and
 
-       LC_MESSAGES         These variables, if set,  specify  the
-                           notion  of  native language formatting
+       LC_MESSAGES         These  variables,  if set, specify the
+                           notion of native  language  formatting
                            style.  They are POSIXly correct.
 
-       LINGUAS             This  variable,  if   set   prior   to
+       LINGUAS             This   variable,   if   set  prior  to
                            configuration,  limits  the  installed
                            languages to specific values.  It is a
-                           space-separated   list  of  two-letter
+                           space-separated  list  of   two-letter
                            codes.  Currently, it is hard-coded to
                            a wish list.
 
-       NLSPATH             This  variable, if set, is used as the
+       NLSPATH             This variable, if set, is used as  the
                            path prefix for message catalogs.
 
 2 Notes
        This is the Lynx v2.8.4 Release
 
-       If you wish to contribute to the  further  development  of
-       Lynx,  subscribe  to  our  mailing  list.   Send  email to
-       <majordomo@sig.net> with "subscribe lynx-dev" as the  only
+       If  you  wish  to contribute to the further development of
+       Lynx, subscribe  to  our  mailing  list.   Send  email  to
+       <majordomo@sig.net>  with "subscribe lynx-dev" as the only
        line in the body of your message.
 
-       Send   bug   reports,   comments,  suggestions  to  <lynx-
+       Send  bug  reports,  comments,   suggestions   to   <lynx-
        dev@sig.net> after subscribing.
 
-       Unsubscribe by sending email to  <majordomo@sig.net>  with
-       "unsubscribe  lynx-dev"  as  the  only line in the body of
-
-       your message.  Do not send the unsubscribe message to  the
+       Unsubscribe  by  sending email to <majordomo@sig.net> with
+       "unsubscribe lynx-dev" as the only line  in  the  body  of
+       your  message.  Do not send the unsubscribe message to the
        lynx-dev list, itself.
 
 2 See Also
-       catgets(3),   curses(3),  environ(7),  execve(2),  ftp(1),
-       gettext(GNU),  localeconv(3),  ncurses(3),   setlocale(3),
+       catgets(3),  curses(3),  environ(7),  execve(2),   ftp(1),
+       gettext(GNU),   localeconv(3),  ncurses(3),  setlocale(3),
        slang(?), termcap(5), terminfo(5), wget(GNU)
 
-       Note  that  man page availability and section numbering is
-       somewhat platform dependent, and may vary from  the  above
+       Note that man page availability and section  numbering  is
+       somewhat  platform  dependent, and may vary from the above
        references.
 
-       A  section  shown as (GNU), is intended to denote that the
-       topic may be available via an info page, instead of a  man
-       page  (i.e.,  try  "info  subject",  rather than "man subject").
+       A section shown as (GNU), is intended to denote  that  the
+       topic  may be available via an info page, instead of a man
+       page (i.e., try "info  subject",  rather  than  "man  subject").
 
-       A section shown as (?) denotes that documentation  on  the
+       A  section  shown as (?) denotes that documentation on the
        topic exists, but is not part of an established documentation
-       retrieval system (see the distribution files  associated
-       with the topic, or contact your System Administrator
+       retrieval system (see the distribution files associated
+       with the topic, or contact your System  Administrator
        for further information).
 
 2 Acknowledgments
        Lynx has incorporated code from a variety of sources along
        the way.  The earliest versions of Lynx included code from
-       Earl Fogel of Computing  Services  at  the  University  of
-       Saskatchewan,  who  implemented HYPERREZ in the Unix envi-
-       ronment.   HYPERREZ  was  developed  by  Niel  Larson   of
-       Think.com  and  served as the model for the early versions
-       of Lynx.  Those versions also incorporated libraries  from
-       the  Unix  Gopher  clients  developed at the University of
-       Minnesota, and the later versions of Lynx rely on the  WWW
-       client  library  code developed by Tim Berners-Lee and the
-       WWW community.  Also a special thanks to  Foteos  Macrides
-       who  ported  much of Lynx to VMS and did or organized most
-       of its development since the departures  of  Lou  Montulli
-       and  Garrett  Blythe  from the University of Kansas in the
-       summer of 1994 through the release of v2.7.2, and  to  ev-
-       eryone  on  the net who has contributed to Lynx's develop-
+       Earl  Fogel  of  Computing  Services  at the University of
+       Saskatchewan, who implemented HYPERREZ in the  Unix  envi-
+       ronment.    HYPERREZ  was  developed  by  Niel  Larson  of
+       Think.com and served as the model for the  early  versions
+       of  Lynx.  Those versions also incorporated libraries from
+       the Unix Gopher clients developed  at  the  University  of
+       Minnesota,  and the later versions of Lynx rely on the WWW
+       client library code developed by Tim Berners-Lee  and  the
+       WWW  community.   Also a special thanks to Foteos Macrides
+       who ported much of Lynx to VMS and did or  organized  most
+       of  its  development  since the departures of Lou Montulli
+       and Garrett Blythe from the University of  Kansas  in  the
+       summer  of  1994 through the release of v2.7.2, and to ev-
+       eryone on the net who has contributed to  Lynx's  develop-
        ment either directly (through patches, comments or bug re-
-       ports)  or indirectly (through inspiration and development
+       ports) or indirectly (through inspiration and  development
        of other systems).
 
 2 Authors
-       Lou Montulli,  Garrett  Blythe,  Craig  Lavender,  Michael
+       Lou  Montulli,  Garrett  Blythe,  Craig  Lavender, Michael
        Grobe, Charles Rezac
        Academic Computing Services
        University of Kansas
diff --git a/gnu/usr.bin/lynx/lynx.man b/gnu/usr.bin/lynx/lynx.man
index 04bfe6dc434..0c33404bc9f 100644
--- a/gnu/usr.bin/lynx/lynx.man
+++ b/gnu/usr.bin/lynx/lynx.man
@@ -1,7 +1,6 @@
 .nr N -1
 .nr D 5
 .TH LYNX 1 Local
-.UC 4
 .SH NAME
 lynx \- a general purpose distributed information browser for the World Wide Web
 .SH SYNOPSIS
@@ -18,6 +17,7 @@ use "lynx -help" to display a complete list of current options.
 .\" Just in case these number registers aren't set yet...
 .if \nN==0 .nr N 10
 .if \nD==0 .nr D 5
+.hy 0
 .I
 Lynx
 is a fully-featured World Wide Web (WWW) client for users
@@ -60,87 +60,104 @@ option names (in the reference below options
 are with one dash before them and with underscores).
 .PP
 .TP
-.B -
+.B \-
 If the argument is only '-', then Lynx expects to receive
 the arguments from stdin.  This is to allow for the
 potentially very long command line that can be associated
-with the -get_data or -post_data arguments (see below).
+with the \fB\-get_data\fR or \fB\-post_data\fR arguments (see below).
 It can also be used to avoid having sensitive information
 in the invoking command line (which would be visible to
 other processes on most systems), especially when
-the -auth or -pauth options are used.
+the \fB\-auth\fR or \fB\-pauth\fR options are used.
 .TP
-.B -accept_all_cookies
+.B \-accept_all_cookies
 accept all cookies.
 .TP
-.B -anonymous
-apply restrictions for anonymous account, see also -restrictions.
+.B \-anonymous
+apply restrictions for anonymous account, see also \fB\-restrictions\fR.
 .TP
-.B -assume_charset\fR=\fIMIMEname
+.B \-assume_charset\fR=\fIMIMEname
 charset for documents that don't specify it.
 .TP
-.B -assume_local_charset\fR=\fIMIMEname
+.B \-assume_local_charset\fR=\fIMIMEname
 charset assumed for local files.
 .TP
-.B -assume_unrec_charset\fR=\fIMIMEname
+.B \-assume_unrec_charset\fR=\fIMIMEname
 use this instead of unrecognized charsets.
 .TP
-.B -auth\fR=\fIID\fR:\fIPASSWD
+.B \-auth\fR=\fIID\fR:\fIPASSWD
 set authorization ID and password for protected documents
 at startup.  Be sure to protect any script files which use
 this switch.
 .TP
-.B -base
+.B \-base
 prepend a request URL comment and BASE tag to text/html
-outputs for -source dumps.
+outputs for \fB\-source\fR dumps.
 .TP
-.B -bibp\fR=\fIURL
+.B \-bibp\fR=\fIURL
 specify a local bibp server (default http://bibhost/).
 .TP
-.B -blink
+.B \-blink
 forces high intensity background colors for color mode, if available
 and supported by the terminal.
 This applies to the \fBslang\fR library (for a few terminal emulators),
 or to OS/2 EMX with \fBncurses\fR.
 .TP
-.B -book
+.B \-book
 use the bookmark page as the startfile.  The default or command
 line startfile is still set for the Main screen command, and will
 be used if the bookmark page is unavailable or blank.
 .TP
-.B -buried_news
+.B \-buried_news
 toggles scanning of news articles for buried references, and
 converts them to news links.  Not recommended because email
 addresses enclosed in angle brackets will be converted to
 false news links, and uuencoded messages can be trashed.
 .TP
-.B -cache\fR=\fINUMBER
+.B \-cache\fR=\fINUMBER
 set the NUMBER of documents cached in memory.
 The default is 10.
 .TP
-.B -case
+.B \-case
 enable case-sensitive string searching.
 .TP
-.B -center
+.B \-center
 Toggle center alignment in HTML TABLE.
 .TP
-.B -cfg\fR=\fIFILENAME
+.B \-cfg\fR=\fIFILENAME
 specifies a Lynx configuration file other than the default
 lynx.cfg.
 .TP
-.B -child
+.B \-child
 exit on left-arrow in startfile, and disable save to disk.
 .TP
-.B -cmd_log\fR=\fIFILENAME
+.B \-cmd_log\fR=\fIFILENAME
 write keystroke commands and related information to the specified file.
 .TP
-.B -cmd_script\fR=\fIFILENAME
+.B \-cmd_script\fR=\fIFILENAME
 read keystroke commands from the specified file.
 You can use the data written using the \fB\-cmd_log\fR option.
 Lynx will ignore other information which the command-logging may have
 written to the logfile.
-.TP
-.B -color
+Each line of the command script contains either a comment beginning with "#",
+or a keyword:
+.RS 5
+.TP 5
+exit
+causes the script to stop, and forces lynx to exit immediately.
+.TP 5
+key
+the character value, in printable form.
+Cursor and other special keys are given as names, e.g., "Down Arrow".
+Printable 7-bit ASCII codes are given as-is,
+and hexadecimal values represent other 8-bit codes.
+.TP 5
+set
+followed by a "name=value" allows one to override values set in the
+lynx.cfg file.
+.RE
+.TP
+.B \-color
 forces color mode on, if available.  Default color control sequences
 which work for many terminal types are assumed if the terminal
 capability description does not specify how to handle color.
@@ -154,105 +171,113 @@ A saved show_color=always setting found in a .lynxrc file at
 startup has the same effect.  A saved show_color=never found
 in .lynxrc on startup is overridden by this flag.
 .TP
-.B -connect_timeout\fR=\fIN
+.B \-connect_timeout\fR=\fIN
 Sets the connection timeout, where N is given in seconds.
-This is not available under DOS (use the sockdelay
-parameter of WATTCP under DOS).
 .TP
-.B -cookie_file\fR=\fIFILENAME
+.B \-cookie_file\fR=\fIFILENAME
 specifies a file to use to read cookies.
 If none is specified, the default value is ~/.lynx_cookies
 for most systems, but ~/cookies for MS-DOS.
 .TP
-.B -cookie_save_file\fR=\fIFILENAME
+.B \-cookie_save_file\fR=\fIFILENAME
 specifies a file to use to store cookies.
 If none is specified, the value given by
 \fB-cookie_file\fR is used.
 .TP
-.B -cookies
+.B \-cookies
 toggles handling of Set-Cookie headers.
 .TP
-.B -core
+.B \-core
 toggles forced core dumps on fatal errors.
+Turn this option off to ask lynx to force a core dump if a fatal error occurs.
 .TP
-.B -crawl
-with -traversal, output each page to a file.
-with -dump, format output as with -traversal, but to stdout.
+.B \-crawl
+with \fB\-traversal,\fR output each page to a file.
+with \fB\-dump\fR, format output as with \fB\-traversal\fR, but to stdout.
 .TP
-.B -curses_pads
+.B \-curses_pads
 toggles the use of curses "pad" feature which supports
 left/right scrolling of the display.
 .TP
-.B -debug_partial
+.B \-debug_partial
 separate incremental display stages with MessageSecs delay
 .TP
-.B -display\fR=\fIDISPLAY
+.B \-delay
+add DebugSecs delay after each progress-message
+.TP
+.B \-display\fR=\fIDISPLAY
 set the display variable for X rexec-ed programs.
 .TP
-.B -display_charset\fR=\fIMIMEname
+.B \-display_charset\fR=\fIMIMEname
 set the charset for the terminal output.
 .TP
-.B -dont_wrap_pre
-inhibit wrapping of text in <pre> when -dump'ing and -crawl'ing, mark
-wrapped lines in interactive session.
+.B \-dont_wrap_pre
+inhibit wrapping of text in <pre> when \fB\-dump\fR'ing and \fB\-crawl\fR'ing,
+mark wrapped lines in interactive session.
 .TP
-.B -dump
+.B \-dump
 dumps the formatted output of the default document or one
 specified on the command line to standard output.
 This can be used in the following way:
 .sp
-lynx -dump http://www.trill-home.com/lynx.html
+lynx \fB\-dump\fR http://www.subir.com/lynx.html
 .TP
-.B -editor\fR=\fIEDITOR
+.B \-editor\fR=\fIEDITOR
 enable external editing, using the specified
 EDITOR. (vi, ed, emacs, etc.)
 .TP
-.B -emacskeys
+.B \-emacskeys
 enable emacs-like key movement.
 .TP
-.B -enable_scrollback
+.B \-enable_scrollback
 toggles compatibility with communication programs' scrollback keys
 (may be incompatible with some curses packages).
 .TP
-.B -error_file\fR=\fIFILE
+.B \-error_file\fR=\fIFILE
 define a file where Lynx will report HTTP access codes.
 .TP
-.B -exec
+.B \-exec
 enable local program execution (normally not configured).
 .TP
-.B -fileversions
+.B \-fileversions
 include all versions of files in local VMS directory listings.
 .TP
-.B -force_empty_hrefless_a
+.B \-find_leaks
+toggle memory leak-checking.
+Normally this
+is not compiled-into your executable, but when it is,
+it can be disabled for a session.
+.TP
+.B \-force_empty_hrefless_a
 force HREF-less 'A' elements to be empty (close them as soon as they are seen).
 .TP
-.B -force_html
+.B \-force_html
 forces the first document to be interpreted as HTML.
 .TP
-.B -force_secure
+.B \-force_secure
 toggles forcing of the secure flag for SSL cookies.
 .TP
-.B -forms_options
+.B \-forms_options
 toggles whether the Options Menu is key-based or form-based.
 .TP
-.B -from
+.B \-from
 toggles transmissions of From headers.
 .TP
-.B -ftp
+.B \-ftp
 disable ftp access.
 .TP
-.B -get_data
+.B \-get_data
 properly formatted data for a get form are read in from
 stdin and passed to the form.
 Input is terminated by a line that starts with '---'.
 .TP
-.B -head
+.B \-head
 send a HEAD request for the mime headers.
 .TP
-.B -help
+.B \-help
 print the Lynx command syntax usage message.
 .TP
-.B -hiddenlinks=[option]
+.B \-hiddenlinks=[option]
 control the display of hidden links.
 
 .I merge
@@ -262,170 +287,173 @@ occurrence in the document.
 
 .I listonly
 hidden links are shown only on L)ist screens and listings generated by
-.I -dump
+.I \-dump
 or from the P)rint menu, but appear separately at the end of those lists.
 This is the default behavior.
 
 .I ignore
 hidden links do not appear even in listings.
 .TP
-.B -historical
+.B \-historical
 toggles use of '>' or '-->' as a terminator for comments.
 .TP
-.B -homepage\fR=\fIURL
+.B \-homepage\fR=\fIURL
 set homepage separate from start page.
 .TP
-.B -image_links
+.B \-image_links
 toggles inclusion of links for all images.
 .TP
-.B -index\fR=\fIURL
+.B \-index\fR=\fIURL
 set the default index file to the specified URL.
 .TP
-.B -ismap
+.B \-ismap
 toggles inclusion of ISMAP links when client-side
 MAPs are present.
 .TP
-.B -justify
+.B \-justify
 do justification of text.
 .TP
-.B -link\fR=\fINUMBER
-starting count for lnk#.dat files produced by -crawl.
+.B \-link\fR=\fINUMBER
+starting count for lnk#.dat files produced by \fB\-crawl\fR.
 .TP
-.B -localhost
+.B \-localhost
 disable URLs that point to remote hosts.
 .TP
-.B -locexec
+.B \-locexec
 enable local program execution from local files only (if
 Lynx was compiled with local execution enabled).
 .TP
-.B -lss\fR=\fIFILENAME
+.B \-lss\fR=\fIFILENAME
 specify filename containing color-style information.
 The default is lynx.lss.
 .TP
-.B -mime_header
+.B \-mime_header
 prints the MIME header of a fetched document along with its
 source.
 .TP
-.B -minimal
+.B \-minimal
 toggles minimal versus valid comment parsing.
 .TP
-.B -newschunksize\fR=\fINUMBER
+.B \-nested_tables
+toggles nested-tables logic (for debugging).
+.TP
+.B \-newschunksize\fR=\fINUMBER
 number of articles in chunked news listings.
 .TP
-.B -newsmaxchunk\fR=\fINUMBER
+.B \-newsmaxchunk\fR=\fINUMBER
 maximum news articles in listings before chunking.
 .TP
-.B -nobold
+.B \-nobold
 disable bold video-attribute.
 .TP
-.B -nobrowse
+.B \-nobrowse
 disable directory browsing.
 .TP
-.B -nocc
+.B \-nocc
 disable Cc: prompts for self copies of mailings.  Note
 that this does not disable any CCs which are incorporated
 within a mailto URL or form ACTION.
 .TP
-.B -nocolor
+.B \-nocolor
 force color mode off, overriding terminal capabilities and any
 -color flags, COLORTERM variable, and saved .lynxrc settings.
 .TP
-.B -noexec
+.B \-noexec
 disable local program execution. (DEFAULT)
 .TP
-.B -nofilereferer
+.B \-nofilereferer
 disable transmissions of Referer headers for file URLs.
 .TP
-.B -nolist
+.B \-nolist
 disable the link list feature in dumps.
 .TP
-.B -nolog
+.B \-nolog
 disable mailing of error messages to document owners.
 .TP
-.B -nonrestarting_sigwinch
+.B \-nonrestarting_sigwinch
 This flag is not available on all systems,
 Lynx needs to be compiled with HAVE_SIGACTION defined.
 If available, this flag \fImay\fR cause Lynx to react
 more immediately to window changes when run within
 an \fBxterm\fR.
 .TP
-.B -nopause
+.B \-nopause
 disable forced pauses for statusline messages.
 .TP
-.B -noprint
+.B \-noprint
 disable most print functions.
 .TP
-.B -noredir
+.B \-noredir
 prevents automatic redirection and prints a message with a
 link to the new URL.
 .TP
-.B -noreferer
+.B \-noreferer
 disable transmissions of Referer headers.
 .TP
-.B -noreverse
+.B \-noreverse
 disable reverse video-attribute.
 .TP
-.B -nosocks
+.B \-nosocks
 disable SOCKS proxy usage by a SOCKSified Lynx.
 .TP
-.B -nostatus
+.B \-nostatus
 disable the retrieval status messages.
 .TP
-.B -nounderline
+.B \-nounderline
 disable underline video-attribute.
 .TP
-.B -number_fields
+.B \-number_fields
 force numbering of links as well as form input fields
 .TP
-.B -number_links
+.B \-number_links
 force numbering of links.
 .TP
-.B -partial
+.B \-partial
 toggles display partial pages while loading.
 .TP
-.B -partial_thres\fR=\fINUMBER
+.B \-partial_thres\fR=\fINUMBER
 number of lines to render before repainting display
 with partial-display logic
 .TP
-.B -pauth\fR=\fIID\fR:\fIPASSWD
+.B \-pauth\fR=\fIID\fR:\fIPASSWD
 set authorization ID and password for a protected proxy
 server at startup.  Be sure to protect any script files
 which use this switch.
 .TP
-.B -popup
+.B \-popup
 toggles handling of single-choice SELECT options via
 popup windows or as lists of radio buttons.
 .TP
-.B -post_data
+.B \-post_data
 properly formatted data for a post form are read in from 
 stdin and passed to the form.
 Input is terminated by a line that starts with '---'. 
 .TP
-.B -preparsed
-show HTML source preparsed and reformatted when used with -source
+.B \-preparsed
+show HTML source preparsed and reformatted when used with \fB\-source\fR
 or in source view.
 .TP
-.B -prettysrc
+.B \-prettysrc
 show HTML source view with lexical elements and tags in color.
 .TP
-.B -print
+.B \-print
 enable print functions. (default)
 .TP
-.B -pseudo_inlines
+.B \-pseudo_inlines
 toggles pseudo-ALTs for inlines with no ALT string.
 .TP
-.B -raw
+.B \-raw
 toggles default setting of 8-bit character translations
 or CJK mode for the startup character set.
 .TP
-.B -realm
+.B \-realm
 restricts access to URLs in the starting realm.
 .TP
-.B -reload
+.B \-reload
 flushes the cache on a proxy server
 (only the first document affected).
 .TP
-.B -restrictions\fR=\fI[option][,option][,option]...
+.B \-restrictions\fR=\fI[option][,option][,option]...
 allows a list of services to be disabled
 selectively. Dashes and underscores in option names
 can be intermixed. The following list is printed
@@ -447,7 +475,7 @@ file.
 management is enabled.
 
 .I default
-- same as command line option -anonymous.
+- same as command line option \fB\-anonymous\fR.
 Disables default services for anonymous users.
 Set to all restricted, except for:
 inside_telnet, outside_telnet,
@@ -563,29 +591,29 @@ outside your domain (utmp required for selectivity).
 - disallow modifications of the User-Agent header.
 
 .TP
-.B -resubmit_posts
+.B \-resubmit_posts
 toggles forced resubmissions (no-cache) of forms with
 method POST when the documents they returned are sought
 with the PREV_DOC command or from the History List.
 .TP
-.B -rlogin
+.B \-rlogin
 disable recognition of rlogin commands.
 .TP
-.B -scrollbar
+.B \-scrollbar
 toggles showing scrollbar.
 .TP
-.B -scrollbar_arrow
+.B \-scrollbar_arrow
 toggles showing arrows at ends of the scrollbar.
 .TP
-.B -selective
+.B \-selective
 require .www_browsable files to browse directories.
 .TP
-.B -short_url
+.B \-short_url
 show very long URLs in the status line with "..." to represent the
 portion which cannot be displayed.
 The beginning and end of the URL are displayed, rather than suppressing the end.
 .TP
-.B -show_cursor
+.B \-show_cursor
 If enabled the cursor will not be hidden in the right hand
 corner but will instead be positioned at the start of the
 currently selected link.  Show cursor is the default for
@@ -593,59 +621,59 @@ systems without FANCY_CURSES capabilities.  The default
 configuration can be changed in userdefs.h or lynx.cfg.
 The command line switch toggles the default.
 .TP
-.B -show_rate
+.B \-show_rate
 If enabled the transfer rate is shown in bytes/second.
 If disabled, no transfer rate is shown.
 Use lynx.cfg or the options menu to select KB/second and/or ETA.
 .TP
-.B -soft_dquotes
+.B \-soft_dquotes
 toggles emulation of the old Netscape and Mosaic bug which
 treated '>' as a co-terminator for double-quotes and tags.
 .TP
-.B -source
+.B \-source
 works the same as dump but outputs HTML source instead of
 formatted text.
 .TP
-.B -stack_dump
+.B \-stack_dump
 disable SIGINT cleanup handler
 .TP
-.B -startfile_ok
-allow non-http startfile and homepage with -validate.
+.B \-startfile_ok
+allow non-http startfile and homepage with \fB\-validate\fR.
 .TP
-.B -stdin
+.B \-stdin
 read the startfile from standard input
 (UNIX only).
 .TP
-.B -syslog\fR=\fItext
+.B \-syslog\fR=\fItext
 information for syslog call.
 .TP
-.B -tagsoup
+.B \-tagsoup
 initialize parser, using Tag Soup DTD rather than SortaSGML.
 .TP
-.B -telnet
+.B \-telnet
 disable recognition of telnet commands.
 .TP
-.B -term\fR=\fITERM
+.B \-term\fR=\fITERM
 tell Lynx what terminal type to assume it is talking to.
 (This may be useful for remote execution, when, for example,
 Lynx connects to a remote TCP/IP port that starts a script that,
 in turn, starts another Lynx process.)
 .TP
-.B -timeout\fR=\fIN
+.B \-timeout\fR=\fIN
 For win32, sets the network read-timeout, where N is given in seconds.
 .TP
-.B -tlog
+.B \-tlog
 toggles between using a Lynx Trace Log and stderr for trace output
 from the session.
 .TP
-.B -tna
+.B \-tna
 turns on "Textfields Need Activation" mode.
 .TP
-.B -trace
+.B \-trace
 turns on Lynx trace mode.  Destination of trace output depends
-on -tlog.
+on \-tlog.
 .TP
-.B -trace_mask\fR=\fIvalue
+.B \-trace_mask\fR=\fIvalue
 turn on optional traces, which may result in very large trace files.
 Logically OR the values to combine options:
 .br
@@ -654,8 +682,12 @@ Logically OR the values to combine options:
 2=color-style
 .br
 4=TRST (table layout)
+.br
+8=config (lynx.cfg and .lynxrc contents)
+.br
+16=binary string copy/append, used in form data construction.
 .TP
-.B -traversal
+.B \-traversal
 traverse all http links derived from startfile.  When used with
 -crawl, each link that begins with the same string as startfile
 is output to a file, intended for indexing.  See CRAWL.announce
@@ -664,10 +696,13 @@ for more information.
 .B trim_input_fields
 trim input text/textarea fields in forms.
 .TP
-.B -underscore
+.B \-underline_links
+toggles use of underline/bold attribute for links.
+.TP
+.B \-underscore
 toggles use of _underline_ format in dumps.
 .TP
-.B -use_mouse
+.B \-use_mouse
 turn on mouse support, if available.
 Clicking the left mouse button on a link traverses it.
 Clicking the right mouse button pops back.
@@ -680,31 +715,31 @@ If \fBncurses\fR is used, clicking the middle mouse button pops up
 a simple menu.  Mouse clicks may only work reliably while Lynx is
 idle waiting for input.
 .TP
-.B -useragent=Name
+.B \-useragent=Name
 set alternate Lynx User-Agent header.
 .TP
-.B -validate
+.B \-validate
 accept only http URLs (for validation).  Complete security
 restrictions also are implemented.
 .TP
-.B -verbose
+.B \-verbose
 toggle [LINK], [IMAGE] and [INLINE] comments with filenames of these images.
 .TP
-.B -version
+.B \-version
 print version information.
 .TP
-.B -vikeys
+.B \-vikeys
 enable vi-like key movement.
 .TP
-.B -wdebug
+.B \-wdebug
 enable Waterloo tcp/ip packet debug (print to watt debugfile).
 This applies only to DOS versions compiled with WATTCP or WATT-32.
 .TP
-.B -width\fR=\fINUMBER
+.B \-width\fR=\fINUMBER
 number of columns for formatting of dumps, default is 80.
 .TP
-.B -with_backspaces
-emit backspaces in output if -dumping or -crawling (like 'man' does)
+.B \-with_backspaces
+emit backspaces in output if \fB\-dump\fR'ing or \fB\-crawl\fR'ing (like 'man' does)
 .SH COMMANDS
 o Use \fBUp arrow\fR and \fBDown arrow\fR to scroll through hypertext links.
 .br
@@ -747,6 +782,10 @@ the global configuration file (normally, \fBlynx.cfg\fR) that was defined
 by the LYNX_CFG_FILE constant in the userdefs.h file, during installation.
 See the userdefs.h file for more information.
 .TP 20
+.B LYNX_LOCALEDIR
+If set, this variable overrides the compiled-in location of the
+locale directory which contains native language (NLS) message text.
+.TP 20
 .B LYNX_LSS
 This variable, if set, specifies the location of the default \fILynx\fR
 character style sheet file.  [Currently only meaningful if \fILynx\fR was
@@ -790,6 +829,12 @@ variables of the form PROTOCOL_proxy (literally: http_proxy, ftp_proxy,
 gopher_proxy, etc), to "http://some.server.dom:port/".
 See \fBLynx Users Guide\fR for additional details and examples.
 .TP 20
+.B SSL_CERT_DIR
+Set to the directory containing trusted certificates.
+.TP 20
+.B SSL_CERT_FILE
+Set to the full path and filename for your file of trusted certificates.
+.TP 20
 .B WWW_access_GATEWAY
 \fILynx\fR still supports use of gateway servers, with the servers specified
 via "WWW_access_GATEWAY" variables (where "access" is lower case and can be
@@ -848,6 +893,11 @@ null string under \fBUNIX\fR, or "No URL" under \fBVMS\fR.
 If set, causes \fILynx\fR to write a trace file as if the \fB-trace\fR
 option were supplied. 
 .TP 20
+.B LYNX_TRACE_FILE
+If set, overrides the compiled-in name of the trace file,
+which is either Lynx.trace or LY-TRACE.LOG (the latter on the DOS platform).
+The trace file is in either case relative to the home directory.
+.TP 20
 .B LYNX_VERSION
 This variable is always set by \fILynx\fR, and may be used by an external
 program to determine if it was invoked by \fILynx\fR.  See also the comments
diff --git a/gnu/usr.bin/lynx/lynx_help/Lynx_users_guide.html b/gnu/usr.bin/lynx/lynx_help/Lynx_users_guide.html
index 64d84119a70..4f3fdd0de4e 100644
--- a/gnu/usr.bin/lynx/lynx_help/Lynx_users_guide.html
+++ b/gnu/usr.bin/lynx/lynx_help/Lynx_users_guide.html
@@ -1,12 +1,13 @@
 <!DOCTYPE html PUBLIC "-//IETF//DTD HTML 3.0//EN">
 <html>
 <head>
-<title>Lynx Users Guide v2.8.4</title>
+<title>Lynx Users Guide v2.8.5</title>
 <link rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body>
-<h1>Lynx Users Guide v2.8.4</h1>
+<h1>Lynx Users Guide v2.8.5</h1>
 
 Lynx is a fully-featured <em>World Wide Web</em> (<em>WWW</em>) client
 for users running cursor-addressable, character-cell display devices (e.g.,
@@ -47,7 +48,7 @@ within a single LAN.
 <li><A HREF="#Bookmarks" NAME="ToC-Bookmarks">Lynx bookmarks</A>
 <li><A HREF="#Jumps" NAME="ToC-Jumps">Jump command</A>
 <li><A HREF="#DirEd" NAME="ToC-DirEd">Directory Editing</A>
-<li><A HREF="#ColorMouse" NAME="ToC-ColorMouse">Using Color & the Mouse</A>
+<li><A HREF="#ColorMouse" NAME="ToC-ColorMouse">Using Color &amp; the Mouse</A>
 <li><A HREF="#MiscKeys" NAME="ToC-MiscKeys">Scrolling and Other useful commands</A>
 <li><a href="#Forms" NAME="ToC-Forms">Lynx and HTML Forms</a>
 | <a href="#Images" NAME="ToC-Images">Lynx and HTML Images</a>
@@ -203,7 +204,7 @@ Here are some sample URLs.
 
 <dl>
    <dt>HTTP  (HyperText Transfer Protocol)
-	<dd><code>http://www.trill-home.com/lynx.html</code>
+        <dd><code>http://www.subir.com/lynx.html</code>
 
    <dt>Gopher
         <dd><code>gopher://gopher.micro.umn.edu/11/</code>
@@ -490,7 +491,7 @@ The form-based menu shown below is an HTML file generated at runtime,
 in which the user fills in choices as in any ordinary HTML form.
 <pre>
 
-                    Options Menu (Lynx Version 2.8.4rel.1)
+                    Options Menu (Lynx Version 2.8.5dev.15)
 
       Accept Changes - Reset Changes Left Arrow cancels changes <A
 HREF="keystrokes/option_help.html">HELP!</A>
@@ -501,8 +502,12 @@ HREF="keystrokes/option_help.html">HELP!</A>
   General Preferences
   User mode                        : [Advanced....]
   Editor                           : __________________________________________
-  Searching type                   : [Case insensitive]
+  Type of Search                   : [Case insensitive]
+
+  Security and Privacy
   Cookies (!)                      : [ask user..]
+  Invalid-Cookie Prompting (!)     : [prompt normally___]
+  SSL Prompting (!)                : [prompt normally___]
 
   Keyboard Input
   Keypad mode                      : [Links are numbered................]
@@ -512,6 +517,7 @@ HREF="keystrokes/option_help.html">HELP!</A>
   Keyboard layout                  : [YAWERTY Cyrillic, for DEC LK201 kbd]
 
   Display and Character Sets
+  Use locale-based character set(!): [OFF]
   Display character set            : [Cyrillic (ISO-8859-5)..........]
   Assumed document character set(!): [iso-8859-1......]
   Raw 8-bit (!)                    : [OFF]
@@ -520,6 +526,8 @@ HREF="keystrokes/option_help.html">HELP!</A>
   Document Appearance
   Show color                       : [ON....]
   Show cursor                      : [OFF]
+  Underline links (!)              : [OFF]
+  Show scrollbar                   : [OFF]
   Popups for select fields         : [ON.]
   HTML error recovery (!)          : [strict (SortaSGML mode)]
   Show images (!)                  : [as labels]
@@ -534,6 +542,8 @@ HREF="keystrokes/option_help.html">HELP!</A>
   Listing and Accessing Files
   FTP sort criteria                : [By Name]
   Local directory sort criteria    : [Mixed style......]
+  Local directory sort order       : [By name..........]
+  Show transfer rate               : [Show KiB/sec, ETA]
   Show dot files                   : [ON.]
   Execution links                  : [FOR LOCAL FILES ONLY]
 
@@ -553,7 +563,7 @@ and is accessed by setting FORMS_OPTIONS to TRUE in
 <A HREF="#lynx.cfg">lynx.cfg</A>.
 <pre>
 
-             Options Menu (Lynx Version 2.8.4rel.1)
+             Options Menu (Lynx Version 2.8.5rel.1)
 
      (E)ditor                     : emacs
      (D)ISPLAY variable           : aixtest.cc.ukans.edu:0.0
@@ -605,31 +615,17 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
 <em>Options Menu</em>:
 
 <dl>
-   <dt>Editor
-        <dd>The editor to be invoked when editing browsable files, when
-            sending mail or comments, when preparing a news article for
-            posting, and for external TEXTAREA editing.  The full pathname
-            of the editor command should be specified when possible.
-
-   <dt>DISPLAY variable
-        <dd>This option is only relevant to X Window users.  The DISPLAY
-            (Unix) or DECW$DISPLAY (VMS) variable is picked up automatically
-            from the environment if it has been previously set.
-
-   <dt>Multi-bookmarks
-        <dd>Lynx supports a default bookmark file, and up to 26 total
-            bookmark files (see below).  When multi-bookmarks is OFF,
-            the default bookmark file is used for the '<em>v</em>'iew
-            bookmarks and '<em>a</em>'dd bookmark link commands.  If
-            multi-bookmark support is available in your account, the
-            setting can be changed to STANDARD or ADVANCED.  In STANDARD
-            mode, a menu of available bookmarks always is invoked when
-            you seek to view a bookmark file or add a link, and you select
-            the bookmark file by its letter token (see
-            <em>Bookmark file</em>, below) in that menu.  In ADVANCED mode,
-            you instead are prompted for the letter of the desired bookmark
-            file, but can enter '<em>=</em>' to invoke the STANDARD selection
-            menu, or <em>RETURN</em> for the default bookmark file.
+   <dt>Assumed document character set
+        <dd>This option changes the handling of documents which do not
+            explicitly specify a charset.  Normally Lynx assumes that 8-bit
+            characters in those documents are encoded according to iso-8859-1
+            (the official default for the HTTP protocol).  Unfortunately,
+            many non-English web pages "forget" to include proper charset info;
+            this option helps you to browse those broken pages if you know
+            by some means what the charset is.  When the value
+            given here or by an -assume_charset command line flag is in effect,
+            Lynx will treat documents as if they were encoded accordingly.
+            This option active when 'Raw 8-bit or CJK Mode' is OFF.
 
    <dt>Bookmark file
         <dd>When multi-bookmarks is OFF, this is the filename and location
@@ -656,12 +652,139 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
             [.BM]lynx_bookmarks.html).
             For Win32, see [???].
 
+   <dt>DISPLAY variable
+        <dd>This option is only relevant to X Window users.  The DISPLAY
+            (Unix) or DECW$DISPLAY (VMS) variable is picked up automatically
+            from the environment if it has been previously set.
+
+   <dt>Display Character set
+        <dd>This option allows you to set up the default character set for
+            your specific terminal.  The display character set provides a
+            mapping from the character encodings of viewed documents and
+            from HTML entities into viewable characters.  It should be set
+            according to your terminal's character set so that characters
+            other than 7-bit ASCII can be displayed correctly, using
+            approximations if necessary.  You must have the selected
+            character set installed on your terminal. (Since Lynx now
+            supports a wide range of platforms it may be useful to note
+            that cpXXX codepages used within IBM PC computers, and
+            windows-xxxx within native MS-Windows apps.)
+
+   <dt>Editor
+        <dd>The editor to be invoked when editing browsable files, when
+            sending mail or comments, when preparing a news article for
+            posting, and for external TEXTAREA editing.  The full pathname
+            of the editor command should be specified when possible.
+
+   <dt>Emacs keys
+        <dd>If set to ON then the CTRL-P, CTRL-N, CTRL-F, and CTRL-B keys
+            will be mapped to up-arrow, down-arrow, right-arrow, and
+            left-arrow, respectively.  Otherwise, they remain mapped to
+            their configured bindings (normally UP_TWO lines, DOWN_TWO
+            lines, NEXT_PAGE, and PREV_PAGE, respectively).
+
+         <p>Note: this has no direct effect on the line-editor's key bindings.
+
    <dt>FTP sort criteria
         <dd>This option allows you to specify how files will be sorted
             within FTP listings.  The current options include
         "<code>By Filename</code>", "<code>By Size</code>",
         "<code>By Type</code>", and "<code>By Date</code>".
 
+   <dt>Keypad as arrows, numbered links, numbered fields, or numbered links and form fields
+        <dd>This option gives the choice among navigating with the arrow
+            keys, or having every link numbered so that the links may be
+            selected or made current by numbers as well as using the arrow
+            keys, or having every link as well as every form field numbered
+            so that they can be selected or sought by numbers.  See the<br>
+            &nbsp;&nbsp;<a href="keystrokes/follow_help.html"
+            >Follow link (or page) number:</a> and<br>
+            &nbsp;&nbsp;<a
+            href="keystrokes/follow_help.html#select-option"
+            >Select option (or page) number:</a><br>
+            help for more information.
+
+   <dt>Line edit style
+        <dd>This option allows you to set alternative key bindings for the
+            built-in line editor, if alternative line-edit bindings have
+            been compiled in.  Otherwise, Lynx uses the <a
+            href="keystrokes/edit_help.html">Default Binding</a>.
+
+   <dt>List directory style
+        <dd>Applies to Directory Editing.  Files and directories can be
+            presented in the following ways:
+          <dl>
+             <dt>Mixed style
+                <dd>Files and directories are listed together in alphabetical
+                    order.
+             <dt>Directories first
+                <dd>Files and directories are separated into two alphabetical
+                    lists.  Directories are listed first.
+             <dt>Files first
+                <dd>Files and directories are separated into two alphabetical
+                    lists.  Files are listed first.
+          <p>
+          The Options Form also allows you to sort by the file attributes,
+          using the <em>Local directory sort order</em>:
+          <dl>
+             <dt>By name
+                <dd>by filename (the default)
+             <dt>By size
+                <dd>by file size, in descending order
+             <dt>By date
+                <dd>by file modification time, in descending order
+             <dt>By mode
+                <dd>by file protection
+             <dt>By type
+                <dd>by filename suffix, e.g., the text beginning with '.'
+             <dt>By user
+                <dd>by file owner's user-id
+             <dt>By group
+                <dd>by file owner's group-id
+          </dl>
+          </dl>
+
+   <dt>Local execution scripts or links
+        <dd>Local execution is activated when Lynx is first set up.
+            If it has not been activated you will not see this option
+            in the <em>Options Menu</em>.
+        <dd>When a local execution script is encountered Lynx  checks the
+            users options to see whether the script can be executed. Users
+            have the following options:
+          <dl>
+             <dt> Always off
+                 <dd>Local execution scripts will never be executed
+             <dt>For Local files only
+                 <dd>Local execution scripts will only be executed if the
+                     script to be executed resides on the local machine,
+                     and is referenced by a URL that begins with
+                     <em>file://localhost</em>
+             <dt>Always on
+                 <dd>All local execution scripts will be executed
+          </dl>
+
+        <dd>If the users options permit the script to be executed Lynx will
+            spawn a shell and run the script.  If the script cannot be
+            executed Lynx will show the script within the Lynx window and
+            inform the user that the script is not allowed to be executed
+            and will ask the user to check his/her options.
+            [<A HREF="#ToC-InteractiveOptions">ToC</A>]
+
+   <dt>Multi-bookmarks
+        <dd>Lynx supports a default bookmark file, and up to 26 total
+            bookmark files (see below).  When multi-bookmarks is OFF,
+            the default bookmark file is used for the '<em>v</em>'iew
+            bookmarks and '<em>a</em>'dd bookmark link commands.  If
+            multi-bookmark support is available in your account, the
+            setting can be changed to STANDARD or ADVANCED.  In STANDARD
+            mode, a menu of available bookmarks always is invoked when
+            you seek to view a bookmark file or add a link, and you select
+            the bookmark file by its letter token (see
+            <em>Bookmark file</em>, below) in that menu.  In ADVANCED mode,
+            you instead are prompted for the letter of the desired bookmark
+            file, but can enter '<em>=</em>' to invoke the STANDARD selection
+            menu, or <em>RETURN</em> for the default bookmark file.
+
    <dt>Personal mail address
         <dd>This mail address will be used to help you send files to
             yourself and will be included as the From: address in any mail
@@ -672,12 +795,15 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
             (the compilation default is not to send the header), or via the
             <em>-from</em> command line toggle.
 
-   <dt>Searching type
-        <dd>Searching type has two possible values: CASE INSENSITIVE
-            (default) and CASE SENSITIVE.  The searching type effects
-            inter-document searches only, and determines whether searches
-            for words within documents will be done in a case-sensitive or
-            case-insensitive manner.
+   <dt>Popups for select fields
+        <dd>Lynx normally uses a popup window for the OPTIONs in form
+            SELECT fields when the field does not have the MULTIPLE
+            attribute specified, and thus only one OPTION can be selected.
+            The use of popup windows can be disabled by changing this setting
+            to OFF, in which case the OPTIONs will be rendered as a list of
+            radio buttons.  Note that if the SELECT field does have the
+            MULTIPLE attribute specified, the OPTIONs always are rendered
+            as a list of checkboxes.
 
    <dt>Preferred Document Language
         <dd>The language you prefer if multi-language files are available
@@ -700,19 +826,6 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
             HTTP protocol, for servers which understand it, for example:
             iso-8859-5,&nbsp;utf-8;q=0.8
 
-   <dt>Display Character set
-        <dd>This option allows you to set up the default character set for
-            your specific terminal.  The display character set provides a
-            mapping from the character encodings of viewed documents and
-            from HTML entities into viewable characters.  It should be set
-            according to your terminal's character set so that characters
-            other than 7-bit ASCII can be displayed correctly, using
-            approximations if necessary.  You must have the selected
-            character set installed on your terminal. (Since Lynx now
-            supports a wide range of platforms it may be useful to note
-            that cpXXX codepages used within IBM PC computers, and
-            windows-xxxx within native MS-Windows apps.)
-
    <dt>Raw 8-bit or CJK Mode
         <dd>Whether 8-bit characters are assumed to correspond with the
             display character set and therefore are processed without
@@ -731,18 +844,6 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
             command, normally mapped to '<em>@</em>', and at startup via the
             <em>-raw</em> switch.
 
-   <dt>Assumed document character set
-        <dd>This option changes the handling of documents which do not
-            explicitly specify a charset.  Normally Lynx assumes that 8-bit
-            characters in those documents are encoded according to iso-8859-1
-            (the official default for the HTTP protocol).  Unfortunately,
-            many non-English web pages "forget" to include proper charset info;
-            this option helps you to browse those broken pages if you know
-            by some means what the charset is.  When the value
-            given here or by an -assume_charset command line flag is in effect,
-            Lynx will treat documents as if they were encoded accordingly.
-            This option active when 'Raw 8-bit or CJK Mode' is OFF.
-
    <dt>Show color.
         <dd>This option will be present if color support is available.
             If set to ON or ALWAYS, color mode will be forced on if possible.
@@ -778,46 +879,12 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
             for any reason the startup color mode is incorrect for your
             terminal, set it appropriately on or off via this option.
 
-   <dt>VI keys
-        <dd>If set to ON then the lowercase h, j, k, and l keys will be
-            mapped to left, down, up, and right arrow, respectively.  The
-            uppercase H, J, K, and L keys remain mapped to their configured
-            bindings (normally HELP, JUMP, KEYMAP, and LIST, respectively).
-
-         <p>Note: this has no effect on the line-editor's key bindings.
-
-   <dt>Emacs keys
-        <dd>If set to ON then the CTRL-P, CTRL-N, CTRL-F, and CTRL-B keys
-            will be mapped to up-arrow, down-arrow, right-arrow, and
-            left-arrow, respectively.  Otherwise, they remain mapped to
-            their configured bindings (normally UP_TWO lines, DOWN_TWO
-            lines, NEXT_PAGE, and PREV_PAGE, respectively).
-
-         <p>Note: this has no direct effect on the line-editor's key bindings.
-
-   <dt>Visited Pages
-        <dd>Enable several different views of the visited links:
-        <dl>
-          <dt>By First Visit
-          <dt>By First Visit Reversed
-          <dt>As Visit Tree
-          <dt>By Last Visit
-          <dt>By Last Visit Reversed
-        </dl>
-
-   <dt>Show dot files
-        <dd>If display/creation of hidden (dot) files/directories is
-            enabled, you can turn the feature on or off via this setting.
-
-   <dt>Popups for select fields
-        <dd>Lynx normally uses a popup window for the OPTIONs in form
-            SELECT fields when the field does not have the MULTIPLE
-            attribute specified, and thus only one OPTION can be selected.
-            The use of popup windows can be disabled by changing this setting
-            to OFF, in which case the OPTIONs will be rendered as a list of
-            radio buttons.  Note that if the SELECT field does have the
-            MULTIPLE attribute specified, the OPTIONs always are rendered
-            as a list of checkboxes.
+   <dt>Searching type
+        <dd>Searching type has two possible values: CASE INSENSITIVE
+            (default) and CASE SENSITIVE.  The searching type effects
+            inter-document searches only, and determines whether searches
+            for words within documents will be done in a case-sensitive or
+            case-insensitive manner.
 
    <dt>Show cursor for current link or option.
         <dd>Lynx normally hides the cursor by positioning it to the right
@@ -831,67 +898,24 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
             to distinguish the current link or OPTION from the others in
             the screen display.
 
-   <dt>Keypad as arrows, numbered links, or numbered links and form fields
-        <dd>This option gives the choice among navigating with the arrow
-            keys, or having every link numbered so that the links may be
-            selected or made current by numbers as well as using the arrow
-            keys, or having every link as well as every form field numbered
-            so that they can be selected or sought by numbers.  See the<br>
-            &nbsp;&nbsp;<a href="keystrokes/follow_help.html"
-            >Follow link (or page) number:</a> and<br>
-            &nbsp;&nbsp;<a
-            href="keystrokes/follow_help.html#select-option"
-            >Select option (or page) number:</a><br>
-            help for more information.
-
-   <dt>Line edit style
-        <dd>This option allows you to set alternative key bindings for the
-            built-in line editor, if alternative line-edit bindings have
-            been compiled in.  Otherwise, Lynx uses the <a
-            href="keystrokes/edit_help.html">Default Binding</a>.
-
-   <dt>List directory style
-        <dd>Applies to Directory Editing.  Files and directories can be
-            presented in the following ways:
-          <dl>
-             <dt>Mixed style
-                <dd>Files and directories are listed together in alphabetical
-                    order.
-             <dt>Directories first
-                <dd>Files and directories are separated into two alphabetical
-                    lists.  Directories are listed first.
-             <dt>Files first
-                <dd>Files and directories are separated into two alphabetical
-                    lists.  Files are listed first.
-          </dl>
+   <dt>Show dot files
+        <dd>If display/creation of hidden (dot) files/directories is
+            enabled, you can turn the feature on or off via this setting.
 
-   <dt>User Mode
-       <dd>There are three possible choices: Novice, Intermediate, and
-           Advanced.
-         <dl>
-            <dt>Novice
-                <dd>In Novice mode two lines of help are displayed at the
-                    bottom of the screen.
-            <dt>Intermediate
-                <dd>Intermediate mode turns off the help lines.
-            <dt>Advanced
-                <dd>Advanced mode displays the URL of the currently selected
-                    link at the bottom of the screen.
-         </dl>
+   <dt>Use locale-based character set
+        <dd>This option allows you to request lynx to obtain a MIME name
+            from the operating system which corresponds to your locale
+            setting.  If successful, it overrides the normal setting of
+            the display character set.
 
-   <dt>Verbose Images
-        <dd>Controls whether or not Lynx replaces the [LINK], [INLINE] and
-            [IMAGE] comments (for images without ALT) with filenames of these
-            images.  This is extremely useful because now we can determine
-            immediately what images are just decorations (button.gif, line.gif)
-            and what images are important.  This setting can also be toggled
-            on startup via the <em>-verbose</em> switch.
+   <dt>Underline links
+        <dd>Use underline-attribute rather than bold for links.
 
    <dt>User Agent
         <dd>The header string which Lynx sends to HTTP servers to indicate the
             User-Agent is displayed here.  Changes may be disallowed via
             the <em>-restrictions</em> switch.  Otherwise, the header can be
-            changed temporarily to a string such as <em>L_y_n_x/2.8.4</em>
+            changed temporarily to a string such as <em>L_y_n_x/2.8.5</em>
             for access to sites which discriminate against Lynx based on
             checks for the presence of &quot;Lynx&quot; in the header.  If
             the User-Agent header has been changed, it can
@@ -901,7 +925,7 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
             changed, the current document is reloaded, with the no-cache
             flags set, on exit from the Options Menu.   Changes of
             the header are not saved in the RC file.
-        <dd><em ID="note_ua">NOTE:</em> Some sites may regard misrepresenting
+        <dd><em ID="noteUA">NOTE:</em> Some sites may regard misrepresenting
             the browser
             as fraudulent deception, or as gaining unauthorized access, if
             it is used to circumvent blocking that was intentionally put in
@@ -912,31 +936,45 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
             header is changed to one which does not include &quot;Lynx&quot;
             or &quot;L_y_n_x&quot;.
 
-   <dt>Local execution scripts or links
-        <dd>Local execution is activated when Lynx is first set up.
-            If it has not been activated you will not see this option
-            in the <em>Options Menu</em>.
-        <dd>When a local execution script is encountered Lynx  checks the
-            users options to see whether the script can be executed. Users
-            have the following options:
-          <dl>
-             <dt> Always off
-                 <dd>Local execution scripts will never be executed
-             <dt>For Local files only
-                 <dd>Local execution scripts will only be executed if the
-                     script to be executed resides on the local machine,
-                     and is referenced by a URL that begins with
-                     <em>file://localhost</em>
-             <dt>Always on
-                 <dd>All local execution scripts will be executed
-          </dl>
+   <dt>User Mode
+       <dd>There are three possible choices: Novice, Intermediate, and
+           Advanced.
+         <dl>
+            <dt>Novice
+                <dd>In Novice mode two lines of help are displayed at the
+                    bottom of the screen.
+            <dt>Intermediate
+                <dd>Intermediate mode turns off the help lines.
+            <dt>Advanced
+                <dd>Advanced mode displays the URL of the currently selected
+                    link at the bottom of the screen.
+         </dl>
 
-        <dd>If the users options permit the script to be executed Lynx will
-            spawn a shell and run the script.  If the script cannot be
-            executed Lynx will show the script within the Lynx window and
-            inform the user that the script is not allowed to be executed
-            and will ask the user to check his/her options.
-            [<A HREF="#ToC-InteractiveOptions">ToC</A>]
+   <dt>Verbose Images
+        <dd>Controls whether or not Lynx replaces the [LINK], [INLINE] and
+            [IMAGE] comments (for images without ALT) with filenames of these
+            images.  This is extremely useful because now we can determine
+            immediately what images are just decorations (button.gif, line.gif)
+            and what images are important.  This setting can also be toggled
+            on startup via the <em>-verbose</em> switch.
+
+   <dt>VI keys
+        <dd>If set to ON then the lowercase h, j, k, and l keys will be
+            mapped to left, down, up, and right arrow, respectively.  The
+            uppercase H, J, K, and L keys remain mapped to their configured
+            bindings (normally HELP, JUMP, KEYMAP, and LIST, respectively).
+
+         <p>Note: this has no effect on the line-editor's key bindings.
+
+   <dt>Visited Pages
+        <dd>Enable several different views of the visited links:
+        <dl>
+          <dt>By First Visit
+          <dt>By First Visit Reversed
+          <dt>As Visit Tree
+          <dt>By Last Visit
+          <dt>By Last Visit Reversed
+        </dl>
 </dl>
 
 <h2 ID="Mail"><A NAME="Mail"><em>Comments and mailto: links</em></A></h2>
@@ -985,7 +1023,7 @@ also will cancel the mailing.[<A HREF="#ToC-Mail">ToC</A>]
 <h2 ID="News"><A NAME="News"><em>USENET News posting</em></A></h2>
 
 While reading <a
-href="http://www.w3.org/hypertext/DataSources/News/Groups/Overview.html"
+href="http://www.w3.org/LineMode/User/AboutNewsServers.html"
 >news</a> articles with Lynx you should see a link that says
 <em>Reply to: user@host</em> and, if the nntp server from which you
 received the article supports posting from your site, a link that says
@@ -1013,6 +1051,8 @@ received the article supports posting from your site, a link that says
             followups (replies) to nntp servers with Lynx.
             [<A HREF="#ToC-News">ToC</A>]
 </dl>
+See also <a
+href="http://www.w3.org/Protocols/rfc977/rfc977">RFC 977</a>.
 
 <h2 ID="Bookmarks"><A NAME="Bookmarks"><em>Lynx bookmarks</em></A></h2>
 
@@ -1147,9 +1187,9 @@ on your local system.  The commands available in DIRED mode are
 </dl>
 [<A HREF="#ToC-DirEd">ToC</A>]
 
-<h2 ID="ColorMouse"><A NAME="ColorMouse"><em>Using Color & the Mouse</em></A></h2>
+<h2 ID="ColorMouse"><A NAME="ColorMouse"><em>Using Color &amp; the Mouse</em></A></h2>
 
-A limited range of colors & mouse commands are available, if the user chooses:
+A limited range of colors &amp; mouse commands are available, if the user chooses:
 see <em>lynx.cfg</em> for details.
 
 [<A HREF="#ToC-ColorMouse">ToC</A>]
@@ -1402,8 +1442,7 @@ options from a list, and fields for entering text.
     Arrow</em>.  This mode can be used to avoid "getting stuck" in input
     fields, especially by users who rarely fill out forms.
 
-    <DIV ID="CtrlVNote">
-    <p><em>NOTE:</em> If you have a text input field selected you will not
+    <p><a name="CtrlVNote">NOTE:</a> If you have a text input field selected you will not
     have access to most of the Lynx keystroke commands, because they are
     interpreted by the <a href="keystrokes/edit_help.html"
     >Line Editor</a> as either text entries or editing commands.  Select a
@@ -1447,7 +1486,6 @@ options from a list, and fields for entering text.
     <em>^_</em> for the first Line Edit style, letting <em>^V</em> still
     act as SWITCH_DTD
     outside of text input fields.
-    </DIV>
 
 <dt>TEXTAREA Fields
 <dd>TEXTAREA fields are for most purposes handled as if they were a series of
@@ -1720,8 +1758,7 @@ HTML includes markup for creating <em>tables</em> structured as arrays of
 cells aligned by columns and rows on the displayed page.
 
 <p>Lynx recognizes the TABLE element and all of its associated elements
-as described in <a href="http://www.faqs.org/rfcs/rfc1942.html"
->http://www.faqs.org/rfcs/rfc1942.html</a>
+as described in <a href="http://www.faqs.org/rfcs/rfc1942.html">RFC 1942</a>
 and will process any ID attributes in the start tags for handling as NAME-ed
 anchors, but does not create actual <em>tables</em>.  Instead, it treats
 the TR start tag as a collapsible BR (line break), and inserts a collapsible
@@ -2123,7 +2160,7 @@ same URL or a new URL, at a specified number of seconds following receipt
 of the current document.  This procedure has been termed
 <em>client-side-pull</em>.  An example of such an element is:
 <pre>
-      <em>&lt;META HTTP-EQUIV="Refresh" CONTENT="3; URL="http://host/path"&gt;</em>
+      <em>&lt;META HTTP-EQUIV="Refresh" CONTENT="3; URL=http://host/path"&gt;</em>
 </pre>
 which instructs a client to fetch the indicated URL in 3 seconds after
 receiving the current document.  If the <em>URL=</em> field is omitted,
@@ -2329,10 +2366,30 @@ where
                 <dd>write keystroke commands and related information to the
                     specified file.
              <dt><code>-cmd_script=FILENAME</code>
-                <dd>read keystroke commands from the specified file.  You can
-                    use the data written using the <em>-cmd_log</em> option.
-                    Lynx will ignore other information which the
-                    command-logging may have written to the log-file.
+                <dd>read keystroke commands from  the  specified  file.
+                    You  can  use  the  data written using the <em>-cmd_log</em>
+                    option.  Lynx will ignore other  information  which
+                    the  command-logging  may  have written to the log-
+                    file.  Each line of  the  command  script  contains
+                    either a comment beginning with "#", or a keyword:
+
+                  <dl>
+                  <dt><code>exit</code>
+                   <dd>causes  the  script  to stop, and forces lynx to
+                       exit immediately.
+
+                  <dt><code>key</code>
+                   <dd>the character value, in printable form.   Cursor
+                       and other special keys are given as names, e.g.,
+                       <code>Down Arrow</code>.  Printable 7-bit ASCII  codes  are
+                       given  as-is,  and  hexadecimal values represent
+                       other 8-bit codes.
+
+                  <dt><code>set</code>
+                   <dd>followed by a "name=value" allows one  to  override
+                       values set in the lynx.cfg file.
+                  </dl>
+
              <dt><code>-color</code>
                 <dd>forces color mode on, if available.  Default color control sequences
                        which work for many terminal types are assumed if the terminal
@@ -2348,8 +2405,6 @@ where
                        in .lynxrc on startup is overridden by this flag.
              <dt><code>-connect_timeout=N</code>
                 <dd>Sets the connection timeout, where N is given in seconds.
-                    This is not available under DOS (use the sockdelay
-                    parameter of WATTCP under DOS).
              <dt><code>-cookie_file=FILENAME</code>
                 <dd>specifies a file to use to read cookies.
                     If none is specified, the default value is ~/.lynx_cookies
@@ -2376,8 +2431,8 @@ where
              <dt><code>-display_charset=MIMEname</code>
                 <dd>set the charset for the terminal output.
              <dt><code>-dont_wrap_pre</code>
-		<dd>inhibit wrapping of text in &lt;pre&gt; when -dump'ing and
-		    -crawl'ing, mark wrapped lines in interactive session.
+                <dd>inhibit wrapping of text in &lt;pre&gt; when -dump'ing and
+                    -crawl'ing, mark wrapped lines in interactive session.
              <dt><code>-dump</code>
                 <dd>dumps the formatted output of the default document
                     or one specified on the command line to standard out.
@@ -2400,6 +2455,11 @@ where
              <dt><code>-fileversions</code>
                 <dd>include all versions of files in local VMS directory
                     listings.
+             <dt><code>-find_leaks</code>
+                <dd>toggles the memory leak checking off.
+                    Normally this
+                    is not compiled-into your executable, but when it is,
+                    it can be disabled for a session.
              <dt><code>-force_empty_hrefless_a</code>
                 <dd>force HREF-less 'A' elements to be empty (close them as soon as they are seen).
              <dt><code>-force_html</code>
@@ -2473,6 +2533,8 @@ where
                     treated as delimiters for series of comments within
                     the overall comment element.  If historical is set,
                     that overrides minimal or valid comment parsing.
+             <dt><code>-nested_tables</code>
+                <dd>toggles nested-tables logic (for debugging).
              <dt><code>-newschunksize=NUMBER</code>
                 <dd>number of articles in chunked news listings.
              <dt><code>-newsmaxchunk=NUMBER</code>
@@ -2551,8 +2613,8 @@ where
                    <A HREF="keystrokes/option_help.html#tagsoup">recovery modes</A>,
                     switched by '<em>^V</em>'.
              <dt><code>-prettysrc</code>
-		<dd>do syntax highlighting and hyperlink handling in source
-		    view.
+                <dd>do syntax highlighting and hyperlink handling in source
+                    view.
              <dt><code>-print</code>
                 <dd>enable print functions. (default)
              <dt><code>-pseudo_inlines</code>
@@ -2644,8 +2706,8 @@ where
                 <dt>externals
                         <dd>disallow some "EXTERNAL" configuration lines,
                             if support for passing URLs to external
-			    applications (with the EXTERN_LINK or EXTERN_PAGE
-			    command) is compiled in.
+                            applications (with the EXTERN_LINK or EXTERN_PAGE
+                            command) is compiled in.
                 <dt>file_url
                         <dd>disallow using G)oto, served links or bookmarks
                             for file: URLs.
@@ -2721,10 +2783,10 @@ where
              <dt><code>-selective</code>
                 <dd>require .www_browsable files to browse directories.
              <dt><code>-short_url</code>
-		<dd>show very long URLs in the status line with "..." to
-		    represent the portion which cannot be displayed.  The
-		    beginning and end of the URL are displayed, rather than
-		    suppressing the end.
+                <dd>show very long URLs in the status line with "..." to
+                    represent the portion which cannot be displayed.  The
+                    beginning and end of the URL are displayed, rather than
+                    suppressing the end.
              <dt><code>-show_cursor </code>
                 <dd>If enabled the cursor will not be hidden in the right hand
                     corner but will instead be positioned at the start of the
@@ -2735,9 +2797,9 @@ where
                     It also can be set and saved via the 'o'ptions menu.
                     The command line switch toggles the default.
              <dt><code>-show_rate</code>
-		<dd>If enabled the transfer rate is shown in bytes/second.  If
-		    disabled, no transfer rate is shown.  Use lynx.cfg or the
-		    options menu to select KB/second and/or ETA.
+                <dd>If enabled the transfer rate is shown in bytes/second.  If
+                    disabled, no transfer rate is shown.  Use lynx.cfg or the
+                    options menu to select KiB/second and/or ETA.
              <dt><code>-soft_dquotes</code>
                 <dd>toggles emulation of the old Netscape and Mosaic bug which
                     treated '<em>&gt;</em>' as a co-terminator for
@@ -2753,7 +2815,7 @@ where
              <dt><code>-stdin</code>
                 <dd>read the startfile from standard input
                     (UNIX only).
-             <dt><code>-syslog=<em>text</em>
+             <dt><code>-syslog=<em>text</em></code>
                 <dd>information for syslog call.
              <dt><code>-tagsoup</code>
                 <dd>initialize DTD with "TagSoup" tables,
@@ -2801,7 +2863,11 @@ where
                        <dd>color-style
                     <dt>4
                        <dd>TRST (table layout)
-                    <dl>
+                    <dt>8
+                       <dd>config (lynx.cfg and .lynxrc contents)
+                    <dt>16
+                       <dd>binary string copy/append, used in form data construction.
+                    </dl>
              <dt><code>-traversal</code>
                 <dd>traverse all http links derived from startfile.  When
                     used with <em>-crawl</em>, each link that begins with the
@@ -2816,7 +2882,7 @@ where
              <dt><code>-useragent=STRING</code>
                 <dd>set different Lynx User-Agent header.  Lynx produces a
                     warning on startup if the STRING does not contain "Lynx"
-                    or "L_y_n_x", see the <A HREF="#note_ua">note</A> in the
+                    or "L_y_n_x", see the <A HREF="#noteUA">note</A> in the
                     Options Menu section for rationale.
              <dt><code>-validate</code>
                 <dd>accept only http URLs (meant for validation).
@@ -2843,14 +2909,14 @@ where
              <dt><code>-vikeys</code>
                 <dd>enable vi-like key movement.
              <dt><code>-wdebug</code>
-		<dd>enable Waterloo tcp/ip packet debug (print to watt
-		    debugfile).  This applies only to DOS versions compiled
-		    with WATTCP or WATT-32.
+                <dd>enable Waterloo tcp/ip packet debug (print to watt
+                    debugfile).  This applies only to DOS versions compiled
+                    with WATTCP or WATT-32.
              <dt><code>-width=NUMBER</code>
                 <dd>number of columns for formatting of dumps, default is 80.
              <dt><code>-with_backspaces</code>
-		<dd>emit backspaces in output if -dumping or -crawling (like
-		<code>man</code> does).
+                <dd>emit backspaces in output if -dumping or -crawling (like
+                <code>man</code> does).
          </dl>
 </dl>
 
@@ -2963,6 +3029,7 @@ The 2.8 development set was released as v2.8.1 in October 1998.<br>
 The 2.8.1 development set was released as v2.8.2 in June 1999.<br>
 The 2.8.2 development set was released as v2.8.3 in April 2000.<br>
 The 2.8.3 development set was released as v2.8.4 in July 2001.<br>
+The 2.8.4 development set was released as v2.8.5 in February 2004.<br>
 
 <p>Since early 1997, the Lynx code has expanded into autoconfigure and
 PC versions.  The branching of the Lynx source base from a single
diff --git a/gnu/usr.bin/lynx/lynx_help/about_lynx.html b/gnu/usr.bin/lynx/lynx_help/about_lynx.html
index 4c158dd004b..a00f6750c60 100644
--- a/gnu/usr.bin/lynx/lynx_help/about_lynx.html
+++ b/gnu/usr.bin/lynx/lynx_help/about_lynx.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>About Lynx</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 
 <BODY>
@@ -20,8 +21,8 @@ other character-cell displays, and vt100 emulators such as Kermit or
 Procomm running on PCs or Macs.
 
 <P>For information on how to use Lynx see the
-<A HREF="../lynx_help/Lynx_users_guide.html">Lynx User's Guide</A>, or the
-<A HREF="../lynx_help/lynx_help_main.html">Lynx help files</A>.
+<A HREF="Lynx_users_guide.html">Lynx User's Guide</A>, or the
+<A HREF="lynx_help_main.html">Lynx help files</A>.
 
 <H2><EM>Credits and Copyright</EM></H2>
 
@@ -31,11 +32,11 @@ HREF="http://www.cc.ukans.edu/">The University of Kansas</A>.
 
 <P>Lynx was originally developed by
 <A HREF="http://www.cc.ukans.edu/cwis/people/Lou.Montulli.html"
->Lou Montulli,</A>
-<A HREF="http://www.cc.ukans.edu/cwis/people/Michael.Grobe/Michael.Grobe.html"
->Michael Grobe,</A>
+>Lou Montulli</A>,
+<A HREF="http://www.cc.ku.edu/~grobe/"
+>Michael Grobe</A>,
 and <A HREF="http://www.cc.ukans.edu/cwis/people/Charles.Rezac.html"
->Charles Rezac.</A>
+>Charles Rezac</A>.
 <A HREF="http://www.cc.ukans.edu/cwis/people/Garrett/Garrett_Arch_Blythe.html"
 >Garrett Blythe</A> created
 <A HREF="http://www.cc.ukans.edu/about_doslynx/doslynx.html">DosLynx</A>
@@ -62,10 +63,10 @@ The Lynx copyright does not override or invalidate those copyrights.
 
 <P>Thanks to <A NAME="13" HREF="http://www.w3.org/People/Berners-Lee/"
 >Tim Berners-Lee</A> and the other <A NAME="14"
-HREF="http://www.w3.org/hypertext/WWW/People.html">CERN World Wide
+HREF="http://www.w3.org/People.html">CERN World Wide
 Web wizards</A> for the WWW client library code and all of their other
 work on the WWW project, NCSA and the
-<A HREF="http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/NCSAMosaicHome.html"
+<A HREF="http://archive.ncsa.uiuc.edu/SDG/Software/Mosaic/NCSAMosaicHome.html"
 >Mosaic</A> developers, and to everyone out in netland who has
 contributed to Lynx's development either directly (through comments
 or bug reports) or indirectly (through inspiration and development of
@@ -83,7 +84,7 @@ had their own hypertext format.
 <H2><A NAME="availability"><EM>Availability</EM></A></H2>
 
 <p>Information on obtaining the most current version of Lynx is
-available via <a href="http://www.trill-home.com/lynx.html"
+available via <a href="http://www.subir.com/lynx.html"
 >Lynx links</a>.
 
 <H2><A NAME="lynx-dev_list"><EM>Mailing List</EM></A></H2>
diff --git a/gnu/usr.bin/lynx/lynx_help/help_files.txt b/gnu/usr.bin/lynx/lynx_help/help_files.txt
index 1b8f236bb27..4f6375ca1e8 100644
--- a/gnu/usr.bin/lynx/lynx_help/help_files.txt
+++ b/gnu/usr.bin/lynx/lynx_help/help_files.txt
@@ -42,10 +42,10 @@ LYNX_DEV_ARCHIVE=http://www.flora.org/lynx-dev/html/
 LYNX_DIST=http://lynx.isc.org/current/index.html
 LYNX_FAQ=http://lynx.isc.org/cgi-bin/fom
 LYNX_FAQ_O_MATIC=http://lynx.isc.org/cgi-bin/fom
-LYNX_HOME=http://lynx.browser.org/
+LYNX_HOME=http://lynx.isc.org/
 LYNX_SPEECH=http://leb.net/blinux/blynx/
-LYNX_SUBIR=http://www.trill-home.com/lynx.html
-WWW_NEWS=http://www.w3.org/hypertext/DataSources/News/Groups/Overview.html
+LYNX_SUBIR=http://www.subir.com/lynx.html
+WWW_NEWS=http://www.w3.org/History/
 WWW_HTML2=http://www.w3.org/MarkUp/html-spec/html-spec_toc.html
 WWW_HTML3=http://www.w3.org/MarkUp/html3/Contents.html
 #
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/alt_edit_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/alt_edit_help.html
index 3c779c1c06b..f8ed7b6d91e 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/alt_edit_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/alt_edit_help.html
@@ -5,6 +5,7 @@
 <link rev="made" href="mailto:lynx-dev@sig.net">
 <link rel="Sibling" title="Default Binding" href="edit_help.html">
 <link rel="Sibling" title="Bash-Like Binding" href="bashlike_edit_help.html">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 <body>
 <h1>+++ALTERNATIVE BINDING+++</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/bashlike_edit_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/bashlike_edit_help.html
index 6c066468113..a9d3491cb40 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/bashlike_edit_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/bashlike_edit_help.html
@@ -5,6 +5,7 @@
 <link rev="made" href="mailto:lynx-dev@sig.net">
 <link rel="Sibling" title="Default Binding" href="edit_help.html">
 <link rel="Sibling" title="Alternative Binding" href="alt_edit_help.html">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 <body>
 <h1>+++BASH-LIKE BINDING+++</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/bookmark_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/bookmark_help.html
index 6a9e5e5e410..6a6ea707f48 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/bookmark_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/bookmark_help.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>Lynx Bookmark Help</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <h1>+++ Bookmark Help +++</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/cookie_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/cookie_help.html
index 6959c9f4d46..125e76ab11f 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/cookie_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/cookie_help.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>Help on the Cookie Jar Page</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <h1>+++ Cookie Jar Page Help +++</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/dired_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/dired_help.html
index b881ad6145f..5fc37a25d86 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/dired_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/dired_help.html
@@ -3,6 +3,7 @@
 <head>
 <title>Lynx Dired Help</title>
 <link rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 <body>
 <h1>+++DIRED HELP+++</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/edit_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/edit_help.html
index c5eae4b172c..186915f0e13 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/edit_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/edit_help.html
@@ -3,6 +3,7 @@
 <head>
 <title>Lynx Line Editor Default Key Binding</title>
 <link rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 <body>
 <h1>+++DEFAULT BINDING+++</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/environments.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/environments.html
index 290ffcb0417..b9d25448ea8 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/environments.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/environments.html
@@ -3,6 +3,7 @@
 <head>
 <title>Help on Environment variables</title>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 <body>
 <pre>
@@ -45,6 +46,12 @@ Environment Variables Used By Lynx:
                            See  the  userdefs.h  file  for   more
                            information.
 
+       LYNX_LOCALEDIR
+                           If  set,  this  variable overrides the
+                           compiled-in  location  of  the  locale
+                           directory  which  contains native lan-
+                           guage (NLS) message text.
+
        LYNX_LSS
                            This  variable,  if set, specifies the
                            location of the default Lynx character
@@ -66,6 +73,19 @@ Environment Variables Used By Lynx:
                            as well as any value that may
                            be assigned to the TMPDIR variable.
 
+       LYNX_TRACE
+                           If  set,  causes Lynx to write a trace
+                           file as if the -trace option were sup-
+                           plied.
+
+       LYNX_TRACE_FILE
+                           If set, overrides the compiled-in name
+                           of the trace  file,  which  is  either
+                           Lynx.trace or LY-TRACE.LOG (the latter
+                           on the DOS platform).  The trace  file
+                           is in either case relative to the home
+                           directory.
+
        MAIL
                            This variable  specifies  the  default
                            inbox Lynx will check for new mail, if
@@ -106,7 +126,7 @@ Environment Variables Used By Lynx:
                            the form PROTOCOL_proxy (literally:
                            http_proxy, ftp_proxy, gopher_proxy,
                            etc), to "http://some.server.dom:port/".
-                           See <a href="#proxy">details and examples</a>.
+                           See <a href="#proxy">Proxy details and examples</a>.
 
        WWW_access_GATEWAY
                            Lynx still  supports  use  of  gateway
@@ -118,7 +138,7 @@ Environment Variables Used By Lynx:
                            discontinued.  Note that  you  do  not
                            include  a  terminal '/' for gateways,
                            but do for proxies specified by PROTOCOL_proxy
-                           environment variables.  See <a href="#proxy">details</a>.
+                           environment variables.  See <a href="#proxy">Proxy details</a>.
 
        WWW_HOME
                            This  variable,  if set, will override
@@ -180,6 +200,12 @@ Environment Variables Set or Modified By Lynx:
                            distribution's  sample  mailcap  file,
                            for notes on usage in such a file.
 
+       SSL_CERT_DIR        Set to the directory containing trusted
+                           certificates.
+
+       SSL_CERT_FILE       Set to the full path and filename  for
+                           your file of trusted certificates.
+
        TERM                Normally,  this  variable  is  used by
                            Lynx to determine  the  terminal  type
                            being  used  to invoke Lynx.  If, however,
@@ -281,7 +307,7 @@ NATIVE LANGUAGE SUPPORT
                            path prefix for message catalogs.
 
 <a name="proxy"><em>
-Proxy:
+Proxy details and examples:
 </em></a>
 
     To set your site's NTTP server as the default host for news reading
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/follow_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/follow_help.html
index b5893963e81..69fe113c884 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/follow_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/follow_help.html
@@ -3,14 +3,17 @@
 <HEAD>
 <TITLE>Help on the Follow link (or page) number feature</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <h1>+++ Follow link (or goto link or page) number Help +++<br>
 +++ Select option (or page) number Help +++</h1>
 
-If a user has set <em>Keypad mode</em> to <em>Links are numbered</em>
-or <em>Links and form fields are numbered</em> as the default or for
-the current session via the <em>Options menu</em>, then hypertext links
+If a user has set <em>Keypad mode</em> to <em>Links are numbered</em>,
+or <em>Form fields are numbered</em>,
+or <em>Links and form fields are numbered</em>
+as the default or for the current session via the <em>Options menu</em>,
+then hypertext links
 (and form fields, depending on the keypad mode)
 are prefixed with numbers in square brackets.  Entering a keyboard
 or keypad number is treated as an <em>F_LINK_NUM</em> command, and should
@@ -23,8 +26,10 @@ the document for that link as if you had paged or used other navigation
 commands to make it the current link and then ACTIVATE-ed it.  The prompt
 can be invoked via '<em>0</em>', but it will not be treated as the lead
 digit for the number entry, whereas '<em>1</em>' through '<em>9</em>' both
-invoke the prompt and are treated as the first digit.  In <em>Links and
-form fields are numbered</em> mode, if the number corresponds to a form
+invoke the prompt and are treated as the first digit.
+In <em>Form fields are numbered</em>
+or <em>Links and form fields are numbered</em> mode,
+if the number corresponds to a form
 field you will be positioned on that field, but if it is a submit button
 it will not be ACTIVATE-ed.
 
@@ -32,8 +37,9 @@ it will not be ACTIVATE-ed.
 <em>123g</em>), then Lynx will make the link corresponding to that number
 the current link, paging as appropriate if the link does not appear in
 the currently displayed page.  The '<em>g</em>' suffix is inferred (need
-not be entered) for form fields in <em>Links and form fields are
-numbered</em> mode.
+not be entered) for form fields in
+<em>Form fields are numbered</em> or
+<em>Links and form fields are numbered</em> mode.
 
 <p>Alternatively, if the number is given a '<em>p</em>' suffix (e.g.,
 <em>123p</em>), Lynx will make the page corresponding to that number
@@ -72,8 +78,10 @@ then only '<em>0</em>', rather than every number, will be treated as an
 number:</em> prompt.  The '<em>0</em>' will not be treated as the first
 digit for the number, or number plus suffix, entry.
 
-<p>Numbers are associated with form fields only when <em>Links and form
-fields are numbered</em> mode has been selected.  If you have selected
+<p>Numbers are associated with form fields only when
+<em>Form fields are numbered</em> or
+<em>Links and form fields are numbered</em> mode has been selected.
+If you have selected
 <em>Numbers act as arrows</em> or <em>Links are numbered</em> mode, you
 can seek form fields in the document via WHEREIS searches for strings in
 their displayed values.  If they are INPUT or TEXTAREA fields with no
@@ -83,8 +91,10 @@ displayed document.
 
 <p ID="select-option">When you have invoked a popup window for a list of
 OPTIONs in a form's SELECT block, each OPTION is associated with a number,
-and that number will be displayed in <em>Links and form fields are
-numbered</em> mode.  In any keypad mode, the <em>F_LINK_NUM</em>
+and that number will be displayed in
+<em>Form fields are numbered</em> or
+<em>Links and form fields are numbered</em> mode.
+In any keypad mode, the <em>F_LINK_NUM</em>
 ('<em>0</em>') command will invoke a <em>Select option (or page)
 number:</em> prompt, and you can enter a number, and optionally a
 '<em>g</em>' or '<em>p</em>' suffix, to select or seek an OPTION in that
@@ -106,6 +116,7 @@ while viewing a popup window, the user can type
 to skip ahead 3 pages, and <em>50g-</em> will move the
 current selection back 50 options.
 This will work whether or not <em>keypad mode</em> is
+<em>Form fields are numbered</em> or
 <em>Links and form fields are numbered</em> since options
 are numbered internally.  If form field numbering is
 turned off, the option numbers won't appear on screen,
@@ -159,6 +170,7 @@ a name/value pair for the fields should be included in the content submitted
 for the form, but the value should not be displayed in the rendered form.
 Lynx respects this attribute as well, and neither displays the HIDDEN field,
 nor assigns it a number for the F_LINK_NUM ('<em>0</em>') command and
+<em>Form fields are numbered</em> or
 <em>Links and form fields are numbered</em> keypad mode handling, nor
 includes an entry for it in the menus created for the LIST ('<em>l</em>')
 or ADDRLIST ('<em>A</em>')
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/gopher_types_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/gopher_types_help.html
index 206665c5c5d..03c7705516f 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/gopher_types_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/gopher_types_help.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>Listing of Gopher types</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <h1>+++ Gopher Types +++</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/history_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/history_help.html
index db1776a20af..c4e4553ba92 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/history_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/history_help.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>Help on the History Page</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <h1>+++ History Page Help +++</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/keystroke_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/keystroke_help.html
index d3ca4ede9fa..5e2a688b43a 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/keystroke_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/keystroke_help.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>Help on Lynx Keystroke Commands</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <h1>+++ Keystroke Commands +++</h1>
@@ -105,6 +106,14 @@
                                 CTRL-V prompts for a key command (allows
                                 <A HREF="../Lynx_users_guide.html#CtrlVNote"
                                 >escaping</A> from the field).
+
+                                Note that on most UNIX hosts, CTRL-V is bound
+                                via stty to the lnext (literal-next) code but
+                                the exact behavior of that is implementation
+                                specific.  On Solaris you must type CTRL-V
+                                twice to use it, since it quotes the following
+                                keystroke.
+
                CTRL-U         - Erase input line (<a href="edit_help.html"
                                 >more input line commands</a>)
                CTRL-G         - Cancel input or transfer
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/movement_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/movement_help.html
index d3661d9ad97..bbbd9ff3732 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/movement_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/movement_help.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>Help on Lynx Movement commands</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <H1>+++ MOVEMENT HELP +++</H1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/option_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/option_help.html
index b27cca2e888..610269db14a 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/option_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/option_help.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>Form-based Options Menu : Help</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <h1>FORM-BASED OPTIONS MENU : HELP</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/other_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/other_help.html
index 0f41f20c5e1..67268a6179b 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/other_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/other_help.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>Help on Misc. Lynx Commands</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <h1>+++ Other Commands +++</h1>
@@ -27,7 +28,7 @@
        E      - Allows you to edit the current link's URL (or ACTION) and
                 use that as a <em>goto</em> URL.
 
-       g      - Allows you to enter any <a href="http://www.ncsa.uiuc.edu/demoweb/url-primer.html">URL</a> or filename that
+       g      - Allows you to enter any <a href="http://archive.ncsa.uiuc.edu/demoweb/url-primer.html">URL</a> or filename that
                 you wish to view, and then <em>goto</em> it.
 
        G      - Allows you to edit the current document's URL and use that
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/print_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/print_help.html
index 052852731c2..f4869759a87 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/print_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/print_help.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>Lynx Print Help</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <h1>+++ Printing Help +++</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/scrolling_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/scrolling_help.html
index 71a401d7d0b..e7eaf1752bb 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/scrolling_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/scrolling_help.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>Lynx Scrolling Help</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <H1>+++ SCROLLING HELP +++</H1>
@@ -14,7 +15,7 @@
         - (or b,       - If you have moved down in a document, this
            or CTRL-B)    will bring you back up one page (Page-Up).
 
-        If the 'Num Lock' on your keyboard is on, Lynx will translate
+        If the 'Num Lock' on your keyboard is on, Lynx translates
         the numbers of your keypad into movement commands as follows:
 
                      9  - page up
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/test_display.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/test_display.html
index 122796958d0..d644498f888 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/test_display.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/test_display.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>Quick test for identifying display character set</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <h1 ALIGN=LEFT>Try this page with Lynx 2.7.2 or above:</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/visited_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/visited_help.html
index 5c62fb3eb56..97007040512 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/visited_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/visited_help.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>Help on the Visited Links Page</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <h1>+++ Visited Links Page Help +++</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/keystrokes/xterm_help.html b/gnu/usr.bin/lynx/lynx_help/keystrokes/xterm_help.html
index 640cc9139c9..e0f7749f676 100644
--- a/gnu/usr.bin/lynx/lynx_help/keystrokes/xterm_help.html
+++ b/gnu/usr.bin/lynx/lynx_help/keystrokes/xterm_help.html
@@ -3,6 +3,7 @@
 <HEAD>
 <TITLE>X Terminal Help</TITLE>
 <LINK rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 <BODY>
 <h1>+++ X Terminal or X Server +++</h1>
diff --git a/gnu/usr.bin/lynx/lynx_help/lynx-dev.html b/gnu/usr.bin/lynx/lynx_help/lynx-dev.html
index 8eeca51a61d..18b426e8cb1 100644
--- a/gnu/usr.bin/lynx/lynx_help/lynx-dev.html
+++ b/gnu/usr.bin/lynx/lynx_help/lynx-dev.html
@@ -3,6 +3,7 @@
 <head>
 <title>Lynx-Dev Discussion List</title>
 <link rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body>
diff --git a/gnu/usr.bin/lynx/lynx_help/lynx_help_main.html b/gnu/usr.bin/lynx/lynx_help/lynx_help_main.html
index 91060a7c599..61af3f72b2c 100644
--- a/gnu/usr.bin/lynx/lynx_help/lynx_help_main.html
+++ b/gnu/usr.bin/lynx/lynx_help/lynx_help_main.html
@@ -1,8 +1,9 @@
 <!DOCTYPE html PUBLIC "-//IETF//DTD HTML 3.0//EN">
 <html>
 <head>
-<link rev="made" href="mailto:lynx-dev@sig.net">
 <title>The Lynx Help Page</title>
+<link rev="made" href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 <body>
 
@@ -29,8 +30,8 @@
 <li><a href="http://www.hippo.ru/%7Ehvv/lynxcfg_toc.html">lynx.cfg options</a>
  -- a reference for advanced configurations
 <li><a href="http://www.chass.utoronto.ca/%7Epurslow/lhfb.html">Lynx Help for Beginners</a> -- quick help on many common problems
-<li><a href="http://lynx.isc.org/cgi-bin/fom">The Lynx FAQ-O-Matic</a> -- many common queries, some more advanced; users may add answers.
-<li><a href="http://www.trill-home.com/lynx.html">Lynx Links</a>
+<!-- {li}{a href="http://lynx.isc.org/cgi-bin/fom"}The Lynx FAQ-O-Matic{/a} .. many common queries, some more advanced; users may add answers. -->
+<li><a href="http://www.subir.com/lynx.html">Lynx Links</a>
  -- source &amp; binaries, FAQs, developers &amp; archives,<br>
 SSL &amp; security, and more
 <li><a href="http://www.ocf.berkeley.edu/%7Ejeffwong/lynxstuff/">Lynxstuff</a>
@@ -48,18 +49,17 @@ SSL &amp; security, and more
  -- <a href="http://www.w3.org/MarkUp/html-spec/html-spec_toc.html">2.0</a>
 <li>HTTP -- <a href="http://www.w3.org/Protocols/">1.1</a>
  -- <a href="http://www.isi.edu/in-notes/rfc1945.txt">1.0</a>
-<li><a href="http://www.w3.org/Addressing/Addressing.html">Web Naming &amp; Addressing Overview: URIs, URLs etc</a>
-<li><a href="http://www.w3c.org/International/">HTML Internationalization</a>
-<li><a href="http://www.w3.org/TheProject.html">WWW Consortium: home page</a>
+<li><a href="http://www.w3.org/Addressing/">Web Naming &amp; Addressing Overview: URIs, URLs etc</a>
+<li><a href="http://www.w3.org/International/">HTML Internationalization</a>
+<li><a href="http://www.w3.org/">WWW Consortium: home page</a>
 </ul>
 
 <h2>Help with HTML:</h2>
 
 <ul>
 <li><a href="http://www.htmlhelp.com/reference/html40/">HTML 4.0 Reference</a>
-<li><a href="http://www.ncsa.uiuc.edu/General/Internet/WWW/HTMLPrimer.html">NCSA Beginner's Guide To HTML</a>
+<li><a href="http://archive.ncsa.uiuc.edu/General/Internet/WWW/HTMLPrimer.html">NCSA Beginner's Guide To HTML</a>
 <li><a href="http://www.cc.ukans.edu/%7Eacs/docs/other/HTML_quick.shtml">HTML Quick Reference Guide</a>
-<li><a href="http://www.stonehand.com/doc/">Spyglass/Stonehand Technical Reference</a>
 </ul>
 
 <h2>HTML validation services:</h2>
@@ -72,7 +72,7 @@ SSL &amp; security, and more
 <h2>Other browsing software:</h2>
 
 <ul>
-<li><a href="http://sunsite.dk/wget/">GNU Wget</a>
+<li><a href="http://wget.sunsite.dk/">GNU wget</a>
  -- powerful &amp; flexible non-interactive downloader
 <li><a href="http://www.idata.sk/~ondrej/pavuk/">Pavuk</a>
  -- powerful &amp; an even more-featured downloader
@@ -85,19 +85,22 @@ SSL &amp; security, and more
 <H2>Meta-indexes: lists of links</H2>
 
 <ul>
-<li><a href="http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html">NCSA Mosaic</a>
+<li><a href="http://archive.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html">NCSA Mosaic</a>
 </ul>
 
 <H2>Search engines:</H2>
 
 <ul>
+<li><a href="http://www.alltheweb.com/">AlltheWeb.com</a>
 <li><a href="http://www.altavista.com/">AltaVista</a>
+<li><a href="http://www.ask.com/">Ask.com</a>
 <li><a href="http://www.excite.com/">Excite</a>
 <li><a href="http://www.go.com/">GO.com</a>
 <li><a href="http://www.google.com/">Google</a>
-<li><a href="http://www.lycos.com/">Lycos</a>
+<li><a href="http://search.lycos.com/">Lycos</a>
 <li><a href="http://www.metacrawler.com/">MetaCrawler</a>
 <li><a href="http://www.search.com/">Search.com</a>
+<li><a href="http://www.teoma.com/">Teoma</a>
 <li><a href="http://www.webcrawler.com/">WebCrawler</a>
 <li><a href="http://www.yahoo.com/">Yahoo!</a>
 </ul>
diff --git a/gnu/usr.bin/lynx/lynx_help/lynx_url_support.html b/gnu/usr.bin/lynx/lynx_help/lynx_url_support.html
index bee820509ca..470df572237 100644
--- a/gnu/usr.bin/lynx/lynx_help/lynx_url_support.html
+++ b/gnu/usr.bin/lynx/lynx_help/lynx_url_support.html
@@ -3,25 +3,27 @@
 <HEAD>
 <TITLE>URL Schemes Supported in Lynx</TITLE>
 <LINK rev=made href="mailto:lynx-dev@sig.net">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </HEAD>
 
 <BODY>
 <blockquote>
-<em>[</em><a href="#http">http, https</a> <em>|</em>
-<a href="#telnet">telnet, tn3270, rlogin</a> <em>|</em>
-<a href="#gopher">gopher</a> <em>|</em>
-<a href="#file">file</a> <em>|</em>
-<a href="#ftp">ftp</a> <em>|</em>
-<a href="#wais">wais</a> <em>|</em>
-<a href="#news">news, nntp, snews</a> <em>|</em>
-<a href="#newspost">newspost, newsreply, snewspost, snewsreply</a> <em>|</em>
-<a href="#mailto">mailto</a> <em>|</em>
-<a href="#finger">finger</a> <em>|</em>
-<a href="#cso">cso</a> <em>|</em>
-<a href="#bibp">bibp</a> <em>|</em>
-<a href="#exec">lynxexec, lynxprog</a> <em>|</em>
-<a href="#cgi">lynxcgi</a><em>|</em>
-<a href="#internal">internal</a><em>]</em>
+<em>[</em><a href="#http_url">http, https</a> <em>|</em>
+<a href="#telnet_url">telnet, tn3270, rlogin</a> <em>|</em>
+<a href="#gopher_url">gopher</a> <em>|</em>
+<a href="#file_url">file</a> <em>|</em>
+<a href="#ftp_url">ftp</a> <em>|</em>
+<a href="#wais_url">wais</a> <em>|</em>
+<a href="#news_url">news, nntp, snews</a> <em>|</em>
+<a href="#newspost_url">newspost, newsreply, snewspost, snewsreply</a> <em>|</em>
+<a href="#mailto_url">mailto</a> <em>|</em>
+<a href="#finger_url">finger</a> <em>|</em>
+<a href="#cso_url">cso</a> <em>|</em>
+<a href="#bibp_url">bibp</a> <em>|</em>
+<a href="#exec_url">lynxexec, lynxprog</a> <em>|</em>
+<a href="#cgi_url">lynxcgi</a><em>|</em>
+<a href="#ncftp_url">NcFTP</a> <em>|</em>
+<a href="#internal_url">internal</a><em>]</em>
 </blockquote>
 
 <H1><em>URL Schemes Supported in Lynx</em></H1>
@@ -74,7 +76,7 @@ Any partial or relative URLs within HTML documents are resolved
 according to the rules specified in RFC1808 and subsequent IETF drafts.
 <HR>
 
-<H2><a name="http">The <em>http</em> and <em>https</em> URLs:</a></H2>
+<H2><a name="http_url">The <em>http</em> and <em>https</em> URLs:</a></H2>
 
 Lynx handles http URLs exactly as specified in RFC1738.  The format
 is:
@@ -94,12 +96,12 @@ which can correspond to positions in the rendering of the document.
 <p>The https URL has the same format, but the default port is <em>:443</em>.
 Patches for support of https URLs and the CONNECT procedure are available
 for qualified recipients via <a
-href="http://www.trill-home.com/lynx.html">Lynx links</a>.  US Export laws
+href="http://www.subir.com/lynx.html">Lynx links</a>.  US Export laws
 and associated red tape pose severe impediments to inclusion of this support
 in the general distributions of freeware WWW clients such as Lynx.  Sorry.
 <HR>
 
-<H2><a name="telnet"
+<H2><a name="telnet_url"
 >The <em>telnet</em>, <em>tn3270</em>, and <em>rlogin</em> URLs:</a></H2>
 
 A <em>telnet</em> URL generally results in Lynx spawning a telnet
@@ -123,7 +125,7 @@ for most TCP-IP software you will be prompted for a password whether
 or not one was included in the URL.
 <HR>
 
-<H2><a name="gopher">The <em>gopher</em> URL:</a></H2>
+<H2><a name="gopher_url">The <em>gopher</em> URL:</a></H2>
 
 The gopher URL takes the form:
 <pre>
@@ -172,7 +174,7 @@ listings returned by gopher servers, but should be considered Lynxisms
 and UMN Gopherisms.
 <HR>
 
-<H2><a name="file">The <em>file</em> URL:</a></H2>
+<H2><a name="file_url">The <em>file</em> URL:</a></H2>
 
 The file URL is used to retrieve files or generate a directory listing
 on the local host.  The host field can be <em>localhost</em> or a domain
@@ -206,7 +208,7 @@ use the <em>showinfo</em> command (<em>=</em>) to see the file
 URL which Lynx created for it.
 <HR>
 
-<H2><a name="ftp">The <em>ftp</em> URL:</a></H2>
+<H2><a name="ftp_url">The <em>ftp</em> URL:</a></H2>
 
 The ftp URL has the general format:
 <pre>
@@ -267,7 +269,7 @@ tilde (<em>~</em>) as for <a href="#file">file</a> URLs, e.g.:
 </pre>
 <HR>
 
-<H2><a name="wais">The <em>wais</em> URL:</a></H2>
+<H2><a name="wais_url">The <em>wais</em> URL:</a></H2>
 
 The wais URL is used to retrieve resources using the Wide Area Information
 System protocol.  The format is:
@@ -289,7 +291,7 @@ convert the server's reply into a hit list with URLs that include the
 the hit list.
 <HR>
 
-<H2><a name="news"
+<H2><a name="news_url"
 >The <em>news</em>, <em>nntp</em>, and <em>snews</em> URLs:</a></H2>
 
 The news and nntp URLs are handled by Lynx as specified in RFC1738, but
@@ -300,7 +302,7 @@ server pointed to by the NNTPSERVER environment variable or configuration
 symbol (see lynx.cfg), with default port <em>:119</em>.  A host field must
 be included in nntp URLs, and the port field is optional with the same
 default.  Patches for support of snews URLs are available to qualified
-recipients via <a href="http://www.trill-home.com/lynx.html">Lynx links</a>
+recipients via <a href="http://www.subir.com/lynx.html">Lynx links</a>
 but cannot be included in the general distribution (sorry, see <a
 href="#http">http and https</a>).
 
@@ -349,7 +351,7 @@ are specific to each nntp server, unlike the unique identifiers for
 news messages.
 <HR>
 
-<H2><a name="newspost"
+<H2><a name="newspost_url"
 >The <em>newspost</em>, <em>newsreply</em>, <em>snewspost</em>, and
 <em>snewsreply</em> URLs:</a></H2>
 
@@ -395,7 +397,7 @@ href="#mailto">mailto</a> URLs, with the qualification that they presently
 are supported only by Lynx.
 <HR>
 
-<H2><a name="mailto">The <em>mailto</em> URL:</a></H2>
+<H2><a name="mailto_url">The <em>mailto</em> URL:</a></H2>
 
 The mailto URL is used to provide links that when activated can be
 used to send a comment or the content of a FORM to an Internet email
@@ -483,7 +485,7 @@ and the prefixed inclusion should be trimmed by the user to just those
 passages relevant to the message which will be sent.
 <HR>
 
-<H2><a name="finger">The <em>finger</em> URL:</a></H2>
+<H2><a name="finger_url">The <em>finger</em> URL:</a></H2>
 
 Lynx has full support for the finger protocol, but a format for finger
 URLs has not yet been adopted by the IETF.  The formats supported by Lynx
@@ -517,7 +519,7 @@ Lynx will handle such URLs equivalently to overt finger URLs, including
 creation of links for any strings which appear to be supported URLs.
 <HR>
 
-<H2><a name="cso">The <em>cso</em> URL:</a></H2>
+<H2><a name="cso_url">The <em>cso</em> URL:</a></H2>
 
 The cso URL is intended to provide a gateway to CSO/PH (QI) servers.
 The requests are made on port 105 by default (<em>:105</em>), with the
@@ -539,7 +541,7 @@ to the server.   Any strings in the reports returned for these requests
 converted into a link for accessing that URL.
 <HR>
 
-<H2><a name="bibp">The <em>bibp</em> URL:</a></H2>
+<H2><a name="bibp_url">The <em>bibp</em> URL:</a></H2>
 
 <p>Lynx provides built-in support for bibliographic protocol (BibP).
 BibP links are links to published works such as books or journal articles,
@@ -548,7 +550,7 @@ by a local bibhost server (http://bibhost/) if it exists.   Otherwise,
 resolution is performed by a document-specified server or a known global
 server.
 
-<H2><a name="exec">The <em>lynxexec</em> and <em>lynxprog</em> URLs:</a></H2>
+<H2><a name="exec_url">The <em>lynxexec</em> and <em>lynxprog</em> URLs:</a></H2>
 
 If execution of spawned commands has been enabled in your Lynx image, the
 lynxexec and lynxprog URLs can be used to execute arbitrary system commands
@@ -575,7 +577,7 @@ from the utility invoked via lynxprog.
 solely for Lynx.
 <HR>
 
-<H2><a name="cgi">The <em>lynxcgi</em> URL:</a></H2>
+<H2><a name="cgi_url">The <em>lynxcgi</em> URL:</a></H2>
 
 The lynxcgi URL is implemented only on Unix, can be used as the
 ACTION for a FORM, and if enabled in your Lynx image has the format:
@@ -593,16 +595,21 @@ in <em>userdefs.h</em> and <em>lynx.cfg</em>, qv.
 <p>This is a Lynxism and should be used only in local documents intended
 solely for Lynx, or for limited local testing of CGI scripts without an
 http server.
+<HR>
+
+<H2><a name="ncftp_url">The <em>NcFTP</em> URL:</a></H2>
 
-<p>On VMS, you are advised to use the threaded OSU http server, available
-from <a href="ftp://osu.edu"
->ftp://osu.edu</a> as freeware, if your site does not already have an http
-server.  It can be installed as a purely local script server, and is far
-more efficient and comprehensive than any code which might be incorporated
-within Lynx.
+Lynx recognizes the NcFTP-style ftp URL, e.g.,
+<pre>
+	<cite>ftpHost</cite>:<cite>fileSpecification</cite>
+</pre>
+for example
+<pre><code>
+	ftp.gnu.org:/pub/gnu
+</code></pre>
 <HR>
 
-<H2><a name="internal">The <em>LYNXfoo</em> internal URLs:</a></H2>
+<H2><a name="internal_url">The <em>LYNXfoo</em> internal URLs:</a></H2>
 
 Lynx uses a variety of private URL schemes for communication among its
 internal modules.  They start with uppercase letters <code>LYNX</code>
diff --git a/gnu/usr.bin/lynx/makefile.in b/gnu/usr.bin/lynx/makefile.in
index 7d18f3de8ec..51739650b30 100644
--- a/gnu/usr.bin/lynx/makefile.in
+++ b/gnu/usr.bin/lynx/makefile.in
@@ -3,8 +3,6 @@
 SHELL		= @CONFIG_SHELL@
 CDPATH		= .
 
-x		= @PROG_EXT@
-
 .SUFFIXES:
 @SET_MAKE@
 prefix		= @prefix@
@@ -19,19 +17,29 @@ DEFS		= @DEFS@
 CPPFLAGS	= @CPPFLAGS@
 LINT		= @LINT@
 
+x		= @EXEEXT@
+o		= .@OBJEXT@
+
 LIBS		= @LIBS@
 
 INSTALL		= @INSTALL@
 INSTALL_PROGRAM	= @INSTALL_PROGRAM@
 INSTALL_DATA	= @INSTALL_DATA@
+
 LN_S		= @LN_S@
 
+MKINSTALLDIRS	= @MKINSTALLDIRS@
+
+TAR		= @TAR@
+TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
+TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
+
 ## This is the version which we are developing (or, upon release, make this
 ## the same).  Use no dots in the name, since it must work on VMS and MS-DOS.
-VERSION		= 2-8-4
+VERSION		= 2-8-5
 
 ##this is the name of the directory the lynx source code is in.
-##(e.g., lynx2-8-4, not the full path)
+##(e.g., lynx2-8-5, not the full path)
 lynxdir= lynx$(VERSION)
 lynxname= lynx$(VERSION)
 
@@ -113,13 +121,14 @@ SITE_LYDEFS = # Your defines here
 SITE_DEFS = # Your defines here
 
 # defines for which there are no configure options:
+# -DEXP_ASCII_CTYPES use POSIX locale for toupper/tolower/isupper
 # -DHP_TERMINAL    For DIM workaround to REVERSE problems on HP terminals.
 # -DIGNORE_CTRL_C  Define if Control-C shouldn't exit lynx.
-# -DNO_CPU_LIMIT   Disables Max CPU timeout (includes CLOCKS_PER_SECOND)
 # -DNO_RULES       Disables CERN-style access rules (see lynx.cfg).
+# -DMISC_EXP       Enable some truly experimental stuff
 # -DSHORTENED_RBIND  For a SOCKSified lynx with the short version of Rbind.
 # -DSLANG_MBCS_HACK prevent cutoff lines when using UTF8 console (slang only)
-# -DUSE_SCROLLBAR  supports scrollbar when built with ncurses
+# -DUSE_VASPRINT   Use vasprintf() function
 #
 # if you are linking to freeWAIS-0.202 or older, you should define this
 # in SITE_DEFS
@@ -141,44 +150,10 @@ SITE_DEFS = # Your defines here
 #
 # -DDGUX_OLD
 
-# defines which have configure options   (see INSTALLATION, Section II-1c.):
-# -DARCHIVE_ONLY
-# -DDIRED_SUPPORT
-# -DDISP_PARTIAL
-# -DDONT_TRACK_INTERNAL_LINKS
-# -DEXEC_LINKS
-# -DEXEC_SCRIPTS
-# -DEXP_CHARTRANS_AUTOSWITCH
-# -DEXP_PERSISTENT_COOKIES
-# -DLONG_LIST
-# -DLYNXCGI_LINKS
-# -DLY_FIND_LEAKS
-# -DNCURSES
-# -DNO_CHANGE_EXECUTE_PERMS
-# -DNO_EXTENDED_HTMLDTD
-# -DNO_PARENT_DIR_REFERENCE
-# -DNSL_FORK
-# -DOK_GZIP
-# -DOK_OVERRIDE
-# -DOK_PERMIT
-# -DOK_TAR
-# -DOK_UUDECODE
-# -DOK_ZIP
-# -DOPTIONS_FORMS
-# -DOPTIONS_MENU
-# -DSOCKS
-# -DSYSLOG_REQUESTED_URLS
-# -DUNDERLINE_LINKS
-# -DUSE_COLOR_STYLE
-# -DUSE_DEFAULT_COLORS
-# -DUSE_EXTERNALS
-# -DUSE_SLANG
-# -DUSE_SOCKS5
-# -DUSE_ZLIB
+# Many other defines have configure options  (see INSTALLATION, Section II-1c.):
 #
 # for installation of local execution links, please see the file userdefs.h
 
-# TESTED: Linux FreeBSD SunOS Solaris IRIX CLIX HP-UX AIX SCO
 all lynx$x: cfg_defs.h LYHelp.h
 @MSG_DIR_MAKE@	$(SHELL) $(srcdir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
 @INTLDIR_MAKE@	cd intl && $(MAKE) CC="$(CC)"
@@ -212,7 +187,7 @@ help:
 	@echo
 	@echo "Please run make with one of the following arguments"
 	@echo "all        -- to make the executable, put it in this directory"
-	@echo "clean      -- removes all '.o' and 'core' files"
+	@echo "clean      -- removes all '$o' and 'core' files"
 	@echo "depend     -- use makedepend to generate header-dependencies"
 	@echo "tar        -- runs clean, removes executable, and tars the whole directory"
 	@echo "compress   -- runs tar, then compresses the result"
@@ -278,7 +253,7 @@ zip:  clean
 	cd ..; rm -f $(lynxname).zip; zip -r $(lynxname).zip $(lynxdir)
 
 save:
-	cd ..; rm -f $(lynxname).tar; tar -cf - $(lynxdir) > $(lynxname).tar
+	cd ..; rm -f $(lynxname).tar; $(TAR_UP) $(lynxdir) > $(lynxname).tar
 
 compress: tar
 	cd ..; rm -f $(lynxname).tar.Z; compress -f -v $(lynxname).tar
@@ -323,12 +298,16 @@ install-man : $(MANDIR)
 
 install-doc : $(DOCDIR) $(HELPDIR)
 	@echo Copying sample files
-	(cd $(srcdir) && tar cf - C[HO]* PROBLEMS README samples test ) | \
-			       ( cd $(DOCDIR) && chmod -R u+w . && tar xf - )
+	(cd $(srcdir) && $(TAR_UP) C[HO]* PROBLEMS README docs samples test ) | \
+			       ( cd $(DOCDIR) && chmod -R u+w . && $(TAR_DOWN) )
+	$(SHELL) -c 'if test "$(COMPRESS_PROG)" != "" ; then \
+		(cd $(DOCDIR) && $(COMPRESS_PROG) -f docs/CHANGES*.[0-9] docs/*.announce ) \
+	fi'
 	$(SHELL) -c 'for name in COPYING COPYHEADER; do \
 		cd $(HELPDIR) && rm -f $$name ;\
 		cd $(HELPDIR) && ( $(LN_S) $(DOCDIR)/$$name . || cp $(DOCDIR)/$$name . );\
 		done'
+	-$(SHELL) -c 'case `id|sed -e "s/(.*//"` in uid=0) chown -R root $(DOCDIR);; esac'
 
 # HPUX 'sed' does not seem to like '=' as pattern delimiter.
 # We cannot use '%' because it may appear in a URL.
@@ -356,11 +335,12 @@ help_files.sed : makefile $(srcdir)/lynx_help/help_files.txt
 		-e 's%\(.*\)=\(.*\.html\)$$%s=\2=\2$(COMPRESS_EXT)=g%' \
 		-e 's%\.html=%\\.html=%' \
 		help_files.tmp | $(FIX_SED) >> $@
-	@ECHO_CC@if test -n "$(COMPRESS_EXT)"; then echo 's%\$(COMPRESS_EXT)\$(COMPRESS_EXT)%$(COMPRESS_EXT)%g' >> $@; fi
+	@ECHO_CC@if test -n "$(COMPRESS_EXT)"; then echo 's%\(\$(COMPRESS_EXT)\)*\$(COMPRESS_EXT)%$(COMPRESS_EXT)%g' >> $@; fi
 	@-rm -f help_files.tmp
 
 install-help : help_files.sed $(HELPDIR)
-	(cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && rm -rf *)
+	- (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && rm -fr *)
+	test -d $(HELPDIR)/keystrokes || mkdir $(HELPDIR)/keystrokes
 @LYNXCFG_MAKE@	@echo 'Making htmlized lynx.cfg'
 @LYNXCFG_MAKE@	cd src && make LYReadCFG.i
 @LYNXCFG_MAKE@	@-rm -f alphatoc.html body.html cattoc.html
@@ -368,25 +348,22 @@ install-help : help_files.sed $(HELPDIR)
 @LYNXCFG_MAKE@	sed  -e 's/ *{ *"\([^"]*\)".*/\1/' | \
 @LYNXCFG_MAKE@	perl $(srcdir)/scripts/cfg2html.pl -ms $(srcdir)/lynx.cfg
 	@echo Translating/copying html files
-	@cat help_files.sed > $(HELPDIR)/help_files.sed
 @LYNXCFG_MAKE@	@$(SHELL) -c 'for f in alphatoc.html body.html cattoc.html ; do \
-@LYNXCFG_MAKE@		sed -f $(HELPDIR)/help_files.sed $$f > $(HELPDIR)/$$f ; \
+@LYNXCFG_MAKE@		sed -f help_files.sed $$f > $(HELPDIR)/$$f ; \
 @LYNXCFG_MAKE@		done'
 @LYNXCFG_MAKE@	-rm -f src/LYReadCFG.i
-	@ECHO_CC@$(SHELL) -c 'cd $(srcdir)/lynx_help && ( \
-		dirs=keystrokes; \
-		(cd $(HELPDIR) && mkdir $$dirs 2>/dev/null ) ; \
-		files="*.html */*.html" ; \
+	@ECHO_CC@$(SHELL) -c 'sed_prog=`pwd`/help_files.sed && \
+		cd $(srcdir)/lynx_help && \
+		dirs=keystrokes && \
+		files="*.html */*.html" && \
 		for f in $$files ; do \
-			sed -f $(HELPDIR)/help_files.sed $$f > $(HELPDIR)/$$f ; \
-		done ; \
+			sed -f $$sed_prog $$f > $(HELPDIR)/$$f ; \
+		done && \
 		if test "$(COMPRESS_PROG)" != "" ; then \
 			(cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \
-		fi ; \
-		)'
-	@-rm -f $(HELPDIR)/help_files.sed
+		fi'
 	@echo Updating $(libdir)/lynx.cfg
-	$(SHELL) -c 'if test -f $(LIBDIR)/lynx.cfg ; then \
+	@ECHO_CC@$(SHELL) -c 'if test -f $(LIBDIR)/lynx.cfg ; then \
 		mv $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
 	else \
 		cp $(srcdir)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
@@ -419,11 +396,10 @@ LYHelp.h : help_files.sed LYHelp.hin
 
 cfg_defs.h : $(srcdir)/cfg_defs.sh $(srcdir)/cfg_edit.sh config.cache lynx_cfg.h
 	@rm -f $@
-	$(SHELL) -c '/bin/sh $(srcdir)/cfg_defs.sh $(srcdir)'
+	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(srcdir)/cfg_defs.sh $(srcdir)'
 
 install-cfg : $(LIBDIR)
-	-mv -f $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.oldcfg
-	$(INSTALL_DATA) $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg
+	@$(SHELL) -c '$(srcdir)/scripts/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg'
 
 install-lss : $(LIBDIR)
 	-mv -f $(LIBDIR)/lynx.lss $(LIBDIR)/lynx.oldlss
@@ -445,7 +421,11 @@ uninstall-doc ::
 	-test -d $(DOCDIR) && WD=`cd $(DOCDIR) && pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_doc$$!!'` && test $$WD != $$HEAD && rm -rf $(DOCDIR)
 	-test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && cd $(HELPDIR) && rm -f COPYING COPYHEADER
 
-$(BINDIR) $(MANDIR) $(LIBDIR) $(HELPDIR) $(DOCDIR) :
-	$(srcdir)/mkdirs.sh $@
+$(BINDIR) \
+$(MANDIR) \
+$(LIBDIR) \
+$(HELPDIR) \
+$(DOCDIR) :
+	$(SHELL) $(MKINSTALLDIRS) $@
 etags:
 	etags -r "/\(PRIVATE\|PUBLIC\)[ \t]+\([a-zA-Z_][a-zA-Z_0-1]*[ \t*]+\)*\([a-zA-Z_][a-zA-Z_0-1]*\)[ \t]+\(ARGS[0-9]\|NOARGS\)/\3/" *.[ch] */*.[ch] */*/*.[ch] */*/*/*.[ch]
diff --git a/gnu/usr.bin/lynx/po/ChangeLog b/gnu/usr.bin/lynx/po/ChangeLog
deleted file mode 100644
index 81690d0294a..00000000000
--- a/gnu/usr.bin/lynx/po/ChangeLog
+++ /dev/null
@@ -1,99 +0,0 @@
-1998-02-14  Karl Eichwalder  <ke@suse.de>
-
-	* no.po: Update.
-
-Sun May 25 19:19:51 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* de.po: Update.
-
-Mon Apr 28 17:38:54 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* es.po: Update.
-
-Wed Mar 26 09:58:18 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* de.po: Update.
-
-Sun Mar 23 18:28:18 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* sv.po: Update.
-
-Fri Feb 14 08:24:07 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* pl.po: Update.
-
-Sun Feb  2 18:42:04 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* de.po es.po fr.po sv.po: Update.
-
-Sat Jan 11 16:51:45 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* nl.po: Update.
-
-Fri Jan 10 13:09:59 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* fr.po: Update.
-
-Wed Jan  8 08:53:41 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* no.po: Update.
-
-Tue Jan  7 18:34:57 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* es.po: Update.
-
-Sun Jan  5 09:58:47 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* de.po fr.po: Updates.
-
-Sat Jan  4 17:49:59 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* es.po: Update.
-
-Thu Dec 12 18:58:01 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* it.po: Remove.
-
-Wed Dec 11 20:05:00 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* mailshar gnu-translation@prep.ai.mit.edu
-	hello-1.3.6/po/hello.pot.
-
-	* POTFILES.in: remove `src/getopt1.c'.
-
-	* de.po es.po fr.po ko.po nl.po no.po pl.po pt.po sl.po sv.po: new
- 	files from alpha.gnu.ai.mit.edu:/gnu/po/maint/hello.
-
-Fri Mar 15 12:43:14 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* fr.po: New (version 1.3.2).
-
-Tue Mar 12 10:15:26 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* mailshar gnu-translation@prep.ai.mit.edu
-	hello-1.3.4/po/hello.pot.
-
-Fri Mar  8 20:40:50 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* de.po: New.
-
-Tue Mar  5 09:58:14 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* de.po: New.  Reflect current version 1.3.2; now 1.3.3.
-
-Sun Mar  3 21:06:15 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* Makefile.in.in ($(PACKAGE).pot): Add POTFILES.
-
-	* POTFILES.in: remove `src/version.c'.
-
-Tue Dec 19 10:16:39 1995  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* POTFILES.in: Reflect, that source files now in ../src/.
-
-Fri Dec 15 11:59:51 1995  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* POTFILES.in: New file.  Lists `getopt.c', `getopt1.c',
- 	`hello.c', and `version.c'.
-	
-
diff --git a/gnu/usr.bin/lynx/po/ca.po b/gnu/usr.bin/lynx/po/ca.po
new file mode 100644
index 00000000000..766e3590b2f
--- /dev/null
+++ b/gnu/usr.bin/lynx/po/ca.po
@@ -0,0 +1,5538 @@
+# Missatges del lynx en català
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Carles Sadurní Anguita <isard@ctv.es>, 2000-2003
+#
+# Agraïments
+#
+# Gràcies als membres de la llista DocsTerms del CALIU i als de la 
+# llista del Translation Project per les correccions i els suggeriments. 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: lynx 2.8.5pre15\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\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:29
+#, c-format
+msgid "Alert!: %s"
+msgstr "Alerta!: %s"
+
+#: LYMessages.c:30
+msgid "Welcome"
+msgstr "Benvinguts"
+
+#: LYMessages.c:31
+msgid "Are you sure you want to quit?"
+msgstr "Esteu segur/a que voleu eixir?"
+
+#: LYMessages.c:33
+msgid "Really exit from Lynx?"
+msgstr "Esteu segur/a que voleu eixir de Lynx?"
+
+#: LYMessages.c:35
+msgid "Connection interrupted."
+msgstr "Connexió interrompuda."
+
+#: LYMessages.c:36
+msgid "Data transfer interrupted."
+msgstr "Transferència de dades interrompuda"
+
+#: LYMessages.c:37
+msgid "Cancelled!!!"
+msgstr "Cancel·lat!!"
+
+#: LYMessages.c:38
+msgid "Cancelling!"
+msgstr "Cancel·lació!"
+
+#: LYMessages.c:39
+msgid "Excellent!!!"
+msgstr "Excel·lent!!"
+
+#: LYMessages.c:40
+msgid "OK"
+msgstr "D'acord"
+
+#: LYMessages.c:41
+msgid "Done!"
+msgstr "Fet!"
+
+#: LYMessages.c:42
+msgid "Bad request!"
+msgstr "Sol·licitud incorrecta!"
+
+#: LYMessages.c:43
+msgid "previous"
+msgstr "anterior"
+
+#: LYMessages.c:44
+msgid "next screen"
+msgstr "següent pantalla"
+
+#: LYMessages.c:45
+msgid "HELP!"
+msgstr "AJUDA!"
+
+#: LYMessages.c:46
+msgid ", help on "
+msgstr ", ajuda sobre "
+
+#. #define HELP
+#: LYMessages.c:48
+msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
+msgstr "Useu les fletxes per a moure-us, '?' ajuda, 'q' eixir, '<-' torna enrere."
+
+#. #define MOREHELP
+#: LYMessages.c:50
+msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
+msgstr "Useu <espai> per a continuar, fletxes per a moure-us, '?' ajuda, 'q' eixir."
+
+#: LYMessages.c:51
+msgid "-- press space for next page --"
+msgstr "-- premeu <espai> per passar a la següent pàgina --"
+
+#: LYMessages.c:52
+msgid "URL too long"
+msgstr "La URL especificada és massa llarga"
+
+#. Inactive input fields, messages used with -tna option - kw
+#. #define FORM_LINK_TEXT_MESSAGE_INA
+#: LYMessages.c:58
+msgid "(Text entry field) Inactive.  Press <return> to activate."
+msgstr "(Camp d'entrada de text) Inactiu. Premeu <intro> per activar-lo."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
+#: LYMessages.c:60
+msgid "(Textarea) Inactive.  Press <return> to activate."
+msgstr "(Àrea de text) Inactiva. Premeu <intro> per activar-la."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
+#: LYMessages.c:62
+#, c-format
+msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
+msgstr "(Àrea de text) Inactiva. Premeu <intro> per activar-la (%s per a l'editor)."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
+#: LYMessages.c:64
+msgid "(Form field) Inactive.  Use <return> to edit."
+msgstr "(Camp de formulari) Inactiu. Useu <intro> per a editar."
+
+#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
+#: LYMessages.c:66
+#, c-format
+msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
+msgstr "(Camp form.) Inactiu. <intro> per a editar (%s per a enviar sense mem. cau)."
+
+#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
+#: LYMessages.c:68
+msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
+msgstr "(Camp form.) Inactiu. <intro> per a editar, <intro> dues vegades per a enviar."
+
+#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
+#: LYMessages.c:70
+msgid "(mailto form field) Inactive.  Press <return> to change."
+msgstr "(Camp de formulari de correu) Inactiu. Premeu <intro> per a canviar-ho."
+
+#. #define FORM_LINK_PASSWORD_MESSAGE_INA
+#: LYMessages.c:72
+msgid "(Password entry field) Inactive.  Press <return> to activate."
+msgstr "(Camp de contrasenya) Inactiu. Premeu <intro> per activar-lo."
+
+#. #define FORM_LINK_FILE_UNM_MSG
+#: LYMessages.c:75
+msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
+msgstr "Camp de fitxer IMMODIFICABLE. Useu les fletxes o <tab> per a eixir-ne."
+
+#. #define FORM_LINK_FILE_MESSAGE
+#: LYMessages.c:77
+msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Camp de fitxer) Introduïu el nom de l'arxiu. Fletxes o <tab> per a eixir-ne."
+
+#. #define FORM_LINK_TEXT_MESSAGE
+#: LYMessages.c:79
+msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Camp de text) Introduïu text. Useu les fletxes o <tab> per a eixir-ne."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE
+#: LYMessages.c:81
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
+msgstr "(Àrea de text) Introduïu text. Fletxes o <tab> per a eixir-ne."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_E
+#: LYMessages.c:83
+#, c-format
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
+msgstr "(À. text) Introduïu text. Fletxes o <tab> per a eixir-ne (%s per a l'editor)."
+
+#. #define FORM_LINK_TEXT_UNM_MSG
+#: LYMessages.c:85
+msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
+msgstr "Camp de text IMMODIFICABLE. Useu les fletxes o <tab> per a eixir-ne."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
+#: LYMessages.c:87
+msgid "(Form field) Enter text.  Use <return> to submit."
+msgstr "(Camp de formulari) Introduïu text. Useu <intro> per a enviar."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
+#: LYMessages.c:89
+#, c-format
+msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
+msgstr "(Camp de formulari) Introduïu text. <intro> per a enviar (%s sensemem. cau)."
+
+#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
+#: LYMessages.c:91
+msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
+msgstr "(C. form.) Introduïu text. <intro> per a enviar, fletxes o tab per eixir-ne."
+
+#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
+#: LYMessages.c:93
+msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
+msgstr "Camp IMMODIFICABLE. Useu les fletxes o el tabulador per a eixir-ne."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
+#: LYMessages.c:95
+msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
+msgstr "(correu) Introduïu text. <intro> per enviar-lo, amb les fletxes n'eixireu."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:97
+msgid "(mailto form field) Mail is disallowed so you cannot submit."
+msgstr "(Camp form. correu) El correu no està permés: no podeu enviar-ne."
+
+#. #define FORM_LINK_PASSWORD_MESSAGE
+#: LYMessages.c:99
+msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Contrasenya) Introduïu text. Useu les fletxes o <tab> per a eixir-ne."
+
+#. #define FORM_LINK_PASSWORD_UNM_MSG
+#: LYMessages.c:101
+msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
+msgstr "Camp de contrasenya IMMODIFICABLE. Fletxes o <tab> per a eixir-ne."
+
+#. #define FORM_LINK_CHECKBOX_MESSAGE
+#: LYMessages.c:103
+msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
+msgstr "(Camp de verificació) Useu '->' o <intro> per a canviar."
+
+#. #define FORM_LINK_CHECKBOX_UNM_MSG
+#: LYMessages.c:105
+msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
+msgstr "Quadre de verificació IMMODIFICABLE. Useu les fletxes per a eixir-ne."
+
+#. #define FORM_LINK_RADIO_MESSAGE
+#: LYMessages.c:107
+#, fuzzy
+msgid "(Radio Button)   Use right-arrow or <return> to toggle."
+msgstr "(Botó de grup) Useu '->' o <intro> per a canviar."
+
+#. #define FORM_LINK_RADIO_UNM_MSG
+#: LYMessages.c:109
+msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
+msgstr "Botó de grup IMMODIFICABLE. Useu fletxes o <tab> per a eixir-ne."
+
+#. #define FORM_LINK_SUBMIT_PREFIX
+#: LYMessages.c:111
+msgid "Submit ('x' for no cache) to "
+msgstr "Enviar a ('x' sense mem. cau) "
+
+#. #define FORM_LINK_RESUBMIT_PREFIX
+#: LYMessages.c:113
+msgid "Submit to "
+msgstr "Enviar a "
+
+#. #define FORM_LINK_SUBMIT_MESSAGE
+#: LYMessages.c:115
+msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
+msgstr "(Botó d'enviament) Useu '->' o <intro> per a enviar ('x' sense mem. cau)."
+
+#. #define FORM_LINK_RESUBMIT_MESSAGE
+#: LYMessages.c:117
+msgid "(Form submit button) Use right-arrow or <return> to submit."
+msgstr "(Botó d'enviament) Useu '->' o <intro> per a enviar."
+
+#. #define FORM_LINK_SUBMIT_DIS_MSG
+#: LYMessages.c:119
+msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
+msgstr "Botó d'enviament DESACTIVAT. Useu les fletxes o <tab> per a eixir-ne."
+
+#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
+#: LYMessages.c:121
+msgid "Submit mailto form to "
+msgstr "Enviar correu a "
+
+#. #define FORM_LINK_SUBMIT_MAILTO_MSG
+#: LYMessages.c:123
+msgid "(mailto form submit button) Use right-arrow or <return> to submit."
+msgstr "(Botó d'enviament de correu) Useu '->' o <intro> per a enviar-lo."
+
+#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:125
+msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
+msgstr "(Botó d'enviament de correu) El correu no està permés: no podeuenviar-ne."
+
+#. #define FORM_LINK_RESET_MESSAGE
+#: LYMessages.c:127
+msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
+msgstr "(Botó de reinici) Useu '->' o <intro> per a tornar als valors predeterminats."
+
+#. #define FORM_LINK_RESET_DIS_MSG
+#: LYMessages.c:129
+msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
+msgstr "Botó de reinici DESACTIVAT. Useu les fletxes o <tab> per a eixir-ne."
+
+#. #define FORM_LINK_OPTION_LIST_MESSAGE
+#: LYMessages.c:131
+msgid "(Option list) Hit return and use arrow keys and return to select option."
+msgstr "(Opcions) Premeu <intro> i useu les fletxes i <intro> per a triar-ne una."
+
+#. #define CHOICE_LIST_MESSAGE
+#: LYMessages.c:133
+msgid "(Choice list) Hit return and use arrow keys and return to select option."
+msgstr "(Tria) Premeu <intro>; useu les fletxes i <intro> per a triar una opció."
+
+#. #define FORM_LINK_OPTION_LIST_UNM_MSG
+#: LYMessages.c:135
+msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
+msgstr "Llista IMMODIFICABLE. <intro> per a revisar-la o fletxes per aeixir-ne."
+
+#. #define CHOICE_LIST_UNM_MSG
+#: LYMessages.c:137
+msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
+msgstr "Llista IMMODIFICABLE. <intro> per a revisar-la o les fletxes per aeixir-ne."
+
+#: LYMessages.c:138
+msgid "Submitting form..."
+msgstr "Enviant..."
+
+#: LYMessages.c:139
+msgid "Resetting form..."
+msgstr "Restablint els valors inicials del formulari..."
+
+#. #define RELOADING_FORM
+#: LYMessages.c:141
+msgid "Reloading document.  Any form entries will be lost!"
+msgstr "Recarregant document. Qualsevol entrada anterior es perdrà!"
+
+#: LYMessages.c:142
+#, c-format
+msgid "Warning: Cannot transcode form data to charset %s!"
+msgstr "Alerta: No es poden convertir les dades al joc de caràcters %s!"
+
+#. #define NORMAL_LINK_MESSAGE
+#: LYMessages.c:145
+msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
+msgstr "(ENLLAÇ NORMAL) Useu la fletxa a la dreta o <return> per a seguir-lo."
+
+#: LYMessages.c:146
+msgid "The resource requested is not available at this time."
+msgstr "El recurs sol·licitat no està disponible a hores d'ara."
+
+#: LYMessages.c:147
+msgid "Enter Lynx keystroke command: "
+msgstr "Introduïu la combinació de tecles: "
+
+#: LYMessages.c:148
+msgid "Looking up "
+msgstr "Buscant "
+
+#: LYMessages.c:149
+#, c-format
+msgid "Getting %s"
+msgstr "Rebent %s"
+
+#: LYMessages.c:150
+#, c-format
+msgid "Skipping %s"
+msgstr "Saltant-se %s"
+
+#: LYMessages.c:151
+#, c-format
+msgid "Using %s"
+msgstr "Usant %s"
+
+#: LYMessages.c:152
+#, c-format
+msgid "Illegal URL: %s"
+msgstr "Adreça il·legal: %s"
+
+#: LYMessages.c:153
+#, c-format
+msgid "Badly formed address %s"
+msgstr "Adreça mal formada: %s"
+
+#: LYMessages.c:154
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: LYMessages.c:155
+msgid "Unable to access WWW file!!!"
+msgstr "No ha estat possible accedir a l'arxiu!!"
+
+#: LYMessages.c:156
+#, c-format
+msgid "This is a searchable index.  Use %s to search."
+msgstr "Índex de recerca. Useu %s per a buscar."
+
+#. #define WWW_INDEX_MORE_MESSAGE
+#: LYMessages.c:158
+#, c-format
+msgid "--More--  This is a searchable index.  Use %s to search."
+msgstr "--Més--  Índex de recerca. Useu %s per a buscar."
+
+#: LYMessages.c:159
+msgid "You have entered an invalid link number."
+msgstr "Heu introduït un número d'enllaç incorrecte."
+
+#. #define SOURCE_HELP
+#: LYMessages.c:161
+msgid "Currently viewing document source.  Press '\\' to return to rendered version."
+msgstr "Aquest és el document font. Premeu '\\' per tornar a la versió interpretada."
+
+#. #define NOVICE_LINE_ONE
+#: LYMessages.c:163
+msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
+msgstr "Fletxes amunt i avall per a moure-us. '->' segueix l'enllaç; '<-' tornaenrere\n"
+
+#. #define NOVICE_LINE_TWO
+#: LYMessages.c:165
+msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
+msgstr "H ajuda O)pcions im(P)rimir  G anar M principal Q ix  / buscar [del] història\n"
+
+#. #define NOVICE_LINE_TWO_A
+#: LYMessages.c:167
+msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
+msgstr "O altres  H ajuda  K tecles  G anar  im(P)rimir  M principal o)pcions  Q ix \n"
+
+#. #define NOVICE_LINE_TWO_B
+#: LYMessages.c:169
+msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
+msgstr "O altres  B enrere E)ditar D)escarregar ^R)ecarregar  ^W refrescar  / buscar \n"
+
+#. #define NOVICE_LINE_TWO_C
+#: LYMessages.c:171
+msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
+msgstr "O altres C)omentari  [del] història  llibreta: V)eure, A)fegir, R eliminar\n"
+
+#. #define FORM_NOVICELINE_ONE
+#: LYMessages.c:173
+msgid "            Enter text into the field by typing on the keyboard              "
+msgstr "              Useu el teclat per a introduir text en el camp                 "
+
+#. #define FORM_NOVICELINE_TWO
+#: LYMessages.c:175
+msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
+msgstr "      Ctrl-U esborra tot el text, [Backspace] esborra només un caràcter      "
+
+#. #define FORM_NOVICELINE_TWO_DELBL
+#: LYMessages.c:177
+msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
+msgstr "        Ctrl-U esborra el text, [Backspace] esborra només un caràcter      "
+
+#. #define FORM_NOVICELINE_TWO_VAR
+#: LYMessages.c:179
+#, c-format
+msgid "    %s to delete all text in field, [Backspace] to delete a character    "
+msgstr "      %s esborra tot el text, [Backspace] esborra només un caràcter      "
+
+#. #define FORM_NOVICELINE_TWO_DELBL_VAR
+#: LYMessages.c:181
+#, c-format
+msgid "      %s to delete text in field, [Backspace] to delete a character    "
+msgstr "       %s esborra el text, [Backspace] esborra només un caràcter      "
+
+#. mailto
+#: LYMessages.c:184
+msgid "Malformed mailto form submission!  Cancelled!"
+msgstr "Formulari d'enviament de correu mal format! Anul·lació!"
+
+#: LYMessages.c:185
+msgid "Warning!  Control codes in mail address replaced by ?"
+msgstr "Alerta! Codis de control en l'adreça de correu substituïts per \"?\""
+
+#: LYMessages.c:186
+msgid "Mail disallowed!  Cannot submit."
+msgstr "El correu no està permés! No s'ha pogut enviar."
+
+#: LYMessages.c:187
+msgid "Mailto form submission failed!"
+msgstr "El formulari d'enviament de correu ha fallat!"
+
+#: LYMessages.c:188
+msgid "Mailto form submission Cancelled!!!"
+msgstr "Enviament cancel·lat!!"
+
+#: LYMessages.c:189
+msgid "Sending form content..."
+msgstr "Enviant el contingut del formulari..."
+
+#: LYMessages.c:190
+msgid "No email address is present in mailto URL!"
+msgstr "No hi ha cap adreça de correu en aquesta URL!"
+
+#. #define MAILTO_URL_TEMPOPEN_FAILED
+#: LYMessages.c:192
+msgid "Unable to open temporary file for mailto URL!"
+msgstr "Ha estat impossible obrir el fitxer temporal per a enviar correu a URL!"
+
+#. #define INC_ORIG_MSG_PROMPT
+#: LYMessages.c:194
+msgid "Do you wish to include the original message?"
+msgstr "Voleu incloure-hi el missatge original?"
+
+#. #define INC_PREPARSED_MSG_PROMPT
+#: LYMessages.c:196
+msgid "Do you wish to include the preparsed source?"
+msgstr "Voleu incloure-hi la font preanalitzada?"
+
+#. #define SPAWNING_EDITOR_FOR_MAIL
+#: LYMessages.c:198
+msgid "Spawning your selected editor to edit mail message"
+msgstr "Obrint l'editor seleccionat per a editar el missatge de correu"
+
+#. #define ERROR_SPAWNING_EDITOR
+#: LYMessages.c:200
+msgid "Error spawning editor, check your editor definition in the options menu"
+msgstr "No s'ha pogut obrir l'editor, comproveu-ne la definició en el menúd'opcions"
+
+#: LYMessages.c:201
+msgid "Send this comment?"
+msgstr "Enviar aquest comentari?"
+
+#: LYMessages.c:202
+msgid "Send this message?"
+msgstr "Enviar aquest missatge?"
+
+#: LYMessages.c:203
+msgid "Sending your message..."
+msgstr "Enviant el missatge..."
+
+#: LYMessages.c:204
+msgid "Sending your comment:"
+msgstr "Enviant el comentari:"
+
+#. textarea
+#: LYMessages.c:207
+msgid "Not in a TEXTAREA; cannot use external editor."
+msgstr "No és una àrea de text; no hi podeu usar l'editor extern."
+
+#: LYMessages.c:208
+msgid "Not in a TEXTAREA; cannot use command."
+msgstr "No és una àrea de text; no s'hi pot usar l'ordre indicada."
+
+#: LYMessages.c:211
+msgid "file: ACTIONs are disallowed!"
+msgstr "fitxer: les accions (ACTIONS) no estan permeses!"
+
+#. #define FILE_SERVED_LINKS_DISALLOWED
+#: LYMessages.c:213
+msgid "file: URLs via served links are disallowed!"
+msgstr ""
+
+#: LYMessages.c:214
+msgid "Access to local files denied."
+msgstr "Accés als arxius locals denegat."
+
+#: LYMessages.c:215
+msgid "file: URLs via bookmarks are disallowed!"
+msgstr "fitxer: les URLs del fitxer d'adreces d'interés no estan permeses!"
+
+#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
+#: LYMessages.c:217
+msgid "This special URL is not allowed in external documents!"
+msgstr "No es permet aquesta URL especial en documents externs!"
+
+#: LYMessages.c:218
+msgid "Press <return> to return to Lynx."
+msgstr "Premeu <return> per tornar a Lynx."
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:221
+msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
+msgstr ""
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:225
+msgid "Type EXIT to return to Lynx.\n"
+msgstr "Escriviu 'exit' per a tornar a Lynx.\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:228
+msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
+msgstr "Obrint la shell predeterminada. Useu \"exit\" per a tornar a Lynx.\n"
+
+#: LYMessages.c:231
+msgid "Spawning is currently disabled."
+msgstr ""
+
+#: LYMessages.c:232
+msgid "The 'd'ownload command is currently disabled."
+msgstr "Actualment l'opció de (d)escàrrega no està activa."
+
+#: LYMessages.c:233
+msgid "You cannot download an input field."
+msgstr "No és possible descarregar un camp d'entrada de dades."
+
+#: LYMessages.c:234
+msgid "Form has a mailto action!  Cannot download."
+msgstr ""
+
+#: LYMessages.c:235
+msgid "You cannot download a mailto: link."
+msgstr "No es pot descarregar un enllaç a una adreça de correu."
+
+#: LYMessages.c:236
+msgid "You cannot download cookies."
+msgstr "Les cookies es poden descarregar."
+
+#: LYMessages.c:237
+msgid "You cannot download a printing option."
+msgstr "No es poden descarregar les opcions d'impressió."
+
+#: LYMessages.c:238
+msgid "You cannot download an upload option."
+msgstr "No es poden descarregar les opcions de càrrega."
+
+#: LYMessages.c:239
+msgid "You cannot download an permit option."
+msgstr ""
+
+#: LYMessages.c:240
+msgid "This special URL cannot be downloaded!"
+msgstr "Aquesta URL especial no es pot descarregar!"
+
+#: LYMessages.c:241
+msgid "Nothing to download."
+msgstr "No hi ha res per descarregar."
+
+#: LYMessages.c:242
+msgid "Trace ON!"
+msgstr "Rastreig activat! (Trace ON!)"
+
+#: LYMessages.c:243
+msgid "Trace OFF!"
+msgstr "Rastreig desactivat! (Trace OFF!)"
+
+#. #define CLICKABLE_IMAGES_ON
+#: LYMessages.c:245
+msgid "Links will be included for all images!  Reloading..."
+msgstr "S'hi inclouran els enllaços a totes les imatges! Recarregant..."
+
+#. #define CLICKABLE_IMAGES_OFF
+#: LYMessages.c:247
+msgid "Standard image handling restored!  Reloading..."
+msgstr "Manejament estàndar d'imatges restaurat! Recarregant..."
+
+#. #define PSEUDO_INLINE_ALTS_ON
+#: LYMessages.c:249
+msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
+msgstr "S'inseriran pseudo-ALTs per a les imatges sense cadena ALT! Recarrega..."
+
+#. #define PSEUDO_INLINE_ALTS_OFF
+#: LYMessages.c:251
+msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
+msgstr "S'ignoraran les imatges sense cadena alternativa ("
+
+#: LYMessages.c:252
+msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
+msgstr "Mode 8-bits cru o CJK activat! Recàrrega..."
+
+#: LYMessages.c:253
+msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
+msgstr "Mode 8-bits cru o CJK desactivat!  Recàrrega..."
+
+#. #define HEAD_D_L_OR_CANCEL
+#: LYMessages.c:255
+msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
+msgstr "Voleu enviar una sol·licitud HEAD per al D)ocument o l'en(L)laç, or C)ancel·lar? (d,l,c):"
+
+#. #define HEAD_D_OR_CANCEL
+#: LYMessages.c:257
+msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
+msgstr "Voleu enviar una sol·licitud HEAD per al D)ocument o C)ancel·lar? (d,c):"
+
+#: LYMessages.c:258
+msgid "Sorry, the document is not an http URL."
+msgstr "El document no és una URL http."
+
+#: LYMessages.c:259
+msgid "Sorry, the link is not an http URL."
+msgstr "L'enllaç no és una URL http."
+
+#: LYMessages.c:260
+msgid "Sorry, the ACTION for this form is disabled."
+msgstr "L'ACCIÓ del formulari no està disponible."
+
+#. #define FORM_ACTION_NOT_HTTP_URL
+#: LYMessages.c:262
+msgid "Sorry, the ACTION for this form is not an http URL."
+msgstr "L'ACCIÓ del formulari no és una adreça de http."
+
+#: LYMessages.c:263
+msgid "Not an http URL or form ACTION!"
+msgstr "No és una URL http ni una ACCIO de formulari!"
+
+#: LYMessages.c:264
+msgid "This special URL cannot be a form ACTION!"
+msgstr "Aquesta URL especial no pot ser una ACCIO de formulari!"
+
+#: LYMessages.c:265
+msgid "URL is not in starting realm!"
+msgstr "La URL no està en el domini inicial!"
+
+#: LYMessages.c:266
+msgid "News posting is disabled!"
+msgstr "L'enviament de missatges als fòrums de discusió està desactivada!"
+
+#: LYMessages.c:267
+msgid "File management support is disabled!"
+msgstr "L'administració de fitxers està desactivada!"
+
+#: LYMessages.c:268
+msgid "No jump file is currently available."
+msgstr "No hi ha cap fitxer de salts disponible."
+
+#: LYMessages.c:269
+msgid "Jump to (use '?' for list): "
+msgstr "Saltar a (premeu '?' per veure la llista): "
+
+#: LYMessages.c:270
+msgid "Jumping to a shortcut URL is disallowed!"
+msgstr ""
+
+#: LYMessages.c:271
+msgid "Random URL is disallowed!  Use a shortcut."
+msgstr "Les adreces aleatòries estan desactivades. Useu una drecera."
+
+#: LYMessages.c:272
+msgid "No random URLs have been used thus far."
+msgstr "Fins ara no s'han usat URLs aleatòries."
+
+#: LYMessages.c:273
+msgid "Bookmark features are currently disabled."
+msgstr "Els \"favorits\" estan desactivats."
+
+#: LYMessages.c:274
+msgid "Execution via bookmarks is disabled."
+msgstr "L'execució a través del fitxer d'adreces està desactivada."
+
+#. #define BOOKMARK_FILE_NOT_DEFINED
+#: LYMessages.c:276
+#, c-format
+msgid "Bookmark file is not defined. Use %s to see options."
+msgstr "El fitxer de favorits no està definit. Useu %s per a veure les opcions."
+
+#. #define NO_TEMP_FOR_HOTLIST
+#: LYMessages.c:278
+msgid "Unable to open tempfile for X Mosaic hotlist conversion."
+msgstr "No ha estat possible obrir el fitxer temporal per a convertir el fitxer d'adreces de Mosaic."
+
+#: LYMessages.c:279
+msgid "ERROR - unable to open bookmark file."
+msgstr "ERROR: ha estat impossible obrir l'arxiu d'adreces"
+
+#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:281
+msgid "Unable to open bookmark file for deletion of link."
+msgstr "No ha estat possible obrir l'arxiu d'adreces per esborrar l'enllaç."
+
+#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:283
+msgid "Unable to open scratch file for deletion of link."
+msgstr ""
+
+#: LYMessages.c:285
+msgid "Error renaming scratch file."
+msgstr ""
+
+#: LYMessages.c:287
+msgid "Error renaming temporary file."
+msgstr "Error quan s'intentava reanomenar un arxiu temporal."
+
+#. #define BOOKTEMP_COPY_FAIL
+#: LYMessages.c:289
+msgid "Unable to copy temporary file for deletion of link."
+msgstr ""
+
+#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
+#: LYMessages.c:291
+msgid "Unable to reopen temporary file for deletion of link."
+msgstr ""
+
+#. #define BOOKMARK_LINK_NOT_ONE_LINE
+#: LYMessages.c:294
+msgid "Link is not by itself all on one line in bookmark file."
+msgstr "Hi ha d'haver un "
+
+#: LYMessages.c:295
+msgid "Bookmark deletion failed."
+msgstr ""
+
+#. #define BOOKMARKS_NOT_TRAVERSED
+#: LYMessages.c:297
+msgid "Bookmark files cannot be traversed (only http URLs)."
+msgstr ""
+
+#. #define BOOKMARKS_NOT_OPEN
+#: LYMessages.c:299
+msgid "Unable to open bookmark file, use 'a' to save a link first"
+msgstr "Impossible obrir el fitxer d'adreces, useu 'a' per a guardar-neuna primer."
+
+#: LYMessages.c:300
+msgid "There are no links in this bookmark file!"
+msgstr "No hi ha enllaços en aquest fitxer d'adreces!"
+
+#. #define BOOK_D_L_OR_CANCEL
+#: LYMessages.c:302
+msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
+msgstr "Guardar com a adreça d'interés D)ocument o en(L)laç,o C)ancel·lar? (d,l,c): "
+
+#: LYMessages.c:303
+msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
+msgstr "Guardar D)ocument en l'arxiu d'adreces d'interéso C)ancel·lar? (d, c): "
+
+#: LYMessages.c:304
+msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
+msgstr "Guardar en(L)laç en l'arxiu d'adreces d'interéso C)ancel·lar? (l, c): "
+
+#. #define NOBOOK_POST_FORM
+#: LYMessages.c:306
+msgid "Documents from forms with POST content cannot be saved as bookmarks."
+msgstr "No es pot guardar al fitxer d'adreces documents procedents de formularis POST."
+
+#: LYMessages.c:307
+msgid "Cannot save form fields/links"
+msgstr ""
+
+#. #define NOBOOK_HSML
+#: LYMessages.c:309
+msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
+msgstr "Els fitxers historial, informació, menú i lista no es poden guardar al fitxer d'adreces."
+
+#. #define CONFIRM_BOOKMARK_DELETE
+#: LYMessages.c:311
+msgid "Do you really want to delete this link from your bookmark file?"
+msgstr "Esteu segurs que voleu esborrar aquest enllaç de l'arxiu d'adreces?"
+
+#: LYMessages.c:312
+msgid "Malformed address."
+msgstr "Adreça mal formada."
+
+#. #define HISTORICAL_ON_MINIMAL_OFF
+#: LYMessages.c:314
+msgid "Historical comment parsing ON (Minimal is overridden)!"
+msgstr ""
+
+#. #define HISTORICAL_OFF_MINIMAL_ON
+#: LYMessages.c:316
+msgid "Historical comment parsing OFF (Minimal is in effect)!"
+msgstr ""
+
+#. #define HISTORICAL_ON_VALID_OFF
+#: LYMessages.c:318
+msgid "Historical comment parsing ON (Valid is overridden)!"
+msgstr ""
+
+#. #define HISTORICAL_OFF_VALID_ON
+#: LYMessages.c:320
+msgid "Historical comment parsing OFF (Valid is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_ON_IN_EFFECT
+#: LYMessages.c:322
+msgid "Minimal comment parsing ON (and in effect)!"
+msgstr ""
+
+#. #define MINIMAL_OFF_VALID_ON
+#: LYMessages.c:324
+msgid "Minimal comment parsing OFF (Valid is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_ON_BUT_HISTORICAL
+#: LYMessages.c:326
+msgid "Minimal comment parsing ON (but Historical is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_OFF_HISTORICAL_ON
+#: LYMessages.c:328
+msgid "Minimal comment parsing OFF (Historical is in effect)!"
+msgstr ""
+
+#: LYMessages.c:329
+msgid "Soft double-quote parsing ON!"
+msgstr ""
+
+#: LYMessages.c:330
+msgid "Soft double-quote parsing OFF!"
+msgstr ""
+
+#: LYMessages.c:331
+msgid "Now using TagSoup parsing of HTML."
+msgstr "Utilitzant l'analitzador d'HTML TagSoup."
+
+#: LYMessages.c:332
+msgid "Now using SortaSGML parsing of HTML!"
+msgstr "Utilitzant l'analitzador d'HTML SortaSGML!"
+
+#: LYMessages.c:333
+msgid "You are already at the end of this document."
+msgstr "És açò, el final del document."
+
+#: LYMessages.c:334
+msgid "You are already at the beginning of this document."
+msgstr "És ací, el principi del document."
+
+#: LYMessages.c:335
+#, c-format
+msgid "You are already at page %d of this document."
+msgstr "És aquesta, la %da pàgina del document."
+
+#: LYMessages.c:336
+#, c-format
+msgid "Link number %d already is current."
+msgstr "És aquest, l'enllaç número %d."
+
+#: LYMessages.c:337
+msgid "You are already at the first document"
+msgstr "Aquest és el primer document"
+
+#: LYMessages.c:338
+msgid "There are no links above this line of the document."
+msgstr "No hi ha enllaços per damunt d'aquesta línia."
+
+#: LYMessages.c:339
+msgid "There are no links below this line of the document."
+msgstr "No hi ha enllaços per sota d'aquesta línia."
+
+#. #define MAXLEN_REACHED_DEL_OR_MOV
+#: LYMessages.c:341
+msgid "Maximum length reached!  Delete text or move off field."
+msgstr "S'ha assolit la longitud màxima! Esborreu text o eixiu del camp."
+
+#. #define NOT_ON_SUBMIT_OR_LINK
+#: LYMessages.c:343
+msgid "You are not on a form submission button or normal link."
+msgstr "No és ni un botó d'enviament ni un enllaç normal."
+
+#. #define NEED_CHECKED_RADIO_BUTTON
+#: LYMessages.c:345
+msgid "One radio button must be checked at all times!"
+msgstr "Sempre s'ha de triar una opció!"
+
+#: LYMessages.c:346
+msgid "No submit button for this form, submit single text field?"
+msgstr "No hi ha cap botó d'enviament, enviar simplemtent el camp de text?"
+
+#: LYMessages.c:347
+msgid "Do you want to go back to the previous document?"
+msgstr "Voleu tornar al document anterior?"
+
+#: LYMessages.c:348
+msgid "Use arrows or tab to move off of field."
+msgstr "Useu les fletxes o <tab> per a eixir-ne."
+
+#. #define ENTER_TEXT_ARROWS_OR_TAB
+#: LYMessages.c:350
+msgid "Enter text.  Use arrows or tab to move off of field."
+msgstr "Introduïu text. Useu les fletxes o el tabulador per a eixir-ne."
+
+#: LYMessages.c:351
+msgid "** Bad HTML!!  No form action defined. **"
+msgstr "** Codi HTML incorrecte!! No hi ha cap acció definida. **"
+
+#: LYMessages.c:352
+msgid "Bad HTML!!  Unable to create popup window!"
+msgstr "Codi HTML incorrecte! Ha estat impossible crear la finestra emergent!"
+
+#: LYMessages.c:353
+msgid "Unable to create popup window!"
+msgstr "Ha estat impossible crear la finestra emergent!"
+
+#: LYMessages.c:354
+msgid "Goto a random URL is disallowed!"
+msgstr "El salt a una URL aleatòria està desactivat!"
+
+#: LYMessages.c:355
+msgid "Goto a non-http URL is disallowed!"
+msgstr "L'accés a URLs que no compleixen el protocol http no està permés!"
+
+#: LYMessages.c:356
+#, c-format
+msgid "You are not allowed to goto \"%s\" URLs"
+msgstr "No teniu permís per a anar a URLs \"%s\""
+
+#: LYMessages.c:357
+msgid "URL to open: "
+msgstr "Anar a: "
+
+#: LYMessages.c:358
+msgid "Edit the current Goto URL: "
+msgstr "Editar l'adreça actual: "
+
+#: LYMessages.c:359
+msgid "Edit the previous Goto URL: "
+msgstr "Editar l'adreça anterior: "
+
+#: LYMessages.c:360
+msgid "Edit a previous Goto URL: "
+msgstr "Editar adreces anteriors: "
+
+#: LYMessages.c:361
+msgid "Current document has POST data."
+msgstr "El document actual conté dades POST."
+
+#: LYMessages.c:362
+msgid "Edit this document's URL: "
+msgstr "Editar l'adreça d'aquest document: "
+
+#: LYMessages.c:363
+msgid "Edit the current link's URL: "
+msgstr "Editar l'adreça de l'enllaç actual: "
+
+#: LYMessages.c:364
+msgid "You cannot edit File Management URLs"
+msgstr "No es poden editar les URLs del gestor de fitxers."
+
+#: LYMessages.c:365
+msgid "Enter a database query: "
+msgstr "Introduïu una consulta a la base de dades: "
+
+#: LYMessages.c:366
+msgid "Enter a whereis query: "
+msgstr "Introduïu la paraula que voleu trobar: "
+
+#: LYMessages.c:367
+msgid "Edit the current query: "
+msgstr "Editar la consulta: "
+
+#: LYMessages.c:368
+msgid "Edit the previous query: "
+msgstr "Editar la consulta anterior: "
+
+#: LYMessages.c:369
+msgid "Edit a previous query: "
+msgstr "Editar una consulta anterior: "
+
+#. #define USE_C_R_TO_RESUB_CUR_QUERY
+#: LYMessages.c:371
+msgid "Use Control-R to resubmit the current query."
+msgstr "Useu Ctrl-R per a reenviar la consulta actual."
+
+#: LYMessages.c:372
+msgid "Edit the current shortcut: "
+msgstr "Editar la drecera actual: "
+
+#: LYMessages.c:373
+msgid "Edit the previous shortcut: "
+msgstr "Editar la drecera anterior: "
+
+#: LYMessages.c:374
+msgid "Edit a previous shortcut: "
+msgstr "Editar una drecera anterior: "
+
+#: LYMessages.c:375
+#, c-format
+msgid "Key '%c' is not mapped to a jump file!"
+msgstr "La tecla '%c' no està assignada a cap fitxer de salt!"
+
+#: LYMessages.c:376
+msgid "Cannot locate jump file!"
+msgstr "No s'ha pogut trobar el fitxer de salts!"
+
+#: LYMessages.c:377
+msgid "Cannot open jump file!"
+msgstr "No s'ha pogut obrir el fitxer de salts!"
+
+#: LYMessages.c:378
+msgid "Error reading jump file!"
+msgstr "Error de lectura en el fitxer de salts!"
+
+#: LYMessages.c:379
+msgid "Out of memory reading jump file!"
+msgstr "Memòria exhaurida durant la lectura del fitxer de salts!"
+
+#: LYMessages.c:380
+msgid "Out of memory reading jump table!"
+msgstr "Memòria exhaurida durant la lectura de la taula de salts!"
+
+#: LYMessages.c:381
+msgid "No index is currently available."
+msgstr "No hi ha cap índex disponible."
+
+#. #define CONFIRM_MAIN_SCREEN
+#: LYMessages.c:383
+msgid "Do you really want to go to the Main screen?"
+msgstr "Esteu segur de voler anar a la pàgina principal?"
+
+#: LYMessages.c:384
+msgid "You are already at main screen!"
+msgstr "És aquesta, la pàgina principal!"
+
+#. #define NOT_ISINDEX
+#: LYMessages.c:386
+msgid "Not a searchable indexed document -- press '/' to search for a text string"
+msgstr "No és un document indexat: premeu '/' per a buscar una cadena de text"
+
+#. #define NO_OWNER
+#: LYMessages.c:388
+msgid "No owner is defined for this file so you cannot send a comment"
+msgstr "No consta el propietari de l'arxiu: no podeu enviar-li cap comentari"
+
+#: LYMessages.c:389
+#, c-format
+msgid "No owner is defined. Use %s?"
+msgstr "No consta el propietari. Usar %s?"
+
+#: LYMessages.c:390
+msgid "Do you wish to send a comment?"
+msgstr "Voleu enviar un comentari?"
+
+#: LYMessages.c:391
+msgid "Mail is disallowed so you cannot send a comment"
+msgstr "El correu no està permés; per tant, no podeu enviar comentaris."
+
+#: LYMessages.c:392
+msgid "The 'e'dit command is currently disabled."
+msgstr "L'ordre Editar està desactivada."
+
+#: LYMessages.c:393
+msgid "External editing is currently disabled."
+msgstr "L'edició externa està desactivada."
+
+#: LYMessages.c:394
+msgid "System error - failure to get status."
+msgstr "Error del sistema: no s'ha pogut obtenir l'estat."
+
+#: LYMessages.c:395
+msgid "No editor is defined!"
+msgstr "No hi ha cap editor definit!"
+
+#: LYMessages.c:396
+msgid "The 'p'rint command is currently disabled."
+msgstr "L'ordre imPrimir està desactivada."
+
+#: LYMessages.c:397
+msgid "Document has no Toolbar links or Banner."
+msgstr "El document no té barra d'enllaços ni banner."
+
+#: LYMessages.c:398
+msgid "Unable to open traversal file."
+msgstr ""
+
+#: LYMessages.c:399
+msgid "Unable to open traversal found file."
+msgstr ""
+
+#: LYMessages.c:400
+msgid "Unable to open reject file."
+msgstr ""
+
+#: LYMessages.c:401
+msgid "Unable to open traversal errors output file"
+msgstr ""
+
+#: LYMessages.c:402
+msgid "TRAVERSAL WAS INTERRUPTED"
+msgstr ""
+
+#: LYMessages.c:403
+msgid "Follow link (or goto link or page) number: "
+msgstr "Seguir l'enllaç (o anar a la pàgina) número: "
+
+#: LYMessages.c:404
+msgid "Select option (or page) number: "
+msgstr "Triar opció (o pàgina) número: "
+
+#: LYMessages.c:405
+#, c-format
+msgid "Option number %d already is current."
+msgstr "És aquesta, l'opció número %d."
+
+#. #define ALREADY_AT_OPTION_END
+#: LYMessages.c:407
+msgid "You are already at the end of this option list."
+msgstr "És ací, el final de la llista d'opcions."
+
+#. #define ALREADY_AT_OPTION_BEGIN
+#: LYMessages.c:409
+msgid "You are already at the beginning of this option list."
+msgstr "És ací, el començament de la llista d'opcions."
+
+#. #define ALREADY_AT_OPTION_PAGE
+#: LYMessages.c:411
+#, c-format
+msgid "You are already at page %d of this option list."
+msgstr "És aquesta, la pàgina %d de la llista d'opcions."
+
+#: LYMessages.c:412
+msgid "You have entered an invalid option number."
+msgstr "Heu introduït un número d'opció que no és vàlid."
+
+#: LYMessages.c:413
+msgid "** Bad HTML!!  Use -trace to diagnose. **"
+msgstr "** HTML erroni!! Useu l'opció -trace per a obtenir un diagnòstic. **"
+
+#: LYMessages.c:414
+msgid "Give name of file to save in"
+msgstr "Cal un nom per a l'arxiu."
+
+#: LYMessages.c:415
+msgid "Can't save data to file -- please run WWW locally"
+msgstr "No s'ha pogut guardar les dades al fitxer: executeu WWW localment."
+
+#: LYMessages.c:416
+msgid "Can't open temporary file!"
+msgstr "No ha estat possible obrir l'arxiu temporal!"
+
+#: LYMessages.c:417
+msgid "Can't open output file!  Cancelling!"
+msgstr "No ha estat possible obrir l'arxiu d'eixida! Anul·lat!"
+
+#: LYMessages.c:418
+msgid "Execution is disabled."
+msgstr "L'execució no està activada."
+
+#. #define EXECUTION_DISABLED_FOR_FILE
+#: LYMessages.c:420
+#, c-format
+msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
+msgstr "L'execució no està activada. Vegeu el menú d'opcions (useu %s)."
+
+#. #define EXECUTION_NOT_COMPILED
+#: LYMessages.c:422
+msgid "Execution capabilities are not compiled into this version."
+msgstr "La capacitat d'executar programes no s'ha compilat en aquesta versió."
+
+#: LYMessages.c:423
+msgid "This file cannot be displayed on this terminal."
+msgstr "El fitxer no es pot mostrar en aquest terminal."
+
+#. #define CANNOT_DISPLAY_FILE_D_OR_C
+#: LYMessages.c:425
+msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
+msgstr "El fitxer no es pot mostrar en aquest terminal: D)escarregar oC)ancel·lar."
+
+#: LYMessages.c:426
+#, c-format
+msgid "%s  D)ownload, or C)ancel"
+msgstr "%s D)escarregar o C)ancel·lar"
+
+#: LYMessages.c:427
+msgid "Cancelling file."
+msgstr "Cancel·lant."
+
+#: LYMessages.c:428
+msgid "Retrieving file.  - PLEASE WAIT -"
+msgstr "Descarregant fitxer. - ESPEREU, PER FAVOR -"
+
+#: LYMessages.c:429
+msgid "Enter a filename: "
+msgstr "Introduïu un nom per a l'arxiu: "
+
+#: LYMessages.c:430
+msgid "Edit the previous filename: "
+msgstr "Editar el nom anterior: "
+
+#: LYMessages.c:431
+msgid "Edit a previous filename: "
+msgstr "Editar els noms anteriors: "
+
+#: LYMessages.c:432
+msgid "Enter a new filename: "
+msgstr "Introduïu un nom nou: "
+
+#: LYMessages.c:433
+msgid "File name may not begin with a dot."
+msgstr "Els noms d'arxiu no poden començar amb punt."
+
+#: LYMessages.c:435
+msgid "File exists.  Create higher version?"
+msgstr ""
+
+#: LYMessages.c:437
+msgid "File exists.  Overwrite?"
+msgstr "L'arxiu existeix. Voleu sobreescriure'l?"
+
+#: LYMessages.c:439
+msgid "Cannot write to file."
+msgstr "No es pot escriure en el fitxer."
+
+#: LYMessages.c:440
+msgid "ERROR! - download command is misconfigured."
+msgstr "ERROR: l'ordre _descarregar_ està mal configurada."
+
+#: LYMessages.c:441
+msgid "Unable to download file."
+msgstr "Ha estat impossible descarregar el fitxer."
+
+#: LYMessages.c:442
+msgid "Reading directory..."
+msgstr "Llegint directori..."
+
+#: LYMessages.c:443
+msgid "Building directory listing..."
+msgstr "Construint la llista del directori..."
+
+#: LYMessages.c:444
+msgid "Saving..."
+msgstr "Gravant..."
+
+#: LYMessages.c:445
+#, c-format
+msgid "Could not edit file '%s'."
+msgstr "No ha estat possible editar el fitxer '%s'."
+
+#: LYMessages.c:446
+msgid "Unable to access document!"
+msgstr "No ha estat possible accedir al document!"
+
+#: LYMessages.c:447
+msgid "Could not access file."
+msgstr "No ha estat possible accedir a l'arxiu."
+
+#: LYMessages.c:448
+msgid "Could not access directory."
+msgstr "No ha estat possible accedir al directori."
+
+#: LYMessages.c:449
+msgid "Could not load data."
+msgstr "No ha estat possible carregar les dades."
+
+#. #define CANNOT_EDIT_REMOTE_FILES
+#: LYMessages.c:451
+msgid "Lynx cannot currently (e)dit remote WWW files."
+msgstr "Lynx no pot editar fitxers WWW remots."
+
+#. #define CANNOT_EDIT_FIELD
+#: LYMessages.c:453
+msgid "This field cannot be (e)dited with an external editor."
+msgstr "Aquest camp no es pot editar amb un editor extern."
+
+#: LYMessages.c:454
+msgid "Bad rule"
+msgstr "Regla incorrecta"
+
+#: LYMessages.c:455
+msgid "Insufficient operands:"
+msgstr "Nombre d'operands insuficient:"
+
+#: LYMessages.c:456
+msgid "You are not authorized to edit this file."
+msgstr "No teniu autorització per a editar aquest arxiu."
+
+#: LYMessages.c:457
+msgid "Title: "
+msgstr "Títol: "
+
+#: LYMessages.c:458
+msgid "Subject: "
+msgstr "Tema: "
+
+#: LYMessages.c:459
+msgid "Username: "
+msgstr "Nom d'usuari: "
+
+#: LYMessages.c:460
+msgid "Password: "
+msgstr "Contrassenya: "
+
+#: LYMessages.c:461
+msgid "lynx: Username and Password required!!!"
+msgstr "lynx: fa falta el nom d'usuari i la contrasenya!!"
+
+#: LYMessages.c:462
+msgid "lynx: Password required!!!"
+msgstr "lynx: fa falta la contrasenya!!"
+
+#: LYMessages.c:463
+msgid "Clear all authorization info for this session?"
+msgstr "Esborrar tota la informació sobre autorització d'aquesta sessió?"
+
+#: LYMessages.c:464
+msgid "Authorization info cleared."
+msgstr "Informació esborrada."
+
+#: LYMessages.c:465
+msgid "Authorization failed.  Retry?"
+msgstr "Autorització fallida. Reintentar?"
+
+#: LYMessages.c:466
+msgid "cgi support has been disabled."
+msgstr "s'ha desactivat el suport per a CGI."
+
+#. #define CGI_NOT_COMPILED
+#: LYMessages.c:468
+msgid "Lynxcgi capabilities are not compiled into this version."
+msgstr "La capacitat d'usar CGI no ha estat compilada en aquesta versió."
+
+#: LYMessages.c:469
+#, c-format
+msgid "Sorry, no known way of converting %s to %s."
+msgstr "Em sap greu, no sé com convertir %s a %s."
+
+#: LYMessages.c:470
+msgid "Unable to set up connection."
+msgstr "Ha estat impossible establir la connexió."
+
+#: LYMessages.c:471
+msgid "Unable to make connection"
+msgstr "Ha estat impossible fer la connexió."
+
+#. #define MALFORMED_EXEC_REQUEST
+#: LYMessages.c:473
+msgid "Executable link rejected due to malformed request."
+msgstr "Enllaç executable rebutjat a causa d'una sol·licitud mal formada."
+
+#. #define BADCHAR_IN_EXEC_LINK
+#: LYMessages.c:475
+#, c-format
+msgid "Executable link rejected due to `%c' character."
+msgstr "Enllaç executable rebutjat a causa del caràcter \"%c\"."
+
+#. #define RELPATH_IN_EXEC_LINK
+#: LYMessages.c:477
+msgid "Executable link rejected due to relative path string ('../')."
+msgstr "Enllaç executable rebutjat a causa d'un camí relatiu (\"../\")."
+
+#. #define BADLOCPATH_IN_EXEC_LINK
+#: LYMessages.c:479
+msgid "Executable link rejected due to location or path."
+msgstr "Enllaç executable rebutjat a causa de la localització o la ruta."
+
+#: LYMessages.c:480
+msgid "Mail access is disabled!"
+msgstr "L'accés a correu no està activat!"
+
+#. #define ACCESS_ONLY_LOCALHOST
+#: LYMessages.c:482
+msgid "Only files and servers on the local host can be accessed."
+msgstr "Només podeu accedir a fitxers i servidors en la màquina local."
+
+#: LYMessages.c:483
+msgid "Telnet access is disabled!"
+msgstr "L'accés a telnet no està activat"
+
+#. #define TELNET_PORT_SPECS_DISABLED
+#: LYMessages.c:485
+msgid "Telnet port specifications are disabled."
+msgstr "Les especificacions del port telnet estan desactivades."
+
+#: LYMessages.c:486
+msgid "USENET news access is disabled!"
+msgstr "L'accés als fòrums de discusió (USENET) no està activat!"
+
+#: LYMessages.c:487
+msgid "Rlogin access is disabled!"
+msgstr "L'accés a través de rlogin està desactivat!"
+
+#: LYMessages.c:488
+msgid "Ftp access is disabled!"
+msgstr "L'accés a ftp no està activat!"
+
+#: LYMessages.c:489
+msgid "There are no references from this document."
+msgstr "No hi ha referències d'aquest document."
+
+#: LYMessages.c:490
+msgid "There are only hidden links from this document."
+msgstr "En aquest document només hi ha enllaços ocults."
+
+#: LYMessages.c:492
+msgid "Unable to open command file."
+msgstr "No ha estat possible obrir el fitxer d'ordres."
+
+#: LYMessages.c:494
+msgid "News Post Cancelled!!!"
+msgstr "Missatge cancel·lat!!"
+
+#. #define SPAWNING_EDITOR_FOR_NEWS
+#: LYMessages.c:496
+msgid "Spawning your selected editor to edit news message"
+msgstr "Creant el procés fill que obri l'editor per a editar el missatge"
+
+#: LYMessages.c:497
+msgid "Post this message?"
+msgstr "Esteu segur que voleu enviar aquest missatge?"
+
+#: LYMessages.c:498
+#, c-format
+msgid "Append '%s'?"
+msgstr "Afegir \"%s\"?"
+
+#: LYMessages.c:499
+msgid "Posting to newsgroup(s)..."
+msgstr "Enviant al(s) fòrum(s)..."
+
+#: LYMessages.c:501
+msgid "*** You have unread mail. ***"
+msgstr "*** Teniu correu pendent. ***"
+
+#: LYMessages.c:503
+msgid "*** You have mail. ***"
+msgstr "*** Teniu correu. ***"
+
+#: LYMessages.c:505
+msgid "*** You have new mail. ***"
+msgstr "*** Teniu correu nou. ***"
+
+#: LYMessages.c:506
+msgid "File insert cancelled!!!"
+msgstr "Inserció del fitxer cancel·lada!!"
+
+#: LYMessages.c:507
+msgid "Not enough memory for file!"
+msgstr "No hi ha prou memòria per al fitxer!"
+
+#: LYMessages.c:508
+msgid "Can't open file for reading."
+msgstr "No ha estat possible llegir l'arxiu."
+
+#: LYMessages.c:509
+msgid "File does not exist."
+msgstr "L'arxiu no existeix."
+
+#: LYMessages.c:510
+msgid "File does not exist - reenter or cancel:"
+msgstr "L'arxiu no existeix. Reescriviu-ne el nom o cancel·leu:"
+
+#: LYMessages.c:511
+msgid "File is not readable."
+msgstr "L'arxiu no es pot llegir."
+
+#: LYMessages.c:512
+msgid "File is not readable - reenter or cancel:"
+msgstr "L'arxiu no es pot llegir. Reescriviu-ne el nom o cancel·leu:"
+
+#: LYMessages.c:513
+msgid "Nothing to insert - file is 0-length."
+msgstr "No hi ha res per a inserir: el fitxer té longitud 0."
+
+#: LYMessages.c:514
+msgid "Save request cancelled!!!"
+msgstr "(Gravar) Operació cancel·lada!!"
+
+#: LYMessages.c:515
+msgid "Mail request cancelled!!!"
+msgstr "Sol·licitud de correu cancel·lada!!"
+
+#. #define CONFIRM_MAIL_SOURCE_PREPARSED
+#: LYMessages.c:517
+msgid "Viewing preparsed source.  Are you sure you want to mail it?"
+msgstr "Font preanalitzada. Segur que voleu enviar-la?"
+
+#: LYMessages.c:518
+msgid "Please wait..."
+msgstr "Per favor, espereu..."
+
+#: LYMessages.c:519
+msgid "Mailing file.  Please wait..."
+msgstr "Enviant arxiu. Per favor, espereu..."
+
+#: LYMessages.c:520
+msgid "ERROR - Unable to mail file"
+msgstr "ERROR: ha estat impossible enviar l'arxiu"
+
+#. #define CONFIRM_LONG_SCREEN_PRINT
+#: LYMessages.c:522
+#, c-format
+msgid "File is %d screens long.  Are you sure you want to print?"
+msgstr "L'arxiu ocupa %d pantalles. Esteu segur que voleu imprimir-lo?"
+
+#: LYMessages.c:523
+msgid "Print request cancelled!!!"
+msgstr "Impressió cancel·lada!!"
+
+#: LYMessages.c:524
+msgid "Press <return> to begin: "
+msgstr "Premeu <return> per començar: "
+
+#: LYMessages.c:525
+msgid "Press <return> to finish: "
+msgstr "Premeu <return> per finalitzar: "
+
+#. #define CONFIRM_LONG_PAGE_PRINT
+#: LYMessages.c:527
+#, c-format
+msgid "File is %d pages long.  Are you sure you want to print?"
+msgstr "L'arxiu ocupa %d pàgines. Esteu segur que voleu imprimir-lo?"
+
+#. #define CHECK_PRINTER
+#: LYMessages.c:529
+msgid "Be sure your printer is on-line.  Press <return> to start printing:"
+msgstr "Assegureu-vos que la impressora està connectada. Premeu <intro>per començar:"
+
+#: LYMessages.c:530
+msgid "ERROR - Unable to allocate file space!!!"
+msgstr ""
+
+#: LYMessages.c:531
+msgid "Unable to open tempfile"
+msgstr "No ha estat possible obrir l'arxiu temporal"
+
+#: LYMessages.c:532
+msgid "Unable to open print options file"
+msgstr "No ha estat possible obrir l'arxiu d'opcions d'impressió"
+
+#: LYMessages.c:533
+msgid "Printing file.  Please wait..."
+msgstr "Imprimint l'arxiu. Per favor, espereu..."
+
+#: LYMessages.c:534
+msgid "Please enter a valid internet mail address: "
+msgstr "Per favor, introduïu una adreça de correu vàlida: "
+
+#: LYMessages.c:535
+msgid "ERROR! - printer is misconfigured!"
+msgstr "ERROR: la impressora no està ben configurada!"
+
+#: LYMessages.c:536
+msgid "Image map from POST response not available!"
+msgstr ""
+
+#: LYMessages.c:537
+msgid "Misdirected client-side image MAP request!"
+msgstr ""
+
+#: LYMessages.c:538
+msgid "Client-side image MAP is not accessible!"
+msgstr ""
+
+#: LYMessages.c:539
+msgid "No client-side image MAPs are available!"
+msgstr ""
+
+#: LYMessages.c:540
+msgid "Client-side image MAP is not available!"
+msgstr ""
+
+#. #define OPTION_SCREEN_NEEDS_24
+#: LYMessages.c:543
+msgid "Screen height must be at least 24 lines for the Options menu!"
+msgstr "La pantalla ha de tenir si més no 24 línies per al menú d'opcions!"
+
+#. #define OPTION_SCREEN_NEEDS_23
+#: LYMessages.c:545
+msgid "Screen height must be at least 23 lines for the Options menu!"
+msgstr "La pantalla ha de tenir si més no 23 línies per al menú d'opcions"
+
+#. #define OPTION_SCREEN_NEEDS_22
+#: LYMessages.c:547
+msgid "Screen height must be at least 22 lines for the Options menu!"
+msgstr "La pantalla ha de tenir si més no 22 línies per al menú d'opcions"
+
+#: LYMessages.c:549
+msgid "That key requires Advanced User mode."
+msgstr "Per a usar aquesta tecla cal activar el mode d'usuari avançat"
+
+#: LYMessages.c:550
+#, c-format
+msgid "Content-type: %s"
+msgstr "Tipus de contingut: %s"
+
+#: LYMessages.c:551
+msgid "Command: "
+msgstr "Ordre: "
+
+#: LYMessages.c:552
+msgid "Unknown or ambiguous command"
+msgstr "Ordre desconeguda o ambigua"
+
+#: LYMessages.c:553
+msgid " Version "
+msgstr " Versió "
+
+#: LYMessages.c:554
+msgid " first"
+msgstr " primer"
+
+#: LYMessages.c:555
+msgid ", guessing..."
+msgstr ", provant..."
+
+#: LYMessages.c:556
+msgid "Permissions for "
+msgstr "Permisos per a "
+
+#: LYMessages.c:557
+msgid "Select "
+msgstr ""
+
+#: LYMessages.c:558
+msgid "capital letter"
+msgstr ""
+
+#: LYMessages.c:559
+msgid " of option line,"
+msgstr ""
+
+#: LYMessages.c:560
+msgid " to save,"
+msgstr ""
+
+#: LYMessages.c:561
+msgid " to "
+msgstr ""
+
+#: LYMessages.c:562
+msgid " or "
+msgstr " o "
+
+#: LYMessages.c:563
+msgid " index"
+msgstr " índex"
+
+#: LYMessages.c:564
+msgid " to return to Lynx."
+msgstr " per a tornar a Lynx."
+
+#: LYMessages.c:565
+msgid "Accept Changes"
+msgstr "Acceptar els canvis"
+
+#: LYMessages.c:566
+msgid "Reset Changes"
+msgstr "Anul·lar els canvis"
+
+#: LYMessages.c:567
+msgid "Left Arrow cancels changes"
+msgstr "'<-' cancel·la els canvis"
+
+#: LYMessages.c:568
+msgid "Save options to disk"
+msgstr "Gravar les opcions al disc"
+
+#: LYMessages.c:569
+msgid "Hit RETURN to accept entered data."
+msgstr "Premeu <return> per acceptar les dades introduïdes."
+
+#. #define ACCEPT_DATA_OR_DEFAULT
+#: LYMessages.c:571
+msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
+msgstr "<intro> accepta les dades. Esborreu-les si voleu els valors preestablerts"
+
+#: LYMessages.c:572
+msgid "Value accepted!"
+msgstr "Valor acceptat!"
+
+#. #define VALUE_ACCEPTED_WARNING_X
+#: LYMessages.c:574
+msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
+msgstr "Valor acceptat!  ALERTA: Lynx està configurat per a XWINDOWS!"
+
+#. #define VALUE_ACCEPTED_WARNING_NONX
+#: LYMessages.c:576
+msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
+msgstr "Valor acceptat!  ALERTA: Lynx no està configurat per a XWINDOWS!"
+
+#: LYMessages.c:577
+msgid "You are not allowed to change which editor to use!"
+msgstr "No teniu permís per a canviar l'editor!"
+
+#: LYMessages.c:578
+msgid "Failed to set DISPLAY variable!"
+msgstr "Ha estat impossible especificar el nou valor de la variable DISPLAY!"
+
+#: LYMessages.c:579
+msgid "Failed to clear DISPLAY variable!"
+msgstr "Ha estat impossible eliminar el valor de la variable DISPLAY!"
+
+#. #define BOOKMARK_CHANGE_DISALLOWED
+#: LYMessages.c:581
+msgid "You are not allowed to change the bookmark file!"
+msgstr "No teniu permís per a canviar l'arxiu d'adreces!"
+
+#: LYMessages.c:582
+msgid "Terminal does not support color"
+msgstr "El terminal no pot mostrar colors"
+
+#: LYMessages.c:583
+#, c-format
+msgid "Your '%s' terminal does not support color."
+msgstr "El terminal '%s' no pot mostrar colors."
+
+#: LYMessages.c:584
+msgid "Access to dot files is disabled!"
+msgstr "L'accés als arxius que comencen amb un punt no està activat!"
+
+#. #define UA_NO_LYNX_WARNING
+#: LYMessages.c:586
+msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
+msgstr "La cadena que identifica el navegador no conté ni \"Lynx\" ni \"L_y_n_x\""
+
+#. #define UA_PLEASE_USE_LYNX
+#: LYMessages.c:588
+msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
+msgstr "Useu \"L_y_n_x\" o \"Lynx\" en l'identificador o semblareu desertors!"
+
+#. #define UA_CHANGE_DISABLED
+#: LYMessages.c:590
+msgid "Changing of the User-Agent string is disabled!"
+msgstr "El canvi de la cadena identificadora del navegador està desactivat!"
+
+#. #define CHANGE_OF_SETTING_DISALLOWED
+#: LYMessages.c:592
+msgid "You are not allowed to change this setting."
+msgstr "No teniu permís per a canviar aquesta opció."
+
+#: LYMessages.c:593
+msgid "Saving Options..."
+msgstr "Gravant les opcions..."
+
+#: LYMessages.c:594
+msgid "Options saved!"
+msgstr "Opcions gravades!"
+
+#: LYMessages.c:595
+msgid "Unable to save Options!"
+msgstr "No ha estat possible gravar les opcions!"
+
+#: LYMessages.c:596
+msgid " 'r' to return to Lynx "
+msgstr " 'r' per tornar a Lynx "
+
+#: LYMessages.c:597
+msgid " '>' to save, or 'r' to return to Lynx "
+msgstr " '>' per gravar, 'r' per tornar a Lynx "
+
+#. #define ANY_KEY_CHANGE_RET_ACCEPT
+#: LYMessages.c:599
+msgid "Hit any key to change value; RETURN to accept."
+msgstr "Premeu qualsevol tecla per canviar el valor; <intro> per acceptar."
+
+#: LYMessages.c:600
+msgid "Error uncompressing temporary file!"
+msgstr "Error descomprimint l'arxiu temporal!"
+
+#: LYMessages.c:601
+msgid "Unsupported URL scheme!"
+msgstr "URL no suportada!"
+
+#: LYMessages.c:602
+msgid "Unsupported data: URL!  Use SHOWINFO, for now."
+msgstr ""
+
+#: LYMessages.c:603
+msgid "Redirection limit of 10 URL's reached."
+msgstr "S'ha assolit el límit de redireccions: 10 URLs."
+
+#: LYMessages.c:604
+msgid "Illegal redirection URL received from server!"
+msgstr "S'ha rebut del servidor una URL de redirecció il·legal!"
+
+#. #define SERVER_ASKED_FOR_REDIRECTION
+#: LYMessages.c:606
+#, c-format
+msgid "Server asked for %d redirection of POST content to"
+msgstr ""
+
+#: LYMessages.c:609
+msgid "P)roceed, use G)ET or C)ancel "
+msgstr "P)rocedir, usar G)ET o C)ancel·lar "
+
+#: LYMessages.c:610
+msgid "P)roceed, or C)ancel "
+msgstr "P)rocedir o C)ancel·lar "
+
+#. #define ADVANCED_POST_GET_REDIRECT
+#: LYMessages.c:612
+msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
+msgstr ""
+
+#. #define ADVANCED_POST_REDIRECT
+#: LYMessages.c:614
+msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
+msgstr ""
+
+#. #define CONFIRM_POST_RESUBMISSION
+#: LYMessages.c:616
+msgid "Document from Form with POST content.  Resubmit?"
+msgstr "El document procedeix d'un formulari amb contingut POST. Reenviar?"
+
+#. #define CONFIRM_POST_RESUBMISSION_TO
+#: LYMessages.c:618
+#, c-format
+msgid "Resubmit POST content to %s ?"
+msgstr "Reenviar el contingut del POST a %s?"
+
+#. #define CONFIRM_POST_LIST_RELOAD
+#: LYMessages.c:620
+#, c-format
+msgid "List from document with POST data.  Reload %s ?"
+msgstr "La llista prové d'un document amb dades POST. Voleu recarregar %s?"
+
+#. #define CONFIRM_POST_DOC_HEAD
+#: LYMessages.c:622
+msgid "Document from POST action, HEAD may not be understood.  Proceed?"
+msgstr ""
+
+#. #define CONFIRM_POST_LINK_HEAD
+#: LYMessages.c:624
+msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
+msgstr ""
+
+#: LYMessages.c:625
+msgid "Proceed without a username and password?"
+msgstr "Continuar sense nom d'usuari i sense contrasenya?"
+
+#: LYMessages.c:626
+#, c-format
+msgid "Proceed (%s)?"
+msgstr "Continuar (%s)?"
+
+#: LYMessages.c:627
+msgid "Cannot POST to this host."
+msgstr ""
+
+#: LYMessages.c:628
+msgid "POST not supported for this URL - ignoring POST data!"
+msgstr ""
+
+#: LYMessages.c:629
+msgid "Discarding POST data..."
+msgstr "Descartant les dades del POST..."
+
+#: LYMessages.c:630
+msgid "Document will not be reloaded!"
+msgstr "No es recarregarà el document!"
+
+#: LYMessages.c:631
+msgid "Location: "
+msgstr "Ubicació: "
+
+#: LYMessages.c:632
+#, c-format
+msgid "'%s' not found!"
+msgstr "no s'ha trobat \"%s\""
+
+#: LYMessages.c:633
+msgid "Default Bookmark File"
+msgstr "Fitxer de favorits predeterminat"
+
+#: LYMessages.c:634
+msgid "Screen too small! (8x35 min)"
+msgstr "Pantalla massa xicoteta! (8x35 min)"
+
+#: LYMessages.c:635
+msgid "Select destination or ^G to Cancel: "
+msgstr "Trieu destinació o ^G per cancel·lar: "
+
+#. #define MULTIBOOKMARKS_SELECT
+#: LYMessages.c:637
+msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
+msgstr "Trieu fitxer de favorits, \"=\" mostra el menú i ^G cancel·la: "
+
+#. #define MULTIBOOKMARKS_SELF
+#: LYMessages.c:639
+msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
+msgstr "Reproduir l'en(L)laç en aquest fitxer de favorits o C)ancel·lar? (l,c):"
+
+#: LYMessages.c:640
+msgid "Multiple bookmark support is not available."
+msgstr "El suport per a més d'un fitxer d'adreces no està activat."
+
+#: LYMessages.c:641
+#, c-format
+msgid " Select Bookmark (screen %d of %d)"
+msgstr " Trieu el fitxer de favorits (pantalla %d de %d)"
+
+#: LYMessages.c:642
+msgid "       Select Bookmark"
+msgstr "       Trieu fitxer de favorits"
+
+#. #define MULTIBOOKMARKS_EHEAD_MASK
+#: LYMessages.c:644
+#, c-format
+msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
+msgstr "Edició de la descripció i del camí del fitxer d'adreces interessants (%d de 2)"
+
+#. #define MULTIBOOKMARKS_EHEAD
+#: LYMessages.c:646
+msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
+msgstr "Edició de la descripció i el camí del fitxer d'adreces d'interés"
+
+#: LYMessages.c:647
+msgid "Letter: "
+msgstr "Lletra: "
+
+#. #define USE_PATH_OFF_HOME
+#: LYMessages.c:650
+msgid "Use a filepath off your login directory in SHELL syntax!"
+msgstr ""
+
+#: LYMessages.c:652
+msgid "Use a filepath off your home directory!"
+msgstr "Useu un camí que no pertanga al vostre directori!"
+
+#. #define MAXLINKS_REACHED
+#: LYMessages.c:655
+msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
+msgstr "Superat el nre. d'enllaços/pàg.! Useu mitja pàg. o desplaçament de dues línies."
+
+#. #define MAXHIST_REACHED
+#: LYMessages.c:657
+msgid "History List maximum reached!  Document not pushed."
+msgstr "L'historial ha assolit el màxim! Aquest document no s'hi afegirà."
+
+#: LYMessages.c:658
+msgid "No previously visited links available!"
+msgstr "No hi ha disponible cap enllaç anterior!"
+
+#: LYMessages.c:659
+msgid "Memory exhausted!  Program aborted!"
+msgstr "Memòria exhaurida! Programa vortat!"
+
+#: LYMessages.c:660
+msgid "Memory exhausted!  Aborting..."
+msgstr "Memòria exhaurida! Avortant..."
+
+#: LYMessages.c:661
+msgid "Not enough memory!"
+msgstr "No hi ha prou memòria!"
+
+#: LYMessages.c:662
+msgid "Directory/File Manager not available"
+msgstr "No hi ha cap administrador de fitxers disponible"
+
+#: LYMessages.c:663
+msgid "HREF in BASE tag is not an absolute URL."
+msgstr "La referència (HREF) en l'etiqueta BASE no és una URL absoluta."
+
+#: LYMessages.c:664
+msgid "Location URL is not absolute."
+msgstr "La URL no és absoluta."
+
+#: LYMessages.c:665
+msgid "Refresh URL is not absolute."
+msgstr "La URL de refresc no és absoluta."
+
+#. #define SENDING_MESSAGE_WITH_BODY_TO
+#: LYMessages.c:667
+msgid ""
+"You are sending a message with body to:\n"
+"  "
+msgstr ""
+"Esteu enviant un missatge no buit a:\n"
+"  "
+
+#: LYMessages.c:668
+msgid ""
+"You are sending a comment to:\n"
+"  "
+msgstr ""
+"Esteu enviant un comentari a:\n"
+"  "
+
+#: LYMessages.c:669
+msgid ""
+"\n"
+" With copy to:\n"
+"  "
+msgstr ""
+"\n"
+" Amb còpia a:\n"
+"  "
+
+#: LYMessages.c:670
+msgid ""
+"\n"
+" With copies to:\n"
+"  "
+msgstr ""
+"\n"
+" Amb còpies a:\n"
+"  "
+
+#. #define CTRL_G_TO_CANCEL_SEND
+#: LYMessages.c:672
+msgid ""
+"\n"
+"\n"
+"Use Ctrl-G to cancel if you do not want to send a message\n"
+msgstr ""
+"\n"
+"\n"
+"Useu Ctrl-G per a cancel·lar si no voleu enviar el missatge\n"
+
+#. #define ENTER_NAME_OR_BLANK
+#: LYMessages.c:674
+msgid ""
+"\n"
+" Please enter your name, or leave it blank to remain anonymous\n"
+msgstr ""
+"\n"
+" Escriviu el vostre nom o deixeu l'espai en blanc si voleu que siga anònim\n"
+
+#. #define ENTER_MAIL_ADDRESS_OR_OTHER
+#: LYMessages.c:676
+msgid ""
+"\n"
+" Please enter a mail address or some other\n"
+msgstr ""
+"\n"
+" Introduïu una adreça de correu o alguna altra\n"
+
+#. #define MEANS_TO_CONTACT_FOR_RESPONSE
+#: LYMessages.c:678
+msgid " means to contact you, if you desire a response.\n"
+msgstr " forma de contactar, si voleu resposta.\n"
+
+#: LYMessages.c:679
+msgid ""
+"\n"
+" Please enter a subject line.\n"
+msgstr ""
+"\n"
+" Introduïu l'assumpte.\n"
+
+#. #define ENTER_ADDRESS_FOR_CC
+#: LYMessages.c:681
+msgid ""
+"\n"
+" Enter a mail address for a CC of your message.\n"
+msgstr ""
+"\n"
+" Escriviu l'adreça a què voleu enviar una còpia del missatge.\n"
+
+#: LYMessages.c:682
+msgid " (Leave blank if you don't want a copy.)\n"
+msgstr " (Deixeu la línia en blanc si no en voleu enviar còpia.)\n"
+
+#: LYMessages.c:683
+msgid ""
+"\n"
+" Please review the message body:\n"
+"\n"
+msgstr ""
+"\n"
+" Per favor, reviseu el cos del missatge:\n"
+"\n"
+
+#: LYMessages.c:684
+msgid ""
+"\n"
+"Press RETURN to continue: "
+msgstr ""
+"\n"
+"Premeu <intro> per continuar: "
+
+#: LYMessages.c:685
+msgid ""
+"\n"
+"Press RETURN to clean up: "
+msgstr ""
+"\n"
+"Premeu <intro> per esborrar: "
+
+#: LYMessages.c:686
+msgid " Use Control-U to erase the default.\n"
+msgstr " Premeu Ctrl-U per esborrar el valor suggerit.\n"
+
+#: LYMessages.c:687
+msgid ""
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+" Escriviu el missatge a partir d'ací."
+
+#. #define ENTER_PERIOD_WHEN_DONE_A
+#: LYMessages.c:689 src/LYNews.c:361
+msgid ""
+"\n"
+" When you are done, press enter and put a single period (.)"
+msgstr ""
+"\n"
+" Quan acabeu, premeu <intro> i escriviu només un punt (.)"
+
+#. #define ENTER_PERIOD_WHEN_DONE_B
+#: LYMessages.c:691 src/LYNews.c:362
+msgid ""
+"\n"
+" on a line and press enter again."
+msgstr ""
+"\n"
+" al començament de la línia i torneu a prémer <intro>."
+
+#. Cookies messages
+#. #define ADVANCED_COOKIE_CONFIRMATION
+#: LYMessages.c:695
+#, c-format
+msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
+msgstr "Cookie de %s: %.*s=%.*s Admetre-la? (S/N/A sempre/V mai)"
+
+#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
+#: LYMessages.c:697
+#, c-format
+msgid "Accept invalid cookie domain=%s for '%s'?"
+msgstr "Voleu acceptar la cookie amb el domini invàlid %s en comptes de '%s'?"
+
+#. #define INVALID_COOKIE_PATH_CONFIRMATION
+#: LYMessages.c:699
+#, c-format
+msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
+msgstr "Accepteu la cookie amb el camí (no vàlid) %s com a prefix de '%s'?"
+
+#: LYMessages.c:700
+msgid "Allowing this cookie."
+msgstr "Tolerant aquesta cookie."
+
+#: LYMessages.c:701
+msgid "Rejecting this cookie."
+msgstr "Rebutjant aquesta cookie."
+
+#: LYMessages.c:702
+msgid "The Cookie Jar is empty."
+msgstr "El recipient de les cookies és buit."
+
+#. #define ACTIVATE_TO_GOBBLE
+#: LYMessages.c:704
+msgid "Activate links to gobble up cookies or entire domains,"
+msgstr "Seguiu els enllaços per eliminar les cookies o els dominis,"
+
+#: LYMessages.c:705
+msgid "or to change a domain's 'allow' setting."
+msgstr "o per a canviar l\"índex de tolerància\"."
+
+#: LYMessages.c:706
+msgid "(Cookies never allowed.)"
+msgstr "(Cookies sempre prohibides)"
+
+#: LYMessages.c:707
+msgid "(Cookies always allowed.)"
+msgstr "(Cookies sempre tolerades)"
+
+#: LYMessages.c:708
+msgid "(Cookies allowed via prompt.)"
+msgstr "(Es pregunta abans d'acceptar cookies)"
+
+#: LYMessages.c:709
+msgid "(Persistent Cookies.)"
+msgstr "(Cookies persistents)"
+
+#: LYMessages.c:710
+msgid "(No title.)"
+msgstr "(Sense títol)"
+
+#: LYMessages.c:711
+msgid "(No name.)"
+msgstr "(Sense nom)"
+
+#: LYMessages.c:712
+msgid "(No value.)"
+msgstr "(Sense valor)"
+
+#: LYMessages.c:713
+msgid "None"
+msgstr ""
+
+#: LYMessages.c:714
+msgid "(End of session.)"
+msgstr "(Fi de la sessió)"
+
+#: LYMessages.c:715
+msgid "Delete this cookie?"
+msgstr "Esborrar aquesta cookie?"
+
+#: LYMessages.c:716
+msgid "The cookie has been eaten!"
+msgstr "La cookie ha estat esborrada!"
+
+#: LYMessages.c:717
+msgid "Delete this empty domain?"
+msgstr "Esborrar aquest domini buit?"
+
+#: LYMessages.c:718
+msgid "The domain has been eaten!"
+msgstr "El domini ha estat esborrat!"
+
+#. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:720
+msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "D esborrar el domini, admetre  A sempre/P)reguntar/V mai, o C)ancel·lar? "
+
+#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:722
+msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "D esborrar domini, admetre  A sempre/P)reguntar/V mai, o C)ancel·lar?"
+
+#: LYMessages.c:723
+msgid "All cookies in the domain have been eaten!"
+msgstr "Totes les cookies del domini han estat esborrades!"
+
+#: LYMessages.c:724
+#, c-format
+msgid "'A'lways allowing from domain '%s'."
+msgstr "Toler(A)r-les sempre que provinguen del domini '%s'."
+
+#: LYMessages.c:725
+#, c-format
+msgid "ne'V'er allowing from domain '%s'."
+msgstr "Rebutjar-les sempre que provinguen del domini '%s'."
+
+#: LYMessages.c:726
+#, c-format
+msgid "'P'rompting to allow from domain '%s'."
+msgstr "(P)reguntar sempre que provinguen del domini '%s'."
+
+#: LYMessages.c:727
+msgid "Delete all cookies in this domain?"
+msgstr "Esborrar totes les cookies del domini?"
+
+#: LYMessages.c:728
+msgid "All of the cookies in the jar have been eaten!"
+msgstr "Totes les cookies han estat esborrades!"
+
+#: LYMessages.c:730
+msgid "Port 19 not permitted in URLs."
+msgstr "El port 19 no està permés en les URLs."
+
+#: LYMessages.c:731
+msgid "Port 25 not permitted in URLs."
+msgstr "El port 25 no està permés en les URLs."
+
+#: LYMessages.c:732
+#, c-format
+msgid "Port %lu not permitted in URLs."
+msgstr "El port %lu no està permés en les URLs."
+
+#: LYMessages.c:733
+msgid "URL has a bad port field."
+msgstr ""
+
+#: LYMessages.c:734
+msgid "Maximum nesting of HTML elements exceeded."
+msgstr "S'ha excedit el màxim nombre d'anidaments permés per a l'HTML."
+
+#: LYMessages.c:735
+msgid "Bad partial reference!  Stripping lead dots."
+msgstr ""
+
+#: LYMessages.c:736
+msgid "Trace Log open failed.  Trace off!"
+msgstr "No s'ha pogut obrir el fitxer de rastreig. Rastreig desactivat!"
+
+#: LYMessages.c:737
+msgid "Lynx Trace Log"
+msgstr "Rastreig (Lynx Trace Log)"
+
+#: LYMessages.c:738
+msgid "No trace log has been started for this session."
+msgstr "No s'ha iniciat el rastreig en aquesta sessió."
+
+#. #define MAX_TEMPCOUNT_REACHED
+#: LYMessages.c:740
+msgid "The maximum temporary file count has been reached!"
+msgstr "S'ha assolit el nombre màxim de fitxers temporals!"
+
+#. #define FORM_VALUE_TOO_LONG
+#: LYMessages.c:742
+msgid "Form field value exceeds buffer length!  Trim the tail."
+msgstr "El valor del camp excedeix la longitud de la memòria intermèdia! Es tallarà."
+
+#. #define FORM_TAIL_COMBINED_WITH_HEAD
+#: LYMessages.c:744
+msgid "Modified tail combined with head of form field value."
+msgstr ""
+
+#. HTFile.c
+#: LYMessages.c:747
+msgid "Directory"
+msgstr "Directori"
+
+#: LYMessages.c:748
+msgid "Directory browsing is not allowed."
+msgstr "La navegació pel directori està prohibida."
+
+#: LYMessages.c:749
+msgid "Selective access is not enabled for this directory"
+msgstr "No està habilitat l'accés selectiu a aquest directori"
+
+#: LYMessages.c:750
+msgid "Multiformat: directory scan failed."
+msgstr ""
+
+#: LYMessages.c:751
+msgid "This directory is not readable."
+msgstr "No es pot llegir el directori."
+
+#: LYMessages.c:752
+msgid "Can't access requested file."
+msgstr "No es pot accedir al fitxer sol·licitat."
+
+#: LYMessages.c:753
+msgid "Could not find suitable representation for transmission."
+msgstr ""
+
+#: LYMessages.c:754
+msgid "Could not open file for decompression!"
+msgstr "No s'ha pogut obrir el fitxer per a descomprimir-lo!"
+
+#: LYMessages.c:755
+msgid "Files:"
+msgstr "Arxius:"
+
+#: LYMessages.c:756
+msgid "Subdirectories:"
+msgstr "Subdirectoris:"
+
+#: LYMessages.c:757
+msgid " directory"
+msgstr " directori"
+
+#: LYMessages.c:758
+msgid "Up to "
+msgstr "De "
+
+#: LYMessages.c:759
+msgid "Current directory is "
+msgstr "El directori actual és "
+
+#. HTGopher.c
+#: LYMessages.c:762
+msgid "No response from server!"
+msgstr "El servidor no respon!"
+
+#: LYMessages.c:763
+msgid "CSO index"
+msgstr "Índex CSO"
+
+#: LYMessages.c:764
+msgid ""
+"\n"
+"This is a searchable index of a CSO database.\n"
+msgstr "\n"
+
+#: LYMessages.c:765
+msgid "CSO Search Results"
+msgstr "Resultats de la recerca CSO"
+
+#: LYMessages.c:766
+#, c-format
+msgid "Seek fail on %s\n"
+msgstr ""
+
+#: LYMessages.c:767
+msgid ""
+"\n"
+"Press the 's' key and enter search keywords.\n"
+msgstr ""
+"\n"
+"Premeu 's' i introduïu els mots que voleu cercar.\n"
+
+#: LYMessages.c:768
+msgid ""
+"\n"
+"This is a searchable Gopher index.\n"
+msgstr "\n"
+
+#: LYMessages.c:769
+msgid "Gopher index"
+msgstr "Í"
+
+#: LYMessages.c:770
+msgid "Gopher Menu"
+msgstr "Menú gopher"
+
+#: LYMessages.c:771
+msgid " Search Results"
+msgstr " Resultats de la recerca"
+
+#: LYMessages.c:772
+msgid "Sending CSO/PH request."
+msgstr "S'està enviant una sol·licitud CSO/PH."
+
+#: LYMessages.c:773
+msgid "Sending Gopher request."
+msgstr "S'està enviant la sol·licitud gopher"
+
+#: LYMessages.c:774
+msgid "CSO/PH request sent; waiting for response."
+msgstr "Sol·licitud COS/PH enviada; s'està esperant resposta."
+
+#: LYMessages.c:775
+msgid "Gopher request sent; waiting for response."
+msgstr "S'ha enviat la sol·licitud gopher; s'està esperant resposta."
+
+#: LYMessages.c:776
+msgid ""
+"\n"
+"Please enter search keywords.\n"
+msgstr ""
+"\n"
+"Per favor, introduïu els mots que voleu cercar.\n"
+
+#: LYMessages.c:777
+msgid ""
+"\n"
+"The keywords that you enter will allow you to search on a"
+msgstr ""
+"\n"
+"Els mots que heu introduït us permetran cercar en un"
+
+#: LYMessages.c:778
+msgid " person's name in the database.\n"
+msgstr " nom de persona en una base de dades.\n"
+
+#. HTNews.c
+#: LYMessages.c:781
+msgid "Connection closed ???"
+msgstr "Connexió tancada ??"
+
+#: LYMessages.c:782
+msgid "Cannot open temporary file for news POST."
+msgstr "No ha estat possible obrir el fitxer temporal per enviar el missatge."
+
+#: LYMessages.c:783
+msgid "This client does not contain support for posting to news with SSL."
+msgstr "Aquest client no pot enviar missatges als fòrums amb SSL."
+
+#. HTStyle.c
+#: LYMessages.c:786
+#, c-format
+msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
+msgstr ""
+
+#: LYMessages.c:787
+#, c-format
+msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
+msgstr ""
+
+#: LYMessages.c:788
+#, c-format
+msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
+msgstr ""
+
+#: LYMessages.c:789
+#, c-format
+msgid "\t\tTab kind=%d at %.0f\n"
+msgstr ""
+
+#. HTTP.c
+#: LYMessages.c:792
+msgid "Can't proceed without a username and password."
+msgstr "No es pot continuar sense un nom d'usuari i una contrasenya."
+
+#: LYMessages.c:793
+msgid "Can't retry with authorization!  Contact the server's WebMaster."
+msgstr "No es pot reintentar sense autorització! Poseu-vos en contacte amb el webmestre."
+
+#: LYMessages.c:794
+msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
+msgstr "No es pot reintentar sense autorització del proxy! Poseu-vos en contacte amb el webmestre."
+
+#: LYMessages.c:795
+msgid "Retrying with proxy authorization information."
+msgstr "Reintent amb la informació de autorització del servidor intermediari (proxy)."
+
+#. HTWAIS.c
+#: LYMessages.c:798
+msgid "HTWAIS: Return message too large."
+msgstr "HTWAIS: El missatge de retorn és massa llarg."
+
+#: LYMessages.c:799
+msgid "Enter WAIS query: "
+msgstr "Introduïu la consulta de tipus WAIS:"
+
+#. Miscellaneous status
+#: LYMessages.c:802
+msgid "Retrying as HTTP0 request."
+msgstr "Reintentant com a sol·licitud HTTP0."
+
+#: LYMessages.c:803
+#, c-format
+msgid "Transferred %d bytes"
+msgstr "%d bytes transferits"
+
+#: LYMessages.c:804
+msgid "Data transfer complete"
+msgstr "Transferència completa"
+
+#: LYMessages.c:805
+#, c-format
+msgid "Error processing line %d of %s\n"
+msgstr "Error mentre es processava la línia %d de %s\n"
+
+#. Lynx internal page titles
+#: LYMessages.c:808
+msgid "Address List Page"
+msgstr "Pàgina d'adreces"
+
+#: LYMessages.c:809
+msgid "Bookmark file"
+msgstr "Agenda d'adreces d'interés"
+
+#: LYMessages.c:810
+msgid "Configuration Definitions"
+msgstr "Configuració"
+
+#: LYMessages.c:811
+msgid "Cookie Jar"
+msgstr "Pot de les galetes (cookie jar) :-)"
+
+#: LYMessages.c:812
+msgid "Current Key Map"
+msgstr "Combinacions de tecles actual"
+
+#: LYMessages.c:813
+msgid "File Management Options"
+msgstr "Opcions d'administració de fitxers"
+
+#: LYMessages.c:814
+msgid "Download Options"
+msgstr "Opcions de descàrrega"
+
+#: LYMessages.c:815
+msgid "History Page"
+msgstr "Historial"
+
+#: LYMessages.c:816
+msgid "List Page"
+msgstr ""
+
+#: LYMessages.c:817
+msgid "Lynx.cfg Information"
+msgstr "Informació del fitxer lynx.cfg"
+
+#: LYMessages.c:818
+msgid "Converted Mosaic Hotlist"
+msgstr "Fitxer d'adreces d'interés de Mosaic convertit"
+
+#: LYMessages.c:819
+msgid "Options Menu"
+msgstr "Menú d'opcions"
+
+#: LYMessages.c:820
+msgid "File Permission Options"
+msgstr "Opcions dels permissos dels fitxers"
+
+#: LYMessages.c:821
+msgid "Printing Options"
+msgstr "Opcions d'impressió"
+
+#: LYMessages.c:822
+msgid "Information about the current document"
+msgstr "Informació del document actual"
+
+#: LYMessages.c:823
+msgid "Your recent statusline messages"
+msgstr "Missatges recents apareguts en la línia d'estat"
+
+#: LYMessages.c:824
+msgid "Upload Options"
+msgstr "Opcions de càrrega"
+
+#: LYMessages.c:825
+msgid "Visited Links Page"
+msgstr "Pàgina dels enllaços visitats"
+
+#. CONFIG_DEF_TITLE subtitles
+#: LYMessages.c:828
+msgid "See also"
+msgstr "Vegeu també"
+
+#: LYMessages.c:829
+msgid "your"
+msgstr ""
+
+#: LYMessages.c:830
+msgid "for runtime options"
+msgstr "opcions en temps d'execució"
+
+#: LYMessages.c:831
+msgid "compile time options"
+msgstr "opcions en temps de compilació"
+
+#: LYMessages.c:832
+#, fuzzy
+msgid "color-style configuration"
+msgstr "Configuració primària"
+
+#: LYMessages.c:833
+msgid "latest release"
+msgstr "última versió"
+
+#: LYMessages.c:834
+msgid "pre-release version"
+msgstr "versió de prova"
+
+#: LYMessages.c:835
+msgid "development version"
+msgstr "versió de desenvolupament"
+
+#. #define AUTOCONF_CONFIG_CACHE
+#: LYMessages.c:837
+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 ""
+"Les dades següents es van generar durant el procés de configuració i\n"
+"compilació automàtiques d'aquesta còpia de Lynx. Quan informeu d'un error,\n"
+"per favor, incloeu una còpia d'aquesta pàgina."
+
+#. #define AUTOCONF_LYNXCFG_H
+#: LYMessages.c:841
+msgid ""
+"The following data were used as automatically-configured compile-time\n"
+"definitions when this copy of Lynx was built."
+msgstr ""
+"Les dades següents es van usar com a definicions configurades automàticament\n"
+"quan es va compilar aquesta còpia de Lynx."
+
+#. #define DIRED_NOVICELINE
+#: LYMessages.c:846
+msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
+msgstr ""
+
+#: LYMessages.c:847
+msgid "Failed to obtain status of current link!"
+msgstr "Ha estat impossible obtenir l'estat de l'enllaç actual!"
+
+#. #define INVALID_PERMIT_URL
+#: LYMessages.c:850
+msgid "Special URL only valid from current File Permission menu!"
+msgstr "URL especial que només és vàlida des del menú permisos de fitxer actual!"
+
+#: LYMessages.c:854
+msgid "External support is currently disabled."
+msgstr ""
+
+#. new with 2.8.4dev.21
+#: LYMessages.c:858
+msgid "Changing working-directory is currently disabled."
+msgstr "El canvi de directori de treball està desactivat."
+
+#: LYMessages.c:859
+msgid "Linewrap OFF!"
+msgstr "Salt de línia automàtic desactivat!"
+
+#: LYMessages.c:860
+msgid "Linewrap ON!"
+msgstr "Salt de línia automàtic activat!"
+
+#: LYMessages.c:861
+msgid "Parsing nested-tables toggled OFF!  Reloading..."
+msgstr "Anàlisi de taules imbricades desactivat! Recàrrega..."
+
+#: LYMessages.c:862
+msgid "Parsing nested-tables toggled ON!  Reloading..."
+msgstr "Analisi de taules imbricades activat! Recàrrega..."
+
+#: LYMessages.c:863
+msgid "Shifting is disabled while line-wrap is in effect"
+msgstr ""
+
+#: LYMessages.c:864
+msgid "Trace not supported"
+msgstr "Rastreig no suportat"
+
+#: WWW/Library/Implementation/HTAABrow.c:647
+#, c-format
+msgid "Username for '%s' at %s '%s%s':"
+msgstr "Nom d'usuari per a '%s' en %s '%s%s':"
+
+#: WWW/Library/Implementation/HTAABrow.c:913
+msgid "This client doesn't know how to compose proxy authorization information for scheme"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:988
+msgid "This client doesn't know how to compose authorization information for scheme"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:1096
+#, c-format
+msgid "Invalid header '%s%s%s%s%s'"
+msgstr "Capçalera invàlida '%s%s%s%s%s'"
+
+#: WWW/Library/Implementation/HTAABrow.c:1200
+msgid "Proxy authorization required -- retrying"
+msgstr "Cal autorizació del proxy: reintentant"
+
+#: WWW/Library/Implementation/HTAABrow.c:1259
+msgid "Access without authorization denied -- retrying"
+msgstr "Accés sense autorització denegat: reintentant"
+
+#: WWW/Library/Implementation/HTAccess.c:677
+msgid "Access forbidden by rule"
+msgstr "Accés prohibit per una regla"
+
+#: WWW/Library/Implementation/HTAccess.c:779
+msgid "Document with POST content not found in cache.  Resubmit?"
+msgstr "El document amb contingut POST no s'ha trobat en la memòria cau. Reenviar?"
+
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
+msgid "Loading incomplete."
+msgstr "Càrrega incompleta."
+
+#: WWW/Library/Implementation/HTAccess.c:1077
+msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1079
+msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
+msgstr "**** HTAccess: Error intern. Per favor escriviu a lynx-dev@sig.net!\n"
+
+#: WWW/Library/Implementation/HTAccess.c:1080
+#, 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:1086 src/LYMainLoop.c:7736
+msgid "Can't Access"
+msgstr "No ha estat possible accedir-hi"
+
+#: WWW/Library/Implementation/HTAccess.c:1094
+msgid "Unable to access document."
+msgstr "No ha estat possible accedir al document."
+
+#: WWW/Library/Implementation/HTFTP.c:766
+#, c-format
+msgid "Enter password for user %s@%s:"
+msgstr "Contrasenya de l'usuari %s@%s:"
+
+#: WWW/Library/Implementation/HTFTP.c:794
+msgid "Unable to connect to FTP host."
+msgstr "No ha estat possible connectar amb el servidor FTP"
+
+#: WWW/Library/Implementation/HTFTP.c:1064
+msgid "close master socket"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:1126
+msgid "socket for master socket"
+msgstr ""
+
+#.
+#. **  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:1640 WWW/Library/Implementation/HTFTP.c:2261
+msgid "Symbolic Link"
+msgstr "Enllaç simbòlic"
+
+#: WWW/Library/Implementation/HTFTP.c:2622
+msgid "Receiving FTP directory."
+msgstr "Rebent directori d'FTP"
+
+#: WWW/Library/Implementation/HTFTP.c:2762
+#, c-format
+msgid "Transferred %d bytes (%5d)"
+msgstr "%d (%5d) bytes transferits"
+
+#: WWW/Library/Implementation/HTFTP.c:3083
+msgid "connect for data"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:3731
+msgid "Receiving FTP file."
+msgstr "Rebent arxiu d'FTP"
+
+#: WWW/Library/Implementation/HTFinger.c:278
+msgid "Could not set up finger connection."
+msgstr "No ha estat possible establir la connexió finger"
+
+#: WWW/Library/Implementation/HTFinger.c:325
+msgid "Could not load data (no sitename in finger URL)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFinger.c:331
+msgid "Invalid port number - will only use port 79!"
+msgstr "Número de port invàlid: s'usarà únicament el port 79!"
+
+#: WWW/Library/Implementation/HTFinger.c:396
+msgid "Could not access finger host."
+msgstr "No ha estat possible accedir al servidor finger."
+
+#: WWW/Library/Implementation/HTFinger.c:404
+msgid "No response from finger server."
+msgstr "El servidor finger no respon."
+
+#: WWW/Library/Implementation/HTNews.c:372
+#, c-format
+msgid "Username for news host '%s':"
+msgstr "Nom d'usuari per al servidor de notícies \"%s\":"
+
+#: WWW/Library/Implementation/HTNews.c:425
+msgid "Change username?"
+msgstr "Canviar el nom d'usuari?"
+
+#: WWW/Library/Implementation/HTNews.c:429
+msgid "Username:"
+msgstr "Nom d'usuari:"
+
+#: WWW/Library/Implementation/HTNews.c:453
+#, c-format
+msgid "Password for news host '%s':"
+msgstr "Contrasenya per al servidor de notícies '%s':"
+
+#: WWW/Library/Implementation/HTNews.c:536
+msgid "Change password?"
+msgstr "Canviar contrasenya?"
+
+#: WWW/Library/Implementation/HTNews.c:1690
+#, c-format
+msgid "No matches for: %s"
+msgstr "Cap coincidència amb: %s"
+
+#: WWW/Library/Implementation/HTNews.c:1743
+msgid ""
+"\n"
+"No articles in this group.\n"
+msgstr ""
+"\n"
+"No hi ha articles en aquest fòrum.\n"
+
+#: WWW/Library/Implementation/HTNews.c:1756
+msgid ""
+"\n"
+"No articles in this range.\n"
+msgstr ""
+"\n"
+"No hi ha cap article en aquest rang.\n"
+
+#.
+#. **	Set window title.
+#.
+#: WWW/Library/Implementation/HTNews.c:1769
+#, c-format
+msgid "%s,  Articles %d-%d"
+msgstr "%s,  articles %d-%d"
+
+#: WWW/Library/Implementation/HTNews.c:1791
+msgid "Earlier articles"
+msgstr "Articles anteriors"
+
+#: WWW/Library/Implementation/HTNews.c:1804
+#, c-format
+msgid ""
+"\n"
+"There are about %d articles currently available in %s, IDs as follows:\n"
+"\n"
+msgstr ""
+"\n"
+"Hi ha %d articles disponibles actualment en %s, \n"
+
+#: WWW/Library/Implementation/HTNews.c:1864
+msgid "All available articles in "
+msgstr "Tots els articles disponibles en "
+
+#: WWW/Library/Implementation/HTNews.c:2080
+msgid "Later articles"
+msgstr "Articles recents"
+
+#: WWW/Library/Implementation/HTNews.c:2104
+msgid "Post to "
+msgstr "Enviar a "
+
+#: WWW/Library/Implementation/HTNews.c:2322
+msgid "This client does not contain support for SNEWS URLs."
+msgstr "Aquest client no té suport per a URLs de SNEWS."
+
+#: WWW/Library/Implementation/HTNews.c:2530
+msgid "No target for raw text!"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2560
+msgid "Connecting to NewsHost ..."
+msgstr "Connectant amb el servidor ..."
+
+#: WWW/Library/Implementation/HTNews.c:2611
+#, c-format
+msgid "Could not access %s."
+msgstr "No ha estat possible accedir a %s."
+
+#: WWW/Library/Implementation/HTNews.c:2711
+#, c-format
+msgid "Can't read news info.  News host %.20s responded: %.200s"
+msgstr "No s'ha pogut llegir la news info. El servidor %.20s ha respost: %.200s"
+
+#: WWW/Library/Implementation/HTNews.c:2715
+#, c-format
+msgid "Can't read news info, empty response from host %s"
+msgstr "No s'ha pogut llegir la news info, resposta buida del servidor %s"
+
+#.
+#. **	List available newsgroups. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2919
+msgid "Reading list of available newsgroups."
+msgstr "Llegint la llista dels fòrums disponibles."
+
+#: WWW/Library/Implementation/HTNews.c:2941
+msgid "Reading list of articles in newsgroup."
+msgstr "Llegint la llista d'articles del fòrum."
+
+#.
+#. **	Get an article from a news group. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2947
+msgid "Reading news article."
+msgstr "Llegint article."
+
+#: WWW/Library/Implementation/HTNews.c:2977
+msgid "Sorry, could not load requested news."
+msgstr "No ha estat possible carregar els missatges sol·licitats."
+
+#: WWW/Library/Implementation/HTTCP.c:1239
+msgid "Address has invalid port"
+msgstr "L'adreça conté un port que no és vàlid"
+
+#: WWW/Library/Implementation/HTTCP.c:1327
+msgid "Address length looks invalid"
+msgstr "La longitud de l'adreça sembla invàlida"
+
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
+#, c-format
+msgid "Unable to locate remote host %s."
+msgstr "Ha estat impossible trobar el servidor %s."
+
+#. 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:1575 WWW/Library/Implementation/HTTelnet.c:103
+#, c-format
+msgid "Invalid hostname %s"
+msgstr "Servidor %s no vàlid"
+
+#: WWW/Library/Implementation/HTTCP.c:1589
+#, c-format
+msgid "Making %s connection to %s"
+msgstr "Establint una connexió %s amb %s"
+
+#: WWW/Library/Implementation/HTTCP.c:1605
+#, c-format
+msgid "socket failed: family %d addr %s port %s."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1614
+msgid "socket failed."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1634
+msgid "Could not make connection non-blocking."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1703
+msgid "Connection failed (too many retries)."
+msgstr "La connexió ha fallat (massa reintents)."
+
+#: WWW/Library/Implementation/HTTCP.c:1896
+msgid "Could not restore socket to blocking."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1962
+msgid "Socket read failed for 180,000 tries."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr "L'adreça conté un nom d'usuari: %s"
+
+#: WWW/Library/Implementation/HTTP.c:503
+msgid "This client does not contain support for HTTPS URLs."
+msgstr "Aquest client no admet adreces HTTPS."
+
+#: WWW/Library/Implementation/HTTP.c:528
+msgid "Unable to connect to remote host."
+msgstr "No ha estat possible connectar amb el servidor."
+
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr "S'està reintentant la connexió sense TLS."
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr "Error SSL: no s'ha pogut trobar el nom comú en el certificat. Continuem?"
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr "Error SSL: servidor(%s)!=cert(%s). Voleu continuar?"
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1091
+msgid "Sending HTTP request."
+msgstr "Enviant sol·licitud HTTP."
+
+#: WWW/Library/Implementation/HTTP.c:1125
+msgid "Unexpected network write error; connection aborted."
+msgstr "Error inesperat d'escriptura "
+
+#: WWW/Library/Implementation/HTTP.c:1131
+msgid "HTTP request sent; waiting for response."
+msgstr "Sol·licitud HTTP enviada; esperant resposta."
+
+#: WWW/Library/Implementation/HTTP.c:1195
+msgid "Unexpected network read error; connection aborted."
+msgstr "Error inesperat de lectura en la xarxa; s'ha avortat la connexió."
+
+#.
+#. **	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:1391
+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:1426
+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:1545
+msgid "Got unexpected 304 Not Modified status."
+msgstr "S'ha obtingut un codi 304 Not Modified inesperat (el document no ha estat modificat)."
+
+#: WWW/Library/Implementation/HTTP.c:1612
+msgid "Redirection of POST content requires user approval."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1627
+msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1672
+msgid "Retrying with access authorization information."
+msgstr "Estic reintentant amb la informació d'accés."
+
+#: WWW/Library/Implementation/HTTP.c:1684
+msgid "Show the 401 message body?"
+msgstr "Mostrar el cos del missatge d'error 401?"
+
+#: WWW/Library/Implementation/HTTP.c:1729
+msgid "Show the 407 message body?"
+msgstr "Mostrar el cos del missatge d'error 407?"
+
+#.
+#. **	Bad or unknown server_status number.
+#. **	Take a chance and hope there is
+#. **	something to display. - FM
+#.
+#: WWW/Library/Implementation/HTTP.c:1834
+msgid "Unknown status reply from server!"
+msgstr "Resposta desconeguda del servidor!"
+
+#: WWW/Library/Implementation/HTTelnet.c:101
+#, c-format
+msgid "remote %s session:"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:161
+msgid "Could not connect to WAIS server."
+msgstr "No ha estat possible connectar al servidor WAIS."
+
+#: WWW/Library/Implementation/HTWAIS.c:170
+msgid "Could not open WAIS connection for reading."
+msgstr "No s'ha pogut obrir cap connexió WAIS (per a lectura)."
+
+#: WWW/Library/Implementation/HTWAIS.c:194
+msgid "Diagnostic code is "
+msgstr "El codi de diagnòstic és "
+
+#: WWW/Library/Implementation/HTWAIS.c:463
+msgid "Index "
+msgstr "Índex "
+
+#: WWW/Library/Implementation/HTWAIS.c:467
+#, c-format
+msgid " contains the following %d item%s relevant to \""
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:475
+msgid "The first figure after each entry is its relative score, "
+msgstr "La primera xifra després de cada entrada és la puntuació relativa, "
+
+#: WWW/Library/Implementation/HTWAIS.c:476
+msgid "the second is the number of lines in the item."
+msgstr "la segona és el nombre de línies."
+
+#: WWW/Library/Implementation/HTWAIS.c:517
+msgid " (bad file name)"
+msgstr " (nom de fitxer incorrecte)"
+
+#: WWW/Library/Implementation/HTWAIS.c:542
+msgid "(bad doc id)"
+msgstr " (identificador de document incorrecte)"
+
+#: WWW/Library/Implementation/HTWAIS.c:558
+msgid "(Short Header record, can't display)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:565
+msgid ""
+"\n"
+"Long Header record, can't display\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:572
+msgid ""
+"\n"
+"Text record\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:581
+msgid ""
+"\n"
+"Headline record, can't display\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:589
+msgid ""
+"\n"
+"Code record, can't display\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:689
+msgid "Syntax error in WAIS URL"
+msgstr "Error sintàctic en la URL WAIS"
+
+#: WWW/Library/Implementation/HTWAIS.c:759
+msgid " (WAIS Index)"
+msgstr " (Índex WAIS)"
+
+#: WWW/Library/Implementation/HTWAIS.c:766
+msgid "WAIS Index: "
+msgstr "Índex WAIS: "
+
+#: WWW/Library/Implementation/HTWAIS.c:772
+msgid "This is a link for searching the "
+msgstr "Aquest és un enllaç per a cercar en "
+
+#: WWW/Library/Implementation/HTWAIS.c:776
+msgid " WAIS Index.\n"
+msgstr " l'índex WAIS.\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:803
+msgid ""
+"\n"
+"Enter the 's'earch command and then specify search words.\n"
+msgstr ""
+"\n"
+"Introduïu l'ordre de recerca ('s') i especifiqueu els mots que voleu cercar.\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:825
+msgid " (in "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:834
+msgid "WAIS Search of \""
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:838
+msgid "\" in: "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:853
+msgid "HTWAIS: Request too large."
+msgstr "HTWAIS: Sol·licitud massa gran."
+
+#: WWW/Library/Implementation/HTWAIS.c:862
+msgid "Searching WAIS database..."
+msgstr "Cercant en la base de dades WAIS..."
+
+#: WWW/Library/Implementation/HTWAIS.c:872
+msgid "Search interrupted."
+msgstr "Recerca interrompuda."
+
+#: WWW/Library/Implementation/HTWAIS.c:922
+msgid "Can't convert format of WAIS document"
+msgstr "No es pot convertir el format del document WAIS"
+
+#: WWW/Library/Implementation/HTWAIS.c:966
+msgid "HTWAIS: Request too long."
+msgstr "HTWAIS: Sol·licitud massa llarga."
+
+#.
+#. **	Actually do the transaction given by request_message.
+#.
+#: WWW/Library/Implementation/HTWAIS.c:980
+msgid "Fetching WAIS document..."
+msgstr "Descarregant el document WAIS..."
+
+#. display_search_response(target, retrieval_response,
+#. wais_database, keywords);
+#: WWW/Library/Implementation/HTWAIS.c:1019
+msgid "No text was returned!\n"
+msgstr "No s'ha tornat cap text!\n"
+
+#: WWW/Library/Implementation/HTWSRC.c:287
+msgid " NOT GIVEN in source file; "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:311
+msgid " WAIS source file"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:318
+msgid " description"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:328
+msgid "Access links"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:346
+msgid "Direct access"
+msgstr "Accés directe"
+
+#. * Proxy will be used if defined, so let user know that - FM *
+#: WWW/Library/Implementation/HTWSRC.c:349
+msgid " (or via proxy server, if defined)"
+msgstr " (o a través d'un proxy, si està definit així)"
+
+#: WWW/Library/Implementation/HTWSRC.c:364
+msgid "Maintainer"
+msgstr "Mantenidor"
+
+#: WWW/Library/Implementation/HTWSRC.c:372
+msgid "Host"
+msgstr "Servidor"
+
+#: src/GridText.c:688
+msgid "Memory exhausted, display interrupted!"
+msgstr "Memòria exhaurida, visualització interrompuda!"
+
+#: src/GridText.c:693
+msgid "Memory exhausted, will interrupt transfer!"
+msgstr "Memòria exhaurida, la transferència s'interromprà!"
+
+#: src/GridText.c:3578
+msgid " *** MEMORY EXHAUSTED ***"
+msgstr " *** MEMÔRIA EXHAURIDA ***"
+
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
+msgid "unknown field or link"
+msgstr "camp o enllaç desconegut"
+
+#: src/GridText.c:6023
+msgid "text entry field"
+msgstr "camp de text"
+
+#: src/GridText.c:6026
+msgid "password entry field"
+msgstr "camp de contrasenya"
+
+#: src/GridText.c:6029
+msgid "checkbox"
+msgstr "quadre de verificació"
+
+#: src/GridText.c:6032
+msgid "radio button"
+msgstr "botó de grup"
+
+#: src/GridText.c:6035
+msgid "submit button"
+msgstr "botó d'enviament"
+
+#: src/GridText.c:6038
+msgid "reset button"
+msgstr "botó de reinici"
+
+#: src/GridText.c:6041
+msgid "popup menu"
+msgstr "menú emergent"
+
+#: src/GridText.c:6044
+msgid "hidden form field"
+msgstr "camp de formulari ocult"
+
+#: src/GridText.c:6047
+msgid "text entry area"
+msgstr "àrea de text"
+
+#: src/GridText.c:6050
+msgid "range entry field"
+msgstr "camp d'entrada d'interval"
+
+#: src/GridText.c:6053
+msgid "file entry field"
+msgstr "camp de fitxer"
+
+#: src/GridText.c:6056
+msgid "text-submit field"
+msgstr "camp d'enviament de text"
+
+#: src/GridText.c:6059
+msgid "image-submit button"
+msgstr "botó d'enviament d'imatges"
+
+#: src/GridText.c:6062
+msgid "keygen field"
+msgstr ""
+
+#: src/GridText.c:6065
+msgid "unknown form field"
+msgstr "camp de formulari desconegut"
+
+#: src/GridText.c:10066
+msgid "Can't open file for uploading"
+msgstr "No ha estat possible obrir el fitxer que voleu carregar."
+
+#: src/GridText.c:11218
+#, c-format
+msgid "Submitting %s"
+msgstr "Enviant %s"
+
+#. ugliness has happened; inform user and do the best we can
+#: src/GridText.c:12375
+msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
+msgstr ""
+
+#. don't show previous state
+#: src/GridText.c:12581
+msgid "Wrap lines to fit displayed area?"
+msgstr "Trencar les línies per a ajustar a l'espai disponible?"
+
+#: src/GridText.c:12633
+msgid "Very long lines have been wrapped!"
+msgstr "Les línies molt llargues han estat tallades!"
+
+#: src/GridText.c:13079
+msgid "Very long lines have been truncated!"
+msgstr "Les línies molt llargues han estat truncades!"
+
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
+msgid "bytes"
+msgstr "bytes"
+
+#: src/HTAlert.c:155
+msgid "KB"
+msgstr "KB"
+
+#: src/HTAlert.c:274
+#, c-format
+msgid "Read %s of %s of data"
+msgstr "Llegits %s de %s."
+
+#: src/HTAlert.c:276
+#, c-format
+msgid "Read %s of data"
+msgstr "Llegits %s"
+
+#: src/HTAlert.c:281
+#, c-format
+msgid ", %s/sec"
+msgstr ", %s/sec"
+
+#: src/HTAlert.c:290
+#, c-format
+msgid " (stalled for %s)"
+msgstr " (aturat durant %s)"
+
+#: src/HTAlert.c:294
+#, c-format
+msgid ", ETA %s"
+msgstr ""
+
+#: src/HTAlert.c:301
+msgid " (Press 'z' to abort)"
+msgstr " (Premeu 'z' per avortar)"
+
+#. 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:342 src/HTAlert.c:390
+msgid "yes"
+msgstr "sí"
+
+#: src/HTAlert.c:345 src/HTAlert.c:391
+msgid "no"
+msgstr "no"
+
+#: src/HTML.c:5985
+msgid "Description:"
+msgstr "Descripció:"
+
+#: src/HTML.c:5990
+msgid "(none)"
+msgstr ""
+
+#: src/HTML.c:5994
+msgid "Filepath:"
+msgstr "Camí:"
+
+#: src/HTML.c:5999
+msgid "(unknown)"
+msgstr "(desconegut)"
+
+#: src/HTML.c:7452
+msgid "Document has only hidden links.  Use the 'l'ist command."
+msgstr "El document només conté enllaços ocults. Useu el comand L)ist."
+
+#: src/HTML.c:7958
+msgid "Source cache error - disk full?"
+msgstr "Source cache error: disc ple?"
+
+#: src/HTML.c:7971
+msgid "Source cache error - not enough memory!"
+msgstr "Source cache error: no hi ha prou memòria!"
+
+#: src/LYBookmark.c:167
+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 ""
+" Aquest fitxer és una representació en HTML de la llista d'adreces de l'X \n"
+" Mosaic. Els enllaços obsolets es poden eliminar amb l'ordre \"eliminar adreça\", que normalment s'executa prement la tecla R "
+"però l'usuari o\n"
+" l'administrador del sistema pot haver-la remapat."
+
+#: src/LYBookmark.c:379
+msgid ""
+"     You can delete links by the 'R' key<br>\n"
+"<ol>\n"
+msgstr ""
+"     Podeu esborrar enllaços amb la tecla 'R'<br>\n"
+"<ol>\n"
+
+#: src/LYBookmark.c:382
+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 ""
+" Es poden esborrar enllaços usant l'ordre \"eliminar adreça\". Normalment\n"
+" correspon a la tecla R, però pot ser remapada per l'usuari o  l'administrador\n"
+" del sistema."
+
+#: src/LYBookmark.c:386
+#, 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 ""
+"     També es pot editar aquest fitxer amb un editor qualsevol per esborrar\n"
+"     enllaços obsolets o invàlids, o per canviar-ne l'ordre.\n"
+
+#: src/LYBookmark.c:389
+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 ""
+"Nota: si editeu aquest fitxer manualment\n"
+"      no canvieu el format entre les línies\n"
+"      ni afegiu cap altra etiqueta d'HTML.\n"
+"      Assegureu-vos de que cada enllaç es guarda en una sola línia."
+
+#: src/LYBookmark.c:681
+#, c-format
+msgid "File may be recoverable from %s during this session"
+msgstr "El fitxer es podrà recuperar des de %s durant aquesta sessió"
+
+#.
+#. *  Neither the path as given nor any components examined by
+#. *  backing up were stat()able. - kw
+#.
+#: src/LYCgi.c:231
+msgid "Unable to access cgi script"
+msgstr "Ha estat impossible d'accedir al script cgi"
+
+#: src/LYCgi.c:654 src/LYCgi.c:657
+msgid "Good Advice"
+msgstr "Bon consell"
+
+#: src/LYCgi.c:660
+msgid "An excellent http server for VMS is available via"
+msgstr "Un servidor http excel·lent per a VMS està disponible "
+
+#: src/LYCgi.c:667
+msgid "this link"
+msgstr "ací"
+
+#: src/LYCgi.c:671
+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"
+
+#: src/LYClean.c:122
+msgid "Exiting via interrupt:"
+msgstr "Eixint a causa de la interrupció:"
+
+#: src/LYCookie.c:2462
+msgid "(from a previous session)"
+msgstr "(d'una sessió anterior)"
+
+#: src/LYCookie.c:2522
+msgid "Maximum Gobble Date:"
+msgstr "Data límit d'eliminació:"
+
+#: src/LYCookie.c:2564
+msgid "Internal"
+msgstr ""
+
+#: src/LYCookie.c:2565
+msgid "cookie_domain_flag_set error, aborting program"
+msgstr ""
+
+#: src/LYCurses.c:1004
+msgid "Terminal initialisation failed - unknown terminal type?"
+msgstr "Ha fallat la inicialització del terminal: potser és un tipus de terminal desconegut."
+
+#: src/LYCurses.c:1426
+msgid "Terminal ="
+msgstr "Terminal ="
+
+#: src/LYCurses.c:1430
+msgid "You must use a vt100, 200, etc. terminal with this program."
+msgstr "Heu d'usar un terminal vt100, 300, etc. amb aquest programa."
+
+#: src/LYCurses.c:1480
+msgid "Your Terminal type is unknown!"
+msgstr "El terminal especificat és desconegut!"
+
+#: src/LYCurses.c:1481
+msgid "Enter a terminal type:"
+msgstr "Introduïu un tipus de terminal:"
+
+#: src/LYCurses.c:1495
+msgid "TERMINAL TYPE IS SET TO"
+msgstr "EL TIPUS DE TERMINAL ESTÀ FIXAT A"
+
+#: src/LYCurses.c:1994
+#, c-format
+msgid ""
+"\n"
+"A Fatal error has occurred in %s Ver. %s\n"
+msgstr ""
+"\n"
+"S'ha produït un error fatal en %s Ver. %s\n"
+
+#: src/LYCurses.c:1996
+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"
+"Per favor poseu-vos en contacte amb l'administrador per confirmar l'error i,\n"
+"si escau, per \n"
+
+#: src/LYEdit.c:249
+msgid "Editor killed by signal"
+msgstr "Editor mort pel senyal"
+
+#: src/LYEdit.c:251
+#, c-format
+msgid "Editor returned with error status, %s"
+msgstr "L'editor ha finalitzat amb l'error \"%s\""
+
+#: src/LYEdit.c:252
+msgid "reason unknown."
+msgstr "per raons desconegudes."
+
+#: src/LYDownload.c:517
+msgid "Downloaded link:"
+msgstr "Heu descarregat:"
+
+#: src/LYDownload.c:522
+msgid "Suggested file name:"
+msgstr "Nom de l'arxiu suggerit:"
+
+#: src/LYDownload.c:527
+msgid "Standard download options:"
+msgstr "Opcions estàndard per a descàrregues:"
+
+#: src/LYDownload.c:528
+msgid "Download options:"
+msgstr "Opcions per a les descàrregues:"
+
+#: src/LYDownload.c:544
+msgid "Save to disk"
+msgstr "Guardar al disc"
+
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "Veure el fitxer"
+
+#: src/LYDownload.c:565
+msgid "Save to disk disabled."
+msgstr "La gravació en disc està desactivada."
+
+#: src/LYDownload.c:569 src/LYPrint.c:1327
+msgid "Local additions:"
+msgstr "Addicions locals:"
+
+#: src/LYDownload.c:578 src/LYUpload.c:216
+msgid "No Name Given"
+msgstr "No heu donat cap nom"
+
+#: src/LYHistory.c:657
+msgid "You selected:"
+msgstr "Heu triat:"
+
+#: src/LYHistory.c:681 src/LYHistory.c:921
+msgid "(no address)"
+msgstr "(cap adreça)"
+
+#: src/LYHistory.c:685
+msgid " (internal)"
+msgstr " (intern)"
+
+#: src/LYHistory.c:687
+msgid " (was internal)"
+msgstr " (era intern)"
+
+#: src/LYHistory.c:785
+msgid " (From History)"
+msgstr " (De l'historial)"
+
+#: src/LYHistory.c:841
+msgid "You visited (POSTs, bookmark, menu and list files excluded):"
+msgstr "Heu visitat (excepte POSTs, adreces d'interés, fitxers del menúi de la llista:"
+
+#: src/LYHistory.c:1137
+msgid "(No messages yet)"
+msgstr "(Cap missatge encara)"
+
+#: src/LYLeaks.c:209
+msgid "Invalid pointer detected."
+msgstr "S'ha detectat un punter invàlid."
+
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
+msgid "Pointer:"
+msgstr "Punter:"
+
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
+msgid "FileName:"
+msgstr "Nom del fitxer:"
+
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
+msgid "LineCount:"
+msgstr "Línia:"
+
+#: src/LYLeaks.c:249
+msgid "Memory leak detected."
+msgstr "S'ha detectat una pèrdua de memòria."
+
+#: src/LYLeaks.c:257
+msgid "Contains:"
+msgstr "Conté:"
+
+#: src/LYLeaks.c:270
+msgid "ByteSize:"
+msgstr ""
+
+#: src/LYLeaks.c:284
+msgid "realloced:"
+msgstr ""
+
+#: src/LYLeaks.c:307
+msgid "Total memory leakage this run:"
+msgstr "Pèrdua de memòria (en total) en aquesta execució:"
+
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr ""
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
+msgid "References in "
+msgstr "Referències en "
+
+#: src/LYList.c:86
+msgid "this document:"
+msgstr "aquest document:"
+
+#: src/LYList.c:92
+msgid "Visible links:"
+msgstr "Enllaços visibles:"
+
+#: src/LYList.c:194 src/LYList.c:315
+msgid "Hidden links:"
+msgstr "Enllaços ocults:"
+
+#: src/LYList.c:262
+msgid "References"
+msgstr "Referències"
+
+#: src/LYList.c:264
+msgid "Visible links"
+msgstr "Enllaços visibles"
+
+#: src/LYLocal.c:267
+#, c-format
+msgid "Unable to get status of '%s'."
+msgstr "Ha estat impossible obtenir l'estat de \"%s\"."
+
+#: src/LYLocal.c:301
+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:366
+#, c-format
+msgid "Unable to %s due to system error!"
+msgstr "Ha estat impossible %s a causa d'un error del sistema!"
+
+#. error return
+#: src/LYLocal.c:400
+#, c-format
+msgid "Probable failure to %s due to system error!"
+msgstr ""
+
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "eliminar %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr ""
+
+#: src/LYLocal.c:508
+#, c-format
+msgid "move %s to %s"
+msgstr "moure %s a %s"
+
+#: src/LYLocal.c:548
+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:550
+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:552
+msgid "The specified name is already in use!  Request ignored."
+msgstr "El nom especificat ja s'està usant! Sol·licitud ignorada. "
+
+#: src/LYLocal.c:563
+msgid "Destination has different owner!  Request denied."
+msgstr "La destinació té un propietari diferent! Sol·licitud denegada."
+
+#: src/LYLocal.c:566
+msgid "Destination is not a valid directory!  Request denied."
+msgstr "La destinació no és un directori vàlid! Sol·licitud denegada."
+
+#: src/LYLocal.c:588
+msgid "Remove all tagged files and directories?"
+msgstr "Esborrar tots els fitxers i directoris indicats?"
+
+#: src/LYLocal.c:647
+msgid "Enter new location for tagged items: "
+msgstr "Introduïu la nova ubicació per als elements indicats: "
+
+#: src/LYLocal.c:716
+msgid "Path too long"
+msgstr "Camí massa llarg"
+
+#: src/LYLocal.c:747
+msgid "Source and destination are the same location - request ignored!"
+msgstr "L'origen i la destinació coincideixen: sol·licitud ignorada!"
+
+#: src/LYLocal.c:805
+msgid "Enter new name for directory: "
+msgstr "Introduïu el nou nom del directori: "
+
+#: src/LYLocal.c:807
+msgid "Enter new name for file: "
+msgstr "Introduïu el nou nom del directori: "
+
+#: src/LYLocal.c:819
+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:868
+msgid "Enter new location for directory: "
+msgstr "Introduïu la nova ubicació per al directori: "
+
+#: src/LYLocal.c:874
+msgid "Enter new location for file: "
+msgstr "Introduïu la nova ubicació per al fitxer: "
+
+#: src/LYLocal.c:901
+msgid "Unexpected failure - unable to find trailing path separator"
+msgstr "Error inesperat: ha estat impossible trobar el separador de camí"
+
+#: src/LYLocal.c:921
+msgid "Source and destination are the same location!  Request ignored!"
+msgstr "L'origen i la destinació coincideixen! Sol·licitud ignorada!"
+
+#: src/LYLocal.c:970
+msgid "Modify name, location, or permission (n, l, or p): "
+msgstr "Modificar nom, ubicació o permisos (n, l, p): "
+
+#: src/LYLocal.c:972
+msgid "Modify name or location (n or l): "
+msgstr "Modificar nom o ubicació (n, l): "
+
+#.
+#. *	Code for changing ownership needed here.
+#.
+#: src/LYLocal.c:1001
+msgid "This feature not yet implemented!"
+msgstr "Aquesta característica no està encara disponible!"
+
+#: src/LYLocal.c:1019
+msgid "Enter name of file to create: "
+msgstr "Introduïu el nom del fitxer que voleu crear: "
+
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
+msgid "Illegal redirection \"//\" found! Request ignored."
+msgstr "S'ha trobat una redirecció il·legal \"//\"! Sol·licitud ignorada."
+
+#: src/LYLocal.c:1061
+msgid "Enter name for new directory: "
+msgstr "Introduïu el nom del nou directori: "
+
+#: src/LYLocal.c:1106
+msgid "Create file or directory (f or d): "
+msgstr "Crear un fitxer o un directori (f, d): "
+
+#: src/LYLocal.c:1146
+#, c-format
+msgid "Remove '%s' and all of its contents?"
+msgstr "Voleu eliminar \"%s\" i tot el seu contingut?"
+
+#: src/LYLocal.c:1149
+msgid "Remove directory and all of its contents?"
+msgstr "Voleu eliminar el directori i tot el seu contingut?"
+
+#: src/LYLocal.c:1153
+#, c-format
+msgid "Remove file '%s'?"
+msgstr "Voleu eliminar l'arxiu '%s'?"
+
+#: src/LYLocal.c:1155
+msgid "Remove file?"
+msgstr "Voleu eliminar l'arxiu?"
+
+#: src/LYLocal.c:1160
+#, c-format
+msgid "Remove symbolic link '%s'?"
+msgstr "Voleu eliminar l'enllaç simbòlic '%s'?"
+
+#: src/LYLocal.c:1162
+msgid "Remove symbolic link?"
+msgstr "Voleu eliminar l'enllaç simbòlic?"
+
+#: src/LYLocal.c:1248
+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:1278
+msgid "Unable to open permit options file"
+msgstr "No s'ha pogut obrir el fitxer d'opcions de permisos"
+
+#: src/LYLocal.c:1305
+msgid "Specify permissions below:"
+msgstr "Especifiqueu els permisos:"
+
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
+msgid "Owner:"
+msgstr "Propietari:"
+
+#: src/LYLocal.c:1322
+msgid "Group"
+msgstr "Grup"
+
+#: src/LYLocal.c:1338
+msgid "Others:"
+msgstr "Altres:"
+
+#: src/LYLocal.c:1356
+msgid "form to permit"
+msgstr ""
+
+#: src/LYLocal.c:1452
+msgid "Invalid mode format."
+msgstr "Format invàlid."
+
+#: src/LYLocal.c:1456
+msgid "Invalid syntax format."
+msgstr "Sintaxi incorrecta."
+
+#: src/LYLocal.c:1645
+msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
+msgstr ""
+
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr ""
+
+#: src/LYLocal.c:1908
+#, c-format
+msgid "Executing %s "
+msgstr "Executant %s "
+
+#: src/LYLocal.c:1911
+msgid "Executing system command. This might take a while."
+msgstr "Executant una ordre del sistema. Pot tardar una mica."
+
+#: src/LYLocal.c:1985
+msgid "Current directory:"
+msgstr "Directori actual:"
+
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
+msgid "Current selection:"
+msgstr "Selecció actual:"
+
+#: src/LYLocal.c:1992
+msgid "Nothing currently selected."
+msgstr "Actualment no hi ha res seleccionat."
+
+#: src/LYLocal.c:2007
+msgid "tagged item:"
+msgstr "element marcat:"
+
+#: src/LYLocal.c:2007
+msgid "tagged items:"
+msgstr "elements marcats:"
+
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
+msgid "Illegal filename; request ignored."
+msgstr "Nom de fitxer il·legal; sol·licitud ignorada."
+
+#. directory not writable
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
+msgid "Install in the selected directory not permitted."
+msgstr "Està prohibida la instal·lació en el directori que heu triat."
+
+#: src/LYLocal.c:2267
+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:2276
+msgid "Just a moment, ..."
+msgstr "Un moment..."
+
+#: src/LYLocal.c:2293
+msgid "Error buiding install args"
+msgstr ""
+
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
+#, c-format
+msgid "Source and target are the same: %s"
+msgstr "L'origen i la destinació són el mateix: %s"
+
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
+#, c-format
+msgid "Already in target directory: %s"
+msgstr "És aquest, el directori de destinació: %s"
+
+#: src/LYLocal.c:2362
+msgid "Installation complete"
+msgstr "Instal·lació completada"
+
+#: src/LYLocal.c:2551
+msgid "Temporary URL or list would be too long."
+msgstr "La URL temporal o la llista serien massa llargues."
+
+#: src/LYMail.c:534
+msgid "Sending"
+msgstr "Enviant"
+
+#: src/LYMail.c:1024
+#, c-format
+msgid "The link   %s :?: %s \n"
+msgstr ""
+
+#: src/LYMail.c:1026
+#, c-format
+msgid "called \"%s\"\n"
+msgstr ""
+
+#: src/LYMail.c:1027
+#, c-format
+msgid "in the file \"%s\" called \"%s\"\n"
+msgstr ""
+
+#: src/LYMail.c:1028
+msgid "was requested but was not available."
+msgstr ""
+
+#: src/LYMail.c:1029
+msgid "Thought you might want to know."
+msgstr "Potser ho volieu saber."
+
+#: src/LYMail.c:1031
+msgid "This message was automatically generated by"
+msgstr "Aquest missatge va ser generat automàticament per"
+
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:969
+msgid "No Winsock found, sorry."
+msgstr "No s'ha trobat Winsock."
+
+#: src/LYMain.c:1170
+msgid "You MUST define a valid TMP or TEMP area!\n"
+msgstr "Heu de definir una àrea TMP o TEMP vàlida!\n"
+
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
+msgid "No such directory"
+msgstr "No existeix el directori"
+
+#: src/LYMain.c:1436
+#, c-format
+msgid ""
+"\n"
+"Configuration file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"El fitxer de configuració %s no està disponible\n"
+"\n"
+
+#: src/LYMain.c:1446
+msgid ""
+"\n"
+"Lynx character sets not declared.\n"
+"\n"
+msgstr ""
+"\n"
+"Els jocs de caràcters no estan declarats.\n"
+
+#: src/LYMain.c:1475
+msgid ""
+"\n"
+"Lynx edit map not declared.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:1504
+#, c-format
+msgid ""
+"\n"
+"Lynx file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"El fitxer %s no està disponible.\n"
+"\n"
+
+#: src/LYMain.c:1743
+msgid "Warning:"
+msgstr "Alerta:"
+
+#: src/LYMain.c:2293
+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:2540 src/LYMain.c:2588
+#, c-format
+msgid "Lynx: ignoring unrecognized charset=%s\n"
+msgstr "Lynx: joc de caràcters %s no reconegut. S'ignorarà.\n"
+
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
+msgstr "%s Versió %s (%s)\n"
+
+#: src/LYMain.c:3143
+#, c-format
+msgid "Built on %s %s %s\n"
+msgstr "Compilat per a %s el %s a les %s\n"
+
+#: src/LYMain.c:3166
+msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+msgstr ""
+"Els drets de còpia pertanyen a la Universitat de Kansas, el CERN i altres\n"
+"contribuïdors.\n"
+
+#: src/LYMain.c:3168
+msgid "Distributed under the GNU General Public License.\n"
+msgstr "Distribuït sota la Llicència Pública General.\n"
+
+#: src/LYMain.c:3170
+msgid ""
+"See http://lynx.isc.org/ and the online help for more information.\n"
+"\n"
+msgstr ""
+"Vegeu http://lynx.isc.org/ i l'ajuda en línia per a més informació.\n"
+"\n"
+
+#: src/LYMain.c:3919
+#, c-format
+msgid "USAGE: %s [options] [file]\n"
+msgstr "UTILITZACIÓ: %s [opcions] [arxiu]\n"
+
+#: src/LYMain.c:3920
+msgid "Options are:\n"
+msgstr "Les opcions són:\n"
+
+#: src/LYMain.c:4191
+#, c-format
+msgid "%s: Invalid Option: %s\n"
+msgstr "%s: l'opció no és vàlida: %s\n"
+
+#: src/LYMainLoop.c:539
+#, c-format
+msgid "Internal error: Invalid mouse link %d!"
+msgstr "Error intern: l'enllaç del ratolí no és vàlid: %d!"
+
+#.
+#. * Make a name for this new URL.
+#.
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
+msgid "A URL specified by the user"
+msgstr "Una URL especificada per l'usuari"
+
+#: src/LYMainLoop.c:1110
+msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
+msgstr ""
+
+#.
+#. *  Make a name for this help file.
+#.
+#: src/LYMainLoop.c:3053
+msgid "Help Screen"
+msgstr "Pantalla d'ajuda"
+
+#: src/LYMainLoop.c:3177
+msgid "System Index"
+msgstr "Índex del sistema"
+
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
+msgid "Entry into main screen"
+msgstr "Entrar en la pantalla principal"
+
+#: src/LYMainLoop.c:3824
+msgid "No next document present"
+msgstr "No hi ha cap document més"
+
+#: src/LYMainLoop.c:4131
+msgid "charset for this document specified explicitly, sorry..."
+msgstr "el joc de caràcters per a aquest document està especificat explicitament"
+
+#: src/LYMainLoop.c:5004
+msgid "cd to:"
+msgstr "canvia al directori:"
+
+#: src/LYMainLoop.c:5031
+msgid "A component of path is not a directory"
+msgstr "Un component del camí no és un directori"
+
+#: src/LYMainLoop.c:5034
+msgid "failed to change directory"
+msgstr "no ha estat possible canviar de directori"
+
+#: src/LYMainLoop.c:6204
+msgid "Reparsing document under current settings..."
+msgstr "Tornant a analitzar el document amb les opcions actuals..."
+
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
+#, 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:6834
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6914
+msgid "Current URL is empty."
+msgstr "La URL actual és buida."
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr "No s'ha pogut copiar al porta-retalls."
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr "La URL del document s'ha copiat al porta-retalls."
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr "La URL de l'enllaç s'ha copiat al porta-retalls."
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr "No hi ha cap URL al porta-retalls."
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
+msgid "-index-"
+msgstr "-índex-"
+
+#: src/LYMainLoop.c:7731
+msgid "lynx: Can't access startfile"
+msgstr "lynx: No s'ha pogut accedir al fitxer inicial"
+
+#: src/LYMainLoop.c:7744
+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:7745
+msgid "      Exiting..."
+msgstr "      Eixint..."
+
+#: src/LYMainLoop.c:7788
+msgid "-more-"
+msgstr "-més-"
+
+#. Enable scrolling.
+#: src/LYNews.c:187
+msgid "You will be posting to:"
+msgstr ""
+
+#.
+#. *  Get the mail address for the From header,
+#. *  offering personal_mail_address as default.
+#.
+#: src/LYNews.c:196
+msgid ""
+"\n"
+"\n"
+" Please provide your mail address for the From: header\n"
+msgstr ""
+"\n"
+"\n"
+" Per favor, indiqueu la vostra adreça per al remit (capçalera De:)\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:214
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Subject: header\n"
+msgstr ""
+"\n"
+"\n"
+" Per favor indiqueu o editeu l'assumpte\n"
+
+#: src/LYNews.c:303
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Organization: header\n"
+msgstr ""
+"\n"
+"\n"
+" Per favor indiqueu o editeu la capçalera Organització:\n"
+
+#.
+#. *  Use the built in line editior.
+#.
+#: src/LYNews.c:360
+msgid ""
+"\n"
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+"\n"
+" Per favor, introduïu el missatge."
+
+#: src/LYNews.c:406
+msgid "Message has no original text!"
+msgstr "El missatge no conté text original!"
+
+#: src/LYOptions.c:746
+msgid "review/edit B)ookmarks files"
+msgstr "B revisar/editar fixers de favorits"
+
+#: src/LYOptions.c:748
+msgid "B)ookmark file: "
+msgstr "B fitxer de favorits:"
+
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
+#, c-format
+msgid "Use %s to invoke the Options menu!"
+msgstr "Useu %s per a invocar el menú d'opcions"
+
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr "(les opcions marcades amb (!) no es desen)"
+
+#: src/LYOptions.c:3261
+msgid "General Preferences"
+msgstr "Preferències generals"
+
+#. ***************************************************************
+#. User Mode: SELECT
+#: src/LYOptions.c:3265
+msgid "User mode"
+msgstr "Tipus d'usuari"
+
+#. Editor: INPUT
+#: src/LYOptions.c:3271
+msgid "Editor"
+msgstr "Editor"
+
+#. Search Type: SELECT
+#: src/LYOptions.c:3276
+msgid "Type of Search"
+msgstr "Tipus de recerca"
+
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
+#. Cookies: SELECT
+#: src/LYOptions.c:3285
+msgid "Cookies"
+msgstr "Cookies"
+
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
+msgid "Keyboard Input"
+msgstr "Teclat"
+
+#. ***************************************************************
+#. Keypad Mode: SELECT
+#: src/LYOptions.c:3316
+msgid "Keypad mode"
+msgstr "Mode del teclat"
+
+#. Emacs keys: ON/OFF
+#: src/LYOptions.c:3322
+msgid "Emacs keys"
+msgstr "Tecles d'emacs"
+
+#. VI Keys: ON/OFF
+#: src/LYOptions.c:3328
+msgid "VI keys"
+msgstr "Tecles de VI"
+
+#. Line edit style: SELECT
+#. well, at least 2 line edit styles available
+#: src/LYOptions.c:3335
+msgid "Line edit style"
+msgstr ""
+
+#. Keyboard layout: SELECT
+#: src/LYOptions.c:3347
+msgid "Keyboard layout"
+msgstr "Configuració del teclat"
+
+#.
+#. * Display and Character Set
+#.
+#: src/LYOptions.c:3360
+msgid "Display and Character Set"
+msgstr "Pantalla i joc de caràcters"
+
+#. ***************************************************************
+#. Display Character Set: SELECT
+#: src/LYOptions.c:3364
+msgid "Display character set"
+msgstr "Joc de caràcters"
+
+#: src/LYOptions.c:3393
+msgid "Assumed document character set"
+msgstr "Joc de caràcters predeterminat"
+
+#.
+#. * 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:3413
+msgid "CJK mode"
+msgstr "mode CJK"
+
+#: src/LYOptions.c:3415
+msgid "Raw 8-bit"
+msgstr "8-bits cru"
+
+#. X Display: INPUT
+#: src/LYOptions.c:3423
+msgid "X Display"
+msgstr ""
+
+#.
+#. * Document Appearance
+#.
+#: src/LYOptions.c:3429
+msgid "Document Appearance"
+msgstr "Apariència dels documents"
+
+#: src/LYOptions.c:3435
+msgid "Show color"
+msgstr "En color"
+
+#. Show cursor: ON/OFF
+#: src/LYOptions.c:3459
+msgid "Show cursor"
+msgstr "Mostrar cursor"
+
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr "Mostrar la barra de desplaçament"
+
+#. Select Popups: ON/OFF
+#: src/LYOptions.c:3473
+msgid "Popups for select fields"
+msgstr ""
+
+#. HTML error recovery: SELECT
+#: src/LYOptions.c:3479
+msgid "HTML error recovery"
+msgstr "Recuperació d'errors de HTML"
+
+#. Show Images: SELECT
+#: src/LYOptions.c:3485
+msgid "Show images"
+msgstr "Mostrar imatges"
+
+#. Verbose Images: ON/OFF
+#: src/LYOptions.c:3499
+msgid "Verbose images"
+msgstr "Detalls sobre imatges"
+
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3507
+msgid "Headers Transferred to Remote Servers"
+msgstr "Capçaleres que es transmeten als servidors remots"
+
+#. ***************************************************************
+#. Mail Address: INPUT
+#: src/LYOptions.c:3511
+msgid "Personal mail address"
+msgstr "Adreça electrònica personal"
+
+#. Preferred Document Character Set: INPUT
+#: src/LYOptions.c:3516
+msgid "Preferred document character set"
+msgstr "Joc de caràcters preferit"
+
+#. Preferred Document Language: INPUT
+#: src/LYOptions.c:3521
+msgid "Preferred document language"
+msgstr "Idioma preferit"
+
+#: src/LYOptions.c:3527
+msgid "User-Agent header"
+msgstr "Identificació del navegador"
+
+#.
+#. * Listing and Accessing Files
+#.
+#: src/LYOptions.c:3535
+msgid "Listing and Accessing Files"
+msgstr "Fitxers: llistat i accés"
+
+#. ***************************************************************
+#. FTP sort: SELECT
+#: src/LYOptions.c:3539
+msgid "FTP sort criteria"
+msgstr "Criteri d'ordenació per a FTP"
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3546
+msgid "Local directory sort criteria"
+msgstr "Criteri d'ordenació local"
+
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+#, fuzzy
+msgid "Local directory sort order"
+msgstr "Criteri d'ordenació local"
+
+#: src/LYOptions.c:3561
+msgid "Show dot files"
+msgstr "Mostrar fitxers .*"
+
+#: src/LYOptions.c:3569
+msgid "Execution links"
+msgstr "Enllaços d'execució"
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3589
+msgid "Show transfer rate"
+msgstr "Mostrar taxa de transferència"
+
+#.
+#. * Special Files and Screens
+#.
+#: src/LYOptions.c:3598
+msgid "Special Files and Screens"
+msgstr "Fitxers i pantalles especials"
+
+#: src/LYOptions.c:3603
+msgid "Multi-bookmarks"
+msgstr ""
+
+#: src/LYOptions.c:3611
+msgid "Review/edit Bookmarks files"
+msgstr "Editar fitxers de favorits"
+
+#: src/LYOptions.c:3613
+msgid "Goto multi-bookmark menu"
+msgstr "Veure el menú de múltiples fitxers d'adreces"
+
+#: src/LYOptions.c:3615
+msgid "Bookmarks file"
+msgstr "Fitxer de favorits"
+
+#. Visited Pages: SELECT
+#: src/LYOptions.c:3621
+msgid "Visited Pages"
+msgstr "Pàgines visitades"
+
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr "Veure el fitxer"
+
+#: src/LYPrint.c:952
+msgid " Print job complete.\n"
+msgstr " Imprimir treball complet.\n"
+
+#: src/LYPrint.c:1281
+msgid "Document:"
+msgstr "Document:"
+
+#: src/LYPrint.c:1282
+msgid "Number of lines:"
+msgstr "Nombre de línies:"
+
+#: src/LYPrint.c:1283
+msgid "Number of pages:"
+msgstr "Nombre de pàgines:"
+
+#: src/LYPrint.c:1284
+msgid "pages"
+msgstr "pàgines"
+
+#: src/LYPrint.c:1284
+msgid "page"
+msgstr "pàgina"
+
+#: src/LYPrint.c:1285
+msgid "(approximately)"
+msgstr "(aproximadament)"
+
+#: src/LYPrint.c:1290
+msgid "Some print functions have been disabled!"
+msgstr "Algunes funcions d'impressió han estat desactivades!"
+
+#: src/LYPrint.c:1294
+msgid "Standard print options:"
+msgstr "Opcions estàndard d'impressió:"
+
+#: src/LYPrint.c:1295
+msgid "Print options:"
+msgstr "Opcions d'impressió:"
+
+#: src/LYPrint.c:1302
+msgid "Save to a local file"
+msgstr "Gravar en un arxiu local"
+
+#: src/LYPrint.c:1304
+msgid "Save to disk disabled"
+msgstr "Gravar en disc està desactivat"
+
+#: src/LYPrint.c:1311
+msgid "Mail the file"
+msgstr "Enviar l'arxiu per correu"
+
+#: src/LYPrint.c:1318
+msgid "Print to the screen"
+msgstr "Imprimir en pantalla"
+
+#: src/LYPrint.c:1323
+msgid "Print out on a printer attached to your vt100 terminal"
+msgstr "Imprimir en una impressora connectada al vostre terminal"
+
+#: src/LYReadCFG.c:339
+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 ""
+"S'ha trobat un error sintàctic mentre s'analitzava\n"
+"la variable COLOR en el fitxer de configuració:\n"
+"La línia ha de ser de la forma:\n"
+"COLOR:NOMBRE_ENTER:PRIMER_PLA:FONS\n"
+"\n"
+"Ací PRIMER_PLA i FONS han de ser:\n"
+"Les cadenes especials \"nocolor\" o \"default\", o\n"
+
+#: src/LYReadCFG.c:352
+msgid "Offending line:"
+msgstr "Línia incorrecta:"
+
+#: src/LYReadCFG.c:638
+#, c-format
+msgid "key remapping of %s to %s for %s failed\n"
+msgstr "el remapatge de %s a %s per a %s ha fallat\n"
+
+#: src/LYReadCFG.c:645
+#, c-format
+msgid "key remapping of %s to %s failed\n"
+msgstr "el remapatge de %s a %s ha fallat\n"
+
+#: src/LYReadCFG.c:666
+#, c-format
+msgid "invalid line-editor selection %s for key %s, selecting all\n"
+msgstr ""
+
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:711
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:816
+#, c-format
+msgid "Lynx: cannot start, CERN rules file %s is not available\n"
+msgstr "Lynx: impossible iniciar, el fitxer de regles del CERN %s no estàdisponible\n"
+
+#: src/LYReadCFG.c:818
+msgid "(no name)"
+msgstr "(sense nom)"
+
+#: src/LYReadCFG.c:1782
+#, 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:1784
+#, c-format
+msgid "Last attempted include was '%s',\n"
+msgstr "L'últim include ha estat \"%s\", \n"
+
+#: src/LYReadCFG.c:1785
+#, c-format
+msgid "included from '%s'.\n"
+msgstr "inclós des de \"%s\".\n"
+
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
+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:2192 src/LYReadCFG.c:2205
+msgid "Please read the distribution"
+msgstr "Per favor, llegiu "
+
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
+msgid "for more comments."
+msgstr "si necessiteu més informació."
+
+#: src/LYReadCFG.c:2244
+msgid "RELOAD THE CHANGES"
+msgstr "RECARREGAR ELS CANVIS"
+
+#: src/LYReadCFG.c:2253
+msgid "Your primary configuration"
+msgstr "Configuració primària"
+
+#: src/LYShowInfo.c:129
+msgid "Directory that you are currently viewing"
+msgstr "Directori que veieu actualment"
+
+#: src/LYShowInfo.c:132
+msgid "Name:"
+msgstr "Nom:"
+
+#: src/LYShowInfo.c:135
+msgid "URL:"
+msgstr "URL:"
+
+#: src/LYShowInfo.c:146
+msgid "Directory that you have currently selected"
+msgstr "Directori triat"
+
+#: src/LYShowInfo.c:149
+msgid "File that you have currently selected"
+msgstr "Arxiu triat"
+
+#: src/LYShowInfo.c:153
+msgid "Symbolic link that you have currently selected"
+msgstr "Enllaç simbòlic que heu triat"
+
+#: src/LYShowInfo.c:157
+msgid "Item that you have currently selected"
+msgstr "Element que heu triat"
+
+#: src/LYShowInfo.c:159
+msgid "Full name:"
+msgstr "Nom complet:"
+
+#: src/LYShowInfo.c:168
+msgid "Unable to follow link"
+msgstr "Ha estat impossible seguir l'enllaç"
+
+#: src/LYShowInfo.c:170
+msgid "Points to file:"
+msgstr "Apunta al fitxer:"
+
+#: src/LYShowInfo.c:175
+msgid "Name of owner:"
+msgstr "Nom del propietari:"
+
+#: src/LYShowInfo.c:178
+msgid "Group name:"
+msgstr "Nom del grup:"
+
+#: src/LYShowInfo.c:181
+msgid "File size:"
+msgstr "Grandària:"
+
+#: src/LYShowInfo.c:187
+msgid "Creation date:"
+msgstr "Data de creació:"
+
+#: src/LYShowInfo.c:190
+msgid "Last modified:"
+msgstr "Última modificació:"
+
+#: src/LYShowInfo.c:193
+msgid "Last accessed:"
+msgstr "Últim accés:"
+
+#: src/LYShowInfo.c:195
+msgid "Access Permissions"
+msgstr "Permisos d'accés"
+
+#: src/LYShowInfo.c:261
+msgid "File that you are currently viewing"
+msgstr "Fitxer que veieu actualment"
+
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
+msgid "Linkname:"
+msgstr "Nom:"
+
+#: src/LYShowInfo.c:279 src/LYShowInfo.c:291
+msgid "Charset:"
+msgstr "Joc de caràcters:"
+
+#: src/LYShowInfo.c:297
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/LYShowInfo.c:300
+msgid "Date:"
+msgstr "Data:"
+
+#: src/LYShowInfo.c:303
+msgid "Last Mod:"
+msgstr "Últ. mod.:"
+
+#: src/LYShowInfo.c:309
+msgid "&nbsp;Expires:"
+msgstr "&nbsp;Expira:"
+
+#: src/LYShowInfo.c:313
+msgid "Cache-Control:"
+msgstr ""
+
+#: src/LYShowInfo.c:317
+msgid "Content-Length:"
+msgstr ""
+
+#: src/LYShowInfo.c:322
+msgid "Language:"
+msgstr "Idioma:"
+
+#: src/LYShowInfo.c:329
+msgid "Post Data:"
+msgstr ""
+
+#: src/LYShowInfo.c:333
+msgid "Post Content Type:"
+msgstr ""
+
+#: src/LYShowInfo.c:342
+msgid "Owner(s):"
+msgstr "Propietari(s):"
+
+#: src/LYShowInfo.c:345
+msgid "size:"
+msgstr "grandària:"
+
+#: src/LYShowInfo.c:345
+msgid "lines"
+msgstr "línies"
+
+#: src/LYShowInfo.c:348
+msgid "mode:"
+msgstr "mode:"
+
+#: src/LYShowInfo.c:350
+msgid "forms mode"
+msgstr ""
+
+#: src/LYShowInfo.c:352
+msgid "source"
+msgstr "font"
+
+#: src/LYShowInfo.c:352
+msgid "normal"
+msgstr "normal"
+
+#: src/LYShowInfo.c:353
+msgid ", safe"
+msgstr ""
+
+#: src/LYShowInfo.c:354
+msgid ", via internal link"
+msgstr ""
+
+#: src/LYShowInfo.c:360
+msgid ", no-cache"
+msgstr ""
+
+#: src/LYShowInfo.c:362
+msgid ", ISMAP script"
+msgstr ""
+
+#: src/LYShowInfo.c:364
+msgid ", bookmark file"
+msgstr ""
+
+#: src/LYShowInfo.c:373
+msgid "Link that you currently have selected"
+msgstr "Enllaç triat"
+
+#: src/LYShowInfo.c:386
+msgid "Method:"
+msgstr "Mètode:"
+
+#: src/LYShowInfo.c:391
+msgid "Enctype:"
+msgstr ""
+
+#: src/LYShowInfo.c:403
+msgid "(Form field)"
+msgstr "(Camp de formulari)"
+
+#: src/LYShowInfo.c:418
+msgid "No Links on the current page"
+msgstr "No hi ha enllaços en aquesta pàgina"
+
+#: src/LYStyle.c:278
+#, 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 ""
+
+#: src/LYTraversal.c:107
+msgid "here is a list of the history stack so that you may rebuild"
+msgstr ""
+
+#: src/LYUpload.c:78
+msgid "ERROR! - upload command is misconfigured"
+msgstr "ERROR! La instrucció de càrrega no està ben configurada"
+
+#: src/LYUpload.c:100
+msgid "Illegal redirection \"../\" found! Request ignored."
+msgstr "S'ha trobat la redirecció il·legal \"../\"! Sol·licitud ignorada."
+
+#: src/LYUpload.c:103
+msgid "Illegal character \"/\" found! Request ignored."
+msgstr "S'ha trobat un caràcter no vàlid \"/\"! Sol·licitud ignorada."
+
+#: src/LYUpload.c:106
+msgid "Illegal redirection using \"~\" found! Request ignored."
+msgstr "Redirecció il·legal amb \"~\"! Sol·licitud ignorada."
+
+#: src/LYUpload.c:163
+msgid "Unable to upload file."
+msgstr "Ha estat impossible carregar el fitxer."
+
+#: src/LYUpload.c:206
+msgid "Upload To:"
+msgstr "Carregar a:"
+
+#: src/LYUpload.c:207
+msgid "Upload options:"
+msgstr "Opcions de càrrega:"
+
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2468
+msgid "Unexpected access protocol for this URL scheme."
+msgstr ""
+
+#: src/LYUtils.c:3294
+msgid "Too many tempfiles"
+msgstr "Massa fitxers temporals"
+
+#: src/LYUtils.c:3595
+msgid "unknown restriction"
+msgstr "restricció desconeguda"
+
+#: src/LYUtils.c:3626
+msgid "No restrictions set.\n"
+msgstr "No s'hi han establert restriccions.\n"
+
+#: src/LYUtils.c:3629
+msgid "Restrictions set:\n"
+msgstr "Restriccions:\n"
+
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr "No s'ha trobat el directori d'inici (HOME)"
+
+#: src/LYrcFile.c:21
+msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
+msgstr "Normalment desactivat. Veieu ENABLE_LYNXRC en lynx.cfg\n"
+
+#: src/LYrcFile.c:295
+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 ""
+"accept_all_cookies permet l'usuari que indique a Lynx que accepte totes\n"
+"les cookies automàticament. El valor predeterminat és \"FALSE\" de forma\n"
+"que el programa preguntarà abans d'acceptar cap cookie. Doneu a \n"
+"accept_all_cookies el valor \"TRUE\" per acceptar qualsevol cookie.\n"
+
+#: src/LYrcFile.c:302
+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 ""
+"bookmark_file especifica el nom i la ubicació del fitxer d'adreces\n"
+"d'interés predeterminat, en el qual l'usuari pot enganxar enllaços\n"
+"per accedir-hi posteriorment amb facilitat.\n"
+
+#: src/LYrcFile.c:307
+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 ""
+"Si el valor de case_sensitive_searching és \"on\", quan l'usuari realitze\n"
+"una recerca usant les tecles \"s\" o \"/\" les lletres majúscules i\n"
+"minúscules seran considerades lletres diferents. El valor predeterminat\n"
+"és \"off\".\n"
+
+#: src/LYrcFile.c:312
+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 ""
+"La definició de character_set (joc de caràcters) controla la\n"
+"representació de caràcters de 8 bits en el vostre terminal. Si no hi\n"
+"apareixen correctament proveu de canviar-ne a un altre\n"
+
+#: src/LYrcFile.c:319
+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 ""
+"cookie_accept_domains i cookie_reject_domains són llistes de dominis\n"
+"delimitats per comues dels quals Lynx acceptarà o rebutjarà (respectivament)\n"
+"totes les cookies. Si s'especifica un domini en totes dues llistes\n"
+
+#: src/LYrcFile.c:327
+msgid ""
+"cookie_file specifies the file from which to read persistent cookies.\n"
+"The default is ~/.lynx_cookies.\n"
+msgstr ""
+"cookie_file especifica el fitxer del qual es llegeixen les cookies\n"
+"persistents. Per omissió és ~/.lynx_cookies.\n"
+
+#: src/LYrcFile.c:332
+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 ""
+"cookie_loose_invalid_domains, cookie_strict_invalid_domains i \n"
+"cookie_query_invalid_domains són llistes separades per comes els\n"
+"dominis de les quals se sotmeten a diversos graus de comprovació\n"
+"de validesa. Si un domini \n"
+
+#: src/LYrcFile.c:346
+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^indica^l'ordre^en^què^s'ha^de^llistar^el^directori^sota\n"
+"DIRED_SUPPORT (si està disponible). Per omissió és \"ORDER_BY_NAME\".\n"
+
+#: src/LYrcFile.c:351
+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 ""
+"dir_list_styles^indica^com^s'ha^de^mostrar^el^directori^sota^DIRED_SUPPORT\n"
+"(si^està^disponible).^Per^omissió^és^\"MIXED_STYLE\",^que^ordena^els^fitxers\n"
+"i^els^directoris^indistintament.^\"FILES_FIRST\"^llista^primer^els^fitxers^i\n"
+"\"DIRECTORIES_FIRST\" llista primer els directoris.\n"
+
+#: src/LYrcFile.c:359
+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 ""
+"Si emacs_keys té el valor \"on\", les tecles de moviment seran les\n"
+"habituals a l'EMACS:\n"
+"  ^N = avall     ^P = amunt\n"
+"  ^B = esquerra  ^F = dreta\n"
+
+#: src/LYrcFile.c:365
+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 ""
+"file_editor indica quin editor s'usarà per a editar fitxers locals o per a\n"
+"enviar correu. Si no se n'especifica cap l'edició de fitxers quedarà\n"
+"desactivada (tret que s'active des de la línia d'ordres) i s'usarà l'editor\n"
+
+#: src/LYrcFile.c:371
+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 ""
+"file_sorting_method^indica^com^s'ha^de^realitzar^l'ordenació^quan^es\n"
+"visualitzen^llistes^de^fitxers^com^ara^directoris^FTP.^Les^opcions^són:\n"
+"^^^BY_FILENAME\n"
+
+#: src/LYrcFile.c:389
+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 "lineedit_mode especifica \n"
+
+#: src/LYrcFile.c:404
+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 ""
+
+#: src/LYrcFile.c:410
+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 "personal_mail_address especifica la vostra adreça de correu. L'adre\n"
+
+#: src/LYrcFile.c:419
+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 ""
+"preferred_charset especifica el joc de caràcters en notació MIME\n"
+"(p. ex.: ISO-8859-2) que Lynx indicarà que preferiu quan faça\n"
+"sol·licituds a servidors que usen la capçalera Accept-Charset. El\n"
+"valor NO ha de ser ni ISO-8859-1 ni US-ASCII atés que aquests són\n"
+"els valors per omissió. Podeu posar-hi una llista separada per comes.\n"
+"Si hi ha cap fitxer amb el joc de caràcters triat, el servidor l'envia.\n"
+"Si la capçalera Accept-Charset no està present, es considera que \n"
+"qualsevol joc de car\n"
+
+#: src/LYrcFile.c:433
+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 ""
+"preferred_language especifica l'idioma en notació MIME (p. ex.: ca,\n"
+"en; pot ser una llista separada per comes per ordre de preferència)\n"
+"que el programa indicarà com a preferit en les sol·licituds als \n"
+"servidors. Si està disponible el servidor l'usarà; si no, usarà\n"
+"l'idioma que tinga establert per omissió.\n"
+
+#: src/LYrcFile.c:442
+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 ""
+"Si run_all_execution_links està activat els enllaços d'execució \n"
+"s'executen \n"
+
+#: src/LYrcFile.c:453
+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 ""
+"Si run_all_execution_links_on_local_files està activat els enllaços\n"
+"d'execució que es troben en fitxers locals s'executen quan se\n"
+"seleccionen. Aquesta opció és diferent de run_all_execution_links\n"
+"en el fet que només es poden executar fitxers que es troben en \n"
+"l'ordinador local que tinguen permisos d'execució.\n"
+"\n"
+"ALERTA: Açò pot ser perillós. Atés que es possible veure\n"
+"        informació escrita per fonts desconegudes, existeix la\n"
+"        possibilitat de crear enllaços troians. Els enllaços\n"
+"        troians poden esborrar fitxers o comprometre la seguretat\n"
+"        del sistema. Aquesta opció només hauria d'activar-se si\n"
+"        veieu informació de confiança.\n"
+
+#: src/LYrcFile.c:471
+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 ""
+
+#: src/LYrcFile.c:481
+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 ""
+
+#: src/LYrcFile.c:498
+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 ""
+"show_cursor indica si s'ha d'\"amagar\" el cursor a la dreta de la\n"
+"pantalla (i avall si és possible), o si s'ha de col·locar a l'esquerra\n"
+"de l'enllaç actual en els documents o de l'opció actual en les finestres\n"
+"de sel\n"
+
+#: src/LYrcFile.c:509
+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 "L'opció show_dotfiles indica que s'han d'incloure els \n"
+
+#: src/LYrcFile.c:520
+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 ""
+
+#: src/LYrcFile.c:533
+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 ""
+"user_mode especifica el nivell d'experiència que té l'usuari amb Lynx.\n"
+"Per omissió és \"NOVICE\"\n"
+
+#: src/LYrcFile.c:542
+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 ""
+"Si el valor de verbose_images és \"on\", lynx mostrarà el nom del fitxer\n"
+"de la imatge en lloc de [INLINE], [LINK] o [IMAGE]\n"
+"Vegeu també VERBOSE_IMAGES en el fitxer lynx.cfg\n"
+
+#: src/LYrcFile.c:547
+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 ""
+"Si vi_keys es posa a \"on\", podreu usar les tecles de moviment de VI\n"
+"  j = avall      k = amunt\n"
+"  h = esquerra   l = dreta\n"
+"Només en minúscula. L\n"
+
+#: src/LYrcFile.c:555
+msgid ""
+"The visited_links setting controls how Lynx organizes the information\n"
+"in the Visited Links Page.\n"
+msgstr ""
+"La variable visited_links controla la forma en què Lynx organitza la\n"
+"informació en la pàgina d'enllaços visitats.\n"
+
+#: src/LYrcFile.c:772
+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 "Si poseu keypad_mode \n"
+
+#: src/LYrcFile.c:781
+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 ""
+"Si el valor de keypad_mode és \"LINKS_ARE_NUMBERED\" (enllaços numerats),\n"
+"aleshores apareixerà un número al costat de cada enllaç i podreu triar\n"
+"l'enllaç desitjat prement la tecla del número corresponent.\n"
+
+#: src/LYrcFile.c:785
+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 ""
+
+#: src/LYrcFile.c:794
+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 ""
+"NOTA: Alguns documents amb format fix poden aparéixer desfigurats quan\n"
+"trieu els valors \"LINKS_ARE_NUMBERED\" (enllaços numerats) o\n"
+"\"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" (enllaços i camps de formulari\n"
+"numerats.\n"
+
+#: src/LYrcFile.c:827
+msgid ""
+"Lynx User Defaults File\n"
+"\n"
+"This file contains options saved from the Lynx Options Screen (normally\n"
+"with the '>' key).  There is normally no need to edit this file manually,\n"
+"since the defaults here can be controlled from the Options Screen, and the\n"
+"next time options are saved from the Options Screen this file will be\n"
+"completely rewritten.  You have been warned...\n"
+"If you are looking for the general configuration file - it is normally\n"
+"called lynx.cfg, and it has different content and a different format.\n"
+"It is not this file.\n"
+msgstr ""
+"Fitxer que conté els valors per omissió de l'usuari\n"
+"\n"
+"Aquest fitxer conté les opcions desades en la pantalla d'opcions\n"
+"(normalment amb la tecla '->'). Normalment no cal editar-lo manualment\n"
+"atés que els valors per omissió es poden canviar des de la pantalla\n"
+"d'opcions i la propera vegada que deseu les opcions aquest fitxer serà\n"
+"completament reescrit. Ja ho sabeu...\n"
+"Si busqueu el fitxer de configuració: normalment s'anomena lynx.cfg i\n"
+"té format i contingut diferents.\n"
+"No és aquest fitxer.\n"
+
+#~ msgid "create %s"
+#~ msgstr "crear %s"
+
+#~ msgid "Unable to open file management menu file."
+#~ msgstr "Ha estat impossible obrir el fitxer del menú de gestió de fitxers."
diff --git a/gnu/usr.bin/lynx/po/cs.po b/gnu/usr.bin/lynx/po/cs.po
index dbe5883759a..0b1abb05403 100644
--- a/gnu/usr.bin/lynx/po/cs.po
+++ b/gnu/usr.bin/lynx/po/cs.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.4\n"
-"POT-Creation-Date: 2001-06-01 18:42-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-0500\n"
 "PO-Revision-Date: 1999-12-11 12:55+0100\n"
 "Last-Translator: Jiøí Pavlovský  <pavlovsk@ff.cuni.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -26,7 +27,7 @@ msgstr ""
 #. * Links to collections of alternate definitions, developed by the Lynx
 #. * User Community, are maintained in Lynx links:
 #. *
-#. *    http://www.trill-home.com/lynx.html
+#. *    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
@@ -41,1992 +42,1992 @@ msgstr "Pozor!: %s"
 msgid "Welcome"
 msgstr "Vítejte"
 
-#: LYMessages.c:31 LYMessages.c:32
+#: LYMessages.c:31
 msgid "Are you sure you want to quit?"
 msgstr "Opravdu chcete ukonèit program?"
 
-#: LYMessages.c:34 LYMessages.c:35
+#: LYMessages.c:33
 msgid "Really exit from Lynx?"
 msgstr "Opravdu chcete ukonèit Lynx?"
 
-#: LYMessages.c:37
+#: LYMessages.c:35
 msgid "Connection interrupted."
 msgstr "Spojení bylo pøeru¹eno."
 
-#: LYMessages.c:38
+#: LYMessages.c:36
 msgid "Data transfer interrupted."
 msgstr "Pøenos dat byl pøeru¹en."
 
-#: LYMessages.c:39
+#: LYMessages.c:37
 msgid "Cancelled!!!"
 msgstr "Zru¹eno!!!"
 
-#: LYMessages.c:40
+#: LYMessages.c:38
 msgid "Cancelling!"
 msgstr "Ru¹ím!"
 
-#: LYMessages.c:41
+#: LYMessages.c:39
 msgid "Excellent!!!"
 msgstr "Výbornì!!!"
 
-#: LYMessages.c:42
+#: LYMessages.c:40
 msgid "OK"
 msgstr "OK"
 
-#: LYMessages.c:43
+#: LYMessages.c:41
 msgid "Done!"
 msgstr "Hotovo!"
 
-#: LYMessages.c:44
+#: LYMessages.c:42
 msgid "Bad request!"
 msgstr "Chybný po¾adavek!"
 
-#: LYMessages.c:45
+#: LYMessages.c:43
 msgid "previous"
 msgstr "pøedchozí"
 
-#: LYMessages.c:46
+#: LYMessages.c:44
 msgid "next screen"
 msgstr "následující obrazovka"
 
-#: LYMessages.c:47
+#: LYMessages.c:45
 msgid "HELP!"
 msgstr "NÁPOVÌDA!"
 
-#: LYMessages.c:48
+#: LYMessages.c:46
 msgid ", help on "
 msgstr ", nápovìda pro "
 
 #. #define HELP
-#: LYMessages.c:50
+#: LYMessages.c:48
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr "Pøíkazy: ¹ipky: pohyb, '?': nápovìda, 'q': ukonèení, '<-': návrat zpìt"
 
 #. #define MOREHELP
-#: LYMessages.c:52
+#: LYMessages.c:50
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr "-- mezerník: dal¹í strana, ¹ipky: pohyb, '?': nápovìda. 'q': ukonèení"
 
-#: LYMessages.c:53
+#: LYMessages.c:51
 msgid "-- press space for next page --"
 msgstr "-- mezerníkem zobrazíte dal¹í stranu --"
 
-#: LYMessages.c:54
+#: LYMessages.c:52
 msgid "URL too long"
 msgstr "Cesta je pøíli¹ dlouhá."
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:60
+#: LYMessages.c:58
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr ""
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:60
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr ""
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:64
+#: LYMessages.c:62
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(Textové pole) Zadejte text. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:64
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(Pole formuláøe) Zadejte text. <return> ode¹le ('x' pro 'NO CACHE')."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:68
+#: LYMessages.c:66
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr "(Pole formuláøe) Zadejte text. <return> ode¹le (%s pro 'NO CACHE')."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:68
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
 msgstr "(Pole formuláøe) Zadejte text. <return> ode¹le, ¹ipky èi tab pro odchod."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:72
+#: LYMessages.c:70
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "(mailto pole formuláøe) Zadejte text. <return> ode¹le, ¹ipky pro odchod."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:74
+#: LYMessages.c:72
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "(Pole pro zadání hesla) Zadejte text. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:77
+#: LYMessages.c:75
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
 msgstr "NEMODIFIKOVATELNÉ pole pro výbìr souboru. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:77
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Pole pro výbìr souboru) Vyberte soubor. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:81
+#: LYMessages.c:79
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Pole pro textový vstup) Zadejte text. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:83
+#: LYMessages.c:81
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
 msgstr "(Textové pole) Zadejte text. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:85
+#: LYMessages.c:83
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
 msgstr "(Textové pole) Zadejte text. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:87
+#: LYMessages.c:85
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
 msgstr "NEMODIFIKOVATELNÉ textové pole formuláøe. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:87
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(Pole formuláøe) Zadejte text. <return> ode¹le ('x' pro 'NO CACHE')."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:91
+#: LYMessages.c:89
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr "(Pole formuláøe) Zadejte text. <return> ode¹le (%s pro 'NO CACHE')."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:93
+#: LYMessages.c:91
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr "(Pole formuláøe) Zadejte text. <return> ode¹le, ¹ipky èi tab pro odchod."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:95
+#: LYMessages.c:93
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
 msgstr "NEMODIFIKOVATELNÉ pole formuláøe. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:97
+#: LYMessages.c:95
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr "(mailto pole formuláøe) Zadejte text. <return> ode¹le, ¹ipky pro odchod."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:99
+#: LYMessages.c:97
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr "('mailto' pole formuláøe) Po¹ta je vypnuta, tudí¾ nemù¾ete nic poslat."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:99
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Pole pro zadání hesla) Zadejte text. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:101
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
 msgstr "NEMODIFIKOVATELNÉ heslo formuláøe. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:103
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "(Za¹krtávací pole). ©ipka vpravo èi <return> pro pøepnutí."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:105
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
 msgstr "NEMODIFIKOVATELNÉ za¹krtávací pole. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:109
+#: LYMessages.c:107
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr "(Pøepínací tlaèítko) ©ipka vpravo èi <return> pro pøepnutí."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:111
+#: LYMessages.c:109
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
 msgstr "NEMODIFIKOVATELNÉ pøepínací tlaèítko. ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:113
+#: LYMessages.c:111
 msgid "Submit ('x' for no cache) to "
 msgstr "Odeslat ('x' pro 'NO CACHE') na "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:115
+#: LYMessages.c:113
 msgid "Submit to "
 msgstr "Odeslat na "
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:117
+#: LYMessages.c:115
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr "(Tlaèítko pro odeslání) ©ipka vpravo èi <return> pro odeslání (x pro NO CACHE)"
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:119
+#: LYMessages.c:117
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(Tlaèítko pro odeslání) ©ipka vpravo èi <return> pro odeslání"
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:121
+#: LYMessages.c:119
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
 msgstr "(VYPNUTÉ tlaèítko pro odeslání) ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:123
+#: LYMessages.c:121
 msgid "Submit mailto form to "
 msgstr "Odeslat 'mailto' formuláø na "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:125
+#: LYMessages.c:123
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr "(Tlaèítko pro odeslání) ©ipka vpravo èi <return> pro odeslání"
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:125
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr "(Tlaèítko pro odeslání) Po¹ta je zakázána, tudí¾ nemù¾ete nic odeslat."
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:127
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr "(Tlaèítko pro smazání) ©ipka vpravo èi <return> pro smazání vlo¾ených údajù."
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:129
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
 msgstr "(VYPNUTÉ tlaèítko pro smazání) ©ipky NAHORU/DOLÙ èi tab pro odchod."
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:131
 msgid "(Option list) Hit return and use arrow keys and return to select option."
 msgstr "(Seznam voleb) <return> a ¹ipky pro vybrání."
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:133
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
 msgstr "(Nabídka mo¾ností) <return> a ¹ipky pro zvolení."
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:135
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr "NEMODIFIKOVATELNÝ seznam voleb. <return> èi ¹ipky pro prohlí¾ení èi odchod"
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:137
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr "NEMODIFIKOVATELNÁ nabídka mo¾ností. <return> èi ¹ipky pro prohlí¾ení èi odchod"
 
-#: LYMessages.c:140
+#: LYMessages.c:138
 msgid "Submitting form..."
 msgstr "Odesílám formuláø..."
 
-#: LYMessages.c:141
+#: LYMessages.c:139
 msgid "Resetting form..."
 msgstr "Ma¾u obsah formuláøe..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:141
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Znovu nahrávám dokument. V¹echny údaje zapsané do formuláøù budou ztraceny!"
 
-#: LYMessages.c:144
+#: LYMessages.c:142
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Varování: Data formuláøe nelze pøevést do znakové sady %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:147
+#: LYMessages.c:145
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr "(BÌ®NÝ ODKAZ)   Pou¾ijte ¹ipku vpravo èi <return> pro aktivaci."
 
-#: LYMessages.c:148
+#: LYMessages.c:146
 msgid "The resource requested is not available at this time."
 msgstr "Po¾adovaný zdroj není v tuto chvíli pøístupný."
 
-#: LYMessages.c:149
+#: LYMessages.c:147
 msgid "Enter Lynx keystroke command: "
 msgstr "Stisknìte nìjakou pøíkazovou klávesu: "
 
-#: LYMessages.c:150
+#: LYMessages.c:148
 msgid "Looking up "
 msgstr "Vyhledávám "
 
-#: LYMessages.c:151
+#: LYMessages.c:149
 #, c-format
 msgid "Getting %s"
 msgstr "Získávám %s"
 
-#: LYMessages.c:152
+#: LYMessages.c:150
 #, c-format
 msgid "Skipping %s"
 msgstr "Pøeskakuji %s"
 
-#: LYMessages.c:153
+#: LYMessages.c:151
 #, c-format
 msgid "Using %s"
 msgstr "Pou¾ívám %s"
 
-#: LYMessages.c:154
+#: LYMessages.c:152
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "Chybné URL %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:153
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Adresa %s je chybnì utvoøená."
 
-#: LYMessages.c:156
+#: LYMessages.c:154
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:155
 msgid "Unable to access WWW file!!!"
 msgstr "Pøístup k WWW souboru nelze získat!!!"
 
-#: LYMessages.c:158
+#: LYMessages.c:156
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "Toto je prohledávatelný rejstøík. Pou¾ijte %s pro hledání."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:160
+#: LYMessages.c:158
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--Více-- Toto je prohledávatelný rejstøík. Pou¾ijte %s pro hledání."
 
-#: LYMessages.c:161
+#: LYMessages.c:159
 msgid "You have entered an invalid link number."
 msgstr "Èíslo odkazu, které jste zadal je chybné."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:163
+#: LYMessages.c:161
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "Zobrazuji zdrojový kód.  Stisknìte '\\' pro návrat k interpretované verzi."
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:165
+#: LYMessages.c:163
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
 msgstr "  ©ipky: Nahoru/Dolù pro pohyb. Vpravo následuje odkaz; vlevo se vrátí zpìt.  \n"
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:167
+#: LYMessages.c:165
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
 msgstr "H>Nápovìda Vo)lby P>Tisk G>Jdi M>Hlavní obrazovka /=hledej [delete]=historie \n"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:169
+#: LYMessages.c:167
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
 msgstr "  O)statní pøík. H>Nápovìda K)lávesová mapa G>Jdi_na P>Tisk M>Hlavní obrazovka o>volby Q>Konec\n"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:171
+#: LYMessages.c:169
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr "  O)statní pøík. B>Zpìt E)ditovat D>Stáhnout ^R>Znovu nahrát ^W>Smazat obraz hledat: /\n"
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:173
+#: LYMessages.c:171
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr "  O)statní pøík. C>Komentáø Historie: <delete> Zálo¾ky: V>Zobrazit A>Nová R>Smazat\n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:175
+#: LYMessages.c:173
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr "            Pomocí klávesnice vlo¾te text do pole                             "
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:177
+#: LYMessages.c:175
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr "    Ctrl-U vyma¾e ve¹kerý text v poli; [Backspace] sma¾e jeden znak          "
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:179
+#: LYMessages.c:177
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
 msgstr "    Ctrl-U vyma¾e ve¹kerý text v poli; [Backspace] sma¾e jeden znak          "
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:181
+#: LYMessages.c:179
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr "    Ctrl-U vyma¾e ve¹kerý text v poli; [Backspace] sma¾e jeden znak          "
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:183
+#: LYMessages.c:181
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
 msgstr "    Ctrl-U vyma¾e ve¹kerý text v poli; [Backspace] sma¾e jeden znak          "
 
 #. mailto
-#: LYMessages.c:186
+#: LYMessages.c:184
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "Pokus o odeslání chybného 'mailto' formuláøe! Zru¹eno!"
 
-#: LYMessages.c:187
+#: LYMessages.c:185
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Varování! Øídící znaky v po¹tovní adrese byly nahrazeny ?"
 
-#: LYMessages.c:188
+#: LYMessages.c:186
 msgid "Mail disallowed!  Cannot submit."
 msgstr "Po¹ta je zakázána! Nelze nic poslat."
 
-#: LYMessages.c:189
+#: LYMessages.c:187
 msgid "Mailto form submission failed!"
 msgstr "Odeslání 'mailto' formuláøe se nezdaøilo!"
 
-#: LYMessages.c:190
+#: LYMessages.c:188
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Odeslání 'mailto' formuláøe zru¹eno!!!"
 
-#: LYMessages.c:191
+#: LYMessages.c:189
 msgid "Sending form content..."
 msgstr "Posílám obsah formuláøe..."
 
-#: LYMessages.c:192
+#: LYMessages.c:190
 msgid "No email address is present in mailto URL!"
 msgstr "'Mailto' URL neobsahuje po¹tovní adresu!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:194
+#: LYMessages.c:192
 msgid "Unable to open temporary file for mailto URL!"
 msgstr "Doèasný soubor pro 'mailto' URL nelze otevøít!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:196
+#: LYMessages.c:194
 msgid "Do you wish to include the original message?"
 msgstr "Chcete zaøadit text pùvodní zprávy?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:196
 msgid "Do you wish to include the preparsed source?"
 msgstr "Chcete zaøadit pøedzpracovaný zdrojový text?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:200
+#: LYMessages.c:198
 msgid "Spawning your selected editor to edit mail message"
 msgstr "Spou¹tím vámi zvolený textový editor pro editaci zprávy"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:202
+#: LYMessages.c:200
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr "Chyba pøi startu editoru. Zkontrolujte nastavení editoru v konfiguraèním menu."
 
-#: LYMessages.c:203
+#: LYMessages.c:201
 msgid "Send this comment?"
 msgstr "Odeslat tento komentáø?"
 
-#: LYMessages.c:204
+#: LYMessages.c:202
 msgid "Send this message?"
 msgstr "Odeslat tuto zprávu?"
 
-#: LYMessages.c:205
+#: LYMessages.c:203
 msgid "Sending your message..."
 msgstr "Odesílám va¹i zprávu..."
 
-#: LYMessages.c:206
+#: LYMessages.c:204
 msgid "Sending your comment:"
 msgstr "Odesílám vá¹ komentáø:"
 
 #. textarea
-#: LYMessages.c:209
+#: LYMessages.c:207
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "Toto není textová oblast; externí editor nelze pou¾ít."
 
-#: LYMessages.c:210
+#: LYMessages.c:208
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "Toto není textová oblast; externí editor nelze pou¾ít."
 
-#: LYMessages.c:213
+#: LYMessages.c:211
 msgid "file: ACTIONs are disallowed!"
 msgstr "file: AKCE jsou zakázány!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:213
 msgid "file: URLs via served links are disallowed!"
 msgstr "Pou¾ívání odkazù ze vzdálených dokumentù pro lokální soubory je zakázáno!"
 
-#: LYMessages.c:216
+#: LYMessages.c:214
 msgid "Access to local files denied."
 msgstr "Pøístup k teèkovým souborùm je zakázán!"
 
-#: LYMessages.c:217
+#: LYMessages.c:215
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "Pou¾ívání zálo¾ek pro lokální soubory je zakázáno!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:217
 msgid "This special URL is not allowed in external documents!"
 msgstr "Toto zvlá¹tní URL není v externích dokumentech povoleno!"
 
-#: LYMessages.c:220
+#: LYMessages.c:218
 msgid "Press <return> to return to Lynx."
 msgstr "Stisknìte <return> pro návrat do programu Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:221
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "Spou¹tím DCL proces. Pou¾ijte 'logout' pro návrat do programu Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:225
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "Napi¹te EXIT pro návrat do programu Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:228
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr "Spou¹tím implicitní shell. Pou¾ijte 'exit' pro návrat do programu Lynx.\n"
 
-#: LYMessages.c:233
+#: LYMessages.c:231
 msgid "Spawning is currently disabled."
 msgstr "Spou¹tìní je nyní vypnuto."
 
-#: LYMessages.c:234
+#: LYMessages.c:232
 msgid "The 'd'ownload command is currently disabled."
 msgstr "Pøíkaz 'd' je nyní vypnut."
 
-#: LYMessages.c:235
+#: LYMessages.c:233
 msgid "You cannot download an input field."
 msgstr "Nemù¾ete stahovat vstupní pole."
 
-#: LYMessages.c:236
+#: LYMessages.c:234
 msgid "Form has a mailto action!  Cannot download."
 msgstr "Formuláø obsahuje 'mailto' akci! Nelze stáhnout."
 
-#: LYMessages.c:237
+#: LYMessages.c:235
 msgid "You cannot download a mailto: link."
 msgstr "Nemù¾ete stáhnout 'mailto:' odkaz."
 
-#: LYMessages.c:238
+#: LYMessages.c:236
 msgid "You cannot download cookies."
 msgstr "Nemù¾ete stahovat cookies."
 
-#: LYMessages.c:239
+#: LYMessages.c:237
 msgid "You cannot download a printing option."
 msgstr "Polo¾ku z menu voleb tisku nelze stahovat."
 
-#: LYMessages.c:240
+#: LYMessages.c:238
 msgid "You cannot download an upload option."
 msgstr "Polo¾ku z menu voleb posílání nelze stahovat."
 
-#: LYMessages.c:241
+#: LYMessages.c:239
 msgid "You cannot download an permit option."
 msgstr "Polo¾ku z menu nastavení práv souborù nelze stahovat."
 
-#: LYMessages.c:242
+#: LYMessages.c:240
 msgid "This special URL cannot be downloaded!"
 msgstr "Toto zvlá¹tní URL nemù¾e být sta¾eno!"
 
-#: LYMessages.c:243
+#: LYMessages.c:241
 msgid "Nothing to download."
 msgstr "Není co stáhnout."
 
-#: LYMessages.c:244
+#: LYMessages.c:242
 msgid "Trace ON!"
 msgstr "Sledování ZAPNUTO!"
 
-#: LYMessages.c:245
+#: LYMessages.c:243
 msgid "Trace OFF!"
 msgstr "Sledování VYPNUTO!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:245
 msgid "Links will be included for all images!  Reloading..."
 msgstr "Budou zaøazeny odkazy na v¹echny obrázky! Znovu naèítám..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:247
 msgid "Standard image handling restored!  Reloading..."
 msgstr "Implicitní zpracování obrázkù obnoveno! Znovu naèítám..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:249
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr "Zobrazuji pseudo-popisy pro vlo¾ené obrázky bez popisu! Znovu naèítám..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:251
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "Vlo¾ené obrázky bez popisu budou ignorovány! Znovu naèítám..."
 
-#: LYMessages.c:254
+#: LYMessages.c:252
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Pøímý 8bitový èi CJK re¾im VYPNUT! Znovu naèítám..."
 
-#: LYMessages.c:255
+#: LYMessages.c:253
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "Pøímý 8bitový èi CJK re¾im ZAPNUT! Znovu naèítám..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:255
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "Poslat HEAD po¾adavek pro D)okument, L>Odkaz èi C>Zru¹it? (d,l,c): "
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:257
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "Poslat HEAD po¾adavek pro D)okument èi C>Zru¹it? (d,c): "
 
-#: LYMessages.c:260
+#: LYMessages.c:258
 msgid "Sorry, the document is not an http URL."
 msgstr "Lituji, dokument není http URL."
 
-#: LYMessages.c:261
+#: LYMessages.c:259
 msgid "Sorry, the link is not an http URL."
 msgstr "Lituji, odkaz není http URL."
 
-#: LYMessages.c:262
+#: LYMessages.c:260
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "Akce tohoto formuláøe je vypnuta."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:262
 msgid "Sorry, the ACTION for this form is not an http URL."
 msgstr "Akce tohoto formuláøe není http URL."
 
-#: LYMessages.c:265
+#: LYMessages.c:263
 msgid "Not an http URL or form ACTION!"
 msgstr "Toto není http URL ani akce formuláøe!"
 
-#: LYMessages.c:266
+#: LYMessages.c:264
 msgid "This special URL cannot be a form ACTION!"
 msgstr "Toto zvlá¹tní URL nemù¾e být akcí formuláøe!"
 
-#: LYMessages.c:267
+#: LYMessages.c:265
 msgid "URL is not in starting realm!"
 msgstr "URL není ve startovní oblasti!"
 
-#: LYMessages.c:268
+#: LYMessages.c:266
 msgid "News posting is disabled!"
 msgstr "Odesílání pøíspìvkù do diskuzních skupin je zakázáno!"
 
-#: LYMessages.c:269
+#: LYMessages.c:267
 msgid "File management support is disabled!"
 msgstr "Správce souborù je zakázán!"
 
-#: LYMessages.c:270
+#: LYMessages.c:268
 msgid "No jump file is currently available."
 msgstr "®ádný soubor zkratek není dostupný."
 
-#: LYMessages.c:271
+#: LYMessages.c:269
 msgid "Jump to (use '?' for list): "
 msgstr "Skoèit na ('?' pro seznam): "
 
-#: LYMessages.c:272
+#: LYMessages.c:270
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr "Není povoleno pøeskakovat na zkrácená URL!"
 
-#: LYMessages.c:273
+#: LYMessages.c:271
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "Náhodná URL jsou zakázána! Pou¾ijte zkratku."
 
-#: LYMessages.c:274
+#: LYMessages.c:272
 msgid "No random URLs have been used thus far."
 msgstr "Doposud nebyla pou¾ita ¾ádná náhodná URL."
 
-#: LYMessages.c:275
+#: LYMessages.c:273
 msgid "Bookmark features are currently disabled."
 msgstr "Pou¾ívání zálo¾ek je nyní zakázáno."
 
-#: LYMessages.c:276
+#: LYMessages.c:274
 msgid "Execution via bookmarks is disabled."
 msgstr "Spou¹tìní programù pøes soubory zálo¾ek je zakázáno."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:276
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "Soubor se zálo¾kami není zadán. Pou¾ijte %s pro zobrazení mo¾ností."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:278
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "Doèasný soubor pro konverzi X Mosaic 'hotlistu' nelze otevøít."
 
-#: LYMessages.c:281
+#: LYMessages.c:279
 msgid "ERROR - unable to open bookmark file."
 msgstr "CHYBA - soubor zálo¾ek nelze otevøít."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:281
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "Zálo¾ku nelze smazat: soubor zálo¾ek nelze otevøít"
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:283
 msgid "Unable to open scratch file for deletion of link."
 msgstr "Zálo¾ku nelze smazat: doèasný soubor nelze otevøít"
 
-#: LYMessages.c:287
+#: LYMessages.c:285
 msgid "Error renaming scratch file."
 msgstr "Chyba pøi pøejmenovávání doèasného souboru."
 
-#: LYMessages.c:289
+#: LYMessages.c:287
 msgid "Error renaming temporary file."
 msgstr "Chyba pøi pøejmenovávání doèasného souboru."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:289
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "Zálo¾ku nelze smazat: doèasný soubor nelze kopírovat"
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:291
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "Zálo¾ku nelze smazat: doèasný soubor nelze znovu otevøít"
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:294
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "Zálo¾ka je del¹í ne¾ jeden øádek."
 
-#: LYMessages.c:297
+#: LYMessages.c:295
 msgid "Bookmark deletion failed."
 msgstr "Odstranìní zálo¾ky se nezdaøilo."
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:297
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr "Soubory se zálo¾kami nelze prolézat (pouze http URL)."
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:299
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "Soubor se zálo¾kami nelze otevøít. Klávesou 'a' nejprve ulo¾te odkaz"
 
-#: LYMessages.c:302
+#: LYMessages.c:300
 msgid "There are no links in this bookmark file!"
 msgstr "Tento soubor zálo¾ek je prázdný!"
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:302
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr "Ulo¾it do souboru se zálo¾kami D)okument, L>Odkaz èi C>Zru¹it? (d,l,c): "
 
-#: LYMessages.c:305
+#: LYMessages.c:303
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "Ulo¾it do souboru se zálo¾kami D)okument èi C>Zru¹it? (d,c): "
 
-#: LYMessages.c:306
+#: LYMessages.c:304
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "Ulo¾it do souboru se zálo¾kami L>Odkaz èi C>Zru¹it? (l,c): "
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:308
+#: LYMessages.c:306
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr "Zálo¾ky pro dokumenty s POST obsahem ukládat nelze."
 
-#: LYMessages.c:309
+#: LYMessages.c:307
 msgid "Cannot save form fields/links"
 msgstr "Formuláøová pole/odkazy nelze ukládat."
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:311
+#: LYMessages.c:309
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "Zálo¾ky pro historii, showinfo, menu a seznamy nelze ukládat."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:313
+#: LYMessages.c:311
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Opravdu chcete vymazat tento odkaz z va¹eho souboru se zálo¾kami?"
 
-#: LYMessages.c:314
+#: LYMessages.c:312
 msgid "Malformed address."
 msgstr "Chybná adresa."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:316
+#: LYMessages.c:314
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "Historické komentáøe zapnuto (minimální komentáøe potlaèeny)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:318
+#: LYMessages.c:316
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "Historické komentáøe vypnuty (minimální komentáøe aktivní)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:320
+#: LYMessages.c:318
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "Historické komentáøe zapnuty (platné komentáøe potlaèeny)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:322
+#: LYMessages.c:320
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "Historické komentáøe vypnuty (platné komentáøù aktivní)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:324
+#: LYMessages.c:322
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "Pou¾ívání minimálních komentáøù zapnuto a aktivní!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:324
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "Pou¾ívání minimálních komentáøù vypnuto (platné komentáøe aktivní)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:328
+#: LYMessages.c:326
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "Pou¾ívání minimálních komentáøù zapnuto (ale aktivní jsou historické komentáøe)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:330
+#: LYMessages.c:328
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "Pou¾ívání minimálních komentáøù vypnuto (historické komentáøù aktivní)!"
 
-#: LYMessages.c:331
+#: LYMessages.c:329
 msgid "Soft double-quote parsing ON!"
 msgstr "Pou¾ívání '>' jako zakonèení znaèek a citací zapnuto!"
 
-#: LYMessages.c:332
+#: LYMessages.c:330
 msgid "Soft double-quote parsing OFF!"
 msgstr "Pou¾ívání '>' jako zakonèení znaèek a citací vypnuto!"
 
-#: LYMessages.c:333
+#: LYMessages.c:331
 msgid "Now using TagSoup parsing of HTML."
 msgstr "Pou¾ívám 'TagSoup' metodu zpracování HTML."
 
-#: LYMessages.c:334
+#: LYMessages.c:332
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "Pou¾ívám 'SortaSGML' metodu zpracování HTML!"
 
-#: LYMessages.c:335
+#: LYMessages.c:333
 msgid "You are already at the end of this document."
 msgstr "Ji¾ jste na konci dokumentu."
 
-#: LYMessages.c:336
+#: LYMessages.c:334
 msgid "You are already at the beginning of this document."
 msgstr "Ji¾ jste na zaèátku dokumentu."
 
-#: LYMessages.c:337
+#: LYMessages.c:335
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "Ji¾ jste na stranì %d."
 
-#: LYMessages.c:338
+#: LYMessages.c:336
 #, c-format
 msgid "Link number %d already is current."
 msgstr "Odkaz èíslo %d je právì zvolen."
 
-#: LYMessages.c:339
+#: LYMessages.c:337
 msgid "You are already at the first document"
 msgstr "Jste na prvním dokumentu."
 
-#: LYMessages.c:340
+#: LYMessages.c:338
 msgid "There are no links above this line of the document."
 msgstr "Nad tímto øádkem ji¾ nejsou ¾ádné odkazy."
 
-#: LYMessages.c:341
+#: LYMessages.c:339
 msgid "There are no links below this line of the document."
 msgstr "Pod tímto øádkem ji¾ nejsou ¾ádné odkazy."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:343
+#: LYMessages.c:341
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "Maximální délka dosa¾ena! Sma¾te text, nebo se pøesuòte mimo pole."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:345
+#: LYMessages.c:343
 msgid "You are not on a form submission button or normal link."
 msgstr "Toto není bì¾ný odkaz ani tlaèítko na odeslání formuláøe."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:347
+#: LYMessages.c:345
 msgid "One radio button must be checked at all times!"
 msgstr "V¾dy musí být vybráno alespoò jedno z pøepínacích tlaèítek!"
 
-#: LYMessages.c:348
+#: LYMessages.c:346
 msgid "No submit button for this form, submit single text field?"
 msgstr ""
 
-#: LYMessages.c:349
+#: LYMessages.c:347
 msgid "Do you want to go back to the previous document?"
 msgstr "Chcete se vrátit k pøedchozímu dokumentu?"
 
-#: LYMessages.c:350
+#: LYMessages.c:348
 msgid "Use arrows or tab to move off of field."
 msgstr "Pou¾ijte ¹ipky èi tabelátor pro pøesun mimo pole."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:352
+#: LYMessages.c:350
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "Vlo¾te text. Pou¾ijte ¹ipky èi tabelátor pro pøesun mimo pole."
 
-#: LYMessages.c:353
+#: LYMessages.c:351
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** Chybné HTML!! Formuláø nemá definovánu ¾ádnou akci. **"
 
-#: LYMessages.c:354
+#: LYMessages.c:352
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "Chybné HTML!! Nelze vytvoøit vyskakovací okno!"
 
-#: LYMessages.c:355
+#: LYMessages.c:353
 msgid "Unable to create popup window!"
 msgstr "Nelze vytvoøit vyskakovací okno!"
 
-#: LYMessages.c:356
+#: LYMessages.c:354
 msgid "Goto a random URL is disallowed!"
 msgstr "Náhodná URL je zakázáno pou¾ít jako cíl!"
 
-#: LYMessages.c:357
+#: LYMessages.c:355
 msgid "Goto a non-http URL is disallowed!"
 msgstr "Ne-http URL je zakázáno pou¾ít jako cíl!"
 
-#: LYMessages.c:358
+#: LYMessages.c:356
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "\"%s\" URL nesmíte pou¾ít jako cíl!"
 
-#: LYMessages.c:359
+#: LYMessages.c:357
 msgid "URL to open: "
 msgstr "Cílové URL: "
 
-#: LYMessages.c:360
+#: LYMessages.c:358
 msgid "Edit the current Goto URL: "
 msgstr "Editace aktuálního cílového URL: "
 
-#: LYMessages.c:361
+#: LYMessages.c:359
 msgid "Edit the previous Goto URL: "
 msgstr "Editace pøedchozího cílového URL: "
 
-#: LYMessages.c:362
+#: LYMessages.c:360
 msgid "Edit a previous Goto URL: "
 msgstr "Editace pøedchozího cílového URL: "
 
-#: LYMessages.c:363
+#: LYMessages.c:361
 msgid "Current document has POST data."
 msgstr "Aktuální dokument obsahuje POST data."
 
-#: LYMessages.c:364
+#: LYMessages.c:362
 msgid "Edit this document's URL: "
 msgstr "Editace URL tohoto dokumentu: "
 
-#: LYMessages.c:365
+#: LYMessages.c:363
 msgid "Edit the current link's URL: "
 msgstr "Editace URL aktuálního odkazu: "
 
-#: LYMessages.c:366
+#: LYMessages.c:364
 msgid "You cannot edit File Management URLs"
 msgstr "Nemù¾ete editovat URL Správce souborù"
 
-#: LYMessages.c:367
+#: LYMessages.c:365
 msgid "Enter a database query: "
 msgstr "Zadejte dotaz na databázi: "
 
-#: LYMessages.c:368
+#: LYMessages.c:366
 msgid "Enter a whereis query: "
 msgstr "Zadejte hledaný øetìzec: "
 
-#: LYMessages.c:369
+#: LYMessages.c:367
 msgid "Edit the current query: "
 msgstr "Editace aktuálního dotazu: "
 
-#: LYMessages.c:370
+#: LYMessages.c:368
 msgid "Edit the previous query: "
 msgstr "Editace pøedchozího dotazu: "
 
-#: LYMessages.c:371
+#: LYMessages.c:369
 msgid "Edit a previous query: "
 msgstr "Editace pøedchozího dotazu: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:373
+#: LYMessages.c:371
 msgid "Use Control-R to resubmit the current query."
 msgstr "Pou¾ijte Control-R pro opìtovné odeslání dotazu."
 
-#: LYMessages.c:374
+#: LYMessages.c:372
 msgid "Edit the current shortcut: "
 msgstr "Editovat aktuální zkratku: "
 
-#: LYMessages.c:375
+#: LYMessages.c:373
 msgid "Edit the previous shortcut: "
 msgstr "Editovat pøedchozí zkratku: "
 
-#: LYMessages.c:376
+#: LYMessages.c:374
 msgid "Edit a previous shortcut: "
 msgstr "Editovat pøedchozí zkratku: "
 
-#: LYMessages.c:377
+#: LYMessages.c:375
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
-msgstr "Klávesa '%s' není svázána se souborem zkratek!"
+msgstr "Klávesa '%c' není svázána se souborem zkratek!"
 
-#: LYMessages.c:378
+#: LYMessages.c:376
 msgid "Cannot locate jump file!"
 msgstr "Soubor zkratek nelze nalézt!"
 
-#: LYMessages.c:379
+#: LYMessages.c:377
 msgid "Cannot open jump file!"
 msgstr "Soubor zkratek nelze otevøít!"
 
-#: LYMessages.c:380
+#: LYMessages.c:378
 msgid "Error reading jump file!"
 msgstr "Chyba pøi ètení souboru zkratek!"
 
-#: LYMessages.c:381
+#: LYMessages.c:379
 msgid "Out of memory reading jump file!"
 msgstr "Pøi ètení souboru zkratek do¹la pamì»!"
 
-#: LYMessages.c:382
+#: LYMessages.c:380
 msgid "Out of memory reading jump table!"
 msgstr "Pøi ètení tabulky zkratek do¹la pamì»!"
 
-#: LYMessages.c:383
+#: LYMessages.c:381
 msgid "No index is currently available."
 msgstr "Není dostupný ¾ádný rejstøík."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:385
+#: LYMessages.c:383
 msgid "Do you really want to go to the Main screen?"
 msgstr "Opravdu chcete pøejít na hlavní obrazovku?"
 
-#: LYMessages.c:386
+#: LYMessages.c:384
 msgid "You are already at main screen!"
 msgstr "Ji¾ jste na hlavní obrazovce!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:388
+#: LYMessages.c:386
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "Toto není prohledávatelný rejstøík -- pou¾ijte '/' pro vyhledání øetìzce"
 
 #. #define NO_OWNER
-#: LYMessages.c:390
+#: LYMessages.c:388
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "Není udán vlastník tohoto dokumentu, tudí¾ nemù¾ete zaslat komentáø."
 
-#: LYMessages.c:391
+#: LYMessages.c:389
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Není udán vlastník. Pou¾ít %s?"
 
-#: LYMessages.c:392
+#: LYMessages.c:390
 msgid "Do you wish to send a comment?"
 msgstr "Chcete zaslat komentáø?"
 
-#: LYMessages.c:393
+#: LYMessages.c:391
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "Po¹ta je zakázána, tudí¾ nemù¾ete zaslat komentáø."
 
-#: LYMessages.c:394
+#: LYMessages.c:392
 msgid "The 'e'dit command is currently disabled."
 msgstr "Pou¾ití pøíkazu 'e' je nyní zakázáno."
 
-#: LYMessages.c:395
+#: LYMessages.c:393
 msgid "External editing is currently disabled."
 msgstr "Spou¹tìní externích programù je nyní zakázáno."
 
-#: LYMessages.c:396
+#: LYMessages.c:394
 msgid "System error - failure to get status."
 msgstr "Systémová chyba - status nelze zjistit."
 
-#: LYMessages.c:397
+#: LYMessages.c:395
 msgid "No editor is defined!"
 msgstr "Není zadán ¾ádný editor!"
 
-#: LYMessages.c:398
+#: LYMessages.c:396
 msgid "The 'p'rint command is currently disabled."
 msgstr "Pou¾ití pøíkazu 'p' je nyní zakázáno."
 
-#: LYMessages.c:399
+#: LYMessages.c:397
 msgid "Document has no Toolbar links or Banner."
 msgstr "Dokument nemá ¾ádnou nástrojovou li¹tu ani reklamní nudli."
 
-#: LYMessages.c:400
+#: LYMessages.c:398
 msgid "Unable to open traversal file."
 msgstr "Nelze otevøít 'traverse' soubor."
 
-#: LYMessages.c:401
+#: LYMessages.c:399
 msgid "Unable to open traversal found file."
 msgstr "Nelze otevøít 'traverse_found' soubor."
 
-#: LYMessages.c:402
+#: LYMessages.c:400
 msgid "Unable to open reject file."
 msgstr "Nelze otevøít 'traverse_reject' soubor."
 
-#: LYMessages.c:403
+#: LYMessages.c:401
 msgid "Unable to open traversal errors output file"
 msgstr "Nelze otevøít 'traverse_errors' soubor."
 
-#: LYMessages.c:404
+#: LYMessages.c:402
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "PROLÉZÁNÍ BYLO PØERU©ENO"
 
-#: LYMessages.c:405
+#: LYMessages.c:403
 msgid "Follow link (or goto link or page) number: "
 msgstr "Následovat odkaz (èi jít na odkaz nebo stránku) èíslo: "
 
-#: LYMessages.c:406
+#: LYMessages.c:404
 msgid "Select option (or page) number: "
 msgstr "Zvolte èíslo volby (èi strany): "
 
-#: LYMessages.c:407
+#: LYMessages.c:405
 #, c-format
 msgid "Option number %d already is current."
 msgstr "Volba èíslo %d je právì aktivní."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:409
+#: LYMessages.c:407
 msgid "You are already at the end of this option list."
 msgstr "Jste na konci seznamu voleb."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:411
+#: LYMessages.c:409
 msgid "You are already at the beginning of this option list."
 msgstr "Jste na zaèátku seznamu voleb."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:413
+#: LYMessages.c:411
 #, c-format
 msgid "You are already at page %d of this option list."
-msgstr "Ji¾ jste na stranì %s nabídky."
+msgstr "Ji¾ jste na stranì %d nabídky."
 
-#: LYMessages.c:414
+#: LYMessages.c:412
 msgid "You have entered an invalid option number."
 msgstr "Zadal jste chybné èíslo volby."
 
-#: LYMessages.c:415
+#: LYMessages.c:413
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** Chybné HTML!! Pou¾ijte -trace pro diagnostiku. **"
 
-#: LYMessages.c:416
+#: LYMessages.c:414
 msgid "Give name of file to save in"
 msgstr "Zadejte jméno souboru, do kterého mám ulo¾it"
 
-#: LYMessages.c:417
+#: LYMessages.c:415
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "Data nelze do souboru ulo¾it -- spus»te WWW místnì"
 
-#: LYMessages.c:418
+#: LYMessages.c:416
 msgid "Can't open temporary file!"
 msgstr "Doèasný soubor nelze otevøít!"
 
-#: LYMessages.c:419
+#: LYMessages.c:417
 msgid "Can't open output file!  Cancelling!"
 msgstr "Výstupní soubor nelze otevøít! Ru¹ím!"
 
-#: LYMessages.c:420
+#: LYMessages.c:418
 msgid "Execution is disabled."
 msgstr "Spou¹tìní programù je zakázáno."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:422
+#: LYMessages.c:420
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "Tento soubor nelze spustit. Viz Konfiguraèní menu (pou¾ijte %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:424
+#: LYMessages.c:422
 msgid "Execution capabilities are not compiled into this version."
 msgstr "Podpora pro spou¹tìní programù byla vypnuta pøi pøekladu programu."
 
-#: LYMessages.c:425
+#: LYMessages.c:423
 msgid "This file cannot be displayed on this terminal."
 msgstr "Tento soubor nelze na tomto terminálu zobrazit."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:427
+#: LYMessages.c:425
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "Tento soubor nelze na tomto terminálu zobrazit: D>Stáhnout èi C>Zru¹it"
 
-#: LYMessages.c:428
+#: LYMessages.c:426
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D>Stáhnout èi C>Zru¹it"
 
-#: LYMessages.c:429
+#: LYMessages.c:427
 msgid "Cancelling file."
 msgstr "Zru¹eno"
 
-#: LYMessages.c:430
+#: LYMessages.c:428
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "Stahuji soubor.  - POÈKEJTE, PROSÍM -"
 
-#: LYMessages.c:431
+#: LYMessages.c:429
 msgid "Enter a filename: "
 msgstr "Zadejte jméno souboru: "
 
-#: LYMessages.c:432
+#: LYMessages.c:430
 msgid "Edit the previous filename: "
 msgstr "Editace pøedchozího jména souboru: "
 
-#: LYMessages.c:433
+#: LYMessages.c:431
 msgid "Edit a previous filename: "
 msgstr "Editace pøedchozího jména souboru: "
 
-#: LYMessages.c:434
+#: LYMessages.c:432
 msgid "Enter a new filename: "
 msgstr "Zadejte nové jméno souboru: "
 
-#: LYMessages.c:435
+#: LYMessages.c:433
 msgid "File name may not begin with a dot."
 msgstr "Jméno souboru nesmí zaèínat teèkou."
 
-#: LYMessages.c:437
+#: LYMessages.c:435
 msgid "File exists.  Create higher version?"
 msgstr "Soubor ji¾ existuje. Vytvoøit jeho novou verzi?"
 
-#: LYMessages.c:439
+#: LYMessages.c:437
 msgid "File exists.  Overwrite?"
 msgstr "Soubor ji¾ existuje. Pøepsat?"
 
-#: LYMessages.c:441
+#: LYMessages.c:439
 msgid "Cannot write to file."
 msgstr "Do souboru nelze zapisovat."
 
-#: LYMessages.c:442
+#: LYMessages.c:440
 msgid "ERROR! - download command is misconfigured."
 msgstr "CHYBA! - pøíkaz pro stahování je chybný"
 
-#: LYMessages.c:443
+#: LYMessages.c:441
 msgid "Unable to download file."
 msgstr "Soubor nelze stáhnout."
 
-#: LYMessages.c:444
+#: LYMessages.c:442
 msgid "Reading directory..."
 msgstr "Ètu adresáø..."
 
-#: LYMessages.c:445
+#: LYMessages.c:443
 msgid "Building directory listing..."
 msgstr "Sestavuji výpis adresáøe..."
 
-#: LYMessages.c:446
+#: LYMessages.c:444
 msgid "Saving..."
 msgstr "Ukládám..."
 
-#: LYMessages.c:447
+#: LYMessages.c:445
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Soubor '%s' nelze editovat."
 
-#: LYMessages.c:448
+#: LYMessages.c:446
 msgid "Unable to access document!"
 msgstr "Pøístup k dokumentu nelze získat!"
 
-#: LYMessages.c:449
+#: LYMessages.c:447
 msgid "Could not access file."
 msgstr "Soubor není dostupný."
 
-#: LYMessages.c:450
+#: LYMessages.c:448
 msgid "Could not access directory."
 msgstr "Adresáø není dostupný."
 
-#: LYMessages.c:451
+#: LYMessages.c:449
 msgid "Could not load data."
 msgstr "Nelze naèíst data."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:453
+#: LYMessages.c:451
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "V souèasné dobì nelze vzdálené WWW dokumenty z Lynxu (e)ditovat."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:455
+#: LYMessages.c:453
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "Toto pole nemù¾e být (e)ditováno pomocí externího editoru."
 
-#: LYMessages.c:456
+#: LYMessages.c:454
 msgid "Bad rule"
 msgstr "Chybné pravidlo"
 
-#: LYMessages.c:457
+#: LYMessages.c:455
 msgid "Insufficient operands:"
 msgstr "Chybí operandy: "
 
-#: LYMessages.c:458
+#: LYMessages.c:456
 msgid "You are not authorized to edit this file."
 msgstr "Nejste oprávnìn editovat tento soubor."
 
-#: LYMessages.c:459
+#: LYMessages.c:457
 msgid "Title: "
 msgstr "Titulek: "
 
-#: LYMessages.c:460
+#: LYMessages.c:458
 msgid "Subject: "
 msgstr "Pøedmìt: "
 
-#: LYMessages.c:461
+#: LYMessages.c:459
 msgid "Username: "
 msgstr "U¾ivatelské jméno: "
 
-#: LYMessages.c:462
+#: LYMessages.c:460
 msgid "Password: "
 msgstr "Heslo: "
 
-#: LYMessages.c:463
+#: LYMessages.c:461
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: Je tøena u¾ivatelské jméno a heslo!!!"
 
-#: LYMessages.c:464
+#: LYMessages.c:462
 msgid "lynx: Password required!!!"
 msgstr "Lynx: Je tøeba heslo!!!"
 
-#: LYMessages.c:465
+#: LYMessages.c:463
 msgid "Clear all authorization info for this session?"
 msgstr "Smazat v¹echny autorizaèní informace pro toto sezení?"
 
-#: LYMessages.c:466
+#: LYMessages.c:464
 msgid "Authorization info cleared."
 msgstr "Autorizaèní informace smazány."
 
-#: LYMessages.c:467
+#: LYMessages.c:465
 msgid "Authorization failed.  Retry?"
 msgstr "Autorizace se nezdaøila. Nový pokus?"
 
-#: LYMessages.c:468
+#: LYMessages.c:466
 msgid "cgi support has been disabled."
 msgstr "podpora cgi byla vypnuta správcem systému"
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:470
+#: LYMessages.c:468
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "Podpora pro spou¹tìní cgi byla vypnuta pøi pøekladu programu."
 
-#: LYMessages.c:471
+#: LYMessages.c:469
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Není znám zpùsob jak pøevést %s na %s."
 
-#: LYMessages.c:472
+#: LYMessages.c:470
 msgid "Unable to set up connection."
 msgstr "Spojení nelze navázat."
 
-#: LYMessages.c:473
+#: LYMessages.c:471
 msgid "Unable to make connection"
 msgstr "Spojení nelze navázat."
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:475
+#: LYMessages.c:473
 msgid "Executable link rejected due to malformed request."
 msgstr "Chybný po¾adavek na spu¹tìní programu."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:477
+#: LYMessages.c:475
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "Odkaz na program obsahuje chybný znak `%c'."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:477
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "Odkaz na program nesmí být relativní ('../')'."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:479
 msgid "Executable link rejected due to location or path."
 msgstr "Odkaz na program odmítnut kvùli umístìní èi názvu cesty."
 
-#: LYMessages.c:482
+#: LYMessages.c:480
 msgid "Mail access is disabled!"
 msgstr "Po¹ta je zakázána!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:484
+#: LYMessages.c:482
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Pøístup je povolen pouze k místním souborùm a slu¾bám."
 
-#: LYMessages.c:485
+#: LYMessages.c:483
 msgid "Telnet access is disabled!"
 msgstr "Pou¾ití telnetu je zakázáno!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:487
+#: LYMessages.c:485
 msgid "Telnet port specifications are disabled."
 msgstr "Je zakázáno uvádìt port u telnetu."
 
-#: LYMessages.c:488
+#: LYMessages.c:486
 msgid "USENET news access is disabled!"
 msgstr "Pøístup do diskuzních skupin je zakázán!"
 
-#: LYMessages.c:489
+#: LYMessages.c:487
 msgid "Rlogin access is disabled!"
 msgstr "Pou¾ití rlogin je zakázáno!"
 
-#: LYMessages.c:490
+#: LYMessages.c:488
 msgid "Ftp access is disabled!"
 msgstr "Pou¾ití FTP je zakázáno!"
 
-#: LYMessages.c:491
+#: LYMessages.c:489
 msgid "There are no references from this document."
 msgstr "Tento dokument neobsahuje ¾ádné odkazy."
 
-#: LYMessages.c:492
+#: LYMessages.c:490
 msgid "There are only hidden links from this document."
 msgstr "Tento dokument obsahuje pouze skryté odkazy."
 
-#: LYMessages.c:494
+#: LYMessages.c:492
 msgid "Unable to open command file."
 msgstr "Soubor s pøíkazy nelze otevøít."
 
-#: LYMessages.c:496
+#: LYMessages.c:494
 msgid "News Post Cancelled!!!"
 msgstr "Odeslání pøíspìvku do diskuzních skupin ZRU©ENO!!!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:498
+#: LYMessages.c:496
 msgid "Spawning your selected editor to edit news message"
 msgstr "Spou¹tím editor pro editaci diskuzního pøíspìvku."
 
-#: LYMessages.c:499
+#: LYMessages.c:497
 msgid "Post this message?"
 msgstr "Odeslat tuto zprávu?"
 
-#: LYMessages.c:500
+#: LYMessages.c:498
 #, c-format
 msgid "Append '%s'?"
 msgstr "Pøipojit '%s'?"
 
-#: LYMessages.c:501
+#: LYMessages.c:499
 msgid "Posting to newsgroup(s)..."
 msgstr "Zasílám do diskuzních skupin..."
 
-#: LYMessages.c:503
+#: LYMessages.c:501
 msgid "*** You have unread mail. ***"
 msgstr "*** Máte nepøeètenou po¹tu. ***"
 
-#: LYMessages.c:505
+#: LYMessages.c:503
 msgid "*** You have mail. ***"
 msgstr "*** Máte po¹tu. ***"
 
-#: LYMessages.c:507
+#: LYMessages.c:505
 msgid "*** You have new mail. ***"
 msgstr "*** Máte novou po¹tu. ***"
 
-#: LYMessages.c:508
+#: LYMessages.c:506
 msgid "File insert cancelled!!!"
 msgstr "Po¾adavek na vlo¾ení souboru byl zru¹en!!!"
 
-#: LYMessages.c:509
+#: LYMessages.c:507
 msgid "Not enough memory for file!"
 msgstr "Pøi ètení souboru zkratek do¹la pamì»!"
 
-#: LYMessages.c:510
+#: LYMessages.c:508
 msgid "Can't open file for reading."
 msgstr "Soubor pro dekompresi nelze otevøít!"
 
-#: LYMessages.c:511
+#: LYMessages.c:509
 msgid "File does not exist."
 msgstr "Soubor neexistuje."
 
-#: LYMessages.c:512
+#: LYMessages.c:510
 msgid "File does not exist - reenter or cancel:"
 msgstr "Soubor neexistuje. Zadejte jiný, èi zru¹te:"
 
-#: LYMessages.c:513
+#: LYMessages.c:511
 msgid "File is not readable."
 msgstr "Soubor je neèitelný."
 
-#: LYMessages.c:514
+#: LYMessages.c:512
 msgid "File is not readable - reenter or cancel:"
 msgstr "Soubor je neèitelný. Zadejte jiný, èi zru¹te:"
 
-#: LYMessages.c:515
+#: LYMessages.c:513
 msgid "Nothing to insert - file is 0-length."
 msgstr "Není co vlo¾it - soubor má nulovou délku."
 
-#: LYMessages.c:516
+#: LYMessages.c:514
 msgid "Save request cancelled!!!"
 msgstr "Po¾adavek na ulo¾ení byl zru¹en!!!"
 
-#: LYMessages.c:517
+#: LYMessages.c:515
 msgid "Mail request cancelled!!!"
 msgstr "Po¾adavek na odeslání po¹ty byl zru¹en!!!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:519
+#: LYMessages.c:517
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "Zobrazuji pøedzpracovaný zdrojový kód. Opravdu jej chcete poslat po¹tou?"
 
-#: LYMessages.c:520
+#: LYMessages.c:518
 msgid "Please wait..."
 msgstr "Okam¾ik, prosím..."
 
-#: LYMessages.c:521
+#: LYMessages.c:519
 msgid "Mailing file.  Please wait..."
 msgstr "Posílám soubor po¹tou. Okam¾ik, prosím..."
 
-#: LYMessages.c:522
+#: LYMessages.c:520
 msgid "ERROR - Unable to mail file"
 msgstr "CHYBA - Soubor nelze po¹tou odeslat."
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:524
+#: LYMessages.c:522
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "Délka souboru v obrazovkách je %d. Opravdu jej chcete vytisknout?"
 
-#: LYMessages.c:525
+#: LYMessages.c:523
 msgid "Print request cancelled!!!"
 msgstr "Po¾adavek na tisk byl zru¹en!!!"
 
-#: LYMessages.c:526
+#: LYMessages.c:524
 msgid "Press <return> to begin: "
 msgstr "Zahajte stisknutím <return>: "
 
-#: LYMessages.c:527
+#: LYMessages.c:525
 msgid "Press <return> to finish: "
 msgstr "Ukonèete stisknutím <return>: "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:527
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "Délka souboru ve stranách je %d. Opravdu jej chcete vytisknout?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:531
+#: LYMessages.c:529
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "Ujistìte se, ¾e tiskárna je zapnuta. Tisk zahajte stisknutím <return>:"
 
-#: LYMessages.c:532
+#: LYMessages.c:530
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "CHYBA - není dostatek místa pro soubor!!!"
 
-#: LYMessages.c:533
+#: LYMessages.c:531
 msgid "Unable to open tempfile"
 msgstr "Doèasný soubor nelze otevøít."
 
-#: LYMessages.c:534
+#: LYMessages.c:532
 msgid "Unable to open print options file"
 msgstr "Soubor s menu voleb tisku nelze otevøít."
 
-#: LYMessages.c:535
+#: LYMessages.c:533
 msgid "Printing file.  Please wait..."
 msgstr "Tisknu soubor. Okam¾ik, prosím..."
 
-#: LYMessages.c:536
+#: LYMessages.c:534
 msgid "Please enter a valid internet mail address: "
 msgstr "Zadejte platnou adresu elektronické po¹ty: "
 
-#: LYMessages.c:537
+#: LYMessages.c:535
 msgid "ERROR! - printer is misconfigured!"
 msgstr "CHYBA! - tiskárna je ¹patnì nastavena!"
 
-#: LYMessages.c:538
+#: LYMessages.c:536
 msgid "Image map from POST response not available!"
 msgstr "Klikací mapa z odpovìdi na POST není dostupná!"
 
-#: LYMessages.c:539
+#: LYMessages.c:537
 msgid "Misdirected client-side image MAP request!"
 msgstr "Chybnì cílený po¾adavek z klikací mapy!"
 
-#: LYMessages.c:540
+#: LYMessages.c:538
 msgid "Client-side image MAP is not accessible!"
 msgstr "Klientská klikací mapa není pøístupná!"
 
-#: LYMessages.c:541
+#: LYMessages.c:539
 msgid "No client-side image MAPs are available!"
 msgstr "Není dostupná ¾ádná klientská klikací mapa!"
 
-#: LYMessages.c:542
+#: LYMessages.c:540
 msgid "Client-side image MAP is not available!"
 msgstr "Klientská klikací mapa není dostupná!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:545
+#: LYMessages.c:543
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "Konfiguraèní menu potøebuje obrazovku o alespoò 24 øádcích!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:547
+#: LYMessages.c:545
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "Konfiguraèní menu potøebuje obrazovku o alespoò 23 øádcích!"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:549
+#: LYMessages.c:547
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "Konfiguraèní menu potøebuje obrazovku o alespoò 23 øádcích!"
 
-#: LYMessages.c:551
+#: LYMessages.c:549
 msgid "That key requires Advanced User mode."
 msgstr "Tato klávesa funguje pouze v re¾imu pro pokroèilé u¾ivatele."
 
-#: LYMessages.c:552
+#: LYMessages.c:550
 #, c-format
 msgid "Content-type: %s"
 msgstr "Content-type: %s"
 
-#: LYMessages.c:553
+#: LYMessages.c:551
 msgid "Command: "
 msgstr "Pøíkaz: "
 
-#: LYMessages.c:554
+#: LYMessages.c:552
 msgid "Unknown or ambiguous command"
 msgstr ""
 
-#: LYMessages.c:555
+#: LYMessages.c:553
 msgid " Version "
 msgstr " Verze "
 
-#: LYMessages.c:556
+#: LYMessages.c:554
 msgid " first"
 msgstr " jako první."
 
-#: LYMessages.c:557
+#: LYMessages.c:555
 msgid ", guessing..."
 msgstr ", hádám..."
 
-#: LYMessages.c:558
+#: LYMessages.c:556
 msgid "Permissions for "
 msgstr "Pøístupová práva pro "
 
-#: LYMessages.c:559
+#: LYMessages.c:557
 msgid "Select "
 msgstr "Zvolte "
 
-#: LYMessages.c:560
+#: LYMessages.c:558
 msgid "capital letter"
 msgstr "velké písmeno"
 
-#: LYMessages.c:561
+#: LYMessages.c:559
 msgid " of option line,"
 msgstr " z volby,"
 
-#: LYMessages.c:562
+#: LYMessages.c:560
 msgid " to save,"
 msgstr " pro ulo¾ení,"
 
-#: LYMessages.c:563
+#: LYMessages.c:561
 msgid " to "
 msgstr " do "
 
-#: LYMessages.c:564
+#: LYMessages.c:562
 msgid " or "
 msgstr " èi "
 
-#: LYMessages.c:565
+#: LYMessages.c:563
 msgid " index"
 msgstr " rejstøík"
 
-#: LYMessages.c:566
+#: LYMessages.c:564
 msgid " to return to Lynx."
 msgstr " pro návrat do programu Lynx."
 
-#: LYMessages.c:567
+#: LYMessages.c:565
 msgid "Accept Changes"
 msgstr "Pøijmout zmìny"
 
-#: LYMessages.c:568
+#: LYMessages.c:566
 msgid "Reset Changes"
 msgstr "Zru¹it zmìny"
 
-#: LYMessages.c:569
+#: LYMessages.c:567
 msgid "Left Arrow cancels changes"
 msgstr "©ipka vlevo zru¹í zmìny"
 
-#: LYMessages.c:570
+#: LYMessages.c:568
 msgid "Save options to disk"
 msgstr "Ulo¾it konfiguraci na disk"
 
-#: LYMessages.c:571
+#: LYMessages.c:569
 msgid "Hit RETURN to accept entered data."
 msgstr "Stisknìte RETURN pro pøijetí údajù."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:573
+#: LYMessages.c:571
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr "Stisknìte RETURN pro pøijetí údajù. Smazáním vyvoláte implicitní nastavení."
 
-#: LYMessages.c:574
+#: LYMessages.c:572
 msgid "Value accepted!"
 msgstr "Hodnota pøijmuta!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:576
+#: LYMessages.c:574
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Hodnota pøijmuta! -- VAROVÁNÍ: Lynx je nastaven pro XWINDOWS!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:578
+#: LYMessages.c:576
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Hodnota pøijmuta! -- VAROVÁNÍ: Lynx není nastaven pro XWINDOWS!"
 
-#: LYMessages.c:579
+#: LYMessages.c:577
 msgid "You are not allowed to change which editor to use!"
 msgstr "Nemáte oprávnìní mìnit editor!"
 
-#: LYMessages.c:580
+#: LYMessages.c:578
 msgid "Failed to set DISPLAY variable!"
 msgstr "Promìnnou DISPLAY se nepodaøilo nastavit!"
 
-#: LYMessages.c:581
+#: LYMessages.c:579
 msgid "Failed to clear DISPLAY variable!"
 msgstr "Promìnnou DISPLAY se nepodaøilo nastavit!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:583
+#: LYMessages.c:581
 msgid "You are not allowed to change the bookmark file!"
 msgstr "Nemáte oprávnìní mìnit soubor zálo¾ek!"
 
-#: LYMessages.c:584
+#: LYMessages.c:582
 msgid "Terminal does not support color"
 msgstr "Terminál nepodporuje barvy."
 
-#: LYMessages.c:585
+#: LYMessages.c:583
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "Terminál '%s' nepodporuje barvy."
 
-#: LYMessages.c:586
+#: LYMessages.c:584
 msgid "Access to dot files is disabled!"
 msgstr "Pøístup k teèkovým souborùm je zakázán!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:588
+#: LYMessages.c:586
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr ""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:590
+#: LYMessages.c:588
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr ""
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:592
+#: LYMessages.c:590
 msgid "Changing of the User-Agent string is disabled!"
 msgstr ""
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:594
+#: LYMessages.c:592
 msgid "You are not allowed to change this setting."
 msgstr "Nemáte oprávnìní mìnit tuto volbu."
 
-#: LYMessages.c:595
+#: LYMessages.c:593
 msgid "Saving Options..."
 msgstr "Ukládám konfiguraci..."
 
-#: LYMessages.c:596
+#: LYMessages.c:594
 msgid "Options saved!"
 msgstr "Konfigurace ulo¾ena!"
 
-#: LYMessages.c:597
+#: LYMessages.c:595
 msgid "Unable to save Options!"
 msgstr "Konfiguraci nelze ulo¾it!"
 
-#: LYMessages.c:598
+#: LYMessages.c:596
 msgid " 'r' to return to Lynx "
 msgstr " 'r' pro  návrat do programu Lynx"
 
-#: LYMessages.c:599
+#: LYMessages.c:597
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr "'>' pro ulo¾ení èi 'r' pro návrat do programu Lynx"
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:601
+#: LYMessages.c:599
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "Stisknìte jakoukoli klávesu pro zmìnu hodnoty; RETURN pro její pøijetí."
 
-#: LYMessages.c:602
+#: LYMessages.c:600
 msgid "Error uncompressing temporary file!"
 msgstr "Chyba pøi dekompresi doèasného souboru!"
 
-#: LYMessages.c:603
+#: LYMessages.c:601
 msgid "Unsupported URL scheme!"
 msgstr "Nepodporovaný typ URL!"
 
-#: LYMessages.c:604
+#: LYMessages.c:602
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "Nepodporované 'data:' URL! Pou¾ijte SHOWINFO."
 
-#: LYMessages.c:605
+#: LYMessages.c:603
 msgid "Redirection limit of 10 URL's reached."
 msgstr "Maximální poèet pøesmìrování (10 URL) byl dosa¾en."
 
-#: LYMessages.c:606
+#: LYMessages.c:604
 msgid "Illegal redirection URL received from server!"
 msgstr "Server zaslal chybné URL pro pøesmìrování!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:608
+#: LYMessages.c:606
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "Server po¾aduje %d pøesmìrování POST obsahu na"
 
-#: LYMessages.c:611
+#: LYMessages.c:609
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P)okraèovat, pou¾ít G)ET èi C>Zru¹it"
 
-#: LYMessages.c:612
+#: LYMessages.c:610
 msgid "P)roceed, or C)ancel "
 msgstr "P)okraèovat èi C>Zru¹it "
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:614
+#: LYMessages.c:612
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr "Pøesmìrování POST obsahu. P)okraèovat, zobrazit U)RL, pou¾ít G)ET èi C>Zru¹it"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:614
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "Pøesmìrování POST obsahu. P)okraèovat, zobrazit U>RL èi C>Zru¹it"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:618
+#: LYMessages.c:616
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "Dokument z formuláøe s POST obsahem? Odeslat znovu?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:620
+#: LYMessages.c:618
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Odeslat znovu POST obsah na %s?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:622
+#: LYMessages.c:620
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "Seznam z dokumentu s POST obsahem? Naèíst %s znovu?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:624
+#: LYMessages.c:622
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "Dokument vznikl z POST akce. Hlavièka nemusí být správnì zpracována. Pokraèovat?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:624
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "Akce formuláøe pou¾ívá POST. Hlavièka nemusí být správnì zpracována. Pokraèovat?"
 
-#: LYMessages.c:627
+#: LYMessages.c:625
 msgid "Proceed without a username and password?"
 msgstr "Pokraèovat bez ovìøení u¾ivatelským jménem a heslem?"
 
-#: LYMessages.c:628
+#: LYMessages.c:626
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Pokraèovat (%s)?"
 
-#: LYMessages.c:629
+#: LYMessages.c:627
 msgid "Cannot POST to this host."
 msgstr "Na tento poèítaè nelze data metodou POST odeslat."
 
-#: LYMessages.c:630
+#: LYMessages.c:628
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "Pro toto URL není metoda POST podporována - ignoruji POST data!"
 
-#: LYMessages.c:631
+#: LYMessages.c:629
 msgid "Discarding POST data..."
 msgstr "Zahazuji POST data..."
 
-#: LYMessages.c:632
+#: LYMessages.c:630
 msgid "Document will not be reloaded!"
 msgstr "Dokument nebude znovu naèten!"
 
-#: LYMessages.c:633
+#: LYMessages.c:631
 msgid "Location: "
 msgstr "Umístìní: "
 
-#: LYMessages.c:634
+#: LYMessages.c:632
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' nebylo nalezeno!"
 
-#: LYMessages.c:635
+#: LYMessages.c:633
 msgid "Default Bookmark File"
 msgstr "Implicitní soubor zálo¾ek"
 
-#: LYMessages.c:636
+#: LYMessages.c:634
 msgid "Screen too small! (8x35 min)"
 msgstr "Obrazovka je pøíli¹ malá! (alespoò 8x35)"
 
-#: LYMessages.c:637
+#: LYMessages.c:635
 msgid "Select destination or ^G to Cancel: "
 msgstr "Zvolte cíl èi zru¹te pomocí ^G: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:639
+#: LYMessages.c:637
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "Zvolte zálo¾ku, '=' pro menu èi ^G pro zru¹ení: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:641
+#: LYMessages.c:639
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "L>Duplikovat zálo¾ku v tomto souboru èi C>Zru¹it? (l,c): "
 
-#: LYMessages.c:642
+#: LYMessages.c:640
 msgid "Multiple bookmark support is not available."
 msgstr "Dìlené zálo¾ky nejsou podporovány."
 
-#: LYMessages.c:643
+#: LYMessages.c:641
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr " Zvolte zálo¾ku (obrazovka %d/%d)"
 
-#: LYMessages.c:644
+#: LYMessages.c:642
 msgid "       Select Bookmark"
 msgstr "       Zvolte zálo¾ku"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:646
+#: LYMessages.c:644
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "Nastavení podsouborù zálo¾ek a jejich popisu (%d/2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:648
+#: LYMessages.c:646
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "         Nastavení podsouborù zálo¾ek a jejich popisu"
 
-#: LYMessages.c:649
+#: LYMessages.c:647
 msgid "Letter: "
 msgstr "Písmeno: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:652
+#: LYMessages.c:650
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Pou¾ijte jméno cesty z pøihla¹ovacího adresáøe a v syntaxi SHELLU!"
 
-#: LYMessages.c:654
+#: LYMessages.c:652
 msgid "Use a filepath off your home directory!"
 msgstr "Pou¾ijte jméno cesty z domácího adresáøe!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:657
+#: LYMessages.c:655
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Maximální poèet odkazù na stránku dosa¾en! Pou¾ijte posun o 1/2 strany èi 2 øádky."
 
 #. #define MAXHIST_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:657
 msgid "History List maximum reached!  Document not pushed."
 msgstr "Maximální velikost seznamu historie dosa¾ena! Dokument nebyl zaznamenán."
 
-#: LYMessages.c:660
+#: LYMessages.c:658
 msgid "No previously visited links available!"
 msgstr "®ádné nav¹tívené odkazy nejsou k dispozici!"
 
-#: LYMessages.c:661
+#: LYMessages.c:659
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Do¹la pamì»! Program pøeru¹en!"
 
-#: LYMessages.c:662
+#: LYMessages.c:660
 msgid "Memory exhausted!  Aborting..."
 msgstr "Do¹la pamì»! Pøeru¹uji..."
 
-#: LYMessages.c:663
+#: LYMessages.c:661
 msgid "Not enough memory!"
 msgstr ""
 
-#: LYMessages.c:664
+#: LYMessages.c:662
 msgid "Directory/File Manager not available"
 msgstr "Správce souborù není k dispozici."
 
-#: LYMessages.c:665
+#: LYMessages.c:663
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "Cílové URL v BASE znaèce není absolutní."
 
-#: LYMessages.c:666
+#: LYMessages.c:664
 msgid "Location URL is not absolute."
 msgstr "URL není absolutní."
 
-#: LYMessages.c:667
+#: LYMessages.c:665
 msgid "Refresh URL is not absolute."
 msgstr "Obnovovací URL není absolutní."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:667
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2034,7 +2035,7 @@ msgstr ""
 "Posíláte zprávu na:\n"
 "  "
 
-#: LYMessages.c:670
+#: LYMessages.c:668
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2042,7 +2043,7 @@ msgstr ""
 "Posíláte komentáø na:\n"
 "  "
 
-#: LYMessages.c:671
+#: LYMessages.c:669
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2052,7 +2053,7 @@ msgstr ""
 " S kopií na:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:670
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2063,7 +2064,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:672
 msgid ""
 "\n"
 "\n"
@@ -2074,7 +2075,7 @@ msgstr ""
 "Odeslání zprávy mù¾ete zru¹it pomocí Ctrl-G.\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:674
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2083,7 +2084,7 @@ msgstr ""
 " Zadejte va¹e jméno, nebo ponechte prázdné, aby jste zùstal v anonymitì.\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:676
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2092,11 +2093,11 @@ msgstr ""
 "Pokud chcete dostat odpovìï, udejte adresu\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:678
 msgid " means to contact you, if you desire a response.\n"
 msgstr "elektronické po¹ty èi jiný kontakt na vás.\n"
 
-#: LYMessages.c:681
+#: LYMessages.c:679
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2105,7 +2106,7 @@ msgstr ""
 " Zadejte pøedmìt.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2113,11 +2114,11 @@ msgstr ""
 "\n"
 " Zadejte adresu pro odeslání kopie této zprávy.\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:682
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (Ponechte prázdné, pokud kopie nechcete poslat.)\n"
 
-#: LYMessages.c:685
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2127,7 +2128,7 @@ msgstr ""
 " Zkontrolujte tìlo zprávy:\n"
 "\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:684
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2135,7 +2136,7 @@ msgstr ""
 "\n"
 "Stisknìte RETURN pro pokraèování: "
 
-#: LYMessages.c:687
+#: LYMessages.c:685
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2143,11 +2144,11 @@ msgstr ""
 "\n"
 "Stisknìte RETURN pro úklid: "
 
-#: LYMessages.c:688
+#: LYMessages.c:686
 msgid " Use Control-U to erase the default.\n"
 msgstr " Pou¾ijte Control-U pro smazání implicitních hodnot.\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2156,7 +2157,7 @@ msgstr ""
 " Zadejte text va¹í zprávy."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:380
+#: LYMessages.c:689 src/LYNews.c:361
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2165,7 +2166,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:381
+#: LYMessages.c:691 src/LYNews.c:362
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2175,248 +2176,248 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:695
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "%s cookie: %.*s=%.*s   Pøijmout? (Y/N/Always/neVer)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:697
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Pøijmout chybnou cookie doménu (%s) pro '%s'?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:699
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr "Pøijmout chybnou cookie cestu (%s) jako prefix '%s'?"
 
-#: LYMessages.c:702
+#: LYMessages.c:700
 msgid "Allowing this cookie."
 msgstr "Cookie pøijmuto."
 
-#: LYMessages.c:703
+#: LYMessages.c:701
 msgid "Rejecting this cookie."
 msgstr "Cookie zamítnuto."
 
-#: LYMessages.c:704
+#: LYMessages.c:702
 msgid "The Cookie Jar is empty."
 msgstr "Sklad cookies je prázdný."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:706
+#: LYMessages.c:704
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr ""
 
-#: LYMessages.c:707
+#: LYMessages.c:705
 msgid "or to change a domain's 'allow' setting."
 msgstr ""
 
-#: LYMessages.c:708
+#: LYMessages.c:706
 msgid "(Cookies never allowed.)"
 msgstr "(Cookies zakázány)"
 
-#: LYMessages.c:709
+#: LYMessages.c:707
 msgid "(Cookies always allowed.)"
 msgstr "(Cookies v¾dy povoleny)"
 
-#: LYMessages.c:710
+#: LYMessages.c:708
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Pøijetí cookies musí potvrdit u¾ivatel.)"
 
-#: LYMessages.c:711
+#: LYMessages.c:709
 msgid "(Persistent Cookies.)"
 msgstr "(Trvalé cookies)"
 
-#: LYMessages.c:712
+#: LYMessages.c:710
 msgid "(No title.)"
 msgstr "(®ádný titulek)"
 
-#: LYMessages.c:713
+#: LYMessages.c:711
 msgid "(No name.)"
 msgstr "(®ádné jméno)"
 
-#: LYMessages.c:714
+#: LYMessages.c:712
 msgid "(No value.)"
 msgstr "(®ádná hodnota)"
 
-#: LYMessages.c:715
+#: LYMessages.c:713
 msgid "None"
 msgstr "Nic"
 
-#: LYMessages.c:716
+#: LYMessages.c:714
 msgid "(End of session.)"
 msgstr "(Konec sezení)"
 
-#: LYMessages.c:717
+#: LYMessages.c:715
 msgid "Delete this cookie?"
 msgstr "Smazat toto cookie?"
 
-#: LYMessages.c:718
+#: LYMessages.c:716
 msgid "The cookie has been eaten!"
 msgstr "Cookie bylo smazáno!"
 
-#: LYMessages.c:719
+#: LYMessages.c:717
 msgid "Delete this empty domain?"
 msgstr "Smazat tuto prázdnou doménu?"
 
-#: LYMessages.c:720
+#: LYMessages.c:718
 msgid "The domain has been eaten!"
 msgstr "Doména byla smazána!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:722
+#: LYMessages.c:720
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D>Smazat cookies z domény, pøijmout A>V¾dy/P)o potvrzení/V>Nikdy èi C>Zru¹it?"
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:724
+#: LYMessages.c:722
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D>Smazat doménu, pøijmout A>V¾dy/P)o potvrzení/V>Nikdy èi C>Zru¹it?"
 
-#: LYMessages.c:725
+#: LYMessages.c:723
 msgid "All cookies in the domain have been eaten!"
 msgstr "V¹echna cookie v této doménì byly smazána!"
 
-#: LYMessages.c:726
+#: LYMessages.c:724
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "'A'V¾dy pøijímám z domény '%s'."
 
-#: LYMessages.c:727
+#: LYMessages.c:725
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "'V'Nikdy nepøijímám z domény '%s'."
 
-#: LYMessages.c:728
+#: LYMessages.c:726
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "Pøijetí z domény '%s' musí 'p'otvrdit u¾ivatel."
 
-#: LYMessages.c:729
+#: LYMessages.c:727
 msgid "Delete all cookies in this domain?"
 msgstr "Smazat v¹echny cookies v této doménì?"
 
-#: LYMessages.c:730
+#: LYMessages.c:728
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "Ùlo¾na cookies byla vyprázdnìna!"
 
-#: LYMessages.c:732
+#: LYMessages.c:730
 msgid "Port 19 not permitted in URLs."
 msgstr "URL nesmí obsahovat port 19."
 
-#: LYMessages.c:733
+#: LYMessages.c:731
 msgid "Port 25 not permitted in URLs."
 msgstr "URL nesmí obsahovat port 25."
 
-#: LYMessages.c:734
+#: LYMessages.c:732
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "URL nesmí obsahovat port %lu."
 
-#: LYMessages.c:735
+#: LYMessages.c:733
 msgid "URL has a bad port field."
 msgstr "URL obsahuje chybný port."
 
-#: LYMessages.c:736
+#: LYMessages.c:734
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "Maximální povolený poèet vnoøení HTML prvkù pøekroèen."
 
-#: LYMessages.c:737
+#: LYMessages.c:735
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Chybný relativní odkaz! Odtrhuji úvodní teèky."
 
-#: LYMessages.c:738
+#: LYMessages.c:736
 msgid "Trace Log open failed.  Trace off!"
 msgstr "Nepodaøilo se otevøít soubor pro záznam èinnosti. Sledování vypnuto!"
 
-#: LYMessages.c:739
+#: LYMessages.c:737
 msgid "Lynx Trace Log"
 msgstr "Záznam èinnosti programu Lynx"
 
-#: LYMessages.c:740
+#: LYMessages.c:738
 msgid "No trace log has been started for this session."
 msgstr "Pro toto sezení nebylo sledování spu¹tìno."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:742
+#: LYMessages.c:740
 msgid "The maximum temporary file count has been reached!"
 msgstr "Maximální povolený poèet doèasných souborù pøekroèen."
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:744
+#: LYMessages.c:742
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "Hodnota pole formuláøe pøesahuje délku bufferu! Zkra»te ji."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:746
+#: LYMessages.c:744
 msgid "Modified tail combined with head of form field value."
 msgstr "Zmìnìný konec hodnoty pole formuláøe byl spojen s jejím zaèátkem."
 
 #. HTFile.c
-#: LYMessages.c:749
+#: LYMessages.c:747
 msgid "Directory"
 msgstr "Adresáø"
 
-#: LYMessages.c:750
+#: LYMessages.c:748
 msgid "Directory browsing is not allowed."
 msgstr "Procházení adresáøù je zakázáno."
 
-#: LYMessages.c:751
+#: LYMessages.c:749
 msgid "Selective access is not enabled for this directory"
 msgstr "Selektivní pøístup k tomuto adresáøi není zapnut."
 
-#: LYMessages.c:752
+#: LYMessages.c:750
 msgid "Multiformat: directory scan failed."
 msgstr "Multiformat: volání scandir pro adresáø se nezdaøilo"
 
-#: LYMessages.c:753
+#: LYMessages.c:751
 msgid "This directory is not readable."
 msgstr "Tento adresáø nelze èíst."
 
-#: LYMessages.c:754
+#: LYMessages.c:752
 msgid "Can't access requested file."
 msgstr "Pøístup k po¾adovanému souboru nelze získat."
 
-#: LYMessages.c:755
+#: LYMessages.c:753
 msgid "Could not find suitable representation for transmission."
 msgstr "Nelze nalézt vhodný formát dat pro pøenos."
 
-#: LYMessages.c:756
+#: LYMessages.c:754
 msgid "Could not open file for decompression!"
 msgstr "Soubor pro dekompresi nelze otevøít!"
 
-#: LYMessages.c:757
+#: LYMessages.c:755
 msgid "Files:"
 msgstr "Soubory:"
 
-#: LYMessages.c:758
+#: LYMessages.c:756
 msgid "Subdirectories:"
 msgstr "Podadresáøe:"
 
-#: LYMessages.c:759
+#: LYMessages.c:757
 msgid " directory"
 msgstr " adresáø"
 
-#: LYMessages.c:760
+#: LYMessages.c:758
 msgid "Up to "
 msgstr "O úroveò vý¹e do "
 
-#: LYMessages.c:761
+#: LYMessages.c:759
 msgid "Current directory is "
 msgstr "Aktuální adresáø je "
 
 #. HTGopher.c
-#: LYMessages.c:764
+#: LYMessages.c:762
 msgid "No response from server!"
 msgstr "Od serveru nepøi¹la odpovìï!"
 
-#: LYMessages.c:765
+#: LYMessages.c:763
 msgid "CSO index"
 msgstr "CSO rejstøík"
 
-#: LYMessages.c:766
+#: LYMessages.c:764
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2424,16 +2425,16 @@ msgstr ""
 "\n"
 "Toto je prohledávatelný rejstøík CSO databáze.\n"
 
-#: LYMessages.c:767
+#: LYMessages.c:765
 msgid "CSO Search Results"
 msgstr "Výsledky prohledávání CSO"
 
-#: LYMessages.c:768
+#: LYMessages.c:766
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Posun ukazovátka pro %s selhal\n"
 
-#: LYMessages.c:769
+#: LYMessages.c:767
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2441,7 +2442,7 @@ msgstr ""
 "\n"
 "Stisknìte klávesu 's' a zadejte hledaná klíèová slova.\n"
 
-#: LYMessages.c:770
+#: LYMessages.c:768
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2449,35 +2450,35 @@ msgstr ""
 "\n"
 "Toto je prohledávatelný Gopher rejstøík.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:769
 msgid "Gopher index"
 msgstr "Gopher rejstøík"
 
-#: LYMessages.c:772
+#: LYMessages.c:770
 msgid "Gopher Menu"
 msgstr "Gopher Menu"
 
-#: LYMessages.c:773
+#: LYMessages.c:771
 msgid " Search Results"
 msgstr " Výsledky hledání"
 
-#: LYMessages.c:774
+#: LYMessages.c:772
 msgid "Sending CSO/PH request."
 msgstr "Posílám CSO/PH po¾adavek."
 
-#: LYMessages.c:775
+#: LYMessages.c:773
 msgid "Sending Gopher request."
 msgstr "Posílám Gopher po¾adavek."
 
-#: LYMessages.c:776
+#: LYMessages.c:774
 msgid "CSO/PH request sent; waiting for response."
 msgstr "CSO/PH po¾adavek poslán; èekám na odpovìï."
 
-#: LYMessages.c:777
+#: LYMessages.c:775
 msgid "Gopher request sent; waiting for response."
 msgstr "Gopher po¾adavek poslán; èekám na odpovìï."
 
-#: LYMessages.c:778
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2485,7 +2486,7 @@ msgstr ""
 "\n"
 "Zadejte hledaná klíèová slova.\n"
 
-#: LYMessages.c:779
+#: LYMessages.c:777
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2493,193 +2494,198 @@ msgstr ""
 "\n"
 "Klíèová slova, která zadáte, vám umo¾ní hledat"
 
-#: LYMessages.c:780
+#: LYMessages.c:778
 msgid " person's name in the database.\n"
 msgstr " jméno osoby v databázi.\n"
 
 #. HTNews.c
-#: LYMessages.c:783
+#: LYMessages.c:781
 msgid "Connection closed ???"
 msgstr "Spojení uzavøeno ???"
 
-#: LYMessages.c:784
+#: LYMessages.c:782
 msgid "Cannot open temporary file for news POST."
 msgstr "Nelze otevøít doèasný soubor pro odeslání diskuzního pøíspìvku."
 
-#: LYMessages.c:785
+#: LYMessages.c:783
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Tento klient nepodporuje zasílání zpráv do diskuzních skupin pøes SSL."
 
 #. HTStyle.c
-#: LYMessages.c:788
+#: LYMessages.c:786
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Styl %d `%s' SGML:%s. Písmo %s %.1f bodù.\n"
 
-#: LYMessages.c:789
+#: LYMessages.c:787
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tOdsazení: první=%.0f dal¹í=%.0f, Vý¹ka=%.1f Popis=%.1f\n"
 
-#: LYMessages.c:790
+#: LYMessages.c:788
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "\tZarovnání=%d, %d tabulátorù. (%.0f pøed, %.0f za)\n"
 
-#: LYMessages.c:791
+#: LYMessages.c:789
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "\t\tDruh tabulátorù=%d na %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:794
+#: LYMessages.c:792
 msgid "Can't proceed without a username and password."
 msgstr "Bez u¾ivatelského jména a hesla nelze pokraèovat."
 
-#: LYMessages.c:795
+#: LYMessages.c:793
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Dal¹í pokus s autorizací není mo¾ný! Kontaktujte pøíslu¹ného webmastera."
 
-#: LYMessages.c:796
+#: LYMessages.c:794
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "S proxy autorizací není dal¹í pokus mo¾ný! Kontaktujte pøíslu¹ného webmastera."
 
-#: LYMessages.c:797
+#: LYMessages.c:795
 msgid "Retrying with proxy authorization information."
 msgstr "Zkou¹im to znovu s proxy autorizací."
 
 #. HTWAIS.c
-#: LYMessages.c:800
+#: LYMessages.c:798
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Odpovìï je pøíli¹ veliká."
 
-#: LYMessages.c:801
+#: LYMessages.c:799
 msgid "Enter WAIS query: "
 msgstr "Zadejte WAIS dotaz: "
 
 #. Miscellaneous status
-#: LYMessages.c:804
+#: LYMessages.c:802
 msgid "Retrying as HTTP0 request."
 msgstr "Posílám znovu jako HTTP0 po¾adavek."
 
-#: LYMessages.c:805
+#: LYMessages.c:803
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "Pøeneseno bajtù: %d"
 
-#: LYMessages.c:806
+#: LYMessages.c:804
 msgid "Data transfer complete"
 msgstr "Pøenos dat dokonèen"
 
-#: LYMessages.c:807
+#: LYMessages.c:805
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Chyba pøi zpracování %d. øádku souboru%s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:810
+#: LYMessages.c:808
 msgid "Address List Page"
 msgstr "Seznam adres"
 
-#: LYMessages.c:811
+#: LYMessages.c:809
 msgid "Bookmark file"
 msgstr "Soubor se zálo¾kami"
 
-#: LYMessages.c:812
+#: LYMessages.c:810
 msgid "Configuration Definitions"
 msgstr "Konfigurace"
 
-#: LYMessages.c:813
+#: LYMessages.c:811
 msgid "Cookie Jar"
 msgstr "Sklad cookies"
 
-#: LYMessages.c:814
+#: LYMessages.c:812
 msgid "Current Key Map"
 msgstr "Aktuální klávesová mapa"
 
-#: LYMessages.c:815
+#: LYMessages.c:813
 msgid "File Management Options"
 msgstr "Nabídka správce souborù"
 
-#: LYMessages.c:816
+#: LYMessages.c:814
 msgid "Download Options"
 msgstr "Mo¾nosti stahování"
 
-#: LYMessages.c:817
+#: LYMessages.c:815
 msgid "History Page"
 msgstr "Historie"
 
-#: LYMessages.c:818
+#: LYMessages.c:816
 msgid "List Page"
 msgstr "Seznam odkazù"
 
-#: LYMessages.c:819
+#: LYMessages.c:817
 msgid "Lynx.cfg Information"
 msgstr "Lynx.cfg Informace"
 
-#: LYMessages.c:820
+#: LYMessages.c:818
 msgid "Converted Mosaic Hotlist"
 msgstr "Pøevedený 'Hotlist' Mosaicu"
 
-#: LYMessages.c:821
+#: LYMessages.c:819
 msgid "Options Menu"
 msgstr "Konfiguraèní menu"
 
-#: LYMessages.c:822
+#: LYMessages.c:820
 msgid "File Permission Options"
 msgstr "Menu nastavení práv souboru"
 
-#: LYMessages.c:823
+#: LYMessages.c:821
 msgid "Printing Options"
 msgstr "Menu voleb tisku"
 
-#: LYMessages.c:824
+#: LYMessages.c:822
 msgid "Information about the current document"
 msgstr "Informace o aktuálním dokumentu"
 
-#: LYMessages.c:825
+#: LYMessages.c:823
 msgid "Your recent statusline messages"
 msgstr "Zprávy stavové øádky"
 
-#: LYMessages.c:826
+#: LYMessages.c:824
 msgid "Upload Options"
 msgstr "Menu voleb posílání"
 
-#: LYMessages.c:827
+#: LYMessages.c:825
 msgid "Visited Links Page"
 msgstr "Nav¹tívené odkazy"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:830
+#: LYMessages.c:828
 msgid "See also"
 msgstr "Viz té¾"
 
-#: LYMessages.c:831
+#: LYMessages.c:829
 msgid "your"
 msgstr "vá¹"
 
-#: LYMessages.c:832
+#: LYMessages.c:830
 msgid "for runtime options"
 msgstr "pro aktuální konfiguraci"
 
-#: LYMessages.c:833
+#: LYMessages.c:831
 msgid "compile time options"
 msgstr "volby zadané pøi pøekladu"
 
-#: LYMessages.c:834
+#: LYMessages.c:832
+#, fuzzy
+msgid "color-style configuration"
+msgstr "Va¹e primární konfigurace"
+
+#: LYMessages.c:833
 msgid "latest release"
 msgstr "poslední verze"
 
-#: LYMessages.c:835
+#: LYMessages.c:834
 msgid "pre-release version"
 msgstr "vývojová verze"
 
-#: LYMessages.c:836
+#: LYMessages.c:835
 msgid "development version"
 msgstr "vývojová verze"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:838
+#: LYMessages.c:837
 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"
@@ -2689,7 +2695,7 @@ msgstr ""
 "kopie programu Lynx. Pøi oznamování chyby pøilo¾te kopii této stránky."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:842
+#: LYMessages.c:841
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2698,104 +2704,108 @@ msgstr ""
 "pøekladu této kopie programu Lynx."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:847
+#: LYMessages.c:846
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "  C>Vytvoøit D>Stáhnout E)ditovat F>Úplné menu R>Smazat T>Oznaèit U>Poslat \n"
 
-#: LYMessages.c:848
+#: LYMessages.c:847
 msgid "Failed to obtain status of current link!"
 msgstr "Nepodaøilo se zjistit status aktuálního odkazu!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:851
+#: LYMessages.c:850
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "Zvlá¹tní URL je platné pouze z aktuálního menu nastavení práv souboru!"
 
-#: LYMessages.c:855
+#: LYMessages.c:854
 msgid "External support is currently disabled."
 msgstr "Spou¹tìní externích programù je nyní zakázáno."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:859
+#: LYMessages.c:858
 #, fuzzy
 msgid "Changing working-directory is currently disabled."
 msgstr "Spou¹tìní je nyní vypnuto."
 
-#: LYMessages.c:860
+#: LYMessages.c:859
 #, fuzzy
 msgid "Linewrap OFF!"
 msgstr "Sledování VYPNUTO!"
 
-#: LYMessages.c:861
+#: LYMessages.c:860
 msgid "Linewrap ON!"
 msgstr ""
 
-#: LYMessages.c:862
+#: LYMessages.c:861
 #, fuzzy
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr "Pøímý 8bitový èi CJK re¾im VYPNUT! Znovu naèítám..."
 
-#: LYMessages.c:863
+#: LYMessages.c:862
 #, fuzzy
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr "Pøímý 8bitový èi CJK re¾im ZAPNUT! Znovu naèítám..."
 
-#: LYMessages.c:864
+#: LYMessages.c:863
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr ""
 
-#: LYMessages.c:865
+#: LYMessages.c:864
 #, fuzzy
 msgid "Trace not supported"
 msgstr "Terminál nepodporuje barvy."
 
-#: WWW/Library/Implementation/HTAABrow.c:648
+#: WWW/Library/Implementation/HTAABrow.c:647
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "U¾ivatelské jméno pro '%s' na %s '%s%s':"
 
-#: WWW/Library/Implementation/HTAABrow.c:914
+#: WWW/Library/Implementation/HTAABrow.c:913
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr "Tento klient neumí vytvoøit proxy autorizaèní informace pro schéma "
 
-#: WWW/Library/Implementation/HTAABrow.c:989
+#: WWW/Library/Implementation/HTAABrow.c:988
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "Tento klient neumí vytvoøit autorizaèní informace pro schéma "
 
-#: WWW/Library/Implementation/HTAABrow.c:1097
+#: WWW/Library/Implementation/HTAABrow.c:1096
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Chybná hlavièka '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1201
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
 msgstr "Proxy vy¾aduje autorizaci -- zkou¹ím znovu"
 
-#: WWW/Library/Implementation/HTAABrow.c:1260
+#: WWW/Library/Implementation/HTAABrow.c:1259
 msgid "Access without authorization denied -- retrying"
 msgstr "Pøístup není bez autorizace povolen -- zkou¹ím znovu"
 
-#: WWW/Library/Implementation/HTAccess.c:683
+#: WWW/Library/Implementation/HTAccess.c:677
 msgid "Access forbidden by rule"
 msgstr "Pøístup odmítnut implicitním pravidlem"
 
-#: WWW/Library/Implementation/HTAccess.c:785
+#: WWW/Library/Implementation/HTAccess.c:779
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "Dokument s POST obsahem nenalezen v cache. Odeslat znovu?"
 
-#: WWW/Library/Implementation/HTAccess.c:1026 src/GridText.c:8039
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
 msgid "Loading incomplete."
 msgstr "Nahrávání dokonèeno."
 
-#: WWW/Library/Implementation/HTAccess.c:1056
+#: WWW/Library/Implementation/HTAccess.c:1077
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr "**** HTAccess: soket èi èíslo souboru vráceno zastaralou load funkcí!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1058
+#: WWW/Library/Implementation/HTAccess.c:1079
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
 msgstr "**** HTAccess: Vnitøní chyba programu. Za¹lete oznámení na lynx_dev@sig.net!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1059
+#: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "**** HTAccess: Návratový status: %d\n"
@@ -2804,28 +2814,28 @@ msgstr "**** HTAccess: Návratový status: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7834
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
 msgid "Can't Access"
 msgstr "Nelze získat pøístup"
 
-#: WWW/Library/Implementation/HTAccess.c:1073
+#: WWW/Library/Implementation/HTAccess.c:1094
 msgid "Unable to access document."
 msgstr "Nelze získat pøístup k dokumentu."
 
-#: WWW/Library/Implementation/HTFTP.c:756
+#: WWW/Library/Implementation/HTFTP.c:766
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Zadejte heslo pro u¾ivatele %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:784
+#: WWW/Library/Implementation/HTFTP.c:794
 msgid "Unable to connect to FTP host."
 msgstr "Nelze navázat spojení s FTP serverem."
 
-#: WWW/Library/Implementation/HTFTP.c:1054
+#: WWW/Library/Implementation/HTFTP.c:1064
 msgid "close master socket"
 msgstr "zavøít hlavní soket"
 
-#: WWW/Library/Implementation/HTFTP.c:1116
+#: WWW/Library/Implementation/HTFTP.c:1126
 msgid "socket for master socket"
 msgstr "hlavní soket"
 
@@ -2834,36 +2844,36 @@ msgstr "hlavní soket"
 #. **  knowing if it is symbolic?	I think so since
 #. **  it might be a directory.
 #.
-#: WWW/Library/Implementation/HTFTP.c:1630 WWW/Library/Implementation/HTFTP.c:2251
+#: WWW/Library/Implementation/HTFTP.c:1640 WWW/Library/Implementation/HTFTP.c:2261
 msgid "Symbolic Link"
 msgstr "Symbol. odkaz"
 
-#: WWW/Library/Implementation/HTFTP.c:2612
+#: WWW/Library/Implementation/HTFTP.c:2622
 msgid "Receiving FTP directory."
 msgstr "Stahuji výpis FTP adresáøe."
 
-#: WWW/Library/Implementation/HTFTP.c:2755
+#: WWW/Library/Implementation/HTFTP.c:2762
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "Pøeneseno bajtù: %d"
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3083
 msgid "connect for data"
 msgstr "datové spojení"
 
-#: WWW/Library/Implementation/HTFTP.c:3690
+#: WWW/Library/Implementation/HTFTP.c:3731
 msgid "Receiving FTP file."
 msgstr "Stahuji FTP soubor."
 
-#: WWW/Library/Implementation/HTFinger.c:275
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
 msgstr "Spojení s finger serverem nelze navázat."
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
 msgstr "Finger URL neobsahuje jméno serveru."
 
-#: WWW/Library/Implementation/HTFinger.c:328
+#: WWW/Library/Implementation/HTFinger.c:331
 msgid "Invalid port number - will only use port 79!"
 msgstr "Chybné èíslo portu - pou¾iji pouze port 79!"
 
@@ -2871,7 +2881,7 @@ msgstr "Chybné èíslo portu - pou¾iji pouze port 79!"
 msgid "Could not access finger host."
 msgstr "Spojení s finger serverem nelze navázat."
 
-#: WWW/Library/Implementation/HTFinger.c:407
+#: WWW/Library/Implementation/HTFinger.c:404
 msgid "No response from finger server."
 msgstr "Od finger serveru nepøi¹la ¾ádná odpovìï."
 
@@ -2897,12 +2907,12 @@ msgstr "Heslo na news serveru '%s':"
 msgid "Change password?"
 msgstr "Zmìnit heslo?"
 
-#: WWW/Library/Implementation/HTNews.c:1691
+#: WWW/Library/Implementation/HTNews.c:1690
 #, c-format
 msgid "No matches for: %s"
 msgstr "%s nic nevyhovuje"
 
-#: WWW/Library/Implementation/HTNews.c:1744
+#: WWW/Library/Implementation/HTNews.c:1743
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2910,7 +2920,7 @@ msgstr ""
 "\n"
 "Tato skupina neobsahuje ¾ádné pøíspìvky.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1757
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2921,16 +2931,16 @@ msgstr ""
 #.
 #. **	Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1770
+#: WWW/Library/Implementation/HTNews.c:1769
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Èlánky %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1792
+#: WWW/Library/Implementation/HTNews.c:1791
 msgid "Earlier articles"
 msgstr "Pøedchozí pøíspìvky"
 
-#: WWW/Library/Implementation/HTNews.c:1805
+#: WWW/Library/Implementation/HTNews.c:1804
 #, c-format
 msgid ""
 "\n"
@@ -2941,41 +2951,41 @@ msgstr ""
 "Poèet èlánkù v %2$s: %1$d. ID jsou následující:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1865
+#: WWW/Library/Implementation/HTNews.c:1864
 msgid "All available articles in "
 msgstr "V¹echny dostupné pøíspìvky v "
 
-#: WWW/Library/Implementation/HTNews.c:2081
+#: WWW/Library/Implementation/HTNews.c:2080
 msgid "Later articles"
 msgstr "Pozdìj¹í pøíspìvky"
 
-#: WWW/Library/Implementation/HTNews.c:2105
+#: WWW/Library/Implementation/HTNews.c:2104
 msgid "Post to "
 msgstr "Poslat do"
 
-#: WWW/Library/Implementation/HTNews.c:2323
+#: WWW/Library/Implementation/HTNews.c:2322
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Tento klient nepodporuje SNEWS URL."
 
-#: WWW/Library/Implementation/HTNews.c:2531
+#: WWW/Library/Implementation/HTNews.c:2530
 msgid "No target for raw text!"
 msgstr "®ádný cíl pro prostý text!"
 
-#: WWW/Library/Implementation/HTNews.c:2561
+#: WWW/Library/Implementation/HTNews.c:2560
 msgid "Connecting to NewsHost ..."
 msgstr "Navazuji spojení s news serverem..."
 
-#: WWW/Library/Implementation/HTNews.c:2612
+#: WWW/Library/Implementation/HTNews.c:2611
 #, c-format
 msgid "Could not access %s."
 msgstr "S %s nelze navázat spojení."
 
-#: WWW/Library/Implementation/HTNews.c:2712
+#: WWW/Library/Implementation/HTNews.c:2711
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Informace o diskuzních skupinách nelze získat. News server %.20s odpovìdìl %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2716
+#: WWW/Library/Implementation/HTNews.c:2715
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Informace o diskuzních skupinách nelze získat. News server odpovìdìl %s"
@@ -2983,34 +2993,34 @@ msgstr "Informace o diskuzních skupinách nelze získat. News server odpovìdìl %s"
 #.
 #. **	List available newsgroups. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2920
+#: WWW/Library/Implementation/HTNews.c:2919
 msgid "Reading list of available newsgroups."
 msgstr "Ètu seznam dostupných diskuzních skupin."
 
-#: WWW/Library/Implementation/HTNews.c:2942
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of articles in newsgroup."
 msgstr "Ètu seznam èlánkù v diskuzní skupinì."
 
 #.
 #. **	Get an article from a news group. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2948
+#: WWW/Library/Implementation/HTNews.c:2947
 msgid "Reading news article."
 msgstr "Ètu pøíspìvek z diskuzní skupiny."
 
-#: WWW/Library/Implementation/HTNews.c:2978
+#: WWW/Library/Implementation/HTNews.c:2977
 msgid "Sorry, could not load requested news."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1233
+#: WWW/Library/Implementation/HTTCP.c:1239
 msgid "Address has invalid port"
 msgstr "Délka adresy se zdá být chybnou."
 
-#: WWW/Library/Implementation/HTTCP.c:1336
+#: WWW/Library/Implementation/HTTCP.c:1327
 msgid "Address length looks invalid"
 msgstr "Délka adresy se zdá být chybnou."
 
-#: WWW/Library/Implementation/HTTCP.c:1574 WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Adresu poèítaèe %s nelze zjistit."
@@ -3019,62 +3029,86 @@ msgstr "Adresu poèítaèe %s nelze zjistit."
 #. *  immediately; but not HTAlert, because typically
 #. *  there will be other alerts from the callers. - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1589 WWW/Library/Implementation/HTTelnet.c:103
+#: WWW/Library/Implementation/HTTCP.c:1575 WWW/Library/Implementation/HTTelnet.c:103
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Jméno poèítaèe %s je chybné"
 
-#: WWW/Library/Implementation/HTTCP.c:1603
+#: WWW/Library/Implementation/HTTCP.c:1589
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Navazuji %s spojení s %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1619
+#: WWW/Library/Implementation/HTTCP.c:1605
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1628
+#: WWW/Library/Implementation/HTTCP.c:1614
 msgid "socket failed."
 msgstr "chyba soketu."
 
-#: WWW/Library/Implementation/HTTCP.c:1648
+#: WWW/Library/Implementation/HTTCP.c:1634
 msgid "Could not make connection non-blocking."
 msgstr "Soket nelze nastavit jako neblokující."
 
-#: WWW/Library/Implementation/HTTCP.c:1717
+#: WWW/Library/Implementation/HTTCP.c:1703
 msgid "Connection failed (too many retries)."
 msgstr "Spojení se nepodaøilo navázat na 180 000. pokus."
 
-#: WWW/Library/Implementation/HTTCP.c:1910
+#: WWW/Library/Implementation/HTTCP.c:1896
 msgid "Could not restore socket to blocking."
 msgstr "Soket nelze nastavit jako blokující."
 
-#: WWW/Library/Implementation/HTTCP.c:1976
+#: WWW/Library/Implementation/HTTCP.c:1962
 msgid "Socket read failed for 180,000 tries."
 msgstr "180 000 neúspì¹ných pokusù èíst ze soketu."
 
-#: WWW/Library/Implementation/HTTP.c:466
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:503
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Tento klient nepodporuje HTTPS URL."
 
-#: WWW/Library/Implementation/HTTP.c:491
+#: WWW/Library/Implementation/HTTP.c:528
 msgid "Unable to connect to remote host."
 msgstr "Spojení se vzdáleným poèítaèem nelze navázat."
 
-#: WWW/Library/Implementation/HTTP.c:1005
+#: WWW/Library/Implementation/HTTP.c:557
+#, fuzzy
+msgid "Retrying connection without TLS."
+msgstr "Navazuji %s spojení s %s."
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1091
 msgid "Sending HTTP request."
 msgstr "Odesílám HTTP po¾adavek."
 
-#: WWW/Library/Implementation/HTTP.c:1039
+#: WWW/Library/Implementation/HTTP.c:1125
 msgid "Unexpected network write error; connection aborted."
 msgstr "Neoèekávaná chyba pøi zápisu na soket; spojení uzavøeno."
 
-#: WWW/Library/Implementation/HTTP.c:1045
+#: WWW/Library/Implementation/HTTP.c:1131
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP po¾adavek odeslán; èekám na odpovìï"
 
-#: WWW/Library/Implementation/HTTP.c:1109
+#: WWW/Library/Implementation/HTTP.c:1195
 msgid "Unexpected network read error; connection aborted."
 msgstr "Neoèekávaná chyba pøi ètení ze soketu; spojení uzavøeno."
 
@@ -3088,7 +3122,7 @@ msgstr "Neoèekávaná chyba pøi ètení ze soketu; spojení uzavøeno."
 #. **	so we'll deal with them by showing the full
 #. **	header to the user as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1305
+#: WWW/Library/Implementation/HTTP.c:1391
 msgid "Got unexpected Informational Status."
 msgstr "Neoèekávané Informaèní hlá¹ení."
 
@@ -3099,7 +3133,7 @@ msgstr "Neoèekávané Informaèní hlá¹ení."
 #. *  user to do that, and restore the current
 #. *  document. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1340
+#: WWW/Library/Implementation/HTTP.c:1426
 msgid "Request fulfilled.  Reset Content."
 msgstr "Po¾adavek vyøízen. Obsah formuláøe smazán."
 
@@ -3110,27 +3144,27 @@ msgstr "Po¾adavek vyøízen. Obsah formuláøe smazán."
 #. *  with it by showing the full header to the user
 #. *  as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1459
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Neoèekávané hlá¹ení: 304 Not Modified"
 
-#: WWW/Library/Implementation/HTTP.c:1526
+#: WWW/Library/Implementation/HTTP.c:1612
 msgid "Redirection of POST content requires user approval."
 msgstr "Pøesmìrování POST obsahu vy¾aduje souhlas u¾ivatele."
 
-#: WWW/Library/Implementation/HTTP.c:1541
+#: WWW/Library/Implementation/HTTP.c:1627
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Obsahuje POST data. Trvalé pøesmìrování pou¾ívám pouze jako doèasné.\n"
 
-#: WWW/Library/Implementation/HTTP.c:1586
+#: WWW/Library/Implementation/HTTP.c:1672
 msgid "Retrying with access authorization information."
 msgstr "Zkou¹ím to znovu s proxy autorizací."
 
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1684
 msgid "Show the 401 message body?"
 msgstr "Zobrazit tìlo 401 hlá¹ení?"
 
-#: WWW/Library/Implementation/HTTP.c:1643
+#: WWW/Library/Implementation/HTTP.c:1729
 msgid "Show the 407 message body?"
 msgstr "Zobrazit tìlo 407 hlá¹ení?"
 
@@ -3139,7 +3173,7 @@ msgstr "Zobrazit tìlo 407 hlá¹ení?"
 #. **	Take a chance and hope there is
 #. **	something to display. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1748
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Unknown status reply from server!"
 msgstr "Neznámé hlá¹ení od serveru!"
 
@@ -3221,27 +3255,27 @@ msgstr ""
 "\n"
 "'Code' záznam, nelze zobrazit\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:691
+#: WWW/Library/Implementation/HTWAIS.c:689
 msgid "Syntax error in WAIS URL"
 msgstr "Syntaktická chyba ve WAIS URL."
 
-#: WWW/Library/Implementation/HTWAIS.c:761
+#: WWW/Library/Implementation/HTWAIS.c:759
 msgid " (WAIS Index)"
 msgstr " (WAIS rejstøík)"
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:766
 msgid "WAIS Index: "
 msgstr "WAIS rejstøík: "
 
-#: WWW/Library/Implementation/HTWAIS.c:774
+#: WWW/Library/Implementation/HTWAIS.c:772
 msgid "This is a link for searching the "
 msgstr "Tento odkaz ukazuje na prohledávaè "
 
-#: WWW/Library/Implementation/HTWAIS.c:778
+#: WWW/Library/Implementation/HTWAIS.c:776
 msgid " WAIS Index.\n"
 msgstr " WAIS rejstøíku.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:805
+#: WWW/Library/Implementation/HTWAIS.c:803
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
@@ -3249,48 +3283,48 @@ msgstr ""
 "\n"
 "Stisknìte 's' a pak zadejte hledaná slova.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:827
+#: WWW/Library/Implementation/HTWAIS.c:825
 msgid " (in "
 msgstr " (v "
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:834
 msgid "WAIS Search of \""
 msgstr "WAIS hledání \""
 
-#: WWW/Library/Implementation/HTWAIS.c:840
+#: WWW/Library/Implementation/HTWAIS.c:838
 msgid "\" in: "
 msgstr "\" v: "
 
-#: WWW/Library/Implementation/HTWAIS.c:855
+#: WWW/Library/Implementation/HTWAIS.c:853
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: po¾adavek pøíli¹ dlouhý."
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:862
 msgid "Searching WAIS database..."
 msgstr "Prohledávám WAIS databázi..."
 
-#: WWW/Library/Implementation/HTWAIS.c:874
+#: WWW/Library/Implementation/HTWAIS.c:872
 msgid "Search interrupted."
 msgstr "Hledání pøeru¹eno."
 
-#: WWW/Library/Implementation/HTWAIS.c:924
+#: WWW/Library/Implementation/HTWAIS.c:922
 msgid "Can't convert format of WAIS document"
 msgstr "Formát WAIS dokumentu nelze pøevést"
 
-#: WWW/Library/Implementation/HTWAIS.c:968
+#: WWW/Library/Implementation/HTWAIS.c:966
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: po¾adavek pøíli¹ dlouhý"
 
 #.
 #. **	Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:982
+#: WWW/Library/Implementation/HTWAIS.c:980
 msgid "Fetching WAIS document..."
 msgstr "Stahuji WAIS dokument..."
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1021
+#: WWW/Library/Implementation/HTWAIS.c:1019
 msgid "No text was returned!\n"
 msgstr "®ádná odpovìï!\n"
 
@@ -3310,167 +3344,161 @@ msgstr " popis"
 msgid "Access links"
 msgstr "Odkazy"
 
-#: WWW/Library/Implementation/HTWSRC.c:345
+#: WWW/Library/Implementation/HTWSRC.c:346
 msgid "Direct access"
 msgstr "Pøímý pøístup"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:348
+#: WWW/Library/Implementation/HTWSRC.c:349
 msgid " (or via proxy server, if defined)"
 msgstr " (èi, pokud je definován, pøes proxy server)"
 
-#: WWW/Library/Implementation/HTWSRC.c:363
+#: WWW/Library/Implementation/HTWSRC.c:364
 msgid "Maintainer"
 msgstr "Správce"
 
-#: WWW/Library/Implementation/HTWSRC.c:371
+#: WWW/Library/Implementation/HTWSRC.c:372
 msgid "Host"
 msgstr "Poèítaè"
 
-#: src/GridText.c:607
+#: src/GridText.c:688
 msgid "Memory exhausted, display interrupted!"
 msgstr "Do¹la pamì», zobrazení pøeru¹eno!"
 
-#: src/GridText.c:612
+#: src/GridText.c:693
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Do¹la pamì», pøenos pøeru¹en!"
 
-#: src/GridText.c:3395
+#: src/GridText.c:3578
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** DO©LA PAMÌ« ***"
 
-#: src/GridText.c:5733 src/GridText.c:5740 src/LYList.c:258
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
 msgid "unknown field or link"
 msgstr "neznámé pole èi odkaz"
 
-#: src/GridText.c:5749
+#: src/GridText.c:6023
 msgid "text entry field"
 msgstr "textové vstupní pole"
 
-#: src/GridText.c:5752
+#: src/GridText.c:6026
 msgid "password entry field"
 msgstr "vstupní pole pro heslo"
 
-#: src/GridText.c:5755
+#: src/GridText.c:6029
 msgid "checkbox"
 msgstr "za¹krtávací políèko"
 
-#: src/GridText.c:5758
+#: src/GridText.c:6032
 msgid "radio button"
 msgstr "pøepínací tlaèítko"
 
-#: src/GridText.c:5761
+#: src/GridText.c:6035
 msgid "submit button"
 msgstr "tlaèítko pro odeslání dat serveru"
 
-#: src/GridText.c:5764
+#: src/GridText.c:6038
 msgid "reset button"
 msgstr "tlaèítko pro obnovení implicitních hodnot"
 
-#: src/GridText.c:5767
+#: src/GridText.c:6041
 msgid "popup menu"
 msgstr "vyskakovací menu"
 
-#: src/GridText.c:5770
+#: src/GridText.c:6044
 msgid "hidden form field"
 msgstr "skryté pole formuláøe"
 
-#: src/GridText.c:5773
+#: src/GridText.c:6047
 msgid "text entry area"
 msgstr "textová vstupní oblast"
 
-#: src/GridText.c:5776
+#: src/GridText.c:6050
 msgid "range entry field"
 msgstr "vstupní pole pro interval"
 
-#: src/GridText.c:5779
+#: src/GridText.c:6053
 msgid "file entry field"
 msgstr "pole pro výbìr souboru"
 
-#: src/GridText.c:5782
+#: src/GridText.c:6056
 msgid "text-submit field"
 msgstr "tlaèítko pro odeslání textu"
 
-#: src/GridText.c:5785
+#: src/GridText.c:6059
 msgid "image-submit button"
 msgstr "tlaèítko pro odeslání obrázku"
 
-#: src/GridText.c:5788
+#: src/GridText.c:6062
 msgid "keygen field"
 msgstr "pole pro vytvoøení klíèe"
 
-#: src/GridText.c:5791
+#: src/GridText.c:6065
 msgid "unknown form field"
 msgstr "neznámé pole formuláøe"
 
-#. We can't open the file, what do we do?
-#: src/GridText.c:10348
+#: src/GridText.c:10066
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Soubor pro dekompresi nelze otevøít!"
 
-#. We got an error reading the file, what do we do?
-#: src/GridText.c:10359
-msgid "Short read from file, problem?"
-msgstr ""
-
-#: src/GridText.c:10721
+#: src/GridText.c:11218
 #, c-format
 msgid "Submitting %s"
 msgstr "Odesílám %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:11887
+#: src/GridText.c:12375
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12092
+#: src/GridText.c:12581
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12144
+#: src/GridText.c:12633
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:12591
+#: src/GridText.c:13079
 msgid "Very long lines have been truncated!"
 msgstr ""
 
-#: src/HTAlert.c:155 src/LYShowInfo.c:318
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
 msgid "bytes"
 msgstr "bajtù"
 
-#: src/HTAlert.c:156
+#: src/HTAlert.c:155
 msgid "KB"
 msgstr "KB"
 
-#: src/HTAlert.c:255
+#: src/HTAlert.c:274
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "Mno¾ství pøenesených dat: %s/%s"
 
-#: src/HTAlert.c:257
+#: src/HTAlert.c:276
 #, c-format
 msgid "Read %s of data"
 msgstr "Mno¾ství pøenesených dat: %s"
 
-#: src/HTAlert.c:262
+#: src/HTAlert.c:281
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s/s."
 
-#: src/HTAlert.c:269
+#: src/HTAlert.c:290
 #, c-format
-msgid " (stalled for %ld sec)"
+msgid " (stalled for %s)"
 msgstr ""
 
-#: src/HTAlert.c:271
-#, c-format
-msgid ", ETA %ld sec"
+#: src/HTAlert.c:294
+#, fuzzy, c-format
+msgid ", ETA %s"
 msgstr ", %ld s."
 
-#: src/HTAlert.c:277
+#: src/HTAlert.c:301
 msgid " (Press 'z' to abort)"
 msgstr " (Stisknìte 'z' pro ukonèení)"
 
@@ -3499,43 +3527,43 @@ msgstr " (Stisknìte 'z' pro ukonèení)"
 #. *  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:334
+#: src/HTAlert.c:342 src/HTAlert.c:390
 msgid "yes"
 msgstr "ano"
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:345 src/HTAlert.c:391
 msgid "no"
 msgstr "ne"
 
-#: src/HTML.c:6342
+#: src/HTML.c:5985
 msgid "Description:"
 msgstr "Popis:"
 
-#: src/HTML.c:6347
+#: src/HTML.c:5990
 msgid "(none)"
 msgstr "(¾ádný)"
 
-#: src/HTML.c:6351
+#: src/HTML.c:5994
 msgid "Filepath:"
 msgstr "Cesta:"
 
-#: src/HTML.c:6356
+#: src/HTML.c:5999
 msgid "(unknown)"
 msgstr "(neznámá)"
 
-#: src/HTML.c:7804
+#: src/HTML.c:7452
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokument obsahuje pouze skryté odkazy. Pou¾ijte 'l' pro jejich vypsání."
 
-#: src/HTML.c:8328
+#: src/HTML.c:7958
 msgid "Source cache error - disk full?"
 msgstr ""
 
-#: src/HTML.c:8341
+#: src/HTML.c:7971
 msgid "Source cache error - not enough memory!"
 msgstr ""
 
-#: src/LYBookmark.c:166
+#: src/LYBookmark.c:167
 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"
@@ -3546,13 +3574,13 @@ msgstr ""
 "     èi chybné odkazy mohou být smazány pomocí klávesy 'R'. Správce\n"
 "     systému ale mohl tuto funkci svázat s jinou klávesou."
 
-#: src/LYBookmark.c:382
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
 msgstr ""
 
-#: src/LYBookmark.c:385
+#: src/LYBookmark.c:382
 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"
@@ -3561,7 +3589,7 @@ msgstr ""
 "     Odkazy mohou být smazány pomocí klávesy 'R'. Správce\n"
 "     systému ale mohl tuto funkci svázat s jinou klávesou."
 
-#: src/LYBookmark.c:389
+#: src/LYBookmark.c:386
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3569,7 +3597,7 @@ msgstr ""
 "     Mazání odkazù èi zmìna jejich poøadí Mù¾e být provedena i pomocí úprav\n"
 "     tohoto souboru bì¾ným textovým editorem."
 
-#: src/LYBookmark.c:392
+#: src/LYBookmark.c:389
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3580,7 +3608,7 @@ msgstr ""
 "          mìnit jeho formát, èi pøidávat dal¹í HTML znaèky.\n"
 "          ®ádná zálo¾ka nesmí zabírat více ne¾ jeden øádek."
 
-#: src/LYBookmark.c:683
+#: src/LYBookmark.c:681
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr ""
@@ -3589,71 +3617,71 @@ msgstr ""
 #. *  Neither the path as given nor any components examined by
 #. *  backing up were stat()able. - kw
 #.
-#: src/LYCgi.c:232
+#: src/LYCgi.c:231
 msgid "Unable to access cgi script"
 msgstr "Nelze získat pøístup k cgi skriptu"
 
-#: src/LYCgi.c:651 src/LYCgi.c:654
+#: src/LYCgi.c:654 src/LYCgi.c:657
 msgid "Good Advice"
 msgstr "Dobrá rada"
 
-#: src/LYCgi.c:657
+#: src/LYCgi.c:660
 msgid "An excellent http server for VMS is available via"
 msgstr "Vynikající http server pro VMS je dostupný pøes"
 
-#: src/LYCgi.c:664
+#: src/LYCgi.c:667
 msgid "this link"
 msgstr "tento odkaz."
 
-#: src/LYCgi.c:668
+#: src/LYCgi.c:671
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Poskytuje výbornou podporu pro cgi skripty.\n"
 
-#: src/LYClean.c:108
+#: src/LYClean.c:122
 msgid "Exiting via interrupt:"
 msgstr "Konèím kvùli pøeru¹ení:"
 
-#: src/LYCookie.c:2659
+#: src/LYCookie.c:2462
 msgid "(from a previous session)"
 msgstr "(z pøedchozího sezení)"
 
-#: src/LYCookie.c:2719
+#: src/LYCookie.c:2522
 msgid "Maximum Gobble Date:"
 msgstr ""
 
-#: src/LYCookie.c:2764
+#: src/LYCookie.c:2564
 msgid "Internal"
 msgstr " (vnitøní)"
 
-#: src/LYCookie.c:2765
+#: src/LYCookie.c:2565
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
-#: src/LYCurses.c:936
+#: src/LYCurses.c:1004
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Inicializace terminálu se nezdaøila - neznámý typ terminálu?"
 
-#: src/LYCurses.c:1328
+#: src/LYCurses.c:1426
 msgid "Terminal ="
 msgstr "Terminál ="
 
-#: src/LYCurses.c:1332
+#: src/LYCurses.c:1430
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Tento program vy¾aduje terminál typu vt100, 200 etc."
 
-#: src/LYCurses.c:1384
+#: src/LYCurses.c:1480
 msgid "Your Terminal type is unknown!"
 msgstr "Typ va¹eho terminálu je neznámý!"
 
-#: src/LYCurses.c:1385
+#: src/LYCurses.c:1481
 msgid "Enter a terminal type:"
 msgstr "Zadejte typ terminálu:"
 
-#: src/LYCurses.c:1398
+#: src/LYCurses.c:1495
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TYP TERMINÁLU JE NASTAVEN NA"
 
-#: src/LYCurses.c:1749
+#: src/LYCurses.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -3662,7 +3690,7 @@ msgstr ""
 "\n"
 "V programu %s verze %s nastala fatální chyba.\n"
 
-#: src/LYCurses.c:1751
+#: src/LYCurses.c:1996
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -3677,123 +3705,162 @@ msgstr ""
 "struèný popis pøíkazu a/nebo URL, který ji zpùsobil, jméno a verzi operaèního\n"
 "systému, TCPIP implementaci, TRACEBACK a v¹echny dal¹í relevantní informace.\n"
 
-#: src/LYDownload.c:520
+#: src/LYEdit.c:249
+msgid "Editor killed by signal"
+msgstr ""
+
+#: src/LYEdit.c:251
+#, c-format
+msgid "Editor returned with error status, %s"
+msgstr ""
+
+#: src/LYEdit.c:252
+msgid "reason unknown."
+msgstr ""
+
+#: src/LYDownload.c:517
 msgid "Downloaded link:"
 msgstr "Sta¾ený odkaz:"
 
-#: src/LYDownload.c:525
+#: src/LYDownload.c:522
 msgid "Suggested file name:"
 msgstr "Doporuèené jméno souboru:"
 
-#: src/LYDownload.c:530
+#: src/LYDownload.c:527
 msgid "Standard download options:"
 msgstr "Standardní menu nabídek pro stahování:"
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:528
 msgid "Download options:"
 msgstr "Menu nabídek pro stahování:"
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:544
 msgid "Save to disk"
 msgstr "Ulo¾it na disk"
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "Poslat soubor po¹tou"
+
+#: src/LYDownload.c:565
 msgid "Save to disk disabled."
 msgstr "Ukládání na disk je zakázáno."
 
-#: src/LYDownload.c:551 src/LYPrint.c:1338
+#: src/LYDownload.c:569 src/LYPrint.c:1327
 msgid "Local additions:"
 msgstr "Místní roz¹íøení:"
 
-#: src/LYDownload.c:560 src/LYUpload.c:224
+#: src/LYDownload.c:578 src/LYUpload.c:216
 msgid "No Name Given"
 msgstr "Nebylo zadáno ¾ádné jméno."
 
-#: src/LYHistory.c:633
+#: src/LYHistory.c:657
 msgid "You selected:"
 msgstr "Nav¹tívené odkazy:"
 
-#: src/LYHistory.c:657 src/LYHistory.c:905
+#: src/LYHistory.c:681 src/LYHistory.c:921
 msgid "(no address)"
 msgstr "(¾ádná adresa)"
 
-#: src/LYHistory.c:661
+#: src/LYHistory.c:685
 msgid " (internal)"
 msgstr " (vnitøní)"
 
-#: src/LYHistory.c:663
+#: src/LYHistory.c:687
 msgid " (was internal)"
 msgstr " (pùvodnì vnitøní)"
 
-#: src/LYHistory.c:761
+#: src/LYHistory.c:785
 msgid " (From History)"
 msgstr " (z historie)"
 
-#: src/LYHistory.c:825
+#: src/LYHistory.c:841
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "Nav¹tívené odkazy (POST, zálo¾ky, menu a seznamy odkazù vynechány):"
 
-#: src/LYHistory.c:1124
+#: src/LYHistory.c:1137
 msgid "(No messages yet)"
 msgstr ""
 
-#: src/LYLeaks.c:78
+#: src/LYLeaks.c:209
 msgid "Invalid pointer detected."
 msgstr "Nalezen chybný ukazatel."
 
-#: src/LYLeaks.c:80 src/LYLeaks.c:117
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
 msgid "Pointer:"
 msgstr "Ukazatel:"
 
-#: src/LYLeaks.c:91 src/LYLeaks.c:98 src/LYLeaks.c:136
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
 msgid "FileName:"
 msgstr "Jméno souboru:"
 
-#: src/LYLeaks.c:94 src/LYLeaks.c:101 src/LYLeaks.c:139 src/LYLeaks.c:150
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
 msgid "LineCount:"
 msgstr "Øádek:"
 
-#: src/LYLeaks.c:115
+#: src/LYLeaks.c:249
 msgid "Memory leak detected."
 msgstr "Zji¹tìn problém s pamìtí."
 
-#: src/LYLeaks.c:120
+#: src/LYLeaks.c:257
 msgid "Contains:"
 msgstr "Obsahuje:"
 
-#: src/LYLeaks.c:133
+#: src/LYLeaks.c:270
 msgid "ByteSize:"
 msgstr "Velikost v bajtech:"
 
-#: src/LYLeaks.c:147
+#: src/LYLeaks.c:284
 msgid "realloced:"
 msgstr "realokováno:"
 
-#: src/LYLeaks.c:170
+#: src/LYLeaks.c:307
 msgid "Total memory leakage this run:"
 msgstr "Celkový poèet problémù s pamìtí:"
 
-#: src/LYList.c:91
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+#, fuzzy
+msgid "Bytes allocated"
+msgstr "realokováno:"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
 msgid "References in "
 msgstr "Odkazy v "
 
-#: src/LYList.c:92
+#: src/LYList.c:86
 msgid "this document:"
 msgstr "v tomto dokumentu:"
 
-#: src/LYList.c:98
+#: src/LYList.c:92
 msgid "Visible links:"
 msgstr "Viditelné odkazy:"
 
-#: src/LYList.c:199 src/LYList.c:319
+#: src/LYList.c:194 src/LYList.c:315
 msgid "Hidden links:"
 msgstr "Skryté odkazy:"
 
-#: src/LYList.c:267
+#: src/LYList.c:262
 msgid "References"
 msgstr "Reference"
 
-#: src/LYList.c:269
+#: src/LYList.c:264
 msgid "Visible links"
 msgstr "Viditelné odkazy"
 
@@ -3806,314 +3873,314 @@ msgstr "Status '%s' nelze zjistit."
 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:383
+#: src/LYLocal.c:366
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "%s selhalo kvùli systémové chybì!"
 
 #. error return
-#: src/LYLocal.c:415
+#: src/LYLocal.c:400
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "%s pravdìpodobnì selhalo kvùli systémové chybì!"
 
-#: src/LYLocal.c:453
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "smazat %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr ""
+
+#: src/LYLocal.c:508
 #, c-format
 msgid "move %s to %s"
 msgstr "pøesunout %s do %s"
 
-#: src/LYLocal.c:475
+#: src/LYLocal.c:548
 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:477
+#: src/LYLocal.c:550
 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:479
+#: src/LYLocal.c:552
 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:490
+#: src/LYLocal.c:563
 msgid "Destination has different owner!  Request denied."
 msgstr "Cíl má jiného vlastníka! Po¾adavek zamítnut."
 
-#: src/LYLocal.c:493
+#: src/LYLocal.c:566
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Cíl není platným adresáøem! Po¾adavek zamítnut."
 
-#: src/LYLocal.c:516
+#: src/LYLocal.c:588
 msgid "Remove all tagged files and directories?"
 msgstr "Smazat v¹echny oznaèené soubory a adresáøe "
 
-#: src/LYLocal.c:537
-#, c-format
-msgid "remove %s"
-msgstr "smazat %s"
-
-#: src/LYLocal.c:580
+#: src/LYLocal.c:647
 msgid "Enter new location for tagged items: "
 msgstr "Zadejte nové místo urèení pro oznaèené pøedmìty: "
 
-#: src/LYLocal.c:649
+#: src/LYLocal.c:716
 msgid "Path too long"
 msgstr "Cesta je pøíli¹ dlouhá."
 
-#: src/LYLocal.c:680
+#: src/LYLocal.c:747
 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:738
+#: src/LYLocal.c:805
 msgid "Enter new name for directory: "
 msgstr "Zadejte nové jméno adresáøe: "
 
-#: src/LYLocal.c:740
+#: src/LYLocal.c:807
 msgid "Enter new name for file: "
 msgstr "Zadejte nové jméno souboru: "
 
-#: src/LYLocal.c:751
+#: src/LYLocal.c:819
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Nalezen chybný znak \"/\"! Po¾adavek ignorován."
 
-#: src/LYLocal.c:800
+#: src/LYLocal.c:868
 msgid "Enter new location for directory: "
 msgstr "Zadejte nové místo urèení pro adresáø: "
 
-#: src/LYLocal.c:802
+#: src/LYLocal.c:874
 msgid "Enter new location for file: "
 msgstr "Zadejte nové místo urèení pro soubor: "
 
-#: src/LYLocal.c:827
+#: src/LYLocal.c:901
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Neoèekávaná chyba - koncové \"/\" nelze najít"
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:921
 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:894
+#: src/LYLocal.c:970
 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:896
+#: src/LYLocal.c:972
 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:925
+#: src/LYLocal.c:1001
 msgid "This feature not yet implemented!"
 msgstr "Tato funkce zatím nebyla implementována!"
 
-#: src/LYLocal.c:943
+#: src/LYLocal.c:1019
 msgid "Enter name of file to create: "
 msgstr "Zadejte jméno souboru, který mám vytvoøit: "
 
-#: src/LYLocal.c:951 src/LYLocal.c:999
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Nalezeno chybné pøesmìrování \"//\"! Po¾adavek ignorován."
 
-#: src/LYLocal.c:966
-#, c-format
-msgid "create %s"
-msgstr "vytvoøit %s"
-
-#: src/LYLocal.c:991
+#: src/LYLocal.c:1061
 msgid "Enter name for new directory: "
 msgstr "Zadejte nové jméno adresáøe: "
 
-#: src/LYLocal.c:1042
+#: src/LYLocal.c:1106
 msgid "Create file or directory (f or d): "
 msgstr "Vytvoøit soubor èi adresáø? (f èi d):"
 
-#: src/LYLocal.c:1083
+#: src/LYLocal.c:1146
 #, c-format
 msgid "Remove '%s' and all of its contents?"
 msgstr "Smazat '%s' a ve¹kerý jeho obsah: "
 
-#: src/LYLocal.c:1086
+#: src/LYLocal.c:1149
 msgid "Remove directory and all of its contents?"
 msgstr "Smazat adresáø a ve¹kerý jeho obsah: "
 
-#: src/LYLocal.c:1090
+#: src/LYLocal.c:1153
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Smazat soubor '%s': "
 
-#: src/LYLocal.c:1092
+#: src/LYLocal.c:1155
 msgid "Remove file?"
 msgstr "Smazat soubor: "
 
-#: src/LYLocal.c:1097
+#: src/LYLocal.c:1160
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Smazat symbolický odkaz '%s': "
 
-#: src/LYLocal.c:1099
+#: src/LYLocal.c:1162
 msgid "Remove symbolic link?"
 msgstr "Smazat symbolický odkaz: "
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1248
 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:1220
+#: src/LYLocal.c:1278
 msgid "Unable to open permit options file"
 msgstr "Soubor s menu nastavení práv souborù nelze otevøít."
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1305
 msgid "Specify permissions below:"
 msgstr "Zadejte pøístupová práva:"
 
-#: src/LYLocal.c:1248 src/LYShowInfo.c:196
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
 msgid "Owner:"
 msgstr "Vlastník:"
 
-#: src/LYLocal.c:1264
+#: src/LYLocal.c:1322
 msgid "Group"
 msgstr "Skupina"
 
-#: src/LYLocal.c:1280
+#: src/LYLocal.c:1338
 msgid "Others:"
 msgstr "Ostatní:"
 
-#: src/LYLocal.c:1298
+#: src/LYLocal.c:1356
 msgid "form to permit"
 msgstr "formuláø"
 
-#: src/LYLocal.c:1396
+#: src/LYLocal.c:1452
 msgid "Invalid mode format."
 msgstr "Chybný formát."
 
-#: src/LYLocal.c:1400
+#: src/LYLocal.c:1456
 msgid "Invalid syntax format."
 msgstr "Chybná syntaxe."
 
-#: src/LYLocal.c:1575
-msgid "NULL URL pointer"
-msgstr "NULOVÝ URL ukazatel"
-
-#: src/LYLocal.c:1670
+#: src/LYLocal.c:1645
 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:1782
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr "NULOVÝ URL ukazatel"
+
+#: src/LYLocal.c:1908
 #, c-format
 msgid "Executing %s "
 msgstr "Spou¹tím %s "
 
-#: src/LYLocal.c:1785
+#: src/LYLocal.c:1911
 msgid "Executing system command. This might take a while."
 msgstr "Spou¹tí se systémový pøíkaz. Okam¾ik, prosím."
 
-#: src/LYLocal.c:1831
-msgid "Unable to open file management menu file."
-msgstr "Nelze otevøít soubor s menu správce souborù."
-
-#: src/LYLocal.c:1862
+#: src/LYLocal.c:1985
 msgid "Current directory:"
 msgstr "Aktuální adresáø:"
 
-#: src/LYLocal.c:1865 src/LYLocal.c:1883
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
 msgid "Current selection:"
 msgstr "Zvolené polo¾ky:"
 
-#: src/LYLocal.c:1869
+#: src/LYLocal.c:1992
 msgid "Nothing currently selected."
 msgstr "®ádné polo¾ky nejsou zvoleny."
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged item:"
 msgstr "oznaèena polo¾ka:"
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged items:"
 msgstr "oznaèené polo¾ky:"
 
-#: src/LYLocal.c:1983 src/LYLocal.c:1994
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
 msgid "Illegal filename; request ignored."
 msgstr "Chybné jméno souboru; po¾adavek ignorován."
 
-#: src/LYLocal.c:2137
-msgid "The selected item is not a directory!  Request ignored."
-msgstr "Zvolená polo¾ka není adresáøem! Po¾adavek ignorován."
-
 #. directory not writable
-#: src/LYLocal.c:2141
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
 msgid "Install in the selected directory not permitted."
 msgstr "Instalace do zvoleného adresáøe není povolena."
 
-#: src/LYLocal.c:2146
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr "Zvolená polo¾ka není adresáøem! Po¾adavek ignorován."
+
+#: src/LYLocal.c:2276
 msgid "Just a moment, ..."
 msgstr "Okam¾ik, prosím ..."
 
-#: src/LYLocal.c:2163
+#: src/LYLocal.c:2293
 msgid "Error buiding install args"
 msgstr ""
 
-#: src/LYLocal.c:2178 src/LYLocal.c:2210
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr ""
 
-#: src/LYLocal.c:2188 src/LYLocal.c:2220
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Ètu adresáø: %s"
 
-#: src/LYLocal.c:2238
+#: src/LYLocal.c:2362
 msgid "Installation complete"
 msgstr "Instalace dokonèena"
 
-#: src/LYLocal.c:2427
+#: src/LYLocal.c:2551
 msgid "Temporary URL or list would be too long."
 msgstr "Doèasné URL nebo seznam by bylo pøíli¹ dlouhé."
 
-#: src/LYMail.c:503
+#: src/LYMail.c:534
 msgid "Sending"
 msgstr "Posílám"
 
-#: src/LYMail.c:989
+#: src/LYMail.c:1024
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "Odkaz      %s :?: %s \n"
 
-#: src/LYMail.c:991
+#: src/LYMail.c:1026
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "volaný \"%s\"\n"
 
-#: src/LYMail.c:992
+#: src/LYMail.c:1027
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "v souboru \"%s\" se jménem \"%s\"\n"
 
-#: src/LYMail.c:993
+#: src/LYMail.c:1028
 msgid "was requested but was not available."
 msgstr "byl po¾adován, ale nebyl dostupný."
 
-#: src/LYMail.c:994
+#: src/LYMail.c:1029
 msgid "Thought you might want to know."
 msgstr "Pouze jsem vás chtìl informovat."
 
-#: src/LYMail.c:996
+#: src/LYMail.c:1031
 msgid "This message was automatically generated by"
 msgstr "Tato zpráva byla vytvoøena automaticky programem"
 
-#: src/LYMain.c:897
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:969
 msgid "No Winsock found, sorry."
 msgstr "Winsock nenalezen. lituji."
 
-#: src/LYMain.c:1103
+#: src/LYMain.c:1170
 msgid "You MUST define a valid TMP or TEMP area!\n"
 msgstr "MUSÍTE zadat platný TMP èi TEMP prostor!\n"
 
-#: src/LYMain.c:1156 src/LYMainLoop.c:5117
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
 msgid "No such directory"
 msgstr " adresáø"
 
-#: src/LYMain.c:1378
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4124,7 +4191,7 @@ msgstr ""
 "Konfiguraèní soubor %s je nedostupný.\n"
 "\n"
 
-#: src/LYMain.c:1388
+#: src/LYMain.c:1446
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
@@ -4134,7 +4201,7 @@ msgstr ""
 "Znakové sady Lynxu nejsou deklarovány.\n"
 "\n"
 
-#: src/LYMain.c:1417
+#: src/LYMain.c:1475
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
@@ -4144,7 +4211,7 @@ msgstr ""
 "Editovací mapy Lynxu nejsou deklarovány.\n"
 "\n"
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1504
 #, c-format
 msgid ""
 "\n"
@@ -4155,60 +4222,60 @@ msgstr ""
 "Soubor %s není dostupný.\n"
 "\n"
 
-#: src/LYMain.c:1704
+#: src/LYMain.c:1743
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2247
+#: src/LYMain.c:2293
 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:2477 src/LYMain.c:2525
+#: src/LYMain.c:2540 src/LYMain.c:2588
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3047
-#, c-format
-msgid "%s Version %s (%s)\n"
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
 msgstr "%s verze %s (%s)\n"
 
-#: src/LYMain.c:3072
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Pøelo¾en na %s %s %s\n"
 
-#: src/LYMain.c:3077
+#: src/LYMain.c:3166
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
 msgstr "Autorská práva patøí Kansaské univerzitì, CERN a ostatním autorùm.\n"
 
-#: src/LYMain.c:3079
+#: src/LYMain.c:3168
 msgid "Distributed under the GNU General Public License.\n"
 msgstr "Roz¹iøován podle podmínek Obecné veøejné licence GNU.\n"
 
-#: src/LYMain.c:3081
+#: src/LYMain.c:3170
 msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
+"See http://lynx.isc.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
-"Podrobnìj¹í informace získáte na http://lynx.browser.org a z nápovìdy k programu.\n"
+"Podrobnìj¹í informace získáte na http://lynx.isc.org/ a z nápovìdy k programu.\n"
 "\n"
 
-#: src/LYMain.c:3800
+#: src/LYMain.c:3919
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "Pou¾ití: %s [pøepínaèe] [soubor]\n"
 
-#: src/LYMain.c:3801
+#: src/LYMain.c:3920
 msgid "Options are:\n"
 msgstr "Pøepínaèe:\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4191
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Chybný pøepínaè %s\n"
 
-#: src/LYMainLoop.c:512
+#: src/LYMainLoop.c:539
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr ""
@@ -4216,80 +4283,109 @@ msgstr ""
 #.
 #. * Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:625 src/LYMainLoop.c:5139
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
 msgid "A URL specified by the user"
 msgstr "URL zadané u¾ivatelem"
 
-#: src/LYMainLoop.c:1114
+#: src/LYMainLoop.c:1110
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "Kódování multipart/form-data není zatím podporováno. Nelze odeslat."
 
 #.
 #. *  Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3097
+#: src/LYMainLoop.c:3053
 msgid "Help Screen"
 msgstr "Nápovìda"
 
-#: src/LYMainLoop.c:3231
+#: src/LYMainLoop.c:3177
 msgid "System Index"
 msgstr "Systémový index"
 
-#: src/LYMainLoop.c:3611 src/LYMainLoop.c:5347
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
 msgid "Entry into main screen"
 msgstr "Vstup na hlavní obrazovku"
 
-#: src/LYMainLoop.c:3897
+#: src/LYMainLoop.c:3824
 msgid "No next document present"
 msgstr ""
 
-#: src/LYMainLoop.c:4206
+#: src/LYMainLoop.c:4131
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "znaková sada tohoto dokumentu je explicitnì zadána, lituji..."
 
-#: src/LYMainLoop.c:5093
+#: src/LYMainLoop.c:5004
 msgid "cd to:"
 msgstr " do "
 
-#: src/LYMainLoop.c:5120
+#: src/LYMainLoop.c:5031
 msgid "A component of path is not a directory"
 msgstr ""
 
-#: src/LYMainLoop.c:5123
+#: src/LYMainLoop.c:5034
 msgid "failed to change directory"
 msgstr "Adresáø není dostupný."
 
-#: src/LYMainLoop.c:6291
+#: src/LYMainLoop.c:6204
 msgid "Reparsing document under current settings..."
 msgstr "Znovu zpracovávám dokument za pou¾ití nových nastavení..."
 
-#: src/LYMainLoop.c:6579 src/LYMainLoop.c:6583
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
 #, 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:7719 src/LYMainLoop.c:7892
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6914
+#, fuzzy
+msgid "Current URL is empty."
+msgstr "Aktuální adresáø:"
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr ""
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
 msgid "-index-"
 msgstr " rejstøík"
 
-#: src/LYMainLoop.c:7829
+#: src/LYMainLoop.c:7731
 msgid "lynx: Can't access startfile"
 msgstr "lynx: startovní soubor nelze otevøít"
 
-#: src/LYMainLoop.c:7842
+#: src/LYMainLoop.c:7744
 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:7843
+#: src/LYMainLoop.c:7745
 msgid "      Exiting..."
 msgstr "      Konèím..."
 
-#: src/LYMainLoop.c:7886
+#: src/LYMainLoop.c:7788
 msgid "-more-"
 msgstr ""
 
 #. Enable scrolling.
-#: src/LYNews.c:203
+#: src/LYNews.c:187
 msgid "You will be posting to:"
 msgstr "Posíláte po¹tu na:"
 
@@ -4297,7 +4393,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:212
+#: src/LYNews.c:196
 msgid ""
 "\n"
 "\n"
@@ -4312,7 +4408,7 @@ msgstr ""
 #. *  document's title as the default if this is a
 #. *  followup rather than a new post. - FM
 #.
-#: src/LYNews.c:230
+#: src/LYNews.c:214
 msgid ""
 "\n"
 "\n"
@@ -4322,7 +4418,7 @@ msgstr ""
 "\n"
 "Zadejte pøedmìt zprávy\n"
 
-#: src/LYNews.c:322
+#: src/LYNews.c:303
 msgid ""
 "\n"
 "\n"
@@ -4335,7 +4431,7 @@ msgstr ""
 #.
 #. *  Use the built in line editior.
 #.
-#: src/LYNews.c:379
+#: src/LYNews.c:360
 msgid ""
 "\n"
 "\n"
@@ -4345,93 +4441,112 @@ msgstr ""
 "\n"
 "Zadejte text zprávy."
 
-#: src/LYNews.c:425
+#: src/LYNews.c:406
 msgid "Message has no original text!"
 msgstr "Zpráva neobsahuje ¾ádný pùvodní text!"
 
-#: src/LYOptions.c:743
+#: src/LYOptions.c:746
 msgid "review/edit B)ookmarks files"
 msgstr "zobrazit/editovat soubory se zálo¾kami B>"
 
-#: src/LYOptions.c:745
+#: src/LYOptions.c:748
 msgid "B)ookmark file: "
 msgstr "Soubor se zálo¾kami B>:"
 
-#: src/LYOptions.c:2507 src/LYOptions.c:2531
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr ""
 
-#: src/LYOptions.c:3208
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr ""
+
+#: src/LYOptions.c:3261
 msgid "General Preferences"
 msgstr "Osobní nastavení"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3212
+#: src/LYOptions.c:3265
 msgid "User mode"
 msgstr "U¾ivatelský re¾im"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3218
+#: src/LYOptions.c:3271
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3223
+#: src/LYOptions.c:3276
 msgid "Type of Search"
 msgstr ""
 
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3229
+#: src/LYOptions.c:3285
 msgid "Cookies"
 msgstr "Cookies"
 
-#: src/LYOptions.c:3243
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3247
+#: src/LYOptions.c:3316
 msgid "Keypad mode"
 msgstr "Re¾im numerické klávesnice"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3253
+#: src/LYOptions.c:3322
 msgid "Emacs keys"
 msgstr "Emacs klávesy"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3259
+#: src/LYOptions.c:3328
 msgid "VI keys"
 msgstr "VI klávesy"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3266
+#: src/LYOptions.c:3335
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3278
+#: src/LYOptions.c:3347
 msgid "Keyboard layout"
 msgstr ""
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3291
+#: src/LYOptions.c:3360
 msgid "Display and Character Set"
 msgstr "Místní znaková sada"
 
 #. ***************************************************************
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3295
+#: src/LYOptions.c:3364
 msgid "Display character set"
 msgstr "Místní znaková sada"
 
-#: src/LYOptions.c:3324
+#: src/LYOptions.c:3393
 msgid "Assumed document character set"
 msgstr "Pøedpokládaná znaková sada"
 
@@ -4440,202 +4555,219 @@ msgstr "Pøedpokládaná znaková sada"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3344
+#: src/LYOptions.c:3413
 msgid "CJK mode"
 msgstr "CJK re¾im"
 
-#: src/LYOptions.c:3346
+#: src/LYOptions.c:3415
 msgid "Raw 8-bit"
 msgstr "Pøímý 8bitový re¾im"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3354
+#: src/LYOptions.c:3423
 msgid "X Display"
 msgstr "X Display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3360
+#: src/LYOptions.c:3429
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:3366
+#: src/LYOptions.c:3435
 msgid "Show color"
 msgstr "Zobrazovat barvy"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3390
+#: src/LYOptions.c:3459
 msgid "Show cursor"
 msgstr "Zobrazovat kurzor"
 
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+#, fuzzy
+msgid "Show scrollbar"
+msgstr "Zobrazovat barvy"
+
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3396
+#: src/LYOptions.c:3473
 msgid "Popups for select fields"
 msgstr "Vyskakovací menu pro zvolená pole"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3403
+#: src/LYOptions.c:3479
 msgid "HTML error recovery"
 msgstr "Zotavení po chybách HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3410
+#: src/LYOptions.c:3485
 msgid "Show images"
 msgstr "Zobrazení obrázkù"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3424
+#: src/LYOptions.c:3499
 msgid "Verbose images"
 msgstr "Doslovné obrázky"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3432
+#: src/LYOptions.c:3507
 msgid "Headers Transferred to Remote Servers"
 msgstr "HTTP hlavièky"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3436
+#: src/LYOptions.c:3511
 msgid "Personal mail address"
 msgstr "Osobní adresa elektronické po¹ty"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3516
 msgid "Preferred document character set"
 msgstr "Upøednostòovaná znaková sada"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3446
+#: src/LYOptions.c:3521
 msgid "Preferred document language"
 msgstr "Upøednostòovaný jazyk dokumentu"
 
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3527
 msgid "User-Agent header"
 msgstr "Hlavièka 'User-Agent'"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3460
+#: src/LYOptions.c:3535
 msgid "Listing and Accessing Files"
 msgstr ""
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3464
+#: src/LYOptions.c:3539
 msgid "FTP sort criteria"
 msgstr "Øazení FTP adresáøù"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3471
+#: src/LYOptions.c:3546
 msgid "Local directory sort criteria"
 msgstr "Øazení lokálních adresáøù"
 
-#: src/LYOptions.c:3479
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+#, fuzzy
+msgid "Local directory sort order"
+msgstr "Øazení lokálních adresáøù"
+
+#: src/LYOptions.c:3561
 msgid "Show dot files"
 msgstr "Zobrazovat teèkové soubory"
 
-#: src/LYOptions.c:3487
+#: src/LYOptions.c:3569
 msgid "Execution links"
 msgstr "Spustitelné odkazy"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3507
+#: src/LYOptions.c:3589
 msgid "Show transfer rate"
 msgstr "Pøenos dat dokonèen"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3516
+#: src/LYOptions.c:3598
 msgid "Special Files and Screens"
 msgstr ""
 
-#: src/LYOptions.c:3521
+#: src/LYOptions.c:3603
 msgid "Multi-bookmarks"
 msgstr "Dìlené zálo¾ky"
 
-#: src/LYOptions.c:3529
+#: src/LYOptions.c:3611
 msgid "Review/edit Bookmarks files"
 msgstr "Editace podsouborù se zálo¾kami"
 
-#: src/LYOptions.c:3531
+#: src/LYOptions.c:3613
 msgid "Goto multi-bookmark menu"
 msgstr "Menu dìlených zálo¾ek"
 
-#: src/LYOptions.c:3533
+#: src/LYOptions.c:3615
 msgid "Bookmarks file"
 msgstr "Soubor se zálo¾kami"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3539
+#: src/LYOptions.c:3621
 msgid "Visited Pages"
 msgstr "Nav¹tívené odkazy"
 
-#: src/LYPrint.c:959
+#: src/LYOptions.c:3628
+#, fuzzy
+msgid "View the file "
+msgstr "Poslat soubor po¹tou"
+
+#: src/LYPrint.c:952
 msgid " Print job complete.\n"
 msgstr "Nahrávání dokonèeno.\n"
 
-#: src/LYPrint.c:1296
+#: src/LYPrint.c:1281
 msgid "Document:"
 msgstr "Dokument:"
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1282
 msgid "Number of lines:"
 msgstr "Poèet øádkù:"
 
-#: src/LYPrint.c:1298
+#: src/LYPrint.c:1283
 msgid "Number of pages:"
 msgstr "Poèet stran:"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "pages"
 msgstr "stran(y)"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "page"
 msgstr "strana"
 
-#: src/LYPrint.c:1300
+#: src/LYPrint.c:1285
 msgid "(approximately)"
 msgstr "(pøibli¾nì)"
 
-#: src/LYPrint.c:1305
+#: src/LYPrint.c:1290
 msgid "Some print functions have been disabled!"
 msgstr "Nìkteré funkce tisku byly vypnuty!"
 
-#: src/LYPrint.c:1309
+#: src/LYPrint.c:1294
 msgid "Standard print options:"
 msgstr "Standardní menu voleb tisku:"
 
-#: src/LYPrint.c:1310
+#: src/LYPrint.c:1295
 msgid "Print options:"
 msgstr "Menu voleb tisku:"
 
-#: src/LYPrint.c:1316
+#: src/LYPrint.c:1302
 msgid "Save to a local file"
 msgstr "Ulo¾it do místního souboru"
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1304
 msgid "Save to disk disabled"
 msgstr "Ukládání na disk je vypnuto"
 
-#: src/LYPrint.c:1324
+#: src/LYPrint.c:1311
 msgid "Mail the file"
 msgstr "Poslat soubor po¹tou"
 
-#: src/LYPrint.c:1330
+#: src/LYPrint.c:1318
 msgid "Print to the screen"
 msgstr "Vytisknout na obrazovku"
 
-#: src/LYPrint.c:1334
+#: src/LYPrint.c:1323
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Vytisknout na tiskárnu pøipojenou k va¹emu vt100 terminálu"
 
-#: src/LYReadCFG.c:340
+#: src/LYReadCFG.c:339
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
 "The line must be of the form:\n"
@@ -4649,76 +4781,76 @@ msgstr ""
 "Øádek musí být ve formátu:\n"
 "COLOR:CELÉ ÈÍSLO:POPØEDÍ:POZADÍ\n"
 
-#: src/LYReadCFG.c:353
+#: src/LYReadCFG.c:352
 msgid "Offending line:"
 msgstr "kritický øádek:"
 
-#: src/LYReadCFG.c:660
+#: src/LYReadCFG.c:638
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:667
+#: src/LYReadCFG.c:645
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "pøemapování klávesy\n"
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:666
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr ""
 
-#: src/LYReadCFG.c:715 src/LYReadCFG.c:728
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:733
+#: src/LYReadCFG.c:711
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:816
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr "Lynx: nelze spustit, soubor %s s pravidly CERN není dostupný\n"
 
-#: src/LYReadCFG.c:840
+#: src/LYReadCFG.c:818
 msgid "(no name)"
 msgstr "(¾ádné jméno)"
 
-#: src/LYReadCFG.c:1658
+#: src/LYReadCFG.c:1782
 #, 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:1660
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Poslední vlo¾ený soubor je '%s'.\n"
 
-#: src/LYReadCFG.c:1661
+#: src/LYReadCFG.c:1785
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "vlo¾ený z '%s'.\n"
 
-#: src/LYReadCFG.c:2116 src/LYReadCFG.c:2129 src/LYReadCFG.c:2165
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
 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:2117 src/LYReadCFG.c:2130
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
 msgid "Please read the distribution"
 msgstr "Pøeètìte si implicitní dodávaný s distribucí"
 
-#: src/LYReadCFG.c:2123 src/LYReadCFG.c:2133
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
 msgid "for more comments."
 msgstr "pro více informací."
 
-#: src/LYReadCFG.c:2147
+#: src/LYReadCFG.c:2244
 msgid "RELOAD THE CHANGES"
 msgstr "NAÈÍST ZMÌNY"
 
-#: src/LYReadCFG.c:2156
+#: src/LYReadCFG.c:2253
 msgid "Your primary configuration"
 msgstr "Va¹e primární konfigurace"
 
@@ -4794,7 +4926,7 @@ msgstr "Pøístupová práva "
 msgid "File that you are currently viewing"
 msgstr "Soubor, který si právì prohlí¾íte"
 
-#: src/LYShowInfo.c:266 src/LYShowInfo.c:375
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
 msgid "Linkname:"
 msgstr "Jméno odkazu:"
 
@@ -4834,79 +4966,79 @@ msgstr "Jazyk:"
 msgid "Post Data:"
 msgstr "Post Data:"
 
-#: src/LYShowInfo.c:331
+#: src/LYShowInfo.c:333
 msgid "Post Content Type:"
 msgstr "Post Content Type:"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:342
 msgid "Owner(s):"
 msgstr "Vlastníci:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "size:"
 msgstr "velikost:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "lines"
 msgstr "øádky"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:348
 msgid "mode:"
 msgstr "re¾im:"
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:350
 msgid "forms mode"
 msgstr "formuláøový re¾im"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "source"
 msgstr "zdroj"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "normal"
 msgstr "bì¾ný"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:353
 msgid ", safe"
 msgstr ", bezpeèný"
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:354
 msgid ", via internal link"
 msgstr ", vnitøní odkaz"
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:360
 msgid ", no-cache"
 msgstr ", no-cache"
 
-#: src/LYShowInfo.c:360
+#: src/LYShowInfo.c:362
 msgid ", ISMAP script"
 msgstr ", ISMAP skript"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:364
 msgid ", bookmark file"
 msgstr ", soubor zálo¾ek"
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:373
 msgid "Link that you currently have selected"
 msgstr "Odkaz, který jste právì zvolil"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:386
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:391
 msgid "Enctype:"
 msgstr "Typ kódování"
 
-#: src/LYShowInfo.c:401
+#: src/LYShowInfo.c:403
 msgid "(Form field)"
 msgstr "(Pole formuláøe)"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:418
 msgid "No Links on the current page"
 msgstr "Aktuální stránka neobsahuje ¾ádné odkazy"
 
-#: src/LYStyle.c:250
+#: src/LYStyle.c:278
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -4947,44 +5079,48 @@ msgstr "Pøesmìrování obsahuje \"~\"! Po¾adavek ignorován."
 msgid "Unable to upload file."
 msgstr "Soubor nelze poslat."
 
-#: src/LYUpload.c:214
+#: src/LYUpload.c:206
 msgid "Upload To:"
 msgstr "Poslat na:"
 
-#: src/LYUpload.c:215
+#: src/LYUpload.c:207
 msgid "Upload options:"
 msgstr "Menu voleb posílání:"
 
-#: src/LYUtils.c:3075
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2468
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3915
+#: src/LYUtils.c:3294
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:4217
+#: src/LYUtils.c:3595
 #, fuzzy
 msgid "unknown restriction"
 msgstr "neznámé pole èi odkaz"
 
-#: src/LYUtils.c:4248
+#: src/LYUtils.c:3626
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:4251
+#: src/LYUtils.c:3629
 msgid "Restrictions set:\n"
 msgstr "Popis:\n"
 
-#: src/LYUtils.c:5601
-msgid "Ignoring invalid HOME"
-msgstr "Ignoruji chybnou hodnotu HOME"
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr ""
 
-#: src/LYrcFile.c:20
+#: src/LYrcFile.c:21
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr ""
 
-#: src/LYrcFile.c:242
+#: src/LYrcFile.c:295
 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"
@@ -4996,7 +5132,7 @@ msgstr ""
 "ka¾dého cookie. Pøijetí ka¾dého cookie zapnete nastavením accept_all_cookies\n"
 "na \"TRUE\".\n"
 
-#: src/LYrcFile.c:249
+#: src/LYrcFile.c:302
 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"
@@ -5005,7 +5141,7 @@ msgstr ""
 "Volba bookmark_file udává jméno implicitního souboru se zálo¾kami, do kterého\n"
 "si u¾ivatel mù¾e ukládat odkazy pro pozdìj¹í pou¾ití.\n"
 
-#: src/LYrcFile.c:254
+#: src/LYrcFile.c:307
 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"
@@ -5015,7 +5151,7 @@ msgstr ""
 "spustí klávesou 's' èi '/' vyhledávání, bude toto brát ohled na velikost písmen.\n"
 "Tato volba je implicitnì vypnuta (\"off\").\n"
 
-#: src/LYrcFile.c:259
+#: src/LYrcFile.c:312
 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"
@@ -5028,7 +5164,7 @@ msgstr ""
 "mù¾ete zkusit jiné 8bitové kódování, èi pou¾ít 7bitové aproximace.\n"
 "Mo¾né znakové sady:\n"
 
-#: src/LYrcFile.c:266
+#: src/LYrcFile.c:319
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5041,7 +5177,7 @@ msgstr ""
 "je doména uvedena v obou seznamech, má cookie_reject_domains pøednost. Volba\n"
 "accept_all_cookies má vy¹¹í prioritu, ne¾ obì tyto volby.\n"
 
-#: src/LYrcFile.c:274
+#: src/LYrcFile.c:327
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/.lynx_cookies.\n"
@@ -5049,7 +5185,7 @@ msgstr ""
 "Volba cookie_file udává soubor, ve kterém se ukládají trvalé cookies.\n"
 "Implicitním nastavením je ~/.lynx_cookies.\n"
 
-#: src/LYrcFile.c:279
+#: src/LYrcFile.c:332
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5066,7 +5202,13 @@ msgstr ""
 "Doména s 'loose' ovìøováním bude moci nastavovat cookies s chybnou cestou\n"
 "èi doménovým atributem (implicitním nastavením je zeptat se u¾ivatele).\n"
 
-#: src/LYrcFile.c:292
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:351
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5078,7 +5220,7 @@ msgstr ""
 "vzájemné promíchání souborù s adresáøi. \"FILES_FIRST\" vypí¹e jako první\n"
 "soubory a \"DIRED_SUPPORT\" adresáøe.\n"
 
-#: src/LYrcFile.c:300
+#: src/LYrcFile.c:359
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5090,7 +5232,7 @@ msgstr ""
 "  ^B = vlevo   ^F = vpravo\n"
 "zapnuty.\n"
 
-#: src/LYrcFile.c:306
+#: src/LYrcFile.c:365
 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"
@@ -5102,7 +5244,7 @@ msgstr ""
 "povoleny z pøíkazové øádky, jsou úpravy souborù zakázány. Pro psaní dopisù\n"
 "bude pou¾it vestavìný editor.\n"
 
-#: src/LYrcFile.c:312
+#: src/LYrcFile.c:371
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5118,7 +5260,7 @@ msgstr ""
 "   BY_SIZE     -- øadí dle velikosti souboru\n"
 "   BY_DATE     -- øadí dle data souboru\n"
 
-#: src/LYrcFile.c:324
+#: src/LYrcFile.c:389
 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"
@@ -5144,7 +5286,7 @@ msgstr ""
 "\n"
 "Mo¾né re¾imy øádkového editoru:\n"
 
-#: src/LYrcFile.c:339
+#: src/LYrcFile.c:404
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5156,7 +5298,7 @@ msgstr ""
 "podsouborù zálo¾ek (ka¾dý odpovídá jednomu velkému písmeno anglické abecedy).\n"
 "Zaèíná se s \"multi_bookmarkB\", proto¾e 'A' je implicitní (viz vý¹e).\n"
 
-#: src/LYrcFile.c:345
+#: src/LYrcFile.c:410
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5174,7 +5316,7 @@ msgstr ""
 "Té¾ je mo¾né nechat toto pole prázdné, ale pak by nebylo zaèlenìno do vámi\n"
 "odeslaných komentáøù.\n"
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:419
 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"
@@ -5201,13 +5343,13 @@ msgstr ""
 "chybovou hlá¹ku. Mù¾e v¹ak také poslat dokument v jiné, ne¾ po¾adované\n"
 "znakové sadì.\n"
 
-#: src/LYrcFile.c:368
+#: src/LYrcFile.c:433
 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 it's default language.\n"
+"Otherwise, the server will send the file in its default language.\n"
 msgstr ""
 "Volba preferred_language udává, v kterých jazycích bude Lynx pøednostnì\n"
 "po¾adovat dokumenty od http serverù. Jazyk musí být zadán v MIME notaci (napø.\n"
@@ -5215,7 +5357,7 @@ msgstr ""
 "preference). Pokud bude dokument v tomto jazyce k dispozici, server jej za¹le.\n"
 "V opaèném pøípadì jej za¹le ve svém implicitním jazyce.\n"
 
-#: src/LYrcFile.c:377
+#: src/LYrcFile.c:442
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5238,7 +5380,7 @@ msgstr ""
 "           tehdy, jestli¾e soubory, které prohlí¾íte, pocházejí z dùvìryhodných\n"
 "           zdrojù.\n"
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:453
 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"
@@ -5267,7 +5409,7 @@ msgstr ""
 "           tehdy, jestli¾e soubory, které prohlí¾íte, pocházejí z dùvìryhodných\n"
 "           zdrojù.\n"
 
-#: src/LYrcFile.c:403
+#: src/LYrcFile.c:471
 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"
@@ -5285,7 +5427,7 @@ msgstr ""
 "na \"off\" zapne pou¾ívání pøepínacích tlaèítek. Implicitní nastavení mù¾e být\n"
 "potlaèeno pøepínaèem -popup.\n"
 
-#: src/LYrcFile.c:413
+#: src/LYrcFile.c:481
 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"
@@ -5317,7 +5459,7 @@ msgstr ""
 "v konfiguraèním menu (do nìj vstoupíte klávesou 'o'). Pokud je hodnota volby\n"
 "\"show color\" ulo¾ena, je pova¾ována za implicitní nastavení.\n"
 
-#: src/LYrcFile.c:430
+#: src/LYrcFile.c:498
 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"
@@ -5338,7 +5480,7 @@ msgstr ""
 "odkazu. Nastavení na \"off\" zapne 'schovávání' kurzoru. Implicitní nastavení\n"
 "mù¾e být potlaèeno pøepínaèem -show_cursor.\n"
 
-#: src/LYrcFile.c:441
+#: src/LYrcFile.c:509
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5352,7 +5494,7 @@ msgstr ""
 "a/nebo v userdefs.h a zároveò není vypnuta z pøíkazové øádky. Pokud je\n"
 "zobrazování skrytých souborù vypnuto, nebude je mo¾né z Lynxu ani vytváøet.\n"
 
-#: src/LYrcFile.c:452
+#: src/LYrcFile.c:520
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5373,7 +5515,7 @@ msgstr ""
 "prompt. Nastavení této volby na \"standard\" zpùsobí zobrazení menu bez\n"
 "ohledu na u¾ivatelský re¾im.\n"
 
-#: src/LYrcFile.c:464
+#: src/LYrcFile.c:533
 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"
@@ -5387,7 +5529,7 @@ msgstr ""
 "èásti obrazovky. Nastavení \"INTERMEDIATE\" vypne tuto nápovìdu a nastavení\n"
 "\"ADVANCED\" zpùsobí vypsání URL aktuálního odkazu v dolní èásti obrazovky.\n"
 
-#: src/LYrcFile.c:472
+#: src/LYrcFile.c:542
 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"
@@ -5397,7 +5539,7 @@ msgstr ""
 "souborù s obrázky místo [INLINE], [LINK] èi [IMAGE].\n"
 "Viz té¾ volbu VERBOSE_IMAGES v kynx.cfg.\n"
 
-#: src/LYrcFile.c:477
+#: src/LYrcFile.c:547
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5412,13 +5554,13 @@ msgstr ""
 "zapnuty.  Fungují pouze malá písmena.\n"
 "Velké 'H', 'J' a 'K zapínají nápovìdu, zkrácená URL a výpis klávesové mapy.\n"
 
-#: src/LYrcFile.c:485
+#: src/LYrcFile.c:555
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
 msgstr ""
 
-#: src/LYrcFile.c:693
+#: src/LYrcFile.c:772
 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"
@@ -5436,7 +5578,7 @@ msgstr ""
 "Èísla na hlavní klávesnici se budou chovat jako kurzorové klávesy bez ohledu\n"
 "na stav numlock.\n"
 
-#: src/LYrcFile.c:702
+#: src/LYrcFile.c:781
 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"
@@ -5445,7 +5587,7 @@ msgstr ""
 "odkazy budou viditelnì oèíslovány a èísla budou pou¾ita ke zvolení pøíslu¹ného\n"
 "odkazu.\n"
 
-#: src/LYrcFile.c:706
+#: src/LYrcFile.c:785
 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"
@@ -5462,7 +5604,7 @@ msgstr ""
 "zvolit polo¾ku napsáním jejího èísla i kdy¾ tato není viditelná na obrazovce.\n"
 "Seznamy odkazù a výstup pøíkazu 'list' jsou také èíslovány.\n"
 
-#: src/LYrcFile.c:715
+#: src/LYrcFile.c:794
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -5472,7 +5614,7 @@ msgstr ""
 "\"LINKS_ARE_NUMBERED\" a \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" vypadat jako\n"
 "po¹kozený.\n"
 
-#: src/LYrcFile.c:748
+#: src/LYrcFile.c:827
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -5494,3 +5636,12 @@ msgstr ""
 "celý pøepsán. Byl jste varován...\n"
 "V¹eobecný konfiguraèní soubor, který mo¾ná hledáte se normálnì jmenuje lynx.cfg\n"
 "a má jiný obsah a jiný formát. Není to tento soubor.\n"
+
+#~ msgid "create %s"
+#~ msgstr "vytvoøit %s"
+
+#~ msgid "Unable to open file management menu file."
+#~ msgstr "Nelze otevøít soubor s menu správce souborù."
+
+#~ msgid "Ignoring invalid HOME"
+#~ msgstr "Ignoruji chybnou hodnotu HOME"
diff --git a/gnu/usr.bin/lynx/po/da.po b/gnu/usr.bin/lynx/po/da.po
index bddf9002d93..671f74fb253 100644
--- a/gnu/usr.bin/lynx/po/da.po
+++ b/gnu/usr.bin/lynx/po/da.po
@@ -1,12 +1,12 @@
-# Dansk po-fil for Lynx Web-browseren
+# Dansk po-fil for netlæseren Lynx
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Morten Bo Johansen <mojo@image.dk>, 2000.
-#
+# Morten Bo Johansen <mojo@image.dk>, 2000-2003
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.4.pre2\n"
-"POT-Creation-Date: 2001-06-01 18:55-0400\n"
-"PO-Revision-Date: 2001-07-01 17:46+0200\n"
+"Project-Id-Version: lynx 2.8.5pre15\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-0500\n"
+"PO-Revision-Date: 2003-06-04 16:02+0200\n"
 "Last-Translator: Morten Bo Johansen <mojo@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 #. * Links to collections of alternate definitions, developed by the Lynx
 #. * User Community, are maintained in Lynx links:
 #. *
-#. *    http://www.trill-home.com/lynx.html
+#. *    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
@@ -35,1998 +35,2000 @@ msgstr ""
 #: LYMessages.c:29
 #, c-format
 msgid "Alert!: %s"
-msgstr "NB!: %s"
+msgstr "Advarsel!: %s"
 
 #: LYMessages.c:30
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: LYMessages.c:31 LYMessages.c:32
+#: LYMessages.c:31
 msgid "Are you sure you want to quit?"
-msgstr "Er du sikker på du vil afslutte?"
+msgstr "Afslut?"
 
-#: LYMessages.c:34 LYMessages.c:35
+#: LYMessages.c:33
 msgid "Really exit from Lynx?"
-msgstr "Virkelig forlade Lynx?"
+msgstr "Afslut Lynx?"
 
-#: LYMessages.c:37
+#: LYMessages.c:35
 msgid "Connection interrupted."
 msgstr "Forbindelse afbrudt."
 
-#: LYMessages.c:38
+#: LYMessages.c:36
 msgid "Data transfer interrupted."
 msgstr "Dataoverførsel afbrudt."
 
-#: LYMessages.c:39
+#: LYMessages.c:37
 msgid "Cancelled!!!"
 msgstr "Afbrudt!"
 
-#: LYMessages.c:40
+#: LYMessages.c:38
 msgid "Cancelling!"
 msgstr "Afbryder!"
 
-#: LYMessages.c:41
+#: LYMessages.c:39
 msgid "Excellent!!!"
-msgstr "Glimrende!"
+msgstr "Fint!"
 
-#: LYMessages.c:42
+#: LYMessages.c:40
 msgid "OK"
 msgstr "O.k."
 
-#: LYMessages.c:43
+#: LYMessages.c:41
 msgid "Done!"
 msgstr "Færdig!"
 
-#: LYMessages.c:44
+#: LYMessages.c:42
 msgid "Bad request!"
 msgstr "Forkert anmodning!"
 
-#: LYMessages.c:45
+#: LYMessages.c:43
 msgid "previous"
 msgstr "forrige"
 
-#: LYMessages.c:46
+#: LYMessages.c:44
 msgid "next screen"
 msgstr "næste skærmbillede"
 
-#: LYMessages.c:47
+#: LYMessages.c:45
 msgid "HELP!"
 msgstr "HJÆLP!"
 
-#: LYMessages.c:48
+#: LYMessages.c:46
 msgid ", help on "
 msgstr ", hjælp til "
 
 #. #define HELP
-#: LYMessages.c:50
+#: LYMessages.c:48
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr "Piletaster navigerer, '?' for hjælp', 'q' afslutter, '<-' går tilbage."
 
 #. #define MOREHELP
-#: LYMessages.c:52
+#: LYMessages.c:50
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
-msgstr "-- tast mellemrum for mere, piletaster navigerer, '?' for hjælp, 'q' afslutter."
+msgstr "- tast mellemrum for mere, piletaster navigerer, '?' for hjælp, 'q' afslutter."
 
-#: LYMessages.c:53
+#: LYMessages.c:51
 msgid "-- press space for next page --"
-msgstr "-- tast mellemrum for næste side --"
+msgstr "- tast mellemrum for næste side -"
 
-#: LYMessages.c:54
+#: LYMessages.c:52
 msgid "URL too long"
-msgstr "URL for lang"
+msgstr "Adresse for lang"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:60
+#: LYMessages.c:58
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr "(Tekstindtastningsfelt) inaktivt. Tast <retur> for at aktivere."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:60
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr "(Tekstområde) inaktivt. Tast <retur> for at aktivere."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:64
+#: LYMessages.c:62
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(Tekstområde) inaktivt. <Retur> aktiverer. (%s for editor)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:64
 msgid "(Form field) Inactive.  Use <return> to edit."
-msgstr "(Formularfelt) inaktivt. Tast <retur> for at aktivere."
+msgstr "(Formularfelt) Inaktivt. Tast <retur> for at aktivere."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:68
+#: LYMessages.c:66
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
-msgstr "(Formularfelt> inaktivt. <retur> aktiverer (%s for at indsende udenom cache)."
+msgstr "(Formularfelt> Inaktivt. <retur> aktiverer (%s for at indsende udenom cache)."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:68
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
-msgstr "(Formularfelt) inaktivt. Tast <retur> for at aktivere, to gange <retur> sender."
+msgstr ""
+"(Formularfelt) Inaktivt. Tast <retur> for at aktivere, to gange <retur> \n"
+"sender."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:72
+#: LYMessages.c:70
 msgid "(mailto form field) Inactive.  Press <return> to change."
-msgstr "(mailto-formularfelt) inaktivt. Tast <retur> for at aktivere."
+msgstr "(e-postformularfelt) Inaktivt. Tast <retur> for at aktivere."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:74
+#: LYMessages.c:72
 msgid "(Password entry field) Inactive.  Press <return> to activate."
-msgstr "(Indtastningsfelt til adgangskode) inaktivt. Tast <retur> for at aktivere."
+msgstr "(Indtastningsfelt til adgangskode) Inaktivt. Tast <retur> for at aktivere."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:77
+#: LYMessages.c:75
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
-msgstr "UKORRIGERBART filindgangsfelt. Brug pil OP/NED for at komme væk."
+msgstr "SKRIVEBESKYTTET filindtastningssfelt. Brug pil OP/NED for at komme væk."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:77
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Filindtastningsfelt) Anfør filnavn.  Brug pil OP/NED el. TAB for at komme væk."
+msgstr "(Filindtastningsfelt) Anfør filnavn. Pil OP/NED el. TAB forlader feltet."
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:81
+#: LYMessages.c:79
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Tekstindtastningsfelt) Indtast tekst.  Pil OP/NED el. TAB forlader feltet."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:83
+#: LYMessages.c:81
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
 msgstr "(Tekstområde) Indtast tekst. Pil OP/NED el. TAB forlader området."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:85
+#: LYMessages.c:83
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
-msgstr "(Tekstområde) Anfør tekst. Pil OP/NED el. TAB går væk (%s for editor)"
+msgstr "(Tekstområde) Anfør tekst. Pil OP/NED el. TAB forlader (%s for editor)"
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:87
+#: LYMessages.c:85
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
-msgstr "UKORRIGERBART formulartekstfelt. Pil OP/NED el. TAB forlader feltet."
+msgstr "SKRIVEBESKYTTET formulartekstfelt. Pil OP/NED el. TAB forlader feltet."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:87
 msgid "(Form field) Enter text.  Use <return> to submit."
-msgstr "(Formularfelt) indtast tekst. Tast <retur> for at indsende."
+msgstr "(Formularfelt) Indtast tekst. Tast <retur> for at indsende."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:91
+#: LYMessages.c:89
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
-msgstr "(Formularfelt) Anfør tekst. <retur> indsender (%s sender udenom cache)"
+msgstr "(Formularfelt) Anfør tekst. <Retur> indsender (%s sender udenom cache)"
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:93
+#: LYMessages.c:91
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
-msgstr "(Formularfelt) indtast tekst. <retur> indsender, pile/TAB forlader feltet."
+msgstr "(Formularfelt) Indtast tekst. <Retur> indsender, pile/TAB forlader feltet."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:95
+#: LYMessages.c:93
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
-msgstr "UKORRIGERBART formularfelt. Brug pil OP/NED el. TAB for at komme væk."
+msgstr "SKRIVEBESKYTTET formularfelt. Pil OP/NED el. TAB forlader feltet."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:97
+#: LYMessages.c:95
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
-msgstr "(mailto-formularfelt) Anfør tekst. <retur> indsender, piletaster forlader felt."
+msgstr "(e-postformularfelt) Anfør tekst. <Retur> indsender, piletaster forlader."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:99
+#: LYMessages.c:97
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
-msgstr "(mailto formularfelt) postning er ikke tilladt, så du kan ikke indsende."
+msgstr "(e-postformularfelt) Postsystem spærret, så du kan ikke indsende."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:99
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Indtastningsfelt til adgangskode) indtast tekst. Pil OP/NED forlader feltet."
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:101
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
-msgstr "UKORRIGERBAR adgangskodeformular.  Brug pil OP/NED el. TAB for at komme væk."
+msgstr "SKRIVEBESKYTTET adgangskodeformular. Pil OP/NED el. TAB forlader felt."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:103
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "(Afkrydsningsfelt)   Højrepil el. <retur> slår til/fra."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:105
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
-msgstr "UKORRIGERBAR afkrydsningsboks.  Brug pil OP/NED el. TAB for at komme væk."
+msgstr "SKRIVEBESKYTTET afkrydsningsboks. Pil OP/NED el. TAB forlader boks."
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:109
+#: LYMessages.c:107
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr "(Radioknap)  Brug højrepil eller <retur> for at (de)aktivere."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:111
+#: LYMessages.c:109
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
-msgstr "UKORRIGERBAR formular-radioknap. Brug pil OP/NED el. TAB for at komme væk."
+msgstr "SKRIVEBESKYTTET formular-radioknap. Pil OP/NED el. TAB forlader knap."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:113
+#: LYMessages.c:111
 msgid "Submit ('x' for no cache) to "
 msgstr "Indsend ('x' sender udenom cache) til "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:115
+#: LYMessages.c:113
 msgid "Submit to "
 msgstr "Indsend til "
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:117
+#: LYMessages.c:115
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr "(Formularindsendelsesknap) Højrepil el. <retur> sender ('x' sender u. cache)."
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:119
+#: LYMessages.c:117
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(Formularindsendelsesknap) Brug højrepil el. <retur> for at indesende."
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:121
+#: LYMessages.c:119
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
-msgstr "Ikke muligt at indesende formular. Brug pil OP/NED el. TAB for at komme væk."
+msgstr "UVIRKSOM formularindelsesknap. Pil OP/NED el. TAB forlader knap."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:123
+#: LYMessages.c:121
 msgid "Submit mailto form to "
-msgstr "Indsend mailto-formular til "
+msgstr "Indsend e-postformular til "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:125
+#: LYMessages.c:123
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
-msgstr "(mailto formularindsendelsesknap) Brug højrepil el. <retur> for at indsende."
+msgstr "(e-postformular-indsendelsesknap) Brug højrepil el. <retur> for at indsende."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:125
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
-msgstr "(mailto formularindsendelsesknap) Postsystem spærret, så du kan ikke sende."
+msgstr "(e-postformular-indsendelsesknap) Postsystem spærret, så du kan ikke sende."
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:127
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
-msgstr "(Formularrydningstast)   Højrepil el. <retur> nulstiller formularindhold."
+msgstr "(Formular-rydningstast) Højrepil el. <retur> nulstiller formularindhold."
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:129
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
-msgstr "UVIRKSOM formularrydningsknap. Brug pil OP/NED el. TAB for at komme væk."
+msgstr "UVIRKSOM formular-rydningsknap. Pil OP/NED el. TAB forlader knap."
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:131
 msgid "(Option list) Hit return and use arrow keys and return to select option."
 msgstr "(Valgmulighedsliste) Tast <retur> og brug pile for at vælge en indstilling."
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:133
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
 msgstr "(Valgliste) Tast <retur> og brug pile for at vælge en indstilling."
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:135
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
-msgstr "UKORRIGERBAR valgmulighedsliste. Brug retur el. pile for at gennemse el. forlade."
+msgstr "SKRIVEBESKYTTET valgmulighedsliste. Brug retur el. pile for at gennemse el. forlade."
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:137
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
-msgstr "UKORRIGERBAR Valgliste. Brug retur el. pile for at gennemse eller forlade."
+msgstr "SKRIVEBESKYTTET Valgliste. Brug retur el. pile for at gennemse eller forlade."
 
-#: LYMessages.c:140
+#: LYMessages.c:138
 msgid "Submitting form..."
 msgstr "Indsender formular..."
 
-#: LYMessages.c:141
+#: LYMessages.c:139
 msgid "Resetting form..."
-msgstr "Tømmer formular..."
+msgstr "Rydder formular..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:141
 msgid "Reloading document.  Any form entries will be lost!"
-msgstr "Genindlæser dokument. Alle formularens indtastninger går tabt!"
+msgstr "Genindlæser dokument. Alle formularens data går tabt!"
 
-#: LYMessages.c:144
+#: LYMessages.c:142
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Advarsel: Kan ikke omkode formulardata til tegnsæt %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:147
+#: LYMessages.c:145
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
-msgstr "(NORMALT LINK)   brug højrepil el. <retur> for at aktivere."
+msgstr "(NORMALT LINK) Brug højrepil el. <retur> for at aktivere."
 
-#: LYMessages.c:148
+#: LYMessages.c:146
 msgid "The resource requested is not available at this time."
 msgstr "Den facilitet du bad om er ikke tilgængelig i øjeblikket."
 
-#: LYMessages.c:149
+#: LYMessages.c:147
 msgid "Enter Lynx keystroke command: "
-msgstr "Indtast Lynx-kommando:"
+msgstr "Indtast Lynx-kommando: "
 
-#: LYMessages.c:150
+#: LYMessages.c:148
 msgid "Looking up "
-msgstr "Foretager opslag til "
+msgstr "Kontakter "
 
-#: LYMessages.c:151
+#: LYMessages.c:149
 #, c-format
 msgid "Getting %s"
 msgstr "Henter %s"
 
-#: LYMessages.c:152
+#: LYMessages.c:150
 #, c-format
 msgid "Skipping %s"
-msgstr "Springer over %s"
+msgstr "Springer %s over"
 
-#: LYMessages.c:153
+#: LYMessages.c:151
 #, c-format
 msgid "Using %s"
 msgstr "Bruger %s"
 
-#: LYMessages.c:154
+#: LYMessages.c:152
 #, c-format
 msgid "Illegal URL: %s"
-msgstr "Ugyldig URL: %s"
+msgstr "Ugyldig adresse: %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:153
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Forkert udformet adresse %s"
 
-#: LYMessages.c:156
+#: LYMessages.c:154
 #, c-format
 msgid "URL: %s"
-msgstr "URL: %s"
+msgstr "Adresse: %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:155
 msgid "Unable to access WWW file!!!"
-msgstr "Web-filen er ikke tilgængelig!!!"
+msgstr "Webfilen er ikke tilgængelig!"
 
-#: LYMessages.c:158
+#: LYMessages.c:156
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
-msgstr "Der kan søges i denne fortegnelse.  Brug %s for at søge."
+msgstr "Der kan søges i dette indeks.  Brug %s for at søge."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:160
+#: LYMessages.c:158
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
-msgstr "--Mere-- Dette er en søgbar fortegnelse. Brug %s for at søge."
+msgstr "--Mere-- Der kan søges i dette indeks. Brug %s for at søge."
 
-#: LYMessages.c:161
+#: LYMessages.c:159
 msgid "You have entered an invalid link number."
 msgstr "Det indtastede linknummer er ugyldigt."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:163
+#: LYMessages.c:161
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
-msgstr "Dokumentets kildetekst vises nu. '\\'  returnerer til gengivet version."
+msgstr "Nu vises dokumentets kildetekst. '\\'  returnerer til gengivet version."
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:165
+#: LYMessages.c:163
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
-msgstr "Piletaster: OP/NED navigerer. Højre følger et link; venstre går tilbage.\n"
+msgstr "  Piletaster: op/ned navigerer, højre følger et link, venstre går tilbage.  \n"
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:167
+#: LYMessages.c:165
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
-msgstr "H=hjælp O=opsætning P=udskriv M=startskærm Q=afslut /=søg [backspace]=historik \n"
+msgstr " H=hjælp O=opsætning P=udskriv M=startskærm Q=afslut /=søg [backspace]=historik \n"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:169
+#: LYMessages.c:167
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
-msgstr "O=øvr. kmd  H=hjælp  K=taster  G=gå til  P=print  M=st.skærm  O=opsætn. Q=afslut\n"
+msgstr "  O=øvr. kmd  H=hjælp  K=taster  G=gå til  P=print  M=st.skærm  O=opsætn. Q=afslut  \n"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:171
+#: LYMessages.c:169
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
-msgstr "O=andre kmd  B=tilb. E=rediger  D=hent ^R=genindl. ^W=ryd skærm  søg i dok: / \n"
+msgstr "  O=øvr. kmd  B=retur E=rediger  D=hent ^R=genindlæs ^W=ryd skærm  søg/dok: / \n"
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:173
+#: LYMessages.c:171
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
-msgstr "O=øvrige kmd  C=kommentar <backspace>=Hist.  Bogmærker: V=vis, A=tilføj F=fjern\n"
+msgstr "O=øvr. kmd  C=kommentar <backspace>=Hist. Bogmærker: V=vis, A=tilføj R=slet\n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:175
+#: LYMessages.c:173
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr "     Brug tastaturet til at indtaste tekst i feltet                   "
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:177
+#: LYMessages.c:175
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr "    Ctrl-U for at slette al tekst i feltet. [Backspace] sletter et tegn "
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:179
+#: LYMessages.c:177
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
-msgstr "    Ctrl-U sletter tekst i feltet, [Backspace] sletter et tegn   "
+msgstr "      Ctrl-U sletter tekst i feltet, [Backspace] sletter et tegn    "
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:181
+#: LYMessages.c:179
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
-msgstr "   %s sletter al tekst i feltet, [Backspace] sletter et tegn    "
+msgstr "    %s sletter al tekst i feltet, [Backspace] sletter et tegn    "
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:183
+#: LYMessages.c:181
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
-msgstr "     %s sletter tekst i feltet, [Backspace] sletter et tegn   "
+msgstr "     %s sletter tekst i feltet, [Backspace] sletter et tegn    "
 
 #. mailto
-#: LYMessages.c:186
+#: LYMessages.c:184
 msgid "Malformed mailto form submission!  Cancelled!"
-msgstr "Formateringsfejl i mailto-formular under afsendelse!  Afbryder!"
+msgstr "Formateringsfejl i e-post-formular under afsendelse!  Afbryder!"
 
-#: LYMessages.c:187
+#: LYMessages.c:185
 msgid "Warning!  Control codes in mail address replaced by ?"
-msgstr "Advarsel! kontrolkoder i postadressen erstattet af ?"
+msgstr "Advarsel! kontrolkoder i e-post-adressen erstattet af ?"
 
-#: LYMessages.c:188
+#: LYMessages.c:186
 msgid "Mail disallowed!  Cannot submit."
-msgstr "Postning er ikke tilladt! Kan ikke sende."
+msgstr "Sending ikke tilladt! Kan ikke sende."
 
-#: LYMessages.c:189
+#: LYMessages.c:187
 msgid "Mailto form submission failed!"
-msgstr "Indsendelse af mailto-formular slog fejl."
+msgstr "Indsendelse af e-post-formular slog fejl."
 
-#: LYMessages.c:190
+#: LYMessages.c:188
 msgid "Mailto form submission Cancelled!!!"
-msgstr "Indsendelse af mailto-formular afbrudt!!!"
+msgstr "Indsendelse af e-post-formular afbrudt!!!"
 
-#: LYMessages.c:191
+#: LYMessages.c:189
 msgid "Sending form content..."
 msgstr "Sender formularens indhold..."
 
-#: LYMessages.c:192
+#: LYMessages.c:190
 msgid "No email address is present in mailto URL!"
-msgstr "Mailto-url mangler en e-postadresse."
+msgstr "'mailto:-linket indeholder ingen e-post-adresse!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:194
+#: LYMessages.c:192
 msgid "Unable to open temporary file for mailto URL!"
-msgstr "Kan ikke åbne midlertidig fil for mailto-url!"
+msgstr "Kan ikke åbne midlertidig fil til 'mailto:'-adresse!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:196
+#: LYMessages.c:194
 msgid "Do you wish to include the original message?"
-msgstr "Vil du medsende den oprindelige meddelelse?"
+msgstr "Vil du medsende den omhandlede side?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:196
 msgid "Do you wish to include the preparsed source?"
-msgstr "Vil du medsende den forud analyserede HTML-kode?"
+msgstr "Vil du medsende HTML-koden?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:200
+#: LYMessages.c:198
 msgid "Spawning your selected editor to edit mail message"
 msgstr "Åbner din valgte editor for at skrive brev"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:202
+#: LYMessages.c:200
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr "Fejl ved åbning af editor, tjek valg af editor i opsætningsmenuen"
 
-#: LYMessages.c:203
+#: LYMessages.c:201
 msgid "Send this comment?"
 msgstr "Send denne kommentar?"
 
-#: LYMessages.c:204
+#: LYMessages.c:202
 msgid "Send this message?"
 msgstr "Send dette brev?"
 
-#: LYMessages.c:205
+#: LYMessages.c:203
 msgid "Sending your message..."
 msgstr "Sender dit brev..."
 
-#: LYMessages.c:206
+#: LYMessages.c:204
 msgid "Sending your comment:"
 msgstr "Sender din kommentar:"
 
 #. textarea
-#: LYMessages.c:209
+#: LYMessages.c:207
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "Ikke i et TEKSTOMRÅDE; kan ikke bruge en ekstern editor."
 
-#: LYMessages.c:210
+#: LYMessages.c:208
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "Ikke i et TEKSTOMRÅDE; kan ikke anvende kommando."
 
-#: LYMessages.c:213
+#: LYMessages.c:211
 msgid "file: ACTIONs are disallowed!"
-msgstr "fil: 'ACTIONs' er ikke tilladte!"
+msgstr "file: 'ACTIONs' er ikke tilladt!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:213
 msgid "file: URLs via served links are disallowed!"
-msgstr "fil: url'er via betjente links er ikke tilladte!"
+msgstr "file: adresser via betjente links er ikke tilladt!"
 
-#: LYMessages.c:216
+#: LYMessages.c:214
 msgid "Access to local files denied."
 msgstr "Adgang til lokale filer nægtet."
 
-#: LYMessages.c:217
+#: LYMessages.c:215
 msgid "file: URLs via bookmarks are disallowed!"
-msgstr "fil: url'er via bogmærker er ikke tilladt!"
+msgstr "file: Adresser via bogmærker er ikke tilladt!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:217
 msgid "This special URL is not allowed in external documents!"
-msgstr "Denne særlige url er ikke tilladt i eksterne dokumenter!"
+msgstr "Denne særlige adresse er ikke tilladt i eksterne dokumenter!"
 
-#: LYMessages.c:220
+#: LYMessages.c:218
 msgid "Press <return> to return to Lynx."
-msgstr "Tast <retur> for at komme tilbage til Lynx"
+msgstr "Tast <retur> for at komme tilbage til Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:221
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "Åbner DCL-delproces. Brug 'logout' for at returnere til Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:225
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "Tast EXIT for at returnere til Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:228
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr "Åbner din standardskal. Brug 'exit' for at komme tilbage til Lynx.\n"
 
-#: LYMessages.c:233
+#: LYMessages.c:231
 msgid "Spawning is currently disabled."
-msgstr "Åbning af eksterne programmer er ikke tilladt for øjeblikket."
+msgstr "Åbning af eksterne programmer er ikke tilladt i øjeblikket."
 
-#: LYMessages.c:234
+#: LYMessages.c:232
 msgid "The 'd'ownload command is currently disabled."
-msgstr "'d'ownload/hente-kommandoen er aktuelt sat ud af kraft."
+msgstr "'d'ownload-kommandoen er deaktiveret i øjeblikket."
 
-#: LYMessages.c:235
+#: LYMessages.c:233
 msgid "You cannot download an input field."
-msgstr "Kan ikke hente et indtastningsfelt."
+msgstr "Kan ikke hente et inddatafelt."
 
-#: LYMessages.c:236
+#: LYMessages.c:234
 msgid "Form has a mailto action!  Cannot download."
 msgstr "Formular indeholder en 'mailto-action'! Kan ikke hente."
 
-#: LYMessages.c:237
+#: LYMessages.c:235
 msgid "You cannot download a mailto: link."
-msgstr "Kan ikke hente et 'mailto:' link ."
+msgstr "Kan ikke hente et 'mailto:'-link ."
 
-#: LYMessages.c:238
+#: LYMessages.c:236
 msgid "You cannot download cookies."
 msgstr "Kan ikke hente cookier."
 
-#: LYMessages.c:239
+#: LYMessages.c:237
 msgid "You cannot download a printing option."
 msgstr "Kan ikke hente en printervalgmulighed."
 
-#: LYMessages.c:240
+#: LYMessages.c:238
 msgid "You cannot download an upload option."
 msgstr "Kan ikke hente en upload-valgmulighed."
 
-#: LYMessages.c:241
+#: LYMessages.c:239
 msgid "You cannot download an permit option."
-msgstr "Kan ikke hente en valgmulighed vedr. tilladelser."
+msgstr "Kan ikke hente en rettigheds-valgmulighed."
 
-#: LYMessages.c:242
+#: LYMessages.c:240
 msgid "This special URL cannot be downloaded!"
-msgstr "Denne særlige url kan ikke hentes!"
+msgstr "Denne særlige adresse kan ikke hentes!"
 
-#: LYMessages.c:243
+#: LYMessages.c:241
 msgid "Nothing to download."
 msgstr "Der er intet at hente."
 
-#: LYMessages.c:244
+#: LYMessages.c:242
 msgid "Trace ON!"
 msgstr "Sporing slået TIL!"
 
-#: LYMessages.c:245
+#: LYMessages.c:243
 msgid "Trace OFF!"
 msgstr "Sporing slået FRA!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:245
 msgid "Links will be included for all images!  Reloading..."
 msgstr "Links vil blive vist for alle billeder!  Genindlæser..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:247
 msgid "Standard image handling restored!  Reloading..."
-msgstr "Standard håndtering af billeder genoprettet!  Genindlæser..."
+msgstr "Standardhåndtering af billeder genoprettet!  Genindlæser..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:249
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr "\"Integrerede billeder uden ALT-tekst tildeles Pseudo_ALTs! Genindlæser.."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:251
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
-msgstr "Integrerede billeder uden ALT-tekst ignoreres!  Genindlæser..."
+msgstr "Integrerede billeder uden ALT-tekst ignoreres! Genindlæser..."
 
-#: LYMessages.c:254
+#: LYMessages.c:252
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Rå 8-bit eller CJK-tilstand slået FRA!  Genindlæser..."
 
-#: LYMessages.c:255
+#: LYMessages.c:253
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
-msgstr "Rå 8-bit el. CJK-tilstand slået TIL!  Genindlæser..."
+msgstr "Rå 8-bit el. CJK-tilstand slået TIL! Genindlæser..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:255
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "Send 'HEAD'-anmodning for D)okument, L)ink eller A)fbryd? (d,l,a): "
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:257
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "Send 'HEAD'-anmodning for D)okument, eller A)fbryd? (d,a): "
 
-#: LYMessages.c:260
+#: LYMessages.c:258
 msgid "Sorry, the document is not an http URL."
-msgstr "Beklager, dokumentet er ikke en http-url."
+msgstr "Beklager, dokumentet er ikke en http-adresse."
 
-#: LYMessages.c:261
+#: LYMessages.c:259
 msgid "Sorry, the link is not an http URL."
-msgstr "Beklager, linket er ikke en http-url."
+msgstr "Beklager, linket er ikke en http-adresse."
 
-#: LYMessages.c:262
+#: LYMessages.c:260
 msgid "Sorry, the ACTION for this form is disabled."
-msgstr "Beklager, 'ACTION' for denne formular kan ikke udføres (er slået fra)."
+msgstr "Beklager, 'ACTION' for denne formular er deaktiveret."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:262
 msgid "Sorry, the ACTION for this form is not an http URL."
-msgstr "Beklager, 'ACTION' for denne formular er ikke en http-url."
+msgstr "Beklager, 'ACTION' for denne formular er ikke en http-adresse."
 
-#: LYMessages.c:265
+#: LYMessages.c:263
 msgid "Not an http URL or form ACTION!"
-msgstr "Ikke en http-url eller 'form ACTION'!"
+msgstr "Ikke en http-adresse eller 'form ACTION'!"
 
-#: LYMessages.c:266
+#: LYMessages.c:264
 msgid "This special URL cannot be a form ACTION!"
-msgstr "Denne særlige url kan ikke være en formular-'ACTION'!"
+msgstr "Denne særlige adresse kan ikke være en formular-'ACTION'!"
 
-#: LYMessages.c:267
+#: LYMessages.c:265
 msgid "URL is not in starting realm!"
-msgstr "Url befinder sig ikke i begyndelsesområde!"
+msgstr "Adresse befinder sig ikke i begyndelsesområde!"
 
-#: LYMessages.c:268
+#: LYMessages.c:266
 msgid "News posting is disabled!"
-msgstr "Postning til nyhedsgrupper er sat ud af kraft!"
+msgstr "Sending til nyhedsgrupper er slået fra!"
 
-#: LYMessages.c:269
+#: LYMessages.c:267
 msgid "File management support is disabled!"
 msgstr "Filhåndteringsfunktioner er sat ud af kraft!"
 
-#: LYMessages.c:270
+#: LYMessages.c:268
 msgid "No jump file is currently available."
 msgstr "Ingen genvejsfil er tilgængelig i øjeblikket."
 
-#: LYMessages.c:271
+#: LYMessages.c:269
 msgid "Jump to (use '?' for list): "
 msgstr "Hop til (brug '?' for en liste): "
 
-#: LYMessages.c:272
+#: LYMessages.c:270
 msgid "Jumping to a shortcut URL is disallowed!"
-msgstr "Hopning til en genvejs-url er ikke tilladt!"
+msgstr "Hopning til en genvejsadresse er ikke tilladt!"
 
-#: LYMessages.c:273
+#: LYMessages.c:271
 msgid "Random URL is disallowed!  Use a shortcut."
-msgstr "Tilfældig url er ikke tilladt!  Brug en genvej."
+msgstr "Tilfældig adresse er ikke tilladt!  Brug en genvej."
 
-#: LYMessages.c:274
+#: LYMessages.c:272
 msgid "No random URLs have been used thus far."
-msgstr "Ingen tilfældige url'er er blevet brugt indtil videre."
+msgstr "Ingen tilfældige adresser er blevet brugt indtil videre."
 
-#: LYMessages.c:275
+#: LYMessages.c:273
 msgid "Bookmark features are currently disabled."
-msgstr "Bogmærkefaciliteter er aktuelt slået fra."
+msgstr "Bogmærkefaciliteter er slået fra p.t."
 
-#: LYMessages.c:276
+#: LYMessages.c:274
 msgid "Execution via bookmarks is disabled."
 msgstr "Programafvikling via bogmærker er slået fra."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:276
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "Bogmærkefil er ikke defineret. Brug %s for at se valgmuligheder."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:278
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
-msgstr "Kan ikke åbne midlertidig fil for at omdanne X-Mosaic bogmærker."
+msgstr "Kan ikke åbne midlertidig fil for at omdanne X-Mosaic-bogmærker."
 
-#: LYMessages.c:281
+#: LYMessages.c:279
 msgid "ERROR - unable to open bookmark file."
-msgstr "FEJL - kan ikke åbne fil med bogmærker."
+msgstr "FEJL - kan ikke åbne bogmærkefil."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:281
 msgid "Unable to open bookmark file for deletion of link."
-msgstr "Kan ikke åbne fil med bogmærker for at slette link."
+msgstr "Kan ikke åbne bogmærkefil for at slette link."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:283
 msgid "Unable to open scratch file for deletion of link."
 msgstr "Kan ikke åbne kladdefil for at slette link."
 
-#: LYMessages.c:287
+#: LYMessages.c:285
 msgid "Error renaming scratch file."
 msgstr "Fejl ved omdøbelse af kladdefil"
 
-#: LYMessages.c:289
+#: LYMessages.c:287
 msgid "Error renaming temporary file."
 msgstr "Fejl ved omdøbelse af midlertidig fil."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:289
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "Kan ikke kopiere midlertidig fil for at slette link."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:291
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "Kan ikke genåbne midlertidig fil for at slette link."
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:294
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "Link står ikke for sig selv på en enkelt linje i bogmærkefilen."
 
-#: LYMessages.c:297
+#: LYMessages.c:295
 msgid "Bookmark deletion failed."
 msgstr "Kunne ikke slette bogmærke."
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:297
 msgid "Bookmark files cannot be traversed (only http URLs)."
-msgstr "Bogmærkefiler kan ikke traverseres (kun http-url'er)."
+msgstr "Bogmærkefiler kan ikke traverseres (kun http-adresser)."
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:299
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "Kan ikke åbne bogmærkefil, brug 'a' for at gemme et link først."
 
-#: LYMessages.c:302
+#: LYMessages.c:300
 msgid "There are no links in this bookmark file!"
 msgstr "Der er ingen links i denne bogmærkefil!"
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:302
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr "Gem D)okument eller L)ink i bogmærkefil eller A)fbryd? (d,l,a): "
 
-#: LYMessages.c:305
+#: LYMessages.c:303
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "Gem D)okument i bogmærkefil eller A)fbryd? (d,a): "
 
-#: LYMessages.c:306
+#: LYMessages.c:304
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "Gem L)ink i bogmærkefil eller A)fbryd? (l,a): "
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:308
+#: LYMessages.c:306
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr "Formulardokumenter med 'POST'-indhold kan ikke gemmes som bogmærker."
 
-#: LYMessages.c:309
+#: LYMessages.c:307
 msgid "Cannot save form fields/links"
 msgstr "Kan ikke gemme formularfelter/-links"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:311
+#: LYMessages.c:309
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
-msgstr "Historik, vis-info, menu og listefiler kan ikke gemmes som bogmærker."
+msgstr "Historik-, vis-info-, menu- og listefiler kan ikke gemmes som bogmærker."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:313
+#: LYMessages.c:311
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Skal dette link virkelig slettes fra din bogmærkefil?"
 
-#: LYMessages.c:314
+#: LYMessages.c:312
 msgid "Malformed address."
 msgstr "Forkert udformet adresse."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:316
+#: LYMessages.c:314
 msgid "Historical comment parsing ON (Minimal is overridden)!"
-msgstr "Analyse af historikkommentar slået TIL (Minimal er tilsidesat)!"
+msgstr "Fortolkning af historikkommentar slået TIL (Minimal er tilsidesat)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:318
+#: LYMessages.c:316
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
-msgstr "Analyse af historikkommentar slået FRA (Minimal er virksom)!"
+msgstr "Fortolkning af historikkommentar slået FRA (Minimal er virksom)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:320
+#: LYMessages.c:318
 msgid "Historical comment parsing ON (Valid is overridden)!"
-msgstr "Analyse af historikkommentar slået TIL (Gyldig er tilsidesat)!"
+msgstr "Fortolkning af historikkommentar slået TIL (Gyldig er tilsidesat)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:322
+#: LYMessages.c:320
 msgid "Historical comment parsing OFF (Valid is in effect)!"
-msgstr "Analyse af historikkommentar slået FRA (Gyldig er virksom)!"
+msgstr "Fortolkning af historikkommentar slået FRA (Gyldig er virksom)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:324
+#: LYMessages.c:322
 msgid "Minimal comment parsing ON (and in effect)!"
-msgstr "Minimal kommentaranalyse slået TIL (og er virksom)!"
+msgstr "Minimal kommentarfortolkning slået TIL (og er virksom)!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:324
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
-msgstr "Minimal kommentaranalyse slået FRA (Gyldig er virksom)!"
+msgstr "Minimal kommentarfortolkning slået FRA (Gyldig er virksom)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:328
+#: LYMessages.c:326
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
-msgstr "Minimal kommentaranalyse slået TIL (men historik er virksom)!"
+msgstr "Minimal kommentarfortolkning slået TIL (men historik er virksom)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:330
+#: LYMessages.c:328
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
-msgstr "Minimal kommentaranalyse slået FRA (Historik er virksom)!"
+msgstr "Minimal kommentarfortolkning slået FRA (Historik er virksom)!"
 
-#: LYMessages.c:331
+#: LYMessages.c:329
 msgid "Soft double-quote parsing ON!"
 msgstr "\"Soft double-quote\"-analyse slået TIL!"
 
-#: LYMessages.c:332
+#: LYMessages.c:330
 msgid "Soft double-quote parsing OFF!"
 msgstr "\"Soft double-quote\"-analyse slået FRA!"
 
-#: LYMessages.c:333
+#: LYMessages.c:331
 msgid "Now using TagSoup parsing of HTML."
-msgstr "Bruger nu \"TagSoup\" til at analysere html."
+msgstr "Bruger nu \"TagSoup\" til at analysere HTML."
 
-#: LYMessages.c:334
+#: LYMessages.c:332
 msgid "Now using SortaSGML parsing of HTML!"
-msgstr "Bruger nu \"SortaSGML\" til at analysere html!"
+msgstr "Bruger nu \"SortaSGML\" til at analysere HTML!"
 
-#: LYMessages.c:335
+#: LYMessages.c:333
 msgid "You are already at the end of this document."
 msgstr "Du er allerede ved enden af dette dokument."
 
-#: LYMessages.c:336
+#: LYMessages.c:334
 msgid "You are already at the beginning of this document."
 msgstr "Du er allerede ved begyndelsen af dette dokument."
 
-#: LYMessages.c:337
+#: LYMessages.c:335
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "Du står allerede på side %d af dette dokument."
 
-#: LYMessages.c:338
+#: LYMessages.c:336
 #, c-format
 msgid "Link number %d already is current."
 msgstr "Linknummer %d er allerede det aktuelle."
 
-#: LYMessages.c:339
+#: LYMessages.c:337
 msgid "You are already at the first document"
 msgstr "Du står allerede på det første dokument"
 
-#: LYMessages.c:340
+#: LYMessages.c:338
 msgid "There are no links above this line of the document."
 msgstr "Der er ingen links over denne linje i dokumentet."
 
-#: LYMessages.c:341
+#: LYMessages.c:339
 msgid "There are no links below this line of the document."
 msgstr "Der er ingen links under denne linje i dokumentet."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:343
+#: LYMessages.c:341
 msgid "Maximum length reached!  Delete text or move off field."
-msgstr "Største længde er nået!  Slet tekst eller forlad feltet."
+msgstr "Største længde er nået! Slet tekst eller forlad feltet."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:345
+#: LYMessages.c:343
 msgid "You are not on a form submission button or normal link."
 msgstr "Du står ikke på en formularindsendelsesknap eller et normalt link."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:347
+#: LYMessages.c:345
 msgid "One radio button must be checked at all times!"
-msgstr "En radioknap skal altid være markeret!"
+msgstr "Mindst en radioknap skal altid være markeret!"
 
-#: LYMessages.c:348
+#: LYMessages.c:346
 msgid "No submit button for this form, submit single text field?"
 msgstr "Ingen indsendelsesknap til denne formular, indsend et enkelt tekstfelt?"
 
-#: LYMessages.c:349
+#: LYMessages.c:347
 msgid "Do you want to go back to the previous document?"
 msgstr "Vil du returnere til det forrige dokument?"
 
-#: LYMessages.c:350
+#: LYMessages.c:348
 msgid "Use arrows or tab to move off of field."
 msgstr "Brug pile eller TAB for at forlade feltet."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:352
+#: LYMessages.c:350
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "Indtast tekst. Brug pile eller TAB for at forlade feltet."
 
-#: LYMessages.c:353
+#: LYMessages.c:351
 msgid "** Bad HTML!!  No form action defined. **"
-msgstr "** Dårlig html!  Ingen formular-'action' er defineret. **"
+msgstr "** Dårlig HTML! Ingen 'form action' er defineret. **"
 
-#: LYMessages.c:354
+#: LYMessages.c:352
 msgid "Bad HTML!!  Unable to create popup window!"
-msgstr "Dårlig HTML!!  Kan ikke oprette et pop op-vindue!"
+msgstr "Dårlig HTML!! Kan ikke lave et pop op-vindue!"
 
-#: LYMessages.c:355
+#: LYMessages.c:353
 msgid "Unable to create popup window!"
-msgstr "Kan ikke oprette et pop op-vindue!"
+msgstr "Kan ikke lave et pop op-vindue!"
 
-#: LYMessages.c:356
+#: LYMessages.c:354
 msgid "Goto a random URL is disallowed!"
-msgstr "Det er ikke tilladt et gå til en tilfældig url!"
+msgstr "Der er spærret for tilfældige adresser!"
 
-#: LYMessages.c:357
+#: LYMessages.c:355
 msgid "Goto a non-http URL is disallowed!"
-msgstr "Det er ikke tilladt at gå til en ikke-http-url!"
+msgstr "Der er spærret for ikke-http-adresser!"
 
-#: LYMessages.c:358
+#: LYMessages.c:356
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
-msgstr "Du må ikke tilgå \"%s\" url'er"
+msgstr "Der er spærret for \"%s\"-adresser"
 
-#: LYMessages.c:359
+#: LYMessages.c:357
 msgid "URL to open: "
-msgstr "Åbn en url: "
+msgstr "Åbn en side: "
 
-#: LYMessages.c:360
+#: LYMessages.c:358
 msgid "Edit the current Goto URL: "
-msgstr "Ret den aktuelle 'gå-til'-url : "
+msgstr "Ret den aktuelle adresse: "
 
-#: LYMessages.c:361
+#: LYMessages.c:359
 msgid "Edit the previous Goto URL: "
-msgstr "Ret den forrige 'gå-til'-url: "
+msgstr "Ret den forrige adresse: "
 
-#: LYMessages.c:362
+#: LYMessages.c:360
 msgid "Edit a previous Goto URL: "
-msgstr "Ret en foregående 'gå-til'-url: "
+msgstr "Ret en foregående adresse: "
 
-#: LYMessages.c:363
+#: LYMessages.c:361
 msgid "Current document has POST data."
-msgstr "Aktuelle dokument har 'POST'-data."
+msgstr "Dette dokument har 'POST'-data."
 
-#: LYMessages.c:364
+#: LYMessages.c:362
 msgid "Edit this document's URL: "
-msgstr "Ret dette dokuments url: "
+msgstr "Ret dette dokuments adresse: "
 
-#: LYMessages.c:365
+#: LYMessages.c:363
 msgid "Edit the current link's URL: "
-msgstr "Ret url på det aktuelle link: "
+msgstr "Ret adresse på det aktuelle link: "
 
-#: LYMessages.c:366
+#: LYMessages.c:364
 msgid "You cannot edit File Management URLs"
-msgstr "Du kan ikke rette i filhåndterings-url'er"
+msgstr "Du kan ikke rette i adresser til filhåndtering"
 
-#: LYMessages.c:367
+#: LYMessages.c:365
 msgid "Enter a database query: "
-msgstr "Indtast en database-forespørgsel: "
+msgstr "Indtast en databaseforespørgsel: "
 
-#: LYMessages.c:368
+#: LYMessages.c:366
 msgid "Enter a whereis query: "
 msgstr "Søg efter: "
 
-#: LYMessages.c:369
+#: LYMessages.c:367
 msgid "Edit the current query: "
 msgstr "Ret i søgemønster: "
 
-#: LYMessages.c:370
+#: LYMessages.c:368
 msgid "Edit the previous query: "
 msgstr "Ret forrige søgemønster: "
 
-#: LYMessages.c:371
+#: LYMessages.c:369
 msgid "Edit a previous query: "
 msgstr "Ret i et tidligere søgemønster: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:373
+#: LYMessages.c:371
 msgid "Use Control-R to resubmit the current query."
 msgstr "Brug Control-R for at genaktivere den aktuelle søgning."
 
-#: LYMessages.c:374
+#: LYMessages.c:372
 msgid "Edit the current shortcut: "
 msgstr "Rediger den aktuelle genvej: "
 
-#: LYMessages.c:375
+#: LYMessages.c:373
 msgid "Edit the previous shortcut: "
 msgstr "Rediger den foregående genvej: "
 
-#: LYMessages.c:376
+#: LYMessages.c:374
 msgid "Edit a previous shortcut: "
 msgstr "Rediger en foregående genvej: "
 
-#: LYMessages.c:377
+#: LYMessages.c:375
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "Tasten '%c' har ingen tildeling i genvejsfilen!"
 
-#: LYMessages.c:378
+#: LYMessages.c:376
 msgid "Cannot locate jump file!"
 msgstr "Kan ikke finde genvejsfilen!"
 
-#: LYMessages.c:379
+#: LYMessages.c:377
 msgid "Cannot open jump file!"
 msgstr "Kan ikke åbne genvejsfilen!"
 
-#: LYMessages.c:380
+#: LYMessages.c:378
 msgid "Error reading jump file!"
 msgstr "Fejl ved læsning af genvejsfil!"
 
-#: LYMessages.c:381
+#: LYMessages.c:379
 msgid "Out of memory reading jump file!"
 msgstr "Ikke nok hukommelse til læsning af genvejsfil!"
 
-#: LYMessages.c:382
+#: LYMessages.c:380
 msgid "Out of memory reading jump table!"
 msgstr "Ikke nok hukommelse til læsning af genvejstabel!"
 
-#: LYMessages.c:383
+#: LYMessages.c:381
 msgid "No index is currently available."
-msgstr "Ingen fortegnelse er tilgængelig i øjeblikket."
+msgstr "Intet indeks er tilgængeligt i øjeblikket."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:385
+#: LYMessages.c:383
 msgid "Do you really want to go to the Main screen?"
 msgstr "Vil du virkelig gå til startskærmen?"
 
-#: LYMessages.c:386
+#: LYMessages.c:384
 msgid "You are already at main screen!"
 msgstr "Du står allerede i startskærmen!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:388
+#: LYMessages.c:386
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
-msgstr "Ikke et søgbart, indekseret dokument -- tast '/' for at søge efter tekst"
+msgstr "Ikke et søgbart, indekseret dokument - tast '/' for at søge efter tekst"
 
 #. #define NO_OWNER
-#: LYMessages.c:390
+#: LYMessages.c:388
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "Denne fil har ingen ejer, så du kan ikke sende en kommentar"
 
-#: LYMessages.c:391
+#: LYMessages.c:389
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Ingen ejer er defineret. Brug %s?"
 
-#: LYMessages.c:392
+#: LYMessages.c:390
 msgid "Do you wish to send a comment?"
 msgstr "Vil du gerne sende en kommentar?"
 
-#: LYMessages.c:393
+#: LYMessages.c:391
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "Postsystemet er spærret, så du kan ikke sende en kommentar"
 
-#: LYMessages.c:394
+#: LYMessages.c:392
 msgid "The 'e'dit command is currently disabled."
 msgstr "'e'dit-kommandoen er slået fra i øjeblikket."
 
-#: LYMessages.c:395
+#: LYMessages.c:393
 msgid "External editing is currently disabled."
 msgstr "Ekstern redigering er slået fra i øjeblikket."
 
-#: LYMessages.c:396
+#: LYMessages.c:394
 msgid "System error - failure to get status."
 msgstr "Systemfejl - indhentning af status slog fejl."
 
-#: LYMessages.c:397
+#: LYMessages.c:395
 msgid "No editor is defined!"
 msgstr "Ingen editor er defineret!"
 
-#: LYMessages.c:398
+#: LYMessages.c:396
 msgid "The 'p'rint command is currently disabled."
 msgstr "'p'rint-kommandoen er slået fra i øjeblikket."
 
-#: LYMessages.c:399
+#: LYMessages.c:397
 msgid "Document has no Toolbar links or Banner."
 msgstr "Dokumentet har hverken værktøjsbjælke, links eller banner."
 
-#: LYMessages.c:400
+#: LYMessages.c:398
 msgid "Unable to open traversal file."
 msgstr "Kan ikke åbne traverseringsfil."
 
-#: LYMessages.c:401
+#: LYMessages.c:399
 msgid "Unable to open traversal found file."
 msgstr "Kan ikke åbne traversering-fundet-fil."
 
-#: LYMessages.c:402
+#: LYMessages.c:400
 msgid "Unable to open reject file."
 msgstr "Kan ikke åbne afvisningsfil."
 
-#: LYMessages.c:403
+#: LYMessages.c:401
 msgid "Unable to open traversal errors output file"
 msgstr "Kan ikke åbne fil med uddata fra traverseringsfejl"
 
-#: LYMessages.c:404
+#: LYMessages.c:402
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "TRAVERSERING BLEV AFBRUDT"
 
-#: LYMessages.c:405
+#: LYMessages.c:403
 msgid "Follow link (or goto link or page) number: "
 msgstr "Følg link, eller gå til link-/sidenummer: "
 
-#: LYMessages.c:406
+#: LYMessages.c:404
 msgid "Select option (or page) number: "
-msgstr "Vælg valgmuligheds- eller sidenummer:"
+msgstr "Vælg valgmuligheds- eller sidenummer: "
 
-#: LYMessages.c:407
+#: LYMessages.c:405
 #, c-format
 msgid "Option number %d already is current."
 msgstr "Valgmulighedsnummer %d er allerede aktuelt."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:409
+#: LYMessages.c:407
 msgid "You are already at the end of this option list."
 msgstr "Du er allerede ved enden af denne liste over valgmuligheder."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:411
+#: LYMessages.c:409
 msgid "You are already at the beginning of this option list."
 msgstr "Du er allerede ved begyndelsen af denne valgmulighedsliste."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:413
+#: LYMessages.c:411
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "Du er allerede ved side %d af denne valgmulighedsliste."
 
-#: LYMessages.c:414
+#: LYMessages.c:412
 msgid "You have entered an invalid option number."
 msgstr "Du har indtastet et ugyldigt nr. for valgmulighed."
 
-#: LYMessages.c:415
+#: LYMessages.c:413
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
-msgstr "** Dårlig html!!  Brug -sporing for at finde ud af, hvad der er galt. **"
+msgstr "** Dårlig HTML!!  Brug -trace (sporing) til diagnostik. **"
 
-#: LYMessages.c:416
+#: LYMessages.c:414
 msgid "Give name of file to save in"
-msgstr "Giv filen, som der skal gemmes i, et navn"
+msgstr "Giv filen, der skal gemmes i, et navn"
 
-#: LYMessages.c:417
+#: LYMessages.c:415
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "Kan ikke gemme data i fil -- kør venligst WWW lokalt"
 
-#: LYMessages.c:418
+#: LYMessages.c:416
 msgid "Can't open temporary file!"
 msgstr "Kan ikke åbne midlertidig fil!"
 
-#: LYMessages.c:419
+#: LYMessages.c:417
 msgid "Can't open output file!  Cancelling!"
-msgstr "Kan ikke åbne uddata-fil!  Afbryder!"
+msgstr "Kan ikke åbne uddatafil!  Afbryder!"
 
-#: LYMessages.c:420
+#: LYMessages.c:418
 msgid "Execution is disabled."
 msgstr "Eksekvering er slået fra."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:422
+#: LYMessages.c:420
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "Denne fil kan ikke eksekveres. Se opsætningsmenuen (brug %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:424
+#: LYMessages.c:422
 msgid "Execution capabilities are not compiled into this version."
 msgstr "Denne version er ikke oversat, så filer kan eksekveres."
 
-#: LYMessages.c:425
+#: LYMessages.c:423
 msgid "This file cannot be displayed on this terminal."
 msgstr "Denne fil kan ikke vises på denne terminal."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:427
+#: LYMessages.c:425
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "Filen kan ikke vises på denne terminal: D=hent, eller C=afbryd"
 
-#: LYMessages.c:428
+#: LYMessages.c:426
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D=hent, eller C=afbryd"
 
-#: LYMessages.c:429
+#: LYMessages.c:427
 msgid "Cancelling file."
 msgstr "Forkaster fil."
 
-#: LYMessages.c:430
+#: LYMessages.c:428
 msgid "Retrieving file.  - PLEASE WAIT -"
-msgstr "Henter fil.  - VENT VENLIGST -"
+msgstr "Henter fil ...vent venligst..."
 
-#: LYMessages.c:431
+#: LYMessages.c:429
 msgid "Enter a filename: "
-msgstr "Indtast et filnavn:"
+msgstr "Indtast et filnavn: "
 
-#: LYMessages.c:432
+#: LYMessages.c:430
 msgid "Edit the previous filename: "
 msgstr "Ret det foregående filnavn: "
 
-#: LYMessages.c:433
+#: LYMessages.c:431
 msgid "Edit a previous filename: "
 msgstr "Ret et foregående filnavn: "
 
-#: LYMessages.c:434
+#: LYMessages.c:432
 msgid "Enter a new filename: "
 msgstr "Indtast et nyt filnavn: "
 
-#: LYMessages.c:435
+#: LYMessages.c:433
 msgid "File name may not begin with a dot."
 msgstr "Filnavn må ikke begynde med et punktum."
 
-#: LYMessages.c:437
+#: LYMessages.c:435
 msgid "File exists.  Create higher version?"
-msgstr "Fil eksisterer.  Opret en nyere version?"
+msgstr "Fil eksisterer. Opret en nyere version?"
 
-#: LYMessages.c:439
+#: LYMessages.c:437
 msgid "File exists.  Overwrite?"
-msgstr "Fil eksisterer.  Overskriv?"
+msgstr "Fil eksisterer. Overskriv?"
 
-#: LYMessages.c:441
+#: LYMessages.c:439
 msgid "Cannot write to file."
 msgstr "Kan ikke skrive til fil."
 
-#: LYMessages.c:442
+#: LYMessages.c:440
 msgid "ERROR! - download command is misconfigured."
-msgstr "FEJL! - hente-kommando er sat forkert op."
+msgstr "FEJL! - download-kommando er sat forkert op."
 
-#: LYMessages.c:443
+#: LYMessages.c:441
 msgid "Unable to download file."
 msgstr "Kan ikke hente fil."
 
-#: LYMessages.c:444
+#: LYMessages.c:442
 msgid "Reading directory..."
 msgstr "Læser filkatalog..."
 
-#: LYMessages.c:445
+#: LYMessages.c:443
 msgid "Building directory listing..."
 msgstr "Laver fortegnelse over filer i filkatalog..."
 
-#: LYMessages.c:446
+#: LYMessages.c:444
 msgid "Saving..."
 msgstr "Gemmer..."
 
-#: LYMessages.c:447
+#: LYMessages.c:445
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Kunne ikke redigere fil '%s'."
 
-#: LYMessages.c:448
+#: LYMessages.c:446
 msgid "Unable to access document!"
 msgstr "Kan ikke tilgå dokument!"
 
-#: LYMessages.c:449
+#: LYMessages.c:447
 msgid "Could not access file."
 msgstr "Kunne ikke tilgå fil."
 
-#: LYMessages.c:450
+#: LYMessages.c:448
 msgid "Could not access directory."
 msgstr "Kunne ikke tilgå filkatalog."
 
-#: LYMessages.c:451
+#: LYMessages.c:449
 msgid "Could not load data."
 msgstr "Kunne ikke indlæse data."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:453
+#: LYMessages.c:451
 msgid "Lynx cannot currently (e)dit remote WWW files."
-msgstr "Lynx kan ikke (e)ditere eksterne webfiler for øjeblikket."
+msgstr "Lynx kan ikke r(e)digere eksterne webfiler i øjeblikket."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:455
+#: LYMessages.c:453
 msgid "This field cannot be (e)dited with an external editor."
-msgstr "Dette felt kan ikke (e)diteres med en ekstern editor."
+msgstr "Dette felt kan ikke r(e)digeres med en ekstern editor."
 
-#: LYMessages.c:456
+#: LYMessages.c:454
 msgid "Bad rule"
 msgstr "Forkert regel"
 
-#: LYMessages.c:457
+#: LYMessages.c:455
 msgid "Insufficient operands:"
 msgstr "Ikke nok operander:"
 
-#: LYMessages.c:458
+#: LYMessages.c:456
 msgid "You are not authorized to edit this file."
 msgstr "Du har ikke lov til at redigere denne fil."
 
-#: LYMessages.c:459
+#: LYMessages.c:457
 msgid "Title: "
-msgstr "Titel:"
+msgstr "Titel: "
 
-#: LYMessages.c:460
+#: LYMessages.c:458
 msgid "Subject: "
-msgstr "Emne:"
+msgstr "Emne: "
 
-#: LYMessages.c:461
+#: LYMessages.c:459
 msgid "Username: "
-msgstr "Brugernavn:"
+msgstr "Brugernavn: "
 
-#: LYMessages.c:462
+#: LYMessages.c:460
 msgid "Password: "
-msgstr "Adgangskode:"
+msgstr "Adgangskode: "
 
-#: LYMessages.c:463
+#: LYMessages.c:461
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: Brugernavn og adgangskode er påkrævet!"
 
-#: LYMessages.c:464
+#: LYMessages.c:462
 msgid "lynx: Password required!!!"
 msgstr "lynx: Adgangskode påkrævet!"
 
-#: LYMessages.c:465
+#: LYMessages.c:463
 msgid "Clear all authorization info for this session?"
 msgstr "Slet al autorisationsinfo for denne session?"
 
-#: LYMessages.c:466
+#: LYMessages.c:464
 msgid "Authorization info cleared."
 msgstr "Autorisationsinfo slettet."
 
-#: LYMessages.c:467
+#: LYMessages.c:465
 msgid "Authorization failed.  Retry?"
 msgstr "Autorisation slog fejl.  Prøv igen?"
 
-#: LYMessages.c:468
+#: LYMessages.c:466
 msgid "cgi support has been disabled."
 msgstr "cgi-understøttelse er slået fra."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:470
+#: LYMessages.c:468
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "Denne version er ikke oversat med lynxcgi."
 
-#: LYMessages.c:471
+#: LYMessages.c:469
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Beklager, ingen kendt metode til at omdanne %s til %s."
 
-#: LYMessages.c:472
+#: LYMessages.c:470
 msgid "Unable to set up connection."
 msgstr "Kan ikke oprette forbindelse."
 
-#: LYMessages.c:473
+#: LYMessages.c:471
 msgid "Unable to make connection"
-msgstr "Kan ikke foretage en forbindelse"
+msgstr "Kan ikke oprette forbindelse"
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:475
+#: LYMessages.c:473
 msgid "Executable link rejected due to malformed request."
-msgstr "Afviste at udføre link pga. af fejl i underliggende kommando."
+msgstr "Afviste at eksekvere link pga. af fejl i underliggende kommando."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:477
+#: LYMessages.c:475
 #, c-format
 msgid "Executable link rejected due to `%c' character."
-msgstr "Udførelse af link afvist pga. '%c'-tegn."
+msgstr "Eksekvering af link afvist pga. '%c'-tegn."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:477
 msgid "Executable link rejected due to relative path string ('../')."
-msgstr "Udførelse af link afvist, da stien er angivet relativt ('../')"
+msgstr "Eksekvering af link afvist, da stien er angivet relativt ('../')"
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:479
 msgid "Executable link rejected due to location or path."
-msgstr "Udførelse af link afvist pga. placering eller sti."
+msgstr "Eksekvering af link afvist pga. placering eller sti."
 
-#: LYMessages.c:482
+#: LYMessages.c:480
 msgid "Mail access is disabled!"
 msgstr "Postsystemet er spærret!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:484
+#: LYMessages.c:482
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Kun filer og servere på den lokale værtsmaskine kan tilgås."
 
-#: LYMessages.c:485
+#: LYMessages.c:483
 msgid "Telnet access is disabled!"
 msgstr "Adgang til Telnet er slået fra!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:487
+#: LYMessages.c:485
 msgid "Telnet port specifications are disabled."
 msgstr "Adgang til angivelser af Telnetporte er spærret."
 
-#: LYMessages.c:488
+#: LYMessages.c:486
 msgid "USENET news access is disabled!"
 msgstr "Adgang til USENET-nyhedsgrupper er slået fra!"
 
-#: LYMessages.c:489
+#: LYMessages.c:487
 msgid "Rlogin access is disabled!"
 msgstr "Rlogin-adgang er slået fra!"
 
-#: LYMessages.c:490
+#: LYMessages.c:488
 msgid "Ftp access is disabled!"
 msgstr "Ftp-adgang er slået fra!"
 
-#: LYMessages.c:491
+#: LYMessages.c:489
 msgid "There are no references from this document."
 msgstr "Der er ingen links i dette dokument."
 
-#: LYMessages.c:492
+#: LYMessages.c:490
 msgid "There are only hidden links from this document."
 msgstr "Der er kun skjulte links i dette dokument."
 
-#: LYMessages.c:494
+#: LYMessages.c:492
 msgid "Unable to open command file."
 msgstr "Ude af stand til at åbne kommandofil."
 
-#: LYMessages.c:496
+#: LYMessages.c:494
 msgid "News Post Cancelled!!!"
-msgstr "Postning til nyhedsgruppe afbrudt!!!"
+msgstr "Sending til nyhedsgruppe afbrudt!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:498
+#: LYMessages.c:496
 msgid "Spawning your selected editor to edit news message"
-msgstr "Skriver meddelelse til nyhedsgruppe med din valgte editor"
+msgstr "Skriver indlæg til nyhedsgruppe med din valgte editor"
 
-#: LYMessages.c:499
+#: LYMessages.c:497
 msgid "Post this message?"
-msgstr "Send denne meddelelse?"
+msgstr "Send dette indlæg?"
 
-#: LYMessages.c:500
+#: LYMessages.c:498
 #, c-format
 msgid "Append '%s'?"
 msgstr "Tilføj '%s'?"
 
-#: LYMessages.c:501
+#: LYMessages.c:499
 msgid "Posting to newsgroup(s)..."
-msgstr "Poster til nyhedsgruppe(r)..."
+msgstr "Sender til nyhedsgruppe(r)..."
 
-#: LYMessages.c:503
+#: LYMessages.c:501
 msgid "*** You have unread mail. ***"
 msgstr "*** Du har ulæst post. ***"
 
-#: LYMessages.c:505
+#: LYMessages.c:503
 msgid "*** You have mail. ***"
-msgstr "***  Du har post. ***  "
+msgstr "***  Du har post. ***"
 
-#: LYMessages.c:507
+#: LYMessages.c:505
 msgid "*** You have new mail. ***"
 msgstr "*** Du har ny post. ***"
 
-#: LYMessages.c:508
+#: LYMessages.c:506
 msgid "File insert cancelled!!!"
 msgstr "Indsætning af fil afbrudt!"
 
-#: LYMessages.c:509
+#: LYMessages.c:507
 msgid "Not enough memory for file!"
 msgstr "Ikke nok hukommelse til fil!"
 
-#: LYMessages.c:510
+#: LYMessages.c:508
 msgid "Can't open file for reading."
 msgstr "Kan ikke åbne fil for læsning."
 
-#: LYMessages.c:511
+#: LYMessages.c:509
 msgid "File does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: LYMessages.c:512
+#: LYMessages.c:510
 msgid "File does not exist - reenter or cancel:"
 msgstr "Fil eksisterer ikke - genindtast eller afbryd:"
 
-#: LYMessages.c:513
+#: LYMessages.c:511
 msgid "File is not readable."
 msgstr "Filen kan ikke læses."
 
-#: LYMessages.c:514
+#: LYMessages.c:512
 msgid "File is not readable - reenter or cancel:"
 msgstr "Fil kan ikke læses - genindtast eller afbryd:"
 
-#: LYMessages.c:515
+#: LYMessages.c:513
 msgid "Nothing to insert - file is 0-length."
 msgstr "Intet at indsætte - filens længde er nul."
 
-#: LYMessages.c:516
+#: LYMessages.c:514
 msgid "Save request cancelled!!!"
 msgstr "Du ville ikke gemme alligevel!"
 
-#: LYMessages.c:517
+#: LYMessages.c:515
 msgid "Mail request cancelled!!!"
 msgstr "Fortrød afsendelse af brev!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:519
+#: LYMessages.c:517
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
-msgstr "Betragter html-kode. Vil du gerne sende koden med post?"
+msgstr "Betragter nu HTML-kode. Vil du gerne sende koden med post?"
 
-#: LYMessages.c:520
+#: LYMessages.c:518
 msgid "Please wait..."
 msgstr "Vent venligst..."
 
-#: LYMessages.c:521
+#: LYMessages.c:519
 msgid "Mailing file.  Please wait..."
 msgstr "Sender fil. Vent venligst..."
 
-#: LYMessages.c:522
+#: LYMessages.c:520
 msgid "ERROR - Unable to mail file"
 msgstr "FEJL - kan ikke sende fil"
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:524
+#: LYMessages.c:522
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "Filen er %d skærmbilleder lang. Vil du gerne udskrive den?"
 
-#: LYMessages.c:525
+#: LYMessages.c:523
 msgid "Print request cancelled!!!"
 msgstr "Fortrød udskrivning!"
 
-#: LYMessages.c:526
+#: LYMessages.c:524
 msgid "Press <return> to begin: "
-msgstr "Tast <retur> for at begynde:"
+msgstr "Tast <retur> for at begynde: "
 
-#: LYMessages.c:527
+#: LYMessages.c:525
 msgid "Press <return> to finish: "
-msgstr "Tast <retur> for at afslutte:"
+msgstr "Tast <retur> for at afslutte: "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:527
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
-msgstr "Filen er %d sider lang. Er du sikker på, at du vil udskrive den?"
+msgstr "Filen er %d sider lang. Er du sikker på at du vil udskrive den?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:531
+#: LYMessages.c:529
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
-msgstr "Sørg for at din printer er tændt.  Tast <retur> for at udskrive:"
+msgstr "Sørg for at din printer er tændt. Tast <retur> for at udskrive:"
 
-#: LYMessages.c:532
+#: LYMessages.c:530
 msgid "ERROR - Unable to allocate file space!!!"
-msgstr "FEJL - kan ikke tildele plads til fil!!!"
+msgstr "FEJL - kan ikke finde plads til fil!"
 
-#: LYMessages.c:533
+#: LYMessages.c:531
 msgid "Unable to open tempfile"
 msgstr "Kan ikke åbne midlertidig fil"
 
-#: LYMessages.c:534
+#: LYMessages.c:532
 msgid "Unable to open print options file"
 msgstr "Kan ikke åbne fil med printerindstillinger"
 
-#: LYMessages.c:535
+#: LYMessages.c:533
 msgid "Printing file.  Please wait..."
-msgstr "Udskriver fil.  Vent venligst..."
+msgstr "Udskriver fil. Vent venligst..."
 
-#: LYMessages.c:536
+#: LYMessages.c:534
 msgid "Please enter a valid internet mail address: "
-msgstr "Indtast venligst en gyldig internet-postadresse:"
+msgstr "Indtast venligst en gyldig e-post-adresse: "
 
-#: LYMessages.c:537
+#: LYMessages.c:535
 msgid "ERROR! - printer is misconfigured!"
 msgstr "FEJL! - printeren er sat forkert op!"
 
-#: LYMessages.c:538
+#: LYMessages.c:536
 msgid "Image map from POST response not available!"
 msgstr "Kortbillede fra 'POST'-svar ikke tilgængeligt!"
 
-#: LYMessages.c:539
+#: LYMessages.c:537
 msgid "Misdirected client-side image MAP request!"
 msgstr "Fejldirigering på ønsket kortbillede fra klienten!"
 
-#: LYMessages.c:540
+#: LYMessages.c:538
 msgid "Client-side image MAP is not accessible!"
-msgstr "Kortbillede fra klienten er ikke tilgængeligt!"
+msgstr "Kortbillede fra klient er ikke tilgængeligt!"
 
-#: LYMessages.c:541
+#: LYMessages.c:539
 msgid "No client-side image MAPs are available!"
-msgstr "Ingen kortbilleder fra klienten er tilgængelige!"
+msgstr "Ingen kortbilleder fra klient er tilgængelige!"
 
-#: LYMessages.c:542
+#: LYMessages.c:540
 msgid "Client-side image MAP is not available!"
-msgstr "Kortbillede fra klienten er ikke tilgængeligt!"
+msgstr "Kortbillede fra klient er ikke tilgængeligt!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:545
+#: LYMessages.c:543
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "Skærmen skal have mindst 24 linjer til opsætningsmenuen!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:547
+#: LYMessages.c:545
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "Skærmen skal have mindst 23 linjer til opsætningsmenuen!"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:549
+#: LYMessages.c:547
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "Skærmen skal have mindst 22 linjer til opsætningsmenuen!"
 
-#: LYMessages.c:551
+#: LYMessages.c:549
 msgid "That key requires Advanced User mode."
-msgstr "Bruger-tilstand skal stå som avanceret for at bruge denne taste."
+msgstr "Brugertilstand skal stå som avanceret for at bruge denne taste."
 
-#: LYMessages.c:552
+#: LYMessages.c:550
 #, c-format
 msgid "Content-type: %s"
-msgstr "'Content-type:' %s"
+msgstr "Content-type: %s"
 
-#: LYMessages.c:553
+#: LYMessages.c:551
 msgid "Command: "
 msgstr "Kommando: "
 
-#: LYMessages.c:554
+#: LYMessages.c:552
 msgid "Unknown or ambiguous command"
 msgstr "Ukendt eller tvetydig kommando"
 
-#: LYMessages.c:555
+#: LYMessages.c:553
 msgid " Version "
-msgstr "Version "
+msgstr " Version "
 
-#: LYMessages.c:556
+#: LYMessages.c:554
 msgid " first"
 msgstr " første"
 
-#: LYMessages.c:557
+#: LYMessages.c:555
 msgid ", guessing..."
 msgstr ", gætter..."
 
-#: LYMessages.c:558
+#: LYMessages.c:556
 msgid "Permissions for "
 msgstr "Rettigheder for "
 
-#: LYMessages.c:559
+#: LYMessages.c:557
 msgid "Select "
 msgstr "Vælg "
 
-#: LYMessages.c:560
+#: LYMessages.c:558
 msgid "capital letter"
 msgstr "stort bogstav"
 
-#: LYMessages.c:561
+#: LYMessages.c:559
 msgid " of option line,"
 msgstr " på valgmulighedslinje."
 
-#: LYMessages.c:562
+#: LYMessages.c:560
 msgid " to save,"
 msgstr " for at gemme,"
 
-#: LYMessages.c:563
+#: LYMessages.c:561
 msgid " to "
 msgstr " til "
 
-#: LYMessages.c:564
+#: LYMessages.c:562
 msgid " or "
 msgstr " eller "
 
-#: LYMessages.c:565
+#: LYMessages.c:563
 msgid " index"
-msgstr " indeks "
+msgstr " indeks"
 
-#: LYMessages.c:566
+#: LYMessages.c:564
 msgid " to return to Lynx."
 msgstr " for at komme tilbage til Lynx."
 
-#: LYMessages.c:567
+#: LYMessages.c:565
 msgid "Accept Changes"
 msgstr "Godkend"
 
-#: LYMessages.c:568
+#: LYMessages.c:566
 msgid "Reset Changes"
 msgstr "Nulstil"
 
-#: LYMessages.c:569
+#: LYMessages.c:567
 msgid "Left Arrow cancels changes"
 msgstr "Venstre pil annullerer ændringer"
 
-#: LYMessages.c:570
+#: LYMessages.c:568
 msgid "Save options to disk"
 msgstr "Gem indstillinger på disk"
 
-#: LYMessages.c:571
+#: LYMessages.c:569
 msgid "Hit RETURN to accept entered data."
-msgstr "Tast RETUR for at godkende indtastede data."
+msgstr "Tast <retur> for at godkende indtastede data."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:573
+#: LYMessages.c:571
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
-msgstr "RETUR godkender indtastninger.  Slet data for at genskabe standarder."
+msgstr "<Retur> godkender indtastninger. Slet data for at genskabe standarder."
 
-#: LYMessages.c:574
+#: LYMessages.c:572
 msgid "Value accepted!"
 msgstr "Værdi godkendt!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:576
+#: LYMessages.c:574
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Værdi godkendt! -- ADVARSEL: Lynx er sat op til X WINDOW!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:578
+#: LYMessages.c:576
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Værdi godkendt! -- ADVARSEL: Lynx er IKKE sat op til X WINDOW!"
 
-#: LYMessages.c:579
+#: LYMessages.c:577
 msgid "You are not allowed to change which editor to use!"
 msgstr "Du har ikke lov til vælge en anden editor!"
 
-#: LYMessages.c:580
+#: LYMessages.c:578
 msgid "Failed to set DISPLAY variable!"
 msgstr "Det lykkedes ikke at sætte 'DISPLAY'-variablen!"
 
-#: LYMessages.c:581
+#: LYMessages.c:579
 msgid "Failed to clear DISPLAY variable!"
 msgstr "Det lykkedes ikke at slette 'DISPLAY'-variablen!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:583
+#: LYMessages.c:581
 msgid "You are not allowed to change the bookmark file!"
 msgstr "Du har ikke lov til at ændre bogmærkefilen!"
 
-#: LYMessages.c:584
+#: LYMessages.c:582
 msgid "Terminal does not support color"
 msgstr "Terminal understøtter ikke farve"
 
-#: LYMessages.c:585
+#: LYMessages.c:583
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "Din '%s' terminal understøtter ikke farver."
 
-#: LYMessages.c:586
+#: LYMessages.c:584
 msgid "Access to dot files is disabled!"
 msgstr "Adgang til punktumfiler er spærret!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:588
+#: LYMessages.c:586
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr "\"User-Agent\"-streng indeholder ikke \"Lynx\" eller \"L_y_n_x\""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:590
+#: LYMessages.c:588
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr "Brug \"L_y_n_x\" eller \"Lynx\" i \"User-Agent\" Ellers minder det om bevidst snyd!"
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:592
+#: LYMessages.c:590
 msgid "Changing of the User-Agent string is disabled!"
 msgstr "Mulighed for at ændre værdi af \"User-Agent\" er slået fra!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:594
+#: LYMessages.c:592
 msgid "You are not allowed to change this setting."
 msgstr "Du har ikke lov til at ændre denne indstilling."
 
-#: LYMessages.c:595
+#: LYMessages.c:593
 msgid "Saving Options..."
 msgstr "Gemmer indstillinger..."
 
-#: LYMessages.c:596
+#: LYMessages.c:594
 msgid "Options saved!"
 msgstr "Indstillinger gemt!"
 
-#: LYMessages.c:597
+#: LYMessages.c:595
 msgid "Unable to save Options!"
 msgstr "Kan ikke gemme indstillinger!"
 
-#: LYMessages.c:598
+#: LYMessages.c:596
 msgid " 'r' to return to Lynx "
-msgstr "'r' for at returnere til Lynx "
+msgstr " 'r' for at returnere til Lynx "
 
-#: LYMessages.c:599
+#: LYMessages.c:597
 msgid " '>' to save, or 'r' to return to Lynx "
-msgstr "'>' for at gemme, eller 'r' for at returnere til Lynx "
+msgstr " '>' for at gemme, eller 'r' for at returnere til Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:601
+#: LYMessages.c:599
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "Tryk enhver taste for at ændre værdi; RETUR accepterer."
 
-#: LYMessages.c:602
+#: LYMessages.c:600
 msgid "Error uncompressing temporary file!"
 msgstr "Fejl ved dekomprimering af midlertidig fil!"
 
-#: LYMessages.c:603
+#: LYMessages.c:601
 msgid "Unsupported URL scheme!"
-msgstr "Url-type ikke understøttet!"
+msgstr "Adressetype ikke understøttet!"
 
-#: LYMessages.c:604
+#: LYMessages.c:602
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
-msgstr "Data ikke understøttet: Url!  Brug 'SHOWINFO' indtil videre."
+msgstr "Data ikke understøttet: Adresse! Brug 'SHOWINFO' indtil videre."
 
-#: LYMessages.c:605
+#: LYMessages.c:603
 msgid "Redirection limit of 10 URL's reached."
-msgstr "Grænse for omdirigering på 10 url'er er nået."
+msgstr "Grænse for omdirigering på 10 adresser er nået."
 
-#: LYMessages.c:606
+#: LYMessages.c:604
 msgid "Illegal redirection URL received from server!"
-msgstr "Server sendte ugyldig url til omdirigering!"
+msgstr "Modtog ugyldig omdirigeringsadresse fra server!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:608
+#: LYMessages.c:606
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
-msgstr "Server spurgte efter %d omdirigering af 'POST'-indholdet til"
+msgstr "Server spurgte efter %d omdirigering af 'POST'-indhold til"
 
-#: LYMessages.c:611
+#: LYMessages.c:609
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P=fortsæt, brug G)et eller C=afbryd "
 
-#: LYMessages.c:612
+#: LYMessages.c:610
 msgid "P)roceed, or C)ancel "
 msgstr "P=fortsæt eller C=afbryd "
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:614
+#: LYMessages.c:612
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
-msgstr "Omdir. af 'POST'-indh.  P=forts, se U)rl, brug G)ET el. C=afbryd"
+msgstr "Omdir. af 'POST'-indhold: P=fortsæt, U=se URL, G=brug GET, C=afbryd"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:614
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
-msgstr "Omdir. af 'POST'-indhold.  P=fortsæt, se U)rl el. C=afbryd"
+msgstr "Omdir. af 'POST'-indhold: P=fortsæt, U=se URL, C=afbryd"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:618
+#: LYMessages.c:616
 msgid "Document from Form with POST content.  Resubmit?"
-msgstr "Dokument fra formular med 'POST'-indhold.  Genindsend?"
+msgstr "Dokument fra formular med 'POST'-indhold. Genindsend?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:620
+#: LYMessages.c:618
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Genindsend 'POST'-indhold til %s ?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:622
+#: LYMessages.c:620
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
-msgstr "Liste fra dokument med 'POST'-data.  Genindlæs %s ?"
+msgstr "Liste fra dokument med 'POST'-data. Genindlæs %s ?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:624
+#: LYMessages.c:622
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "Dokument fra 'POST action'. 'HEAD' forstås måske ikke.  Fortsæt?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:624
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
-msgstr "Formularindsendelses Action er POST. 'HEAD' forstås evt. ikke. Fortsæt?"
+msgstr "Formularindsendelse sker med 'POST'. 'HEAD' forstås evt. ikke. Fortsæt?"
 
-#: LYMessages.c:627
+#: LYMessages.c:625
 msgid "Proceed without a username and password?"
 msgstr "Fortsæt uden brugernavn og adgangskode?"
 
-#: LYMessages.c:628
+#: LYMessages.c:626
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Fortsæt (%s)?"
 
-#: LYMessages.c:629
+#: LYMessages.c:627
 msgid "Cannot POST to this host."
 msgstr "Kan ikke sende 'POST' til denne vært."
 
-#: LYMessages.c:630
+#: LYMessages.c:628
 msgid "POST not supported for this URL - ignoring POST data!"
-msgstr "Denne url understøtter ikke 'POST' - ignorerer 'POST'-data!"
+msgstr "'POST' ikke understøttet for denne adresse - ignorerer 'POST'-data!"
 
-#: LYMessages.c:631
+#: LYMessages.c:629
 msgid "Discarding POST data..."
 msgstr "Forkaster 'POST'-data..."
 
-#: LYMessages.c:632
+#: LYMessages.c:630
 msgid "Document will not be reloaded!"
 msgstr "Dokumentet vil ikke blive genindlæst!"
 
-#: LYMessages.c:633
+#: LYMessages.c:631
 msgid "Location: "
-msgstr "Sted: "
+msgstr "Placering: "
 
-#: LYMessages.c:634
+#: LYMessages.c:632
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' ikke fundet!"
 
-#: LYMessages.c:635
+#: LYMessages.c:633
 msgid "Default Bookmark File"
 msgstr "Standard bogmærkefil"
 
-#: LYMessages.c:636
+#: LYMessages.c:634
 msgid "Screen too small! (8x35 min)"
 msgstr "Skærm for lille! (min. 8x35)"
 
-#: LYMessages.c:637
+#: LYMessages.c:635
 msgid "Select destination or ^G to Cancel: "
 msgstr "Vælg bogmærkefil eller ^G for at afbryde: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:639
+#: LYMessages.c:637
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
-msgstr "Vælg underbogmærke, '=' for en menu eller ^G for at afbryde: "
+msgstr "Vælg underbogmærke: '=' for en menu eller ^G for at afbryde: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:641
+#: LYMessages.c:639
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "Genskab L)ink i denne bogmærkefil eller A)fbryd? (l,a): "
 
-#: LYMessages.c:642
+#: LYMessages.c:640
 msgid "Multiple bookmark support is not available."
 msgstr "Mulighed for flere bogmærkefiler er ikke tilgængelig."
 
-#: LYMessages.c:643
+#: LYMessages.c:641
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr " Vælg bogmærke (skærm %d af %d)"
 
-#: LYMessages.c:644
+#: LYMessages.c:642
 msgid "       Select Bookmark"
 msgstr "       Vælg Bogmærke"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:646
+#: LYMessages.c:644
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
-msgstr "Redigerer BESKRIVELSE og FILSTI for Bogmærker (%d af 2)"
+msgstr "Redigerer BESKRIVELSE og FILSTI for bogmærker (%d af 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:648
+#: LYMessages.c:646
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "         Redigerer BESKRIVELSE og FILSTI for Bogmærker"
 
-#: LYMessages.c:649
+#: LYMessages.c:647
 msgid "Letter: "
 msgstr "Bogstav: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:652
+#: LYMessages.c:650
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Brug en filsti udenfor dit hjemmekatalog i SKAL-syntaks!"
 
-#: LYMessages.c:654
+#: LYMessages.c:652
 msgid "Use a filepath off your home directory!"
 msgstr "Brug en filsti udenfor dit hjemmekatalog!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:657
+#: LYMessages.c:655
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Max. links/side overskredet! Gennemse ½ side el. 2 linjer ad gangen."
 
 #. #define MAXHIST_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:657
 msgid "History List maximum reached!  Document not pushed."
-msgstr "Kan ikke være flere linjer i historiklisten!  Dokument ikke skubbet ud."
+msgstr "Antal linjer i historikliste udtømt! Dokument ikke skubbet ud."
 
-#: LYMessages.c:660
+#: LYMessages.c:658
 msgid "No previously visited links available!"
 msgstr "Side med tidligere besøgte links er ikke tilgængelig!"
 
-#: LYMessages.c:661
+#: LYMessages.c:659
 msgid "Memory exhausted!  Program aborted!"
-msgstr "Hukommelse opbrugt!  Program afsluttedes!"
+msgstr "Hukommelse opbrugt! Program afsluttedes!"
 
-#: LYMessages.c:662
+#: LYMessages.c:660
 msgid "Memory exhausted!  Aborting..."
-msgstr "Hukommelse opbrugt!  Afslutter..."
+msgstr "Hukommelse opbrugt! Afslutter..."
 
-#: LYMessages.c:663
+#: LYMessages.c:661
 msgid "Not enough memory!"
 msgstr "Ikke nok hukommelse!"
 
-#: LYMessages.c:664
+#: LYMessages.c:662
 msgid "Directory/File Manager not available"
-msgstr "Filkatalog/filmanager er ikke tilgængelig"
+msgstr "Filkatalog/filhåndtering er ikke tilgængelig"
 
-#: LYMessages.c:665
+#: LYMessages.c:663
 msgid "HREF in BASE tag is not an absolute URL."
-msgstr "HREF i BASE-mærke er ikke en absolut URL."
+msgstr "HREF i BASE-mærke er ikke en absolut adresse."
 
-#: LYMessages.c:666
+#: LYMessages.c:664
 msgid "Location URL is not absolute."
-msgstr "\"Location URL\" er ikke absolut."
+msgstr "Placeringsadresse er ikke absolut."
 
-#: LYMessages.c:667
+#: LYMessages.c:665
 msgid "Refresh URL is not absolute."
-msgstr "\"Refresh URL\" er ikke absolut."
+msgstr "\"Refresh\"-adresse er ikke absolut."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:667
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2034,7 +2036,7 @@ msgstr ""
 "Du sender en meddelelse med indhold til:\n"
 "  "
 
-#: LYMessages.c:670
+#: LYMessages.c:668
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2042,7 +2044,7 @@ msgstr ""
 "Du sender en kommentar til:\n"
 "  "
 
-#: LYMessages.c:671
+#: LYMessages.c:669
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2052,7 +2054,7 @@ msgstr ""
 "Med kopi til:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:670
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2063,7 +2065,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:672
 msgid ""
 "\n"
 "\n"
@@ -2074,29 +2076,29 @@ msgstr ""
 "Brug Ctrl-G for at afbryde, hvis du ikke vil sende meddelelse\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:674
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
 msgstr ""
 "\n"
-"Indtast venligst dit navn eller undlad dette, hvis du vil være anonym\n"
+" Indtast venligst dit navn (eller lad være hvis du vil være anonym)\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:676
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
 msgstr ""
 "\n"
-"Anfør venligst en e-postadresse eller en anden\n"
+" Anfør venligst en e-post-adresse eller en anden\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:678
 msgid " means to contact you, if you desire a response.\n"
 msgstr " måde at kontakte dig på, hvis du ønsker et svar.\n"
 
-#: LYMessages.c:681
+#: LYMessages.c:679
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2105,317 +2107,317 @@ msgstr ""
 " Anfør venligst en emnelinje.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
 msgstr ""
 "\n"
-" Anfør en e-postadresse for en Cc af dit brev.\n"
+" Anfør en e-post-adresse for en Cc af dit brev.\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:682
 msgid " (Leave blank if you don't want a copy.)\n"
-msgstr " (undlad at udfylde, hvis du ikke vil have kopi.)\n"
+msgstr " (Undlad at udfylde, hvis du ikke vil have kopi.)\n"
 
-#: LYMessages.c:685
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please review the message body:\n"
 "\n"
 msgstr ""
 "\n"
-" Kig venligst brevets indhold igennem:\n"
+" Gennemse venligst brevets indhold:\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:684
 msgid ""
 "\n"
 "Press RETURN to continue: "
 msgstr ""
 "\n"
-"Tast RETUR for at fortsætte: "
+"Tast <retur> for at fortsætte: "
 
-#: LYMessages.c:687
+#: LYMessages.c:685
 msgid ""
 "\n"
 "Press RETURN to clean up: "
 msgstr ""
 "\n"
-"Tast RETUR for at rydde op: "
+"Tast <retur> for at rydde op: "
 
-#: LYMessages.c:688
+#: LYMessages.c:686
 msgid " Use Control-U to erase the default.\n"
-msgstr " Brug Control-U for at slette standarden.\n"
+msgstr " Brug Control-U for at slette det forvalgte.\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please enter your message below."
 msgstr ""
 "\n"
-"Skriv venligst dit brev nedenfor."
+" Skriv venligst dit brev nedenfor."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:380
+#: LYMessages.c:689 src/LYNews.c:361
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
 msgstr ""
 "\n"
-"Når du er færdig, så tast <retur> og sæt et enkelt punktum (.)"
+" 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:381
+#: LYMessages.c:691 src/LYNews.c:362
 msgid ""
 "\n"
 " on a line and press enter again."
 msgstr ""
 "\n"
-" på en linje og tast <retur> igen."
+" på en linje for sig selv og tast <retur> igen."
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:695
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "%s cookie: %.*s=%.*s  Tillad? (Y=ja/N=nej/A=Altid/V=aldrig)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:697
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Godkend ugyldigt cookiedomæne=%s for '%s'?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:699
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr "Godkend ugyldig cookiesti=%s som et præfiks for '%s'?"
 
-#: LYMessages.c:702
+#: LYMessages.c:700
 msgid "Allowing this cookie."
 msgstr "Tillader denne cookie."
 
-#: LYMessages.c:703
+#: LYMessages.c:701
 msgid "Rejecting this cookie."
 msgstr "Afviser denne cookie."
 
-#: LYMessages.c:704
+#: LYMessages.c:702
 msgid "The Cookie Jar is empty."
-msgstr "Cookiekrukken er tom."
+msgstr "Cookiebeholderen er tom."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:706
+#: LYMessages.c:704
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "Aktiver links for at slette cookier eller hele domæner,"
 
-#: LYMessages.c:707
+#: LYMessages.c:705
 msgid "or to change a domain's 'allow' setting."
-msgstr "eller for at ændre værdien for accept/afvisning af cookier fra et domæne."
+msgstr "eller for at ændre et domænes status."
 
-#: LYMessages.c:708
+#: LYMessages.c:706
 msgid "(Cookies never allowed.)"
 msgstr "(Cookier aldrig tilladt.)"
 
-#: LYMessages.c:709
+#: LYMessages.c:707
 msgid "(Cookies always allowed.)"
 msgstr "(Cookier altid tilladt.)"
 
-#: LYMessages.c:710
+#: LYMessages.c:708
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Cookier tilladt via prompt.)"
 
-#: LYMessages.c:711
+#: LYMessages.c:709
 msgid "(Persistent Cookies.)"
 msgstr "(Vedvarende cookier.)"
 
-#: LYMessages.c:712
+#: LYMessages.c:710
 msgid "(No title.)"
 msgstr "(Ingen titel.)"
 
-#: LYMessages.c:713
+#: LYMessages.c:711
 msgid "(No name.)"
 msgstr "(Ingen navn.)"
 
-#: LYMessages.c:714
+#: LYMessages.c:712
 msgid "(No value.)"
 msgstr "(Ingen værdi.)"
 
-#: LYMessages.c:715
+#: LYMessages.c:713
 msgid "None"
 msgstr "Ingen"
 
-#: LYMessages.c:716
+#: LYMessages.c:714
 msgid "(End of session.)"
 msgstr "(Slut på session.)"
 
-#: LYMessages.c:717
+#: LYMessages.c:715
 msgid "Delete this cookie?"
 msgstr "Slet denne cookie?"
 
-#: LYMessages.c:718
+#: LYMessages.c:716
 msgid "The cookie has been eaten!"
 msgstr "Cookier er blevet slettet!"
 
-#: LYMessages.c:719
+#: LYMessages.c:717
 msgid "Delete this empty domain?"
 msgstr "Slet dette tomme domæne?"
 
-#: LYMessages.c:720
+#: LYMessages.c:718
 msgid "The domain has been eaten!"
 msgstr "Domænet er blevet slettet!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:722
+#: LYMessages.c:720
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
-msgstr "D=slet domænes cookier, sæt tillad: A=altid/P=spørg/V=aldrig el. C=afbryd? "
+msgstr "D=slet domænes cookier, tillad: A=altid P=spørg V=aldrig C=afbryd? "
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:724
+#: LYMessages.c:722
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
-msgstr "D=slet domæne, sæt tillad: A=altid/P=spørg/V=aldrig el. C=afbryd? "
+msgstr "D=slet domæne, tillad: A=altid P=spørg V=aldrig C=afbryd? "
 
-#: LYMessages.c:725
+#: LYMessages.c:723
 msgid "All cookies in the domain have been eaten!"
 msgstr "Alle cookier i domænet er blevet slettet!"
 
-#: LYMessages.c:726
+#: LYMessages.c:724
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "Tillader 'A'ltid fra domæne '%s'."
 
-#: LYMessages.c:727
+#: LYMessages.c:725
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "Tillader aldrig(V) fra domæne '%s'."
 
-#: LYMessages.c:728
+#: LYMessages.c:726
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "'Spørger(P) om tilladelse fra domæne '%s'."
 
-#: LYMessages.c:729
+#: LYMessages.c:727
 msgid "Delete all cookies in this domain?"
 msgstr "Slet alle cookier under dette domæne?"
 
-#: LYMessages.c:730
+#: LYMessages.c:728
 msgid "All of the cookies in the jar have been eaten!"
-msgstr "Alle cookier i krukken er blevet slettet!"
+msgstr "Alle cookier i beholderen er blevet slettet!"
 
-#: LYMessages.c:732
+#: LYMessages.c:730
 msgid "Port 19 not permitted in URLs."
-msgstr "Port 19 er ikke tilladt i url'er."
+msgstr "Port 19 er ikke tilladt i adresser."
 
-#: LYMessages.c:733
+#: LYMessages.c:731
 msgid "Port 25 not permitted in URLs."
-msgstr "Port 25 er ikke tilladt i url'er."
+msgstr "Port 25 er ikke tilladt i adresser."
 
-#: LYMessages.c:734
+#: LYMessages.c:732
 #, c-format
 msgid "Port %lu not permitted in URLs."
-msgstr "Port %lu er ikke tilladt i url'er."
+msgstr "Port %lu er ikke tilladt i adresser."
 
-#: LYMessages.c:735
+#: LYMessages.c:733
 msgid "URL has a bad port field."
-msgstr "Url har et forkert portfelt."
+msgstr "Adresse har et forkert portfelt."
 
-#: LYMessages.c:736
+#: LYMessages.c:734
 msgid "Maximum nesting of HTML elements exceeded."
-msgstr "Øvre grænse for indlejring af html-elementer er overskredet."
+msgstr "Øvre grænse for indlejring af HTML-elementer er overskredet."
 
-#: LYMessages.c:737
+#: LYMessages.c:735
 msgid "Bad partial reference!  Stripping lead dots."
-msgstr "Forkert partiel reference!  Fjerner forreste punktummer."
+msgstr "Forkert delreference! Fjerner forreste punktummer."
 
-#: LYMessages.c:738
+#: LYMessages.c:736
 msgid "Trace Log open failed.  Trace off!"
-msgstr "Åbning af sporingslogfil mislykkedes.  Sporing slået fra!"
+msgstr "Åbning af sporingslogfil mislykkedes. Sporing slået fra!"
 
-#: LYMessages.c:739
+#: LYMessages.c:737
 msgid "Lynx Trace Log"
 msgstr "Lynx sporingslog"
 
-#: LYMessages.c:740
+#: LYMessages.c:738
 msgid "No trace log has been started for this session."
 msgstr "Ingen sporingslog er åbnet for denne session."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:742
+#: LYMessages.c:740
 msgid "The maximum temporary file count has been reached!"
 msgstr "Det maksimale antal midlertidige filer er nået!"
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:744
+#: LYMessages.c:742
 msgid "Form field value exceeds buffer length!  Trim the tail."
-msgstr "Formularfeltets værdi overstiger bufferlængde! Gør den kortere. "
+msgstr "Formularfeltets værdi overstiger bufferlængde! Gør den kortere."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:746
+#: LYMessages.c:744
 msgid "Modified tail combined with head of form field value."
 msgstr "Ændret \"hale\" kombineret med \"hoved\" i værdi for formularfelt."
 
 #. HTFile.c
-#: LYMessages.c:749
+#: LYMessages.c:747
 msgid "Directory"
 msgstr "Filkatalog"
 
-#: LYMessages.c:750
+#: LYMessages.c:748
 msgid "Directory browsing is not allowed."
 msgstr "Gennemsyn af filkatalog er ikke tilladt."
 
-#: LYMessages.c:751
+#: LYMessages.c:749
 msgid "Selective access is not enabled for this directory"
 msgstr "Selektiv adgang til dette filkatalog er ikke muliggjort"
 
-#: LYMessages.c:752
+#: LYMessages.c:750
 msgid "Multiformat: directory scan failed."
 msgstr "Multiformat: Skanning af filkatalog mislykkedes."
 
-#: LYMessages.c:753
+#: LYMessages.c:751
 msgid "This directory is not readable."
 msgstr "Dette filkatalog er ikke læsbart."
 
-#: LYMessages.c:754
+#: LYMessages.c:752
 msgid "Can't access requested file."
 msgstr "Kan ikke tilgå den ønskede fil."
 
-#: LYMessages.c:755
+#: LYMessages.c:753
 msgid "Could not find suitable representation for transmission."
 msgstr "Kunne ikke finde en passende repræsentation for overførsel."
 
-#: LYMessages.c:756
+#: LYMessages.c:754
 msgid "Could not open file for decompression!"
 msgstr "Kunne ikke åbne fil for dekomprimering!"
 
-#: LYMessages.c:757
+#: LYMessages.c:755
 msgid "Files:"
 msgstr "Filer:"
 
-#: LYMessages.c:758
+#: LYMessages.c:756
 msgid "Subdirectories:"
 msgstr "Underkataloger:"
 
-#: LYMessages.c:759
+#: LYMessages.c:757
 msgid " directory"
 msgstr " filkatalog"
 
-#: LYMessages.c:760
+#: LYMessages.c:758
 msgid "Up to "
 msgstr "Op til "
 
-#: LYMessages.c:761
+#: LYMessages.c:759
 msgid "Current directory is "
 msgstr "Aktuelle filkatalog er "
 
 #. HTGopher.c
-#: LYMessages.c:764
+#: LYMessages.c:762
 msgid "No response from server!"
 msgstr "Serveren svarede ikke!"
 
-#: LYMessages.c:765
+#: LYMessages.c:763
 msgid "CSO index"
 msgstr "CSO-indeks"
 
-#: LYMessages.c:766
+#: LYMessages.c:764
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2423,16 +2425,16 @@ msgstr ""
 "\n"
 "Dette er et søgbart indeks i en CSO-database.\n"
 
-#: LYMessages.c:767
+#: LYMessages.c:765
 msgid "CSO Search Results"
 msgstr "CSO søgeresultater"
 
-#: LYMessages.c:768
+#: LYMessages.c:766
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Søgning mislykkedes for %s\n"
 
-#: LYMessages.c:769
+#: LYMessages.c:767
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2440,7 +2442,7 @@ msgstr ""
 "\n"
 "Tryk på 's'-tasten og indtast nøgleord for søgning.\n"
 
-#: LYMessages.c:770
+#: LYMessages.c:768
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2448,35 +2450,35 @@ msgstr ""
 "\n"
 "Dette er et søgbart Gopher-indeks.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:769
 msgid "Gopher index"
 msgstr "Gopher-indeks"
 
-#: LYMessages.c:772
+#: LYMessages.c:770
 msgid "Gopher Menu"
 msgstr "Gopher-menu"
 
-#: LYMessages.c:773
+#: LYMessages.c:771
 msgid " Search Results"
 msgstr " Resultater af søgning"
 
-#: LYMessages.c:774
+#: LYMessages.c:772
 msgid "Sending CSO/PH request."
 msgstr "Sender CSO/PH-anmodning."
 
-#: LYMessages.c:775
+#: LYMessages.c:773
 msgid "Sending Gopher request."
 msgstr "Sender Gopher-anmodning."
 
-#: LYMessages.c:776
+#: LYMessages.c:774
 msgid "CSO/PH request sent; waiting for response."
 msgstr "CSO/PH-anmodning sendt; venter på svar."
 
-#: LYMessages.c:777
+#: LYMessages.c:775
 msgid "Gopher request sent; waiting for response."
 msgstr "Gopher-anmodning sendt; venter på svar."
 
-#: LYMessages.c:778
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2484,7 +2486,7 @@ msgstr ""
 "\n"
 "Indtast venligst nøgleord for søgning.\n"
 
-#: LYMessages.c:779
+#: LYMessages.c:777
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2492,305 +2494,313 @@ msgstr ""
 "\n"
 "De indtastede nøgleord vil lade dig søge på et"
 
-#: LYMessages.c:780
+#: LYMessages.c:778
 msgid " person's name in the database.\n"
 msgstr " personnavn i databasen.\n"
 
 #. HTNews.c
-#: LYMessages.c:783
+#: LYMessages.c:781
 msgid "Connection closed ???"
 msgstr "Forbindelsen lukket ???"
 
-#: LYMessages.c:784
+#: LYMessages.c:782
 msgid "Cannot open temporary file for news POST."
 msgstr "Kan ikke åbne midlertidig fil for postning til nyhedsgruppe."
 
-#: LYMessages.c:785
+#: LYMessages.c:783
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Postning til nyhedsgrupper med SSL kan ikke benyttes med denne klient."
 
 #. HTStyle.c
-#: LYMessages.c:788
+#: LYMessages.c:786
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Stil %d '%s' SGML:%s.  Font %s %.1f punkt.\n"
 
-#: LYMessages.c:789
+#: LYMessages.c:787
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "Indryk: først=%.0f andre=%.0f, Højde=%.1f Beskr=%.1f\n"
 
-#: LYMessages.c:790
+#: LYMessages.c:788
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "Juster=%d, %d tabs. (%.0f foran, %.0f efter)\n"
 
-#: LYMessages.c:791
+#: LYMessages.c:789
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
-msgstr "Tab type=%d ved %.0f\n"
+msgstr "\t\tTab kind=%d ved %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:794
+#: LYMessages.c:792
 msgid "Can't proceed without a username and password."
 msgstr "Kan ikke fortsætte uden et brugernavn og en adgangskode."
 
-#: LYMessages.c:795
+#: LYMessages.c:793
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
-msgstr "Kan ikke prøve igen med autorisation!  Kontakt serverens WebMaster."
+msgstr "Kan ikke prøve igen med autorisation! Kontakt serverens WebMaster."
 
-#: LYMessages.c:796
+#: LYMessages.c:794
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
-msgstr "Kan ikke prøve igen m. proxy-autorisation!  Kontakt serverens WebMaster."
+msgstr "Kan ikke genprøve m. godkendelse fra mellemvært! Kontakt serverens WebMaster."
 
-#: LYMessages.c:797
+#: LYMessages.c:795
 msgid "Retrying with proxy authorization information."
-msgstr "Prøver igen med proxy-godkendelsesinformation."
+msgstr "Prøver igen med godkendelsesinformation fra mellemvært."
 
 #. HTWAIS.c
-#: LYMessages.c:800
+#: LYMessages.c:798
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Retur-meddelelse er for stor."
 
-#: LYMessages.c:801
+#: LYMessages.c:799
 msgid "Enter WAIS query: "
-msgstr "Indtast WAIS-forespørgsel."
+msgstr "Indtast WAIS-forespørgsel: "
 
 #. Miscellaneous status
-#: LYMessages.c:804
+#: LYMessages.c:802
 msgid "Retrying as HTTP0 request."
 msgstr "Prøver igen med HTTP0 som anmodning."
 
-#: LYMessages.c:805
+#: LYMessages.c:803
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "Overført %d bytes"
 
-#: LYMessages.c:806
+#: LYMessages.c:804
 msgid "Data transfer complete"
 msgstr "Dataoverførsel fuldført"
 
-#: LYMessages.c:807
+#: LYMessages.c:805
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Fejl ved behandling af linje %d af %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:810
+#: LYMessages.c:808
 msgid "Address List Page"
-msgstr "Adresseliste"
+msgstr "Side med adresseliste"
 
-#: LYMessages.c:811
+#: LYMessages.c:809
 msgid "Bookmark file"
 msgstr "Bogmærkefil"
 
-#: LYMessages.c:812
+#: LYMessages.c:810
 msgid "Configuration Definitions"
 msgstr "Opsætningsdefinitioner"
 
-#: LYMessages.c:813
+#: LYMessages.c:811
 msgid "Cookie Jar"
-msgstr "Cookie-krukke"
+msgstr "Cookie-beholder"
 
-#: LYMessages.c:814
+#: LYMessages.c:812
 msgid "Current Key Map"
 msgstr "Aktuelle tastebindinger"
 
-#: LYMessages.c:815
+#: LYMessages.c:813
 msgid "File Management Options"
 msgstr "Valgmuligheder for filhåndtering"
 
-#: LYMessages.c:816
+#: LYMessages.c:814
 msgid "Download Options"
-msgstr "Valgmuligheder for hentning af filer"
+msgstr "Valgmuligheder for download af filer"
 
-#: LYMessages.c:817
+#: LYMessages.c:815
 msgid "History Page"
 msgstr "Historikside"
 
-#: LYMessages.c:818
+#: LYMessages.c:816
 msgid "List Page"
 msgstr "Oversigtsside"
 
-#: LYMessages.c:819
+#: LYMessages.c:817
 msgid "Lynx.cfg Information"
-msgstr "Lynx.cfg information"
+msgstr "Information om lynx.cfg"
 
-#: LYMessages.c:820
+#: LYMessages.c:818
 msgid "Converted Mosaic Hotlist"
 msgstr "Omdannet Mosaic-bogmærkefil"
 
-#: LYMessages.c:821
+#: LYMessages.c:819
 msgid "Options Menu"
 msgstr "Opsætningsmenu"
 
-#: LYMessages.c:822
+#: LYMessages.c:820
 msgid "File Permission Options"
 msgstr "Valgmuligheder for filrettigheder"
 
-#: LYMessages.c:823
+#: LYMessages.c:821
 msgid "Printing Options"
 msgstr "Valgmuligheder for udskrivning"
 
-#: LYMessages.c:824
+#: LYMessages.c:822
 msgid "Information about the current document"
 msgstr "Oplysninger om det aktuelle dokument"
 
-#: LYMessages.c:825
+#: LYMessages.c:823
 msgid "Your recent statusline messages"
 msgstr "De seneste meddelelser fra statuslinjen"
 
-#: LYMessages.c:826
+#: LYMessages.c:824
 msgid "Upload Options"
 msgstr "Valgmuligheder for uploads"
 
-#: LYMessages.c:827
+#: LYMessages.c:825
 msgid "Visited Links Page"
 msgstr "Oversigt over besøgte links"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:830
+#: LYMessages.c:828
 msgid "See also"
 msgstr "Se også"
 
-#: LYMessages.c:831
+#: LYMessages.c:829
 msgid "your"
 msgstr "din"
 
-#: LYMessages.c:832
+#: LYMessages.c:830
 msgid "for runtime options"
 msgstr "Valgmuligheder ved opstart"
 
-#: LYMessages.c:833
+#: LYMessages.c:831
 msgid "compile time options"
 msgstr "Valgmuligheder ved oversættelse (compile)"
 
-#: LYMessages.c:834
+#: LYMessages.c:832
+msgid "color-style configuration"
+msgstr "\"color-style\"-opsætning"
+
+#: LYMessages.c:833
 msgid "latest release"
 msgstr "seneste udgave"
 
-#: LYMessages.c:835
+#: LYMessages.c:834
 msgid "pre-release version"
-msgstr "pre-release version"
+msgstr "prøveversion udgave"
 
-#: LYMessages.c:836
+#: LYMessages.c:835
 msgid "development version"
 msgstr "udviklingsudgave"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:838
+#: LYMessages.c:837
 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 ""
-"Følgende data blev indhentet under den automatiske konfigureringsproces\n"
+"Følgende data blev indhentet under den automatiske opsætningsproces\n"
 "af denne kopi af Lynx.  Ved indrapportering af en programfejl, medsend da\n"
 "venligst en kopi af denne side."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:842
+#: LYMessages.c:841
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
 msgstr ""
-"Følgende data blev brugt som automatisk indstillede oversættelsesdefinitioner,\n"
+"Følgende data blev brugt som forvalgte oversættelsesdefinitioner,\n"
 "da denne kopi af Lynx blev lavet."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:847
+#: LYMessages.c:846
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
-msgstr "C=Opret D=Hent  E=rediger  F=fuld menu  M=ret  R=slet  T=marker  U=upload      \n"
+msgstr "  C=Opret D=Hent  E=rediger  F=fuld menu  M=ret  R=slet  T=marker  U=upload      \n"
 
-#: LYMessages.c:848
+#: LYMessages.c:847
 msgid "Failed to obtain status of current link!"
 msgstr "Kunne ikke fremskaffe status på aktuelle link!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:851
+#: LYMessages.c:850
 msgid "Special URL only valid from current File Permission menu!"
-msgstr "Særlig url er kun gyldig fra menu over aktuelle filrettigheder!"
+msgstr "Særlig adresse er kun gyldig fra menu over aktuelle filrettigheder!"
 
-#: LYMessages.c:855
+#: LYMessages.c:854
 msgid "External support is currently disabled."
 msgstr "Ekstern understøttelse er slået fra i øjeblikket."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:859
+#: LYMessages.c:858
 msgid "Changing working-directory is currently disabled."
 msgstr "Ændring af arbejdskatalog er sat ud af kraft i øjeblikket."
 
-#: LYMessages.c:860
+#: LYMessages.c:859
 msgid "Linewrap OFF!"
 msgstr "Linjeombrydning slået FRA!"
 
-#: LYMessages.c:861
+#: LYMessages.c:860
 msgid "Linewrap ON!"
 msgstr "Linjeombrydning slået TIL!"
 
-#: LYMessages.c:862
+#: LYMessages.c:861
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
-msgstr "Indlejrede tabeller fortolkes IKKE!  Genindlæser..."
+msgstr "Indlejrede tabeller fortolkes IKKE! Genindlæser..."
 
-#: LYMessages.c:863
+#: LYMessages.c:862
 msgid "Parsing nested-tables toggled ON!  Reloading..."
-msgstr "Indlejrede tabeller fortolkes!  Genindlæser..."
+msgstr "Indlejrede tabeller fortolkes! Genindlæser..."
 
-#: LYMessages.c:864
+#: LYMessages.c:863
 msgid "Shifting is disabled while line-wrap is in effect"
-msgstr "Panorering er slået fra, når linjeombrydning er virksom."
+msgstr "Panorering er slået fra, når linjeombrydning er aktiveret"
 
-#: LYMessages.c:865
+#: LYMessages.c:864
 msgid "Trace not supported"
 msgstr "Sporing ikke understøttet"
 
-#: WWW/Library/Implementation/HTAABrow.c:648
+#: WWW/Library/Implementation/HTAABrow.c:647
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "Brugernavn for '%s' på %s '%s%s':"
 
-#: WWW/Library/Implementation/HTAABrow.c:914
+#: WWW/Library/Implementation/HTAABrow.c:913
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
-msgstr "Denne klient ved ikke, hvordan proxy-autorisationsinfo for protokol skal dannes"
+msgstr "Denne klient kan ikke danne godkendelsesinfo for mellemvært"
 
-#: WWW/Library/Implementation/HTAABrow.c:989
+#: WWW/Library/Implementation/HTAABrow.c:988
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "Denne klient ved ikke, hvordan godkendelsesinfo for protokol skal dannes"
 
-#: WWW/Library/Implementation/HTAABrow.c:1097
+#: WWW/Library/Implementation/HTAABrow.c:1096
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Ugyldigt hoved '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1201
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
-msgstr "Proxy-godkendelse påkrævet - forsøger igen"
+msgstr "mellemværtsgodkendelse påkrævet - forsøger igen"
 
-#: WWW/Library/Implementation/HTAABrow.c:1260
+#: WWW/Library/Implementation/HTAABrow.c:1259
 msgid "Access without authorization denied -- retrying"
 msgstr "Adgang uden godkendelse nægtet - forsøger igen"
 
-#: WWW/Library/Implementation/HTAccess.c:683
+#: WWW/Library/Implementation/HTAccess.c:677
 msgid "Access forbidden by rule"
-msgstr "Adgang forbudt ved regel"
+msgstr "Adgang forbudt pr. regel"
 
-#: WWW/Library/Implementation/HTAccess.c:785
+#: WWW/Library/Implementation/HTAccess.c:779
 msgid "Document with POST content not found in cache.  Resubmit?"
-msgstr "Dokument med POST-indhold ikke fundet i cache.  Indsend igen?"
+msgstr "Dokument med 'POST'-indhold ikke fundet i cache. Genindsend?"
 
-#: WWW/Library/Implementation/HTAccess.c:1026 src/GridText.c:8039
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
 msgid "Loading incomplete."
 msgstr "Indlæsning ikke fuldført."
 
-#: WWW/Library/Implementation/HTAccess.c:1056
+#: WWW/Library/Implementation/HTAccess.c:1077
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
-msgstr "**** HTAccess: 'Socket-' el. filnr. returneret af forældet indlæsningsmetode!\n"
+msgstr "** HTAccess: 'socket-' el. filnr. returneret af forældet indlæsningsmetode!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1058
+#: WWW/Library/Implementation/HTAccess.c:1079
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
-msgstr "**** HTAccess: Intern softwarefejl. Rapporter venligst til lynx-dev@sig.net!\n"
+msgstr "**** HTAccess: Intern softwarefejl. Meld venligst til lynx-dev@sig.net!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1059
+#: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "**** HTAccess: Statustilbagemelding var: %d\n"
@@ -2799,66 +2809,66 @@ msgstr "**** HTAccess: Statustilbagemelding var: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7834
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
 msgid "Can't Access"
-msgstr "Har ikke adgang til"
+msgstr "Kan ikke tilgå"
 
-#: WWW/Library/Implementation/HTAccess.c:1073
+#: WWW/Library/Implementation/HTAccess.c:1094
 msgid "Unable to access document."
 msgstr "Kan ikke tilgå dokument."
 
-#: WWW/Library/Implementation/HTFTP.c:756
+#: WWW/Library/Implementation/HTFTP.c:766
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Indtast adgangskode for bruger %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:784
+#: WWW/Library/Implementation/HTFTP.c:794
 msgid "Unable to connect to FTP host."
-msgstr "Kan ikke forbinde til FTP-vært."
+msgstr "Kan ikke kontakte FTP-vært."
 
-#: WWW/Library/Implementation/HTFTP.c:1054
+#: WWW/Library/Implementation/HTFTP.c:1064
 msgid "close master socket"
-msgstr "luk hoved-\"socket\""
+msgstr "luk \"master-socket\""
 
-#: WWW/Library/Implementation/HTFTP.c:1116
+#: WWW/Library/Implementation/HTFTP.c:1126
 msgid "socket for master socket"
-msgstr "\"socket\" for hoved-\"socket\""
+msgstr "\"socket\" til \"master-socket\""
 
 #.
 #. **  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:1630 WWW/Library/Implementation/HTFTP.c:2251
+#: WWW/Library/Implementation/HTFTP.c:1640 WWW/Library/Implementation/HTFTP.c:2261
 msgid "Symbolic Link"
 msgstr "Symbolsk link"
 
-#: WWW/Library/Implementation/HTFTP.c:2612
+#: WWW/Library/Implementation/HTFTP.c:2622
 msgid "Receiving FTP directory."
 msgstr "FTP-filkatalog indlæses."
 
-#: WWW/Library/Implementation/HTFTP.c:2755
+#: WWW/Library/Implementation/HTFTP.c:2762
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "Overført %d bytes (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3083
 msgid "connect for data"
 msgstr "dataforbindelse åben"
 
-#: WWW/Library/Implementation/HTFTP.c:3690
+#: WWW/Library/Implementation/HTFTP.c:3731
 msgid "Receiving FTP file."
 msgstr "Modtager FTP-fil."
 
-#: WWW/Library/Implementation/HTFinger.c:275
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
-msgstr "Kunne ikke sætte en finger-forbindelse op."
+msgstr "Kunne ikke oprette finger-forbindelse."
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
-msgstr "Kunne ikke indlæse data (intet sitenavn i finger-url)"
+msgstr "Kunne ikke indlæse data (intet sitenavn i finger-adresse)"
 
-#: WWW/Library/Implementation/HTFinger.c:328
+#: WWW/Library/Implementation/HTFinger.c:331
 msgid "Invalid port number - will only use port 79!"
 msgstr "Ugyldigt portnummer - vil kun bruge port 79!"
 
@@ -2866,7 +2876,7 @@ msgstr "Ugyldigt portnummer - vil kun bruge port 79!"
 msgid "Could not access finger host."
 msgstr "Kunne ikke få adgang til finger-vært."
 
-#: WWW/Library/Implementation/HTFinger.c:407
+#: WWW/Library/Implementation/HTFinger.c:404
 msgid "No response from finger server."
 msgstr "Intet svar fra finger-server."
 
@@ -2886,18 +2896,18 @@ msgstr "Brugernavn:"
 #: WWW/Library/Implementation/HTNews.c:453
 #, c-format
 msgid "Password for news host '%s':"
-msgstr "Adgangskode for news-vært '%s':"
+msgstr "Adgangskode for nyhedsvært (news) '%s':"
 
 #: WWW/Library/Implementation/HTNews.c:536
 msgid "Change password?"
 msgstr "Skift adgangskode?"
 
-#: WWW/Library/Implementation/HTNews.c:1691
+#: WWW/Library/Implementation/HTNews.c:1690
 #, c-format
 msgid "No matches for: %s"
 msgstr "Ingen resultater for: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1744
+#: WWW/Library/Implementation/HTNews.c:1743
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2905,7 +2915,7 @@ msgstr ""
 "\n"
 "Ingen artikler i denne gruppe.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1757
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2916,16 +2926,16 @@ msgstr ""
 #.
 #. **	Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1770
+#: WWW/Library/Implementation/HTNews.c:1769
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Artikler %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1792
+#: WWW/Library/Implementation/HTNews.c:1791
 msgid "Earlier articles"
 msgstr "Tidligere artikler"
 
-#: WWW/Library/Implementation/HTNews.c:1805
+#: WWW/Library/Implementation/HTNews.c:1804
 #, c-format
 msgid ""
 "\n"
@@ -2935,41 +2945,41 @@ msgstr ""
 "\n"
 "Der er i øjeblikket ca. %d artikler i %s, ID'er som følger:\n"
 
-#: WWW/Library/Implementation/HTNews.c:1865
+#: WWW/Library/Implementation/HTNews.c:1864
 msgid "All available articles in "
 msgstr "Alle tilgængelige artikler i "
 
-#: WWW/Library/Implementation/HTNews.c:2081
+#: WWW/Library/Implementation/HTNews.c:2080
 msgid "Later articles"
 msgstr "Nyere artikler"
 
-#: WWW/Library/Implementation/HTNews.c:2105
+#: WWW/Library/Implementation/HTNews.c:2104
 msgid "Post to "
 msgstr "Post til "
 
-#: WWW/Library/Implementation/HTNews.c:2323
+#: WWW/Library/Implementation/HTNews.c:2322
 msgid "This client does not contain support for SNEWS URLs."
-msgstr "Denne klient kan ikke håndtere SNEWS url'er."
+msgstr "Denne klient kan ikke håndtere SNEWS adresser."
 
-#: WWW/Library/Implementation/HTNews.c:2531
+#: WWW/Library/Implementation/HTNews.c:2530
 msgid "No target for raw text!"
 msgstr "Intet mål for rå tekst!"
 
-#: WWW/Library/Implementation/HTNews.c:2561
+#: WWW/Library/Implementation/HTNews.c:2560
 msgid "Connecting to NewsHost ..."
-msgstr "Forbinder til nyhedsvært ..."
+msgstr "Kontakter nyhedsvært ..."
 
-#: WWW/Library/Implementation/HTNews.c:2612
+#: WWW/Library/Implementation/HTNews.c:2611
 #, c-format
 msgid "Could not access %s."
 msgstr "Kunne ikke tilgå %s."
 
-#: WWW/Library/Implementation/HTNews.c:2712
+#: WWW/Library/Implementation/HTNews.c:2711
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
-msgstr "Kan ikke læse nyhedsinfo.  Nyhedsvært %.20s svarede: %.200s"
+msgstr "Kan ikke læse nyhedsinfo. Nyhedsvært %.20s svarede: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2716
+#: WWW/Library/Implementation/HTNews.c:2715
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Kan ikke læse nyhedsinfo, tomt svar fra vært %s"
@@ -2977,34 +2987,34 @@ msgstr "Kan ikke læse nyhedsinfo, tomt svar fra vært %s"
 #.
 #. **	List available newsgroups. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2920
+#: WWW/Library/Implementation/HTNews.c:2919
 msgid "Reading list of available newsgroups."
-msgstr "Læser liste over tilgængelige nyhedsgrupper."
+msgstr "Indlæser liste over tilgængelige nyhedsgrupper.."
 
-#: WWW/Library/Implementation/HTNews.c:2942
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of articles in newsgroup."
-msgstr "Læser liste over artikler i nyhedsgruppe."
+msgstr "Indlæser liste over artikler i nyhedsgruppe.."
 
 #.
 #. **	Get an article from a news group. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2948
+#: WWW/Library/Implementation/HTNews.c:2947
 msgid "Reading news article."
-msgstr "Læser nyhedsartikel."
+msgstr "Læser nyhedsartikel.."
 
-#: WWW/Library/Implementation/HTNews.c:2978
+#: WWW/Library/Implementation/HTNews.c:2977
 msgid "Sorry, could not load requested news."
 msgstr "Beklager, kunne ikke indlæse artikler."
 
-#: WWW/Library/Implementation/HTTCP.c:1233
+#: WWW/Library/Implementation/HTTCP.c:1239
 msgid "Address has invalid port"
 msgstr "Adresse har en ugyldig port"
 
-#: WWW/Library/Implementation/HTTCP.c:1336
+#: WWW/Library/Implementation/HTTCP.c:1327
 msgid "Address length looks invalid"
 msgstr "Adresselængde forekommer ugyldig"
 
-#: WWW/Library/Implementation/HTTCP.c:1574 WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Ude af stand til at finde fremmed vært %s."
@@ -3013,62 +3023,85 @@ msgstr "Ude af stand til at finde fremmed vært %s."
 #. *  immediately; but not HTAlert, because typically
 #. *  there will be other alerts from the callers. - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1589 WWW/Library/Implementation/HTTelnet.c:103
+#: WWW/Library/Implementation/HTTCP.c:1575 WWW/Library/Implementation/HTTelnet.c:103
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ugyldigt værtsnavn %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1603
+#: WWW/Library/Implementation/HTTCP.c:1589
 #, c-format
 msgid "Making %s connection to %s"
-msgstr "Foretager %s-forbindelse til %s"
+msgstr "Opretter %s-forbindelse til %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1619
+#: WWW/Library/Implementation/HTTCP.c:1605
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "'socket' fejlede: familie %d adr. %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1628
+#: WWW/Library/Implementation/HTTCP.c:1614
 msgid "socket failed."
 msgstr "'socket' fejlede."
 
-#: WWW/Library/Implementation/HTTCP.c:1648
+#: WWW/Library/Implementation/HTTCP.c:1634
 msgid "Could not make connection non-blocking."
 msgstr "Kunne ikke oprette en ikke-blokerende forbindelse."
 
-#: WWW/Library/Implementation/HTTCP.c:1717
+#: WWW/Library/Implementation/HTTCP.c:1703
 msgid "Connection failed (too many retries)."
 msgstr "Forbindelse opgivet (for mange forsøg)."
 
-#: WWW/Library/Implementation/HTTCP.c:1910
+#: WWW/Library/Implementation/HTTCP.c:1896
 msgid "Could not restore socket to blocking."
 msgstr "Kunne ikke genformå \"socket\" til at blokere."
 
-#: WWW/Library/Implementation/HTTCP.c:1976
+#: WWW/Library/Implementation/HTTCP.c:1962
 msgid "Socket read failed for 180,000 tries."
 msgstr "'Socket'-læsning slog fejl for 180.000 forsøg."
 
-#: WWW/Library/Implementation/HTTP.c:466
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr "Adresse indeholder et brugernavn: %s"
+
+#: WWW/Library/Implementation/HTTP.c:503
 msgid "This client does not contain support for HTTPS URLs."
-msgstr "Denne klient kan ikke håndtere HTTPS-url'er."
+msgstr "Denne klient kan ikke håndtere https-adresser."
 
-#: WWW/Library/Implementation/HTTP.c:491
+#: WWW/Library/Implementation/HTTP.c:528
 msgid "Unable to connect to remote host."
 msgstr "Kan ikke forbinde til fremmed vært."
 
-#: WWW/Library/Implementation/HTTP.c:1005
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr "Forsøger at genetablere forbindelsen uden TLS."
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr "SSL-fejl: Kan ikke finde fælles navn i certifikat - fortsæt?"
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr "SSL fejl:vært(%s)!=cert(%s)-Fortsæt?"
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr "Sikker %d-bit %s (%s) http-forbindelse"
+
+#: WWW/Library/Implementation/HTTP.c:1091
 msgid "Sending HTTP request."
-msgstr "Sender HTTP-anmodning."
+msgstr "Sender http-anmodning."
 
-#: WWW/Library/Implementation/HTTP.c:1039
+#: WWW/Library/Implementation/HTTP.c:1125
 msgid "Unexpected network write error; connection aborted."
 msgstr "Uventet skrivningsfejl i netværk; forbindelse afbrudt."
 
-#: WWW/Library/Implementation/HTTP.c:1045
+#: WWW/Library/Implementation/HTTP.c:1131
 msgid "HTTP request sent; waiting for response."
-msgstr "HTTP-anmodning sendt; venter på svar."
+msgstr "Http-anmodning sendt; venter på svar."
 
-#: WWW/Library/Implementation/HTTP.c:1109
+#: WWW/Library/Implementation/HTTP.c:1195
 msgid "Unexpected network read error; connection aborted."
 msgstr "Uventet læsningsfejl i netværk; forbindelse afbrudt"
 
@@ -3082,7 +3115,7 @@ msgstr "Uventet læsningsfejl i netværk; forbindelse afbrudt"
 #. **	so we'll deal with them by showing the full
 #. **	header to the user as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1305
+#: WWW/Library/Implementation/HTTP.c:1391
 msgid "Got unexpected Informational Status."
 msgstr "Modtog uventet \"Informational Status\"."
 
@@ -3093,9 +3126,9 @@ msgstr "Modtog uventet \"Informational Status\"."
 #. *  user to do that, and restore the current
 #. *  document. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1340
+#: WWW/Library/Implementation/HTTP.c:1426
 msgid "Request fulfilled.  Reset Content."
-msgstr "Anmodning imødekommet.  Nulstil indhold."
+msgstr "Anmodning imødekommet. Nulstil indhold."
 
 #. Not Modified
 #.
@@ -3104,27 +3137,27 @@ msgstr "Anmodning imødekommet.  Nulstil indhold."
 #. *  with it by showing the full header to the user
 #. *  as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1459
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Modtog uventet 304 \"Not Modified status\"."
 
-#: WWW/Library/Implementation/HTTP.c:1526
+#: WWW/Library/Implementation/HTTP.c:1612
 msgid "Redirection of POST content requires user approval."
 msgstr "Omdirigering af 'POST'-indhold kræver brugers godkendelse."
 
-#: WWW/Library/Implementation/HTTP.c:1541
+#: WWW/Library/Implementation/HTTP.c:1627
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
-msgstr "Har 'POST'-indhold.  Behandler perm. omdirigering som midlertidig.\n"
+msgstr "Har 'POST'-indhold. Behandler permanent omdirigering som midlertidig.\n"
 
-#: WWW/Library/Implementation/HTTP.c:1586
+#: WWW/Library/Implementation/HTTP.c:1672
 msgid "Retrying with access authorization information."
 msgstr "Prøver igen med oplysning om adgangstilladelse."
 
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1684
 msgid "Show the 401 message body?"
 msgstr "Vis indhold af 401-meddelelse?"
 
-#: WWW/Library/Implementation/HTTP.c:1643
+#: WWW/Library/Implementation/HTTP.c:1729
 msgid "Show the 407 message body?"
 msgstr "Vis indhold af 407-meddelelse?"
 
@@ -3133,7 +3166,7 @@ msgstr "Vis indhold af 407-meddelelse?"
 #. **	Take a chance and hope there is
 #. **	something to display. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1748
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Unknown status reply from server!"
 msgstr "Ukendt statussvar fra server!"
 
@@ -3165,7 +3198,7 @@ msgstr " indeholder flg. %d enhed%s med relevans for \""
 
 #: WWW/Library/Implementation/HTWAIS.c:475
 msgid "The first figure after each entry is its relative score, "
-msgstr "Det første tal efter hver listning er dens relative score."
+msgstr "Det første tal efter hver listning er dens relative score, "
 
 #: WWW/Library/Implementation/HTWAIS.c:476
 msgid "the second is the number of lines in the item."
@@ -3177,7 +3210,7 @@ msgstr " (forkert filnavn)"
 
 #: WWW/Library/Implementation/HTWAIS.c:542
 msgid "(bad doc id)"
-msgstr "(forkert dok id)"
+msgstr "(forkert dok-id)"
 
 #: WWW/Library/Implementation/HTWAIS.c:558
 msgid "(Short Header record, can't display)"
@@ -3215,27 +3248,27 @@ msgstr ""
 "\n"
 "Kodepost, kan ikke vise\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:691
+#: WWW/Library/Implementation/HTWAIS.c:689
 msgid "Syntax error in WAIS URL"
-msgstr "Syntaksfejl i WAIS-URL"
+msgstr "Syntaksfejl i WAIS-adresse"
 
-#: WWW/Library/Implementation/HTWAIS.c:761
+#: WWW/Library/Implementation/HTWAIS.c:759
 msgid " (WAIS Index)"
 msgstr " (WAIS-indeks)"
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:766
 msgid "WAIS Index: "
 msgstr "WAIS-indeks: "
 
-#: WWW/Library/Implementation/HTWAIS.c:774
+#: WWW/Library/Implementation/HTWAIS.c:772
 msgid "This is a link for searching the "
-msgstr "Dette er et link til søgning af "
+msgstr "Dette er et link til søgning i "
 
-#: WWW/Library/Implementation/HTWAIS.c:778
+#: WWW/Library/Implementation/HTWAIS.c:776
 msgid " WAIS Index.\n"
 msgstr " WAIS-indekset.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:805
+#: WWW/Library/Implementation/HTWAIS.c:803
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
@@ -3243,58 +3276,58 @@ msgstr ""
 "\n"
 "Indtast 's'øgekommando og anfør så søgeordene.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:827
+#: WWW/Library/Implementation/HTWAIS.c:825
 msgid " (in "
 msgstr " (i "
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:834
 msgid "WAIS Search of \""
 msgstr "WAIS-søgning efter \""
 
-#: WWW/Library/Implementation/HTWAIS.c:840
+#: WWW/Library/Implementation/HTWAIS.c:838
 msgid "\" in: "
 msgstr "\" i: "
 
-#: WWW/Library/Implementation/HTWAIS.c:855
+#: WWW/Library/Implementation/HTWAIS.c:853
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: Anmodning fylder for meget."
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:862
 msgid "Searching WAIS database..."
 msgstr "Søger i WAIS-database..."
 
-#: WWW/Library/Implementation/HTWAIS.c:874
+#: WWW/Library/Implementation/HTWAIS.c:872
 msgid "Search interrupted."
 msgstr "Søgning afbrudt."
 
-#: WWW/Library/Implementation/HTWAIS.c:924
+#: WWW/Library/Implementation/HTWAIS.c:922
 msgid "Can't convert format of WAIS document"
 msgstr "Kan ikke omdanne WAIS-dokumentets format"
 
-#: WWW/Library/Implementation/HTWAIS.c:968
+#: WWW/Library/Implementation/HTWAIS.c:966
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: Anmodning for lang."
 
 #.
 #. **	Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:982
+#: WWW/Library/Implementation/HTWAIS.c:980
 msgid "Fetching WAIS document..."
 msgstr "Henter WAIS-dokument..."
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1021
+#: WWW/Library/Implementation/HTWAIS.c:1019
 msgid "No text was returned!\n"
 msgstr "Ingen tekst blev returneret!\n"
 
 #: WWW/Library/Implementation/HTWSRC.c:287
 msgid " NOT GIVEN in source file; "
-msgstr " IKKE GIVET i kildefil; "
+msgstr " IKKE ANFØRT i kildefil; "
 
 #: WWW/Library/Implementation/HTWSRC.c:311
 msgid " WAIS source file"
-msgstr "WAIS kildefil"
+msgstr " WAIS-kildefil"
 
 #: WWW/Library/Implementation/HTWSRC.c:318
 msgid " description"
@@ -3304,166 +3337,160 @@ msgstr " beskrivelse"
 msgid "Access links"
 msgstr "Adgangslinks"
 
-#: WWW/Library/Implementation/HTWSRC.c:345
+#: WWW/Library/Implementation/HTWSRC.c:346
 msgid "Direct access"
 msgstr "Direkte adgang"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:348
+#: WWW/Library/Implementation/HTWSRC.c:349
 msgid " (or via proxy server, if defined)"
 msgstr " (eller via proxy-server, hvis fastsat)"
 
-#: WWW/Library/Implementation/HTWSRC.c:363
+#: WWW/Library/Implementation/HTWSRC.c:364
 msgid "Maintainer"
 msgstr "Vedligeholder"
 
-#: WWW/Library/Implementation/HTWSRC.c:371
+#: WWW/Library/Implementation/HTWSRC.c:372
 msgid "Host"
 msgstr "Vært"
 
-#: src/GridText.c:607
+#: src/GridText.c:688
 msgid "Memory exhausted, display interrupted!"
 msgstr "Hukommelse opbrugt, visning afbrudt!"
 
-#: src/GridText.c:612
+#: src/GridText.c:693
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Hukommelse opbrugt, vil afbryde overførsel!"
 
-#: src/GridText.c:3395
+#: src/GridText.c:3578
 msgid " *** MEMORY EXHAUSTED ***"
-msgstr "*** HUKOMMELSE OPBRUGT ***"
+msgstr " *** HUKOMMELSE OPBRUGT ***"
 
-#: src/GridText.c:5733 src/GridText.c:5740 src/LYList.c:258
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
 msgid "unknown field or link"
 msgstr "ukendt felt eller link"
 
-#: src/GridText.c:5749
+#: src/GridText.c:6023
 msgid "text entry field"
 msgstr "tekstindtastningsfelt"
 
-#: src/GridText.c:5752
+#: src/GridText.c:6026
 msgid "password entry field"
-msgstr "adgangskode-indtastningsfelt"
+msgstr "indtastningsfelt til adgangskode"
 
-#: src/GridText.c:5755
+#: src/GridText.c:6029
 msgid "checkbox"
 msgstr "afkrydsningsboks"
 
-#: src/GridText.c:5758
+#: src/GridText.c:6032
 msgid "radio button"
 msgstr "radioknap"
 
-#: src/GridText.c:5761
+#: src/GridText.c:6035
 msgid "submit button"
 msgstr "indsendelsesknap"
 
-#: src/GridText.c:5764
+#: src/GridText.c:6038
 msgid "reset button"
 msgstr "nulstillingsknap"
 
-#: src/GridText.c:5767
+#: src/GridText.c:6041
 msgid "popup menu"
 msgstr "pop up-menu"
 
-#: src/GridText.c:5770
+#: src/GridText.c:6044
 msgid "hidden form field"
 msgstr "skjult formularfelt"
 
-#: src/GridText.c:5773
+#: src/GridText.c:6047
 msgid "text entry area"
 msgstr "tekstindtastningsområde"
 
-#: src/GridText.c:5776
+#: src/GridText.c:6050
 msgid "range entry field"
-msgstr "interval-indtastningsfelt"
+msgstr "intervalindtastningsfelt"
 
-#: src/GridText.c:5779
+#: src/GridText.c:6053
 msgid "file entry field"
 msgstr "filindtastningsfelt"
 
-#: src/GridText.c:5782
+#: src/GridText.c:6056
 msgid "text-submit field"
 msgstr "tekstindsendelsesfelt"
 
-#: src/GridText.c:5785
+#: src/GridText.c:6059
 msgid "image-submit button"
 msgstr "Billedindsendelsesknap"
 
-#: src/GridText.c:5788
+#: src/GridText.c:6062
 msgid "keygen field"
 msgstr "nøglegen-felt"
 
-#: src/GridText.c:5791
+#: src/GridText.c:6065
 msgid "unknown form field"
 msgstr "ukendt formularfelt"
 
-#. We can't open the file, what do we do?
-#: src/GridText.c:10348
+#: src/GridText.c:10066
 msgid "Can't open file for uploading"
-msgstr "Kan ikke åbne fil for uploadning"
-
-#. We got an error reading the file, what do we do?
-#: src/GridText.c:10359
-msgid "Short read from file, problem?"
-msgstr "Kort læsning fra fil, problem?"
+msgstr "Kan ikke åbne fil til uploadning"
 
-#: src/GridText.c:10721
+#: src/GridText.c:11218
 #, c-format
 msgid "Submitting %s"
 msgstr "Indsender %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:11887
+#: src/GridText.c:12375
 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:12092
+#: src/GridText.c:12581
 msgid "Wrap lines to fit displayed area?"
-msgstr "ombryd linjer for tilpasning til det viste område?"
+msgstr "Ombryd linjer så de passer til det viste område?"
 
-#: src/GridText.c:12144
+#: src/GridText.c:12633
 msgid "Very long lines have been wrapped!"
 msgstr "Meget lange linjer er blevet ombrudt!"
 
-#: src/GridText.c:12591
+#: src/GridText.c:13079
 msgid "Very long lines have been truncated!"
 msgstr "Meget lange linjer er blevet afkortet!"
 
-#: src/HTAlert.c:155 src/LYShowInfo.c:318
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
 msgid "bytes"
 msgstr "bytes"
 
-#: src/HTAlert.c:156
+#: src/HTAlert.c:155
 msgid "KB"
 msgstr "Kb "
 
-#: src/HTAlert.c:255
+#: src/HTAlert.c:274
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "Læst %s af %s af data"
 
-#: src/HTAlert.c:257
+#: src/HTAlert.c:276
 #, c-format
 msgid "Read %s of data"
 msgstr "Læst %s af data"
 
-#: src/HTAlert.c:262
+#: src/HTAlert.c:281
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s/sek"
 
-#: src/HTAlert.c:269
+#: src/HTAlert.c:290
 #, c-format
-msgid " (stalled for %ld sec)"
-msgstr " (gået i stå i %ld sek)"
+msgid " (stalled for %s)"
+msgstr " (gået i stå i %s)"
 
-#: src/HTAlert.c:271
+#: src/HTAlert.c:294
 #, c-format
-msgid ", ETA %ld sec"
-msgstr ", ETA %ld sek"
+msgid ", ETA %s"
+msgstr ", ETA %s"
 
-#: src/HTAlert.c:277
+#: src/HTAlert.c:301
 msgid " (Press 'z' to abort)"
 msgstr " (Tast 'z' for at afbryde)"
 
@@ -3492,55 +3519,55 @@ msgstr " (Tast 'z' for at afbryde)"
 #. *  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:334
+#: src/HTAlert.c:342 src/HTAlert.c:390
 msgid "yes"
 msgstr "ja"
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:345 src/HTAlert.c:391
 msgid "no"
 msgstr "nej"
 
-#: src/HTML.c:6342
+#: src/HTML.c:5985
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: src/HTML.c:6347
+#: src/HTML.c:5990
 msgid "(none)"
 msgstr "(ingen)"
 
-#: src/HTML.c:6351
+#: src/HTML.c:5994
 msgid "Filepath:"
 msgstr "Filsti:"
 
-#: src/HTML.c:6356
+#: src/HTML.c:5999
 msgid "(unknown)"
 msgstr "(ukendt)"
 
-#: src/HTML.c:7804
+#: src/HTML.c:7452
 msgid "Document has only hidden links.  Use the 'l'ist command."
-msgstr "Dokument har kun skjulte links.  Brug 'l'istnings-kommandoen."
+msgstr "Dokument har kun skjulte links. Brug 'l'istekommandoen."
 
-#: src/HTML.c:8328
+#: src/HTML.c:7958
 msgid "Source cache error - disk full?"
 msgstr "Cache-fejl - diskplads opbrugt?"
 
-#: src/HTML.c:8341
+#: src/HTML.c:7971
 msgid "Source cache error - not enough memory!"
 msgstr "Cache-fejl - ikke nok hukommelse!"
 
-#: src/LYBookmark.c:166
+#: src/LYBookmark.c:167
 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 ""
-"     Denne fil er en html-udgave af X Mosaics bogmærkefil.\n"
-"     Gamle eller ugyldige links kan fjernes ved brug af\n"
-"     fjern-bogmærke-kommandoen, det er normalt 'R'-tasten, men kan have\n"
-"     fået en anden tildeling af din systemadministrator."
+"     Denne fil er en HTML-udgave af X Mosaics bogmærkefil. Gamle eller\n"
+"     ugyldige links kan slettes ved brug af kommandoen til at slette\n"
+"     et bogmærke, det er normalt 'R'-tasten, men kan have fået en\n"
+"     anden tildeling af din systemadministrator."
 
-#: src/LYBookmark.c:382
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
@@ -3548,24 +3575,26 @@ msgstr ""
 "     Du kan slette links med 'R'-tasten<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:385
+#: src/LYBookmark.c:382
 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 ""
-"    Du kan slette links ved brug af fjern-bogmærke-kommandoen.  Det er normalt\n"
-"    'R'-tasten, men kan have fået en anden tildeling af din systemadministrator"
+"     Du kan slette links ved at bruge kommandoen til at slette et\n"
+"     bogmærke. Det er normalt 'R'-tasten, men kan have fået en anden\n"
+"     tildeling af din systemadministrator"
 
-#: src/LYBookmark.c:389
+#: src/LYBookmark.c:386
 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 ""
-"    Denne fil kan også redigeres med et standard tekstredigeringsværktøj for\n"
-"    at slette gamle eller ugyldige links, eller for at ændre deres rækkefølge."
+"     Denne fil kan også redigeres med et standard teksteditor for at\n"
+"     slette gamle eller ugyldige links, eller for at ændre deres\n"
+"     rækkefølge."
 
-#: src/LYBookmark.c:392
+#: src/LYBookmark.c:389
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3574,10 +3603,10 @@ msgid ""
 msgstr ""
 "Bemærk: Hvis du redigerer denne fil manuelt,\n"
 "        bør du ikke ændre linjeformatet\n"
-"        eller tilføje anden html-kode.\n"
-"        Sørg for, at ethvert bogmærke er gemt på en enkelt linje."
+"        eller tilføje anden HTML-kode.\n"
+"        Sørg for at ethvert bogmærke er gemt på en enkelt linje."
 
-#: src/LYBookmark.c:683
+#: src/LYBookmark.c:681
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr "Fil kan måske genskabes fra %s under denne session"
@@ -3586,71 +3615,71 @@ msgstr "Fil kan måske genskabes fra %s under denne session"
 #. *  Neither the path as given nor any components examined by
 #. *  backing up were stat()able. - kw
 #.
-#: src/LYCgi.c:232
+#: src/LYCgi.c:231
 msgid "Unable to access cgi script"
-msgstr "Kan ikke få adgang til cgi-script"
+msgstr "Kan ikke få adgang til cgi-program"
 
-#: src/LYCgi.c:651 src/LYCgi.c:654
+#: src/LYCgi.c:654 src/LYCgi.c:657
 msgid "Good Advice"
 msgstr "Godt råd"
 
-#: src/LYCgi.c:657
+#: src/LYCgi.c:660
 msgid "An excellent http server for VMS is available via"
 msgstr "En fortrinlig http-server for VMS kan findes via"
 
-#: src/LYCgi.c:664
+#: src/LYCgi.c:667
 msgid "this link"
 msgstr "dette link"
 
-#: src/LYCgi.c:668
+#: src/LYCgi.c:671
 msgid "It provides state of the art CGI script support.\n"
-msgstr "Den tilbyder upåklagelig understøttelse af CGI-scripts\n"
+msgstr "Den tilbyder upåklagelig understøttelse af CGI-programmer\n"
 
-#: src/LYClean.c:108
+#: src/LYClean.c:122
 msgid "Exiting via interrupt:"
-msgstr "Afslutter via \"interrupt\":"
+msgstr "Afslutter via interrupt:"
 
-#: src/LYCookie.c:2659
+#: src/LYCookie.c:2462
 msgid "(from a previous session)"
 msgstr "(fra en foregående session)"
 
-#: src/LYCookie.c:2719
+#: src/LYCookie.c:2522
 msgid "Maximum Gobble Date:"
 msgstr "Udløbsdato for cookie:"
 
-#: src/LYCookie.c:2764
+#: src/LYCookie.c:2564
 msgid "Internal"
 msgstr "Intern"
 
-#: src/LYCookie.c:2765
+#: src/LYCookie.c:2565
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "'cookie_domain_set_flag'-fejl, afbryder program"
 
-#: src/LYCurses.c:936
+#: src/LYCurses.c:1004
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Klargøring af terminal slog fejl - ukendt terminaltype?"
 
-#: src/LYCurses.c:1328
+#: src/LYCurses.c:1426
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1332
+#: src/LYCurses.c:1430
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Du skal bruge en vt100, 200, etc. terminal med dette program."
 
-#: src/LYCurses.c:1384
+#: src/LYCurses.c:1480
 msgid "Your Terminal type is unknown!"
 msgstr "Din terminaltype er ukendt!"
 
-#: src/LYCurses.c:1385
+#: src/LYCurses.c:1481
 msgid "Enter a terminal type:"
 msgstr "Anfør en terminaltype:"
 
-#: src/LYCurses.c:1398
+#: src/LYCurses.c:1495
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINAL-TYPE SAT TIL"
 
-#: src/LYCurses.c:1749
+#: src/LYCurses.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -3659,7 +3688,7 @@ msgstr ""
 "\n"
 "En kritisk fejl opstod i %s Ver. %s\n"
 
-#: src/LYCurses.c:1751
+#: src/LYCurses.c:1996
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -3669,462 +3698,488 @@ msgid ""
 "TRACEBACK if it can be captured, and any other relevant information.\n"
 msgstr ""
 "\n"
-"Underret venligst din systemadministrator for at få bekræftet en programfejl, \n"
-"og hvis den bekræftes, underret da lynx-dev-listen. Rapporter om programfejl\n"
-"bør indeholde en koncis beskrivelse af den kommando og/eller URL som forårsagede\n"
-"problemet, styresystemets navn og versionsnummer, TCP/IP-implementeringen, en\n"
-"\"TRACEBACK\", hvis den kan fanges og enhver anden relevant information.\n"
-
-#: src/LYEdit.c:264
+"Underret venligst din systemadministrator for at få bekræftet en\n"
+"programfejl, og hvis den bekræftes, underret da lynx-dev-listen.\n"
+"Rapporter om programfejl bør indeholde en koncis beskrivelse af\n"
+"den kommando og/eller adresse som forårsagede problemet, styresystemets\n"
+"navn og versionsnummer, TCP/IP-implementeringen, en \"TRACEBACK\", hvis\n"
+"den kan fanges og enhver anden relevant information.\n"
+
+#: src/LYEdit.c:249
 msgid "Editor killed by signal"
 msgstr "Editor dræbt ved signal"
 
-#: src/LYEdit.c:266
+#: src/LYEdit.c:251
 #, c-format
 msgid "Editor returned with error status, %s"
-msgstr "Editor vendte tilbage med fejlstatus, %s"
+msgstr "Editor returnerede fejlstatus, %s"
 
-#: src/LYEdit.c:267
+#: src/LYEdit.c:252
 msgid "reason unknown."
 msgstr "ukendt årsag."
 
-#: src/LYDownload.c:520
+#: src/LYDownload.c:517
 msgid "Downloaded link:"
-msgstr "hentet link:"
+msgstr "Hentet link:"
 
-#: src/LYDownload.c:525
+#: src/LYDownload.c:522
 msgid "Suggested file name:"
 msgstr "Foreslået filnavn:"
 
-#: src/LYDownload.c:530
+#: src/LYDownload.c:527
 msgid "Standard download options:"
-msgstr "Standard valgmuligheder ved hentning af filer:"
+msgstr "Gængse valgmuligheder ved hjemtagning af filer:"
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:528
 msgid "Download options:"
-msgstr "Valgmuligheder for hentning af filer:"
+msgstr "Valgmuligheder ved hjemtagning af filer:"
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:544
 msgid "Save to disk"
 msgstr "Gem på disk"
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "Vis filen "
+
+#: src/LYDownload.c:565
 msgid "Save to disk disabled."
 msgstr "Gemning på disk slået fra."
 
-#: src/LYDownload.c:551 src/LYPrint.c:1338
+#: src/LYDownload.c:569 src/LYPrint.c:1327
 msgid "Local additions:"
 msgstr "Egne tilføjelser:"
 
-#: src/LYDownload.c:560 src/LYUpload.c:224
+#: src/LYDownload.c:578 src/LYUpload.c:216
 msgid "No Name Given"
 msgstr "Intet navn givet"
 
-#: src/LYHistory.c:633
+#: src/LYHistory.c:657
 msgid "You selected:"
 msgstr "Du valgte:"
 
-#: src/LYHistory.c:657 src/LYHistory.c:905
+#: src/LYHistory.c:681 src/LYHistory.c:921
 msgid "(no address)"
 msgstr "(ingen adresse)"
 
-#: src/LYHistory.c:661
+#: src/LYHistory.c:685
 msgid " (internal)"
-msgstr "(intern)"
+msgstr " (intern)"
 
-#: src/LYHistory.c:663
+#: src/LYHistory.c:687
 msgid " (was internal)"
 msgstr " (var intern)"
 
-#: src/LYHistory.c:761
+#: src/LYHistory.c:785
 msgid " (From History)"
 msgstr " (Fra historik)"
 
-#: src/LYHistory.c:825
+#: src/LYHistory.c:841
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
-msgstr "Du besøgte ('POSTs', bogmærker, menu og listefiler undtaget):"
+msgstr "Du har besøgt: ('POSTs', bogmærke-, menu- og listefiler undtaget)"
 
-#: src/LYHistory.c:1124
+#: src/LYHistory.c:1137
 msgid "(No messages yet)"
 msgstr "(Ingen meddelelser endnu)"
 
-#: src/LYLeaks.c:78
+#: src/LYLeaks.c:209
 msgid "Invalid pointer detected."
 msgstr "Ugyldig peger opdaget."
 
-#: src/LYLeaks.c:80 src/LYLeaks.c:117
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr "Sekvens:"
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
 msgid "Pointer:"
 msgstr "Peger:"
 
-#: src/LYLeaks.c:91 src/LYLeaks.c:98 src/LYLeaks.c:136
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
 msgid "FileName:"
 msgstr "FilNavn:"
 
-#: src/LYLeaks.c:94 src/LYLeaks.c:101 src/LYLeaks.c:139 src/LYLeaks.c:150
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
 msgid "LineCount:"
 msgstr "LinjeAntal:"
 
-#: src/LYLeaks.c:115
+#: src/LYLeaks.c:249
 msgid "Memory leak detected."
 msgstr "Hukommelsesudsivning opdaget."
 
-#: src/LYLeaks.c:120
+#: src/LYLeaks.c:257
 msgid "Contains:"
 msgstr "Indeholder:"
 
-#: src/LYLeaks.c:133
+#: src/LYLeaks.c:270
 msgid "ByteSize:"
 msgstr "ByteStr.:"
 
-#: src/LYLeaks.c:147
+#: src/LYLeaks.c:284
 msgid "realloced:"
 msgstr "gentildelt:"
 
-#: src/LYLeaks.c:170
+#: src/LYLeaks.c:307
 msgid "Total memory leakage this run:"
 msgstr "Total hukommelsesudsivning denne gang:"
 
-#: src/LYList.c:91
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr "Allokering ved spidsbelastning"
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr "Antal tildelte byte"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr "Totalt antal \"mallocs\""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr "Totalt antal \"frees\""
+
+#: src/LYList.c:85
 msgid "References in "
-msgstr "Referencer i "
+msgstr "Henvisninger i "
 
-#: src/LYList.c:92
+#: src/LYList.c:86
 msgid "this document:"
 msgstr "dette dokument:"
 
-#: src/LYList.c:98
+#: src/LYList.c:92
 msgid "Visible links:"
 msgstr "Synlige links:"
 
-#: src/LYList.c:199 src/LYList.c:319
+#: src/LYList.c:194 src/LYList.c:315
 msgid "Hidden links:"
 msgstr "Skjulte links:"
 
-#: src/LYList.c:267
+#: src/LYList.c:262
 msgid "References"
 msgstr "Henvisninger"
 
-#: src/LYList.c:269
+#: src/LYList.c:264
 msgid "Visible links"
 msgstr "Synlige links"
 
 #: src/LYLocal.c:267
 #, c-format
 msgid "Unable to get status of '%s'."
-msgstr "Ude af stand til af skaffe status på '%s'."
+msgstr "Kan ikke indhente status på '%s'."
 
 #: src/LYLocal.c:301
 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:383
+#: src/LYLocal.c:366
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Kan ikke %s pga. systemfejl!"
 
 #. error return
-#: src/LYLocal.c:415
+#: src/LYLocal.c:400
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Sandsynlig fejl for %s skyldes en systemfejl!"
 
-#: src/LYLocal.c:453
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "slet %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr "opret %s"
+
+#: src/LYLocal.c:508
 #, c-format
 msgid "move %s to %s"
 msgstr "flyt %s til %s"
 
-#: src/LYLocal.c:475
+#: src/LYLocal.c:548
 msgid "There is already a directory with that name!  Request ignored."
-msgstr "Der er allerede et filkatalog med dette navn!  Anmodning ignoreret."
+msgstr "Der er allerede et filkatalog med dette navn! Anmodning ignoreret."
 
-#: src/LYLocal.c:477
+#: src/LYLocal.c:550
 msgid "There is already a file with that name!  Request ignored."
-msgstr "Der er allerede en fil med dette navn!  Anmodning ignoreret."
+msgstr "Der er allerede en fil med dette navn! Anmodning ignoreret."
 
-#: src/LYLocal.c:479
+#: src/LYLocal.c:552
 msgid "The specified name is already in use!  Request ignored."
-msgstr "Det anførte navn er allerede i brug!  Anmodning ignoreret."
+msgstr "Det anførte navn er allerede i brug! Anmodning ignoreret."
 
-#: src/LYLocal.c:490
+#: src/LYLocal.c:563
 msgid "Destination has different owner!  Request denied."
-msgstr "Destination har en anden ejer!  Anmodning nægtet."
+msgstr "Mål har en anden ejer! Anmodning nægtet."
 
-#: src/LYLocal.c:493
+#: src/LYLocal.c:566
 msgid "Destination is not a valid directory!  Request denied."
-msgstr "Destination er ikke et gyldigt filkatalog!  Anmodning afslået."
+msgstr "Mål er ikke et gyldigt filkatalog! Anmodning afslået."
 
-#: src/LYLocal.c:516
+#: src/LYLocal.c:588
 msgid "Remove all tagged files and directories?"
-msgstr "Fjern alle markerede filer og filkataloger?"
+msgstr "Slet alle markerede filer og filkataloger?"
 
-#: src/LYLocal.c:537
-#, c-format
-msgid "remove %s"
-msgstr "fjern %s"
-
-#: src/LYLocal.c:580
+#: src/LYLocal.c:647
 msgid "Enter new location for tagged items: "
-msgstr "Anfør et nyt bestemmelsessted for de markerede enheder: "
+msgstr "Angiv en ny placering for de markerede filer: "
 
-#: src/LYLocal.c:649
+#: src/LYLocal.c:716
 msgid "Path too long"
 msgstr "Sti for lang"
 
-#: src/LYLocal.c:680
+#: src/LYLocal.c:747
 msgid "Source and destination are the same location - request ignored!"
-msgstr "Kilde og mål er på samme sted - anmodning ignoreret!"
+msgstr "Samme placering af kilde og mål - anmodning ignoreret!"
 
-#: src/LYLocal.c:738
+#: src/LYLocal.c:805
 msgid "Enter new name for directory: "
 msgstr "Indtast nyt navn på filkatalog: "
 
-#: src/LYLocal.c:740
+#: src/LYLocal.c:807
 msgid "Enter new name for file: "
 msgstr "Indtast et nyt navn på fil: "
 
-#: src/LYLocal.c:751
+#: src/LYLocal.c:819
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Ugyldigt tegn (sti-adskillelsestegn) fundet! Anmodning ignoreret."
 
-#: src/LYLocal.c:800
+#: src/LYLocal.c:868
 msgid "Enter new location for directory: "
-msgstr "Anfør et nyt opbevaringssted for filkatalog: "
+msgstr "Anfør ny placering af filkatalog: "
 
-#: src/LYLocal.c:802
+#: src/LYLocal.c:874
 msgid "Enter new location for file: "
-msgstr "Anfør et nyt opbevaringssted for fil: "
+msgstr "Anfør ny placering af fil: "
 
-#: src/LYLocal.c:827
+#: src/LYLocal.c:901
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Uventet fejl - ude af stand til at finde sti-adskillelsestegn"
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:921
 msgid "Source and destination are the same location!  Request ignored!"
-msgstr "Kilde og mål er på samme sted!  Anmodning ignoreret!"
+msgstr "Samme placering af kilde og mål! Anmodning ignoreret!"
 
-#: src/LYLocal.c:894
+#: src/LYLocal.c:970
 msgid "Modify name, location, or permission (n, l, or p): "
-msgstr "Ret n=navn, l=sted eller p=tilladelse: "
+msgstr "Ret n=navn, l=placering eller p=rettighed: "
 
-#: src/LYLocal.c:896
+#: src/LYLocal.c:972
 msgid "Modify name or location (n or l): "
-msgstr "Ret n=navn eller l=sted: "
+msgstr "Ret n=navn eller l=placering: "
 
 #.
 #. *	Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:925
+#: src/LYLocal.c:1001
 msgid "This feature not yet implemented!"
-msgstr "Denne funktionalitet er endnu ikke indarbejdet!"
+msgstr "Denne programfunktion er endnu ikke indarbejdet!"
 
-#: src/LYLocal.c:943
+#: src/LYLocal.c:1019
 msgid "Enter name of file to create: "
 msgstr "Anfør navn på den fil som skal oprettes: "
 
-#: src/LYLocal.c:951 src/LYLocal.c:999
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Ugyldig omdirigering \"//\" fundet! Anmodning ignoreret."
 
-#: src/LYLocal.c:966
-#, c-format
-msgid "create %s"
-msgstr "opret %s"
-
-#: src/LYLocal.c:991
+#: src/LYLocal.c:1061
 msgid "Enter name for new directory: "
 msgstr "Anfør navn på nyt filkatalog: "
 
-#: src/LYLocal.c:1042
+#: src/LYLocal.c:1106
 msgid "Create file or directory (f or d): "
 msgstr "Opret f=fil eller d=filkatalog: "
 
-#: src/LYLocal.c:1083
+#: src/LYLocal.c:1146
 #, c-format
 msgid "Remove '%s' and all of its contents?"
-msgstr "Fjern '%s' og hele dets indhold?"
+msgstr "Slet '%s' og hele dets indhold?"
 
-#: src/LYLocal.c:1086
+#: src/LYLocal.c:1149
 msgid "Remove directory and all of its contents?"
-msgstr "Fjern filkatalog og hele dets indhold?"
+msgstr "Slet filkatalog og hele dets indhold?"
 
-#: src/LYLocal.c:1090
+#: src/LYLocal.c:1153
 #, c-format
 msgid "Remove file '%s'?"
-msgstr "Fjern fil '%s'?"
+msgstr "Slet fil '%s'?"
 
-#: src/LYLocal.c:1092
+#: src/LYLocal.c:1155
 msgid "Remove file?"
-msgstr "Fjern fil?"
+msgstr "Slet fil?"
 
-#: src/LYLocal.c:1097
+#: src/LYLocal.c:1160
 #, c-format
 msgid "Remove symbolic link '%s'?"
-msgstr "Fjern symbolsk link '%s'?"
+msgstr "Slet symbolsk link '%s'?"
 
-#: src/LYLocal.c:1099
+#: src/LYLocal.c:1162
 msgid "Remove symbolic link?"
-msgstr "Fjern symbolsk link"
+msgstr "Slet symbolsk link"
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1248
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Beklager, kan endnu ikke tillade ikke-UNIX-filer."
 
-#: src/LYLocal.c:1220
+#: src/LYLocal.c:1278
 msgid "Unable to open permit options file"
-msgstr "Ude af stand til at åbne fil med indstillinger for tilladelser."
+msgstr "Ude af stand til at åbne fil med rettighedstilvalg."
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1305
 msgid "Specify permissions below:"
-msgstr "Anfør tilladelser nedenfor:"
+msgstr "Anfør rettigheder nedenfor:"
 
-#: src/LYLocal.c:1248 src/LYShowInfo.c:196
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
 msgid "Owner:"
 msgstr "Ejer:"
 
-#: src/LYLocal.c:1264
+#: src/LYLocal.c:1322
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/LYLocal.c:1280
+#: src/LYLocal.c:1338
 msgid "Others:"
 msgstr "Andre:"
 
-#: src/LYLocal.c:1298
+#: src/LYLocal.c:1356
 msgid "form to permit"
 msgstr "formular som skal tillades"
 
-#: src/LYLocal.c:1396
+#: src/LYLocal.c:1452
 msgid "Invalid mode format."
 msgstr "Ugyldigt tilstandsformat."
 
-#: src/LYLocal.c:1400
+#: src/LYLocal.c:1456
 msgid "Invalid syntax format."
 msgstr "Ugyldigt syntaksformat."
 
-#: src/LYLocal.c:1575
-msgid "NULL URL pointer"
-msgstr "NULL url-peger"
-
-#: src/LYLocal.c:1670
+#: src/LYLocal.c:1645
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
-msgstr "Advarsel!  UUDecodet fil lægges i filkatalog, hvor du startede Lynx."
+msgstr "Advarsel!  UUDecodet fil lægges i filkatalog hvor du startede Lynx."
 
-#: src/LYLocal.c:1782
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr "NULL adresse-peger"
+
+#: src/LYLocal.c:1908
 #, c-format
 msgid "Executing %s "
 msgstr "Udfører %s "
 
-#: src/LYLocal.c:1785
+#: src/LYLocal.c:1911
 msgid "Executing system command. This might take a while."
 msgstr "Udfører systemkommando. Dette kan tage et øjeblik."
 
-#: src/LYLocal.c:1831
-msgid "Unable to open file management menu file."
-msgstr "Ude af stand til at åbne filhåndterings-menufil."
-
-#: src/LYLocal.c:1862
+#: src/LYLocal.c:1985
 msgid "Current directory:"
 msgstr "Aktuelle filkatalog:"
 
-#: src/LYLocal.c:1865 src/LYLocal.c:1883
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
 msgid "Current selection:"
-msgstr "Aktuelle valg:"
+msgstr "Aktuelle udvalg:"
 
-#: src/LYLocal.c:1869
+#: src/LYLocal.c:1992
 msgid "Nothing currently selected."
 msgstr "Intet er aktuelt udvalgt."
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged item:"
 msgstr "markeret enhed:"
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged items:"
 msgstr "markerede enheder:"
 
-#: src/LYLocal.c:1983 src/LYLocal.c:1994
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
 msgid "Illegal filename; request ignored."
-msgstr "Ugyldigt filnavn: Anmodning ignoreret."
-
-#: src/LYLocal.c:2137
-msgid "The selected item is not a directory!  Request ignored."
-msgstr "Den markerede enhed er ikke et filkatalog!  Anmodning ignoreret."
+msgstr "Ugyldigt filnavn: anmodning ignoreret."
 
 #. directory not writable
-#: src/LYLocal.c:2141
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
 msgid "Install in the selected directory not permitted."
 msgstr "Installering i det valgte filkatalog er ikke tilladt."
 
-#: src/LYLocal.c:2146
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr "Den markerede enhed er ikke et filkatalog! Anmodning ignoreret."
+
+#: src/LYLocal.c:2276
 msgid "Just a moment, ..."
-msgstr "Lige et øjeblik, ..."
+msgstr "Vent et øjeblik, ..."
 
-#: src/LYLocal.c:2163
+#: src/LYLocal.c:2293
 msgid "Error buiding install args"
-msgstr "Kunne ikke lave installeringsparametre"
+msgstr "Kunne ikke danne installeringsparametre"
 
-#: src/LYLocal.c:2178 src/LYLocal.c:2210
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Kilde og mål er det samme: %s"
 
-#: src/LYLocal.c:2188 src/LYLocal.c:2220
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
 #, c-format
 msgid "Already in target directory: %s"
-msgstr "Står allerede i mål-kataloget: %s"
+msgstr "Står allerede i målkataloget: %s"
 
-#: src/LYLocal.c:2238
+#: src/LYLocal.c:2362
 msgid "Installation complete"
 msgstr "Installering fuldført"
 
-#: src/LYLocal.c:2427
+#: src/LYLocal.c:2551
 msgid "Temporary URL or list would be too long."
-msgstr "Midlertidig url eller listen ville blive for lang."
+msgstr "Midlertidig adresse eller listen ville blive for lang."
 
-#: src/LYMail.c:503
+#: src/LYMail.c:534
 msgid "Sending"
 msgstr "Sender"
 
-#: src/LYMail.c:989
+#: src/LYMail.c:1024
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "Linket   %s :?: %s \n"
 
-#: src/LYMail.c:991
+#: src/LYMail.c:1026
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "ved navn \"%s\"\n"
 
-#: src/LYMail.c:992
+#: src/LYMail.c:1027
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "i filen \"%s\" ved navn \"%s\"\n"
 
-#: src/LYMail.c:993
+#: src/LYMail.c:1028
 msgid "was requested but was not available."
 msgstr "blev der anmodet om, men den var ikke tilgængelig."
 
-#: src/LYMail.c:994
+#: src/LYMail.c:1029
 msgid "Thought you might want to know."
 msgstr "Du ville sikkert gerne vide dette."
 
-#: src/LYMail.c:996
+#: src/LYMail.c:1031
 msgid "This message was automatically generated by"
-msgstr "Denne meddelelse blev automatisk skabt af"
+msgstr "Denne meddelelse blev automatisk lavet af"
 
-#: src/LYMain.c:897
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr "Systemets postprogram er ikke sat op"
+
+#: src/LYMain.c:969
 msgid "No Winsock found, sorry."
 msgstr "Ingen \"Winsocket\" fundet, beklager."
 
-#: src/LYMain.c:1103
+#: src/LYMain.c:1170
 msgid "You MUST define a valid TMP or TEMP area!\n"
 msgstr "Du SKAL definere et gyldigt TMP eller TEMP-område!\n"
 
-#: src/LYMain.c:1156 src/LYMainLoop.c:5117
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
 msgid "No such directory"
 msgstr "Intet sådant filkatalog"
 
-#: src/LYMain.c:1378
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4134,7 +4189,7 @@ msgstr ""
 "\n"
 "Opsætningsfil %s er ikke tilgængelig.\n"
 
-#: src/LYMain.c:1388
+#: src/LYMain.c:1446
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
@@ -4143,7 +4198,7 @@ msgstr ""
 "\n"
 "Lynx tegnsæt er ikke angivet.\n"
 
-#: src/LYMain.c:1417
+#: src/LYMain.c:1475
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
@@ -4152,7 +4207,7 @@ msgstr ""
 "\n"
 "Lynx \"edit map\" er ikke angivet.\n"
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1504
 #, c-format
 msgid ""
 "\n"
@@ -4162,60 +4217,60 @@ msgstr ""
 "\n"
 "Lynx-fil %s er ikke tilgængelig.\n"
 
-#: src/LYMain.c:1704
+#: src/LYMain.c:1743
 msgid "Warning:"
 msgstr "Advarsel:"
 
-#: src/LYMain.c:2247
+#: src/LYMain.c:2293
 msgid "persistent cookies state will be changed in next session only."
-msgstr "Ændring for vedvarende cookier vil kun gælde næste session. "
+msgstr "Ændring for vedvarende cookier vil kun gælde næste session."
 
-#: src/LYMain.c:2477 src/LYMain.c:2525
+#: src/LYMain.c:2540 src/LYMain.c:2588
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
-msgstr "Lynx: Ignorerer ikke-anerkendt tegnsæt=%s\n"
+msgstr "Lynx: Ignorerer ukendt tegnsæt=%s\n"
 
-#: src/LYMain.c:3047
-#, c-format
-msgid "%s Version %s (%s)\n"
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
 msgstr "%s Version %s (%s)\n"
 
-#: src/LYMain.c:3072
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Bygget på %s %s %s\n"
 
-#: src/LYMain.c:3077
+#: src/LYMain.c:3166
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
 msgstr "Ophavsret indehaves af University of Kansas, CERN og andre bidragydere.\n"
 
-#: src/LYMain.c:3079
+#: src/LYMain.c:3168
 msgid "Distributed under the GNU General Public License.\n"
 msgstr "Distribueret under GNU General Public License.\n"
 
-#: src/LYMain.c:3081
+#: src/LYMain.c:3170
 msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
+"See http://lynx.isc.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
-"Se http://lynx.browser.org/ og online-hjælpen for flere oplysninger.\n"
+"Se http://lynx.isc.org/ og online-hjælpen for flere oplysninger.\n"
 "\n"
 
-#: src/LYMain.c:3800
+#: src/LYMain.c:3919
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "BRUG: %s [valgmuligheder] [fil]\n"
 
-#: src/LYMain.c:3801
+#: src/LYMain.c:3920
 msgid "Options are:\n"
 msgstr "Valgmuligheder er:\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4191
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ugyldig indstilling: %s\n"
 
-#: src/LYMainLoop.c:512
+#: src/LYMainLoop.c:539
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "Intern fejl: Ugyldigt muse-link %d!"
@@ -4223,80 +4278,108 @@ msgstr "Intern fejl: Ugyldigt muse-link %d!"
 #.
 #. * Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:625 src/LYMainLoop.c:5139
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
 msgid "A URL specified by the user"
-msgstr "En URL angivet af brugeren"
+msgstr "En adresse angivet af brugeren"
 
-#: src/LYMainLoop.c:1114
+#: src/LYMainLoop.c:1110
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
-msgstr "Indkodn. \"multipart/form-data\" virker endnu ikke!  Kan ikke indsende."
+msgstr "Kodningstype \"multipart/form-data\" ikke understøttet! Kan ikke indsende."
 
 #.
 #. *  Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3097
+#: src/LYMainLoop.c:3053
 msgid "Help Screen"
 msgstr "Hjælpeskærm"
 
-#: src/LYMainLoop.c:3231
+#: src/LYMainLoop.c:3177
 msgid "System Index"
 msgstr "Systemfortegnelse"
 
-#: src/LYMainLoop.c:3611 src/LYMainLoop.c:5347
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
 msgid "Entry into main screen"
 msgstr "Indgang til hovedskærm"
 
-#: src/LYMainLoop.c:3897
+#: src/LYMainLoop.c:3824
 msgid "No next document present"
 msgstr "Intet \"næste dokument\" indlæst"
 
-#: src/LYMainLoop.c:4206
+#: src/LYMainLoop.c:4131
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "dette dokuments tegnsæt er udtrykkeligt angivet, beklager..."
 
-#: src/LYMainLoop.c:5093
+#: src/LYMainLoop.c:5004
 msgid "cd to:"
 msgstr "cd til:"
 
-#: src/LYMainLoop.c:5120
+#: src/LYMainLoop.c:5031
 msgid "A component of path is not a directory"
 msgstr "En del af stien er ikke et filkatalog"
 
-#: src/LYMainLoop.c:5123
+#: src/LYMainLoop.c:5034
 msgid "failed to change directory"
 msgstr "Kunne ikke skifte filkatalog."
 
-#: src/LYMainLoop.c:6291
+#: src/LYMainLoop.c:6204
 msgid "Reparsing document under current settings..."
-msgstr "Genanalyserer dokument under aktuelle indstillinger..."
+msgstr "Genfortolker dokument under nuværende indstillinger..."
 
-#: src/LYMainLoop.c:6579 src/LYMainLoop.c:6583
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
-msgstr "Kritisk fejl - kunne ikke åbne uddata-fil %s\n"
+msgstr "Kritisk fejl - kunne ikke åbne uddatafil %s\n"
+
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr "TABEL-centrering slået til."
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr "TABEL-centrering slået fra."
 
-#: src/LYMainLoop.c:7719 src/LYMainLoop.c:7892
+#: src/LYMainLoop.c:6914
+msgid "Current URL is empty."
+msgstr "Aktuelle adresse er tom."
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr "Kopiering til klippebord slog fejl."
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr "Dokumentets adresse overført til klippebord."
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr "Linkets adresse overført til klippebord."
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr "Ingen adresse ligger på klippebord."
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
 msgid "-index-"
 msgstr "-indeks-"
 
-#: src/LYMainLoop.c:7829
+#: src/LYMainLoop.c:7731
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Kan ikke få adgang til startfil"
 
-#: src/LYMainLoop.c:7842
+#: src/LYMainLoop.c:7744
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
-msgstr "lynx: startfil forefandtes ikke el. er ikke i format text/html el. text/plain"
+msgstr "lynx: startfil fandtes ikke eller er ikke i text/html, text/plain format"
 
-#: src/LYMainLoop.c:7843
+#: src/LYMainLoop.c:7745
 msgid "      Exiting..."
 msgstr "      Afslutter..."
 
-#: src/LYMainLoop.c:7886
+#: src/LYMainLoop.c:7788
 msgid "-more-"
 msgstr "-mere-"
 
 #. Enable scrolling.
-#: src/LYNews.c:203
+#: src/LYNews.c:187
 msgid "You will be posting to:"
 msgstr "Du vil poste til:"
 
@@ -4304,7 +4387,7 @@ msgstr "Du vil poste til:"
 #. *  Get the mail address for the From header,
 #. *  offering personal_mail_address as default.
 #.
-#: src/LYNews.c:212
+#: src/LYNews.c:196
 msgid ""
 "\n"
 "\n"
@@ -4312,14 +4395,14 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" Giv venligst din postadresse fra From: header'en\n"
+" Angiv venligst afsenderadresse\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:230
+#: src/LYNews.c:214
 msgid ""
 "\n"
 "\n"
@@ -4329,7 +4412,7 @@ msgstr ""
 "\n"
 " Indtast eller ret venligst emnelinjen\n"
 
-#: src/LYNews.c:322
+#: src/LYNews.c:303
 msgid ""
 "\n"
 "\n"
@@ -4342,7 +4425,7 @@ msgstr ""
 #.
 #. *  Use the built in line editior.
 #.
-#: src/LYNews.c:379
+#: src/LYNews.c:360
 msgid ""
 "\n"
 "\n"
@@ -4350,299 +4433,332 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Skriv dit brev nedenfor."
+"Skriv dit indlæg nedenfor."
 
-#: src/LYNews.c:425
+#: src/LYNews.c:406
 msgid "Message has no original text!"
-msgstr "Brev har ingen oprindelig tekst!"
+msgstr "Indlæg har ingen oprindelig tekst!"
 
-#: src/LYOptions.c:743
+#: src/LYOptions.c:746
 msgid "review/edit B)ookmarks files"
 msgstr "gennemse/rediger B)ogmærkefiler"
 
-#: src/LYOptions.c:745
+#: src/LYOptions.c:748
 msgid "B)ookmark file: "
-msgstr "B)ogmærke-fil: "
+msgstr "B)ogmærkefil: "
 
-#: src/LYOptions.c:2507 src/LYOptions.c:2531
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Brug %s for at aktivere menu over valgmuligheder!"
 
-#: src/LYOptions.c:3208
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr "(indstillinger markeret med (!) vil ikke blive gemt)"
+
+#: src/LYOptions.c:3261
 msgid "General Preferences"
 msgstr "Generelle indstillinger"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3212
+#: src/LYOptions.c:3265
 msgid "User mode"
-msgstr "Bruger-tilstand"
+msgstr "Brugertilstand"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3218
+#: src/LYOptions.c:3271
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3223
+#: src/LYOptions.c:3276
 msgid "Type of Search"
 msgstr "Søgningstype"
 
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3229
+#: src/LYOptions.c:3285
 msgid "Cookies"
 msgstr "Cookier"
 
-#: src/LYOptions.c:3243
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
 msgid "Keyboard Input"
-msgstr "Tastaturindstillinger"
+msgstr "Tastatur-inddata"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3247
+#: src/LYOptions.c:3316
 msgid "Keypad mode"
-msgstr "Numerisk tastatur-modus"
+msgstr "Numerisk tastaturtilstand"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3253
+#: src/LYOptions.c:3322
 msgid "Emacs keys"
 msgstr "Emacs-taster"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3259
+#: src/LYOptions.c:3328
 msgid "VI keys"
 msgstr "VI-taster"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3266
+#: src/LYOptions.c:3335
 msgid "Line edit style"
 msgstr "Linjeredigeringsstil"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3278
+#: src/LYOptions.c:3347
 msgid "Keyboard layout"
-msgstr "Tastatur-layout"
+msgstr "Tastaturudlægning"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3291
+#: src/LYOptions.c:3360
 msgid "Display and Character Set"
 msgstr "Skærm og tegnsæt"
 
 #. ***************************************************************
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3295
+#: src/LYOptions.c:3364
 msgid "Display character set"
-msgstr "Skærm-tegnsæt"
+msgstr "Skærmtegnsæt"
 
-#: src/LYOptions.c:3324
+#: src/LYOptions.c:3393
 msgid "Assumed document character set"
-msgstr "Formodet dokument-tegnsæt"
+msgstr "Formodet dokumenttegnsæt"
 
 #.
 #. * 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:3344
+#: src/LYOptions.c:3413
 msgid "CJK mode"
 msgstr "CJK-tilstand"
 
-#: src/LYOptions.c:3346
+#: src/LYOptions.c:3415
 msgid "Raw 8-bit"
 msgstr "Rå 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3354
+#: src/LYOptions.c:3423
 msgid "X Display"
 msgstr "X-skærm"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3360
+#: src/LYOptions.c:3429
 msgid "Document Appearance"
-msgstr "Dokument-udseende"
+msgstr "Udseende af dokument"
 
-#: src/LYOptions.c:3366
+#: src/LYOptions.c:3435
 msgid "Show color"
 msgstr "Vis farver"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3390
+#: src/LYOptions.c:3459
 msgid "Show cursor"
 msgstr "Vis markør"
 
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr "Vis rullebjælke"
+
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3396
+#: src/LYOptions.c:3473
 msgid "Popups for select fields"
 msgstr "Pop op-vinduer for valgte felter"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3403
+#: src/LYOptions.c:3479
 msgid "HTML error recovery"
-msgstr "HTML fejlgenopretning"
+msgstr "HTML-fejlgenopretning"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3410
+#: src/LYOptions.c:3485
 msgid "Show images"
 msgstr "Vis billeder"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3424
+#: src/LYOptions.c:3499
 msgid "Verbose images"
 msgstr "Billedtekst"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3432
+#: src/LYOptions.c:3507
 msgid "Headers Transferred to Remote Servers"
 msgstr "Information til fremmede servere"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3436
+#: src/LYOptions.c:3511
 msgid "Personal mail address"
-msgstr "Personlig postadresse"
+msgstr "Personlig e-post-adresse"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3516
 msgid "Preferred document character set"
-msgstr "Foretrukket dokument-tegnsæt"
+msgstr "Foretrukket dokumenttegnsæt"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3446
+#: src/LYOptions.c:3521
 msgid "Preferred document language"
 msgstr "Foretrukket dokumentsprog"
 
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3527
 msgid "User-Agent header"
 msgstr "'User-Agent'-linje"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3460
+#: src/LYOptions.c:3535
 msgid "Listing and Accessing Files"
 msgstr "Filoversigt og Filadgang"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3464
+#: src/LYOptions.c:3539
 msgid "FTP sort criteria"
 msgstr "FTP sorteringskriterie"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3471
+#: src/LYOptions.c:3546
 msgid "Local directory sort criteria"
 msgstr "Sortering af lokale filkataloger"
 
-#: src/LYOptions.c:3479
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+msgid "Local directory sort order"
+msgstr "Sortering af lokale filkataloger"
+
+#: src/LYOptions.c:3561
 msgid "Show dot files"
 msgstr "Vis punktumfiler"
 
-#: src/LYOptions.c:3487
+#: src/LYOptions.c:3569
 msgid "Execution links"
-msgstr "(program-)udførelseslinks"
+msgstr "Links til programafvikling"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3507
+#: src/LYOptions.c:3589
 msgid "Show transfer rate"
 msgstr "Vis overførselshastighed"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3516
+#: src/LYOptions.c:3598
 msgid "Special Files and Screens"
-msgstr "Særlige filer og skærme"
+msgstr "Særlige filer og skærmbilleder"
 
-#: src/LYOptions.c:3521
+#: src/LYOptions.c:3603
 msgid "Multi-bookmarks"
 msgstr "Multi-bogmærker"
 
-#: src/LYOptions.c:3529
+#: src/LYOptions.c:3611
 msgid "Review/edit Bookmarks files"
 msgstr "Gennemse/ret bogmærkefiler"
 
-#: src/LYOptions.c:3531
+#: src/LYOptions.c:3613
 msgid "Goto multi-bookmark menu"
 msgstr "Gå til multi-bogmærkemenu"
 
-#: src/LYOptions.c:3533
+#: src/LYOptions.c:3615
 msgid "Bookmarks file"
 msgstr "Bogmærkefil"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3539
+#: src/LYOptions.c:3621
 msgid "Visited Pages"
 msgstr "Besøgte sider"
 
-#: src/LYPrint.c:959
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr "Vis filen "
+
+#: src/LYPrint.c:952
 msgid " Print job complete.\n"
-msgstr "Udskrivningsjob fuldført.\n"
+msgstr " Udskrivningsjob fuldført.\n"
 
-#: src/LYPrint.c:1296
+#: src/LYPrint.c:1281
 msgid "Document:"
 msgstr "Dokument:"
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1282
 msgid "Number of lines:"
 msgstr "Antal linjer:"
 
-#: src/LYPrint.c:1298
+#: src/LYPrint.c:1283
 msgid "Number of pages:"
 msgstr "Antal sider:"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "pages"
 msgstr "sider"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "page"
 msgstr "side"
 
-#: src/LYPrint.c:1300
+#: src/LYPrint.c:1285
 msgid "(approximately)"
 msgstr "(cirka)"
 
-#: src/LYPrint.c:1305
+#: src/LYPrint.c:1290
 msgid "Some print functions have been disabled!"
 msgstr "Visse udskrivningsfunktioner er slået fra!"
 
-#: src/LYPrint.c:1309
+#: src/LYPrint.c:1294
 msgid "Standard print options:"
 msgstr "Standard valgmuligheder for udskrivning:"
 
-#: src/LYPrint.c:1310
+#: src/LYPrint.c:1295
 msgid "Print options:"
 msgstr "Valgmuligheder for udskrivning:"
 
-#: src/LYPrint.c:1316
+#: src/LYPrint.c:1302
 msgid "Save to a local file"
 msgstr "Gem i lokal fil"
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1304
 msgid "Save to disk disabled"
 msgstr "Gemning på disk er slået fra"
 
-#: src/LYPrint.c:1324
+#: src/LYPrint.c:1311
 msgid "Mail the file"
 msgstr "Send fil med post"
 
-#: src/LYPrint.c:1330
+#: src/LYPrint.c:1318
 msgid "Print to the screen"
 msgstr "Udskriv til skærm"
 
-#: src/LYPrint.c:1334
+#: src/LYPrint.c:1323
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Udskriv på printer tilknyttet en vt100-terminal"
 
-#: src/LYReadCFG.c:340
+#: src/LYReadCFG.c:339
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
 "The line must be of the form:\n"
@@ -4658,76 +4774,76 @@ msgstr ""
 "Her skal FORGRUND og BAGGRUND være en af:\n"
 "de særlige strenge 'nocolor' el. 'default', el.\n"
 
-#: src/LYReadCFG.c:353
+#: src/LYReadCFG.c:352
 msgid "Offending line:"
 msgstr "Problemskabende linje:"
 
-#: src/LYReadCFG.c:660
+#: src/LYReadCFG.c:638
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
-msgstr "taste-gentildeling af %s til %s for %s slog fejl\n"
+msgstr "tastetildeling af %s til %s for %s slog fejl\n"
 
-#: src/LYReadCFG.c:667
+#: src/LYReadCFG.c:645
 #, c-format
 msgid "key remapping of %s to %s failed\n"
-msgstr "taste-gentildeling af %s til %s slog fejl\n"
+msgstr "tastetildeling af %s til %s slog fejl\n"
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:666
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
-msgstr "ugyldigt linje-editor-valg %s for taste %s, vælger alt\n"
+msgstr "ugyldigt linje-editorvalg %s for taste %s, vælger alle\n"
 
-#: src/LYReadCFG.c:715 src/LYReadCFG.c:728
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr "tildeling af taste %s (0x%x) til 0x%x for %s i linje-editor slog fejl\n"
 
-#: src/LYReadCFG.c:733
+#: src/LYReadCFG.c:711
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr "tildeling af taste %s (0x%x) for %s i linje-editor slog fejl\n"
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:816
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
-msgstr "Lynx: Kan ikke starte, CERN regel-fil %s er ikke tilgængelig\n"
+msgstr "Lynx: Kan ikke starte, CERN-regelfil %s er ikke tilgængelig\n"
 
-#: src/LYReadCFG.c:840
+#: src/LYReadCFG.c:818
 msgid "(no name)"
 msgstr "(intet navn)"
 
-#: src/LYReadCFG.c:1658
+#: src/LYReadCFG.c:1782
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
-msgstr "Flere end %d indlejrede lynx.cfg-inkluderinger -- måske er der en sløjfe?1?\n"
+msgstr "Flere end %d indlejrede lynx.cfg-inkluderinger - måske en sløjfe!?\n"
 
-#: src/LYReadCFG.c:1660
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Sidst forsøgte inkludering var '%s',\n"
 
-#: src/LYReadCFG.c:1661
+#: src/LYReadCFG.c:1785
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "inkluderet fra '%s'.\n"
 
-#: src/LYReadCFG.c:2116 src/LYReadCFG.c:2129 src/LYReadCFG.c:2165
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
 msgid "The following is read from your lynx.cfg file."
 msgstr "Følgende er læst fra din lynx.cfg-fil."
 
-#: src/LYReadCFG.c:2117 src/LYReadCFG.c:2130
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
 msgid "Please read the distribution"
 msgstr "Læs venligst distributionen"
 
-#: src/LYReadCFG.c:2123 src/LYReadCFG.c:2133
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
 msgid "for more comments."
 msgstr "for flere kommentarer."
 
-#: src/LYReadCFG.c:2147
+#: src/LYReadCFG.c:2244
 msgid "RELOAD THE CHANGES"
 msgstr "GENINDLÆS ÆNDRINGERNE"
 
-#: src/LYReadCFG.c:2156
+#: src/LYReadCFG.c:2253
 msgid "Your primary configuration"
 msgstr "Din primære opsætning"
 
@@ -4741,7 +4857,7 @@ msgstr "Navn:"
 
 #: src/LYShowInfo.c:135
 msgid "URL:"
-msgstr "URL:"
+msgstr "Adresse:"
 
 #: src/LYShowInfo.c:146
 msgid "Directory that you have currently selected"
@@ -4781,7 +4897,7 @@ msgstr "Gruppes navn:"
 
 #: src/LYShowInfo.c:181
 msgid "File size:"
-msgstr "Filstr.: "
+msgstr "Filstr.:"
 
 #: src/LYShowInfo.c:187
 msgid "Creation date:"
@@ -4797,13 +4913,13 @@ msgstr "Sidst tilgået:"
 
 #: src/LYShowInfo.c:195
 msgid "Access Permissions"
-msgstr "Adgangstilladelser"
+msgstr "Adgangsrettigheder"
 
 #: src/LYShowInfo.c:261
 msgid "File that you are currently viewing"
 msgstr "Oplysninger om det aktuelle dokument:"
 
-#: src/LYShowInfo.c:266 src/LYShowInfo.c:375
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
 msgid "Linkname:"
 msgstr "Linknavn:"
 
@@ -4825,15 +4941,15 @@ msgstr "Sidst ret:"
 
 #: src/LYShowInfo.c:309
 msgid "&nbsp;Expires:"
-msgstr "&nbsp;udløber:"
+msgstr "&nbsp;Udløber:"
 
 #: src/LYShowInfo.c:313
 msgid "Cache-Control:"
-msgstr "Cache-styring:"
+msgstr "Cachestyring:"
 
 #: src/LYShowInfo.c:317
 msgid "Content-Length:"
-msgstr "Filstr.:"
+msgstr "'Content-Length':"
 
 #: src/LYShowInfo.c:322
 msgid "Language:"
@@ -4843,79 +4959,79 @@ msgstr "Sprog:"
 msgid "Post Data:"
 msgstr "'Post Data:'"
 
-#: src/LYShowInfo.c:331
+#: src/LYShowInfo.c:333
 msgid "Post Content Type:"
 msgstr "'Post Content Type:'"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:342
 msgid "Owner(s):"
 msgstr "Ejer(e):"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "size:"
 msgstr "Str:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "lines"
 msgstr "linjer"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:348
 msgid "mode:"
 msgstr "Tilstand:"
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:350
 msgid "forms mode"
-msgstr "formular-tilstand"
+msgstr "formulartilstand"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "source"
 msgstr "kilde"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:353
 msgid ", safe"
 msgstr ", sikker"
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:354
 msgid ", via internal link"
 msgstr ", via internt link"
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:360
 msgid ", no-cache"
 msgstr ", no-cache"
 
-#: src/LYShowInfo.c:360
+#: src/LYShowInfo.c:362
 msgid ", ISMAP script"
 msgstr ", ISMAP-script"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:364
 msgid ", bookmark file"
 msgstr ", bogmærkefil"
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:373
 msgid "Link that you currently have selected"
 msgstr "Aktuelt valgte link"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:386
 msgid "Method:"
 msgstr "Metode:"
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:391
 msgid "Enctype:"
-msgstr "Inktype:"
+msgstr "Kodtype:"
 
-#: src/LYShowInfo.c:401
+#: src/LYShowInfo.c:403
 msgid "(Form field)"
 msgstr "(Formularfelt)"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:418
 msgid "No Links on the current page"
 msgstr "Ingen links på denne side"
 
-#: src/LYStyle.c:250
+#: src/LYStyle.c:278
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -4925,7 +5041,7 @@ msgid ""
 "where OBJECT is one of EM,STRONG,B,I,U,BLINK etc.\n"
 "\n"
 msgstr ""
-"Syntaksfejl ved analyse af stilen i lss-fil:\n"
+"Syntaksfejl ved fortolkning af stil i lss-fil:\n"
 "[%s]\n"
 "Linjen skal være på formen:\n"
 "OBJECT:MONO:COLOR (ie em:bold:brightblue:white),\n"
@@ -4934,7 +5050,7 @@ msgstr ""
 
 #: src/LYTraversal.c:107
 msgid "here is a list of the history stack so that you may rebuild"
-msgstr "her er en liste over historik-stack'en, så du kan genopbygge"
+msgstr "her er en liste over historikstakken, så du kan genopbygge"
 
 #: src/LYUpload.c:78
 msgid "ERROR! - upload command is misconfigured"
@@ -4942,7 +5058,7 @@ msgstr "FEJL! - upload-kommandoen er sat forkert op"
 
 #: src/LYUpload.c:100
 msgid "Illegal redirection \"../\" found! Request ignored."
-msgstr "Ulovlig omdirigering \"../\" fundet! Anmodning ignoreret."
+msgstr "Ulovlig omdirigering \"../\" opdaget! Anmodning ignoreret."
 
 #: src/LYUpload.c:103
 msgid "Illegal character \"/\" found! Request ignored."
@@ -4956,65 +5072,69 @@ msgstr "Ulovlig omdirigering som bruger \"~\" fundet! Anmodning ignoreret."
 msgid "Unable to upload file."
 msgstr "Ude af stand til at uploade fil."
 
-#: src/LYUpload.c:214
+#: src/LYUpload.c:206
 msgid "Upload To:"
 msgstr "Upload til:"
 
-#: src/LYUpload.c:215
+#: src/LYUpload.c:207
 msgid "Upload options:"
 msgstr "Valgmuligheder for uploads:"
 
-#: src/LYUtils.c:3075
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr "Hjemtag dokument fra adressen på klippebord."
+
+#: src/LYUtils.c:2468
 msgid "Unexpected access protocol for this URL scheme."
-msgstr "Uventet adgangsprotokol for denne URL-type."
+msgstr "Uventet adgangsprotokol for denne adressetype."
 
-#: src/LYUtils.c:3915
+#: src/LYUtils.c:3294
 msgid "Too many tempfiles"
 msgstr "For mange tempfiler"
 
-#: src/LYUtils.c:4217
+#: src/LYUtils.c:3595
 msgid "unknown restriction"
 msgstr "ukendt begrænsning"
 
-#: src/LYUtils.c:4248
+#: src/LYUtils.c:3626
 msgid "No restrictions set.\n"
 msgstr "Ingen begrænsninger sat.\n"
 
-#: src/LYUtils.c:4251
+#: src/LYUtils.c:3629
 msgid "Restrictions set:\n"
 msgstr "Begrænsninger sat:\n"
 
-#: src/LYUtils.c:5601
-msgid "Ignoring invalid HOME"
-msgstr "Ignorerer ugyldig HOME"
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr "Kan ikke finde HOME-katalog"
 
-#: src/LYrcFile.c:20
+#: src/LYrcFile.c:21
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
-msgstr ""
+msgstr "Normalt slået fra. Se ENABLE_LYNXRC i lynx.cfg\n"
 
-#: src/LYrcFile.c:242
+#: src/LYrcFile.c:295
 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 ""
-"\"accept_all_cookies\" gør, at Lynx automatisk vil acceptere alle cookier,\n"
+"\"accept_all_cookies\" gør at Lynx automatisk vil acceptere alle cookier\n"
 "hvis dette ønskes. Standarden er \"FALSE\", hvilket vil lade hver cookie\n"
 "blive ledsaget af et spørgsmål, om den skal accepteres eller ej. Sæt\n"
 "\"accept_all_cookies\" til \"TRUE\" for at acceptere alle cookier.\n"
 
-#: src/LYrcFile.c:249
+#: src/LYrcFile.c:302
 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 ""
-"\"bookmark_file\" angiver navn og placering på standard bogmærkefilen\n"
+"\"bookmark_file\" angiver navn og placering på standard-bogmærkefilen\n"
 "som brugeren kan indsætte de links i, som han ønsker let adgang til\n"
 "på et senere tidspunkt.\n"
 
-#: src/LYrcFile.c:254
+#: src/LYrcFile.c:307
 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"
@@ -5024,7 +5144,7 @@ msgstr ""
 "mellem store og små bogstaver ved søgninger afgivet med 's' og '/'\n"
 "tasterne. Det normale er \"off\".\n"
 
-#: src/LYrcFile.c:259
+#: src/LYrcFile.c:312
 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"
@@ -5032,13 +5152,13 @@ msgid ""
 "set or using the 7 bit character approximations.\n"
 "Current valid characters sets are:\n"
 msgstr ""
-"\"character_set\" definitionen styrer, hvordan 8-bit tegn vises\n"
-"på din terminal. Hvis 8-bit tegn ikke vises korrekt på din skærm,\n"
-"kan du forsøge at skifte til et andet 8-bit tegnsæt eller bruge\n"
-"7-bit tegntilnærmelser.\n"
+"\"character_set\"-definitionen styrer hvordan 8-bit-tegn vises på\n"
+"din terminal. Hvis 8-bit-tegn ikke vises korrekt på din skærm, kan\n"
+"du forsøge at skifte til et andet 8-bit-tegnsæt eller bruge 7-bit\n"
+"tegntilnærmelser.\n"
 "Aktuelt gyldige tegnsæt er:\n"
 
-#: src/LYrcFile.c:266
+#: src/LYrcFile.c:319
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5047,12 +5167,12 @@ msgid ""
 "settings made here.\n"
 msgstr ""
 "\"cookie_accept_domains\" og \"cookie_reject_domains\" er en kommasepareret\n"
-"liste over domæner, hvorfra Lynx automatisk skal godkende eller afvise\n"
-"alle cookier.  Hvis et domæne er anført i begge indstillinger, vil afvisningen\n"
-"have forrang. \"accept_all_cookies\" parameteren vil tilsidesætte begge\n"
-"disse indstillinger.\n"
+"liste over domæner hvorfra Lynx automatisk skal godkende eller afvise\n"
+"alle cookier.  Hvis et domæne er anført i begge indstillinger, vil\n"
+"afvisningen have forrang. Parameteren \"accept_all_cookies\" vil\n"
+"tilsidesætte begge disse indstillinger.\n"
 
-#: src/LYrcFile.c:274
+#: src/LYrcFile.c:327
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/.lynx_cookies.\n"
@@ -5060,7 +5180,7 @@ msgstr ""
 "\"cookie_file\" angiver den fil som vedholdende cookier skal læses fra.\n"
 "Standarden er ~/.lynx_cookies.\n"
 
-#: src/LYrcFile.c:279
+#: src/LYrcFile.c:332
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5071,51 +5191,60 @@ msgid ""
 "querying the user for an invalid path or domain.\n"
 msgstr ""
 "\"cookie_loose_invalid_domains\", \"cookie_strict_invalid_domains\", og\"\n"
-"\"cookie_query_invalid_domains\" er en kommasepareret liste over, hvilke\n"
-"domæner der skal underkastes varierende grader af gyldighedstjek. If et\n"
-"domæne er sat til strengt tjek, vil en streng overholdelse af RFC2109\n"
-"blive krævet. Et domæne med et afslappet tjek vil blive tilladt at at\n"
-"sende cookier med en ugyldig sti eller domæneattribut. Alle domæner vil\n"
-"som standard spørge brugeren om en ugyldig sti eller domæne.\n"
-
-#: src/LYrcFile.c:292
+"\"cookie_query_invalid_domains\" er en kommasepareret liste over hvilke\n"
+"domæner der skal underkastes varierende grader af gyldighedstjek. hvis\n"
+"et domæne er sat til strengt tjek, vil en streng overholdelse af RFC2109\n"
+"blive krævet. Et domæne med et afslappet tjek vil blive tilladt at sende\n"
+"cookier med en ugyldig sti eller domæneattribut.  Alle domæner vil som\n"
+"standard spørge brugeren om en ugyldig sti eller domæne.\n"
+
+#: src/LYrcFile.c:346
+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 angiver katalogsortering under DIRED_SUPPORT\n"
+"(hvis implementeret).  Standarden er \"ORDER_BY_NAME\"\n"
+
+#: src/LYrcFile.c:351
 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 ""
-"\"dir_list_styles\" angiver stilen for visning af filkataloger under \n"
-"\"DIRED_SUPPORT\" (hvis indarbejdet). Standarden er \"MIXED_STYLE\", \n"
+"\"dir_list_styles\" angiver stilen for visning af filkataloger under\n"
+"\"DIRED_SUPPORT\" (hvis indarbejdet). Standarden er \"MIXED_STYLE\",\n"
 "hvilket sorterer såvel filer som kataloger sammen.  \"FILES_FIRST\"\n"
 "oplister filer først og \"DIRECTORIES_FIRST\" oplister filkataloger\n"
 "først.\n"
 
-#: src/LYrcFile.c:300
+#: src/LYrcFile.c:359
 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 ""
-"Hvis \"emac_keys\" er sat til \"til\", vil de normale EMACS bevægelsestaster:\n"
-"   ^N = ned        ^P = op\n"
-"   ^B = venstre    ^F = højre\n"
+"Hvis \"emac_keys\" er sat til \"til\", vil de normale EMACS navigationstaster:\n"
+"  ^N = ned        ^P = op\n"
+"  ^B = venstre    ^F = højre\n"
 "være slået til.\n"
 
-#: src/LYrcFile.c:306
+#: src/LYrcFile.c:365
 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 ""
-"\"file_editor\" angiver den editor der skal bruges ved redigering af lokale filer\n"
-"eller ved afsendelse af post. Hvis ingen editor er angivet, er filredigering \n"
-"slået fra, medmindre den er aktiveret fra kommandolinjen, og den indbyggede\n"
-"linje-editor vil blive brugt ved afsendelse af post.\n"
+"\"file_editor\" angiver den editor der skal bruges ved redigering af\n"
+"lokale filer eller ved afsendelse af post. Hvis ingen editor er\n"
+"angivet, er filredigering slået fra, medmindre den er aktiveret fra\n"
+"kommandolinjen, og den indbyggede linje-editor vil blive brugt ved\n"
+"afsendelse af post.\n"
 
-#: src/LYrcFile.c:312
+#: src/LYrcFile.c:371
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5131,7 +5260,7 @@ msgstr ""
 "   BY_SIZE     -- sorterer efter filstørrelse\n"
 "   BY_DATE     -- sorterer efter fildato\n"
 
-#: src/LYrcFile.c:324
+#: src/LYrcFile.c:389
 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"
@@ -5146,7 +5275,7 @@ msgid ""
 "Current lineedit modes are:\n"
 msgstr ""
 "\"lineedit_mode\" angiver de tastebindinger, der bruges for at indtaste\n"
-"tekststrenge ved prompter og i formularer. Hvis \"lineedit_mode\" er sat \n"
+"tekststrenge ved prompter og i formularer. Hvis \"lineedit_mode\" er sat\n"
 "til \"Default Binding\", vil flg. kontroltegn blive brugt for flytning\n"
 "og sletning:\n"
 "\n"
@@ -5158,20 +5287,20 @@ msgstr ""
 "\n"
 "Aktuelle tilstande ved linjeredigering er:\n"
 
-#: src/LYrcFile.c:339
+#: src/LYrcFile.c:404
 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 ""
-"Følgende giver dig mulighed for at definere sekundære bogmærkefiler med \n"
+"Følgende giver dig mulighed for at definere sekundære bogmærkefiler med\n"
 "tilhørende beskrivelser. Formatet er \"multi_bookmark\"<stort bogstav>=\n"
 "<filnavn>,<beskrivelse>. Indtil 26 bogmærkefiler (bogstaverne A-Z) er\n"
-"tilladt. Vi begynder med \"multi_bookmarkB\", idet \"A\" er standard \n"
+"tilladt. Vi begynder med \"multi_bookmarkB\", idet \"A\" er standard\n"
 "(se ovenfor).\n"
 
-#: src/LYrcFile.c:345
+#: src/LYrcFile.c:410
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5181,15 +5310,15 @@ msgid ""
 "could leave this field blank, but then you won't have it included in\n"
 "your mailed comments.\n"
 msgstr ""
-"\"personal_mail_address\" angiver din personlige postadresse. Denne\n"
+"\"personal_mail_address\" angiver din personlige e-post-adresse. Denne\n"
 "adresse vil blive afsendt under HTTP-filoverførsler med henblik på\n"
 "autorisation og logning samt for afsendelse af kommentarer pr. post.\n"
 "Sæt NO_FROM_HEADER til TRUE i lynx.cfg, eller brug -nofrom kommando-\n"
 "linje parameteren, hvis du ikke ønsker denne oplysning viderebragt.\n"
-"Du kan også lade dette felt stå tomt, men så vil din postadresse ikke\n"
+"Du kan også lade dette felt stå tomt, men så vil din e-post-adresse ikke\n"
 "blive medtaget i dine kommentarer sendt pr. post.\n"
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:419
 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"
@@ -5206,32 +5335,32 @@ msgid ""
 msgstr ""
 "\"preferred_charset\" angiver det tegnsæt i MIME-notation (f.eks.\n"
 "ISO-8859-2, ISO-8859-5), som Lynx vil tilkendegive er dit foretrukne,\n"
-"i forespørgsler til http-servere og ved brug af en \"Accept-Charset header\".\n"
-"Værdien bør IKKE indbefatte ISO-8859-1 eller US-ASCII, idet disse altid er\n"
-"underforståede som standard. Værdierne kan anføres på en kommasepareret liste.\n"
-"Hvis en fil i dette tegnsæt er tilgængelig, vil serveren sende den.\n"
-"Hvis ingen \"Accept-Charset\" header er til stede, er standarden at ethvert\n"
-"tegnsæt er acceptabelt. Hvis en \"Accept-Charset\" header er til stede,\n"
-"og hvis serveren ikke kan sende et acceptabelt svar i henhold til denne\n"
-"header, da BØR serveren sende en fejlmeddelelse, omend afgivelse af et\n"
-"ikke-acceptabelt svar også er tilladt.\n"
-
-#: src/LYrcFile.c:368
+"i forespørgsler til http-servere og ved brug af en \"Accept-Charset\n"
+"header \". Værdien bør IKKE indbefatte ISO-8859-1 eller US-ASCII, idet\n"
+"disse altid er underforståede som standard. Værdierne kan anføres på\n"
+"en kommasepareret liste. Hvis en fil i dette tegnsæt er tilgængelig,\n"
+"vil serveren sende den. Hvis ingen \"Accept-Charset\" header er til\n"
+"stede, er standarden at ethvert tegnsæt er acceptabelt. Hvis en\n"
+"\"Accept-Charset\"-header er til stede, og hvis serveren ikke kan sende\n"
+"et acceptabelt svar i henhold til denne header, da BØR serveren sende\n"
+"en fejlmeddelelse, omend afgivelse af et ikke-acceptabelt svar også er\n"
+"tilladt.\n"
+
+#: src/LYrcFile.c:433
 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 it's default language.\n"
+"Otherwise, the server will send the file in its default language.\n"
 msgstr ""
-"\"preferred_language\" angiver det sprog i MIME-notation (f.eks. en,\n"
-"fr, - kan være en komma-separeret liste af faldende præference)\n"
-"som Lynx vil tilkendegive er dit foretrukne i sine forespørgsler \n"
-"til http-servere. Hvis en fil på dette sprog er tilgængelig, vil\n"
-"serveren sende den. I modsat fald vil den sende filen på sit\n"
-"standardsprog.\n"
-
-#: src/LYrcFile.c:377
+"\"preferred_language\" angiver det sprog i MIME-notation (f.eks. \"en\",\n"
+"eller \"fr\", og kan være en komma-separeret liste af faldende præference)\n"
+"som Lynx vil tilkendegive er dit foretrukne i sine forespørgsler til\n"
+"http-servere. Hvis en fil på dette sprog er tilgængelig, vil serveren\n"
+"sende den. I modsat fald vil den sende filen på sit standardsprog.\n"
+
+#: src/LYrcFile.c:442
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5243,17 +5372,18 @@ msgid ""
 "          or compromise security.  This should only be set to \"on\" if\n"
 "          you are viewing trusted source information.\n"
 msgstr ""
-"Hvis \"run_all_execution_links\" er slået \"til\" vil alle lokale\n"
+"Hvis \"run_all_execution_links\" er sat til \"on\" vil alle lokale\n"
 "programafviklingslinks blive udført, når disse er valgt.\n"
 "\n"
-"ADVARSEL - Dette er potentielt MEGET farligt, eftersom du kan betragte\n"
-"           information, som er skrevet af ukendte og upålidelige kilder.\n"
-"           Der er mulighed for at links med \"trojanske heste\" kan skrives\n"
-"           med det formål at slette filer eller kompromittere sikkerheden.\n"
-"           Denne indstilling skal kun sættes til \"til\", hvis du betragter\n"
-"           information du kan stole på.\n"
-
-#: src/LYrcFile.c:388
+"ADVARSEL - Dette kan være MEGET farligt, eftersom du kan betragte\n"
+"           information, som er skrevet af ukendte og upålidelige\n"
+"           kilder. Der er mulighed for at links med \"trojanske heste\"\n"
+"           kan være skrevet med det formål at slette filer eller\n"
+"           kompromittere sikkerheden. Denne indstilling skal kun\n"
+"           sættes til \"on\", hvis du betragter information du kan\n"
+"           stole på.\n"
+
+#: src/LYrcFile.c:453
 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"
@@ -5268,20 +5398,20 @@ msgid ""
 "          or compromise security.  This should only be set to \"on\" if\n"
 "          you are viewing trusted source information.\n"
 msgstr ""
-"Hvis \"run_execution_links_on_local_files\" er slået \"til\", vil alle lokale\n"
-"programafviklingslinks, som forefindes i lokale filer blive udført, når\n"
-"disse vælges.  Dette er anderledes end \"run_all_execution_links\" i den\n"
-"forstand, at alene filer som ligger på det lokale system vil tilladelse\n"
-"til at blive eksekveret.\n"
+"Hvis \"run_execution_links_on_local_files\" er sat til \"on\", vil alle\n"
+"lokale programafviklingslinks, som forefindes i LOKALE filer blive\n"
+"udført, når disse vælges.  Dette er anderledes end\n"
+"\"run_all_execution_links\", i den forstand at alene filer som ligger på\n"
+"det lokale system vil have tilladelse til at blive eksekveret.\n"
 "\n"
 "ADVARSEL - Dette er potentielt MEGET farligt, eftersom du kan betragte\n"
 "           information, som er skrevet af ukendte og upålidelige kilder.\n"
-"           Der er mulighed for at links med \"trojanske heste\" kan skrives\n"
+"           Der er mulighed for at links med \"trojanske heste\" kan skrives,\n"
 "           med det formål at slette filer eller kompromittere sikkerheden.\n"
-"           Denne indstilling skal kun slås \"til\", hvis du betragter\n"
-"           information du kan stole på.\n"
+"           Denne indstilling skal kun sættes til \"on\", hvis du har fuld\n"
+"           tillid til den kilde hvorfra informationen stammer.\n"
 
-#: src/LYrcFile.c:403
+#: src/LYrcFile.c:471
 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"
@@ -5291,16 +5421,16 @@ msgid ""
 "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 ""
-"\"select_popups\" angiver om VALGMULIGHEDER i en \"SELECT\"-blok, som mangler en\n"
-"\"MULTIPLE\"-attribut bliver præsenteret som en lodret liste af radioknapper\n"
-"eller via en \"popup\"-menu. Bemærk, at hvis \"MULTIPLE\"-attributten er til\n"
-"stede i \"SELECT start tag\", vil Lynx altid oprette en ledret liste af\n"
-"afkrydsningsbokse for VALGMULIGHEDERNE.  En værdi af \"til\" vil sætte \n"
-"\"popup\"-menuer som standard, medens en værdi af \"fra\" vil sætte brugen\n"
-"af radiobokse. En standard kan tilsidesættes via \"-popup\" kommandolinje-\n"
-"parameteren.\n"
-
-#: src/LYrcFile.c:413
+"\"select_popups\" angiver om VALGMULIGHEDER i en \"SELECT\"-blok, som \n"
+"mangler en \"MULTIPLE\"-attribut bliver præsenteret som en lodret liste\n"
+"af radioknapper eller via en pop op-menu. Bemærk at hvis\n"
+"\"MULTIPLE\"-attributten er til stede i \"SELECT start tag\", vil Lynx\n"
+"altid oprette en lodret liste af afkrydsningsbokse for\n"
+"VALGMULIGHEDERne.  En værdi af \"on\" vil sætte pop op-menuer som\n"
+"standard, medens en værdi af \"off\" vil sætte brugen af radiobokse. En\n"
+"standard kan tilsidesættes med kommandolinje-parameteret \"-popup\".\n"
+
+#: src/LYrcFile.c:481
 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"
@@ -5318,21 +5448,23 @@ msgid ""
 "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 ""
-"\"show_color\" angiver, hvorledes farveindstillingen skal være ved opstart.\n"
-"En værdi på \"aldrig\" vil slå farver fra (som på en monokrom skærm) ved opstart,\n"
-"selvom der er tale om en farveskærm. En værdi på \"altid\" vil slå farver til,\n"
-"selvom der er tale om en monokrom skærm, såfremt dette er understøttet af det\n"
-"terminalbibliotek, som Lynx er baseret på. En værdi på \"standard\" vil medføre,\n"
-"at en monokrom skærm antages, medmindre farveegenskaber antydes ved opstart,\n"
-"enten ud fra skærmtypen, eller ved brug af \"-color\" kommandolinje-parameteren,\n"
-"eller hvis COLORTERM miljøvariablen er sat.  \"Standard\"-indstilingen bruges\n"
-"altid i anonyme konti, eller hvis \"option_save\" begrænsningen er sat.\n"
-"Virkningen af den gemte værdi kan tilsidesættes via \"-color\" og \"-nocolor\"\n"
-"kommandolinje-parametrene. Startindstillingen kan ændres via \"vis farve\"\n"
-"valgmuligheden i 'o'psætningsmenuen.  Hvis indstillingerne er gemt, vil \n"
-"farveindstilingerne blive opfattet som \"standard\".\n"
-
-#: src/LYrcFile.c:430
+"\"show_color\" angiver, hvorledes farveindstillingen skal være ved\n"
+"opstart. En værdi på \"aldrig\" vil slå farver fra (som på en monokrom\n"
+"skærm) ved opstart, selvom der er tale om en farveskærm. En værdi på\n"
+"\"altid\" vil slå farver til, selvom der er tale om en monokrom skærm,\n"
+"såfremt dette er understøttet af det terminalbibliotek, som Lynx er\n"
+"baseret på. En værdi på \"standard\" vil medføre, at en monokrom skærm\n"
+"antages, medmindre farveegenskaber antydes ved opstart, enten ud fra\n"
+"skærmtypen, eller ved brug af kommandolinje-parameteret \"-color\",\n"
+"eller hvis miljøvariablen COLORTERM er sat.  \"Standard\"-indstilingen\n"
+"bruges altid i anonyme konti, eller hvis \"option_save\"-begrænsningen\n"
+"er sat. Virkningen af den gemte værdi kan tilsidesættes med\n"
+"kommandolinje-parametrene\" -color\" og \"-nocolor \". Startindstillingen\n"
+"kan ændres med \"vis farve\" valgmuligheden i 'o'psætningsmenuen.  Hvis\n"
+"indstillingerne er gemt, vil farveindstilingerne blive opfattet som\n"
+"\"standard\".\n"
+
+#: src/LYrcFile.c:498
 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"
@@ -5344,18 +5476,18 @@ 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\" angiver om markøren skal gemmes væk i skærmen højre side \n"
+"\"show_cursor\" angiver om markøren skal gemmes væk i skærmen højre side\n"
 "(og hvis muligt også skærmens bund), eller om den skal placeres til\n"
-"venstre for det aktuelle link i dokumenter hhv. ved aktuelle valgmulighed\n"
-"i udvælgelses-\"popup\"-vinduer. Placering af markør til venstre for det\n"
-"aktuelle link eller valgmulighed er hensigtsmæssigt for tale- eller Braille-\n"
-"brugerflader, og hvor skærmen er af en type som ikke kan skelne det\n"
-"aktuelle link på baggrund af lysmarkering eller farve. En værdi af \"til\"\n"
-"vil sætte placeringen til venstre som standard, medens en værdi af \"fra\"\n"
-"vil skjule markøren.\n"
-"Standarden kan tilsidesættes vil \"-show-cursur\" kommandolinje-parameteren.\n"
-
-#: src/LYrcFile.c:441
+"venstre for det aktuelle link i dokumenter hhv. ved aktuelle\n"
+"valgmulighed i pop op-vinduer. Placering af markør til venstre for det\n"
+"aktuelle link eller valgmulighed er hensigtsmæssigt for tale- eller\n"
+"Braille-brugerflader, og hvor skærmen er af en type som ikke kan\n"
+"skelne det aktuelle link på baggrund af lysmarkering eller farve. En\n"
+"værdi af \"on\" vil sætte placeringen til venstre som standard, medens\n"
+"en værdi af \"off\" vil skjule markøren.  Standarden kan tilsidesættes\n"
+"med kommandolinje-parameteret \"-show-cursur\".\n"
+
+#: src/LYrcFile.c:509
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5364,13 +5496,13 @@ msgid ""
 "is disabled, creation of such files via Lynx also is disabled.\n"
 msgstr ""
 "\"show_dotfiles\" angiver, at \"skjulte\" punktumfiler/-kataloger vises i\n"
-"filoversigterne. Hvis slået \"til\" vil det kun blive respekteret, \n"
-"såfremt det er gjort virksomt via userdefs.h og/eller lynx.cfg\n"
-"og ikke begrænset via en kommandolinje-parameter. Hvis visning af\n"
-"skjulte filer er slået fra, vil mulighed for oprettelse af sådanne \n"
-"via Lynx ligeledes være slået fra<.\n"
+"filoversigterne. Hvis sat til \"on\", vil det kun blive respekteret,\n"
+"såfremt det er gjort virksomt via userdefs.h og/eller lynx.cfg og ikke\n"
+"er slået fra via kommandolinjen. Hvis visning af skjulte filer er\n"
+"slået fra (off), vil mulighed for oprettelse af sådanne via Lynx\n"
+"ligeledes være slået fra.\n"
 
-#: src/LYrcFile.c:452
+#: src/LYrcFile.c:520
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5382,18 +5514,18 @@ msgid ""
 "user modes.  When this option is set to \"standard\", the menu will be\n"
 "presented regardless of user mode.\n"
 msgstr ""
-"Hvis \"sub_bookmarks\" ikke er sat til \"off\", og multi-bogmærker er\n"
-"defineret (se nedenfor), så vil brugeren, i forbindelse med alle\n"
-"bogmærke-operationer, først blive bedt om at vælge en aktiv sekundær \n"
-"bogmærkefil.  Hvis den gængse \"Lynx bookmark_file\" er defineret \n"
-"(se ovenfor), vil denne blive brugt som første valg. Når denne\n"
-"valgmulighed er sat til \"advanced\" og brugermodus er avanceret, vil\n"
-"'v'is bogmærke-kommandoen præsentere en statuslinjeprompt i stedet\n"
-"for den menu som fremkommer i begynder og viderekommende \n"
-"brugertilstande. Når denne valgmulighed er sat til \"standard\",\n"
-"vil menuen fremkomme, uanset brugermodus.\n"
-
-#: src/LYrcFile.c:464
+"Hvis \"sub_bookmarks\" ikke er sat til \"off\", og multibogmærker er\n"
+"defineret (se nedenfor), så vil brugeren i forbindelse med alle\n"
+"bogmærke-operationer, først blive bedt om at vælge en aktiv sekundær\n"
+"bogmærkefil.  Hvis den gængse \"Lynx bookmark_file\" er defineret (se\n"
+"ovenfor), vil denne blive brugt som første valg. Når denne valgmulighed\n"
+"er sat til \"advanced\" og brugertilstand er \"advanced\", vil kommandoen\n"
+"'v'is bogmærke give en statuslinjeprompt, i stedet for den menu som\n"
+"fremkommer i brugertilstandene \"novice\" og \"intermediate\". Når denne\n"
+"valgmulighed er sat til \"standard\", vil menuen fremkomme, uanset\n"
+"brugertilstand.\n"
+
+#: src/LYrcFile.c:533
 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"
@@ -5405,11 +5537,11 @@ msgstr ""
 "\"user_mode\" angiver en brugers kompetanceniveau i Lynx. Standarden er\n"
 "\"NOVICE\", hvilket betyder at to ekstra linjer med hjælpetekst bliver\n"
 "vist i bunden af skærmen for at hjælpe brugeren med at lære de basale\n"
-"Lynx-kommandoer. Set \"user_mode\" til \"INTERMEDIATE\" for at slå disse \n"
-"ekstra oplysninger fra, Brug \"ADVANCED\" for at se URL'en på det aktuelt\n"
-"valgte link i bunden af skærmen.\n"
+"Lynx-kommandoer. Sæt \"user_mode\" til \"INTERMEDIATE\" for at slå disse\n"
+"ekstra oplysninger fra, Brug \"ADVANCED\" for at se URL'en på det\n"
+"aktuelt valgte link i bunden af skærmen.\n"
 
-#: src/LYrcFile.c:472
+#: src/LYrcFile.c:542
 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"
@@ -5419,7 +5551,7 @@ msgstr ""
 "et billedlinks kildefil i stedet for [INLINE], [LINK] eller [IMAGE]\n"
 "Se også \"VERBOSE_IMAGES\" i lynx.cfg\n"
 
-#: src/LYrcFile.c:477
+#: src/LYrcFile.c:547
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5429,21 +5561,21 @@ msgid ""
 "and the keymap display, respectively.\n"
 msgstr ""
 "Hvis \"vi_keys\" er sat til \"til\", vil de normale VI bevægelsestaster:\n"
-"   J = ned        K = op\n"
-"   h = venstre    I = højre\n"
+"  J = ned        K = op\n"
+"  h = venstre    I = højre\n"
 "være slået til. Disse taster virker kun som små bogstaver.\n"
-"Stort 'H', 'J' og 'K' vil stadig aktivere henholdsvis hjælp, \n"
+"Stort 'H', 'J' og 'K' vil stadig aktivere henholdsvis hjælp,\n"
 "hop-genveje og oversigt over tastebindinger.\n"
 
-#: src/LYrcFile.c:485
+#: src/LYrcFile.c:555
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
 msgstr ""
-"\"visited_links\" indstillingen styrer, hvorledes Lynx organiserer oplysningerne\n"
-"i siden over besøgte links.\n"
+"\"visited_links\" styrer hvorledes Lynx organiserer oplysningerne i siden\n"
+"over besøgte links.\n"
 
-#: src/LYrcFile.c:693
+#: src/LYrcFile.c:772
 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"
@@ -5461,15 +5593,15 @@ msgstr ""
 "og de tilsvarende numeriske taster på tastaturet vil virke som piletaster,\n"
 "uanset om numlock er slået til eller ej\n"
 
-#: src/LYrcFile.c:702
+#: src/LYrcFile.c:781
 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 ""
 "Hvis \"keypad_mode\" er sat til \"LINKS_ARE_NUMBERED\", vil hvert link\n"
-"være ledsaget af et nummer, og disse bruges til at vælge linkene.\n"
+"være ledsaget af et nummer og disse bruges til at vælge linkene.\n"
 
-#: src/LYrcFile.c:706
+#: src/LYrcFile.c:785
 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"
@@ -5479,16 +5611,17 @@ msgid ""
 "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 ""
-"Hvis \"keypad_mode\" er sat til \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", vil\n"
-"der komme til at stå et tal ved siden af hvert link og synligt formular-\n"
-"indtastningsfelt. Tallene bruges til at vælge linkene, eller for at flytte\n"
-"det \"aktuelle link\" til et formularindtastningsfelt eller -knap. I tilgift\n"
-"er valgmulighed i \"popup\"-menuer indekserede, således at brugeren kan indtaste\n"
-"et tal for at vælge en indstillingsmulighed i \"popup\"-menuen, selvom denne\n"
-"ikke er synlig på skærmen. Henvisningsoversigter og uddata fra \n"
-"\"list\"-kommandoen opregner også formularindtastninger.\n"
-
-#: src/LYrcFile.c:715
+"Hvis \"keypad_mode\" er sat til \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\",\n"
+"vil der komme til at stå et tal ved siden af ethvert link og synligt\n"
+"formularindtastningsfelt. Tallene bruges til at vælge linkene, eller\n"
+"for at flytte det \"aktuelle link\" til et formularindtastningsfelt eller\n"
+"-knap. I tilgift er valgmuligheder i pop op-menuer indekserede, således\n"
+"at brugeren kan indtaste et tal for at vælge en indstillingsmulighed\n"
+"i pop op-menuen, selvom denne ikke er synlig på skærmen. Oversigter\n"
+"over links og uddata fra \"list\"-kommandoen nummererer også\n"
+"formularindtastninger.\n"
+
+#: src/LYrcFile.c:794
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -5498,7 +5631,7 @@ msgstr ""
 "\"LINKS_ARE_NUMBERED\" eller \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" er\n"
 "slået til.\n"
 
-#: src/LYrcFile.c:748
+#: src/LYrcFile.c:827
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -5513,10 +5646,11 @@ msgid ""
 msgstr ""
 "Lynxfil for brugers standardindstilinger\n"
 "\n"
-"Denne fil indeholder de indstillinger, som er gemt fra Lynx' opsætningsmenu \n"
-"(normalt gemt med \">\"-tasten). Der er normalt ingen grund til at redigere \n"
-"denne fil manuelt. eftersom standarderne heri kan styres fra opsætningsmenuen,\n"
-"og næste gang indstillingerne er gemt fra opsætningsmenuen vil denne fil blive\n"
-"fuldstændig omskrevet.  Du er blevet advaret...\n"
-"Hvis du er ude efter en almen opsætningsfil - den hedder sædvanligvis lynx.cfg,\n"
-"og har et andet indhold og format - så er det ikke denne fil.\n"
+"Denne fil indeholder de indstillinger, som er gemt fra Lynx'\n"
+"opsætningsmenu (normalt gemt med \">\"-tasten). Der er normalt ingen\n"
+"grund til at redigere denne fil manuelt, eftersom standarderne heri\n"
+"kan styres fra opsætningsmenuen, og næste gang indstillingerne er gemt\n"
+"fra opsætningsmenuen vil denne fil blive fuldstændig omskrevet. Du er\n"
+"blevet advaret...\n"
+"Hvis du er ude efter en almen opsætningsfil - den hedder sædvanligvis\n"
+"lynx.cfg, og har et andet indhold og format - så er det ikke denne fil.\n"
diff --git a/gnu/usr.bin/lynx/po/de.po b/gnu/usr.bin/lynx/po/de.po
index 1a3b46a9024..8093fb19e9f 100644
--- a/gnu/usr.bin/lynx/po/de.po
+++ b/gnu/usr.bin/lynx/po/de.po
@@ -1,6 +1,8 @@
 # German translations for the `lynx' program.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
+# Karl Eichwalder <ke@suse.de>, 2002-2003.
 # Erwin Dieterich <bamse@gmx.de>, 2000.
+# Klaus Weide <kweide@enteract.com>, 1999.
 #
 # The TRANSLATIONS in this file are in the public domain.
 # This does not apply to the included original strings, which were
@@ -12,15 +14,19 @@
 # Maintainer since July 1999:
 # Erwin Dieterich <bamse@gmx.de>, 1999.
 #
+# Minor additions since March 2002:
+# Karl Eichwalder <ke@suse.de>, 2002.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.4\n"
-"POT-Creation-Date: 2001-06-01 18:55-0400\n"
-"PO-Revision-Date: 2000-05-03 02:59-05:00\n"
-"Last-Translator: Erwin Dieterich <bamse@gmx.de>\n"
+"Project-Id-Version: lynx 2.8.5pre15\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-0500\n"
+"PO-Revision-Date: 2003-06-04 15:36+0200\n"
+"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. ******************************************************************
@@ -36,7 +42,7 @@ msgstr ""
 #. * Links to collections of alternate definitions, developed by the Lynx
 #. * User Community, are maintained in Lynx links:
 #. *
-#. *    http://www.trill-home.com/lynx.html
+#. *    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
@@ -51,389 +57,389 @@ msgstr "Obacht: %s"
 msgid "Welcome"
 msgstr "Willkommen"
 
-#: LYMessages.c:31 LYMessages.c:32
+#: LYMessages.c:31
 msgid "Are you sure you want to quit?"
 msgstr "Programm wirklich beenden?"
 
-#: LYMessages.c:34 LYMessages.c:35
+#: LYMessages.c:33
 msgid "Really exit from Lynx?"
 msgstr "Willst du wirklich raus?"
 
-#: LYMessages.c:37
+#: LYMessages.c:35
 msgid "Connection interrupted."
 msgstr "Verbindung abgebrochen."
 
-#: LYMessages.c:38
+#: LYMessages.c:36
 msgid "Data transfer interrupted."
 msgstr "Datentransfer abgebrochen."
 
-#: LYMessages.c:39
+#: LYMessages.c:37
 msgid "Cancelled!!!"
-msgstr "Abgebrochen!!!"
+msgstr "Abgebrochen!"
 
-#: LYMessages.c:40
+#: LYMessages.c:38
 msgid "Cancelling!"
 msgstr "Abgebrochen!"
 
-#: LYMessages.c:41
+#: LYMessages.c:39
 msgid "Excellent!!!"
 msgstr "Prima!"
 
 # This message is kinda stupid... - kw
-#: LYMessages.c:42
+#: LYMessages.c:40
 msgid "OK"
 msgstr "OK"
 
-#: LYMessages.c:43
+#: LYMessages.c:41
 msgid "Done!"
 msgstr "Fertig!"
 
-#: LYMessages.c:44
+#: LYMessages.c:42
 msgid "Bad request!"
 msgstr "Fehlerhafter Request!"
 
-#: LYMessages.c:45
+#: LYMessages.c:43
 msgid "previous"
 msgstr "vorhergehender"
 
-#: LYMessages.c:46
+#: LYMessages.c:44
 msgid "next screen"
-msgstr "nächste Seite"
+msgstr "nächste Seite"
 
-#: LYMessages.c:47
+#: LYMessages.c:45
 msgid "HELP!"
 msgstr "HILFE!"
 
-#: LYMessages.c:48
+#: LYMessages.c:46
 msgid ", help on "
-msgstr ", Hilfe über "
+msgstr ", Hilfe über "
 
 #. #define HELP
-#: LYMessages.c:50
+#: LYMessages.c:48
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
-msgstr "Pfeiltasten zum Bewegen, '?': Hilfe, 'q': Programmende, '<-': zurück"
+msgstr "Pfeiltasten zum Bewegen, '?': Hilfe, 'q': Programmende, '<-': zurück"
 
 #. #define MOREHELP
-#: LYMessages.c:52
+#: LYMessages.c:50
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
-msgstr "-- Leertaste für mehr, Pfeiltasten zum Bewegen, '?': Hilfe, 'q': Programmende"
+msgstr "-- Leertaste für mehr, Pfeiltasten zum Bewegen, '?': Hilfe, 'q': Programmende"
 
-#: LYMessages.c:53
+#: LYMessages.c:51
 msgid "-- press space for next page --"
-msgstr "-- Leertaste für nächste Seite --"
+msgstr "-- Leertaste für nächste Seite --"
 
-#: LYMessages.c:54
+#: LYMessages.c:52
 msgid "URL too long"
 msgstr "URL zu lang"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:60
+#: LYMessages.c:58
 msgid "(Text entry field) Inactive.  Press <return> to activate."
-msgstr "(Texteingabefeld) nicht aktiviert. Zum Aktivieren <Return> eingeben."
+msgstr "(Texteingabefeld) nicht aktiv. Zum Aktivieren <Return> eingeben."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:60
 msgid "(Textarea) Inactive.  Press <return> to activate."
-msgstr "(Textbereich) nicht aktiviert. Zum Aktivieren <Return> eingeben."
+msgstr "(Textbereich) nicht aktiv. Zum Aktivieren <Return> eingeben."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:64
+#: LYMessages.c:62
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
-msgstr "(Textregion) nicht aktiv. Zum Aktivieren <Return> drücken (%s für Editor)."
+msgstr "(Textregion) nicht aktiv. Zum Aktivieren <Return> drücken (%s für Editor)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:64
 msgid "(Form field) Inactive.  Use <return> to edit."
-msgstr "(Formfeld) inaktiv. <Return> zum Editieren."
+msgstr "(Formfeld) nicht aktiv. <Return> zum Editieren."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:68
+#: LYMessages.c:66
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
-msgstr "(Formfeld) inaktiv. <Return> zum Editieren (%s zum Abschicken ohne Zwischenspeicher (Cache))."
+msgstr "(Formfeld) nicht aktiv. <Return> zum Editieren (%s: Abschicken ohne Zwischenspeicher (Cache))."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:68
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
-msgstr "(Formfeld) nicht aktiviert. Eingabetaste zum Editieren, Zweimal Eingabetaste zm Abschicken"
+msgstr "(Formfeld) nicht aktiv. <return> zum Editieren, zweimal <return> zum Abschicken."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:72
+#: LYMessages.c:70
 msgid "(mailto form field) Inactive.  Press <return> to change."
-msgstr "(Mailto-Formfeld) nicht aktiv. Zum Ändern Eingabetaste dücken."
+msgstr "(Mailto-Formfeld) nicht aktiv. Zum Ändern <return> dücken."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:74
+#: LYMessages.c:72
 msgid "(Password entry field) Inactive.  Press <return> to activate."
-msgstr "(Passwort-Eingabefeld) nicht aktiv. Zum Aktivieren Eingabetaste dücken."
+msgstr "(Passwort-Eingabefeld) nicht aktiv. Zum Aktivieren <return> dücken."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:77
+#: LYMessages.c:75
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
-msgstr "NICHTVERÄNDERBARES Formfeld. Verlassen mit Rauf- oder Runter-Pfeiltaste oder TAB."
+msgstr "NICHTVERÄNDERBARES Formfeld. Verlassen mit Auf- oder Ab-Pfeiltaste oder TAB."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:77
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Texteingabefeld) Text eingeben. Verlassen mit Rauf- oder Runter-Pfeiltaste oder TAB."
+msgstr "(Texteingabefeld) Text eingeben. Verlassen mit Auf- oder Ab-Pfeiltaste oder TAB."
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:81
+#: LYMessages.c:79
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Texteingabefeld) Text eingeben. Verlassen mit Rauf- und Runter-Pfeiltasten."
+msgstr "(Texteingabefeld) Text eingeben. Verlassen mit Auf- oder Ab-Pfeiltaste oder TAB."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:83
+#: LYMessages.c:81
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
-msgstr "(Textregion) Text eingeben. Mit AUF/AB-Pfeiltasten verlassen."
+msgstr "(Textregion) Text eingeben. Mit Auf/Ab-Pfeiltaste oder TAB verlassen."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:85
+#: LYMessages.c:83
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
-msgstr "(Textregion) Text eingeben. Verlassen mit Pfeiltasten oder TAB (%s für Editor)."
+msgstr "(Textregion) Text eingeben. Verlassen mit Pfeiltasten oder TAB (%s für Editor)."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:87
+#: LYMessages.c:85
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
-msgstr "NICHTVERÄNDERBARES Form-Textfeld. Verlassen mit Rauf- und Runter-Pfeiltasten."
+msgstr "NICHTVERÄNDERBARES Form-Textfeld. Verlassen mit Auf- oder Ab-Pfeiltaste oder TAB."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:87
 msgid "(Form field) Enter text.  Use <return> to submit."
-msgstr "(Formfeld) Text eingeben. Eingabetaste zum Losschicken."
+msgstr "(Formfeld) Text eingeben. <return> zum Abschicken."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:91
+#: LYMessages.c:89
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
-msgstr "(Formfeld) Text eingeben. Eingabetaste zum Losschicken (%s: Cache umgehen)."
+msgstr "(Formfeld) Text eingeben. <return> zum Abschicken (%s: Cache umgehen)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:93
+#: LYMessages.c:91
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
-msgstr "(Formfeld) Text Eingeben. Eingabetaste zum Losschicken, Pfeile/Tab.: Verlassen"
+msgstr "(Formfeld) Text eingeben. <return> zum Abschicken, Pfeiltasten/TAB: Verlassen."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:95
+#: LYMessages.c:93
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
-msgstr "NICHTVERÄNDERBARES Formfeld. Verlassen mit Rauf- und Runter-Pfeiltasten."
+msgstr "NICHTVERÄNDERBARES Formfeld. Verlassen mit Auf- oder Ab-Pfeiltaste."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:97
+#: LYMessages.c:95
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
-msgstr "(Mailto-Formfeld) Text Eingeben. Eingabetaste: Losschicken, Pfeile: Verlassen"
+msgstr "(Mailto-Formfeld) Text eingeben. <return>: Abschicken, Pfeiltasten: Verlassen"
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:99
+#: LYMessages.c:97
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
-msgstr "(Mailto-Formfeld) Schicken nicht möglich, da Mail nicht erlaubt ist."
+msgstr "(Mailto-Formfeld) Schicken nicht möglich, da Mail nicht erlaubt ist."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:99
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Passwort-Eingabefeld) Text Eingeben. Rauf- und Runter-Pfeiltasten: Verlassen"
+msgstr "(Passwort-Eingabefeld) Text Eingeben. Auf- oder Ab-Pfeiltasten: Verlassen"
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:101
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
-msgstr "NICHTVERÄNDERBARES Form-Passwort. Rauf- und Runter-Pfeiltasten zum Verlassen."
+msgstr "NICHTVERÄNDERBARES Form-Passwort. Rauf- und Runter-Pfeiltasten zum Verlassen."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:103
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
-msgstr "(Checkbox-Feld)   Ein-/Ausschalten mit rechter Pfeiltaste oder Eingabetaste."
+msgstr "(Checkbox-Feld)   Ein-/Ausschalten mit rechter Pfeiltaste oder <return>."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:105
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
-msgstr "NICHTVERÄNDERBARE Form-Checkbox. Rauf- und Runter-Pfeiltasten zum Verlassen."
+msgstr "NICHTVERÄNDERBARE Form-Checkbox. Auf- oder Ab-Pfeiltaste oder TAB zum Verlassen."
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:109
+#: LYMessages.c:107
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
-msgstr "(Radiotaste)      Ein-/Ausschalten mit rechter Pfeiltaste oder Eingabetaste."
+msgstr "(Radiotaste)      Ein-/Ausschalten mit rechter Pfeiltaste oder <return>."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:111
+#: LYMessages.c:109
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
-msgstr "NICHTVERÄNDERBARE Form-Radiotaste. Rauf- und Runter-Pfeiltasten zum Verlassen."
+msgstr "NICHTVERÄNDERBARE Form-Radiotaste. Auf- oder Ab-Pfeiltaste oder TAB zum Verlassen."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:113
+#: LYMessages.c:111
 msgid "Submit ('x' for no cache) to "
 msgstr "Eingabe: Schicken ('x': ohne Cache) zu "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:115
+#: LYMessages.c:113
 msgid "Submit to "
 msgstr "Eingabe: Schicken zu "
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:117
+#: LYMessages.c:115
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
-msgstr "(Form-Submit-Button) Rechter Pfeil / Eingabetaste: Schicken ('x': ohne Cache)"
+msgstr "(Form-Submit-Button) Rechter Pfeiltaste / <return>: Schicken ('x': ohne Cache)"
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:119
+#: LYMessages.c:117
 msgid "(Form submit button) Use right-arrow or <return> to submit."
-msgstr "(Form-Submit-Button) Rechter Pfeil oder Eingabetaste zum Losschicken"
+msgstr "(Form-Submit-Button) Rechter Pfeiltaste oder <return> zum Abschicken"
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:121
+#: LYMessages.c:119
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
-msgstr "AUSGESCHALTETER Form-Submit-Button. Rechter Pfeil / Eingabetaste zum Verlassen."
+msgstr "\\AUSGESCHALTETER Form-Submit-Button. Rechter Pfeiltaste / <return> zum Verlassen."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:123
+#: LYMessages.c:121
 msgid "Submit mailto form to "
 msgstr "Eingabe: Mailto-Form schicken an "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:125
+#: LYMessages.c:123
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
-msgstr "(Mailto-Form-Submit-Button) Rechte Pfeiltaste oder Eingabetaste: Losschicken."
+msgstr "(Mailto-Form-Submit-Button) Rechte Pfeiltaste oder <return>: Abschicken."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:125
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
-msgstr "(Mailto-Form-Submit-Button) Schicken nicht möglich, da Mail nicht erlaubt ist."
+msgstr "(Mailto-Form-Submit-Button) Schicken nicht möglich, da Mail nicht erlaubt ist."
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:127
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
-msgstr "(Form-Resetbutton) Rechter Pfeil/Eingabetaste: zu Ausgangszustand zurücksetzen."
+msgstr "(Form-Resetbutton) Rechter Pfeiltaste / <return>: zu Ausgangszustand zurücksetzen."
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:129
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
-msgstr "AUSGESCHALTETER Form-Resetbutton. Rauf- und Runter-Pfeiltasten zum Verlassen."
+msgstr "AUSGESCHALTETER Form-Resetbutton. Auf- und Ab-Pfeiltasten oder TAB zum Verlassen."
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:131
 msgid "(Option list) Hit return and use arrow keys and return to select option."
-msgstr "(Optionsliste) Eingabetaste drücken und Pfeiltasten zur Optionswahl werwenden."
+msgstr "(Optionsliste) Eingabetaste drücken und Pfeiltasten zur Optionswahl werwenden."
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:133
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
-msgstr "(Auswahlliste) Eingabetaste drücken und Pfeiltasten zur Optionswahl werwenden."
+msgstr "(Auswahlliste) Eingabetaste drücken und Pfeiltasten zur Optionswahl werwenden."
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:135
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
-msgstr "NICHTVERÄNDERBARE Optionsliste. Eingabetaste / Pfeile zum Ansehen / Verlassen."
+msgstr "NICHTVERÄNDERBARE Optionsliste. Eingabetaste / Pfeile zum Ansehen / Verlassen."
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:137
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
-msgstr "NICHTVERÄNDERBARE Auswahlliste. Eingabetaste / Pfeile zum Ansehen / Verlassen."
+msgstr "NICHTVERÄNDERBARE Auswahlliste. Eingabetaste / Pfeile zum Ansehen / Verlassen."
 
-#: LYMessages.c:140
+#: LYMessages.c:138
 msgid "Submitting form..."
 msgstr "Form wird geschickt..."
 
-#: LYMessages.c:141
+#: LYMessages.c:139
 msgid "Resetting form..."
-msgstr "Form wird zurückgesetzt..."
+msgstr "Form wird zurückgesetzt..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:141
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Dokument wird nachgeladen. Alle Formeingaben gehen verloren!"
 
-#: LYMessages.c:144
+#: LYMessages.c:142
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
-msgstr "Warnung: Formdaten können nicht in Zeichensatz %s übersetzt werden!"
+msgstr "Warnung: Formdaten können nicht in Zeichensatz %s übersetzt werden!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:147
+#: LYMessages.c:145
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
-msgstr "(NORMALER LINK) Rechte Pfeiltaste oder Eingabetaste zum Aktivieren verwenden."
+msgstr "(NORMALER LINK) Rechte Pfeiltaste oder <return> zum Aktivieren verwenden."
 
-#: LYMessages.c:148
+#: LYMessages.c:146
 msgid "The resource requested is not available at this time."
-msgstr "Angeforderte Resource ist zur Zeit nicht verfügbar."
+msgstr "Angeforderte Ressource ist zur Zeit nicht verfügbar."
 
-#: LYMessages.c:149
+#: LYMessages.c:147
 msgid "Enter Lynx keystroke command: "
 msgstr "Lynx-Tastenbefehl eingeben: "
 
-#: LYMessages.c:150
+#: LYMessages.c:148
 msgid "Looking up "
 msgstr "Suche nach "
 
-#: LYMessages.c:151
+#: LYMessages.c:149
 #, c-format
 msgid "Getting %s"
 msgstr "%s wird geholt..."
 
-#: LYMessages.c:152
+#: LYMessages.c:150
 #, c-format
 msgid "Skipping %s"
-msgstr "%s wird übergangen."
+msgstr "%s wird übergangen."
 
-#: LYMessages.c:153
+#: LYMessages.c:151
 #, c-format
 msgid "Using %s"
 msgstr "Umgeleitet nach %s"
 
-#: LYMessages.c:154
+#: LYMessages.c:152
 #, c-format
 msgid "Illegal URL: %s"
-msgstr "Ungültiger URL: %s"
+msgstr "Ungültiger URL: %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:153
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Fehlgestaltete Adresse %s"
 
-#: LYMessages.c:156
+#: LYMessages.c:154
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:155
 msgid "Unable to access WWW file!!!"
-msgstr "WWW-Datei ist nicht zugänglich!!!"
+msgstr "Zugriff auf die WWW-Datei ist nicht möglich!"
 
-#: LYMessages.c:158
+#: LYMessages.c:156
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "Abfragbarer Index. Suchbegriff kann mit %s eingegeben werden."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:160
+#: LYMessages.c:158
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--Mehr -- Abfragbarer Index. Suchbegriff kann mit %s eingegeben werden."
 
-#: LYMessages.c:161
+#: LYMessages.c:159
 msgid "You have entered an invalid link number."
-msgstr "Ungültige Link-Nummer."
+msgstr "Ungültige Link-Nummer."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:163
+#: LYMessages.c:161
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
-msgstr "Quelltext des Dokuments wird gezeigt. Rückkehr zur Normaldarstellung mit '\\'."
+msgstr "Quelltext des Dokuments wird gezeigt. Rückkehr zur Normaldarstellung mit '\\'."
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:165
+#: LYMessages.c:163
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
-msgstr "Pfeile: Auf/Ab: andere Seite im Text. Rechts: Verweis folgen; Links: zurück.\n"
+msgstr "Pfeile: Auf/Ab: andere Seite im Text. Rechts: Verweis folgen; Links: zurück.\n"
 
 # Used if lynx.cfg does NOT contain KEYMAP for TOGGLE_HELP, default.
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:167
+#: LYMessages.c:165
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
 msgstr "H)ilfe O)ptionen P) Druck G)ehe zu M) Hauptseite Q) Beenden /=Suche <-=History\n"
 
 # Only used if lynx.cfg contains KEYMAP for TOGGLE_HELP.
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:169
+#: LYMessages.c:167
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
 msgstr ""
 "O: andere Befehle  H: Hilfe  K: Tastenbelegung  G: Gehe zu \n"
@@ -441,1615 +447,1615 @@ msgstr ""
 
 # Only used if lynx.cfg contains KEYMAP for TOGGLE_HELP.
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:171
+#: LYMessages.c:169
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr ""
-"O: Andere Befehle  B: Zurück  E: Editieren D: Download \n"
+"O: Andere Befehle  B: Zurück  E: Editieren D: Download \n"
 "^R: Neu laden  ^W: Auffrischen  /: Suche im Text\n"
 
 # Only used if lynx.cfg contains KEYMAP for TOGGLE_HELP.
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:173
+#: LYMessages.c:171
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr ""
 "O: Andere Befehle  C: Kommentar  Entfernen: History\n"
-"Lesezeichen:  V: Ansehen  A: Hinzufügen  R) Löschen\n"
+"Lesezeichen:  V: Ansehen  A: Hinzufügen  R) Löschen\n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:175
+#: LYMessages.c:173
 msgid "            Enter text into the field by typing on the keyboard              "
-msgstr "    Normale Tasten für Texteingabe verwenden.    "
+msgstr "    Normale Tasten für Texteingabe verwenden.    "
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:177
+#: LYMessages.c:175
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
-msgstr " Ctrl-U zum Löschen des ganzen Texts in einem Feld, [Entf] um einen Buchstaben zu löschen  "
+msgstr " Ctrl-U zum Löschen des ganzen Texts in einem Feld, [Entf] um einen Buchstaben zu löschen  "
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:179
+#: LYMessages.c:177
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
-msgstr " Ctrl-U zum Löschen von Text in einem Feld, [Entf] um einen Buchstaben zu löschen  "
+msgstr " Ctrl-U zum Löschen von Text in einem Feld, [Entf] um einen Buchstaben zu löschen  "
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:181
+#: LYMessages.c:179
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
-msgstr "    %s zum Löschen des Textes in einem Feld, [Entf] um einen Buchstaben zu löschen  "
+msgstr "    %s zum Löschen des Textes in einem Feld, [Entf] um einen Buchstaben zu löschen  "
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:183
+#: LYMessages.c:181
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
-msgstr "   %s zum Löschen des Textes in einem Feld, [Entf] um einen Buchstaben zu löschen "
+msgstr "   %s zum Löschen des Textes in einem Feld, [Entf] um einen Buchstaben zu löschen "
 
 #. mailto
-#: LYMessages.c:186
+#: LYMessages.c:184
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "Fehlerhafte mailto-Form, kann nicht gesandt werden!"
 
-#: LYMessages.c:187
+#: LYMessages.c:185
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Warnung!  Kontrollzeichen in Mailadresse durch ? ersetzt"
 
-#: LYMessages.c:188
+#: LYMessages.c:186
 msgid "Mail disallowed!  Cannot submit."
 msgstr "Mail is nicht erlaubt!  Kann nicht gesandt werden."
 
-#: LYMessages.c:189
+#: LYMessages.c:187
 msgid "Mailto form submission failed!"
 msgstr "Senden der mailto-Formdaten fehlgeschlagen!"
 
-#: LYMessages.c:190
+#: LYMessages.c:188
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Senden der mailto-Form abgebrochen!!!"
 
-#: LYMessages.c:191
+#: LYMessages.c:189
 msgid "Sending form content..."
 msgstr "Formdaten werden gesandt..."
 
-#: LYMessages.c:192
+#: LYMessages.c:190
 msgid "No email address is present in mailto URL!"
 msgstr "mailto-URL hat keine Mailadresse!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:194
+#: LYMessages.c:192
 msgid "Unable to open temporary file for mailto URL!"
-msgstr "Temporäre Datei für Mailto-URL konnte nicht geöffnet werden!"
+msgstr "Temporäre Datei für Mailto-URL konnte nicht geöffnet werden!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:196
+#: LYMessages.c:194
 msgid "Do you wish to include the original message?"
-msgstr "Soll der Originaltext eingefügt werden?"
+msgstr "Soll der Originaltext eingefügt werden?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:196
 msgid "Do you wish to include the preparsed source?"
-msgstr "Soll der vorverarbeitete Quelltext eingefügt werden?"
+msgstr "Soll der vorverarbeitete Quelltext eingefügt werden?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:200
+#: LYMessages.c:198
 msgid "Spawning your selected editor to edit mail message"
-msgstr "Der ausgewählte Editor wird zur Erstellen der Mail-Botschaft gestartet."
+msgstr "Der ausgewählte Editor wird zur Erstellen der Mail-Botschaft gestartet."
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:202
+#: LYMessages.c:200
 msgid "Error spawning editor, check your editor definition in the options menu"
-msgstr "Editor nicht gestartet, bitte Einstellung im Optionsmenü überprüfen!"
+msgstr "Editor nicht gestartet, bitte Einstellung im Options-Menü überprüfen!"
 
-#: LYMessages.c:203
+#: LYMessages.c:201
 msgid "Send this comment?"
 msgstr "Kommentar abschicken?"
 
-#: LYMessages.c:204
+#: LYMessages.c:202
 msgid "Send this message?"
 msgstr "Mail abschicken?"
 
-#: LYMessages.c:205
+#: LYMessages.c:203
 msgid "Sending your message..."
 msgstr "Mail wird gesandt..."
 
-#: LYMessages.c:206
+#: LYMessages.c:204
 msgid "Sending your comment:"
 msgstr "Nachricht wird gesandt:"
 
 #. textarea
-#: LYMessages.c:209
+#: LYMessages.c:207
 msgid "Not in a TEXTAREA; cannot use external editor."
-msgstr "Nicht in einem TEXTAREA-Bereich; externer Editor ist hier nicht möglich."
+msgstr "Nicht in einem TEXTAREA-Bereich; externer Editor ist hier nicht möglich."
 
-#: LYMessages.c:210
+#: LYMessages.c:208
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "Nicht in einem TEXTAREA-Bereich; Befehl ist hier nicht anwendbar."
 
-#: LYMessages.c:213
+#: LYMessages.c:211
 msgid "file: ACTIONs are disallowed!"
 msgstr "\"file\"-URLs sind nicht als Form-ACTION erlaubt!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:213
 msgid "file: URLs via served links are disallowed!"
 msgstr "Aktivierung von \"file\"-URLs von externen Links aus ist nicht erlaubt!"
 
-#: LYMessages.c:216
+#: LYMessages.c:214
 msgid "Access to local files denied."
 msgstr "Zugang zu lokalen Dateien nicht gestatted."
 
-#: LYMessages.c:217
+#: LYMessages.c:215
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "\"file\"-URLs sind von Lesezeichen aus nicht erlaubt!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:217
 msgid "This special URL is not allowed in external documents!"
 msgstr "Dieser spezielle URLs ist von externen Dokumenten aus nicht erlaubt!"
 
-#: LYMessages.c:220
+#: LYMessages.c:218
 msgid "Press <return> to return to Lynx."
-msgstr "Zurück zu Lynx mit Eingabetaste."
+msgstr "Zurück zu Lynx mit Eingabetaste."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:221
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
-msgstr "DCL-Unterprozeß wird gestartet. Rückkehr zu Lynx mit 'logout'.\n"
+msgstr "DCL-Unterprozess wird gestartet. Rückkehr zu Lynx mit 'logout'.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:225
 msgid "Type EXIT to return to Lynx.\n"
-msgstr "Für Rückkehr zu Lynx EXIT eingeben.\n"
+msgstr "Für Rückkehr zu Lynx EXIT eingeben.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:228
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
-msgstr "Default Shell wird gestartet, für Rückkehr zu Lynx 'exit' eingeben.\n"
+msgstr "Default Shell wird gestartet, für Rückkehr zu Lynx 'exit' eingeben.\n"
 
-#: LYMessages.c:233
+#: LYMessages.c:231
 msgid "Spawning is currently disabled."
-msgstr "Starten von Unterprozessen zur Zeit nicht ermöglicht."
+msgstr "Starten von Unterprozessen zur Zeit nicht ermöglicht."
 
-#: LYMessages.c:234
+#: LYMessages.c:232
 msgid "The 'd'ownload command is currently disabled."
 msgstr "Das Kommando 'd'ownload is zur Zeit nicht gestattet."
 
-#: LYMessages.c:235
+#: LYMessages.c:233
 msgid "You cannot download an input field."
-msgstr "Download von Eingabefeldern is nicht möglich."
+msgstr "Download von Eingabefeldern is nicht möglich."
 
-#: LYMessages.c:236
+#: LYMessages.c:234
 msgid "Form has a mailto action!  Cannot download."
-msgstr "Diese Form verlangt eine mailto-Aktion!  Download unmöglich."
+msgstr "Diese Form verlangt eine mailto-Aktion!  Download unmöglich."
 
-#: LYMessages.c:237
+#: LYMessages.c:235
 msgid "You cannot download a mailto: link."
-msgstr "Download unmöglich für mailto-Link."
+msgstr "Download unmöglich für mailto-Link."
 
-#: LYMessages.c:238
+#: LYMessages.c:236
 msgid "You cannot download cookies."
-msgstr "Download unmöglich für Kekse."
+msgstr "Download unmöglich für Kekse."
 
-#: LYMessages.c:239
+#: LYMessages.c:237
 msgid "You cannot download a printing option."
-msgstr "Download unmöglich für Druckoption."
+msgstr "Download unmöglich für Druckoption."
 
-#: LYMessages.c:240
+#: LYMessages.c:238
 msgid "You cannot download an upload option."
-msgstr "Download unmöglich für Upload-Option."
+msgstr "Download unmöglich für Upload-Option."
 
-#: LYMessages.c:241
+#: LYMessages.c:239
 msgid "You cannot download an permit option."
-msgstr "Download unmöglich für Berechtigungsoption."
+msgstr "Download unmöglich für Berechtigungsoption."
 
-#: LYMessages.c:242
+#: LYMessages.c:240
 msgid "This special URL cannot be downloaded!"
-msgstr "Download unmöglich für diesen speziellen URL!"
+msgstr "Download unmöglich für diesen speziellen URL!"
 
-#: LYMessages.c:243
+#: LYMessages.c:241
 msgid "Nothing to download."
 msgstr "Nichts runterzuladen."
 
-#: LYMessages.c:244
+#: LYMessages.c:242
 msgid "Trace ON!"
 msgstr "Trace EIN!"
 
-#: LYMessages.c:245
+#: LYMessages.c:243
 msgid "Trace OFF!"
 msgstr "Trace AUS!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:245
 msgid "Links will be included for all images!  Reloading..."
-msgstr "Links für alle Bilder werden eingefügt! Neuladen..."
+msgstr "Links für alle Bilder werden eingefügt! Neuladen..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:247
 msgid "Standard image handling restored!  Reloading..."
 msgstr "Wiederaufnahme der normalen Bildbehandlung! Neuladen..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:249
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
-msgstr "Pseudo-ALTs werden für alle Inlinebilder one ALT-Attrbut eingefügt! Neuladen..."
+msgstr "Pseudo-ALTs werden für alle Inlinebilder one ALT-Attribut eingefügt! Neuladen..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:251
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "Inlinebilder ohne ALT-Attribut werden jetzt ignoriert! Neuladen..."
 
-#: LYMessages.c:254
+#: LYMessages.c:252
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Raw 8-bit or CJK mode eingeschaltet!  Reloading..."
 
-#: LYMessages.c:255
+#: LYMessages.c:253
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "Raw 8-bit or CJK mode ausgeschaltet!  Reloading..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:255
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
-msgstr "HEAD-Anforderung für D)okument oder L)link senden, oder Abbre(C)hen? (d,l,c): "
+msgstr "HEAD-Anforderung für D)okument oder L)link senden, oder Abbrec)hen? (d,l,c): "
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:257
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
-msgstr "HEAD-Anforderung für D)okument senden, oder Abbre(C)hen? (d,c): "
+msgstr "HEAD-Anforderung für D)okument senden, oder Abbrec)hen? (d,c): "
 
-#: LYMessages.c:260
+#: LYMessages.c:258
 msgid "Sorry, the document is not an http URL."
 msgstr "Sorry, das Dokument ist kein http-URL."
 
-#: LYMessages.c:261
+#: LYMessages.c:259
 msgid "Sorry, the link is not an http URL."
 msgstr "Sorry, der Link ist kein http-URL."
 
-#: LYMessages.c:262
+#: LYMessages.c:260
 msgid "Sorry, the ACTION for this form is disabled."
-msgstr "Sorry, die ACTION für diese Form ist \"disabled\"."
+msgstr "Sorry, die ACTION für diese Form ist \"disabled\"."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:262
 msgid "Sorry, the ACTION for this form is not an http URL."
-msgstr "Sorry, die ACTION für diese Form ist kein HTTP-URL."
+msgstr "Sorry, die ACTION für diese Form ist kein HTTP-URL."
 
-#: LYMessages.c:265
+#: LYMessages.c:263
 msgid "Not an http URL or form ACTION!"
 msgstr "Dies ist weder ein http-URL noch eine Form-ACTION!"
 
-#: LYMessages.c:266
+#: LYMessages.c:264
 msgid "This special URL cannot be a form ACTION!"
-msgstr "Dieser spezielle URL ist nicht möglich als Form-ACTION!"
+msgstr "Dieser spezielle URL ist nicht möglich als Form-ACTION!"
 
-#: LYMessages.c:267
+#: LYMessages.c:265
 msgid "URL is not in starting realm!"
 msgstr "URL ist nicht im erlaubten Start-Bereich!"
 
-#: LYMessages.c:268
+#: LYMessages.c:266
 msgid "News posting is disabled!"
 msgstr "News-Posting nicht erlaubt."
 
-#: LYMessages.c:269
+#: LYMessages.c:267
 msgid "File management support is disabled!"
-msgstr "Dired-Unterstützung für Dateimanagement is ausgeschaltet!"
+msgstr "Dired-Unterstützung für Dateimanagement ist ausgeschaltet!"
 
-#: LYMessages.c:270
+#: LYMessages.c:268
 msgid "No jump file is currently available."
-msgstr "Eine Sprungdatei (jump file) ist zur Zeit nicht erhältlich."
+msgstr "Eine Sprungdatei (jump file) ist zur Zeit nicht erhältlich."
 
-#: LYMessages.c:271
+#: LYMessages.c:269
 msgid "Jump to (use '?' for list): "
-msgstr "Sprung zu URL ('?' für Auswahlliste): "
+msgstr "Sprung zu URL ('?' für Auswahlliste): "
 
-#: LYMessages.c:272
+#: LYMessages.c:270
 msgid "Jumping to a shortcut URL is disallowed!"
-msgstr "Abgekürzter URL-Sprung ist nicht erlaubt!"
+msgstr "Abgekürzter URL-Sprung ist nicht erlaubt!"
 
-#: LYMessages.c:273
+#: LYMessages.c:271
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "Eingabe von beliebigen URLs nicht erlaubt!  Bitte URL-Sprung benutzen."
 
-#: LYMessages.c:274
+#: LYMessages.c:272
 msgid "No random URLs have been used thus far."
 msgstr "\"Go\"-URLs noch nicht benutzt."
 
-#: LYMessages.c:275
+#: LYMessages.c:273
 msgid "Bookmark features are currently disabled."
 msgstr "Lesezeichen zur Zeit ausgeschaltet."
 
-#: LYMessages.c:276
+#: LYMessages.c:274
 msgid "Execution via bookmarks is disabled."
-msgstr "Ausführen von Befehlen ist hier nicht erlaubt."
+msgstr "Ausführen von Befehlen ist hier nicht erlaubt."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:276
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "Lesezeichendatei nicht definiert. Siehe Opttionseinstellungen (Taste %s)."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:278
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
-msgstr "Temporärdatei für Mosaic-Hotlistenumwandlung kann nicht geöffnet werden."
+msgstr "Temporärdatei für Mosaic-Hotlistenumwandlung kann nicht geöffnet werden."
 
-#: LYMessages.c:281
+#: LYMessages.c:279
 msgid "ERROR - unable to open bookmark file."
-msgstr "FEHLER - Lesemarken-Datei kann nicht geöffnet werden."
+msgstr "FEHLER - Lesemarken-Datei kann nicht geöffnet werden."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:281
 msgid "Unable to open bookmark file for deletion of link."
-msgstr "Lesezeichendatei kann nicht zum Linkentfernen geöffnet werden."
+msgstr "Lesezeichendatei kann nicht zum Linkentfernen geöffnet werden."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:283
 msgid "Unable to open scratch file for deletion of link."
-msgstr "Scratchdatei kann nicht zum Linkentfernen geöffnet werden."
+msgstr "Scratchdatei kann nicht zum Linkentfernen geöffnet werden."
 
-#: LYMessages.c:287
+#: LYMessages.c:285
 msgid "Error renaming scratch file."
 msgstr "Umbenennung einer Scratchdatei fehlgeschlagen."
 
-#: LYMessages.c:289
+#: LYMessages.c:287
 msgid "Error renaming temporary file."
-msgstr "Umbenennung einer temporären Datei fehlgeschlagen."
+msgstr "Umbenennung einer temporären Datei fehlgeschlagen."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:289
 msgid "Unable to copy temporary file for deletion of link."
-msgstr "Temporäre Datei für das Linkentfernen kann nicht geöffnet werden."
+msgstr "Temporäre Datei für das Linkentfernen kann nicht geöffnet werden."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:291
 msgid "Unable to reopen temporary file for deletion of link."
-msgstr "Temporäre Datei für das Linkentfernen kann nicht wiedergeöffnet werden."
+msgstr "Temporäre Datei für das Linkentfernen kann nicht wiedergeöffnet werden."
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:294
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "Link steht nicht allein in einer Zeile in der Lesezeichendatei."
 
-#: LYMessages.c:297
+#: LYMessages.c:295
 msgid "Bookmark deletion failed."
-msgstr "Löschen des Lesezeicheneintrags fehlgeschlagen."
+msgstr "Löschen des Lesezeicheneintrags fehlgeschlagen."
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:297
 msgid "Bookmark files cannot be traversed (only http URLs)."
-msgstr "Traversal ist für Lesezeichendateien nicht erlaubt, nur für HTTP-URLs."
+msgstr "Traversal ist für Lesezeichendateien nicht erlaubt, nur für HTTP-URLs."
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:299
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "Lesezeichendatei kann nicht gelesen werden, erst mit 'a' einen Link speichern."
 
-#: LYMessages.c:302
+#: LYMessages.c:300
 msgid "There are no links in this bookmark file!"
-msgstr "Diese Lesezeichendatei hat keine Einträge!"
+msgstr "Diese Lesezeichendatei hat keine Einträge!"
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:302
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
-msgstr "Aktuelles Dokument speichern (D,d), Lesezeichen erstellen (L,l) oder abbrechen (C,c): "
+msgstr "Aktuelles D)okument oder L)ink als Lesezeichen speichern oder abbrec)hen? (d,l,c): "
 
-#: LYMessages.c:305
+#: LYMessages.c:303
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
-msgstr "Gegenwärtiges D)okument als Lesezeichen speichern oder abbre(C)hen? (d,c): "
+msgstr "D)okument als Lesezeichen speichern oder abbreC)hen? (d,c): "
 
-#: LYMessages.c:306
+#: LYMessages.c:304
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "L)ink als Lesezeichen speichern oder abbre(C)hen? (l,c): "
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:308
+#: LYMessages.c:306
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
-msgstr "Anlegen von Lesezeichen für Dokumente mit POST-Formdaten nicht möglich."
+msgstr "Anlegen von Lesezeichen für Dokumente mit POST-Formdaten nicht möglich."
 
-#: LYMessages.c:309
+#: LYMessages.c:307
 msgid "Cannot save form fields/links"
-msgstr "Form-Eingabefelder können nicht gespeichert werden"
+msgstr "Form-Eingabefelder können nicht gespeichert werden"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:311
+#: LYMessages.c:309
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
-msgstr "Lesezeichen für History-, Info-, Menü- und Listendateien nicht möglich."
+msgstr "Lesezeichen für History-, Info-, Menü- und Listendateien nicht möglich."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:313
+#: LYMessages.c:311
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Diesen Link wirklich aus Lesezeichendatei entfernen?"
 
-#: LYMessages.c:314
+#: LYMessages.c:312
 msgid "Malformed address."
 msgstr "Fehlgeformte Adresse."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:316
+#: LYMessages.c:314
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "Historische Kommentarerkennung EIN (Minimalmodus AUS)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:318
+#: LYMessages.c:316
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "Historische Kommentarerkennung AUS (Minimalmodus EIN)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:320
+#: LYMessages.c:318
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "Historisches Kommentarparsing EIN (richtige Methode AUS)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:322
+#: LYMessages.c:320
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "Historisches Kommentarparsing AUS (richtige Methode EIN)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:324
+#: LYMessages.c:322
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "Minimale Kommentarerkennung EIN (und in Effekt)!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:324
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "Minimale Kommentarerkennung AUS (richtige Methode ist in Effekt)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:328
+#: LYMessages.c:326
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
-msgstr "Minimale Kommentarerkennung EIN (aber geändert durch \"historisch\")!"
+msgstr "Minimale Kommentarerkennung EIN (aber geändert durch \"historisch\")!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:330
+#: LYMessages.c:328
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "Minimale Kommentarerkennung AUS (historische Methode ist in Effekt)!"
 
-#: LYMessages.c:331
+#: LYMessages.c:329
 msgid "Soft double-quote parsing ON!"
 msgstr "Soft double-quote parsing EIN!"
 
-#: LYMessages.c:332
+#: LYMessages.c:330
 msgid "Soft double-quote parsing OFF!"
 msgstr "Soft double-quote parsing AUS!"
 
-#: LYMessages.c:333
+#: LYMessages.c:331
 msgid "Now using TagSoup parsing of HTML."
-msgstr "Von nun an \"TagSoup\" parsing für HTML."
+msgstr "Von nun an \"TagSoup\"-Parsing für HTML."
 
-#: LYMessages.c:334
+#: LYMessages.c:332
 msgid "Now using SortaSGML parsing of HTML!"
-msgstr "Von nun an \"SortaSGML\" parsing für HTML!"
+msgstr "Von nun an \"SortaSGML\"-Parsing für HTML!"
 
-#: LYMessages.c:335
+#: LYMessages.c:333
 msgid "You are already at the end of this document."
 msgstr "Schon am Ende."
 
-#: LYMessages.c:336
+#: LYMessages.c:334
 msgid "You are already at the beginning of this document."
 msgstr "Schon am Anfang."
 
-#: LYMessages.c:337
+#: LYMessages.c:335
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "Schon auf Seite %d in diesem Dokument."
 
-#: LYMessages.c:338
+#: LYMessages.c:336
 #, c-format
 msgid "Link number %d already is current."
-msgstr "Schon auf Link Nummer %d."
+msgstr "Schon auf Link-Nummer %d."
 
-#: LYMessages.c:339
+#: LYMessages.c:337
 msgid "You are already at the first document"
 msgstr "Schon im ersten Dokument"
 
-#: LYMessages.c:340
+#: LYMessages.c:338
 msgid "There are no links above this line of the document."
 msgstr "Keine Links mehr vor dieser Zeile."
 
-#: LYMessages.c:341
+#: LYMessages.c:339
 msgid "There are no links below this line of the document."
 msgstr "Keine Links mehr nach dieser Zeile."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:343
+#: LYMessages.c:341
 msgid "Maximum length reached!  Delete text or move off field."
-msgstr "Maximale Länge erreicht! Text löschen oder Feld verlassen."
+msgstr "Maximale Länge erreicht! Text löschen oder Feld verlassen."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:345
+#: LYMessages.c:343
 msgid "You are not on a form submission button or normal link."
-msgstr "Kein Formaktivierungsbutton oder normaler Link gewählt."
+msgstr "Kein Formaktivierungsbutton oder normaler Link gewählt."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:347
+#: LYMessages.c:345
 msgid "One radio button must be checked at all times!"
-msgstr "Eine von den Radiotasten muß immer markiert sein!"
+msgstr "Eine von den Radiotasten muss immer markiert sein!"
 
-#: LYMessages.c:348
+#: LYMessages.c:346
 msgid "No submit button for this form, submit single text field?"
-msgstr "Kein Abschicken-Knopf für dieses Formular, einzelnes Textfeld abschicken?"
+msgstr "Kein Abschicken-Knopf für dieses Formular, einzelnes Textfeld abschicken?"
 
-#: LYMessages.c:349
+#: LYMessages.c:347
 msgid "Do you want to go back to the previous document?"
-msgstr "Zurück zum vorherigen Dokument?"
+msgstr "Zurück zum vorherigen Dokument?"
 
-#: LYMessages.c:350
+#: LYMessages.c:348
 msgid "Use arrows or tab to move off of field."
-msgstr "Form-Eingabefelder können mit Pfeil- or Tabulatortasten verlassen werden."
+msgstr "Form-Eingabefelder können mit Pfeil- oder Tabulatortasten verlassen werden."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:352
+#: LYMessages.c:350
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "Text Eingeben, Feld kann mit Pfeil- or Tabulatortasten verlassen werden."
 
-#: LYMessages.c:353
+#: LYMessages.c:351
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** Bad HTML!!  Keine Form-Aktion definiert. **"
 
-#: LYMessages.c:354
+#: LYMessages.c:352
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "Bad HTML!!  Popup-Fenster kann nicht erzeugt werden!"
 
-#: LYMessages.c:355
+#: LYMessages.c:353
 msgid "Unable to create popup window!"
 msgstr "Popup-Fenster kann nicht erzeugt werden!"
 
-#: LYMessages.c:356
+#: LYMessages.c:354
 msgid "Goto a random URL is disallowed!"
 msgstr "Das Gehen zu beliebigen URLs ist nicht erlaubt!"
 
-#: LYMessages.c:357
+#: LYMessages.c:355
 msgid "Goto a non-http URL is disallowed!"
 msgstr "Das Gehen zu anderen als http-URLs ist nicht erlaubt!"
 
-#: LYMessages.c:358
+#: LYMessages.c:356
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "Das Gehen zu \"%s\"-URLs ist nicht erlaubt"
 
-#: LYMessages.c:359
+#: LYMessages.c:357
 msgid "URL to open: "
 msgstr "Neuer URL: "
 
-#: LYMessages.c:360
+#: LYMessages.c:358
 msgid "Edit the current Goto URL: "
 msgstr "Jetziger URL: "
 
-#: LYMessages.c:361
+#: LYMessages.c:359
 msgid "Edit the previous Goto URL: "
 msgstr "Letzter URL: "
 
-#: LYMessages.c:362
+#: LYMessages.c:360
 msgid "Edit a previous Goto URL: "
-msgstr "Früherer URL: "
+msgstr "Früherer URL: "
 
-#: LYMessages.c:363
+#: LYMessages.c:361
 msgid "Current document has POST data."
 msgstr "Das aktuelle Dokument ist mit POST-Daten verbunden."
 
-#: LYMessages.c:364
+#: LYMessages.c:362
 msgid "Edit this document's URL: "
-msgstr "URL des gegenwärtigen Dokuments: "
+msgstr "URL des gegenwärtigen Dokuments: "
 
-#: LYMessages.c:365
+#: LYMessages.c:363
 msgid "Edit the current link's URL: "
 msgstr "URL dieses Links: "
 
-#: LYMessages.c:366
+#: LYMessages.c:364
 msgid "You cannot edit File Management URLs"
-msgstr "Editieren von Dateimanagement-URLs (Dired-URLs) ist nicht möglich"
+msgstr "Editieren von Dateimanagement-URLs (Dired-URLs) ist nicht möglich"
 
-#: LYMessages.c:367
+#: LYMessages.c:365
 msgid "Enter a database query: "
 msgstr "Datenbankabfrage eingeben: "
 
-#: LYMessages.c:368
+#: LYMessages.c:366
 msgid "Enter a whereis query: "
-msgstr "Suche in gegenwärtigen Dokument: "
+msgstr "Suche in gegenwärtigen Dokument: "
 
-#: LYMessages.c:369
+#: LYMessages.c:367
 msgid "Edit the current query: "
-msgstr "Suche ändern: "
+msgstr "Suche ändern: "
 
-#: LYMessages.c:370
+#: LYMessages.c:368
 msgid "Edit the previous query: "
-msgstr "Letzte Suche ändern: "
+msgstr "Letzte Suche ändern: "
 
-#: LYMessages.c:371
+#: LYMessages.c:369
 msgid "Edit a previous query: "
-msgstr "Vorherige Suche ändern: "
+msgstr "Vorherige Suche ändern: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:373
+#: LYMessages.c:371
 msgid "Use Control-R to resubmit the current query."
-msgstr "Wiederholung der gegenwärtigen Abfrage kann mit ^R erzwungen werden."
+msgstr "Wiederholung der gegenwärtigen Abfrage kann mit ^R erzwungen werden."
 
-#: LYMessages.c:374
+#: LYMessages.c:372
 msgid "Edit the current shortcut: "
-msgstr "Abgekürzter Sprung (Jump): "
+msgstr "Abgekürzter Sprung (Jump): "
 
-#: LYMessages.c:375
+#: LYMessages.c:373
 msgid "Edit the previous shortcut: "
-msgstr "Letzter abgekürzter Sprung (Jump): "
+msgstr "Letzter abgekürzter Sprung (Jump): "
 
-#: LYMessages.c:376
+#: LYMessages.c:374
 msgid "Edit a previous shortcut: "
-msgstr "Vorheriger abgekürzter Sprung (Jump): "
+msgstr "Vorheriger abgekürzter Sprung (Jump): "
 
-#: LYMessages.c:377
+#: LYMessages.c:375
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "Die Taste '%c' entspricht keiner Sprungdatei!"
 
-#: LYMessages.c:378
+#: LYMessages.c:376
 msgid "Cannot locate jump file!"
 msgstr "Sprungdatei nicht gefunden!"
 
-#: LYMessages.c:379
+#: LYMessages.c:377
 msgid "Cannot open jump file!"
-msgstr "Fehler beim Öffnen der Sprungdatei!"
+msgstr "Fehler beim Öffnen der Sprungdatei!"
 
-#: LYMessages.c:380
+#: LYMessages.c:378
 msgid "Error reading jump file!"
 msgstr "Fehler beim Lesen der Sprungdatei!"
 
-#: LYMessages.c:381
+#: LYMessages.c:379
 msgid "Out of memory reading jump file!"
 msgstr "Nicht genug Memory um Sprungdatei zu lesen!"
 
-#: LYMessages.c:382
+#: LYMessages.c:380
 msgid "Out of memory reading jump table!"
 msgstr "Nicht genug Memory um Sprungtabelle zu lesen!"
 
-#: LYMessages.c:383
+#: LYMessages.c:381
 msgid "No index is currently available."
-msgstr "Index zur Zeit nicht verfügbar."
+msgstr "Index zur Zeit nicht verfügbar."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:385
+#: LYMessages.c:383
 msgid "Do you really want to go to the Main screen?"
 msgstr "Wirklich zur Hauptseite gehen?"
 
-#: LYMessages.c:386
+#: LYMessages.c:384
 msgid "You are already at main screen!"
 msgstr "Schon auf der Hauptseite!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:388
+#: LYMessages.c:386
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
-msgstr "Dies ist kein abfragbares ISINDEX-Dokument  --  für Textsuche '/' drücken."
+msgstr "Dies ist kein abfragbares ISINDEX-Dokument  --  für Textsuche '/' drücken."
 
 #. #define NO_OWNER
-#: LYMessages.c:390
+#: LYMessages.c:388
 msgid "No owner is defined for this file so you cannot send a comment"
-msgstr "Besizter oder Autor unbekannt, Kommentar daher nicht möglich"
+msgstr "Besitzer oder Autor unbekannt, Kommentar daher nicht möglich"
 
-#: LYMessages.c:391
+#: LYMessages.c:389
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Besitzeradresse nicht definiert. %s benutzen?"
 
-#: LYMessages.c:392
+#: LYMessages.c:390
 msgid "Do you wish to send a comment?"
 msgstr "Kommentar schicken?"
 
-#: LYMessages.c:393
+#: LYMessages.c:391
 msgid "Mail is disallowed so you cannot send a comment"
-msgstr "Mail ist nicht erlaubt, Kommentar daher nicht möglich"
+msgstr "Mail ist nicht erlaubt, Kommentar daher nicht möglich"
 
-#: LYMessages.c:394
+#: LYMessages.c:392
 msgid "The 'e'dit command is currently disabled."
 msgstr "Der Befehl 'E'dit ist zur Zeit nicht erlaubt."
 
-#: LYMessages.c:395
+#: LYMessages.c:393
 msgid "External editing is currently disabled."
 msgstr "Benutzung eines externen Editors ist zur Zeit nicht erlaubt."
 
-#: LYMessages.c:396
+#: LYMessages.c:394
 msgid "System error - failure to get status."
 msgstr "Systemfehler - Status konnte nicht bestimmt werden."
 
-#: LYMessages.c:397
+#: LYMessages.c:395
 msgid "No editor is defined!"
 msgstr "Kein Editor ist definiert!"
 
-#: LYMessages.c:398
+#: LYMessages.c:396
 msgid "The 'p'rint command is currently disabled."
 msgstr "Der Befehl 'P'rint ist zur Zeit nicht erlaubt."
 
-#: LYMessages.c:399
+#: LYMessages.c:397
 msgid "Document has no Toolbar links or Banner."
 msgstr "Dokument hat keine Toolbar-Links oder \"Banner\"."
 
-#: LYMessages.c:400
+#: LYMessages.c:398
 msgid "Unable to open traversal file."
-msgstr "Traversal-Datei konnte nicht geöffnet werden."
+msgstr "Traversal-Datei konnte nicht geöffnet werden."
 
-#: LYMessages.c:401
+#: LYMessages.c:399
 msgid "Unable to open traversal found file."
-msgstr "Traversal-Gefunden-Datei konnte nicht geöffnet werden."
+msgstr "Traversal-Gefunden-Datei konnte nicht geöffnet werden."
 
-#: LYMessages.c:402
+#: LYMessages.c:400
 msgid "Unable to open reject file."
-msgstr "Reject-Datei konnte nicht geöffnet werden."
+msgstr "Reject-Datei konnte nicht geöffnet werden."
 
-#: LYMessages.c:403
+#: LYMessages.c:401
 msgid "Unable to open traversal errors output file"
-msgstr "Traversal-Fehlerdatei konnte nicht geöffnet werden."
+msgstr "Traversal-Fehlerdatei konnte nicht geöffnet werden."
 
-#: LYMessages.c:404
+#: LYMessages.c:402
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "TRAVERSAL UNTERBROCHEN"
 
-#: LYMessages.c:405
+#: LYMessages.c:403
 msgid "Follow link (or goto link or page) number: "
-msgstr "Folge Link Nummer (oder gehe zu Link oder Seite): "
+msgstr "Folge Link-Nummer (oder gehe zu Link oder Seite): "
 
-#: LYMessages.c:406
+#: LYMessages.c:404
 msgid "Select option (or page) number: "
-msgstr "Optionsnummer (oder Seitennummer) wählen: "
+msgstr "Optionsnummer (oder Seitennummer) wählen: "
 
-#: LYMessages.c:407
+#: LYMessages.c:405
 #, c-format
 msgid "Option number %d already is current."
 msgstr "Aktuelle Option ist schon Nummer %d."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:409
+#: LYMessages.c:407
 msgid "You are already at the end of this option list."
 msgstr "Schon am Ende der Optionsliste."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:411
+#: LYMessages.c:409
 msgid "You are already at the beginning of this option list."
 msgstr "Schon am Anfang der Optionsliste."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:413
+#: LYMessages.c:411
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "Schon auf Seite %d der Optionsliste."
 
-#: LYMessages.c:414
+#: LYMessages.c:412
 msgid "You have entered an invalid option number."
-msgstr "Ungültige Optionsnummer eingegeben."
+msgstr "Ungültige Optionsnummer eingegeben."
 
-#: LYMessages.c:415
+#: LYMessages.c:413
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
-msgstr "** Bad HTML!!  Benutze ^T oder -trace um zu sehen was los ist. **"
+msgstr "** Bad HTML!!  ^T oder -trace Benutzen, um zu sehen was los ist. **"
 
-#: LYMessages.c:416
+#: LYMessages.c:414
 msgid "Give name of file to save in"
 msgstr "Dateiname zum Speichern eingeben"
 
-#: LYMessages.c:417
+#: LYMessages.c:415
 msgid "Can't save data to file -- please run WWW locally"
-msgstr "Speichern in Datei ist hier nicht möglich - Bitte localen Client benutzen."
+msgstr "Speichern in Datei ist hier nicht möglich - bitte lokalen Client benutzen."
 
-#: LYMessages.c:418
+#: LYMessages.c:416
 msgid "Can't open temporary file!"
-msgstr "Temporäre Datei kann nicht geöffnet werden!"
+msgstr "Temporäre Datei kann nicht geöffnet werden!"
 
-#: LYMessages.c:419
+#: LYMessages.c:417
 msgid "Can't open output file!  Cancelling!"
-msgstr "Ausgabedatei kann nicht geöffnet werden!  Abgebrochen!"
+msgstr "Ausgabedatei kann nicht geöffnet werden!  Abgebrochen!"
 
-#: LYMessages.c:420
+#: LYMessages.c:418
 msgid "Execution is disabled."
-msgstr "Befehlsausführung nicht erlaubt."
+msgstr "Befehlsausführung nicht erlaubt."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:422
+#: LYMessages.c:420
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
-msgstr "Ausführung für diese Datei nicht ermöglicht. Siehe Optionsmenü (Taste %s)."
+msgstr "Ausführung für diese Datei nicht ermöglicht. Siehe Options-Menü (Taste %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:424
+#: LYMessages.c:422
 msgid "Execution capabilities are not compiled into this version."
-msgstr "Diese Version wurde ohne die Fähigkeit zur Programmausführung kompiliert."
+msgstr "Diese Version wurde ohne die Fähigkeit zur Programmausführung kompiliert."
 
-#: LYMessages.c:425
+#: LYMessages.c:423
 msgid "This file cannot be displayed on this terminal."
 msgstr "Diese Datei kann auf diesem Terminal nicht gezeigt werden."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:427
+#: LYMessages.c:425
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "Kann an diesem Terminal nicht gezeigt werden: D)ownload oder abbre(C)hen"
 
-#: LYMessages.c:428
+#: LYMessages.c:426
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D)ownload oder Abbru(c)h/(C)ancel"
 
-#: LYMessages.c:429
+#: LYMessages.c:427
 msgid "Cancelling file."
 msgstr "Datei abgebrochen."
 
-#: LYMessages.c:430
+#: LYMessages.c:428
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "Datei wird geholt.  - BITTE WARTEN -"
 
-#: LYMessages.c:431
+#: LYMessages.c:429
 msgid "Enter a filename: "
 msgstr "Dateiname eingeben: "
 
-#: LYMessages.c:432
+#: LYMessages.c:430
 msgid "Edit the previous filename: "
 msgstr "Letzter Dateiname: "
 
-#: LYMessages.c:433
+#: LYMessages.c:431
 msgid "Edit a previous filename: "
-msgstr "Früherer Dateiname: "
+msgstr "Früherer Dateiname: "
 
-#: LYMessages.c:434
+#: LYMessages.c:432
 msgid "Enter a new filename: "
 msgstr "Neuer Dateiname: "
 
-#: LYMessages.c:435
+#: LYMessages.c:433
 msgid "File name may not begin with a dot."
 msgstr "Dateiname darf nicht mit einem Punkt beginnen."
 
-#: LYMessages.c:437
+#: LYMessages.c:435
 msgid "File exists.  Create higher version?"
-msgstr "Datei existiert schon. Höhere Versionsnummer erzeugen?"
+msgstr "Datei existiert schon. Höhere Versionsnummer erzeugen?"
 
-#: LYMessages.c:439
+#: LYMessages.c:437
 msgid "File exists.  Overwrite?"
-msgstr "Datei existiert schon. Überschreiben?"
+msgstr "Datei existiert schon. Ãœberschreiben?"
 
-#: LYMessages.c:441
+#: LYMessages.c:439
 msgid "Cannot write to file."
-msgstr "Speichern in Datei nicht möglich."
+msgstr "Speichern in Datei nicht möglich."
 
-#: LYMessages.c:442
+#: LYMessages.c:440
 msgid "ERROR! - download command is misconfigured."
 msgstr "FEHLER! - Der Befehl \"Download\" ist falsch konfiguriert."
 
-#: LYMessages.c:443
+#: LYMessages.c:441
 msgid "Unable to download file."
-msgstr "Download der Datei nicht möglich."
+msgstr "Download der Datei nicht möglich."
 
-#: LYMessages.c:444
+#: LYMessages.c:442
 msgid "Reading directory..."
 msgstr "Verzeichnis wird gelesen..."
 
-#: LYMessages.c:445
+#: LYMessages.c:443
 msgid "Building directory listing..."
 msgstr "Verzeichnisliste wird erzeugt..."
 
-#: LYMessages.c:446
+#: LYMessages.c:444
 msgid "Saving..."
 msgstr "Speichern..."
 
 # This seems unused - kw
-#: LYMessages.c:447
+#: LYMessages.c:445
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Datei '%s' konnte nicht editiert werden."
 
-#: LYMessages.c:448
+#: LYMessages.c:446
 msgid "Unable to access document!"
-msgstr "Zugriff auf Dokument nicht möglich!"
+msgstr "Zugriff auf Dokument nicht möglich!"
 
-#: LYMessages.c:449
+#: LYMessages.c:447
 msgid "Could not access file."
 msgstr "Zugriff auf Datei fehlgeschlagen."
 
-#: LYMessages.c:450
+#: LYMessages.c:448
 msgid "Could not access directory."
 msgstr "Zugriff auf Verzeichnis fehlgeschlagen."
 
-#: LYMessages.c:451
+#: LYMessages.c:449
 msgid "Could not load data."
 msgstr "Daten konnten nicht geladen werden."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:453
+#: LYMessages.c:451
 msgid "Lynx cannot currently (e)dit remote WWW files."
-msgstr "Lynx hat noch keine Unterstützung fürs (E)ditieren externer WWW-Dateien."
+msgstr "Lynx hat noch keine Unterstützung fürs (E)ditieren externer WWW-Dateien."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:455
+#: LYMessages.c:453
 msgid "This field cannot be (e)dited with an external editor."
-msgstr "Externer Editor ist für dieses Feld nicht anwendbar."
+msgstr "Externer Editor ist für dieses Feld nicht anwendbar."
 
-#: LYMessages.c:456
+#: LYMessages.c:454
 msgid "Bad rule"
 msgstr "Schlechte Regel in Konfiguration."
 
-#: LYMessages.c:457
+#: LYMessages.c:455
 msgid "Insufficient operands:"
 msgstr "Nicht genug Operanden:"
 
-#: LYMessages.c:458
+#: LYMessages.c:456
 msgid "You are not authorized to edit this file."
 msgstr "Erlaubnis zum Editieren dieser Datei verweigert."
 
-#: LYMessages.c:459
+#: LYMessages.c:457
 msgid "Title: "
 msgstr "Titel: "
 
-#: LYMessages.c:460
+#: LYMessages.c:458
 msgid "Subject: "
 msgstr "Betreff/Subject: "
 
-#: LYMessages.c:461
+#: LYMessages.c:459
 msgid "Username: "
-msgstr "Benutzer: "
+msgstr "Username: "
 
-#: LYMessages.c:462
+#: LYMessages.c:460
 msgid "Password: "
 msgstr "Passwort: "
 
-#: LYMessages.c:463
+#: LYMessages.c:461
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: Username und Password notwendig!!!"
 
-#: LYMessages.c:464
+#: LYMessages.c:462
 msgid "lynx: Password required!!!"
 msgstr "lynx: Password notwendig!!!"
 
-#: LYMessages.c:465
+#: LYMessages.c:463
 msgid "Clear all authorization info for this session?"
 msgstr "Alle Authorisationsdaten dieser Sitzung vergessen?"
 
-#: LYMessages.c:466
+#: LYMessages.c:464
 msgid "Authorization info cleared."
-msgstr "Authorisationsdaten gelöscht."
+msgstr "Authorisationsdaten gelöscht."
 
-#: LYMessages.c:467
+#: LYMessages.c:465
 msgid "Authorization failed.  Retry?"
 msgstr "Noch nicht authorisiert. Noch mal versuchen?"
 
-#: LYMessages.c:468
+#: LYMessages.c:466
 msgid "cgi support has been disabled."
-msgstr "Unterstützung für cgi ist ausgeschaltet."
+msgstr "Unterstützung für cgi ist ausgeschaltet."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:470
+#: LYMessages.c:468
 msgid "Lynxcgi capabilities are not compiled into this version."
-msgstr "LYNXCGI-Fähigkeit nicht eingebaut."
+msgstr "LYNXCGI-Fähigkeit nicht eingebaut."
 
-#: LYMessages.c:471
+#: LYMessages.c:469
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Sorry, keine Methode bekannt um %s in %s umzuwandeln."
 
-#: LYMessages.c:472
+#: LYMessages.c:470
 msgid "Unable to set up connection."
 msgstr "Vorbereitung der Verbindung fehlgeschlagen."
 
-#: LYMessages.c:473
+#: LYMessages.c:471
 msgid "Unable to make connection"
 msgstr "Verbindung kann nicht hergestellt werden"
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:475
+#: LYMessages.c:473
 msgid "Executable link rejected due to malformed request."
-msgstr "Fehlerhafte Anforderung, Ausführbarer Link wird zurückgewiesen."
+msgstr "Fehlerhafte Anforderung, Ausführbarer Link wird zurückgewiesen."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:477
+#: LYMessages.c:475
 #, c-format
 msgid "Executable link rejected due to `%c' character."
-msgstr "Ausführbarer Link wird zurückgewiesen, weil das Zeichen `%c' vorkommt."
+msgstr "Ausführbarer Link wird zurückgewiesen, weil das Zeichen `%c' vorkommt."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:477
 msgid "Executable link rejected due to relative path string ('../')."
-msgstr "Ausführbarer Link wird wegen der Zeichenfolge '../' zurückgewiesen."
+msgstr "Ausführbarer Link wird wegen der Zeichenfolge '../' zurückgewiesen."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:479
 msgid "Executable link rejected due to location or path."
-msgstr "Ausführbarer Link aufgrund des Ortes oder Dateipfades zurückgewiesen."
+msgstr "Ausführbarer Link aufgrund des Ortes oder Dateipfades zurückgewiesen."
 
-#: LYMessages.c:482
+#: LYMessages.c:480
 msgid "Mail access is disabled!"
 msgstr "Zugang zu Mail ist ausgeschaltet!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:484
+#: LYMessages.c:482
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Zugang ist nur zu Dateien und Diensten der lokalen Machine gestattet."
 
-#: LYMessages.c:485
+#: LYMessages.c:483
 msgid "Telnet access is disabled!"
 msgstr "Zugang zu Telnet ist ausgeschaltet!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:487
+#: LYMessages.c:485
 msgid "Telnet port specifications are disabled."
-msgstr "Erlaubnis zur Angabe eines Ports für Telnet ist nicht eingeschaltet."
+msgstr "Erlaubnis zur Angabe eines Ports für Telnet ist nicht eingeschaltet."
 
-#: LYMessages.c:488
+#: LYMessages.c:486
 msgid "USENET news access is disabled!"
 msgstr "Zugang zu USENET news ist ausgeschaltet!"
 
-#: LYMessages.c:489
+#: LYMessages.c:487
 msgid "Rlogin access is disabled!"
 msgstr "Zugang zu Rlogin ist ausgeschaltet!"
 
-#: LYMessages.c:490
+#: LYMessages.c:488
 msgid "Ftp access is disabled!"
 msgstr "Zugang zu Ftp ist ausgeschaltet!"
 
-#: LYMessages.c:491
+#: LYMessages.c:489
 msgid "There are no references from this document."
 msgstr "Dieses Dokument hat keine Links."
 
-#: LYMessages.c:492
+#: LYMessages.c:490
 msgid "There are only hidden links from this document."
 msgstr "Dieses Dokument hat nur versteckte Links."
 
 # Seems unused now.
-#: LYMessages.c:494
+#: LYMessages.c:492
 msgid "Unable to open command file."
-msgstr "Kann die Befehlsdatei nicht öffnen"
+msgstr "Kann die Befehlsdatei nicht öffnen"
 
-#: LYMessages.c:496
+#: LYMessages.c:494
 msgid "News Post Cancelled!!!"
 msgstr "News-Posting abgebrochen!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:498
+#: LYMessages.c:496
 msgid "Spawning your selected editor to edit news message"
-msgstr "Ausgewählter Editor wird zum Erstellen der Nachricht gestartet."
+msgstr "Ausgewählter Editor wird zum Erstellen der Nachricht gestartet."
 
-#: LYMessages.c:499
+#: LYMessages.c:497
 msgid "Post this message?"
 msgstr "Message schicken?"
 
-#: LYMessages.c:500
+#: LYMessages.c:498
 #, c-format
 msgid "Append '%s'?"
-msgstr "'%s' anhängen?"
+msgstr "'%s' anhängen?"
 
-#: LYMessages.c:501
+#: LYMessages.c:499
 msgid "Posting to newsgroup(s)..."
 msgstr "Posting zu Newsgroup(s)..."
 
-#: LYMessages.c:503
+#: LYMessages.c:501
 msgid "*** You have unread mail. ***"
 msgstr "*** Du hast ungelesene Mail. ***"
 
-#: LYMessages.c:505
+#: LYMessages.c:503
 msgid "*** You have mail. ***"
 msgstr "*** Du hast Mail. ***"
 
-#: LYMessages.c:507
+#: LYMessages.c:505
 msgid "*** You have new mail. ***"
 msgstr "*** Du hast neue Mail. ***"
 
-#: LYMessages.c:508
+#: LYMessages.c:506
 msgid "File insert cancelled!!!"
-msgstr "Dateieinfügung abgebrochen!!!"
+msgstr "Dateieinfügung abgebrochen!!!"
 
-#: LYMessages.c:509
+#: LYMessages.c:507
 msgid "Not enough memory for file!"
-msgstr "Nicht genug Memory für Datei!"
+msgstr "Nicht genug Memory für Datei!"
 
-#: LYMessages.c:510
+#: LYMessages.c:508
 msgid "Can't open file for reading."
-msgstr "Datei konnte nicht zum Lesen geöffnet werden!"
+msgstr "Datei konnte nicht zum Lesen geöffnet werden!"
 
-#: LYMessages.c:511
+#: LYMessages.c:509
 msgid "File does not exist."
 msgstr "Datei nicht gefunden."
 
-#: LYMessages.c:512
+#: LYMessages.c:510
 msgid "File does not exist - reenter or cancel:"
 msgstr "Datei nicht gefunden - Neueingabe oder Abbruch:"
 
-#: LYMessages.c:513
+#: LYMessages.c:511
 msgid "File is not readable."
 msgstr "Datei nicht lesbar."
 
-#: LYMessages.c:514
+#: LYMessages.c:512
 msgid "File is not readable - reenter or cancel:"
 msgstr "Datei nicht lesbar - Neueingabe oder Abbruch:"
 
-#: LYMessages.c:515
+#: LYMessages.c:513
 msgid "Nothing to insert - file is 0-length."
-msgstr "Kein einfügbarer Text vorhanden - die Datei ist leer."
+msgstr "Kein einfügbarer Text vorhanden - die Datei ist leer."
 
-#: LYMessages.c:516
+#: LYMessages.c:514
 msgid "Save request cancelled!!!"
 msgstr "Wunsch zu speichern abgebrochen!!!"
 
-#: LYMessages.c:517
+#: LYMessages.c:515
 msgid "Mail request cancelled!!!"
 msgstr "Wunsch Mail zu schicken abgebrochen!!!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:519
+#: LYMessages.c:517
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "Quelltext ist vorverarbeitet. Wirklich schicken?"
 
-#: LYMessages.c:520
+#: LYMessages.c:518
 msgid "Please wait..."
 msgstr "Bitte warten..."
 
-#: LYMessages.c:521
+#: LYMessages.c:519
 msgid "Mailing file.  Please wait..."
 msgstr "Datei wird als Mail geschickt.  Bitte warten..."
 
-#: LYMessages.c:522
+#: LYMessages.c:520
 msgid "ERROR - Unable to mail file"
 msgstr "FEHLER - Datei konnte nicht als Mail geschickt werden"
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:524
+#: LYMessages.c:522
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "Datei ist %d Bildschirme lang. Wirklich drucken?"
 
-#: LYMessages.c:525
+#: LYMessages.c:523
 msgid "Print request cancelled!!!"
 msgstr "Wunsch zu durcken abgebrochen!!!"
 
-#: LYMessages.c:526
+#: LYMessages.c:524
 msgid "Press <return> to begin: "
-msgstr "Eingabetaste drücken um zu beginnen: "
+msgstr "Eingabetaste drücken um zu beginnen: "
 
-#: LYMessages.c:527
+#: LYMessages.c:525
 msgid "Press <return> to finish: "
-msgstr "Eingabetaste drücken: "
+msgstr "Eingabetaste drücken: "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:527
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "Datei ist %d Seiten lang. Wirklich drucken?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:531
+#: LYMessages.c:529
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
-msgstr "Ist der Drucker auch on-line?  Eingabetaste betätigen für Druckbeginn:"
+msgstr "Ist der Drucker auch on-line?  Eingabetaste betätigen für Druckbeginn:"
 
-#: LYMessages.c:532
+#: LYMessages.c:530
 msgid "ERROR - Unable to allocate file space!!!"
-msgstr "FEHLER - Nicht genug Speicherplatz für Datei!!!"
+msgstr "FEHLER - Nicht genug Speicherplatz für Datei!!!"
 
-#: LYMessages.c:533
+#: LYMessages.c:531
 msgid "Unable to open tempfile"
-msgstr "Temporäre Datei konnte nicht geöffnet werden"
+msgstr "Temporäre Datei konnte nicht geöffnet werden"
 
-#: LYMessages.c:534
+#: LYMessages.c:532
 msgid "Unable to open print options file"
-msgstr "Temporäre Datei für Druckeroptionen konnte nicht geöffnet werden"
+msgstr "Temporäre Datei für Druckeroptionen konnte nicht geöffnet werden"
 
-#: LYMessages.c:535
+#: LYMessages.c:533
 msgid "Printing file.  Please wait..."
 msgstr "Datei wird gedruckt.  Bitte warten..."
 
-#: LYMessages.c:536
+#: LYMessages.c:534
 msgid "Please enter a valid internet mail address: "
-msgstr "Bitte gültige Internet-Mailadresse eingeben: "
+msgstr "Bitte gültige Internet-Mailadresse eingeben: "
 
-#: LYMessages.c:537
+#: LYMessages.c:535
 msgid "ERROR! - printer is misconfigured!"
 msgstr "FEHLER! - Drucker ist falsch konfiguriert!"
 
-#: LYMessages.c:538
+#: LYMessages.c:536
 msgid "Image map from POST response not available!"
 msgstr "Imagemap aus POST-Antwort nicht vorhanden!"
 
-#: LYMessages.c:539
+#: LYMessages.c:537
 msgid "Misdirected client-side image MAP request!"
 msgstr "Fehlgeleitete Anforderung einer client-side Image-MAP!"
 
-#: LYMessages.c:540
+#: LYMessages.c:538
 msgid "Client-side image MAP is not accessible!"
-msgstr "Client-side Image-MAP ist nicht zugänglich!"
+msgstr "Client-side Image-MAP ist nicht zugänglich!"
 
-#: LYMessages.c:541
+#: LYMessages.c:539
 msgid "No client-side image MAPs are available!"
-msgstr "Keinerlei client-side Image-MAPs verfügbar!"
+msgstr "Keinerlei client-side Image-MAPs verfügbar!"
 
-#: LYMessages.c:542
+#: LYMessages.c:540
 msgid "Client-side image MAP is not available!"
-msgstr "Client-side Image-MAP ist nicht verfügbar!"
+msgstr "Client-side Image-MAP ist nicht verfügbar!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:545
+#: LYMessages.c:543
 msgid "Screen height must be at least 24 lines for the Options menu!"
-msgstr "Das Optionsmenü braucht mindestens 24 Bildschirmzeilen!"
+msgstr "Das Options-Menü braucht mindestens 24 Bildschirmzeilen!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:547
+#: LYMessages.c:545
 msgid "Screen height must be at least 23 lines for the Options menu!"
-msgstr "Das Optionsmenü braucht mindestens 23 Bildschirmzeilen!"
+msgstr "Das Options-Menü braucht mindestens 23 Bildschirmzeilen!"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:549
+#: LYMessages.c:547
 msgid "Screen height must be at least 22 lines for the Options menu!"
-msgstr "Das Optionsmenü braucht mindestens 22 Bildschirmzeilen!"
+msgstr "Das Options-Menü braucht mindestens 22 Bildschirmzeilen!"
 
-#: LYMessages.c:551
+#: LYMessages.c:549
 msgid "That key requires Advanced User mode."
 msgstr "Die Taste funktioniert nur im \"fortgeschrittenen\" Benutzermodus."
 
-#: LYMessages.c:552
+#: LYMessages.c:550
 #, c-format
 msgid "Content-type: %s"
 msgstr "Content-Type: %s"
 
-#: LYMessages.c:553
+#: LYMessages.c:551
 msgid "Command: "
-msgstr "Kommando: "
+msgstr "Befehl: "
 
-#: LYMessages.c:554
+#: LYMessages.c:552
 msgid "Unknown or ambiguous command"
-msgstr ""
+msgstr "Unbekannter oder doppeldeutiger Befehl"
 
-#: LYMessages.c:555
+#: LYMessages.c:553
 msgid " Version "
 msgstr " Version "
 
-#: LYMessages.c:556
+#: LYMessages.c:554
 msgid " first"
-msgstr "erster"
+msgstr " erster"
 
-#: LYMessages.c:557
+#: LYMessages.c:555
 msgid ", guessing..."
 msgstr " (Versuch zu raten...)"
 
-#: LYMessages.c:558
+#: LYMessages.c:556
 msgid "Permissions for "
-msgstr "Zugriffsberechtigung für "
+msgstr "Zugriffsberechtigung für "
 
-#: LYMessages.c:559
+#: LYMessages.c:557
 msgid "Select "
-msgstr "Wähle "
+msgstr "Wähle "
 
-#: LYMessages.c:560
+#: LYMessages.c:558
 msgid "capital letter"
-msgstr "Großbuchstaben"
+msgstr "Großbuchstaben"
 
-#: LYMessages.c:561
+#: LYMessages.c:559
 msgid " of option line,"
 msgstr " der Optionszeile,"
 
-#: LYMessages.c:562
+#: LYMessages.c:560
 msgid " to save,"
 msgstr " um zu speichern,"
 
-#: LYMessages.c:563
+#: LYMessages.c:561
 msgid " to "
 msgstr " um zu "
 
-#: LYMessages.c:564
+#: LYMessages.c:562
 msgid " or "
 msgstr " oder "
 
-#: LYMessages.c:565
+#: LYMessages.c:563
 msgid " index"
 msgstr "-Index"
 
-#: LYMessages.c:566
+#: LYMessages.c:564
 msgid " to return to Lynx."
-msgstr " für Rückkehr zu Lynx."
+msgstr " für Rückkehr zu Lynx."
 
-#: LYMessages.c:567
+#: LYMessages.c:565
 msgid "Accept Changes"
-msgstr "Änderungen akzeptieren"
+msgstr "Änderungen akzeptieren"
 
-#: LYMessages.c:568
+#: LYMessages.c:566
 msgid "Reset Changes"
-msgstr "Änderungen zurücknehmen"
+msgstr "Änderungen zurücknehmen"
 
-#: LYMessages.c:569
+#: LYMessages.c:567
 msgid "Left Arrow cancels changes"
-msgstr "Linke Pfeiltaste nimmt zurück"
+msgstr "Linke Pfeiltaste nimmt zurück"
 
-#: LYMessages.c:570
+#: LYMessages.c:568
 msgid "Save options to disk"
 msgstr "Optionen permanent speichern"
 
-#: LYMessages.c:571
+#: LYMessages.c:569
 msgid "Hit RETURN to accept entered data."
-msgstr "RETURN (Eingabetaste) für Bestätigung."
+msgstr "RETURN (Eingabetaste) für Bestätigung."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:573
+#: LYMessages.c:571
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
-msgstr "RETURN (Eingabetaste) für Bestätigung, oder Feld leermachen für Vorgabewert."
+msgstr "RETURN (Eingabetaste) für Bestätigung, oder Feld leermachen für Vorgabewert."
 
-#: LYMessages.c:574
+#: LYMessages.c:572
 msgid "Value accepted!"
 msgstr "Wert akzeptiert!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:576
+#: LYMessages.c:574
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
-msgstr "Wert akzeptiert! -- WARNUNG: Lynx ist für X Window System konfiguriert!"
+msgstr "Wert akzeptiert! -- WARNUNG: Lynx ist für X Window System konfiguriert!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:578
+#: LYMessages.c:576
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
-msgstr "Wert akzeptiert! -- WARNUNG: Lynx ist NICHT für X Window System konfiguriert!"
+msgstr "Wert akzeptiert! -- WARNUNG: Lynx ist NICHT für X Window System konfiguriert!"
 
-#: LYMessages.c:579
+#: LYMessages.c:577
 msgid "You are not allowed to change which editor to use!"
-msgstr "Es ist nicht erlaubt, die Auswahl des Editors zu ändern!"
+msgstr "Es ist nicht erlaubt, die Auswahl des Editors zu ändern!"
 
-#: LYMessages.c:580
+#: LYMessages.c:578
 msgid "Failed to set DISPLAY variable!"
 msgstr "DISPLAY-Variable konnte nicht gesetzt werden!"
 
-#: LYMessages.c:581
+#: LYMessages.c:579
 msgid "Failed to clear DISPLAY variable!"
-msgstr "DISPLAY-Variable konnte nicht gelöscht werden!"
+msgstr "DISPLAY-Variable konnte nicht gelöscht werden!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:583
+#: LYMessages.c:581
 msgid "You are not allowed to change the bookmark file!"
-msgstr "Änderung der Lesezeichendatei ist nicht erlaubt!"
+msgstr "Änderung der Lesezeichendatei ist nicht erlaubt!"
 
-#: LYMessages.c:584
+#: LYMessages.c:582
 msgid "Terminal does not support color"
-msgstr "Terminal hat keine Unterstützung für Farbe"
+msgstr "Terminal hat keine Unterstützung für Farbe"
 
-#: LYMessages.c:585
+#: LYMessages.c:583
 #, c-format
 msgid "Your '%s' terminal does not support color."
-msgstr "Das Terminal vom Typ '%s' hat keine Unterstützung für Farbe."
+msgstr "Das Terminal vom Typ '%s' hat keine Unterstützung für Farbe."
 
-#: LYMessages.c:586
+#: LYMessages.c:584
 msgid "Access to dot files is disabled!"
 msgstr "Zugang zu Dateien, die mit Punkt beginnen, ist nicht erlaubt!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:588
+#: LYMessages.c:586
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
-msgstr "Die Kennung des Benutzer-Agenten enthält weder \\\"Lynx\\\" noch \\\"L_y_n_x\\\""
+msgstr "Die Kennung des Benutzer-Agenten enthält weder \\\"Lynx\\\" noch \\\"L_y_n_x\\\""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:590
+#: LYMessages.c:588
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
-msgstr "Benutze \\\"L_y_n_x\\\" oder \\\"Lynx\\\" im Benutzer-Agenten. Anderenfalls sieht es nach bewusster Täuschung aus."
+msgstr "Benutze \\\"L_y_n_x\\\" oder \\\"Lynx\\\" im Benutzer-Agenten. Anderenfalls sieht es nach bewusster Täuschung aus."
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:592
+#: LYMessages.c:590
 msgid "Changing of the User-Agent string is disabled!"
-msgstr "Ändern der Kennung des Benutzer-Agenten ist außer Betrieb!"
+msgstr "Ändern der Kennung des Benutzer-Agenten ist außer Betrieb!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:594
+#: LYMessages.c:592
 msgid "You are not allowed to change this setting."
-msgstr "Das Ändern dieser Einstellung ist nicht erlaubt."
+msgstr "Das Ändern dieser Einstellung ist nicht erlaubt."
 
-#: LYMessages.c:595
+#: LYMessages.c:593
 msgid "Saving Options..."
 msgstr "Optionen speichern..."
 
-#: LYMessages.c:596
+#: LYMessages.c:594
 msgid "Options saved!"
 msgstr "Optionen gespeichert!"
 
-#: LYMessages.c:597
+#: LYMessages.c:595
 msgid "Unable to save Options!"
 msgstr "Optionen konnten nicht gespeichert werten!"
 
-#: LYMessages.c:598
+#: LYMessages.c:596
 msgid " 'r' to return to Lynx "
-msgstr " 'r' für Rückkehr zu Lynx "
+msgstr " 'r' für Rückkehr zu Lynx "
 
-#: LYMessages.c:599
+#: LYMessages.c:597
 msgid " '>' to save, or 'r' to return to Lynx "
-msgstr " '>' um zu speichern, oder 'r' für Rückkehr zu Lynx "
+msgstr " '>' um zu speichern, oder 'r' für Rückkehr zu Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:601
+#: LYMessages.c:599
 msgid "Hit any key to change value; RETURN to accept."
-msgstr "Beliebige Taste drücken um Wert zu verändern; Eingabetaste zum Akzeptieren."
+msgstr "Beliebige Taste drücken um Wert zu verändern; Eingabetaste zum Akzeptieren."
 
-#: LYMessages.c:602
+#: LYMessages.c:600
 msgid "Error uncompressing temporary file!"
-msgstr "Temporäre Datei konnte nicht dekomprimiert werden!"
+msgstr "Temporäre Datei konnte nicht dekomprimiert werden!"
 
-#: LYMessages.c:603
+#: LYMessages.c:601
 msgid "Unsupported URL scheme!"
-msgstr "Ununterstütztes URL-Schema!"
+msgstr "Ununterstütztes URL-Schema!"
 
-#: LYMessages.c:604
+#: LYMessages.c:602
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
-msgstr "Der URL-Typ \"data:\" ist nicht unterstützt. Probier die '=' Taste."
+msgstr "Der URL-Typ \"data:\" ist nicht unterstützt. Probier die '=' Taste."
 
-#: LYMessages.c:605
+#: LYMessages.c:603
 msgid "Redirection limit of 10 URL's reached."
 msgstr "Redirection-Limit von 10 URLs erreicht."
 
-#: LYMessages.c:606
+#: LYMessages.c:604
 msgid "Illegal redirection URL received from server!"
-msgstr "Der Server hat einen ungültigen Redirection-URL geschickt!"
+msgstr "Der Server hat einen ungültigen Redirection-URL geschickt!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:608
+#: LYMessages.c:606
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "Server verlangte mit Status %d Umleitung von POST-Daten zu"
 
-#: LYMessages.c:611
+#: LYMessages.c:609
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P)OST, in G)ET umwandeln oder Abbru(c)h/(C)ancel "
 
-#: LYMessages.c:612
+#: LYMessages.c:610
 msgid "P)roceed, or C)ancel "
 msgstr "Weitermachen/(P)roceed oder Abbruch/(C)ancel "
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:614
+#: LYMessages.c:612
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr "Umleitung von POST-Daten. P)OST, U)RL zeigen, G)ET, oder Abbre(C)hen"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:614
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "Umleitung von POST-Daten. Weiter/(P)roceed, U)RL zeigen oder Abbre(C)en"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:618
+#: LYMessages.c:616
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "Dokument hat POST-Daten, d.h. bereits gesandten Forminhalt. POST wiederholen?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:620
+#: LYMessages.c:618
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "POST-Daten neu senden zu %s ?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:622
+#: LYMessages.c:620
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
-msgstr "Liste für Dokuments mit Formdaten. %s neu laden?"
+msgstr "Liste für Dokuments mit Formdaten. %s neu laden?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:624
+#: LYMessages.c:622
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "Dokument is Ergebnis einer POST-Aktion, HEAD vielleicht unanwendbar. Weiter?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:624
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "Formzugriffsmethode ist POST, HEAD vielleicht unanwendbar. Weiter?"
 
-#: LYMessages.c:627
+#: LYMessages.c:625
 msgid "Proceed without a username and password?"
 msgstr "Weitermachen ohne Username und Password?"
 
-#: LYMessages.c:628
+#: LYMessages.c:626
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Weiter (%s)?"
 
-#: LYMessages.c:629
+#: LYMessages.c:627
 msgid "Cannot POST to this host."
-msgstr "POST nicht möglich für diesen Host."
+msgstr "POST nicht möglich für diesen Host."
 
-#: LYMessages.c:630
+#: LYMessages.c:628
 msgid "POST not supported for this URL - ignoring POST data!"
-msgstr "POST nicht möglich für diesen URL - POST-Daten werden ignoriert!"
+msgstr "POST nicht möglich für diesen URL - POST-Daten werden ignoriert!"
 
-#: LYMessages.c:631
+#: LYMessages.c:629
 msgid "Discarding POST data..."
 msgstr "POST-Daten weggeworfen..."
 
-#: LYMessages.c:632
+#: LYMessages.c:630
 msgid "Document will not be reloaded!"
 msgstr "Dokument wird nicht zwangsgeladen!"
 
-#: LYMessages.c:633
+#: LYMessages.c:631
 msgid "Location: "
 msgstr "Location: "
 
-#: LYMessages.c:634
+#: LYMessages.c:632
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' nicht gefunden!"
 
-#: LYMessages.c:635
+#: LYMessages.c:633
 msgid "Default Bookmark File"
 msgstr "Lesezeichendatei wenn nicht angegeben"
 
-#: LYMessages.c:636
+#: LYMessages.c:634
 msgid "Screen too small! (8x35 min)"
-msgstr "Fenster zu klein, 8x35 nötig"
+msgstr "Fenster zu klein, 8x35 nötig"
 
-#: LYMessages.c:637
+#: LYMessages.c:635
 msgid "Select destination or ^G to Cancel: "
-msgstr "Ziel eingeben, oder ^G für Abbruch: "
+msgstr "Ziel eingeben, oder ^G für Abbruch: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:639
+#: LYMessages.c:637
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
-msgstr "Unterlesezeichendatein wählen, '=' für Menü oder ^G für Abbruch:"
+msgstr "Unterlesezeichendatein wählen, '=' für Menü oder ^G für Abbruch:"
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:641
+#: LYMessages.c:639
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "L)ink in dieser Lesezeichendatei duplizieren oder abbre(C)hen? (l,c): "
 
-#: LYMessages.c:642
+#: LYMessages.c:640
 msgid "Multiple bookmark support is not available."
-msgstr "Multi-Datei-Lesezeichen nicht verfügbar."
+msgstr "Multi-Datei-Lesezeichen nicht verfügbar."
 
-#: LYMessages.c:643
+#: LYMessages.c:641
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
-msgstr " Wähle Lesezeichensammlung (Seite %d von %d)"
+msgstr " Wähle Lesezeichensammlung (Seite %d von %d)"
 
-#: LYMessages.c:644
+#: LYMessages.c:642
 msgid "       Select Bookmark"
-msgstr "       Wähle Lesezeichensammlung"
+msgstr "       Wähle Lesezeichensammlung"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:646
+#: LYMessages.c:644
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
-msgstr "BESCHREIBUNG und DATEIPFAD für Lesezeichen ändern (%d von 2)"
+msgstr "BESCHREIBUNG und DATEIPFAD für Lesezeichen ändern (%d von 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:648
+#: LYMessages.c:646
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
-msgstr "         BESCHREIBUNG und DATEIPFAD für Lesezeichen ändern"
+msgstr "         BESCHREIBUNG und DATEIPFAD für Lesezeichen ändern"
 
-#: LYMessages.c:649
+#: LYMessages.c:647
 msgid "Letter: "
 msgstr "Buchstabe: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:652
+#: LYMessages.c:650
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Dateipfad relativ zum Home-Verzeichnis in SHELL-Syntax angeben!"
 
-#: LYMessages.c:654
+#: LYMessages.c:652
 msgid "Use a filepath off your home directory!"
 msgstr "Dateipfad relativ zum Home-Verzeichnis angeben!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:657
+#: LYMessages.c:655
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Max. Links/Bildschirm erreicht! Probier Halbseiten- oder Zweizeilenbewegung."
 
 #. #define MAXHIST_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:657
 msgid "History List maximum reached!  Document not pushed."
-msgstr "Maximum für History-Liste erreicht! Dokument nicht auf Stapel abgelegt."
+msgstr "Maximum für History-Liste erreicht! Dokument nicht auf Stapel abgelegt."
 
-#: LYMessages.c:660
+#: LYMessages.c:658
 msgid "No previously visited links available!"
 msgstr "Noch keine schon besuchten Links!"
 
-#: LYMessages.c:661
+#: LYMessages.c:659
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Zu wenig Speicherplatz!  Programm abgebrochen!"
 
-#: LYMessages.c:662
+#: LYMessages.c:660
 msgid "Memory exhausted!  Aborting..."
 msgstr "Zu wenig Speicherplatz!  Programm bricht ab..."
 
-#: LYMessages.c:663
+#: LYMessages.c:661
 msgid "Not enough memory!"
 msgstr "Nicht genug Speicher!"
 
-#: LYMessages.c:664
+#: LYMessages.c:662
 msgid "Directory/File Manager not available"
-msgstr "Verzeichnis- und Dateimanager (Dired) nicht verfügbar"
+msgstr "Verzeichnis- und Dateimanager (Dired) nicht verfügbar"
 
-#: LYMessages.c:665
+#: LYMessages.c:663
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "HREF in BASE-Tag ist kein absoluter URL."
 
-#: LYMessages.c:666
+#: LYMessages.c:664
 msgid "Location URL is not absolute."
 msgstr "Location-URL ist nicht absolut."
 
-#: LYMessages.c:667
+#: LYMessages.c:665
 msgid "Refresh URL is not absolute."
 msgstr "Refresh-URL ist nicht absolut."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:667
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2057,7 +2063,7 @@ msgstr ""
 "Nachricht mit vergegebenem Inhalt wird geschickt an:\n"
 "  "
 
-#: LYMessages.c:670
+#: LYMessages.c:668
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2065,7 +2071,7 @@ msgstr ""
 "Kommentar wird geschickt an:\n"
 "  "
 
-#: LYMessages.c:671
+#: LYMessages.c:669
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2075,7 +2081,7 @@ msgstr ""
 " Mit Kopie an:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:670
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2086,7 +2092,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:672
 msgid ""
 "\n"
 "\n"
@@ -2097,16 +2103,16 @@ msgstr ""
 "Ctrl-G zum Abbrechen verwenden, falls keine Nachricht geschickt werden soll.\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:674
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
 msgstr ""
 "\n"
-" Bitte eigenen Namen eingeben, oder für Anonymität leerlassen\n"
+" Bitte eigenen Namen eingeben, oder für Anonymität leerlassen\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:676
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2116,42 +2122,42 @@ msgstr ""
 " Bitte eigene Mailadresse oder ander Kontaktadresse\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:678
 msgid " means to contact you, if you desire a response.\n"
-msgstr " eingeben, fall eine Antwort gewünscht wird.\n"
+msgstr " eingeben, fall eine Antwort gewünscht wird.\n"
 
-#: LYMessages.c:681
+#: LYMessages.c:679
 msgid ""
 "\n"
 " Please enter a subject line.\n"
 msgstr ""
 "\n"
-" Bitte eine Zeile eingeben für Betreff/Subject.\n"
+" Bitte eine Zeile eingeben für Betreff/Subject.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
 msgstr ""
 "\n"
-" Mailadresse für zusätztliche Kopie (CC) eingeben.\n"
+" Mailadresse für zusätztliche Kopie (CC) eingeben.\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:682
 msgid " (Leave blank if you don't want a copy.)\n"
-msgstr " (Kann leergelassen werden, falls keine Kopie erwünscht ist.)\n"
+msgstr " (Kann leergelassen werden, falls keine Kopie erwünscht ist.)\n"
 
-#: LYMessages.c:685
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please review the message body:\n"
 "\n"
 msgstr ""
 "\n"
-" Bitte den Inhalt der Nachricht überprüfen:\n"
+" Bitte den Inhalt der Nachricht überprüfen:\n"
 "\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:684
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2159,19 +2165,19 @@ msgstr ""
 "\n"
 "RETURN (Eingabetaste) um weiterzumachen: "
 
-#: LYMessages.c:687
+#: LYMessages.c:685
 msgid ""
 "\n"
 "Press RETURN to clean up: "
 msgstr ""
 "\n"
-"RETURN (Eingabetaste) um aufzuräumen: "
+"RETURN (Eingabetaste) um aufzuräumen: "
 
-#: LYMessages.c:688
+#: LYMessages.c:686
 msgid " Use Control-U to erase the default.\n"
-msgstr " Die Vorgaben können mit ^U gelöscht werden.\n"
+msgstr " Die Vorgaben können mit ^U gelöscht werden.\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2180,16 +2186,16 @@ msgstr ""
 " Bitte Nachricht unten eingeben."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:380
+#: LYMessages.c:689 src/LYNews.c:361
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
 msgstr ""
 "\n"
-" Wenn du fertig bist, Eingabetaste drücken und einen einzelnen Punkt (.)"
+" Wenn du fertig bist, Eingabetaste drücken und einen einzelnen Punkt (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:381
+#: LYMessages.c:691 src/LYNews.c:362
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2199,249 +2205,249 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:695
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "Keks von %s: %.*s=%.*s ?diesen(Y/N)/immer(Akz./Verw.)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:697
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Schlechten Keks domain=%s von '%s' nehmen?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:699
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
-msgstr "Keks: path=%s als Präfix von '%s' akzeptieren?"
+msgstr "Keks: path=%s als Präfix von '%s' akzeptieren?"
 
-#: LYMessages.c:702
+#: LYMessages.c:700
 msgid "Allowing this cookie."
 msgstr "Dieser Keks wird erlaubt."
 
-#: LYMessages.c:703
+#: LYMessages.c:701
 msgid "Rejecting this cookie."
-msgstr "Dieser Keks wird zurückgewiesen."
+msgstr "Dieser Keks wird zurückgewiesen."
 
-#: LYMessages.c:704
+#: LYMessages.c:702
 msgid "The Cookie Jar is empty."
 msgstr "Der Keksbeutel ist leer."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:706
+#: LYMessages.c:704
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "Links aktivieren um einzelne Kekse oder ganze Domains zu vernichten,"
 
-#: LYMessages.c:707
+#: LYMessages.c:705
 msgid "or to change a domain's 'allow' setting."
-msgstr "oder um den 'erlaubt'-Zustand für eine Domain zu ändern."
+msgstr "oder um den 'erlaubt'-Zustand für eine Domain zu ändern."
 
-#: LYMessages.c:708
+#: LYMessages.c:706
 msgid "(Cookies never allowed.)"
 msgstr "(Kekse nie erlaubt.)"
 
-#: LYMessages.c:709
+#: LYMessages.c:707
 msgid "(Cookies always allowed.)"
 msgstr "(Kekse immer gern gesehen.)"
 
-#: LYMessages.c:710
+#: LYMessages.c:708
 msgid "(Cookies allowed via prompt.)"
-msgstr "(Kekse erlaubt nach Bestätigung.)"
+msgstr "(Kekse erlaubt nach Bestätigung.)"
 
 # Not used any more in latest cookie code.
-#: LYMessages.c:711
+#: LYMessages.c:709
 msgid "(Persistent Cookies.)"
-msgstr "(Beständige Kekse.)"
+msgstr "(Beständige Kekse.)"
 
-#: LYMessages.c:712
+#: LYMessages.c:710
 msgid "(No title.)"
 msgstr "(ohne Titel)"
 
-#: LYMessages.c:713
+#: LYMessages.c:711
 msgid "(No name.)"
 msgstr "(kein Name.)"
 
-#: LYMessages.c:714
+#: LYMessages.c:712
 msgid "(No value.)"
 msgstr "(kein Wert.)"
 
-#: LYMessages.c:715
+#: LYMessages.c:713
 msgid "None"
 msgstr "keine"
 
-#: LYMessages.c:716
+#: LYMessages.c:714
 msgid "(End of session.)"
 msgstr "(Ende der Session.)"
 
-#: LYMessages.c:717
+#: LYMessages.c:715
 msgid "Delete this cookie?"
-msgstr "Diesen Keks wegschmeißen?"
+msgstr "Diesen Keks wegschmeißen?"
 
-#: LYMessages.c:718
+#: LYMessages.c:716
 msgid "The cookie has been eaten!"
 msgstr "Der Keks is wechgehaun!"
 
-#: LYMessages.c:719
+#: LYMessages.c:717
 msgid "Delete this empty domain?"
 msgstr "Leere Domain entfernen?"
 
-#: LYMessages.c:720
+#: LYMessages.c:718
 msgid "The domain has been eaten!"
 msgstr "Fort ist sie!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:722
+#: LYMessages.c:720
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)iese Kekse weg, (immer)(A)kzept/ (P)rompt/ (immer)(V)erweig, oder Abbru(C)h? "
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:724
+#: LYMessages.c:722
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)omain weg, (immer) (A)kzept. / (P)rompt / (immer)(V)erweig., oder Abbru(C)h? "
 
-#: LYMessages.c:725
+#: LYMessages.c:723
 msgid "All cookies in the domain have been eaten!"
 msgstr "Keine Kekse mehr da!"
 
-#: LYMessages.c:726
+#: LYMessages.c:724
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
-msgstr "'A'lle Kekse für Domain '%s' erlaubt."
+msgstr "'A'lle Kekse für Domain '%s' erlaubt."
 
-#: LYMessages.c:727
+#: LYMessages.c:725
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
-msgstr "Kekse 'V'erboten für Domain '%s'."
+msgstr "Kekse 'V'erboten für Domain '%s'."
 
-#: LYMessages.c:728
+#: LYMessages.c:726
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
-msgstr "'P'rompte Frage wenn Kekse kommen für Domain '%s'."
+msgstr "'P'rompte Frage wenn Kekse kommen für Domain '%s'."
 
-#: LYMessages.c:729
+#: LYMessages.c:727
 msgid "Delete all cookies in this domain?"
-msgstr "Alle Kekse für diese Domain wegwerfen?"
+msgstr "Alle Kekse für diese Domain wegwerfen?"
 
-#: LYMessages.c:730
+#: LYMessages.c:728
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "Der Keksbeutel ist total leer!"
 
-#: LYMessages.c:732
+#: LYMessages.c:730
 msgid "Port 19 not permitted in URLs."
 msgstr "Port 19 nicht erlaubt in URLs."
 
-#: LYMessages.c:733
+#: LYMessages.c:731
 msgid "Port 25 not permitted in URLs."
 msgstr "Port 25 nicht erlaubt in URLs."
 
-#: LYMessages.c:734
+#: LYMessages.c:732
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "Port %lu nicht erlaubt in URLs."
 
-#: LYMessages.c:735
+#: LYMessages.c:733
 msgid "URL has a bad port field."
-msgstr "URL hat ungültigen Port."
+msgstr "URL hat ungültigen Port."
 
-#: LYMessages.c:736
+#: LYMessages.c:734
 msgid "Maximum nesting of HTML elements exceeded."
-msgstr "Maximale Schachtelungstiefe für HTML-Elemente überschritten."
+msgstr "Maximale Schachtelungstiefe für HTML-Elemente überschritten."
 
-#: LYMessages.c:737
+#: LYMessages.c:735
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Link mit schlechter partieller URL-Reference! '../' wird entfernt."
 
-#: LYMessages.c:738
+#: LYMessages.c:736
 msgid "Trace Log open failed.  Trace off!"
-msgstr "Fehler beim Öffnen der Trace-Logdatei.  Trace AUS!"
+msgstr "Fehler beim Öffnen der Trace-Logdatei.  Trace AUS!"
 
-#: LYMessages.c:739
+#: LYMessages.c:737
 msgid "Lynx Trace Log"
 msgstr "Lynx Trace Log"
 
-#: LYMessages.c:740
+#: LYMessages.c:738
 msgid "No trace log has been started for this session."
 msgstr "Trace Log in dieser Session bislang nicht gestartet."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:742
+#: LYMessages.c:740
 msgid "The maximum temporary file count has been reached!"
-msgstr "Die maximale Anzahl temporärer Dateien ist erreicht!"
+msgstr "Die maximale Anzahl temporärer Dateien ist erreicht!"
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:744
+#: LYMessages.c:742
 msgid "Form field value exceeds buffer length!  Trim the tail."
-msgstr "Wert des Formfeldes länger as Pufferspeicher! Schwanz ab."
+msgstr "Wert des Formfeldes länger as Pufferspeicher! Schwanz ab."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:746
+#: LYMessages.c:744
 msgid "Modified tail combined with head of form field value."
 msgstr "Modifizierter Schwanz mit dem Kopf des Formfeldwertes kombiniert."
 
 #. HTFile.c
-#: LYMessages.c:749
+#: LYMessages.c:747
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: LYMessages.c:750
+#: LYMessages.c:748
 msgid "Directory browsing is not allowed."
-msgstr "Das Durchstöbern von Dateiverzeichnissen ist untersagt."
+msgstr "Das Durchstöbern von Dateiverzeichnissen ist untersagt."
 
-#: LYMessages.c:751
+#: LYMessages.c:749
 msgid "Selective access is not enabled for this directory"
-msgstr "Selektiver Zugriff ist für dieses Verzeichnis nicht möglich"
+msgstr "Selektiver Zugriff ist für dieses Verzeichnis nicht möglich"
 
-#: LYMessages.c:752
+#: LYMessages.c:750
 msgid "Multiformat: directory scan failed."
 msgstr "Multiformat: Suche im Verzeichnis fehlgeschlagen."
 
-#: LYMessages.c:753
+#: LYMessages.c:751
 msgid "This directory is not readable."
 msgstr "Dieses Verzeichnis kann nicht gelesen werden."
 
-#: LYMessages.c:754
+#: LYMessages.c:752
 msgid "Can't access requested file."
-msgstr "Die gewünschte Datei ist nicht zugänglich."
+msgstr "Die gewünschte Datei ist nicht zugänglich."
 
-#: LYMessages.c:755
+#: LYMessages.c:753
 msgid "Could not find suitable representation for transmission."
 msgstr "Keine passende Datei von akzeptablem Typ gefunden."
 
-#: LYMessages.c:756
+#: LYMessages.c:754
 msgid "Could not open file for decompression!"
-msgstr "Datei konnte nicht für Dekompression geöffnet werden!"
+msgstr "Datei konnte nicht für Dekompression geöffnet werden!"
 
-#: LYMessages.c:757
+#: LYMessages.c:755
 msgid "Files:"
 msgstr "Dateien:"
 
-#: LYMessages.c:758
+#: LYMessages.c:756
 msgid "Subdirectories:"
 msgstr "Unterverzeichnisse:"
 
-#: LYMessages.c:759
+#: LYMessages.c:757
 msgid " directory"
 msgstr " Verzeichnis"
 
-#: LYMessages.c:760
+#: LYMessages.c:758
 msgid "Up to "
 msgstr "Rauf nach "
 
-#: LYMessages.c:761
+#: LYMessages.c:759
 msgid "Current directory is "
 msgstr "Dies Verzeichnis ist "
 
 #. HTGopher.c
-#: LYMessages.c:764
+#: LYMessages.c:762
 msgid "No response from server!"
 msgstr "Keine Antwort vom Server!"
 
-#: LYMessages.c:765
+#: LYMessages.c:763
 msgid "CSO index"
 msgstr "CSO index"
 
-#: LYMessages.c:766
+#: LYMessages.c:764
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2449,24 +2455,24 @@ msgstr ""
 "\n"
 "Dies is ein abfragbarer Index einer CSO-Datenbank.\n"
 
-#: LYMessages.c:767
+#: LYMessages.c:765
 msgid "CSO Search Results"
 msgstr "CSO Suchresultate"
 
-#: LYMessages.c:768
+#: LYMessages.c:766
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Suchfehler auf %s\n"
 
-#: LYMessages.c:769
+#: LYMessages.c:767
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
 msgstr ""
 "\n"
-"Drück die Taste 's' und dann gib Schbegriffe ein.\n"
+"Drück die Taste 's' und dann gib Schbegriffe ein.\n"
 
-#: LYMessages.c:770
+#: LYMessages.c:768
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2474,241 +2480,245 @@ msgstr ""
 "\n"
 "Dies ist ein abfragbarer Gopher-Index.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:769
 msgid "Gopher index"
 msgstr "Gopher-Index"
 
-#: LYMessages.c:772
+#: LYMessages.c:770
 msgid "Gopher Menu"
-msgstr "Gophermenü"
+msgstr "Gophermenü"
 
-#: LYMessages.c:773
+#: LYMessages.c:771
 msgid " Search Results"
 msgstr " Suchergebnisse"
 
-#: LYMessages.c:774
+#: LYMessages.c:772
 msgid "Sending CSO/PH request."
 msgstr "CSO/PH-Request wird geschickt."
 
-#: LYMessages.c:775
+#: LYMessages.c:773
 msgid "Sending Gopher request."
 msgstr "Gopher-Request wird geschickt."
 
-#: LYMessages.c:776
+#: LYMessages.c:774
 msgid "CSO/PH request sent; waiting for response."
 msgstr "CSO/PH-Request geschickt; warten auf Antwort."
 
-#: LYMessages.c:777
+#: LYMessages.c:775
 msgid "Gopher request sent; waiting for response."
 msgstr "Gopher-Request geschickt; warten auf Godot."
 
-#: LYMessages.c:778
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Please enter search keywords.\n"
 msgstr ""
 "\n"
-"Bitte Suchwörter eingeben.\n"
+"Bitte Suchwörter eingeben.\n"
 
-#: LYMessages.c:779
+#: LYMessages.c:777
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
 msgstr ""
 "\n"
-"Die einzugebenden Wörter erlauben die Suche nach einem"
+"Die einzugebenden Wörter erlauben die Suche nach einem"
 
-#: LYMessages.c:780
+#: LYMessages.c:778
 msgid " person's name in the database.\n"
 msgstr " Personennamen in der Datenbank.\n"
 
 #. HTNews.c
-#: LYMessages.c:783
+#: LYMessages.c:781
 msgid "Connection closed ???"
 msgstr "Verbindung zugemacht ???"
 
-#: LYMessages.c:784
+#: LYMessages.c:782
 msgid "Cannot open temporary file for news POST."
-msgstr "Temporäre Datei für das Posten der News-Message kann nicht geöffnet werden."
+msgstr "Temporäre Datei für das Posten der News-Message kann nicht geöffnet werden."
 
-#: LYMessages.c:785
+#: LYMessages.c:783
 msgid "This client does not contain support for posting to news with SSL."
-msgstr "Dieses Clientprogramm hat keine Unterstützung für das News-Posten mit SSL."
+msgstr "Dieses Clientprogramm hat keine Unterstützung für das News-Posten mit SSL."
 
 # These functions are never being called.
 #. HTStyle.c
-#: LYMessages.c:788
+#: LYMessages.c:786
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Stil %d `%s' SGML:%s. Schrift %s %.1f point.\n"
 
 # These functions are never being called.
-#: LYMessages.c:789
+#: LYMessages.c:787
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
-msgstr "\tEinrückungen: Erste=%.0f, Andere=%.0f, Höhe=%.1f, Nachklapp=%.1f\n"
+msgstr "\tEinrückungen: Erste=%.0f, Andere=%.0f, Höhe=%.1f, Nachklapp=%.1f\n"
 
 # These functions are never being called.
-#: LYMessages.c:790
+#: LYMessages.c:788
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "\tAusrichten=%d, %d tabs. (%.0f vor, %.0f danach)\n"
 
 # These functions are never being called.
-#: LYMessages.c:791
+#: LYMessages.c:789
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "\t\tTabulator-Art=%d bei %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:794
+#: LYMessages.c:792
 msgid "Can't proceed without a username and password."
-msgstr "Weitermachen ohne Username und Password nicht möglich."
+msgstr "Weitermachen ohne Username und Password nicht möglich."
 
-#: LYMessages.c:795
+#: LYMessages.c:793
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Authorisierungversuche fehlgeschlagen!  Webmaster kontaktieren."
 
-#: LYMessages.c:796
+#: LYMessages.c:794
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "Proxy-Authorisierungversuche fehlgeschlagen! Frag den Cachemaster oder so..."
 
-#: LYMessages.c:797
+#: LYMessages.c:795
 msgid "Retrying with proxy authorization information."
 msgstr "Wir versuchen's noch einmal, mit Proxy-Authorisierungsinfo."
 
 #. HTWAIS.c
-#: LYMessages.c:800
+#: LYMessages.c:798
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Message zu lang."
 
-#: LYMessages.c:801
+#: LYMessages.c:799
 msgid "Enter WAIS query: "
 msgstr "Gib WAIS-Frage ein: "
 
 #. Miscellaneous status
-#: LYMessages.c:804
+#: LYMessages.c:802
 msgid "Retrying as HTTP0 request."
 msgstr "Wir versuchen's noch einmal, als HTTP0-Request."
 
-#: LYMessages.c:805
+#: LYMessages.c:803
 #, c-format
 msgid "Transferred %d bytes"
-msgstr "%d bytes übertragen"
+msgstr "%d bytes übertragen"
 
-#: LYMessages.c:806
+#: LYMessages.c:804
 msgid "Data transfer complete"
-msgstr "Übertragung komplett."
+msgstr "Ãœbertragung komplett."
 
-#: LYMessages.c:807
+#: LYMessages.c:805
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Fehler beim Verarbeiten von Zeile %d von %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:810
+#: LYMessages.c:808
 msgid "Address List Page"
 msgstr "Linkadressenliste"
 
-#: LYMessages.c:811
+#: LYMessages.c:809
 msgid "Bookmark file"
 msgstr "Lesezeichendatei"
 
-#: LYMessages.c:812
+#: LYMessages.c:810
 msgid "Configuration Definitions"
 msgstr "Konfiguration"
 
-#: LYMessages.c:813
+#: LYMessages.c:811
 msgid "Cookie Jar"
 msgstr "Keksbeutel (Cookie Jar)"
 
-#: LYMessages.c:814
+#: LYMessages.c:812
 msgid "Current Key Map"
 msgstr "Aktuelle Tastaturbelegung"
 
-#: LYMessages.c:815
+#: LYMessages.c:813
 msgid "File Management Options"
-msgstr "Dateimanagement-Menü"
+msgstr "Dateimanagement-Menü"
 
-#: LYMessages.c:816
+#: LYMessages.c:814
 msgid "Download Options"
-msgstr "Download-Menü"
+msgstr "Download-Menü"
 
-#: LYMessages.c:817
+#: LYMessages.c:815
 msgid "History Page"
 msgstr "History- oder Geschichtsseite"
 
-#: LYMessages.c:818
+#: LYMessages.c:816
 msgid "List Page"
 msgstr "Linkliste"
 
-#: LYMessages.c:819
+#: LYMessages.c:817
 msgid "Lynx.cfg Information"
-msgstr "Informationen über lynx.cfg"
+msgstr "Informationen über lynx.cfg"
 
-#: LYMessages.c:820
+#: LYMessages.c:818
 msgid "Converted Mosaic Hotlist"
 msgstr "Konvertierte Mosaic-Hotlist"
 
-#: LYMessages.c:821
+#: LYMessages.c:819
 msgid "Options Menu"
-msgstr "Menü der persönlichen Konfigurationsoptionen"
+msgstr "Menü der persönlichen Konfigurationsoptionen"
 
-#: LYMessages.c:822
+#: LYMessages.c:820
 msgid "File Permission Options"
-msgstr "Dateizugriffserlaubnis Ändern"
+msgstr "Dateizugriffserlaubnis Ändern"
 
-#: LYMessages.c:823
+#: LYMessages.c:821
 msgid "Printing Options"
 msgstr "Druckeroptionen"
 
-#: LYMessages.c:824
+#: LYMessages.c:822
 msgid "Information about the current document"
-msgstr "Informationen über das aktuelle Dokument"
+msgstr "Informationen über das aktuelle Dokument"
 
-#: LYMessages.c:825
+#: LYMessages.c:823
 msgid "Your recent statusline messages"
 msgstr "Letzte Meldungen von der Statuszeile"
 
-#: LYMessages.c:826
+#: LYMessages.c:824
 msgid "Upload Options"
 msgstr "Upload-Optionen"
 
-#: LYMessages.c:827
+#: LYMessages.c:825
 msgid "Visited Links Page"
 msgstr "Seite der besuchten Links"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:830
+#: LYMessages.c:828
 msgid "See also"
 msgstr "Siehe auch"
 
-#: LYMessages.c:831
+#: LYMessages.c:829
 msgid "your"
 msgstr "dein"
 
-#: LYMessages.c:832
+#: LYMessages.c:830
 msgid "for runtime options"
-msgstr "für Runtime-Optionen"
+msgstr "für Runtime-Optionen"
 
-#: LYMessages.c:833
+#: LYMessages.c:831
 msgid "compile time options"
 msgstr "Einkompilierte Optionen"
 
-#: LYMessages.c:834
+#: LYMessages.c:832
+msgid "color-style configuration"
+msgstr "Farbstil-Konfiguration"
+
+#: LYMessages.c:833
 msgid "latest release"
 msgstr "letzte Fassung"
 
-#: LYMessages.c:835
+#: LYMessages.c:834
 msgid "pre-release version"
-msgstr "Development-Version"
+msgstr "Pre-Release-Version"
 
-#: LYMessages.c:836
+#: LYMessages.c:835
 msgid "development version"
 msgstr "Development-Version"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:838
+#: LYMessages.c:837
 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"
@@ -2716,10 +2726,10 @@ msgid ""
 msgstr ""
 "Die folgenden Informationen wurden beim Konfigurieren/Zusammenbau dieser\n"
 "Kopie von Lynx automatisch hergeleitet. Beim Melden eines Bugs bitte eine\n"
-"Kopie dieser Seite beifügen."
+"Kopie dieser Seite beifügen."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:842
+#: LYMessages.c:841
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2728,104 +2738,103 @@ msgstr ""
 "dieser Programmkopie als Definitionen verwendet."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:847
+#: LYMessages.c:846
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
-msgstr "C) Erzeugen D)ownload E)dit F) Menü  M) Ändern R) Löschen T) Markieren U)pload\n"
+msgstr "C) Erzeugen D)ownload E)dit F) Menü  M) Ändern R) Löschen T) Markieren U)pload\n"
 
-#: LYMessages.c:848
+#: LYMessages.c:847
 msgid "Failed to obtain status of current link!"
 msgstr "Der Status des aktuellen Links konnte nicht bestimmt werden!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:851
+#: LYMessages.c:850
 msgid "Special URL only valid from current File Permission menu!"
-msgstr "Dieser spezielle URL ist nur vom aktiven Zugriffsrechtemenü aus verwendbar!"
+msgstr "Dieser spezielle URL ist nur vom aktiven Zugriffsrechtemenü aus verwendbar!"
 
-#: LYMessages.c:855
+#: LYMessages.c:854
 msgid "External support is currently disabled."
-msgstr "Unterstützung für EXTERNAL ist zur Zeit ausgeschaltet."
+msgstr "Unterstützung für EXTERNAL ist zur Zeit ausgeschaltet."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:859
-#, fuzzy
+#: LYMessages.c:858
 msgid "Changing working-directory is currently disabled."
-msgstr "Starten von Unterprozessen zur Zeit nicht ermöglicht."
+msgstr "Wechseln des Arbeitsverzeichnisses ist zur Zeit nicht aktiviert."
 
-#: LYMessages.c:860
-#, fuzzy
+#: LYMessages.c:859
 msgid "Linewrap OFF!"
-msgstr "Trace AUS!"
+msgstr "Linewrap AUS!"
 
-#: LYMessages.c:861
+#: LYMessages.c:860
 msgid "Linewrap ON!"
-msgstr ""
+msgstr "Linewrap AN!"
 
-#: LYMessages.c:862
-#, fuzzy
+#: LYMessages.c:861
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
-msgstr "Raw 8-bit or CJK mode eingeschaltet!  Reloading..."
+msgstr "Erkennung verschachtelter Tabellen ist AUSgeschaltet!  Reloading..."
 
-#: LYMessages.c:863
-#, fuzzy
+#: LYMessages.c:862
 msgid "Parsing nested-tables toggled ON!  Reloading..."
-msgstr "Raw 8-bit or CJK mode ausgeschaltet!  Reloading..."
+msgstr "Erkennung verschachtelter Tabellen ist EINgeschaltet!  Reloading..."
 
-#: LYMessages.c:864
+#: LYMessages.c:863
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr ""
 
-#: LYMessages.c:865
-#, fuzzy
+#: LYMessages.c:864
 msgid "Trace not supported"
-msgstr "Terminal hat keine Unterstützung für Farbe"
+msgstr "Trace hat keine Unterstützung"
 
-#: WWW/Library/Implementation/HTAABrow.c:648
+#: WWW/Library/Implementation/HTAABrow.c:647
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
-msgstr "Username für '%s' auf %s '%s%s':"
+msgstr "Username für '%s' auf %s '%s%s':"
 
-#: WWW/Library/Implementation/HTAABrow.c:914
+#: WWW/Library/Implementation/HTAABrow.c:913
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
-msgstr "Dieses Programm kann nichts anfangen mit dem Schema für Proxy-Authorisierung"
+msgstr "Dieses Programm kann nichts anfangen mit dem Schema für Proxy-Authorisierung"
 
-#: WWW/Library/Implementation/HTAABrow.c:989
+#: WWW/Library/Implementation/HTAABrow.c:988
 msgid "This client doesn't know how to compose authorization information for scheme"
-msgstr "Dieses Programm weiß nichts anzufangen mit dem Authorisierungsschema"
+msgstr "Dieses Programm weiß nichts anzufangen mit dem Authorisierungsschema"
 
-#: WWW/Library/Implementation/HTAABrow.c:1097
+#: WWW/Library/Implementation/HTAABrow.c:1096
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
-msgstr "Ungültiger Header '%s%s%s%s%s'"
+msgstr "Ungültiger Header '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1201
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
 msgstr "Proxy-Authorisierung verlangt -- wiederholter Versuch"
 
-#: WWW/Library/Implementation/HTAABrow.c:1260
+#: WWW/Library/Implementation/HTAABrow.c:1259
 msgid "Access without authorization denied -- retrying"
 msgstr "Zugang ohne Authorisierung verweigert -- wiederholter Versuch"
 
-#: WWW/Library/Implementation/HTAccess.c:683
+#: WWW/Library/Implementation/HTAccess.c:677
 msgid "Access forbidden by rule"
 msgstr "Zugang durch Konfigurationsregel verboten"
 
-#: WWW/Library/Implementation/HTAccess.c:785
+#: WWW/Library/Implementation/HTAccess.c:779
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "Dokument mit POST-Daten nicht im Seitencache gefunden. POST wiederholen?"
 
-#: WWW/Library/Implementation/HTAccess.c:1026 src/GridText.c:8039
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
 msgid "Loading incomplete."
-msgstr "Unvollständig geladen."
+msgstr "Unvollständig geladen."
 
-#: WWW/Library/Implementation/HTAccess.c:1056
+#: WWW/Library/Implementation/HTAccess.c:1077
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
-msgstr "**** HTAccess: Alte Laderoutine hat Socket- oder Dateinummer zurückgegeben!\n"
+msgstr "**** HTAccess: Alte Laderoutine hat Socket- oder Dateinummer zurückgegeben!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1058
+#: WWW/Library/Implementation/HTAccess.c:1079
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
 msgstr "**** HTAccess: Interner Softwarefehler. Bitte lynx-dev@sig.net benachrichtigen!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1059
+#: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "**** HTAccess: Der empfangene Statuscode war %d\n"
@@ -2834,28 +2843,28 @@ msgstr "**** HTAccess: Der empfangene Statuscode war %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7834
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
 msgid "Can't Access"
 msgstr "Zugriff fehlgeschlagen:"
 
-#: WWW/Library/Implementation/HTAccess.c:1073
+#: WWW/Library/Implementation/HTAccess.c:1094
 msgid "Unable to access document."
-msgstr "Zugriff auf Dokument nicht möglich."
+msgstr "Zugriff auf Dokument nicht möglich."
 
-#: WWW/Library/Implementation/HTFTP.c:756
+#: WWW/Library/Implementation/HTFTP.c:766
 #, c-format
 msgid "Enter password for user %s@%s:"
-msgstr "Password eingeben für User %s@%s:"
+msgstr "Password eingeben für User %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:784
+#: WWW/Library/Implementation/HTFTP.c:794
 msgid "Unable to connect to FTP host."
 msgstr "Verbindung zum FTP-Host konnte nicht hergestellt werden."
 
-#: WWW/Library/Implementation/HTFTP.c:1054
+#: WWW/Library/Implementation/HTFTP.c:1064
 msgid "close master socket"
 msgstr "close master socket"
 
-#: WWW/Library/Implementation/HTFTP.c:1116
+#: WWW/Library/Implementation/HTFTP.c:1126
 msgid "socket for master socket"
 msgstr "socket for master socket"
 
@@ -2866,55 +2875,55 @@ msgstr "socket for master socket"
 #. **  knowing if it is symbolic?	I think so since
 #. **  it might be a directory.
 #.
-#: WWW/Library/Implementation/HTFTP.c:1630 WWW/Library/Implementation/HTFTP.c:2251
+#: WWW/Library/Implementation/HTFTP.c:1640 WWW/Library/Implementation/HTFTP.c:2261
 msgid "Symbolic Link"
 msgstr "Symbolic Link"
 
-#: WWW/Library/Implementation/HTFTP.c:2612
+#: WWW/Library/Implementation/HTFTP.c:2622
 msgid "Receiving FTP directory."
 msgstr "FTP-Verzeichnis wird empfangen."
 
-#: WWW/Library/Implementation/HTFTP.c:2755
+#: WWW/Library/Implementation/HTFTP.c:2762
 #, c-format
 msgid "Transferred %d bytes (%5d)"
-msgstr "%d bytes übertragen (%5d)"
+msgstr "%d bytes übertragen (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3083
 msgid "connect for data"
 msgstr "connect for data"
 
-#: WWW/Library/Implementation/HTFTP.c:3690
+#: WWW/Library/Implementation/HTFTP.c:3731
 msgid "Receiving FTP file."
 msgstr "FTP-Datei wird empfangen."
 
-#: WWW/Library/Implementation/HTFinger.c:275
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
 msgstr "\"Finger\"-Verbindung konnte nicht nicht hergestellt werden."
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
 msgstr "Nichts geladen (kein Site-Name im \"finger\"-URL)"
 
-#: WWW/Library/Implementation/HTFinger.c:328
+#: WWW/Library/Implementation/HTFinger.c:331
 msgid "Invalid port number - will only use port 79!"
-msgstr "Ungültige Portnummer - Nur Port 79 kann benutzt werden!"
+msgstr "Ungültige Portnummer - Nur Port 79 kann benutzt werden!"
 
 #: WWW/Library/Implementation/HTFinger.c:396
 msgid "Could not access finger host."
 msgstr "Der \"finger\"-Host konnte nicht erreicht werden."
 
-#: WWW/Library/Implementation/HTFinger.c:407
+#: WWW/Library/Implementation/HTFinger.c:404
 msgid "No response from finger server."
 msgstr "Keine Antwort vom \"finger\"-Server."
 
 #: WWW/Library/Implementation/HTNews.c:372
 #, c-format
 msgid "Username for news host '%s':"
-msgstr "Username für den News-Host '%s':"
+msgstr "Username für den News-Host '%s':"
 
 #: WWW/Library/Implementation/HTNews.c:425
 msgid "Change username?"
-msgstr "Username ändern?"
+msgstr "Username ändern?"
 
 #: WWW/Library/Implementation/HTNews.c:429
 msgid "Username:"
@@ -2923,18 +2932,18 @@ msgstr "Username:"
 #: WWW/Library/Implementation/HTNews.c:453
 #, c-format
 msgid "Password for news host '%s':"
-msgstr "Password für den News-Host '%s':"
+msgstr "Password für den News-Host '%s':"
 
 #: WWW/Library/Implementation/HTNews.c:536
 msgid "Change password?"
-msgstr "Password ändern?"
+msgstr "Password ändern?"
 
-#: WWW/Library/Implementation/HTNews.c:1691
+#: WWW/Library/Implementation/HTNews.c:1690
 #, c-format
 msgid "No matches for: %s"
-msgstr "Keine passenden Newsgroups für: %s"
+msgstr "Keine passenden Newsgroups für: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1744
+#: WWW/Library/Implementation/HTNews.c:1743
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2942,7 +2951,7 @@ msgstr ""
 "\n"
 "Keine Messages in dieser Newsgroup.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1757
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2953,16 +2962,16 @@ msgstr ""
 #.
 #. **	Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1770
+#: WWW/Library/Implementation/HTNews.c:1769
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Messages %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1792
+#: WWW/Library/Implementation/HTNews.c:1791
 msgid "Earlier articles"
-msgstr "Frühere Messsages"
+msgstr "Frühere Messsages"
 
-#: WWW/Library/Implementation/HTNews.c:1805
+#: WWW/Library/Implementation/HTNews.c:1804
 #, c-format
 msgid ""
 "\n"
@@ -2970,44 +2979,44 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Ungefähr %d Messages zur Zeit vorhanden in %s, IDs wie folgt:\n"
+"Ungefähr %d Messages zur Zeit vorhanden in %s, IDs wie folgt:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1865
+#: WWW/Library/Implementation/HTNews.c:1864
 msgid "All available articles in "
-msgstr "Alle zugänglichen Messages in "
+msgstr "Alle zugänglichen Messages in "
 
-#: WWW/Library/Implementation/HTNews.c:2081
+#: WWW/Library/Implementation/HTNews.c:2080
 msgid "Later articles"
-msgstr "Spätere Messages"
+msgstr "Spätere Messages"
 
-#: WWW/Library/Implementation/HTNews.c:2105
+#: WWW/Library/Implementation/HTNews.c:2104
 msgid "Post to "
 msgstr "Message hinterlassen (Post) in "
 
-#: WWW/Library/Implementation/HTNews.c:2323
+#: WWW/Library/Implementation/HTNews.c:2322
 msgid "This client does not contain support for SNEWS URLs."
-msgstr "Dieses Programm hat keine Unterstützung für SNEWS URLs."
+msgstr "Dieses Programm hat keine Unterstützung für SNEWS URLs."
 
-#: WWW/Library/Implementation/HTNews.c:2531
+#: WWW/Library/Implementation/HTNews.c:2530
 msgid "No target for raw text!"
-msgstr "Kein target für rohen Text!"
+msgstr "Kein target für rohen Text!"
 
-#: WWW/Library/Implementation/HTNews.c:2561
+#: WWW/Library/Implementation/HTNews.c:2560
 msgid "Connecting to NewsHost ..."
 msgstr "Verbindungserstellung zum News-Host ..."
 
-#: WWW/Library/Implementation/HTNews.c:2612
+#: WWW/Library/Implementation/HTNews.c:2611
 #, c-format
 msgid "Could not access %s."
 msgstr "Kein Zugang zu %s."
 
-#: WWW/Library/Implementation/HTNews.c:2712
+#: WWW/Library/Implementation/HTNews.c:2711
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "News-Info kann nicht gelesen werden. Server %.20s antwortet: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2716
+#: WWW/Library/Implementation/HTNews.c:2715
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "News-Info kann nicht gelesen werden. Leere Antwort von Server %s"
@@ -3015,34 +3024,34 @@ msgstr "News-Info kann nicht gelesen werden. Leere Antwort von Server %s"
 #.
 #. **	List available newsgroups. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2920
+#: WWW/Library/Implementation/HTNews.c:2919
 msgid "Reading list of available newsgroups."
 msgstr "Liste vorhandener Newsgroups wird geladen."
 
-#: WWW/Library/Implementation/HTNews.c:2942
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of articles in newsgroup."
 msgstr "Liste der vorhandenen Messages wird geladen."
 
 #.
 #. **	Get an article from a news group. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2948
+#: WWW/Library/Implementation/HTNews.c:2947
 msgid "Reading news article."
 msgstr "News-Message wird geladen."
 
-#: WWW/Library/Implementation/HTNews.c:2978
+#: WWW/Library/Implementation/HTNews.c:2977
 msgid "Sorry, could not load requested news."
 msgstr "Entschuldigung: konnte die angeforderten News nich laden."
 
-#: WWW/Library/Implementation/HTTCP.c:1233
+#: WWW/Library/Implementation/HTTCP.c:1239
 msgid "Address has invalid port"
-msgstr "Adresslänge hat einen ungültigen port"
+msgstr "Adresslänge hat einen ungültigen port"
 
-#: WWW/Library/Implementation/HTTCP.c:1336
+#: WWW/Library/Implementation/HTTCP.c:1327
 msgid "Address length looks invalid"
-msgstr "Adresslänge scheint ungültig zu sein"
+msgstr "Adresslänge scheint ungültig zu sein"
 
-#: WWW/Library/Implementation/HTTCP.c:1574 WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Remote Host %s nicht gefunden."
@@ -3051,62 +3060,85 @@ msgstr "Remote Host %s nicht gefunden."
 #. *  immediately; but not HTAlert, because typically
 #. *  there will be other alerts from the callers. - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1589 WWW/Library/Implementation/HTTelnet.c:103
+#: WWW/Library/Implementation/HTTCP.c:1575 WWW/Library/Implementation/HTTelnet.c:103
 #, c-format
 msgid "Invalid hostname %s"
-msgstr "Hostname ist ungültig: %s"
+msgstr "Hostname ist ungültig: %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1603
+#: WWW/Library/Implementation/HTTCP.c:1589
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "%s-Verbindung zu %s wird aufgebaut."
 
-#: WWW/Library/Implementation/HTTCP.c:1619
+#: WWW/Library/Implementation/HTTCP.c:1605
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
-msgstr ""
+msgstr "Socketfehler: family %d addr %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1628
+#: WWW/Library/Implementation/HTTCP.c:1614
 msgid "socket failed."
 msgstr "Socket-Fehler."
 
-#: WWW/Library/Implementation/HTTCP.c:1648
+#: WWW/Library/Implementation/HTTCP.c:1634
 msgid "Could not make connection non-blocking."
 msgstr "Veerbindung konnte nicht non-blocking gemacht werden."
 
-#: WWW/Library/Implementation/HTTCP.c:1717
+#: WWW/Library/Implementation/HTTCP.c:1703
 msgid "Connection failed (too many retries)."
 msgstr "Verbindungsfehler (zu viele Versuche)."
 
-#: WWW/Library/Implementation/HTTCP.c:1910
+#: WWW/Library/Implementation/HTTCP.c:1896
 msgid "Could not restore socket to blocking."
 msgstr "Socket konnte nicht wieder blocking gemacht werden."
 
-#: WWW/Library/Implementation/HTTCP.c:1976
+#: WWW/Library/Implementation/HTTCP.c:1962
 msgid "Socket read failed for 180,000 tries."
-msgstr "Lesefehler nach 180000 Versuchen."
+msgstr "Lesefehler nach 180.000 Versuchen."
 
-#: WWW/Library/Implementation/HTTP.c:466
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr "Adresse mit einem Username: %s"
+
+#: WWW/Library/Implementation/HTTP.c:503
 msgid "This client does not contain support for HTTPS URLs."
-msgstr "Dieses Programm hat keine Unterstützung für HTTPS-URLs."
+msgstr "Dieses Programm hat keine Unterstützung für HTTPS-URLs."
 
-#: WWW/Library/Implementation/HTTP.c:491
+#: WWW/Library/Implementation/HTTP.c:528
 msgid "Unable to connect to remote host."
 msgstr "Verbindung zum remote Host konnte nicht hergestellt werden."
 
-#: WWW/Library/Implementation/HTTP.c:1005
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr "Verbindung erneut versuchen, ohne TLS."
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr "SSL-Fehler:Es ist nicht möglich einen allgemeinen Namen im Zertifikat zu finden - Fortfahren?"
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr "SSL-Fehler:host(%s)!=cert(%s) - Fortfahren?"
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr "Sichere %d Bit %s (%s) HTTP-Verbindung"
+
+#: WWW/Library/Implementation/HTTP.c:1091
 msgid "Sending HTTP request."
 msgstr "HTTP Request wird geschickt."
 
-#: WWW/Library/Implementation/HTTP.c:1039
+#: WWW/Library/Implementation/HTTP.c:1125
 msgid "Unexpected network write error; connection aborted."
 msgstr "Unerwarteter Netzschreibfehler; Verbindung abgebrochen."
 
-#: WWW/Library/Implementation/HTTP.c:1045
+#: WWW/Library/Implementation/HTTP.c:1131
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP Request geschickt; warten auf Antwort."
 
-#: WWW/Library/Implementation/HTTP.c:1109
+#: WWW/Library/Implementation/HTTP.c:1195
 msgid "Unexpected network read error; connection aborted."
 msgstr "Unerwarteter Netzlesefehler; Verbindung abgebrochen."
 
@@ -3120,7 +3152,7 @@ msgstr "Unerwarteter Netzlesefehler; Verbindung abgebrochen."
 #. **	so we'll deal with them by showing the full
 #. **	header to the user as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1305
+#: WWW/Library/Implementation/HTTP.c:1391
 msgid "Got unexpected Informational Status."
 msgstr "Unerwarteter Informations-Statuscode empfangen."
 
@@ -3131,9 +3163,9 @@ msgstr "Unerwarteter Informations-Statuscode empfangen."
 #. *  user to do that, and restore the current
 #. *  document. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1340
+#: WWW/Library/Implementation/HTTP.c:1426
 msgid "Request fulfilled.  Reset Content."
-msgstr "Request ausgeführt. Seiteninhalt zurücksetzen."
+msgstr "Request ausgeführt. Seiteninhalt zurücksetzen."
 
 #. Not Modified
 #.
@@ -3142,27 +3174,27 @@ msgstr "Request ausgeführt. Seiteninhalt zurücksetzen."
 #. *  with it by showing the full header to the user
 #. *  as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1459
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Unerwarteter Status 304 \"Not Modified\"."
 
-#: WWW/Library/Implementation/HTTP.c:1526
+#: WWW/Library/Implementation/HTTP.c:1612
 msgid "Redirection of POST content requires user approval."
-msgstr "Bestätigung ist erforderlich für Umleitung von POST-Daten."
+msgstr "Bestätigung ist erforderlich für Umleitung von POST-Daten."
 
-#: WWW/Library/Implementation/HTTP.c:1541
+#: WWW/Library/Implementation/HTTP.c:1627
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
-msgstr "POST-Request. Permanente Umleitung wird als temporär behandelt.\n"
+msgstr "POST-Request. Permanente Umleitung wird als temporär behandelt.\n"
 
-#: WWW/Library/Implementation/HTTP.c:1586
+#: WWW/Library/Implementation/HTTP.c:1672
 msgid "Retrying with access authorization information."
 msgstr "Wir versuchen's noch einmal mit Authorisierungsinfo."
 
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1684
 msgid "Show the 401 message body?"
 msgstr "Inhalt der 401-Antwort zeigen?"
 
-#: WWW/Library/Implementation/HTTP.c:1643
+#: WWW/Library/Implementation/HTTP.c:1729
 msgid "Show the 407 message body?"
 msgstr "Inhalt der 407-Antwort zeigen?"
 
@@ -3171,7 +3203,7 @@ msgstr "Inhalt der 407-Antwort zeigen?"
 #. **	Take a chance and hope there is
 #. **	something to display. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1748
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Unknown status reply from server!"
 msgstr "Unbekannter Statuscode in Antwort vom Server!"
 
@@ -3186,11 +3218,11 @@ msgstr "Verbindungsaufnahme zum WAIS-Server fehlgeschlagen."
 
 #: WWW/Library/Implementation/HTWAIS.c:170
 msgid "Could not open WAIS connection for reading."
-msgstr "Verbindung zum WAIS Server konnte nicht fürs Lesen geöffnet werden."
+msgstr "Verbindung zum WAIS Server konnte nicht fürs Lesen geöffnet werden."
 
 #: WWW/Library/Implementation/HTWAIS.c:194
 msgid "Diagnostic code is "
-msgstr "Codenummer für Dignose ist "
+msgstr "Codenummer für Dignose ist "
 
 #: WWW/Library/Implementation/HTWAIS.c:463
 msgid "Index "
@@ -3199,7 +3231,7 @@ msgstr "Index"
 #: WWW/Library/Implementation/HTWAIS.c:467
 #, c-format
 msgid " contains the following %d item%s relevant to \""
-msgstr " enthält folgenden %d relevanten Item%s für \""
+msgstr " enthält folgenden %d relevanten Item%s für \""
 
 #: WWW/Library/Implementation/HTWAIS.c:475
 msgid "The first figure after each entry is its relative score, "
@@ -3207,7 +3239,7 @@ msgstr "Die erste Zahl nach jedem Eintrag ist die relative Bewertung, "
 
 #: WWW/Library/Implementation/HTWAIS.c:476
 msgid "the second is the number of lines in the item."
-msgstr "die zweite ist die Länge des Items in Zeilen."
+msgstr "die zweite ist die Länge des Items in Zeilen."
 
 #: WWW/Library/Implementation/HTWAIS.c:517
 msgid " (bad file name)"
@@ -3219,7 +3251,7 @@ msgstr "(schlechte Dokument-Identifizierungsnummer)"
 
 #: WWW/Library/Implementation/HTWAIS.c:558
 msgid "(Short Header record, can't display)"
-msgstr "(Kurzer Kopfeintrag, Anzeige nicht möglich)"
+msgstr "(Kurzer Kopfeintrag, Anzeige nicht möglich)"
 
 #: WWW/Library/Implementation/HTWAIS.c:565
 msgid ""
@@ -3227,7 +3259,7 @@ msgid ""
 "Long Header record, can't display\n"
 msgstr ""
 "\n"
-"Langer Kopfeintrag, Anzeige nicht möglich\n"
+"Langer Kopfeintrag, Anzeige nicht möglich\n"
 
 #: WWW/Library/Implementation/HTWAIS.c:572
 msgid ""
@@ -3243,7 +3275,7 @@ msgid ""
 "Headline record, can't display\n"
 msgstr ""
 "\n"
-"Überschriftseintrag, Anzeige nicht möglich\n"
+"Überschriftseintrag, Anzeige nicht möglich\n"
 
 #: WWW/Library/Implementation/HTWAIS.c:589
 msgid ""
@@ -3251,78 +3283,78 @@ msgid ""
 "Code record, can't display\n"
 msgstr ""
 "\n"
-"Codeeintrag, Anzeige nicht möglich\n"
+"Codeeintrag, Anzeige nicht möglich\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:691
+#: WWW/Library/Implementation/HTWAIS.c:689
 msgid "Syntax error in WAIS URL"
 msgstr "Syntaxfehler in WAIS-URL"
 
-#: WWW/Library/Implementation/HTWAIS.c:761
+#: WWW/Library/Implementation/HTWAIS.c:759
 msgid " (WAIS Index)"
 msgstr " (WAIS-Index)"
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:766
 msgid "WAIS Index: "
 msgstr "WAIS-Index: "
 
-#: WWW/Library/Implementation/HTWAIS.c:774
+#: WWW/Library/Implementation/HTWAIS.c:772
 msgid "This is a link for searching the "
 msgstr "Dies ist ein Link zum Abfragen des "
 
-#: WWW/Library/Implementation/HTWAIS.c:778
+#: WWW/Library/Implementation/HTWAIS.c:776
 msgid " WAIS Index.\n"
 msgstr " WAIS-Index.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:805
+#: WWW/Library/Implementation/HTWAIS.c:803
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
 msgstr ""
 "\n"
-" Tastenkommando 's' für Suche, dann Suchwörter eingeben.\n"
+" Tastenkommando 's' für Suche, dann Suchwörter eingeben.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:827
+#: WWW/Library/Implementation/HTWAIS.c:825
 msgid " (in "
 msgstr " (in "
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:834
 msgid "WAIS Search of \""
 msgstr "WAIS-Suche von \""
 
-#: WWW/Library/Implementation/HTWAIS.c:840
+#: WWW/Library/Implementation/HTWAIS.c:838
 msgid "\" in: "
 msgstr "\" in: "
 
-#: WWW/Library/Implementation/HTWAIS.c:855
+#: WWW/Library/Implementation/HTWAIS.c:853
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: Request zu lang."
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:862
 msgid "Searching WAIS database..."
 msgstr "WAIS-Datenbang wird abgefragt..."
 
-#: WWW/Library/Implementation/HTWAIS.c:874
+#: WWW/Library/Implementation/HTWAIS.c:872
 msgid "Search interrupted."
 msgstr "Suche unterbrochen."
 
-#: WWW/Library/Implementation/HTWAIS.c:924
+#: WWW/Library/Implementation/HTWAIS.c:922
 msgid "Can't convert format of WAIS document"
 msgstr "Format des WAIS-Dokuments kann nicht konvertiert werden"
 
-#: WWW/Library/Implementation/HTWAIS.c:968
+#: WWW/Library/Implementation/HTWAIS.c:966
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: Request zu lang."
 
 #.
 #. **	Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:982
+#: WWW/Library/Implementation/HTWAIS.c:980
 msgid "Fetching WAIS document..."
 msgstr "WAIS-Dokument wird geholt..."
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1021
+#: WWW/Library/Implementation/HTWAIS.c:1019
 msgid "No text was returned!\n"
 msgstr "Kein Text in Antwort!\n"
 
@@ -3342,169 +3374,162 @@ msgstr " Beschreibungs"
 msgid "Access links"
 msgstr "Zugriffslinks"
 
-#: WWW/Library/Implementation/HTWSRC.c:345
+#: WWW/Library/Implementation/HTWSRC.c:346
 msgid "Direct access"
 msgstr "direkter Zugang"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:348
+#: WWW/Library/Implementation/HTWSRC.c:349
 msgid " (or via proxy server, if defined)"
 msgstr " (oder durch Proxyserver, falls definiert)"
 
-#: WWW/Library/Implementation/HTWSRC.c:363
+#: WWW/Library/Implementation/HTWSRC.c:364
 msgid "Maintainer"
 msgstr "Instandhalter"
 
-#: WWW/Library/Implementation/HTWSRC.c:371
+#: WWW/Library/Implementation/HTWSRC.c:372
 msgid "Host"
 msgstr "Host"
 
-#: src/GridText.c:607
+#: src/GridText.c:688
 msgid "Memory exhausted, display interrupted!"
 msgstr "zu wenig Hauptspeicher, Anzeige abgebrochen!"
 
-#: src/GridText.c:612
+#: src/GridText.c:693
 msgid "Memory exhausted, will interrupt transfer!"
-msgstr "zu wenig Hauptspeicher, Übertragung wird abgebrochen!"
+msgstr "zu wenig Hauptspeicher, Ãœbertragung wird abgebrochen!"
 
-#: src/GridText.c:3395
+#: src/GridText.c:3578
 msgid " *** MEMORY EXHAUSTED ***"
-msgstr " *** MEMORY ERSCHÖPFT ***"
+msgstr " *** MEMORY ERSCHÖPFT ***"
 
-#: src/GridText.c:5733 src/GridText.c:5740 src/LYList.c:258
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
 msgid "unknown field or link"
 msgstr "unbekanntes Feld oder Link"
 
-#: src/GridText.c:5749
+#: src/GridText.c:6023
 msgid "text entry field"
 msgstr "Texteingabefeld"
 
-#: src/GridText.c:5752
+#: src/GridText.c:6026
 msgid "password entry field"
 msgstr "Password-Eingabefeld"
 
-#: src/GridText.c:5755
+#: src/GridText.c:6029
 msgid "checkbox"
 msgstr "Checkbox"
 
-#: src/GridText.c:5758
+#: src/GridText.c:6032
 msgid "radio button"
 msgstr "Radiobutton"
 
-#: src/GridText.c:5761
+#: src/GridText.c:6035
 msgid "submit button"
 msgstr "Submit-Button"
 
-#: src/GridText.c:5764
+#: src/GridText.c:6038
 msgid "reset button"
 msgstr "Reset-Button"
 
-#: src/GridText.c:5767
+#: src/GridText.c:6041
 msgid "popup menu"
-msgstr "Popup-Menü"
+msgstr "Popup-Menü"
 
-#: src/GridText.c:5770
+#: src/GridText.c:6044
 msgid "hidden form field"
 msgstr "verstecktes Formfeld"
 
-#: src/GridText.c:5773
+#: src/GridText.c:6047
 msgid "text entry area"
 msgstr "Texteingaberegion"
 
-#: src/GridText.c:5776
+#: src/GridText.c:6050
 msgid "range entry field"
 msgstr "Bereichseingabefeld"
 
-#: src/GridText.c:5779
+#: src/GridText.c:6053
 msgid "file entry field"
 msgstr "Dateieingabefeld"
 
-#: src/GridText.c:5782
+#: src/GridText.c:6056
 msgid "text-submit field"
 msgstr "Textsendefeld"
 
-#: src/GridText.c:5785
+#: src/GridText.c:6059
 msgid "image-submit button"
 msgstr "Image-Sendefeld"
 
-#: src/GridText.c:5788
+#: src/GridText.c:6062
 msgid "keygen field"
 msgstr "\"Keygen\"-Feld"
 
-#: src/GridText.c:5791
+#: src/GridText.c:6065
 msgid "unknown form field"
 msgstr "unbekanntes Formfeld"
 
-#. We can't open the file, what do we do?
-#: src/GridText.c:10348
-#, fuzzy
+#: src/GridText.c:10066
 msgid "Can't open file for uploading"
-msgstr "Datei konnte nicht zum Lesen geöffnet werden!"
-
-#. We got an error reading the file, what do we do?
-#: src/GridText.c:10359
-msgid "Short read from file, problem?"
-msgstr ""
+msgstr "Datei konnte nicht zum Upload geöffnet werden!"
 
-#: src/GridText.c:10721
+#: src/GridText.c:11218
 #, c-format
 msgid "Submitting %s"
 msgstr "%s wird gesandt"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:11887
+#: src/GridText.c:12375
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
-msgstr ""
+msgstr "Hänger festgestellt: TextAnchor-Konstruktion ist schadhaft - am besten abbrechen!"
 
 #. don't show previous state
-#: src/GridText.c:12092
+#: src/GridText.c:12581
 msgid "Wrap lines to fit displayed area?"
-msgstr "Zeilen umbrechen, um an den sichtbaren Bereich anzupassen?"
+msgstr "Zeilen umbrechen, um in den sichtbaren Bereich einzupassen?"
 
-#: src/GridText.c:12144
+#: src/GridText.c:12633
 msgid "Very long lines have been wrapped!"
-msgstr "Sehr lange Zeilen wurden umgebrochen!"
+msgstr "Sehr lange Zeilen wurden umbrochen!"
 
-#: src/GridText.c:12591
+#: src/GridText.c:13079
 msgid "Very long lines have been truncated!"
-msgstr "Sehr lange Zeilen wurden gekürzt!"
+msgstr "Sehr lange Zeilen wurden abgeschnitten!"
 
-#: src/HTAlert.c:155 src/LYShowInfo.c:318
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
 msgid "bytes"
 msgstr "bytes"
 
-#: src/HTAlert.c:156
+#: src/HTAlert.c:155
 msgid "KB"
 msgstr "KB"
 
-#: src/HTAlert.c:255
+#: src/HTAlert.c:274
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "%s von %s der Daten gelesen"
 
-#: src/HTAlert.c:257
+#: src/HTAlert.c:276
 #, c-format
 msgid "Read %s of data"
 msgstr "%s der Daten gelesen"
 
-#: src/HTAlert.c:262
+#: src/HTAlert.c:281
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s/sec"
 
-#: src/HTAlert.c:269
+#: src/HTAlert.c:290
 #, c-format
-msgid " (stalled for %ld sec)"
-msgstr " (unterbrochen für %ld Sekunden)"
+msgid " (stalled for %s)"
+msgstr " (unterbrochen für %s)"
 
-#: src/HTAlert.c:271
+#: src/HTAlert.c:294
 #, c-format
-msgid ", ETA %ld sec"
-msgstr ", ETA %ld sec"
+msgid ", ETA %s"
+msgstr ", ETA %s"
 
-#: src/HTAlert.c:277
+#: src/HTAlert.c:301
 msgid " (Press 'z' to abort)"
-msgstr " ('z' für Abbruch)"
+msgstr " ('z' für Abbruch)"
 
 #. Meta-note: don't move the following note from its place right
 #. in front of the first gettext().  As it is now, it should
@@ -3531,82 +3556,82 @@ msgstr " ('z' für Abbruch)"
 #. *  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:334
+#: src/HTAlert.c:342 src/HTAlert.c:390
 msgid "yes"
 msgstr "ja"
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:345 src/HTAlert.c:391
 msgid "no"
 msgstr "nein"
 
-#: src/HTML.c:6342
+#: src/HTML.c:5985
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: src/HTML.c:6347
+#: src/HTML.c:5990
 msgid "(none)"
 msgstr "(keine)"
 
-#: src/HTML.c:6351
+#: src/HTML.c:5994
 msgid "Filepath:"
 msgstr "Dateipfad:"
 
-#: src/HTML.c:6356
+#: src/HTML.c:5999
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: src/HTML.c:7804
+#: src/HTML.c:7452
 msgid "Document has only hidden links.  Use the 'l'ist command."
-msgstr "Dokument hat nur versteckte Links. Tastenbefehl 'L' für Liste."
+msgstr "Dokument hat nur versteckte Links. Tastenbefehl 'L' für Liste."
 
-#: src/HTML.c:8328
+#: src/HTML.c:7958
 msgid "Source cache error - disk full?"
 msgstr "Source Cache Fehler - Festplatte voll?"
 
-#: src/HTML.c:8341
+#: src/HTML.c:7971
 msgid "Source cache error - not enough memory!"
 msgstr "Source Cache Fehler - nicht genug Speicher!"
 
-#: src/LYBookmark.c:166
+#: src/LYBookmark.c:167
 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 ""
-"     Diese Datei ist eine HTML-Repräsentation der X-Mosaic-Hotlistdatei.\n"
-"     Alte oder ungültige Links können mit dem Tastenbefehl für\n"
+"     Diese Datei ist eine HTML-Repräsentation der X-Mosaic-Hotlistdatei.\n"
+"     Alte oder ungültige Links können mit dem Tastenbefehl für\n"
 "     \"remove bookmark\" entfernt werden, das ist normalerweise der\n"
-"     Buchstabe 'R', außer wenn die Tastenbelegung geändert worden ist."
+"     Buchstabe 'R', außer wenn die Tastenbelegung geändert worden ist."
 
-#: src/LYBookmark.c:382
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
 msgstr ""
-"     Sie können Links mit der Taste 'R' löschen<br>\n"
+"     Sie können Links mit der Taste 'R' löschen<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:385
+#: src/LYBookmark.c:382
 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 ""
-"     Links können mit dem Tastenbefehl für \"remove bookmark\" entfernt werden.\n"
-"     Das ist normalerweise der Buchstabe 'R', außer wenn die Tastenbelegung\n"
-"     geändert worden ist."
+"     Links können mit dem Tastenbefehl für \"remove bookmark\" entfernt werden.\n"
+"     Das ist normalerweise der Buchstabe 'R', außer wenn die Tastenbelegung\n"
+"     geändert worden ist."
 
-#: src/LYBookmark.c:389
+#: src/LYBookmark.c:386
 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 ""
-"     Diese Datei kann auch mit einem Standard-Texteditor geändert werden,\n"
-"     um alte oder ungültige Links zu entfernen, or um die Reihenfolge der\n"
+"     Diese Datei kann auch mit einem Standard-Texteditor geändert werden,\n"
+"     um alte oder ungültige Links zu entfernen, or um die Reihenfolge der\n"
 "     Links zu modifizieren."
 
-#: src/LYBookmark.c:392
+#: src/LYBookmark.c:389
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3614,85 +3639,85 @@ msgid ""
 "      Make sure any bookmark link is saved as a single line."
 msgstr ""
 "Achtung: Beim manuellen Editieren dieser Datei sollte\n"
-"         das Format innerhalb der Zeilen nicht verändert\n"
-"         werden. Zusätzliches HTML-Markup sollte nicht\n"
-"         verwendet werden. Jeder einzelne Link muß vollständig\n"
+"         das Format innerhalb der Zeilen nicht verändert\n"
+"         werden. Zusätzliches HTML-Markup sollte nicht\n"
+"         verwendet werden. Jeder einzelne Link muss vollständig\n"
 "         in einer einzigen Zeile enthalten sein."
 
-#: src/LYBookmark.c:683
+#: src/LYBookmark.c:681
 #, c-format
 msgid "File may be recoverable from %s during this session"
-msgstr "Datei kann möglicherweise während dieser Session mit %s wieder rekonstruiert werden"
+msgstr "Datei kann möglicherweise während dieser Session mit %s wieder rekonstruiert werden"
 
 #.
 #. *  Neither the path as given nor any components examined by
 #. *  backing up were stat()able. - kw
 #.
-#: src/LYCgi.c:232
+#: src/LYCgi.c:231
 msgid "Unable to access cgi script"
-msgstr "Zugang zu CGI-Script nicht möglich"
+msgstr "Zugang zu CGI-Script nicht möglich"
 
-#: src/LYCgi.c:651 src/LYCgi.c:654
+#: src/LYCgi.c:654 src/LYCgi.c:657
 msgid "Good Advice"
 msgstr "Guter Rat"
 
-#: src/LYCgi.c:657
+#: src/LYCgi.c:660
 msgid "An excellent http server for VMS is available via"
-msgstr "Ein exzellenter HTTP-Server für VMS is durch"
+msgstr "Ein exzellenter HTTP-Server für VMS is durch"
 
-#: src/LYCgi.c:664
+#: src/LYCgi.c:667
 msgid "this link"
-msgstr "diesen Link erhältlich"
+msgstr "diesen Link erhältlich"
 
-#: src/LYCgi.c:668
+#: src/LYCgi.c:671
 msgid "It provides state of the art CGI script support.\n"
-msgstr "Er hat state of the art CGI-Unterstützung.\n"
+msgstr "Er hat state of the art CGI-Unterstützung.\n"
 
-#: src/LYClean.c:108
+#: src/LYClean.c:122
 msgid "Exiting via interrupt:"
 msgstr "Programmende durch Interrupt:"
 
-#: src/LYCookie.c:2659
+#: src/LYCookie.c:2462
 msgid "(from a previous session)"
 msgstr "(von vorheriger Session)"
 
-#: src/LYCookie.c:2719
+#: src/LYCookie.c:2522
 msgid "Maximum Gobble Date:"
 msgstr "Verfallsdatum:"
 
-#: src/LYCookie.c:2764
+#: src/LYCookie.c:2564
 msgid "Internal"
 msgstr "Intern"
 
-#: src/LYCookie.c:2765
+#: src/LYCookie.c:2565
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set-Fehler, beende das Programm"
 
-#: src/LYCurses.c:936
+#: src/LYCurses.c:1004
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Terminalinitialisierung fehlgeschlagen - unbekannter Terminaltyp?"
 
-#: src/LYCurses.c:1328
+#: src/LYCurses.c:1426
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1332
+#: src/LYCurses.c:1430
 msgid "You must use a vt100, 200, etc. terminal with this program."
-msgstr "Ein Textterminal wie VT100, VT200 usw. ist für dieses Programm notwendig."
+msgstr "Ein Textterminal wie VT100, VT200 usw. ist für dieses Programm notwendig."
 
-#: src/LYCurses.c:1384
+#: src/LYCurses.c:1480
 msgid "Your Terminal type is unknown!"
 msgstr "Terminaltyp ist unbekannt!"
 
-#: src/LYCurses.c:1385
+#: src/LYCurses.c:1481
 msgid "Enter a terminal type:"
 msgstr "Terminaltyp eingeben:"
 
-#: src/LYCurses.c:1398
+#: src/LYCurses.c:1495
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINAL TYPE IS SET TO"
 
-#: src/LYCurses.c:1749
+#: src/LYCurses.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -3702,7 +3727,7 @@ msgstr ""
 " Ein fataler Fehler passierte in %s Ver. %s\n"
 
 # Yes, this is incomplete... - kw
-#: src/LYCurses.c:1751
+#: src/LYCurses.c:1996
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -3712,83 +3737,88 @@ msgid ""
 "TRACEBACK if it can be captured, and any other relevant information.\n"
 msgstr ""
 "\n"
-" Bitte Systemverwalter benachrichtigen, um einen Bug zu bestätigen, und\n"
-"bei Bestätigung die lynx-dev Mailingliste benachrichtigen. Fehlermeldungen\n"
+" Bitte Systemverwalter benachrichtigen, um einen Bug zu bestätigen, und\n"
+"bei Bestätigung die lynx-dev Mailingliste benachrichtigen. Fehlermeldungen\n"
 "sollten eine knappe Beschreibung des Befehls oder der URL enthalten, die\n"
 "den Fehler verursacht haben, das Betriebssystem mit Versionsnummer,\n"
 "die TCPIP-Implementierung, den TRACEBACK (wenn er gewinnen werden\n"
 "konnte und andere relevante Information.\n"
 
-#: src/LYEdit.c:264
+#: src/LYEdit.c:249
 msgid "Editor killed by signal"
 msgstr "Editor von Signal abgeschossen"
 
-#: src/LYEdit.c:266
+#: src/LYEdit.c:251
 #, c-format
 msgid "Editor returned with error status, %s"
 msgstr "Editor mit Fehler-Status beendet, %s"
 
-#: src/LYEdit.c:267
+#: src/LYEdit.c:252
 msgid "reason unknown."
 msgstr "Grund nicht bekannt."
 
-#: src/LYDownload.c:520
+#: src/LYDownload.c:517
 msgid "Downloaded link:"
 msgstr "Geladener Link:"
 
-#: src/LYDownload.c:525
+#: src/LYDownload.c:522
 msgid "Suggested file name:"
 msgstr "Vorgeschlagener Dateiname:"
 
-#: src/LYDownload.c:530
+#: src/LYDownload.c:527
 msgid "Standard download options:"
 msgstr "Normale Download-Optionen:"
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:528
 msgid "Download options:"
 msgstr "Download-Optionen:"
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:544
 msgid "Save to disk"
 msgstr "Speichern auf Disk"
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "Die Datei ansehen "
+
+#: src/LYDownload.c:565
 msgid "Save to disk disabled."
-msgstr "Speichern auf Disk nicht ermöglicht."
+msgstr "Speichern auf Disk nicht ermöglicht."
 
-#: src/LYDownload.c:551 src/LYPrint.c:1338
+#: src/LYDownload.c:569 src/LYPrint.c:1327
 msgid "Local additions:"
-msgstr "Lokale Zusätze:"
+msgstr "Lokale Zusätze:"
 
-#: src/LYDownload.c:560 src/LYUpload.c:224
+#: src/LYDownload.c:578 src/LYUpload.c:216
 msgid "No Name Given"
 msgstr "Kein Name gegeben"
 
-#: src/LYHistory.c:633
+#: src/LYHistory.c:657
 msgid "You selected:"
-msgstr "Abfolge der gewählten Links:"
+msgstr "Abfolge der gewählten Links:"
 
-#: src/LYHistory.c:657 src/LYHistory.c:905
+#: src/LYHistory.c:681 src/LYHistory.c:921
 msgid "(no address)"
 msgstr "(keine Adresse)"
 
-#: src/LYHistory.c:661
+#: src/LYHistory.c:685
 msgid " (internal)"
 msgstr " (intern)"
 
-#: src/LYHistory.c:663
+#: src/LYHistory.c:687
 msgid " (was internal)"
 msgstr " (ehemals intern)"
 
-#: src/LYHistory.c:761
+#: src/LYHistory.c:785
 msgid " (From History)"
 msgstr " (Von History)"
 
-#: src/LYHistory.c:825
+#: src/LYHistory.c:841
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
-msgstr "Besuchte Links (mit Ausnahme von POST, Lesezeichen, Menüs and Listen):"
+msgstr "Besuchte Links (mit Ausnahme von POST, Lesezeichen, Menüs and Listen):"
 
-#: src/LYHistory.c:1124
+#: src/LYHistory.c:1137
 msgid "(No messages yet)"
 msgstr "(Bisher keine Nachrichten)"
 
@@ -3797,383 +3827,403 @@ msgstr "(Bisher keine Nachrichten)"
 # It's fairly technical, might have been better to leave these strings
 # untranslated.  As it is, the spaces in some of the strings are
 # necessary so that things line up (formatting uses TAB chars). - kw
-#: src/LYLeaks.c:78
+#: src/LYLeaks.c:209
 msgid "Invalid pointer detected."
-msgstr "Ungültiger Zeiger gefunden."
+msgstr "Ungültiger Zeiger gefunden."
+
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr "Abfolge: "
 
-#: src/LYLeaks.c:80 src/LYLeaks.c:117
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
 msgid "Pointer:"
 msgstr "Zeiger: "
 
-#: src/LYLeaks.c:91 src/LYLeaks.c:98 src/LYLeaks.c:136
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
 msgid "FileName:"
-msgstr "Quelle: "
+msgstr "Quelle:  "
 
-#: src/LYLeaks.c:94 src/LYLeaks.c:101 src/LYLeaks.c:139 src/LYLeaks.c:150
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
 msgid "LineCount:"
-msgstr "Zeile:  "
+msgstr "Zeile:    "
 
-#: src/LYLeaks.c:115
+#: src/LYLeaks.c:249
 msgid "Memory leak detected."
 msgstr "Speicherleck gefunden."
 
-#: src/LYLeaks.c:120
+#: src/LYLeaks.c:257
 msgid "Contains:"
-msgstr "Inhalt: "
+msgstr "Inhalt:  "
 
-#: src/LYLeaks.c:133
+#: src/LYLeaks.c:270
 msgid "ByteSize:"
-msgstr "Länge:   "
+msgstr "Länge:   "
 
-#: src/LYLeaks.c:147
+#: src/LYLeaks.c:284
 msgid "realloced:"
 msgstr "realloziert:"
 
-#: src/LYLeaks.c:170
+#: src/LYLeaks.c:307
 msgid "Total memory leakage this run:"
 msgstr "Summe der Speicherlecks in diesem Programmlauf:"
 
-#: src/LYList.c:91
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr "Bytes alloziert"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr "mallocs total"
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr "frees total"
+
+#: src/LYList.c:85
 msgid "References in "
 msgstr "Verweise in "
 
-#: src/LYList.c:92
+#: src/LYList.c:86
 msgid "this document:"
 msgstr "diesem Document:"
 
-#: src/LYList.c:98
+#: src/LYList.c:92
 msgid "Visible links:"
 msgstr "Sichtbare Links:"
 
-#: src/LYList.c:199 src/LYList.c:319
+#: src/LYList.c:194 src/LYList.c:315
 msgid "Hidden links:"
 msgstr "Versteckte Links:"
 
-#: src/LYList.c:267
+#: src/LYList.c:262
 msgid "References"
 msgstr "Verweise"
 
-#: src/LYList.c:269
+#: src/LYList.c:264
 msgid "Visible links"
 msgstr "Sichtbare Links"
 
 #: src/LYLocal.c:267
 #, c-format
 msgid "Unable to get status of '%s'."
-msgstr "Status von '%s' nicht zugänglich."
+msgstr "Status von '%s' nicht zugänglich."
 
 #: src/LYLocal.c:301
 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."
+msgstr "Das Ausgewählte ist weder eine Datei noch ein Verzeichnis! Befehl ignoriert."
 
-#: src/LYLocal.c:383
+#: src/LYLocal.c:366
 #, c-format
 msgid "Unable to %s due to system error!"
-msgstr "%s unmöglich wegen eines Fehlers vom System!"
+msgstr "%s unmöglich wegen eines Fehlers vom System!"
 
 #. error return
-#: src/LYLocal.c:415
+#: src/LYLocal.c:400
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "%s wahrscheinlich fehlgeschlagen, Fehler vom System!"
 
-#: src/LYLocal.c:453
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "Löschen von %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr "\"Touchen\" von %s"
+
+#: src/LYLocal.c:508
 #, c-format
 msgid "move %s to %s"
-msgstr "Bewegen von %s nach %s"
+msgstr "Verschieben von %s nach %s"
 
-#: src/LYLocal.c:475
+#: src/LYLocal.c:548
 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:477
+#: src/LYLocal.c:550
 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:479
+#: src/LYLocal.c:552
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Der angegebene Name ist schon in Benutzung! Befehl ignoriert."
 
-#: src/LYLocal.c:490
+#: src/LYLocal.c:563
 msgid "Destination has different owner!  Request denied."
-msgstr "Ziel gehört jemand anders! Befehl verweigert."
+msgstr "Ziel gehört jemand anderem! Befehl verweigert."
 
-#: src/LYLocal.c:493
+#: src/LYLocal.c:566
 msgid "Destination is not a valid directory!  Request denied."
-msgstr "Ziel is kein gültiges Verzeichnis! Befehl verweigert."
+msgstr "Ziel is kein gültiges Verzeichnis! Befehl verweigert."
 
-#: src/LYLocal.c:516
+#: src/LYLocal.c:588
 msgid "Remove all tagged files and directories?"
-msgstr "Alle markierten Dateien und Verzeichnisse entfernen?"
+msgstr "Alle markierten Dateien und Verzeichnisse löschen?"
 
-#: src/LYLocal.c:537
-#, c-format
-msgid "remove %s"
-msgstr "Löschen von %s"
-
-#: src/LYLocal.c:580
+#: src/LYLocal.c:647
 msgid "Enter new location for tagged items: "
-msgstr "Neuer Ort for markierte Objekte: "
+msgstr "Neuer Ort für markierte Objekte: "
 
-#: src/LYLocal.c:649
+#: src/LYLocal.c:716
 msgid "Path too long"
 msgstr "Pfad zu lang"
 
-#: src/LYLocal.c:680
+#: src/LYLocal.c:747
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Quelle und Ziel sind derselbe Ort - Befehl ignoriert!"
 
-#: src/LYLocal.c:738
+#: src/LYLocal.c:805
 msgid "Enter new name for directory: "
-msgstr "Neuer Name für Verzeichnis: "
+msgstr "Neuer Name für Verzeichnis: "
 
-#: src/LYLocal.c:740
+#: src/LYLocal.c:807
 msgid "Enter new name for file: "
-msgstr "Neuer Name für Datei: "
+msgstr "Neuer Name für Datei: "
 
-#: src/LYLocal.c:751
+#: src/LYLocal.c:819
 msgid "Illegal character (path-separator) found! Request ignored."
-msgstr "Ungültiges Zeichen (path-separator) gefunden! Befehl ignoriert."
+msgstr "Ungültiges Zeichen (path-separator) gefunden! Befehl ignoriert."
 
-#: src/LYLocal.c:800
+#: src/LYLocal.c:868
 msgid "Enter new location for directory: "
-msgstr "Neuer Ort für Verzeichnis: "
+msgstr "Neuer Ort für Verzeichnis: "
 
-#: src/LYLocal.c:802
+#: src/LYLocal.c:874
 msgid "Enter new location for file: "
-msgstr "Neuer Ort für Datei: "
+msgstr "Neuer Ort für Datei: "
 
-#: src/LYLocal.c:827
+#: src/LYLocal.c:901
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Unerwarteter Fehler - kann den Pfadsperator am Ende nicht finden"
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:921
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Quelle und Ziel sind derselbe Ort! Befehl ignoriert!"
 
-#: src/LYLocal.c:894
+#: src/LYLocal.c:970
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Name(n), Ort(l) oder Zugriffsrechte(p) modifizieren? [nlp] "
 
-#: src/LYLocal.c:896
+#: src/LYLocal.c:972
 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:925
+#: src/LYLocal.c:1001
 msgid "This feature not yet implemented!"
 msgstr "Noch nicht implementiert!"
 
-#: src/LYLocal.c:943
+#: src/LYLocal.c:1019
 msgid "Enter name of file to create: "
 msgstr "Name der Datei, die erzeugt werden soll: "
 
-#: src/LYLocal.c:951 src/LYLocal.c:999
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Unerlaubte Umleitung \"//\" gefunden! Befehl ignoriert."
 
-#: src/LYLocal.c:966
-#, c-format
-msgid "create %s"
-msgstr "Erzeugen von %s"
-
-#: src/LYLocal.c:991
+#: src/LYLocal.c:1061
 msgid "Enter name for new directory: "
-msgstr "Name für neues Verzeichnis: "
+msgstr "Name für neues Verzeichnis: "
 
-#: src/LYLocal.c:1042
+#: src/LYLocal.c:1106
 msgid "Create file or directory (f or d): "
 msgstr "Datei(f) oder Verzeichnis(d) erzeugen? [fd] "
 
-#: src/LYLocal.c:1083
+#: src/LYLocal.c:1146
 #, c-format
 msgid "Remove '%s' and all of its contents?"
 msgstr "'%s' mit gesamtem Inhalt entfernen?"
 
-#: src/LYLocal.c:1086
+#: src/LYLocal.c:1149
 msgid "Remove directory and all of its contents?"
-msgstr "Verzeichnis und gesamten Inhalt löschen?"
+msgstr "Verzeichnis und gesamten Inhalt löschen?"
 
-#: src/LYLocal.c:1090
+#: src/LYLocal.c:1153
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Datei '%s' entfernen? "
 
-#: src/LYLocal.c:1092
+#: src/LYLocal.c:1155
 msgid "Remove file?"
 msgstr "Datei entfernen?"
 
-#: src/LYLocal.c:1097
+#: src/LYLocal.c:1160
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Symbolischen Link '%s' entfernen?"
 
-#: src/LYLocal.c:1099
+#: src/LYLocal.c:1162
 msgid "Remove symbolic link?"
 msgstr "Symbolischen Link entfernen?"
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1248
 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."
+msgstr "Sorry, Dateizugriffsrechte für Systeme außer UNIX können nicht geändert werden."
 
-#: src/LYLocal.c:1220
+#: src/LYLocal.c:1278
 msgid "Unable to open permit options file"
-msgstr "Zugriffsrechte-Optionsdatei kann nicht geöffnet werden"
+msgstr "Zugriffsrechte-Optionsdatei kann nicht geöffnet werden"
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1305
 msgid "Specify permissions below:"
 msgstr "Zugriffsrechte angeben:"
 
-#: src/LYLocal.c:1248 src/LYShowInfo.c:196
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
 msgid "Owner:"
 msgstr "Besitzer:"
 
-#: src/LYLocal.c:1264
+#: src/LYLocal.c:1322
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/LYLocal.c:1280
+#: src/LYLocal.c:1338
 msgid "Others:"
 msgstr "Andere:"
 
-#: src/LYLocal.c:1298
+#: src/LYLocal.c:1356
 msgid "form to permit"
-msgstr "Form für Zugriffsrechte"
+msgstr "Form für Zugriffsrechte"
 
-#: src/LYLocal.c:1396
+#: src/LYLocal.c:1452
 msgid "Invalid mode format."
-msgstr "Ungültiges Format für mode."
+msgstr "Ungültiges Format für mode."
 
-#: src/LYLocal.c:1400
+#: src/LYLocal.c:1456
 msgid "Invalid syntax format."
-msgstr "Ungültiges Format für Syntax."
+msgstr "Ungültiges Format für Syntax."
 
-#: src/LYLocal.c:1575
-msgid "NULL URL pointer"
-msgstr "Null-URL-Zeiger"
-
-#: src/LYLocal.c:1670
+#: src/LYLocal.c:1645
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Warnung!  UUDekodierte Dateien werden im Startverzeichnis abgelegt."
 
-#: src/LYLocal.c:1782
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr "Null-URL-Zeiger"
+
+#: src/LYLocal.c:1908
 #, c-format
 msgid "Executing %s "
-msgstr "Ausgeführt wird %s "
+msgstr "Ausgeführt wird %s "
 
-#: src/LYLocal.c:1785
+#: src/LYLocal.c:1911
 msgid "Executing system command. This might take a while."
-msgstr "Systembefehl wird ausgeführt. Das kann eine Weile dauern."
+msgstr "Systembefehl wird ausgeführt. Das kann eine Weile dauern."
 
-#: src/LYLocal.c:1831
-msgid "Unable to open file management menu file."
-msgstr "Dateimanagement-Menüdatei kann nicht geöffnet werden."
-
-#: src/LYLocal.c:1862
+#: src/LYLocal.c:1985
 msgid "Current directory:"
 msgstr "Aktuelles Verzeichnis:"
 
-#: src/LYLocal.c:1865 src/LYLocal.c:1883
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
 msgid "Current selection:"
 msgstr "Aktuelle Auswahl:"
 
-#: src/LYLocal.c:1869
+#: src/LYLocal.c:1992
 msgid "Nothing currently selected."
-msgstr "Zur Zeit nichts ausgewählt."
+msgstr "Zur Zeit nichts ausgewählt."
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged item:"
 msgstr "Markiertes Objekt:"
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged items:"
 msgstr "Markierte Objekte:"
 
-#: src/LYLocal.c:1983 src/LYLocal.c:1994
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
 msgid "Illegal filename; request ignored."
-msgstr "Ungültiger Dateiname; Befehl ignoriert."
-
-#: src/LYLocal.c:2137
-msgid "The selected item is not a directory!  Request ignored."
-msgstr "Das ausgewählte Objekt ist kein Verzeichnis! Befehl ignoriert."
+msgstr "Ungültiger Dateiname; Befehl ignoriert."
 
 #. directory not writable
-#: src/LYLocal.c:2141
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
 msgid "Install in the selected directory not permitted."
-msgstr "Installieren im ausgewählten Verzeichnis nicht gestattet."
+msgstr "Installieren im ausgewählten Verzeichnis nicht gestattet."
+
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr "Das ausgewählte Objekt ist kein Verzeichnis! Befehl ignoriert."
 
-#: src/LYLocal.c:2146
+#: src/LYLocal.c:2276
 msgid "Just a moment, ..."
 msgstr "Nur ein Weilchen, ..."
 
-#: src/LYLocal.c:2163
+#: src/LYLocal.c:2293
 msgid "Error buiding install args"
 msgstr "Fehler beim Aufbau der Installations-Argumente"
 
-#: src/LYLocal.c:2178 src/LYLocal.c:2210
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Quelle und Ziel sind gleich: %s"
 
-#: src/LYLocal.c:2188 src/LYLocal.c:2220
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Bereits im Zielverzeichis: %s"
 
-#: src/LYLocal.c:2238
+#: src/LYLocal.c:2362
 msgid "Installation complete"
 msgstr "Installation fertig"
 
-#: src/LYLocal.c:2427
+#: src/LYLocal.c:2551
 msgid "Temporary URL or list would be too long."
-msgstr "Temporarärer URL oder Liste wäre zu lang."
+msgstr "Temporarärer URL oder Liste wäre zu lang."
 
-#: src/LYMail.c:503
+#: src/LYMail.c:534
 msgid "Sending"
 msgstr "Mail wird gesandt:"
 
-#: src/LYMail.c:989
+#: src/LYMail.c:1024
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "Der Link   %s :?: %s \n"
 
-#: src/LYMail.c:991
+#: src/LYMail.c:1026
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "mit Namen \"%s\"\n"
 
-#: src/LYMail.c:992
+#: src/LYMail.c:1027
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "in der Datei \"%s\", genannt \"%s\",\n"
 
-#: src/LYMail.c:993
+#: src/LYMail.c:1028
 msgid "was requested but was not available."
-msgstr "wurde angefordert, und war nicht verfügbar."
+msgstr "wurde angefordert, und war nicht verfügbar."
 
-#: src/LYMail.c:994
+#: src/LYMail.c:1029
 msgid "Thought you might want to know."
 msgstr "Vielleicht wollten Sie das ja gerne wissen."
 
-#: src/LYMail.c:996
+#: src/LYMail.c:1031
 msgid "This message was automatically generated by"
 msgstr "Diese Nachricht wurde automatisch generiert von"
 
-#: src/LYMain.c:897
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr "Kein systemweiter Mailer konfiguriert"
+
+#: src/LYMain.c:969
 msgid "No Winsock found, sorry."
 msgstr "Kein Winsock gefunden, sorry."
 
-#: src/LYMain.c:1103
+#: src/LYMain.c:1170
 msgid "You MUST define a valid TMP or TEMP area!\n"
-msgstr "Ein gültiger Bereich MUSS definiert sein für TMP oder TEMP!\n"
+msgstr "Ein gültiger Bereich MUSS definiert sein für TMP oder TEMP!\n"
 
-#: src/LYMain.c:1156 src/LYMainLoop.c:5117
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
 msgid "No such directory"
-msgstr " Verzeichnis"
+msgstr "Verzeichnis nicht vorhanden"
 
-#: src/LYMain.c:1378
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4181,20 +4231,20 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Konfigurationsdatei %s ist nicht zugänglich.\n"
+"Konfigurationsdatei %s ist nicht zugänglich.\n"
 "\n"
 
-#: src/LYMain.c:1388
+#: src/LYMain.c:1446
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
 "\n"
 msgstr ""
 "\n"
-"Lynx-Zeichensätze nicht deklariert.\n"
+"Lynx-Zeichensätze nicht deklariert.\n"
 "\n"
 
-#: src/LYMain.c:1417
+#: src/LYMain.c:1475
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
@@ -4204,7 +4254,7 @@ msgstr ""
 "Lynx \"edit map\" nicht deklariert.\n"
 "\n"
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1504
 #, c-format
 msgid ""
 "\n"
@@ -4212,146 +4262,174 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Lynx-Datei %s ist nicht verfügbar.\n"
+"Lynx-Datei %s ist nicht verfügbar.\n"
 "\n"
 
-#: src/LYMain.c:1704
+#: src/LYMain.c:1743
 msgid "Warning:"
 msgstr "Warnung:"
 
 # No idea what this means.  Seems highly experimental anyway. - kw
-#: src/LYMain.c:2247
+#: src/LYMain.c:2293
 msgid "persistent cookies state will be changed in next session only."
-msgstr "Beständige Kekse werden erst beim nächsten Programmaufruf geändert."
+msgstr "Beständige Kekse werden erst beim nächsten Programmaufruf geändert."
 
-#: src/LYMain.c:2477 src/LYMain.c:2525
+#: src/LYMain.c:2540 src/LYMain.c:2588
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignoriere unbekannte Codierung (charset)=%s\n"
 
-#: src/LYMain.c:3047
-#, c-format
-msgid "%s Version %s (%s)\n"
-msgstr "%s Programmversion %s (%s)\n"
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
+msgstr "%s Version %s (%s)\n"
 
-#: src/LYMain.c:3072
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Kompiliert auf %s, %s %s\n"
 
-#: src/LYMain.c:3077
+#: src/LYMain.c:3166
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
-msgstr "Copyrights - University of Kansas, CERN, Autoren individueller Beiträge.\n"
+msgstr "Copyrights - University of Kansas, CERN, Autoren individueller Beiträge.\n"
 
-#: src/LYMain.c:3079
+#: src/LYMain.c:3168
 msgid "Distributed under the GNU General Public License.\n"
 msgstr "Verbreitet unter den Bedingungen der GNU General Public License.\n"
 
-#: src/LYMain.c:3081
+#: src/LYMain.c:3170
 msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
+"See http://lynx.isc.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
-"Weitere Informationen: siehe http://lynx.browser.org/ und die Online-Hilfe.\n"
+"Weitere Informationen: siehe http://lynx.isc.org/ und die Online-Hilfe.\n"
 "\n"
 
-#: src/LYMain.c:3800
+#: src/LYMain.c:3919
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "AUFRUF: %s [optionen] [datei oder URL]\n"
 
-#: src/LYMain.c:3801
+#: src/LYMain.c:3920
 msgid "Options are:\n"
 msgstr "Optionen sind:\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4191
 #, c-format
 msgid "%s: Invalid Option: %s\n"
-msgstr "%s: Ungültige Option: %s\n"
+msgstr "%s: Ungültige Option: %s\n"
 
-#: src/LYMainLoop.c:512
+#: src/LYMainLoop.c:539
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
-msgstr "Interner Fehler: %d is ungültig für mouse_link!"
+msgstr "Interner Fehler: %d is ungültig für mouse_link!"
 
 #.
 #. * Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:625 src/LYMainLoop.c:5139
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
 msgid "A URL specified by the user"
 msgstr "Ein vom Benutzer eingegegener URL"
 
-#: src/LYMainLoop.c:1114
+#: src/LYMainLoop.c:1110
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
-msgstr "Enctype multipart/form-data noch nicht unterstützt! Submission unmöglich."
+msgstr "Enctype multipart/form-data noch nicht unterstützt! Submission unmöglich."
 
 #.
 #. *  Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3097
+#: src/LYMainLoop.c:3053
 msgid "Help Screen"
 msgstr "Hilfe-Seite"
 
-#: src/LYMainLoop.c:3231
+#: src/LYMainLoop.c:3177
 msgid "System Index"
 msgstr "Systemindex"
 
-#: src/LYMainLoop.c:3611 src/LYMainLoop.c:5347
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
 msgid "Entry into main screen"
 msgstr "Eingang zur Hauptseite"
 
-#: src/LYMainLoop.c:3897
+#: src/LYMainLoop.c:3824
 msgid "No next document present"
-msgstr ""
+msgstr "Es gibt kein nächstes Dokument"
 
-#: src/LYMainLoop.c:4206
+#: src/LYMainLoop.c:4131
 msgid "charset for this document specified explicitly, sorry..."
-msgstr "'Tschuldigung: Charset für diesen Text ist schon explizit angegeben..."
+msgstr "Charset für dieses Dokument ist schon explizit angegeben..."
 
-#: src/LYMainLoop.c:5093
+#: src/LYMainLoop.c:5004
 msgid "cd to:"
-msgstr " um zu "
+msgstr "cd nach:"
 
-#: src/LYMainLoop.c:5120
+#: src/LYMainLoop.c:5031
 msgid "A component of path is not a directory"
-msgstr ""
+msgstr "Eine Pfadkomponente ist kein Verzeichnis"
 
-#: src/LYMainLoop.c:5123
+#: src/LYMainLoop.c:5034
 msgid "failed to change directory"
-msgstr "Zugriff auf Verzeichnis fehlgeschlagen."
+msgstr "Fehler beim Verzeichniswechsel"
 
 # How does one translate reparsing anyway? - kw
-#: src/LYMainLoop.c:6291
+#: src/LYMainLoop.c:6204
 msgid "Reparsing document under current settings..."
-msgstr "Document wird mit jetzigen Einstellungen reinterpretiert..."
+msgstr "Dokument wird mit jetzigen Einstellungen reinterpretiert..."
 
-#: src/LYMainLoop.c:6579 src/LYMainLoop.c:6583
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
-msgstr "Fataler Fehler - Ausgabedatei %s konnte nicht geöffnet werden\n"
+msgstr "Fataler Fehler - Ausgabedatei %s konnte nicht geöffnet werden\n"
+
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr "TABLE-Zentrierung aktivieren."
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr "TABLE-Zentrierung ausschalten."
+
+#: src/LYMainLoop.c:6914
+msgid "Current URL is empty."
+msgstr "Aktueller URL ist leer."
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr "Kopieren in das Clipboard fehlgeschlagen."
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr "URL des Dokuments in das Clipboard gespeichert."
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr "URL des Links in das Clipboard gespeichert."
 
-#: src/LYMainLoop.c:7719 src/LYMainLoop.c:7892
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr "Kein URL in das Clipboard gespeichert."
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
 msgid "-index-"
 msgstr "-Index"
 
-#: src/LYMainLoop.c:7829
+#: src/LYMainLoop.c:7731
 msgid "lynx: Can't access startfile"
-msgstr "lynx: Unzugängliche Startdatei"
+msgstr "lynx: Unzugängliche Startdatei"
 
-#: src/LYMainLoop.c:7842
+#: src/LYMainLoop.c:7744
 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:7843
+#: src/LYMainLoop.c:7745
 msgid "      Exiting..."
 msgstr "      Ende..."
 
-#: src/LYMainLoop.c:7886
+#: src/LYMainLoop.c:7788
 msgid "-more-"
 msgstr "-mehr-"
 
 #. Enable scrolling.
-#: src/LYNews.c:203
+#: src/LYNews.c:187
 msgid "You will be posting to:"
 msgstr "Message wird hinterlegt werden in:"
 
@@ -4359,7 +4437,7 @@ msgstr "Message wird hinterlegt werden in:"
 #. *  Get the mail address for the From header,
 #. *  offering personal_mail_address as default.
 #.
-#: src/LYNews.c:212
+#: src/LYNews.c:196
 msgid ""
 "\n"
 "\n"
@@ -4367,14 +4445,14 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" Bitte eigene Mailadresse für den From-Header angeben\n"
+" Bitte eigene Mailadresse für den From-Header angeben\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:230
+#: src/LYNews.c:214
 msgid ""
 "\n"
 "\n"
@@ -4382,9 +4460,9 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" Bitte Betreff angeben oder ändern für den Subject-Header\n"
+" Bitte Betreff angeben oder ändern für den Subject-Header\n"
 
-#: src/LYNews.c:322
+#: src/LYNews.c:303
 msgid ""
 "\n"
 "\n"
@@ -4392,12 +4470,12 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" Bitte Inhalt angeben oder ändern für den Organization-Header\n"
+" Bitte Inhalt angeben oder ändern für den Organization-Header\n"
 
 #.
 #. *  Use the built in line editior.
 #.
-#: src/LYNews.c:379
+#: src/LYNews.c:360
 msgid ""
 "\n"
 "\n"
@@ -4407,94 +4485,112 @@ msgstr ""
 "\n"
 " Bitte Nachricht unten eingeben."
 
-#: src/LYNews.c:425
+#: src/LYNews.c:406
 msgid "Message has no original text!"
 msgstr "Die Message hat keinen neuen Text!"
 
-#: src/LYOptions.c:743
+#: src/LYOptions.c:746
 msgid "review/edit B)ookmarks files"
-msgstr "Lesezeichendateien ((B)ookmark files) ansehen/ändern"
+msgstr "Lesezeichendateien ((B)ookmark files) ansehen/ändern"
 
-#: src/LYOptions.c:745
+#: src/LYOptions.c:748
 msgid "B)ookmark file: "
 msgstr "Lesezeichendatei/(B)ookmark file: "
 
-#: src/LYOptions.c:2507 src/LYOptions.c:2531
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
 #, c-format
 msgid "Use %s to invoke the Options menu!"
-msgstr "Benutze %s um das Options-Menu aufzurufen"
+msgstr "%s benutzen, um das Options-Menü aufzurufen"
+
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr "(mit (!) markierte Optionen werden nicht gespeichert)"
 
-#: src/LYOptions.c:3208
+#: src/LYOptions.c:3261
 msgid "General Preferences"
-msgstr "Allgmeine Präferenzen"
+msgstr "Allgmeine Präferenzen"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3212
+#: src/LYOptions.c:3265
 msgid "User mode"
 msgstr "User mode"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3218
+#: src/LYOptions.c:3271
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3223
+#: src/LYOptions.c:3276
 msgid "Type of Search"
 msgstr "Art der Suche"
 
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3229
+#: src/LYOptions.c:3285
 msgid "Cookies"
 msgstr "Kekse (Cookies)"
 
-#: src/LYOptions.c:3243
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
 msgid "Keyboard Input"
 msgstr "Tastatureingabe"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3247
+#: src/LYOptions.c:3316
 msgid "Keypad mode"
 msgstr "Tastaturmodus/Keypad mode"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3253
+#: src/LYOptions.c:3322
 msgid "Emacs keys"
 msgstr "Emacstasten"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3259
+#: src/LYOptions.c:3328
 msgid "VI keys"
 msgstr "VI-Tasten"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3266
+#: src/LYOptions.c:3335
 msgid "Line edit style"
-msgstr ""
+msgstr "Art für das Editieren von Zeilen"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3278
-#, fuzzy
+#: src/LYOptions.c:3347
 msgid "Keyboard layout"
-msgstr "Tastatureingabe"
+msgstr "Tastaturbelegung"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3291
+#: src/LYOptions.c:3360
 msgid "Display and Character Set"
 msgstr "Display und Zeichensatz"
 
 #. ***************************************************************
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3295
+#: src/LYOptions.c:3364
 msgid "Display character set"
 msgstr "Zeichensatz des Displays"
 
-#: src/LYOptions.c:3324
+#: src/LYOptions.c:3393
 msgid "Assumed document character set"
 msgstr "Angenommene Zeichensatzkodierung"
 
@@ -4503,202 +4599,216 @@ msgstr "Angenommene Zeichensatzkodierung"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3344
+#: src/LYOptions.c:3413
 msgid "CJK mode"
 msgstr "CJK-Modus"
 
-#: src/LYOptions.c:3346
+#: src/LYOptions.c:3415
 msgid "Raw 8-bit"
 msgstr "Unkonvertiert (Raw 8-bit)"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3354
+#: src/LYOptions.c:3423
 msgid "X Display"
 msgstr "X DISPLAY"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3360
+#: src/LYOptions.c:3429
 msgid "Document Appearance"
 msgstr "Aussehen des Dokuments"
 
-#: src/LYOptions.c:3366
+#: src/LYOptions.c:3435
 msgid "Show color"
 msgstr "Farbe zeigen/Show color"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3390
+#: src/LYOptions.c:3459
 msgid "Show cursor"
 msgstr "Positionsmarke zeigen/Show cursor"
 
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr "Scrollbar zeigen"
+
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3396
+#: src/LYOptions.c:3473
 msgid "Popups for select fields"
-msgstr "Popups für Select-Felder"
+msgstr "Popups für Select-Felder"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3403
+#: src/LYOptions.c:3479
 msgid "HTML error recovery"
 msgstr "HTML-Fehlerbehandlung"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3410
+#: src/LYOptions.c:3485
 msgid "Show images"
 msgstr "Bilder zeigen"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3424
+#: src/LYOptions.c:3499
 msgid "Verbose images"
 msgstr "Detaillierte Bildinformation"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3432
+#: src/LYOptions.c:3507
 msgid "Headers Transferred to Remote Servers"
-msgstr "Einige Headers für Requests zu Remote Servern verschickt"
+msgstr "Einige Headers für Requests zu Remote Servern verschickt"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3436
+#: src/LYOptions.c:3511
 msgid "Personal mail address"
-msgstr "Persönliche Mailadresse"
+msgstr "Persönliche Mailadresse"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3516
 msgid "Preferred document character set"
-msgstr "Erwünschter Zeichensatz (Accept-Charset)"
+msgstr "Erwünschter Zeichensatz (Accept-Charset)"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3446
+#: src/LYOptions.c:3521
 msgid "Preferred document language"
-msgstr "Erwünschte Dokumentsprache (Accept-Language)"
+msgstr "Erwünschte Dokumentsprache (Accept-Language)"
 
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3527
 msgid "User-Agent header"
 msgstr "Browseridentifizierung (User-Agent)"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3460
+#: src/LYOptions.c:3535
 msgid "Listing and Accessing Files"
 msgstr "Dateiverzeichnisse anlegen und auf Dateien zugreifen"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3464
+#: src/LYOptions.c:3539
 msgid "FTP sort criteria"
-msgstr "Sortierung für FTP-Verzeichnisse"
+msgstr "Sortierung für FTP-Verzeichnisse"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3471
+#: src/LYOptions.c:3546
 msgid "Local directory sort criteria"
-msgstr "Sortierung für lokale Verzeichnisse"
+msgstr "Sortierkriterien für lokale Verzeichnisse"
 
-#: src/LYOptions.c:3479
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+msgid "Local directory sort order"
+msgstr "Sortierreihenfolge für lokale Verzeichnisse"
+
+#: src/LYOptions.c:3561
 msgid "Show dot files"
 msgstr "Dateien mit Punkt am Anfang sichtbar"
 
-#: src/LYOptions.c:3487
+#: src/LYOptions.c:3569
 msgid "Execution links"
-msgstr "Ausführbare Links/Execution links"
+msgstr "Ausführbare Links/Execution links"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3507
+#: src/LYOptions.c:3589
 msgid "Show transfer rate"
-msgstr "Übertragung komplett."
+msgstr "Ãœbertragungsrate anzeigen"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3516
+#: src/LYOptions.c:3598
 msgid "Special Files and Screens"
 msgstr "Besondere Dateien und Bildschirme"
 
-#: src/LYOptions.c:3521
+#: src/LYOptions.c:3603
 msgid "Multi-bookmarks"
 msgstr "Multi-Datein-Lesezeichen"
 
-#: src/LYOptions.c:3529
+#: src/LYOptions.c:3611
 msgid "Review/edit Bookmarks files"
-msgstr "Lesezeichendateien ansehen/ändern"
+msgstr "Lesezeichendateien ansehen/bearbeiten"
 
-#: src/LYOptions.c:3531
+#: src/LYOptions.c:3613
 msgid "Goto multi-bookmark menu"
-msgstr "Zum Multi-Lesezeichenmenü"
+msgstr "Zum Multi-Lesezeichenmenü"
 
-#: src/LYOptions.c:3533
+#: src/LYOptions.c:3615
 msgid "Bookmarks file"
 msgstr "Lesezeichendatei"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3539
+#: src/LYOptions.c:3621
 msgid "Visited Pages"
 msgstr "Besuchte Seiten"
 
-#: src/LYPrint.c:959
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr "Die Datei ansehen "
+
+#: src/LYPrint.c:952
 msgid " Print job complete.\n"
-msgstr "Druckauftrag abgearbeitet.\n"
+msgstr "Druckauftrag erledigt.\n"
 
-#: src/LYPrint.c:1296
+#: src/LYPrint.c:1281
 msgid "Document:"
 msgstr "Dokument:"
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1282
 msgid "Number of lines:"
 msgstr "Anzahl Zeilen:"
 
-#: src/LYPrint.c:1298
+#: src/LYPrint.c:1283
 msgid "Number of pages:"
 msgstr "Seiten:"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "pages"
 msgstr "Seiten"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "page"
 msgstr "Seite"
 
-#: src/LYPrint.c:1300
+#: src/LYPrint.c:1285
 msgid "(approximately)"
-msgstr "(geschätzt)"
+msgstr "(geschätzt)"
 
-#: src/LYPrint.c:1305
+#: src/LYPrint.c:1290
 msgid "Some print functions have been disabled!"
 msgstr "Einige Druckfunktionen sind ausgeschaltet!"
 
-#: src/LYPrint.c:1309
+#: src/LYPrint.c:1294
 msgid "Standard print options:"
 msgstr "Normale Druckoptionen:"
 
-#: src/LYPrint.c:1310
+#: src/LYPrint.c:1295
 msgid "Print options:"
 msgstr "Druckoptionen:"
 
-#: src/LYPrint.c:1316
+#: src/LYPrint.c:1302
 msgid "Save to a local file"
 msgstr "In lokale Datei speichern"
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1304
 msgid "Save to disk disabled"
 msgstr "Speichern auf Disk nicht erlaubt"
 
-#: src/LYPrint.c:1324
+#: src/LYPrint.c:1311
 msgid "Mail the file"
 msgstr "Datei als Mail schicken"
 
-#: src/LYPrint.c:1330
+#: src/LYPrint.c:1318
 msgid "Print to the screen"
 msgstr "Druckausgabe auf Bildschirm"
 
-#: src/LYPrint.c:1334
+#: src/LYPrint.c:1323
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Ausgabe auf Drucker verbunden mit VT100-Terminal"
 
-#: src/LYReadCFG.c:340
+#: src/LYReadCFG.c:339
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
 "The line must be of the form:\n"
@@ -4708,89 +4818,87 @@ msgid ""
 "The special strings 'nocolor' or 'default', or\n"
 msgstr ""
 "Syntaxfehler beim Parsen von COLOR in Konfigurationsdatei:\n"
-"Die Zeile muß die folgende Form haben:\n"
+"Die Zeile muss die folgende Form haben:\n"
 "COLOR:NUMMER:VORDERGRUND:HINTERGRUND\n"
 "\n"
-"Dabei müssen VORDERGRUND und HINTERGRUND eins der folgenden sein:\n"
-"Die speziellen Wörter 'nocolor' oder 'default', oder\n"
+"Dabei müssen VORDERGRUND und HINTERGRUND eins der folgenden sein:\n"
+"Die speziellen Wörter 'nocolor' oder 'default', oder\n"
 
-#: src/LYReadCFG.c:353
+#: src/LYReadCFG.c:352
 msgid "Offending line:"
 msgstr "Zeile mit Fehler:"
 
-#: src/LYReadCFG.c:660
+#: src/LYReadCFG.c:638
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
-msgstr "Remapping der Taste von %s zu %s für %s fehlgeschlagen\n"
+msgstr "Remapping der Taste von %s zu %s für %s fehlgeschlagen\n"
 
-#: src/LYReadCFG.c:667
+#: src/LYReadCFG.c:645
 #, c-format
 msgid "key remapping of %s to %s failed\n"
-msgstr "Remapping der Taste von %s zu %s fehlgeschlagen\n"
+msgstr "Umbelegung der Taste von %s zu %s fehlgeschlagen\n"
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:666
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
-msgstr "ungültige Zeilen-Editor-Auswahl %s für Taste %s, wähle alle aus\n"
+msgstr "ungültige Zeilen-Editor-Auswahl %s für Taste %s, wähle alle aus\n"
 
-#: src/LYReadCFG.c:715 src/LYReadCFG.c:728
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
-msgstr "Zeileneditor-Bindung der Taste %s (0x%x) an Wert 0x%x für %s ungültig\n"
+msgstr "Zeileneditor-Bindung der Taste %s (0x%x) an Wert 0x%x für %s ungültig\n"
 
-#: src/LYReadCFG.c:733
+#: src/LYReadCFG.c:711
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
-msgstr "Zeileneditor-Bindung der Taste %s (0x%x) für %s ungültig\n"
+msgstr "Zeileneditor-Bindung der Taste %s (0x%x) für %s ungültig\n"
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:816
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
-msgstr "Lynx: Programmstart verweigert, Regeldatei %s (CERN rules file) nicht verfügbar\n"
+msgstr "Lynx: Programmstart verweigert, Regeldatei %s (CERN rules file) nicht verfügbar\n"
 
-#: src/LYReadCFG.c:840
+#: src/LYReadCFG.c:818
 msgid "(no name)"
 msgstr "(ohne Namen)"
 
-#: src/LYReadCFG.c:1658
+#: src/LYReadCFG.c:1782
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
-msgstr "Mehr als %d geschachtelte lynx.cfg-Includes -- Vielleicht eine Schleife?!?\n"
+msgstr "Mehr als %d geschachtelte lynx.cfg-Includes -- wohl eine Schleife?!?\n"
 
-#: src/LYReadCFG.c:1660
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "Last attempted include was '%s',\n"
-msgstr "letztes INCLUDE war für '%s',\n"
+msgstr "letztes INCLUDE war für '%s',\n"
 
-#: src/LYReadCFG.c:1661
+#: src/LYReadCFG.c:1785
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "enthalten in '%s'.\n"
 
-#: src/LYReadCFG.c:2116 src/LYReadCFG.c:2129 src/LYReadCFG.c:2165
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
 msgid "The following is read from your lynx.cfg file."
-msgstr "Folgendes is der aktuellen Konfigurationsdatei entnommen."
+msgstr "Folgendes ist der aktuellen Konfigurationsdatei entnommen."
 
-#: src/LYReadCFG.c:2117 src/LYReadCFG.c:2130
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
 msgid "Please read the distribution"
 msgstr "Bitte die installierte Konfigurationsdatei"
 
-#: src/LYReadCFG.c:2123 src/LYReadCFG.c:2133
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
 msgid "for more comments."
 msgstr ""
 " \n"
-"für weitere Erläuterungen ansehen."
+"für weitere Erläuterungen ansehen."
 
 # Looks dangerous to me, so I sneak in a warning. - kw
-#: src/LYReadCFG.c:2147
+#: src/LYReadCFG.c:2244
 msgid "RELOAD THE CHANGES"
-msgstr "NEULADEN NACH ÄNDERUNG, AUF EIGENE GEFAHR!"
+msgstr "NEULADEN NACH ÄNDERUNG, AUF EIGENE GEFAHR!"
 
-#: src/LYReadCFG.c:2156
+#: src/LYReadCFG.c:2253
 msgid "Your primary configuration"
-msgstr ""
-" Deine primäre Konfigurationsdatei:\n"
-"    #"
+msgstr "Ihre primäre Konfiguration"
 
 #: src/LYShowInfo.c:129
 msgid "Directory that you are currently viewing"
@@ -4806,19 +4914,19 @@ msgstr " URL:"
 
 #: src/LYShowInfo.c:146
 msgid "Directory that you have currently selected"
-msgstr "Zur Zeit ausgewähltes Verzeichnis"
+msgstr "Zur Zeit ausgewähltes Verzeichnis"
 
 #: src/LYShowInfo.c:149
 msgid "File that you have currently selected"
-msgstr "Zur Zeit ausgewählte Datei"
+msgstr "Zur Zeit ausgewählte Datei"
 
 #: src/LYShowInfo.c:153
 msgid "Symbolic link that you have currently selected"
-msgstr "Zur Zeit ausgewählter symbolischer Link"
+msgstr "Zur Zeit ausgewählter symbolischer Link"
 
 #: src/LYShowInfo.c:157
 msgid "Item that you have currently selected"
-msgstr "Zur Zeit ausgewähltes Objekt"
+msgstr "Zur Zeit ausgewähltes Objekt"
 
 #: src/LYShowInfo.c:159
 msgid "Full name:"
@@ -4842,7 +4950,7 @@ msgstr "Gruppenname:"
 
 #: src/LYShowInfo.c:181
 msgid "File size:"
-msgstr "Dateilänge:"
+msgstr "Dateilänge:"
 
 #: src/LYShowInfo.c:187
 msgid "Creation date:"
@@ -4850,7 +4958,7 @@ msgstr "Erzeugungsdatum:"
 
 #: src/LYShowInfo.c:190
 msgid "Last modified:"
-msgstr "Letzte Änderung:"
+msgstr "Letzte Änderung:"
 
 #: src/LYShowInfo.c:193
 msgid "Last accessed:"
@@ -4864,7 +4972,7 @@ msgstr "Zugriffsrechte"
 msgid "File that you are currently viewing"
 msgstr "Zur Zeit angeschautes Dokument"
 
-#: src/LYShowInfo.c:266 src/LYShowInfo.c:375
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
 msgid "Linkname:"
 msgstr "Linkname:"
 
@@ -4884,7 +4992,7 @@ msgstr "Date:"
 
 #: src/LYShowInfo.c:303
 msgid "Last Mod:"
-msgstr "Geändert:"
+msgstr "Geändert:"
 
 #: src/LYShowInfo.c:309
 msgid "&nbsp;Expires:"
@@ -4906,79 +5014,79 @@ msgstr "Language:"
 msgid "Post Data:"
 msgstr "POST-Daten:"
 
-#: src/LYShowInfo.c:331
+#: src/LYShowInfo.c:333
 msgid "Post Content Type:"
 msgstr "POST-Content-Type:"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:342
 msgid "Owner(s):"
 msgstr "Besitzer:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "size:"
-msgstr "Länge:"
+msgstr "Länge:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "lines"
 msgstr "Zeilen"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:348
 msgid "mode:"
 msgstr "Modus:"
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:350
 msgid "forms mode"
 msgstr "Formmodus"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "source"
 msgstr "Quelltext"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:353
 msgid ", safe"
 msgstr ", safe"
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:354
 msgid ", via internal link"
 msgstr ", durch internen Link"
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:360
 msgid ", no-cache"
 msgstr ", no-cache"
 
-#: src/LYShowInfo.c:360
+#: src/LYShowInfo.c:362
 msgid ", ISMAP script"
 msgstr ", ISMAP-Script"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:364
 msgid ", bookmark file"
 msgstr ", Lesezeichendatei"
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:373
 msgid "Link that you currently have selected"
-msgstr "Zur Zeit ausgewählter Link"
+msgstr "Zur Zeit ausgewählter Link"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:386
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:391
 msgid "Enctype:"
 msgstr "Enctype:"
 
-#: src/LYShowInfo.c:401
+#: src/LYShowInfo.c:403
 msgid "(Form field)"
 msgstr "(Formfeld)"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:418
 msgid "No Links on the current page"
 msgstr "Keine Links auf dieser Seite"
 
-#: src/LYStyle.c:250
+#: src/LYStyle.c:278
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -4990,7 +5098,7 @@ msgid ""
 msgstr ""
 "Syntaxfehler beim Parsen eines style's in lss-Datei:\n"
 "[%s]\n"
-"Die Zeile muß die folgende Form haben:\n"
+"Die Zeile muss die folgende Form haben:\n"
 "OBJECT:MONO:COLOR (z.B. em:bold:brightblue:white)\n"
 "wobei OBJECT eins von EM,STRONG,B,I,U,BLINK usw. ist.\n"
 "\n"
@@ -5009,7 +5117,7 @@ msgstr "Unerlaubte Umleitung \"../\" gefunden! Befehl ignoriert."
 
 #: src/LYUpload.c:103
 msgid "Illegal character \"/\" found! Request ignored."
-msgstr "Ungültiges Zeichen \"/\" gefunden! Befehl ignoriert."
+msgstr "Ungültiges Zeichen \"/\" gefunden! Befehl ignoriert."
 
 #: src/LYUpload.c:106
 msgid "Illegal redirection using \"~\" found! Request ignored."
@@ -5017,58 +5125,61 @@ msgstr "Unerlaubte Umleitung mit \"~\" gefunden! Befehl ignoriert."
 
 #: src/LYUpload.c:163
 msgid "Unable to upload file."
-msgstr "Upload für Datei nicht möglich."
+msgstr "Upload für Datei nicht möglich."
 
-#: src/LYUpload.c:214
+#: src/LYUpload.c:206
 msgid "Upload To:"
 msgstr "Upload - wohin:"
 
-#: src/LYUpload.c:215
+#: src/LYUpload.c:207
 msgid "Upload options:"
 msgstr "Upload-Optionen:"
 
-#: src/LYUtils.c:3075
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr "URL des Download-Dokuments in das Clipboard gespeichert."
+
+#: src/LYUtils.c:2468
 msgid "Unexpected access protocol for this URL scheme."
-msgstr "Unerwartetes Zugangsprotokoll für dieses URL-Schema."
+msgstr "Unerwartetes Zugangsprotokoll für dieses URL-Schema."
 
-#: src/LYUtils.c:3915
+#: src/LYUtils.c:3294
 msgid "Too many tempfiles"
-msgstr ""
+msgstr "Zu viele temporäre Dateien"
 
-#: src/LYUtils.c:4217
-#, fuzzy
+#: src/LYUtils.c:3595
 msgid "unknown restriction"
-msgstr "Keine Beschränkungen gesetzt.\n"
+msgstr "unbekannte Beschränkung"
 
-#: src/LYUtils.c:4248
+#: src/LYUtils.c:3626
 msgid "No restrictions set.\n"
-msgstr "Keine Beschränkungen gesetzt.\n"
+msgstr "Keine Beschränkungen gesetzt.\n"
 
-#: src/LYUtils.c:4251
+#: src/LYUtils.c:3629
 msgid "Restrictions set:\n"
-msgstr "Die folgenden Beschränkungen sind in kraft:\n"
+msgstr "Aktuelle Beschränkungen:\n"
 
-#: src/LYUtils.c:5601
-msgid "Ignoring invalid HOME"
-msgstr "Ungültiger Wert für HOME wird ignoriert"
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr "Das HOME-Verzeichnis ist nicht zu finden"
 
-#: src/LYrcFile.c:20
+#: src/LYrcFile.c:21
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
-msgstr ""
+msgstr "Normalerweise nicht aktiviert.  Siehe ENABLE_LYNXRC in lynx.cfg.\n"
 
-#: src/LYrcFile.c:242
+#: src/LYrcFile.c:295
 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 ""
-"accept_all_cookies erlaubt es, Lynx zu sagen, daß alle Kekse (Cookies)\n"
-"akzeptiert werden sollen, falls dies Verhalten erwünscht ist.\n"
-"Die Normaleinstellung ist \"FALSE\", so daß normalerweise bei jedem Keks\n"
+"accept_all_cookies erlaubt es, Lynx zu sagen, dass alle Kekse (Cookies)\n"
+"akzeptiert werden sollen, falls dies Verhalten erwünscht ist.\n"
+"Die Normaleinstellung ist \"FALSE\", so dass normalerweise bei jedem Keks\n"
 "gefragt wird.  Auf \"TRUE\" setzen, um alle Kekse zu akzeptieren.\n"
 
-#: src/LYrcFile.c:249
+#: src/LYrcFile.c:302
 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"
@@ -5076,10 +5187,10 @@ msgid ""
 msgstr ""
 "bookmark_file gibt Name und Ort der normalen Lesezeichendatei (default\n"
 "bookmark file) an. Der Benutzer kann die URLs von Links an die\n"
-"Lesezeichendatei anfügen, so daß Dokumente später leicht wiedergefunden\n"
-"werden können.\n"
+"Lesezeichendatei anfügen, so dass Dokumente später leicht wiedergefunden\n"
+"werden können.\n"
 
-#: src/LYrcFile.c:254
+#: src/LYrcFile.c:307
 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"
@@ -5087,10 +5198,10 @@ msgid ""
 msgstr ""
 "Wenn case_sensitive_searching auf \"on\" gesetzt ist, dann werden mit\n"
 "den Tasten 's' oder '/' gestartete Suchen mit Vergleichsoperationen\n"
-"durchgeführt, die groß-/kleinschreibungsempfindlich sind, statt\n"
-"Kapitalisierung zu ignorieren. Die übliche Einstellung ist \"off\".\n"
+"durchgeführt, die groß-/kleinschreibungsempfindlich sind, statt\n"
+"Kapitalisierung zu ignorieren. Die übliche Einstellung ist \"off\".\n"
 
-#: src/LYrcFile.c:259
+#: src/LYrcFile.c:312
 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"
@@ -5100,12 +5211,12 @@ msgid ""
 msgstr ""
 "Die Definition von character_set bestimmt die Darstellung von 8-Bit-\n"
 "Zeichen auf dem Bildschirm. Falls 8-Bit-Zeichen nicht korrekt gezeigt\n"
-"werden, können Sie versuchen, zu einem anderen 8-Bit-Zeichensatz zu\n"
-"wechseln oder die \"7 bit approximations (US-ASCII)\" mit näherungs-\n"
+"werden, können Sie versuchen, zu einem anderen 8-Bit-Zeichensatz zu\n"
+"wechseln oder die \"7 bit approximations (US-ASCII)\" mit näherungs-\n"
 "weisen Ersatzdarstellungen zu verwenden.\n"
-"Zur Zeit gültige Werte sind:\n"
+"Zur Zeit gültige Werte sind:\n"
 
-#: src/LYrcFile.c:266
+#: src/LYrcFile.c:319
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5114,13 +5225,13 @@ msgid ""
 "settings made here.\n"
 msgstr ""
 "cookie_accept_domains und cookie_reject_domains sind kommaseparierte\n"
-"Listen von Domains (mit führendem '.'), von denen alle Kekse automatisch\n"
+"Listen von Domains (mit führendem '.'), von denen alle Kekse automatisch\n"
 "akzeptiert oder verweigert werden sollen. Der Parameter accept_all_cookies\n"
-"parameter hat jedoch Vorrang über jedwede Einstellungen, die durch diese\n"
+"parameter hat jedoch Vorrang über jedwede Einstellungen, die durch diese\n"
 "Listen gemacht werden. Wenn dieselbe Domain in cookie_accept_domains und\n"
 "in cookie_reject_domains erscheint, hat die Verweigerung vorrang.\n"
 
-#: src/LYrcFile.c:274
+#: src/LYrcFile.c:327
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/.lynx_cookies.\n"
@@ -5128,7 +5239,7 @@ msgstr ""
 "cookie_file gibt die Datei an, von der langlebige Kekse gelesen werden.\n"
 "Standardeinstellung ist ~/.lynx_cookies.\n"
 
-#: src/LYrcFile.c:279
+#: src/LYrcFile.c:332
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5140,14 +5251,20 @@ msgid ""
 msgstr ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains und\n"
 "cookie_query_invalid_domains sind durch Kommas getrennte Listen von\n"
-"Internet-Domänen, die unterschiedlich strikten Gültigkeitstests\n"
-"unterzogen werden sollten. Wenn eine Domäne auf genaue Gültigkeit\n"
-"gesetzt ist, wird auf strikte Erfüllung von RFC2109 untersucht. Eine\n"
-"Domäne mit schwacher Gültigkeit kann Kekse mit einem ungültigen\n"
-"Pfad oder einem ungültigen Domänen-Attribut ablegen. Alle Domänen\n"
-"fragen grundsätzlich den Benutzer bei ungültigen Pfaden oder Domänen\n"
-
-#: src/LYrcFile.c:292
+"Internet-Domänen, die unterschiedlich strikten Gültigkeitstests\n"
+"unterzogen werden sollten. Wenn eine Domäne auf genaue Gültigkeit\n"
+"gesetzt ist, wird auf strikte Erfüllung von RFC2109 untersucht. Eine\n"
+"Domäne mit schwacher Gültigkeit kann Kekse mit einem ungültigen\n"
+"Pfad oder einem ungültigen Domänen-Attribut ablegen. Alle Domänen\n"
+"fragen grundsätzlich den Benutzer bei ungültigen Pfaden oder Domänen\n"
+
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:351
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5160,7 +5277,7 @@ msgstr ""
 "Mit \"FILES_FIRST\" werde normale Dateien zuerst aufgelistet, und mit\n"
 "\"DIRECTORIES_FIRST\" kommen Verzeichnisse zuerst.\n"
 
-#: src/LYrcFile.c:300
+#: src/LYrcFile.c:359
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5168,11 +5285,11 @@ msgid ""
 "will be enabled.\n"
 msgstr ""
 "Wenn emacs_keys auf \"on\" gesetzt ist, werden die im Editor EMACS\n"
-"üblichen Bewegungstasten aktiviert:\n"
+"üblichen Bewegungstasten aktiviert:\n"
 "  ^N = down    ^P = up\n"
 "  ^B = left    ^F = right\n"
 
-#: src/LYrcFile.c:306
+#: src/LYrcFile.c:365
 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"
@@ -5180,12 +5297,12 @@ msgid ""
 "will be used for sending mail.\n"
 msgstr ""
 "file_editor gibt das Programm an, das als Editor benutzt wird, wenn lokale\n"
-"Dateien geändert werden sollen oder wenn Mail geschickt werden soll.\n"
-"Wenn kein Editor angegeben ist, ist Editieren nicht möglich außer wenn es\n"
+"Dateien geändert werden sollen oder wenn Mail geschickt werden soll.\n"
+"Wenn kein Editor angegeben ist, ist Editieren nicht möglich, außer wenn es\n"
 "von der Befehlszeile aus aktiviert wird, und der eingebaute Zeileneditor\n"
-"wird für das Schicken von Mail benutzt.\n"
+"wird für das Schicken von Mail benutzt.\n"
 
-#: src/LYrcFile.c:312
+#: src/LYrcFile.c:371
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5196,13 +5313,13 @@ msgid ""
 msgstr ""
 "file_sorting_method gibt an, nach welchem Feld Dateilisten\n"
 "wie z.B. FTP-Verzeichnisse sortiert werden sollen.\n"
-"Die möglichen Optionen sind:\n"
+"Die möglichen Optionen sind:\n"
 "   BY_FILENAME -- sortiert nach Dateinamen\n"
 "   BY_TYPE     -- sortiert nach Dateityp\n"
-"   BY_SIZE     -- sortiert nach Dateilänge\n"
-"   BY_DATE     -- sortiert nach Änderungsdatum\n"
+"   BY_SIZE     -- sortiert nach Dateilänge\n"
+"   BY_DATE     -- sortiert nach Änderungsdatum\n"
 
-#: src/LYrcFile.c:324
+#: src/LYrcFile.c:389
 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"
@@ -5216,35 +5333,35 @@ msgid ""
 "\n"
 "Current lineedit modes are:\n"
 msgstr ""
-"lineedit_mode gibt an, welche Tastaturbindungen für die Zeicheneingabe\n"
+"lineedit_mode gibt an, welche Tastaturbindungen für die Zeicheneingabe\n"
 "in Prompts un Formfeldern verwendet werden. Wenn lineedit_mode auf\n"
 "\"Default Binding\" gesetzt ist, werden die folgenden Kontrollzeichen\n"
-"zum Bewegen und Löschen benutzt:\n"
+"zum Bewegen und Löschen benutzt:\n"
 "\n"
-"         rückwärts/vorwärts    Enter = Eingabe =      Accept input\n"
+"         rückwärts/vorwärts    Enter = Eingabe =      Accept input\n"
 "Einzelzeichen: <-    ->        ^G    = Abbruch       (Cancel input)\n"
-"  ganzes Wort: ^P    ^N        ^U    = Zeile Löschen (Erase line)\n"
-"Lösch Zeichen: ^H    ^R        ^A    = Zeilenanfang  (Beginning of line)\n"
-"  Lösche Wort: ^B    ^F        ^E    = Zeilenende    (End of line)\n"
+"  ganzes Wort: ^P    ^N        ^U    = Zeile Löschen (Erase line)\n"
+"Lösch Zeichen: ^H    ^R        ^A    = Zeilenanfang  (Beginning of line)\n"
+"  Lösche Wort: ^B    ^F        ^E    = Zeilenende    (End of line)\n"
 "\n"
-"Zur Zeit verfügbare Bindungen sind:\n"
+"Zur Zeit verfügbare Bindungen sind:\n"
 
-#: src/LYrcFile.c:339
+#: src/LYrcFile.c:404
 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 ""
-"Im folgenden können Unterlesezeichendateien (sub-bookmark files)\n"
+"Im folgenden können Unterlesezeichendateien (sub-bookmark files)\n"
 "un ihre Beschreibungen definiert werden.  Das Format ist\n"
 "multi_bookmark<capital_letter>=<filename>,<description>\n"
-"Bis zu 26 Lesezeichendateien (für die im Englischen verwendeten\n"
-"Großbuchstaben) sind erlaubt.\n"
-"Wir beginnen mit \"multi_bookmarkB\", da 'A' schon für normale\n"
+"Bis zu 26 Lesezeichendateien (für die im Englischen verwendeten\n"
+"Großbuchstaben) sind erlaubt.\n"
+"Wir beginnen mit \"multi_bookmarkB\", da 'A' schon für normale\n"
 "Lesezeichen (siehe oben) benutzt wird.\n"
 
-#: src/LYrcFile.c:345
+#: src/LYrcFile.c:410
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5254,17 +5371,17 @@ msgid ""
 "could leave this field blank, but then you won't have it included in\n"
 "your mailed comments.\n"
 msgstr ""
-"personal_mail_address gibt die persönliche Mailadresse des Benutzers an.\n"
-"Die Adresse wird für das Schicken von Kommentaren als Mail benutzt,\n"
-"und kann auch bei Zugriff zu einem HTTP-Server für Authorisierungs-\n"
+"personal_mail_address gibt die persönliche Mailadresse des Benutzers an.\n"
+"Die Adresse wird für das Schicken von Kommentaren als Mail benutzt,\n"
+"und kann auch bei Zugriff zu einem HTTP-Server für Authorisierungs-\n"
 "und Logging-Zwecke in einem Header gesandt werden.  Letztere Nutzung\n"
-"ist normalerweise ausgeschaltet um personenbezogene Daten zu schützen,\n"
+"ist normalerweise ausgeschaltet um personenbezogene Daten zu schützen,\n"
 "kann aber durch Setzen von NO_FROM_HEADER in lynx.cfg oder durch den\n"
 "Switch -from in der Befehlszeile aktiviert werden.\n"
-"Dieses Feld könnte hier auch leergelassen werden, aber dann wird die\n"
+"Dieses Feld könnte hier auch leergelassen werden, aber dann wird die\n"
 "Absenderadresse in Mail-Kommentaren fehlen.\n"
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:419
 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"
@@ -5282,7 +5399,7 @@ msgstr ""
 "preferred_charset gibt Zeichensatz und -kodierung (charset) in MIME-\n"
 "Notation an (z.B. ISO-8859-2, ISO-8859-5), Lynx benutzt diese Einstellung\n"
 "um einem HTTP-Server im Accept-Charset-Header mitzuteilen, welches der\n"
-"vorgezogene charset ist. Eine kommaseparierte Liste is auch möglich.\n"
+"vorgezogene charset ist. Eine kommaseparierte Liste is auch möglich.\n"
 "Die Werte ISO-8859-1 oder US-ASCII sollten NICHT explizit angegeben\n"
 "werden, da diese bereits als default vorausgesetzt werden.\n"
 "Falls eine Datei mit verlangtem charset vorhanden ist, sollte der Server\n"
@@ -5293,23 +5410,23 @@ msgstr ""
 "mit einer Fehlermeldung antworten, das Senden einer Antwort mit\n"
 "nichtpassendem charset ist allerdings auch erlaubt.\n"
 
-#: src/LYrcFile.c:368
+#: src/LYrcFile.c:433
 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 it's default language.\n"
+"Otherwise, the server will send the file in its default language.\n"
 msgstr ""
 "preferred_language gibt eine Sprache oder mehrere Sprachen in MIME-\n"
 "Notation an (z.B. en oder fr, kann auch eine kommaseparierte, nach\n"
-"abnehmender Präferenz geordnete Liste sein).\n"
-"Lynx übermittelt die angegebene Sprachpräferenz in Requests zum\n"
+"abnehmender Präferenz geordnete Liste sein).\n"
+"Lynx übermittelt die angegebene Sprachpräferenz in Requests zum\n"
 "HTTP-Server. Der Server sollte dann eine Datei in der vorgezogenen\n"
-"Sprache zurückschicken, falls vorhanden; andernfalls antwortet der\n"
-"Server in der für den Server (und die Datei) üblichen Sprache.\n"
+"Sprache zurückschicken, falls vorhanden; andernfalls antwortet der\n"
+"Server in der für den Server (und die Datei) üblichen Sprache.\n"
 
-#: src/LYrcFile.c:377
+#: src/LYrcFile.c:442
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5322,19 +5439,19 @@ msgid ""
 "          you are viewing trusted source information.\n"
 msgstr ""
 "Wenn run_all_execution_links auf \"on\" gesetzt ist, werden alle \"local\n"
-"execution links\" ausgeführt, wenn sie aktiviert (ausgewählt) werden.\n"
+"execution links\" ausgeführt, wenn sie aktiviert (ausgewählt) werden.\n"
 "\n"
-"WARNUNG - Dies ist potentiell SEHR gefährlich. Da Sie Dokumente ansehen\n"
-"          können, die von unbekannten oder verdächtigen Quellen stammen,\n"
-"          besteht die Möglichkeit, daß jemand Ihnen einen Link unterschiebt,\n"
-"          der wie ein trojanisches Pferd unerwünschten Zugang gestattet.\n"
-"          Solche trojanischen links könnten so geschrieben sein, daß sie\n"
-"          Dateien löschen oder die Sicherheit kompromittieren.\n"
+"WARNUNG - Dies ist potentiell SEHR gefährlich. Da Sie Dokumente ansehen\n"
+"          können, die von unbekannten oder verdächtigen Quellen stammen,\n"
+"          besteht die Möglichkeit, dass jemand Ihnen einen Link unterschiebt,\n"
+"          der wie ein trojanisches Pferd unerwünschten Zugang gestattet.\n"
+"          Solche trojanischen links könnten so geschrieben sein, dass sie\n"
+"          Dateien löschen oder die Sicherheit kompromittieren.\n"
 "          Die Einstellung sollte nur dann auf \"on\" gesetzt werden, wenn\n"
-"          die angeschauten Dokumente von einer vertrauenswürdigen Quelle\n"
+"          die angeschauten Dokumente von einer vertrauenswürdigen Quelle\n"
 "          kommen.\n"
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:453
 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"
@@ -5351,22 +5468,22 @@ msgid ""
 msgstr ""
 "Wenn run_execution_links_on_local_files auf \"on\" gesetzt ist, dann werden\n"
 "alle \"local execution links\", die in LOKALEN Dateien gefunden wurden,\n"
-"ausgeführt, wenn sie aktiviert (ausgewählt) werden.\n"
+"ausgeführt, wenn sie aktiviert (ausgewählt) werden.\n"
 "Dies underscheidet sich von run_all_execution_links, insofern als nur\n"
-"für Dateien, die sich auf dem lokalen System befinden, Erlaubnis zur\n"
-"Ausführung gegeben wird.\n"
+"für Dateien, die sich auf dem lokalen System befinden, Erlaubnis zur\n"
+"Ausführung gegeben wird.\n"
 "\n"
-"WARNUNG - Dies ist potentiell gefährlich. Da Sie Dokumente ansehen\n"
-"          können, die von unbekannten oder verdächtigen Quellen stammen,\n"
-"          besteht die Möglichkeit, daß jemand Ihnen einen Link unterschiebt,\n"
-"          der wie ein trojanisches Pferd unerwünschten Zugang gestattet.\n"
-"          Solche trojanischen links könnten so geschrieben sein, daß sie\n"
-"          Dateien löschen oder die Sicherheit kompromittieren.\n"
+"WARNUNG - Dies ist potentiell gefährlich. Da Sie Dokumente ansehen\n"
+"          können, die von unbekannten oder verdächtigen Quellen stammen,\n"
+"          besteht die Möglichkeit, dass jemand Ihnen einen Link unterschiebt,\n"
+"          der wie ein trojanisches Pferd unerwünschten Zugang gestattet.\n"
+"          Solche trojanischen links könnten so geschrieben sein, dass sie\n"
+"          Dateien löschen oder die Sicherheit kompromittieren.\n"
 "          Die Einstellung sollte nur dann auf \"on\" gesetzt werden, wenn\n"
-"          die angeschauten Dokumente von einer vertrauenswürdigen Quelle\n"
+"          die angeschauten Dokumente von einer vertrauenswürdigen Quelle\n"
 "          kommen.\n"
 
-#: src/LYrcFile.c:403
+#: src/LYrcFile.c:471
 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"
@@ -5378,14 +5495,14 @@ msgid ""
 msgstr ""
 "select_popups bestimmt, ob OPTIONs in einem SELECT-Block ohne das\n"
 "Attribute MULTIPLE als eine vertikale Liste von Radio-Buttons oder\n"
-"als Popup-Menü präsentiert werden. Es sei bemerkt, daß Lynx immer eine\n"
+"als Popup-Menü präsentiert werden. Es sei bemerkt, dass Lynx immer eine\n"
 "vertikale Liste von Checkboxes erzeugt, wenn das Attribut MULTIPLE im\n"
-"Start-Tag SELECT vorhanden ist. Der Wert \"on\" macht Popup-Menüs zum\n"
-"Normalverhalten, während der Wert \"off\" die Benutzung von Radio-Buttons\n"
+"Start-Tag SELECT vorhanden ist. Der Wert \"on\" macht Popup-Menüs zum\n"
+"Normalverhalten, während der Wert \"off\" die Benutzung von Radio-Buttons\n"
 "zum Normalverhalten macht.  Die normale Einstellung kann durch den\n"
-"Toggle-Switch -popup in der Befehlszeile verändert werden.\n"
+"Toggle-Switch -popup in der Befehlszeile verändert werden.\n"
 
-#: src/LYrcFile.c:413
+#: src/LYrcFile.c:481
 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"
@@ -5404,27 +5521,27 @@ msgid ""
 "\"off\" \"show color\" settings will be treated as \"default\".\n"
 msgstr ""
 "show_color gibt den Farbmodus bei Programmstart an. Die Einstellung\n"
-"\"never\" schaltet Farbunterstützung in Lynx aus (so daß das Terminal\n"
-"als Schwarzweißbildschirm behandelt wird), sogar wenn es scheint daß\n"
-"das Terminal farbfähig ist. Die Einstellung \"always\" erzwingt die\n"
+"\"never\" schaltet Farbunterstützung in Lynx aus (so dass das Terminal\n"
+"als Schwarzweißbildschirm behandelt wird), sogar wenn es scheint dass\n"
+"das Terminal farbfähig ist. Die Einstellung \"always\" erzwingt die\n"
 "Aktivierung des Farbmodus in Lynx, sogar wenn der Terminaltyp nicht\n"
-"farbfähig zu sein scheint, falls die Programmbibliothek, mit der Lynx\n"
-"kompiliert und gelinkt wurde, dies zuläßt.\n"
+"farbfähig zu sein scheint, falls die Programmbibliothek, mit der Lynx\n"
+"kompiliert und gelinkt wurde, dies zulässt.\n"
 "Wenn die Einstellung als \"default\" gespeichert ist, ist das Verhalten\n"
-"wie folgt:  Farbunterstützung im Terminal wird angenommen falls beim\n"
-"Programmstart die Beschreibung des Terminaltyps Farbfähigkeit anzeigt\n"
+"wie folgt:  Farbunterstützung im Terminal wird angenommen falls beim\n"
+"Programmstart die Beschreibung des Terminaltyps Farbfähigkeit anzeigt\n"
 "oder der Switch -color in der Befehlszeile verwendet wird oder die\n"
 "Umgebungsvariable COLORTERM gesetzt ist. Dieses \"default\"-Verhalten\n"
-"trifft außerdem für anomyme Acounts immer zu, und wenn die \"option_save\"\n"
+"trifft außerdem für anomyme Acounts immer zu, und wenn die \"option_save\"\n"
 "Restriction gesetzt ist.\n"
 "Der Effekt der gespeicherten Einstellung kann durch -color oder -nocolor\n"
 "in der Befehlszeile aufgehoben werden.\n"
 "Der beim Programmstart gesetzte Modus kann mittels der Option \"show color\"\n"
-"im 'O'ptionsmenü geändert werden. Wenn die Optionseinstellungen gespei-\n"
-"chert werden, werden die Werte \"on\" und \"off\" für \"show color\" als\n"
+"im 'O'ptionsmenü geändert werden. Wenn die Optionseinstellungen gespei-\n"
+"chert werden, werden die Werte \"on\" und \"off\" für \"show color\" als\n"
 "\"default\" behandelt.\n"
 
-#: src/LYrcFile.c:430
+#: src/LYrcFile.c:498
 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"
@@ -5437,17 +5554,17 @@ msgid ""
 "The default can be overridden via the -show_cursor command line toggle.\n"
 msgstr ""
 "show_cursor gibt an ob der Cursor (Schreibmarke) am rechten Bildschirmrand\n"
-"(und wennmöglich in der underen Ecke) 'versteckt' werden sollte, oder ob\n"
-"er links vom aktuellen Link oder der ausgewählten Option in Popup-Fenstern\n"
-"erscheinen soll.  Die Plazierung links von ausgewähltem Link oder Option\n"
-"ist nützlich für Sprach- und Brailleschnittstellen, und wenn das Terminal\n"
+"(und wennmöglich in der underen Ecke) 'versteckt' werden sollte, oder ob\n"
+"er links vom aktuellen Link oder der ausgewählten Option in Popup-Fenstern\n"
+"erscheinen soll.  Die Plazierung links von ausgewähltem Link oder Option\n"
+"ist nützlich für Sprach- und Brailleschnittstellen, und wenn das Terminal\n"
 "eines ist, welches nicht durch Hervorhebung oder Farbe die Unterscheidung \n"
-"des ausgewählten Links zuläßt. Der Wert \"on\" bewirkt daß der Cursor links\n"
+"des ausgewählten Links zulässt. Der Wert \"on\" bewirkt, dass der Cursor links\n"
 "von Links erscheint, der Wert \"off\" bewirkt 'Verstecken' des Cursors.\n"
-"Die gewählte Einstellung kann durch den Toggle-Switch -show_cursor in\n"
-"der Befehlszeile geändert werden.\n"
+"Die gewählte Einstellung kann durch den Toggle-Switch -show_cursor in\n"
+"der Befehlszeile geändert werden.\n"
 
-#: src/LYrcFile.c:441
+#: src/LYrcFile.c:509
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5455,15 +5572,15 @@ msgid ""
 "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 ""
-"show_dotfiles gibt an daß in der Auflistung von Verzeichnissen\n"
+"show_dotfiles gibt an dass in der Auflistung von Verzeichnissen\n"
 "\"versteckte\" (dot-)Dateien und Verzeichnisse enthalten sein sollten.\n"
 "Die Einstellung \"on\" wird nur honoriert, wenn die durch userdefs.h\n"
 "und/oder lynx.cfg gegebenen Einstellungen dies erlauben und keine\n"
-"Restriktion von der Befehlszeile in kraft ist. Wenn die Anzeige\n"
+"Restriktion von der Befehlszeile in kraft ist.  Wenn die Anzeige\n"
 "von versteckten Dateien ausgeschaltet ist, ist auch die Erzeugung\n"
 "solcher Dateien von Lynx aus nicht erlaubt.\n"
 
-#: src/LYrcFile.c:452
+#: src/LYrcFile.c:520
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5478,16 +5595,16 @@ msgstr ""
 "Wenn sub_bookmarks nicht \"off\" ist und Multi-Datei-Lesezeichen (multiple\n"
 "bookmarks) definiert sind (siehe unten), dann werden alle Lesezeichen-\n"
 "operationen als ersten den Benutzer bitten, eine aktive Unterlesezeichen-\n"
-"datei auszuwählen. Das normale bookmark_file wird als Vorgabe vorge-\n"
+"datei auszuwählen. Das normale bookmark_file wird als Vorgabe vorge-\n"
 "schlagen, fall es definiert is (siehe oben). Wenn diese Option auf\n"
 "\"advanced\" (= fortgeschritten) gesetzt ist und der Benutzermodus (user\n"
-"mode) auch advanced ist, dann führt der Tastenbefehl 'v'iew bookmark\n"
-"zu einer Statuszeilenfrage statt zu dem Menü, welches erscheint wenn\n"
+"mode) auch advanced ist, dann führt der Tastenbefehl 'v'iew bookmark\n"
+"zu einer Statuszeilenfrage statt zu dem Menü, welches erscheint wenn\n"
 "der Benutzermodus novice oder intermediate ist. Wenn diese Option auf\n"
-"\"standard\" gesetzt ist, dann erscheint das letzgenannt Menü immer,\n"
-"unabhängig vom Benutzermodus.\n"
+"\"standard\" gesetzt ist, dann erscheint das letzgenannt Menü immer,\n"
+"unabhängig vom Benutzermodus.\n"
 
-#: src/LYrcFile.c:464
+#: src/LYrcFile.c:533
 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"
@@ -5498,14 +5615,14 @@ msgid ""
 msgstr ""
 "user_mode bestimmt den Benutzermodus, das Kenntnisniveau des Benutzers\n"
 "im Umgang mit Lynx. Wenn nicht anders angegeben, wird die Einstellung\n"
-"\"NOVICE\" verwendet. In diesem Modus werden zwei zusätzliche Zeilen mit\n"
+"\"NOVICE\" verwendet. In diesem Modus werden zwei zusätzliche Zeilen mit\n"
 "Hilfsinformationen am unteren Bildschirmrand gezeigt, um dem Benutzer zu\n"
-"helfen, die grundlegenden Tastaturbefehle für Lynx zu lernen.\n"
+"helfen, die grundlegenden Tastaturbefehle für Lynx zu lernen.\n"
 "Wenn user_mode auf \"INTERMEDIATE\" gesetzt wird, werden die Extrazeilen\n"
-"ausgeschaltet.  Im Modus \"ADVANCED\" wird außerdem der URL des gerade\n"
-"ausgewählten Links am unteren Bildschirmrand angezeigt.\n"
+"ausgeschaltet.  Im Modus \"ADVANCED\" wird außerdem der URL des gerade\n"
+"ausgewählten Links am unteren Bildschirmrand angezeigt.\n"
 
-#: src/LYrcFile.c:472
+#: src/LYrcFile.c:542
 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"
@@ -5515,7 +5632,7 @@ msgstr ""
 "der Bildquelle anstelle von [INLINE], [LINK] or [IMAGE] an.\n"
 "Siehe auch VERBOSE_IMAGES in lynx.cfg.\n"
 
-#: src/LYrcFile.c:477
+#: src/LYrcFile.c:547
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5524,25 +5641,25 @@ msgid ""
 "Capital 'H', 'J' and 'K will still activate help, jump shortcuts,\n"
 "and the keymap display, respectively.\n"
 msgstr ""
-"Wenn vi_keys auf \"on\" gesetzt ist, werden die im Editor VI üblichen\n"
+"Wenn vi_keys auf \"on\" gesetzt ist, werden die im Editor VI üblichen\n"
 "Bewegungstasten aktiviert:\n"
 "  j = down    k = up\n"
 "  h = left    l = right\n"
 "Diese Einstellung wirkt sich nur auf die Kleinbuchstaben aus.\n"
-"Die Wirkung der Großbuchstaben 'H', 'J' and 'K' bleibt unverändert,\n"
-"diese können daher zur gleichen Zeit immer noch verwendet werden um\n"
+"Die Wirkung der Großbuchstaben 'H', 'J' and 'K' bleibt unverändert,\n"
+"diese können daher zur gleichen Zeit immer noch verwendet werden um\n"
 "die normalen Aktionen (activate help, jump shortcuts, keymap display)\n"
-"auszulösen.\n"
+"auszulösen.\n"
 
-#: src/LYrcFile.c:485
+#: src/LYrcFile.c:555
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
 msgstr ""
 "Die visited_links Einrichtung legt fest, wie Lynx die Informationen\n"
-"auf der Seite für besuchte Links organisiert.\n"
+"auf der Seite für besuchte Links organisiert.\n"
 
-#: src/LYrcFile.c:693
+#: src/LYrcFile.c:772
 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"
@@ -5554,25 +5671,25 @@ msgid ""
 msgstr ""
 "Wenn keypad_mode auf \"NUMBERS_AS_ARROWS\" gesetzt ist, dann werden die\n"
 "meisten Ziffern als entsprechende Bewegungstasten vom Ziffernblock\n"
-"der üblichen Tastatur behandelt. Dadurch können diese Tasten als\n"
+"der üblichen Tastatur behandelt. Dadurch können diese Tasten als\n"
 "Pfeiltasten verwendet werden, wenn \"Numlock\" aktiv ist.\n"
 "\n"
 "            8 = Up Arrow\n"
 "  4 = Left Arrow    6 = Right Arrow\n"
 "            2 = Down Arrow\n"
-"Die über den Buchstaben gelegenen Zifferntasten haben dann natürlich\n"
-"denselben Effekt, unabhängig vom \"Numlock\"-Zustand.\n"
+"Die über den Buchstaben gelegenen Zifferntasten haben dann natürlich\n"
+"denselben Effekt, unabhängig vom \"Numlock\"-Zustand.\n"
 
-#: src/LYrcFile.c:702
+#: src/LYrcFile.c:781
 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 ""
 "Wenn keypad_mode auf \"LINKS_ARE_NUMBERED\" gesetzt ist, dann werden\n"
 "Links mit einer sichtbaren Numerierung versehen, und Zifferntasten\n"
-"können zur Auswahl von Links benutzt werden.\n"
+"können zur Auswahl von Links benutzt werden.\n"
 
-#: src/LYrcFile.c:706
+#: src/LYrcFile.c:785
 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"
@@ -5584,26 +5701,26 @@ msgid ""
 msgstr ""
 "Wenn keypad_mode auf \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" gesetzt ist,\n"
 "dann werden Links und sichtbare Formfelder mit nebenstehend erscheinender\n"
-"Numerierung versehen, und Zifferntasten können zur Auswahl von Links oder\n"
-"für Positionierung auf Formeingabefelder und -buttons verwendet werden. \n"
-"Zusätzlich werden auch Optionen in Popup-Menüs durchnumeriert, so daß\n"
-"eine Option durch Eingabe der entsprechenden Nummer ausgewählt werden\n"
-"kann (sogar wenn die gewünschte Option nicht im gerade auf dem Bildschirm\n"
-"sichtbaren Bereich des Popup-Menüs liegt). Außerdem werden Formfelder\n"
+"Numerierung versehen, und Zifferntasten können zur Auswahl von Links oder\n"
+"für Positionierung auf Formeingabefelder und -buttons verwendet werden. \n"
+"Zusätzlich werden auch Optionen in Popup-Menüs durchnumeriert, so dass\n"
+"eine Option durch Eingabe der entsprechenden Nummer ausgewählt werden\n"
+"kann (sogar wenn die gewünschte Option nicht im gerade auf dem Bildschirm\n"
+"sichtbaren Bereich des Popup-Menüs liegt). Außerdem werden Formfelder\n"
 "auch in Verweislisten und im Ergebnis des Tastenbefehls 'L'ist numeriert\n"
 "aufgelistet.\n"
 
-#: src/LYrcFile.c:715
+#: src/LYrcFile.c:794
 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 ""
-"Warnung: Einige Dokumente mit fixem Format können unschön aussehen,\n"
+"Warnung: Einige Dokumente mit fixem Format können unschön aussehen,\n"
 "wenn \"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\"\n"
 "eingeschaltet ist.\n"
 
-#: src/LYrcFile.c:748
+#: src/LYrcFile.c:827
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -5618,12 +5735,205 @@ msgid ""
 msgstr ""
 "Lynx User Defaults File\n"
 "\n"
-"Diese Datei enthält Optionen, die vom Lynx Options Screen gespeichert\n"
-"worden sind (üblicherweise mit der Taste '>').  Normalerweise braucht\n"
+"Diese Datei enthält Optionen, die vom Lynx Options Screen gespeichert\n"
+"worden sind (üblicherweise mit der Taste '>').  Normalerweise braucht\n"
 "diese Datei nicht manuell editiert zu werden, da die Einstellungen\n"
-"hier vom der Optionsseite kontrolliert werden können.  Außerdem wird\n"
-"diese Datei das nächstemal, wenn Optionen von der Optionsseite gespeichert\n"
-"werden, komplett überschrieben.  Sie sind gewarnt worden...\n"
+"hier vom der Optionsseite kontrolliert werden können.  Außerdem wird\n"
+"diese Datei das nächstemal, wenn Optionen von der Optionsseite gespeichert\n"
+"werden, komplett überschrieben.  Sie sind gewarnt worden...\n"
 "Wenn Sie nach der generellen Konfigurationsdatei suchen - da sind sie\n"
-"hier am falschen Ort.  Die generelle Konfigurationsdatei wird üblicherweise\n"
+"hier am falschen Ort.  Die generelle Konfigurationsdatei wird üblicherweise\n"
 "lynx.cfg genannt, und ihr Inhalt und Format ist verschieden.\n"
+
+#~ msgid "Short read from file, problem?"
+#~ msgstr "Datei unvollständig gelesen; gibt es ein Problem?"
+
+#~ msgid "Unable to open file management menu file."
+#~ msgstr "Dateimanagement-Menüdatei kann nicht geöffnet werden."
+
+#~ msgid "create %s"
+#~ msgstr "Erzeugen von %s"
+
+#~ msgid "Ignoring invalid HOME"
+#~ msgstr "Ungültiger Wert für HOME wird ignoriert"
+
+#~ msgid "Comment request cancelled!!!"
+#~ msgstr "Kommentarwunsch zurückgezogen!"
+
+#~ msgid "You are not allowed to goto \"file:\" URLs"
+#~ msgstr "Das Gehen zu \"file:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"finger:\" URLs"
+#~ msgstr "Das Gehen zu \"finger:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"ftp:\" URLs"
+#~ msgstr "Das Gehen zu \"ftp:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"gopher:\" URLs"
+#~ msgstr "Das Gehen zu \"gopher:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"http:\" URLs"
+#~ msgstr "Das Gehen zu \"http:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"https:\" URLs"
+#~ msgstr "Das Gehen zu \"https:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"lynxcgi:\" URLs"
+#~ msgstr "Das Gehen zu \"lynxcgi:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"lynxexec:\" URLs"
+#~ msgstr "Das Gehen zu \"lynxexec:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"lynxprog:\" URLs"
+#~ msgstr "Das Gehen zu \"lynxprog:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"mailto:\" URLs"
+#~ msgstr "Das Gehen zu \"mailto:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"news:\" URLs"
+#~ msgstr "Das Gehen zu \"news:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"nntp:\" URLs"
+#~ msgstr "Das Gehen zu \"nntp:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"rlogin:\" URLs"
+#~ msgstr "Das Gehen zu \"rlogin:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"snews:\" URLs"
+#~ msgstr "Das Gehen zu \"snews:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"telnet:\" URLs"
+#~ msgstr "Das Gehen zu \"telnet:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"tn3270:\" URLs"
+#~ msgstr "Das Gehen zu \"tn3270:\"-URLs ist nicht erlaubt"
+
+#~ msgid "You are not allowed to goto \"wais:\" URLs"
+#~ msgstr "Das Gehen zu \"wais:\"-URLs ist nicht erlaubt"
+
+#~ msgid "This special URL is not allowed as a goto!"
+#~ msgstr "Das Gehen zu diesem speziellen URL ist nicht erlaubt!"
+
+#~ msgid "Option choice (or page) number: "
+#~ msgstr "Optionswahl (oder Seite) Nummer: "
+
+#~ msgid "Choice number %d already is current."
+#~ msgstr "Aktuelle Wahl ist schon Nummer %d."
+
+#~ msgid "You are already at the end of this choice list."
+#~ msgstr "Schon am Ende der Auswahlliste."
+
+#~ msgid "You are already at the beginning of this choice list."
+#~ msgstr "Schon am Anfang der Auswahlliste."
+
+#~ msgid "You are already at page %d of this choice list."
+#~ msgstr "Schon auf Seite %d der Auswahlliste."
+
+#~ msgid "You have entered an invalid choice number."
+#~ msgstr "Ungültige Auswahlnummer eingegeben."
+
+#~ msgid "Read %ld of %ld %s of data"
+#~ msgstr "%ld von %ld %s gelesen"
+
+#~ msgid "Read %ld %s of data"
+#~ msgstr "%ld %s gelesen"
+
+#~ msgid "(From Cookie Jar)"
+#~ msgstr "(Aus Keksbeutel)"
+
+#~ msgid "Personal Name: "
+#~ msgstr "Persönlicher Name: "
+
+#~ msgid "Inactive text input, activate to edit (e.g., press ENTER)"
+#~ msgstr "Inaktive Texteingabe, für Eingabe erst aktivieren (z.B. ENTER drücken)"
+
+#~ msgid "Left mouse button or return to select, arrow keys to scroll."
+#~ msgstr "RETURN oder linke Maustaste wählt aus, Pfeiltasten zum Auf- und Abbewegen."
+
+# This is within `#ifdef NOTUSED'. - kw
+#~ msgid ""
+#~ "partial_thres specifies the number of lines Lynx should download and render\n"
+#~ "before we redraw the screen in Partial Display logic\n"
+#~ "e.g., partial_thres=2\n"
+#~ "would have Lynx redraw every 2 lines that it renders\n"
+#~ "partial_thres=-1 would use the entire screensize\n"
+#~ msgstr ""
+#~ "partial_thres gibt die Anzahl der Zeilen an, die Lynx laden und \n"
+#~ "verarbeiten soll, bevor in der Partialdisplaylogik der Bildschirm-\n"
+#~ "inhalt neugezeichnet wird.\n"
+#~ "z.B. partial_thres=2\n"
+#~ "würde bewirken, dass Lynx pro neue interpretierte zwei Zeilen die\n"
+#~ "Bildschirmdarstellung auffrischt.\n"
+#~ "partial_thres=-1 bewirkt Benutzung der gesamten Bildschirmlänge.\n"
+
+# This claim makes even less sense in languages other than English. - kw
+#~ msgid "WARNING: Misrepresentation of the User-Agent may be a copyright violation!"
+#~ msgstr "WARNUNG: Sollte \"Lynx\" enthalten, um absichtliche Täuschung zu vermeiden!"
+
+#~ msgid "Looking up %s."
+#~ msgstr "Suche nach %s."
+
+#~ msgid "Got redirection with a bad Location header."
+#~ msgstr "Umleitung mit ungültigem Location-Header empfangen."
+
+#~ msgid "Got redirection with no Location header."
+#~ msgstr "Umleitung ohne Location-Header empfangen."
+
+#~ msgid "Searching type"
+#~ msgstr "Suchmodus"
+
+#~ msgid "Document Layout"
+#~ msgstr "Dokumentlayout"
+
+#~ msgid "Bookmark Options"
+#~ msgstr "Lesezeichen/Bookmarks"
+
+#~ msgid " failed"
+#~ msgstr " fehlgeschlagen"
+
+#~ msgid "Are you sure you want to quit? [N] "
+#~ msgstr "Programm wirklich beenden? [N] "
+
+#~ msgid "Really exit from Lynx? [N] "
+#~ msgstr "Willst du wirklich raus? [N] "
+
+#~ 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.<br>\n"
+#~ "     This file also may be edited with a standard text editor to delete\n"
+#~ "     outdated or invalid links, or to change their order.\n"
+#~ "\n"
+#~ "<!--\n"
+#~ "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 saved as a single line\n"
+#~ "-->\n"
+#~ "\n"
+#~ "     <p>\n"
+#~ "<ol>\n"
+#~ msgstr ""
+#~ "     Links können mit dem Tastenbefehl für \"remove bookmark\" entfernt\n"
+#~ "     werden.  Das ist normalerweise der Buchstabe 'R', ausser wenn die\n"
+#~ "     Tastenbelegung geändert worden ist.<br>\n"
+#~ "     Diese Datei kann auch mit einem normalen Texteditor geändert\n"
+#~ "     werden um alte oder ungültige Links zu entfernen oder um die\n"
+#~ "     Reihenfolge zu ändern.\n"
+#~ "\n"
+#~ "<!--\n"
+#~ "Achtung: Beim manuellen Editieren dieser Datei sollte\n"
+#~ "         das Format innerhalb der Zeilen nicht verändert\n"
+#~ "         werden. Zusätzliches HTML-Markup sollte nicht\n"
+#~ "         verwendet werden. Jeder einzelne Link muss vollständig\n"
+#~ "         in einer einzigen Zeile enthalten sein.\n"
+#~ "-->\n"
+#~ "\n"
+#~ "     <p>\n"
+#~ "<ol>\n"
+
+#~ msgid "Character Set Options"
+#~ msgstr "Zeichensätze"
+
+#~ msgid "This is read from your lynx.cfg file:"
+#~ msgstr "Dies ist der aktuellen Konfigurationsdatei entnommen:"
diff --git a/gnu/usr.bin/lynx/po/es.po b/gnu/usr.bin/lynx/po/es.po
deleted file mode 100644
index d1e1193c4a9..00000000000
--- a/gnu/usr.bin/lynx/po/es.po
+++ /dev/null
@@ -1,27 +0,0 @@
-msgid ""
-msgstr ""
-"Date: 1998-08-22 16:12:20-0400\n"
-"From: Webmaster Jim <jspath@bcpl.net>\n"
-"Content-Type: text/plain; charset=\n"
-"Xgettext-Options: --default-domain=po/de\n"
-"Files: src/LYMain.c\n"
-
-#: src/LYMain.c:2502
-msgid "%s Version %s %s"
-msgstr "%s Versión %s"
-
-#: src/LYMain.c:2504
-msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
-msgstr "El copyright sostuvo al lado de la universidad de Kansas, de la CERN, y de otros contribuidores.\n"
-
-#: src/LYMain.c:2506
-msgid "Distributed under the GNU General Public License.\n"
-msgstr "Distribuido bajo la licencia el público en general de GNU.\n"
-
-#: src/LYMain.c:2508
-msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
-"\n"
-msgstr ""
-"Vea http://lynx.browser.org/ y la ayuda en línea para más información.\n"
-"\n"
diff --git a/gnu/usr.bin/lynx/po/et.po b/gnu/usr.bin/lynx/po/et.po
new file mode 100644
index 00000000000..e3a02faf7a3
--- /dev/null
+++ b/gnu/usr.bin/lynx/po/et.po
@@ -0,0 +1,5638 @@
+# Estonian translations for lynx
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Toomas Soome <tsoome@ut.ee>, 2002.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lynx 2.8.5pre15\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-0500\n"
+"PO-Revision-Date: 2003-06-03 20:22+0300\n"
+"Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8-bit\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:29
+#, c-format
+msgid "Alert!: %s"
+msgstr "Tähelepanu!: %s"
+
+#: LYMessages.c:30
+msgid "Welcome"
+msgstr "Tere tulemast"
+
+#: LYMessages.c:31
+msgid "Are you sure you want to quit?"
+msgstr "Olete kindel, et soovite väljuda?"
+
+#: LYMessages.c:33
+msgid "Really exit from Lynx?"
+msgstr "Soovite tõesti väljuda Lynxist?"
+
+#: LYMessages.c:35
+msgid "Connection interrupted."
+msgstr "Ühendus katkestati."
+
+#: LYMessages.c:36
+msgid "Data transfer interrupted."
+msgstr "Andmete ülekanne katkestati."
+
+#: LYMessages.c:37
+msgid "Cancelled!!!"
+msgstr "Katkestatud!!!"
+
+#: LYMessages.c:38
+msgid "Cancelling!"
+msgstr "Katkestan!!!"
+
+#: LYMessages.c:39
+msgid "Excellent!!!"
+msgstr "Suurepärane!!!"
+
+#: LYMessages.c:40
+msgid "OK"
+msgstr "OK"
+
+#: LYMessages.c:41
+msgid "Done!"
+msgstr "Valmis!"
+
+#: LYMessages.c:42
+msgid "Bad request!"
+msgstr "Halb päring!"
+
+#: LYMessages.c:43
+msgid "previous"
+msgstr "eelmine"
+
+#: LYMessages.c:44
+msgid "next screen"
+msgstr "järgmine ekraan"
+
+#: LYMessages.c:45
+msgid "HELP!"
+msgstr "APPI!"
+
+#: LYMessages.c:46
+msgid ", help on "
+msgstr ", abiinfo"
+
+#. #define HELP
+#: LYMessages.c:48
+msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
+msgstr "Käsud: Liikumiseks kasutage nooli, '?' abiinfo, 'q' väljumine, '<-' tagasi."
+
+#. #define MOREHELP
+#: LYMessages.c:50
+msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
+msgstr "-- edasi saate tühikuga, liikumiseks nooled, '?' annab abi. väljumiseks 'q'."
+
+#: LYMessages.c:51
+msgid "-- press space for next page --"
+msgstr "-- vajutage tühikut --"
+
+#: LYMessages.c:52
+msgid "URL too long"
+msgstr "URL on liiga pikk"
+
+#. Inactive input fields, messages used with -tna option - kw
+#. #define FORM_LINK_TEXT_MESSAGE_INA
+#: LYMessages.c:58
+msgid "(Text entry field) Inactive.  Press <return> to activate."
+msgstr "(Tekstiväli) Pole aktiivne. Aktiveerimiseks vajutage <return>."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
+#: LYMessages.c:60
+msgid "(Textarea) Inactive.  Press <return> to activate."
+msgstr "(Tekstiala) Pole aktiivne. Aktiveerimiseks vajutage <return>."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
+#: LYMessages.c:62
+#, c-format
+msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
+msgstr "(Tekstiala) Pole aktiivne. Aktiveerimiseks vajutage <return> (%s toimeti)."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
+#: LYMessages.c:64
+msgid "(Form field) Inactive.  Use <return> to edit."
+msgstr "(Vormiväli) Pole aktiivne. Toimetamiseks vajutage <return>."
+
+#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
+#: LYMessages.c:66
+#, c-format
+msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
+msgstr "(Vormiväli) Pole aktiivne. Toimetamiseks <return> (%s saada puhverdamata)."
+
+#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
+#: LYMessages.c:68
+msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
+msgstr "(Vormiväli) Pole aktiivne. Toimetamiseks <return>, saatmiseks topelt."
+
+#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
+#: LYMessages.c:70
+msgid "(mailto form field) Inactive.  Press <return> to change."
+msgstr "(mailto vormi väli) Pole aktiivne. Muutmiseks vajutage <return>."
+
+#. #define FORM_LINK_PASSWORD_MESSAGE_INA
+#: LYMessages.c:72
+msgid "(Password entry field) Inactive.  Press <return> to activate."
+msgstr "(Parooliväli) Pole aktiivne. Aktiveerimiseks vajutage <return>."
+
+#. #define FORM_LINK_FILE_UNM_MSG
+#: LYMessages.c:75
+msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
+msgstr "MITTEMUUDETAV failiväli. Väljalt lahkumiseks kasutage ÜLES, ALLA või TAB."
+
+#. #define FORM_LINK_FILE_MESSAGE
+#: LYMessages.c:77
+msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Failiväli) Sisestage faili nimi. Väljalt lahkumiseks ÜLES, ALLA või TAB."
+
+#. #define FORM_LINK_TEXT_MESSAGE
+#: LYMessages.c:79
+msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Tekstiväli) Sisestage tekst. Väljalt lahkumiseks ÜLES, ALLA või TAB."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE
+#: LYMessages.c:81
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
+msgstr "(Tekstiala) Sisestage tekst. Lahkumiseks kasutage ÜLES, ALLA või TAB."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_E
+#: LYMessages.c:83
+#, c-format
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
+msgstr "(Tekstiala) Sisestage tekst. Lahkumiseks ÜLES, ALLA või TAB (%s toimeti)."
+
+#. #define FORM_LINK_TEXT_UNM_MSG
+#: LYMessages.c:85
+msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
+msgstr "MITTEMUUDETAV vormi tekst. Väljalt lahkumiseks ÜLES, ALLA või TAB."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
+#: LYMessages.c:87
+msgid "(Form field) Enter text.  Use <return> to submit."
+msgstr "(Vormi väli) Sisestage tekst. Saatmiseks vajutage <return>."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
+#: LYMessages.c:89
+#, c-format
+msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
+msgstr "(Vormi väli) Sisestage tekst. Saatmiseks vajutage <return> (%s puhverdamata)."
+
+#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
+#: LYMessages.c:91
+msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
+msgstr "(Vormi väli) Sisestage tekst. Saatmiseks <return>, lahkumiseks nooled/tab."
+
+#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
+#: LYMessages.c:93
+msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
+msgstr "MITTEMUUDETAV vormi väli. Lahkumiseks nooled või tab."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
+#: LYMessages.c:95
+msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
+msgstr "(mailto vorm) Sisestage tekst. Postitamiseks <return>, lahkumiseks nooled."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:97
+msgid "(mailto form field) Mail is disallowed so you cannot submit."
+msgstr "(mailto vorm) E-post on blokeeritud, seega postitada ei saa."
+
+#. #define FORM_LINK_PASSWORD_MESSAGE
+#: LYMessages.c:99
+msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Parooliväli) Sisestage tekst. Lahkumiseks nooled või tab."
+
+#. #define FORM_LINK_PASSWORD_UNM_MSG
+#: LYMessages.c:101
+msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
+msgstr "MITTEMUUDETAV vormi parool. Lahkumiseks nooled või tab."
+
+#. #define FORM_LINK_CHECKBOX_MESSAGE
+#: LYMessages.c:103
+msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
+msgstr "(Märkeruut) Valimiseks kasutage nool paremale või <return>."
+
+#. #define FORM_LINK_CHECKBOX_UNM_MSG
+#: LYMessages.c:105
+msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
+msgstr "MITTEMUUDETAV märkeruut. Lahkumiseks nooled või tab."
+
+#. #define FORM_LINK_RADIO_MESSAGE
+#: LYMessages.c:107
+msgid "(Radio Button)   Use right-arrow or <return> to toggle."
+msgstr "(Raadionupp) Valimiseks kasutage nool paremale või <return>."
+
+#. #define FORM_LINK_RADIO_UNM_MSG
+#: LYMessages.c:109
+msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
+msgstr "MITTEMUUDETAV raadionupp. Lahkumiseks nooled või tab."
+
+#. #define FORM_LINK_SUBMIT_PREFIX
+#: LYMessages.c:111
+msgid "Submit ('x' for no cache) to "
+msgstr "postita ('x' puhverdamata): "
+
+#. #define FORM_LINK_RESUBMIT_PREFIX
+#: LYMessages.c:113
+msgid "Submit to "
+msgstr "Postita: "
+
+#. #define FORM_LINK_SUBMIT_MESSAGE
+#: LYMessages.c:115
+msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
+msgstr "(Vormi postitamine) Täitmiseks nool paremale või <return> ('x' ei puhverda)."
+
+#. #define FORM_LINK_RESUBMIT_MESSAGE
+#: LYMessages.c:117
+msgid "(Form submit button) Use right-arrow or <return> to submit."
+msgstr "(Vormi postitamine) Täitmiseks nool paremale või <return>."
+
+#. #define FORM_LINK_SUBMIT_DIS_MSG
+#: LYMessages.c:119
+msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
+msgstr "BLOKEERITUD vormi postitamine. Kasutage tab või nool üles või alla."
+
+#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
+#: LYMessages.c:121
+msgid "Submit mailto form to "
+msgstr "Postita mailto vorm aadressil "
+
+#. #define FORM_LINK_SUBMIT_MAILTO_MSG
+#: LYMessages.c:123
+msgid "(mailto form submit button) Use right-arrow or <return> to submit."
+msgstr "(mailto vormi postitamine) Täitmiseks nool paremale või <return>."
+
+#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:125
+msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
+msgstr "(mailto vormi postitamine) E-post on keelatud, seda ei saa kasutada."
+
+#. #define FORM_LINK_RESET_MESSAGE
+#: LYMessages.c:127
+msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
+msgstr "(Vormi algväärtustamise nupp)  Nool paremale või <return> algväärtustab. "
+
+#. #define FORM_LINK_RESET_DIS_MSG
+#: LYMessages.c:129
+msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
+msgstr "BLOKEERITUD vormi algväärtustamine) Kasutage tab või nool üles või alla."
+
+#. #define FORM_LINK_OPTION_LIST_MESSAGE
+#: LYMessages.c:131
+msgid "(Option list) Hit return and use arrow keys and return to select option."
+msgstr "(Seadete loend) Vajutage return ja valige noolte ja return klahviga seade."
+
+#. #define CHOICE_LIST_MESSAGE
+#: LYMessages.c:133
+msgid "(Choice list) Hit return and use arrow keys and return to select option."
+msgstr "(Valiku loend) Vajutage return ja valige noolte ja return klahviga seade."
+
+#. #define FORM_LINK_OPTION_LIST_UNM_MSG
+#: LYMessages.c:135
+msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
+msgstr "MITTEMUUDETAVAD seaded. Vaatamiseks või liikumiseks nooled või <return>."
+
+#. #define CHOICE_LIST_UNM_MSG
+#: LYMessages.c:137
+msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
+msgstr "MITTEMUUDETAVAD valikud. Vaatamiseks või liikumiseks nooled või <return>."
+
+#: LYMessages.c:138
+msgid "Submitting form..."
+msgstr "Saadan vormi..."
+
+#: LYMessages.c:139
+msgid "Resetting form..."
+msgstr "Algväärtustan vormi..."
+
+#. #define RELOADING_FORM
+#: LYMessages.c:141
+msgid "Reloading document.  Any form entries will be lost!"
+msgstr "Laen dokumendi uuesti. Kõik vormi väljad lähevad kaotsi!"
+
+#: LYMessages.c:142
+#, c-format
+msgid "Warning: Cannot transcode form data to charset %s!"
+msgstr "Hoiatus: Vormi andmeid ei õnnestu teisendada kooditabelisse %s!"
+
+#. #define NORMAL_LINK_MESSAGE
+#: LYMessages.c:145
+msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
+msgstr "(TAVALINE VIIDE) Aktiveerimiseks kasutage nool paremale või <return>."
+
+#: LYMessages.c:146
+msgid "The resource requested is not available at this time."
+msgstr "Ressurss, mida soovisite, ei ole hetkel kättesaadav."
+
+#: LYMessages.c:147
+msgid "Enter Lynx keystroke command: "
+msgstr "Sisestage Lynxi klahvikäsklus: "
+
+#: LYMessages.c:148
+msgid "Looking up "
+msgstr "Otsin serverit "
+
+#: LYMessages.c:149
+#, c-format
+msgid "Getting %s"
+msgstr "Laen %s"
+
+#: LYMessages.c:150
+#, c-format
+msgid "Skipping %s"
+msgstr "Jätan %s vahele"
+
+#: LYMessages.c:151
+#, c-format
+msgid "Using %s"
+msgstr "Kasutan %s"
+
+#: LYMessages.c:152
+#, c-format
+msgid "Illegal URL: %s"
+msgstr "Vigane URL: %s"
+
+#: LYMessages.c:153
+#, c-format
+msgid "Badly formed address %s"
+msgstr "Vigaselt vormitud aadress %s"
+
+#: LYMessages.c:154
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: LYMessages.c:155
+msgid "Unable to access WWW file!!!"
+msgstr "WWW failile pole juurdepääsu!!!"
+
+#: LYMessages.c:156
+#, c-format
+msgid "This is a searchable index.  Use %s to search."
+msgstr "See on otsitav indeks. Otsimiseks kasutage %s."
+
+#. #define WWW_INDEX_MORE_MESSAGE
+#: LYMessages.c:158
+#, c-format
+msgid "--More--  This is a searchable index.  Use %s to search."
+msgstr "--Veel-- See on otsitav indeks. Otsimiseks kasutage %s."
+
+#: LYMessages.c:159
+msgid "You have entered an invalid link number."
+msgstr "Te sisestasite vigase viitenumbri."
+
+#. #define SOURCE_HELP
+#: LYMessages.c:161
+msgid "Currently viewing document source.  Press '\\' to return to rendered version."
+msgstr "Dokumendi algtekst. Renderdatud versiooni vaatamiseks vajutage '\\'."
+
+#. #define NOVICE_LINE_ONE
+#: LYMessages.c:163
+msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
+msgstr "  Nooleklahvid: liikumiseks üles ja alla. Parem järgib viidet, vasakuga tagasi.\n"
+
+#. #define NOVICE_LINE_TWO
+#: LYMessages.c:165
+msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
+msgstr " H=appi O=seaded P=trüki G=mine M=põhiaken Q=välju /=otsing [delete]=ajalugu\n"
+
+#. #define NOVICE_LINE_TWO_A
+#: LYMessages.c:167
+msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
+msgstr "O=muud  H=abiinfo  K)lahvid  G=mine  P)rindi  M=põhiekraan  o=seaded  Q=välju\n"
+
+#. #define NOVICE_LINE_TWO_B
+#: LYMessages.c:169
+msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
+msgstr "O=muud  B=tagasi  toim'E'ta  D=lae alla ^R=lae uuesti ^W=pühi ekraan /=otsing\n"
+
+#. #define NOVICE_LINE_TWO_C
+#: LYMessages.c:171
+msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
+msgstr "O=muud käsud C=kommentaar  Ajalugu: <bsp>  Järjed: V)aata, A=lisa, R=eemalda \n"
+
+#. #define FORM_NOVICELINE_ONE
+#: LYMessages.c:173
+msgid "            Enter text into the field by typing on the keyboard              "
+msgstr "            Sisestage väljale tekst                                          "
+
+#. #define FORM_NOVICELINE_TWO
+#: LYMessages.c:175
+msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
+msgstr "    Ctrl-U kustutab väljalt kogu teksti, [Backspace] kustutab sümboli        "
+
+#. #define FORM_NOVICELINE_TWO_DELBL
+#: LYMessages.c:177
+msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
+msgstr "      Ctrl-U kustutab väljalt teksti, [Backspace] kustutab sümboli         "
+
+#. #define FORM_NOVICELINE_TWO_VAR
+#: LYMessages.c:179
+#, c-format
+msgid "    %s to delete all text in field, [Backspace] to delete a character    "
+msgstr "    %s kustutab väljalt kogu teksti, [Backspace] kustutab sümboli        "
+
+#. #define FORM_NOVICELINE_TWO_DELBL_VAR
+#: LYMessages.c:181
+#, c-format
+msgid "      %s to delete text in field, [Backspace] to delete a character    "
+msgstr "      %s kustutab väljalt teksti, [Backspace] kustutab sümboli         "
+
+#. mailto
+#: LYMessages.c:184
+msgid "Malformed mailto form submission!  Cancelled!"
+msgstr "Vigane mailto vormi edastamine! Katkestasin!"
+
+#: LYMessages.c:185
+msgid "Warning!  Control codes in mail address replaced by ?"
+msgstr "Hoiatus! Asendasin kontrollkoodid kirja aadressis küsimärkidega"
+
+#: LYMessages.c:186
+msgid "Mail disallowed!  Cannot submit."
+msgstr "Kirjad ei ole lubatud! Ei saa postitada."
+
+#: LYMessages.c:187
+msgid "Mailto form submission failed!"
+msgstr "Mailto vormi andmete edastamine ebaõnnestus!"
+
+#: LYMessages.c:188
+msgid "Mailto form submission Cancelled!!!"
+msgstr "Mailto vormi andmete edastamine katkestati!!!"
+
+#: LYMessages.c:189
+msgid "Sending form content..."
+msgstr "Saadan vormi sisu..."
+
+#: LYMessages.c:190
+msgid "No email address is present in mailto URL!"
+msgstr "mailto URLis puudub e-posti aadress!"
+
+#. #define MAILTO_URL_TEMPOPEN_FAILED
+#: LYMessages.c:192
+msgid "Unable to open temporary file for mailto URL!"
+msgstr "mailto URLile ei õnnestu avada ajutist faili!"
+
+#. #define INC_ORIG_MSG_PROMPT
+#: LYMessages.c:194
+msgid "Do you wish to include the original message?"
+msgstr "Kas te soovite kaasata originaalteadet?"
+
+#. #define INC_PREPARSED_MSG_PROMPT
+#: LYMessages.c:196
+msgid "Do you wish to include the preparsed source?"
+msgstr "Kas soovite kaasata eelnevalt töödeldud teksti?"
+
+#. #define SPAWNING_EDITOR_FOR_MAIL
+#: LYMessages.c:198
+msgid "Spawning your selected editor to edit mail message"
+msgstr "Käivitan kirja toimetamiseks teie poolt valitud toimeti"
+
+#. #define ERROR_SPAWNING_EDITOR
+#: LYMessages.c:200
+msgid "Error spawning editor, check your editor definition in the options menu"
+msgstr "Viga toimeti käivitamisel, kontrollige toimeti definitsiooni seadete menüüs"
+
+#: LYMessages.c:201
+msgid "Send this comment?"
+msgstr "Saata teie kommentaar?"
+
+#: LYMessages.c:202
+msgid "Send this message?"
+msgstr "Saata teie teade?"
+
+#: LYMessages.c:203
+msgid "Sending your message..."
+msgstr "Saadan teie teadet..."
+
+#: LYMessages.c:204
+msgid "Sending your comment:"
+msgstr "Saadan teie kommentaari:"
+
+#. textarea
+#: LYMessages.c:207
+msgid "Not in a TEXTAREA; cannot use external editor."
+msgstr "Pole TEXTAREA, välist toimetit ei saa kasutada."
+
+#: LYMessages.c:208
+msgid "Not in a TEXTAREA; cannot use command."
+msgstr "Pole TEXTAREA, käsku ei saa kasutada."
+
+#: LYMessages.c:211
+msgid "file: ACTIONs are disallowed!"
+msgstr "file: TEGEVUSed ei ole lubatud!"
+
+#. #define FILE_SERVED_LINKS_DISALLOWED
+#: LYMessages.c:213
+msgid "file: URLs via served links are disallowed!"
+msgstr "file: URLid teeninduslikest viidetest ei ole lubatud! "
+
+#: LYMessages.c:214
+msgid "Access to local files denied."
+msgstr "Juurdepääs lokaalsetele failidele on keelatud."
+
+#: LYMessages.c:215
+msgid "file: URLs via bookmarks are disallowed!"
+msgstr "faile: URLE ei lubata järgedes kasutada!"
+
+#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
+#: LYMessages.c:217
+msgid "This special URL is not allowed in external documents!"
+msgstr "See spetsiaal URL ei ole välistes dokumentides lubatud!"
+
+#: LYMessages.c:218
+msgid "Press <return> to return to Lynx."
+msgstr "Lynxi tagasi pääsemiseks vajutage <return>."
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:221
+msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
+msgstr "Loon DCL alamprotsessi.  Tagasi Lynxi saamiseks kasutage 'logout'.\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:225
+msgid "Type EXIT to return to Lynx.\n"
+msgstr "Lynxi tagasi pääsemiseks sisestage exit.\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:228
+msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
+msgstr "Käivitan teie vaikimisi shelli.  Tagasi Lynxi saamiseks kasutage 'exit'.\n"
+
+#: LYMessages.c:231
+msgid "Spawning is currently disabled."
+msgstr "Alamprotsessi loomine on hetkel blokeeritud."
+
+#: LYMessages.c:232
+msgid "The 'd'ownload command is currently disabled."
+msgstr "Allalaa'd'imise käsklus on praegu blokeeritud."
+
+#: LYMessages.c:233
+msgid "You cannot download an input field."
+msgstr "Sisendvälja ei saa alla laadida."
+
+#: LYMessages.c:234
+msgid "Form has a mailto action!  Cannot download."
+msgstr "Vormil on mailto tegevus! Ei saa alla laadida."
+
+#: LYMessages.c:235
+msgid "You cannot download a mailto: link."
+msgstr "mailto: viidet ei saa alla laadida."
+
+#: LYMessages.c:236
+msgid "You cannot download cookies."
+msgstr "Präänikuid ei saa alla laadida."
+
+#: LYMessages.c:237
+msgid "You cannot download a printing option."
+msgstr "Trükkimise seadeid ei saa alla laadida."
+
+#: LYMessages.c:238
+msgid "You cannot download an upload option."
+msgstr "Üleslaadimise seadeid ei saa alla laadida."
+
+#: LYMessages.c:239
+msgid "You cannot download an permit option."
+msgstr "lubamise seadeid ei saa alla laadida."
+
+#: LYMessages.c:240
+msgid "This special URL cannot be downloaded!"
+msgstr "Seda spetsiaal URLi ei saa alla laadida!"
+
+#: LYMessages.c:241
+msgid "Nothing to download."
+msgstr "Pole midagi alla laadida."
+
+#: LYMessages.c:242
+msgid "Trace ON!"
+msgstr "Trasseerimine sees!"
+
+#: LYMessages.c:243
+msgid "Trace OFF!"
+msgstr "Trasseerimine väljas!"
+
+#. #define CLICKABLE_IMAGES_ON
+#: LYMessages.c:245
+msgid "Links will be included for all images!  Reloading..."
+msgstr "Viiteid kasutatakse kõikide piltidega! Laen uuesti..."
+
+#. #define CLICKABLE_IMAGES_OFF
+#: LYMessages.c:247
+msgid "Standard image handling restored!  Reloading..."
+msgstr "Standartne piltide käsitlemine taastatud! Laen uuesti..."
+
+#. #define PSEUDO_INLINE_ALTS_ON
+#: LYMessages.c:249
+msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
+msgstr "Lisan ALT sõnedeta piltidele pseudo_ALTid! Laen uuesti..."
+
+#. #define PSEUDO_INLINE_ALTS_OFF
+#: LYMessages.c:251
+msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
+msgstr "Ignoreerin ALT sõnedeta pilte! Laen uuesti..."
+
+#: LYMessages.c:252
+msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
+msgstr "Puhas 8-bit või CJK mood on välja lülitatud! Laen uuesti..."
+
+#: LYMessages.c:253
+msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
+msgstr "Puhas 8-bit või CJK mood on sisse lülitatud! Laen uuesti..."
+
+#. #define HEAD_D_L_OR_CANCEL
+#: LYMessages.c:255
+msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
+msgstr "Saada HEAD päring D)okumendile või L=viitele või C=katkesta? (d,l,c): "
+
+#. #define HEAD_D_OR_CANCEL
+#: LYMessages.c:257
+msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
+msgstr "Saada HEAD päring D)okumendile või C=katkesta? (d,c): "
+
+#: LYMessages.c:258
+msgid "Sorry, the document is not an http URL."
+msgstr "Vabandust, dokument ei ole http URL."
+
+#: LYMessages.c:259
+msgid "Sorry, the link is not an http URL."
+msgstr "Vabandust, viide ei ole http URL."
+
+#: LYMessages.c:260
+msgid "Sorry, the ACTION for this form is disabled."
+msgstr "Vabandust, sellel vormil on tegevus keelatud."
+
+#. #define FORM_ACTION_NOT_HTTP_URL
+#: LYMessages.c:262
+msgid "Sorry, the ACTION for this form is not an http URL."
+msgstr "Vabandust, selle vormi tegevus ei ole http URL."
+
+#: LYMessages.c:263
+msgid "Not an http URL or form ACTION!"
+msgstr "Ei ole http URL ega vormi tegevus!"
+
+#: LYMessages.c:264
+msgid "This special URL cannot be a form ACTION!"
+msgstr "Vormi tegevus ei saa olla see spetsiaal URL!"
+
+#: LYMessages.c:265
+msgid "URL is not in starting realm!"
+msgstr "URL ei ole startfailis!"
+
+#: LYMessages.c:266
+msgid "News posting is disabled!"
+msgstr "Artiklite postitamine on blokeeritud!"
+
+#: LYMessages.c:267
+msgid "File management support is disabled!"
+msgstr "Failide haldamine on blokeeritud!"
+
+#: LYMessages.c:268
+msgid "No jump file is currently available."
+msgstr "Hüpete fail ei ole praegu kasutatav."
+
+#: LYMessages.c:269
+msgid "Jump to (use '?' for list): "
+msgstr "Hüppa aadressil (nimekirjaks '?'): "
+
+#: LYMessages.c:270
+msgid "Jumping to a shortcut URL is disallowed!"
+msgstr "Lühiurlile hüppamine ei ole lubatud!"
+
+#: LYMessages.c:271
+msgid "Random URL is disallowed!  Use a shortcut."
+msgstr "Juhuslik URL ei ole lubatud! Kasutage lühiurli."
+
+#: LYMessages.c:272
+msgid "No random URLs have been used thus far."
+msgstr "Seni ei ole juhuslikke urle kasutatud."
+
+#: LYMessages.c:273
+msgid "Bookmark features are currently disabled."
+msgstr "Järgede kasutamine on praegu blokeeritud."
+
+#: LYMessages.c:274
+msgid "Execution via bookmarks is disabled."
+msgstr "Järgede kaudu täitmine on blokeeritud."
+
+#. #define BOOKMARK_FILE_NOT_DEFINED
+#: LYMessages.c:276
+#, c-format
+msgid "Bookmark file is not defined. Use %s to see options."
+msgstr "Järgede faili ei ole defineeritud. Seadete vaatamiseks kasutage %s."
+
+#. #define NO_TEMP_FOR_HOTLIST
+#: LYMessages.c:278
+msgid "Unable to open tempfile for X Mosaic hotlist conversion."
+msgstr "X Mosaic hotlist teisendamiseks ei õnnestu avada ajutist faili."
+
+#: LYMessages.c:279
+msgid "ERROR - unable to open bookmark file."
+msgstr "VIGA - järgede faili ei saa avada."
+
+#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:281
+msgid "Unable to open bookmark file for deletion of link."
+msgstr "Järgede faili ei õnnestu viite kustutamiseks avada."
+
+#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:283
+msgid "Unable to open scratch file for deletion of link."
+msgstr "Viite kustutamiseks ei õnnestu avada ajutist faili."
+
+#: LYMessages.c:285
+msgid "Error renaming scratch file."
+msgstr "Viga ajutise faili ümber nimetamisel."
+
+#: LYMessages.c:287
+msgid "Error renaming temporary file."
+msgstr "Viga ajutise faili ümbernimetamisel."
+
+#. #define BOOKTEMP_COPY_FAIL
+#: LYMessages.c:289
+msgid "Unable to copy temporary file for deletion of link."
+msgstr "Viite kustutamiseks ei õnnestu ajutist faili kopeerida."
+
+#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
+#: LYMessages.c:291
+msgid "Unable to reopen temporary file for deletion of link."
+msgstr "Viite kustutamiseks ei õnnestu ajutist faili uuesti avada."
+
+#. #define BOOKMARK_LINK_NOT_ONE_LINE
+#: LYMessages.c:294
+msgid "Link is not by itself all on one line in bookmark file."
+msgstr "Viide järgede failis ei ole ühel real."
+
+#: LYMessages.c:295
+msgid "Bookmark deletion failed."
+msgstr "Järje kustutamine ebaõnnestus."
+
+#. #define BOOKMARKS_NOT_TRAVERSED
+#: LYMessages.c:297
+msgid "Bookmark files cannot be traversed (only http URLs)."
+msgstr "Järgede faile ei saa läbida (ainult http URLe)."
+
+#. #define BOOKMARKS_NOT_OPEN
+#: LYMessages.c:299
+msgid "Unable to open bookmark file, use 'a' to save a link first"
+msgstr "Järgede faili ei saa avada, salvestage viide kõigepealt käsuga 'a'"
+
+#: LYMessages.c:300
+msgid "There are no links in this bookmark file!"
+msgstr "Selles järgede failis pole viiteid!"
+
+#. #define BOOK_D_L_OR_CANCEL
+#: LYMessages.c:302
+msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
+msgstr "Salvesta D)okument, L=viide järgede faili või C=katkesta? (d,l,c): "
+
+#: LYMessages.c:303
+msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
+msgstr "Salvesta D)okument järgede faili või C=katkesta? (d,c): "
+
+#: LYMessages.c:304
+msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
+msgstr "Salvesta L=viide järgede faili või C=katkesta? (l,c): "
+
+#. #define NOBOOK_POST_FORM
+#: LYMessages.c:306
+msgid "Documents from forms with POST content cannot be saved as bookmarks."
+msgstr "Dokumente vormidelt POST sisuga ei saa järgedena salvestada."
+
+#: LYMessages.c:307
+msgid "Cannot save form fields/links"
+msgstr "Vormide välju/viiteid ei saa salvestada"
+
+#. #define NOBOOK_HSML
+#: LYMessages.c:309
+msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
+msgstr "Ajaloo, info, menüü ja loendi faile ei saa järgedena salvestada."
+
+#. #define CONFIRM_BOOKMARK_DELETE
+#: LYMessages.c:311
+msgid "Do you really want to delete this link from your bookmark file?"
+msgstr "Kas te tõesti soovite kustutada seda viidet oma järgede failist?"
+
+#: LYMessages.c:312
+msgid "Malformed address."
+msgstr "Vigane aadress."
+
+#. #define HISTORICAL_ON_MINIMAL_OFF
+#: LYMessages.c:314
+msgid "Historical comment parsing ON (Minimal is overridden)!"
+msgstr "Ajalooline kommentaaride parsimine sees (minimaalne on kõrvale lükatud)!"
+
+#. #define HISTORICAL_OFF_MINIMAL_ON
+#: LYMessages.c:316
+msgid "Historical comment parsing OFF (Minimal is in effect)!"
+msgstr "Ajalooline kommentaaride parsimine väljas (kasutatakse minimaalset)!"
+
+#. #define HISTORICAL_ON_VALID_OFF
+#: LYMessages.c:318
+msgid "Historical comment parsing ON (Valid is overridden)!"
+msgstr "Ajalooline kommentaaride parsimine sees (kehtiv on kõrvale lükatud)!"
+
+#. #define HISTORICAL_OFF_VALID_ON
+#: LYMessages.c:320
+msgid "Historical comment parsing OFF (Valid is in effect)!"
+msgstr "Ajalooline kommentaaride parsimine väljas (kasutatakse kehtivat)!"
+
+#. #define MINIMAL_ON_IN_EFFECT
+#: LYMessages.c:322
+msgid "Minimal comment parsing ON (and in effect)!"
+msgstr "Minimaalne kommentaaride parsimine sees (kasutatakse kehtivat)!"
+
+#. #define MINIMAL_OFF_VALID_ON
+#: LYMessages.c:324
+msgid "Minimal comment parsing OFF (Valid is in effect)!"
+msgstr "Minimaalne kommentaaride parsimine väljas (kasutatakse kehtivat)!"
+
+#. #define MINIMAL_ON_BUT_HISTORICAL
+#: LYMessages.c:326
+msgid "Minimal comment parsing ON (but Historical is in effect)!"
+msgstr "Minimaalne kommentaaride parsimine sees (kasutatakse ajaloolist)!"
+
+#. #define MINIMAL_OFF_HISTORICAL_ON
+#: LYMessages.c:328
+msgid "Minimal comment parsing OFF (Historical is in effect)!"
+msgstr "Minimaalne kommentaaride parsimine väljas (kasutatakse ajaloolist)!"
+
+#: LYMessages.c:329
+msgid "Soft double-quote parsing ON!"
+msgstr "Pehme jutumärkide parsmine sees (ON)!"
+
+#: LYMessages.c:330
+msgid "Soft double-quote parsing OFF!"
+msgstr "Pehme jutumärkide parsmine väljas (OFF)!"
+
+#: LYMessages.c:331
+msgid "Now using TagSoup parsing of HTML."
+msgstr "Kasutan nüüd HTML TagSoup parsimist."
+
+#: LYMessages.c:332
+msgid "Now using SortaSGML parsing of HTML!"
+msgstr "Kasutan nüüd HTML SortaSGML parsimist!"
+
+#: LYMessages.c:333
+msgid "You are already at the end of this document."
+msgstr "Te olete juba selle dokumendi lõpus."
+
+#: LYMessages.c:334
+msgid "You are already at the beginning of this document."
+msgstr "Te olete juba selle dokumendi alguses."
+
+#: LYMessages.c:335
+#, c-format
+msgid "You are already at page %d of this document."
+msgstr "Te olete juba selle dokumendi leheküljel %d."
+
+#: LYMessages.c:336
+#, c-format
+msgid "Link number %d already is current."
+msgstr "Viide number %d on juba jooksev viide."
+
+#: LYMessages.c:337
+msgid "You are already at the first document"
+msgstr "Te vaatate juba esimest dokumenti"
+
+#: LYMessages.c:338
+msgid "There are no links above this line of the document."
+msgstr "Ülalpool seda rida ei ole dokumendis enam viiteid."
+
+#: LYMessages.c:339
+msgid "There are no links below this line of the document."
+msgstr "Allpool seda rida ei ole dokumendis enam viiteid."
+
+#. #define MAXLEN_REACHED_DEL_OR_MOV
+#: LYMessages.c:341
+msgid "Maximum length reached!  Delete text or move off field."
+msgstr "Maksimaalne pikkus on saavutatud! Kustutage teksti või lahkuge väljalt."
+
+#. #define NOT_ON_SUBMIT_OR_LINK
+#: LYMessages.c:343
+msgid "You are not on a form submission button or normal link."
+msgstr "Te pole vormi postitamise nupul ega viitel."
+
+#. #define NEED_CHECKED_RADIO_BUTTON
+#: LYMessages.c:345
+msgid "One radio button must be checked at all times!"
+msgstr "Üks raadionupp peab olema valitud!"
+
+#: LYMessages.c:346
+msgid "No submit button for this form, submit single text field?"
+msgstr "Sellel vormil puudub postitamise nupp, postitan ühe tekstivälja?"
+
+#: LYMessages.c:347
+msgid "Do you want to go back to the previous document?"
+msgstr "Kas te soovite minna tagasi eelmisele dokumendile?"
+
+#: LYMessages.c:348
+msgid "Use arrows or tab to move off of field."
+msgstr "Väljalt lahkumiseks kasutage nooli või tabulaatorit."
+
+#. #define ENTER_TEXT_ARROWS_OR_TAB
+#: LYMessages.c:350
+msgid "Enter text.  Use arrows or tab to move off of field."
+msgstr "Sisestage tekst. Väljalt lahkumiseks kasutage nooli või tabulaatorit."
+
+#: LYMessages.c:351
+msgid "** Bad HTML!!  No form action defined. **"
+msgstr "** Vigane HTML!! Vormil pole tegevust defineeritud. **"
+
+#: LYMessages.c:352
+msgid "Bad HTML!!  Unable to create popup window!"
+msgstr "Vigane HTML!! Ei saa luua hüpikakent!"
+
+#: LYMessages.c:353
+msgid "Unable to create popup window!"
+msgstr "Ei saa luua hüpikakent!"
+
+#: LYMessages.c:354
+msgid "Goto a random URL is disallowed!"
+msgstr "Juhuslikule URLile minek on blokeeritud!"
+
+#: LYMessages.c:355
+msgid "Goto a non-http URL is disallowed!"
+msgstr "Mitte-http URLile minek on blokeeritud!"
+
+#: LYMessages.c:356
+#, c-format
+msgid "You are not allowed to goto \"%s\" URLs"
+msgstr "Teil ei ole lubatud minna \"%s\" URLile"
+
+#: LYMessages.c:357
+msgid "URL to open: "
+msgstr "URL, mida avada: "
+
+#: LYMessages.c:358
+msgid "Edit the current Goto URL: "
+msgstr "Toimeta jooksvat Goto URLi: "
+
+#: LYMessages.c:359
+msgid "Edit the previous Goto URL: "
+msgstr "Toimeta eelmist Goto URLi: "
+
+#: LYMessages.c:360
+msgid "Edit a previous Goto URL: "
+msgstr "Toimeta eelmist Goto URLi: "
+
+#: LYMessages.c:361
+msgid "Current document has POST data."
+msgstr "Jooksev dokument sisaldab POST andmeid."
+
+#: LYMessages.c:362
+msgid "Edit this document's URL: "
+msgstr "Toimeta selle dokumendi URLi: "
+
+#: LYMessages.c:363
+msgid "Edit the current link's URL: "
+msgstr "Toimeta selle viite URLi: "
+
+#: LYMessages.c:364
+msgid "You cannot edit File Management URLs"
+msgstr "Failide haldamise URLe ei saa toimetada"
+
+#: LYMessages.c:365
+msgid "Enter a database query: "
+msgstr "Sisestage andmebaasi päring: "
+
+#: LYMessages.c:366
+msgid "Enter a whereis query: "
+msgstr "Sisestage kus-on päring: "
+
+#: LYMessages.c:367
+msgid "Edit the current query: "
+msgstr "Toimetage jooksvat päringut: "
+
+#: LYMessages.c:368
+msgid "Edit the previous query: "
+msgstr "Toimetage eelmist päringut: "
+
+#: LYMessages.c:369
+msgid "Edit a previous query: "
+msgstr "Toimetage eelmist päringut: "
+
+#. #define USE_C_R_TO_RESUB_CUR_QUERY
+#: LYMessages.c:371
+msgid "Use Control-R to resubmit the current query."
+msgstr "Päringu uuesti postitamiseks kasutage Control-R."
+
+#: LYMessages.c:372
+msgid "Edit the current shortcut: "
+msgstr "Toimeta jooksvat lühiurli: "
+
+#: LYMessages.c:373
+msgid "Edit the previous shortcut: "
+msgstr "Toimeta eelmist lühiurli: "
+
+#: LYMessages.c:374
+msgid "Edit a previous shortcut: "
+msgstr "Toimeta eelmist lühiurli: "
+
+#: LYMessages.c:375
+#, c-format
+msgid "Key '%c' is not mapped to a jump file!"
+msgstr "Klahv '%c' ei ole seotud hüpete failiga!"
+
+#: LYMessages.c:376
+msgid "Cannot locate jump file!"
+msgstr "Ei leia hüpete faili!"
+
+#: LYMessages.c:377
+msgid "Cannot open jump file!"
+msgstr "Hüpete faili ei saa avada!"
+
+#: LYMessages.c:378
+msgid "Error reading jump file!"
+msgstr "Viga hüpete failist lugemisel!"
+
+#: LYMessages.c:379
+msgid "Out of memory reading jump file!"
+msgstr "Hüpete failist lugemisel sai mälu otsa!"
+
+#: LYMessages.c:380
+msgid "Out of memory reading jump table!"
+msgstr "Hüpete tabeli lugemisel sai mälu otsa!"
+
+#: LYMessages.c:381
+msgid "No index is currently available."
+msgstr "Indeksid ei ole praegu kasutatavad."
+
+#. #define CONFIRM_MAIN_SCREEN
+#: LYMessages.c:383
+msgid "Do you really want to go to the Main screen?"
+msgstr "Kas te soovite tõesti minne põhiekraanile?"
+
+#: LYMessages.c:384
+msgid "You are already at main screen!"
+msgstr "Te olete juba põhiekraanil!"
+
+#. #define NOT_ISINDEX
+#: LYMessages.c:386
+msgid "Not a searchable indexed document -- press '/' to search for a text string"
+msgstr "Pole otsimiseks indekseeritud dokument -- teksti otsimiseks vajutage '/'"
+
+#. #define NO_OWNER
+#: LYMessages.c:388
+msgid "No owner is defined for this file so you cannot send a comment"
+msgstr "Sellel failil ei ole omanikku defineeritud, seega ei saa kommentaari saata"
+
+#: LYMessages.c:389
+#, c-format
+msgid "No owner is defined. Use %s?"
+msgstr "Omanikku ei ole defineeritud. Kasutan %s?"
+
+#: LYMessages.c:390
+msgid "Do you wish to send a comment?"
+msgstr "Kas te soovite saata kommentaari?"
+
+#: LYMessages.c:391
+msgid "Mail is disallowed so you cannot send a comment"
+msgstr "E-post pole lubatud, seega ei saa kommentaare saata"
+
+#: LYMessages.c:392
+msgid "The 'e'dit command is currently disabled."
+msgstr "Toim'e'ta käsklus on praegu blokeeritud."
+
+#: LYMessages.c:393
+msgid "External editing is currently disabled."
+msgstr "Väline toimeti on praegu blokeeritud."
+
+#: LYMessages.c:394
+msgid "System error - failure to get status."
+msgstr "Süsteemi viga - olekut ei õnnestu lugeda."
+
+#: LYMessages.c:395
+msgid "No editor is defined!"
+msgstr "Tekstitoimetit ei ole määratud!"
+
+#: LYMessages.c:396
+msgid "The 'p'rint command is currently disabled."
+msgstr "Trükkimise käsklus 'p' on praegu blokeeritud."
+
+#: LYMessages.c:397
+msgid "Document has no Toolbar links or Banner."
+msgstr "Dokumendis puuduvad Toolbar viited või Banner."
+
+#: LYMessages.c:398
+msgid "Unable to open traversal file."
+msgstr "Ei saa avada läbimise faili."
+
+#: LYMessages.c:399
+msgid "Unable to open traversal found file."
+msgstr "Ei saa avada läbimise leidude faili."
+
+#: LYMessages.c:400
+msgid "Unable to open reject file."
+msgstr "Ei saa avada keeldumiste faili."
+
+#: LYMessages.c:401
+msgid "Unable to open traversal errors output file"
+msgstr "Ei õnnestu avada läbimise vigade väljundfaili"
+
+#: LYMessages.c:402
+msgid "TRAVERSAL WAS INTERRUPTED"
+msgstr "LÄBIMINE KATKESTATI"
+
+#: LYMessages.c:403
+msgid "Follow link (or goto link or page) number: "
+msgstr "Järgne viitele (või mine viitele või lehele) number: "
+
+#: LYMessages.c:404
+msgid "Select option (or page) number: "
+msgstr "Valige seade (või lehe) number: "
+
+#: LYMessages.c:405
+#, c-format
+msgid "Option number %d already is current."
+msgstr "Seade numbriga %d on juba jooksev."
+
+#. #define ALREADY_AT_OPTION_END
+#: LYMessages.c:407
+msgid "You are already at the end of this option list."
+msgstr "Te olete juba nende seadete loendi lõpus."
+
+#. #define ALREADY_AT_OPTION_BEGIN
+#: LYMessages.c:409
+msgid "You are already at the beginning of this option list."
+msgstr "Te olete juba nende seadete loendi alguses."
+
+#. #define ALREADY_AT_OPTION_PAGE
+#: LYMessages.c:411
+#, c-format
+msgid "You are already at page %d of this option list."
+msgstr "Te olete juba nende seadete loendi lehel %d."
+
+#: LYMessages.c:412
+msgid "You have entered an invalid option number."
+msgstr "Te sisestasite vigase seade numbri."
+
+#: LYMessages.c:413
+msgid "** Bad HTML!!  Use -trace to diagnose. **"
+msgstr "** Vigane HTML!! Diagnoosimiseks kasutage võtit -trace. **"
+
+#: LYMessages.c:414
+msgid "Give name of file to save in"
+msgstr "Andke faili nimi, kuhu salvestada"
+
+#: LYMessages.c:415
+msgid "Can't save data to file -- please run WWW locally"
+msgstr "Andmete salvestamine faili ebaõnnestus -- palun käivitage WWW lokaalselt"
+
+#: LYMessages.c:416
+msgid "Can't open temporary file!"
+msgstr "Ajutist faili ei saa avada!"
+
+#: LYMessages.c:417
+msgid "Can't open output file!  Cancelling!"
+msgstr "Väljundfaili ei saa avada! katkestan!"
+
+#: LYMessages.c:418
+msgid "Execution is disabled."
+msgstr "Käivitamine ei ole lubatud."
+
+#. #define EXECUTION_DISABLED_FOR_FILE
+#: LYMessages.c:420
+#, c-format
+msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
+msgstr "Selle faili täitmine ei ole lubatud. Vaadake omaduste menüüd (kasutage %s)."
+
+#. #define EXECUTION_NOT_COMPILED
+#: LYMessages.c:422
+msgid "Execution capabilities are not compiled into this version."
+msgstr "Täitmise omadus ei ole selle sellesse versiooni kompileeritud."
+
+#: LYMessages.c:423
+msgid "This file cannot be displayed on this terminal."
+msgstr "Seda faili ei saa sellel terminalil näidata."
+
+#. #define CANNOT_DISPLAY_FILE_D_OR_C
+#: LYMessages.c:425
+msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
+msgstr "Seda faili ei saa sellel terminalil näidata: D=allalaadimine, C=katkesta"
+
+#: LYMessages.c:426
+#, c-format
+msgid "%s  D)ownload, or C)ancel"
+msgstr "%s D=allalaadimine, C=katkesta"
+
+#: LYMessages.c:427
+msgid "Cancelling file."
+msgstr "Katkestan faili."
+
+#: LYMessages.c:428
+msgid "Retrieving file.  - PLEASE WAIT -"
+msgstr "Laen faili. - PALUN OODAKE -"
+
+#: LYMessages.c:429
+msgid "Enter a filename: "
+msgstr "Sisestage failinimi: "
+
+#: LYMessages.c:430
+msgid "Edit the previous filename: "
+msgstr "Toimetage eelmist failinime: "
+
+#: LYMessages.c:431
+msgid "Edit a previous filename: "
+msgstr "Toimetage eelmist failinime: "
+
+#: LYMessages.c:432
+msgid "Enter a new filename: "
+msgstr "Sisestage uus failinimi: "
+
+#: LYMessages.c:433
+msgid "File name may not begin with a dot."
+msgstr "Faili nimi ei või alata punktiga."
+
+#: LYMessages.c:435
+msgid "File exists.  Create higher version?"
+msgstr "Fail on olemas. Loon uuema versioni?"
+
+#: LYMessages.c:437
+msgid "File exists.  Overwrite?"
+msgstr "Fail on olemas. Kirjutan üle?"
+
+#: LYMessages.c:439
+msgid "Cannot write to file."
+msgstr "Faili ei õnnestu kirjutada."
+
+#: LYMessages.c:440
+msgid "ERROR! - download command is misconfigured."
+msgstr "VIGA! - allalaadimise käsk on vigaste seadetega."
+
+#: LYMessages.c:441
+msgid "Unable to download file."
+msgstr "Faili ei saa alla laadida."
+
+#: LYMessages.c:442
+msgid "Reading directory..."
+msgstr "Loen kataloogi..."
+
+#: LYMessages.c:443
+msgid "Building directory listing..."
+msgstr "Ehitan kataloogi nimiekirja..."
+
+#: LYMessages.c:444
+msgid "Saving..."
+msgstr "Salvestan..."
+
+#: LYMessages.c:445
+#, c-format
+msgid "Could not edit file '%s'."
+msgstr "Faili '%s' ei saa toimetada."
+
+#: LYMessages.c:446
+msgid "Unable to access document!"
+msgstr "Dokumendi ei saa kasutada!"
+
+#: LYMessages.c:447
+msgid "Could not access file."
+msgstr "Faili kasutamiseks pole õiguseid."
+
+#: LYMessages.c:448
+msgid "Could not access directory."
+msgstr "Kataloogi kasutamiseks pole õiguseid."
+
+#: LYMessages.c:449
+msgid "Could not load data."
+msgstr "Andmeid ei õnnestu laadida."
+
+#. #define CANNOT_EDIT_REMOTE_FILES
+#: LYMessages.c:451
+msgid "Lynx cannot currently (e)dit remote WWW files."
+msgstr "Lynx ei saa praegu toim'e'tada faile WWW serveritel."
+
+#. #define CANNOT_EDIT_FIELD
+#: LYMessages.c:453
+msgid "This field cannot be (e)dited with an external editor."
+msgstr "Seda välja ei saa välise toimetiga toim'e'tada."
+
+#: LYMessages.c:454
+msgid "Bad rule"
+msgstr "Vigane reegel"
+
+#: LYMessages.c:455
+msgid "Insufficient operands:"
+msgstr "Puuduvad operandid: "
+
+#: LYMessages.c:456
+msgid "You are not authorized to edit this file."
+msgstr "Teil ei ole lubatud seda faili muuta."
+
+#: LYMessages.c:457
+msgid "Title: "
+msgstr "Tiitel: "
+
+#: LYMessages.c:458
+msgid "Subject: "
+msgstr "Teema: "
+
+#: LYMessages.c:459
+msgid "Username: "
+msgstr "Kasutaja: "
+
+#: LYMessages.c:460
+msgid "Password: "
+msgstr "Parool: "
+
+#: LYMessages.c:461
+msgid "lynx: Username and Password required!!!"
+msgstr "lynx: Nõutakse kasutajanime ja parooli!!!"
+
+#: LYMessages.c:462
+msgid "lynx: Password required!!!"
+msgstr "lynx: nõutakse parooli!!!"
+
+#: LYMessages.c:463
+msgid "Clear all authorization info for this session?"
+msgstr "Tühjendan selle sessiooni kogu autoriseerimise info?"
+
+#: LYMessages.c:464
+msgid "Authorization info cleared."
+msgstr "Autoriseerimisinfo eemaldatud."
+
+#: LYMessages.c:465
+msgid "Authorization failed.  Retry?"
+msgstr "Autoriseerimine ebaõnnestus. Kordan?"
+
+#: LYMessages.c:466
+msgid "cgi support has been disabled."
+msgstr "cgi tugi on blokeeritud."
+
+#. #define CGI_NOT_COMPILED
+#: LYMessages.c:468
+msgid "Lynxcgi capabilities are not compiled into this version."
+msgstr "Lynxcgi võimalused ei ole sellesse versiooni kompileeritud."
+
+#: LYMessages.c:469
+#, c-format
+msgid "Sorry, no known way of converting %s to %s."
+msgstr "Kahjuks ei tunne ühtegi meetodit teisendamaks %s -> %s."
+
+#: LYMessages.c:470
+msgid "Unable to set up connection."
+msgstr "Ühendust ei õnnestu luua."
+
+#: LYMessages.c:471
+msgid "Unable to make connection"
+msgstr "Ühendust ei õnnestu tekitada"
+
+#. #define MALFORMED_EXEC_REQUEST
+#: LYMessages.c:473
+msgid "Executable link rejected due to malformed request."
+msgstr "Vigase päringu tõttu keeldutakse viidet täitmast."
+
+#. #define BADCHAR_IN_EXEC_LINK
+#: LYMessages.c:475
+#, c-format
+msgid "Executable link rejected due to `%c' character."
+msgstr "Sümboli `%c' tõttu keeldutakse viidet täitmast."
+
+#. #define RELPATH_IN_EXEC_LINK
+#: LYMessages.c:477
+msgid "Executable link rejected due to relative path string ('../')."
+msgstr "Suhtelise tee ('../') tõttu keeldutakse viidet täitmast."
+
+#. #define BADLOCPATH_IN_EXEC_LINK
+#: LYMessages.c:479
+msgid "Executable link rejected due to location or path."
+msgstr "Asukoha või tee tõttu keeldutakse viidet täitmast."
+
+#: LYMessages.c:480
+msgid "Mail access is disabled!"
+msgstr "E-posti kasutamine on blokeeritud!"
+
+#. #define ACCESS_ONLY_LOCALHOST
+#: LYMessages.c:482
+msgid "Only files and servers on the local host can be accessed."
+msgstr "Kasutada saab ainult lokaalse serveri faile või teenuseid."
+
+#: LYMessages.c:483
+msgid "Telnet access is disabled!"
+msgstr "Telneti kasutamine on blokeeritud!"
+
+#. #define TELNET_PORT_SPECS_DISABLED
+#: LYMessages.c:485
+msgid "Telnet port specifications are disabled."
+msgstr "Telneti pordi määramine on blokeeritud."
+
+#: LYMessages.c:486
+msgid "USENET news access is disabled!"
+msgstr "USENET uudisegruppide kasutamine on blokeeritud!"
+
+#: LYMessages.c:487
+msgid "Rlogin access is disabled!"
+msgstr "Rlogin kasutamine on blokeeritud!"
+
+#: LYMessages.c:488
+msgid "Ftp access is disabled!"
+msgstr "Ftp kasutamine on blokeeritud!"
+
+#: LYMessages.c:489
+msgid "There are no references from this document."
+msgstr "Sellest dokumendist ei ole viiteid."
+
+#: LYMessages.c:490
+msgid "There are only hidden links from this document."
+msgstr "Selles dokumendis on ainult peidetud viited."
+
+#: LYMessages.c:492
+msgid "Unable to open command file."
+msgstr "Käskude faili ei saa avada."
+
+#: LYMessages.c:494
+msgid "News Post Cancelled!!!"
+msgstr "Artikli postitamine katkestatud!!!"
+
+#. #define SPAWNING_EDITOR_FOR_NEWS
+#: LYMessages.c:496
+msgid "Spawning your selected editor to edit news message"
+msgstr "Käivitan uudise artikli toimetamiseks teie poolt valitud toimeti"
+
+#: LYMessages.c:497
+msgid "Post this message?"
+msgstr "Postitan selle teate?"
+
+#: LYMessages.c:498
+#, c-format
+msgid "Append '%s'?"
+msgstr "Lisan '%s'?"
+
+#: LYMessages.c:499
+msgid "Posting to newsgroup(s)..."
+msgstr "Postitan gruppi(desse)..."
+
+#: LYMessages.c:501
+msgid "*** You have unread mail. ***"
+msgstr "*** Teil on lugemata teateid. ***"
+
+#: LYMessages.c:503
+msgid "*** You have mail. ***"
+msgstr "*** Teil on kiri. ***"
+
+#: LYMessages.c:505
+msgid "*** You have new mail. ***"
+msgstr "*** Teil on uus kiri. ***"
+
+#: LYMessages.c:506
+msgid "File insert cancelled!!!"
+msgstr "Faili lisamine katkestati!!!"
+
+#: LYMessages.c:507
+msgid "Not enough memory for file!"
+msgstr "Faili jaoks napib mälu!"
+
+#: LYMessages.c:508
+msgid "Can't open file for reading."
+msgstr "Faili ei õnnestu lugemiseks avada."
+
+#: LYMessages.c:509
+msgid "File does not exist."
+msgstr "Faili ei ole."
+
+#: LYMessages.c:510
+msgid "File does not exist - reenter or cancel:"
+msgstr "Faili pole - sisestage uuesti või katkestage:"
+
+#: LYMessages.c:511
+msgid "File is not readable."
+msgstr "Fail ei ole loetav."
+
+#: LYMessages.c:512
+msgid "File is not readable - reenter or cancel:"
+msgstr "Fail pole loetav - sisestage uuesti või katkestage:"
+
+#: LYMessages.c:513
+msgid "Nothing to insert - file is 0-length."
+msgstr "Midagi pole lisada - fail on pikkusega null."
+
+#: LYMessages.c:514
+msgid "Save request cancelled!!!"
+msgstr "Salvestamine katkestati!!!"
+
+#: LYMessages.c:515
+msgid "Mail request cancelled!!!"
+msgstr "Postitamine katkestati!!!"
+
+#. #define CONFIRM_MAIL_SOURCE_PREPARSED
+#: LYMessages.c:517
+msgid "Viewing preparsed source.  Are you sure you want to mail it?"
+msgstr "Vaatan eeltöödeldud lähteteksti. Olete kindel, et soovite seda postitada?"
+
+#: LYMessages.c:518
+msgid "Please wait..."
+msgstr "Palun oodake..."
+
+#: LYMessages.c:519
+msgid "Mailing file.  Please wait..."
+msgstr "Saadan faili.  Palun oodake..."
+
+#: LYMessages.c:520
+msgid "ERROR - Unable to mail file"
+msgstr "VIGA - Faili saatmine ebaõnnestus"
+
+#. #define CONFIRM_LONG_SCREEN_PRINT
+#: LYMessages.c:522
+#, c-format
+msgid "File is %d screens long.  Are you sure you want to print?"
+msgstr "Faili pikkus on %d ekraanitäit. Olete kindel, et soovite seda trükkida?"
+
+#: LYMessages.c:523
+msgid "Print request cancelled!!!"
+msgstr "Trükkimise päring katkestati!!!"
+
+#: LYMessages.c:524
+msgid "Press <return> to begin: "
+msgstr "Vajutage alustamiseks <return>: "
+
+#: LYMessages.c:525
+msgid "Press <return> to finish: "
+msgstr "Vajutage lõpetamiseks <return>: "
+
+#. #define CONFIRM_LONG_PAGE_PRINT
+#: LYMessages.c:527
+#, c-format
+msgid "File is %d pages long.  Are you sure you want to print?"
+msgstr "Faili pikkus on %d lehekülge. Olete kinde, et soovite seda trükkida?"
+
+#. #define CHECK_PRINTER
+#: LYMessages.c:529
+msgid "Be sure your printer is on-line.  Press <return> to start printing:"
+msgstr "Kontrollige printerit. Trükkimise alustamiseks vajutage <return>:"
+
+#: LYMessages.c:530
+msgid "ERROR - Unable to allocate file space!!!"
+msgstr "VIGA - Ei õnnestu reserveerida faili ruumi!!!"
+
+#: LYMessages.c:531
+msgid "Unable to open tempfile"
+msgstr "Ajutist faili ei õnnestu avada"
+
+#: LYMessages.c:532
+msgid "Unable to open print options file"
+msgstr "Ei õnnestu avada trükiseadete faili"
+
+#: LYMessages.c:533
+msgid "Printing file.  Please wait..."
+msgstr "Trükin faili. Palun oodake..."
+
+#: LYMessages.c:534
+msgid "Please enter a valid internet mail address: "
+msgstr "palun sisestage kehtiv interneti postiaadress: "
+
+#: LYMessages.c:535
+msgid "ERROR! - printer is misconfigured!"
+msgstr "VIGA! - trükkal on vigaselt seadistatud!"
+
+#: LYMessages.c:536
+msgid "Image map from POST response not available!"
+msgstr "Hüperpilt POST vastusest ei ole kasutatav!"
+
+#: LYMessages.c:537
+msgid "Misdirected client-side image MAP request!"
+msgstr "Vigaselt suunatud kliendi-poolse hüperpildi päring!"
+
+#: LYMessages.c:538
+msgid "Client-side image MAP is not accessible!"
+msgstr "Kliendi-poolne hüperpilt ei ole kasutatav!"
+
+#: LYMessages.c:539
+msgid "No client-side image MAPs are available!"
+msgstr "Kliendi-poolseid hüperpilte pole!"
+
+#: LYMessages.c:540
+msgid "Client-side image MAP is not available!"
+msgstr "Kliendi-poolne hüperpilt ei ole kätte saadav!"
+
+#. #define OPTION_SCREEN_NEEDS_24
+#: LYMessages.c:543
+msgid "Screen height must be at least 24 lines for the Options menu!"
+msgstr "Seadete menüü nõuab vähemalt 24 rida ekraanile!"
+
+#. #define OPTION_SCREEN_NEEDS_23
+#: LYMessages.c:545
+msgid "Screen height must be at least 23 lines for the Options menu!"
+msgstr "Seadete menüü nõuab vähemalt 23 rida ekraanile!"
+
+#. #define OPTION_SCREEN_NEEDS_22
+#: LYMessages.c:547
+msgid "Screen height must be at least 22 lines for the Options menu!"
+msgstr "Seadete menüü nõuab vähemalt 22 rida ekraanile!"
+
+#: LYMessages.c:549
+msgid "That key requires Advanced User mode."
+msgstr "See klahv nõuab \"advanced\" kasutaja moodi."
+
+#: LYMessages.c:550
+#, c-format
+msgid "Content-type: %s"
+msgstr "Sisu tüüp: %s"
+
+#: LYMessages.c:551
+msgid "Command: "
+msgstr "Käsk: "
+
+#: LYMessages.c:552
+msgid "Unknown or ambiguous command"
+msgstr "Tundmatu või segane käsklus"
+
+#: LYMessages.c:553
+msgid " Version "
+msgstr " Versioon "
+
+#: LYMessages.c:554
+msgid " first"
+msgstr " esimene"
+
+#: LYMessages.c:555
+msgid ", guessing..."
+msgstr ", arvan..."
+
+#: LYMessages.c:556
+msgid "Permissions for "
+msgstr "Õigused failile "
+
+#: LYMessages.c:557
+msgid "Select "
+msgstr "Valige "
+
+#: LYMessages.c:558
+msgid "capital letter"
+msgstr "suurtäht"
+
+#: LYMessages.c:559
+msgid " of option line,"
+msgstr " valiku rida,"
+
+#: LYMessages.c:560
+msgid " to save,"
+msgstr " salvestamiseks"
+
+#: LYMessages.c:561
+msgid " to "
+msgstr " et "
+
+#: LYMessages.c:562
+msgid " or "
+msgstr " või "
+
+#: LYMessages.c:563
+msgid " index"
+msgstr " indeks"
+
+#: LYMessages.c:564
+msgid " to return to Lynx."
+msgstr " viib tagasi Lynxi."
+
+#: LYMessages.c:565
+msgid "Accept Changes"
+msgstr "Arvesta muutuseid"
+
+#: LYMessages.c:566
+msgid "Reset Changes"
+msgstr "Algväärtusta"
+
+#: LYMessages.c:567
+msgid "Left Arrow cancels changes"
+msgstr "Nool vasakule tühistab muutused"
+
+#: LYMessages.c:568
+msgid "Save options to disk"
+msgstr "Salvesta seaded kettale"
+
+#: LYMessages.c:569
+msgid "Hit RETURN to accept entered data."
+msgstr "Sisestatud andmete kasutamiseks vajutage RETURN."
+
+#. #define ACCEPT_DATA_OR_DEFAULT
+#: LYMessages.c:571
+msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
+msgstr "Andmete kasutamiseks vajutage RETURN. Kustutades andmed saate vaikeväärtuse."
+
+#: LYMessages.c:572
+msgid "Value accepted!"
+msgstr "Väärtus aktsepteeritud!"
+
+#. #define VALUE_ACCEPTED_WARNING_X
+#: LYMessages.c:574
+msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
+msgstr "Väärtus vastu võetud! -- HOIATUS: Lynx on seadistatud XWINDOWSi kasutamiseks!"
+
+#. #define VALUE_ACCEPTED_WARNING_NONX
+#: LYMessages.c:576
+msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
+msgstr "Väärtus vastu võetud! -- HOIATUS: Lynx ei ole XWINDOWSi jaoks seadistatud!"
+
+#: LYMessages.c:577
+msgid "You are not allowed to change which editor to use!"
+msgstr "Teil ei ole lubatud toimetit vahetada!"
+
+#: LYMessages.c:578
+msgid "Failed to set DISPLAY variable!"
+msgstr "DISPLAY muutuja seadmine ebaõnnestus!"
+
+#: LYMessages.c:579
+msgid "Failed to clear DISPLAY variable!"
+msgstr "DISPLAY muutuja tühjendamine ebaõnnestus!"
+
+#. #define BOOKMARK_CHANGE_DISALLOWED
+#: LYMessages.c:581
+msgid "You are not allowed to change the bookmark file!"
+msgstr "Teil ei ole lubatud järgede faili muuta!"
+
+#: LYMessages.c:582
+msgid "Terminal does not support color"
+msgstr "Terminal ei toeta värve"
+
+#: LYMessages.c:583
+#, c-format
+msgid "Your '%s' terminal does not support color."
+msgstr "Teie '%s' terminal ei toeta värve."
+
+#: LYMessages.c:584
+msgid "Access to dot files is disabled!"
+msgstr "Punktiga algavaid faile ei ole lubatud kasutada!"
+
+#. #define UA_NO_LYNX_WARNING
+#: LYMessages.c:586
+msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
+msgstr "User-Agent sõne ei sisalda \"Lynx\" ega \"L_y_n_x\""
+
+#. #define UA_PLEASE_USE_LYNX
+#: LYMessages.c:588
+msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
+msgstr "Kasutage User-Agent sees sõnu \"L_y_n_x\" või \"Lynx\", muidu paistab tegu olevat sihiliku pettusena!"
+
+#. #define UA_CHANGE_DISABLED
+#: LYMessages.c:590
+msgid "Changing of the User-Agent string is disabled!"
+msgstr "User-Agent väärtuse muutmine ei ole lubatud!"
+
+#. #define CHANGE_OF_SETTING_DISALLOWED
+#: LYMessages.c:592
+msgid "You are not allowed to change this setting."
+msgstr "Teil ei ole lubatud seda seadet muuta."
+
+#: LYMessages.c:593
+msgid "Saving Options..."
+msgstr "Salvestan seaded..."
+
+#: LYMessages.c:594
+msgid "Options saved!"
+msgstr "Seaded salvestatud!"
+
+#: LYMessages.c:595
+msgid "Unable to save Options!"
+msgstr "Seadeid ei õnnestu salvestada!"
+
+#: LYMessages.c:596
+msgid " 'r' to return to Lynx "
+msgstr " 'r' laseb Lynxi tagasi "
+
+#: LYMessages.c:597
+msgid " '>' to save, or 'r' to return to Lynx "
+msgstr " '>' salvestamiseks, 'r' laseb Lynxi tagasi "
+
+#. #define ANY_KEY_CHANGE_RET_ACCEPT
+#: LYMessages.c:599
+msgid "Hit any key to change value; RETURN to accept."
+msgstr "Väärtuse muutmiseks vajutage mõnd klahvi; RETURN aktsepteerimiseks."
+
+#: LYMessages.c:600
+msgid "Error uncompressing temporary file!"
+msgstr "Viga ajutise faili lahtipakkimisel!"
+
+#: LYMessages.c:601
+msgid "Unsupported URL scheme!"
+msgstr "Mittetoetatud URL skeem!"
+
+#: LYMessages.c:602
+msgid "Unsupported data: URL!  Use SHOWINFO, for now."
+msgstr "Mittetoetatud andmed: URL! Kasutage praegu SHOWINFO."
+
+#: LYMessages.c:603
+msgid "Redirection limit of 10 URL's reached."
+msgstr "Saavutati ümbersuunamiste piirang, 10 URLi."
+
+#: LYMessages.c:604
+msgid "Illegal redirection URL received from server!"
+msgstr "Server saatis vigase ümbersuunamise URLi!"
+
+#. #define SERVER_ASKED_FOR_REDIRECTION
+#: LYMessages.c:606
+#, c-format
+msgid "Server asked for %d redirection of POST content to"
+msgstr "Server palus %d POST sisu ümbersuunamist aadressil"
+
+#: LYMessages.c:609
+msgid "P)roceed, use G)ET or C)ancel "
+msgstr "P=jätka, kasuta G)ET või C=katkesta "
+
+#: LYMessages.c:610
+msgid "P)roceed, or C)ancel "
+msgstr "P=jätka või C=katkesta "
+
+#. #define ADVANCED_POST_GET_REDIRECT
+#: LYMessages.c:612
+msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
+msgstr "POST sisu ümbersuunamine. P=jätka, vaata U)RL, kasuta G)ET või C=katkesta"
+
+#. #define ADVANCED_POST_REDIRECT
+#: LYMessages.c:614
+msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
+msgstr "POST sisu ümbersuunamine. P=jätka, vaata U)RL või C=katkesta"
+
+#. #define CONFIRM_POST_RESUBMISSION
+#: LYMessages.c:616
+msgid "Document from Form with POST content.  Resubmit?"
+msgstr "Dokument vormist POST sisuga. Postitan uuesti?"
+
+#. #define CONFIRM_POST_RESUBMISSION_TO
+#: LYMessages.c:618
+#, c-format
+msgid "Resubmit POST content to %s ?"
+msgstr "Postitan uuesti POST sisu aadressil %s ?"
+
+#. #define CONFIRM_POST_LIST_RELOAD
+#: LYMessages.c:620
+#, c-format
+msgid "List from document with POST data.  Reload %s ?"
+msgstr "Loend dokumendist POST andmetega. Laen %s uuesti?"
+
+#. #define CONFIRM_POST_DOC_HEAD
+#: LYMessages.c:622
+msgid "Document from POST action, HEAD may not be understood.  Proceed?"
+msgstr "Dokument POST tegevusest, HEAD ei pruugi olla arusaadav. Jätkan?"
+
+#. #define CONFIRM_POST_LINK_HEAD
+#: LYMessages.c:624
+msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
+msgstr "Vormi postitamise tegevus on POST, HEAD ei pruugi olla arusaadav. Jätkan?"
+
+#: LYMessages.c:625
+msgid "Proceed without a username and password?"
+msgstr "Jätkan kasutaja ja paroolita?"
+
+#: LYMessages.c:626
+#, c-format
+msgid "Proceed (%s)?"
+msgstr "Jätkan (%s)?"
+
+#: LYMessages.c:627
+msgid "Cannot POST to this host."
+msgstr "POST ei saa sellele serverile saata."
+
+#: LYMessages.c:628
+msgid "POST not supported for this URL - ignoring POST data!"
+msgstr "Selle URLiga POST ei toetata - ignoreerin POST andmeid!"
+
+#: LYMessages.c:629
+msgid "Discarding POST data..."
+msgstr "Loobun POST andmetest..."
+
+#: LYMessages.c:630
+msgid "Document will not be reloaded!"
+msgstr "Dokumenti ei laeta uuesti!"
+
+#: LYMessages.c:631
+msgid "Location: "
+msgstr "Asukoht: "
+
+#: LYMessages.c:632
+#, c-format
+msgid "'%s' not found!"
+msgstr "'%s' ei leidu!"
+
+#: LYMessages.c:633
+msgid "Default Bookmark File"
+msgstr "Vaikimisi järgede fail"
+
+#: LYMessages.c:634
+msgid "Screen too small! (8x35 min)"
+msgstr "Ekraan on liiga väike! (min on 8x35)"
+
+#: LYMessages.c:635
+msgid "Select destination or ^G to Cancel: "
+msgstr "Valige sihtkoht või katkestamiseks ^G: "
+
+#. #define MULTIBOOKMARKS_SELECT
+#: LYMessages.c:637
+msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
+msgstr "Valige alamjärg, '=' annab menüü, ^G katkestab: "
+
+#. #define MULTIBOOKMARKS_SELF
+#: LYMessages.c:639
+msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
+msgstr "L=Uuenda viide selles järgede failis või C=katkesta? (l,c):  "
+
+#: LYMessages.c:640
+msgid "Multiple bookmark support is not available."
+msgstr "Mitut järgede faili ei toetata."
+
+#: LYMessages.c:641
+#, c-format
+msgid " Select Bookmark (screen %d of %d)"
+msgstr " Valige järg (ekraan %d/%d)"
+
+#: LYMessages.c:642
+msgid "       Select Bookmark"
+msgstr "       Valige järg"
+
+#. #define MULTIBOOKMARKS_EHEAD_MASK
+#: LYMessages.c:644
+#, c-format
+msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
+msgstr "Järgede kirjelduste ja failiteede toimetamine (%d/2)"
+
+#. #define MULTIBOOKMARKS_EHEAD
+#: LYMessages.c:646
+msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
+msgstr "         Järje kirjelduse ja failitee toimetamine"
+
+#: LYMessages.c:647
+msgid "Letter: "
+msgstr "Täht: "
+
+#. #define USE_PATH_OFF_HOME
+#: LYMessages.c:650
+msgid "Use a filepath off your login directory in SHELL syntax!"
+msgstr "Kasutage failiteed oma kodukataloogis ja shelli süntaksiga!"
+
+#: LYMessages.c:652
+msgid "Use a filepath off your home directory!"
+msgstr "Kasutage failiteed oma kodukataloogis!"
+
+#. #define MAXLINKS_REACHED
+#: LYMessages.c:655
+msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
+msgstr "Viidete maksimum lehel ületatud! Kasutage poolt lehte või kahe-rea skrolli."
+
+#. #define MAXHIST_REACHED
+#: LYMessages.c:657
+msgid "History List maximum reached!  Document not pushed."
+msgstr "Ajaloo loendi maksimum saavutatud! Dokumenti ei lisata."
+
+#: LYMessages.c:658
+msgid "No previously visited links available!"
+msgstr "Varem külastatud viiteid pole!"
+
+#: LYMessages.c:659
+msgid "Memory exhausted!  Program aborted!"
+msgstr "Mälu on otsas! Programm katkestab töö!"
+
+#: LYMessages.c:660
+msgid "Memory exhausted!  Aborting..."
+msgstr "Mälu on otsas! Katkestan töö..."
+
+#: LYMessages.c:661
+msgid "Not enough memory!"
+msgstr "Mälu on otsas!"
+
+#: LYMessages.c:662
+msgid "Directory/File Manager not available"
+msgstr "Kataloogi/faili haldur ei ole kasutatav"
+
+#: LYMessages.c:663
+msgid "HREF in BASE tag is not an absolute URL."
+msgstr "HREF BASE silt ei ole absoluutne URL."
+
+#: LYMessages.c:664
+msgid "Location URL is not absolute."
+msgstr "Asukoha URL ei ole absoluutne."
+
+#: LYMessages.c:665
+msgid "Refresh URL is not absolute."
+msgstr "Uuendatud URL ei ole absoluutne."
+
+#. #define SENDING_MESSAGE_WITH_BODY_TO
+#: LYMessages.c:667
+msgid ""
+"You are sending a message with body to:\n"
+"  "
+msgstr ""
+"Te olete saatmas pikemat teadet aadressil:\n"
+"  "
+
+#: LYMessages.c:668
+msgid ""
+"You are sending a comment to:\n"
+"  "
+msgstr ""
+"Te olete saatmas kommentaari aadressil:\n"
+"  "
+
+#: LYMessages.c:669
+msgid ""
+"\n"
+" With copy to:\n"
+"  "
+msgstr ""
+"\n"
+"Koopia aadressile:\n"
+"  "
+
+#: LYMessages.c:670
+msgid ""
+"\n"
+" With copies to:\n"
+"  "
+msgstr ""
+"\n"
+"Koopiad aadressidele:\n"
+"  "
+
+#. #define CTRL_G_TO_CANCEL_SEND
+#: LYMessages.c:672
+msgid ""
+"\n"
+"\n"
+"Use Ctrl-G to cancel if you do not want to send a message\n"
+msgstr ""
+"\n"
+"\n"
+"Kui te ei soovi teadet saata, vajutage katkestamiseks Ctrl-G\n"
+
+#. #define ENTER_NAME_OR_BLANK
+#: LYMessages.c:674
+msgid ""
+"\n"
+" Please enter your name, or leave it blank to remain anonymous\n"
+msgstr ""
+"\n"
+" Palun sisestage oma nimi või jätke tühjaks, kui soovite jääda anonüümseks\n"
+
+#. #define ENTER_MAIL_ADDRESS_OR_OTHER
+#: LYMessages.c:676
+msgid ""
+"\n"
+" Please enter a mail address or some other\n"
+msgstr ""
+"\n"
+" Kui soovite vastust, sisestage palun e-posti\n"
+
+#. #define MEANS_TO_CONTACT_FOR_RESPONSE
+#: LYMessages.c:678
+msgid " means to contact you, if you desire a response.\n"
+msgstr " aadress või muu kontakti info.\n"
+
+#: LYMessages.c:679
+msgid ""
+"\n"
+" Please enter a subject line.\n"
+msgstr ""
+"\n"
+" Palun sisestage teemarida.\n"
+
+#. #define ENTER_ADDRESS_FOR_CC
+#: LYMessages.c:681
+msgid ""
+"\n"
+" Enter a mail address for a CC of your message.\n"
+msgstr ""
+"\n"
+" Sisestage palun aadress, millele saata teate koopia.\n"
+
+#: LYMessages.c:682
+msgid " (Leave blank if you don't want a copy.)\n"
+msgstr " (Jätke tühjaks, kui te ei soovi koopiat.)\n"
+
+#: LYMessages.c:683
+msgid ""
+"\n"
+" Please review the message body:\n"
+"\n"
+msgstr ""
+"\n"
+" Palun vaadake teade üle:\n"
+"\n"
+
+#: LYMessages.c:684
+msgid ""
+"\n"
+"Press RETURN to continue: "
+msgstr ""
+"\n"
+"Jätkamiseks vajutage RETURN: "
+
+#: LYMessages.c:685
+msgid ""
+"\n"
+"Press RETURN to clean up: "
+msgstr ""
+"\n"
+"Puhastamiseks vajutage RETURN: "
+
+#: LYMessages.c:686
+msgid " Use Control-U to erase the default.\n"
+msgstr " Vaikeväärtuse kustutamiseks vajutage Control-U.\n"
+
+#: LYMessages.c:687
+msgid ""
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+" Palun sisestage all oma teade."
+
+#. #define ENTER_PERIOD_WHEN_DONE_A
+#: LYMessages.c:689 src/LYNews.c:361
+msgid ""
+"\n"
+" When you are done, press enter and put a single period (.)"
+msgstr ""
+"\n"
+"Kui te olete valmis, vajutage enter ja kirjutage punkt (.)"
+
+#. #define ENTER_PERIOD_WHEN_DONE_B
+#: LYMessages.c:691 src/LYNews.c:362
+msgid ""
+"\n"
+" on a line and press enter again."
+msgstr ""
+"\n"
+" ja vajutage uuesti enter klahvi."
+
+#. Cookies messages
+#. #define ADVANCED_COOKIE_CONFIRMATION
+#: LYMessages.c:695
+#, c-format
+msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
+msgstr "%s präänik: %.*s=%.*s  Luban? (Y/N/Alati/V=mitte kunagi)"
+
+#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
+#: LYMessages.c:697
+#, c-format
+msgid "Accept invalid cookie domain=%s for '%s'?"
+msgstr "Aktsepteerin vogast prääniku doomenit=%s, server '%s'?"
+
+#. #define INVALID_COOKIE_PATH_CONFIRMATION
+#: LYMessages.c:699
+#, c-format
+msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
+msgstr "Aktsepteerin vigast prääniku teed=%s '%s' prefiksina?"
+
+#: LYMessages.c:700
+msgid "Allowing this cookie."
+msgstr "Luban seda präänikut."
+
+#: LYMessages.c:701
+msgid "Rejecting this cookie."
+msgstr "Keeldun sellest präänikust."
+
+#: LYMessages.c:702
+msgid "The Cookie Jar is empty."
+msgstr "Prääniku Jar on tühi."
+
+#. #define ACTIVATE_TO_GOBBLE
+#: LYMessages.c:704
+msgid "Activate links to gobble up cookies or entire domains,"
+msgstr "Präänikute või tervete doomenite neelamiseks aktiveerige viited "
+
+#: LYMessages.c:705
+msgid "or to change a domain's 'allow' setting."
+msgstr "või muutke doomeni 'allow' seadet."
+
+#: LYMessages.c:706
+msgid "(Cookies never allowed.)"
+msgstr "(Präänikuid ei lubata kunagi.)"
+
+#: LYMessages.c:707
+msgid "(Cookies always allowed.)"
+msgstr "(Präänikuid lubatakse alati.)"
+
+#: LYMessages.c:708
+msgid "(Cookies allowed via prompt.)"
+msgstr "(präänikute lubamist küsitakse.)"
+
+#: LYMessages.c:709
+msgid "(Persistent Cookies.)"
+msgstr "(Püsivad präänikud.)"
+
+#: LYMessages.c:710
+msgid "(No title.)"
+msgstr "(Tiitlita.)"
+
+#: LYMessages.c:711
+msgid "(No name.)"
+msgstr "(Nimeta.)"
+
+#: LYMessages.c:712
+msgid "(No value.)"
+msgstr "(Väärtuseta.)"
+
+#: LYMessages.c:713
+msgid "None"
+msgstr "Puudub"
+
+#: LYMessages.c:714
+msgid "(End of session.)"
+msgstr "(Sessiooni lõpp.)"
+
+#: LYMessages.c:715
+msgid "Delete this cookie?"
+msgstr "Kustutan selle prääniku?"
+
+#: LYMessages.c:716
+msgid "The cookie has been eaten!"
+msgstr "Präänik on söödud!"
+
+#: LYMessages.c:717
+msgid "Delete this empty domain?"
+msgstr "Kustutan selle tühja doomeni?"
+
+#: LYMessages.c:718
+msgid "The domain has been eaten!"
+msgstr "Doomen on söödud!"
+
+#. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:720
+msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "D=kustuta doomeni präänikud, sea luba A)lati/P=küsi/V=ei või C=katkesta? "
+
+#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:722
+msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "D=Kustuta doomen, sea luba A)lati/P=küsi/V=ei või C=katkesta? "
+
+#: LYMessages.c:723
+msgid "All cookies in the domain have been eaten!"
+msgstr "Doomeni kõik präänikud on söödud!"
+
+#: LYMessages.c:724
+#, c-format
+msgid "'A'lways allowing from domain '%s'."
+msgstr "'A'lati luban doomenist '%s'."
+
+#: LYMessages.c:725
+#, c-format
+msgid "ne'V'er allowing from domain '%s'."
+msgstr "'V'=ei luba kunagi doomenist '%s'."
+
+#: LYMessages.c:726
+#, c-format
+msgid "'P'rompting to allow from domain '%s'."
+msgstr "'P'=küsi, et lubada doomenist '%s'."
+
+#: LYMessages.c:727
+msgid "Delete all cookies in this domain?"
+msgstr "Kustutan kõik selle doomeni präänikud?"
+
+#: LYMessages.c:728
+msgid "All of the cookies in the jar have been eaten!"
+msgstr "Kõik jari küpsised on söödud!"
+
+#: LYMessages.c:730
+msgid "Port 19 not permitted in URLs."
+msgstr "Porti 19 ei ole lubatud URLis kasutada."
+
+#: LYMessages.c:731
+msgid "Port 25 not permitted in URLs."
+msgstr "Porti 25 ei ole lubatud URLis kasutada."
+
+#: LYMessages.c:732
+#, c-format
+msgid "Port %lu not permitted in URLs."
+msgstr "Porti %lu ei ole lubatud URLis kasutada."
+
+#: LYMessages.c:733
+msgid "URL has a bad port field."
+msgstr "Port urlis on vigane."
+
+#: LYMessages.c:734
+msgid "Maximum nesting of HTML elements exceeded."
+msgstr "Üksteises sisalduvate HTML elementide maksimum ületatud."
+
+#: LYMessages.c:735
+msgid "Bad partial reference!  Stripping lead dots."
+msgstr "Vigane osaline viide! Eemaldan esimesed punktid."
+
+#: LYMessages.c:736
+msgid "Trace Log open failed.  Trace off!"
+msgstr "Trasseerimise logi avamine ebaõnnestus. Ei trasseeri!"
+
+#: LYMessages.c:737
+msgid "Lynx Trace Log"
+msgstr "Lynx trasseerimise logi"
+
+#: LYMessages.c:738
+msgid "No trace log has been started for this session."
+msgstr "Selle sessiooniga ei ole trasseerimist alustatud."
+
+#. #define MAX_TEMPCOUNT_REACHED
+#: LYMessages.c:740
+msgid "The maximum temporary file count has been reached!"
+msgstr "Maksimaalne ajutiste failide arv on ületatud!"
+
+#. #define FORM_VALUE_TOO_LONG
+#: LYMessages.c:742
+msgid "Form field value exceeds buffer length!  Trim the tail."
+msgstr "Vormi väärtuse pikkus ületab puhvri pikkust! Eemaldan ülejäägi."
+
+#. #define FORM_TAIL_COMBINED_WITH_HEAD
+#: LYMessages.c:744
+msgid "Modified tail combined with head of form field value."
+msgstr "Muudetud lõpp kombineeriti vormi välja väärtuse päisega."
+
+#. HTFile.c
+#: LYMessages.c:747
+msgid "Directory"
+msgstr "Kataloog"
+
+#: LYMessages.c:748
+msgid "Directory browsing is not allowed."
+msgstr "Kataloogide prausimine ei ole lubatud."
+
+#: LYMessages.c:749
+msgid "Selective access is not enabled for this directory"
+msgstr "Valikuline lubamine ei ole selles kataloogis lubatud"
+
+#: LYMessages.c:750
+msgid "Multiformat: directory scan failed."
+msgstr "Multiformat: kataloogi skaneerimine ebaõnnestus."
+
+#: LYMessages.c:751
+msgid "This directory is not readable."
+msgstr "See kataloog ei ole loetav."
+
+#: LYMessages.c:752
+msgid "Can't access requested file."
+msgstr "Soovitud faili ei saa kasutada."
+
+#: LYMessages.c:753
+msgid "Could not find suitable representation for transmission."
+msgstr "Ei leia ülekandeks sobivat esitusviisi."
+
+#: LYMessages.c:754
+msgid "Could not open file for decompression!"
+msgstr "Faili ei õnnestu lahtipakkimiseks avada!"
+
+#: LYMessages.c:755
+msgid "Files:"
+msgstr "Failid:"
+
+#: LYMessages.c:756
+msgid "Subdirectories:"
+msgstr "Alamkataloogid:"
+
+#: LYMessages.c:757
+msgid " directory"
+msgstr " kataloog"
+
+#: LYMessages.c:758
+msgid "Up to "
+msgstr "Tagasi "
+
+#: LYMessages.c:759
+msgid "Current directory is "
+msgstr "Jooksev kataloog on "
+
+#. HTGopher.c
+#: LYMessages.c:762
+msgid "No response from server!"
+msgstr "Server ei vasta!"
+
+#: LYMessages.c:763
+msgid "CSO index"
+msgstr "CSO indeks"
+
+#: LYMessages.c:764
+msgid ""
+"\n"
+"This is a searchable index of a CSO database.\n"
+msgstr ""
+"\n"
+"See on CSO andmebaasi otsingu indeks.\n"
+
+#: LYMessages.c:765
+msgid "CSO Search Results"
+msgstr "CSO otsingu tulemused"
+
+#: LYMessages.c:766
+#, c-format
+msgid "Seek fail on %s\n"
+msgstr "%s positsioneerimine ebaõnnestus\n"
+
+#: LYMessages.c:767
+msgid ""
+"\n"
+"Press the 's' key and enter search keywords.\n"
+msgstr ""
+"\n"
+"Vajutage klahvi 's' ja sisestage otsingu võtmesõnad.\n"
+
+#: LYMessages.c:768
+msgid ""
+"\n"
+"This is a searchable Gopher index.\n"
+msgstr ""
+"\n"
+"See on Gopheri otsingu indeks.\n"
+
+#: LYMessages.c:769
+msgid "Gopher index"
+msgstr "Gopher indeks"
+
+#: LYMessages.c:770
+msgid "Gopher Menu"
+msgstr "Gopher Menüü"
+
+#: LYMessages.c:771
+msgid " Search Results"
+msgstr " Otsingu tulemused"
+
+#: LYMessages.c:772
+msgid "Sending CSO/PH request."
+msgstr "Saadan CSO/PH päringu."
+
+#: LYMessages.c:773
+msgid "Sending Gopher request."
+msgstr "Saadan Gopher päringu."
+
+#: LYMessages.c:774
+msgid "CSO/PH request sent; waiting for response."
+msgstr "CSO/PH päring saadetud; ootan vastust."
+
+#: LYMessages.c:775
+msgid "Gopher request sent; waiting for response."
+msgstr "Gopher päring saadetud; ootan vastust."
+
+#: LYMessages.c:776
+msgid ""
+"\n"
+"Please enter search keywords.\n"
+msgstr ""
+"\n"
+"Palun sisestage otsitavad võtmesõnad.\n"
+
+#: LYMessages.c:777
+msgid ""
+"\n"
+"The keywords that you enter will allow you to search on a"
+msgstr ""
+"\n"
+"Sisestatavate võtmesõnadega otsitakse"
+
+#: LYMessages.c:778
+msgid " person's name in the database.\n"
+msgstr " andmebaasist inimeste nimesid.\n"
+
+#. HTNews.c
+#: LYMessages.c:781
+msgid "Connection closed ???"
+msgstr "Ühendus suleti ???"
+
+#: LYMessages.c:782
+msgid "Cannot open temporary file for news POST."
+msgstr "Uudisegruppi postitamiseks ei õnnestu avada ajutist faili."
+
+#: LYMessages.c:783
+msgid "This client does not contain support for posting to news with SSL."
+msgstr "See klient ei toeta SSL vahendusel uudisegruppi postitamist."
+
+#. HTStyle.c
+#: LYMessages.c:786
+#, c-format
+msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
+msgstr "Stiil %d `%s' SGML:%s.  Kiri %s %.1f punkti.\n"
+
+#: LYMessages.c:787
+#, c-format
+msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
+msgstr "\tTaanded: esimene=%.0f teised=%.0f, Kõrgus=%.1f Kirj=%.1f\n"
+
+#: LYMessages.c:788
+#, c-format
+msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
+msgstr "\tJoondus=%d, %d tab. (%.0f enen, %.0f peale)\n"
+
+#: LYMessages.c:789
+#, c-format
+msgid "\t\tTab kind=%d at %.0f\n"
+msgstr "\t\tTab tüüp=%d kohal %.0f\n"
+
+#. HTTP.c
+#: LYMessages.c:792
+msgid "Can't proceed without a username and password."
+msgstr "Kasutajanime ja paroolita ei saa jätkata."
+
+#: LYMessages.c:793
+msgid "Can't retry with authorization!  Contact the server's WebMaster."
+msgstr "Autoriseerimisega ei õnnestu jätkata! Võtke ühendust serveri haldajaga."
+
+#: LYMessages.c:794
+msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
+msgstr "Proksi autoriseerimisega ei õnnestu jätkata! Kontakteeruge serveri haldajaga."
+
+#: LYMessages.c:795
+msgid "Retrying with proxy authorization information."
+msgstr "Proovin uuesti proksi autoriseerimise infoga."
+
+#. HTWAIS.c
+#: LYMessages.c:798
+msgid "HTWAIS: Return message too large."
+msgstr "HTWAIS: Tagastatav teade on liiga pikk."
+
+#: LYMessages.c:799
+msgid "Enter WAIS query: "
+msgstr "Sisestage WAIS päring: "
+
+#. Miscellaneous status
+#: LYMessages.c:802
+msgid "Retrying as HTTP0 request."
+msgstr "Proovin uuesti HTTP0 päringuna."
+
+#: LYMessages.c:803
+#, c-format
+msgid "Transferred %d bytes"
+msgstr "Laetud %d baiti"
+
+#: LYMessages.c:804
+msgid "Data transfer complete"
+msgstr "Andmed laetud"
+
+#: LYMessages.c:805
+#, c-format
+msgid "Error processing line %d of %s\n"
+msgstr "Viga rea %d töötlemisel (%s)\n"
+
+#. Lynx internal page titles
+#: LYMessages.c:808
+msgid "Address List Page"
+msgstr "Aadressi loendi leht"
+
+#: LYMessages.c:809
+msgid "Bookmark file"
+msgstr "Järgede fail"
+
+#: LYMessages.c:810
+msgid "Configuration Definitions"
+msgstr "Seadete definitsioonid"
+
+#: LYMessages.c:811
+msgid "Cookie Jar"
+msgstr "Präänikute Jar"
+
+#: LYMessages.c:812
+msgid "Current Key Map"
+msgstr "Jooksev klahvitabel"
+
+#: LYMessages.c:813
+msgid "File Management Options"
+msgstr "Failide haldamise seaded"
+
+#: LYMessages.c:814
+msgid "Download Options"
+msgstr "Allalaadimise võimalused"
+
+#: LYMessages.c:815
+msgid "History Page"
+msgstr "Ajaloo leht"
+
+#: LYMessages.c:816
+msgid "List Page"
+msgstr "Lehe info"
+
+#: LYMessages.c:817
+msgid "Lynx.cfg Information"
+msgstr "Lynx.cfg Informatsioon"
+
+#: LYMessages.c:818
+msgid "Converted Mosaic Hotlist"
+msgstr "Teisendatud Mosaic Hotlist"
+
+#: LYMessages.c:819
+msgid "Options Menu"
+msgstr "Omaduste menüü"
+
+#: LYMessages.c:820
+msgid "File Permission Options"
+msgstr "Failiõiguste seaded"
+
+#: LYMessages.c:821
+msgid "Printing Options"
+msgstr "Trükkimise võimalused"
+
+#: LYMessages.c:822
+msgid "Information about the current document"
+msgstr "Info jooksvast dokumendist"
+
+#: LYMessages.c:823
+msgid "Your recent statusline messages"
+msgstr "Viimased olekurea teated"
+
+#: LYMessages.c:824
+msgid "Upload Options"
+msgstr "Üleslaadimise seaded"
+
+#: LYMessages.c:825
+msgid "Visited Links Page"
+msgstr "Külastatud viidete leht"
+
+#. CONFIG_DEF_TITLE subtitles
+#: LYMessages.c:828
+msgid "See also"
+msgstr "Vaadake ka"
+
+#: LYMessages.c:829
+msgid "your"
+msgstr "teie"
+
+#: LYMessages.c:830
+msgid "for runtime options"
+msgstr "töö-aja seaded"
+
+#: LYMessages.c:831
+msgid "compile time options"
+msgstr "kompileerimise aegsed seaded"
+
+#: LYMessages.c:832
+msgid "color-style configuration"
+msgstr "värvistiili seaded"
+
+#: LYMessages.c:833
+msgid "latest release"
+msgstr "viimane versioon"
+
+#: LYMessages.c:834
+msgid "pre-release version"
+msgstr "eelversioon"
+
+#: LYMessages.c:835
+msgid "development version"
+msgstr "arendusversioon"
+
+#. #define AUTOCONF_CONFIG_CACHE
+#: LYMessages.c:837
+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 ""
+"Järgnevad andmed tuletati selle Lynxi automaatse seadistamise ja ehitamise\n"
+"protsessi käigus. Vearaportite saatmisel lisage palun koopia ka sellest\n"
+"lehest."
+
+#. #define AUTOCONF_LYNXCFG_H
+#: LYMessages.c:841
+msgid ""
+"The following data were used as automatically-configured compile-time\n"
+"definitions when this copy of Lynx was built."
+msgstr ""
+"Järgnevaid andmeid kasutati selle Lynxi ehitamisel automaatselt seadistatud\n"
+"kompileerimise aegsete definitsioonidena."
+
+#. #define DIRED_NOVICELINE
+#: LYMessages.c:846
+msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
+msgstr "  C=loo D=lae alla E=toimeta F=kogu menüü M)uuda R=eemalda T=märgi U=lae üles\n"
+
+#: LYMessages.c:847
+msgid "Failed to obtain status of current link!"
+msgstr "Jooksva viite oleku lugemine ebaõnnestus!"
+
+#. #define INVALID_PERMIT_URL
+#: LYMessages.c:850
+msgid "Special URL only valid from current File Permission menu!"
+msgstr "Spetsiaal URL on lubatud ainult faili õiguste menüüs!"
+
+#: LYMessages.c:854
+msgid "External support is currently disabled."
+msgstr "Väline tugi on hetkel blokeeritud."
+
+#. new with 2.8.4dev.21
+#: LYMessages.c:858
+msgid "Changing working-directory is currently disabled."
+msgstr "Töökataloogi muutmine on hetkel blokeeritud."
+
+#: LYMessages.c:859
+msgid "Linewrap OFF!"
+msgstr "Reamurdmine väljas!"
+
+#: LYMessages.c:860
+msgid "Linewrap ON!"
+msgstr "Reamurdmine sees!"
+
+#: LYMessages.c:861
+msgid "Parsing nested-tables toggled OFF!  Reloading..."
+msgstr "Tabelid tabelites töötlemine on välja lülitatud! Laen uuesti..."
+
+#: LYMessages.c:862
+msgid "Parsing nested-tables toggled ON!  Reloading..."
+msgstr "Tabelid tabelites töötlemine on sisse lülitatud! Laen uuesti..."
+
+#: LYMessages.c:863
+msgid "Shifting is disabled while line-wrap is in effect"
+msgstr "Kui kasutatakse reamurdmist, on nihutamine blokeeritud"
+
+#: LYMessages.c:864
+msgid "Trace not supported"
+msgstr "Trasseerimine ei ole toetatud"
+
+#: WWW/Library/Implementation/HTAABrow.c:647
+#, c-format
+msgid "Username for '%s' at %s '%s%s':"
+msgstr "Kasutajanimi '%s' kasutamiseks, %s '%s%s':"
+
+#: WWW/Library/Implementation/HTAABrow.c:913
+msgid "This client doesn't know how to compose proxy authorization information for scheme"
+msgstr "See klient ei tea, kuidas koostada proksi autoriseerimise infot skeemile"
+
+#: WWW/Library/Implementation/HTAABrow.c:988
+msgid "This client doesn't know how to compose authorization information for scheme"
+msgstr "See klient ei tea, kuidas koostada autoriseerimise infot skeemile"
+
+#: WWW/Library/Implementation/HTAABrow.c:1096
+#, c-format
+msgid "Invalid header '%s%s%s%s%s'"
+msgstr "Vigane päis '%s%s%s%s%s'"
+
+#: WWW/Library/Implementation/HTAABrow.c:1200
+msgid "Proxy authorization required -- retrying"
+msgstr "Nõutakse proksi autentimist -- proovin uuesti"
+
+#: WWW/Library/Implementation/HTAABrow.c:1259
+msgid "Access without authorization denied -- retrying"
+msgstr "Autoriseerimata ei lubata kasutada -- proovin uuesti"
+
+#: WWW/Library/Implementation/HTAccess.c:677
+msgid "Access forbidden by rule"
+msgstr "Reeglid piiravad juurdepääsu"
+
+#: WWW/Library/Implementation/HTAccess.c:779
+msgid "Document with POST content not found in cache.  Resubmit?"
+msgstr "POST sisuga dokument puudub puhvrist. Postitan uuesti?"
+
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
+msgid "Loading incomplete."
+msgstr "Mittetäielik laadimine."
+
+#: WWW/Library/Implementation/HTAccess.c:1077
+msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
+msgstr "**** HTAccess: pistiku või faili numbri tagastas aegunud protseduur!\n"
+
+#: WWW/Library/Implementation/HTAccess.c:1079
+msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
+msgstr "**** HTAccess: Sisemine tarkvaraline viga.  Teavitage palun lynx-dev@sig.net!\n"
+
+#: WWW/Library/Implementation/HTAccess.c:1080
+#, c-format
+msgid "**** HTAccess: Status returned was: %d\n"
+msgstr "**** HTAccess: Tagastatud olek oli: %d\n"
+
+#.
+#. * hack: if we fail in HTAccess.c
+#. * avoid duplicating URL, oh.
+#.
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
+msgid "Can't Access"
+msgstr "Ei saa kasutada"
+
+#: WWW/Library/Implementation/HTAccess.c:1094
+msgid "Unable to access document."
+msgstr "Dokumenti ei saa kasutada."
+
+#: WWW/Library/Implementation/HTFTP.c:766
+#, c-format
+msgid "Enter password for user %s@%s:"
+msgstr "Sisestage kasutaja %s@%s parool:"
+
+#: WWW/Library/Implementation/HTFTP.c:794
+msgid "Unable to connect to FTP host."
+msgstr "Ei õnnestu luua ühendust FTP serveriga."
+
+#: WWW/Library/Implementation/HTFTP.c:1064
+msgid "close master socket"
+msgstr "ülem pistiku sulgemine"
+
+#: WWW/Library/Implementation/HTFTP.c:1126
+msgid "socket for master socket"
+msgstr "pistik ülem pistikule"
+
+#.
+#. **  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:1640 WWW/Library/Implementation/HTFTP.c:2261
+msgid "Symbolic Link"
+msgstr "Nimeviide"
+
+#: WWW/Library/Implementation/HTFTP.c:2622
+msgid "Receiving FTP directory."
+msgstr "Laen FTP kataloogi."
+
+#: WWW/Library/Implementation/HTFTP.c:2762
+#, c-format
+msgid "Transferred %d bytes (%5d)"
+msgstr "Üle kantud %d baiti (%5d)"
+
+#: WWW/Library/Implementation/HTFTP.c:3083
+msgid "connect for data"
+msgstr "loon andmekanalit"
+
+#: WWW/Library/Implementation/HTFTP.c:3731
+msgid "Receiving FTP file."
+msgstr "Laen FTP faili."
+
+#: WWW/Library/Implementation/HTFinger.c:278
+msgid "Could not set up finger connection."
+msgstr "Ei õnnestu luua ühendust finger teenusega."
+
+#: WWW/Library/Implementation/HTFinger.c:325
+msgid "Could not load data (no sitename in finger URL)"
+msgstr "Ei õnnestu lugeda andmeid (finger URLis puudub serveri nimi)"
+
+#: WWW/Library/Implementation/HTFinger.c:331
+msgid "Invalid port number - will only use port 79!"
+msgstr "Vigane pordi number - kasutan ainult porti 79!"
+
+#: WWW/Library/Implementation/HTFinger.c:396
+msgid "Could not access finger host."
+msgstr "Finger serverit ei saa kasutada."
+
+#: WWW/Library/Implementation/HTFinger.c:404
+msgid "No response from finger server."
+msgstr "Finger server ei vasta."
+
+#: WWW/Library/Implementation/HTNews.c:372
+#, c-format
+msgid "Username for news host '%s':"
+msgstr "Kasutajanimi uudiseserverile '%s':"
+
+#: WWW/Library/Implementation/HTNews.c:425
+msgid "Change username?"
+msgstr "Muudan kasutajanime?"
+
+#: WWW/Library/Implementation/HTNews.c:429
+msgid "Username:"
+msgstr "Kasutajanimi:"
+
+#: WWW/Library/Implementation/HTNews.c:453
+#, c-format
+msgid "Password for news host '%s':"
+msgstr "Parool uudiseserverile '%s':"
+
+#: WWW/Library/Implementation/HTNews.c:536
+msgid "Change password?"
+msgstr "Muudan parooli?"
+
+#: WWW/Library/Implementation/HTNews.c:1690
+#, c-format
+msgid "No matches for: %s"
+msgstr "Ei leia: %s"
+
+#: WWW/Library/Implementation/HTNews.c:1743
+msgid ""
+"\n"
+"No articles in this group.\n"
+msgstr ""
+"\n"
+"Selles grupis ei ole artikleid.\n"
+
+#: WWW/Library/Implementation/HTNews.c:1756
+msgid ""
+"\n"
+"No articles in this range.\n"
+msgstr ""
+"\n"
+"Selles vahemikus artikleid ei ole.\n"
+
+#.
+#. **	Set window title.
+#.
+#: WWW/Library/Implementation/HTNews.c:1769
+#, c-format
+msgid "%s,  Articles %d-%d"
+msgstr "%s,  Artiklid %d-%d"
+
+#: WWW/Library/Implementation/HTNews.c:1791
+msgid "Earlier articles"
+msgstr "Varasemad artiklid"
+
+#: WWW/Library/Implementation/HTNews.c:1804
+#, c-format
+msgid ""
+"\n"
+"There are about %d articles currently available in %s, IDs as follows:\n"
+"\n"
+msgstr ""
+"\n"
+"Leidsin umbes %d artiklit grupis %s, järgnevad artiklite ID:\n"
+"\n"
+
+#: WWW/Library/Implementation/HTNews.c:1864
+msgid "All available articles in "
+msgstr "Kõik kasutatavad artiklid grupis "
+
+#: WWW/Library/Implementation/HTNews.c:2080
+msgid "Later articles"
+msgstr "Hilisemad artiklid"
+
+#: WWW/Library/Implementation/HTNews.c:2104
+msgid "Post to "
+msgstr "Postita gruppi "
+
+#: WWW/Library/Implementation/HTNews.c:2322
+msgid "This client does not contain support for SNEWS URLs."
+msgstr "See klient ei toeta SNEWS URLe."
+
+#: WWW/Library/Implementation/HTNews.c:2530
+msgid "No target for raw text!"
+msgstr "Toore teksti jaoks pole kohta!"
+
+#: WWW/Library/Implementation/HTNews.c:2560
+msgid "Connecting to NewsHost ..."
+msgstr "Loon ühendust uudisegruppide serveriga ..."
+
+#: WWW/Library/Implementation/HTNews.c:2611
+#, c-format
+msgid "Could not access %s."
+msgstr "%s ei saa kasutada."
+
+#: WWW/Library/Implementation/HTNews.c:2711
+#, c-format
+msgid "Can't read news info.  News host %.20s responded: %.200s"
+msgstr "Ei õnnestu lugeda uudiste infot. Server %.20s vastas: %.200s"
+
+#: WWW/Library/Implementation/HTNews.c:2715
+#, c-format
+msgid "Can't read news info, empty response from host %s"
+msgstr "Ei õnnestu lugeda uudiste infot, tühi vastus serverilt %s"
+
+#.
+#. **	List available newsgroups. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2919
+msgid "Reading list of available newsgroups."
+msgstr "Loen kasutatavate gruppide nimekirja."
+
+#: WWW/Library/Implementation/HTNews.c:2941
+msgid "Reading list of articles in newsgroup."
+msgstr "Loen artiklite nimekirja grupis."
+
+#.
+#. **	Get an article from a news group. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2947
+msgid "Reading news article."
+msgstr "Loen artiklit."
+
+#: WWW/Library/Implementation/HTNews.c:2977
+msgid "Sorry, could not load requested news."
+msgstr "Kahjuks ei õnnestunud soovitud uudiseid laadida."
+
+#: WWW/Library/Implementation/HTTCP.c:1239
+msgid "Address has invalid port"
+msgstr "Aadressis on vigane port"
+
+#: WWW/Library/Implementation/HTTCP.c:1327
+msgid "Address length looks invalid"
+msgstr "Aadressi pikkus tundub vigane"
+
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
+#, c-format
+msgid "Unable to locate remote host %s."
+msgstr "Ei leia serverit %s."
+
+#. 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:1575 WWW/Library/Implementation/HTTelnet.c:103
+#, c-format
+msgid "Invalid hostname %s"
+msgstr "Vigane serveri nimi %s"
+
+#: WWW/Library/Implementation/HTTCP.c:1589
+#, c-format
+msgid "Making %s connection to %s"
+msgstr "Loon %s ühendust serveriga %s"
+
+#: WWW/Library/Implementation/HTTCP.c:1605
+#, 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:1614
+msgid "socket failed."
+msgstr "socket ebaõnnestus."
+
+#: WWW/Library/Implementation/HTTCP.c:1634
+msgid "Could not make connection non-blocking."
+msgstr "Ei õnnestu muuta ühendust mitte-blokeerivaks."
+
+#: WWW/Library/Implementation/HTTCP.c:1703
+msgid "Connection failed (too many retries)."
+msgstr "Ühendus ebaõnnestus (looga palju katseid)."
+
+#: WWW/Library/Implementation/HTTCP.c:1896
+msgid "Could not restore socket to blocking."
+msgstr "Pistikul ei õnnestu taastada blokeerivat moodi."
+
+#: WWW/Library/Implementation/HTTCP.c:1962
+msgid "Socket read failed for 180,000 tries."
+msgstr "Pistikust lugemine ebaõnnestus 180 000 katsel."
+
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr "Aadress sisaldab kasutajanime: %s"
+
+#: WWW/Library/Implementation/HTTP.c:503
+msgid "This client does not contain support for HTTPS URLs."
+msgstr "See klient ei toeta HTTPS URLe."
+
+#: WWW/Library/Implementation/HTTP.c:528
+msgid "Unable to connect to remote host."
+msgstr "Serveriga ühenduse loomine ebaõnnestus."
+
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr "Üritan ühendust uuesti luua TLS kasutamata."
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr "SSL viga: Sertifikaadis puudub ühine nimi - jätkan?"
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr "SSL viga:host(%s)!=sert(%s)-Jätkan?"
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr "Turvaline %d-bitti %s (%s) HTTP ühendus"
+
+#: WWW/Library/Implementation/HTTP.c:1091
+msgid "Sending HTTP request."
+msgstr "Saadan HTTP päringu."
+
+#: WWW/Library/Implementation/HTTP.c:1125
+msgid "Unexpected network write error; connection aborted."
+msgstr "Ootamatu tõrge võrku kirjutamisel; ühendus katkestati."
+
+#: WWW/Library/Implementation/HTTP.c:1131
+msgid "HTTP request sent; waiting for response."
+msgstr "HTTP päring on saadetud; ootan vastust."
+
+#: WWW/Library/Implementation/HTTP.c:1195
+msgid "Unexpected network read error; connection aborted."
+msgstr "Ootamatu tõrge võrgust lugemisel; ühendus katkestati."
+
+#.
+#. **	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:1391
+msgid "Got unexpected Informational Status."
+msgstr "Sain ootamatu informatiivse oleku."
+
+#.
+#. *  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:1426
+msgid "Request fulfilled.  Reset Content."
+msgstr "Päring täidetud. Algväärtusta sisu."
+
+#. 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:1545
+msgid "Got unexpected 304 Not Modified status."
+msgstr "Sain ootamatu oleku, 304 Pole muudetud."
+
+#: WWW/Library/Implementation/HTTP.c:1612
+msgid "Redirection of POST content requires user approval."
+msgstr "POST sisu ümbersuunamine nõuab kasutaja kinnitust."
+
+#: WWW/Library/Implementation/HTTP.c:1627
+msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
+msgstr "Oman POST sisu. Käsitlen püsivat ümbersuunamist ajutisena.\n"
+
+#: WWW/Library/Implementation/HTTP.c:1672
+msgid "Retrying with access authorization information."
+msgstr "Proovin uuesti kasutades autoriseerimise infot."
+
+#: WWW/Library/Implementation/HTTP.c:1684
+msgid "Show the 401 message body?"
+msgstr "Näitan teate 401 keha?"
+
+#: WWW/Library/Implementation/HTTP.c:1729
+msgid "Show the 407 message body?"
+msgstr "Näitan teate 407 keha?"
+
+#.
+#. **	Bad or unknown server_status number.
+#. **	Take a chance and hope there is
+#. **	something to display. - FM
+#.
+#: WWW/Library/Implementation/HTTP.c:1834
+msgid "Unknown status reply from server!"
+msgstr "Tundmatu oleku vastus serverilt!"
+
+#: WWW/Library/Implementation/HTTelnet.c:101
+#, c-format
+msgid "remote %s session:"
+msgstr "%s sessioon:"
+
+#: WWW/Library/Implementation/HTWAIS.c:161
+msgid "Could not connect to WAIS server."
+msgstr "Ei õnnestu luua ühendust WAIS serveriga."
+
+#: WWW/Library/Implementation/HTWAIS.c:170
+msgid "Could not open WAIS connection for reading."
+msgstr "Ei õnnestu luua lugemiseks WAIS ühendust."
+
+#: WWW/Library/Implementation/HTWAIS.c:194
+msgid "Diagnostic code is "
+msgstr "Diagnostika kood on "
+
+#: WWW/Library/Implementation/HTWAIS.c:463
+msgid "Index "
+msgstr "Indeks "
+
+#: WWW/Library/Implementation/HTWAIS.c:467
+#, c-format
+msgid " contains the following %d item%s relevant to \""
+msgstr " sisaldab järgnevad asjasse puutuvas %d element%s \""
+
+#: WWW/Library/Implementation/HTWAIS.c:475
+msgid "The first figure after each entry is its relative score, "
+msgstr "Esimene number iga kirje järel on selle suhteline kaal, "
+
+#: WWW/Library/Implementation/HTWAIS.c:476
+msgid "the second is the number of lines in the item."
+msgstr "teine on ridade arv selles."
+
+#: WWW/Library/Implementation/HTWAIS.c:517
+msgid " (bad file name)"
+msgstr " (halb failinimi)"
+
+#: WWW/Library/Implementation/HTWAIS.c:542
+msgid "(bad doc id)"
+msgstr "(halb dokumendi id)"
+
+#: WWW/Library/Implementation/HTWAIS.c:558
+msgid "(Short Header record, can't display)"
+msgstr "(Lühike päise kirje, ei saa näidata)"
+
+#: WWW/Library/Implementation/HTWAIS.c:565
+msgid ""
+"\n"
+"Long Header record, can't display\n"
+msgstr ""
+"\n"
+"Pikk päise kirje, ei saa näidata\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:572
+msgid ""
+"\n"
+"Text record\n"
+msgstr ""
+"\n"
+"Tekstikirje\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:581
+msgid ""
+"\n"
+"Headline record, can't display\n"
+msgstr ""
+"\n"
+"Päisrea kirje, ei saa näidata\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:589
+msgid ""
+"\n"
+"Code record, can't display\n"
+msgstr ""
+"\n"
+"Koodi kirje, ei saa näidata\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:689
+msgid "Syntax error in WAIS URL"
+msgstr "Süntaksi viga WAIS URLis"
+
+#: WWW/Library/Implementation/HTWAIS.c:759
+msgid " (WAIS Index)"
+msgstr " (WAIS Indeks)"
+
+#: WWW/Library/Implementation/HTWAIS.c:766
+msgid "WAIS Index: "
+msgstr "WAIS Indeks: "
+
+#: WWW/Library/Implementation/HTWAIS.c:772
+msgid "This is a link for searching the "
+msgstr "See on viide otsimaks "
+
+#: WWW/Library/Implementation/HTWAIS.c:776
+msgid " WAIS Index.\n"
+msgstr " WAIS Indeks.\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:803
+msgid ""
+"\n"
+"Enter the 's'earch command and then specify search words.\n"
+msgstr ""
+"\n"
+"Andke ot's'ingu käsklus ja seejärel otsitavad sõnad.\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:825
+msgid " (in "
+msgstr " (baasis "
+
+#: WWW/Library/Implementation/HTWAIS.c:834
+msgid "WAIS Search of \""
+msgstr "WAIS Otsing \""
+
+#: WWW/Library/Implementation/HTWAIS.c:838
+msgid "\" in: "
+msgstr "\" baasis: "
+
+#: WWW/Library/Implementation/HTWAIS.c:853
+msgid "HTWAIS: Request too large."
+msgstr "HTWAIS: Päring on liiga suur."
+
+#: WWW/Library/Implementation/HTWAIS.c:862
+msgid "Searching WAIS database..."
+msgstr "Otsin WAIS andmebaasis..."
+
+#: WWW/Library/Implementation/HTWAIS.c:872
+msgid "Search interrupted."
+msgstr "Otsing katkestati."
+
+#: WWW/Library/Implementation/HTWAIS.c:922
+msgid "Can't convert format of WAIS document"
+msgstr "WAIS dokumendi vormingut ei õnnestu teisendada"
+
+#: WWW/Library/Implementation/HTWAIS.c:966
+msgid "HTWAIS: Request too long."
+msgstr "HTWAIS: Päring on liiga pikk."
+
+#.
+#. **	Actually do the transaction given by request_message.
+#.
+#: WWW/Library/Implementation/HTWAIS.c:980
+msgid "Fetching WAIS document..."
+msgstr "Laen WAIS dokumenti..."
+
+#. display_search_response(target, retrieval_response,
+#. wais_database, keywords);
+#: WWW/Library/Implementation/HTWAIS.c:1019
+msgid "No text was returned!\n"
+msgstr "Teksti ei tagastatud!\n"
+
+#: WWW/Library/Implementation/HTWSRC.c:287
+msgid " NOT GIVEN in source file; "
+msgstr " EI ESITATUD lähtefailis; "
+
+#: WWW/Library/Implementation/HTWSRC.c:311
+msgid " WAIS source file"
+msgstr " WAIS lähtefail"
+
+#: WWW/Library/Implementation/HTWSRC.c:318
+msgid " description"
+msgstr " kirjeldus"
+
+#: WWW/Library/Implementation/HTWSRC.c:328
+msgid "Access links"
+msgstr "Kasutamise viited"
+
+#: WWW/Library/Implementation/HTWSRC.c:346
+msgid "Direct access"
+msgstr "Otsene kasutamine"
+
+#. * Proxy will be used if defined, so let user know that - FM *
+#: WWW/Library/Implementation/HTWSRC.c:349
+msgid " (or via proxy server, if defined)"
+msgstr " (või proksi serveri vahendusel, kui on defineeritud)"
+
+#: WWW/Library/Implementation/HTWSRC.c:364
+msgid "Maintainer"
+msgstr "Haldaja"
+
+#: WWW/Library/Implementation/HTWSRC.c:372
+msgid "Host"
+msgstr "Server"
+
+#: src/GridText.c:688
+msgid "Memory exhausted, display interrupted!"
+msgstr "Mälu on otsas, esitus katkestati!"
+
+#: src/GridText.c:693
+msgid "Memory exhausted, will interrupt transfer!"
+msgstr "Mälu on otsas, katkestan ülekande!"
+
+#: src/GridText.c:3578
+msgid " *** MEMORY EXHAUSTED ***"
+msgstr " *** MÄLU ON OTSAS ***"
+
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
+msgid "unknown field or link"
+msgstr "tundmatu väli või viide"
+
+#: src/GridText.c:6023
+msgid "text entry field"
+msgstr "teksti väli"
+
+#: src/GridText.c:6026
+msgid "password entry field"
+msgstr "parooli väli"
+
+#: src/GridText.c:6029
+msgid "checkbox"
+msgstr "märkeruut"
+
+#: src/GridText.c:6032
+msgid "radio button"
+msgstr "raadionupp"
+
+#: src/GridText.c:6035
+msgid "submit button"
+msgstr "postitamise nupp"
+
+#: src/GridText.c:6038
+msgid "reset button"
+msgstr "algväärtustamise nupp"
+
+#: src/GridText.c:6041
+msgid "popup menu"
+msgstr "hüpikmenüü"
+
+#: src/GridText.c:6044
+msgid "hidden form field"
+msgstr "peidetud vormi väli"
+
+#: src/GridText.c:6047
+msgid "text entry area"
+msgstr "tekstiala"
+
+#: src/GridText.c:6050
+msgid "range entry field"
+msgstr "vahemiku väli"
+
+#: src/GridText.c:6053
+msgid "file entry field"
+msgstr "faili väli"
+
+#: src/GridText.c:6056
+msgid "text-submit field"
+msgstr "teksti postitamise väli"
+
+#: src/GridText.c:6059
+msgid "image-submit button"
+msgstr "pildi postitamise nupp"
+
+#: src/GridText.c:6062
+msgid "keygen field"
+msgstr "võtme loomise väli"
+
+#: src/GridText.c:6065
+msgid "unknown form field"
+msgstr "tundmatu vormi väli"
+
+#: src/GridText.c:10066
+msgid "Can't open file for uploading"
+msgstr "Faili ei õnnestu üleslaadimiseks avada"
+
+#: src/GridText.c:11218
+#, c-format
+msgid "Submitting %s"
+msgstr "Postitan %s"
+
+#. ugliness has happened; inform user and do the best we can
+#: src/GridText.c:12375
+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:12581
+msgid "Wrap lines to fit displayed area?"
+msgstr "Murran read et mahtuda ekraanile?"
+
+#: src/GridText.c:12633
+msgid "Very long lines have been wrapped!"
+msgstr "Väga pikad read on murtud!"
+
+#: src/GridText.c:13079
+msgid "Very long lines have been truncated!"
+msgstr "Väga pikad read on lõigatud!"
+
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
+msgid "bytes"
+msgstr "baiti"
+
+#: src/HTAlert.c:155
+msgid "KB"
+msgstr "KB"
+
+#: src/HTAlert.c:274
+#, c-format
+msgid "Read %s of %s of data"
+msgstr "Loetud andmeid %s, kokku %s"
+
+#: src/HTAlert.c:276
+#, c-format
+msgid "Read %s of data"
+msgstr "Loetud andmeid %s"
+
+#: src/HTAlert.c:281
+#, c-format
+msgid ", %s/sec"
+msgstr ", %s/sek"
+
+#: src/HTAlert.c:290
+#, c-format
+msgid " (stalled for %s)"
+msgstr " (peatunud %s)"
+
+#: src/HTAlert.c:294
+#, c-format
+msgid ", ETA %s"
+msgstr ", ELA %s"
+
+#: src/HTAlert.c:301
+msgid " (Press 'z' to abort)"
+msgstr " (Katkestamiseks vajutage 'z')"
+
+#. 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:342 src/HTAlert.c:390
+msgid "yes"
+msgstr "jah"
+
+#: src/HTAlert.c:345 src/HTAlert.c:391
+msgid "no"
+msgstr "ei"
+
+#: src/HTML.c:5985
+msgid "Description:"
+msgstr "Kirjeldus:"
+
+#: src/HTML.c:5990
+msgid "(none)"
+msgstr "(puudub)"
+
+#: src/HTML.c:5994
+msgid "Filepath:"
+msgstr "Failitee:"
+
+#: src/HTML.c:5999
+msgid "(unknown)"
+msgstr "(tundmatu)"
+
+#: src/HTML.c:7452
+msgid "Document has only hidden links.  Use the 'l'ist command."
+msgstr "Dokumendis on ainult peidetud viited. Kasuta käsklust 'l'ist."
+
+#: src/HTML.c:7958
+msgid "Source cache error - disk full?"
+msgstr "Lähtefaili puhvri viga - ketas on täis?"
+
+#: src/HTML.c:7971
+msgid "Source cache error - not enough memory!"
+msgstr "Lähtefaili puhvri viga - mälu on otsas?"
+
+#: src/LYBookmark.c:167
+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 ""
+"     See fail on HTML esitus X Mosaic hotlist failist. Aegunud või\n"
+"     vigased viited saab eemaldada eemalda järg käsklusega, mis \n"
+"     käivitatakse tavaliselt vajutades klahvile 'R'. 'R' võib olla\n"
+"     ka teie süsteemi administraatori poolt ümber määratud."
+
+#: src/LYBookmark.c:379
+msgid ""
+"     You can delete links by the 'R' key<br>\n"
+"<ol>\n"
+msgstr ""
+"     Viiteid saate kustutada klahviga 'R'<br>\n"
+"<ol>\n"
+
+#: src/LYBookmark.c:382
+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 ""
+"     Viiteid saate eemaldada kasutades eemalda järg käsklust. See on\n"
+"     tavaliselt klahv 'R', aga võib olla ka ümber määratud teie enda\n"
+"     või teie süsteemi administraatori poolt."
+
+#: src/LYBookmark.c:386
+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 ""
+"     Selle faili muutmiseks, näiteks aegunud viidete eemaldamiseks\n"
+"     või viidete järjekorra muutmiseks, võib kasutada ka tavalist\n"
+"     tekstitoimetit."
+
+#: src/LYBookmark.c:389
+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 ""
+"Märkus: kui te muudate seda faili käsitsi, ei tohiks te\n"
+"      muuta ridade vormingut ega lisada HTML konstruktsioone.\n"
+"      Kontrollige, et järjed oleksid salvestatud ühe reana."
+
+#: src/LYBookmark.c:681
+#, c-format
+msgid "File may be recoverable from %s during this session"
+msgstr "Fail võib selle sessiooni jooksul olla taastatav failist %s"
+
+#.
+#. *  Neither the path as given nor any components examined by
+#. *  backing up were stat()able. - kw
+#.
+#: src/LYCgi.c:231
+msgid "Unable to access cgi script"
+msgstr "Cgi skripti ei saa kasutada"
+
+#: src/LYCgi.c:654 src/LYCgi.c:657
+msgid "Good Advice"
+msgstr "Hea soovitus"
+
+#: src/LYCgi.c:660
+msgid "An excellent http server for VMS is available via"
+msgstr "Suurepärane http server VMS süsteemile on saadav"
+
+#: src/LYCgi.c:667
+msgid "this link"
+msgstr "sellelt viitelt"
+
+#: src/LYCgi.c:671
+msgid "It provides state of the art CGI script support.\n"
+msgstr "See pakub korralikku CGI skriptide tuge.\n"
+
+#: src/LYClean.c:122
+msgid "Exiting via interrupt:"
+msgstr "Lõpetan katkestuse tõttu:"
+
+#: src/LYCookie.c:2462
+msgid "(from a previous session)"
+msgstr "(eelmisest sessioonist)"
+
+#: src/LYCookie.c:2522
+msgid "Maximum Gobble Date:"
+msgstr "Maksimaalne söömise aeg: "
+
+#: src/LYCookie.c:2564
+msgid "Internal"
+msgstr "Sisemine"
+
+#: src/LYCookie.c:2565
+msgid "cookie_domain_flag_set error, aborting program"
+msgstr "cookie_domain_flag_set viga, katkestan programmi töö"
+
+#: src/LYCurses.c:1004
+msgid "Terminal initialisation failed - unknown terminal type?"
+msgstr "Terminali initsialiseerimine ebaõnnestus - tundmatu terminali tüüp?"
+
+#: src/LYCurses.c:1426
+msgid "Terminal ="
+msgstr "Terminal ="
+
+#: src/LYCurses.c:1430
+msgid "You must use a vt100, 200, etc. terminal with this program."
+msgstr "Selle programmiga peate kasutama vt100, 200 vms terminali."
+
+#: src/LYCurses.c:1480
+msgid "Your Terminal type is unknown!"
+msgstr "Teie terminali tüüp on tundmatu!"
+
+#: src/LYCurses.c:1481
+msgid "Enter a terminal type:"
+msgstr "Sisestage terminali tüüp:"
+
+#: src/LYCurses.c:1495
+msgid "TERMINAL TYPE IS SET TO"
+msgstr "TERMINALI TÜÜBIKS ON SEATUD"
+
+#: src/LYCurses.c:1994
+#, c-format
+msgid ""
+"\n"
+"A Fatal error has occurred in %s Ver. %s\n"
+msgstr ""
+"\n"
+"Fataalne viga tekkis programmis %s Ver. %s\n"
+
+#: src/LYCurses.c:1996
+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"
+"Palun teavitage oma süsteemi administraatorit, et ta kinnitaks viga\n"
+"ja kui vea olemasolu on kindel, teavitaks lynx-dev postiloendit.\n"
+"Vearaport peab olema lakooniline kirjeldus käskidest ja/või URList,\n"
+"mis vea põhjustas, operatsioonisüsteemi nimi ja versiooni number,\n"
+"info TCPIP realisatsioonist ja muu asjakohane info.\n"
+
+#: src/LYEdit.c:249
+msgid "Editor killed by signal"
+msgstr "Toimeti tapeti signaaliga"
+
+#: src/LYEdit.c:251
+#, c-format
+msgid "Editor returned with error status, %s"
+msgstr "Toimeti lõpetas veakoodiga, %s"
+
+#: src/LYEdit.c:252
+msgid "reason unknown."
+msgstr "põhjus tundmatu."
+
+#: src/LYDownload.c:517
+msgid "Downloaded link:"
+msgstr "Laetud viide:"
+
+#: src/LYDownload.c:522
+msgid "Suggested file name:"
+msgstr "Soovitatav faili nimi:"
+
+#: src/LYDownload.c:527
+msgid "Standard download options:"
+msgstr "Standardsed allalaadimise võimalused:"
+
+#: src/LYDownload.c:528
+msgid "Download options:"
+msgstr "Allalaadimise võimalused:"
+
+#: src/LYDownload.c:544
+msgid "Save to disk"
+msgstr "Salvesta kettale"
+
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "Vaata faili"
+
+#: src/LYDownload.c:565
+msgid "Save to disk disabled."
+msgstr "Kettale salvestamine blokeeritud"
+
+#: src/LYDownload.c:569 src/LYPrint.c:1327
+msgid "Local additions:"
+msgstr "Lokaalsed lisad:"
+
+#: src/LYDownload.c:578 src/LYUpload.c:216
+msgid "No Name Given"
+msgstr "Nimi puudub"
+
+#: src/LYHistory.c:657
+msgid "You selected:"
+msgstr "Teie valik:"
+
+#: src/LYHistory.c:681 src/LYHistory.c:921
+msgid "(no address)"
+msgstr "(aadress puudub)"
+
+#: src/LYHistory.c:685
+msgid " (internal)"
+msgstr " (sisemine)"
+
+#: src/LYHistory.c:687
+msgid " (was internal)"
+msgstr " (oli sisemine)"
+
+#: src/LYHistory.c:785
+msgid " (From History)"
+msgstr " (Ajaloost)"
+
+#: src/LYHistory.c:841
+msgid "You visited (POSTs, bookmark, menu and list files excluded):"
+msgstr "Teie külastused (v.a. POST, järjed, menüü ja listingu failid):"
+
+#: src/LYHistory.c:1137
+msgid "(No messages yet)"
+msgstr "(Teateid pole veel)"
+
+#: src/LYLeaks.c:209
+msgid "Invalid pointer detected."
+msgstr "Tuvastati vigane viit."
+
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr "Järjend:"
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
+msgid "Pointer:"
+msgstr "Viit:"
+
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
+msgid "FileName:"
+msgstr "Failinimi:"
+
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
+msgid "LineCount:"
+msgstr "Ridu:"
+
+#: src/LYLeaks.c:249
+msgid "Memory leak detected."
+msgstr "Tuvastasin mälulekke."
+
+#: src/LYLeaks.c:257
+msgid "Contains:"
+msgstr "Sisaldab:"
+
+#: src/LYLeaks.c:270
+msgid "ByteSize:"
+msgstr "Maht:"
+
+#: src/LYLeaks.c:284
+msgid "realloced:"
+msgstr "uuesti võetud:"
+
+#: src/LYLeaks.c:307
+msgid "Total memory leakage this run:"
+msgstr "Mälulekkeid selles sessioonis kokku:"
+
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr "Mäluhaaramiste tipp"
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr "Baiti võetud"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr "Kokku malloc kasutamisi"
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr "Vabastamisi kokku"
+
+#: src/LYList.c:85
+msgid "References in "
+msgstr "Viited lehel "
+
+#: src/LYList.c:86
+msgid "this document:"
+msgstr "see dokument:"
+
+#: src/LYList.c:92
+msgid "Visible links:"
+msgstr "Nähtavad viited:"
+
+#: src/LYList.c:194 src/LYList.c:315
+msgid "Hidden links:"
+msgstr "Peidetud viited:"
+
+#: src/LYList.c:262
+msgid "References"
+msgstr "Viited"
+
+#: src/LYList.c:264
+msgid "Visible links"
+msgstr "Nähtavad viited"
+
+#: src/LYLocal.c:267
+#, c-format
+msgid "Unable to get status of '%s'."
+msgstr "Ei õnnestu lugeda '%s' olekut."
+
+#: src/LYLocal.c:301
+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:366
+#, c-format
+msgid "Unable to %s due to system error!"
+msgstr "Süsteemi vea tõttu ei õnnestu %s!"
+
+#. error return
+#: src/LYLocal.c:400
+#, c-format
+msgid "Probable failure to %s due to system error!"
+msgstr "Ilmselt %s viga süsteemi vea tõttu!"
+
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "eemalda %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr "puuduta %s"
+
+#: src/LYLocal.c:508
+#, c-format
+msgid "move %s to %s"
+msgstr "tõstan %s -> %s"
+
+#: src/LYLocal.c:548
+msgid "There is already a directory with that name!  Request ignored."
+msgstr "Sellise nimega kataloog on juba olemas! Ignoreerin päringut."
+
+#: src/LYLocal.c:550
+msgid "There is already a file with that name!  Request ignored."
+msgstr "Sellise nimega fail on juba olemas! Ignoreerin päringut."
+
+#: src/LYLocal.c:552
+msgid "The specified name is already in use!  Request ignored."
+msgstr "Antud nimi on juba kasutusel! Ignoreerin päringut."
+
+#: src/LYLocal.c:563
+msgid "Destination has different owner!  Request denied."
+msgstr "Sihtkohal on teine omanik! Keeldun päringut täitmast."
+
+#: src/LYLocal.c:566
+msgid "Destination is not a valid directory!  Request denied."
+msgstr "Sihtkoht ei ole lubatud kataloog! Keeldun päringut täitmast."
+
+#: src/LYLocal.c:588
+msgid "Remove all tagged files and directories?"
+msgstr "Eemaldan kõik märgitud failid ja kataloogid?"
+
+#: src/LYLocal.c:647
+msgid "Enter new location for tagged items: "
+msgstr "Sisestage valitud elementidele uus asukoht: "
+
+#: src/LYLocal.c:716
+msgid "Path too long"
+msgstr "Tee on liiga pikk"
+
+#: src/LYLocal.c:747
+msgid "Source and destination are the same location - request ignored!"
+msgstr "Allikas ja sihtkoht on samad - ignoreerin päringut!"
+
+#: src/LYLocal.c:805
+msgid "Enter new name for directory: "
+msgstr "Sisestage kataloogi uus nimi: "
+
+#: src/LYLocal.c:807
+msgid "Enter new name for file: "
+msgstr "Sisestage faili uus nimi: "
+
+#: src/LYLocal.c:819
+msgid "Illegal character (path-separator) found! Request ignored."
+msgstr "Leiti lubamatu sümbol (tee eraldaja)! Päringut ignoreeritakse."
+
+#: src/LYLocal.c:868
+msgid "Enter new location for directory: "
+msgstr "Sisestage kataloogi uus asukoht: "
+
+#: src/LYLocal.c:874
+msgid "Enter new location for file: "
+msgstr "Sisestage faili uus asukoht: "
+
+#: src/LYLocal.c:901
+msgid "Unexpected failure - unable to find trailing path separator"
+msgstr "Ootamatu tõrge - ei leia lõpust tee eraldajat"
+
+#: src/LYLocal.c:921
+msgid "Source and destination are the same location!  Request ignored!"
+msgstr "Allikas ja sihtkoht on samad! Ignoreerin päringut!"
+
+#: src/LYLocal.c:970
+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:972
+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:1001
+msgid "This feature not yet implemented!"
+msgstr "Seda omadust ei ole veel realiseeritud!"
+
+#: src/LYLocal.c:1019
+msgid "Enter name of file to create: "
+msgstr "Sisestage loodavale failile nimi: "
+
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
+msgid "Illegal redirection \"//\" found! Request ignored."
+msgstr "Leiti vigane ümbersuunamine \"//\"! Ignoreerin päringut."
+
+#: src/LYLocal.c:1061
+msgid "Enter name for new directory: "
+msgstr "Sisestage nimi uuele kataloogile: "
+
+#: src/LYLocal.c:1106
+msgid "Create file or directory (f or d): "
+msgstr "Luua fail või kataloog (f või d): "
+
+#: src/LYLocal.c:1146
+#, c-format
+msgid "Remove '%s' and all of its contents?"
+msgstr "Eemaldan '%s' ja kogu selle sisu?"
+
+#: src/LYLocal.c:1149
+msgid "Remove directory and all of its contents?"
+msgstr "Eemaldan kataloogi ja kogu selle sisu?"
+
+#: src/LYLocal.c:1153
+#, c-format
+msgid "Remove file '%s'?"
+msgstr "Eemaldan faili '%s'?"
+
+#: src/LYLocal.c:1155
+msgid "Remove file?"
+msgstr "Eemaldan faili?"
+
+#: src/LYLocal.c:1160
+#, c-format
+msgid "Remove symbolic link '%s'?"
+msgstr "Eemaldan nimeviite '%s'?"
+
+#: src/LYLocal.c:1162
+msgid "Remove symbolic link?"
+msgstr "Eemaldan nimeviite?"
+
+#: src/LYLocal.c:1248
+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:1278
+msgid "Unable to open permit options file"
+msgstr "Õiguste seadete faili avamine ebaõnnestus"
+
+#: src/LYLocal.c:1305
+msgid "Specify permissions below:"
+msgstr "Määrake õigused allpool:"
+
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
+msgid "Owner:"
+msgstr "Omanik:"
+
+#: src/LYLocal.c:1322
+msgid "Group"
+msgstr "Grupp:"
+
+#: src/LYLocal.c:1338
+msgid "Others:"
+msgstr "Ülejäänud:"
+
+#: src/LYLocal.c:1356
+msgid "form to permit"
+msgstr "vorm seadmaks õiguseid"
+
+#: src/LYLocal.c:1452
+msgid "Invalid mode format."
+msgstr "Vigane moodi formaat."
+
+#: src/LYLocal.c:1456
+msgid "Invalid syntax format."
+msgstr "Vigane süntaksi formaat."
+
+#: src/LYLocal.c:1645
+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:1825
+msgid "NULL URL pointer"
+msgstr "NULL URL viit"
+
+#: src/LYLocal.c:1908
+#, c-format
+msgid "Executing %s "
+msgstr "Täidan %s "
+
+#: src/LYLocal.c:1911
+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:1985
+msgid "Current directory:"
+msgstr "Jooksev kataloog:"
+
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
+msgid "Current selection:"
+msgstr "Praegune valik:"
+
+#: src/LYLocal.c:1992
+msgid "Nothing currently selected."
+msgstr "Midagi ei ole valitud."
+
+#: src/LYLocal.c:2007
+msgid "tagged item:"
+msgstr "märgitud element:"
+
+#: src/LYLocal.c:2007
+msgid "tagged items:"
+msgstr "märgitud elemendid:"
+
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
+msgid "Illegal filename; request ignored."
+msgstr "Vigane failinimi; ignoreerin päringut."
+
+#. directory not writable
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
+msgid "Install in the selected directory not permitted."
+msgstr "Valitud kataloogi ei ole lubatud installeerida."
+
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr "Valik ei ole kataloog! Ignoreerin päringut."
+
+#: src/LYLocal.c:2276
+msgid "Just a moment, ..."
+msgstr "Üks hetk, ..."
+
+#: src/LYLocal.c:2293
+msgid "Error buiding install args"
+msgstr "Viga install argumentide koostamisel"
+
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
+#, c-format
+msgid "Source and target are the same: %s"
+msgstr "Lähte ja sihtkoht on samad: %s"
+
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
+#, c-format
+msgid "Already in target directory: %s"
+msgstr "On juba sihtkataloogis: %s"
+
+#: src/LYLocal.c:2362
+msgid "Installation complete"
+msgstr "Installeerimine on valmis"
+
+#: src/LYLocal.c:2551
+msgid "Temporary URL or list would be too long."
+msgstr "Ajutine URL või loend oleks liiga pikk."
+
+#: src/LYMail.c:534
+msgid "Sending"
+msgstr "Saadan"
+
+#: src/LYMail.c:1024
+#, c-format
+msgid "The link   %s :?: %s \n"
+msgstr "Viide   %s :?: %s \n"
+
+#: src/LYMail.c:1026
+#, c-format
+msgid "called \"%s\"\n"
+msgstr "nimega \"%s\"\n"
+
+#: src/LYMail.c:1027
+#, c-format
+msgid "in the file \"%s\" called \"%s\"\n"
+msgstr "failis \"%s\" nimega \"%s\"\n"
+
+#: src/LYMail.c:1028
+msgid "was requested but was not available."
+msgstr "sooviti, aga ei ole kasutatav."
+
+#: src/LYMail.c:1029
+msgid "Thought you might want to know."
+msgstr "Ma arvasin, et te sooviksite seda teada."
+
+#: src/LYMail.c:1031
+msgid "This message was automatically generated by"
+msgstr "See teade on automaatselt loodud"
+
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr "Süsteemset e-posti programmi ei ole seadistatud"
+
+#: src/LYMain.c:969
+msgid "No Winsock found, sorry."
+msgstr "Winsock puudub, kahju."
+
+#: src/LYMain.c:1170
+msgid "You MUST define a valid TMP or TEMP area!\n"
+msgstr "Te PEATE defineerima kehtiva TMP või TEMP piirkonna!\n"
+
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
+msgid "No such directory"
+msgstr "Sellist kataloogi ei ole"
+
+#: src/LYMain.c:1436
+#, c-format
+msgid ""
+"\n"
+"Configuration file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"Seadete faili %s ei ole.\n"
+"\n"
+
+#: src/LYMain.c:1446
+msgid ""
+"\n"
+"Lynx character sets not declared.\n"
+"\n"
+msgstr ""
+"\n"
+"Lynx kooditabeleid ei ole deklareeritud.\n"
+"\n"
+
+#: src/LYMain.c:1475
+msgid ""
+"\n"
+"Lynx edit map not declared.\n"
+"\n"
+msgstr ""
+"\n"
+"Lynx kaadri toimeti ei ole deklareeritud.\n"
+"\n"
+
+#: src/LYMain.c:1504
+#, c-format
+msgid ""
+"\n"
+"Lynx file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"Lynx fail %s ei ole kasutatav.\n"
+"\n"
+
+#: src/LYMain.c:1743
+msgid "Warning:"
+msgstr "Hoiatus:"
+
+#: src/LYMain.c:2293
+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:2540 src/LYMain.c:2588
+#, c-format
+msgid "Lynx: ignoring unrecognized charset=%s\n"
+msgstr "Lynx: ignoreerin tundmatut kooditabelit %s\n"
+
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
+msgstr "%s Versioon %s (%s)\n"
+
+#: src/LYMain.c:3143
+#, c-format
+msgid "Built on %s %s %s\n"
+msgstr "Ehitatud %s masinal %s %s\n"
+
+#: src/LYMain.c:3166
+msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+msgstr "Autoriõiguseid omavad University of Kansas, CERN ja teised.\n"
+
+#: src/LYMain.c:3168
+msgid "Distributed under the GNU General Public License.\n"
+msgstr "Levitatakse GNU üldise avaliku litsensiga.\n"
+
+#: src/LYMain.c:3170
+msgid ""
+"See http://lynx.isc.org/ and the online help for more information.\n"
+"\n"
+msgstr ""
+"Abi ja muud infot leiate aadressil http://lynx.isc.org/.\n"
+"\n"
+
+#: src/LYMain.c:3919
+#, c-format
+msgid "USAGE: %s [options] [file]\n"
+msgstr "KASUTAMINE: %s [võtmed] [fail]\n"
+
+#: src/LYMain.c:3920
+msgid "Options are:\n"
+msgstr "Võtmed on:\n"
+
+#: src/LYMain.c:4191
+#, c-format
+msgid "%s: Invalid Option: %s\n"
+msgstr "%s: Vigane võti: %s\n"
+
+#: src/LYMainLoop.c:539
+#, c-format
+msgid "Internal error: Invalid mouse link %d!"
+msgstr "Sisemine viga: Vigane hiire viide %d!"
+
+#.
+#. * Make a name for this new URL.
+#.
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
+msgid "A URL specified by the user"
+msgstr "Kasutaja poolt antud URL"
+
+#: src/LYMainLoop.c:1110
+msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
+msgstr "multipart/form-data kodeering ei ole veel toetatud! Ei saa saata."
+
+#.
+#. *  Make a name for this help file.
+#.
+#: src/LYMainLoop.c:3053
+msgid "Help Screen"
+msgstr "Abiinfo ekraan"
+
+#: src/LYMainLoop.c:3177
+msgid "System Index"
+msgstr "Süsteemi indeks"
+
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
+msgid "Entry into main screen"
+msgstr "Sisenemine põhiekraanile"
+
+#: src/LYMainLoop.c:3824
+msgid "No next document present"
+msgstr "Järgmist dokumenti pole"
+
+#: src/LYMainLoop.c:4131
+msgid "charset for this document specified explicitly, sorry..."
+msgstr "kahjuks on selle dokumendi kooditabel üheselt määratud..."
+
+#: src/LYMainLoop.c:5004
+msgid "cd to:"
+msgstr "mine kataloogi:"
+
+#: src/LYMainLoop.c:5031
+msgid "A component of path is not a directory"
+msgstr "Tee komponent ei ole kataloog"
+
+#: src/LYMainLoop.c:5034
+msgid "failed to change directory"
+msgstr "kataloogi ei õnnestu vahetada"
+
+#: src/LYMainLoop.c:6204
+msgid "Reparsing document under current settings..."
+msgstr "Parsin dokumendi uuesti jooksvate seadetega..."
+
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
+#, 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:6834
+msgid "TABLE center enable."
+msgstr "TABELI tsentreerimine lubatud."
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr "TABELI tsentreerimine blokeeritud."
+
+#: src/LYMainLoop.c:6914
+msgid "Current URL is empty."
+msgstr "Jooksev URL on tühi."
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr "Lõikepuhvrisse kopeerimine ebaõnnestus."
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr "Panin dokumendi URLi lõikepuhvrisse."
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr "Panin viite URLi lõikepuhvrisse."
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr "Lõikepuhvris URLe ei ole."
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
+msgid "-index-"
+msgstr "-indeks-"
+
+#: src/LYMainLoop.c:7731
+msgid "lynx: Can't access startfile"
+msgstr "lynx: Ei õnnestu laadida esilehte"
+
+#: src/LYMainLoop.c:7744
+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:7745
+msgid "      Exiting..."
+msgstr "      Lõpetan..."
+
+#: src/LYMainLoop.c:7788
+msgid "-more-"
+msgstr "-veel-"
+
+#. Enable scrolling.
+#: src/LYNews.c:187
+msgid "You will be posting to:"
+msgstr "Te postitate gruppi:"
+
+#.
+#. *  Get the mail address for the From header,
+#. *  offering personal_mail_address as default.
+#.
+#: src/LYNews.c:196
+msgid ""
+"\n"
+"\n"
+" Please provide your mail address for the From: header\n"
+msgstr ""
+"\n"
+"\n"
+" Palun teie aadress From: päisesse\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:214
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Subject: header\n"
+msgstr ""
+"\n"
+"\n"
+" Palun lisage või muutke teema Subject: päises\n"
+
+#: src/LYNews.c:303
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Organization: header\n"
+msgstr ""
+"\n"
+"\n"
+" Palun lisage või muutke Organization: päises\n"
+
+#.
+#. *  Use the built in line editior.
+#.
+#: src/LYNews.c:360
+msgid ""
+"\n"
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+"\n"
+" Palun sisestage oma teade."
+
+#: src/LYNews.c:406
+msgid "Message has no original text!"
+msgstr "Teatel puudub algne tekst!"
+
+#: src/LYOptions.c:746
+msgid "review/edit B)ookmarks files"
+msgstr "vaara/toimeta B=järgede faile"
+
+#: src/LYOptions.c:748
+msgid "B)ookmark file: "
+msgstr "B=järgede fail: "
+
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
+#, c-format
+msgid "Use %s to invoke the Options menu!"
+msgstr "Seadete menüü saamiseks kasutage %s!"
+
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr "((!) märgitud seadeid ei salvestata)"
+
+#: src/LYOptions.c:3261
+msgid "General Preferences"
+msgstr "Üldised seaded"
+
+#. ***************************************************************
+#. User Mode: SELECT
+#: src/LYOptions.c:3265
+msgid "User mode"
+msgstr "Kasutaja mood"
+
+#. Editor: INPUT
+#: src/LYOptions.c:3271
+msgid "Editor"
+msgstr "Toimeti"
+
+#. Search Type: SELECT
+#: src/LYOptions.c:3276
+msgid "Type of Search"
+msgstr "Otsingutüüp"
+
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
+#. Cookies: SELECT
+#: src/LYOptions.c:3285
+msgid "Cookies"
+msgstr "Präänikud"
+
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
+msgid "Keyboard Input"
+msgstr "Sisend klaviatuurilt"
+
+#. ***************************************************************
+#. Keypad Mode: SELECT
+#: src/LYOptions.c:3316
+msgid "Keypad mode"
+msgstr "Klahvistiku mood"
+
+#. Emacs keys: ON/OFF
+#: src/LYOptions.c:3322
+msgid "Emacs keys"
+msgstr "Emacs klahvid"
+
+#. VI Keys: ON/OFF
+#: src/LYOptions.c:3328
+msgid "VI keys"
+msgstr "VI klahvid"
+
+#. Line edit style: SELECT
+#. well, at least 2 line edit styles available
+#: src/LYOptions.c:3335
+msgid "Line edit style"
+msgstr "Reatoimeti mood"
+
+#. Keyboard layout: SELECT
+#: src/LYOptions.c:3347
+msgid "Keyboard layout"
+msgstr "Klaviatuuri asetus"
+
+#.
+#. * Display and Character Set
+#.
+#: src/LYOptions.c:3360
+msgid "Display and Character Set"
+msgstr "Ekraan ja kooditabel"
+
+#. ***************************************************************
+#. Display Character Set: SELECT
+#: src/LYOptions.c:3364
+msgid "Display character set"
+msgstr "Ekraani kooditabel"
+
+#: src/LYOptions.c:3393
+msgid "Assumed document character set"
+msgstr "Eeldatav dokumendi kooditabel"
+
+#.
+#. * 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:3413
+msgid "CJK mode"
+msgstr "CJK mood"
+
+#: src/LYOptions.c:3415
+msgid "Raw 8-bit"
+msgstr "Puhas 8-bitti"
+
+#. X Display: INPUT
+#: src/LYOptions.c:3423
+msgid "X Display"
+msgstr "X Ekraan"
+
+#.
+#. * Document Appearance
+#.
+#: src/LYOptions.c:3429
+msgid "Document Appearance"
+msgstr "Dokumendi esitamine"
+
+#: src/LYOptions.c:3435
+msgid "Show color"
+msgstr "Näita värve"
+
+#. Show cursor: ON/OFF
+#: src/LYOptions.c:3459
+msgid "Show cursor"
+msgstr "Näita kursorit"
+
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr "Näita kerimisriba"
+
+#. Select Popups: ON/OFF
+#: src/LYOptions.c:3473
+msgid "Popups for select fields"
+msgstr "Hüpikud valikuväljadele"
+
+#. HTML error recovery: SELECT
+#: src/LYOptions.c:3479
+msgid "HTML error recovery"
+msgstr "HTML veatöötlus"
+
+#. Show Images: SELECT
+#: src/LYOptions.c:3485
+msgid "Show images"
+msgstr "Näita pilte"
+
+#. Verbose Images: ON/OFF
+#: src/LYOptions.c:3499
+msgid "Verbose images"
+msgstr "Verbaalsed pildid"
+
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3507
+msgid "Headers Transferred to Remote Servers"
+msgstr "Serverile saadetavad päised"
+
+#. ***************************************************************
+#. Mail Address: INPUT
+#: src/LYOptions.c:3511
+msgid "Personal mail address"
+msgstr "Isiklik e-posti aadress"
+
+#. Preferred Document Character Set: INPUT
+#: src/LYOptions.c:3516
+msgid "Preferred document character set"
+msgstr "Eelistatuim dokumendi kooditabel"
+
+#. Preferred Document Language: INPUT
+#: src/LYOptions.c:3521
+msgid "Preferred document language"
+msgstr "Eelistatuim dokumendi keel"
+
+#: src/LYOptions.c:3527
+msgid "User-Agent header"
+msgstr "User-Agent päis"
+
+#.
+#. * Listing and Accessing Files
+#.
+#: src/LYOptions.c:3535
+msgid "Listing and Accessing Files"
+msgstr "Failide näitamine ja kasutamine"
+
+#. ***************************************************************
+#. FTP sort: SELECT
+#: src/LYOptions.c:3539
+msgid "FTP sort criteria"
+msgstr "FTP järjestamine"
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3546
+msgid "Local directory sort criteria"
+msgstr "Lokaalse kataloogi järjestamine"
+
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+msgid "Local directory sort order"
+msgstr "Lokaalse kataloogi järjestamine"
+
+#: src/LYOptions.c:3561
+msgid "Show dot files"
+msgstr "Näita punktiga faile"
+
+#: src/LYOptions.c:3569
+msgid "Execution links"
+msgstr "Täidetavad viited"
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3589
+msgid "Show transfer rate"
+msgstr "Näita laadimise kiirust"
+
+#.
+#. * Special Files and Screens
+#.
+#: src/LYOptions.c:3598
+msgid "Special Files and Screens"
+msgstr "Spetsiaalfailid ja ekraanid"
+
+#: src/LYOptions.c:3603
+msgid "Multi-bookmarks"
+msgstr "Järgede failid"
+
+#: src/LYOptions.c:3611
+msgid "Review/edit Bookmarks files"
+msgstr "vaata/toimeta järgede faile"
+
+#: src/LYOptions.c:3613
+msgid "Goto multi-bookmark menu"
+msgstr "Mine mitme-järje menüüsse"
+
+#: src/LYOptions.c:3615
+msgid "Bookmarks file"
+msgstr "Järgede fail"
+
+#. Visited Pages: SELECT
+#: src/LYOptions.c:3621
+msgid "Visited Pages"
+msgstr "Külastatud lehed"
+
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr "Vaata faili"
+
+#: src/LYPrint.c:952
+msgid " Print job complete.\n"
+msgstr " Trükitöö lõpetas.\n"
+
+#: src/LYPrint.c:1281
+msgid "Document:"
+msgstr "Dokument:"
+
+#: src/LYPrint.c:1282
+msgid "Number of lines:"
+msgstr "Ridu:"
+
+#: src/LYPrint.c:1283
+msgid "Number of pages:"
+msgstr "Lehekülgi:"
+
+#: src/LYPrint.c:1284
+msgid "pages"
+msgstr "lehekülge"
+
+#: src/LYPrint.c:1284
+msgid "page"
+msgstr "lehekülg"
+
+#: src/LYPrint.c:1285
+msgid "(approximately)"
+msgstr "(umbkaudu)"
+
+#: src/LYPrint.c:1290
+msgid "Some print functions have been disabled!"
+msgstr "Osad trükkimise funktsioonid on blokeeritud!"
+
+#: src/LYPrint.c:1294
+msgid "Standard print options:"
+msgstr "Standardsed trükkimise võimalused:"
+
+#: src/LYPrint.c:1295
+msgid "Print options:"
+msgstr "Trükkimise võimalused:"
+
+#: src/LYPrint.c:1302
+msgid "Save to a local file"
+msgstr "Salvesta lokaalsesse faili"
+
+#: src/LYPrint.c:1304
+msgid "Save to disk disabled"
+msgstr "Kettale salvestamine on blokeeritud"
+
+#: src/LYPrint.c:1311
+msgid "Mail the file"
+msgstr "Postita fail"
+
+#: src/LYPrint.c:1318
+msgid "Print to the screen"
+msgstr "Väljasta ekraanile"
+
+#: src/LYPrint.c:1323
+msgid "Print out on a printer attached to your vt100 terminal"
+msgstr "Trüki vt100 terminaliga ühendatud printerile"
+
+#: src/LYReadCFG.c:339
+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 ""
+"Süntaksi viga seadete failis COLOR parsimisel:\n"
+"Rida peab olema kujul:\n"
+"COLOR:TÄISARV:ESIPLAAN:TAUST\n"
+"\n"
+"ESIPLAAN ja TAUST peab olema üks järgnevaist:\n"
+"Sõne 'nocolor' või 'default', või\n"
+
+#: src/LYReadCFG.c:352
+msgid "Offending line:"
+msgstr "Vigane rida:"
+
+#: src/LYReadCFG.c:638
+#, c-format
+msgid "key remapping of %s to %s for %s failed\n"
+msgstr "klahvi %s -> %s ümbermääramine %s jaoks ebaõnnestus\n"
+
+#: src/LYReadCFG.c:645
+#, c-format
+msgid "key remapping of %s to %s failed\n"
+msgstr "klahvi %s -> %s ümbermääramine ebaõnnestus\n"
+
+#: src/LYReadCFG.c:666
+#, c-format
+msgid "invalid line-editor selection %s for key %s, selecting all\n"
+msgstr "vigane rea-toimeti valik %s klahvile %s, valik kõik\n"
+
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
+msgstr "rea-toimeti klahviseose seadmine %s (0x%x) -> 0x%x %s jaoks ebaõnnestus\n"
+
+#: src/LYReadCFG.c:711
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
+msgstr "rea-toimeti klahviseose seadmine klahv %s (0x%x) %s jaoks ebaõnnestus\n"
+
+#: src/LYReadCFG.c:816
+#, c-format
+msgid "Lynx: cannot start, CERN rules file %s is not available\n"
+msgstr "Lynx: ei saa startida, CERN reeglite fail %s ei ole kasutatav\n"
+
+#: src/LYReadCFG.c:818
+msgid "(no name)"
+msgstr "(nimetu)"
+
+#: src/LYReadCFG.c:1782
+#, 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:1784
+#, c-format
+msgid "Last attempted include was '%s',\n"
+msgstr "Viimane kaasata üritatud fail oli '%s',\n"
+
+#: src/LYReadCFG.c:1785
+#, c-format
+msgid "included from '%s'.\n"
+msgstr "kaasatud failist '%s'.\n"
+
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
+msgid "The following is read from your lynx.cfg file."
+msgstr "Järgnev on loetud teie lynx.cfg failist."
+
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
+msgid "Please read the distribution"
+msgstr "Lisainfo jaoks lugege palun"
+
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
+msgid "for more comments."
+msgstr "paketis olevat faili."
+
+#: src/LYReadCFG.c:2244
+msgid "RELOAD THE CHANGES"
+msgstr "MUUTUSTE LAADIMINE"
+
+#: src/LYReadCFG.c:2253
+msgid "Your primary configuration"
+msgstr "Teie primaarsed seaded"
+
+#: src/LYShowInfo.c:129
+msgid "Directory that you are currently viewing"
+msgstr "Praegu vaadatav kataloog"
+
+#: src/LYShowInfo.c:132
+msgid "Name:"
+msgstr "Nimi:"
+
+#: src/LYShowInfo.c:135
+msgid "URL:"
+msgstr "URL:"
+
+#: src/LYShowInfo.c:146
+msgid "Directory that you have currently selected"
+msgstr "Praegu valitud kataloog"
+
+#: src/LYShowInfo.c:149
+msgid "File that you have currently selected"
+msgstr "Praegu valitud fail"
+
+#: src/LYShowInfo.c:153
+msgid "Symbolic link that you have currently selected"
+msgstr "Praegu valitud nimeviide"
+
+#: src/LYShowInfo.c:157
+msgid "Item that you have currently selected"
+msgstr "Praegu valitud element"
+
+#: src/LYShowInfo.c:159
+msgid "Full name:"
+msgstr "Täisnimi"
+
+#: src/LYShowInfo.c:168
+msgid "Unable to follow link"
+msgstr "Viidet ei õnnestu järgida"
+
+#: src/LYShowInfo.c:170
+msgid "Points to file:"
+msgstr "Osutab failile: "
+
+#: src/LYShowInfo.c:175
+msgid "Name of owner:"
+msgstr "Omaniku nimi"
+
+#: src/LYShowInfo.c:178
+msgid "Group name:"
+msgstr "Grupi nimi"
+
+#: src/LYShowInfo.c:181
+msgid "File size:"
+msgstr "Faili suurus"
+
+#: src/LYShowInfo.c:187
+msgid "Creation date:"
+msgstr "Loodud:"
+
+#: src/LYShowInfo.c:190
+msgid "Last modified:"
+msgstr "Viimati muudetud:"
+
+#: src/LYShowInfo.c:193
+msgid "Last accessed:"
+msgstr "Viimane kasutamine:"
+
+#: src/LYShowInfo.c:195
+msgid "Access Permissions"
+msgstr "Kasutamise õigused"
+
+#: src/LYShowInfo.c:261
+msgid "File that you are currently viewing"
+msgstr "Fail mida te parajasti vaatate"
+
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
+msgid "Linkname:"
+msgstr "Viite nimi:"
+
+#: src/LYShowInfo.c:279 src/LYShowInfo.c:291
+msgid "Charset:"
+msgstr "Kooditabel:"
+
+#: src/LYShowInfo.c:297
+msgid "Server:"
+msgstr "Server:"
+
+#: src/LYShowInfo.c:300
+msgid "Date:"
+msgstr "Kuupäev:"
+
+#: src/LYShowInfo.c:303
+msgid "Last Mod:"
+msgstr "Viimane muutmine:"
+
+#: src/LYShowInfo.c:309
+msgid "&nbsp;Expires:"
+msgstr "&nbsp;Aegub:"
+
+#: src/LYShowInfo.c:313
+msgid "Cache-Control:"
+msgstr "Vahemälu-kontroll:"
+
+#: src/LYShowInfo.c:317
+msgid "Content-Length:"
+msgstr "Sisu-pikkus:"
+
+#: src/LYShowInfo.c:322
+msgid "Language:"
+msgstr "Keel:"
+
+#: src/LYShowInfo.c:329
+msgid "Post Data:"
+msgstr "Post andmed:"
+
+#: src/LYShowInfo.c:333
+msgid "Post Content Type:"
+msgstr "Post sisu tüüp:"
+
+#: src/LYShowInfo.c:342
+msgid "Owner(s):"
+msgstr "Omanik(ud):"
+
+#: src/LYShowInfo.c:345
+msgid "size:"
+msgstr "maht:"
+
+#: src/LYShowInfo.c:345
+msgid "lines"
+msgstr "ridu"
+
+#: src/LYShowInfo.c:348
+msgid "mode:"
+msgstr "mood:"
+
+#: src/LYShowInfo.c:350
+msgid "forms mode"
+msgstr "vormide mood"
+
+#: src/LYShowInfo.c:352
+msgid "source"
+msgstr "lähtetekst"
+
+#: src/LYShowInfo.c:352
+msgid "normal"
+msgstr "normaalne"
+
+#: src/LYShowInfo.c:353
+msgid ", safe"
+msgstr ", turvaline"
+
+#: src/LYShowInfo.c:354
+msgid ", via internal link"
+msgstr ", sisemise viitega"
+
+#: src/LYShowInfo.c:360
+msgid ", no-cache"
+msgstr ", mitte-puhverdatav"
+
+#: src/LYShowInfo.c:362
+msgid ", ISMAP script"
+msgstr ", ISMAP skript"
+
+#: src/LYShowInfo.c:364
+msgid ", bookmark file"
+msgstr ", järgede fail"
+
+#: src/LYShowInfo.c:373
+msgid "Link that you currently have selected"
+msgstr "Praegu valitud viide"
+
+#: src/LYShowInfo.c:386
+msgid "Method:"
+msgstr "Meetod:"
+
+#: src/LYShowInfo.c:391
+msgid "Enctype:"
+msgstr "Kodeering:"
+
+#: src/LYShowInfo.c:403
+msgid "(Form field)"
+msgstr "(Vormi väli)"
+
+#: src/LYShowInfo.c:418
+msgid "No Links on the current page"
+msgstr "Jooksval lehel ei ole viiteid"
+
+#: src/LYStyle.c:278
+#, 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 ""
+"Süntaksi viga lss failis stiili parsimisel:\n"
+"[%s]\n"
+"Rida peab olema kujul:\n"
+"OBJEKT:MONO:COLOR (n. em:bold:brightblue:white)\n"
+"kus OBJEKT on üks järgnevaist EM,STRONG,B,I,U,BLINK jne.\n"
+"\n"
+
+#: src/LYTraversal.c:107
+msgid "here is a list of the history stack so that you may rebuild"
+msgstr "siin on väljavõte ajaloo magasinist, saate vajadusel taastada"
+
+#: src/LYUpload.c:78
+msgid "ERROR! - upload command is misconfigured"
+msgstr "VIGA! - üleslaadimise käsklus on vigaselt seadistatud"
+
+#: src/LYUpload.c:100
+msgid "Illegal redirection \"../\" found! Request ignored."
+msgstr "Leidsin vigase ümbersuunamise \"../\"! Ignoreerin päringut."
+
+#: src/LYUpload.c:103
+msgid "Illegal character \"/\" found! Request ignored."
+msgstr "Leidsin lubamatu sümboli \"/\"! Ignoreerin päringut."
+
+#: src/LYUpload.c:106
+msgid "Illegal redirection using \"~\" found! Request ignored."
+msgstr "Leidsin lubamatu ümbersuunamine, mis kasutab \"~\"! Ignoreerin päringut."
+
+#: src/LYUpload.c:163
+msgid "Unable to upload file."
+msgstr "Faili ei õnnestu üles laadida."
+
+#: src/LYUpload.c:206
+msgid "Upload To:"
+msgstr "Lae üles:"
+
+#: src/LYUpload.c:207
+msgid "Upload options:"
+msgstr "Üleslaadimise seaded:"
+
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr "Panin dokumendi allalaadimise URLi lõikepuhvrisse."
+
+#: src/LYUtils.c:2468
+msgid "Unexpected access protocol for this URL scheme."
+msgstr "Selle URL skeemiga kasutatakse ootamatut kasutamise protokolli."
+
+#: src/LYUtils.c:3294
+msgid "Too many tempfiles"
+msgstr "Liiga palju ajutisi faile"
+
+#: src/LYUtils.c:3595
+msgid "unknown restriction"
+msgstr "tundmatu piirang"
+
+#: src/LYUtils.c:3626
+msgid "No restrictions set.\n"
+msgstr "Piiranguid pole.\n"
+
+#: src/LYUtils.c:3629
+msgid "Restrictions set:\n"
+msgstr "Seatud piirangud:\n"
+
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr "Ei leie HOME kataloogi"
+
+#: src/LYrcFile.c:21
+msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
+msgstr "Tavaliselt blokeeritud. Vaadake lynx.cfg failis ENABLE_LYNXRC kohta\n"
+
+#: src/LYrcFile.c:295
+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 ""
+"accept_all_cookies võimaldab kasutajal paluda Lynxil automaatselt\n"
+"võtta vastu kõik pakutavad präänikud. Vaikeseade on \"FALSE\", mis\n"
+"tähendab, et iga prääniku korral küsitakse kasutaja nõusolekut.\n"
+"Kõikide präänikute vastu võtmiseks kasutage väärtust \"TRUE\".\n"
+
+#: src/LYrcFile.c:302
+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 ""
+"bookmark_file määrab vaikimisi järgede faili nime ja asukoha, kuhu\n"
+"kasutaja saab salvestada viiteid hilisemaks kasutamiseks.\n"
+
+#: src/LYrcFile.c:307
+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 ""
+"Kui case_sensitive_searching väärtus on \"on\", siis teostatakse klahvidega\n"
+"'s' või '/' antud otsing tõstutundlikult. Väärtuse \"off\" korral on otsing\n"
+"tõstutundetu. Vaikimisi on tavaliselt \"off\".\n"
+
+#: src/LYrcFile.c:312
+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 ""
+"character_set definitsioon kontrollib teie ekraanil 8 bitiste sümbolite\n"
+"esitust. Kui 8 bitised sümbolid ei ole teie ekraanil esitatud korrektselt,\n"
+"võite proovida kasutada muud 8 bitist kooditabelit või kasutada 7 bitiseid\n"
+"lähendusi.\n"
+"Lubatud kooditabelid on:\n"
+
+#: src/LYrcFile.c:319
+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 ""
+"cookie_accept_domains ja cookie_reject_domains on komadega eraldatud\n"
+"loend doomenitest, mille pakutavad präänikud peaks Lynx automaatselt\n"
+"vastu võtma või tagasi lükkama. Kui doomen on esindatud mõlemas seades,\n"
+"eelistatakse tagasi lükkamist. accept_all_cookies parameeter käib\n"
+"siinsetest määrangutest üle.\n"
+
+#: src/LYrcFile.c:327
+msgid ""
+"cookie_file specifies the file from which to read persistent cookies.\n"
+"The default is ~/.lynx_cookies.\n"
+msgstr ""
+"cookie_file määrab faili, millest loetakse püsivad präänikud.\n"
+"Vaikeväärtus on ~/.lynx_cookies.\n"
+
+#: src/LYrcFile.c:332
+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 ""
+"cookie_loose_invalid_domains, cookie_strict_invalid_domains ja\n"
+"cookie_query_invalid_domains on komadega eraldatud loendid doomenitest,\n"
+"millele rakendatakse erinevaid kehtivuse piiranguid. \"strict\" kontrolli\n"
+"korral nõutakse ranget RFC2109 vastavust. \"loose\" kontrolli korral\n"
+"lubatakse seada vigase tee või doomeni atribuudiga präänikuid. Kõikide\n"
+"doomenite korral küsitakse vigase tee või doomeni korral luba kasutajalt.\n"
+
+#: src/LYrcFile.c:346
+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 määrab kataloogi esituse järjestuse DIRED_SUPPORT sees\n"
+"(kui on realiseeritud).  Vaikimisi on \"ORDER_BY_NAME\"\n"
+
+#: src/LYrcFile.c:351
+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 ""
+"dir_list_styles määraba karaloogi listingu stiili DIRED_SUPPORT\n"
+"keskkonnas (kui see on realiseeritud). Vaikeväärtus on \"MIXED_STYLE\",\n"
+"mis järjestab läbisegi nii failid, kui kataloogid. \"FILES_FIRST\"\n"
+"järjestab esimesteks failid ja \"DIRECTORIES_FIRST\" järjestab esimesteks\n"
+"kataloogid.\n"
+
+#: src/LYrcFile.c:359
+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 ""
+"Kui emacs_keys väärtus on \"on\", siis on lubatud tavalised EMACS stiilis\n"
+"liikumise klahvid:\n"
+"  ^N = alla     ^P = üles\n"
+"  ^B = vasakule ^F = paremale\n"
+
+#: src/LYrcFile.c:365
+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 ""
+"file_editor määrab toimeti, mida käivitatakse lokaalsete failide\n"
+"toimetamiseks või kirja saatmiseks. Kui toimetit ei ole määratud, siis\n"
+"failide toimetamine on blokeeritud, välja arvatud juhul, kui toimeti\n"
+"on määratud käsureal, ja kirjade saatmisel kasutatakse sisemist toimetit. \n"
+
+#: src/LYrcFile.c:371
+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 ""
+"file_sorting_method määrab millise väärtuse järgi järjestada failide\n"
+"loendeid, nagu näiteks FTP katalooge. Valikud on:\n"
+"   BY_FILENAME -- järjestab failide nimede järgi\n"
+"   BY_TYPE     -- järjestab failide tüüpide järgi\n"
+"   BY_SIZE     -- järjestab failide suuruste järgi\n"
+"   BY_DATE     -- järjestab failide aegade järgi\n"
+
+#: src/LYrcFile.c:389
+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 ""
+"lineedit_mode määrab sisendteksti klahviseosed küsimustes ja\n"
+"vormides. Kui lineedit_mode väärtuseks on seatud \"Default Binding\",\n"
+"kasutatakse liikumiseks ja kustutamiseks järgnevaid seoseid:\n"
+"\n"
+"                Eelm  Järgm      Enter = Nõustu sisendiga\n"
+"  Sümbol haaval: <-    ->        ^G    = katkesta sisend\n"
+"    Sõna haaval: ^P    ^N        ^U    = Kustuta rida\n"
+" Kustuta sümbol: ^H    ^R        ^A    = Rea algus\n"
+"   Kustuta sõna: ^B    ^F        ^E    = Rea lõpp\n"
+"\n"
+"Current lineedit modes are:\n"
+
+#: src/LYrcFile.c:404
+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 ""
+"Järgnev võimaldab teil defineerida alam-järgede faile ja kirjeldusi.\n"
+"Vorming on multi_bookmark<suurtäht>=<failinimi>,<kirjeldus>\n"
+"Lubatud on kuni 26 järgede faili (Inglise tähestiku suurtähtede arv).\n"
+"Alustatakse seadega \"multi_bookmarkB\", kuna 'A' on vaikeväärtus\n"
+"(vaadake ülaltpoolt).\n"
+
+#: src/LYrcFile.c:410
+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 ""
+"personal_mail_address seab teie isikliku e-posti aadressi. Aadressi\n"
+"kasutatakse HTTP failide ülekandmise autoriseerimiseks ja logimiseks\n"
+"ning kommentaaride saatmisel.\n"
+"Kui te ei soovi seda infot jagada, seadke lynx.cfg failis NO_FROM_HEADER\n"
+"väärtuseks TRUE või kasutage -nofrom käsurea võtit. Selle välja võib\n"
+"jätta ka tühjaks, kuid siis ei kasutata seda ka kommentaaride saatmisel.\n"
+
+#: src/LYrcFile.c:419
+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 ""
+"preferred_charset määrab MIME notatsioonis (n. ISO-8859-15, ISO-8859-5)\n"
+"kooditabeli, mida Lynx esitab Accept-Charset päises http serveritele\n"
+"teie poolt eelistatuima kooditabelina. Väärtusena ei peaks kasutama\n"
+"ISO-8859-1 ega US-ASCII, kuna neid kasutatakse alati vaikimisi. Väärtus\n"
+"võib olla komadega eraldatud loend. Kui soovitud kooditabelit kasutav\n"
+"fail on olemas, saadab server selle. Kui Accept-Charset päist ei kasutata,\n"
+"aktsepteeritakse suvalise kooditabeliga. Kui Accept-Charset päis on olemas,\n"
+"aga soovitud kooditabelit kasutavad faili pole, peaks server vastama\n"
+"veateatega, lubatud on aga ka vastata mittesoovitud kooditabelit kasutava\n"
+"failiga.\n"
+
+#: src/LYrcFile.c:433
+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 ""
+"preferred_language määrab keele MIME esituses (n., et, en võib\n"
+"olla ka komadega eraldatud kahaneva eelistusega loend),\n"
+"mida Lynx näitab teie eelistusena http serveritele.\n"
+"Kui fail antud keeles on olemas, server saadab selle. Kui pole,\n"
+"saadab faili oma vaikimisi keeles.\n"
+
+#: src/LYrcFile.c:442
+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 ""
+"Kui run_all_execution_links väärtus on \"on\", täidetakse kõik valitud\n"
+"lokaalsed täidetavad viited.\n"
+"\n"
+"HOIATUS - See seade on VÄGA ohtlik. Kuna info võib olla loodud tundmatu\n"
+"          ja kontrollimatu allika poolt, võib olla võimalik luua viiteid\n"
+"          Trooja hobustele. Trooja hobune võib hävitada teie andmeid või\n"
+"          ohustada teie süsteemi muul moel. Väärtust \"on\" võib kasutada\n"
+"          ainult juhul, kui vaatate usaldatavatest allikatest pärit infot.\n"
+
+#: src/LYrcFile.c:453
+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 ""
+"Kui run_execution_links_on_local_files väärtus on \"on\", täidetakse kõik\n"
+"valitud lokaalsed täidetavad viited LOKAALSETEL failidel. Erinevus\n"
+"run_all_execution_links seadega on selles, et ainult lokaalse süsteemi\n"
+"failidel võib olla täidetavate viidete õigused.\n"
+"\n"
+"HOIATUS - See seade võib olla ohtlik. Kuna info võib olla loodud tundmatu\n"
+"          ja kontrollimatu allika poolt, võib olla võimalik luua viiteid\n"
+"          Trooja hobustele. Trooja hobune võib hävitada teie andmeid või\n"
+"          ohustada teie süsteemi muul moel. Väärtust \"on\" võib kasutada\n"
+"          ainult juhul, kui vaatate usaldatavatest allikatest pärit infot.\n"
+
+#: src/LYrcFile.c:471
+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 ""
+"select_popups määrab kas valikud valiku kastis millel puudub atribuut\n"
+"MULTIPLE esitatakse vertikaalse raadionuppude loendina või hüpikmenüüna.\n"
+"Kui atribuut MULTIPLE on SELECT alguslipikus olemas, loob Lynx valikute\n"
+"jaoks alati vertikaalse märkeruutude loendi. Väärtus \"on\" seab\n"
+"vaikeväärtuse hüpikmenüü ja väärtus \"off\" määrab raadionuppude loendi\n"
+"kasutamise. Vaikeväärtust saab üle määrata käsurea lülitiga -popup.\n"
+
+#: src/LYrcFile.c:481
+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 ""
+"show_color määrab värvide kasutamise programmi käivitamisel. Väärtus\n"
+"\"never\" lülitab värvide kasutamise välja (terminali käsitletakse\n"
+"ühevärvilisena) isegi kui terminal peaks suutma värve kasutada.\n"
+"Väärtus \"always\" lükutab värvide kasutamise sisse isegi kui terminal\n"
+"ei toeta värvide kasutamist, aga seda juhul, kui sellist värvide\n"
+"kasutamist toetab Lynx kompileerimisel kasutatud teek. Väärtus \"default\"\n"
+"lülitab käitumise, kus eeldatakse ühevärvilist terminali, välja arvatud\n"
+"juhul, kui värvide kasutamist on võimalik tuvastada terminali tüübist,\n"
+"kasutatakse käsurea võtit -color või on kasutatud keskkonna muutujat\n"
+"COLORTERM. Vaikimisi käitumist kasutatakse alati anonüümsete kasutajate\n"
+"korral või kui on seatud piirang \"option_save\". Salvestatud väärtust\n"
+"saab muuta käsurea võtmetega -color ja -nocolor.\n"
+"Käivitamisel seatud moodi saab muuta o=seadete menüü \"Näita värve\"\n"
+"seadega. Kui seaded salvestatakse, käsitletakse \"Näita värve\" omaduse\n"
+"väärtusi \"on\" ja \"off\" kui väärtust \"default\".\n"
+
+#: src/LYrcFile.c:498
+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 ""
+"show_cursor määrab kas 'peita' kursor ekraani paremasse (ja kui võimalik,\n"
+"alumisse) serva või asetada ta dokumendi jooksvast viitest või hüpikakna\n"
+"valikust vasakule. Kusrori positsioneerimine viitest vasemale aitab kõne\n"
+"või punktkirja liideseid ning juhul, kui terminal ei erista jooksvat\n"
+"viidet heleduse ega värviga. Väärtus \"on\" asetab kursori viidetest\n"
+"vasakule ja on vaikeväärtus ning \"off\" määrab kursori 'peitmise'.\n"
+"vaikeväärtust saab ümber määrata käsurea lülitiga -show_cursor.\n"
+
+#: src/LYrcFile.c:509
+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 ""
+"show_dotfiles määrab et kataloogi listingus peavad olema ka\n"
+"\"peidetud\" (punktiga algavad) failid ja kataloogid. Kui väärtus\n"
+"on \"on\", kasutatakse seda ainult, kui on nii seatud failis\n"
+"userdefs.h ja/või lynx.cfg, ning seda ei piirata käsurea võtmega.\n"
+"Kui punktiga algavate failide näitamine on keelatud, ei lubata neid\n"
+"ka Lynx vahenditega luua.\n"
+
+#: src/LYrcFile.c:520
+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 ""
+"Kui sub_bookmarks väärtus ei ole \"off\" ja on defineeritud mitu järgede\n"
+"faili (vaadake allpool), siis paluvad kõik järgede operatsioonid määrata\n"
+"kasutajal kõigepealt kasutatab alam-järgede fail. Kui vaikimisi järgede\n"
+"fail on määratud (vaadake ülalpoolt), kasutatakse seda vaikimisi valikuna.\n"
+"Kui selle seade väärtus on \"advanced\" ja kasutaja mood on samuti \"advanced\",\n"
+"kasutab 'v'aata järgi käsklus menüü asemel olekurea viipa. Kui selle\n"
+"seade väärtus on \"standard\", näidatakse alati menüüd.\n"
+
+#: src/LYrcFile.c:533
+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 ""
+"user_mode näitab kui tuttav on kasutaja Lynx programmiga. Vaikeseade\n"
+"on \"NOVICE\", mille korral näidatakse kaht lisarida abiinfoga ekraani\n"
+"alaosas, et aidata kasutajal õppida Lynx põhikäske. Seades user_mode\n"
+"väärtuseks \"INTERMEDIATE\", lülitate selle lisainfo välja. Määrang\n"
+"\"ADVANCED\" korral näidatakse ekraani alaosas parajasti vaadeldava\n"
+"viite URLi.\n"
+
+#: src/LYrcFile.c:542
+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 ""
+"Kui verbose_images väärtus on \"on\", trükib lynx pildi nime tekstide\n"
+"[INLINE], [LINK] või [IMAGE] asemel.\n"
+"Vaadake ka lynx.cfg failis VERBOSE_IMAGES seadet.\n"
+
+#: src/LYrcFile.c:547
+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 ""
+"Kui vi_keys väärtus on \"on\", on lubatud tavalised VI liikumiskäsud:\n"
+"  j = alla       k = üles\n"
+"  h = vasakule   l = paremale\n"
+"Need käsud on ainult väiketähed.\n"
+"Suured 'H', 'J' ja 'K' aktiveerivad ikka vastavalt abiinfo, hüpped\n"
+"ja klahvitabeli ekraani.\n"
+
+#: src/LYrcFile.c:555
+msgid ""
+"The visited_links setting controls how Lynx organizes the information\n"
+"in the Visited Links Page.\n"
+msgstr ""
+"visited_links seade kontrollib, kuidas Lynx organiseerib infot külastatud\n"
+"viidete lehel.\n"
+
+#: src/LYrcFile.c:772
+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 ""
+"Kui keypad_mode väärtus on \"NUMBERS_AS_ARROWS\", toimivad numbrid \n"
+"teie klahvistikul nooltena ka siis, kui numlock on sisse lülitatud:\n"
+"              8 = Nool üles\n"
+"  4 = Nool vasakule   6 = Nool paremale\n"
+"              2 = Nool alla\n"
+"ning ka vastavad klaviatuuri numbrid toimivad nooltena sõltumata\n"
+"numlock seadest.\n"
+
+#: src/LYrcFile.c:781
+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 ""
+"Kui keypad_mode väärtus on \"LINKS_ARE_NUMBERED\", ilmuvad iga viite\n"
+"kõrvale numbrid ja viidete valimiseks kasutatakse numbreid.\n"
+
+#: src/LYrcFile.c:785
+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 ""
+"Kui keypad_mode väärtus on \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\",\n"
+"ilmuvad numbrid iga nähtava viite ja nähtava vormi sisendvälja kõrvale.\n"
+"Numbreid kasutatakse viidete valimiseks või \"jooksva viite\" viimiseks\n"
+"vormi sisendväljale või nupule. Lisaks indekseeritakse valikud\n"
+"hüpikmenüüdes nii, et kasutaja saab valiku valida sisestades vastava\n"
+"hüpikmenüü valiku numbri, isegi kui valik ei ole hetkel ekraanil nähtav.\n"
+"Viidete nimekirjad ja loendikäskude väljundid nummerdavad samuti\n"
+"vormide sisendeid.\n"
+
+#: src/LYrcFile.c:794
+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 ""
+"MÄRKUS: Mõnede fikseeritud vormingus dokumentide esitus võib olla\n"
+"\"LINKS_ARE_NUMBERED\" või \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\"\n"
+"kasutamisel segane.\n"
+
+#: src/LYrcFile.c:827
+msgid ""
+"Lynx User Defaults File\n"
+"\n"
+"This file contains options saved from the Lynx Options Screen (normally\n"
+"with the '>' key).  There is normally no need to edit this file manually,\n"
+"since the defaults here can be controlled from the Options Screen, and the\n"
+"next time options are saved from the Options Screen this file will be\n"
+"completely rewritten.  You have been warned...\n"
+"If you are looking for the general configuration file - it is normally\n"
+"called lynx.cfg, and it has different content and a different format.\n"
+"It is not this file.\n"
+msgstr ""
+"Lynx Kasutaja seadete fail\n"
+"\n"
+"See fail sisaldab seadeid, mis on salvestatud Lynx omaduste ekraanil\n"
+"(tavaliselt klahviga '>'). Tavaliselt ei ole vajadust seda faili käsitsi\n"
+"muuta, kuna siinseid väärtusi saab muuta omaduste ekraanilt ning peale\n"
+"järgmist salvestamist kirjutatakse see fail täielikult üle. Teid on\n"
+"hoiatatud...\n"
+"Kui te otsite üldist seadete faili - selle nimi on tavaliselt lynx.cfg\n"
+"ja tal on erinev sisu ning vorming. Need ei ole samad failid.\n"
diff --git a/gnu/usr.bin/lynx/po/fr.po b/gnu/usr.bin/lynx/po/fr.po
index 3bf5e37354b..d9fab9a5119 100644
--- a/gnu/usr.bin/lynx/po/fr.po
+++ b/gnu/usr.bin/lynx/po/fr.po
@@ -25,11 +25,11 @@
 # 		Pierre Amadio <pierre.amadio@libertysurf.fr>
 #
 # * * * * * * * * * *
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.2\n"
-"POT-Creation-Date: 2001-06-01 18:55-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-0500\n"
 "PO-Revision-Date: 1999-06-05 15:18-0400\n"
 "Last-Translator: Jim Spath <jspath@bcpl.net>\n"
 "Language-Team: (none yet, address for now:) French <lynx-dev@sig.net>\n"
@@ -50,7 +50,7 @@ msgstr ""
 #. * Links to collections of alternate definitions, developed by the Lynx
 #. * User Community, are maintained in Lynx links:
 #. *
-#. *    http://www.trill-home.com/lynx.html
+#. *    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
@@ -67,872 +67,872 @@ msgstr "Alerte! : %s"
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#: LYMessages.c:31 LYMessages.c:32
+#: LYMessages.c:31
 msgid "Are you sure you want to quit?"
 msgstr "Désirez-vous vraiment quitter?"
 
-#: LYMessages.c:34 LYMessages.c:35
+#: LYMessages.c:33
 msgid "Really exit from Lynx?"
 msgstr "Vous voulez vraiment quitter Lynx?"
 
-#: LYMessages.c:37
+#: LYMessages.c:35
 msgid "Connection interrupted."
 msgstr "Connexion interrompue."
 
-#: LYMessages.c:38
+#: LYMessages.c:36
 msgid "Data transfer interrupted."
 msgstr "Transfert de données interrompu"
 
-#: LYMessages.c:39
+#: LYMessages.c:37
 msgid "Cancelled!!!"
 msgstr "Annulé!"
 
-#: LYMessages.c:40
+#: LYMessages.c:38
 msgid "Cancelling!"
 msgstr "Annulation!"
 
-#: LYMessages.c:41
+#: LYMessages.c:39
 msgid "Excellent!!!"
 msgstr "Excellent!"
 
-#: LYMessages.c:42
+#: LYMessages.c:40
 msgid "OK"
 msgstr ""
 
-#: LYMessages.c:43
+#: LYMessages.c:41
 msgid "Done!"
 msgstr "Terminé!"
 
-#: LYMessages.c:44
+#: LYMessages.c:42
 msgid "Bad request!"
 msgstr "Demande erronée!"
 
-#: LYMessages.c:45
+#: LYMessages.c:43
 msgid "previous"
 msgstr "écran précédent"
 
-#: LYMessages.c:46
+#: LYMessages.c:44
 msgid "next screen"
 msgstr "écran suivant"
 
-#: LYMessages.c:47
+#: LYMessages.c:45
 msgid "HELP!"
 msgstr "Aide!"
 
-#: LYMessages.c:48
+#: LYMessages.c:46
 msgid ", help on "
 msgstr ", aide activée "
 
 #. #define HELP
-#: LYMessages.c:50
+#: LYMessages.c:48
 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"
 
 #. #define MOREHELP
-#: LYMessages.c:52
+#: LYMessages.c:50
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr "touche d'espac.: page suiv., flèches: se déplacer, '?': aide, 'q': quitter"
 
-#: LYMessages.c:53
+#: LYMessages.c:51
 msgid "-- press space for next page --"
 msgstr "- appuyez sur la touche d'espacement pour aller à la page suivante -"
 
-#: LYMessages.c:54
+#: LYMessages.c:52
 msgid "URL too long"
 msgstr "URL à ouvrir"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:60
+#: LYMessages.c:58
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr "(Champ texte) inactif. Appuyez sur <entrée> pour l'activer."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:60
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr "(Aire de texte) inactive. Appuyez sur <entrée> pour l'activer."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:64
+#: LYMessages.c:62
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(Aire de texte) Inactive. Appuyez sur <entrée> pour l'activer (%s pour éditer)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:64
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "Entrez le texte. <Entr> pour confirmer («x» : nouvelle instance)."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:68
+#: LYMessages.c:66
 #, 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)."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:68
 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."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:72
+#: LYMessages.c:70
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "Entrez le texte. <Entr> pour confirmer; touches fléchées pour vous déplacer."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:74
+#: LYMessages.c:72
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "Entrez le texte. Touches HAUT/BAS ou tabulateur pour vous déplacer."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:77
+#: LYMessages.c:75
 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."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:77
 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."
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:81
+#: LYMessages.c:79
 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"
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:83
+#: LYMessages.c:81
 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."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:85
+#: LYMessages.c:83
 #, 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)"
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:87
+#: LYMessages.c:85
 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."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:87
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "Entrez le texte. <Entr> pour confirmer."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:91
+#: LYMessages.c:89
 #, 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)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:93
+#: LYMessages.c:91
 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"
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:95
+#: LYMessages.c:93
 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"
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:97
+#: LYMessages.c:95
 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"
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:99
+#: LYMessages.c:97
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr "Fonction de courrier invalidée; impossible de soumettre l'envoi"
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:99
 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"
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:101
 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"
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:103
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "Touche DROITE ou <Entr> pour changer d'option"
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:105
 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"
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:109
+#: LYMessages.c:107
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr "Touche DROITE ou <Entr> pour changer d'option"
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:111
+#: LYMessages.c:109
 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"
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:113
+#: LYMessages.c:111
 msgid "Submit ('x' for no cache) to "
 msgstr "Soumettre ('x' pour annuler le cache) à"
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:115
+#: LYMessages.c:113
 msgid "Submit to "
 msgstr "Soumettre à"
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:117
+#: LYMessages.c:115
 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)"
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:119
+#: LYMessages.c:117
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "Utilisez la touche DROITE ou <Entr> pour confirmer"
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:121
+#: LYMessages.c:119
 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"
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:123
+#: LYMessages.c:121
 msgid "Submit mailto form to "
 msgstr "Soumettre le formulaire via mail à"
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:125
+#: LYMessages.c:123
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr "Utilisez la touche DROITE ou <Entr> pour confirmer"
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:125
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr "Fonction de courrier invalidée; envoi impossible"
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:127
 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"
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:129
 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"
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:131
 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"
 
 # /maxwell/lynx2.7.1/LYMessages_en.h
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:133
 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"
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:135
 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"
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:137
 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"
 
-#: LYMessages.c:140
+#: LYMessages.c:138
 msgid "Submitting form..."
 msgstr "Envoi du formulaire... "
 
-#: LYMessages.c:141
+#: LYMessages.c:139
 msgid "Resetting form..."
 msgstr "Réinitialisation du formulaire..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:141
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Rechargement du document.  Toutes les entrées seront effacées!"
 
-#: LYMessages.c:144
+#: LYMessages.c:142
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Transcodage impossible des données au jeu de caractères %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:147
+#: LYMessages.c:145
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr "Utilisez la touche DROITE ou <Entr> pour activer le lien"
 
-#: LYMessages.c:148
+#: LYMessages.c:146
 msgid "The resource requested is not available at this time."
 msgstr "La ressource demandée n'est pas disponible en ce moment."
 
-#: LYMessages.c:149
+#: LYMessages.c:147
 msgid "Enter Lynx keystroke command: "
 msgstr "Entrer la commande Lynx au clavier : "
 
-#: LYMessages.c:150
+#: LYMessages.c:148
 msgid "Looking up "
 msgstr "Recherche "
 
-#: LYMessages.c:151
+#: LYMessages.c:149
 #, c-format
 msgid "Getting %s"
 msgstr "Accès à %s"
 
-#: LYMessages.c:152
+#: LYMessages.c:150
 #, c-format
 msgid "Skipping %s"
 msgstr "Ignoré : %s"
 
-#: LYMessages.c:153
+#: LYMessages.c:151
 #, c-format
 msgid "Using %s"
 msgstr "Utilisation de %s"
 
-#: LYMessages.c:154
+#: LYMessages.c:152
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "URL illégal : %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:153
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Adresse mal formée %s"
 
-#: LYMessages.c:156
+#: LYMessages.c:154
 #, c-format
 msgid "URL: %s"
 msgstr "l'URL : %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:155
 msgid "Unable to access WWW file!!!"
 msgstr "Impossible d'accéder au fichier W3!"
 
-#: LYMessages.c:158
+#: LYMessages.c:156
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "Ceci est un index consultable.  Utilisez %s pour la recherche."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:160
+#: LYMessages.c:158
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "-Suite- Ceci est un index consultable. Utilisez %s pour la recherche."
 
-#: LYMessages.c:161
+#: LYMessages.c:159
 msgid "You have entered an invalid link number."
 msgstr "Vous avez entré un numéro de lien invalide."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:163
+#: LYMessages.c:161
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "Vous visualisez le code source. Faites '\\' pour la version hypertexte"
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:165
+#: LYMessages.c:163
 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"
 
 # Is the AIDE command correct? There is no online Help in Lynx. 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:167
+#: LYMessages.c:165
 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"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:169
+#: LYMessages.c:167
 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"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:171
+#: LYMessages.c:169
 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"
 
 # NOVICE_LINE_TWO_C
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:173
+#: LYMessages.c:171
 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"
 
 #  Z)ap Transfer missing from line, since it does nothing
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:175
+#: LYMessages.c:173
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr "Entrez le texte dans la zone à partir du clavier                 "
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:177
+#: LYMessages.c:175
 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"
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:179
+#: LYMessages.c:177
 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"
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:181
+#: LYMessages.c:179
 #, 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"
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:183
+#: LYMessages.c:181
 #, 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"
 
 #. mailto
-#: LYMessages.c:186
+#: LYMessages.c:184
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "Envoi de formulaire mailto incorrect. Demande annulée!"
 
-#: LYMessages.c:187
+#: LYMessages.c:185
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Attention! Les codes de controles de l'adresse ont étés remplacés par ?"
 
-#: LYMessages.c:188
+#: LYMessages.c:186
 msgid "Mail disallowed!  Cannot submit."
 msgstr "La fonction de courrier est invalidée. Impossible de soumettre l'envoi!"
 
-#: LYMessages.c:189
+#: LYMessages.c:187
 msgid "Mailto form submission failed!"
 msgstr "Impossible d'envoyer le formulaire mailto!"
 
-#: LYMessages.c:190
+#: LYMessages.c:188
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Envoi du formulaire mailto annulé!"
 
-#: LYMessages.c:191
+#: LYMessages.c:189
 msgid "Sending form content..."
 msgstr "Envoi du contenu du formulaire..."
 
-#: LYMessages.c:192
+#: LYMessages.c:190
 msgid "No email address is present in mailto URL!"
 msgstr "Aucune adresse de courrier ne figure dans l'URL mailto!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:194
+#: LYMessages.c:192
 msgid "Unable to open temporary file for mailto URL!"
 msgstr "Impossible d'ouvrir de fichier temporaire pour l'URL mailto!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:196
+#: LYMessages.c:194
 msgid "Do you wish to include the original message?"
 msgstr "Voulez-vous inclure le message d'origine?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:196
 msgid "Do you wish to include the preparsed source?"
 msgstr "Voulez-vous inclure la source pré-analysée?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:200
+#: LYMessages.c:198
 msgid "Spawning your selected editor to edit mail message"
 msgstr "Lancement de votre éditeur de choix pour l'édition du message"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:202
+#: LYMessages.c:200
 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"
 
-#: LYMessages.c:203
+#: LYMessages.c:201
 msgid "Send this comment?"
 msgstr "Envoyer ce commentaire? "
 
-#: LYMessages.c:204
+#: LYMessages.c:202
 msgid "Send this message?"
 msgstr "Envoyer ce message? "
 
-#: LYMessages.c:205
+#: LYMessages.c:203
 msgid "Sending your message..."
 msgstr "Envoi de votre message..."
 
-#: LYMessages.c:206
+#: LYMessages.c:204
 msgid "Sending your comment:"
 msgstr "Envoi de votre commentaire:"
 
 #. textarea
-#: LYMessages.c:209
+#: LYMessages.c:207
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "Vous n'êtes pas dans une zone de texte, impossible d'utiliser l'éditeur éxterne."
 
-#: LYMessages.c:210
+#: LYMessages.c:208
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "Vous n'êtes pas dans une zone de texte, impossible d'utiliser cette commande."
 
-#: LYMessages.c:213
+#: LYMessages.c:211
 msgid "file: ACTIONs are disallowed!"
 msgstr "L'attribut ACTION n'est pas permis avec l'URL 'file:'"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:213
 msgid "file: URLs via served links are disallowed!"
 msgstr "L'URL 'file:' n'est pas permis dans les liens du serveur"
 
-#: LYMessages.c:216
+#: LYMessages.c:214
 msgid "Access to local files denied."
 msgstr "L'accès aux fichiers cachés est désactivé!"
 
-#: LYMessages.c:217
+#: LYMessages.c:215
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "L'URL 'file:' n'est pas permis dans les signets"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:217
 msgid "This special URL is not allowed in external documents!"
 msgstr "Cet URL spécial n'est pas permis dans les documents externes!"
 
-#: LYMessages.c:220
+#: LYMessages.c:218
 msgid "Press <return> to return to Lynx."
 msgstr "Appuyez sur <Entr> pour retourner à Lynx  "
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:221
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "Lancement du sous-processus DCL; «logout» pour retourner à Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:225
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "Pressez ECHAP pour retourner à lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:228
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr "Lancement du shell implicite. Entrez «exit» pour retourner à Lynx.\n"
 
-#: LYMessages.c:233
+#: LYMessages.c:231
 msgid "Spawning is currently disabled."
 msgstr "Le lancement est présentement désactivé."
 
-#: LYMessages.c:234
+#: LYMessages.c:232
 msgid "The 'd'ownload command is currently disabled."
 msgstr "La commande «d» (décharger) est présentement désactivée."
 
-#: LYMessages.c:235
+#: LYMessages.c:233
 msgid "You cannot download an input field."
 msgstr "Vous ne pouvez pas télécharger un champ de formulaire."
 
-#: LYMessages.c:236
+#: LYMessages.c:234
 msgid "Form has a mailto action!  Cannot download."
 msgstr "Le formulaire contient une entité 'mailto:'. Téléchargement impossible."
 
-#: LYMessages.c:237
+#: LYMessages.c:235
 msgid "You cannot download a mailto: link."
 msgstr "Vous ne pouvez pas télécharger un lien mailto."
 
-#: LYMessages.c:238
+#: LYMessages.c:236
 msgid "You cannot download cookies."
 msgstr "Vous ne pouvez télécharger les cookies."
 
-#: LYMessages.c:239
+#: LYMessages.c:237
 msgid "You cannot download a printing option."
 msgstr "Impossible de télédécharger une option d'impression"
 
-#: LYMessages.c:240
+#: LYMessages.c:238
 msgid "You cannot download an upload option."
 msgstr "Impossible de télédécharger une option de chargement."
 
-#: LYMessages.c:241
+#: LYMessages.c:239
 msgid "You cannot download an permit option."
 msgstr "Impossible de télédécharger une option de permission."
 
-#: LYMessages.c:242
+#: LYMessages.c:240
 msgid "This special URL cannot be downloaded!"
 msgstr "Cet URL spécial ne peut être déchargé!"
 
-#: LYMessages.c:243
+#: LYMessages.c:241
 msgid "Nothing to download."
 msgstr "Il n'y a rien à télédécharger."
 
-#: LYMessages.c:244
+#: LYMessages.c:242
 msgid "Trace ON!"
 msgstr "Traçage ACTIVÉ"
 
-#: LYMessages.c:245
+#: LYMessages.c:243
 msgid "Trace OFF!"
 msgstr "Traçage DÉSACTIVÉ"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:245
 msgid "Links will be included for all images!  Reloading..."
 msgstr "Les liens seront inclus pour toutes les images! Chargement..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:247
 msgid "Standard image handling restored!  Reloading..."
 msgstr "Traitement d'image standard restauré. Chargement... "
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:249
 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..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:251
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "Les images incluses sans l'attribut ALT seront ignorées!  Chargement..."
 
-#: LYMessages.c:254
+#: LYMessages.c:252
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Le mode 8-bits ou CJK est réglé à DÉSACTIVÉ! Chargement..."
 
-#: LYMessages.c:255
+#: LYMessages.c:253
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "Le mode 8-bits ou CJK est réglé à ACTIVÉ! Chargement..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:255
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "Envoyer requête HEAD pour D)ocument, L)ien  ou C) Annuler? (d,l,c) :   "
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:257
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "Envoyer requête HEAD pour D)ocument ou C) Annuler? (d,c) :"
 
-#: LYMessages.c:260
+#: LYMessages.c:258
 msgid "Sorry, the document is not an http URL."
 msgstr "Désolé, le document n'est pas un URL http."
 
-#: LYMessages.c:261
+#: LYMessages.c:259
 msgid "Sorry, the link is not an http URL."
 msgstr "Désolé, le document n'est pas un URL http."
 
-#: LYMessages.c:262
+#: LYMessages.c:260
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "Désolé, l'attribut ACTION est invalidé pour ce formulaire."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:262
 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."
 
-#: LYMessages.c:265
+#: LYMessages.c:263
 msgid "Not an http URL or form ACTION!"
 msgstr "L'élément n'est ni un URL http ni un attribut ACTION!"
 
-#: LYMessages.c:266
+#: LYMessages.c:264
 msgid "This special URL cannot be a form ACTION!"
 msgstr "Cet URL spécial ne peut être un attribut ACTION"
 
-#: LYMessages.c:267
+#: LYMessages.c:265
 msgid "URL is not in starting realm!"
 msgstr "L'URL n'est pas dans la partition de départ spécifiée"
 
-#: LYMessages.c:268
+#: LYMessages.c:266
 msgid "News posting is disabled!"
 msgstr "L'envoi d'articles Usenet est désactivé"
 
-#: LYMessages.c:269
+#: LYMessages.c:267
 msgid "File management support is disabled!"
 msgstr "Le soutien de gestion de fichier est désactivé."
 
-#: LYMessages.c:270
+#: LYMessages.c:268
 msgid "No jump file is currently available."
 msgstr "Aucun fichier-raccourci n'est présentement disponible."
 
-#: LYMessages.c:271
+#: LYMessages.c:269
 msgid "Jump to (use '?' for list): "
 msgstr "Accès à (entrez '?' pour la liste des raccourcis) : "
 
-#: LYMessages.c:272
+#: LYMessages.c:270
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr "L'accès à un URL par raccourci est invalidé!"
 
-#: LYMessages.c:273
+#: LYMessages.c:271
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "L'accès arbitraire à un URL est invalidé. Utilisez un raccourci."
 
-#: LYMessages.c:274
+#: LYMessages.c:272
 msgid "No random URLs have been used thus far."
 msgstr "Aucun URL arbitraire n'a encore été utilisé."
 
-#: LYMessages.c:275
+#: LYMessages.c:273
 msgid "Bookmark features are currently disabled."
 msgstr "Les fonctions de signets sont présentement désactivées."
 
-#: LYMessages.c:276
+#: LYMessages.c:274
 msgid "Execution via bookmarks is disabled."
 msgstr "L'exécution à partir des signets est désactivée."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:276
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "Le fichier de signets n'est pas défini. Utilisez %s pour voir les options."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:278
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "Impossible d'ouvrir le fichier temp. pour convertir les signets X Mosaic"
 
-#: LYMessages.c:281
+#: LYMessages.c:279
 msgid "ERROR - unable to open bookmark file."
 msgstr "ERREUR - impossible d'ouvrir le fichier de signets."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:281
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "Impossible d'ouvrir le fichier de signets pour supprimer un lien"
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:283
 msgid "Unable to open scratch file for deletion of link."
 msgstr "Impossible d'ouvrir le fichier de travail pour supprimer un lien"
 
-#: LYMessages.c:287
+#: LYMessages.c:285
 msgid "Error renaming scratch file."
 msgstr "Erreur de renommage du fichier de travail."
 
-#: LYMessages.c:289
+#: LYMessages.c:287
 msgid "Error renaming temporary file."
 msgstr "Erreur de renommage du fichier temporaire."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:289
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "Impossible de copier le fichier temporaire (pour l'effacement du lien)."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:291
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "Impossible de réouvrir le fichier temporaire pour supprimer un lien"
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:294
 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"
 
-#: LYMessages.c:297
+#: LYMessages.c:295
 msgid "Bookmark deletion failed."
 msgstr "Impossible de supprimer le signet."
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:297
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr "Les fichiers de signets ne peuvent être parcourus (seuls les URL http)"
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:299
 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"
 
-#: LYMessages.c:302
+#: LYMessages.c:300
 msgid "There are no links in this bookmark file!"
 msgstr "Il n'y a aucun lien dans ce fichier!"
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:302
 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) : "
 
-#: LYMessages.c:305
+#: LYMessages.c:303
 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) : "
 
-#: LYMessages.c:306
+#: LYMessages.c:304
 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) : "
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:308
+#: LYMessages.c:306
 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"
 
-#: LYMessages.c:309
+#: LYMessages.c:307
 msgid "Cannot save form fields/links"
 msgstr "Impossible d'enregistrer les zones ou les liens d'un formulaire."
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:311
+#: LYMessages.c:309
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "Historique, Information, Menu et Références ne peuvent être des signets"
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:313
+#: LYMessages.c:311
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Voulez-vous vraiment supprimer ce lien de vos signets?"
 
-#: LYMessages.c:314
+#: LYMessages.c:312
 msgid "Malformed address."
 msgstr "Adresse incorrecte."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:316
+#: LYMessages.c:314
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "Analyse historique ACTIVÉE (analyse minimale annulée)"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:318
+#: LYMessages.c:316
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "Analyse historique DÉSACTIVÉE (analyse minimale en cours)"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:320
+#: LYMessages.c:318
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "Analyse historique ACTIVÉE (analyse de validation annulée)"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:322
+#: LYMessages.c:320
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "Analyse historique DÉSACTIVÉE (analyse de validation en cours)"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:324
+#: LYMessages.c:322
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "Analyse minimale ACTIVÉE (et en cours)"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:324
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "Analyse minimale DÉSACTIVÉE (analyse de validation en cours)"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:328
+#: LYMessages.c:326
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "Analyse minimale ACTIVÉE (mais l'analyse historique est en cours)"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:330
+#: LYMessages.c:328
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "Analyse minimale DÉSACTIVÉE (l'analyse historique est en cours)"
 
-#: LYMessages.c:331
+#: LYMessages.c:329
 msgid "Soft double-quote parsing ON!"
 msgstr "Analyse à tolérance de fautes (soft double-quote) ACTIVÉE"
 
-#: LYMessages.c:332
+#: LYMessages.c:330
 msgid "Soft double-quote parsing OFF!"
 msgstr "Analyse à tolérance de fautes (soft double-quote) DÉSACTIVÉE"
 
-#: LYMessages.c:333
+#: LYMessages.c:331
 msgid "Now using TagSoup parsing of HTML."
 msgstr "Analyse du HTML à l'aide de TagSoup."
 
-#: LYMessages.c:334
+#: LYMessages.c:332
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "Analyse du HTML à l'aide de SortaSGML."
 
-#: LYMessages.c:335
+#: LYMessages.c:333
 msgid "You are already at the end of this document."
 msgstr "Vous êtes déjà à la fin du document."
 
-#: LYMessages.c:336
+#: LYMessages.c:334
 msgid "You are already at the beginning of this document."
 msgstr "Vous êtes déjà au début du document."
 
-#: LYMessages.c:337
+#: LYMessages.c:335
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "Vous êtes déjà à la page %d du document."
@@ -942,1133 +942,1133 @@ msgstr "Vous êtes déjà à la page %d du document."
 #  User enters 5
 #  Their cursor was on the 5th link, so it says:
 #   "Link number 5 already is current."
-#: LYMessages.c:338
+#: LYMessages.c:336
 #, c-format
 msgid "Link number %d already is current."
 msgstr "Le lien %d est déjà le lien actif."
 
-#: LYMessages.c:339
+#: LYMessages.c:337
 msgid "You are already at the first document"
 msgstr "Vous êtes déjà au premier document."
 
-#: LYMessages.c:340
+#: LYMessages.c:338
 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"
 
-#: LYMessages.c:341
+#: LYMessages.c:339
 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"
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:343
+#: LYMessages.c:341
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "Vous avez le maximum permis; supprimez du texte ou quittez le champ"
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:345
+#: LYMessages.c:343
 msgid "You are not on a form submission button or normal link."
 msgstr "Vous n'êtes pas à un bouton Envoyer ou un lien normal."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:347
+#: LYMessages.c:345
 msgid "One radio button must be checked at all times!"
 msgstr "Un seul bouton d'option peut être coché à la fois."
 
-#: LYMessages.c:348
+#: LYMessages.c:346
 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 ?"
 
-#: LYMessages.c:349
+#: LYMessages.c:347
 msgid "Do you want to go back to the previous document?"
 msgstr "Voulez-vous retourner au document précédent?"
 
-#: LYMessages.c:350
+#: LYMessages.c:348
 msgid "Use arrows or tab to move off of field."
 msgstr "Touches fléchées ou tabulateur pour se déplacer hors du champ"
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:352
+#: LYMessages.c:350
 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."
 
-#: LYMessages.c:353
+#: LYMessages.c:351
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** Erreur de code HTML! Aucune action définie pour le formulaire. **"
 
-#: LYMessages.c:354
+#: LYMessages.c:352
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "Erreur de code HTML! Impossible de créer de fenêtre flash."
 
-#: LYMessages.c:355
+#: LYMessages.c:353
 msgid "Unable to create popup window!"
 msgstr "Impossible de créer de fenêtre flash."
 
-#: LYMessages.c:356
+#: LYMessages.c:354
 msgid "Goto a random URL is disallowed!"
 msgstr "Accès à un URL arbitraire invalidé."
 
-#: LYMessages.c:357
+#: LYMessages.c:355
 msgid "Goto a non-http URL is disallowed!"
 msgstr "Accès à un URL non http invalidé."
 
-#: LYMessages.c:358
+#: LYMessages.c:356
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "Vous ne pouvez accéder aux URL «%s:»"
 
-#: LYMessages.c:359
+#: LYMessages.c:357
 msgid "URL to open: "
 msgstr "URL à ouvrir: "
 
-#: LYMessages.c:360
+#: LYMessages.c:358
 msgid "Edit the current Goto URL: "
 msgstr "Éditer la commande Goto URL en cours :"
 
-#: LYMessages.c:361
+#: LYMessages.c:359
 msgid "Edit the previous Goto URL: "
 msgstr "Éditer la commande Goto URL précédente :"
 
-#: LYMessages.c:362
+#: LYMessages.c:360
 msgid "Edit a previous Goto URL: "
 msgstr "Éditer une commande Goto URL précédente :"
 
-#: LYMessages.c:363
+#: LYMessages.c:361
 msgid "Current document has POST data."
 msgstr "Le document en cours contient des données POST."
 
-#: LYMessages.c:364
+#: LYMessages.c:362
 msgid "Edit this document's URL: "
 msgstr "Éditer l'URL de ce document :"
 
-#: LYMessages.c:365
+#: LYMessages.c:363
 msgid "Edit the current link's URL: "
 msgstr "Editer l'url relative au lien courant: "
 
-#: LYMessages.c:366
+#: LYMessages.c:364
 msgid "You cannot edit File Management URLs"
 msgstr "Vous ne pouvez pas éditer les url de gestion de fichier."
 
-#: LYMessages.c:367
+#: LYMessages.c:365
 msgid "Enter a database query: "
 msgstr "Entrez une recherche dans la base de données : "
 
-#: LYMessages.c:368
+#: LYMessages.c:366
 msgid "Enter a whereis query: "
 msgstr "Entrez le mot à rechercher : "
 
-#: LYMessages.c:369
+#: LYMessages.c:367
 msgid "Edit the current query: "
 msgstr "Éditer la recherche en cours :"
 
-#: LYMessages.c:370
+#: LYMessages.c:368
 msgid "Edit the previous query: "
 msgstr "Éditer la recherche précédente :"
 
-#: LYMessages.c:371
+#: LYMessages.c:369
 msgid "Edit a previous query: "
 msgstr "Éditer une recherche précédente :"
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:373
+#: LYMessages.c:371
 msgid "Use Control-R to resubmit the current query."
 msgstr "Faites Ctrl-R pour lancer de nouveau la recherche en cours"
 
-#: LYMessages.c:374
+#: LYMessages.c:372
 msgid "Edit the current shortcut: "
 msgstr "Éditer le raccourci courant :"
 
-#: LYMessages.c:375
+#: LYMessages.c:373
 msgid "Edit the previous shortcut: "
 msgstr "Éditer le raccourci précédent :"
 
-#: LYMessages.c:376
+#: LYMessages.c:374
 msgid "Edit a previous shortcut: "
 msgstr "Éditer un raccourci précédent :"
 
-#: LYMessages.c:377
+#: LYMessages.c:375
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "Touche '%c' non configurée pour correspondre à un fichier-raccourci"
 
-#: LYMessages.c:378
+#: LYMessages.c:376
 msgid "Cannot locate jump file!"
 msgstr "Impossible de localiser le fichier-raccourci."
 
-#: LYMessages.c:379
+#: LYMessages.c:377
 msgid "Cannot open jump file!"
 msgstr "Impossible d'ouvrir le fichier-raccourci."
 
-#: LYMessages.c:380
+#: LYMessages.c:378
 msgid "Error reading jump file!"
 msgstr "Erreur de lecture du fichier-raccourci."
 
-#: LYMessages.c:381
+#: LYMessages.c:379
 msgid "Out of memory reading jump file!"
 msgstr "Mémoire insuffisante pour lire le fichier-raccourci."
 
-#: LYMessages.c:382
+#: LYMessages.c:380
 msgid "Out of memory reading jump table!"
 msgstr "Mémoire insuffisante pour lire les tables de raccourcis"
 
-#: LYMessages.c:383
+#: LYMessages.c:381
 msgid "No index is currently available."
 msgstr "Aucun index n'est présentement disponible."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:385
+#: LYMessages.c:383
 msgid "Do you really want to go to the Main screen?"
 msgstr "Voulez-vous vraiment aller à l'écran principal?"
 
-#: LYMessages.c:386
+#: LYMessages.c:384
 msgid "You are already at main screen!"
 msgstr "Vous êtes déjà à l'écran principal."
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:388
+#: LYMessages.c:386
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "Document non indexé - faites '/' pour chercher une séquence de texte."
 
 #. #define NO_OWNER
-#: LYMessages.c:390
+#: LYMessages.c:388
 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"
 
-#: LYMessages.c:391
+#: LYMessages.c:389
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Aucun propriétaire n'est défini.  Utiliser %s?"
 
-#: LYMessages.c:392
+#: LYMessages.c:390
 msgid "Do you wish to send a comment?"
 msgstr "Voulez-vous envoyer un commentaire?"
 
-#: LYMessages.c:393
+#: LYMessages.c:391
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "Fonction de courrier invalidée; impossible d'envoyer un commentaire"
 
-#: LYMessages.c:394
+#: LYMessages.c:392
 msgid "The 'e'dit command is currently disabled."
 msgstr "La commande 'e' (Éditer) est présentement désactivée."
 
-#: LYMessages.c:395
+#: LYMessages.c:393
 msgid "External editing is currently disabled."
 msgstr "Le soutien externe est présentement inactivé."
 
-#: LYMessages.c:396
+#: LYMessages.c:394
 msgid "System error - failure to get status."
 msgstr "Erreur système - impossible d'obtenir l'état."
 
-#: LYMessages.c:397
+#: LYMessages.c:395
 msgid "No editor is defined!"
 msgstr "Aucun éditeur n'est défini."
 
-#: LYMessages.c:398
+#: LYMessages.c:396
 msgid "The 'p'rint command is currently disabled."
 msgstr "La commande 'p' (Imprimer) est présentement désactivée."
 
-#: LYMessages.c:399
+#: LYMessages.c:397
 msgid "Document has no Toolbar links or Banner."
 msgstr "Aucun lien vers une barre d'outil ou une bannière"
 
-#: LYMessages.c:400
+#: LYMessages.c:398
 msgid "Unable to open traversal file."
 msgstr "Impossible d'ouvrir le fichier de parcours."
 
-#: LYMessages.c:401
+#: LYMessages.c:399
 msgid "Unable to open traversal found file."
 msgstr "Impossible d'ouvrir le fichier de parcours trouvé."
 
-#: LYMessages.c:402
+#: LYMessages.c:400
 msgid "Unable to open reject file."
 msgstr "Impossible d'ouvrir le fichier rejeté."
 
-#: LYMessages.c:403
+#: LYMessages.c:401
 msgid "Unable to open traversal errors output file"
 msgstr "Impossible d'ouvrir le fichier sortie d'erreurs de parcours"
 
-#: LYMessages.c:404
+#: LYMessages.c:402
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "PARCOURS INTERROMPU"
 
-#: LYMessages.c:405
+#: LYMessages.c:403
 msgid "Follow link (or goto link or page) number: "
 msgstr "Accéder au lien (commande G) Aller) numéro : "
 
-#: LYMessages.c:406
+#: LYMessages.c:404
 msgid "Select option (or page) number: "
 msgstr "Choisir le numéro d'option (ou de page) : "
 
-#: LYMessages.c:407
+#: LYMessages.c:405
 #, c-format
 msgid "Option number %d already is current."
 msgstr "L'option %d est déjà l'option en cours."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:409
+#: LYMessages.c:407
 msgid "You are already at the end of this option list."
 msgstr "Vous êtes déjà à la fin de cette liste d'options."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:411
+#: LYMessages.c:409
 msgid "You are already at the beginning of this option list."
 msgstr "Vous êtes déjà au début de cette liste d'options."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:413
+#: LYMessages.c:411
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "Vous êtes déjà à la page %d de cette liste d'options."
 
-#: LYMessages.c:414
+#: LYMessages.c:412
 msgid "You have entered an invalid option number."
 msgstr "Vous avez entré un numéro d'option non valide."
 
-#: LYMessages.c:415
+#: LYMessages.c:413
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** Erreur de code HTML! Utiliser -trace pour le diagnostic. **"
 
-#: LYMessages.c:416
+#: LYMessages.c:414
 msgid "Give name of file to save in"
 msgstr "Donnez le nom du fichier à sauvegarder."
 
-#: LYMessages.c:417
+#: LYMessages.c:415
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "Impossible d'enregistrer les données dans le fichier -- Merci d'utiliser www localement."
 
-#: LYMessages.c:418
+#: LYMessages.c:416
 msgid "Can't open temporary file!"
 msgstr "Impossible d'ouvrir le fichier temporaire!"
 
-#: LYMessages.c:419
+#: LYMessages.c:417
 msgid "Can't open output file!  Cancelling!"
 msgstr "Impossible d'ouvrir le fichier de sortie! Demande annulée."
 
-#: LYMessages.c:420
+#: LYMessages.c:418
 msgid "Execution is disabled."
 msgstr "L'exécution est désactivée."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:422
+#: LYMessages.c:420
 #, 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)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:424
+#: LYMessages.c:422
 msgid "Execution capabilities are not compiled into this version."
 msgstr "Capacités d'exécution non compilées dans cette version."
 
-#: LYMessages.c:425
+#: LYMessages.c:423
 msgid "This file cannot be displayed on this terminal."
 msgstr "Ce fichier ne peut être affiché sur votre terminal."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:427
+#: LYMessages.c:425
 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  "
 
-#: LYMessages.c:428
+#: LYMessages.c:426
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D) Décharger ou C) Annuler"
 
-#: LYMessages.c:429
+#: LYMessages.c:427
 msgid "Cancelling file."
 msgstr "Annulation!"
 
-#: LYMessages.c:430
+#: LYMessages.c:428
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "Récupération du fichier.  - VEUILLEZ ATTENDRE -"
 
-#: LYMessages.c:431
+#: LYMessages.c:429
 msgid "Enter a filename: "
 msgstr "Entrez un nom de fichier : "
 
-#: LYMessages.c:432
+#: LYMessages.c:430
 msgid "Edit the previous filename: "
 msgstr "Éditez le nom de fichier précédent : "
 
-#: LYMessages.c:433
+#: LYMessages.c:431
 msgid "Edit a previous filename: "
 msgstr "Éditez un nom de fichier précédent : "
 
-#: LYMessages.c:434
+#: LYMessages.c:432
 msgid "Enter a new filename: "
 msgstr "Entrez un nouveau nom de fichier : "
 
-#: LYMessages.c:435
+#: LYMessages.c:433
 msgid "File name may not begin with a dot."
 msgstr "Le nom de fichier ne peut commencer avec un point."
 
-#: LYMessages.c:437
+#: LYMessages.c:435
 msgid "File exists.  Create higher version?"
 msgstr "Ce fichier existe déjà. Créer une nouvelle version?"
 
-#: LYMessages.c:439
+#: LYMessages.c:437
 msgid "File exists.  Overwrite?"
 msgstr "Ce fichier existe déjà. Remplacer?"
 
-#: LYMessages.c:441
+#: LYMessages.c:439
 msgid "Cannot write to file."
 msgstr "Écriture non autorisée."
 
-#: LYMessages.c:442
+#: LYMessages.c:440
 msgid "ERROR! - download command is misconfigured."
 msgstr "ERREUR - la commande de déchargement est mal configurée."
 
-#: LYMessages.c:443
+#: LYMessages.c:441
 msgid "Unable to download file."
 msgstr "Impossible de télédécharger le fichier."
 
-#: LYMessages.c:444
+#: LYMessages.c:442
 msgid "Reading directory..."
 msgstr "Lecture du répertoire..."
 
-#: LYMessages.c:445
+#: LYMessages.c:443
 msgid "Building directory listing..."
 msgstr "Création des listes de répertoire..."
 
-#: LYMessages.c:446
+#: LYMessages.c:444
 msgid "Saving..."
 msgstr "Enregistrement..."
 
-#: LYMessages.c:447
+#: LYMessages.c:445
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Impossible d'éditer le fichier '%s'."
 
-#: LYMessages.c:448
+#: LYMessages.c:446
 msgid "Unable to access document!"
 msgstr "Impossible d'acceder au document !"
 
-#: LYMessages.c:449
+#: LYMessages.c:447
 msgid "Could not access file."
 msgstr "Impossible d'accéder au fichier."
 
-#: LYMessages.c:450
+#: LYMessages.c:448
 msgid "Could not access directory."
 msgstr "Impossible d'acceder au répertoire."
 
-#: LYMessages.c:451
+#: LYMessages.c:449
 msgid "Could not load data."
 msgstr "Impossible de charger les données."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:453
+#: LYMessages.c:451
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "Lynx ne peut (E) Éditer de fichiers W3 distants."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:455
+#: LYMessages.c:453
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "Ce champ ne peut être (e)dité par un éditeur externe."
 
-#: LYMessages.c:456
+#: LYMessages.c:454
 msgid "Bad rule"
 msgstr "Mauvaise regle."
 
-#: LYMessages.c:457
+#: LYMessages.c:455
 msgid "Insufficient operands:"
 msgstr "Nombre d'opérandes insuffisant."
 
-#: LYMessages.c:458
+#: LYMessages.c:456
 msgid "You are not authorized to edit this file."
 msgstr "Vous n'êtes pas autorisé à éditer ce fichier."
 
-#: LYMessages.c:459
+#: LYMessages.c:457
 msgid "Title: "
 msgstr "Titre : "
 
-#: LYMessages.c:460
+#: LYMessages.c:458
 msgid "Subject: "
 msgstr "Objet : "
 
-#: LYMessages.c:461
+#: LYMessages.c:459
 msgid "Username: "
 msgstr "Nom d'utilisateur : "
 
-#: LYMessages.c:462
+#: LYMessages.c:460
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: LYMessages.c:463
+#: LYMessages.c:461
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx : nom d'utilisateur et mot de passe requis!"
 
-#: LYMessages.c:464
+#: LYMessages.c:462
 msgid "lynx: Password required!!!"
 msgstr "lynx : mot de passe requis!"
 
 # LYMessages_en.h
-#: LYMessages.c:465
+#: LYMessages.c:463
 msgid "Clear all authorization info for this session?"
 msgstr "Effacer toute l'information d'autorisation pour cette session?"
 
-#: LYMessages.c:466
+#: LYMessages.c:464
 msgid "Authorization info cleared."
 msgstr "Information d'autorisation effacée."
 
-#: LYMessages.c:467
+#: LYMessages.c:465
 msgid "Authorization failed.  Retry?"
 msgstr "L'auhorisation a échouée. Ré-essayer ?"
 
-#: LYMessages.c:468
+#: LYMessages.c:466
 msgid "cgi support has been disabled."
 msgstr "l'administrateur système a désactivé le soutien cgi."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:470
+#: LYMessages.c:468
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "Fonctionnalités Lynxcgi non compilées dans cette version"
 
-#: LYMessages.c:471
+#: LYMessages.c:469
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Désolé. Aucun moyen connu de convertir  %s to %s. "
 
-#: LYMessages.c:472
+#: LYMessages.c:470
 msgid "Unable to set up connection."
 msgstr "Impossible de finaliser la connexion."
 
-#: LYMessages.c:473
+#: LYMessages.c:471
 msgid "Unable to make connection"
 msgstr "Impossible d'établir la connexion."
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:475
+#: LYMessages.c:473
 msgid "Executable link rejected due to malformed request."
 msgstr "Lien exécutable rejeté dû à une demande erronée."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:477
+#: LYMessages.c:475
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "Lien exécutable rejeté dû au caractère `%c'."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:477
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "Lien exécutable rejeté dû à un chemin relatif ('../')"
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:479
 msgid "Executable link rejected due to location or path."
 msgstr "Lien exécutable rejeté dû à l'emplacement ou au chemin d'accès"
 
-#: LYMessages.c:482
+#: LYMessages.c:480
 msgid "Mail access is disabled!"
 msgstr "L'accès au courrier est désactivé."
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:484
+#: LYMessages.c:482
 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"
 
-#: LYMessages.c:485
+#: LYMessages.c:483
 msgid "Telnet access is disabled!"
 msgstr "L'accès Telnet est désactivé."
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:487
+#: LYMessages.c:485
 msgid "Telnet port specifications are disabled."
 msgstr "Les spécifications de port Telnet sont désactivées."
 
-#: LYMessages.c:488
+#: LYMessages.c:486
 msgid "USENET news access is disabled!"
 msgstr "L'accès aux articles USENET est désactivé."
 
-#: LYMessages.c:489
+#: LYMessages.c:487
 msgid "Rlogin access is disabled!"
 msgstr "L'accès Rlogin est désactivé."
 
-#: LYMessages.c:490
+#: LYMessages.c:488
 msgid "Ftp access is disabled!"
 msgstr "L'accès FTP est désactivé."
 
-#: LYMessages.c:491
+#: LYMessages.c:489
 msgid "There are no references from this document."
 msgstr "Il n'y a aucune référence dans ce document."
 
-#: LYMessages.c:492
+#: LYMessages.c:490
 msgid "There are only hidden links from this document."
 msgstr "Ce document ne renvoie qu'à des liens cachés."
 
-#: LYMessages.c:494
+#: LYMessages.c:492
 msgid "Unable to open command file."
 msgstr "Impossible d'ouvrir le fichier de commande."
 
-#: LYMessages.c:496
+#: LYMessages.c:494
 msgid "News Post Cancelled!!!"
 msgstr "Envoi des nouvelles annulé!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:498
+#: LYMessages.c:496
 msgid "Spawning your selected editor to edit news message"
 msgstr "Lancement de votre éditeur pour éditer un message"
 
-#: LYMessages.c:499
+#: LYMessages.c:497
 msgid "Post this message?"
 msgstr "Envoyer ce message?"
 
-#: LYMessages.c:500
+#: LYMessages.c:498
 #, c-format
 msgid "Append '%s'?"
 msgstr "Adjoindre '%s'?"
 
-#: LYMessages.c:501
+#: LYMessages.c:499
 msgid "Posting to newsgroup(s)..."
 msgstr "Envoi du message..."
 
-#: LYMessages.c:503
+#: LYMessages.c:501
 msgid "*** You have unread mail. ***"
 msgstr "*** Vous avez du courrier non ouvert. ***"
 
-#: LYMessages.c:505
+#: LYMessages.c:503
 msgid "*** You have mail. ***"
 msgstr "*** Vous avez du courrier. ***"
 
-#: LYMessages.c:507
+#: LYMessages.c:505
 msgid "*** You have new mail. ***"
 msgstr "*** Vous avez du nouveau courrier. ***"
 
-#: LYMessages.c:508
+#: LYMessages.c:506
 msgid "File insert cancelled!!!"
 msgstr "Insertion de fichier annulée!!"
 
-#: LYMessages.c:509
+#: LYMessages.c:507
 msgid "Not enough memory for file!"
 msgstr "Mémoire insuffisante pour lire le fichier-raccourci."
 
 # WWW/Libary/Implementation/HTFile.c
-#: LYMessages.c:510
+#: LYMessages.c:508
 msgid "Can't open file for reading."
 msgstr "Impossible d'ouvrir le fichier pour décompression."
 
-#: LYMessages.c:511
+#: LYMessages.c:509
 msgid "File does not exist."
 msgstr "Le fichier n'éxiste pas."
 
-#: LYMessages.c:512
+#: LYMessages.c:510
 msgid "File does not exist - reenter or cancel:"
 msgstr "LE fichier n'éxiste pas - ré-essayer ou annuler:"
 
-#: LYMessages.c:513
+#: LYMessages.c:511
 msgid "File is not readable."
 msgstr "Le fichier n'est pas lisible."
 
-#: LYMessages.c:514
+#: LYMessages.c:512
 msgid "File is not readable - reenter or cancel:"
 msgstr "Le fichier n'est pas lisible - ré-essayer ou annuler:"
 
-#: LYMessages.c:515
+#: LYMessages.c:513
 msgid "Nothing to insert - file is 0-length."
 msgstr "Rien n'a insérer - le fichier est vide."
 
-#: LYMessages.c:516
+#: LYMessages.c:514
 msgid "Save request cancelled!!!"
 msgstr "Demande d'enregistrement annulée!"
 
-#: LYMessages.c:517
+#: LYMessages.c:515
 msgid "Mail request cancelled!!!"
 msgstr "Demande de courrier annulée!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:519
+#: LYMessages.c:517
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "Lecture de la source pré-analysée. Veuillez confirmer l'envoi?"
 
-#: LYMessages.c:520
+#: LYMessages.c:518
 msgid "Please wait..."
 msgstr "Veuillez attendre..."
 
-#: LYMessages.c:521
+#: LYMessages.c:519
 msgid "Mailing file.  Please wait..."
 msgstr "Envoi du fichier.  Veuillez attendre..."
 
-#: LYMessages.c:522
+#: LYMessages.c:520
 msgid "ERROR - Unable to mail file"
 msgstr "ERREUR - impossible d'envoyer le fichier."
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:524
+#: LYMessages.c:522
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "Le fichier représente %d écrans. Vous voulez l'imprimer?"
 
-#: LYMessages.c:525
+#: LYMessages.c:523
 msgid "Print request cancelled!!!"
 msgstr "Demande d'impression annulée!"
 
-#: LYMessages.c:526
+#: LYMessages.c:524
 msgid "Press <return> to begin: "
 msgstr "Appuyez sur <Entr> pour commencer : "
 
-#: LYMessages.c:527
+#: LYMessages.c:525
 msgid "Press <return> to finish: "
 msgstr "Appuyez sur <Entr> pour terminer : "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:527
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "Le fichier représente %d pages. Vous voulez l'inmprimer?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:531
+#: LYMessages.c:529
 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."
 
-#: LYMessages.c:532
+#: LYMessages.c:530
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "ERREUR - impossible d'allouer de l'espace pour le fichier!"
 
-#: LYMessages.c:533
+#: LYMessages.c:531
 msgid "Unable to open tempfile"
 msgstr "Impossible d'ouvrir le fichier temporaire."
 
-#: LYMessages.c:534
+#: LYMessages.c:532
 msgid "Unable to open print options file"
 msgstr "Impossible d'ouvrir le fichier d'options d'impression."
 
-#: LYMessages.c:535
+#: LYMessages.c:533
 msgid "Printing file.  Please wait..."
 msgstr "Impression du fichier.  Veuillez attendre."
 
-#: LYMessages.c:536
+#: LYMessages.c:534
 msgid "Please enter a valid internet mail address: "
 msgstr "Veuillez entrer une adresse de courrier Internet valide : "
 
-#: LYMessages.c:537
+#: LYMessages.c:535
 msgid "ERROR! - printer is misconfigured!"
 msgstr "ERREUR - l'imprimante est mal configurée."
 
 # src/LYMap.c
-#: LYMessages.c:538
+#: LYMessages.c:536
 msgid "Image map from POST response not available!"
 msgstr "Image référencée de la réponse POST non disponible"
 
-#: LYMessages.c:539
+#: LYMessages.c:537
 msgid "Misdirected client-side image MAP request!"
 msgstr "Erreur de demande d'image référencée client."
 
-#: LYMessages.c:540
+#: LYMessages.c:538
 msgid "Client-side image MAP is not accessible!"
 msgstr "L'image référencée client n'est pas accessible."
 
-#: LYMessages.c:541
+#: LYMessages.c:539
 msgid "No client-side image MAPs are available!"
 msgstr "Aucune image référencée client n'est disponible."
 
-#: LYMessages.c:542
+#: LYMessages.c:540
 msgid "Client-side image MAP is not available!"
 msgstr "L'image référencée client n'est pas disponible."
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:545
+#: LYMessages.c:543
 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!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:547
+#: LYMessages.c:545
 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"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:549
+#: LYMessages.c:547
 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!"
 
-#: LYMessages.c:551
+#: LYMessages.c:549
 msgid "That key requires Advanced User mode."
 msgstr "Cette touche n'est active qu'en mode utilisateur avancé."
 
-#: LYMessages.c:552
+#: LYMessages.c:550
 #, c-format
 msgid "Content-type: %s"
 msgstr "Type de contenu: %s"
 
-#: LYMessages.c:553
+#: LYMessages.c:551
 msgid "Command: "
 msgstr "Commande :"
 
-#: LYMessages.c:554
+#: LYMessages.c:552
 msgid "Unknown or ambiguous command"
 msgstr "Commande inconnue ou ambigue."
 
-#: LYMessages.c:555
+#: LYMessages.c:553
 msgid " Version "
 msgstr " Version "
 
-#: LYMessages.c:556
+#: LYMessages.c:554
 msgid " first"
 msgstr " premier"
 
-#: LYMessages.c:557
+#: LYMessages.c:555
 msgid ", guessing..."
 msgstr ", analyse en cours..."
 
-#: LYMessages.c:558
+#: LYMessages.c:556
 msgid "Permissions for "
 msgstr "Permissions d'accès pour "
 
-#: LYMessages.c:559
+#: LYMessages.c:557
 msgid "Select "
 msgstr "Choisir "
 
-#: LYMessages.c:560
+#: LYMessages.c:558
 msgid "capital letter"
 msgstr "majuscule"
 
-#: LYMessages.c:561
+#: LYMessages.c:559
 msgid " of option line,"
 msgstr " de la ligne d'option,"
 
-#: LYMessages.c:562
+#: LYMessages.c:560
 msgid " to save,"
 msgstr " pour enregistrer,"
 
-#: LYMessages.c:563
+#: LYMessages.c:561
 msgid " to "
 msgstr " à "
 
-#: LYMessages.c:564
+#: LYMessages.c:562
 msgid " or "
 msgstr " ou "
 
-#: LYMessages.c:565
+#: LYMessages.c:563
 msgid " index"
 msgstr " index"
 
-#: LYMessages.c:566
+#: LYMessages.c:564
 msgid " to return to Lynx."
 msgstr " pour retourner à Lynx"
 
-#: LYMessages.c:567
+#: LYMessages.c:565
 msgid "Accept Changes"
 msgstr "Accepter les changements"
 
-#: LYMessages.c:568
+#: LYMessages.c:566
 msgid "Reset Changes"
 msgstr "Annuler les changements"
 
-#: LYMessages.c:569
+#: LYMessages.c:567
 msgid "Left Arrow cancels changes"
 msgstr "Fleche gauche pour annuler les changements"
 
-#: LYMessages.c:570
+#: LYMessages.c:568
 msgid "Save options to disk"
 msgstr "Enregistrer les options sur disque"
 
-#: LYMessages.c:571
+#: LYMessages.c:569
 msgid "Hit RETURN to accept entered data."
 msgstr "Appuyer sur ENTR pour accepter les données entrées."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:573
+#: LYMessages.c:571
 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"
 
-#: LYMessages.c:574
+#: LYMessages.c:572
 msgid "Value accepted!"
 msgstr "Valeur acceptée!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:576
+#: LYMessages.c:574
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Valeur acceptée! NOTA : Lynx est configuré pour XWINDOWS!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:578
+#: LYMessages.c:576
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Valeur acceptée!  NOTA : Lynx n'est PAS configuré pour XWINDOWS!"
 
-#: LYMessages.c:579
+#: LYMessages.c:577
 msgid "You are not allowed to change which editor to use!"
 msgstr "Vous ne pouvez pas choisir un autre éditeur!"
 
-#: LYMessages.c:580
+#: LYMessages.c:578
 msgid "Failed to set DISPLAY variable!"
 msgstr "Impossible de régler la variable AFFICHAGE."
 
-#: LYMessages.c:581
+#: LYMessages.c:579
 msgid "Failed to clear DISPLAY variable!"
 msgstr "Impossible d'effacer la variable AFFICHAGE."
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:583
+#: LYMessages.c:581
 msgid "You are not allowed to change the bookmark file!"
 msgstr "Changement du fichier de signets non autorisé!"
 
-#: LYMessages.c:584
+#: LYMessages.c:582
 msgid "Terminal does not support color"
 msgstr "Le terminal ne permet pas l'affichage couleur"
 
-#: LYMessages.c:585
+#: LYMessages.c:583
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "Votre terminal '%s' ne permet pas l'affichage couleur."
 
-#: LYMessages.c:586
+#: LYMessages.c:584
 msgid "Access to dot files is disabled!"
 msgstr "L'accès aux fichiers cachés est désactivé!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:588
+#: LYMessages.c:586
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr "La chaine de caractere 'User-Agent' ne contient ni \"Lynx\" ni \"L_y_n_x\""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:590
+#: LYMessages.c:588
 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 apparaitra comme uneerreur volontaire"
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:592
+#: LYMessages.c:590
 msgid "Changing of the User-Agent string is disabled!"
 msgstr "La modification du champ 'User-Agent' n'est pas activée"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:594
+#: LYMessages.c:592
 msgid "You are not allowed to change this setting."
 msgstr "Vous n'êtes pas autorisé à changer ce paramètre."
 
-#: LYMessages.c:595
+#: LYMessages.c:593
 msgid "Saving Options..."
 msgstr "Enregistrement des options..."
 
-#: LYMessages.c:596
+#: LYMessages.c:594
 msgid "Options saved!"
 msgstr "Options enregistrées"
 
-#: LYMessages.c:597
+#: LYMessages.c:595
 msgid "Unable to save Options!"
 msgstr "Impossible d'enregistrer les options!"
 
-#: LYMessages.c:598
+#: LYMessages.c:596
 msgid " 'r' to return to Lynx "
 msgstr " Entrez « r » pour retourner à Lynx. "
 
-#: LYMessages.c:599
+#: LYMessages.c:597
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr " Entrez « > » pour enregistrer; « r » pour retourner à Lynx."
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:601
+#: LYMessages.c:599
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "N'importe quelle touche pour changer la valeur; ENTR pour accepter"
 
-#: LYMessages.c:602
+#: LYMessages.c:600
 msgid "Error uncompressing temporary file!"
 msgstr "Erreur de décompression du fichier temporaire!"
 
-#: LYMessages.c:603
+#: LYMessages.c:601
 msgid "Unsupported URL scheme!"
 msgstr "Schème de URL non reconnu!"
 
-#: LYMessages.c:604
+#: LYMessages.c:602
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "Données non reconnues; consultez la page d'informations pour le moment"
 
-#: LYMessages.c:605
+#: LYMessages.c:603
 msgid "Redirection limit of 10 URL's reached."
 msgstr "Réacheminement : limite de 10 URL atteinte."
 
-#: LYMessages.c:606
+#: LYMessages.c:604
 msgid "Illegal redirection URL received from server!"
 msgstr "URL de réacheminement illégal reçu du serveur!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:608
+#: LYMessages.c:606
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "Le serveur a demandé %d réacheminement du contenu POST vers"
 
-#: LYMessages.c:611
+#: LYMessages.c:609
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P) Continuer, utiliser G)ET ou C) Annuler "
 
-#: LYMessages.c:612
+#: LYMessages.c:610
 msgid "P)roceed, or C)ancel "
 msgstr "P) Continuer ou C) Annuler "
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:614
+#: LYMessages.c:612
 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"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:614
 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"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:618
+#: LYMessages.c:616
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "Document FORM avec contenu POST. Envoyer de nouveau?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:620
+#: LYMessages.c:618
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Ré-envoyer le contenu POST vers %s ?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:622
+#: LYMessages.c:620
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "Liste d'un document avec données POST. Recharger %s ?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:624
+#: LYMessages.c:622
 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?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:624
 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?"
 
-#: LYMessages.c:627
+#: LYMessages.c:625
 msgid "Proceed without a username and password?"
 msgstr "Procéder sans id-utilisateur et mot de passe?"
 
-#: LYMessages.c:628
+#: LYMessages.c:626
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Continuer (%s)?"
 
-#: LYMessages.c:629
+#: LYMessages.c:627
 msgid "Cannot POST to this host."
 msgstr "Impossible d'envoyer des articles vers cet hôte."
 
 # src/LYGetFile.c
-#: LYMessages.c:630
+#: LYMessages.c:628
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "Méthode POST non fonctionnelle pour cet URL; données POST ignorées"
 
-#: LYMessages.c:631
+#: LYMessages.c:629
 msgid "Discarding POST data..."
 msgstr "Suppression de données POST..."
 
-#: LYMessages.c:632
+#: LYMessages.c:630
 msgid "Document will not be reloaded!"
 msgstr "Le document ne sera pas rechargé!"
 
-#: LYMessages.c:633
+#: LYMessages.c:631
 msgid "Location: "
 msgstr "Emplacement : "
 
-#: LYMessages.c:634
+#: LYMessages.c:632
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' non trouvé!"
 
-#: LYMessages.c:635
+#: LYMessages.c:633
 msgid "Default Bookmark File"
 msgstr "fichier signets implicite"
 
-#: LYMessages.c:636
+#: LYMessages.c:634
 msgid "Screen too small! (8x35 min)"
 msgstr "L'écran est trop petit! (8x35 min)"
 
-#: LYMessages.c:637
+#: LYMessages.c:635
 msgid "Select destination or ^G to Cancel: "
 msgstr "Choisissez une destination ou entrez ^G pour annuler : "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:639
+#: LYMessages.c:637
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "Choisir classeur de signets, '=' pour le menu ou ^G pour annuler : "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:641
+#: LYMessages.c:639
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "Copier le L)ien dans ce fichier de signets ou C) Annuler? (l,c) : "
 
-#: LYMessages.c:642
+#: LYMessages.c:640
 msgid "Multiple bookmark support is not available."
 msgstr "Le soutien des fichiers multiples n'est pas disponible."
 
-#: LYMessages.c:643
+#: LYMessages.c:641
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr "Sélection de signets (écran %d de %d)"
 
-#: LYMessages.c:644
+#: LYMessages.c:642
 msgid "       Select Bookmark"
 msgstr "Sélection de signets"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:646
+#: LYMessages.c:644
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "Édition de la description et du chemin de fichier (%d de 2)"
 
 # UNSURE
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:648
+#: LYMessages.c:646
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "         Édition de la description et du chemin de fichier"
 
 # UNSURE
-#: LYMessages.c:649
+#: LYMessages.c:647
 msgid "Letter: "
 msgstr "Lettre : "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:652
+#: LYMessages.c:650
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Utilisez un chemin de fichier à partir de votre répertoire de connexion"
 
-#: LYMessages.c:654
+#: LYMessages.c:652
 msgid "Use a filepath off your home directory!"
 msgstr "Utilisez un chemin de fichier à partir de votre répertoire personnel"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:657
+#: LYMessages.c:655
 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"
 
 #. #define MAXHIST_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:657
 msgid "History List maximum reached!  Document not pushed."
 msgstr "Vous avez atteint le maximum de l'Historique. Accès impossible"
 
-#: LYMessages.c:660
+#: LYMessages.c:658
 msgid "No previously visited links available!"
 msgstr "Aucun lien déjà activé n'est disponible"
 
-#: LYMessages.c:661
+#: LYMessages.c:659
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Mémoire insuffisante!  Abandon!"
 
-#: LYMessages.c:662
+#: LYMessages.c:660
 msgid "Memory exhausted!  Aborting..."
 msgstr "Mémoire insuffisante!  Abandon!"
 
-#: LYMessages.c:663
+#: LYMessages.c:661
 msgid "Not enough memory!"
 msgstr "Mémoire insuffisante"
 
-#: LYMessages.c:664
+#: LYMessages.c:662
 msgid "Directory/File Manager not available"
 msgstr "Gestionnaire de fichier/répertoire non disponible"
 
-#: LYMessages.c:665
+#: LYMessages.c:663
 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"
 
-#: LYMessages.c:666
+#: LYMessages.c:664
 msgid "Location URL is not absolute."
 msgstr "Il ne s'agit pas d'un URL absolu"
 
-#: LYMessages.c:667
+#: LYMessages.c:665
 msgid "Refresh URL is not absolute."
 msgstr "Il ne s'agit pas d'un URL absolu"
 
 # NdT: This one is not clear...   
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:667
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2076,13 +2076,13 @@ msgstr ""
 "Vous envoyez un message à :\n"
 " "
 
-#: LYMessages.c:670
+#: LYMessages.c:668
 msgid ""
 "You are sending a comment to:\n"
 "  "
 msgstr "Vous envoyez maintenant un commentaire à : "
 
-#: LYMessages.c:671
+#: LYMessages.c:669
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2092,7 +2092,7 @@ msgstr ""
 " En copie à:\n"
 " "
 
-#: LYMessages.c:672
+#: LYMessages.c:670
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2103,7 +2103,7 @@ msgstr ""
 " "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:672
 msgid ""
 "\n"
 "\n"
@@ -2115,7 +2115,7 @@ msgstr ""
 
 # The following two messages have been put together to make:
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:674
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2124,7 +2124,7 @@ msgstr ""
 " Entrez votre nom (ou laissez un blanc pour rester anonyme)\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:676
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2133,11 +2133,11 @@ msgstr ""
 " Entrez une adresse de courriel ou un autre moyen\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:678
 msgid " means to contact you, if you desire a response.\n"
 msgstr " de vous joindre si vous désirez une réponse.\n"
 
-#: LYMessages.c:681
+#: LYMessages.c:679
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2146,7 +2146,7 @@ msgstr ""
 " Veuillez entrer le sujet du message.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2154,11 +2154,11 @@ msgstr ""
 "\n"
 " Entrez une adresse de courriel pour la copie conforme.\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:682
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (Laissez en blanc si vous ne voulez pas de copie.)\n"
 
-#: LYMessages.c:685
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2168,7 +2168,7 @@ msgstr ""
 " Veuillez revoir le corps du message :\n"
 "\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:684
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2176,7 +2176,7 @@ msgstr ""
 "\n"
 "Faites ENTR pour continuer :"
 
-#: LYMessages.c:687
+#: LYMessages.c:685
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2184,11 +2184,11 @@ msgstr ""
 "\n"
 "Appuyez sur ENTRÉE pour restaurer : "
 
-#: LYMessages.c:688
+#: LYMessages.c:686
 msgid " Use Control-U to erase the default.\n"
 msgstr "Faites Ctrl-U pour effacer la valeur par défaut.\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2197,7 +2197,7 @@ msgstr ""
 " Veuillez entrer votre message ci-après."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:380
+#: LYMessages.c:689 src/LYNews.c:361
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2206,7 +2206,7 @@ msgstr ""
 " Une fois terminé, faites <Entr> et tapez un point (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:381
+#: LYMessages.c:691 src/LYNews.c:362
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2223,32 +2223,32 @@ msgstr ""
 # NdT: Can you make the system accept the O, N, T, J commands? 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:695
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "cookie de %s : %.*s=%.*s  Accepter? (O/N/Toujours/Jamais)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:697
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Accepter un cookie au domaine non valide=%s pour '%s'?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:699
 #, 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'?"
 
-#: LYMessages.c:702
+#: LYMessages.c:700
 msgid "Allowing this cookie."
 msgstr "Acceptation du cookie"
 
-#: LYMessages.c:703
+#: LYMessages.c:701
 msgid "Rejecting this cookie."
 msgstr "Rejet du cookie"
 
-#: LYMessages.c:704
+#: LYMessages.c:702
 msgid "The Cookie Jar is empty."
 msgstr "Le fichier des «cookies» est vide"
 
@@ -2257,63 +2257,63 @@ msgstr "Le fichier des «cookies» est vide"
 # LYMessages_en.h (LYCookie.c)
 # NdT: What do they mean by "gobble up an entire domain"?
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:706
+#: LYMessages.c:704
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "Activer les liens pour supprimer les cookies ou les domaines,"
 
-#: LYMessages.c:707
+#: LYMessages.c:705
 msgid "or to change a domain's 'allow' setting."
 msgstr "ou pour changer les paramètres de permission pour un domaine."
 
-#: LYMessages.c:708
+#: LYMessages.c:706
 msgid "(Cookies never allowed.)"
 msgstr "(Cookies jamais acceptés)"
 
-#: LYMessages.c:709
+#: LYMessages.c:707
 msgid "(Cookies always allowed.)"
 msgstr "(Cookies toujours acceptés)"
 
-#: LYMessages.c:710
+#: LYMessages.c:708
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Cookies acceptés à l'invite)"
 
-#: LYMessages.c:711
+#: LYMessages.c:709
 msgid "(Persistent Cookies.)"
 msgstr "(Cokkies persistants.)"
 
-#: LYMessages.c:712
+#: LYMessages.c:710
 msgid "(No title.)"
 msgstr "(Pas de titre.)"
 
-#: LYMessages.c:713
+#: LYMessages.c:711
 msgid "(No name.)"
 msgstr "(Aucun nom)"
 
-#: LYMessages.c:714
+#: LYMessages.c:712
 msgid "(No value.)"
 msgstr "(Aucune valeur)"
 
-#: LYMessages.c:715
+#: LYMessages.c:713
 msgid "None"
 msgstr "Aucun(e)"
 
-#: LYMessages.c:716
+#: LYMessages.c:714
 msgid "(End of session.)"
 msgstr "(Fin de session)"
 
-#: LYMessages.c:717
+#: LYMessages.c:715
 msgid "Delete this cookie?"
 msgstr "Supprimer ce cookie?"
 
-#: LYMessages.c:718
+#: LYMessages.c:716
 msgid "The cookie has been eaten!"
 msgstr "Le cookie a été supprimé!"
 
-#: LYMessages.c:719
+#: LYMessages.c:717
 msgid "Delete this empty domain?"
 msgstr "Supprimer ce domaine vide?"
 
-#: LYMessages.c:720
+#: LYMessages.c:718
 msgid "The domain has been eaten!"
 msgstr "Le domaine a été supprimé!"
 
@@ -2321,159 +2321,159 @@ msgstr "Le domaine a été supprimé!"
 #  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:722
+#: LYMessages.c:720
 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? "
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:724
+#: LYMessages.c:722
 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? "
 
-#: LYMessages.c:725
+#: LYMessages.c:723
 msgid "All cookies in the domain have been eaten!"
 msgstr "Tous les cookies du domaine ont été supprimés!"
 
-#: LYMessages.c:726
+#: LYMessages.c:724
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "Toujours accepter les cookies du domaine '%s'."
 
-#: LYMessages.c:727
+#: LYMessages.c:725
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "Ne jamais accepter les cookies du domaine '%s'."
 
 # NdT: What does happen exatly when you chose P)rompt?
-#: LYMessages.c:728
+#: LYMessages.c:726
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "Confirmer avant d'accepter les cookies du domaine '%s'."
 
-#: LYMessages.c:729
+#: LYMessages.c:727
 msgid "Delete all cookies in this domain?"
 msgstr "Supprimer tous les cookies de ce domaine?"
 
-#: LYMessages.c:730
+#: LYMessages.c:728
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "Tous les cookies ont été supprimés!"
 
-#: LYMessages.c:732
+#: LYMessages.c:730
 msgid "Port 19 not permitted in URLs."
 msgstr "Le port 19 n'est pas permis"
 
-#: LYMessages.c:733
+#: LYMessages.c:731
 msgid "Port 25 not permitted in URLs."
 msgstr "Le port 25 n'est pas permis"
 
-#: LYMessages.c:734
+#: LYMessages.c:732
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "Le port %lu n'est pas permis dans les URL."
 
-#: LYMessages.c:735
+#: LYMessages.c:733
 msgid "URL has a bad port field."
 msgstr "Champ de port d'URL erroné."
 
-#: LYMessages.c:736
+#: LYMessages.c:734
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "Imbrication maximale d'éléments HTML dépassée."
 
-#: LYMessages.c:737
+#: LYMessages.c:735
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Référence partielle eronnée! Suppression des points (../)."
 
-#: LYMessages.c:738
+#: LYMessages.c:736
 msgid "Trace Log open failed.  Trace off!"
 msgstr "Échec d'ouverture du journal de parcours. Annuler la commande!"
 
-#: LYMessages.c:739
+#: LYMessages.c:737
 msgid "Lynx Trace Log"
 msgstr "Journal de parcours Lynx"
 
-#: LYMessages.c:740
+#: LYMessages.c:738
 msgid "No trace log has been started for this session."
 msgstr "Aucun journal de parcours n'a été lancé pour cette session."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:742
+#: LYMessages.c:740
 msgid "The maximum temporary file count has been reached!"
 msgstr "Le nombre maximum de fichiers temporaires a été atteint."
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:744
+#: LYMessages.c:742
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "La valeur excède la zone tampon; Élaguer les lignes finales (tail)."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:746
+#: LYMessages.c:744
 msgid "Modified tail combined with head of form field value."
 msgstr "Lignes finales modifiés combinées avec en-tête (champ de formulaire)"
 
 #. HTFile.c
-#: LYMessages.c:749
+#: LYMessages.c:747
 msgid "Directory"
 msgstr "Répertoire"
 
-#: LYMessages.c:750
+#: LYMessages.c:748
 msgid "Directory browsing is not allowed."
 msgstr "La lecture du répertoire n'est pas permise."
 
-#: LYMessages.c:751
+#: LYMessages.c:749
 msgid "Selective access is not enabled for this directory"
 msgstr "L'accès sélectif n'est pas activé pour ce répertoire."
 
-#: LYMessages.c:752
+#: LYMessages.c:750
 msgid "Multiformat: directory scan failed."
 msgstr "Multiformat: l'analyse du répertoire a échouée."
 
-#: LYMessages.c:753
+#: LYMessages.c:751
 msgid "This directory is not readable."
 msgstr "Ce répertoire ne peut être lu."
 
-#: LYMessages.c:754
+#: LYMessages.c:752
 msgid "Can't access requested file."
 msgstr "Impossible d'accéder au fichier requis."
 
-#: LYMessages.c:755
+#: LYMessages.c:753
 msgid "Could not find suitable representation for transmission."
 msgstr "Impossible de trouver une représentation correcte pour la transmission."
 
 # WWW/Libary/Implementation/HTFile.c
-#: LYMessages.c:756
+#: LYMessages.c:754
 msgid "Could not open file for decompression!"
 msgstr "Impossible d'ouvrir le fichier pour décompression."
 
-#: LYMessages.c:757
+#: LYMessages.c:755
 msgid "Files:"
 msgstr "Fichiers:"
 
-#: LYMessages.c:758
+#: LYMessages.c:756
 msgid "Subdirectories:"
 msgstr "Sous-répertoires :"
 
-#: LYMessages.c:759
+#: LYMessages.c:757
 msgid " directory"
 msgstr " répertoire"
 
-#: LYMessages.c:760
+#: LYMessages.c:758
 msgid "Up to "
 msgstr "jusqu'à "
 
-#: LYMessages.c:761
+#: LYMessages.c:759
 msgid "Current directory is "
 msgstr "Le répertoire courant est "
 
 #. HTGopher.c
-#: LYMessages.c:764
+#: LYMessages.c:762
 msgid "No response from server!"
 msgstr "Pas de réponses du serveur !"
 
-#: LYMessages.c:765
+#: LYMessages.c:763
 msgid "CSO index"
 msgstr "index CSO"
 
-#: LYMessages.c:766
+#: LYMessages.c:764
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2481,16 +2481,16 @@ msgstr ""
 "\n"
 "Ceci est un index cherchable provenant d'une base de donnée CSO.\n"
 
-#: LYMessages.c:767
+#: LYMessages.c:765
 msgid "CSO Search Results"
 msgstr "Résultat de la recherche CSO"
 
-#: LYMessages.c:768
+#: LYMessages.c:766
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "La recherche a échouée sur %s\n"
 
-#: LYMessages.c:769
+#: LYMessages.c:767
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2498,7 +2498,7 @@ msgstr ""
 "\n"
 "Appuyez sur la touche 's' et entrez un mot clef de recherche.\n"
 
-#: LYMessages.c:770
+#: LYMessages.c:768
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2506,35 +2506,35 @@ msgstr ""
 "\n"
 "Ceci est un index Gopher chercheable.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:769
 msgid "Gopher index"
 msgstr "Index Gopher"
 
-#: LYMessages.c:772
+#: LYMessages.c:770
 msgid "Gopher Menu"
 msgstr "Menu Gopher"
 
-#: LYMessages.c:773
+#: LYMessages.c:771
 msgid " Search Results"
 msgstr " Résultats de la recherche:"
 
-#: LYMessages.c:774
+#: LYMessages.c:772
 msgid "Sending CSO/PH request."
 msgstr "Envoi de la requête CSO/PH."
 
-#: LYMessages.c:775
+#: LYMessages.c:773
 msgid "Sending Gopher request."
 msgstr "Envoi de la requête Gopher."
 
-#: LYMessages.c:776
+#: LYMessages.c:774
 msgid "CSO/PH request sent; waiting for response."
 msgstr "Requête CSO/PH envoyée, attente de réponse."
 
-#: LYMessages.c:777
+#: LYMessages.c:775
 msgid "Gopher request sent; waiting for response."
 msgstr "Requête Gopher envoyée; attente de réponse."
 
-#: LYMessages.c:778
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2542,7 +2542,7 @@ msgstr ""
 "\n"
 "Merci d'entrer un mot clef pour la recherche.\n"
 
-#: LYMessages.c:779
+#: LYMessages.c:777
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2550,193 +2550,198 @@ msgstr ""
 "\n"
 "Le mot clef que vous entrez vous permettra de faire une recherche sur un"
 
-#: LYMessages.c:780
+#: LYMessages.c:778
 msgid " person's name in the database.\n"
 msgstr " nom de personne dans la base de donnée.\n"
 
 #. HTNews.c
-#: LYMessages.c:783
+#: LYMessages.c:781
 msgid "Connection closed ???"
 msgstr "Connexion terminée ???"
 
-#: LYMessages.c:784
+#: LYMessages.c:782
 msgid "Cannot open temporary file for news POST."
 msgstr "Impossible d'ouvrir un fichier temporaire pour les articles de forums."
 
-#: LYMessages.c:785
+#: LYMessages.c:783
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Ce client ne permet pas l'envoi de news avec SSL"
 
 #. HTStyle.c
-#: LYMessages.c:788
+#: LYMessages.c:786
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Style %d '%s' SGML:%s. Police %s %.1f point.\n"
 
-#: LYMessages.c:789
+#: LYMessages.c:787
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tIndentations: premiere=%.0f autres=%.0f, Hauteur=%.1f Desc=%.1f\n"
 
-#: LYMessages.c:790
+#: LYMessages.c:788
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "\tAlign=%d, %d tabs. (%.0f avant, %.0f apres)\n"
 
-#: LYMessages.c:791
+#: LYMessages.c:789
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "\t\tTab sorte=%d à %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:794
+#: LYMessages.c:792
 msgid "Can't proceed without a username and password."
 msgstr "Impossible de procéder sans id-utilisateur et mot de passe."
 
-#: LYMessages.c:795
+#: LYMessages.c:793
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Impossible de ré-essayer sans authorisation! Contactez le Webmestre du serveur."
 
-#: LYMessages.c:796
+#: LYMessages.c:794
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "Impossible sans autorisation du mandataire; contacter le webmestre."
 
-#: LYMessages.c:797
+#: LYMessages.c:795
 msgid "Retrying with proxy authorization information."
 msgstr "Nouvelle tentative avec info d'autorisation du mandataire"
 
 #. HTWAIS.c
-#: LYMessages.c:800
+#: LYMessages.c:798
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Message de retour trop grand."
 
-#: LYMessages.c:801
+#: LYMessages.c:799
 msgid "Enter WAIS query: "
 msgstr "Entrez votre requête WAIS:"
 
 #. Miscellaneous status
-#: LYMessages.c:804
+#: LYMessages.c:802
 msgid "Retrying as HTTP0 request."
 msgstr "Nouvel essai de requête HTTP0"
 
-#: LYMessages.c:805
+#: LYMessages.c:803
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "%d bytes transférés"
 
-#: LYMessages.c:806
+#: LYMessages.c:804
 msgid "Data transfer complete"
 msgstr "Transfert de données terminé"
 
-#: LYMessages.c:807
+#: LYMessages.c:805
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Erreur à la ligne %d de %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:810
+#: LYMessages.c:808
 msgid "Address List Page"
 msgstr "Page de liste d'adresse"
 
-#: LYMessages.c:811
+#: LYMessages.c:809
 msgid "Bookmark file"
 msgstr "Fichier de signets"
 
-#: LYMessages.c:812
+#: LYMessages.c:810
 msgid "Configuration Definitions"
 msgstr "Définition de la configuration"
 
-#: LYMessages.c:813
+#: LYMessages.c:811
 msgid "Cookie Jar"
 msgstr "\"Le fichier des «cookies»"
 
-#: LYMessages.c:814
+#: LYMessages.c:812
 msgid "Current Key Map"
 msgstr "Configuration des touches"
 
-#: LYMessages.c:815
+#: LYMessages.c:813
 msgid "File Management Options"
 msgstr "Options de gestion de fichier"
 
-#: LYMessages.c:816
+#: LYMessages.c:814
 msgid "Download Options"
 msgstr "Options de déchargement de fichier"
 
-#: LYMessages.c:817
+#: LYMessages.c:815
 msgid "History Page"
 msgstr "Historique"
 
-#: LYMessages.c:818
+#: LYMessages.c:816
 msgid "List Page"
 msgstr "la Page de références"
 
-#: LYMessages.c:819
+#: LYMessages.c:817
 msgid "Lynx.cfg Information"
 msgstr "Information sur Lynx.cfg"
 
-#: LYMessages.c:820
+#: LYMessages.c:818
 msgid "Converted Mosaic Hotlist"
 msgstr "Liste de signets Mosaic convertie"
 
-#: LYMessages.c:821
+#: LYMessages.c:819
 msgid "Options Menu"
 msgstr "Menu des paramètres"
 
-#: LYMessages.c:822
+#: LYMessages.c:820
 msgid "File Permission Options"
 msgstr "Options de permission d'accès"
 
-#: LYMessages.c:823
+#: LYMessages.c:821
 msgid "Printing Options"
 msgstr "Options d'impression"
 
-#: LYMessages.c:824
+#: LYMessages.c:822
 msgid "Information about the current document"
 msgstr "Information sur le document courant"
 
-#: LYMessages.c:825
+#: LYMessages.c:823
 msgid "Your recent statusline messages"
 msgstr "Votre ligne d'état récente"
 
-#: LYMessages.c:826
+#: LYMessages.c:824
 msgid "Upload Options"
 msgstr "Options de chargement de fichier "
 
-#: LYMessages.c:827
+#: LYMessages.c:825
 msgid "Visited Links Page"
 msgstr "la Page des liens activés"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:830
+#: LYMessages.c:828
 msgid "See also"
 msgstr "Voir aussi"
 
-#: LYMessages.c:831
+#: LYMessages.c:829
 msgid "your"
 msgstr "votre"
 
-#: LYMessages.c:832
+#: LYMessages.c:830
 msgid "for runtime options"
 msgstr "pour les options d'éxécution"
 
-#: LYMessages.c:833
+#: LYMessages.c:831
 msgid "compile time options"
 msgstr "options de compilation"
 
-#: LYMessages.c:834
+#: LYMessages.c:832
+#, fuzzy
+msgid "color-style configuration"
+msgstr "Votre configuration principale"
+
+#: LYMessages.c:833
 msgid "latest release"
 msgstr "dernière version"
 
-#: LYMessages.c:835
+#: LYMessages.c:834
 msgid "pre-release version"
 msgstr "version pré finale"
 
-#: LYMessages.c:836
+#: LYMessages.c:835
 msgid "development version"
 msgstr "version de développement"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:838
+#: LYMessages.c:837
 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"
@@ -2747,7 +2752,7 @@ msgstr ""
 "d'inclure une copie de cette page."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:842
+#: LYMessages.c:841
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2756,106 +2761,110 @@ msgstr ""
 "configurées automatiquement lors de la compilation de cette version de Lynx."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:847
+#: LYMessages.c:846
 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"
 
-#: LYMessages.c:848
+#: LYMessages.c:847
 msgid "Failed to obtain status of current link!"
 msgstr "Impossible d'obtenir l'état du lien actif!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:851
+#: LYMessages.c:850
 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"
 
-#: LYMessages.c:855
+#: LYMessages.c:854
 msgid "External support is currently disabled."
 msgstr "Le soutien externe est présentement inactivé."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:859
+#: LYMessages.c:858
 #, fuzzy
 msgid "Changing working-directory is currently disabled."
 msgstr "Le lancement est présentement désactivé."
 
-#: LYMessages.c:860
+#: LYMessages.c:859
 #, fuzzy
 msgid "Linewrap OFF!"
 msgstr "Traçage DÉSACTIVÉ"
 
-#: LYMessages.c:861
+#: LYMessages.c:860
 msgid "Linewrap ON!"
 msgstr ""
 
-#: LYMessages.c:862
+#: LYMessages.c:861
 #, fuzzy
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr "Le mode 8-bits ou CJK est réglé à DÉSACTIVÉ! Chargement..."
 
-#: LYMessages.c:863
+#: LYMessages.c:862
 #, fuzzy
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr "Le mode 8-bits ou CJK est réglé à ACTIVÉ! Chargement..."
 
-#: LYMessages.c:864
+#: LYMessages.c:863
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr ""
 
-#: LYMessages.c:865
+#: LYMessages.c:864
 #, fuzzy
 msgid "Trace not supported"
 msgstr "Le terminal ne permet pas l'affichage couleur"
 
-#: WWW/Library/Implementation/HTAABrow.c:648
+#: WWW/Library/Implementation/HTAABrow.c:647
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "TR-Username for '%s' at %s '%s%s':"
 
-#: WWW/Library/Implementation/HTAABrow.c:914
+#: WWW/Library/Implementation/HTAABrow.c:913
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr "Ce client ne sait pas comment composer l'informationd'autorisation du mandataire pour le schème d'adressage"
 
-#: WWW/Library/Implementation/HTAABrow.c:989
+#: WWW/Library/Implementation/HTAABrow.c:988
 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 scheme"
 
-#: WWW/Library/Implementation/HTAABrow.c:1097
+#: WWW/Library/Implementation/HTAABrow.c:1096
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Header invalide '%s%s%s%s%s'"
 
 # WWW/Libary/Implementation/HTAABrow.c
-#: WWW/Library/Implementation/HTAABrow.c:1201
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
 msgstr "Autorisation du mandataire requise - nouvelle tentative"
 
-#: WWW/Library/Implementation/HTAABrow.c:1260
+#: WWW/Library/Implementation/HTAABrow.c:1259
 msgid "Access without authorization denied -- retrying"
 msgstr "Accès non autorisé refusé - nouvelle tentative"
 
-#: WWW/Library/Implementation/HTAccess.c:683
+#: WWW/Library/Implementation/HTAccess.c:677
 msgid "Access forbidden by rule"
 msgstr "Accès interdit par une règle"
 
 # WWW/Libary/Implementation/HTAccess.c
-#: WWW/Library/Implementation/HTAccess.c:785
+#: WWW/Library/Implementation/HTAccess.c:779
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "Document avec contenu POST non trouvé dans l'antémémoire. Recommencer?"
 
-#: WWW/Library/Implementation/HTAccess.c:1026 src/GridText.c:8039
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
 msgid "Loading incomplete."
 msgstr "Chargement incomplet."
 
-#: WWW/Library/Implementation/HTAccess.c:1056
+#: WWW/Library/Implementation/HTAccess.c:1077
 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"
 
-#: WWW/Library/Implementation/HTAccess.c:1058
+#: WWW/Library/Implementation/HTAccess.c:1079
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
 msgstr "**** HTAccess: Erreur interne. Merci de contacter lynx-dev@sig.net !\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1059
+#: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "**** HTAccess: L'état retourné était: %d\n"
@@ -2864,28 +2873,28 @@ msgstr "**** HTAccess: L'état retourné était: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7834
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
 msgid "Can't Access"
 msgstr "Acces impossible"
 
-#: WWW/Library/Implementation/HTAccess.c:1073
+#: WWW/Library/Implementation/HTAccess.c:1094
 msgid "Unable to access document."
 msgstr "Impossible d'accéder au document."
 
-#: WWW/Library/Implementation/HTFTP.c:756
+#: WWW/Library/Implementation/HTFTP.c:766
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Mot de passe pour l'utilisateur %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:784
+#: WWW/Library/Implementation/HTFTP.c:794
 msgid "Unable to connect to FTP host."
 msgstr "Impossible d'établir une connexion à l'hôte FTP"
 
-#: WWW/Library/Implementation/HTFTP.c:1054
+#: WWW/Library/Implementation/HTFTP.c:1064
 msgid "close master socket"
 msgstr "fermer le socket maitre"
 
-#: WWW/Library/Implementation/HTFTP.c:1116
+#: WWW/Library/Implementation/HTFTP.c:1126
 msgid "socket for master socket"
 msgstr "socket pour le socket maitre"
 
@@ -2894,36 +2903,36 @@ msgstr "socket pour le socket maitre"
 #. **  knowing if it is symbolic?	I think so since
 #. **  it might be a directory.
 #.
-#: WWW/Library/Implementation/HTFTP.c:1630 WWW/Library/Implementation/HTFTP.c:2251
+#: WWW/Library/Implementation/HTFTP.c:1640 WWW/Library/Implementation/HTFTP.c:2261
 msgid "Symbolic Link"
 msgstr "Lien symbolique"
 
-#: WWW/Library/Implementation/HTFTP.c:2612
+#: WWW/Library/Implementation/HTFTP.c:2622
 msgid "Receiving FTP directory."
 msgstr "Récepion du répertoire FTP."
 
-#: WWW/Library/Implementation/HTFTP.c:2755
+#: WWW/Library/Implementation/HTFTP.c:2762
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "%d bytes téléchargées (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3083
 msgid "connect for data"
 msgstr "connection pour données"
 
-#: WWW/Library/Implementation/HTFTP.c:3690
+#: WWW/Library/Implementation/HTFTP.c:3731
 msgid "Receiving FTP file."
 msgstr "Reception du fichier FTP"
 
-#: WWW/Library/Implementation/HTFinger.c:275
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
 msgstr "Impossible d'établir une connection finger"
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 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)"
 
-#: WWW/Library/Implementation/HTFinger.c:328
+#: WWW/Library/Implementation/HTFinger.c:331
 msgid "Invalid port number - will only use port 79!"
 msgstr "Numéro de port invalde - seul le port 79 sera utilisé"
 
@@ -2931,7 +2940,7 @@ msgstr "Numéro de port invalde - seul le port 79 sera utilisé"
 msgid "Could not access finger host."
 msgstr "Impossible d'atteindre l'hote"
 
-#: WWW/Library/Implementation/HTFinger.c:407
+#: WWW/Library/Implementation/HTFinger.c:404
 msgid "No response from finger server."
 msgstr "Pas de réponses du serveur finger"
 
@@ -2957,18 +2966,18 @@ msgstr "Mot de passe pour l'hôte de forums '%s' :"
 msgid "Change password?"
 msgstr "Changer le mot de passe?"
 
-#: WWW/Library/Implementation/HTNews.c:1691
+#: WWW/Library/Implementation/HTNews.c:1690
 #, c-format
 msgid "No matches for: %s"
 msgstr "Pas de correspondances pour: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1744
+#: WWW/Library/Implementation/HTNews.c:1743
 msgid ""
 "\n"
 "No articles in this group.\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1757
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2979,16 +2988,16 @@ msgstr ""
 #.
 #. **	Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1770
+#: WWW/Library/Implementation/HTNews.c:1769
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1792
+#: WWW/Library/Implementation/HTNews.c:1791
 msgid "Earlier articles"
 msgstr "Articles plus récents"
 
-#: WWW/Library/Implementation/HTNews.c:1805
+#: WWW/Library/Implementation/HTNews.c:1804
 #, c-format
 msgid ""
 "\n"
@@ -2999,41 +3008,41 @@ msgstr ""
 "Il y a à jusqu'à %d articles accessibles dans %s, les ID suivent:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1865
+#: WWW/Library/Implementation/HTNews.c:1864
 msgid "All available articles in "
 msgstr "Tout les articles accessibles dans "
 
-#: WWW/Library/Implementation/HTNews.c:2081
+#: WWW/Library/Implementation/HTNews.c:2080
 msgid "Later articles"
 msgstr "Articles anciens"
 
-#: WWW/Library/Implementation/HTNews.c:2105
+#: WWW/Library/Implementation/HTNews.c:2104
 msgid "Post to "
 msgstr "Postez vers"
 
-#: WWW/Library/Implementation/HTNews.c:2323
+#: WWW/Library/Implementation/HTNews.c:2322
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Ce client ne supporte pas les Urls SNEWS"
 
-#: WWW/Library/Implementation/HTNews.c:2531
+#: WWW/Library/Implementation/HTNews.c:2530
 msgid "No target for raw text!"
 msgstr "Aucune cible pour le texte brut!"
 
-#: WWW/Library/Implementation/HTNews.c:2561
+#: WWW/Library/Implementation/HTNews.c:2560
 msgid "Connecting to NewsHost ..."
 msgstr "Connection à l'hote de news ...."
 
-#: WWW/Library/Implementation/HTNews.c:2612
+#: WWW/Library/Implementation/HTNews.c:2611
 #, c-format
 msgid "Could not access %s."
 msgstr "Impossible d'accéder à %s."
 
-#: WWW/Library/Implementation/HTNews.c:2712
+#: WWW/Library/Implementation/HTNews.c:2711
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Impossible de lire les informations. Le serveur de news %.20s à répondut: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2716
+#: WWW/Library/Implementation/HTNews.c:2715
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Impossible de lire les informations, réponse vide de l'hote %s"
@@ -3041,34 +3050,34 @@ msgstr "Impossible de lire les informations, réponse vide de l'hote %s"
 #.
 #. **	List available newsgroups. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2920
+#: WWW/Library/Implementation/HTNews.c:2919
 msgid "Reading list of available newsgroups."
 msgstr "Lecture de la liste des forums disponibles."
 
-#: WWW/Library/Implementation/HTNews.c:2942
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of articles in newsgroup."
 msgstr "Lecture de la liste des articles du forum."
 
 #.
 #. **	Get an article from a news group. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2948
+#: WWW/Library/Implementation/HTNews.c:2947
 msgid "Reading news article."
 msgstr "Lecture d'articles de forums."
 
-#: WWW/Library/Implementation/HTNews.c:2978
+#: WWW/Library/Implementation/HTNews.c:2977
 msgid "Sorry, could not load requested news."
 msgstr "Désolé, impossible de charger la news demandée."
 
-#: WWW/Library/Implementation/HTTCP.c:1233
+#: WWW/Library/Implementation/HTTCP.c:1239
 msgid "Address has invalid port"
 msgstr "L'adresse a un numéro de port invalide"
 
-#: WWW/Library/Implementation/HTTCP.c:1336
+#: WWW/Library/Implementation/HTTCP.c:1327
 msgid "Address length looks invalid"
 msgstr "La longueur de l'adresse semble invalide"
 
-#: WWW/Library/Implementation/HTTCP.c:1574 WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Impossible de localiser l'hôte distant %s"
@@ -3077,65 +3086,90 @@ msgstr "Impossible de localiser l'hôte distant %s"
 #. *  immediately; but not HTAlert, because typically
 #. *  there will be other alerts from the callers. - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1589 WWW/Library/Implementation/HTTelnet.c:103
+#: WWW/Library/Implementation/HTTCP.c:1575 WWW/Library/Implementation/HTTelnet.c:103
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Nom d'hote invalide: %s"
 
 # First %s will be FTP, HTTP or other protocol and second %s will be hostname
-#: WWW/Library/Implementation/HTTCP.c:1603
+#: WWW/Library/Implementation/HTTCP.c:1589
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Connexion %s à %s "
 
-#: WWW/Library/Implementation/HTTCP.c:1619
+#: WWW/Library/Implementation/HTTCP.c:1605
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "La socket a échouée: famille %d addresse %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1628
+#: WWW/Library/Implementation/HTTCP.c:1614
 msgid "socket failed."
 msgstr "la socket a échouée"
 
-#: WWW/Library/Implementation/HTTCP.c:1648
+#: WWW/Library/Implementation/HTTCP.c:1634
 msgid "Could not make connection non-blocking."
 msgstr "Impossible d'établir une connection non bloquante"
 
-#: WWW/Library/Implementation/HTTCP.c:1717
+#: WWW/Library/Implementation/HTTCP.c:1703
 msgid "Connection failed (too many retries)."
 msgstr "Connection impossible (trop d'éssais successifs)"
 
-#: WWW/Library/Implementation/HTTCP.c:1910
+#: WWW/Library/Implementation/HTTCP.c:1896
 msgid "Could not restore socket to blocking."
 msgstr "Impossible de rétablir le blocage sur la socket"
 
-#: WWW/Library/Implementation/HTTCP.c:1976
+#: WWW/Library/Implementation/HTTCP.c:1962
 msgid "Socket read failed for 180,000 tries."
 msgstr "La lecture de la socket a échouée pour 180,000 essais"
 
-#: WWW/Library/Implementation/HTTP.c:466
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:503
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Ce client n'est pas conçu pour traiter les URL HTTPS"
 
-#: WWW/Library/Implementation/HTTP.c:491
+#: WWW/Library/Implementation/HTTP.c:528
 msgid "Unable to connect to remote host."
 msgstr "Impossible d'établir une connexion à l'hôte distant"
 
-#: WWW/Library/Implementation/HTTP.c:1005
+# First %s will be FTP, HTTP or other protocol and second %s will be hostname
+#: WWW/Library/Implementation/HTTP.c:557
+#, fuzzy
+msgid "Retrying connection without TLS."
+msgstr "Connexion %s à %s "
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1091
 msgid "Sending HTTP request."
 msgstr "Envoi de la requête HTTP"
 
-#: WWW/Library/Implementation/HTTP.c:1039
+#: WWW/Library/Implementation/HTTP.c:1125
 msgid "Unexpected network write error; connection aborted."
 msgstr "Erreur d'écriture réseau inattendue: connection annulée."
 
-#: WWW/Library/Implementation/HTTP.c:1045
+#: WWW/Library/Implementation/HTTP.c:1131
 msgid "HTTP request sent; waiting for response."
 msgstr "Demande acheminée au serveur. Veuillez attendre"
 
 # END of Permit FORM
 # More progress strings follow
-#: WWW/Library/Implementation/HTTP.c:1109
+#: WWW/Library/Implementation/HTTP.c:1195
 msgid "Unexpected network read error; connection aborted."
 msgstr "Erreur de lecture inattendue; connexion interrompue"
 
@@ -3149,7 +3183,7 @@ msgstr "Erreur de lecture inattendue; connexion interrompue"
 #. **	so we'll deal with them by showing the full
 #. **	header to the user as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1305
+#: WWW/Library/Implementation/HTTP.c:1391
 msgid "Got unexpected Informational Status."
 msgstr "Réception d'information de statut inattendue"
 
@@ -3160,7 +3194,7 @@ msgstr "Réception d'information de statut inattendue"
 #. *  user to do that, and restore the current
 #. *  document. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1340
+#: WWW/Library/Implementation/HTTP.c:1426
 msgid "Request fulfilled.  Reset Content."
 msgstr "Requête fructueuse. Restauration du contenu."
 
@@ -3171,27 +3205,27 @@ msgstr "Requête fructueuse. Restauration du contenu."
 #. *  with it by showing the full header to the user
 #. *  as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1459
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Réception inattendue d'un état non modifié 304"
 
-#: WWW/Library/Implementation/HTTP.c:1526
+#: WWW/Library/Implementation/HTTP.c:1612
 msgid "Redirection of POST content requires user approval."
 msgstr "La redirection d'un contenu post nécessite l'accord de l'utilisateur"
 
-#: WWW/Library/Implementation/HTTP.c:1541
+#: WWW/Library/Implementation/HTTP.c:1627
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Contnu POST. La redirection permanente est traitée comme temporaire.\n"
 
-#: WWW/Library/Implementation/HTTP.c:1586
+#: WWW/Library/Implementation/HTTP.c:1672
 msgid "Retrying with access authorization information."
 msgstr "Nouvel essai avec information d'autorisation d'accès"
 
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1684
 msgid "Show the 401 message body?"
 msgstr "Visualiser le corps du message 401 ?"
 
-#: WWW/Library/Implementation/HTTP.c:1643
+#: WWW/Library/Implementation/HTTP.c:1729
 msgid "Show the 407 message body?"
 msgstr "Afficher le corps du message 407?"
 
@@ -3200,7 +3234,7 @@ msgstr "Afficher le corps du message 407?"
 #. **	Take a chance and hope there is
 #. **	something to display. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1748
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Unknown status reply from server!"
 msgstr "Réponse d'état inconnue recue du serveur"
 
@@ -3278,27 +3312,27 @@ msgid ""
 "Code record, can't display\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:691
+#: WWW/Library/Implementation/HTWAIS.c:689
 msgid "Syntax error in WAIS URL"
 msgstr "Erreur de syntaxe dans l'url WAIS"
 
-#: WWW/Library/Implementation/HTWAIS.c:761
+#: WWW/Library/Implementation/HTWAIS.c:759
 msgid " (WAIS Index)"
 msgstr " (Index WAIS) "
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:766
 msgid "WAIS Index: "
 msgstr "Index WAIS: "
 
-#: WWW/Library/Implementation/HTWAIS.c:774
+#: WWW/Library/Implementation/HTWAIS.c:772
 msgid "This is a link for searching the "
 msgstr "Ceci est un lien pour chercher le "
 
-#: WWW/Library/Implementation/HTWAIS.c:778
+#: WWW/Library/Implementation/HTWAIS.c:776
 msgid " WAIS Index.\n"
 msgstr "Index WAIS.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:805
+#: WWW/Library/Implementation/HTWAIS.c:803
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
@@ -3306,48 +3340,48 @@ msgstr ""
 "\n"
 "Entrez la commande de recherche (s) puis les mots cléfs.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:827
+#: WWW/Library/Implementation/HTWAIS.c:825
 msgid " (in "
 msgstr " (dans "
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:834
 msgid "WAIS Search of \""
 msgstr "Recherche WAIS de \""
 
-#: WWW/Library/Implementation/HTWAIS.c:840
+#: WWW/Library/Implementation/HTWAIS.c:838
 msgid "\" in: "
 msgstr "\" dans: "
 
-#: WWW/Library/Implementation/HTWAIS.c:855
+#: WWW/Library/Implementation/HTWAIS.c:853
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: requête trop grande."
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:862
 msgid "Searching WAIS database..."
 msgstr "Recherche dans la base de donnée WAIS..."
 
-#: WWW/Library/Implementation/HTWAIS.c:874
+#: WWW/Library/Implementation/HTWAIS.c:872
 msgid "Search interrupted."
 msgstr "Recherche interrompue."
 
-#: WWW/Library/Implementation/HTWAIS.c:924
+#: WWW/Library/Implementation/HTWAIS.c:922
 msgid "Can't convert format of WAIS document"
 msgstr "Impossible de convertir le format du document WAIS"
 
-#: WWW/Library/Implementation/HTWAIS.c:968
+#: WWW/Library/Implementation/HTWAIS.c:966
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: requête trop longue."
 
 #.
 #. **	Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:982
+#: WWW/Library/Implementation/HTWAIS.c:980
 msgid "Fetching WAIS document..."
 msgstr "Rapatriement du document WAIS...."
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1021
+#: WWW/Library/Implementation/HTWAIS.c:1019
 msgid "No text was returned!\n"
 msgstr "Aucun texte n'a été retourné!\n"
 
@@ -3367,170 +3401,164 @@ msgstr " description"
 msgid "Access links"
 msgstr "Acces aux liens"
 
-#: WWW/Library/Implementation/HTWSRC.c:345
+#: WWW/Library/Implementation/HTWSRC.c:346
 msgid "Direct access"
 msgstr "Acces direct"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:348
+#: WWW/Library/Implementation/HTWSRC.c:349
 msgid " (or via proxy server, if defined)"
 msgstr " (ou via un serveur de proxy, si défini)"
 
-#: WWW/Library/Implementation/HTWSRC.c:363
+#: WWW/Library/Implementation/HTWSRC.c:364
 msgid "Maintainer"
 msgstr "Mainteneur"
 
-#: WWW/Library/Implementation/HTWSRC.c:371
+#: WWW/Library/Implementation/HTWSRC.c:372
 msgid "Host"
 msgstr "Hote"
 
 # src/GridText.c
-#: src/GridText.c:607
+#: src/GridText.c:688
 msgid "Memory exhausted, display interrupted!"
 msgstr "Mémoire insuffisante; interruption de l'affichage."
 
-#: src/GridText.c:612
+#: src/GridText.c:693
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Mémoire saturée, interruption du transfert !"
 
-#: src/GridText.c:3395
+#: src/GridText.c:3578
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** MÉMOIRE INSUFFISANTE ***"
 
-#: src/GridText.c:5733 src/GridText.c:5740 src/LYList.c:258
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
 msgid "unknown field or link"
 msgstr "champ ou lien inconnu"
 
-#: src/GridText.c:5749
+#: src/GridText.c:6023
 msgid "text entry field"
 msgstr "champ de saisie de texte"
 
-#: src/GridText.c:5752
+#: src/GridText.c:6026
 msgid "password entry field"
 msgstr "champ d'entrée du mot de passe"
 
-#: src/GridText.c:5755
+#: src/GridText.c:6029
 msgid "checkbox"
 msgstr "case d'option"
 
-#: src/GridText.c:5758
+#: src/GridText.c:6032
 msgid "radio button"
 msgstr "bouton d'option"
 
-#: src/GridText.c:5761
+#: src/GridText.c:6035
 msgid "submit button"
 msgstr "bouton Envoyer"
 
-#: src/GridText.c:5764
+#: src/GridText.c:6038
 msgid "reset button"
 msgstr "bouton Effacer"
 
-#: src/GridText.c:5767
+#: src/GridText.c:6041
 msgid "popup menu"
 msgstr "menu éclair"
 
-#: src/GridText.c:5770
+#: src/GridText.c:6044
 msgid "hidden form field"
 msgstr "champ de formulaire caché"
 
-#: src/GridText.c:5773
+#: src/GridText.c:6047
 msgid "text entry area"
 msgstr "zone d'entrée de texte"
 
-#: src/GridText.c:5776
+#: src/GridText.c:6050
 msgid "range entry field"
 msgstr "champ de saisie (range)"
 
-#: src/GridText.c:5779
+#: src/GridText.c:6053
 msgid "file entry field"
 msgstr "champ de saisie (file)"
 
-#: src/GridText.c:5782
+#: src/GridText.c:6056
 msgid "text-submit field"
 msgstr "champ d'envoi (texte)"
 
-#: src/GridText.c:5785
+#: src/GridText.c:6059
 msgid "image-submit button"
 msgstr "bouton d'envoi (image)"
 
-#: src/GridText.c:5788
+#: src/GridText.c:6062
 msgid "keygen field"
 msgstr "champ «keygen»"
 
-#: src/GridText.c:5791
+#: src/GridText.c:6065
 msgid "unknown form field"
 msgstr "champ de formulaire inconnu"
 
 # WWW/Libary/Implementation/HTFile.c
-#. We can't open the file, what do we do?
-#: src/GridText.c:10348
+#: src/GridText.c:10066
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Impossible d'ouvrir le fichier pour décompression."
 
-#. We got an error reading the file, what do we do?
-#: src/GridText.c:10359
-msgid "Short read from file, problem?"
-msgstr ""
-
-#: src/GridText.c:10721
+#: src/GridText.c:11218
 #, c-format
 msgid "Submitting %s"
 msgstr "Envoi de %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:11887
+#: src/GridText.c:12375
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12092
+#: src/GridText.c:12581
 msgid "Wrap lines to fit displayed area?"
 msgstr "Raccourcir les lignes pour correspondre à l'aire d'affichage ?"
 
-#: src/GridText.c:12144
+#: src/GridText.c:12633
 msgid "Very long lines have been wrapped!"
 msgstr "Les tres longues lignes ont étées tassées"
 
-#: src/GridText.c:12591
+#: src/GridText.c:13079
 msgid "Very long lines have been truncated!"
 msgstr "Les tres longues lignes ont étées tronquées"
 
-#: src/HTAlert.c:155 src/LYShowInfo.c:318
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
 msgid "bytes"
 msgstr "bytes"
 
-#: src/HTAlert.c:156
+#: src/HTAlert.c:155
 msgid "KB"
 msgstr "KB"
 
-#: src/HTAlert.c:255
+#: src/HTAlert.c:274
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "Lecture de %s de %s octets de données"
 
 # WWW/Library/Implementation/HTFormat.c
-#: src/HTAlert.c:257
+#: src/HTAlert.c:276
 #, c-format
 msgid "Read %s of data"
 msgstr "Lecture de %s kilooctets de données"
 
-#: src/HTAlert.c:262
+#: src/HTAlert.c:281
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s/sec"
 
-#: src/HTAlert.c:269
-#, c-format
-msgid " (stalled for %ld sec)"
+#: src/HTAlert.c:290
+#, fuzzy, c-format
+msgid " (stalled for %s)"
 msgstr " (bloqué pour %ld sec)"
 
-#: src/HTAlert.c:271
-#, c-format
-msgid ", ETA %ld sec"
+#: src/HTAlert.c:294
+#, fuzzy, c-format
+msgid ", ETA %s"
 msgstr ", temps éstimé: %ld sec"
 
-#: src/HTAlert.c:277
+#: src/HTAlert.c:301
 msgid " (Press 'z' to abort)"
 msgstr " (Appuyer sur 'z' pour annuler.)"
 
@@ -3574,43 +3602,43 @@ msgstr " (Appuyer sur 'z' pour annuler.)"
 #. *  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:334
+#: src/HTAlert.c:342 src/HTAlert.c:390
 msgid "yes"
 msgstr "oui"
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:345 src/HTAlert.c:391
 msgid "no"
 msgstr "non"
 
-#: src/HTML.c:6342
+#: src/HTML.c:5985
 msgid "Description:"
 msgstr "Description :"
 
-#: src/HTML.c:6347
+#: src/HTML.c:5990
 msgid "(none)"
 msgstr "(aucun(e))"
 
-#: src/HTML.c:6351
+#: src/HTML.c:5994
 msgid "Filepath:"
 msgstr "Chemin de fichier :"
 
-#: src/HTML.c:6356
+#: src/HTML.c:5999
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: src/HTML.c:7804
+#: src/HTML.c:7452
 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."
 
-#: src/HTML.c:8328
+#: src/HTML.c:7958
 msgid "Source cache error - disk full?"
 msgstr "Erreur de cache - disque pleins ?"
 
-#: src/HTML.c:8341
+#: src/HTML.c:7971
 msgid "Source cache error - not enough memory!"
 msgstr "Erreur de cache - pas assez de mémoire"
 
-#: src/LYBookmark.c:166
+#: src/LYBookmark.c:167
 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"
@@ -3622,7 +3650,7 @@ msgstr ""
 "     commande de suppression de signet, habituellement la touche 'R' mais les\n"
 "     touches peuvent avoir été reconfigurées par vous ou l'administrateur système."
 
-#: src/LYBookmark.c:382
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
@@ -3630,7 +3658,7 @@ msgstr ""
 "     Vous pouvez effacer des lines par la touche 'R'<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:385
+#: src/LYBookmark.c:382
 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"
@@ -3640,7 +3668,7 @@ msgstr ""
 "     habituellement la touche 'R' mais les touches peuvent avoir été\n"
 "     reconfigurées par vous ou par votre administrateur système."
 
-#: src/LYBookmark.c:389
+#: src/LYBookmark.c:386
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3649,7 +3677,7 @@ msgstr ""
 "     Vous pouvez supprimer les liens désuets ou non valides ou en modifier\n"
 "     l'ordre."
 
-#: src/LYBookmark.c:392
+#: src/LYBookmark.c:389
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3659,7 +3687,7 @@ msgstr ""
 "     Mais vous ne devez pas changer le format à l'intérieur des lignes\n"
 "     ni ajouter d'autres balises HTML."
 
-#: src/LYBookmark.c:683
+#: src/LYBookmark.c:681
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr "Le fichier pourrait etre récupérable de %s lors de cette session"
@@ -3668,71 +3696,71 @@ msgstr "Le fichier pourrait etre récupérable de %s lors de cette session"
 #. *  Neither the path as given nor any components examined by
 #. *  backing up were stat()able. - kw
 #.
-#: src/LYCgi.c:232
+#: src/LYCgi.c:231
 msgid "Unable to access cgi script"
 msgstr "Impossible d'accéder au script cgi"
 
-#: src/LYCgi.c:651 src/LYCgi.c:654
+#: src/LYCgi.c:654 src/LYCgi.c:657
 msgid "Good Advice"
 msgstr "Bons conseils"
 
-#: src/LYCgi.c:657
+#: src/LYCgi.c:660
 msgid "An excellent http server for VMS is available via"
 msgstr "Un excellent serveur http pour VMS est disponible via"
 
-#: src/LYCgi.c:664
+#: src/LYCgi.c:667
 msgid "this link"
 msgstr "ce lien"
 
-#: src/LYCgi.c:668
+#: src/LYCgi.c:671
 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"
 
-#: src/LYClean.c:108
+#: src/LYClean.c:122
 msgid "Exiting via interrupt:"
 msgstr "Sortie par interruption"
 
-#: src/LYCookie.c:2659
+#: src/LYCookie.c:2462
 msgid "(from a previous session)"
 msgstr "(a partir d'une session précédente)"
 
-#: src/LYCookie.c:2719
+#: src/LYCookie.c:2522
 msgid "Maximum Gobble Date:"
 msgstr "Date d'expiration maximale :"
 
-#: src/LYCookie.c:2764
+#: src/LYCookie.c:2564
 msgid "Internal"
 msgstr "Interne"
 
-#: src/LYCookie.c:2765
+#: src/LYCookie.c:2565
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "erreur de mise en place de flag de domaine de cookie, fermeture du programme"
 
-#: src/LYCurses.c:936
+#: src/LYCurses.c:1004
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Défaut d'initialisation au terminal; type de terminal inconnu?"
 
-#: src/LYCurses.c:1328
+#: src/LYCurses.c:1426
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1332
+#: src/LYCurses.c:1430
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Il faut utiliser un terminal vt100, 200, etc. avec ce programme."
 
-#: src/LYCurses.c:1384
+#: src/LYCurses.c:1480
 msgid "Your Terminal type is unknown!"
 msgstr "Votre type de terminal n'est pas reconnu."
 
-#: src/LYCurses.c:1385
+#: src/LYCurses.c:1481
 msgid "Enter a terminal type:"
 msgstr "Entrez un type de terminal"
 
-#: src/LYCurses.c:1398
+#: src/LYCurses.c:1495
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TYPE DE TERMINAL RÉGLÉ À"
 
-#: src/LYCurses.c:1749
+#: src/LYCurses.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -3741,7 +3769,7 @@ msgstr ""
 "\n"
 "Une erreur fatale s'est produite dans %s Ver. %s\n"
 
-#: src/LYCurses.c:1751
+#: src/LYCurses.c:1996
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -3759,136 +3787,162 @@ msgstr ""
 "TCP/IP, le TRACEBACK si il a put être capturé ainsi que toute information pouvant\n"
 "s'avérer utile\n"
 
-#: src/LYEdit.c:264
+#: src/LYEdit.c:249
 msgid "Editor killed by signal"
 msgstr "Editeur tué par signal"
 
-#: src/LYEdit.c:266
+#: src/LYEdit.c:251
 #, c-format
 msgid "Editor returned with error status, %s"
 msgstr "L'éditeur à retourné un code d'erreur %s"
 
-#: src/LYEdit.c:267
+#: src/LYEdit.c:252
 msgid "reason unknown."
 msgstr "raison inconnue"
 
-#: src/LYDownload.c:520
+#: src/LYDownload.c:517
 msgid "Downloaded link:"
 msgstr "Lien téléchargé:"
 
-#: src/LYDownload.c:525
+#: src/LYDownload.c:522
 msgid "Suggested file name:"
 msgstr "Nom de fichier suggéré"
 
-#: src/LYDownload.c:530
+#: src/LYDownload.c:527
 msgid "Standard download options:"
 msgstr "Options standard de téléchargement:"
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:528
 msgid "Download options:"
 msgstr "Options de déchargement de fichier :"
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:544
 msgid "Save to disk"
 msgstr "Enregistrement sur disque"
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "Envoyer le fichier par courriel"
+
+#: src/LYDownload.c:565
 msgid "Save to disk disabled."
 msgstr "Enregistrement sur disque d<E9>sactiv<E9>"
 
-#: src/LYDownload.c:551 src/LYPrint.c:1338
+#: src/LYDownload.c:569 src/LYPrint.c:1327
 msgid "Local additions:"
 msgstr "Ajout local:"
 
-#: src/LYDownload.c:560 src/LYUpload.c:224
+#: src/LYDownload.c:578 src/LYUpload.c:216
 msgid "No Name Given"
 msgstr "Aucun nom donné"
 
-#: src/LYHistory.c:633
+#: src/LYHistory.c:657
 msgid "You selected:"
 msgstr "Vous avez choisi :"
 
-#: src/LYHistory.c:657 src/LYHistory.c:905
+#: src/LYHistory.c:681 src/LYHistory.c:921
 msgid "(no address)"
 msgstr "(aucune addresse)"
 
-#: src/LYHistory.c:661
+#: src/LYHistory.c:685
 msgid " (internal)"
 msgstr " (interne)"
 
-#: src/LYHistory.c:663
+#: src/LYHistory.c:687
 msgid " (was internal)"
 msgstr " (était interne)"
 
-#: src/LYHistory.c:761
+#: src/LYHistory.c:785
 msgid " (From History)"
 msgstr " (de l'Historique)"
 
-#: src/LYHistory.c:825
+#: src/LYHistory.c:841
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "Vous avez consulté (fichiers POST, références et signets exclus):"
 
-#: src/LYHistory.c:1124
+#: src/LYHistory.c:1137
 msgid "(No messages yet)"
 msgstr "(Pas encore de message)"
 
-#: src/LYLeaks.c:78
+#: src/LYLeaks.c:209
 msgid "Invalid pointer detected."
 msgstr "Détection de pointeur non valide"
 
-#: src/LYLeaks.c:80 src/LYLeaks.c:117
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
 msgid "Pointer:"
 msgstr "Pointeur:"
 
-#: src/LYLeaks.c:91 src/LYLeaks.c:98 src/LYLeaks.c:136
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
 msgid "FileName:"
 msgstr "Nom de fichier :"
 
-#: src/LYLeaks.c:94 src/LYLeaks.c:101 src/LYLeaks.c:139 src/LYLeaks.c:150
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
 msgid "LineCount:"
 msgstr "Nombre de lignes:"
 
-#: src/LYLeaks.c:115
+#: src/LYLeaks.c:249
 msgid "Memory leak detected."
 msgstr "Fuite de mémoire détectée"
 
-#: src/LYLeaks.c:120
+#: src/LYLeaks.c:257
 msgid "Contains:"
 msgstr "Contient:"
 
-#: src/LYLeaks.c:133
+#: src/LYLeaks.c:270
 msgid "ByteSize:"
 msgstr "Taille de byte"
 
-#: src/LYLeaks.c:147
+#: src/LYLeaks.c:284
 msgid "realloced:"
 msgstr "réallouée:"
 
-#: src/LYLeaks.c:170
+#: src/LYLeaks.c:307
 msgid "Total memory leakage this run:"
 msgstr "Total de fuite de mémoire pour cette éxécution:"
 
-#: src/LYList.c:91
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+#, fuzzy
+msgid "Bytes allocated"
+msgstr "réallouée:"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
 msgid "References in "
 msgstr "Références dans"
 
-#: src/LYList.c:92
+#: src/LYList.c:86
 msgid "this document:"
 msgstr "ce document"
 
-#: src/LYList.c:98
+#: src/LYList.c:92
 msgid "Visible links:"
 msgstr "Liens visibles :"
 
-#: src/LYList.c:199 src/LYList.c:319
+#: src/LYList.c:194 src/LYList.c:315
 msgid "Hidden links:"
 msgstr "Liens cachés :"
 
-#: src/LYList.c:267
+#: src/LYList.c:262
 msgid "References"
 msgstr "Références"
 
-#: src/LYList.c:269
+#: src/LYList.c:264
 msgid "Visible links"
 msgstr "Liens visibles"
 
@@ -3901,314 +3955,314 @@ msgstr "Impossible d'obtenir l'état de '%s'."
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "L'élément sélectioné n'est ni un fichier ni un répertoire. Requête ignorée."
 
-#: src/LYLocal.c:383
+#: src/LYLocal.c:366
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Opération (%s) impossible dû à une erreur système!"
 
 #. error return
-#: src/LYLocal.c:415
+#: src/LYLocal.c:400
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Défaut de %s dû probablement à une erreur système"
 
-#: src/LYLocal.c:453
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "déstruction de %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr ""
+
+#: src/LYLocal.c:508
 #, c-format
 msgid "move %s to %s"
 msgstr "déplacement de %s vers %s"
 
-#: src/LYLocal.c:475
+#: src/LYLocal.c:548
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Le répertoire éxiste déja. Requête ignorée."
 
-#: src/LYLocal.c:477
+#: src/LYLocal.c:550
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Ce fichier éxiste déja. Requête ignorée."
 
-#: src/LYLocal.c:479
+#: src/LYLocal.c:552
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Ce nom est déja utilisé. Requête ignorée."
 
-#: src/LYLocal.c:490
+#: src/LYLocal.c:563
 msgid "Destination has different owner!  Request denied."
 msgstr "La déstination possede un autre propriétaire. Requête ignorée."
 
-#: src/LYLocal.c:493
+#: src/LYLocal.c:566
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "La déstination n'est pas un répertoire valide. Requête ignorée."
 
-#: src/LYLocal.c:516
+#: src/LYLocal.c:588
 msgid "Remove all tagged files and directories?"
 msgstr "Détruire tout les répertoires et fichiers marqués ?"
 
-#: src/LYLocal.c:537
-#, c-format
-msgid "remove %s"
-msgstr "déstruction de %s"
-
-#: src/LYLocal.c:580
+#: src/LYLocal.c:647
 msgid "Enter new location for tagged items: "
 msgstr "Entrer un nouvel emplacement pour articles marqués : "
 
-#: src/LYLocal.c:649
+#: src/LYLocal.c:716
 msgid "Path too long"
 msgstr "Chemin trop long"
 
-#: src/LYLocal.c:680
+#: src/LYLocal.c:747
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Source et destination identiques; demande non traitée"
 
-#: src/LYLocal.c:738
+#: src/LYLocal.c:805
 msgid "Enter new name for directory: "
 msgstr "Entrer un nouveau nom pour le répertoire : "
 
-#: src/LYLocal.c:740
+#: src/LYLocal.c:807
 msgid "Enter new name for file: "
 msgstr "Entrer un nouveau nom pour le fichier : "
 
-#: src/LYLocal.c:751
+#: src/LYLocal.c:819
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Caractère  «/» non autorisé; demande non traitée."
 
-#: src/LYLocal.c:800
+#: src/LYLocal.c:868
 msgid "Enter new location for directory: "
 msgstr "Entrez nouvel emplacement pour répertoire : "
 
-#: src/LYLocal.c:802
+#: src/LYLocal.c:874
 msgid "Enter new location for file: "
 msgstr "Entrez une nouvelle localisation pour le fichier:"
 
-#: src/LYLocal.c:827
+#: src/LYLocal.c:901
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Impossible de trouver la marque de fin de fichier \"/\""
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:921
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "La source et la déstination sont similaires. Requête ignorée."
 
-#: src/LYLocal.c:894
+#: src/LYLocal.c:970
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Modifier nom, emplacement ou permission (n, l ou p) : "
 
-#: src/LYLocal.c:896
+#: src/LYLocal.c:972
 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:925
+#: src/LYLocal.c:1001
 msgid "This feature not yet implemented!"
 msgstr "Option non encore disponible"
 
-#: src/LYLocal.c:943
+#: src/LYLocal.c:1019
 msgid "Enter name of file to create: "
 msgstr "Entrez le nom du fichier : "
 
-#: src/LYLocal.c:951 src/LYLocal.c:999
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Réacheminement \"//\" non autorisé; demande non traitée"
 
-#: src/LYLocal.c:966
-#, c-format
-msgid "create %s"
-msgstr "création de %s"
-
-#: src/LYLocal.c:991
+#: src/LYLocal.c:1061
 msgid "Enter name for new directory: "
 msgstr "Entrer le nom du nouveau répertoire : "
 
-#: src/LYLocal.c:1042
+#: src/LYLocal.c:1106
 msgid "Create file or directory (f or d): "
 msgstr "Créer un fichier ou un répertoire (f ou r) :"
 
-#: src/LYLocal.c:1083
+#: src/LYLocal.c:1146
 #, c-format
 msgid "Remove '%s' and all of its contents?"
 msgstr "Supprimer '%s' et tout son contenu"
 
-#: src/LYLocal.c:1086
+#: src/LYLocal.c:1149
 msgid "Remove directory and all of its contents?"
 msgstr "Supprimer le répertoire et tout son contenu"
 
-#: src/LYLocal.c:1090
+#: src/LYLocal.c:1153
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Supprimer le fichier '%s'"
 
-#: src/LYLocal.c:1092
+#: src/LYLocal.c:1155
 msgid "Remove file?"
 msgstr "Supprimer le fichier"
 
-#: src/LYLocal.c:1097
+#: src/LYLocal.c:1160
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Supprimer le lien symbolique '%s'"
 
-#: src/LYLocal.c:1099
+#: src/LYLocal.c:1162
 msgid "Remove symbolic link?"
 msgstr "Supprimer le lien symbolique"
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1248
 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"
 
-#: src/LYLocal.c:1220
+#: src/LYLocal.c:1278
 msgid "Unable to open permit options file"
 msgstr "Impossible d'ouvrir le fichier demandé"
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1305
 msgid "Specify permissions below:"
 msgstr "Spécifier les permissions d'accès ci-après :"
 
-#: src/LYLocal.c:1248 src/LYShowInfo.c:196
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
 msgid "Owner:"
 msgstr "Propriétaire :"
 
-#: src/LYLocal.c:1264
+#: src/LYLocal.c:1322
 msgid "Group"
 msgstr "Groupe"
 
-#: src/LYLocal.c:1280
+#: src/LYLocal.c:1338
 msgid "Others:"
 msgstr "Autres :"
 
-#: src/LYLocal.c:1298
+#: src/LYLocal.c:1356
 msgid "form to permit"
 msgstr "formulaire pour permission"
 
-#: src/LYLocal.c:1396
+#: src/LYLocal.c:1452
 msgid "Invalid mode format."
 msgstr "Format de mode non valide"
 
-#: src/LYLocal.c:1400
+#: src/LYLocal.c:1456
 msgid "Invalid syntax format."
 msgstr "Format de syntaxe non valide"
 
-#: src/LYLocal.c:1575
-msgid "NULL URL pointer"
-msgstr "pointeur vers une URL nulle"
-
-#: src/LYLocal.c:1670
+#: src/LYLocal.c:1645
 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"
 
-#: src/LYLocal.c:1782
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr "pointeur vers une URL nulle"
+
+#: src/LYLocal.c:1908
 #, c-format
 msgid "Executing %s "
 msgstr "Exécution de la commande %s "
 
-#: src/LYLocal.c:1785
+#: src/LYLocal.c:1911
 msgid "Executing system command. This might take a while."
 msgstr "Exécution de la commande système. Veuillez patienter."
 
-#: src/LYLocal.c:1831
-msgid "Unable to open file management menu file."
-msgstr "Impossible d'ouvrir le menu de gestion de fichier."
-
-#: src/LYLocal.c:1862
+#: src/LYLocal.c:1985
 msgid "Current directory:"
 msgstr "Le répertoire courant:"
 
-#: src/LYLocal.c:1865 src/LYLocal.c:1883
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
 msgid "Current selection:"
 msgstr "La sélection courante:"
 
-#: src/LYLocal.c:1869
+#: src/LYLocal.c:1992
 msgid "Nothing currently selected."
 msgstr "Il n'y a rien de sélectionné."
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged item:"
 msgstr "élément marqué"
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged items:"
 msgstr "éléménts marqués"
 
-#: src/LYLocal.c:1983 src/LYLocal.c:1994
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
 msgid "Illegal filename; request ignored."
 msgstr "Nom de fichier invalide; demande non traitée"
 
-#: src/LYLocal.c:2137
-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."
-
 #. directory not writable
-#: src/LYLocal.c:2141
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
 msgid "Install in the selected directory not permitted."
 msgstr "Installation dans le répertoire choisi non permise."
 
-#: src/LYLocal.c:2146
+#: src/LYLocal.c:2267
+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:2276
 msgid "Just a moment, ..."
 msgstr "Un instant svp..."
 
-#: src/LYLocal.c:2163
+#: src/LYLocal.c:2293
 msgid "Error buiding install args"
 msgstr "Erreur lors de la mise en place des arguments d'installation"
 
-#: src/LYLocal.c:2178 src/LYLocal.c:2210
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Source et destination identiques; demande non traitée: %s"
 
-#: src/LYLocal.c:2188 src/LYLocal.c:2220
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Le répertoire courant est: %s"
 
-#: src/LYLocal.c:2238
+#: src/LYLocal.c:2362
 msgid "Installation complete"
 msgstr "Installation terminée"
 
-#: src/LYLocal.c:2427
+#: src/LYLocal.c:2551
 msgid "Temporary URL or list would be too long."
 msgstr "L'URL ou la liste temporaires seraient trop longs."
 
-#: src/LYMail.c:503
+#: src/LYMail.c:534
 msgid "Sending"
 msgstr "Envoi"
 
-#: src/LYMail.c:989
+#: src/LYMail.c:1024
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "Le lien   %s :?: %s \n"
 
-#: src/LYMail.c:991
+#: src/LYMail.c:1026
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "appelé «%s»\n"
 
-#: src/LYMail.c:992
+#: src/LYMail.c:1027
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "dans le fichier «%s» appelé «%s»\n"
 
-#: src/LYMail.c:993
+#: src/LYMail.c:1028
 msgid "was requested but was not available."
 msgstr "a été demandé mais n'est pas disponible."
 
-#: src/LYMail.c:994
+#: src/LYMail.c:1029
 msgid "Thought you might want to know."
 msgstr "Pour votre information."
 
-#: src/LYMail.c:996
+#: src/LYMail.c:1031
 msgid "This message was automatically generated by"
 msgstr "Ce message est généré automatiquement par"
 
-#: src/LYMain.c:897
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:969
 msgid "No Winsock found, sorry."
 msgstr "Pas de Winsock trouvée, désolé."
 
-#: src/LYMain.c:1103
+#: src/LYMain.c:1170
 msgid "You MUST define a valid TMP or TEMP area!\n"
 msgstr "vous DEVEZ définire une aire TMP ou TEMP valide ! \n"
 
-#: src/LYMain.c:1156 src/LYMainLoop.c:5117
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
 msgid "No such directory"
 msgstr "Pas de tel répertoire"
 
-#: src/LYMain.c:1378
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4220,7 +4274,7 @@ msgstr ""
 "\n"
 
 # src/LYMain.c
-#: src/LYMain.c:1388
+#: src/LYMain.c:1446
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
@@ -4230,7 +4284,7 @@ msgstr ""
 "Jeux de caractères Lynx non précisés.\n"
 "\n"
 
-#: src/LYMain.c:1417
+#: src/LYMain.c:1475
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
@@ -4240,7 +4294,7 @@ msgstr ""
 "Relevé de liens Lynx non déclaré.\n"
 "\n"
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1504
 #, c-format
 msgid ""
 "\n"
@@ -4251,60 +4305,60 @@ msgstr ""
 "Le fichier Lynx %s n'est pas disponible.\n"
 "\n"
 
-#: src/LYMain.c:1704
+#: src/LYMain.c:1743
 msgid "Warning:"
 msgstr "Attention:"
 
-#: src/LYMain.c:2247
+#: src/LYMain.c:2293
 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."
 
-#: src/LYMain.c:2477 src/LYMain.c:2525
+#: src/LYMain.c:2540 src/LYMain.c:2588
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignorer le charset=%s inconnu\n"
 
-#: src/LYMain.c:3047
-#, c-format
-msgid "%s Version %s (%s)\n"
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
 msgstr "%s Version %s (%s)\n"
 
-#: src/LYMain.c:3072
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Compilé le %s %s %s\n"
 
-#: src/LYMain.c:3077
+#: src/LYMain.c:3166
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
 msgstr "Copyright tenu par l'université du Kansas, du CERN, et d'autres contribuants\n"
 
-#: src/LYMain.c:3079
+#: src/LYMain.c:3168
 msgid "Distributed under the GNU General Public License.\n"
 msgstr "Distribué sous le permis de grand public de GNU\n"
 
-#: src/LYMain.c:3081
+#: src/LYMain.c:3170
 msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
+"See http://lynx.isc.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
-"Voyez http://lynx.browser.org / et d'aide en ligne pour plus d'information.\n"
+"Voyez http://lynx.isc.org/ et d'aide en ligne pour plus d'information.\n"
 "\n"
 
-#: src/LYMain.c:3800
+#: src/LYMain.c:3919
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "USAGE : %s [options] [fichier]\n"
 
-#: src/LYMain.c:3801
+#: src/LYMain.c:3920
 msgid "Options are:\n"
 msgstr "Les options sont :\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4191
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s : Option non valide : %s\n"
 
-#: src/LYMainLoop.c:512
+#: src/LYMainLoop.c:539
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "Erreur interne: lien pour la souris %d invalide"
@@ -4312,80 +4366,109 @@ msgstr "Erreur interne: lien pour la souris %d invalide"
 #.
 #. * Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:625 src/LYMainLoop.c:5139
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
 msgid "A URL specified by the user"
 msgstr "Un URL spécifié par l'utilisateur"
 
-#: src/LYMainLoop.c:1114
+#: src/LYMainLoop.c:1110
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "«Enctype multipart/form-data» non fonctionnel. Envoi impossible."
 
 #.
 #. *  Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3097
+#: src/LYMainLoop.c:3053
 msgid "Help Screen"
 msgstr "L'écran de Aide"
 
-#: src/LYMainLoop.c:3231
+#: src/LYMainLoop.c:3177
 msgid "System Index"
 msgstr "Index système"
 
-#: src/LYMainLoop.c:3611 src/LYMainLoop.c:5347
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
 msgid "Entry into main screen"
 msgstr "Entrée dans l'écran principal"
 
-#: src/LYMainLoop.c:3897
+#: src/LYMainLoop.c:3824
 msgid "No next document present"
 msgstr ""
 
-#: src/LYMainLoop.c:4206
+#: src/LYMainLoop.c:4131
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "charset pour ce document spécifié éxplicitement, désolé..."
 
-#: src/LYMainLoop.c:5093
+#: src/LYMainLoop.c:5004
 msgid "cd to:"
 msgstr "changer de répertoire vers:"
 
-#: src/LYMainLoop.c:5120
+#: src/LYMainLoop.c:5031
 msgid "A component of path is not a directory"
 msgstr "Une partie du chemin n'est pas un répertoire."
 
-#: src/LYMainLoop.c:5123
+#: src/LYMainLoop.c:5034
 msgid "failed to change directory"
 msgstr "Changement de répertoire impossible"
 
-#: src/LYMainLoop.c:6291
+#: src/LYMainLoop.c:6204
 msgid "Reparsing document under current settings..."
 msgstr "Relecture du document avec les parametres actuels."
 
-#: src/LYMainLoop.c:6579 src/LYMainLoop.c:6583
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
 #, 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:7719 src/LYMainLoop.c:7892
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6914
+#, fuzzy
+msgid "Current URL is empty."
+msgstr "Le répertoire courant:"
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr ""
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:7829
+#: src/LYMainLoop.c:7731
 msgid "lynx: Can't access startfile"
 msgstr "lynx : accès impossible au fichier de départ"
 
-#: src/LYMainLoop.c:7842
+#: src/LYMainLoop.c:7744
 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"
 
-#: src/LYMainLoop.c:7843
+#: src/LYMainLoop.c:7745
 msgid "      Exiting..."
 msgstr "Sortie"
 
-#: src/LYMainLoop.c:7886
+#: src/LYMainLoop.c:7788
 msgid "-more-"
 msgstr "-suite-"
 
 #. Enable scrolling.
-#: src/LYNews.c:203
+#: src/LYNews.c:187
 msgid "You will be posting to:"
 msgstr "Vous postez à : "
 
@@ -4393,7 +4476,7 @@ msgstr "Vous postez à : "
 #. *  Get the mail address for the From header,
 #. *  offering personal_mail_address as default.
 #.
-#: src/LYNews.c:212
+#: src/LYNews.c:196
 msgid ""
 "\n"
 "\n"
@@ -4408,7 +4491,7 @@ msgstr ""
 #. *  document's title as the default if this is a
 #. *  followup rather than a new post. - FM
 #.
-#: src/LYNews.c:230
+#: src/LYNews.c:214
 msgid ""
 "\n"
 "\n"
@@ -4418,7 +4501,7 @@ msgstr ""
 "\n"
 " Veuillez fournir ou éditer l'en-tête Objet :\n"
 
-#: src/LYNews.c:322
+#: src/LYNews.c:303
 msgid ""
 "\n"
 "\n"
@@ -4431,7 +4514,7 @@ msgstr ""
 #.
 #. *  Use the built in line editior.
 #.
-#: src/LYNews.c:379
+#: src/LYNews.c:360
 msgid ""
 "\n"
 "\n"
@@ -4441,76 +4524,95 @@ msgstr ""
 "\n"
 "Veuillez entrer votre message ci-après :"
 
-#: src/LYNews.c:425
+#: src/LYNews.c:406
 msgid "Message has no original text!"
 msgstr "Le message n'a pas de texte original !"
 
-#: src/LYOptions.c:743
+#: src/LYOptions.c:746
 msgid "review/edit B)ookmarks files"
 msgstr "B) Éditer fichiers signets "
 
-#: src/LYOptions.c:745
+#: src/LYOptions.c:748
 msgid "B)ookmark file: "
 msgstr "B) Fichier de signets : "
 
-#: src/LYOptions.c:2507 src/LYOptions.c:2531
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Utilisez %s pour invoquer le menu des Options."
 
-#: src/LYOptions.c:3208
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr ""
+
+#: src/LYOptions.c:3261
 msgid "General Preferences"
 msgstr "Références"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3212
+#: src/LYOptions.c:3265
 msgid "User mode"
 msgstr "Mode utilisateur"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3218
+#: src/LYOptions.c:3271
 msgid "Editor"
 msgstr "Éditeur"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3223
+#: src/LYOptions.c:3276
 msgid "Type of Search"
 msgstr " pour la recherche"
 
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3229
+#: src/LYOptions.c:3285
 msgid "Cookies"
 msgstr "Cookies"
 
-#: src/LYOptions.c:3243
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
 msgid "Keyboard Input"
 msgstr "Entrée du clavier"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3247
+#: src/LYOptions.c:3316
 msgid "Keypad mode"
 msgstr "Pavé numérique"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3253
+#: src/LYOptions.c:3322
 msgid "Emacs keys"
 msgstr "Touches emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3259
+#: src/LYOptions.c:3328
 msgid "VI keys"
 msgstr "Touches vi"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3266
+#: src/LYOptions.c:3335
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3278
+#: src/LYOptions.c:3347
 #, fuzzy
 msgid "Keyboard layout"
 msgstr "Entrée du clavier"
@@ -4518,17 +4620,17 @@ msgstr "Entrée du clavier"
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3291
+#: src/LYOptions.c:3360
 msgid "Display and Character Set"
 msgstr "Variable d'affichage"
 
 #. ***************************************************************
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3295
+#: src/LYOptions.c:3364
 msgid "Display character set"
 msgstr "Afficher le charset"
 
-#: src/LYOptions.c:3324
+#: src/LYOptions.c:3393
 msgid "Assumed document character set"
 msgstr "charset présumé du document:"
 
@@ -4537,202 +4639,219 @@ msgstr "charset présumé du document:"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3344
+#: src/LYOptions.c:3413
 msgid "CJK mode"
 msgstr ""
 
-#: src/LYOptions.c:3346
+#: src/LYOptions.c:3415
 msgid "Raw 8-bit"
 msgstr "Mode 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3354
+#: src/LYOptions.c:3423
 msgid "X Display"
 msgstr "X Display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3360
+#: src/LYOptions.c:3429
 msgid "Document Appearance"
 msgstr "Apparence du document"
 
-#: src/LYOptions.c:3366
+#: src/LYOptions.c:3435
 msgid "Show color"
 msgstr "Afficher les couleurs"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3390
+#: src/LYOptions.c:3459
 msgid "Show cursor"
 msgstr "Afficher le curseur"
 
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+#, fuzzy
+msgid "Show scrollbar"
+msgstr "Afficher les couleurs"
+
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3396
+#: src/LYOptions.c:3473
 msgid "Popups for select fields"
 msgstr "Fenêtre popup pour les champs sélectionnés."
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3403
+#: src/LYOptions.c:3479
 msgid "HTML error recovery"
 msgstr "Reprise d'une erreur HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3410
+#: src/LYOptions.c:3485
 msgid "Show images"
 msgstr "Montrer les images"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3424
+#: src/LYOptions.c:3499
 msgid "Verbose images"
 msgstr "Images verbeuses"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3432
+#: src/LYOptions.c:3507
 msgid "Headers Transferred to Remote Servers"
 msgstr "Les headers sont transférés aux serveurs distants"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3436
+#: src/LYOptions.c:3511
 msgid "Personal mail address"
 msgstr "Adresse email personnelle"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3516
 msgid "Preferred document character set"
 msgstr "Jeu de caractères préféré"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3446
+#: src/LYOptions.c:3521
 msgid "Preferred document language"
 msgstr "Langue préférée"
 
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3527
 msgid "User-Agent header"
 msgstr "Header 'User-Agent'"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3460
+#: src/LYOptions.c:3535
 msgid "Listing and Accessing Files"
 msgstr "Listes et acces aux fichiers"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3464
+#: src/LYOptions.c:3539
 msgid "FTP sort criteria"
 msgstr "Critères de tri FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3471
+#: src/LYOptions.c:3546
 msgid "Local directory sort criteria"
 msgstr "Critère de tri des répertoires locaux."
 
-#: src/LYOptions.c:3479
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+#, fuzzy
+msgid "Local directory sort order"
+msgstr "Critère de tri des répertoires locaux."
+
+#: src/LYOptions.c:3561
 msgid "Show dot files"
 msgstr "Montrer les fichiers cachés"
 
-#: src/LYOptions.c:3487
+#: src/LYOptions.c:3569
 msgid "Execution links"
 msgstr "Liens à éxécuter"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3507
+#: src/LYOptions.c:3589
 msgid "Show transfer rate"
 msgstr "Transfert de données terminé"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3516
+#: src/LYOptions.c:3598
 msgid "Special Files and Screens"
 msgstr "Fichiers et écrans spéciaux."
 
-#: src/LYOptions.c:3521
+#: src/LYOptions.c:3603
 msgid "Multi-bookmarks"
 msgstr "Bookmarks multiples"
 
-#: src/LYOptions.c:3529
+#: src/LYOptions.c:3611
 msgid "Review/edit Bookmarks files"
 msgstr "Revoir/Editer les fichiers Bookmarks"
 
-#: src/LYOptions.c:3531
+#: src/LYOptions.c:3613
 msgid "Goto multi-bookmark menu"
 msgstr "Aller au menu multi-bookmarks"
 
-#: src/LYOptions.c:3533
+#: src/LYOptions.c:3615
 msgid "Bookmarks file"
 msgstr "Fichier de Bookmarks"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3539
+#: src/LYOptions.c:3621
 msgid "Visited Pages"
 msgstr "la Page des liens activés"
 
-#: src/LYPrint.c:959
+#: src/LYOptions.c:3628
+#, fuzzy
+msgid "View the file "
+msgstr "Envoyer le fichier par courriel"
+
+#: src/LYPrint.c:952
 msgid " Print job complete.\n"
 msgstr "Chargement incomplet.\n"
 
-#: src/LYPrint.c:1296
+#: src/LYPrint.c:1281
 msgid "Document:"
 msgstr "Document:"
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1282
 msgid "Number of lines:"
 msgstr "Nombre de lignes:"
 
-#: src/LYPrint.c:1298
+#: src/LYPrint.c:1283
 msgid "Number of pages:"
 msgstr "Nombre de pages:"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "pages"
 msgstr "pages"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "page"
 msgstr "page"
 
-#: src/LYPrint.c:1300
+#: src/LYPrint.c:1285
 msgid "(approximately)"
 msgstr "(approximativement)"
 
-#: src/LYPrint.c:1305
+#: src/LYPrint.c:1290
 msgid "Some print functions have been disabled!"
 msgstr "Certaines fonctions d'impression ont <E9>t<E9> d<E9>sactiv<E9>es."
 
-#: src/LYPrint.c:1309
+#: src/LYPrint.c:1294
 msgid "Standard print options:"
 msgstr "Option d'impression standard."
 
-#: src/LYPrint.c:1310
+#: src/LYPrint.c:1295
 msgid "Print options:"
 msgstr "Option d'impression."
 
-#: src/LYPrint.c:1316
+#: src/LYPrint.c:1302
 msgid "Save to a local file"
 msgstr "Enregistrer dans un fichier"
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1304
 msgid "Save to disk disabled"
 msgstr "Enregistrement sur disque d<E9>sactiv<E9>"
 
-#: src/LYPrint.c:1324
+#: src/LYPrint.c:1311
 msgid "Mail the file"
 msgstr "Envoyer le fichier par courriel"
 
-#: src/LYPrint.c:1330
+#: src/LYPrint.c:1318
 msgid "Print to the screen"
 msgstr "Imprimer à l'écran"
 
-#: src/LYPrint.c:1334
+#: src/LYPrint.c:1323
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Utiliser la séquence vt100 pour imprimer à votre imprimante"
 
-#: src/LYReadCFG.c:340
+#: src/LYReadCFG.c:339
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
 "The line must be of the form:\n"
@@ -4748,76 +4867,76 @@ msgstr ""
 "Ici, PREMIERPLAN et ARIERREPLAN doivent être soit\n"
 "les chaines de carctère spéciales 'nocolor' ou 'default', ou\n"
 
-#: src/LYReadCFG.c:353
+#: src/LYReadCFG.c:352
 msgid "Offending line:"
 msgstr "Ligne fautive :"
 
-#: src/LYReadCFG.c:660
+#: src/LYReadCFG.c:638
 #, 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"
 
-#: src/LYReadCFG.c:667
+#: src/LYReadCFG.c:645
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "Le changement de touche de %s vers %s a échoué\n"
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:666
 #, 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. Selection de tous.\n"
 
-#: src/LYReadCFG.c:715 src/LYReadCFG.c:728
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
 #, 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"
 
-#: src/LYReadCFG.c:733
+#: src/LYReadCFG.c:711
 #, 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"
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:816
 #, 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"
 
-#: src/LYReadCFG.c:840
+#: src/LYReadCFG.c:818
 msgid "(no name)"
 msgstr "(pas de nom)"
 
-#: src/LYReadCFG.c:1658
+#: src/LYReadCFG.c:1782
 #, 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:1660
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Le dernier include tenté était: '%s',\n"
 
-#: src/LYReadCFG.c:1661
+#: src/LYReadCFG.c:1785
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "included de '%s'.\n"
 
-#: src/LYReadCFG.c:2116 src/LYReadCFG.c:2129 src/LYReadCFG.c:2165
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
 msgid "The following is read from your lynx.cfg file."
 msgstr "Les données suivantes sont lues à partie de votre fichier lynx.cfg."
 
-#: src/LYReadCFG.c:2117 src/LYReadCFG.c:2130
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
 msgid "Please read the distribution"
 msgstr "Merci de lire la distribution"
 
-#: src/LYReadCFG.c:2123 src/LYReadCFG.c:2133
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
 msgid "for more comments."
 msgstr "pour plus de commentaires."
 
-#: src/LYReadCFG.c:2147
+#: src/LYReadCFG.c:2244
 msgid "RELOAD THE CHANGES"
 msgstr "RECHARGER LES MODIFICATIONS"
 
-#: src/LYReadCFG.c:2156
+#: src/LYReadCFG.c:2253
 msgid "Your primary configuration"
 msgstr "Votre configuration principale"
 
@@ -4893,7 +5012,7 @@ msgstr "Permissions d'accès"
 msgid "File that you are currently viewing"
 msgstr "Fichier que vous visualisez présentement"
 
-#: src/LYShowInfo.c:266 src/LYShowInfo.c:375
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
 msgid "Linkname:"
 msgstr "Nom du lien :"
 
@@ -4933,79 +5052,79 @@ msgstr "Langage:"
 msgid "Post Data:"
 msgstr "Données POST :"
 
-#: src/LYShowInfo.c:331
+#: src/LYShowInfo.c:333
 msgid "Post Content Type:"
 msgstr "Type de contenu POST :"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:342
 msgid "Owner(s):"
 msgstr "Propriétaire(s) :"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "size:"
 msgstr "Taille :"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "lines"
 msgstr "Lignes"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:348
 msgid "mode:"
 msgstr "Mode :"
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:350
 msgid "forms mode"
 msgstr "mode formulaires"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "source"
 msgstr "source"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:353
 msgid ", safe"
 msgstr ", sécuritaire"
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:354
 msgid ", via internal link"
 msgstr ", lien interne"
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:360
 msgid ", no-cache"
 msgstr ", pas de cache"
 
-#: src/LYShowInfo.c:360
+#: src/LYShowInfo.c:362
 msgid ", ISMAP script"
 msgstr ", script ISMAP"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:364
 msgid ", bookmark file"
 msgstr ", fichier de bookmark"
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:373
 msgid "Link that you currently have selected"
 msgstr "Lien que vous avez sélectionné"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:386
 msgid "Method:"
 msgstr "Méthode :"
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:391
 msgid "Enctype:"
 msgstr "Encodage :"
 
-#: src/LYShowInfo.c:401
+#: src/LYShowInfo.c:403
 msgid "(Form field)"
 msgstr "(champ de formulaire)"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:418
 msgid "No Links on the current page"
 msgstr "Aucun lien dans la page courante"
 
-#: src/LYStyle.c:250
+#: src/LYStyle.c:278
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -5046,44 +5165,48 @@ msgstr "Réacheminement avec «~» non autorisé; demande non traitée"
 msgid "Unable to upload file."
 msgstr "Impossible de charger le fichier."
 
-#: src/LYUpload.c:214
+#: src/LYUpload.c:206
 msgid "Upload To:"
 msgstr "Téléchargement vers:"
 
-#: src/LYUpload.c:215
+#: src/LYUpload.c:207
 msgid "Upload options:"
 msgstr "Options de chargement de fichier :"
 
-#: src/LYUtils.c:3075
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2468
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Protocole d'acces inattendu pour ce scheme d'url"
 
-#: src/LYUtils.c:3915
+#: src/LYUtils.c:3294
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:4217
+#: src/LYUtils.c:3595
 #, fuzzy
 msgid "unknown restriction"
-msgstr "Pas de réstriction définies.\n"
+msgstr "Pas de réstriction définies."
 
-#: src/LYUtils.c:4248
+#: src/LYUtils.c:3626
 msgid "No restrictions set.\n"
 msgstr "Pas de réstriction définies.\n"
 
-#: src/LYUtils.c:4251
+#: src/LYUtils.c:3629
 msgid "Restrictions set:\n"
 msgstr "Définition de réstriction:\n"
 
-#: src/LYUtils.c:5601
-msgid "Ignoring invalid HOME"
-msgstr "Non prise en compte d'un HOME invalide"
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr ""
 
-#: src/LYrcFile.c:20
+#: src/LYrcFile.c:21
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr ""
 
-#: src/LYrcFile.c:242
+#: src/LYrcFile.c:295
 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"
@@ -5091,7 +5214,7 @@ msgid ""
 "all cookies.\n"
 msgstr ""
 
-#: src/LYrcFile.c:249
+#: src/LYrcFile.c:302
 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"
@@ -5101,7 +5224,7 @@ msgstr ""
 "dans lequel l'utilisateur peut copier des liens pour un accès rapide\n"
 "ultérieurement.\n"
 
-#: src/LYrcFile.c:254
+#: src/LYrcFile.c:307
 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"
@@ -5111,7 +5234,7 @@ msgstr ""
 "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"
 
-#: src/LYrcFile.c:259
+#: src/LYrcFile.c:312
 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"
@@ -5125,7 +5248,7 @@ msgstr ""
 "bits différent ou utiliser les caractères approximatifs 7 bits.  Les jeux\n"
 "de caractères valides courants sont :\n"
 
-#: src/LYrcFile.c:266
+#: src/LYrcFile.c:319
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5134,7 +5257,7 @@ msgid ""
 "settings made here.\n"
 msgstr ""
 
-#: src/LYrcFile.c:274
+#: src/LYrcFile.c:327
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/.lynx_cookies.\n"
@@ -5142,7 +5265,7 @@ msgstr ""
 "cookie_file spécifie le fichier à partir duquel lire les cookies\n"
 "persistants. Le défaut est ~/.lynx_cookies.\n"
 
-#: src/LYrcFile.c:279
+#: src/LYrcFile.c:332
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5153,7 +5276,13 @@ msgid ""
 "querying the user for an invalid path or domain.\n"
 msgstr ""
 
-#: src/LYrcFile.c:292
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:351
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5166,7 +5295,7 @@ msgstr ""
 "permet de lister les fichiers d'abord tandis que «DIRECTORIES_FIRST» permet\n"
 "de lister les répertoires d'abord.\n"
 
-#: src/LYrcFile.c:300
+#: src/LYrcFile.c:359
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5178,7 +5307,7 @@ msgstr ""
 "  ^B = gauche    ^F = droite\n"
 "est activé.\n"
 
-#: src/LYrcFile.c:306
+#: src/LYrcFile.c:365
 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"
@@ -5190,7 +5319,7 @@ msgstr ""
 "à moins qu'elle soit activée de la ligne de commande, auquel cas l'éditeur\n"
 "de lignes sera utilisé pour l'envoi de courrier.\n"
 
-#: src/LYrcFile.c:312
+#: src/LYrcFile.c:371
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5206,7 +5335,7 @@ msgstr ""
 "   VOLUME    -- tri selon le volume du fichier\n"
 "   DATE      -- tri selon la date du fichier\n"
 
-#: src/LYrcFile.c:324
+#: src/LYrcFile.c:389
 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"
@@ -5234,7 +5363,7 @@ msgstr ""
 "\n"
 "Les modes d'édition de ligne courants sont:\n"
 
-#: src/LYrcFile.c:339
+#: src/LYrcFile.c:404
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5246,7 +5375,7 @@ msgstr ""
 "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"
 
-#: src/LYrcFile.c:345
+#: src/LYrcFile.c:410
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5264,7 +5393,7 @@ msgstr ""
 "utilisez l'option -nofrom en ligne de commande. Vous pouvez aussi laisser\n"
 "ce champ vide, mais alors il n'apparaitra pas dans vos commentaires postés.\n"
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:419
 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"
@@ -5291,20 +5420,20 @@ msgstr ""
 "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"
 
-#: src/LYrcFile.c:368
+#: src/LYrcFile.c:433
 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 it's default language.\n"
+"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"
 "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"
 
-#: src/LYrcFile.c:377
+#: src/LYrcFile.c:442
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5326,7 +5455,7 @@ msgstr ""
 "          fonction devrait être réglée à «activé» uniquement si vous\n"
 "          consultez de l'information fiable.\n"
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:453
 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"
@@ -5354,7 +5483,7 @@ msgstr ""
 "          compromettre la sécurité. Cette fonction devrait être réglée à\n"
 "          «activé» uniquement si vous consultez de l'information fiable.\n"
 
-#: src/LYrcFile.c:403
+#: src/LYrcFile.c:471
 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"
@@ -5373,7 +5502,7 @@ msgstr ""
 "sélectionnera les boutons radio par défaut. Cette option peut être surchargée\n"
 "par l'option -popup en ligne de commande.\n"
 
-#: src/LYrcFile.c:413
+#: src/LYrcFile.c:481
 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"
@@ -5409,7 +5538,7 @@ msgstr ""
 "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"
 
-#: src/LYrcFile.c:430
+#: src/LYrcFile.c:498
 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"
@@ -5432,7 +5561,7 @@ msgstr ""
 "é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"
 
-#: src/LYrcFile.c:441
+#: src/LYrcFile.c:509
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5447,7 +5576,7 @@ msgstr ""
 "l'affichage des fichiers cachés est désactivé, la création de tels fichiers\n"
 "dans Lynx est aussi désactivée.\n"
 
-#: src/LYrcFile.c:452
+#: src/LYrcFile.c:520
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5470,7 +5599,7 @@ msgstr ""
 "modes novices et intérmédiaires. Lorsque cette option est définie comme \n"
 "\"standard\", le menu apparaitra quelquesoit le mode d'utilisation.\n"
 
-#: src/LYrcFile.c:464
+#: src/LYrcFile.c:533
 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"
@@ -5486,7 +5615,7 @@ msgstr ""
 "«INTERMEDIATE» pour éliminer ces lignes.  Utilisez l'option «ADVANCED» pour\n"
 "afficher l'URL du lien sélectionné au bas de l'écran.\n"
 
-#: src/LYrcFile.c:472
+#: src/LYrcFile.c:542
 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"
@@ -5495,7 +5624,7 @@ msgstr ""
 "Si verbose_images est à \"on\", lynx affichera les noms des fichier d'images\n"
 "sources au lieu de [INLINE],[LINK] ou [IMAGE]\n"
 
-#: src/LYrcFile.c:477
+#: src/LYrcFile.c:547
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5511,7 +5640,7 @@ msgstr ""
 "Les majuscules 'H', 'J' et 'K' activent l'aide, les touches de raccourci\n"
 "et la configuration des touches respectivement.\n"
 
-#: src/LYrcFile.c:485
+#: src/LYrcFile.c:555
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
@@ -5519,7 +5648,7 @@ msgstr ""
 "L'option visited_links controle la façon dont Lynx organise les informations\n"
 "sur la page Liens visités.\n"
 
-#: src/LYrcFile.c:693
+#: src/LYrcFile.c:772
 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"
@@ -5538,7 +5667,7 @@ msgstr ""
 "et les chiffres correspondants de votre clavier se comporterons\n"
 "comme des flèches, quelquesoit l'état du numlock.\n"
 
-#: src/LYrcFile.c:702
+#: src/LYrcFile.c:781
 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"
@@ -5547,7 +5676,7 @@ msgstr ""
 "chifres apparaitrons à cotés des liens afin de pouvoir sélectionner\n"
 "ces liens\n"
 
-#: src/LYrcFile.c:706
+#: src/LYrcFile.c:785
 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"
@@ -5567,7 +5696,7 @@ msgstr ""
 "de référence et les sorties de ces listes de commandes enumèrent aussi les\n"
 "champs de formulaires.\n"
 
-#: src/LYrcFile.c:715
+#: src/LYrcFile.c:794
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -5577,7 +5706,7 @@ msgstr ""
 "lorsque \"LINKS_ARE_NUMBERED\" ou \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" \n"
 "sont sélectionnés.\n"
 
-#: src/LYrcFile.c:748
+#: src/LYrcFile.c:827
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -5600,3 +5729,12 @@ msgstr ""
 "complètement renouvelé.  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 "create %s"
+#~ msgstr "création de %s"
+
+#~ msgid "Unable to open file management menu file."
+#~ msgstr "Impossible d'ouvrir le menu de gestion de fichier."
+
+#~ msgid "Ignoring invalid HOME"
+#~ msgstr "Non prise en compte d'un HOME invalide"
diff --git a/gnu/usr.bin/lynx/po/hu.po b/gnu/usr.bin/lynx/po/hu.po
new file mode 100644
index 00000000000..943b704763f
--- /dev/null
+++ b/gnu/usr.bin/lynx/po/hu.po
@@ -0,0 +1,5636 @@
+# Hungarian translation of lynx.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Gábor István <stive@mezobereny.hu>, 2002.
+# Mihály Gyulai <gyulai@fbi.hu>, 2003.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lynx 2.8.5pre15\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-0500\n"
+"PO-Revision-Date: 2003-06-03 20:58+0200\n"
+"Last-Translator: Mihály Gyulai <gyulai@fbi.hu>\n"
+"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\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:29
+#, c-format
+msgid "Alert!: %s"
+msgstr "Figyelem!: %s"
+
+#: LYMessages.c:30
+msgid "Welcome"
+msgstr "Üdvözöljük"
+
+#: LYMessages.c:31
+msgid "Are you sure you want to quit?"
+msgstr "Ki akar lépni a programból?"
+
+#: LYMessages.c:33
+msgid "Really exit from Lynx?"
+msgstr "Kilép a Lynx-bõl?"
+
+#: LYMessages.c:35
+msgid "Connection interrupted."
+msgstr "A kapcsolat megszakadt."
+
+#: LYMessages.c:36
+msgid "Data transfer interrupted."
+msgstr "Az adatátvitel megszakadt."
+
+#: LYMessages.c:37
+msgid "Cancelled!!!"
+msgstr "Megszakítva!!!"
+
+#: LYMessages.c:38
+msgid "Cancelling!"
+msgstr "Megszakítás!"
+
+#: LYMessages.c:39
+msgid "Excellent!!!"
+msgstr "Kitûnõ!!!"
+
+#: LYMessages.c:40
+msgid "OK"
+msgstr "RENDBEN"
+
+#: LYMessages.c:41
+msgid "Done!"
+msgstr "Kész!"
+
+#: LYMessages.c:42
+msgid "Bad request!"
+msgstr "Hibás kérés!"
+
+#: LYMessages.c:43
+msgid "previous"
+msgstr "elõzõ"
+
+#: LYMessages.c:44
+msgid "next screen"
+msgstr "következõ képernyõ"
+
+#: LYMessages.c:45
+msgid "HELP!"
+msgstr "További segítség az opciókhoz"
+
+#: LYMessages.c:46
+msgid ", help on "
+msgstr ", segítség "
+
+#. #define HELP
+#: LYMessages.c:48
+msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
+msgstr "Le-föl billentyû: mozgás, ?: súgó, q: kilép, balra nyíl: vissza"
+
+#. #define MOREHELP
+#: LYMessages.c:50
+msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
+msgstr "-- Szóköz: tovább, le-föl nyíl: mozgás, ?: súgó, q: kilép"
+
+#: LYMessages.c:51
+msgid "-- press space for next page --"
+msgstr "-- Szóköz: következõ oldal --"
+
+#: LYMessages.c:52
+msgid "URL too long"
+msgstr "Az URL túl hosszú"
+
+#. Inactive input fields, messages used with -tna option - kw
+#. #define FORM_LINK_TEXT_MESSAGE_INA
+#: LYMessages.c:58
+msgid "(Text entry field) Inactive.  Press <return> to activate."
+msgstr "(Szövegbeviteli mezõ). Nem aktív. <return>: aktivál"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
+#: LYMessages.c:60
+msgid "(Textarea) Inactive.  Press <return> to activate."
+msgstr "(Szöveges terület). Nem aktív. <return>: aktivál"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
+#: LYMessages.c:62
+#, c-format
+msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
+msgstr "(Szövegmezõ). Nem aktív. <return>: aktivál. (%s szerkesztõvel)"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
+#: LYMessages.c:64
+msgid "(Form field) Inactive.  Use <return> to edit."
+msgstr "(Ûrlap mezõ). Nem aktív. <return>: szerkeszt"
+
+#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
+#: LYMessages.c:66
+#, c-format
+msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
+msgstr "(Ûrlap mezõ). Nem aktív. <return>: szerkeszt (%s: gyorsítótár nélküli küldés)"
+
+#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
+#: LYMessages.c:68
+msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
+msgstr "(Ûrlap mezõ). Nem aktív. <return>: szerkeszt, 2x <return>: elküld"
+
+#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
+#: LYMessages.c:70
+msgid "(mailto form field) Inactive.  Press <return> to change."
+msgstr "(címzés mezõ). Nem aktív. <return>: váltás"
+
+#. #define FORM_LINK_PASSWORD_MESSAGE_INA
+#: LYMessages.c:72
+msgid "(Password entry field) Inactive.  Press <return> to activate."
+msgstr "(Jelszó mezõ). Nem aktív. <return>: aktivál"
+
+#. #define FORM_LINK_FILE_UNM_MSG
+#: LYMessages.c:75
+msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
+msgstr "MÓDOSÍTHATATLAN fájl megadási mezõ. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_FILE_MESSAGE
+#: LYMessages.c:77
+msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Fájl megadási mezõ). Kérem a fájl nevét. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_TEXT_MESSAGE
+#: LYMessages.c:79
+msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Szövegbeviteli mezõ). Kérem a szöveget. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE
+#: LYMessages.c:81
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
+msgstr "(Szöveges terület). Kérem a szöveget. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_E
+#: LYMessages.c:83
+#, c-format
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
+msgstr "(Szöveges terület). Kérem a szöveget. Le-föl nyíl, Tab: kilép. (%s szerkesztõ)"
+
+#. #define FORM_LINK_TEXT_UNM_MSG
+#: LYMessages.c:85
+msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
+msgstr "MÓDOSÍTHATATLAN szöveg mezõ. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
+#: LYMessages.c:87
+msgid "(Form field) Enter text.  Use <return> to submit."
+msgstr "(Ûrlap mezõ). Kérem a szöveget. <return>: elküld"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
+#: LYMessages.c:89
+#, c-format
+msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
+msgstr "(Ûrlap mezõ). Kérem a szöveget. <return>: elküld (%s: gyorstár nélküli küldés)"
+
+#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
+#: LYMessages.c:91
+msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
+msgstr "(Ûrlap mezõ). Kérem a szöveget. <return>: elküld. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
+#: LYMessages.c:93
+msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
+msgstr "MÓDOSÍTHATATLAN ûrlap mezõ. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
+#: LYMessages.c:95
+msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
+msgstr "(Levelezõlap mezõ). Kérem a szöveget. <return>: elküld. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:97
+msgid "(mailto form field) Mail is disallowed so you cannot submit."
+msgstr "(címzés mezõ). A levelezés használata nincs engedélyezve, nem tudjuk elküldeni."
+
+#. #define FORM_LINK_PASSWORD_MESSAGE
+#: LYMessages.c:99
+msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Jelszó mezõ). Kérem a szöveget. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_PASSWORD_UNM_MSG
+#: LYMessages.c:101
+msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
+msgstr "MÓDOSÍTHATATLAN jelszó mezõ. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_CHECKBOX_MESSAGE
+#: LYMessages.c:103
+msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
+msgstr "(Jelölõnégyzet mezõ). Jobb nyíl vagy <return>: kijelöl"
+
+#. #define FORM_LINK_CHECKBOX_UNM_MSG
+#: LYMessages.c:105
+msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
+msgstr "MÓDOSÍTHATATLAN jelölõnégyzet. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_RADIO_MESSAGE
+#: LYMessages.c:107
+msgid "(Radio Button)   Use right-arrow or <return> to toggle."
+msgstr "(Választógomb). Jobbra nyíl vagy <return>: kijelöl"
+
+#. #define FORM_LINK_RADIO_UNM_MSG
+#: LYMessages.c:109
+msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
+msgstr "MÓDOSÍTHATATLAN választógomb. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_SUBMIT_PREFIX
+#: LYMessages.c:111
+msgid "Submit ('x' for no cache) to "
+msgstr "Elküldés (x: gyorstár nélküli küldés) "
+
+#. #define FORM_LINK_RESUBMIT_PREFIX
+#: LYMessages.c:113
+msgid "Submit to "
+msgstr "Elküldés "
+
+#. #define FORM_LINK_SUBMIT_MESSAGE
+#: LYMessages.c:115
+msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
+msgstr "(Ûrlap küldõ gomb). Jobbra nyíl vagy <return>: ('x': gyorstár nélküli küldés)"
+
+#. #define FORM_LINK_RESUBMIT_MESSAGE
+#: LYMessages.c:117
+msgid "(Form submit button) Use right-arrow or <return> to submit."
+msgstr "(Ûrlap küldõ gomb). Jobbra nyíl vagy <return>: elküld"
+
+#. #define FORM_LINK_SUBMIT_DIS_MSG
+#: LYMessages.c:119
+msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
+msgstr "A küldés gomb le van tiltva. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
+#: LYMessages.c:121
+msgid "Submit mailto form to "
+msgstr "Levelezõlap elküldése "
+
+#. #define FORM_LINK_SUBMIT_MAILTO_MSG
+#: LYMessages.c:123
+msgid "(mailto form submit button) Use right-arrow or <return> to submit."
+msgstr "(Levelezõlap küldõ gomb). Jobbra nyíl vagy <return>: elküld"
+
+#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:125
+msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
+msgstr "(Levelezõlap küldõ gomb). A levelezés le van tiltva, nem lehet elküldeni."
+
+#. #define FORM_LINK_RESET_MESSAGE
+#: LYMessages.c:127
+msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
+msgstr "(Ûrlap törlés gomb). Jobbra nyíl vagy <return>: alaphelyzetbe hoz"
+
+#. #define FORM_LINK_RESET_DIS_MSG
+#: LYMessages.c:129
+msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
+msgstr "A törlés gomb le van tiltva. Le-föl nyíl, Tab: kilép"
+
+#. #define FORM_LINK_OPTION_LIST_MESSAGE
+#: LYMessages.c:131
+msgid "(Option list) Hit return and use arrow keys and return to select option."
+msgstr "(Legördülõ menü). <return>, jobbra nyíl: belép"
+
+#. #define CHOICE_LIST_MESSAGE
+#: LYMessages.c:133
+msgid "(Choice list) Hit return and use arrow keys and return to select option."
+msgstr "(Választó lista). Le-föl nyíl: mozgás, <return>: választ"
+
+#. #define FORM_LINK_OPTION_LIST_UNM_MSG
+#: LYMessages.c:135
+msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
+msgstr "MÓDOSÍTHATATLAN legördülõ menü. <return>: megnéz, le-föl nyíl: kilép"
+
+#. #define CHOICE_LIST_UNM_MSG
+#: LYMessages.c:137
+msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
+msgstr "MÓDOSÍTHATATLAN választó lista. <return>: megnéz, le-föl nyíl: kilép"
+
+#: LYMessages.c:138
+msgid "Submitting form..."
+msgstr "Ûrlap elküldése..."
+
+#: LYMessages.c:139
+msgid "Resetting form..."
+msgstr "Ûrlap törlése..."
+
+#. #define RELOADING_FORM
+#: LYMessages.c:141
+msgid "Reloading document.  Any form entries will be lost!"
+msgstr "Dokumentum újratöltése: Az összes bejegyzés el fog veszni!"
+
+#: LYMessages.c:142
+#, c-format
+msgid "Warning: Cannot transcode form data to charset %s!"
+msgstr "Figyelem: Nem lehet átkódolni az adatokat a(z) %s karakterkészletre!"
+
+#. #define NORMAL_LINK_MESSAGE
+#: LYMessages.c:145
+msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
+msgstr "(HIVATKOZÁS). Jobbra nyíl vagy <return>: kiválaszt"
+
+#: LYMessages.c:146
+msgid "The resource requested is not available at this time."
+msgstr "A kívánt erõforrás most nem áll rendelkezésre."
+
+#: LYMessages.c:147
+msgid "Enter Lynx keystroke command: "
+msgstr "Kérem a Lynx billentyû-parancsot: "
+
+#: LYMessages.c:148
+msgid "Looking up "
+msgstr "Keresés "
+
+#: LYMessages.c:149
+#, c-format
+msgid "Getting %s"
+msgstr "%s lekérdezése"
+
+#: LYMessages.c:150
+#, c-format
+msgid "Skipping %s"
+msgstr "%s kihagyása"
+
+#: LYMessages.c:151
+#, c-format
+msgid "Using %s"
+msgstr "%s használata"
+
+#: LYMessages.c:152
+#, c-format
+msgid "Illegal URL: %s"
+msgstr "Érvénytelen URL: %s"
+
+#: LYMessages.c:153
+#, c-format
+msgid "Badly formed address %s"
+msgstr "Hibás címzés %s"
+
+#: LYMessages.c:154
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: LYMessages.c:155
+msgid "Unable to access WWW file!!!"
+msgstr "Nem lehet elérni WWW fájlt!"
+
+#: LYMessages.c:156
+#, c-format
+msgid "This is a searchable index.  Use %s to search."
+msgstr "Ez egy kereshetõ index. Használja a %s-t a kereséshez."
+
+#. #define WWW_INDEX_MORE_MESSAGE
+#: LYMessages.c:158
+#, c-format
+msgid "--More--  This is a searchable index.  Use %s to search."
+msgstr "--Tovább--  Ez egy kereshetõ index. Használja a %s-t a kereséshez."
+
+#: LYMessages.c:159
+msgid "You have entered an invalid link number."
+msgstr "Ön egy érvénytelen hivatkozás-számot írt be."
+
+#. #define SOURCE_HELP
+#: LYMessages.c:161
+msgid "Currently viewing document source.  Press '\\' to return to rendered version."
+msgstr "Ez a dokumentum forrása. Nyomja le a \\-t a normál nézethez."
+
+#. #define NOVICE_LINE_ONE
+#: LYMessages.c:163
+msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
+msgstr "  Le-föl nyilak: mozgás. Jobbra nyíl: hivatkozást követ; Balra nyíl: visszalép.\n"
+
+#. #define NOVICE_LINE_TWO
+#: LYMessages.c:165
+msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
+msgstr "H: Súgó, O: Beállít, P: Nyomtat, M:Fõablak, Q:Kilép, /:Keres, [del]:Elõzõ\n"
+
+#. #define NOVICE_LINE_TWO_A
+#: LYMessages.c:167
+msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
+msgstr "O: Parancs, H: Súgó, K: Bill., G: Ugrik, P: Nyomtat, M: Fõablak, O: Beállít, Q: Kilép\n"
+
+#. #define NOVICE_LINE_TWO_B
+#: LYMessages.c:169
+msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
+msgstr "O:Parancs, B:Vissza, E:Szerk., D:Letölt,  Ctrl-R:Újratölt, Ctrl-W:Frissít, /:Keres\n"
+
+#. #define NOVICE_LINE_TWO_C
+#: LYMessages.c:171
+msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
+msgstr "O:Parancs, C:Megj., BS:Elõzmény, könyvjelzõ: V:Néz, A:Új, R:Töröl\n"
+
+#. #define FORM_NOVICELINE_ONE
+#: LYMessages.c:173
+msgid "            Enter text into the field by typing on the keyboard              "
+msgstr "            Írja be a szöveget a mezõbe                    "
+
+#. #define FORM_NOVICELINE_TWO
+#: LYMessages.c:175
+msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
+msgstr "    Ctrl-U: kitörli az egész szöveget,  [Backspace]: egy karaktert töröl     "
+
+#. #define FORM_NOVICELINE_TWO_DELBL
+#: LYMessages.c:177
+msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
+msgstr "  Ctrl-U: kitörli a szöveget a mezõbõl,  [Backspace]: egy karaktert töröl  "
+
+#. #define FORM_NOVICELINE_TWO_VAR
+#: LYMessages.c:179
+#, c-format
+msgid "    %s to delete all text in field, [Backspace] to delete a character    "
+msgstr "     %s kitörli az egész szöveget,  [Backspace]: egy karaktert töröl   "
+
+#. #define FORM_NOVICELINE_TWO_DELBL_VAR
+#: LYMessages.c:181
+#, c-format
+msgid "      %s to delete text in field, [Backspace] to delete a character    "
+msgstr "     %s kitörli a szöveget,  [Backspace]: egy karaktert töröl    "
+
+#. mailto
+#: LYMessages.c:184
+msgid "Malformed mailto form submission!  Cancelled!"
+msgstr "Hibás levelezõlap kitöltés! Megszakítva!"
+
+#: LYMessages.c:185
+msgid "Warning!  Control codes in mail address replaced by ?"
+msgstr "Figyelmeztetés! Az ellenõrzõ kódokat a levél címében kicserélte?"
+
+#: LYMessages.c:186
+msgid "Mail disallowed!  Cannot submit."
+msgstr "A levelezés le van tiltva! Nem lehet elküldeni."
+
+#: LYMessages.c:187
+msgid "Mailto form submission failed!"
+msgstr "A levelezõlap küldése nem sikerült!"
+
+#: LYMessages.c:188
+msgid "Mailto form submission Cancelled!!!"
+msgstr "A levelezõlap küldése megszakítva!"
+
+#: LYMessages.c:189
+msgid "Sending form content..."
+msgstr "Ûrlap tartalmának küldése..."
+
+#: LYMessages.c:190
+msgid "No email address is present in mailto URL!"
+msgstr "Nincs email cím ebben a \"mailto\" URL-ben!"
+
+#. #define MAILTO_URL_TEMPOPEN_FAILED
+#: LYMessages.c:192
+msgid "Unable to open temporary file for mailto URL!"
+msgstr "Nem lehet az átmeneti fájlt megnyitni a levelezõ URL-hez"
+
+#. #define INC_ORIG_MSG_PROMPT
+#: LYMessages.c:194
+msgid "Do you wish to include the original message?"
+msgstr "Szeretné az eredeti üzenetet a levélbe illeszteni?"
+
+#. #define INC_PREPARSED_MSG_PROMPT
+#: LYMessages.c:196
+msgid "Do you wish to include the preparsed source?"
+msgstr "Szeretné az elemzett forrást a levélbe illeszteni?"
+
+#. #define SPAWNING_EDITOR_FOR_MAIL
+#: LYMessages.c:198
+msgid "Spawning your selected editor to edit mail message"
+msgstr "A kiválasztott szerkesztõ meghívása a levél szerkesztéséhez"
+
+#. #define ERROR_SPAWNING_EDITOR
+#: LYMessages.c:200
+msgid "Error spawning editor, check your editor definition in the options menu"
+msgstr "Hiba a szerkesztõ meghívásakor. Az opcióknál a szerkesztõ jól lett megadva?"
+
+#: LYMessages.c:201
+msgid "Send this comment?"
+msgstr "A megjegyzés küldése?"
+
+#: LYMessages.c:202
+msgid "Send this message?"
+msgstr "Az üzenet küldése?"
+
+#: LYMessages.c:203
+msgid "Sending your message..."
+msgstr "Az üzenet küldése..."
+
+#: LYMessages.c:204
+msgid "Sending your comment:"
+msgstr "A megjegyzés küldése:"
+
+#. textarea
+#: LYMessages.c:207
+msgid "Not in a TEXTAREA; cannot use external editor."
+msgstr "Nem szövegmezõ! Nem lehet használni külsõ szerkesztõt."
+
+#: LYMessages.c:208
+msgid "Not in a TEXTAREA; cannot use command."
+msgstr "Nem szövegmezõ! Nem lehet használni parancsokat."
+
+#: LYMessages.c:211
+msgid "file: ACTIONs are disallowed!"
+msgstr "fájl: A mûveletek le vannak tiltva!"
+
+#. #define FILE_SERVED_LINKS_DISALLOWED
+#: LYMessages.c:213
+msgid "file: URLs via served links are disallowed!"
+msgstr "fájl: URL-ek hivatkozásokon keresztüli elérése le van tiltva!"
+
+#: LYMessages.c:214
+msgid "Access to local files denied."
+msgstr "A helyi fájl-elérés le van tiltva."
+
+#: LYMessages.c:215
+msgid "file: URLs via bookmarks are disallowed!"
+msgstr "fájl: az URL-ek könyvjelzõn keresztüli elérése le van tiltva!"
+
+#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
+#: LYMessages.c:217
+msgid "This special URL is not allowed in external documents!"
+msgstr "Ez a speciális URL nincs engedélyezve külsõ dokumentumokban!"
+
+#: LYMessages.c:218
+msgid "Press <return> to return to Lynx."
+msgstr "Nyomja meg a <return> billentyût, hogy visszatérjen a Lynx-hez."
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:221
+msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
+msgstr "DCL folyamat hívása. Használja a 'logout' parancsot a Lynx-hez való visszatéréshez.\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:225
+msgid "Type EXIT to return to Lynx.\n"
+msgstr "Gépelje be az 'exit' parancsot a Lynx-hez való visszatéréshez.\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:228
+msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
+msgstr "Az alapértelmezett parancsértelmezõ meghívása. Használja az 'exit' parancsot a Lynx-hez való visszatéréshez.\n"
+
+#: LYMessages.c:231
+msgid "Spawning is currently disabled."
+msgstr "A meghívás most le van tiltva."
+
+#: LYMessages.c:232
+msgid "The 'd'ownload command is currently disabled."
+msgstr "A letöltés parancs (D) most le van tiltva."
+
+#: LYMessages.c:233
+msgid "You cannot download an input field."
+msgstr "Beviteli mezõt nem lehet letölteni."
+
+#: LYMessages.c:234
+msgid "Form has a mailto action!  Cannot download."
+msgstr "Ez az ûrlap levelezésre való! Nem lehet letölteni."
+
+#: LYMessages.c:235
+msgid "You cannot download a mailto: link."
+msgstr "Nem lehet letölteni levelezõlap hivatkozást."
+
+#: LYMessages.c:236
+msgid "You cannot download cookies."
+msgstr "Sütiket nem lehet letölteni."
+
+#: LYMessages.c:237
+msgid "You cannot download a printing option."
+msgstr "Nyomtatási beállításokat nem lehet letölteni."
+
+#: LYMessages.c:238
+msgid "You cannot download an upload option."
+msgstr "Feltöltés opciót nem lehet letölteni."
+
+#: LYMessages.c:239
+msgid "You cannot download an permit option."
+msgstr "Engedélyezõ opciót nem lehet letölteni."
+
+#: LYMessages.c:240
+msgid "This special URL cannot be downloaded!"
+msgstr "Ezt a speciális URL-t nem lehet letölteni!"
+
+#: LYMessages.c:241
+msgid "Nothing to download."
+msgstr "Nincs mit letölteni."
+
+#: LYMessages.c:242
+msgid "Trace ON!"
+msgstr "Nyomkövetés BE!"
+
+#: LYMessages.c:243
+msgid "Trace OFF!"
+msgstr "Nyomkövetés KI!"
+
+#. #define CLICKABLE_IMAGES_ON
+#: LYMessages.c:245
+msgid "Links will be included for all images!  Reloading..."
+msgstr "Hivatkozások betöltése a képekhez. Újratöltés..."
+
+#. #define CLICKABLE_IMAGES_OFF
+#: LYMessages.c:247
+msgid "Standard image handling restored!  Reloading..."
+msgstr "Alapértelmezett képkezelés visszaállítva! Újratöltés..."
+
+#. #define PSEUDO_INLINE_ALTS_ON
+#: LYMessages.c:249
+msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
+msgstr "Pszeudo_ALT-ok lesznek beszúrva ALT sztringek nélküli \"inline\"-okhoz! Újratöltés.."
+
+#. #define PSEUDO_INLINE_ALTS_OFF
+#: LYMessages.c:251
+msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
+msgstr "Az ALT sztringek nélküli sorok ki lesznek hagyva! Újratöltés..."
+
+#: LYMessages.c:252
+msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
+msgstr "Nyers 8-bites vagy CJK mód KIkapcsolva! Újratöltés..."
+
+#: LYMessages.c:253
+msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
+msgstr "Nyers 8-bites vagy CJK mód BEkapcsolva! Újratöltés..."
+
+#. #define HEAD_D_L_OR_CANCEL
+#: LYMessages.c:255
+msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
+msgstr "HEAD kérés küldése a dokumentumnak (D), vagy hivatkozásnak (L) vagy sehova (C): "
+
+#. #define HEAD_D_OR_CANCEL
+#: LYMessages.c:257
+msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
+msgstr "HEAD kérés küldése a dokumentumnak (D), vagy sehova (C): "
+
+#: LYMessages.c:258
+msgid "Sorry, the document is not an http URL."
+msgstr "Sajnálom, de ez a dokumentum nem HTTP URL."
+
+#: LYMessages.c:259
+msgid "Sorry, the link is not an http URL."
+msgstr "Sajnálom, de a hivatkozás nem HTTP URL."
+
+#: LYMessages.c:260
+msgid "Sorry, the ACTION for this form is disabled."
+msgstr "Sajnálom, de ez a mûvelet erre az ûrlapra le van tiltva."
+
+#. #define FORM_ACTION_NOT_HTTP_URL
+#: LYMessages.c:262
+msgid "Sorry, the ACTION for this form is not an http URL."
+msgstr "Sajnálom, de ez a mûvelet erre a ûrlapra nem HTTP URL."
+
+#: LYMessages.c:263
+msgid "Not an http URL or form ACTION!"
+msgstr "Nem HTTP URL vagy ûrlap mûvelet!"
+
+#: LYMessages.c:264
+msgid "This special URL cannot be a form ACTION!"
+msgstr "Ez a speciális URL nem lehet ûrlap mûvelet!"
+
+#: LYMessages.c:265
+msgid "URL is not in starting realm!"
+msgstr "Az URL nem kezdõtartományban van!"
+
+#: LYMessages.c:266
+msgid "News posting is disabled!"
+msgstr "Hírek postázása le van tiltva!"
+
+#: LYMessages.c:267
+msgid "File management support is disabled!"
+msgstr "A fájlkezelés le van tiltva!"
+
+#: LYMessages.c:268
+msgid "No jump file is currently available."
+msgstr "Ugrásfájl jelenleg nem áll rendelkezésre."
+
+#: LYMessages.c:269
+msgid "Jump to (use '?' for list): "
+msgstr "Ugrás ('?': listát mutat) : "
+
+#: LYMessages.c:270
+msgid "Jumping to a shortcut URL is disallowed!"
+msgstr "Az URL billentyûparanccsal való ugrás le van tiltva!"
+
+#: LYMessages.c:271
+msgid "Random URL is disallowed!  Use a shortcut."
+msgstr "Közvetlen URL le van tiltva!  Használjon billentyûparancsot."
+
+#: LYMessages.c:272
+msgid "No random URLs have been used thus far."
+msgstr "A közvetlen URL-ek eddig még nem voltak használva."
+
+#: LYMessages.c:273
+msgid "Bookmark features are currently disabled."
+msgstr "A könyvjelzõ jelenleg le van tiltva."
+
+#: LYMessages.c:274
+msgid "Execution via bookmarks is disabled."
+msgstr "Futtatás könyvjelzõn keresztül le van tiltva."
+
+#. #define BOOKMARK_FILE_NOT_DEFINED
+#: LYMessages.c:276
+#, c-format
+msgid "Bookmark file is not defined. Use %s to see options."
+msgstr "Nincs megadva könyvjelzõ fájl. Használja a %s-t a beállítások megnézéséhez."
+
+#. #define NO_TEMP_FOR_HOTLIST
+#: LYMessages.c:278
+msgid "Unable to open tempfile for X Mosaic hotlist conversion."
+msgstr "Nem lehet megnyitni átmeneti fájlt az X Mosaic gyorslista átalakításához."
+
+#: LYMessages.c:279
+msgid "ERROR - unable to open bookmark file."
+msgstr "HIBA  -  Nem lehet megnyitni könyvjelzõ fájlt."
+
+#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:281
+msgid "Unable to open bookmark file for deletion of link."
+msgstr "Nem lehet megnyitni könyvjelzõ fájlt a hivatkozás törléséhez."
+
+#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:283
+msgid "Unable to open scratch file for deletion of link."
+msgstr "Nem lehet megnyitni visszavonó fájlt a hivatkozás törléséhez."
+
+#: LYMessages.c:285
+msgid "Error renaming scratch file."
+msgstr "Hiba a visszavonó fájl átnevezése közben."
+
+#: LYMessages.c:287
+msgid "Error renaming temporary file."
+msgstr "Hiba az átmeneti fájl átnevezése közben."
+
+#. #define BOOKTEMP_COPY_FAIL
+#: LYMessages.c:289
+msgid "Unable to copy temporary file for deletion of link."
+msgstr "Nem lehet másolni az átmeneti fájlt a hivatkozás törléséhez."
+
+#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
+#: LYMessages.c:291
+msgid "Unable to reopen temporary file for deletion of link."
+msgstr "Nem lehet újra megnyitni az átmeneti fájlt a hivatkozás törléséhez."
+
+#. #define BOOKMARK_LINK_NOT_ONE_LINE
+#: LYMessages.c:294
+msgid "Link is not by itself all on one line in bookmark file."
+msgstr "A hivatkozás nem egy sorban van a könyvjelzõ fájlon belül."
+
+#: LYMessages.c:295
+msgid "Bookmark deletion failed."
+msgstr "Könyvjelzõ törlés sikertelen."
+
+#. #define BOOKMARKS_NOT_TRAVERSED
+#: LYMessages.c:297
+msgid "Bookmark files cannot be traversed (only http URLs)."
+msgstr "Könyvjelzõ fájlt nem lehet átirányítani (csak http URL-ek szerepelhetnek)."
+
+#. #define BOOKMARKS_NOT_OPEN
+#: LYMessages.c:299
+msgid "Unable to open bookmark file, use 'a' to save a link first"
+msgstr "Nem lehet megnyitni könyvjelzõ fájlt, az 'a'-val elmentheti az elsõ hivatkozást"
+
+#: LYMessages.c:300
+msgid "There are no links in this bookmark file!"
+msgstr "Ebben a könyvjelzõ fájlban nincs hivatkozás!"
+
+#. #define BOOK_D_L_OR_CANCEL
+#: LYMessages.c:302
+msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
+msgstr "D: Dokumentum vagy L: hivatkozás mentése a könyvjelzõkhöz vagy C: Semmi"
+
+#: LYMessages.c:303
+msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
+msgstr "D: Dokumentum mentése a könyvjelzõkhöz vagy C: Semmi"
+
+#: LYMessages.c:304
+msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
+msgstr "A hivatkozás (L) mentése a könyvjelzõkhöz vagy Semmi (C)"
+
+#. #define NOBOOK_POST_FORM
+#: LYMessages.c:306
+msgid "Documents from forms with POST content cannot be saved as bookmarks."
+msgstr "POST tartalmú ûrlapnál lévõ dokumentumokat nem lehet könyvjelzõként elmenteni."
+
+#: LYMessages.c:307
+msgid "Cannot save form fields/links"
+msgstr "Nem lehet elmenteni ûrlap mezõt/hivatkozást"
+
+#. #define NOBOOK_HSML
+#: LYMessages.c:309
+msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
+msgstr "Elõzményt, információt, menüt és listafájlt nem lehet elmenteni könyvjelzõként."
+
+#. #define CONFIRM_BOOKMARK_DELETE
+#: LYMessages.c:311
+msgid "Do you really want to delete this link from your bookmark file?"
+msgstr "Törölni akarja ezt a hivatkozást a könyvjelzõ fájlból?"
+
+#: LYMessages.c:312
+msgid "Malformed address."
+msgstr "Hibásan megadott cím."
+
+#. #define HISTORICAL_ON_MINIMAL_OFF
+#: LYMessages.c:314
+msgid "Historical comment parsing ON (Minimal is overridden)!"
+msgstr "Elõzmények megjegyzés-elemzése BE! (\"minimális\" felülbírálva)"
+
+#. #define HISTORICAL_OFF_MINIMAL_ON
+#: LYMessages.c:316
+msgid "Historical comment parsing OFF (Minimal is in effect)!"
+msgstr "Elõzmények megjegyzés-elemzése KI! (\"minimális\"-ba kapcsolva)"
+
+#. #define HISTORICAL_ON_VALID_OFF
+#: LYMessages.c:318
+msgid "Historical comment parsing ON (Valid is overridden)!"
+msgstr "Elõzmények megjegyzés-elemzése BE (\"érvényes\" felülbírálva)!"
+
+#. #define HISTORICAL_OFF_VALID_ON
+#: LYMessages.c:320
+msgid "Historical comment parsing OFF (Valid is in effect)!"
+msgstr "Elõzmény megjegyzés elemzés KI(\"érvényes\" bekapcsolva)!"
+
+#. #define MINIMAL_ON_IN_EFFECT
+#: LYMessages.c:322
+msgid "Minimal comment parsing ON (and in effect)!"
+msgstr "Minimális megjegyzés-elemzés BE!"
+
+#. #define MINIMAL_OFF_VALID_ON
+#: LYMessages.c:324
+msgid "Minimal comment parsing OFF (Valid is in effect)!"
+msgstr "Minimális megjegyzés-elemzés KI (\"érvényes\" bekapcsolva)!"
+
+#. #define MINIMAL_ON_BUT_HISTORICAL
+#: LYMessages.c:326
+msgid "Minimal comment parsing ON (but Historical is in effect)!"
+msgstr "Minimális megjegyzés-elemzés BE (de az \"elõzmények\" is érvényes)!"
+
+#. #define MINIMAL_OFF_HISTORICAL_ON
+#: LYMessages.c:328
+msgid "Minimal comment parsing OFF (Historical is in effect)!"
+msgstr "Minimális megjegyzés-elemzés KI (az \"elõzmények\" is érvényes)!"
+
+#: LYMessages.c:329
+msgid "Soft double-quote parsing ON!"
+msgstr "Dupla-idézõjel elemzés BE!"
+
+#: LYMessages.c:330
+msgid "Soft double-quote parsing OFF!"
+msgstr "Dupla-idézõjel elemzés KI!"
+
+#: LYMessages.c:331
+msgid "Now using TagSoup parsing of HTML."
+msgstr "Most a \"TagSoup HTML\" elemzést használom."
+
+#: LYMessages.c:332
+msgid "Now using SortaSGML parsing of HTML!"
+msgstr "Most a \"SortaSGML HTML\" elemzést használom."
+
+#: LYMessages.c:333
+msgid "You are already at the end of this document."
+msgstr "A dokumentum végénél vagyunk."
+
+#: LYMessages.c:334
+msgid "You are already at the beginning of this document."
+msgstr "A dokumentum elejénél vagyunk."
+
+#: LYMessages.c:335
+#, c-format
+msgid "You are already at page %d of this document."
+msgstr "A dokumentum %d. oldalán vagyunk."
+
+#: LYMessages.c:336
+#, c-format
+msgid "Link number %d already is current."
+msgstr "A %d. hivatkozás már aktuális volt."
+
+#: LYMessages.c:337
+msgid "You are already at the first document"
+msgstr "Az elsõ dokumentumon állunk."
+
+#: LYMessages.c:338
+msgid "There are no links above this line of the document."
+msgstr "A dokumentumban e sor fölött nincs semmilyen hivatkozás."
+
+#: LYMessages.c:339
+msgid "There are no links below this line of the document."
+msgstr "A dokumentumban e sor alatt nincs semmilyen hivatkozás."
+
+#. #define MAXLEN_REACHED_DEL_OR_MOV
+#: LYMessages.c:341
+msgid "Maximum length reached!  Delete text or move off field."
+msgstr "Elértük a max. hosszúságot! Töröljön a szövegbõl, vagy lépjen ki a mezõbõl."
+
+#. #define NOT_ON_SUBMIT_OR_LINK
+#: LYMessages.c:343
+msgid "You are not on a form submission button or normal link."
+msgstr "Nem ûrlapküldõ gombon vagy hivatkozáson állunk."
+
+#. #define NEED_CHECKED_RADIO_BUTTON
+#: LYMessages.c:345
+msgid "One radio button must be checked at all times!"
+msgstr "A választó gombok közül egy mindenképpen ki lesz jelölve!"
+
+#: LYMessages.c:346
+msgid "No submit button for this form, submit single text field?"
+msgstr "Nincs küldés gomb ezen az ûrlapon. Elküldjem önálló szövegmezõként?"
+
+#: LYMessages.c:347
+msgid "Do you want to go back to the previous document?"
+msgstr "Visszatérünk az elõzõ dokumentumhoz?"
+
+#: LYMessages.c:348
+msgid "Use arrows or tab to move off of field."
+msgstr "Használja a le-föl nyilat vagy a tabulátort a mezõ elhagyásához."
+
+#. #define ENTER_TEXT_ARROWS_OR_TAB
+#: LYMessages.c:350
+msgid "Enter text.  Use arrows or tab to move off of field."
+msgstr "Kérem a szöveget. Le-föl nyíl vagy Tab: mezõ elhagyása."
+
+#: LYMessages.c:351
+msgid "** Bad HTML!!  No form action defined. **"
+msgstr "** Hibás HTML! Nincs ûrlap mûvelet meghatározva. **"
+
+#: LYMessages.c:352
+msgid "Bad HTML!!  Unable to create popup window!"
+msgstr "Hibás HTML! Nem lehet létrehozni legördülõ ablakot!"
+
+#: LYMessages.c:353
+msgid "Unable to create popup window!"
+msgstr "Nem lehet létrehozni legördülõ ablakot!"
+
+#: LYMessages.c:354
+msgid "Goto a random URL is disallowed!"
+msgstr "Az \"ugrás közvetlen URL-re\" le van tiltva!"
+
+#: LYMessages.c:355
+msgid "Goto a non-http URL is disallowed!"
+msgstr "Az \"ugrás nem HTTP URL-re\" le van tiltva!"
+
+#: LYMessages.c:356
+#, c-format
+msgid "You are not allowed to goto \"%s\" URLs"
+msgstr "Az Ön számára nincs engedélyezve \"%s\" URL-ekre való ugrás"
+
+#: LYMessages.c:357
+msgid "URL to open: "
+msgstr "URL megnyitása: "
+
+#: LYMessages.c:358
+msgid "Edit the current Goto URL: "
+msgstr "Az aktuális \"URL-re ugrás\" szerkesztése: "
+
+#: LYMessages.c:359
+msgid "Edit the previous Goto URL: "
+msgstr "Az elõzõ \"URL-re ugrás\" szerkesztése: "
+
+#: LYMessages.c:360
+msgid "Edit a previous Goto URL: "
+msgstr "Egy elõzõ \"URL-re ugrás\" szerkesztése: "
+
+#: LYMessages.c:361
+msgid "Current document has POST data."
+msgstr "A jelenlegi dokumentumban POST adatok vannak."
+
+#: LYMessages.c:362
+msgid "Edit this document's URL: "
+msgstr "A dokumentum URL-jének szerkesztése: "
+
+#: LYMessages.c:363
+msgid "Edit the current link's URL: "
+msgstr "A jelenlegi hivatkozás URL-jének szerkesztése: "
+
+#: LYMessages.c:364
+msgid "You cannot edit File Management URLs"
+msgstr "A fájlkezelés URL-jeit nem lehet szerkeszteni"
+
+#: LYMessages.c:365
+msgid "Enter a database query: "
+msgstr "Kérem az adatbázisbeli keresést: "
+
+#: LYMessages.c:366
+msgid "Enter a whereis query: "
+msgstr "Kérem a keresendõ szöveget: "
+
+#: LYMessages.c:367
+msgid "Edit the current query: "
+msgstr "A keresendõ szöveg szerkesztése: "
+
+#: LYMessages.c:368
+msgid "Edit the previous query: "
+msgstr "Az elõzõ keresendõ szöveg szerkesztése: "
+
+#: LYMessages.c:369
+msgid "Edit a previous query: "
+msgstr "Egy elõzõ keresendõ szöveg szerkesztése: "
+
+#. #define USE_C_R_TO_RESUB_CUR_QUERY
+#: LYMessages.c:371
+msgid "Use Control-R to resubmit the current query."
+msgstr "Használja a Control-R gombot a keresési kulcs újraküldéséhez."
+
+#: LYMessages.c:372
+msgid "Edit the current shortcut: "
+msgstr "A billentyûparancs szerkesztése: "
+
+#: LYMessages.c:373
+msgid "Edit the previous shortcut: "
+msgstr "Az elõzõ billentyûparancs szerkesztése: "
+
+#: LYMessages.c:374
+msgid "Edit a previous shortcut: "
+msgstr "Egyik elõzõ billentyûparancs szerkesztése: "
+
+#: LYMessages.c:375
+#, c-format
+msgid "Key '%c' is not mapped to a jump file!"
+msgstr "A '%c' billentyû nincs hozzárendelve ugrás fájlhoz!"
+
+#: LYMessages.c:376
+msgid "Cannot locate jump file!"
+msgstr "Nem találok ugrás fájlt!"
+
+#: LYMessages.c:377
+msgid "Cannot open jump file!"
+msgstr "Nem tudok megnyitni ugrás fájlt!"
+
+#: LYMessages.c:378
+msgid "Error reading jump file!"
+msgstr "Hiba az ugrás fájl olvasásakor!"
+
+#: LYMessages.c:379
+msgid "Out of memory reading jump file!"
+msgstr "Elfogyott a memória az ugrás fájl olvasásakor!"
+
+#: LYMessages.c:380
+msgid "Out of memory reading jump table!"
+msgstr "Elfogyott a memória az ugrás tábla olvasásakor!"
+
+#: LYMessages.c:381
+msgid "No index is currently available."
+msgstr "Nincs elérhetõ index."
+
+#. #define CONFIRM_MAIN_SCREEN
+#: LYMessages.c:383
+msgid "Do you really want to go to the Main screen?"
+msgstr "Vissza akar térni a fõképre?"
+
+#: LYMessages.c:384
+msgid "You are already at main screen!"
+msgstr "A fõképnél vagyunk!"
+
+#. #define NOT_ISINDEX
+#: LYMessages.c:386
+msgid "Not a searchable indexed document -- press '/' to search for a text string"
+msgstr "Nem indexelt dokumentum -- használja a '/'-t a szövegben való kereséshez"
+
+#. #define NO_OWNER
+#: LYMessages.c:388
+msgid "No owner is defined for this file so you cannot send a comment"
+msgstr "Nincs meghatározva a fájl tulajdonosa, így nem tudunk megjegyzést küldeni"
+
+#: LYMessages.c:389
+#, c-format
+msgid "No owner is defined. Use %s?"
+msgstr "Nincs tulajdonos meghatározva. Használjuk a(z) %s-t?"
+
+#: LYMessages.c:390
+msgid "Do you wish to send a comment?"
+msgstr "El akar küldeni egy megjegyzést?"
+
+#: LYMessages.c:391
+msgid "Mail is disallowed so you cannot send a comment"
+msgstr "A levélküldés nincs engedélyezve, nem lehet küldeni megjegyzést"
+
+#: LYMessages.c:392
+msgid "The 'e'dit command is currently disabled."
+msgstr "A szerkesztés parancs (E) jelenleg le van tiltva."
+
+#: LYMessages.c:393
+msgid "External editing is currently disabled."
+msgstr "A külsõ szerkesztés le van tiltva."
+
+#: LYMessages.c:394
+msgid "System error - failure to get status."
+msgstr "Rendszerhiba - nem lehet kiolvasni az állapotot."
+
+#: LYMessages.c:395
+msgid "No editor is defined!"
+msgstr "Nincs szerkesztõ meghatározva!"
+
+#: LYMessages.c:396
+msgid "The 'p'rint command is currently disabled."
+msgstr "A nyomtatásparancs (P) jelenleg le van tiltva."
+
+#: LYMessages.c:397
+msgid "Document has no Toolbar links or Banner."
+msgstr "A dokumentumban nincs Eszköztár link, sem Felirat (\"banner\")."
+
+#: LYMessages.c:398
+msgid "Unable to open traversal file."
+msgstr "Nem lehet megnyitni a bejárás fájlt (\"traversal\")."
+
+#: LYMessages.c:399
+msgid "Unable to open traversal found file."
+msgstr "Nem lehet megnyitni a talált bejárás fájlt (\"traversal\")."
+
+#: LYMessages.c:400
+msgid "Unable to open reject file."
+msgstr "Nem lehet megnyitni a visszautasítás fájlt."
+
+#: LYMessages.c:401
+msgid "Unable to open traversal errors output file"
+msgstr "Nem lehet megnyitni a bejárás hibakimeneti fájlt."
+
+#: LYMessages.c:402
+msgid "TRAVERSAL WAS INTERRUPTED"
+msgstr "BEJÁRÁS MEGSZAKADT"
+
+#: LYMessages.c:403
+msgid "Follow link (or goto link or page) number: "
+msgstr "Hivatkozás követésének (vagy hivatkozásra ugrásnak vagy lapnak) száma:"
+
+#: LYMessages.c:404
+msgid "Select option (or page) number: "
+msgstr "Opció kiválasztásának (vagy lapnak) a száma: "
+
+#: LYMessages.c:405
+#, c-format
+msgid "Option number %d already is current."
+msgstr "A %d. opció már ki van választva."
+
+#. #define ALREADY_AT_OPTION_END
+#: LYMessages.c:407
+msgid "You are already at the end of this option list."
+msgstr "A legördülõ menü végénél vagyunk."
+
+#. #define ALREADY_AT_OPTION_BEGIN
+#: LYMessages.c:409
+msgid "You are already at the beginning of this option list."
+msgstr "A legördülõ menü elejénél vagyunk."
+
+#. #define ALREADY_AT_OPTION_PAGE
+#: LYMessages.c:411
+#, c-format
+msgid "You are already at page %d of this option list."
+msgstr "A legördülõ menü %d. oldalán vagyunk."
+
+#: LYMessages.c:412
+msgid "You have entered an invalid option number."
+msgstr "A beírt opció-szám érvénytelen."
+
+#: LYMessages.c:413
+msgid "** Bad HTML!!  Use -trace to diagnose. **"
+msgstr "** Hibás HTML!! Használja a -trace kapcsolót a hibakereséshez. **"
+
+#: LYMessages.c:414
+msgid "Give name of file to save in"
+msgstr "Kérem a menteni kívánt fájl nevét"
+
+#: LYMessages.c:415
+msgid "Can't save data to file -- please run WWW locally"
+msgstr "Nem lehet az adatokat fájlba menteni -- kérem futtassa WWW-t helyileg"
+
+#: LYMessages.c:416
+msgid "Can't open temporary file!"
+msgstr "Nem lehet megnyitni átmeneti fájlt!"
+
+#: LYMessages.c:417
+msgid "Can't open output file!  Cancelling!"
+msgstr "Nem lehet megnyitni kimeneti fájlt! Megszakítva!"
+
+#: LYMessages.c:418
+msgid "Execution is disabled."
+msgstr "Futtatás tiltva."
+
+#. #define EXECUTION_DISABLED_FOR_FILE
+#: LYMessages.c:420
+#, c-format
+msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
+msgstr "A futtatás le van tiltva erre a fájlra.  Nézze meg a beállítások menüben (használja a(z) %s-t)"
+
+#. #define EXECUTION_NOT_COMPILED
+#: LYMessages.c:422
+msgid "Execution capabilities are not compiled into this version."
+msgstr "A futtatás lehetõsége nincs beleépítve ebbe a verzióba."
+
+#: LYMessages.c:423
+msgid "This file cannot be displayed on this terminal."
+msgstr "Ezt a fájlt nem lehet megjeleníteni ezen a terminálon."
+
+#. #define CANNOT_DISPLAY_FILE_D_OR_C
+#: LYMessages.c:425
+msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
+msgstr "Ezt a fájlt nem lehet megjeleníteni ezen a terminálon. Letöltés (D), vagy mégse (C)"
+
+#: LYMessages.c:426
+#, c-format
+msgid "%s  D)ownload, or C)ancel"
+msgstr "%s Letöltés (D) vagy mégse (C)"
+
+#: LYMessages.c:427
+msgid "Cancelling file."
+msgstr "Fájl megszakítása."
+
+#: LYMessages.c:428
+msgid "Retrieving file.  - PLEASE WAIT -"
+msgstr "Fájl letöltése. - KÉREM VÁRJON -"
+
+#: LYMessages.c:429
+msgid "Enter a filename: "
+msgstr "Kérem a fájlnevet: "
+
+#: LYMessages.c:430
+msgid "Edit the previous filename: "
+msgstr "Az elõzõ fájlnév szerkesztése: "
+
+#: LYMessages.c:431
+msgid "Edit a previous filename: "
+msgstr "Egy elõzõ fájlnév szerkesztése: "
+
+#: LYMessages.c:432
+msgid "Enter a new filename: "
+msgstr "Kérem az új fájlnevet: "
+
+#: LYMessages.c:433
+msgid "File name may not begin with a dot."
+msgstr "Fájlnév nem kezdõdhet ponttal."
+
+#: LYMessages.c:435
+msgid "File exists.  Create higher version?"
+msgstr "A fájl már létezik. Létrehozzak egy újabb verziót?"
+
+#: LYMessages.c:437
+msgid "File exists.  Overwrite?"
+msgstr "A fájl már létezik. Felülírjam?"
+
+#: LYMessages.c:439
+msgid "Cannot write to file."
+msgstr "Nem lehet fájlt írni."
+
+#: LYMessages.c:440
+msgid "ERROR! - download command is misconfigured."
+msgstr "HIBA! A letöltés parancs nincs jól beállítva."
+
+#: LYMessages.c:441
+msgid "Unable to download file."
+msgstr "Nem lehet letölteni a fájlt."
+
+#: LYMessages.c:442
+msgid "Reading directory..."
+msgstr "Könyvtár olvasása..."
+
+#: LYMessages.c:443
+msgid "Building directory listing..."
+msgstr "Könyvtárlista felépítése..."
+
+#: LYMessages.c:444
+msgid "Saving..."
+msgstr "Mentés..."
+
+#: LYMessages.c:445
+#, c-format
+msgid "Could not edit file '%s'."
+msgstr "Nem lehet szerkeszteni a(z) %s fájlt."
+
+#: LYMessages.c:446
+msgid "Unable to access document!"
+msgstr "Nem lehet elérni a dokumentumot!"
+
+#: LYMessages.c:447
+msgid "Could not access file."
+msgstr "Nem lehet elérni a fájlt."
+
+#: LYMessages.c:448
+msgid "Could not access directory."
+msgstr "Nem lehet elérni a könyvtárat."
+
+#: LYMessages.c:449
+msgid "Could not load data."
+msgstr "Nem lehet betölteni az adatokat."
+
+#. #define CANNOT_EDIT_REMOTE_FILES
+#: LYMessages.c:451
+msgid "Lynx cannot currently (e)dit remote WWW files."
+msgstr "A Lynx jelenleg nem tud szerkeszteni távoli WWW fájlokat."
+
+#. #define CANNOT_EDIT_FIELD
+#: LYMessages.c:453
+msgid "This field cannot be (e)dited with an external editor."
+msgstr "Ez a mezõ nem szerkeszthetõ külsõ szerkesztõvel."
+
+#: LYMessages.c:454
+msgid "Bad rule"
+msgstr "Hibás szabály"
+
+#: LYMessages.c:455
+msgid "Insufficient operands:"
+msgstr "Kevés operandus:"
+
+#: LYMessages.c:456
+msgid "You are not authorized to edit this file."
+msgstr "Ön nem jogosult e fájl szerkesztésére."
+
+#: LYMessages.c:457
+msgid "Title: "
+msgstr "Megnevezés: "
+
+#: LYMessages.c:458
+msgid "Subject: "
+msgstr "Tárgy: "
+
+#: LYMessages.c:459
+msgid "Username: "
+msgstr "Felhasználói név: "
+
+#: LYMessages.c:460
+msgid "Password: "
+msgstr "Jelszó: "
+
+#: LYMessages.c:461
+msgid "lynx: Username and Password required!!!"
+msgstr "lynx: Felhasználói név és jelszó szükséges!"
+
+#: LYMessages.c:462
+msgid "lynx: Password required!!!"
+msgstr "lynx: Jelszó szükséges!"
+
+#: LYMessages.c:463
+msgid "Clear all authorization info for this session?"
+msgstr "Minden felhatalmazás törlése errõl a folyamatról?"
+
+#: LYMessages.c:464
+msgid "Authorization info cleared."
+msgstr "Felhatalmazási információk törölve."
+
+#: LYMessages.c:465
+msgid "Authorization failed.  Retry?"
+msgstr "A felhasználói azonosítás sikertelen. Újra?"
+
+#: LYMessages.c:466
+msgid "cgi support has been disabled."
+msgstr "A CGI támogatás le van tiltva."
+
+#. #define CGI_NOT_COMPILED
+#: LYMessages.c:468
+msgid "Lynxcgi capabilities are not compiled into this version."
+msgstr "Lynxcgi lehetõségek nincsenek beépítve ebbe a verzióba."
+
+#: LYMessages.c:469
+#, c-format
+msgid "Sorry, no known way of converting %s to %s."
+msgstr "Sajnálom, nincs ismert módja a(z) %s %s átalakításnak."
+
+#: LYMessages.c:470
+msgid "Unable to set up connection."
+msgstr "Nem lehet beállítani a csatlakozást."
+
+#: LYMessages.c:471
+msgid "Unable to make connection"
+msgstr "Nem lehet csatlakozást létrehozni"
+
+#. #define MALFORMED_EXEC_REQUEST
+#: LYMessages.c:473
+msgid "Executable link rejected due to malformed request."
+msgstr "A végrehajtható link visszautasítva, hibás kérés miatt."
+
+#. #define BADCHAR_IN_EXEC_LINK
+#: LYMessages.c:475
+#, c-format
+msgid "Executable link rejected due to `%c' character."
+msgstr "A végrehajtható link visszautasítva, '%c' karakter miatt."
+
+#. #define RELPATH_IN_EXEC_LINK
+#: LYMessages.c:477
+msgid "Executable link rejected due to relative path string ('../')."
+msgstr "A végrehajtható link visszautasítva, relatív útvonal ('../')  miatt."
+
+#. #define BADLOCPATH_IN_EXEC_LINK
+#: LYMessages.c:479
+msgid "Executable link rejected due to location or path."
+msgstr "A végrehajtható link visszautasítva, hely vagy útvonal miatt."
+
+#: LYMessages.c:480
+msgid "Mail access is disabled!"
+msgstr "A levelek elérése le van tiltva!"
+
+#. #define ACCESS_ONLY_LOCALHOST
+#: LYMessages.c:482
+msgid "Only files and servers on the local host can be accessed."
+msgstr "Csak a helyi számítógépen található szervereket és fájlokat lehet elérni."
+
+#: LYMessages.c:483
+msgid "Telnet access is disabled!"
+msgstr "A telnet hozzáférés le van tiltva!"
+
+#. #define TELNET_PORT_SPECS_DISABLED
+#: LYMessages.c:485
+msgid "Telnet port specifications are disabled."
+msgstr "A telnet port beállítása le van tiltva."
+
+#: LYMessages.c:486
+msgid "USENET news access is disabled!"
+msgstr "A USENET hírek elérése le van tiltva!"
+
+#: LYMessages.c:487
+msgid "Rlogin access is disabled!"
+msgstr "Az rlogin elérése le van tiltva!"
+
+#: LYMessages.c:488
+msgid "Ftp access is disabled!"
+msgstr "Az ftp-s elérés le van tiltva!"
+
+#: LYMessages.c:489
+msgid "There are no references from this document."
+msgstr "Ebben a dokumentumban nincsenek hivatkozások."
+
+#: LYMessages.c:490
+msgid "There are only hidden links from this document."
+msgstr "Ebben a dokumentumban csak rejtett hivatkozások vannak."
+
+#: LYMessages.c:492
+msgid "Unable to open command file."
+msgstr "Nem lehet megnyitni a parancs fájlt."
+
+#: LYMessages.c:494
+msgid "News Post Cancelled!!!"
+msgstr "Hírek postázása megszakítva!"
+
+#. #define SPAWNING_EDITOR_FOR_NEWS
+#: LYMessages.c:496
+msgid "Spawning your selected editor to edit news message"
+msgstr "A kiválasztott szerkesztõ meghívása hírüzenet szerkesztéséhez"
+
+#: LYMessages.c:497
+msgid "Post this message?"
+msgstr "Postázzam az üzenetet?"
+
+#: LYMessages.c:498
+#, c-format
+msgid "Append '%s'?"
+msgstr "Hozzáfûzés: '%s'?"
+
+#: LYMessages.c:499
+msgid "Posting to newsgroup(s)..."
+msgstr "Hírcsoport(ok) felé postázás..."
+
+#: LYMessages.c:501
+msgid "*** You have unread mail. ***"
+msgstr "*** Önnek olvasatlan levele van. ***"
+
+#: LYMessages.c:503
+msgid "*** You have mail. ***"
+msgstr "*** Önnek levele van. ***"
+
+#: LYMessages.c:505
+msgid "*** You have new mail. ***"
+msgstr "*** Önnek új levele van. ***"
+
+#: LYMessages.c:506
+msgid "File insert cancelled!!!"
+msgstr "Fájlbeszúrás megszakítva!"
+
+#: LYMessages.c:507
+msgid "Not enough memory for file!"
+msgstr "Nincs elég memória a fájlnak!"
+
+#: LYMessages.c:508
+msgid "Can't open file for reading."
+msgstr "Nem lehet megnyitni a fájlt olvasásra."
+
+#: LYMessages.c:509
+msgid "File does not exist."
+msgstr "A fájl nem létezik."
+
+#: LYMessages.c:510
+msgid "File does not exist - reenter or cancel:"
+msgstr "A fájl nem létezik - újra vagy mégsem:"
+
+#: LYMessages.c:511
+msgid "File is not readable."
+msgstr "A fájl nem olvasható."
+
+#: LYMessages.c:512
+msgid "File is not readable - reenter or cancel:"
+msgstr "A fájl nem olvasható - újra vagy mégsem:"
+
+#: LYMessages.c:513
+msgid "Nothing to insert - file is 0-length."
+msgstr "Nincs mit beszúrni - a fájl 0 hosszú."
+
+#: LYMessages.c:514
+msgid "Save request cancelled!!!"
+msgstr "Mentési kérés megszakítva!"
+
+#: LYMessages.c:515
+msgid "Mail request cancelled!!!"
+msgstr "Levelezési kérés megszakítva!"
+
+#. #define CONFIRM_MAIL_SOURCE_PREPARSED
+#: LYMessages.c:517
+msgid "Viewing preparsed source.  Are you sure you want to mail it?"
+msgstr "Az elõkészített forrás megtekintése. El akarja postázni?"
+
+#: LYMessages.c:518
+msgid "Please wait..."
+msgstr "Kérem várjon..."
+
+#: LYMessages.c:519
+msgid "Mailing file.  Please wait..."
+msgstr "Fájl postázása. Kérem várjon..."
+
+#: LYMessages.c:520
+msgid "ERROR - Unable to mail file"
+msgstr "HIBA  - Nem lehet postázni a fájlt"
+
+#. #define CONFIRM_LONG_SCREEN_PRINT
+#: LYMessages.c:522
+#, c-format
+msgid "File is %d screens long.  Are you sure you want to print?"
+msgstr "A fájl %d képernyõ hosszú. Ki akarja nyomtatni?"
+
+#: LYMessages.c:523
+msgid "Print request cancelled!!!"
+msgstr "Nyomtatási kérés megszakítva!"
+
+#: LYMessages.c:524
+msgid "Press <return> to begin: "
+msgstr "Nyomja le a <return>-t a kezdéshez: "
+
+#: LYMessages.c:525
+msgid "Press <return> to finish: "
+msgstr "Nyomja le a <return>-t a befejezéshez: "
+
+#. #define CONFIRM_LONG_PAGE_PRINT
+#: LYMessages.c:527
+#, c-format
+msgid "File is %d pages long.  Are you sure you want to print?"
+msgstr "A fájl %d oldal hosszú. Ki akarja nyomtatni?"
+
+#. #define CHECK_PRINTER
+#: LYMessages.c:529
+msgid "Be sure your printer is on-line.  Press <return> to start printing:"
+msgstr "A nyomtató legyen bekapcsolva. Nyomja le a <return>-t a nyomtatáshoz:"
+
+#: LYMessages.c:530
+msgid "ERROR - Unable to allocate file space!!!"
+msgstr "HIBA - Nem lehet lefoglalni a fájlnak elég helyet!"
+
+#: LYMessages.c:531
+msgid "Unable to open tempfile"
+msgstr "Nem lehet megnyitni az átmeneti fájlt"
+
+#: LYMessages.c:532
+msgid "Unable to open print options file"
+msgstr "Nem lehet megnyitni a nyomtatási beállítások fájlt"
+
+#: LYMessages.c:533
+msgid "Printing file.  Please wait..."
+msgstr "Nyomtatás. Kérem várjon..."
+
+#: LYMessages.c:534
+msgid "Please enter a valid internet mail address: "
+msgstr "Írjon be egy érvényes email címet: "
+
+#: LYMessages.c:535
+msgid "ERROR! - printer is misconfigured!"
+msgstr "HIBA - a nyomtató nincs jól beállítva!"
+
+#: LYMessages.c:536
+msgid "Image map from POST response not available!"
+msgstr "Képtérkép nem áll rendelkezésre POST válaszból!"
+
+#: LYMessages.c:537
+msgid "Misdirected client-side image MAP request!"
+msgstr "Félreirányított ügyféloldali képtérkép kérés!"
+
+#: LYMessages.c:538
+msgid "Client-side image MAP is not accessible!"
+msgstr "Az ügyféloldali képtérkép nem hozzáférhetõ!"
+
+#: LYMessages.c:539
+msgid "No client-side image MAPs are available!"
+msgstr "Nincs elérhetõ ügyféloldali képtérkép!"
+
+#: LYMessages.c:540
+msgid "Client-side image MAP is not available!"
+msgstr "Az ügyfél oldali képtérkép nem elérhetõ!"
+
+#. #define OPTION_SCREEN_NEEDS_24
+#: LYMessages.c:543
+msgid "Screen height must be at least 24 lines for the Options menu!"
+msgstr "A képernyõ magassága legalább 24 sor legyen a Beállítások menü számára!"
+
+#. #define OPTION_SCREEN_NEEDS_23
+#: LYMessages.c:545
+msgid "Screen height must be at least 23 lines for the Options menu!"
+msgstr "A képernyõ magassága legalább 23 sor legyen a Beállítások menü számára!"
+
+#. #define OPTION_SCREEN_NEEDS_22
+#: LYMessages.c:547
+msgid "Screen height must be at least 22 lines for the Options menu!"
+msgstr "A képernyõ magassága legalább 22 sor legyen a Beállítások menü számára!"
+
+#: LYMessages.c:549
+msgid "That key requires Advanced User mode."
+msgstr "Ehhez a gombhoz haladó felhasználói mód kell."
+
+#: LYMessages.c:550
+#, c-format
+msgid "Content-type: %s"
+msgstr "Tartalom típusa: %s"
+
+#: LYMessages.c:551
+msgid "Command: "
+msgstr "Parancs: "
+
+#: LYMessages.c:552
+msgid "Unknown or ambiguous command"
+msgstr "Ismeretlen vagy bizonytalan parancs"
+
+#: LYMessages.c:553
+msgid " Version "
+msgstr " Verzió "
+
+#: LYMessages.c:554
+msgid " first"
+msgstr " elõször"
+
+#: LYMessages.c:555
+msgid ", guessing..."
+msgstr ", próbálkozás..."
+
+#: LYMessages.c:556
+msgid "Permissions for "
+msgstr "Jogosultságok "
+
+#: LYMessages.c:557
+msgid "Select "
+msgstr "Választás "
+
+#: LYMessages.c:558
+msgid "capital letter"
+msgstr "nagybetû"
+
+#: LYMessages.c:559
+msgid " of option line,"
+msgstr "beállítások sorának,"
+
+#: LYMessages.c:560
+msgid " to save,"
+msgstr " mentés,"
+
+#: LYMessages.c:561
+msgid " to "
+msgstr "  "
+
+#: LYMessages.c:562
+msgid " or "
+msgstr " vagy "
+
+#: LYMessages.c:563
+msgid " index"
+msgstr " index"
+
+#: LYMessages.c:564
+msgid " to return to Lynx."
+msgstr " vissza a Lynx-be."
+
+#: LYMessages.c:565
+msgid "Accept Changes"
+msgstr "A változások elfogadása"
+
+#: LYMessages.c:566
+msgid "Reset Changes"
+msgstr "Változások eldobása"
+
+#: LYMessages.c:567
+msgid "Left Arrow cancels changes"
+msgstr "Balra nyíl: változtatások figyelmen kívül hagyása"
+
+#: LYMessages.c:568
+msgid "Save options to disk"
+msgstr "A beállítások lemezre mentése"
+
+#: LYMessages.c:569
+msgid "Hit RETURN to accept entered data."
+msgstr "Nyomja le a RETURN-t a beírt adatok elfogadásához."
+
+#. #define ACCEPT_DATA_OR_DEFAULT
+#: LYMessages.c:571
+msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
+msgstr "Nyomja le a RETURN-t a beírt adatok elfogadásához. Az adatok törlésével az alapbeállításokat hívja meg."
+
+#: LYMessages.c:572
+msgid "Value accepted!"
+msgstr "Érték elfogadva!"
+
+#. #define VALUE_ACCEPTED_WARNING_X
+#: LYMessages.c:574
+msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
+msgstr "Érték elfogadva! -- FIGYELMEZTETÉS: a Lynx-et az XWINDOW-hoz állította be!"
+
+#. #define VALUE_ACCEPTED_WARNING_NONX
+#: LYMessages.c:576
+msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
+msgstr "Érték elfogadva! -- FIGYELMEZTETÉS: a Lynx nincs beállítva XWINDOW-hoz!"
+
+#: LYMessages.c:577
+msgid "You are not allowed to change which editor to use!"
+msgstr "Ön nem állíthatja be, hogy melyik szerkesztõt használja!"
+
+#: LYMessages.c:578
+msgid "Failed to set DISPLAY variable!"
+msgstr "Nem sikerült beállítani a DISPLAY változót!"
+
+#: LYMessages.c:579
+msgid "Failed to clear DISPLAY variable!"
+msgstr "Nem sikerült törölni a DISPLAY változót!"
+
+#. #define BOOKMARK_CHANGE_DISALLOWED
+#: LYMessages.c:581
+msgid "You are not allowed to change the bookmark file!"
+msgstr "Ön nem módosíthatja a könyvjelzõ fájlt!"
+
+#: LYMessages.c:582
+msgid "Terminal does not support color"
+msgstr "A terminál nem támogatja a színeket"
+
+#: LYMessages.c:583
+#, c-format
+msgid "Your '%s' terminal does not support color."
+msgstr "Ez a '%s' terminál nem támogatja a színeket."
+
+#: LYMessages.c:584
+msgid "Access to dot files is disabled!"
+msgstr "A rejtett fájlok elérése le van tiltva!"
+
+#. #define UA_NO_LYNX_WARNING
+#: LYMessages.c:586
+msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
+msgstr "A böngészõ-azonosító sztring nem tartalmaz \"Lynx\" vagy \"L_y_n_x\"-et"
+
+#. #define UA_PLEASE_USE_LYNX
+#: LYMessages.c:588
+msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
+msgstr "Használja a \"L_y_n_x\" vagy a \"Lynx\"-et a böngészõ-azonosítóban egyébként ez szándékos csalás!"
+
+#. #define UA_CHANGE_DISABLED
+#: LYMessages.c:590
+msgid "Changing of the User-Agent string is disabled!"
+msgstr "A böngészõ-azonosító sztring változtatása le van tiltva!"
+
+#. #define CHANGE_OF_SETTING_DISALLOWED
+#: LYMessages.c:592
+msgid "You are not allowed to change this setting."
+msgstr "Önnek nincs engedélyezve ennek a beállításnak a módosítása."
+
+#: LYMessages.c:593
+msgid "Saving Options..."
+msgstr "Beállítások mentése..."
+
+#: LYMessages.c:594
+msgid "Options saved!"
+msgstr "Beállítások elmentve!"
+
+#: LYMessages.c:595
+msgid "Unable to save Options!"
+msgstr "Nem lehet elmenteni a beállításokat!"
+
+#: LYMessages.c:596
+msgid " 'r' to return to Lynx "
+msgstr "'r': visszatérés a Lynx-hez "
+
+#: LYMessages.c:597
+msgid " '>' to save, or 'r' to return to Lynx "
+msgstr "'>': mentés vagy az 'r': visszatérés a Lynx-hez "
+
+#. #define ANY_KEY_CHANGE_RET_ACCEPT
+#: LYMessages.c:599
+msgid "Hit any key to change value; RETURN to accept."
+msgstr "Bármely billentyû lenyomásával módosíthatja az értéket; RETURN elfogadja"
+
+#: LYMessages.c:600
+msgid "Error uncompressing temporary file!"
+msgstr "Hiba az átmeneti fájl kitömörítése közben!"
+
+#: LYMessages.c:601
+msgid "Unsupported URL scheme!"
+msgstr "Nem támogatott URL séma!"
+
+#: LYMessages.c:602
+msgid "Unsupported data: URL!  Use SHOWINFO, for now."
+msgstr "Nem támogatott adat: URL! Használja a SHOWINFO-t."
+
+#: LYMessages.c:603
+msgid "Redirection limit of 10 URL's reached."
+msgstr "Elértük a 10 URL-es átirányítási határt."
+
+#: LYMessages.c:604
+msgid "Illegal redirection URL received from server!"
+msgstr "Érvénytelen URL átirányítás érkezett a szervertõl!"
+
+#. #define SERVER_ASKED_FOR_REDIRECTION
+#: LYMessages.c:606
+#, c-format
+msgid "Server asked for %d redirection of POST content to"
+msgstr "A kiszolgáló %d átirányítást kért POST tartalommal"
+
+#: LYMessages.c:609
+msgid "P)roceed, use G)ET or C)ancel "
+msgstr "Folytatás (P), használjam a GET-et (G), vagy hagyjuk (C) "
+
+#: LYMessages.c:610
+msgid "P)roceed, or C)ancel "
+msgstr "Folytatás (P), vagy hagyjuk (C) "
+
+#. #define ADVANCED_POST_GET_REDIRECT
+#: LYMessages.c:612
+msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
+msgstr "POST tartalmú átirányítás. Folytatás (P), nézzük az URL-t, használjam a GET-et (G), vagy mégsem (C)"
+
+#. #define ADVANCED_POST_REDIRECT
+#: LYMessages.c:614
+msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
+msgstr "POST tartalmú átirányítás. Folytatás (P), nézzük az URL-t, vagy mégsem (C)"
+
+#. #define CONFIRM_POST_RESUBMISSION
+#: LYMessages.c:616
+msgid "Document from Form with POST content.  Resubmit?"
+msgstr "Dokumentum ûrlap POST tartalommal. Újraküldés?"
+
+#. #define CONFIRM_POST_RESUBMISSION_TO
+#: LYMessages.c:618
+#, c-format
+msgid "Resubmit POST content to %s ?"
+msgstr "A POST tartalom újraküldése a %s-hez?"
+
+#. #define CONFIRM_POST_LIST_RELOAD
+#: LYMessages.c:620
+#, c-format
+msgid "List from document with POST data.  Reload %s ?"
+msgstr "A dokumentum listázása POST adatokkal. %s újratöltése?"
+
+#. #define CONFIRM_POST_DOC_HEAD
+#: LYMessages.c:622
+msgid "Document from POST action, HEAD may not be understood.  Proceed?"
+msgstr "POST mûveletbõl dokumentum, a HEAD nem értelmezhetõ. Tovább?"
+
+#. #define CONFIRM_POST_LINK_HEAD
+#: LYMessages.c:624
+msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
+msgstr "Az ûrlap kitöltése POST mûvelet, a HEAD nem értelmezhetõ. Tovább?"
+
+#: LYMessages.c:625
+msgid "Proceed without a username and password?"
+msgstr "Tovább felhasználónév és jelszó nélkül?"
+
+#: LYMessages.c:626
+#, c-format
+msgid "Proceed (%s)?"
+msgstr "Tovább (%s)?"
+
+#: LYMessages.c:627
+msgid "Cannot POST to this host."
+msgstr "Nem lehet ezen a kiszolgálón POST mûveletet végrehajtani."
+
+#: LYMessages.c:628
+msgid "POST not supported for this URL - ignoring POST data!"
+msgstr "A POST nincs támogatva ezen az URL-en - a POST adatok eldobása!"
+
+#: LYMessages.c:629
+msgid "Discarding POST data..."
+msgstr "POST adatok eldobása."
+
+#: LYMessages.c:630
+msgid "Document will not be reloaded!"
+msgstr "A dokumentum nem lesz újratöltve!"
+
+#: LYMessages.c:631
+msgid "Location: "
+msgstr "Hely: "
+
+#: LYMessages.c:632
+#, c-format
+msgid "'%s' not found!"
+msgstr "'%s' nem található!"
+
+#: LYMessages.c:633
+msgid "Default Bookmark File"
+msgstr "Alapértelmezett könyvjelzõ-fájl"
+
+#: LYMessages.c:634
+msgid "Screen too small! (8x35 min)"
+msgstr "A képernyõ túl kicsi (8x35 a minimum)"
+
+#: LYMessages.c:635
+msgid "Select destination or ^G to Cancel: "
+msgstr "Válasszon célt vagy ^G-vel vissza: "
+
+#. #define MULTIBOOKMARKS_SELECT
+#: LYMessages.c:637
+msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
+msgstr "Segédkönyvjelzõ kiválasztása, '=': menü, vagy a ^G-vel vissza: "
+
+#. #define MULTIBOOKMARKS_SELF
+#: LYMessages.c:639
+msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
+msgstr "Lemásolja a hivatkozást (L) ebbe a könyvjelzõ-fájlba, vagy mégsem (C): "
+
+#: LYMessages.c:640
+msgid "Multiple bookmark support is not available."
+msgstr "Többszörös könyvjelzõ-támogatás nem áll rendelkezésre."
+
+#: LYMessages.c:641
+#, c-format
+msgid " Select Bookmark (screen %d of %d)"
+msgstr "Könyvjelzõ kiválasztása (%d. képernyõ, összesen %d)"
+
+#: LYMessages.c:642
+msgid "       Select Bookmark"
+msgstr "      Könyvjelzõ kiválasztása"
+
+#. #define MULTIBOOKMARKS_EHEAD_MASK
+#: LYMessages.c:644
+#, c-format
+msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
+msgstr "Könyvjelzõ leírás és útvonal szerkesztése (2-bõl %d)"
+
+#. #define MULTIBOOKMARKS_EHEAD
+#: LYMessages.c:646
+msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
+msgstr "            Könyvjelzõ leírás és útvonal szerkesztése"
+
+#: LYMessages.c:647
+msgid "Letter: "
+msgstr "Betû: "
+
+#. #define USE_PATH_OFF_HOME
+#: LYMessages.c:650
+msgid "Use a filepath off your login directory in SHELL syntax!"
+msgstr "Használja a belépési könyvtár útvonalát parancsértelmezõ stílusban!"
+
+#: LYMessages.c:652
+msgid "Use a filepath off your home directory!"
+msgstr "Használja a HOME könyvtártól az útvonalat!"
+
+#. #define MAXLINKS_REACHED
+#: LYMessages.c:655
+msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
+msgstr "Elértük az oldalankénti maximális hivatkozások számát! Használjon fél oldalt vagy kétsoros görgetést."
+
+#. #define MAXHIST_REACHED
+#: LYMessages.c:657
+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."
+
+#: LYMessages.c:658
+msgid "No previously visited links available!"
+msgstr "Nem áll rendelkezésre meglátogatott hivatkozás!"
+
+#: LYMessages.c:659
+msgid "Memory exhausted!  Program aborted!"
+msgstr "A memória kimerült! A program megszakítva!"
+
+#: LYMessages.c:660
+msgid "Memory exhausted!  Aborting..."
+msgstr "A memória kimerült! Megszakítás..."
+
+#: LYMessages.c:661
+msgid "Not enough memory!"
+msgstr "Nincs elég memória!"
+
+#: LYMessages.c:662
+msgid "Directory/File Manager not available"
+msgstr "Könyvtár- vagy fájlkezelõprogram nem elérhetõ"
+
+#: LYMessages.c:663
+msgid "HREF in BASE tag is not an absolute URL."
+msgstr "A HREF a BASE tagban nem egy abszolút URL."
+
+#: LYMessages.c:664
+msgid "Location URL is not absolute."
+msgstr "Az URL nem abszolút."
+
+#: LYMessages.c:665
+msgid "Refresh URL is not absolute."
+msgstr "A frissítési URL nem abszolút."
+
+#. #define SENDING_MESSAGE_WITH_BODY_TO
+#: LYMessages.c:667
+msgid ""
+"You are sending a message with body to:\n"
+"  "
+msgstr ""
+"Ön egy üzenet küld ide:\n"
+"  "
+
+#: LYMessages.c:668
+msgid ""
+"You are sending a comment to:\n"
+"  "
+msgstr ""
+"Ön egy megjegyzést küld ide:\n"
+"  "
+
+#: LYMessages.c:669
+msgid ""
+"\n"
+" With copy to:\n"
+"  "
+msgstr ""
+"\n"
+" Másolat neki:\n"
+"  "
+
+#: LYMessages.c:670
+msgid ""
+"\n"
+" With copies to:\n"
+"  "
+msgstr ""
+"\n"
+" Másolatok nekik:\n"
+"  "
+
+#. #define CTRL_G_TO_CANCEL_SEND
+#: LYMessages.c:672
+msgid ""
+"\n"
+"\n"
+"Use Ctrl-G to cancel if you do not want to send a message\n"
+msgstr ""
+"\n"
+"\n"
+"Használja a Ctrl G-t a megszakításhoz, ha mégsem akar üzenetet küldeni\n"
+
+#. #define ENTER_NAME_OR_BLANK
+#: LYMessages.c:674
+msgid ""
+"\n"
+" Please enter your name, or leave it blank to remain anonymous\n"
+msgstr ""
+"\n"
+" Kérem írja be a nevét, vagy hagyja üresen, ha névtelen akar maradni\n"
+
+#. #define ENTER_MAIL_ADDRESS_OR_OTHER
+#: LYMessages.c:676
+msgid ""
+"\n"
+" Please enter a mail address or some other\n"
+msgstr ""
+"\n"
+" Kérem írja ide az email címét, vagy más elérhetõségét\n"
+
+#. #define MEANS_TO_CONTACT_FOR_RESPONSE
+#: LYMessages.c:678
+msgid " means to contact you, if you desire a response.\n"
+msgstr " ahol kapcsolatba léphetnek önnel, ha választ vár.\n"
+
+#: LYMessages.c:679
+msgid ""
+"\n"
+" Please enter a subject line.\n"
+msgstr ""
+"\n"
+" Kérem írja be a levél tárgyát.\n"
+
+#. #define ENTER_ADDRESS_FOR_CC
+#: LYMessages.c:681
+msgid ""
+"\n"
+" Enter a mail address for a CC of your message.\n"
+msgstr ""
+"\n"
+" Írja be azt a címet, ahova szeretne az üzenetrõl másolatot küldeni.\n"
+
+#: LYMessages.c:682
+msgid " (Leave blank if you don't want a copy.)\n"
+msgstr " (Hagyja üresen, ha nem akar másolatot.)\n"
+
+#: LYMessages.c:683
+msgid ""
+"\n"
+" Please review the message body:\n"
+"\n"
+msgstr ""
+"\n"
+" Kérem nézze át az üzenet szövegét:\n"
+"\n"
+
+#: LYMessages.c:684
+msgid ""
+"\n"
+"Press RETURN to continue: "
+msgstr ""
+"\n"
+"Nyomjon RETURN-t a folytatáshoz: "
+
+#: LYMessages.c:685
+msgid ""
+"\n"
+"Press RETURN to clean up: "
+msgstr ""
+"\n"
+"Nyomjon RETURN-t a törléshez: "
+
+#: LYMessages.c:686
+msgid " Use Control-U to erase the default.\n"
+msgstr " Használja a Control-U -t a teljes törléshez\n"
+
+#: LYMessages.c:687
+msgid ""
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+" Ide írhatja az üzenet szövegét."
+
+#. #define ENTER_PERIOD_WHEN_DONE_A
+#: LYMessages.c:689 src/LYNews.c:361
+msgid ""
+"\n"
+" When you are done, press enter and put a single period (.)"
+msgstr ""
+"\n"
+" Mikor kész, nyomjon ENTER-t, és egy üres sorba írjon pontot (.)"
+
+#. #define ENTER_PERIOD_WHEN_DONE_B
+#: LYMessages.c:691 src/LYNews.c:362
+msgid ""
+"\n"
+" on a line and press enter again."
+msgstr ""
+"\n"
+" egy sorban nyomjon újból ENTER-t."
+
+#. Cookies messages
+#. #define ADVANCED_COOKIE_CONFIRMATION
+#: LYMessages.c:695
+#, c-format
+msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
+msgstr "%s süti: %.*s=%.*s  Engedjük? (Igen/Nem/Mindig/Soha)"
+
+#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
+#: LYMessages.c:697
+#, c-format
+msgid "Accept invalid cookie domain=%s for '%s'?"
+msgstr "Elfogadjuk az érvénytelen süti tartományt=%s %s-nek?"
+
+#. #define INVALID_COOKIE_PATH_CONFIRMATION
+#: LYMessages.c:699
+#, c-format
+msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
+msgstr "Elfogadjuk az érvénytelen süti útvonalat=%s, mint '%s' elõtétjét?"
+
+#: LYMessages.c:700
+msgid "Allowing this cookie."
+msgstr "A süti elfogadása."
+
+#: LYMessages.c:701
+msgid "Rejecting this cookie."
+msgstr "A süti elutasítása."
+
+#: LYMessages.c:702
+msgid "The Cookie Jar is empty."
+msgstr "A sütis tálca üres."
+
+#. #define ACTIVATE_TO_GOBBLE
+#: LYMessages.c:704
+msgid "Activate links to gobble up cookies or entire domains,"
+msgstr "A hivatkozás aktiválásával felfalhatja a sütiket vagy teljes tartományokat,"
+
+#: LYMessages.c:705
+msgid "or to change a domain's 'allow' setting."
+msgstr "vagy módosíthatja a tartomány 'engedélyezési' beállítását."
+
+#: LYMessages.c:706
+msgid "(Cookies never allowed.)"
+msgstr "(Sütiket soha nem engedélyezi.)"
+
+#: LYMessages.c:707
+msgid "(Cookies always allowed.)"
+msgstr "(Sütiket mindig engedélyezi.)"
+
+#: LYMessages.c:708
+msgid "(Cookies allowed via prompt.)"
+msgstr "(Sütiket csak rákérdezés után engedélyezi.)"
+
+#: LYMessages.c:709
+msgid "(Persistent Cookies.)"
+msgstr "(Állandó sütik.)"
+
+#: LYMessages.c:710
+msgid "(No title.)"
+msgstr "(Nincs cím)"
+
+#: LYMessages.c:711
+msgid "(No name.)"
+msgstr "(Nincs név.)"
+
+#: LYMessages.c:712
+msgid "(No value.)"
+msgstr "(Nincs érték.)"
+
+#: LYMessages.c:713
+msgid "None"
+msgstr "Nincs"
+
+#: LYMessages.c:714
+msgid "(End of session.)"
+msgstr "(Folyamat vége.)"
+
+#: LYMessages.c:715
+msgid "Delete this cookie?"
+msgstr "A süti törlése?"
+
+#: LYMessages.c:716
+msgid "The cookie has been eaten!"
+msgstr "A sütit megettük!"
+
+#: LYMessages.c:717
+msgid "Delete this empty domain?"
+msgstr "Töröljem ezt az üres tartományt?"
+
+#: LYMessages.c:718
+msgid "The domain has been eaten!"
+msgstr "A tartományt megettük!"
+
+#. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:720
+msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "A tartomány sütijeinek törlése (D), engedélyez mindig (A), kérdez (P), Soha (V), mégsem (C)?"
+
+#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:722
+msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "A tartomány törlése (D), engedélyez mindig (A), kérdez (P), Soha (V), mégsem (C)?"
+
+#: LYMessages.c:723
+msgid "All cookies in the domain have been eaten!"
+msgstr "Minden sütit megettünk ebben a tartományban!"
+
+#: LYMessages.c:724
+#, c-format
+msgid "'A'lways allowing from domain '%s'."
+msgstr "(A): Mindig engedélyezi a %s tartományt."
+
+#: LYMessages.c:725
+#, c-format
+msgid "ne'V'er allowing from domain '%s'."
+msgstr "(V): Soha nem engedélyezi a %s tartományt."
+
+#: LYMessages.c:726
+#, c-format
+msgid "'P'rompting to allow from domain '%s'."
+msgstr "(P): Rákérdez a %s tartomány engedélyezésére."
+
+#: LYMessages.c:727
+msgid "Delete all cookies in this domain?"
+msgstr "Töröljek minden sütit ebben a tartományban?"
+
+#: LYMessages.c:728
+msgid "All of the cookies in the jar have been eaten!"
+msgstr "Az összes sütit megettük errõl a tálcáról!"
+
+#: LYMessages.c:730
+msgid "Port 19 not permitted in URLs."
+msgstr "A 19-es port nem megengedett URL-ekben."
+
+#: LYMessages.c:731
+msgid "Port 25 not permitted in URLs."
+msgstr "A 25-ös port nem megengedett URL-ekben."
+
+#: LYMessages.c:732
+#, c-format
+msgid "Port %lu not permitted in URLs."
+msgstr "A %lu port nem megengedett URL-ekben."
+
+#: LYMessages.c:733
+msgid "URL has a bad port field."
+msgstr "Az URL-ben hibás a port beállítása."
+
+#: LYMessages.c:734
+msgid "Maximum nesting of HTML elements exceeded."
+msgstr "Túlléptük a maximálisan egymásba ágyazható HTML elemszámot."
+
+#: LYMessages.c:735
+msgid "Bad partial reference!  Stripping lead dots."
+msgstr "Hibás részleges hivatkozás! A soreleji pontokat elhagyom."
+
+#: LYMessages.c:736
+msgid "Trace Log open failed.  Trace off!"
+msgstr "A nyomozati napló megnyitása nem sikerült. Nyomozás kikapcsolva!"
+
+#: LYMessages.c:737
+msgid "Lynx Trace Log"
+msgstr "Lynx nyomozati napló"
+
+#: LYMessages.c:738
+msgid "No trace log has been started for this session."
+msgstr "Nincs nyomozati napló indítva ezen a folyamaton."
+
+#. #define MAX_TEMPCOUNT_REACHED
+#: LYMessages.c:740
+msgid "The maximum temporary file count has been reached!"
+msgstr "Elértük a maximális átmeneti fájlok számát!"
+
+#. #define FORM_VALUE_TOO_LONG
+#: LYMessages.c:742
+msgid "Form field value exceeds buffer length!  Trim the tail."
+msgstr "Az ûrlap mezõ értéke nagyobb, mint a puffer hossza! Megpróbálom levágni a végét."
+
+#. #define FORM_TAIL_COMBINED_WITH_HEAD
+#: LYMessages.c:744
+msgid "Modified tail combined with head of form field value."
+msgstr "A módosított véget kombináltam az ûrlapmezõ fejlécével."
+
+#. HTFile.c
+#: LYMessages.c:747
+msgid "Directory"
+msgstr "Könyvtár"
+
+#: LYMessages.c:748
+msgid "Directory browsing is not allowed."
+msgstr "A könyvtárak tallózása nincs engedélyezve."
+
+#: LYMessages.c:749
+msgid "Selective access is not enabled for this directory"
+msgstr "A válogatott elérés nincs engedélyezve ezen a könyvtáron"
+
+#: LYMessages.c:750
+msgid "Multiformat: directory scan failed."
+msgstr "Multiformat: a könyvtár vizsgálata sikertelen."
+
+#: LYMessages.c:751
+msgid "This directory is not readable."
+msgstr "Ez a könyvtár nem olvasható."
+
+#: LYMessages.c:752
+msgid "Can't access requested file."
+msgstr "Nem lehet elérni a kívánt fájlt."
+
+#: LYMessages.c:753
+msgid "Could not find suitable representation for transmission."
+msgstr "Nem találtam megfelelõ ábrázolást az átvitelre."
+
+#: LYMessages.c:754
+msgid "Could not open file for decompression!"
+msgstr "Nem lehet megnyitni a fájlt a kitömörítéshez!"
+
+#: LYMessages.c:755
+msgid "Files:"
+msgstr "Fájlok:"
+
+#: LYMessages.c:756
+msgid "Subdirectories:"
+msgstr "Alkönyvtárak:"
+
+#: LYMessages.c:757
+msgid " directory"
+msgstr " könyvtár"
+
+#: LYMessages.c:758
+msgid "Up to "
+msgstr "Fel "
+
+#: LYMessages.c:759
+msgid "Current directory is "
+msgstr "A jelenlegi könyvtár "
+
+#. HTGopher.c
+#: LYMessages.c:762
+msgid "No response from server!"
+msgstr "Nem válaszol a szerver!"
+
+#: LYMessages.c:763
+msgid "CSO index"
+msgstr "CSO index"
+
+#: LYMessages.c:764
+msgid ""
+"\n"
+"This is a searchable index of a CSO database.\n"
+msgstr ""
+"\n"
+"Ez egy CSO adatbázis kereshetõ indexe.\n"
+
+#: LYMessages.c:765
+msgid "CSO Search Results"
+msgstr "CSO Keresés eredménye"
+
+#: LYMessages.c:766
+#, c-format
+msgid "Seek fail on %s\n"
+msgstr "A keresés nem sikerült: %s\n"
+
+#: LYMessages.c:767
+msgid ""
+"\n"
+"Press the 's' key and enter search keywords.\n"
+msgstr ""
+"\n"
+"Nyomja le az 's' gombot, és írja be a keresendõ szavakat.\n"
+
+#: LYMessages.c:768
+msgid ""
+"\n"
+"This is a searchable Gopher index.\n"
+msgstr ""
+"\n"
+"Ez egy kereshetõ Gopher index.\n"
+
+#: LYMessages.c:769
+msgid "Gopher index"
+msgstr "Gopher index"
+
+#: LYMessages.c:770
+msgid "Gopher Menu"
+msgstr "Gopher menü"
+
+#: LYMessages.c:771
+msgid " Search Results"
+msgstr " A keresés eredménye"
+
+#: LYMessages.c:772
+msgid "Sending CSO/PH request."
+msgstr "CSO/PH kérés küldése."
+
+#: LYMessages.c:773
+msgid "Sending Gopher request."
+msgstr "Gopher kérés küldése."
+
+#: LYMessages.c:774
+msgid "CSO/PH request sent; waiting for response."
+msgstr "CSO/PH kérés elküldve; várakozás a válaszra."
+
+#: LYMessages.c:775
+msgid "Gopher request sent; waiting for response."
+msgstr "Gopher kérés elküldve; várakozás a válaszra."
+
+#: LYMessages.c:776
+msgid ""
+"\n"
+"Please enter search keywords.\n"
+msgstr ""
+"\n"
+"Írja be a keresendõ kulcsszavakat.\n"
+
+#: LYMessages.c:777
+msgid ""
+"\n"
+"The keywords that you enter will allow you to search on a"
+msgstr ""
+"\n"
+"A megadott kulcsszavak lehetõvé teszik a keresést egy"
+
+#: LYMessages.c:778
+msgid " person's name in the database.\n"
+msgstr " személy neve után az adatbázisban.\n"
+
+#. HTNews.c
+#: LYMessages.c:781
+msgid "Connection closed ???"
+msgstr "A kapcsolat bezáródott?"
+
+#: LYMessages.c:782
+msgid "Cannot open temporary file for news POST."
+msgstr "Nem sikerült az átmeneti fájl megnyitása a hírek postázásához."
+
+#: LYMessages.c:783
+msgid "This client does not contain support for posting to news with SSL."
+msgstr "Ez az ügyfél nem tartalmazza az SSL kapcsolaton keresztüli hírküldést."
+
+#. HTStyle.c
+#: LYMessages.c:786
+#, c-format
+msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
+msgstr "%d stílus `%s' SGML:%s. %s font %.1f pont.\n"
+
+#: LYMessages.c:787
+#, c-format
+msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
+msgstr "\tÖsszetevõk: elsõ=%.0f többi=%.0f, Magasság=%.1f Leírás=%.1f\n"
+
+#: LYMessages.c:788
+#, c-format
+msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
+msgstr "\tIgazítás=%d, %d tab (%.0f elõtte, %.0f mögötte)\n"
+
+#: LYMessages.c:789
+#, c-format
+msgid "\t\tTab kind=%d at %.0f\n"
+msgstr "\t\tTab típusa=%d a %.0f-nél\n"
+
+#. HTTP.c
+#: LYMessages.c:792
+msgid "Can't proceed without a username and password."
+msgstr "Nem lehet folytatni felhasználói név és jelszó nélkül."
+
+#: LYMessages.c:793
+msgid "Can't retry with authorization!  Contact the server's WebMaster."
+msgstr "Nem lehet újrapróbálni az azonosítást! Lépjen kapcsolatba a szerver webmesterével."
+
+#: LYMessages.c:794
+msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
+msgstr "Nem lehet újrapróbálni proxy felhatalmazást! Lépjen kapcsolatba a szerver webmesterével."
+
+#: LYMessages.c:795
+msgid "Retrying with proxy authorization information."
+msgstr "Újra próbálkozom a proxy felhatalmazási információval."
+
+#. HTWAIS.c
+#: LYMessages.c:798
+msgid "HTWAIS: Return message too large."
+msgstr "HTWAIS: A visszaadott üzenet túl nagy."
+
+#: LYMessages.c:799
+msgid "Enter WAIS query: "
+msgstr "Gépelje be a WAIS keresést: "
+
+#. Miscellaneous status
+#: LYMessages.c:802
+msgid "Retrying as HTTP0 request."
+msgstr "Újra próbálom HTTP0 kéréssel."
+
+#: LYMessages.c:803
+#, c-format
+msgid "Transferred %d bytes"
+msgstr "Továbbítva %d bájt"
+
+#: LYMessages.c:804
+msgid "Data transfer complete"
+msgstr "Adatátvitel kész"
+
+#: LYMessages.c:805
+#, c-format
+msgid "Error processing line %d of %s\n"
+msgstr "Hiba a feldolgozásban a %d. sorban (össz: %s)\n"
+
+#. Lynx internal page titles
+#: LYMessages.c:808
+msgid "Address List Page"
+msgstr "Címlista lap"
+
+#: LYMessages.c:809
+msgid "Bookmark file"
+msgstr "Könyvjelzõ fájl"
+
+#: LYMessages.c:810
+msgid "Configuration Definitions"
+msgstr "Beállítás meghatározásai"
+
+#: LYMessages.c:811
+msgid "Cookie Jar"
+msgstr "Sütis tálca"
+
+#: LYMessages.c:812
+msgid "Current Key Map"
+msgstr "Jelenlegi billentyûkiosztás"
+
+#: LYMessages.c:813
+msgid "File Management Options"
+msgstr "Fájlkezelési beállítások"
+
+#: LYMessages.c:814
+msgid "Download Options"
+msgstr "Letöltési beállítások"
+
+#: LYMessages.c:815
+msgid "History Page"
+msgstr "Elõzmények lap"
+
+#: LYMessages.c:816
+msgid "List Page"
+msgstr "Lista lap"
+
+#: LYMessages.c:817
+msgid "Lynx.cfg Information"
+msgstr "Lynx.cfg információ"
+
+#: LYMessages.c:818
+msgid "Converted Mosaic Hotlist"
+msgstr "Átalakított Mosaic gyorslista"
+
+#: LYMessages.c:819
+msgid "Options Menu"
+msgstr "Beállítások menü"
+
+#: LYMessages.c:820
+msgid "File Permission Options"
+msgstr "Fájl-jogok beállításai"
+
+#: LYMessages.c:821
+msgid "Printing Options"
+msgstr "Nyomtatási beállítások"
+
+#: LYMessages.c:822
+msgid "Information about the current document"
+msgstr "Információ az aktuális dokumentumról"
+
+#: LYMessages.c:823
+msgid "Your recent statusline messages"
+msgstr "A legutóbbi állapotsori üzenetek"
+
+#: LYMessages.c:824
+msgid "Upload Options"
+msgstr "Feltöltési beállítások"
+
+#: LYMessages.c:825
+msgid "Visited Links Page"
+msgstr "Látogatott linkek lapja"
+
+#. CONFIG_DEF_TITLE subtitles
+#: LYMessages.c:828
+msgid "See also"
+msgstr "Lásd még:"
+
+#: LYMessages.c:829
+msgid "your"
+msgstr "az ön"
+
+#: LYMessages.c:830
+msgid "for runtime options"
+msgstr "futásidejû beállítások"
+
+#: LYMessages.c:831
+msgid "compile time options"
+msgstr "programfordítási beállítások"
+
+#: LYMessages.c:832
+msgid "color-style configuration"
+msgstr "szín-stílus beállítása"
+
+#: LYMessages.c:833
+msgid "latest release"
+msgstr "A Lynx honlapja"
+
+#: LYMessages.c:834
+msgid "pre-release version"
+msgstr "A Lynx kiadás elõtti változata"
+
+#: LYMessages.c:835
+msgid "development version"
+msgstr "Fejlesztõi változat helye"
+
+#. #define AUTOCONF_CONFIG_CACHE
+#: LYMessages.c:837
+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 ""
+"A következõ adatok ennek a Lynx példánynak az automatikus konfigurációja/\n"
+"fordítása alatt készültek. Ha hibajelentést küld, kérem mellékeljen \n"
+"egy másolatot errõl az oldalról. (másolat: 'p' parancs)"
+
+#. #define AUTOCONF_LYNXCFG_H
+#: LYMessages.c:841
+msgid ""
+"The following data were used as automatically-configured compile-time\n"
+"definitions when this copy of Lynx was built."
+msgstr ""
+"A következõ adatok lettek felhasználva ennek a Lynx példánynak az automatikus\n"
+" konfigurálása során."
+
+#. #define DIRED_NOVICELINE
+#: LYMessages.c:846
+msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
+msgstr "Létrehoz (C), Letölt (D), Szerkeszt (E), Teljes menü (F), Módosít (M), Eltávolít (R), Jelöl (T), Feltölt (U)\n"
+
+#: LYMessages.c:847
+msgid "Failed to obtain status of current link!"
+msgstr "Nem sikerült megállapítani az aktuális link állapotát!"
+
+#. #define INVALID_PERMIT_URL
+#: LYMessages.c:850
+msgid "Special URL only valid from current File Permission menu!"
+msgstr "Speciális URL csak az aktuális Fájl-Jogok menübõl érvényes!"
+
+#: LYMessages.c:854
+msgid "External support is currently disabled."
+msgstr "A külsõ támogatás jelenleg le van tiltva."
+
+#. new with 2.8.4dev.21
+#: LYMessages.c:858
+msgid "Changing working-directory is currently disabled."
+msgstr "A munkakönyvtár váltás most le van tiltva."
+
+#: LYMessages.c:859
+msgid "Linewrap OFF!"
+msgstr "Sortörés KI!"
+
+#: LYMessages.c:860
+msgid "Linewrap ON!"
+msgstr "Sortörés BE!"
+
+#: LYMessages.c:861
+msgid "Parsing nested-tables toggled OFF!  Reloading..."
+msgstr "Egymásba ágyazott táblázatok kikapcsolva! Újratöltés..."
+
+#: LYMessages.c:862
+msgid "Parsing nested-tables toggled ON!  Reloading..."
+msgstr "Egymásba ágyazott táblázatok bekapcsolva! Újratöltés..."
+
+#: LYMessages.c:863
+msgid "Shifting is disabled while line-wrap is in effect"
+msgstr "Az eltolás le van tiltva a sortörés alatt"
+
+#: LYMessages.c:864
+msgid "Trace not supported"
+msgstr "A nyomozás nincs támogatva"
+
+#: WWW/Library/Implementation/HTAABrow.c:647
+#, c-format
+msgid "Username for '%s' at %s '%s%s':"
+msgstr "'%s' %s '%s%s' felhasználónév:"
+
+#: WWW/Library/Implementation/HTAABrow.c:913
+msgid "This client doesn't know how to compose proxy authorization information for scheme"
+msgstr "Ez a program nem tudja, hogyan kell összeállítani proxy jogosultságot ehhez a sémához"
+
+#: WWW/Library/Implementation/HTAABrow.c:988
+msgid "This client doesn't know how to compose authorization information for scheme"
+msgstr "Ez az ügyfél nem tudja, hogyan kell összeállítani jogosultságot ehhez a sémához"
+
+#: WWW/Library/Implementation/HTAABrow.c:1096
+#, c-format
+msgid "Invalid header '%s%s%s%s%s'"
+msgstr "Helytelen fejléc: '%s%s%s%s%s'"
+
+#: WWW/Library/Implementation/HTAABrow.c:1200
+msgid "Proxy authorization required -- retrying"
+msgstr "Proxy felhatalmazás szükséges -- újra"
+
+#: WWW/Library/Implementation/HTAABrow.c:1259
+msgid "Access without authorization denied -- retrying"
+msgstr "Felhatalmazás nélküli elérés megtagadva -- újra"
+
+#: WWW/Library/Implementation/HTAccess.c:677
+msgid "Access forbidden by rule"
+msgstr "Az elérést szabály tiltja"
+
+#: WWW/Library/Implementation/HTAccess.c:779
+msgid "Document with POST content not found in cache.  Resubmit?"
+msgstr "POST tartalommal rendelkezõ dokumentum nem található a gyorstárban. Újratöltsem?"
+
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
+msgid "Loading incomplete."
+msgstr "A betöltés nem teljes."
+
+#: WWW/Library/Implementation/HTAccess.c:1077
+msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
+msgstr "**** HTAccess: elavult betöltési rutin által adott socket vagy fájl szám!\n"
+
+#: WWW/Library/Implementation/HTAccess.c:1079
+msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
+msgstr "**** HTaccess: Belsõ programhiba. Kérem írjon egy emailt a lynx-dev@sig.net címre (angolul)!\n"
+
+#: WWW/Library/Implementation/HTAccess.c:1080
+#, c-format
+msgid "**** HTAccess: Status returned was: %d\n"
+msgstr "**** HTAccess: Visszatérési állapot: %d\n"
+
+#.
+#. * hack: if we fail in HTAccess.c
+#. * avoid duplicating URL, oh.
+#.
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
+msgid "Can't Access"
+msgstr "Nem lehet elérni"
+
+#: WWW/Library/Implementation/HTAccess.c:1094
+msgid "Unable to access document."
+msgstr "Nem lehet elérni a dokumentumot."
+
+#: WWW/Library/Implementation/HTFTP.c:766
+#, c-format
+msgid "Enter password for user %s@%s:"
+msgstr "Kérem a %s@%s felhasználó jelszavát:"
+
+#: WWW/Library/Implementation/HTFTP.c:794
+msgid "Unable to connect to FTP host."
+msgstr "Nem lehet kapcsolódni az FTP kiszolgálóhoz."
+
+#: WWW/Library/Implementation/HTFTP.c:1064
+msgid "close master socket"
+msgstr "a fõ socket bezárása"
+
+#: WWW/Library/Implementation/HTFTP.c:1126
+msgid "socket for master socket"
+msgstr "socket a fõ-socket-hez"
+
+#.
+#. **  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:1640 WWW/Library/Implementation/HTFTP.c:2261
+msgid "Symbolic Link"
+msgstr "Szimbolikus hivatkozás"
+
+#: WWW/Library/Implementation/HTFTP.c:2622
+msgid "Receiving FTP directory."
+msgstr "FTP könyvtár fogadása."
+
+#: WWW/Library/Implementation/HTFTP.c:2762
+#, c-format
+msgid "Transferred %d bytes (%5d)"
+msgstr "Letöltve: %d bájt (%5d)"
+
+#: WWW/Library/Implementation/HTFTP.c:3083
+msgid "connect for data"
+msgstr "kapcsolás az adatért"
+
+#: WWW/Library/Implementation/HTFTP.c:3731
+msgid "Receiving FTP file."
+msgstr "FTP fájl fogadása."
+
+#: WWW/Library/Implementation/HTFinger.c:278
+msgid "Could not set up finger connection."
+msgstr "Nem lehet finger csatlakozást felépíteni."
+
+#: WWW/Library/Implementation/HTFinger.c:325
+msgid "Could not load data (no sitename in finger URL)"
+msgstr "Nem lehet betölteni az adatokat (nincs megadva webhely a finger URL-ben)"
+
+#: WWW/Library/Implementation/HTFinger.c:331
+msgid "Invalid port number - will only use port 79!"
+msgstr "Érvénytelen port szám - csak a 79-es port lesz használva!"
+
+#: WWW/Library/Implementation/HTFinger.c:396
+msgid "Could not access finger host."
+msgstr "Nem lehet elérni a finger gazdagépet."
+
+#: WWW/Library/Implementation/HTFinger.c:404
+msgid "No response from finger server."
+msgstr "Nem válaszol a finger szerver."
+
+#: WWW/Library/Implementation/HTNews.c:372
+#, c-format
+msgid "Username for news host '%s':"
+msgstr "Felhasználónév a(z) '%s' hírszolgáltatóhoz:"
+
+#: WWW/Library/Implementation/HTNews.c:425
+msgid "Change username?"
+msgstr "Felhasználónév módosítása?"
+
+#: WWW/Library/Implementation/HTNews.c:429
+msgid "Username:"
+msgstr "Felhasználói név:"
+
+#: WWW/Library/Implementation/HTNews.c:453
+#, c-format
+msgid "Password for news host '%s':"
+msgstr "Jelszó a(z) '%s' hírszolgáltatóhoz:"
+
+#: WWW/Library/Implementation/HTNews.c:536
+msgid "Change password?"
+msgstr "Jelszó módosítása?"
+
+#: WWW/Library/Implementation/HTNews.c:1690
+#, c-format
+msgid "No matches for: %s"
+msgstr "Nincs illeszkedés: %s"
+
+#: WWW/Library/Implementation/HTNews.c:1743
+msgid ""
+"\n"
+"No articles in this group.\n"
+msgstr ""
+"\n"
+"Nincs cikk ebben csoportban.\n"
+
+#: WWW/Library/Implementation/HTNews.c:1756
+msgid ""
+"\n"
+"No articles in this range.\n"
+msgstr ""
+"\n"
+"Nincs cikk ebben tartományban.\n"
+
+#.
+#. **	Set window title.
+#.
+#: WWW/Library/Implementation/HTNews.c:1769
+#, c-format
+msgid "%s,  Articles %d-%d"
+msgstr "%s, Cikk: %d-%d"
+
+#: WWW/Library/Implementation/HTNews.c:1791
+msgid "Earlier articles"
+msgstr "Korábbi cikkek"
+
+#: WWW/Library/Implementation/HTNews.c:1804
+#, c-format
+msgid ""
+"\n"
+"There are about %d articles currently available in %s, IDs as follows:\n"
+"\n"
+msgstr ""
+"\n"
+"Körülbelül %d cikk van itt: %s, a következõ azonosítókkal:\n"
+"\n"
+
+#: WWW/Library/Implementation/HTNews.c:1864
+msgid "All available articles in "
+msgstr "Minden rendelkezésre álló cikk "
+
+#: WWW/Library/Implementation/HTNews.c:2080
+msgid "Later articles"
+msgstr "Újabb cikkek"
+
+#: WWW/Library/Implementation/HTNews.c:2104
+msgid "Post to "
+msgstr "Cikk írása "
+
+#: WWW/Library/Implementation/HTNews.c:2322
+msgid "This client does not contain support for SNEWS URLs."
+msgstr "Ez az ügyfél nem támogatja az SNEWS URL-eket."
+
+#: WWW/Library/Implementation/HTNews.c:2530
+msgid "No target for raw text!"
+msgstr "Nincs cél a nyers szöveghez!"
+
+#: WWW/Library/Implementation/HTNews.c:2560
+msgid "Connecting to NewsHost ..."
+msgstr "Kapcsolódás NewsHost-hoz..."
+
+#: WWW/Library/Implementation/HTNews.c:2611
+#, c-format
+msgid "Could not access %s."
+msgstr "Nem lehet elérni %s-t."
+
+#: WWW/Library/Implementation/HTNews.c:2711
+#, c-format
+msgid "Can't read news info.  News host %.20s responded: %.200s"
+msgstr "Nem lehet olvasni a hír információkat. A %.20s hírszolgáltató válasza: %.200s"
+
+#: WWW/Library/Implementation/HTNews.c:2715
+#, c-format
+msgid "Can't read news info, empty response from host %s"
+msgstr "Nem lehet olvasni a hír információkat. A %s hírszolgáltató üres választ adott"
+
+#.
+#. **	List available newsgroups. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2919
+msgid "Reading list of available newsgroups."
+msgstr "A rendelkezésre álló hírcsoportok olvasása."
+
+#: WWW/Library/Implementation/HTNews.c:2941
+msgid "Reading list of articles in newsgroup."
+msgstr "A hírlista olvasása a hírcsoportból."
+
+#.
+#. **	Get an article from a news group. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2947
+msgid "Reading news article."
+msgstr "Cikk olvasása."
+
+#: WWW/Library/Implementation/HTNews.c:2977
+msgid "Sorry, could not load requested news."
+msgstr "Sajnálom, nem tudom betölteni a hírt."
+
+#: WWW/Library/Implementation/HTTCP.c:1239
+msgid "Address has invalid port"
+msgstr "A címben érvénytelen a port"
+
+#: WWW/Library/Implementation/HTTCP.c:1327
+msgid "Address length looks invalid"
+msgstr "A cím hosszúsága érvénytelen"
+
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
+#, c-format
+msgid "Unable to locate remote host %s."
+msgstr "Nem találom a %s távoli számítógépet."
+
+#. 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:1575 WWW/Library/Implementation/HTTelnet.c:103
+#, c-format
+msgid "Invalid hostname %s"
+msgstr "A %s helytelen gépnév"
+
+#: WWW/Library/Implementation/HTTCP.c:1589
+#, c-format
+msgid "Making %s connection to %s"
+msgstr "%s csatlakozás létrehozása ide: %s"
+
+#: WWW/Library/Implementation/HTTCP.c:1605
+#, c-format
+msgid "socket failed: family %d addr %s port %s."
+msgstr "socket sérült: család: %d cím: %s port: %s."
+
+#: WWW/Library/Implementation/HTTCP.c:1614
+msgid "socket failed."
+msgstr "socket sérült."
+
+#: WWW/Library/Implementation/HTTCP.c:1634
+msgid "Could not make connection non-blocking."
+msgstr "Nem sikerült a nem blokkolt csatlakozás."
+
+#: WWW/Library/Implementation/HTTCP.c:1703
+msgid "Connection failed (too many retries)."
+msgstr "A kapcsolat sikertelen (túl sok próbálkozás)."
+
+#: WWW/Library/Implementation/HTTCP.c:1896
+msgid "Could not restore socket to blocking."
+msgstr "Nem lehet visszaállítani az illesztõpontot blokkosra."
+
+#: WWW/Library/Implementation/HTTCP.c:1962
+msgid "Socket read failed for 180,000 tries."
+msgstr "Az illesztõpont 180.000 olvasás után is sikertelen."
+
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr "A cím felhasználói nevet tartalmaz: %s"
+
+#: WWW/Library/Implementation/HTTP.c:503
+msgid "This client does not contain support for HTTPS URLs."
+msgstr "Ez az ügyfél nem támogatja a HTTPS URL-eket."
+
+#: WWW/Library/Implementation/HTTP.c:528
+msgid "Unable to connect to remote host."
+msgstr "Nem lehet kapcsolódni a távoli számítógéphez."
+
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr "Újbóli csatlakozás TLS nélkül."
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr "SSL hiba: nem található azonos név a bizonyítványban - folytatjuk?"
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr "SSL hiba:host(%s)!=cert(%s)-Tovább?"
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr "Biztonságos %d-bit %s (%s) HTTP csatlakozás"
+
+#: WWW/Library/Implementation/HTTP.c:1091
+msgid "Sending HTTP request."
+msgstr "HTTP kérés küldése."
+
+#: WWW/Library/Implementation/HTTP.c:1125
+msgid "Unexpected network write error; connection aborted."
+msgstr "Váratlan hálózati írási hiba; a csatlakozás megszakítva."
+
+#: WWW/Library/Implementation/HTTP.c:1131
+msgid "HTTP request sent; waiting for response."
+msgstr "HTTP kérés elküldve, várakozás a válaszra."
+
+#: WWW/Library/Implementation/HTTP.c:1195
+msgid "Unexpected network read error; connection aborted."
+msgstr "Váratlan hálózati olvasási hiba, a csatlakozás megszakítva."
+
+#.
+#. **	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:1391
+msgid "Got unexpected Informational Status."
+msgstr "Váratlan tájékoztatást kaptam az állapotról."
+
+#.
+#. *  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:1426
+msgid "Request fulfilled.  Reset Content."
+msgstr "Kérés teljesítve. Állítsa vissza a tartalmat."
+
+#. 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:1545
+msgid "Got unexpected 304 Not Modified status."
+msgstr "Váratlan 304-es hiba: Nem lett módosítva az állapot."
+
+#: WWW/Library/Implementation/HTTP.c:1612
+msgid "Redirection of POST content requires user approval."
+msgstr "A POST tartalom átirányításához felhasználói engedély kell."
+
+#: WWW/Library/Implementation/HTTP.c:1627
+msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
+msgstr "POST tartalom. Az állandó átirányítást átmenetiként kezelem.\n"
+
+#: WWW/Library/Implementation/HTTP.c:1672
+msgid "Retrying with access authorization information."
+msgstr "Újra próbálom elérés felhatalmazási információval."
+
+#: WWW/Library/Implementation/HTTP.c:1684
+msgid "Show the 401 message body?"
+msgstr "Mutassam a 401-es üzenet szövegét?"
+
+#: WWW/Library/Implementation/HTTP.c:1729
+msgid "Show the 407 message body?"
+msgstr "Mutassam a 407-es üzenet szövegét?"
+
+#.
+#. **	Bad or unknown server_status number.
+#. **	Take a chance and hope there is
+#. **	something to display. - FM
+#.
+#: WWW/Library/Implementation/HTTP.c:1834
+msgid "Unknown status reply from server!"
+msgstr "A szerver válasza: Ismeretlen állapot!"
+
+#: WWW/Library/Implementation/HTTelnet.c:101
+#, c-format
+msgid "remote %s session:"
+msgstr "távoli %s folyamat:"
+
+#: WWW/Library/Implementation/HTWAIS.c:161
+msgid "Could not connect to WAIS server."
+msgstr "Nem lehet kapcsolódni WAIS szerverhez."
+
+#: WWW/Library/Implementation/HTWAIS.c:170
+msgid "Could not open WAIS connection for reading."
+msgstr "Nem lehet megnyitni WAIS csatlakozást az olvasáshoz."
+
+#: WWW/Library/Implementation/HTWAIS.c:194
+msgid "Diagnostic code is "
+msgstr "A diagnosztikai kód "
+
+#: WWW/Library/Implementation/HTWAIS.c:463
+msgid "Index "
+msgstr "Index "
+
+#: WWW/Library/Implementation/HTWAIS.c:467
+#, c-format
+msgid " contains the following %d item%s relevant to \""
+msgstr " tartalmazza a következõ %d elemet %s fontos \""
+
+#: WWW/Library/Implementation/HTWAIS.c:475
+msgid "The first figure after each entry is its relative score, "
+msgstr "Minden bejegyzés után álló elsõ számjegy egy arányos pontszám, "
+
+#: WWW/Library/Implementation/HTWAIS.c:476
+msgid "the second is the number of lines in the item."
+msgstr "a második a sorok száma a tételben."
+
+#: WWW/Library/Implementation/HTWAIS.c:517
+msgid " (bad file name)"
+msgstr " (hibás fájlnév)"
+
+#: WWW/Library/Implementation/HTWAIS.c:542
+msgid "(bad doc id)"
+msgstr "(hibás dok. azonosító)"
+
+#: WWW/Library/Implementation/HTWAIS.c:558
+msgid "(Short Header record, can't display)"
+msgstr "(Rövid fejléc-rekord, nem lehet megjeleníteni)"
+
+#: WWW/Library/Implementation/HTWAIS.c:565
+msgid ""
+"\n"
+"Long Header record, can't display\n"
+msgstr ""
+"\n"
+"Hosszú fejlécrekord, nem lehet megjeleníteni\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:572
+msgid ""
+"\n"
+"Text record\n"
+msgstr ""
+"\n"
+"Szöveg rekord\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:581
+msgid ""
+"\n"
+"Headline record, can't display\n"
+msgstr ""
+"\n"
+"Fejléc-rekord, nem lehet megjeleníteni\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:589
+msgid ""
+"\n"
+"Code record, can't display\n"
+msgstr ""
+"\n"
+"Kód rekord, nem lehet megjeleníteni\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:689
+msgid "Syntax error in WAIS URL"
+msgstr "Szintaktikai hiba a WAIS URL-ben"
+
+#: WWW/Library/Implementation/HTWAIS.c:759
+msgid " (WAIS Index)"
+msgstr " (WAIS Index)"
+
+#: WWW/Library/Implementation/HTWAIS.c:766
+msgid "WAIS Index: "
+msgstr "WAIS Index: "
+
+#: WWW/Library/Implementation/HTWAIS.c:772
+msgid "This is a link for searching the "
+msgstr "Ezt a hivatkozást keresem a "
+
+#: WWW/Library/Implementation/HTWAIS.c:776
+msgid " WAIS Index.\n"
+msgstr " WAIS Indexben.\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:803
+msgid ""
+"\n"
+"Enter the 's'earch command and then specify search words.\n"
+msgstr ""
+"\n"
+"Adjon ki keresés parancsot (S), és határozza meg a keresendõ szavakat.\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:825
+msgid " (in "
+msgstr " ("
+
+#: WWW/Library/Implementation/HTWAIS.c:834
+msgid "WAIS Search of \""
+msgstr "WAIS Keresés: \""
+
+#: WWW/Library/Implementation/HTWAIS.c:838
+msgid "\" in: "
+msgstr "\" itt: "
+
+#: WWW/Library/Implementation/HTWAIS.c:853
+msgid "HTWAIS: Request too large."
+msgstr "HTWAIS: A kérés túl nagy."
+
+#: WWW/Library/Implementation/HTWAIS.c:862
+msgid "Searching WAIS database..."
+msgstr "Keresés a WAIS adatbázisban..."
+
+#: WWW/Library/Implementation/HTWAIS.c:872
+msgid "Search interrupted."
+msgstr "A keresés megszakítva."
+
+#: WWW/Library/Implementation/HTWAIS.c:922
+msgid "Can't convert format of WAIS document"
+msgstr "Nem lehet átalakítani WAIS dokumentum formátumot"
+
+#: WWW/Library/Implementation/HTWAIS.c:966
+msgid "HTWAIS: Request too long."
+msgstr "HTWAIS: A kérés túl hosszú."
+
+#.
+#. **	Actually do the transaction given by request_message.
+#.
+#: WWW/Library/Implementation/HTWAIS.c:980
+msgid "Fetching WAIS document..."
+msgstr "WAIS dokumentum lehívása..."
+
+#. display_search_response(target, retrieval_response,
+#. wais_database, keywords);
+#: WWW/Library/Implementation/HTWAIS.c:1019
+msgid "No text was returned!\n"
+msgstr "Nem jött vissza szöveg!\n"
+
+#: WWW/Library/Implementation/HTWSRC.c:287
+msgid " NOT GIVEN in source file; "
+msgstr " NINCS MEGADVA a forrás fájlban, "
+
+#: WWW/Library/Implementation/HTWSRC.c:311
+msgid " WAIS source file"
+msgstr " WAIS forrás fájl"
+
+#: WWW/Library/Implementation/HTWSRC.c:318
+msgid " description"
+msgstr " leírás"
+
+#: WWW/Library/Implementation/HTWSRC.c:328
+msgid "Access links"
+msgstr "Hivatkozás elérése"
+
+#: WWW/Library/Implementation/HTWSRC.c:346
+msgid "Direct access"
+msgstr "Közvetlen elérés"
+
+#. * Proxy will be used if defined, so let user know that - FM *
+#: WWW/Library/Implementation/HTWSRC.c:349
+msgid " (or via proxy server, if defined)"
+msgstr " (vagy proxykiszolgálón keresztül, ha meg van adva)"
+
+#: WWW/Library/Implementation/HTWSRC.c:364
+msgid "Maintainer"
+msgstr "Karbantartó"
+
+#: WWW/Library/Implementation/HTWSRC.c:372
+msgid "Host"
+msgstr "Kiszolgáló"
+
+#: src/GridText.c:688
+msgid "Memory exhausted, display interrupted!"
+msgstr "A memória elfogyott, megjelenítés megszakítva!"
+
+#: src/GridText.c:693
+msgid "Memory exhausted, will interrupt transfer!"
+msgstr "A memória elfogyott, az átvitel meg lesz szakítva!"
+
+#: src/GridText.c:3578
+msgid " *** MEMORY EXHAUSTED ***"
+msgstr " *** A MEMÓRIA ELFOGYOTT ***"
+
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
+msgid "unknown field or link"
+msgstr "ismeretlen mezõ vagy hivatkozás"
+
+#: src/GridText.c:6023
+msgid "text entry field"
+msgstr "szöveg bejegyzés mezõ"
+
+#: src/GridText.c:6026
+msgid "password entry field"
+msgstr "jelszó bejegyzés mezõ"
+
+#: src/GridText.c:6029
+msgid "checkbox"
+msgstr "jelölõnégyzet"
+
+#: src/GridText.c:6032
+msgid "radio button"
+msgstr "választógomb"
+
+#: src/GridText.c:6035
+msgid "submit button"
+msgstr "küldõ gomb"
+
+#: src/GridText.c:6038
+msgid "reset button"
+msgstr "törlés gomb"
+
+#: src/GridText.c:6041
+msgid "popup menu"
+msgstr "felbukkanó menü"
+
+#: src/GridText.c:6044
+msgid "hidden form field"
+msgstr "rejtett ûrlap mezõ"
+
+#: src/GridText.c:6047
+msgid "text entry area"
+msgstr "szöveg bejegyzés terület"
+
+#: src/GridText.c:6050
+msgid "range entry field"
+msgstr "tartomány bejegyzés mezõ"
+
+#: src/GridText.c:6053
+msgid "file entry field"
+msgstr "fájl bejegyzés mezõ"
+
+#: src/GridText.c:6056
+msgid "text-submit field"
+msgstr "szöveg-küldõ mezõ"
+
+#: src/GridText.c:6059
+msgid "image-submit button"
+msgstr "kép-küldõ mezõ"
+
+#: src/GridText.c:6062
+msgid "keygen field"
+msgstr "kulcsgeneráló mezõ"
+
+#: src/GridText.c:6065
+msgid "unknown form field"
+msgstr "ismeretlen ûrlap mezõ"
+
+#: src/GridText.c:10066
+msgid "Can't open file for uploading"
+msgstr "Nem lehet megnyitni a fájlt a feltöltéshez"
+
+#: src/GridText.c:11218
+#, 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:12375
+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:12581
+msgid "Wrap lines to fit displayed area?"
+msgstr "Tördeljem a sorokat, hogy kiférjenek?"
+
+#: src/GridText.c:12633
+msgid "Very long lines have been wrapped!"
+msgstr "A hosszú sorokat tördeltem!"
+
+#: src/GridText.c:13079
+msgid "Very long lines have been truncated!"
+msgstr "A hosszú sorok végét levágtam!"
+
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
+msgid "bytes"
+msgstr "bájt"
+
+#: src/HTAlert.c:155
+msgid "KB"
+msgstr "kB"
+
+#: src/HTAlert.c:274
+#, c-format
+msgid "Read %s of %s of data"
+msgstr "Adat olvasása: %s (összesen: %s)"
+
+#: src/HTAlert.c:276
+#, c-format
+msgid "Read %s of data"
+msgstr "%s adat olvasása"
+
+#: src/HTAlert.c:281
+#, c-format
+msgid ", %s/sec"
+msgstr ", %s/sec"
+
+#: src/HTAlert.c:290
+#, c-format
+msgid " (stalled for %s)"
+msgstr " (megállt %s sec-ra)"
+
+#: src/HTAlert.c:294
+#, c-format
+msgid ", ETA %s"
+msgstr ", ETA %s sec"
+
+#: src/HTAlert.c:301
+msgid " (Press 'z' to abort)"
+msgstr " (Nyomja le a 'Z'-t a megszakításhoz)"
+
+#. 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:342 src/HTAlert.c:390
+msgid "yes"
+msgstr "igen"
+
+#: src/HTAlert.c:345 src/HTAlert.c:391
+msgid "no"
+msgstr "nem"
+
+#: src/HTML.c:5985
+msgid "Description:"
+msgstr "Leírás:"
+
+#: src/HTML.c:5990
+msgid "(none)"
+msgstr "(nincs)"
+
+#: src/HTML.c:5994
+msgid "Filepath:"
+msgstr "Útvonal:"
+
+#: src/HTML.c:5999
+msgid "(unknown)"
+msgstr "(ismeretlen)"
+
+#: src/HTML.c:7452
+msgid "Document has only hidden links.  Use the 'l'ist command."
+msgstr "(A dokumentum csak rejtett hivatkozásokat tartalmaz. Használja az 'L' parancsot."
+
+#: src/HTML.c:7958
+msgid "Source cache error - disk full?"
+msgstr "Forrás gyorstárazási hiba - a lemez megtelt?"
+
+#: src/HTML.c:7971
+msgid "Source cache error - not enough memory!"
+msgstr "Forrás gyorstárazási hiba - nincs elég memória!"
+
+#: src/LYBookmark.c:167
+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 ""
+"      Ez a fájl HTML ábrázolása egy X Mosaic gyorslista fájlnak.\n"
+"      A régi vagy érvénytelen hivatkozásokat törölheti\n"
+"      a könyvjelzõ eltávolítás paranccsal, ami általában az \n"
+"      'R' billentyû (lehet, hogy ez meg lett változtatva)."
+
+#: src/LYBookmark.c:379
+msgid ""
+"     You can delete links by the 'R' key<br>\n"
+"<ol>\n"
+msgstr ""
+"     A hivatkozásokat az 'R' billentyûvel törölheti<br>\n"
+"<ol>\n"
+
+#: src/LYBookmark.c:382
+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 ""
+"      A hivatkozásokat törölheti a könyvjelzõ eltávolítás paranccsal.\n"
+"      Ez általában a 'R' billentyû, de lehet, hogy ez meg lett változtatva."
+
+#: src/LYBookmark.c:386
+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 ""
+"     Ez a fájl szövegszerkesztõvel módosítható, törölhetõk a \n"
+"     régi vagy érvénytelen hivatkozások, vagy módosítható a sorrendjük."
+
+#: src/LYBookmark.c:389
+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 ""
+"Megjegyzés: ha ön ezt a fájlt kézzel szerkeszti,\n"
+"      nem szabad változtatnia a sor felépítésén, és\n"
+"      ne adjon hozzá más HTML tagot.\n"
+"      Gyõzõdjön meg róla, hogy minden hivatkozás egy sorban van."
+
+#: src/LYBookmark.c:681
+#, c-format
+msgid "File may be recoverable from %s during this session"
+msgstr "A fájl még helyreállítható innen: %s, ebben a folyamatban"
+
+#.
+#. *  Neither the path as given nor any components examined by
+#. *  backing up were stat()able. - kw
+#.
+#: src/LYCgi.c:231
+msgid "Unable to access cgi script"
+msgstr "Nem lehet elérni a cgi alkalmazói programot"
+
+#: src/LYCgi.c:654 src/LYCgi.c:657
+msgid "Good Advice"
+msgstr "Jó tanács"
+
+#: src/LYCgi.c:660
+msgid "An excellent http server for VMS is available via"
+msgstr "Egy kitûnõ http szerver VMS-hez rendelkezésre áll"
+
+#: src/LYCgi.c:667
+msgid "this link"
+msgstr "ezen a linken keresztül"
+
+#: src/LYCgi.c:671
+msgid "It provides state of the art CGI script support.\n"
+msgstr "Nagyon jól támogatja a CGI szkripteket.\n"
+
+#: src/LYClean.c:122
+msgid "Exiting via interrupt:"
+msgstr "Kilépés megszakításon keresztül:"
+
+#: src/LYCookie.c:2462
+msgid "(from a previous session)"
+msgstr "(egy elõzõ folyamatból)"
+
+#: src/LYCookie.c:2522
+msgid "Maximum Gobble Date:"
+msgstr "Maximális evési dátum:"
+
+#: src/LYCookie.c:2564
+msgid "Internal"
+msgstr "Belsõ"
+
+#: src/LYCookie.c:2565
+msgid "cookie_domain_flag_set error, aborting program"
+msgstr "cookie_domain_flag_set hiba, program megszakítva"
+
+#: src/LYCurses.c:1004
+msgid "Terminal initialisation failed - unknown terminal type?"
+msgstr "Terminál megnyitás sikertelen - ismeretlen terminál típus?"
+
+#: src/LYCurses.c:1426
+msgid "Terminal ="
+msgstr "Terminál ="
+
+#: src/LYCurses.c:1430
+msgid "You must use a vt100, 200, etc. terminal with this program."
+msgstr "Önnek vt100, 200 stb.-t kell használnia ehhez a programhoz."
+
+#: src/LYCurses.c:1480
+msgid "Your Terminal type is unknown!"
+msgstr "A terminál típus ismeretlen!"
+
+#: src/LYCurses.c:1481
+msgid "Enter a terminal type:"
+msgstr "Kérem a terminál típusát:"
+
+#: src/LYCurses.c:1495
+msgid "TERMINAL TYPE IS SET TO"
+msgstr "A TERMINÁL TÍPUS BEÁLLÍTVA:"
+
+#: src/LYCurses.c:1994
+#, c-format
+msgid ""
+"\n"
+"A Fatal error has occurred in %s Ver. %s\n"
+msgstr ""
+"\n"
+"Végzetes hiba lépett fel a %s %s verzióban\n"
+
+#: src/LYCurses.c:1996
+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"
+"Kérem beszéljem a rendszergazdájával, hogy ellenõrizze a hibát\n"
+"és ha õ megerõsítette, akkor küldjön egy jelentést a lynx-dev listára.\n"
+"A hibajelentésbe írja be a parancs leírását, melyik URL-el volt gond,\n"
+" az operációs rendszert verziószámmal együtt, a TCP/IP \n"
+"implementációt, hogyan hozta létre a hibát és minden egyéb fontos dolgot.\n"
+
+#: src/LYEdit.c:249
+msgid "Editor killed by signal"
+msgstr "Szerkesztõprogram kilõve:"
+
+#: src/LYEdit.c:251
+#, c-format
+msgid "Editor returned with error status, %s"
+msgstr "A szerkesztõprogram a következõ hibaállapottal tért vissza: %s"
+
+#: src/LYEdit.c:252
+msgid "reason unknown."
+msgstr "ok ismeretlen."
+
+#: src/LYDownload.c:517
+msgid "Downloaded link:"
+msgstr "Letöltött link:"
+
+#: src/LYDownload.c:522
+msgid "Suggested file name:"
+msgstr "Javasolt fájlnév:"
+
+#: src/LYDownload.c:527
+msgid "Standard download options:"
+msgstr "Alapvetõ letöltési beállítások:"
+
+#: src/LYDownload.c:528
+msgid "Download options:"
+msgstr "Letöltési beállítások:"
+
+#: src/LYDownload.c:544
+msgid "Save to disk"
+msgstr "Mentés lemezre"
+
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "A fájl nézése "
+
+#: src/LYDownload.c:565
+msgid "Save to disk disabled."
+msgstr "Mentés lemezre le van tiltva."
+
+#: src/LYDownload.c:569 src/LYPrint.c:1327
+msgid "Local additions:"
+msgstr "Helyi adalékok:"
+
+#: src/LYDownload.c:578 src/LYUpload.c:216
+msgid "No Name Given"
+msgstr "Nincs név megadva"
+
+#: src/LYHistory.c:657
+msgid "You selected:"
+msgstr "Kiválasztva:"
+
+#: src/LYHistory.c:681 src/LYHistory.c:921
+msgid "(no address)"
+msgstr "(nincs cím)"
+
+#: src/LYHistory.c:685
+msgid " (internal)"
+msgstr " (belsõ)"
+
+#: src/LYHistory.c:687
+msgid " (was internal)"
+msgstr "(belsõ volt)"
+
+#: src/LYHistory.c:785
+msgid " (From History)"
+msgstr " (Elõzményekbõl)"
+
+#: src/LYHistory.c:841
+msgid "You visited (POSTs, bookmark, menu and list files excluded):"
+msgstr "Ön itt volt (POST, könyvjelzõ, menü és listafájl kihagyva):"
+
+#: src/LYHistory.c:1137
+msgid "(No messages yet)"
+msgstr "(Még nincs üzenet)"
+
+#: src/LYLeaks.c:209
+msgid "Invalid pointer detected."
+msgstr "Helytelen mutatót észleltem."
+
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr "Sorozat:"
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
+msgid "Pointer:"
+msgstr "Mutató:"
+
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
+msgid "FileName:"
+msgstr "Fájlnév:"
+
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
+msgid "LineCount:"
+msgstr "Sorok száma:"
+
+#: src/LYLeaks.c:249
+msgid "Memory leak detected."
+msgstr "Memóriaszivárgást észleltem."
+
+#: src/LYLeaks.c:257
+msgid "Contains:"
+msgstr "Tartalom:"
+
+#: src/LYLeaks.c:270
+msgid "ByteSize:"
+msgstr "Bájtméret:"
+
+#: src/LYLeaks.c:284
+msgid "realloced:"
+msgstr "újra lefoglalva:"
+
+#: src/LYLeaks.c:307
+msgid "Total memory leakage this run:"
+msgstr "Teljes memóriaszivárgás ebben a futtatásban:"
+
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr "Lefoglalási csúcs"
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr "bájt lefoglalva"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr "Össz 'malloc'"
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr "Össz 'free'"
+
+#: src/LYList.c:85
+msgid "References in "
+msgstr "Hivatkozások itt: "
+
+#: src/LYList.c:86
+msgid "this document:"
+msgstr "ez a dokumentum:"
+
+#: src/LYList.c:92
+msgid "Visible links:"
+msgstr "Látható hivatkozás:"
+
+#: src/LYList.c:194 src/LYList.c:315
+msgid "Hidden links:"
+msgstr "Rejtett hivatkozás:"
+
+#: src/LYList.c:262
+msgid "References"
+msgstr "Hivatkozások"
+
+#: src/LYList.c:264
+msgid "Visible links"
+msgstr "Látható hivatkozás"
+
+#: src/LYLocal.c:267
+#, c-format
+msgid "Unable to get status of '%s'."
+msgstr "Nem lehet a %s állapotát meghatározni."
+
+#: src/LYLocal.c:301
+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:366
+#, c-format
+msgid "Unable to %s due to system error!"
+msgstr "A %s nem végrehajtható, rendszerhiba miatt!"
+
+#. error return
+#: src/LYLocal.c:400
+#, c-format
+msgid "Probable failure to %s due to system error!"
+msgstr "Valószínûleg megsérült a %s, rendszerhiba miatt!"
+
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "%s eltávolítása"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr "%s létrehozása"
+
+#: src/LYLocal.c:508
+#, c-format
+msgid "move %s to %s"
+msgstr "%s mozgatása ide: %s"
+
+#: src/LYLocal.c:548
+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:550
+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:552
+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:563
+msgid "Destination has different owner!  Request denied."
+msgstr "A célnak más a tulajdonosa! Kérés megtagadva."
+
+#: src/LYLocal.c:566
+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:588
+msgid "Remove all tagged files and directories?"
+msgstr "Minden megjelölt fájl és könyvtár eltávolítása?"
+
+#: src/LYLocal.c:647
+msgid "Enter new location for tagged items: "
+msgstr "Kérem az új helyét a megjelölt elemeknek: "
+
+#: src/LYLocal.c:716
+msgid "Path too long"
+msgstr "Az elérési út túl hosszú"
+
+#: src/LYLocal.c:747
+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:805
+msgid "Enter new name for directory: "
+msgstr "Kérem az új könyvtárnevet: "
+
+#: src/LYLocal.c:807
+msgid "Enter new name for file: "
+msgstr "Kérem az új fájlnevet: "
+
+#: src/LYLocal.c:819
+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:868
+msgid "Enter new location for directory: "
+msgstr "Kérem a könyvtár új helyét: "
+
+#: src/LYLocal.c:874
+msgid "Enter new location for file: "
+msgstr "Kérem a fájl új helyét: "
+
+#: src/LYLocal.c:901
+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:921
+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:970
+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:972
+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:1001
+msgid "This feature not yet implemented!"
+msgstr "Ez a képesség még nincs készen!"
+
+#: src/LYLocal.c:1019
+msgid "Enter name of file to create: "
+msgstr "Kérem a létrehozandó fájl nevét: "
+
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
+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:1061
+msgid "Enter name for new directory: "
+msgstr "Kérem az új könyvtár nevét: "
+
+#: src/LYLocal.c:1106
+msgid "Create file or directory (f or d): "
+msgstr "Fájl (F) vagy könyvtár (D) létrehozása: "
+
+#: src/LYLocal.c:1146
+#, c-format
+msgid "Remove '%s' and all of its contents?"
+msgstr "%s eltávolítása minden tartalmával együtt?"
+
+#: src/LYLocal.c:1149
+msgid "Remove directory and all of its contents?"
+msgstr "A könyvtár eltávolítása minden tartalmával együtt?"
+
+#: src/LYLocal.c:1153
+#, c-format
+msgid "Remove file '%s'?"
+msgstr "'%s' fájl eltávolítása?"
+
+#: src/LYLocal.c:1155
+msgid "Remove file?"
+msgstr "Fájl eltávolítása?"
+
+#: src/LYLocal.c:1160
+#, c-format
+msgid "Remove symbolic link '%s'?"
+msgstr "Eltávolítsam a %s szimbolikus hivatkozást?"
+
+#: src/LYLocal.c:1162
+msgid "Remove symbolic link?"
+msgstr "Eltávolítsam a szimbolikus hivatkozást?"
+
+#: src/LYLocal.c:1248
+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:1278
+msgid "Unable to open permit options file"
+msgstr "Nem lehet megnyitni az engedély beállítások fájlt"
+
+#: src/LYLocal.c:1305
+msgid "Specify permissions below:"
+msgstr "Adja meg a jogosultságokat:"
+
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
+msgid "Owner:"
+msgstr "Tulajdonos:"
+
+#: src/LYLocal.c:1322
+msgid "Group"
+msgstr "Csoport"
+
+#: src/LYLocal.c:1338
+msgid "Others:"
+msgstr "A többiek:"
+
+#: src/LYLocal.c:1356
+msgid "form to permit"
+msgstr "engedélyezve"
+
+#: src/LYLocal.c:1452
+msgid "Invalid mode format."
+msgstr "Érvénytelen mód formátum."
+
+#: src/LYLocal.c:1456
+msgid "Invalid syntax format."
+msgstr "Érvénytelen szintaktika."
+
+#: src/LYLocal.c:1645
+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:1825
+msgid "NULL URL pointer"
+msgstr "ÜRES URL mutató"
+
+#: src/LYLocal.c:1908
+#, c-format
+msgid "Executing %s "
+msgstr "%s futtatása "
+
+#: src/LYLocal.c:1911
+msgid "Executing system command. This might take a while."
+msgstr "Rendszerparancs végrehajtása. Ez eltarthat egy ideig."
+
+#: src/LYLocal.c:1985
+msgid "Current directory:"
+msgstr "Aktuális könyvtár:"
+
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
+msgid "Current selection:"
+msgstr "Jelenlegi kiválasztás:"
+
+#: src/LYLocal.c:1992
+msgid "Nothing currently selected."
+msgstr "Semmi nincs kiválasztva."
+
+#: src/LYLocal.c:2007
+msgid "tagged item:"
+msgstr "jelölt elem:"
+
+#: src/LYLocal.c:2007
+msgid "tagged items:"
+msgstr "jelölt elemek:"
+
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
+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:2213 src/LYLocal.c:2271
+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:2267
+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:2276
+msgid "Just a moment, ..."
+msgstr "Egy pillanat, ..."
+
+#: src/LYLocal.c:2293
+msgid "Error buiding install args"
+msgstr "Hiba a telepítési paraméterek létrehozása során"
+
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
+#, c-format
+msgid "Source and target are the same: %s"
+msgstr "A forrás és a cél ugyanaz: %s"
+
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
+#, c-format
+msgid "Already in target directory: %s"
+msgstr "Már a cél könyvtárban van: %s"
+
+#: src/LYLocal.c:2362
+msgid "Installation complete"
+msgstr "Telepítés kész"
+
+#: src/LYLocal.c:2551
+msgid "Temporary URL or list would be too long."
+msgstr "Az átmeneti URL vagy lista túl hosszú."
+
+#: src/LYMail.c:534
+msgid "Sending"
+msgstr "Küldés"
+
+#: src/LYMail.c:1024
+#, c-format
+msgid "The link   %s :?: %s \n"
+msgstr "A hivatkozás :%s :?: %s \n"
+
+#: src/LYMail.c:1026
+#, c-format
+msgid "called \"%s\"\n"
+msgstr "\"%s\" meghívva\n"
+
+#: src/LYMail.c:1027
+#, c-format
+msgid "in the file \"%s\" called \"%s\"\n"
+msgstr "a %s fájlban meghívtam a \"%s\"-t\n"
+
+#: src/LYMail.c:1028
+msgid "was requested but was not available."
+msgstr "igényeltem, de nem állt rendelkezésre."
+
+#: src/LYMail.c:1029
+msgid "Thought you might want to know."
+msgstr "Azt hiszem, jó tudni."
+
+#: src/LYMail.c:1031
+msgid "This message was automatically generated by"
+msgstr "Ez az üzenet önmûködõen jött létre"
+
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr "Nincsen rendszerszintû levelezõ beállítva"
+
+#: src/LYMain.c:969
+msgid "No Winsock found, sorry."
+msgstr "Nem találtam Winsock-ot, bocs."
+
+#: src/LYMain.c:1170
+msgid "You MUST define a valid TMP or TEMP area!\n"
+msgstr "Önnek meg kell határoznia egy érvényes TMP vagy TEMP területet\n"
+
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
+msgid "No such directory"
+msgstr "Nincs ilyen könyvtár"
+
+#: src/LYMain.c:1436
+#, c-format
+msgid ""
+"\n"
+"Configuration file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"A %s konfigurációs fájl nem áll rendelkezésre.\n"
+"\n"
+
+#: src/LYMain.c:1446
+msgid ""
+"\n"
+"Lynx character sets not declared.\n"
+"\n"
+msgstr ""
+"\n"
+"Nincs deklarált karakterkészlet a Lynx-ben.\n"
+"\n"
+
+#: src/LYMain.c:1475
+msgid ""
+"\n"
+"Lynx edit map not declared.\n"
+"\n"
+msgstr ""
+"\n"
+"Nincs deklarált szerkesztõkép a Lynx-ben.\n"
+"\n"
+
+#: src/LYMain.c:1504
+#, c-format
+msgid ""
+"\n"
+"Lynx file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"A %s Lynx-fájl nem áll rendelkezésre.\n"
+"\n"
+
+#: src/LYMain.c:1743
+msgid "Warning:"
+msgstr "Figyelem:"
+
+#: src/LYMain.c:2293
+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:2540 src/LYMain.c:2588
+#, 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:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
+msgstr "%s Verzió %s (%s)\n"
+
+#: src/LYMain.c:3143
+#, c-format
+msgid "Built on %s %s %s\n"
+msgstr "Készítve %s %s %s\n"
+
+#: src/LYMain.c:3166
+msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+msgstr "A szerzõi és kiadó jogokat a Kansas Egyetem, a CERN és az egyéb terjesztõk gyakorolják.\n"
+
+#: src/LYMain.c:3168
+msgid "Distributed under the GNU General Public License.\n"
+msgstr "A GNU Általános Nyilvános Licensz szerint kiadva.\n"
+
+#: src/LYMain.c:3170
+msgid ""
+"See http://lynx.isc.org/ and the online help for more information.\n"
+"\n"
+msgstr "Nézze meg a súgót és a http://lynx.isc.org/-ot, ahol segítséget kaphat.\n"
+
+#: src/LYMain.c:3919
+#, c-format
+msgid "USAGE: %s [options] [file]\n"
+msgstr "HASZNÁLAT: %s [opciók] [fájl]\n"
+
+#: src/LYMain.c:3920
+msgid "Options are:\n"
+msgstr "Opciók:\n"
+
+#: src/LYMain.c:4191
+#, c-format
+msgid "%s: Invalid Option: %s\n"
+msgstr "%s: Érvénytelen opció: %s \n"
+
+#: src/LYMainLoop.c:539
+#, c-format
+msgid "Internal error: Invalid mouse link %d!"
+msgstr "Belsõ hiba: Hibás egér hivatkozás %d!"
+
+#.
+#. * Make a name for this new URL.
+#.
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
+msgid "A URL specified by the user"
+msgstr "Felhasználó által megadott URL"
+
+#: src/LYMainLoop.c:1110
+msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
+msgstr "Enctype multipart/form-data még nincs támogatva! Nem tudom elküldeni."
+
+#.
+#. *  Make a name for this help file.
+#.
+#: src/LYMainLoop.c:3053
+msgid "Help Screen"
+msgstr "Súgó képernyõ"
+
+#: src/LYMainLoop.c:3177
+msgid "System Index"
+msgstr "Rendszer index"
+
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
+msgid "Entry into main screen"
+msgstr "Belépés a fõképernyõbe"
+
+#: src/LYMainLoop.c:3824
+msgid "No next document present"
+msgstr "Nincs következõ dokumentum"
+
+#: src/LYMainLoop.c:4131
+msgid "charset for this document specified explicitly, sorry..."
+msgstr "a dokumentum karakterkészlete már erre van beállítva, bocs..."
+
+#: src/LYMainLoop.c:5004
+msgid "cd to:"
+msgstr "könyvtárváltás:"
+
+#: src/LYMainLoop.c:5031
+msgid "A component of path is not a directory"
+msgstr "Az útvonal egy összetevõje nem könyvtár"
+
+#: src/LYMainLoop.c:5034
+msgid "failed to change directory"
+msgstr "nem sikerült a  könyvtárváltás"
+
+#: src/LYMainLoop.c:6204
+msgid "Reparsing document under current settings..."
+msgstr "A dokumentumot átalakítom az aktuális beállításoknak megfelelõen..."
+
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
+#, c-format
+msgid "Fatal error - could not open output file %s\n"
+msgstr "Végzetes hiba: nem lehet megnyitni a '%s' kimeneti fájlt\n"
+
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr "'Táblázat középre' engedélyezve."
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr "'Táblázat középre' tiltva."
+
+#: src/LYMainLoop.c:6914
+msgid "Current URL is empty."
+msgstr "Üres a pillanatnyi URL."
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr "Sikertelen a vágólapra másolás."
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr "A dokumentum URL-jét a vágólapra tesszük."
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr "A link URL-jét a vágólapra tesszük."
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr "Nincsen URL a vágólapon."
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
+msgid "-index-"
+msgstr "-index-"
+
+#: src/LYMainLoop.c:7731
+msgid "lynx: Can't access startfile"
+msgstr "lynx: Nincs nyitófájl"
+
+#: src/LYMainLoop.c:7744
+msgid "lynx: Start file could not be found or is not text/html or text/plain"
+msgstr "lynx: A nyitófájlt nem találom (vagy nem HTML szöveg, vagy nem sima szöveg)"
+
+#: src/LYMainLoop.c:7745
+msgid "      Exiting..."
+msgstr "      Kilépés..."
+
+#: src/LYMainLoop.c:7788
+msgid "-more-"
+msgstr "-több-"
+
+#. Enable scrolling.
+#: src/LYNews.c:187
+msgid "You will be posting to:"
+msgstr "Ön levelet fog küldeni:"
+
+#.
+#. *  Get the mail address for the From header,
+#. *  offering personal_mail_address as default.
+#.
+#: src/LYNews.c:196
+msgid ""
+"\n"
+"\n"
+" Please provide your mail address for the From: header\n"
+msgstr ""
+"\n"
+"\n"
+" Kérem adja meg a postacímét a fejléc Feladó sorába\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:214
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Subject: header\n"
+msgstr ""
+"\n"
+"\n"
+" Adja meg, vagy szerkessze a fejléc Tárgy sorát\n"
+
+#: src/LYNews.c:303
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Organization: header\n"
+msgstr ""
+"\n"
+"\n"
+" Adja meg, vagy szerkessze a fejléc Szervezet sorát\n"
+
+#.
+#. *  Use the built in line editior.
+#.
+#: src/LYNews.c:360
+msgid ""
+"\n"
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+"\n"
+" Kérem írja be az üzenetét ez alá."
+
+#: src/LYNews.c:406
+msgid "Message has no original text!"
+msgstr "Az üzenetben nincs eredeti szöveg!"
+
+#: src/LYOptions.c:746
+msgid "review/edit B)ookmarks files"
+msgstr "(B): a könyvjelzõ fájlok áttekintése/szerkesztése"
+
+#: src/LYOptions.c:748
+msgid "B)ookmark file: "
+msgstr "(B): a könyvjelzõ fájl: "
+
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
+#, c-format
+msgid "Use %s to invoke the Options menu!"
+msgstr "Használja a %s-t, hogy meghívja a Beállítások menüt!"
+
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr "(a '!'-el jelölt opciók nem lesznek megõrizve)"
+
+#: src/LYOptions.c:3261
+msgid "General Preferences"
+msgstr "Általános beállítások"
+
+#. ***************************************************************
+#. User Mode: SELECT
+#: src/LYOptions.c:3265
+msgid "User mode"
+msgstr "Felhasználói mód"
+
+#. Editor: INPUT
+#: src/LYOptions.c:3271
+msgid "Editor"
+msgstr "Szerkesztõ"
+
+#. Search Type: SELECT
+#: src/LYOptions.c:3276
+msgid "Type of Search"
+msgstr "Keresés típusa"
+
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
+#. Cookies: SELECT
+#: src/LYOptions.c:3285
+msgid "Cookies"
+msgstr "Sütik"
+
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
+msgid "Keyboard Input"
+msgstr "Billentyûzet bevitel"
+
+#. ***************************************************************
+#. Keypad Mode: SELECT
+#: src/LYOptions.c:3316
+msgid "Keypad mode"
+msgstr "Numerikus pad módja"
+
+#. Emacs keys: ON/OFF
+#: src/LYOptions.c:3322
+msgid "Emacs keys"
+msgstr "Emacs billentyûk"
+
+#. VI Keys: ON/OFF
+#: src/LYOptions.c:3328
+msgid "VI keys"
+msgstr "vi billentyûk"
+
+#. Line edit style: SELECT
+#. well, at least 2 line edit styles available
+#: src/LYOptions.c:3335
+msgid "Line edit style"
+msgstr "Sorszerkesztõi stílus"
+
+#. Keyboard layout: SELECT
+#: src/LYOptions.c:3347
+msgid "Keyboard layout"
+msgstr "Billentyûzet kiosztás"
+
+#.
+#. * Display and Character Set
+#.
+#: src/LYOptions.c:3360
+msgid "Display and Character Set"
+msgstr "Képernyõ és karakterkészlet "
+
+#. ***************************************************************
+#. Display Character Set: SELECT
+#: src/LYOptions.c:3364
+msgid "Display character set"
+msgstr "Képernyõ karakterkészlet"
+
+#: src/LYOptions.c:3393
+msgid "Assumed document character set"
+msgstr "Feltételezett karakterkészlet"
+
+#.
+#. * 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:3413
+msgid "CJK mode"
+msgstr "CJK mód"
+
+#: src/LYOptions.c:3415
+msgid "Raw 8-bit"
+msgstr "Nyers 8-bites mód"
+
+#. X Display: INPUT
+#: src/LYOptions.c:3423
+msgid "X Display"
+msgstr "X képernyõ"
+
+#.
+#. * Document Appearance
+#.
+#: src/LYOptions.c:3429
+msgid "Document Appearance"
+msgstr "Dokumentum megjelenése"
+
+#: src/LYOptions.c:3435
+msgid "Show color"
+msgstr "Színek mutatása"
+
+#. Show cursor: ON/OFF
+#: src/LYOptions.c:3459
+msgid "Show cursor"
+msgstr "Kurzor mutatása"
+
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr "Csúszka mutatása"
+
+#. Select Popups: ON/OFF
+#: src/LYOptions.c:3473
+msgid "Popups for select fields"
+msgstr "Felbukkanó ablakok használata"
+
+#. HTML error recovery: SELECT
+#: src/LYOptions.c:3479
+msgid "HTML error recovery"
+msgstr "HTML hiba helyreállítás"
+
+#. Show Images: SELECT
+#: src/LYOptions.c:3485
+msgid "Show images"
+msgstr "Képek mutatása"
+
+#. Verbose Images: ON/OFF
+#: src/LYOptions.c:3499
+msgid "Verbose images"
+msgstr "Tallózás a képek között"
+
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3507
+msgid "Headers Transferred to Remote Servers"
+msgstr "A távoli gépeknek átküldött fejlécek"
+
+#. ***************************************************************
+#. Mail Address: INPUT
+#: src/LYOptions.c:3511
+msgid "Personal mail address"
+msgstr "Személyes email cím"
+
+#. Preferred Document Character Set: INPUT
+#: src/LYOptions.c:3516
+msgid "Preferred document character set"
+msgstr "Elsõdleges karakterkészlet"
+
+#. Preferred Document Language: INPUT
+#: src/LYOptions.c:3521
+msgid "Preferred document language"
+msgstr "Elsõdleges nyelv"
+
+#: src/LYOptions.c:3527
+msgid "User-Agent header"
+msgstr "Böngészõ-azonosító fejléc"
+
+#.
+#. * Listing and Accessing Files
+#.
+#: src/LYOptions.c:3535
+msgid "Listing and Accessing Files"
+msgstr "Fájlok listázása és elérése"
+
+#. ***************************************************************
+#. FTP sort: SELECT
+#: src/LYOptions.c:3539
+msgid "FTP sort criteria"
+msgstr "FTP-s rendezés módja"
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3546
+msgid "Local directory sort criteria"
+msgstr "Helyi könyvtárrendezés módja"
+
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+msgid "Local directory sort order"
+msgstr "Helyi könyvtárrendezés sorrendje"
+
+#: src/LYOptions.c:3561
+msgid "Show dot files"
+msgstr "Rejtett fájlok mutatása"
+
+#: src/LYOptions.c:3569
+msgid "Execution links"
+msgstr "Futtatható hivatkozások"
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3589
+msgid "Show transfer rate"
+msgstr "Az átvitel sebesség megjelenítése"
+
+#.
+#. * Special Files and Screens
+#.
+#: src/LYOptions.c:3598
+msgid "Special Files and Screens"
+msgstr "Speciális fájlok és képernyõk"
+
+#: src/LYOptions.c:3603
+msgid "Multi-bookmarks"
+msgstr "Többszörös könyvjelzõk"
+
+#: src/LYOptions.c:3611
+msgid "Review/edit Bookmarks files"
+msgstr "Könyvjelzõk szerkesztése, átnézése"
+
+#: src/LYOptions.c:3613
+msgid "Goto multi-bookmark menu"
+msgstr "Ugrás a többszörös könyvjelzõi menübe"
+
+#: src/LYOptions.c:3615
+msgid "Bookmarks file"
+msgstr "Könyvjelzõ fájl"
+
+#. Visited Pages: SELECT
+#: src/LYOptions.c:3621
+msgid "Visited Pages"
+msgstr "Meglátogatott lapok"
+
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr "A fájl nézése "
+
+#: src/LYPrint.c:952
+msgid " Print job complete.\n"
+msgstr "Nyomtatási munka kész.\n"
+
+#: src/LYPrint.c:1281
+msgid "Document:"
+msgstr "Dokumentum:"
+
+#: src/LYPrint.c:1282
+msgid "Number of lines:"
+msgstr "Sorok száma:"
+
+#: src/LYPrint.c:1283
+msgid "Number of pages:"
+msgstr "Oldalak száma:"
+
+#: src/LYPrint.c:1284
+msgid "pages"
+msgstr "oldal"
+
+#: src/LYPrint.c:1284
+msgid "page"
+msgstr "oldal"
+
+#: src/LYPrint.c:1285
+msgid "(approximately)"
+msgstr "(körülbelül)"
+
+#: src/LYPrint.c:1290
+msgid "Some print functions have been disabled!"
+msgstr "Néhány nyomtatási funkció le van tiltva!"
+
+#: src/LYPrint.c:1294
+msgid "Standard print options:"
+msgstr "Nyomtatási alapbeállítások: "
+
+#: src/LYPrint.c:1295
+msgid "Print options:"
+msgstr "Nyomtatási beállítások:"
+
+#: src/LYPrint.c:1302
+msgid "Save to a local file"
+msgstr "Mentés helyi fájlba"
+
+#: src/LYPrint.c:1304
+msgid "Save to disk disabled"
+msgstr "Lemezre mentés le van tiltva"
+
+#: src/LYPrint.c:1311
+msgid "Mail the file"
+msgstr "Fájl küldése levélben"
+
+#: src/LYPrint.c:1318
+msgid "Print to the screen"
+msgstr "Nyomtatás a képernyõre"
+
+#: src/LYPrint.c:1323
+msgid "Print out on a printer attached to your vt100 terminal"
+msgstr "Nyomtatás a vt100-as terminálhoz csatlakozó nyomtatóra."
+
+#: src/LYReadCFG.c:339
+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 ""
+"Szintaktikai hiba a konfigurációs fájl SZÍNEK (COLOR) részében\n"
+"A sor a következõ szerkezetû legyen:\n"
+"SZÍN:EGÉSZ:ELÕTÉR:HÁTTÉR\n"
+"\n"
+"Itt az ELÕTÉR és a HÁTTÉR a következõ lehet:\n"
+"A különleges szavak lehetnek 'nocolor' vagy 'default', vagy\n"
+
+#: src/LYReadCFG.c:352
+msgid "Offending line:"
+msgstr "Nem jó sorok:"
+
+#: src/LYReadCFG.c:638
+#, c-format
+msgid "key remapping of %s to %s for %s failed\n"
+msgstr "a %s billentyû átállítása %s-re nem sikerült (%s)\n"
+
+#: src/LYReadCFG.c:645
+#, c-format
+msgid "key remapping of %s to %s failed\n"
+msgstr "a %s billentyû átállítása %s-re nem sikerült\n"
+
+#: src/LYReadCFG.c:666
+#, c-format
+msgid "invalid line-editor selection %s for key %s, selecting all\n"
+msgstr "%s: érvénytelen sor-szerkesztõ kiválasztás %s gombnak, összes kiválasztva\n"
+
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
+msgstr "a sorszerkesztõ hozzárendelése a %s gombnak (0x%x) a 0x%x-hez (%s) sikertelen\n"
+
+#: src/LYReadCFG.c:711
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
+msgstr "a sorszerkesztõ hozzárendelése %s gombhoz (0x%x) sikertelen (%s)\n"
+
+#: src/LYReadCFG.c:816
+#, c-format
+msgid "Lynx: cannot start, CERN rules file %s is not available\n"
+msgstr "A Lynx nem tud elindulni, a CERN %s szabály fájlja nem áll rendelkezésre\n"
+
+#: src/LYReadCFG.c:818
+msgid "(no name)"
+msgstr "(névtelen)"
+
+#: src/LYReadCFG.c:1782
+#, 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:1784
+#, c-format
+msgid "Last attempted include was '%s',\n"
+msgstr "Az utolsó beillesztés %s volt,\n"
+
+#: src/LYReadCFG.c:1785
+#, c-format
+msgid "included from '%s'.\n"
+msgstr "beszúrva innen: %s.\n"
+
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
+msgid "The following is read from your lynx.cfg file."
+msgstr "Az itt következõket a lynx.cfg fájlból olvasom ki."
+
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
+msgid "Please read the distribution"
+msgstr "Kérem olvassa el az ide vonatkozó leírást ("
+
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
+msgid "for more comments."
+msgstr ") további információért."
+
+#: src/LYReadCFG.c:2244
+msgid "RELOAD THE CHANGES"
+msgstr "VÁLTOZÁSOK ÚJRATÖLTÉSE"
+
+#: src/LYReadCFG.c:2253
+msgid "Your primary configuration"
+msgstr "Az elsõdleges beállítás:"
+
+#: src/LYShowInfo.c:129
+msgid "Directory that you are currently viewing"
+msgstr "A könyvtár, amit jelenleg néz."
+
+#: src/LYShowInfo.c:132
+msgid "Name:"
+msgstr "Neve:"
+
+#: src/LYShowInfo.c:135
+msgid "URL:"
+msgstr "URL:"
+
+#: src/LYShowInfo.c:146
+msgid "Directory that you have currently selected"
+msgstr "A kiválasztott könyvtár"
+
+#: src/LYShowInfo.c:149
+msgid "File that you have currently selected"
+msgstr "A kiválasztott fájl"
+
+#: src/LYShowInfo.c:153
+msgid "Symbolic link that you have currently selected"
+msgstr "A kiválasztott szimbolikus link"
+
+#: src/LYShowInfo.c:157
+msgid "Item that you have currently selected"
+msgstr "A kiválasztott elem"
+
+#: src/LYShowInfo.c:159
+msgid "Full name:"
+msgstr "Teljes név:"
+
+#: src/LYShowInfo.c:168
+msgid "Unable to follow link"
+msgstr "Nem tudom követni a linket"
+
+#: src/LYShowInfo.c:170
+msgid "Points to file:"
+msgstr "Erre a fájlra mutat:"
+
+#: src/LYShowInfo.c:175
+msgid "Name of owner:"
+msgstr "Tulajdonos neve:"
+
+#: src/LYShowInfo.c:178
+msgid "Group name:"
+msgstr "Csoport neve:"
+
+#: src/LYShowInfo.c:181
+msgid "File size:"
+msgstr "Fájl mérete:"
+
+#: src/LYShowInfo.c:187
+msgid "Creation date:"
+msgstr "Létrehozás dátuma:"
+
+#: src/LYShowInfo.c:190
+msgid "Last modified:"
+msgstr "Utolsó módosítás:"
+
+#: src/LYShowInfo.c:193
+msgid "Last accessed:"
+msgstr "Utolsó hozzáférés:"
+
+#: src/LYShowInfo.c:195
+msgid "Access Permissions"
+msgstr "Elérési jogok"
+
+#: src/LYShowInfo.c:261
+msgid "File that you are currently viewing"
+msgstr "Az aktuális fájl"
+
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
+msgid "Linkname:"
+msgstr "Hivatkozásnév:"
+
+#: src/LYShowInfo.c:279 src/LYShowInfo.c:291
+msgid "Charset:"
+msgstr "Karakterkészlet:"
+
+#: src/LYShowInfo.c:297
+msgid "Server:"
+msgstr "Kiszolgáló:"
+
+#: src/LYShowInfo.c:300
+msgid "Date:"
+msgstr "Dátum:"
+
+#: src/LYShowInfo.c:303
+msgid "Last Mod:"
+msgstr "Utolsó módosítás:"
+
+#: src/LYShowInfo.c:309
+msgid "&nbsp;Expires:"
+msgstr "&nbsp;Lejár:"
+
+#: src/LYShowInfo.c:313
+msgid "Cache-Control:"
+msgstr "Gyorstár vezérlés:"
+
+#: src/LYShowInfo.c:317
+msgid "Content-Length:"
+msgstr "Tartalom hossza:"
+
+#: src/LYShowInfo.c:322
+msgid "Language:"
+msgstr "Nyelv:"
+
+#: src/LYShowInfo.c:329
+msgid "Post Data:"
+msgstr "Posta Adat:"
+
+#: src/LYShowInfo.c:333
+msgid "Post Content Type:"
+msgstr "Posta Tartalom Típus:"
+
+#: src/LYShowInfo.c:342
+msgid "Owner(s):"
+msgstr "Tulajdonos:"
+
+#: src/LYShowInfo.c:345
+msgid "size:"
+msgstr "méret:"
+
+#: src/LYShowInfo.c:345
+msgid "lines"
+msgstr "sor"
+
+#: src/LYShowInfo.c:348
+msgid "mode:"
+msgstr "mód:"
+
+#: src/LYShowInfo.c:350
+msgid "forms mode"
+msgstr "ûrlap mód"
+
+#: src/LYShowInfo.c:352
+msgid "source"
+msgstr "forrás"
+
+#: src/LYShowInfo.c:352
+msgid "normal"
+msgstr "normál"
+
+#: src/LYShowInfo.c:353
+msgid ", safe"
+msgstr ", biztonságos"
+
+#: src/LYShowInfo.c:354
+msgid ", via internal link"
+msgstr ", belsõ hivatkozáson keresztül"
+
+#: src/LYShowInfo.c:360
+msgid ", no-cache"
+msgstr ", gyorstár nélkül"
+
+#: src/LYShowInfo.c:362
+msgid ", ISMAP script"
+msgstr ", ISMAP parancsállomány"
+
+#: src/LYShowInfo.c:364
+msgid ", bookmark file"
+msgstr ", könyvjelzõ fájl"
+
+#: src/LYShowInfo.c:373
+msgid "Link that you currently have selected"
+msgstr "Az aktuális link"
+
+#: src/LYShowInfo.c:386
+msgid "Method:"
+msgstr "Módszer:"
+
+#: src/LYShowInfo.c:391
+msgid "Enctype:"
+msgstr "Kódolás típusa:"
+
+#: src/LYShowInfo.c:403
+msgid "(Form field)"
+msgstr "(Ûrlap mezõ)"
+
+#: src/LYShowInfo.c:418
+msgid "No Links on the current page"
+msgstr "Nincs hivatkozás ezen a lapon"
+
+#: src/LYStyle.c:278
+#, 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 ""
+"Szintaktikai hiba az lss fájlban:\n"
+"[%s]\n"
+"A sornak a következõ szerkezete legyen:\n"
+"TÁRGY:MONO:SZÍN (pl. em:bold:brightblue:white)\n"
+"ahol a TÁRGY lehet: EM, STRONG, B, I, U, BLINK stb.\n"
+"\n"
+
+#: src/LYTraversal.c:107
+msgid "here is a list of the history stack so that you may rebuild"
+msgstr "itt egy lista az elõzmények veremrõl, így újra tudja építeni"
+
+#: src/LYUpload.c:78
+msgid "ERROR! - upload command is misconfigured"
+msgstr "HIBA! - a feltöltési parancs nincs jól beállítva"
+
+#: src/LYUpload.c:100
+msgid "Illegal redirection \"../\" found! Request ignored."
+msgstr "Érvénytelen átirányítás! \"../\" A kérés figyelmen kívül hagyva."
+
+#: src/LYUpload.c:103
+msgid "Illegal character \"/\" found! Request ignored."
+msgstr "Érvénytelen karakter! \"/\" A kérés figyelmen kívül hagyva."
+
+#: src/LYUpload.c:106
+msgid "Illegal redirection using \"~\" found! Request ignored."
+msgstr "Érvénytelen átirányítás! \"~\" A kérés figyelmen kívül hagyva."
+
+#: src/LYUpload.c:163
+msgid "Unable to upload file."
+msgstr "Nem lehet feltölteni a fájlt."
+
+#: src/LYUpload.c:206
+msgid "Upload To:"
+msgstr "Feltöltés:"
+
+#: src/LYUpload.c:207
+msgid "Upload options:"
+msgstr "Feltöltési beállítások:"
+
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr "A letöltendõ dokumentum URL-jét a vágólapra tesszük."
+
+#: src/LYUtils.c:2468
+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:3294
+msgid "Too many tempfiles"
+msgstr "Túl sok átmeneti fájl"
+
+#: src/LYUtils.c:3595
+msgid "unknown restriction"
+msgstr "ismeretlen szigorítás"
+
+#: src/LYUtils.c:3626
+msgid "No restrictions set.\n"
+msgstr "Nincs szigorítás beállítva.\n"
+
+#: src/LYUtils.c:3629
+msgid "Restrictions set:\n"
+msgstr "Szigorítási beállítás:\n"
+
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr "Nem találom a HOME könyvtárat"
+
+#: src/LYrcFile.c:21
+msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
+msgstr "Általában letiltva. Nézze meg az ENABLE_LYNXRC-t a lynx.cfg-ben\n"
+
+#: src/LYrcFile.c:295
+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 ""
+"Az accept_all_cookies TRUE-ra állítása lehetõvé teszi a sütik automatikus\n"
+" fogadását. Alapban FALSE, így mindig rákérdez.\n"
+
+#: src/LYrcFile.c:302
+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 ""
+"a bookmark_file eltárolja annak a fájlnak nevét és helyét, amibe linkeket\n"
+" lehet felvenni.\n"
+
+#: src/LYrcFile.c:307
+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 ""
+"Ha a case_sensitive_searching \"on\", akkor a keresés megkülönbözteti\n"
+" a kis- és nagybetûket. Az alapbeállítás az \"off\" állapot.\n"
+
+#: src/LYrcFile.c:312
+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 ""
+"A character_set definíció vezérli a 8 bites megjelenítést a terminálon.\n"
+"Ha a 8 bites betûk nem megfelelõen látszanak, akkor megpróbálhatja\n"
+"használni a 7 bites karaktereket.\n"
+"A jelenlegi karakterkészletek:\n"
+
+#: src/LYrcFile.c:319
+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 ""
+"A cookie_accept_domains és a cookie_reject_domains vesszõvel elválasztott\n"
+"tartomány-listák, ahonnan a Lynxnek automatikusan el kell fogadnia, \n"
+"vagy elvetnie a kapott sütiket. Ha egy tartomány mindkét listában szerepelne,\n"
+"az elutasítás lép érvénybe. Az accept_all_cookies felülírja az itt megadott\n"
+"beállítást.\n"
+
+#: src/LYrcFile.c:327
+msgid ""
+"cookie_file specifies the file from which to read persistent cookies.\n"
+"The default is ~/.lynx_cookies.\n"
+msgstr "A cookie_file az a fájl, ahonnan az állandó sütiket be kell olvasni.Alaphelyzetben ez a ~/.lynx_cookies.\n"
+
+#: src/LYrcFile.c:332
+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 ""
+"A cookie_loose_invalid_domains, a cookie_strict_invalid_domains, és\n"
+"a cookie_query_invalid_domains vesszõvel elválasztott tartomány-listák,\n"
+" ahonnan különbözõ mértékû azonosítást kívánunk meg. Ha egy tartomány\n"
+"'strict checking'-re van állítva, akkor az RFC2109-nek megfelelõ eljárás\n"
+"lép érvénybe. A 'loose checking' megengedi a sütik érvénytelen útvonallal\n"
+"való elfogadását. Alapbeállításban a felhasználó egy kérdést kap, melyben\n"
+"eldöntheti, hogy elfogadja-e az érvénytelen útvonalat vagy tartományt.\n"
+
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+"A dir_list_order határozza meg a könyvtárlista rendezését, a \n"
+"DIRED_SUPPORT-nál (ha rendelkezésre áll). Alaphelyzet: \"ORDER_BY_NAME\"\n"
+
+#: src/LYrcFile.c:351
+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 ""
+"A dir_list_styles határozza meg a könyvtárlista módját a DIRED_SUPPORT-nál\n"
+"(ha rendelkezésre áll). Alaphelyzet: \"MIXED_STYLE\", amiben a könyvtárak\n"
+"és a fájlok egy listában vannak. A \"FILES_FIRST\" elõször a fájlokat\n"
+" listázza, a \"DIRECTORIES_FIRST\" elõször a könyvtárakat.\n"
+
+#: src/LYrcFile.c:359
+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 ""
+"Ha az emacs_keys \"on\" állásban van, akkor az alábbi EMACS gombok \n"
+"használhatók:\n"
+"  ^N = le      ^P = fel\n"
+"  ^B = balra   ^F = jobbra\n"
+
+#: src/LYrcFile.c:365
+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 ""
+"A file_editor határozza a szerkesztõt helyi fájlokhoz vagy üzenetekhez.\n"
+"Ha ez nincs meghatározva, akkor a fájl szerkesztés letiltódik, hacsak nem\n"
+" parancssorból lett aktiválva, mert akkor a beépített szerkesztõ lesz\n"
+" használva a levélíráshoz.\n"
+
+#: src/LYrcFile.c:371
+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 ""
+"A file_sorting_method meghatározza, hogy melyik érték szerint rendezze\n"
+"sorba az éppen látható FTP könyvtárat. Az opciók:\n"
+"   BY_FILENAME -- fájlnév szerint rendez\n"
+"   BY_TYPE     -- fájl típusa szerint rendez\n"
+"   BY_SIZE     -- fájl mérete szerint rendez\n"
+"   BY_DATE     -- fájl dátuma szerint rendez\n"
+
+#: src/LYrcFile.c:389
+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 ""
+"\"A lineedit_mode határozza meg azokat a hozzárendeléseket, amiket az\n"
+"ûrlapoknál használunk. Ha a lineedit_mode \"Default Binding\"-re van állítva\n"
+"(alapértelmezés), akkor a következõ vezérlõkaraktereket lehet használni\n"
+"mozgásra és törlésre:\n"
+"\n"
+"                    Elõzõ   Köv.   Enter = rendben\n"
+"Mozgás karakterre:   <-      ->    ^G = mégsem \n"
+"Mozgás szóra:        ^P      ^N    ^U = sor törlése \n"
+"Karakter törlése:    ^H      ^R    ^A = sor elejére\n"
+"Szó törlése:         ^B      ^F    ^E = sor végére \n"
+"A pillanatnyi 'lineedit' módok:\n"
+
+#: src/LYrcFile.c:404
+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 ""
+"Itt definiálhatjuk az al-könyvjelzõ fájlokat és leírásukat.\n"
+"A forma a következõ: többszörös_könyvjelzõ<nagy_betû>=<fájlnév>,<leírás>\n"
+"Összesen 26 könyvjelzõt lehet létrehozni (az angol ABC nagy betûibõl)\n"
+"Kezdjük a \"multi_bookmarkB\"-vel, mivel az 'A' az alapbeállítás (lásd késõbb).\n"
+
+#: src/LYrcFile.c:410
+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 ""
+"A personal_mail_address határozza meg az ön személyes email címét. Ez a\n"
+"cím lesz elküldve HTTP fájl átvitel hitelesítésekor, tárolva lesz, amikor\n"
+"bejelentkezik egy gépre és amikor egy megjegyzést küld.\n"
+"Ha nem akarja, hogy ezt az adatot kiadja a program, akkor \n"
+"állítsa be a NO_FROM_HEADER-t TRUE-ra a lynx.cfg-ben, vagy használja\n"
+"a -nofrom parancssori kapcsolót. Üresen is hagyhatja a mezõt, de akkor\n"
+"nem lesz belefoglalva az elküldött megjegyzésbe.\n"
+
+#: src/LYrcFile.c:419
+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 ""
+"A preferred_charset meghatározza a MIME jelölés karakterkészletét(pl.\n"
+" ISO-8859-2, ISO-8859-5) amit a Lynx jelez a http szervernek az Accept-Charset\n"
+"fejlécen keresztül. Fölösleges az ISO-8859-1 vagy US-ASCII beállítás,\n"
+" mert ezeket alapból használja.\n"
+"Készíthet belõlük kettõsponttal elválasztott listát.\n"
+"Ha a karakterkészlet elérhetõ, a szerver elküldi.\n"
+"Ha nincs Accept-Charset fejléc, akkor az összes karakterkészletet\n"
+"elfogadjuk. Ha az Accept-Charset létezik, de a szerver nem tud küldeni\n"
+"ennek megfelelõ választ, akkor a szervernek hiba üzenetet\n"
+"kell küldenie, bár elfogadhatatlan válasz is lehetséges.\n"
+
+#: src/LYrcFile.c:433
+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 ""
+"A preferred_language meghatározza a MIME jelölés nyelvét (pl: hu, en,\n"
+"fr; ezeket csökkenõ fontossági sorrendben kettõsponttal el lehet\n"
+"választani egymástól), amit a Lynx jelezni fog a http szerver felé. Ha\n"
+"a fájl ezen a nyelven elérhetõ, akkor a szerver azt küldi vissza. \n"
+"Egyébként a szerver az általa alapértelmezettnek vett nyelven fog beszélni.\n"
+
+#: src/LYrcFile.c:442
+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 ""
+"Ha a run_all_execution_links \"on\"-ra van állítva, akkor minden\n"
+" végrehajtható link kiválasztás után végrehajtódik.\n"
+"\n"
+"FIGYELEM - Ez egy NAGYON veszélyes beállítás. Minthogy ismeretlen\n"
+"           forrás által készített anyagot használunk, \n"
+"           megvan a lehetõsége, hogy trójai programot indítunk el.\n"
+"           A trójai program fájlokat törölhet a gépünkrõl, vagy\n"
+"           hozzáférhet a személyes adatainkhoz. Kizárólag abban az\n"
+"           esetben állítsuk \"on\"-ra, ha megbízható forrást használunk.\n"
+
+#: src/LYrcFile.c:453
+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 ""
+"Ha a run_execution_links_on_local_files \"on\"-ra van állítva, akkor\n"
+"a helyi végrehajtható linkeket kiválasztással el lehet indítani.\n"
+"Ez különbözik a run_all_execution_links beállítástól, mert\n"
+"csak a helyi fájlokra vonatkozik.\n"
+"\n"
+"FIGYELEM - Ez egy veszélyes beállítás. Minthogy ismeretlen\n"
+"           forrás által készített anyagot használunk, \n"
+"           megvan a lehetõsége, hogy trójai programot indítunk el.\n"
+"           A trójai program fájlokat törölhet a gépünkrõl, vagy\n"
+"           hozzáférhet a személyes adatainkhoz. Kizárólag abban az\n"
+"           esetben állítsuk \"on\"-ra, ha megbízható forrást használunk.\n"
+
+#: src/LYrcFile.c:471
+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 ""
+"A select_popups meghatározza, hogy a SELECT blokkban lévõ OPCIÓK\n"
+"hogyan jelenjen meg, ha hiányzik a MULTIPLE attribútum: függõleges\n"
+"rádiógombokkal, vagy legördülõ menüvel. Megjegyezzük, hogy ha a \n"
+"MULTIPLE attribútum be van állítva a SELECT tagban, akkor a Lynx\n"
+" automatikusan jelölõnégyzeteket rajzol egymás alá. Ha az érték \"on\"\n"
+" állásban van, akkor mindig legördülõ menüt használ, \"off\" állásban\n"
+"pedig jelölõnégyzeteket.\n"
+"Az alapértelmezett beállítást a -popup paranccsal felül lehet írni.\n"
+
+#: src/LYrcFile.c:481
+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 ""
+"A show_color meghatározza, hogy induláskor a Lynx színes legyen, vagy sem.\n"
+"A \"never\" érték kikapcsolja a színes módot (a terminál fekete-fehér lesz),\n"
+"akkor is, ha lehetséges lenne színes mód használata. Az \"always\" érték\n"
+"bekapcsolja a színes üzemmódot még fekete-fehér monitoron is, ha \n"
+"a támogatás bele lett fordítva a Lynx-be. A \"default\" érték hatására\n"
+"fekete-fehér terminált használ, hacsak színes képernyõt nem talál,\n"
+"esetleg a -color parancssori, vagy a COLORTERM \n"
+"környezeti változó be nem lett állítva. Az alapértelmezett viselkedés \n"
+" lesz érvényes a névtelen bejelentkezések esetén, vagy ha\n"
+"a felhasználó az \"option_save\" szigorítást használja.\n"
+"Az elmentett beállításokat felül lehet bírálni a parancssori\n"
+" -color és -nocolor kapcsolókkal.\n"
+"Az induláskori beállításokat meg lehet változtatni a \"színek mutatása\" opcióval.\n"
+
+#: src/LYrcFile.c:498
+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 ""
+"A show_cursor határozza meg, hogy a kurzort elrejtjük-e ('hide') a\n"
+"képernyõ jobb oldalára, alulra (ha lehetséges), vagy az aktuális\n"
+"linktõl balra, vagy az aktuális opcióra egy felbukkanó menüben. A\n"
+"kurzor balra helyezése elõnyös felolvasó- vagy braille csatolók\n"
+"esetén, és általában akkor, ha a terminál nem különbözteti meg\n"
+"kiemeléssel vagy színnel a linkeket. Alaphelyzet az \"ON\", ekkor a\n"
+"\"balra\" pozicionálás érvényes, míg \"OFF\" állásban a kurzor elrejtésre\n"
+"kerül. Felülírható a \"-show_cursor\" parancssori opcióval.\n"
+
+#: src/LYrcFile.c:509
+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 ""
+"A show_dotfiles meghatározza, hogyan viselkedjen a program azokkal a könyvtárakkal,\n"
+"amikben rejtett (ponttal kezdõdõ) fájlok, könyvtárak vannak. A kapcsolót csak \n"
+"úgy tudjuk \"ON\" állásba helyezni, hogy a userdefs.h vagy a lynx.cfg-ben \n"
+"engedélyezzük és a parancssorban sem tiltottuk le. Ha a rejtett fájlok \n"
+"megjelenítése le van tiltva, akkor az ilyen fájlok létrehozása sem lehetséges.\n"
+
+#: src/LYrcFile.c:520
+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 ""
+"Ha az al-könyvjelzõ nincs kikapcsolva (OFF), és többszörös könyvjelzõt\n"
+"állítottunk be (lásd késõbb), akkor könyvjelzõ mûveletek elõtt elõször\n"
+"megkérdezzük a felhasználót, hogy melyik al-könyvjelzõt akarja\n"
+"használni. Ha az alapértelmezett Lynx könyvjelzõ definiálva van (lásd\n"
+"fentebb), akkor azt használjuk alapból. Amikor ez a beállítás haladó\n"
+"(\"advanced\") módban van és a felhasználó is haladó, akkor a könyvjelzõ\n"
+"megnézése parancs státussorában prompt lesz látható a kezdõ és közép-\n"
+"haladónál látható menü helyett. Ha ez az opció \"standard\"-re van\n"
+"állítva, akkor a menü - felhasználói módra való tekintet nélkül -\n"
+"megjelenik.\n"
+
+#: src/LYrcFile.c:533
+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 ""
+"A user_mode határozza meg a felhasználó tapasztalati szintjét\n"
+"Lynx-szel kapcsolatban. Alaphelyzet a \"KEZDÕ\" szint, ekkor két plusz\n"
+"sor segíti a felhasználót a képernyõ alján. A \"KÖZÉPFOKÚ\" szint\n"
+"kikapcsolja ezeket a sorokat. A \"HALADÓ\" szinten a képernyõ alján a\n"
+"kiválasztott link URL-je látható.\n"
+
+#: src/LYrcFile.c:542
+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 ""
+"Ha a verbose_images \"ON\" állásban van, akkor a Lynx kiírja a kép nevét\n"
+"az [INLINE], [LINK] vagy [IMAGE] elõfordulásakor. (Lásd még:\n"
+"VERBOSE_IMAGES a lynx.cfg fájlban\n"
+
+#: src/LYrcFile.c:547
+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 ""
+"Ha a vi_keys \"ON\" állásban van, akkor a VI mozgató gombokat \n"
+"használhatjuk:\n"
+"  j = le      k = fel\n"
+"  h = balra   l = jobbra\n"
+"A parancsok kisbetûsek! A nagy 'H', 'J' és 'K' segítséget, ugrást, és\n"
+"billentyû beállítást jelent.\n"
+
+#: src/LYrcFile.c:555
+msgid ""
+"The visited_links setting controls how Lynx organizes the information\n"
+"in the Visited Links Page.\n"
+msgstr ""
+"A visited_links beállítás határozza meg, hogy a Lynx hogyan szervezi a\n"
+"meglátogatott oldalakkal kapcsolatos információkat.\n"
+
+#: src/LYrcFile.c:772
+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 ""
+"Ha a keypad_mode \"NUMBERS_AS_ARROWS\" beállításban van (a numerikus\n"
+"gombok nyilakként viselkedjenek), akkor a numerikus gombokkal a következõ\n"
+"haladási irányt adhatjuk meg (feltéve, hogy a NumLock gomb be van nyomva):\n"
+"\n"
+"           8 = fel\n"
+"  4 = balra    6 = jobbra\n"
+"           2 = le  \n"
+"\n"
+"Ugyanígy viselkednek a betûknél lévõ számok is, függetlenül a NumLock\n"
+"gomb állásától.\n"
+
+#: src/LYrcFile.c:781
+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 ""
+"Ha a keypad_mode \"LINKS_ARE_NUMBERED\"-re van állítva (\"a hivatkozások\n"
+"számozva lesznek\"), a hivatkozások mellett számok fognak megjelenni, amivel\n"
+"ki lehet választani az adott hivatkozást.\n"
+
+#: src/LYrcFile.c:785
+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 ""
+"Ha a keypad_mode \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\"-re van állítva,\n"
+"akkor a hivatkozások és a látható bemeneti mezõk mellett számok fognak\n"
+"megjelenni. A számokat a hivatkozás kiválasztására lehet használni,\n"
+"vagy az \"aktuális link\"-et lehet átállítani bemeneti mezõre vagy\n"
+"gombra. Ezen felül a felbukkanó menükben lévõ opciók indexet kapnak,\n"
+"ami alapján is ki lehet választani õket számokkal, akkor is, ha az\n"
+"opció nem látható a képernyõn. Referencia listák és a listaparancsból\n"
+"származó kimenetek szintén beszámozzák az ûrlap bemeneteket.\n"
+
+#: src/LYrcFile.c:794
+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 ""
+"MEGJEGYZÉS: Bizonyos meghatározott formátumú dokumentum rosszul nézhet\n"
+"ki, ha a LINKS_ARE_NUMBERED vagy a LINKS_AND_FORM_FIELDS_ARE_NUMBERED\n"
+"opció engedélyezve van.\n"
+
+#: src/LYrcFile.c:827
+msgid ""
+"Lynx User Defaults File\n"
+"\n"
+"This file contains options saved from the Lynx Options Screen (normally\n"
+"with the '>' key).  There is normally no need to edit this file manually,\n"
+"since the defaults here can be controlled from the Options Screen, and the\n"
+"next time options are saved from the Options Screen this file will be\n"
+"completely rewritten.  You have been warned...\n"
+"If you are looking for the general configuration file - it is normally\n"
+"called lynx.cfg, and it has different content and a different format.\n"
+"It is not this file.\n"
+msgstr ""
+"Lynx Felhasználói Alapbeállítások Fájl\n"
+"\n"
+"Ez a fájl tartalmazza a Lynx Beállítások Képernyõn elmentett\n"
+"beállításokat. Nem szükséges ennek a fájlnak a kézi szerkesztése,\n"
+"mivel a Beállítások Képernyõ teljesen átveszi a fájl kezelését. Ha ön\n"
+"az általános beállítások fájlt keresi - azt általában lynx.cfg -nek\n"
+"nevezik. Ez nem az a fájl.\n"
diff --git a/gnu/usr.bin/lynx/po/it.po b/gnu/usr.bin/lynx/po/it.po
index 180e0f8ee94..fd147b1c2f0 100644
--- a/gnu/usr.bin/lynx/po/it.po
+++ b/gnu/usr.bin/lynx/po/it.po
@@ -1,177 +1,4490 @@
 # Lynx Italian message catalog
-# created: Sat Aug 22 18:47:32 EDT 1998
-# updated:     Sep  7
+# Copyright (C) 1998, 2002 Free Software Foundation, Inc.
+# Giuliano Artico <artico@math.unipd.it>, 2002.
 #
+# Dipartimento di Matematica Pura e Applicata
+# via Belzoni 7, I-35131 Padova, Italy
+# Phone: (+39) 049 8275909, FAX: (+39) 049 8758596
+# http://www.math.unipd.it/~artico
+#
+# This is a totally new translation made in March-April 2002
+# and revised in May-June 2002.
+# Previously (may 1997) an Italian translation of Lynx 2.7 messages
+# was made by Sabato De Rosa. It couldn't be used here since
+# it did not employ the po method.
+# Thanks to the Italian translators group for valuable suggestions during
+# the revision process, in particular to:
+# Francesco Potorti` <pot@softwarelibero.it>,
+# Yuri <yuri@denver.sociol.unimi.it>, and
+# Emanuele Aina <tp@lists@linux.it>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lynx 2.8.4.pre2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"From: Giuliano Artico <artico@math.unipd.it>\n"
+
+# Look to "NdT" to locate some problems/doubts
+#. ******************************************************************
+#. * 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:29
+#, c-format
+msgid "Alert!: %s"
+msgstr "Attenzione! %s"
+
+# END of the file browser/F)ull menu
+# Following are from the File browser
+#: LYMessages.c:30
+msgid "Welcome"
+msgstr "Benvenuto"
+
+#: LYMessages.c:31
+msgid "Are you sure you want to quit?"
+msgstr "Uscire veramente da Lynx?"
+
+#: LYMessages.c:33
+msgid "Really exit from Lynx?"
+msgstr "Uscire davvero da Lynx?"
+
+#: LYMessages.c:35
+msgid "Connection interrupted."
+msgstr "Connessione interrotta."
+
+#: LYMessages.c:36
+msgid "Data transfer interrupted."
+msgstr "Trasferimento dati interrotto."
+
+#: LYMessages.c:37
+msgid "Cancelled!!!"
+msgstr "Annullato!"
+
+#: LYMessages.c:38
+msgid "Cancelling!"
+msgstr "Annullamento!"
+
+#: LYMessages.c:39
+msgid "Excellent!!!"
+msgstr "Ottimo!"
+
+#: LYMessages.c:40
+msgid "OK"
+msgstr "OK"
+
+#: LYMessages.c:41
+msgid "Done!"
+msgstr "Fatto!"
+
+#: LYMessages.c:42
+msgid "Bad request!"
+msgstr "Richiesta non corretta!"
+
+#: LYMessages.c:43
+msgid "previous"
+msgstr "precedente"
+
+#: LYMessages.c:44
+msgid "next screen"
+msgstr "prossima schermata"
+
+#: LYMessages.c:45
+msgid "HELP!"
+msgstr "AIUTO!"
+
+#: LYMessages.c:46
+msgid ", help on "
+msgstr ", aiuto attivato "
+
+#. #define HELP
+#: LYMessages.c:48
+msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
+msgstr "Su/Giù per muoversi, '?' per aiuto, 'q' per uscire, '<-' per tornare indietro."
+
+#. #define MOREHELP
+#: LYMessages.c:50
+msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
+msgstr "-- spazio per proseguire, Su/Giù per spostare, '?' per aiuto, 'q' per uscire"
+
+#: LYMessages.c:51
+msgid "-- press space for next page --"
+msgstr "-- premere la barra spaziatrice per andare alla prossima pagina --"
+
+#: LYMessages.c:52
+msgid "URL too long"
+msgstr "URL troppo lungo"
+
+#. Inactive input fields, messages used with -tna option - kw
+#. #define FORM_LINK_TEXT_MESSAGE_INA
+#: LYMessages.c:58
+msgid "(Text entry field) Inactive.  Press <return> to activate."
+msgstr "(Campo testo) Non attivo.  Premere <Invio> per attivare."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
+#: LYMessages.c:60
+msgid "(Textarea) Inactive.  Press <return> to activate."
+msgstr "(Area testo)  non attiva. Premere <Invio> per attivare."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
+#: LYMessages.c:62
+#, c-format
+msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
+msgstr "(Area testo)  non attiva. Premere <Invio> per attivare (%s per l'editor)."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
+#: LYMessages.c:64
+msgid "(Form field) Inactive.  Use <return> to edit."
+msgstr "(Campo del modulo) disattivato. Premere <Invio> per modificare."
+
+#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
+#: LYMessages.c:66
+#, c-format
+msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
+msgstr "(Campo del modulo) disattivato. Usare <Invio> per modificare (%s : rinnova)."
+
+#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
+#: LYMessages.c:68
+msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
+msgstr "Usare Invio per modificare, due volte Invio per confermare."
+
+#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
+#: LYMessages.c:70
+msgid "(mailto form field) Inactive.  Press <return> to change."
+msgstr "(Campo mailto) disattivato. Premere <Invio> per modificare."
+
+#. #define FORM_LINK_PASSWORD_MESSAGE_INA
+#: LYMessages.c:72
+msgid "(Password entry field) Inactive.  Press <return> to activate."
+msgstr "(Campo password) disattivato. Premere <Invio> per attivare."
+
+#. #define FORM_LINK_FILE_UNM_MSG
+#: LYMessages.c:75
+msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Campo file INALTERABILE) Usare Su/Giù oppure Tab per spostarsi."
+
+#. #define FORM_LINK_FILE_MESSAGE
+#: LYMessages.c:77
+msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Campo file) Scrivere il nome del file. Usare frecce Su/Giù o Tab per spostarsi."
+
+#. #define FORM_LINK_TEXT_MESSAGE
+#: LYMessages.c:79
+msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Campo immissione testo) Scrivere il testo. Usare Su/Giù o Tab per spostarsi."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE
+#: LYMessages.c:81
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
+msgstr "(Area testo) Scrivere il testo. Usare Su/Giù o Tab per spostarsi."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_E
+#: LYMessages.c:83
+#, c-format
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
+msgstr "Scrivere il testo. Usare Su/Giù o Tab per spostarsi (%s per l'editor)."
+
+#. #define FORM_LINK_TEXT_UNM_MSG
+#: LYMessages.c:85
+msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
+msgstr "Campo testo modulo INALTERABILE. Usare frecce su/giù o Tab per spostarsi."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
+#: LYMessages.c:87
+msgid "(Form field) Enter text.  Use <return> to submit."
+msgstr "(Campo del modulo) Scrivere il testo. Battere <Invio> per confermare."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
+#: LYMessages.c:89
+#, c-format
+msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
+msgstr "Scrivere il testo. Usare <Invio> per confermare (%s : rinnova)."
+
+#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
+#: LYMessages.c:91
+msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
+msgstr "Scrivere il testo. Usare <Invio> per confermare, frecce o Tab per spostarsi."
+
+#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
+#: LYMessages.c:93
+msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
+msgstr "Campo modulo INALTERABILE. Usare frecce su/giù o Tab per spostarsi."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
+#: LYMessages.c:95
+msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
+msgstr "(Campo mailto) Scrivere il testo. Confermare con <Invio>, spostarsi con frecce."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:97
+msgid "(mailto form field) Mail is disallowed so you cannot submit."
+msgstr "(Campo mailto) L'invio di mail è disattivato, impossibile spedire."
+
+#. #define FORM_LINK_PASSWORD_MESSAGE
+#: LYMessages.c:99
+msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Campo password) Scrivere il testo. Premere Su/Giù o Tab per spostarsi."
+
+#. #define FORM_LINK_PASSWORD_UNM_MSG
+#: LYMessages.c:101
+msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
+msgstr "Campo password INALTERABILE. Premere Su/Giù o Tab per spostarsi."
+
+#. #define FORM_LINK_CHECKBOX_MESSAGE
+#: LYMessages.c:103
+msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
+msgstr "(Casella di scelta) Usare la freccia destra o <Invio> per cambiare stato."
+
+#. #define FORM_LINK_CHECKBOX_UNM_MSG
+#: LYMessages.c:105
+msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
+msgstr "Casella di scelta INALTERABILE. Usare Su/Giù o Tab per spostarsi."
+
+#. #define FORM_LINK_RADIO_MESSAGE
+#: LYMessages.c:107
+msgid "(Radio Button)   Use right-arrow or <return> to toggle."
+msgstr "(Bottone radio) Usare la freccia destra o <Invio> per cambiare stato."
+
+#. #define FORM_LINK_RADIO_UNM_MSG
+#: LYMessages.c:109
+msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
+msgstr "Bottone radio INALTERABILE. Usare Su/Giù o Tab per spostarsi."
+
+#. #define FORM_LINK_SUBMIT_PREFIX
+#: LYMessages.c:111
+msgid "Submit ('x' for no cache) to "
+msgstr "Invia ('x' per annullare la cache) a "
+
+#. #define FORM_LINK_RESUBMIT_PREFIX
+#: LYMessages.c:113
+msgid "Submit to "
+msgstr "Invia a "
+
+#. #define FORM_LINK_SUBMIT_MESSAGE
+#: LYMessages.c:115
+msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
+msgstr "(Bottone di invio) Usare freccia destra o <Invio> per confermare ('x': rinnova)"
+
+#. #define FORM_LINK_RESUBMIT_MESSAGE
+#: LYMessages.c:117
+msgid "(Form submit button) Use right-arrow or <return> to submit."
+msgstr "(Bottone di invio) Usare la freccia destra o <Invio> per confermare."
+
+#. #define FORM_LINK_SUBMIT_DIS_MSG
+#: LYMessages.c:119
+msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
+msgstr "Bottone di invio disattivato. Usare Su/Giù oppure Tab per spostarsi."
+
+#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
+#: LYMessages.c:121
+msgid "Submit mailto form to "
+msgstr "Invia il modulo tramite mail a "
+
+#. #define FORM_LINK_SUBMIT_MAILTO_MSG
+#: LYMessages.c:123
+msgid "(mailto form submit button) Use right-arrow or <return> to submit."
+msgstr "(Bottone di invio posta) Usare la freccia destra o <Invio> per confermare."
+
+#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:125
+msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
+msgstr "(Bottone di invio) L'invio di mail è disattivato, impossibile spedire."
+
+#. #define FORM_LINK_RESET_MESSAGE
+#: LYMessages.c:127
+msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
+msgstr "(Bottone) Riporta il modulo ai valori predefiniti con freccia destra o <Invio>."
+
+#. #define FORM_LINK_RESET_DIS_MSG
+#: LYMessages.c:129
+msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
+msgstr "Bottone di azzeramento disabilitato. Usare Su/Giù o Tab per spostarsi."
+
+#. #define FORM_LINK_OPTION_LIST_MESSAGE
+#: LYMessages.c:131
+msgid "(Option list) Hit return and use arrow keys and return to select option."
+msgstr "(Elenco opzioni) Premere Invio, scegliere con le frecce e confermare con Invio."
+
+# /maxwell/lynx2.7.1/LYMessages_en.h
+#. #define CHOICE_LIST_MESSAGE
+#: LYMessages.c:133
+msgid "(Choice list) Hit return and use arrow keys and return to select option."
+msgstr "(Elenco scelte) Premere Invio, scegliere con le frecce e confermare con Invio."
+
+#. #define FORM_LINK_OPTION_LIST_UNM_MSG
+#: LYMessages.c:135
+msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
+msgstr "Lista opzioni INALTERABILE. Usare frecce o <Invio> per esaminare e abbandonare."
+
+#. #define CHOICE_LIST_UNM_MSG
+#: LYMessages.c:137
+msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
+msgstr "Lista scelte INALTERABILE. Usare frecce o <Invio> per esaminare e abbandonare."
+
+#: LYMessages.c:138
+msgid "Submitting form..."
+msgstr "Invio del modulo in corso..."
+
+#: LYMessages.c:139
+msgid "Resetting form..."
+msgstr "Azzeramento del modulo in corso..."
+
+#. #define RELOADING_FORM
+#: LYMessages.c:141
+msgid "Reloading document.  Any form entries will be lost!"
+msgstr "Ricarico il documento. I dati immessi nel modulo andranno persi!"
+
+#: LYMessages.c:142
+#, c-format
+msgid "Warning: Cannot transcode form data to charset %s!"
+msgstr "Attenzione: impossibile convertire nella tabella %s i dati del modulo."
+
+#. #define NORMAL_LINK_MESSAGE
+#: LYMessages.c:145
+msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
+msgstr "Usare la freccia destra o <Invio> per attivare il collegamento."
+
+#: LYMessages.c:146
+msgid "The resource requested is not available at this time."
+msgstr "La risorsa richiesta non è disponibile in questo momento."
+
+#: LYMessages.c:147
+msgid "Enter Lynx keystroke command: "
+msgstr "Immetti il comando di Lynx con la tastiera: "
+
+#: LYMessages.c:148
+msgid "Looking up "
+msgstr "Ricerca di "
+
+#: LYMessages.c:149
+#, c-format
+msgid "Getting %s"
+msgstr "Acquisizione di %s"
+
+#: LYMessages.c:150
+#, c-format
+msgid "Skipping %s"
+msgstr "Ignoro %s"
+
+#: LYMessages.c:151
+#, c-format
+msgid "Using %s"
+msgstr "Utilizzo %s"
+
+#: LYMessages.c:152
+#, c-format
+msgid "Illegal URL: %s"
+msgstr "URL illecito: %s"
+
+#: LYMessages.c:153
+#, c-format
+msgid "Badly formed address %s"
+msgstr "Indirizzo scorretto %s"
+
+#: LYMessages.c:154
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: LYMessages.c:155
+msgid "Unable to access WWW file!!!"
+msgstr "Impossibile accedere al file WWW!"
+
+#: LYMessages.c:156
+#, c-format
+msgid "This is a searchable index.  Use %s to search."
+msgstr "Questo è un indice consultabile. Usare %s per cercare."
+
+#. #define WWW_INDEX_MORE_MESSAGE
+#: LYMessages.c:158
+#, c-format
+msgid "--More--  This is a searchable index.  Use %s to search."
+msgstr "-Segue- Questo è un indice consultabile. Usare %s per cercare."
+
+#: LYMessages.c:159
+msgid "You have entered an invalid link number."
+msgstr "Il numero di link immesso non è valido."
+
+#. #define SOURCE_HELP
+#: LYMessages.c:161
+msgid "Currently viewing document source.  Press '\\' to return to rendered version."
+msgstr "È visualizzato il codice sorgente. Premere '\\' per la versione ipertestuale."
+
+#. #define NOVICE_LINE_ONE
+#: LYMessages.c:163
+msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
+msgstr "Frecce: su/giù per muoversi, destra per il link, sinistra per tornare indietro. \n"
+
+#. #define NOVICE_LINE_TWO
+#: LYMessages.c:165
+msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
+msgstr " H=aiuto O=opzioni P=stampa G=vai... M=Pagina di avvio Q=fine /=cerca ^H=storia \n"
+
+#. #define NOVICE_LINE_TWO_A
+#: LYMessages.c:167
+msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
+msgstr " O=altri cmd H=aiuto K=tasti G=vai... P=stampa M=prima pagina o=opzioni Q=fine\n"
+
+#. #define NOVICE_LINE_TWO_B
+#: LYMessages.c:169
+msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
+msgstr " O=altri cmd B=PaginaPrec E=editor D=scarica ^R=ricarica ^W=rinnova /=cerca\n"
+
+# NOVICE_LINE_TWO_C
+#. #define NOVICE_LINE_TWO_C
+#: LYMessages.c:171
+msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
+msgstr "O=altri cmd C=commento ^H=storia Segnalibri: V=vedi A=aggiungi R=rimuovi\n"
+
+#  Z)ap Transfer missing from line, since it does nothing
+#. #define FORM_NOVICELINE_ONE
+#: LYMessages.c:173
+msgid "            Enter text into the field by typing on the keyboard              "
+msgstr "            Usare la tastiera per immettere il testo nel campo               "
+
+#. #define FORM_NOVICELINE_TWO
+#: LYMessages.c:175
+msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
+msgstr " Ctrl-U cancella tutto il testo del campo, [Backspace] cancella un carattere "
+
+#. #define FORM_NOVICELINE_TWO_DELBL
+#: LYMessages.c:177
+msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
+msgstr "   Ctrl-U cancella il testo del campo, [Backspace] cancella un carattere   "
+
+#. #define FORM_NOVICELINE_TWO_VAR
+#: LYMessages.c:179
+#, c-format
+msgid "    %s to delete all text in field, [Backspace] to delete a character    "
+msgstr "%s cancella tutto il testo del campo, [Backspace] cancella un carattere  "
+
+#. #define FORM_NOVICELINE_TWO_DELBL_VAR
+#: LYMessages.c:181
+#, c-format
+msgid "      %s to delete text in field, [Backspace] to delete a character    "
+msgstr "  %s cancella il testo del campo, [Backspace] cancella un carattere    "
+
+#. mailto
+#: LYMessages.c:184
+msgid "Malformed mailto form submission!  Cancelled!"
+msgstr "Invio del modulo mailto malfatto. Richiesta annullata!"
+
+#: LYMessages.c:185
+msgid "Warning!  Control codes in mail address replaced by ?"
+msgstr "Attenzione! I codici di controllo dell'indirizzo sono stati sostituiti con ?"
+
+#: LYMessages.c:186
+msgid "Mail disallowed!  Cannot submit."
+msgstr "Invio di mail disattivato! Impossibile spedire."
+
+#: LYMessages.c:187
+msgid "Mailto form submission failed!"
+msgstr "Impossibile spedire il modulo mailto!"
+
+#: LYMessages.c:188
+msgid "Mailto form submission Cancelled!!!"
+msgstr "Spedizione del modulo mailto annullata!"
+
+#: LYMessages.c:189
+msgid "Sending form content..."
+msgstr "Spedizione del contenuto del modulo..."
+
+#: LYMessages.c:190
+msgid "No email address is present in mailto URL!"
+msgstr "Non è presente alcun indirizzo E-mail nell'URL mailto!"
+
+#. #define MAILTO_URL_TEMPOPEN_FAILED
+#: LYMessages.c:192
+msgid "Unable to open temporary file for mailto URL!"
+msgstr "Impossibile aprire il file temporaneo per l'URL mailto!"
+
+#. #define INC_ORIG_MSG_PROMPT
+#: LYMessages.c:194
+msgid "Do you wish to include the original message?"
+msgstr "Si desidera accludere il messaggio originale?"
+
+#. #define INC_PREPARSED_MSG_PROMPT
+#: LYMessages.c:196
+msgid "Do you wish to include the preparsed source?"
+msgstr "Si desidera accludere il sorgente preanalizzato?"
+
+#. #define SPAWNING_EDITOR_FOR_MAIL
+#: LYMessages.c:198
+msgid "Spawning your selected editor to edit mail message"
+msgstr "Avvio l'editor prescelto per l'elaborazione del messaggio E-mail."
+
+#. #define ERROR_SPAWNING_EDITOR
+#: LYMessages.c:200
+msgid "Error spawning editor, check your editor definition in the options menu"
+msgstr "Errore nell'avvio dell'editor. Verificare il nome nel menù opzioni."
+
+#: LYMessages.c:201
+msgid "Send this comment?"
+msgstr "Spedire questo commento?"
+
+#: LYMessages.c:202
+msgid "Send this message?"
+msgstr "Spedire questo messaggio?"
+
+#: LYMessages.c:203
+msgid "Sending your message..."
+msgstr "Invio del messaggio in corso..."
+
+#: LYMessages.c:204
+msgid "Sending your comment:"
+msgstr "Invio del commento:"
+
+#. textarea
+#: LYMessages.c:207
+msgid "Not in a TEXTAREA; cannot use external editor."
+msgstr "Qui non si può immettere testo (né usare l'editor esterno)."
+
+#: LYMessages.c:208
+msgid "Not in a TEXTAREA; cannot use command."
+msgstr "Qui non si può immettere testo: impossibile usare questo comando."
+
+#: LYMessages.c:211
+msgid "file: ACTIONs are disallowed!"
+msgstr "L'attributo ACTION non è ammesso con l'URL 'file:'"
+
+#. #define FILE_SERVED_LINKS_DISALLOWED
+#: LYMessages.c:213
+msgid "file: URLs via served links are disallowed!"
+msgstr "L'URL 'file:' non è ammesso nei collegamenti tramite server."
+
+#: LYMessages.c:214
+msgid "Access to local files denied."
+msgstr "Accesso negato ai file locali."
+
+#: LYMessages.c:215
+msgid "file: URLs via bookmarks are disallowed!"
+msgstr "L'URL 'file:' non è ammesso nei segnalibri."
+
+#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
+#: LYMessages.c:217
+msgid "This special URL is not allowed in external documents!"
+msgstr "Questo particolare URL non è ammesso nei documenti esterni!"
+
+#: LYMessages.c:218
+msgid "Press <return> to return to Lynx."
+msgstr "Premere <Invio> per rientrare in Lynx."
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:221
+msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
+msgstr "Avvio di un sottoprocesso DCL; «logout» per rientrare in Lynx.\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:225
+msgid "Type EXIT to return to Lynx.\n"
+msgstr "Scrivere «EXIT» per rientrare in Lynx.\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:228
+msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
+msgstr "Avvio la shell predefinita. Scrivere «exit» per rientrare in Lynx.\n"
+
+#: LYMessages.c:231
+msgid "Spawning is currently disabled."
+msgstr "In questo momento l'avvio è disattivato."
+
+#: LYMessages.c:232
+msgid "The 'd'ownload command is currently disabled."
+msgstr "In questo momento il comando «d» (scaricamento) è disattivato."
+
+#: LYMessages.c:233
+msgid "You cannot download an input field."
+msgstr "Impossibile scaricare un campo di immissione di un modulo."
+
+#: LYMessages.c:234
+msgid "Form has a mailto action!  Cannot download."
+msgstr "Il modulo contiene un'azione 'mailto:'! Scaricamento impossibile."
+
+#: LYMessages.c:235
+msgid "You cannot download a mailto: link."
+msgstr "Impossibile scaricare un link di tipo mailto."
+
+#: LYMessages.c:236
+msgid "You cannot download cookies."
+msgstr "Impossibile scaricare i cookie."
+
+#: LYMessages.c:237
+msgid "You cannot download a printing option."
+msgstr "Impossibile scaricare un'opzione di stampa."
+
+#: LYMessages.c:238
+msgid "You cannot download an upload option."
+msgstr "Impossibile scaricare un'opzione di caricamento."
+
+#: LYMessages.c:239
+msgid "You cannot download an permit option."
+msgstr "Impossibile scaricare un'opzione di permesso."
+
+#: LYMessages.c:240
+msgid "This special URL cannot be downloaded!"
+msgstr "Questo particolare URL non può essere scaricato!"
+
+#: LYMessages.c:241
+msgid "Nothing to download."
+msgstr "Non c'è nulla da scaricare."
+
+#: LYMessages.c:242
+msgid "Trace ON!"
+msgstr "Tracciamento ATTIVATO."
+
+#: LYMessages.c:243
+msgid "Trace OFF!"
+msgstr "Tracciamento DISATTIVATO."
+
+#. #define CLICKABLE_IMAGES_ON
+#: LYMessages.c:245
+msgid "Links will be included for all images!  Reloading..."
+msgstr "I link saranno inclusi per tutte le immagini! Aggiornamento..."
+
+#. #define CLICKABLE_IMAGES_OFF
+#: LYMessages.c:247
+msgid "Standard image handling restored!  Reloading..."
+msgstr "Ripristino del normale trattamento per le immagini. Aggiornamento..."
+
+#. #define PSEUDO_INLINE_ALTS_ON
+#: LYMessages.c:249
+msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
+msgstr "Verranno inseriti 'pseudo-ALT' per le immagini prive di ALT! Aggiornamento..."
+
+#. #define PSEUDO_INLINE_ALTS_OFF
+#: LYMessages.c:251
+msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
+msgstr "Le immagini prive dell'attributo ALT verranno ignorate! Aggiornamento..."
+
+#: LYMessages.c:252
+msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
+msgstr "Modo 8-bit o CJK DISATTIVATO! Aggiornamento..."
+
+#: LYMessages.c:253
+msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
+msgstr "Modo 8-bit o CJK ATTIVATO! Aggiornamento..."
+
+#. #define HEAD_D_L_OR_CANCEL
+#: LYMessages.c:255
+msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
+msgstr "Inviare richiesta HEAD per D)ocumento, L)ink o C) Annullare? (d,l,c): "
+
+#. #define HEAD_D_OR_CANCEL
+#: LYMessages.c:257
+msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
+msgstr "Inviare richiesta HEAD per D)ocumento o C) Annullare? (d,c): "
+
+#: LYMessages.c:258
+msgid "Sorry, the document is not an http URL."
+msgstr "Spiacente, il documento non è un URL http."
+
+#: LYMessages.c:259
+msgid "Sorry, the link is not an http URL."
+msgstr "Spiacente, il documento non è un URL http."
+
+#: LYMessages.c:260
+msgid "Sorry, the ACTION for this form is disabled."
+msgstr "Spiacente, l'attributo ACTION per questo modulo non è valido."
+
+#. #define FORM_ACTION_NOT_HTTP_URL
+#: LYMessages.c:262
+msgid "Sorry, the ACTION for this form is not an http URL."
+msgstr "Spiacente, l'attributo ACTION per questo modulo non è un URL http."
+
+#: LYMessages.c:263
+msgid "Not an http URL or form ACTION!"
+msgstr "L'elemento non è né un URL http né un attributo ACTION!"
+
+#: LYMessages.c:264
+msgid "This special URL cannot be a form ACTION!"
+msgstr "Questo particolare URL non può essere un attributo ACTION."
+
+#: LYMessages.c:265
+msgid "URL is not in starting realm!"
+msgstr "L'URL non è nel dominio di partenza specificato!"
+
+#: LYMessages.c:266
+msgid "News posting is disabled!"
+msgstr "L'invio di contributi Usenet (news) è disattivato!"
+
+#: LYMessages.c:267
+msgid "File management support is disabled!"
+msgstr "Il supporto della gestione dei file è disattivato!"
+
+#: LYMessages.c:268
+msgid "No jump file is currently available."
+msgstr "Non è disponibile alcun file di abbreviazioni (jumps file)."
+
+#: LYMessages.c:269
+msgid "Jump to (use '?' for list): "
+msgstr "Abbreviazione ('?' per l'elenco): "
+
+#: LYMessages.c:270
+msgid "Jumping to a shortcut URL is disallowed!"
+msgstr "L'accesso ad un URL abbreviato (jump) non è consentito!"
+
+#: LYMessages.c:271
+msgid "Random URL is disallowed!  Use a shortcut."
+msgstr "L'URL esplicito non è ammesso! Usare un'abbreviazione."
+
+#: LYMessages.c:272
+msgid "No random URLs have been used thus far."
+msgstr "Finora non è stato usato alcun URL esplicito."
+
+#: LYMessages.c:273
+msgid "Bookmark features are currently disabled."
+msgstr "Le funzioni riguardanti i segnalibri sono attualmente disattivate."
+
+#: LYMessages.c:274
+msgid "Execution via bookmarks is disabled."
+msgstr "L'esecuzione a partire dai segnalibri è disattivata."
+
+#. #define BOOKMARK_FILE_NOT_DEFINED
+#: LYMessages.c:276
+#, c-format
+msgid "Bookmark file is not defined. Use %s to see options."
+msgstr "Il file dei segnalibri non è definito. Usare %s per vedere le opzioni."
+
+#. #define NO_TEMP_FOR_HOTLIST
+#: LYMessages.c:278
+msgid "Unable to open tempfile for X Mosaic hotlist conversion."
+msgstr "Impossibile aprire il file temporaneo per convertire la hotlist di X Mosaic."
+
+#: LYMessages.c:279
+msgid "ERROR - unable to open bookmark file."
+msgstr "Errore - Impossibile aprire il file dei segnalibri."
+
+#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:281
+msgid "Unable to open bookmark file for deletion of link."
+msgstr "Impossibile aprire il file dei segnalibri per la cancellazione della voce."
+
+#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:283
+msgid "Unable to open scratch file for deletion of link."
+msgstr "Impossibile aprire il file di lavoro per la cancellazione del link."
+
+#: LYMessages.c:285
+msgid "Error renaming scratch file."
+msgstr "Errore nel rinominare il file di lavoro."
+
+#: LYMessages.c:287
+msgid "Error renaming temporary file."
+msgstr "Errore nel rinominare il file temporaneo."
+
+#. #define BOOKTEMP_COPY_FAIL
+#: LYMessages.c:289
+msgid "Unable to copy temporary file for deletion of link."
+msgstr "Impossibile copiare il file temporaneo (per l'eliminazione del link)."
+
+#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
+#: LYMessages.c:291
+msgid "Unable to reopen temporary file for deletion of link."
+msgstr "Impossibile riaprire il file temporaneo per l'eliminazione del link."
+
+#. #define BOOKMARK_LINK_NOT_ONE_LINE
+#: LYMessages.c:294
+msgid "Link is not by itself all on one line in bookmark file."
+msgstr "Il link non è contenuto in un'unica riga nel file dei segnalibri."
+
+#: LYMessages.c:295
+msgid "Bookmark deletion failed."
+msgstr "Impossibile cancellare il segnalibro."
+
+#. #define BOOKMARKS_NOT_TRAVERSED
+#: LYMessages.c:297
+msgid "Bookmark files cannot be traversed (only http URLs)."
+msgstr "Impossibile scorrere i file di segnalibri (solo gli URL http)."
+
+#. #define BOOKMARKS_NOT_OPEN
+#: LYMessages.c:299
+msgid "Unable to open bookmark file, use 'a' to save a link first"
+msgstr "Impossibile aprire il file; devi prima memorizzare un segnalibro con 'a'."
+
+#: LYMessages.c:300
+msgid "There are no links in this bookmark file!"
+msgstr "Non c'è alcuna voce in questo file di segnalibri!"
+
+#. #define BOOK_D_L_OR_CANCEL
+#: LYMessages.c:302
+msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
+msgstr "D) Conserva il documento, L) Conserva il link, C) Annulla? (d,l,c): "
+
+#: LYMessages.c:303
+msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
+msgstr "D) registra il documento nei segnalibri o C) Annulla? (d,c): "
+
+#: LYMessages.c:304
+msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
+msgstr "L) registra il link nei segnalibri o C) Annulla? (l,c): "
+
+#. #define NOBOOK_POST_FORM
+#: LYMessages.c:306
+msgid "Documents from forms with POST content cannot be saved as bookmarks."
+msgstr "Non si possono conservare nei segnalibri documenti da moduli con contenuto POST"
+
+#: LYMessages.c:307
+msgid "Cannot save form fields/links"
+msgstr "Impossibile conservare campi o link di un modulo."
+
+#. #define NOBOOK_HSML
+#: LYMessages.c:309
+msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
+msgstr "Impossibile conservare nei segnalibri storia, informazioni, menù e riferimenti."
+
+#. #define CONFIRM_BOOKMARK_DELETE
+#: LYMessages.c:311
+msgid "Do you really want to delete this link from your bookmark file?"
+msgstr "Cancellare questa voce dal file dei segnalibri?"
+
+#: LYMessages.c:312
+msgid "Malformed address."
+msgstr "Indirizzo malfatto."
+
+#. #define HISTORICAL_ON_MINIMAL_OFF
+#: LYMessages.c:314
+msgid "Historical comment parsing ON (Minimal is overridden)!"
+msgstr "Analisi storica dei commenti ATTIVATA (analisi minima annullata)!"
+
+#. #define HISTORICAL_OFF_MINIMAL_ON
+#: LYMessages.c:316
+msgid "Historical comment parsing OFF (Minimal is in effect)!"
+msgstr "Analisi storica dei commenti DISATTIVATA (analisi minima in atto)!"
+
+#. #define HISTORICAL_ON_VALID_OFF
+#: LYMessages.c:318
+msgid "Historical comment parsing ON (Valid is overridden)!"
+msgstr "Analisi storica dei commenti ATTIVATA (analisi di validità annullata)!"
+
+#. #define HISTORICAL_OFF_VALID_ON
+#: LYMessages.c:320
+msgid "Historical comment parsing OFF (Valid is in effect)!"
+msgstr "Analisi storica dei commenti DISATTIVATA (analisi di validità in atto)!"
+
+#. #define MINIMAL_ON_IN_EFFECT
+#: LYMessages.c:322
+msgid "Minimal comment parsing ON (and in effect)!"
+msgstr "Analisi minima dei commenti ATTIVATA (e in atto)!"
+
+#. #define MINIMAL_OFF_VALID_ON
+#: LYMessages.c:324
+msgid "Minimal comment parsing OFF (Valid is in effect)!"
+msgstr "Analisi minima dei commenti DISATTIVATA (analisi di validità in atto)!"
+
+#. #define MINIMAL_ON_BUT_HISTORICAL
+#: LYMessages.c:326
+msgid "Minimal comment parsing ON (but Historical is in effect)!"
+msgstr "Analisi minima dei commenti ATTIVATA (ma analisi storica in atto)!"
+
+#. #define MINIMAL_OFF_HISTORICAL_ON
+#: LYMessages.c:328
+msgid "Minimal comment parsing OFF (Historical is in effect)!"
+msgstr "Analisi minima dei commenti DISATTIVATA (analisi storica in atto)!"
+
+#: LYMessages.c:329
+msgid "Soft double-quote parsing ON!"
+msgstr "Analisi flessibile delle virgolette (soft double-quote) ATTIVATA!"
+
+#: LYMessages.c:330
+msgid "Soft double-quote parsing OFF!"
+msgstr "Analisi flessibile delle virgolette (soft double-quote) DISATTIVATA!"
+
+#: LYMessages.c:331
+msgid "Now using TagSoup parsing of HTML."
+msgstr "Analisi dell'HTML in stile TagSoup (meno rigida)."
+
+#: LYMessages.c:332
+msgid "Now using SortaSGML parsing of HTML!"
+msgstr "Analisi dell'HTML in stile SortaSGML (più rigida)."
+
+#: LYMessages.c:333
+msgid "You are already at the end of this document."
+msgstr "Siamo già alla fine del documento."
+
+#: LYMessages.c:334
+msgid "You are already at the beginning of this document."
+msgstr "Siamo già all'inizio del documento."
+
+#: LYMessages.c:335
+#, c-format
+msgid "You are already at page %d of this document."
+msgstr "Siamo già alla pagina %d del documento."
+
+#  Needs context for LINK_ALREADY_CURRENT
+#  Prints "Enter link number to follow: "
+#  User enters 5
+#  Their cursor was on the 5th link, so it says:
+#   "Link number 5 already is current."
+#: LYMessages.c:336
+#, c-format
+msgid "Link number %d already is current."
+msgstr "Il link %d è già quello attuale."
+
+#: LYMessages.c:337
+msgid "You are already at the first document"
+msgstr "Siamo già nel primo documento."
+
+#: LYMessages.c:338
+msgid "There are no links above this line of the document."
+msgstr "Non ci sono link al di sopra di questa riga del documento."
+
+#: LYMessages.c:339
+msgid "There are no links below this line of the document."
+msgstr "Non ci sono link al di sotto di questa riga del documento."
+
+#. #define MAXLEN_REACHED_DEL_OR_MOV
+#: LYMessages.c:341
+msgid "Maximum length reached!  Delete text or move off field."
+msgstr "Raggiunta la lunghezza massima! Togliere qualcosa o uscire dal campo."
+
+#. #define NOT_ON_SUBMIT_OR_LINK
+#: LYMessages.c:343
+msgid "You are not on a form submission button or normal link."
+msgstr "Non siamo su un bottone di invio o su un link normale."
+
+#. #define NEED_CHECKED_RADIO_BUTTON
+#: LYMessages.c:345
+msgid "One radio button must be checked at all times!"
+msgstr "Si deve attivare un solo bottone radio per volta!"
+
+#: LYMessages.c:346
+msgid "No submit button for this form, submit single text field?"
+msgstr "Nel modulo non c'è un bottone di invio. Invio il campo di testo singolo?"
+
+#: LYMessages.c:347
+msgid "Do you want to go back to the previous document?"
+msgstr "Ritornare al documento precedente?"
+
+#: LYMessages.c:348
+msgid "Use arrows or tab to move off of field."
+msgstr "Usare le frecce o Tab per spostarsi da questo campo."
+
+#. #define ENTER_TEXT_ARROWS_OR_TAB
+#: LYMessages.c:350
+msgid "Enter text.  Use arrows or tab to move off of field."
+msgstr "Scrivere il testo. Premere Su/Giù o Tab per spostarsi al di fuori del campo."
+
+#: LYMessages.c:351
+msgid "** Bad HTML!!  No form action defined. **"
+msgstr "** Errore nel codice HTML! Non è definita alcuna azione per il modulo. **"
+
+#: LYMessages.c:352
+msgid "Bad HTML!!  Unable to create popup window!"
+msgstr "Errore nel codice HTML! Impossibile far comparire la finestra."
+
+#: LYMessages.c:353
+msgid "Unable to create popup window!"
+msgstr "Impossibile far comparire la finestra."
+
+#: LYMessages.c:354
+msgid "Goto a random URL is disallowed!"
+msgstr "Il rinvio ad un URL esplicito non è ammesso."
+
+#: LYMessages.c:355
+msgid "Goto a non-http URL is disallowed!"
+msgstr "Non è ammesso il rinvio ad un URL non HTTP!"
+
+#: LYMessages.c:356
+#, c-format
+msgid "You are not allowed to goto \"%s\" URLs"
+msgstr "Non è consentito andare agli URL \"%s:\"."
+
+#: LYMessages.c:357
+msgid "URL to open: "
+msgstr "URL da aprire: "
+
+#: LYMessages.c:358
+msgid "Edit the current Goto URL: "
+msgstr "Modifica del Goto URL attuale: "
+
+#: LYMessages.c:359
+msgid "Edit the previous Goto URL: "
+msgstr "Modifica del Goto URL precedente: "
+
+#: LYMessages.c:360
+msgid "Edit a previous Goto URL: "
+msgstr "Editazione di un Goto URL precedente: "
+
+#: LYMessages.c:361
+msgid "Current document has POST data."
+msgstr "Il documento attuale contiene dati POST."
+
+#: LYMessages.c:362
+msgid "Edit this document's URL: "
+msgstr "Modifica l'URL di questo documento: "
+
+#: LYMessages.c:363
+msgid "Edit the current link's URL: "
+msgstr "Modifica l'URL del link attuale: "
+
+#: LYMessages.c:364
+msgid "You cannot edit File Management URLs"
+msgstr "Impossibile modificare gli URL dei file di gestione."
+
+#: LYMessages.c:365
+msgid "Enter a database query: "
+msgstr "Immetti una richiesta per la base di dati: "
+
+#: LYMessages.c:366
+msgid "Enter a whereis query: "
+msgstr "Scrivere il termine da cercare: "
+
+#: LYMessages.c:367
+msgid "Edit the current query: "
+msgstr "Modifica la ricerca attuale: "
+
+#: LYMessages.c:368
+msgid "Edit the previous query: "
+msgstr "Modifica la richiesta precedente: "
+
+#: LYMessages.c:369
+msgid "Edit a previous query: "
+msgstr "Modifica una ricerca precedente: "
+
+#. #define USE_C_R_TO_RESUB_CUR_QUERY
+#: LYMessages.c:371
+msgid "Use Control-R to resubmit the current query."
+msgstr "Premere Ctrl-R per avviare nuovamente la ricerca attuale."
+
+#: LYMessages.c:372
+msgid "Edit the current shortcut: "
+msgstr "Modifica l'abbreviazione attuale: "
+
+#: LYMessages.c:373
+msgid "Edit the previous shortcut: "
+msgstr "Modifica l'abbreviazione precedente: "
+
+#: LYMessages.c:374
+msgid "Edit a previous shortcut: "
+msgstr "Modifica un'abbreviazione precedente: "
+
+#: LYMessages.c:375
+#, c-format
+msgid "Key '%c' is not mapped to a jump file!"
+msgstr "Il tasto '%c' non corrisponde ad un file di abbreviazioni."
+
+#: LYMessages.c:376
+msgid "Cannot locate jump file!"
+msgstr "Non riesco a trovare il file delle abbreviazioni!"
+
+#: LYMessages.c:377
+msgid "Cannot open jump file!"
+msgstr "Impossibile aprire il file delle abbreviazioni!"
+
+#: LYMessages.c:378
+msgid "Error reading jump file!"
+msgstr "Errore nella lettura del file di abbreviazioni!"
+
+#: LYMessages.c:379
+msgid "Out of memory reading jump file!"
+msgstr "Memoria esaurita durante la lettura del file di abbreviazioni!"
+
+#: LYMessages.c:380
+msgid "Out of memory reading jump table!"
+msgstr "Memoria esaurita durante la lettura della tabella di abbreviazioni!"
+
+#: LYMessages.c:381
+msgid "No index is currently available."
+msgstr "Attualmente non è disponibile alcun indice."
+
+#. #define CONFIRM_MAIN_SCREEN
+#: LYMessages.c:383
+msgid "Do you really want to go to the Main screen?"
+msgstr "Andare alla pagina di avvio?"
+
+#: LYMessages.c:384
+msgid "You are already at main screen!"
+msgstr "Siamo già nella pagina di avvio!"
+
+#. #define NOT_ISINDEX
+#: LYMessages.c:386
+msgid "Not a searchable indexed document -- press '/' to search for a text string"
+msgstr "Documento non indicizzato. Usare \"/\" per cercare una parola o frase."
+
+#. #define NO_OWNER
+#: LYMessages.c:388
+msgid "No owner is defined for this file so you cannot send a comment"
+msgstr "Non è definito un proprietario del file, impossibile spedire un commento."
+
+#: LYMessages.c:389
+#, c-format
+msgid "No owner is defined. Use %s?"
+msgstr "Non è definito alcun proprietario. Usare %s?"
+
+#: LYMessages.c:390
+msgid "Do you wish to send a comment?"
+msgstr "Desideri inviare un commento?"
+
+#: LYMessages.c:391
+msgid "Mail is disallowed so you cannot send a comment"
+msgstr "La spedizione di mail è disattivata, impossibile inviare un commento."
+
+#: LYMessages.c:392
+msgid "The 'e'dit command is currently disabled."
+msgstr "Il comando 'e' (editor) è attualmente disattivato."
+
+#: LYMessages.c:393
+msgid "External editing is currently disabled."
+msgstr "La revisione esterna dei testi è attualmente disattivata."
+
+#: LYMessages.c:394
+msgid "System error - failure to get status."
+msgstr "Errore di sistema - impossibile rilevare lo stato."
+
+#: LYMessages.c:395
+msgid "No editor is defined!"
+msgstr "Non è definito alcun editor!"
+
+#: LYMessages.c:396
+msgid "The 'p'rint command is currently disabled."
+msgstr "Il comando 'p' (stampa) è attualmente disattivato."
+
+#: LYMessages.c:397
+msgid "Document has no Toolbar links or Banner."
+msgstr "Il documento non ha barre di strumenti o banner."
+
+#: LYMessages.c:398
+msgid "Unable to open traversal file."
+msgstr "Impossibile aprire il file dei percorsi (traversal file)."
+
+#: LYMessages.c:399
+msgid "Unable to open traversal found file."
+msgstr "Impossibile aprire il file dei percorsi trovato (traversal file)."
+
+#: LYMessages.c:400
+msgid "Unable to open reject file."
+msgstr "Impossibile aprire il file dei percorsi respinti."
+
+#: LYMessages.c:401
+msgid "Unable to open traversal errors output file"
+msgstr "Impossibile aprire il file con gli errori dei percorsi (traversal)"
+
+#: LYMessages.c:402
+msgid "TRAVERSAL WAS INTERRUPTED"
+msgstr "Rilevamento dei percorsi (traversal) INTERROTTO."
+
+#: LYMessages.c:403
+msgid "Follow link (or goto link or page) number: "
+msgstr "Accedere al link (o andare al link o alla pagina) numero: "
+
+#: LYMessages.c:404
+msgid "Select option (or page) number: "
+msgstr "Scegli l'opzione (o la pagina) numero: "
+
+#: LYMessages.c:405
+#, c-format
+msgid "Option number %d already is current."
+msgstr "L'opzione numero %d è già quella attuale."
+
+#. #define ALREADY_AT_OPTION_END
+#: LYMessages.c:407
+msgid "You are already at the end of this option list."
+msgstr "Siamo già alla fine di questa lista di opzioni."
+
+#. #define ALREADY_AT_OPTION_BEGIN
+#: LYMessages.c:409
+msgid "You are already at the beginning of this option list."
+msgstr "Siamo già all'inizio di questa lista di opzioni."
+
+#. #define ALREADY_AT_OPTION_PAGE
+#: LYMessages.c:411
+#, c-format
+msgid "You are already at page %d of this option list."
+msgstr "Siamo già alla pagina %d di questa lista di opzioni."
+
+#: LYMessages.c:412
+msgid "You have entered an invalid option number."
+msgstr "Il numero di opzione immesso non è valido."
+
+#: LYMessages.c:413
+msgid "** Bad HTML!!  Use -trace to diagnose. **"
+msgstr "** Errore nel codice HTML! Usare -trace per la diagnosi **"
+
+#: LYMessages.c:414
+msgid "Give name of file to save in"
+msgstr "Dai il nome del file da registrare in"
+
+#: LYMessages.c:415
+msgid "Can't save data to file -- please run WWW locally"
+msgstr "Inpossibile registrare i dati nel file - Avviare WWW localmente."
+
+#: LYMessages.c:416
+msgid "Can't open temporary file!"
+msgstr "Impossibile aprire il file temporaneo!"
+
+#: LYMessages.c:417
+msgid "Can't open output file!  Cancelling!"
+msgstr "Impossibile aprire il file di uscita! Richiesta annullata."
+
+#: LYMessages.c:418
+msgid "Execution is disabled."
+msgstr "L'esecuzione è disattivata."
+
+#. #define EXECUTION_DISABLED_FOR_FILE
+#: LYMessages.c:420
+#, c-format
+msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
+msgstr "Esecuzione disattivata per questo file. Vedere il menu Opzioni (usare %s)."
+
+#. #define EXECUTION_NOT_COMPILED
+#: LYMessages.c:422
+msgid "Execution capabilities are not compiled into this version."
+msgstr "Le funzionalità di esecuzione non sono compilate in questa versione."
+
+#: LYMessages.c:423
+msgid "This file cannot be displayed on this terminal."
+msgstr "Questo file non può essere visualizzato con questo terminale."
+
+#. #define CANNOT_DISPLAY_FILE_D_OR_C
+#: LYMessages.c:425
+msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
+msgstr "Non si può mostrare il file su questo terminale: D) scaricare o C) annullare"
+
+#: LYMessages.c:426
+#, c-format
+msgid "%s  D)ownload, or C)ancel"
+msgstr "%s  D) scaricare o C) annullare"
+
+#: LYMessages.c:427
+msgid "Cancelling file."
+msgstr "Annullamento!"
+
+#: LYMessages.c:428
+msgid "Retrieving file.  - PLEASE WAIT -"
+msgstr "Acquisizione del file. - ATTENDERE."
+
+#: LYMessages.c:429
+msgid "Enter a filename: "
+msgstr "Scrivere un nome di file: "
+
+#: LYMessages.c:430
+msgid "Edit the previous filename: "
+msgstr "Modificare il nome di file precedente: "
+
+#: LYMessages.c:431
+msgid "Edit a previous filename: "
+msgstr "Modificare nome di file precedente: "
+
+#: LYMessages.c:432
+msgid "Enter a new filename: "
+msgstr "Scrivere un nuovo nome di file: "
+
+#: LYMessages.c:433
+msgid "File name may not begin with a dot."
+msgstr "Un nome di file non può iniziare con punto."
+
+#: LYMessages.c:435
+msgid "File exists.  Create higher version?"
+msgstr "Il file esiste. Creare una nuova versione?"
+
+#: LYMessages.c:437
+msgid "File exists.  Overwrite?"
+msgstr "Questo file esiste già. Sovrascrivere?"
+
+#: LYMessages.c:439
+msgid "Cannot write to file."
+msgstr "Scrittura del file non consentita."
+
+#: LYMessages.c:440
+msgid "ERROR! - download command is misconfigured."
+msgstr "Errore - il comando di scaricamento è mal configurato."
+
+#: LYMessages.c:441
+msgid "Unable to download file."
+msgstr "Impossibile scaricare il file."
+
+#: LYMessages.c:442
+msgid "Reading directory..."
+msgstr "Lettura della directory..."
+
+#: LYMessages.c:443
+msgid "Building directory listing..."
+msgstr "Generazione dell'elenco della directory..."
+
+#: LYMessages.c:444
+msgid "Saving..."
+msgstr "Registrazione..."
+
+#: LYMessages.c:445
+#, c-format
+msgid "Could not edit file '%s'."
+msgstr "Impossibile elaborare il file '%s'."
+
+#: LYMessages.c:446
+msgid "Unable to access document!"
+msgstr "Impossibile accedere al documento!"
+
+#: LYMessages.c:447
+msgid "Could not access file."
+msgstr "Impossibile accedere al file."
+
+#: LYMessages.c:448
+msgid "Could not access directory."
+msgstr "Impossibile accedere alla directory."
+
+#: LYMessages.c:449
+msgid "Could not load data."
+msgstr "Impossibile scaricare i dati."
+
+#. #define CANNOT_EDIT_REMOTE_FILES
+#: LYMessages.c:451
+msgid "Lynx cannot currently (e)dit remote WWW files."
+msgstr "Lynx non può attualmente (E) elaborare i file W3 remoti."
+
+#. #define CANNOT_EDIT_FIELD
+#: LYMessages.c:453
+msgid "This field cannot be (e)dited with an external editor."
+msgstr "Questo campo non può essere trattato con un (E)ditor esterno."
+
+#: LYMessages.c:454
+msgid "Bad rule"
+msgstr "Regola malfatta."
+
+#: LYMessages.c:455
+msgid "Insufficient operands:"
+msgstr "Numero di operandi insufficiente."
+
+#: LYMessages.c:456
+msgid "You are not authorized to edit this file."
+msgstr "Manca l'autorizzazione per modificare questo file."
+
+#: LYMessages.c:457
+msgid "Title: "
+msgstr "Titolo: "
+
+#: LYMessages.c:458
+msgid "Subject: "
+msgstr "Oggetto: "
+
+#: LYMessages.c:459
+msgid "Username: "
+msgstr "Nome utente: "
+
+#: LYMessages.c:460
+msgid "Password: "
+msgstr "Password: "
+
+#: LYMessages.c:461
+msgid "lynx: Username and Password required!!!"
+msgstr "lynx: nome utente e password obbligatori!"
+
+#: LYMessages.c:462
+msgid "lynx: Password required!!!"
+msgstr "lynx: password obbligatoria!"
+
+# LYMessages_en.h
+#: LYMessages.c:463
+msgid "Clear all authorization info for this session?"
+msgstr "Eliminare tutte le info di autorizzazione per questa sessione?"
+
+#: LYMessages.c:464
+msgid "Authorization info cleared."
+msgstr "Informazioni di autorizzazione eliminate."
+
+#: LYMessages.c:465
+msgid "Authorization failed.  Retry?"
+msgstr "Autorizzazione non riuscita. Riprovare?"
+
+#: LYMessages.c:466
+msgid "cgi support has been disabled."
+msgstr "Il supporto cgi è stato disattivato."
+
+#. #define CGI_NOT_COMPILED
+#: LYMessages.c:468
+msgid "Lynxcgi capabilities are not compiled into this version."
+msgstr "Le funzionalità Lynxcgi non sono compilate in questa versione."
+
+#: LYMessages.c:469
+#, c-format
+msgid "Sorry, no known way of converting %s to %s."
+msgstr "Spiacente, non è noto alcun modo di convertire %s in %s. "
+
+#: LYMessages.c:470
+msgid "Unable to set up connection."
+msgstr "Impossibile stabilire la connessione."
+
+#: LYMessages.c:471
+msgid "Unable to make connection"
+msgstr "Impossibile realizzare la connessione."
+
+#. #define MALFORMED_EXEC_REQUEST
+#: LYMessages.c:473
+msgid "Executable link rejected due to malformed request."
+msgstr "Link eseguibile rifiutato a causa di richiesta malfatta."
+
+#. #define BADCHAR_IN_EXEC_LINK
+#: LYMessages.c:475
+#, c-format
+msgid "Executable link rejected due to `%c' character."
+msgstr "Link eseguibile rifiutato a causa del carattere `%c'."
+
+#. #define RELPATH_IN_EXEC_LINK
+#: LYMessages.c:477
+msgid "Executable link rejected due to relative path string ('../')."
+msgstr "Link eseguibile rifiutato a causa di un percorso relativo ('../')"
+
+#. #define BADLOCPATH_IN_EXEC_LINK
+#: LYMessages.c:479
+msgid "Executable link rejected due to location or path."
+msgstr "Link eseguibile rifiutato per la posizione o il percorso."
+
+#: LYMessages.c:480
+msgid "Mail access is disabled!"
+msgstr "L'accesso alla posta è disattivato!"
+
+#. #define ACCESS_ONLY_LOCALHOST
+#: LYMessages.c:482
+msgid "Only files and servers on the local host can be accessed."
+msgstr "Sono accessibili solo i file e i server del sistema locale."
+
+#: LYMessages.c:483
+msgid "Telnet access is disabled!"
+msgstr "L'accesso a Telnet è disattivato."
+
+#. #define TELNET_PORT_SPECS_DISABLED
+#: LYMessages.c:485
+msgid "Telnet port specifications are disabled."
+msgstr "Le specifiche delle porte Telnet sono disattivate."
+
+#: LYMessages.c:486
+msgid "USENET news access is disabled!"
+msgstr "L'accesso agli articoli Usenet (news) è disattivato."
+
+#: LYMessages.c:487
+msgid "Rlogin access is disabled!"
+msgstr "L'accesso Rlogin è disattivato."
+
+#: LYMessages.c:488
+msgid "Ftp access is disabled!"
+msgstr "L'accesso Ftp è disattivato."
+
+#: LYMessages.c:489
+msgid "There are no references from this document."
+msgstr "Non esistono riferimenti in questo documento."
+
+#: LYMessages.c:490
+msgid "There are only hidden links from this document."
+msgstr "Questo documento rinvia solo a link nascosti."
+
+#: LYMessages.c:492
+msgid "Unable to open command file."
+msgstr "Impossibile aprire il file dei comandi."
+
+#: LYMessages.c:494
+msgid "News Post Cancelled!!!"
+msgstr "Invio del contributo news annullato!"
+
+#. #define SPAWNING_EDITOR_FOR_NEWS
+#: LYMessages.c:496
+msgid "Spawning your selected editor to edit news message"
+msgstr "Avvio l'editor prescelto per l'elaborazione del messaggio news."
+
+#: LYMessages.c:497
+msgid "Post this message?"
+msgstr "Inviare questo messaggio?"
+
+#: LYMessages.c:498
+#, c-format
+msgid "Append '%s'?"
+msgstr "Accodare '%s'?"
+
+#: LYMessages.c:499
+msgid "Posting to newsgroup(s)..."
+msgstr "Invio il messaggio..."
+
+#: LYMessages.c:501
+msgid "*** You have unread mail. ***"
+msgstr "*** È presente posta non letta ***"
+
+#: LYMessages.c:503
+msgid "*** You have mail. ***"
+msgstr "*** È presente posta. ***"
+
+#: LYMessages.c:505
+msgid "*** You have new mail. ***"
+msgstr "*** È presente posta nuova. ***"
+
+#: LYMessages.c:506
+msgid "File insert cancelled!!!"
+msgstr "Inserimento del file annullato!!!"
+
+#: LYMessages.c:507
+msgid "Not enough memory for file!"
+msgstr "Memoria insufficiente per il file!"
+
+# WWW/Libary/Implementation/HTFile.c
+#: LYMessages.c:508
+msgid "Can't open file for reading."
+msgstr "Impossibile aprire il file per la lettura."
+
+#: LYMessages.c:509
+msgid "File does not exist."
+msgstr "Il file non esiste."
+
+#: LYMessages.c:510
+msgid "File does not exist - reenter or cancel:"
+msgstr "Il file non esiste - reinserisci o annulla:"
+
+#: LYMessages.c:511
+msgid "File is not readable."
+msgstr "Il file non è leggibile."
+
+#: LYMessages.c:512
+msgid "File is not readable - reenter or cancel:"
+msgstr "Il file non è leggibile - reinserisci o annulla:"
+
+#: LYMessages.c:513
+msgid "Nothing to insert - file is 0-length."
+msgstr "Nulla da inserire - il file è vuoto."
+
+#: LYMessages.c:514
+msgid "Save request cancelled!!!"
+msgstr "Richiesta di registrazione annullata!"
+
+#: LYMessages.c:515
+msgid "Mail request cancelled!!!"
+msgstr "Richiesta di spedizione annullata!"
+
+#. #define CONFIRM_MAIL_SOURCE_PREPARSED
+#: LYMessages.c:517
+msgid "Viewing preparsed source.  Are you sure you want to mail it?"
+msgstr "È visualizzato il sorgente preanalizzato. Inviare tramite mail?"
+
+#: LYMessages.c:518
+msgid "Please wait..."
+msgstr "Attendere..."
+
+#: LYMessages.c:519
+msgid "Mailing file.  Please wait..."
+msgstr "Invio del file in corso. Attendere..."
+
+#: LYMessages.c:520
+msgid "ERROR - Unable to mail file"
+msgstr "Errore - impossibile spedire il file."
+
+#. #define CONFIRM_LONG_SCREEN_PRINT
+#: LYMessages.c:522
+#, c-format
+msgid "File is %d screens long.  Are you sure you want to print?"
+msgstr "Il file è di %d schermate. Stampare veramente?"
+
+#: LYMessages.c:523
+msgid "Print request cancelled!!!"
+msgstr "Richiesta di stampa annullata!!!"
+
+#: LYMessages.c:524
+msgid "Press <return> to begin: "
+msgstr "Premere <Invio> per iniziare: "
+
+#: LYMessages.c:525
+msgid "Press <return> to finish: "
+msgstr "Premere <Invio> per terminare: "
+
+#. #define CONFIRM_LONG_PAGE_PRINT
+#: LYMessages.c:527
+#, c-format
+msgid "File is %d pages long.  Are you sure you want to print?"
+msgstr "Il file è di %d pagine. Stampare veramente?"
+
+#. #define CHECK_PRINTER
+#: LYMessages.c:529
+msgid "Be sure your printer is on-line.  Press <return> to start printing:"
+msgstr "Verificare che la stampante sia accesa. Premere <Invio> per avviare la stampa:"
+
+#: LYMessages.c:530
+msgid "ERROR - Unable to allocate file space!!!"
+msgstr "Errore - impossibile assegnare lo spazio per il file!"
+
+#: LYMessages.c:531
+msgid "Unable to open tempfile"
+msgstr "Impossibile aprire il file temporaneo."
+
+#: LYMessages.c:532
+msgid "Unable to open print options file"
+msgstr "Impossibile aprire il file con le opzioni di stampa."
+
+#: LYMessages.c:533
+msgid "Printing file.  Please wait..."
+msgstr "Stampa del file in corso. Attendere..."
+
+#: LYMessages.c:534
+msgid "Please enter a valid internet mail address: "
+msgstr "Scrivere un indirizzo di posta Internet valido: "
+
+#: LYMessages.c:535
+msgid "ERROR! - printer is misconfigured!"
+msgstr "Errore - la stampante è configurata male!"
+
+# src/LYMap.c
+#: LYMessages.c:536
+msgid "Image map from POST response not available!"
+msgstr "MAPPA immagine dalla risposta POST non disponibile!"
+
+#: LYMessages.c:537
+msgid "Misdirected client-side image MAP request!"
+msgstr "Errore nella richiesta di mappa immagine gestita dal client."
+
+#: LYMessages.c:538
+msgid "Client-side image MAP is not accessible!"
+msgstr "Inaccessibile la mappa immagine riferita al client!"
+
+#: LYMessages.c:539
+msgid "No client-side image MAPs are available!"
+msgstr "Non sono disponibili mappe immagine riferite al client!"
+
+#: LYMessages.c:540
+msgid "Client-side image MAP is not available!"
+msgstr "Non è disponibile la mappa immagine riferita al client!"
+
+#. #define OPTION_SCREEN_NEEDS_24
+#: LYMessages.c:543
+msgid "Screen height must be at least 24 lines for the Options menu!"
+msgstr "L'altezza dello schermo per il menù opzioni deve essere di almeno 24 righe!"
+
+#. #define OPTION_SCREEN_NEEDS_23
+#: LYMessages.c:545
+msgid "Screen height must be at least 23 lines for the Options menu!"
+msgstr "L'altezza dello schermo per il menù opzioni deve essere di almeno 23 righe!"
+
+#. #define OPTION_SCREEN_NEEDS_22
+#: LYMessages.c:547
+msgid "Screen height must be at least 22 lines for the Options menu!"
+msgstr "L'altezza dello schermo per il menù opzioni deve essere di almeno 22 righe!"
+
+#: LYMessages.c:549
+msgid "That key requires Advanced User mode."
+msgstr "Questo tasto è attivo solo nel modo «advanced» (utenti esperti)."
+
+#: LYMessages.c:550
+#, c-format
+msgid "Content-type: %s"
+msgstr "Tipo di contenuto: %s"
+
+#: LYMessages.c:551
+msgid "Command: "
+msgstr "Comando: "
+
+#: LYMessages.c:552
+msgid "Unknown or ambiguous command"
+msgstr "Comando sconosciuto o ambiguo."
+
+#: LYMessages.c:553
+msgid " Version "
+msgstr " Versione "
+
+#: LYMessages.c:554
+msgid " first"
+msgstr " per primo"
+
+#: LYMessages.c:555
+msgid ", guessing..."
+msgstr ", suppongo..."
+
+#: LYMessages.c:556
+msgid "Permissions for "
+msgstr "Diritti di accesso per "
+
+#: LYMessages.c:557
+msgid "Select "
+msgstr "Scegliere "
+
+#: LYMessages.c:558
+msgid "capital letter"
+msgstr "maiuscola"
+
+#: LYMessages.c:559
+msgid " of option line,"
+msgstr " della riga di scelta,"
+
+#: LYMessages.c:560
+msgid " to save,"
+msgstr " per registrare,"
+
+#: LYMessages.c:561
+msgid " to "
+msgstr " a "
+
+#: LYMessages.c:562
+msgid " or "
+msgstr " o "
+
+#: LYMessages.c:563
+msgid " index"
+msgstr " indice"
+
+#: LYMessages.c:564
+msgid " to return to Lynx."
+msgstr " per ritornare a Lynx."
+
+#: LYMessages.c:565
+msgid "Accept Changes"
+msgstr "Accetta modifiche"
+
+#: LYMessages.c:566
+msgid "Reset Changes"
+msgstr "Annulla modifiche"
+
+#: LYMessages.c:567
+msgid "Left Arrow cancels changes"
+msgstr "FrecciaSin annulla"
+
+#: LYMessages.c:568
+msgid "Save options to disk"
+msgstr "Registra le scelte nel disco"
+
+#: LYMessages.c:569
+msgid "Hit RETURN to accept entered data."
+msgstr "Premere INVIO per accettare i dati immessi."
+
+#. #define ACCEPT_DATA_OR_DEFAULT
+#: LYMessages.c:571
+msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
+msgstr "INVIO per accettare i dati.  Cancella i dati per recuperare i valori predefiniti"
+
+#: LYMessages.c:572
+msgid "Value accepted!"
+msgstr "Valore accettato!"
+
+#. #define VALUE_ACCEPTED_WARNING_X
+#: LYMessages.c:574
+msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
+msgstr "Valore accettato! NOTA: Lynx è configurato per XWINDOWS!"
+
+#. #define VALUE_ACCEPTED_WARNING_NONX
+#: LYMessages.c:576
+msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
+msgstr "Valore accettato! NOTA: Lynx non è configurato per XWINDOWS!"
+
+#: LYMessages.c:577
+msgid "You are not allowed to change which editor to use!"
+msgstr "Non è consentito scegliere l'editor da utilizzare!"
+
+#: LYMessages.c:578
+msgid "Failed to set DISPLAY variable!"
+msgstr "Impossibile impostare la variabile DISPLAY!"
+
+#: LYMessages.c:579
+msgid "Failed to clear DISPLAY variable!"
+msgstr "Impossibile svuotare la variabile DISPLAY!"
+
+#. #define BOOKMARK_CHANGE_DISALLOWED
+#: LYMessages.c:581
+msgid "You are not allowed to change the bookmark file!"
+msgstr "Non è permesso cambiare il file dei segnalibri!"
+
+#: LYMessages.c:582
+msgid "Terminal does not support color"
+msgstr "Il terminale non gestisce i colori."
+
+#: LYMessages.c:583
+#, c-format
+msgid "Your '%s' terminal does not support color."
+msgstr "Il terminale '%s' non gestisce i colori."
+
+# NdT: "dot files" = "file punto" (should be familiar to Unix users)
+#: LYMessages.c:584
+msgid "Access to dot files is disabled!"
+msgstr "L'accesso ai file nascosti (dot) è disattivato."
+
+#. #define UA_NO_LYNX_WARNING
+#: LYMessages.c:586
+msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
+msgstr "La sequenza di caratteri 'User-Agent' non contiene né \"Lynx\" né \"L_y_n_x\""
+
+#. #define UA_PLEASE_USE_LYNX
+#: LYMessages.c:588
+msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
+msgstr "Usare \"L_y_n_x\" o \"Lynx\" in 'User-Agent' o sembrerà una violazione intenzionale."
+
+#. #define UA_CHANGE_DISABLED
+#: LYMessages.c:590
+msgid "Changing of the User-Agent string is disabled!"
+msgstr "La modifica del campo 'User-Agent' è disabilitata!"
+
+#. #define CHANGE_OF_SETTING_DISALLOWED
+#: LYMessages.c:592
+msgid "You are not allowed to change this setting."
+msgstr "Non è consentito cambiare questa impostazione."
+
+#: LYMessages.c:593
+msgid "Saving Options..."
+msgstr "Registrazione delle opzioni..."
+
+#: LYMessages.c:594
+msgid "Options saved!"
+msgstr "Opzioni registrate."
+
+#: LYMessages.c:595
+msgid "Unable to save Options!"
+msgstr "Impossibile registrare le opzioni!"
+
+#: LYMessages.c:596
+msgid " 'r' to return to Lynx "
+msgstr " «r» per ritornare a Lynx "
+
+#: LYMessages.c:597
+msgid " '>' to save, or 'r' to return to Lynx "
+msgstr " «>» per registrare, «r» per ritornare a Lynx "
+
+#. #define ANY_KEY_CHANGE_RET_ACCEPT
+#: LYMessages.c:599
+msgid "Hit any key to change value; RETURN to accept."
+msgstr "INVIO per accettare, un altro tasto per cambiare valore."
+
+#: LYMessages.c:600
+msgid "Error uncompressing temporary file!"
+msgstr "Errore nella decompressione del file temporaneo!"
+
+#: LYMessages.c:601
+msgid "Unsupported URL scheme!"
+msgstr "Schema di URL non riconosciuto!"
+
+#: LYMessages.c:602
+msgid "Unsupported data: URL!  Use SHOWINFO, for now."
+msgstr "Dato non riconosciuto: URL! Per ora consulta la pagina di informazioni."
+
+#: LYMessages.c:603
+msgid "Redirection limit of 10 URL's reached."
+msgstr "Reindirizzamento: raggiunto il limite di 10 URL."
+
+#: LYMessages.c:604
+msgid "Illegal redirection URL received from server!"
+msgstr "URL di reindirizzamento non valido ricevuto dal server!"
+
+#. #define SERVER_ASKED_FOR_REDIRECTION
+#: LYMessages.c:606
+#, c-format
+msgid "Server asked for %d redirection of POST content to"
+msgstr "Il server chiede %d reindirizzare il contenuto POST verso"
+
+#: LYMessages.c:609
+msgid "P)roceed, use G)ET or C)ancel "
+msgstr "P) proseguire, usare G)ET o C) annullare "
+
+#: LYMessages.c:610
+msgid "P)roceed, or C)ancel "
+msgstr "P) proseguire o C) annullare "
+
+#. #define ADVANCED_POST_GET_REDIRECT
+#: LYMessages.c:612
+msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
+msgstr "Reindirizzamento contenuto POST. P)rosegui, vedi U)RL, usa G)ET o C) annulla"
+
+#. #define ADVANCED_POST_REDIRECT
+#: LYMessages.c:614
+msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
+msgstr "Reindirizzamento del contenuto POST. P)rosegui, vedi U)RL o C) annulla"
+
+#. #define CONFIRM_POST_RESUBMISSION
+#: LYMessages.c:616
+msgid "Document from Form with POST content.  Resubmit?"
+msgstr "Documento da un modulo con contenuto POST. Rispedire?"
+
+#. #define CONFIRM_POST_RESUBMISSION_TO
+#: LYMessages.c:618
+#, c-format
+msgid "Resubmit POST content to %s ?"
+msgstr "Rispedire il contenuto POST a %s ?"
+
+#. #define CONFIRM_POST_LIST_RELOAD
+#: LYMessages.c:620
+#, c-format
+msgid "List from document with POST data.  Reload %s ?"
+msgstr "Elenco da documento con dati POST. Ricaricare %s ?"
+
+#. #define CONFIRM_POST_DOC_HEAD
+#: LYMessages.c:622
+msgid "Document from POST action, HEAD may not be understood.  Proceed?"
+msgstr "Documento di tipo POST, l'elemento HEAD può non essere compreso. Proseguire?"
+
+#. #define CONFIRM_POST_LINK_HEAD
+#: LYMessages.c:624
+msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
+msgstr "Invio con il metodo POST, l'elemento HEAD può non essere compreso. Proseguire?"
+
+#: LYMessages.c:625
+msgid "Proceed without a username and password?"
+msgstr "Proseguire senza nome utente e password?"
+
+#: LYMessages.c:626
+#, c-format
+msgid "Proceed (%s)?"
+msgstr "Proseguire (%s)?"
+
+#: LYMessages.c:627
+msgid "Cannot POST to this host."
+msgstr "Impossibile inviare il contributo a questo host."
+
+# src/LYGetFile.c
+#: LYMessages.c:628
+msgid "POST not supported for this URL - ignoring POST data!"
+msgstr "Il metodo POST non funziona con questo URL. I dati POST sono ignorati."
+
+#: LYMessages.c:629
+msgid "Discarding POST data..."
+msgstr "Eliminazione dei dati POST..."
+
+#: LYMessages.c:630
+msgid "Document will not be reloaded!"
+msgstr "Il documento non sarà ricaricato!"
+
+#: LYMessages.c:631
+msgid "Location: "
+msgstr "Posizione: "
+
+#: LYMessages.c:632
+#, c-format
+msgid "'%s' not found!"
+msgstr "'%s' non trovato!"
+
+#: LYMessages.c:633
+msgid "Default Bookmark File"
+msgstr "File segnalibri predefinito"
+
+#: LYMessages.c:634
+msgid "Screen too small! (8x35 min)"
+msgstr "Schermo troppo piccolo (min 8x35 )"
+
+#: LYMessages.c:635
+msgid "Select destination or ^G to Cancel: "
+msgstr "Scegli la destinazione, ^G per annullare: "
+
+#. #define MULTIBOOKMARKS_SELECT
+#: LYMessages.c:637
+msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
+msgstr "Scegli il sottosegnalibro, '=' per il menù, ^G per annullare: "
+
+#. #define MULTIBOOKMARKS_SELF
+#: LYMessages.c:639
+msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
+msgstr "Replicare il L)ink in questo file di segnalibri o C) annullare? (l,c): "
+
+#: LYMessages.c:640
+msgid "Multiple bookmark support is not available."
+msgstr "Supporto per i segnalibri multipli non disponibile."
+
+#: LYMessages.c:641
+#, c-format
+msgid " Select Bookmark (screen %d of %d)"
+msgstr " Scelta dei segnalibri (schermata %d di %d)"
+
+#: LYMessages.c:642
+msgid "       Select Bookmark"
+msgstr "     Scelta dei segnalibri"
+
+#. #define MULTIBOOKMARKS_EHEAD_MASK
+#: LYMessages.c:644
+#, c-format
+msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
+msgstr "Modifica della descrizione e del percorso dei file (%d di 2)"
+
+# UNSURE
+#. #define MULTIBOOKMARKS_EHEAD
+#: LYMessages.c:646
+msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
+msgstr "Modifica della descrizione e del percorso dei file"
+
+# UNSURE
+#: LYMessages.c:647
+msgid "Letter: "
+msgstr "Lettera: "
+
+#. #define USE_PATH_OFF_HOME
+#: LYMessages.c:650
+msgid "Use a filepath off your login directory in SHELL syntax!"
+msgstr "Usare una SHELL con un percorso di file a partire dalla directory di login!"
+
+#: LYMessages.c:652
+msgid "Use a filepath off your home directory!"
+msgstr "Il percorso del file deve essere relativo alla directory home."
+
+# NdT: half-page behaviour unknown
+#. #define MAXLINKS_REACHED
+#: LYMessages.c:655
+msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
+msgstr "Troppi link nella pagina. Scorrere di due righe o di mezza pagina."
+
+#. #define MAXHIST_REACHED
+#: LYMessages.c:657
+msgid "History List maximum reached!  Document not pushed."
+msgstr "L'elenco della storia ha raggiunto il massimo. Documento non inserito."
+
+#: LYMessages.c:658
+msgid "No previously visited links available!"
+msgstr "Non è disponibile alcun link consultato in precedenza!"
+
+#: LYMessages.c:659
+msgid "Memory exhausted!  Program aborted!"
+msgstr "Memoria esaurita! Esecuzione annullata."
+
+#: LYMessages.c:660
+msgid "Memory exhausted!  Aborting..."
+msgstr "Memoria esaurita! Esecuzione annullata."
+
+#: LYMessages.c:661
+msgid "Not enough memory!"
+msgstr "Memoria insufficiente!"
+
+#: LYMessages.c:662
+msgid "Directory/File Manager not available"
+msgstr "Gestore di directory/file non disponibile"
+
+#: LYMessages.c:663
+msgid "HREF in BASE tag is not an absolute URL."
+msgstr "L'attributo HREF dell'elemento BASE non è un URL assoluto."
+
+#: LYMessages.c:664
+msgid "Location URL is not absolute."
+msgstr "L'indirizzo dell'URL non è assoluto."
+
+#: LYMessages.c:665
+msgid "Refresh URL is not absolute."
+msgstr "Non si tratta di un URL assoluto."
+
+# NdT: This one is not clear...
+#. #define SENDING_MESSAGE_WITH_BODY_TO
+#: LYMessages.c:667
+msgid ""
+"You are sending a message with body to:\n"
+"  "
+msgstr ""
+"Invio di un messaggio con corpo a:\n"
+" "
+
+#: LYMessages.c:668
+msgid ""
+"You are sending a comment to:\n"
+"  "
+msgstr ""
+" Invio di un commento a:\n"
+"  "
+
+#: LYMessages.c:669
+msgid ""
+"\n"
+" With copy to:\n"
+"  "
+msgstr ""
+"\n"
+" In copia a:\n"
+" "
+
+#: LYMessages.c:670
+msgid ""
+"\n"
+" With copies to:\n"
+"  "
+msgstr ""
+"\n"
+" Con copie a:\n"
+" "
+
+#. #define CTRL_G_TO_CANCEL_SEND
+#: LYMessages.c:672
+msgid ""
+"\n"
+"\n"
+"Use Ctrl-G to cancel if you do not want to send a message\n"
+msgstr ""
+"\n"
+"\n"
+" Premere Ctrl-G per annullare l'invio del messaggio\n"
+
+# The following two messages have been put together to make:
+#. #define ENTER_NAME_OR_BLANK
+#: LYMessages.c:674
 msgid ""
+"\n"
+" Please enter your name, or leave it blank to remain anonymous\n"
 msgstr ""
-"Date: 1998-08-22 16:12:20-0400\n"
-"From: Webmaster Jim <jspath@bcpl.net>\n"
-"Content-Type: text/plain; charset=\n"
-"Files: src/LYMain.c src/LYMainLoop.c src/LYNews.c WWW/Library/Implementation/HTNews.c\n"
+"\n"
+" Scrivere nome e cognome (o lasciare vuoto per rimanere anonimi)\n"
+
+#. #define ENTER_MAIL_ADDRESS_OR_OTHER
+#: LYMessages.c:676
+msgid ""
+"\n"
+" Please enter a mail address or some other\n"
+msgstr ""
+"\n"
+" Indicare un indirizzo di posta o qualche altro mezzo\n"
+
+#. #define MEANS_TO_CONTACT_FOR_RESPONSE
+#: LYMessages.c:678
+msgid " means to contact you, if you desire a response.\n"
+msgstr " per essere contattati, se si desidera una risposta.\n"
 
-# Lynx message catalog
-# Copyright (C) 1998 Free Software Foundation, Inc.
-# Webmaster Jim <jspath@bcpl.net>, 1998.
-# Lynx development group <lynx-dev@sig.net>, 1998.
-# http://lynx.browser.org/
+#: LYMessages.c:679
+msgid ""
+"\n"
+" Please enter a subject line.\n"
+msgstr ""
+"\n"
+" Immettere la riga con l'oggetto del messaggio.\n"
+
+#. #define ENTER_ADDRESS_FOR_CC
+#: LYMessages.c:681
+msgid ""
+"\n"
+" Enter a mail address for a CC of your message.\n"
+msgstr ""
+"\n"
+" Immettere un indirizzo di posta per una copia conforme del messaggio\n"
+
+#: LYMessages.c:682
+msgid " (Leave blank if you don't want a copy.)\n"
+msgstr " (lasciare vuoto per non inviare copia).\n"
+
+#: LYMessages.c:683
+msgid ""
+"\n"
+" Please review the message body:\n"
+"\n"
+msgstr ""
+"\n"
+" Rivedere il corpo del messaggio:\n"
+"\n"
+
+#: LYMessages.c:684
+msgid ""
+"\n"
+"Press RETURN to continue: "
+msgstr ""
+"\n"
+"Premere INVIO per proseguire:"
+
+#: LYMessages.c:685
+msgid ""
+"\n"
+"Press RETURN to clean up: "
+msgstr ""
+"\n"
+"Premere INVIO per ripulire: "
+
+#: LYMessages.c:686
+msgid " Use Control-U to erase the default.\n"
+msgstr " Premere Ctrl-U per cancellare il valore predefinito.\n"
+
+#: LYMessages.c:687
+msgid ""
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+" Immettere il messaggio qui di seguito."
+
+#. #define ENTER_PERIOD_WHEN_DONE_A
+#: LYMessages.c:689 src/LYNews.c:361
+msgid ""
+"\n"
+" When you are done, press enter and put a single period (.)"
+msgstr ""
+"\n"
+" Una volta terminato, premere INVIO e mettere un singolo punto (.)"
+
+#. #define ENTER_PERIOD_WHEN_DONE_B
+#: LYMessages.c:691 src/LYNews.c:362
+msgid ""
+"\n"
+" on a line and press enter again."
+msgstr ""
+"\n"
+" su di una riga, poi premere nuovamente INVIO."
+
+# NOTE:  I will have to get you an example text.
 #
-# , fuzzy
-#: WWW/Library/Implementation/HTNews.c:350
-msgid "Username for news host '%s':"
+#  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: systems looks not to accept replacements for Always/neVer
+#. Cookies messages
+#. #define ADVANCED_COOKIE_CONFIRMATION
+#: LYMessages.c:695
+#, c-format
+msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
+msgstr "cookie di %s: %.*s=%.*s  Accetti? (S/N/A=sempre/V=mai)"
+
+#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
+#: LYMessages.c:697
+#, c-format
+msgid "Accept invalid cookie domain=%s for '%s'?"
+msgstr "Accettare cookie su dominio non valido=%s per '%s'?"
+
+#. #define INVALID_COOKIE_PATH_CONFIRMATION
+#: LYMessages.c:699
+#, c-format
+msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
+msgstr "Accettare percorso di cookie non valido=%s come prefisso di '%s'?"
+
+#: LYMessages.c:700
+msgid "Allowing this cookie."
+msgstr "Ammissione del cookie."
+
+#: LYMessages.c:701
+msgid "Rejecting this cookie."
+msgstr "Rifiuto del cookie"
+
+#: LYMessages.c:702
+msgid "The Cookie Jar is empty."
+msgstr "Il contenitore dei cookie è vuoto."
+
+# --------
+# 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:704
+msgid "Activate links to gobble up cookies or entire domains,"
+msgstr "Attivare i link per eliminare i cookie o gli interi domini,"
+
+#: LYMessages.c:705
+msgid "or to change a domain's 'allow' setting."
+msgstr "o per cambiare l'impostazione di autorizzazione per un dominio."
+
+#: LYMessages.c:706
+msgid "(Cookies never allowed.)"
+msgstr "(Cookie mai accettati)"
+
+#: LYMessages.c:707
+msgid "(Cookies always allowed.)"
+msgstr "(Cookie sempre accettati)"
+
+#: LYMessages.c:708
+msgid "(Cookies allowed via prompt.)"
+msgstr "(Cookie accettati su richiesta.)"
+
+#: LYMessages.c:709
+msgid "(Persistent Cookies.)"
+msgstr "(Cookie permanenti.)"
+
+#: LYMessages.c:710
+msgid "(No title.)"
+msgstr "(Nessun titolo.)"
+
+#: LYMessages.c:711
+msgid "(No name.)"
+msgstr "(Nessun nome.)"
+
+#: LYMessages.c:712
+msgid "(No value.)"
+msgstr "(Nessun valore)"
+
+#: LYMessages.c:713
+msgid "None"
+msgstr "Nessuno(a)"
+
+#: LYMessages.c:714
+msgid "(End of session.)"
+msgstr "(Fine della sessione)"
+
+#: LYMessages.c:715
+msgid "Delete this cookie?"
+msgstr "Eliminare questo cookie?"
+
+#: LYMessages.c:716
+msgid "The cookie has been eaten!"
+msgstr "Il cookie è stato eliminato!"
+
+#: LYMessages.c:717
+msgid "Delete this empty domain?"
+msgstr "Eliminare questo dominio vuoto?"
+
+#: LYMessages.c:718
+msgid "The domain has been eaten!"
+msgstr "Il dominio è stato eliminato!"
+
+# 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:720
+msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "E)limina cookie; imposta permesso: T)utti C)hiedi M)ai A)nnulla? "
+
+#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:722
+msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "E)limina cookie; imposta permesso: T)utti/C)hiedi/M)ai o A)nnulla? "
+
+#: LYMessages.c:723
+msgid "All cookies in the domain have been eaten!"
+msgstr "Tutti i cookie nel dominio sono stati eliminati!"
+
+#: LYMessages.c:724
+#, c-format
+msgid "'A'lways allowing from domain '%s'."
+msgstr "'A'ccettati tutti i cookie del dominio '%s'."
+
+#: LYMessages.c:725
+#, c-format
+msgid "ne'V'er allowing from domain '%s'."
+msgstr "'V' Non si accetta alcun cookie dal dominio '%s'."
+
+# NdT: What does happen exatly when you chose P)rompt?
+#: LYMessages.c:726
+#, c-format
+msgid "'P'rompting to allow from domain '%s'."
+msgstr "Si chiede conferma 'P'rima di accettare i cookie dal dominio '%s'."
+
+#: LYMessages.c:727
+msgid "Delete all cookies in this domain?"
+msgstr "Eliminare tutti i cookie di questo dominio?"
+
+#: LYMessages.c:728
+msgid "All of the cookies in the jar have been eaten!"
+msgstr "Tutti i cookie del contenitore sono stati eliminati!"
+
+#: LYMessages.c:730
+msgid "Port 19 not permitted in URLs."
+msgstr "Porta 19 non autorizzata negli URL."
+
+#: LYMessages.c:731
+msgid "Port 25 not permitted in URLs."
+msgstr "Porta 25 non autorizzata negli URL."
+
+#: LYMessages.c:732
+#, c-format
+msgid "Port %lu not permitted in URLs."
+msgstr "Porta %lu non autorizzata negli URL."
+
+#: LYMessages.c:733
+msgid "URL has a bad port field."
+msgstr "Campo porta dell'URL errato!"
+
+#: LYMessages.c:734
+msgid "Maximum nesting of HTML elements exceeded."
+msgstr "Massimo annidamento di elementi HTML superato!"
+
+#: LYMessages.c:735
+msgid "Bad partial reference!  Stripping lead dots."
+msgstr "Riferimento parziale errato! Tolgo i punti iniziali."
+
+#: LYMessages.c:736
+msgid "Trace Log open failed.  Trace off!"
+msgstr "Errore nell'apertura del «Trace Log»! Tracciamento non attivo."
+
+#: LYMessages.c:737
+msgid "Lynx Trace Log"
+msgstr "Trace Log di Lynx"
+
+#: LYMessages.c:738
+msgid "No trace log has been started for this session."
+msgstr "Non è stato iniziato alcun Trace Log per questa sessione."
+
+#. #define MAX_TEMPCOUNT_REACHED
+#: LYMessages.c:740
+msgid "The maximum temporary file count has been reached!"
+msgstr "Il numero massimo di file temporanei è stato raggiunto."
+
+#. #define FORM_VALUE_TOO_LONG
+#: LYMessages.c:742
+msgid "Form field value exceeds buffer length!  Trim the tail."
+msgstr "Il valore eccede la lunghezza prevista! Taglio la coda."
+
+#. #define FORM_TAIL_COMBINED_WITH_HEAD
+#: LYMessages.c:744
+msgid "Modified tail combined with head of form field value."
+msgstr "Coda modificata combinata con il valore in testa al campo del modulo."
+
+#. HTFile.c
+#: LYMessages.c:747
+msgid "Directory"
+msgstr "Directory"
+
+#: LYMessages.c:748
+msgid "Directory browsing is not allowed."
+msgstr "La lettura della directory non è consentita."
+
+#: LYMessages.c:749
+msgid "Selective access is not enabled for this directory"
+msgstr "L'accesso selettivo non è abilitato per questa directory"
+
+#: LYMessages.c:750
+msgid "Multiformat: directory scan failed."
+msgstr "Multiformat: analisi della directory fallita."
+
+#: LYMessages.c:751
+msgid "This directory is not readable."
+msgstr "Questa directory non si può leggere."
+
+#: LYMessages.c:752
+msgid "Can't access requested file."
+msgstr "Impossibile accedere al file richiesto."
+
+#: LYMessages.c:753
+msgid "Could not find suitable representation for transmission."
+msgstr "Impossibile trovare una rappresentazione corretta per la trasmissione."
+
+# WWW/Libary/Implementation/HTFile.c
+#: LYMessages.c:754
+msgid "Could not open file for decompression!"
+msgstr "Impossibile aprire il file per la decompressione!"
+
+#: LYMessages.c:755
+msgid "Files:"
+msgstr "File:"
+
+#: LYMessages.c:756
+msgid "Subdirectories:"
+msgstr "Sottodirectory:"
+
+#: LYMessages.c:757
+msgid " directory"
+msgstr " directory"
+
+# NdT: "su a" is shorter, but less clear!
+#: LYMessages.c:758
+msgid "Up to "
+msgstr "Risali a "
+
+#: LYMessages.c:759
+msgid "Current directory is "
+msgstr "La directory attuale è: "
+
+#. HTGopher.c
+#: LYMessages.c:762
+msgid "No response from server!"
+msgstr "Nessuna risposta dal server!"
+
+#: LYMessages.c:763
+msgid "CSO index"
+msgstr "indice CSO"
+
+#: LYMessages.c:764
+msgid ""
+"\n"
+"This is a searchable index of a CSO database.\n"
 msgstr ""
+"\n"
+"Questo è un indice con ricerca proveniente da una base di dati CSO.\n"
 
-#: WWW/Library/Implementation/HTNews.c:361 WWW/Library/Implementation/HTNews.c:445 WWW/Library/Implementation/HTNews.c:2344 WWW/Library/Implementation/HTNews.c:2402 WWW/Library/Implementation/HTNews.c:2507 WWW/Library/Implementation/HTNews.c:2522 WWW/Library/Implementation/HTNews.c:2530 WWW/Library/Implementation/HTNews.c:2669
-msgid "Connection interrupted."
+#: LYMessages.c:765
+msgid "CSO Search Results"
+msgstr "Risultato della ricerca CSO"
+
+#: LYMessages.c:766
+#, c-format
+msgid "Seek fail on %s\n"
+msgstr "Ricerca fallita su %s\n"
+
+#: LYMessages.c:767
+msgid ""
+"\n"
+"Press the 's' key and enter search keywords.\n"
 msgstr ""
+"\n"
+"Premere il tasto 's' e immettere i termini per la ricerca.\n"
 
-#: WWW/Library/Implementation/HTNews.c:363 WWW/Library/Implementation/HTNews.c:447
-msgid "Connection closed ???"
+#: LYMessages.c:768
+msgid ""
+"\n"
+"This is a searchable Gopher index.\n"
 msgstr ""
+"\n"
+"Questo è un indice Gopher con ricerca.\n"
 
-#: WWW/Library/Implementation/HTNews.c:403
-msgid "Change username?"
+#: LYMessages.c:769
+msgid "Gopher index"
+msgstr "Indice Gopher"
+
+#: LYMessages.c:770
+msgid "Gopher Menu"
+msgstr "Menù Gopher"
+
+#: LYMessages.c:771
+msgid " Search Results"
+msgstr " Risultato della ricerca"
+
+#: LYMessages.c:772
+msgid "Sending CSO/PH request."
+msgstr "Invio della richiesta CSO/PH."
+
+#: LYMessages.c:773
+msgid "Sending Gopher request."
+msgstr "Invio della richiesta Gopher."
+
+#: LYMessages.c:774
+msgid "CSO/PH request sent; waiting for response."
+msgstr "Richiesta CSO/PH inviata; in attesa di risposta."
+
+#: LYMessages.c:775
+msgid "Gopher request sent; waiting for response."
+msgstr "Richiesta Gopher inviata; in attesa di risposta."
+
+#: LYMessages.c:776
+msgid ""
+"\n"
+"Please enter search keywords.\n"
 msgstr ""
+"\n"
+"Immettere i termini per la ricerca.\n"
 
-#: WWW/Library/Implementation/HTNews.c:517
-msgid "Change password?"
+#: LYMessages.c:777
+msgid ""
+"\n"
+"The keywords that you enter will allow you to search on a"
 msgstr ""
+"\n"
+"Il termine immesso permetterà di fare una ricerca su un"
+
+#: LYMessages.c:778
+msgid " person's name in the database.\n"
+msgstr " nome di persona nella base di dati.\n"
+
+#. HTNews.c
+#: LYMessages.c:781
+msgid "Connection closed ???"
+msgstr "Connessione terminata ???"
 
-#: WWW/Library/Implementation/HTNews.c:826
+#: LYMessages.c:782
 msgid "Cannot open temporary file for news POST."
-msgstr "Impossibile aprire file temporaneo"
+msgstr "Impossibile aprire un file temporaneo per inviare il contributo news."
+
+#: LYMessages.c:783
+msgid "This client does not contain support for posting to news with SSL."
+msgstr "Questo client non consente l'invio di news mediante SSL"
+
+#. HTStyle.c
+#: LYMessages.c:786
+#, c-format
+msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
+msgstr "Stile %d '%s' SGML:%s. Carattere %s %.1f punti.\n"
+
+#: LYMessages.c:787
+#, c-format
+msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
+msgstr "\tRientri: primo=%.0f altri=%.0f, Altezza=%.1f Desc=%.1f\n"
+
+#: LYMessages.c:788
+#, c-format
+msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
+msgstr "\tAllinea=%d, %d tab. (%.0f prima, %.0f dopo)\n"
+
+#: LYMessages.c:789
+#, c-format
+msgid "\t\tTab kind=%d at %.0f\n"
+msgstr "\t\tTipo Tab=%d a %.0f\n"
+
+#. HTTP.c
+#: LYMessages.c:792
+msgid "Can't proceed without a username and password."
+msgstr "Impossibile proseguire senza nome utente e password."
+
+#: LYMessages.c:793
+msgid "Can't retry with authorization!  Contact the server's WebMaster."
+msgstr "Impossibile ritentare l'autorizzazione! Interpella il gestore del server."
+
+#: LYMessages.c:794
+msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
+msgstr "Impossibile ritentare l'autorizzazione proxy! Interpella il gestore del server."
+
+#: LYMessages.c:795
+msgid "Retrying with proxy authorization information."
+msgstr "Nuovo tentativo con info di autorizzazione del proxy."
+
+#. HTWAIS.c
+#: LYMessages.c:798
+msgid "HTWAIS: Return message too large."
+msgstr "HTWAIS: messaggio troppo grande respinto."
+
+#: LYMessages.c:799
+msgid "Enter WAIS query: "
+msgstr "Immetti la tua richiesta WAIS:"
+
+#. Miscellaneous status
+#: LYMessages.c:802
+msgid "Retrying as HTTP0 request."
+msgstr "Ritento richiesta come HTTP0."
+
+#: LYMessages.c:803
+#, c-format
+msgid "Transferred %d bytes"
+msgstr "%d byte trasferiti"
+
+#: LYMessages.c:804
+msgid "Data transfer complete"
+msgstr "Trasferimento dati completato"
 
-#: WWW/Library/Implementation/HTNews.c:1595
+#: LYMessages.c:805
+#, c-format
+msgid "Error processing line %d of %s\n"
+msgstr "Errore alla riga %d di %s\n"
+
+#. Lynx internal page titles
+#: LYMessages.c:808
+msgid "Address List Page"
+msgstr "Pagina con la lista di indirizzi"
+
+#: LYMessages.c:809
+msgid "Bookmark file"
+msgstr "File dei segnalibri"
+
+#: LYMessages.c:810
+msgid "Configuration Definitions"
+msgstr "Definizione della configurazione"
+
+#: LYMessages.c:811
+msgid "Cookie Jar"
+msgstr "Contenitore dei «cookie»"
+
+#: LYMessages.c:812
+msgid "Current Key Map"
+msgstr "Configurazione di tastiera"
+
+#: LYMessages.c:813
+msgid "File Management Options"
+msgstr "Opzioni di gestione dei file"
+
+#: LYMessages.c:814
+msgid "Download Options"
+msgstr "Opzioni di scaricamento file"
+
+#: LYMessages.c:815
+msgid "History Page"
+msgstr "Storia"
+
+#: LYMessages.c:816
+msgid "List Page"
+msgstr "Pagina di riferimenti"
+
+#: LYMessages.c:817
+msgid "Lynx.cfg Information"
+msgstr "Informazioni su Lynx.cfg"
+
+#: LYMessages.c:818
+msgid "Converted Mosaic Hotlist"
+msgstr "Elenco di segnalibri Mosaic convertito"
+
+#: LYMessages.c:819
+msgid "Options Menu"
+msgstr "Menù dei parametri"
+
+#: LYMessages.c:820
+msgid "File Permission Options"
+msgstr "Opzioni di permesso d'accesso"
+
+#: LYMessages.c:821
+msgid "Printing Options"
+msgstr "Opzioni di stampa"
+
+#: LYMessages.c:822
+msgid "Information about the current document"
+msgstr "Informazioni sul documento attuale"
+
+#: LYMessages.c:823
+msgid "Your recent statusline messages"
+msgstr "Messaggi recenti nella riga di stato"
+
+#: LYMessages.c:824
+msgid "Upload Options"
+msgstr "Opzioni di caricamento file"
+
+#: LYMessages.c:825
+msgid "Visited Links Page"
+msgstr "Pagina dei link consultati"
+
+#. CONFIG_DEF_TITLE subtitles
+#: LYMessages.c:828
+msgid "See also"
+msgstr "Vedere anche"
+
+#: LYMessages.c:829
+msgid "your"
+msgstr "tuo"
+
+#: LYMessages.c:830
+msgid "for runtime options"
+msgstr "per le opzioni di esecuzione"
+
+#: LYMessages.c:831
+msgid "compile time options"
+msgstr "opzioni di compilazione"
+
+#: LYMessages.c:832
+#, fuzzy
+msgid "color-style configuration"
+msgstr "La configurazione principale"
+
+#: LYMessages.c:833
+msgid "latest release"
+msgstr "ultima versione"
+
+#: LYMessages.c:834
+msgid "pre-release version"
+msgstr "versione pre-finale"
+
+#: LYMessages.c:835
+msgid "development version"
+msgstr "versione di sviluppo"
+
+#. #define AUTOCONF_CONFIG_CACHE
+#: LYMessages.c:837
+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 ""
+"I dati seguenti sono stati desunti durante la configurazione automatica\n"
+"di questa copia di Lynx. Nel segnalare un difetto, si prega di\n"
+"includere una copia di questa pagina."
+
+#. #define AUTOCONF_LYNXCFG_H
+#: LYMessages.c:841
+msgid ""
+"The following data were used as automatically-configured compile-time\n"
+"definitions when this copy of Lynx was built."
+msgstr ""
+"I dati seguenti sono stati usati come opzioni di compilazione configurati\n"
+"automaticamente allorché questa versione di Lynx è stata prodotta."
+
+#. #define DIRED_NOVICELINE
+#: LYMessages.c:846
+msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
+msgstr "C=crea D=scarica E=elabora F=menù M=modifica R=elimina T=contrassegna U=carica\n"
+
+#: LYMessages.c:847
+msgid "Failed to obtain status of current link!"
+msgstr "Impossibile ottenere lo stato del link attuale!"
+
+#. #define INVALID_PERMIT_URL
+#: LYMessages.c:850
+msgid "Special URL only valid from current File Permission menu!"
+msgstr "URL speciale valido solo dal menù di permesso di accesso attuale!"
+
+#: LYMessages.c:854
+msgid "External support is currently disabled."
+msgstr "Il sostegno esterno è attualmente disattivato."
+
+#. new with 2.8.4dev.21
+#: LYMessages.c:858
+msgid "Changing working-directory is currently disabled."
+msgstr "Il cambio di directory di lavoro è disattivato."
+
+#: LYMessages.c:859
+msgid "Linewrap OFF!"
+msgstr "A capo automatico DISATTIVATO"
+
+#: LYMessages.c:860
+msgid "Linewrap ON!"
+msgstr "A capo automatico ATTIVATO"
+
+#: LYMessages.c:861
+msgid "Parsing nested-tables toggled OFF!  Reloading..."
+msgstr "Analisi delle tabelle annidate DISATTIVATA! Aggiornamento..."
+
+# NdT: alternate translation inspired to French version
+# msgstr "Modo 8-bit o CJK impostato a DISATTIVATO! Caricamento..."
+#: LYMessages.c:862
+msgid "Parsing nested-tables toggled ON!  Reloading..."
+msgstr "Analisi delle tabelle annidate ATTIVATA! Aggiornamento..."
+
+# NdT: alternate translation inspired to French version
+# msgstr "Modo 8-bit o CJK impostato ad ATTIVATO! Caricamento..."
+#: LYMessages.c:863
+msgid "Shifting is disabled while line-wrap is in effect"
+msgstr "Spostamento disattivato, ma a capo automatico in funzione"
+
+#: LYMessages.c:864
+msgid "Trace not supported"
+msgstr "Trace non disponibile"
+
+# NdT: meaning of French translation differs from English one
+# msgstr "Le terminal ne permet pas l'affichage couleur"
+#: WWW/Library/Implementation/HTAABrow.c:647
+#, c-format
+msgid "Username for '%s' at %s '%s%s':"
+msgstr "Username per '%s' a %s '%s%s':"
+
+#: WWW/Library/Implementation/HTAABrow.c:913
+msgid "This client doesn't know how to compose proxy authorization information for scheme"
+msgstr "Il client non sa come comporre l'info di autorizzazione del proxy per lo schema di indirizzamento"
+
+#: WWW/Library/Implementation/HTAABrow.c:988
+msgid "This client doesn't know how to compose authorization information for scheme"
+msgstr "Il client non sa come comporre le info di autorizzazione per uno schema"
+
+#: WWW/Library/Implementation/HTAABrow.c:1096
+#, c-format
+msgid "Invalid header '%s%s%s%s%s'"
+msgstr "Intestaz. non valida '%s%s%s%s%s'"
+
+# WWW/Libary/Implementation/HTAABrow.c
+#: WWW/Library/Implementation/HTAABrow.c:1200
+msgid "Proxy authorization required -- retrying"
+msgstr "Autorizzazione del proxy obbligatoria -- ritento"
+
+#: WWW/Library/Implementation/HTAABrow.c:1259
+msgid "Access without authorization denied -- retrying"
+msgstr "Negato l'accesso senza autorizzazione -- ritento"
+
+#: WWW/Library/Implementation/HTAccess.c:677
+msgid "Access forbidden by rule"
+msgstr "Accesso impedito da una regola"
+
+# WWW/Libary/Implementation/HTAccess.c
+#: WWW/Library/Implementation/HTAccess.c:779
+msgid "Document with POST content not found in cache.  Resubmit?"
+msgstr "Documento con contenuto POST non trovato in memoria. Ritentare?"
+
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
+msgid "Loading incomplete."
+msgstr "Caricamento incompleto."
+
+#: WWW/Library/Implementation/HTAccess.c:1077
+msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
+msgstr "**** HTAccess: socket o numero file restituiti da routine di caricam. obsoleta!\n"
+
+#: WWW/Library/Implementation/HTAccess.c:1079
+msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
+msgstr "**** HTAccess: errore software interno. Segnalare a lynx-dev@sig.net !\n"
+
+#: WWW/Library/Implementation/HTAccess.c:1080
+#, c-format
+msgid "**** HTAccess: Status returned was: %d\n"
+msgstr "**** HTAccess: stato di ritorno: %d\n"
+
+#.
+#. * hack: if we fail in HTAccess.c
+#. * avoid duplicating URL, oh.
+#.
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
+msgid "Can't Access"
+msgstr "Accesso impossibile"
+
+#: WWW/Library/Implementation/HTAccess.c:1094
+msgid "Unable to access document."
+msgstr "Impossibile accedere al documento."
+
+#: WWW/Library/Implementation/HTFTP.c:766
+#, c-format
+msgid "Enter password for user %s@%s:"
+msgstr "Password per l'utente %s@%s:"
+
+#: WWW/Library/Implementation/HTFTP.c:794
+msgid "Unable to connect to FTP host."
+msgstr "Connessione impossibile con l'host FTP"
+
+#: WWW/Library/Implementation/HTFTP.c:1064
+msgid "close master socket"
+msgstr "chiudere socket principale"
+
+#: WWW/Library/Implementation/HTFTP.c:1126
+msgid "socket for master socket"
+msgstr "socket per socket principale"
+
+#.
+#. **  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:1640 WWW/Library/Implementation/HTFTP.c:2261
+msgid "Symbolic Link"
+msgstr "Link simbolico"
+
+#: WWW/Library/Implementation/HTFTP.c:2622
+msgid "Receiving FTP directory."
+msgstr "Ricezione della directory FTP."
+
+#: WWW/Library/Implementation/HTFTP.c:2762
+#, c-format
+msgid "Transferred %d bytes (%5d)"
+msgstr "Trasferiti %d byte (%5d)"
+
+#: WWW/Library/Implementation/HTFTP.c:3083
+msgid "connect for data"
+msgstr "connessione per dati"
+
+#: WWW/Library/Implementation/HTFTP.c:3731
+msgid "Receiving FTP file."
+msgstr "Ricezione del file FTP"
+
+#: WWW/Library/Implementation/HTFinger.c:278
+msgid "Could not set up finger connection."
+msgstr "Impossibile stabilire connessione finger"
+
+#: WWW/Library/Implementation/HTFinger.c:325
+msgid "Could not load data (no sitename in finger URL)"
+msgstr "Impossibile prelevare i dati (URL finger senza nome del sito)"
+
+#: WWW/Library/Implementation/HTFinger.c:331
+msgid "Invalid port number - will only use port 79!"
+msgstr "Numero di porta non valido - si userà solo la porta 79"
+
+#: WWW/Library/Implementation/HTFinger.c:396
+msgid "Could not access finger host."
+msgstr "Accesso impossibile all'host finger."
+
+#: WWW/Library/Implementation/HTFinger.c:404
+msgid "No response from finger server."
+msgstr "Nessuna risposta dal server finger."
+
+#: WWW/Library/Implementation/HTNews.c:372
+#, c-format
+msgid "Username for news host '%s':"
+msgstr "Nome utente per l'host news '%s':"
+
+#: WWW/Library/Implementation/HTNews.c:425
+msgid "Change username?"
+msgstr "Cambiare nome utente?"
+
+#: WWW/Library/Implementation/HTNews.c:429
+msgid "Username:"
+msgstr "Nome utente:"
+
+#: WWW/Library/Implementation/HTNews.c:453
+#, c-format
+msgid "Password for news host '%s':"
+msgstr "Password per l'host news '%s':"
+
+#: WWW/Library/Implementation/HTNews.c:536
+msgid "Change password?"
+msgstr "Cambiare password?"
+
+#: WWW/Library/Implementation/HTNews.c:1690
+#, c-format
+msgid "No matches for: %s"
+msgstr "Nessuna corrispondenza per: %s"
+
+#: WWW/Library/Implementation/HTNews.c:1743
 msgid ""
 "\n"
 "No articles in this group.\n"
 msgstr ""
+"\n"
+"Questo gruppo non contiene alcun articolo.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1608
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this range.\n"
 msgstr ""
+"\n"
+"Non c'è alcun articolo in questo intervallo.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1642
+#.
+#. **	Set window title.
+#.
+#: WWW/Library/Implementation/HTNews.c:1769
+#, c-format
+msgid "%s,  Articles %d-%d"
+msgstr "%s,  Articoli %d-%d"
+
+#: WWW/Library/Implementation/HTNews.c:1791
 msgid "Earlier articles"
-msgstr ""
+msgstr "Contributi precedenti"
 
-#: WWW/Library/Implementation/HTNews.c:1655
+#: WWW/Library/Implementation/HTNews.c:1804
+#, c-format
 msgid ""
 "\n"
 "There are about %d articles currently available in %s, IDs as follows:\n"
 "\n"
 msgstr ""
+"\n"
+"Ci sono circa %d contributi disponibili su %s, ID come segue:\n"
+"\n"
 
-#: WWW/Library/Implementation/HTNews.c:1713
+#: WWW/Library/Implementation/HTNews.c:1864
 msgid "All available articles in "
-msgstr ""
+msgstr "Tutti i contributi disponibili in "
 
-#: WWW/Library/Implementation/HTNews.c:1923
+#: WWW/Library/Implementation/HTNews.c:2080
 msgid "Later articles"
-msgstr ""
+msgstr "Contributi successivi"
 
-#: WWW/Library/Implementation/HTNews.c:1947
+#: WWW/Library/Implementation/HTNews.c:2104
 msgid "Post to "
-msgstr "Inviare a aree di conferenza "
+msgstr "Invia a "
 
-#: WWW/Library/Implementation/HTNews.c:2035
-msgid "This client does not contain support for posting to news with SSL."
+#: WWW/Library/Implementation/HTNews.c:2322
+msgid "This client does not contain support for SNEWS URLs."
+msgstr "Questo client non è predisposto per gestire gli URL SNEWS."
+
+#: WWW/Library/Implementation/HTNews.c:2530
+msgid "No target for raw text!"
+msgstr "Nessuna destinazione per il testo grezzo!"
+
+#: WWW/Library/Implementation/HTNews.c:2560
+msgid "Connecting to NewsHost ..."
+msgstr "Connessione all'host delle news..."
+
+#: WWW/Library/Implementation/HTNews.c:2611
+#, c-format
+msgid "Could not access %s."
+msgstr "Impossibile accedere a %s."
+
+#: WWW/Library/Implementation/HTNews.c:2711
+#, c-format
+msgid "Can't read news info.  News host %.20s responded: %.200s"
+msgstr "Lettura info impossibile. L'host news %.20s risp.: %.200s"
+
+#: WWW/Library/Implementation/HTNews.c:2715
+#, c-format
+msgid "Can't read news info, empty response from host %s"
+msgstr "Lettura info impossibile, risposta vuota dall'host %s"
+
+#.
+#. **	List available newsgroups. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2919
+msgid "Reading list of available newsgroups."
+msgstr "Lettura dell'elenco dei forum disponibili."
+
+#: WWW/Library/Implementation/HTNews.c:2941
+msgid "Reading list of articles in newsgroup."
+msgstr "Lettura dell'elenco dei contributi nel forum."
+
+#.
+#. **	Get an article from a news group. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2947
+msgid "Reading news article."
+msgstr "Lettura del contributo news."
+
+#: WWW/Library/Implementation/HTNews.c:2977
+msgid "Sorry, could not load requested news."
+msgstr "Spiacente, impossibile prelevare la news richiesta."
+
+#: WWW/Library/Implementation/HTTCP.c:1239
+msgid "Address has invalid port"
+msgstr "L'indirizzo ha un numero di porta non valido."
+
+#: WWW/Library/Implementation/HTTCP.c:1327
+msgid "Address length looks invalid"
+msgstr "La lunghezza dell'indirizzo sembra non valida"
+
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
+#, c-format
+msgid "Unable to locate remote host %s."
+msgstr "Impossibile individuare l'host remoto %s"
+
+#. 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:1575 WWW/Library/Implementation/HTTelnet.c:103
+#, 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:1589
+#, c-format
+msgid "Making %s connection to %s"
+msgstr "Connessione %s a %s "
+
+#: WWW/Library/Implementation/HTTCP.c:1605
+#, 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:1614
+msgid "socket failed."
+msgstr "socket fallita."
+
+#: WWW/Library/Implementation/HTTCP.c:1634
+msgid "Could not make connection non-blocking."
+msgstr "Impossibile stabilire connessione non bloccante."
+
+#: WWW/Library/Implementation/HTTCP.c:1703
+msgid "Connection failed (too many retries)."
+msgstr "Connessione fallita (troppi tentativi)."
+
+#: WWW/Library/Implementation/HTTCP.c:1896
+msgid "Could not restore socket to blocking."
+msgstr "Impossibile ripristinare socket bloccante."
+
+#: WWW/Library/Implementation/HTTCP.c:1962
+msgid "Socket read failed for 180,000 tries."
+msgstr "Falliti 180000 tentativi di lettura socket."
+
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2048
-msgid "Invalid URL!"
+#: WWW/Library/Implementation/HTTP.c:503
+msgid "This client does not contain support for HTTPS URLs."
+msgstr "Questo client non è predisposto per gestire gli URL HTTPS."
+
+#: WWW/Library/Implementation/HTTP.c:528
+msgid "Unable to connect to remote host."
+msgstr "Impossibile stabilire la connessione con l'host remoto."
+
+# First %s will be FTP, HTTP or other protocol and second %s will be hostname
+#: WWW/Library/Implementation/HTTP.c:557
+#, fuzzy
+msgid "Retrying connection without TLS."
+msgstr "Connessione %s a %s "
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2125
-msgid "This client does not contain support for SNEWS URLs."
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2306
-msgid "No target for raw text!"
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2336
-msgid "Connecting to NewsHost ..."
+#: WWW/Library/Implementation/HTTP.c:1091
+msgid "Sending HTTP request."
+msgstr "Invio della richiesta HTTP"
+
+#: WWW/Library/Implementation/HTTP.c:1125
+msgid "Unexpected network write error; connection aborted."
+msgstr "Errore inatteso di scrittura in rete; connessione annullata."
+
+#: WWW/Library/Implementation/HTTP.c:1131
+msgid "HTTP request sent; waiting for response."
+msgstr "Richiesta HTTP inviata; in attesa di risposta."
+
+# END of Permit FORM
+# More progress strings follow
+#: WWW/Library/Implementation/HTTP.c:1195
+msgid "Unexpected network read error; connection aborted."
+msgstr "Errore inatteso di lettura in rete; connessione annullata."
+
+#.
+#. **	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:1391
+msgid "Got unexpected Informational Status."
+msgstr "Ricevuta informazione di stato inattesa."
+
+#.
+#. *  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:1426
+msgid "Request fulfilled.  Reset Content."
+msgstr "Richiesta soddisfatta. Ripristino del contenuto."
+
+#. 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:1545
+msgid "Got unexpected 304 Not Modified status."
+msgstr "Ricezione inattesa di stato non modificato 304"
+
+#: WWW/Library/Implementation/HTTP.c:1612
+msgid "Redirection of POST content requires user approval."
+msgstr "Il reindirizzamento del contenuto POST richiede il consenso dell'utente."
+
+#: WWW/Library/Implementation/HTTP.c:1627
+msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
+msgstr "Contenuto POST. Il reindirizzamento permanente è trattato come temporaneo.\n"
+
+#: WWW/Library/Implementation/HTTP.c:1672
+msgid "Retrying with access authorization information."
+msgstr "Nuovo tentativo con info di autorizzazione d'accesso."
+
+#: WWW/Library/Implementation/HTTP.c:1684
+msgid "Show the 401 message body?"
+msgstr "Visualizzare il corpo del messaggio 401?"
+
+#: WWW/Library/Implementation/HTTP.c:1729
+msgid "Show the 407 message body?"
+msgstr "Visualizzare il corpo del messaggio 407?"
+
+#.
+#. **	Bad or unknown server_status number.
+#. **	Take a chance and hope there is
+#. **	something to display. - FM
+#.
+#: WWW/Library/Implementation/HTTP.c:1834
+msgid "Unknown status reply from server!"
+msgstr "Risposta di stato sconosciuto ricevuta dal server!"
+
+#: WWW/Library/Implementation/HTTelnet.c:101
+#, c-format
+msgid "remote %s session:"
+msgstr "sessione remota %s"
+
+#: WWW/Library/Implementation/HTWAIS.c:161
+msgid "Could not connect to WAIS server."
+msgstr "Connessione al server WAIS impossibile."
+
+#: WWW/Library/Implementation/HTWAIS.c:170
+msgid "Could not open WAIS connection for reading."
+msgstr "Impossibile aprire connessione WAYS in lettura."
+
+#: WWW/Library/Implementation/HTWAIS.c:194
+msgid "Diagnostic code is "
+msgstr "Il codice diagnostico è "
+
+#: WWW/Library/Implementation/HTWAIS.c:463
+msgid "Index "
+msgstr "Indice "
+
+#: WWW/Library/Implementation/HTWAIS.c:467
+#, c-format
+msgid " contains the following %d item%s relevant to \""
+msgstr " contiene i %d elementi seguenti %s relativi a \""
+
+#: WWW/Library/Implementation/HTWAIS.c:475
+msgid "The first figure after each entry is its relative score, "
+msgstr "La prima cifra dopo ciascuna voce è il suo punteggio relativo, "
+
+#: WWW/Library/Implementation/HTWAIS.c:476
+msgid "the second is the number of lines in the item."
+msgstr "la seconda è il numero di righe nella voce."
+
+#: WWW/Library/Implementation/HTWAIS.c:517
+msgid " (bad file name)"
+msgstr "(cattivo nome di file)"
+
+# NdT: ??
+#: WWW/Library/Implementation/HTWAIS.c:542
+msgid "(bad doc id)"
+msgstr "(id di doc scorretto)"
+
+#: WWW/Library/Implementation/HTWAIS.c:558
+msgid "(Short Header record, can't display)"
+msgstr "(Corto registro di testa, impossibile visualizzare)"
+
+#: WWW/Library/Implementation/HTWAIS.c:565
+msgid ""
+"\n"
+"Long Header record, can't display\n"
 msgstr ""
+"\n"
+"Lungo registro di testa, impossibile visualizzare.\n"
 
-#: WWW/Library/Implementation/HTNews.c:2436 WWW/Library/Implementation/HTNews.c:2462 WWW/Library/Implementation/HTNews.c:2619
-msgid "Cannot POST to this host."
+#: WWW/Library/Implementation/HTWAIS.c:572
+msgid ""
+"\n"
+"Text record\n"
 msgstr ""
+"\n"
+"Registro di testo\n"
 
-#: WWW/Library/Implementation/HTNews.c:2485
-msgid "Cancelled!"
+#: WWW/Library/Implementation/HTWAIS.c:581
+msgid ""
+"\n"
+"Headline record, can't display\n"
 msgstr ""
+"\n"
+"Registro di riga iniziale, impossibile visualizzare\n"
 
-#: WWW/Library/Implementation/HTNews.c:2637
-msgid "Reading list of available newsgroups."
+#: WWW/Library/Implementation/HTWAIS.c:589
+msgid ""
+"\n"
+"Code record, can't display\n"
 msgstr ""
+"\n"
+"Registro di codice, impossibile visualizzare\n"
 
-#: WWW/Library/Implementation/HTNews.c:2659
-msgid "Reading list of articles in newsgroup."
+#: WWW/Library/Implementation/HTWAIS.c:689
+msgid "Syntax error in WAIS URL"
+msgstr "Errore di sintassi nell'URL WAIS"
+
+#: WWW/Library/Implementation/HTWAIS.c:759
+msgid " (WAIS Index)"
+msgstr " (Indice WAIS) "
+
+#: WWW/Library/Implementation/HTWAIS.c:766
+msgid "WAIS Index: "
+msgstr "Indice WAIS: "
+
+#: WWW/Library/Implementation/HTWAIS.c:772
+msgid "This is a link for searching the "
+msgstr "Questo è un link per cercare il "
+
+#: WWW/Library/Implementation/HTWAIS.c:776
+msgid " WAIS Index.\n"
+msgstr "Indice WAIS.\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:803
+msgid ""
+"\n"
+"Enter the 's'earch command and then specify search words.\n"
 msgstr ""
+"\n"
+"Usare il comando di ricerca (s), poi scrivere i termini da cercare.\n"
 
-#: WWW/Library/Implementation/HTNews.c:2665
-msgid "Reading news article."
+#: WWW/Library/Implementation/HTWAIS.c:825
+msgid " (in "
+msgstr " (in "
+
+#: WWW/Library/Implementation/HTWAIS.c:834
+msgid "WAIS Search of \""
+msgstr "Ricerca WAIS di \""
+
+#: WWW/Library/Implementation/HTWAIS.c:838
+msgid "\" in: "
+msgstr "\" in: "
+
+#: WWW/Library/Implementation/HTWAIS.c:853
+msgid "HTWAIS: Request too large."
+msgstr "HTWAIS: richiesta troppo grande."
+
+#: WWW/Library/Implementation/HTWAIS.c:862
+msgid "Searching WAIS database..."
+msgstr "Ricerca nella base di dati WAIS..."
+
+#: WWW/Library/Implementation/HTWAIS.c:872
+msgid "Search interrupted."
+msgstr "Ricerca interrotta."
+
+#: WWW/Library/Implementation/HTWAIS.c:922
+msgid "Can't convert format of WAIS document"
+msgstr "Impossibile convertire il formato del documento WAIS"
+
+#: WWW/Library/Implementation/HTWAIS.c:966
+msgid "HTWAIS: Request too long."
+msgstr "HTWAIS: richiesta troppo lunga."
+
+#.
+#. **	Actually do the transaction given by request_message.
+#.
+#: WWW/Library/Implementation/HTWAIS.c:980
+msgid "Fetching WAIS document..."
+msgstr "Raccolta del documento WAIS...."
+
+#. display_search_response(target, retrieval_response,
+#. wais_database, keywords);
+#: WWW/Library/Implementation/HTWAIS.c:1019
+msgid "No text was returned!\n"
+msgstr "Non è stato restituito alcun testo!\n"
+
+#: WWW/Library/Implementation/HTWSRC.c:287
+msgid " NOT GIVEN in source file; "
+msgstr "NON DATO nel file origine; "
+
+#: WWW/Library/Implementation/HTWSRC.c:311
+msgid " WAIS source file"
+msgstr "file origine WAIS"
+
+#: WWW/Library/Implementation/HTWSRC.c:318
+msgid " description"
+msgstr " descrizione"
+
+#: WWW/Library/Implementation/HTWSRC.c:328
+msgid "Access links"
+msgstr "Link di accesso"
+
+#: WWW/Library/Implementation/HTWSRC.c:346
+msgid "Direct access"
+msgstr "Accesso diretto"
+
+#. * Proxy will be used if defined, so let user know that - FM *
+#: WWW/Library/Implementation/HTWSRC.c:349
+msgid " (or via proxy server, if defined)"
+msgstr " (o tramite un server proxy, se definito)"
+
+#: WWW/Library/Implementation/HTWSRC.c:364
+msgid "Maintainer"
+msgstr "Curatore"
+
+#: WWW/Library/Implementation/HTWSRC.c:372
+msgid "Host"
+msgstr "Host"
+
+# src/GridText.c
+#: src/GridText.c:688
+msgid "Memory exhausted, display interrupted!"
+msgstr "Memoria insufficiente, visualizzazione interrotta!"
+
+#: src/GridText.c:693
+msgid "Memory exhausted, will interrupt transfer!"
+msgstr "Memoria insufficiente, il trasferimento sarà interrotto!"
+
+#: src/GridText.c:3578
+msgid " *** MEMORY EXHAUSTED ***"
+msgstr " *** MEMORIA INSUFFICIENTE ***"
+
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
+msgid "unknown field or link"
+msgstr "campo o link sconosciuto"
+
+#: src/GridText.c:6023
+msgid "text entry field"
+msgstr "campo di immissione testo"
+
+#: src/GridText.c:6026
+msgid "password entry field"
+msgstr "campo di immissione password"
+
+#: src/GridText.c:6029
+msgid "checkbox"
+msgstr "casella di scelta"
+
+#: src/GridText.c:6032
+msgid "radio button"
+msgstr "bottone radio"
+
+#: src/GridText.c:6035
+msgid "submit button"
+msgstr "bottone Invio"
+
+#: src/GridText.c:6038
+msgid "reset button"
+msgstr "bottone Annulla"
+
+#: src/GridText.c:6041
+msgid "popup menu"
+msgstr "menù a comparsa"
+
+#: src/GridText.c:6044
+msgid "hidden form field"
+msgstr "campo nascosto di modulo"
+
+#: src/GridText.c:6047
+msgid "text entry area"
+msgstr "area di immissione testo"
+
+#: src/GridText.c:6050
+msgid "range entry field"
+msgstr "campo di immissione (range)"
+
+#: src/GridText.c:6053
+msgid "file entry field"
+msgstr "campo di immissione file"
+
+#: src/GridText.c:6056
+msgid "text-submit field"
+msgstr "campo di invio testo"
+
+#: src/GridText.c:6059
+msgid "image-submit button"
+msgstr "bottone di invio immagine"
+
+#: src/GridText.c:6062
+msgid "keygen field"
+msgstr "campo «keygen»"
+
+#: src/GridText.c:6065
+msgid "unknown form field"
+msgstr "campo di modulo sconosciuto"
+
+# WWW/Libary/Implementation/HTFile.c
+# #, fuzzy
+#: src/GridText.c:10066
+msgid "Can't open file for uploading"
+msgstr "Impossibile aprire il file per il caricamento"
+
+#: src/GridText.c:11218
+#, c-format
+msgid "Submitting %s"
+msgstr "Invio di %s"
+
+#. ugliness has happened; inform user and do the best we can
+#: src/GridText.c:12375
+msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
+msgstr "Interruzione: struttura TextAnchorrovinata - si suggerisce di abbandonare!"
+
+#. don't show previous state
+#: src/GridText.c:12581
+msgid "Wrap lines to fit displayed area?"
+msgstr "Accorciare le righe per adattarle all'area di visualizzazione?"
+
+#: src/GridText.c:12633
+msgid "Very long lines have been wrapped!"
+msgstr "Le righe molto lunghe sono state spezzate!"
+
+#: src/GridText.c:13079
+msgid "Very long lines have been truncated!"
+msgstr "Le righe molto lunghe sono state troncate!"
+
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
+msgid "bytes"
+msgstr "byte"
+
+#: src/HTAlert.c:155
+msgid "KB"
+msgstr "KB"
+
+#: src/HTAlert.c:274
+#, c-format
+msgid "Read %s of %s of data"
+msgstr "Letti %s su %s di dati"
+
+# WWW/Library/Implementation/HTFormat.c
+#: src/HTAlert.c:276
+#, c-format
+msgid "Read %s of data"
+msgstr "Letti %s di dati"
+
+#: src/HTAlert.c:281
+#, c-format
+msgid ", %s/sec"
+msgstr ", %s/sec"
+
+#: src/HTAlert.c:290
+#, fuzzy, c-format
+msgid " (stalled for %s)"
+msgstr " (bloccato per %ld sec)"
+
+#: src/HTAlert.c:294
+#, fuzzy, c-format
+msgid ", ETA %s"
+msgstr ", mancano %ld sec"
+
+#: src/HTAlert.c:301
+msgid " (Press 'z' to abort)"
+msgstr " (Premere 'z' per annullare.)"
+
+# SOME DESCRIPTIVE TITLE.
+# MUST GO AND FIND NdT= to address problems.
+#. 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:342 src/HTAlert.c:390
+msgid "yes"
+msgstr "sì"
+
+#: src/HTAlert.c:345 src/HTAlert.c:391
+msgid "no"
+msgstr "no"
+
+#: src/HTML.c:5985
+msgid "Description:"
+msgstr "Descrizione:"
+
+#: src/HTML.c:5990
+msgid "(none)"
+msgstr "(nessuno/a)"
+
+#: src/HTML.c:5994
+msgid "Filepath:"
+msgstr "Percorso del file:"
+
+#: src/HTML.c:5999
+msgid "(unknown)"
+msgstr "(sconosciuto)"
+
+#: src/HTML.c:7452
+msgid "Document has only hidden links.  Use the 'l'ist command."
+msgstr "Il documento rinvia solo a link nascosti. Usare il comando 'l'ista."
+
+#: src/HTML.c:7958
+msgid "Source cache error - disk full?"
+msgstr "Errore di registrazione - disco pieno?"
+
+#: src/HTML.c:7971
+msgid "Source cache error - not enough memory!"
+msgstr "Errore di registrazione - memoria insufficiente!"
+
+#: src/LYBookmark.c:167
+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 ""
+"     Questo file è una rappresentazione HTML del file segnalibri di X Mosaic.\n"
+"     Si possono eliminare i link scaduti o non validi con il consueto\n"
+"     comando di cancellazione dei segnalibri, normalmente il tasto 'R', che\n"
+"     potrebbe essere stato riconfigurato dall'utente o dal gestore di sistema."
+
+#: src/LYBookmark.c:379
+msgid ""
+"     You can delete links by the 'R' key<br>\n"
+"<ol>\n"
+msgstr ""
+"     Si possono cancellare le voci con il tasto 'R'<br>\n"
+"<ol>\n"
+
+#: src/LYBookmark.c:382
+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 ""
+"     Si possono cancellare le voci con il tasto di cancellazione dei segnalibri,\n"
+"     di solito il tasto 'R', ma i tasti possono essere stati riconfigurati\n"
+"     dall'utente o dal gestore di sistema."
+
+#: src/LYBookmark.c:386
+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 ""
+"     Il file può anche essere modificato con un normale editor di testi per\n"
+"     eliminare le voci scadute o non valide o cambiarne l'ordine."
+
+#: src/LYBookmark.c:389
+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 ""
+"Nota: se si elabora manualmente questo file,\n"
+"      non si deve cambiare il formato all'interno delle righe\n"
+"      e nemmeno aggiungere altro codice HTML."
+
+#: src/LYBookmark.c:681
+#, c-format
+msgid "File may be recoverable from %s during this session"
+msgstr "Il file si potrà recuperare da %s entro questa sessione."
+
+#.
+#. *  Neither the path as given nor any components examined by
+#. *  backing up were stat()able. - kw
+#.
+#: src/LYCgi.c:231
+msgid "Unable to access cgi script"
+msgstr "Impossibile accedere allo script cgi"
+
+#: src/LYCgi.c:654 src/LYCgi.c:657
+msgid "Good Advice"
+msgstr "Buon consiglio"
+
+#: src/LYCgi.c:660
+msgid "An excellent http server for VMS is available via"
+msgstr "Un ottimo server http per VMS è disponibile tramite"
+
+#: src/LYCgi.c:667
+msgid "this link"
+msgstr "questo link"
+
+#: src/LYCgi.c:671
+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"
+
+#: src/LYClean.c:122
+msgid "Exiting via interrupt:"
+msgstr "Uscita tramite interrupt:"
+
+#: src/LYCookie.c:2462
+msgid "(from a previous session)"
+msgstr "(da una sessione precedente)"
+
+#: src/LYCookie.c:2522
+msgid "Maximum Gobble Date:"
+msgstr "Data massima di scadenza:"
+
+#: src/LYCookie.c:2564
+msgid "Internal"
+msgstr "Interno"
+
+#: src/LYCookie.c:2565
+msgid "cookie_domain_flag_set error, aborting program"
+msgstr "errore cookie_domain_flag_set: programma interrotto"
+
+#: src/LYCurses.c:1004
+msgid "Terminal initialisation failed - unknown terminal type?"
+msgstr "Inizializzazione del terminale fallita - tipo di terminale sconosciuto?"
+
+#: src/LYCurses.c:1426
+msgid "Terminal ="
+msgstr "Terminale ="
+
+#: src/LYCurses.c:1430
+msgid "You must use a vt100, 200, etc. terminal with this program."
+msgstr "Con questo programma si deve usare un terminale vt100, 200, ecc."
+
+#: src/LYCurses.c:1480
+msgid "Your Terminal type is unknown!"
+msgstr "Il tipo di terminale è sconosciuto."
+
+#: src/LYCurses.c:1481
+msgid "Enter a terminal type:"
+msgstr "Indicare un tipo di terminale:"
+
+#: src/LYCurses.c:1495
+msgid "TERMINAL TYPE IS SET TO"
+msgstr "TIPO DI TERMINALE IMPOSTATO A"
+
+#: src/LYCurses.c:1994
+#, c-format
+msgid ""
+"\n"
+"A Fatal error has occurred in %s Ver. %s\n"
 msgstr ""
+"\n"
+"Un errore irreversibile si è verificato in %s Ver. %s\n"
 
-#: src/LYMain.c:2502
+#: src/LYCurses.c:1996
 msgid ""
 "\n"
-"%s Version %s (1998)\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"
+"Si prega di avvisare il gestore di sistema per segnalare un difetto e, se il\n"
+"difetto è confermato, di segnalarlo alla lista di discussione lynx-dev.\n"
+"La relazione dovrà contenere una descrizione concisa del comando e/o URL che\n"
+"provoca il problema, il nome del sistema operativo con il numero di versione,\n"
+"l'implementazione TCP/IP, il TRACEBACK se è possibile catturarlo, ed ogni\n"
+"altra informazione significativa.\n"
+
+#: src/LYEdit.c:249
+msgid "Editor killed by signal"
+msgstr "Editor cancellato da segnale"
+
+#: src/LYEdit.c:251
+#, c-format
+msgid "Editor returned with error status, %s"
+msgstr "L'editor ha restituito un codice di errore %s"
+
+#: src/LYEdit.c:252
+msgid "reason unknown."
+msgstr "motivo sconosciuto."
+
+#: src/LYDownload.c:517
+msgid "Downloaded link:"
+msgstr "Link scaricato:"
+
+#: src/LYDownload.c:522
+msgid "Suggested file name:"
+msgstr "Nome di file proposto:"
+
+#: src/LYDownload.c:527
+msgid "Standard download options:"
+msgstr "Opzioni standard di scaricamento:"
+
+#: src/LYDownload.c:528
+msgid "Download options:"
+msgstr "Opzioni di scaricamento file:"
+
+#: src/LYDownload.c:544
+msgid "Save to disk"
+msgstr "Registrare su disco"
+
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "Spedire il file tramite mail"
+
+#: src/LYDownload.c:565
+msgid "Save to disk disabled."
+msgstr "Registrazione su disco disattivata."
+
+#: src/LYDownload.c:569 src/LYPrint.c:1327
+msgid "Local additions:"
+msgstr "Aggiunte locali:"
+
+#: src/LYDownload.c:578 src/LYUpload.c:216
+msgid "No Name Given"
+msgstr "Nessun nome dato"
+
+#: src/LYHistory.c:657
+msgid "You selected:"
+msgstr "Scelte effettuate:"
+
+#: src/LYHistory.c:681 src/LYHistory.c:921
+msgid "(no address)"
+msgstr "(nessun indirizzo)"
+
+#: src/LYHistory.c:685
+msgid " (internal)"
+msgstr " (interno)"
+
+#: src/LYHistory.c:687
+msgid " (was internal)"
+msgstr " (era interno)"
+
+#: src/LYHistory.c:785
+msgid " (From History)"
+msgstr " (dalla storia)"
+
+#: src/LYHistory.c:841
+msgid "You visited (POSTs, bookmark, menu and list files excluded):"
+msgstr "Elementi consultati (sono esclusi file POST, segnalibri ed elenchi):"
+
+#: src/LYHistory.c:1137
+msgid "(No messages yet)"
+msgstr "(Ancora nessun messaggio)"
+
+#: src/LYLeaks.c:209
+msgid "Invalid pointer detected."
+msgstr "Individuato puntatore non valido."
+
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
+msgid "Pointer:"
+msgstr "Puntatore:"
+
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
+msgid "FileName:"
+msgstr "Nome di file:"
+
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
+msgid "LineCount:"
+msgstr "Numero di righe:"
+
+#: src/LYLeaks.c:249
+msgid "Memory leak detected."
+msgstr "Individuata falla di memoria."
+
+#: src/LYLeaks.c:257
+msgid "Contains:"
+msgstr "Contiene:"
+
+#: src/LYLeaks.c:270
+msgid "ByteSize:"
+msgstr "Dim. byte:"
+
+#: src/LYLeaks.c:284
+msgid "realloced:"
+msgstr "reallocato:"
+
+#: src/LYLeaks.c:307
+msgid "Total memory leakage this run:"
+msgstr "Perdita totale di memoria in questa esecuzione:"
+
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+#, fuzzy
+msgid "Bytes allocated"
+msgstr "reallocato:"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
+msgid "References in "
+msgstr "Riferimenti in "
+
+#: src/LYList.c:86
+msgid "this document:"
+msgstr "questo documento:"
+
+#: src/LYList.c:92
+msgid "Visible links:"
+msgstr "Link visibili:"
+
+#: src/LYList.c:194 src/LYList.c:315
+msgid "Hidden links:"
+msgstr "Link nascosti:"
+
+#: src/LYList.c:262
+msgid "References"
+msgstr "Riferimenti"
+
+#: src/LYList.c:264
+msgid "Visible links"
+msgstr "Link visibili"
+
+#: src/LYLocal.c:267
+#, c-format
+msgid "Unable to get status of '%s'."
+msgstr "Impossibile rilevare lo stato di '%s'."
+
+#: src/LYLocal.c:301
+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:366
+#, c-format
+msgid "Unable to %s due to system error!"
+msgstr "Operazione %s impossibile per errore di sistema!"
+
+#. error return
+#: src/LYLocal.c:400
+#, 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:463
+#, c-format
+msgid "remove %s"
+msgstr "eliminazione di %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr "touch %s"
+
+#: src/LYLocal.c:508
+#, c-format
+msgid "move %s to %s"
+msgstr "spostamento di %s a %s"
+
+#: src/LYLocal.c:548
+msgid "There is already a directory with that name!  Request ignored."
+msgstr "Questa directory esiste già! Richiesta ignorata."
+
+#: src/LYLocal.c:550
+msgid "There is already a file with that name!  Request ignored."
+msgstr "Questo file esiste già! Richiesta ignorata."
+
+#: src/LYLocal.c:552
+msgid "The specified name is already in use!  Request ignored."
+msgstr "Il nome indicato è già usato! Richiesta ignorata."
+
+#: src/LYLocal.c:563
+msgid "Destination has different owner!  Request denied."
+msgstr "La destinazione ha un proprietario diverso! Richiesta negata."
+
+#: src/LYLocal.c:566
+msgid "Destination is not a valid directory!  Request denied."
+msgstr "La destinazione non è una directory valida! Richiesta negata."
+
+#: src/LYLocal.c:588
+msgid "Remove all tagged files and directories?"
+msgstr "Eliminare tutte le directory e i file contrassegnati?"
+
+#: src/LYLocal.c:647
+msgid "Enter new location for tagged items: "
+msgstr "Immettere una nuova destinazione per le voci contrassegnate: "
+
+#: src/LYLocal.c:716
+msgid "Path too long"
+msgstr "Percorso troppo lungo"
+
+#: src/LYLocal.c:747
+msgid "Source and destination are the same location - request ignored!"
+msgstr "Origine e destinazione sono identici - richiesta ignorata!"
+
+#: src/LYLocal.c:805
+msgid "Enter new name for directory: "
+msgstr "Scrivere un nuovo nome per la directory: "
+
+#: src/LYLocal.c:807
+msgid "Enter new name for file: "
+msgstr "Scrivere un nuovo nome per il file: "
+
+#: src/LYLocal.c:819
+msgid "Illegal character (path-separator) found! Request ignored."
+msgstr "Carattere proibito (separatore di percorso)! Richiesta ignorata."
+
+#: src/LYLocal.c:868
+msgid "Enter new location for directory: "
+msgstr "Immettere una nuova destinazione per la directory: "
+
+#: src/LYLocal.c:874
+msgid "Enter new location for file: "
+msgstr "Immettere una nuova destinazione per il file: "
+
+#: src/LYLocal.c:901
+msgid "Unexpected failure - unable to find trailing path separator"
+msgstr "Errore inatteso - non trovo il separatore di percorso finale"
+
+#: src/LYLocal.c:921
+msgid "Source and destination are the same location!  Request ignored!"
+msgstr "Origine e destinazione sono identici! Richiesta ignorata!"
+
+#: src/LYLocal.c:970
+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:972
+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:1001
+msgid "This feature not yet implemented!"
+msgstr "Questa caratteristica non è ancora disponibile."
+
+#: src/LYLocal.c:1019
+msgid "Enter name of file to create: "
+msgstr "Scrivere il nome del file da generare: "
+
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
+msgid "Illegal redirection \"//\" found! Request ignored."
+msgstr "Reindirizzamento \"//\" proibito! Richiesta ignorata."
+
+#: src/LYLocal.c:1061
+msgid "Enter name for new directory: "
+msgstr "Scrivere il nome della nuova directory: "
+
+#: src/LYLocal.c:1106
+msgid "Create file or directory (f or d): "
+msgstr "Generare un file o una directory (f o d): "
+
+#: src/LYLocal.c:1146
+#, c-format
+msgid "Remove '%s' and all of its contents?"
+msgstr "Eliminare '%s' e l'intero suo contenuto?"
+
+#: src/LYLocal.c:1149
+msgid "Remove directory and all of its contents?"
+msgstr "Eliminare la directory e l'intero suo contenuto?"
+
+#: src/LYLocal.c:1153
+#, c-format
+msgid "Remove file '%s'?"
+msgstr "Eliminare il file '%s'?"
+
+#: src/LYLocal.c:1155
+msgid "Remove file?"
+msgstr "Eliminare il file?"
+
+#: src/LYLocal.c:1160
+#, c-format
+msgid "Remove symbolic link '%s'?"
+msgstr "Eliminare il link simbolico '%s'?"
+
+#: src/LYLocal.c:1162
+msgid "Remove symbolic link?"
+msgstr "Eliminare il link simbolico?"
+
+#: src/LYLocal.c:1248
+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:1278
+msgid "Unable to open permit options file"
+msgstr "Impossibile aprire il file delle opzioni di permesso."
+
+#: src/LYLocal.c:1305
+msgid "Specify permissions below:"
+msgstr "Specificare di seguito i diritti di accesso:"
+
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
+msgid "Owner:"
+msgstr "Proprietario:"
+
+#: src/LYLocal.c:1322
+msgid "Group"
+msgstr "Gruppo"
+
+#: src/LYLocal.c:1338
+msgid "Others:"
+msgstr "Altri:"
+
+#: src/LYLocal.c:1356
+msgid "form to permit"
+msgstr "modulo di permesso"
+
+#: src/LYLocal.c:1452
+msgid "Invalid mode format."
+msgstr "Formato di modo non valido."
+
+#: src/LYLocal.c:1456
+msgid "Invalid syntax format."
+msgstr "Formato di sintassi non valido."
+
+#: src/LYLocal.c:1645
+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:1825
+msgid "NULL URL pointer"
+msgstr "puntatore a NULL URL"
+
+#: src/LYLocal.c:1908
+#, c-format
+msgid "Executing %s "
+msgstr "Esecuzione di %s "
+
+#: src/LYLocal.c:1911
+msgid "Executing system command. This might take a while."
+msgstr "Esecuzione di comando di sistema. Potrebbe volerci un po' di tempo."
+
+#: src/LYLocal.c:1985
+msgid "Current directory:"
+msgstr "Directory attuale:"
+
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
+msgid "Current selection:"
+msgstr "Selezione attuale:"
+
+#: src/LYLocal.c:1992
+msgid "Nothing currently selected."
+msgstr "Nulla attualmente selezionato."
+
+#: src/LYLocal.c:2007
+msgid "tagged item:"
+msgstr "voce contrassegnata:"
+
+#: src/LYLocal.c:2007
+msgid "tagged items:"
+msgstr "voci contrassegnate:"
+
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
+msgid "Illegal filename; request ignored."
+msgstr "Nome di file proibito; richiesta ignorata."
+
+#. directory not writable
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
+msgid "Install in the selected directory not permitted."
+msgstr "Manca il diritto per l'installazione nella directory selezionata."
+
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr "La voce selezionata non è una directory! Richiesta ignorata."
+
+#: src/LYLocal.c:2276
+msgid "Just a moment, ..."
+msgstr "Solo un momento..."
+
+#: src/LYLocal.c:2293
+msgid "Error buiding install args"
+msgstr "Errore nella preparazione degli argomenti di installazione."
+
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
+#, c-format
+msgid "Source and target are the same: %s"
+msgstr "Origine e destinazione sono identici: %s"
+
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
+#, c-format
+msgid "Already in target directory: %s"
+msgstr "Siamo già nella directory destinazione: %s"
+
+#: src/LYLocal.c:2362
+msgid "Installation complete"
+msgstr "Installazione terminata."
+
+#: src/LYLocal.c:2551
+msgid "Temporary URL or list would be too long."
+msgstr "L'URL o l'elenco temporaneo sarebbero troppo lunghi."
+
+#: src/LYMail.c:534
+msgid "Sending"
+msgstr "Invio"
+
+#: src/LYMail.c:1024
+#, c-format
+msgid "The link   %s :?: %s \n"
+msgstr "Il link %s :?: %s \n"
+
+#: src/LYMail.c:1026
+#, c-format
+msgid "called \"%s\"\n"
+msgstr "chiamato «%s»\n"
+
+#: src/LYMail.c:1027
+#, c-format
+msgid "in the file \"%s\" called \"%s\"\n"
+msgstr "nel file \"%s\" chiamato \"%s\"\n"
+
+#: src/LYMail.c:1028
+msgid "was requested but was not available."
+msgstr "è stato richiesto ma non è disponibile."
+
+#: src/LYMail.c:1029
+msgid "Thought you might want to know."
+msgstr "Probabilmente è utile saperlo."
+
+#: src/LYMail.c:1031
+msgid "This message was automatically generated by"
+msgstr "Questo messaggio è stato generato automaticamente da"
+
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:969
+msgid "No Winsock found, sorry."
+msgstr "Nessun Winsock trovato, spiacente."
 
-#: src/LYMain.c:2507
-msgid "%s Version %s %s"
-msgstr "%s Versione %s %s"
+#: src/LYMain.c:1170
+msgid "You MUST define a valid TMP or TEMP area!\n"
+msgstr "SI DEVE definire un'area TMP o TEMP valida! \n"
 
-#: src/LYMain.c:2510
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
+msgid "No such directory"
+msgstr "Non esiste la directory indicata"
+
+#: src/LYMain.c:1436
+#, c-format
+msgid ""
+"\n"
+"Configuration file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"Il file di configurazione %s non è disponibile.\n"
+"\n"
+
+# src/LYMain.c
+#: src/LYMain.c:1446
+msgid ""
+"\n"
+"Lynx character sets not declared.\n"
+"\n"
+msgstr ""
+"\n"
+"Insiemi di caratteri di Lynx non precisati.\n"
+"\n"
+
+#: src/LYMain.c:1475
+msgid ""
+"\n"
+"Lynx edit map not declared.\n"
+"\n"
+msgstr ""
+"\n"
+"Edit map di Lynx non precisata.\n"
+"\n"
+
+#: src/LYMain.c:1504
+#, c-format
+msgid ""
+"\n"
+"Lynx file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"Il file Lynx %s non è disponibile.\n"
+"\n"
+
+#: src/LYMain.c:1743
+msgid "Warning:"
+msgstr "Attenzione:"
+
+#: src/LYMain.c:2293
+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:2540 src/LYMain.c:2588
+#, c-format
+msgid "Lynx: ignoring unrecognized charset=%s\n"
+msgstr "Lynx: ignorato charset=%s sconosciuto.\n"
+
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
+msgstr "%s versione %s (%s)\n"
+
+#: src/LYMain.c:3143
+#, c-format
+msgid "Built on %s %s %s\n"
+msgstr "Compilato il %s %s %s\n"
+
+#: src/LYMain.c:3166
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
-msgstr "Il copyright ha tenuto dall' università di Kansas, di CERN e di altri contributori.\n"
+msgstr "Copyright dell'Università del Kansas, del CERN e di altri collaboratori.\n"
 
-#: src/LYMain.c:2512
+#: src/LYMain.c:3168
 msgid "Distributed under the GNU General Public License.\n"
-msgstr "Distribuito sotto l' autorizzazione del grande pubblico di GNU.\n"
+msgstr "Distribuito nell'ambito della licenza pubblica GNU\n"
 
-#: src/LYMain.c:2514
+#: src/LYMain.c:3170
 msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
+"See http://lynx.isc.org/ and the online help for more information.\n"
 "\n"
-msgstr "Vedere http://lynx.browser.org / e l' aiuto in linea per le più informazioni.\n"
+msgstr ""
+"Vedere http://lynx.isc.org/ e l'aiuto in linea per ulteriori informazioni.\n"
 "\n"
 
-#: src/LYMainLoop.c:2204
-msgid "Are you sure you want to quit? [Y] "
-msgstr " Vuoi abbandonare? [Y] "
+#: src/LYMain.c:3919
+#, c-format
+msgid "USAGE: %s [options] [file]\n"
+msgstr "USO: %s [opzioni] [file]\n"
 
-#: src/LYMainLoop.c:2206
-msgid "Are you sure you want to quit? [N] "
-msgstr " Vuoi abbandonare? [N] "
+#: src/LYMain.c:3920
+msgid "Options are:\n"
+msgstr "Le opzioni sono:\n"
 
-#: src/LYMainLoop.c:2214 src/LYMainLoop.c:2219
-msgid "Excellent!!!"
-msgstr "Bene!!!"
+#: src/LYMain.c:4191
+#, c-format
+msgid "%s: Invalid Option: %s\n"
+msgstr "%s: opzione non valida: %s\n"
 
-#: src/LYNews.c:72 src/LYNews.c:84
-msgid "Can't open temporary file!"
-msgstr "Impossibile aprire file temporaneo!"
+#: src/LYMainLoop.c:539
+#, c-format
+msgid "Internal error: Invalid mouse link %d!"
+msgstr "Errore interno: link per il mouse %d non valido"
 
-#: src/LYNews.c:111
-msgid "You will be posting to:"
+#.
+#. * Make a name for this new URL.
+#.
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
+msgid "A URL specified by the user"
+msgstr "Un URL precisato dall'utente"
+
+#: src/LYMainLoop.c:1110
+msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
+msgstr "«Enctype multipart/form-data» non ancora funzionante! Invio impossibile."
+
+#.
+#. *  Make a name for this help file.
+#.
+#: src/LYMainLoop.c:3053
+msgid "Help Screen"
+msgstr "Schermata di aiuto"
+
+#: src/LYMainLoop.c:3177
+msgid "System Index"
+msgstr "Indice sistema"
+
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
+msgid "Entry into main screen"
+msgstr "Ingresso nella pagina di avvio"
+
+#: src/LYMainLoop.c:3824
+msgid "No next document present"
+msgstr "Non è presente un documento successivo"
+
+#: src/LYMainLoop.c:4131
+msgid "charset for this document specified explicitly, sorry..."
+msgstr "charset per questo documento precisato in modo esplicito, spiacente..."
+
+#: src/LYMainLoop.c:5004
+msgid "cd to:"
+msgstr "cambio directory su:"
+
+#: src/LYMainLoop.c:5031
+msgid "A component of path is not a directory"
+msgstr "Un elemento del percorso non è una directory."
+
+#: src/LYMainLoop.c:5034
+msgid "failed to change directory"
+msgstr "cambiamento directory fallito"
+
+#: src/LYMainLoop.c:6204
+msgid "Reparsing document under current settings..."
+msgstr "Reanalisi del documento con le impostazioni attuali..."
+
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
+#, 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:6834
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6914
+#, fuzzy
+msgid "Current URL is empty."
+msgstr "Directory attuale:"
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr ""
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
 msgstr ""
 
-#: src/LYNews.c:120
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
+msgid "-index-"
+msgstr "-indice-"
+
+#: src/LYMainLoop.c:7731
+msgid "lynx: Can't access startfile"
+msgstr "lynx: impossibile accedere al file di avvio"
+
+#: src/LYMainLoop.c:7744
+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:7745
+msgid "      Exiting..."
+msgstr "      Uscita..."
+
+#: src/LYMainLoop.c:7788
+msgid "-more-"
+msgstr "-segue-"
+
+#. Enable scrolling.
+#: src/LYNews.c:187
+msgid "You will be posting to:"
+msgstr "Il contributo sarà inviato a: "
+
+#.
+#. *  Get the mail address for the From header,
+#. *  offering personal_mail_address as default.
+#.
+#: src/LYNews.c:196
 msgid ""
 "\n"
 "\n"
 " Please provide your mail address for the From: header\n"
 msgstr ""
+"\n"
+"\n"
+" Fornire il proprio indirizzo E-mail per l'intestazione From:\n"
 
-#: src/LYNews.c:127 src/LYNews.c:156 src/LYNews.c:191 src/LYNews.c:265 src/LYNews.c:276
-msgid "News Post Cancelled!!!"
-msgstr "Invio news cancellato!!!"
-
-#: src/LYNews.c:139
+#.
+#. *  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:214
 msgid ""
 "\n"
 "\n"
@@ -179,69 +4492,1264 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" Inserire il soggetto.\n"
+" Immettere o correggere l'intestazione Subject:\n"
 
-#: src/LYNews.c:187
+#: src/LYNews.c:303
 msgid ""
 "\n"
 "\n"
 " Please provide or edit the Organization: header\n"
 msgstr ""
+"\n"
+"\n"
+" Immettere o correggere l'intestazione Organization:\n"
 
-#: src/LYNews.c:217
-msgid "Do you wish to include the original message? (y/n) "
-msgstr "Vuoi includere il messaggio originario? (s/n) "
+#.
+#. *  Use the built in line editior.
+#.
+#: src/LYNews.c:360
+msgid ""
+"\n"
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+"\n"
+"Immettere il messaggio qui di seguito:"
 
-#: src/LYNews.c:244
-msgid "Spawning your selected editor to edit news message"
-msgstr "Avvio dell'editor selezionato per editare messaggi news"
+#: src/LYNews.c:406
+msgid "Message has no original text!"
+msgstr "Il messaggio non ha testo originale!"
 
-#: src/LYNews.c:248
-msgid "Error spawning editor, check your editor definition in the options menu"
-msgstr "Errore nell'avvio dell'editor, verifica la definizione dell'editor nelle opzioni"
+#: src/LYOptions.c:746
+msgid "review/edit B)ookmarks files"
+msgstr "B) revisione dei file di segnalibri"
+
+#: src/LYOptions.c:748
+msgid "B)ookmark file: "
+msgstr "B) File segnalibri : "
 
-#: src/LYNews.c:256
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
+#, c-format
+msgid "Use %s to invoke the Options menu!"
+msgstr "Usare %s per richiamare il menù opzioni."
+
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr ""
+
+#: src/LYOptions.c:3261
+msgid "General Preferences"
+msgstr "Preferenze generali"
+
+#. ***************************************************************
+#. User Mode: SELECT
+#: src/LYOptions.c:3265
+msgid "User mode"
+msgstr "Modalità d'uso"
+
+#. Editor: INPUT
+#: src/LYOptions.c:3271
+msgid "Editor"
+msgstr "Editor"
+
+#. Search Type: SELECT
+#: src/LYOptions.c:3276
+msgid "Type of Search"
+msgstr " Modalità di ricerca"
+
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
+#. Cookies: SELECT
+#: src/LYOptions.c:3285
+msgid "Cookies"
+msgstr "Cookie"
+
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
+msgid "Keyboard Input"
+msgstr "Immissione da tastiera"
+
+#. ***************************************************************
+#. Keypad Mode: SELECT
+#: src/LYOptions.c:3316
+msgid "Keypad mode"
+msgstr "Tastierino numerico"
+
+#. Emacs keys: ON/OFF
+#: src/LYOptions.c:3322
+msgid "Emacs keys"
+msgstr "Tasti emacs"
+
+#. VI Keys: ON/OFF
+#: src/LYOptions.c:3328
+msgid "VI keys"
+msgstr "Tasti vi"
+
+#. Line edit style: SELECT
+#. well, at least 2 line edit styles available
+#: src/LYOptions.c:3335
+msgid "Line edit style"
+msgstr "Modo di elaborazione riga"
+
+# #, fuzzy
+#. Keyboard layout: SELECT
+#: src/LYOptions.c:3347
+msgid "Keyboard layout"
+msgstr "Tipo di tastiera"
+
+#.
+#. * Display and Character Set
+#.
+#: src/LYOptions.c:3360
+msgid "Display and Character Set"
+msgstr "Visualizzazione e set di caratteri (charset)"
+
+#. ***************************************************************
+#. Display Character Set: SELECT
+#: src/LYOptions.c:3364
+msgid "Display character set"
+msgstr "Set di caratteri per lo schermo"
+
+#: src/LYOptions.c:3393
+msgid "Assumed document character set"
+msgstr "Charset presunto del documento"
+
+#.
+#. * 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:3413
+msgid "CJK mode"
+msgstr "Modo CJK (lingue asiatiche)"
+
+#: src/LYOptions.c:3415
+msgid "Raw 8-bit"
+msgstr "Non convertito (raw 8-bit)"
+
+#. X Display: INPUT
+#: src/LYOptions.c:3423
+msgid "X Display"
+msgstr "X Display"
+
+#.
+#. * Document Appearance
+#.
+#: src/LYOptions.c:3429
+msgid "Document Appearance"
+msgstr "Aspetto del documento"
+
+#: src/LYOptions.c:3435
+msgid "Show color"
+msgstr "Mostrare i colori"
+
+#. Show cursor: ON/OFF
+#: src/LYOptions.c:3459
+msgid "Show cursor"
+msgstr "Mostrare il cursore"
+
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr "Mostrare la barra di scorrimento"
+
+#. Select Popups: ON/OFF
+#: src/LYOptions.c:3473
+msgid "Popups for select fields"
+msgstr "Menù a comparsa per i campi «select»"
+
+#. HTML error recovery: SELECT
+#: src/LYOptions.c:3479
+msgid "HTML error recovery"
+msgstr "Ripristino da errori HTML"
+
+#. Show Images: SELECT
+#: src/LYOptions.c:3485
+msgid "Show images"
+msgstr "Mostrare le immagini"
+
+#. Verbose Images: ON/OFF
+#: src/LYOptions.c:3499
+msgid "Verbose images"
+msgstr "Immagini prolisse"
+
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3507
+msgid "Headers Transferred to Remote Servers"
+msgstr "Le intestazioni sono trasmesse ai server remoti"
+
+#. ***************************************************************
+#. Mail Address: INPUT
+#: src/LYOptions.c:3511
+msgid "Personal mail address"
+msgstr "Indirizzo E-mail personale"
+
+#. Preferred Document Character Set: INPUT
+#: src/LYOptions.c:3516
+msgid "Preferred document character set"
+msgstr "Charset preferito per i documenti"
+
+#. Preferred Document Language: INPUT
+#: src/LYOptions.c:3521
+msgid "Preferred document language"
+msgstr "Lingua preferita"
+
+#: src/LYOptions.c:3527
+msgid "User-Agent header"
+msgstr "Header 'User-Agent'"
+
+#.
+#. * Listing and Accessing Files
+#.
+#: src/LYOptions.c:3535
+msgid "Listing and Accessing Files"
+msgstr "Elencazione ed accesso ai file"
+
+#. ***************************************************************
+#. FTP sort: SELECT
+#: src/LYOptions.c:3539
+msgid "FTP sort criteria"
+msgstr "Criterio disposizione liste FTP"
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3546
+msgid "Local directory sort criteria"
+msgstr "Criterio disposizione file locali"
+
+# NdT: added "manually" -GA
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+msgid "Local directory sort order"
+msgstr "Criterio ordinamento file locali"
+
+# NdT: options menu phrase missing in po files -GA
+# msgid "(options marked with (!) will not be saved)\n"
+# msgstr "(le opzioni affiancate da (!) non saranno registrate)\n"
+#: src/LYOptions.c:3561
+msgid "Show dot files"
+msgstr "Mostrare i file nascosti"
+
+#: src/LYOptions.c:3569
+msgid "Execution links"
+msgstr "Esecuzione link"
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3589
+msgid "Show transfer rate"
+msgstr "Velocità di trasferimento"
+
+#.
+#. * Special Files and Screens
+#.
+#: src/LYOptions.c:3598
+msgid "Special Files and Screens"
+msgstr "File e schermate speciali"
+
+#: src/LYOptions.c:3603
+msgid "Multi-bookmarks"
+msgstr "Segnalibri multipli"
+
+#: src/LYOptions.c:3611
+msgid "Review/edit Bookmarks files"
+msgstr "Revisione file segnalibri"
+
+#: src/LYOptions.c:3613
+msgid "Goto multi-bookmark menu"
+msgstr "Andare al menù multi-bookmark"
+
+#: src/LYOptions.c:3615
+msgid "Bookmarks file"
+msgstr "File dei segnalibri (Bookmark)"
+
+#. Visited Pages: SELECT
+#: src/LYOptions.c:3621
+msgid "Visited Pages"
+msgstr "Pagine consultate"
+
+#: src/LYOptions.c:3628
+#, fuzzy
+msgid "View the file "
+msgstr "Spedire il file tramite mail"
+
+#: src/LYPrint.c:952
+msgid " Print job complete.\n"
+msgstr "Stampa completata\n"
+
+#: src/LYPrint.c:1281
+msgid "Document:"
+msgstr "Documento:"
+
+#: src/LYPrint.c:1282
+msgid "Number of lines:"
+msgstr "Numero di righe:"
+
+#: src/LYPrint.c:1283
+msgid "Number of pages:"
+msgstr "Numero di pagine:"
+
+#: src/LYPrint.c:1284
+msgid "pages"
+msgstr "pagine"
+
+#: src/LYPrint.c:1284
+msgid "page"
+msgstr "pagina"
+
+#: src/LYPrint.c:1285
+msgid "(approximately)"
+msgstr "(approssimativamente)"
+
+#: src/LYPrint.c:1290
+msgid "Some print functions have been disabled!"
+msgstr "Alcune funzioni di stampa sono state disattivate!"
+
+#: src/LYPrint.c:1294
+msgid "Standard print options:"
+msgstr "Opzioni di stampa ordinarie:"
+
+#: src/LYPrint.c:1295
+msgid "Print options:"
+msgstr "Opzioni di stampa:"
+
+#: src/LYPrint.c:1302
+msgid "Save to a local file"
+msgstr "Registrare su file"
+
+#: src/LYPrint.c:1304
+msgid "Save to disk disabled"
+msgstr "Registrazione su disco disattivata"
+
+#: src/LYPrint.c:1311
+msgid "Mail the file"
+msgstr "Spedire il file tramite mail"
+
+#: src/LYPrint.c:1318
+msgid "Print to the screen"
+msgstr "Stampare sullo schermo"
+
+#: src/LYPrint.c:1323
+msgid "Print out on a printer attached to your vt100 terminal"
+msgstr "Stampare su una stampante collegata al terminale vt100"
+
+#: src/LYReadCFG.c:339
 msgid ""
+"Syntax Error parsing COLOR in configuration file:\n"
+"The line must be of the form:\n"
+"COLOR:INTEGER:FOREGROUND:BACKGROUND\n"
 "\n"
-"\n"
-" Please enter your message below."
+"Here FOREGROUND and BACKGROUND must be one of:\n"
+"The special strings 'nocolor' or 'default', or\n"
 msgstr ""
+"Errore di sintassi durante l'analisi di COLOR nel file di configurazione.\n"
+"La riga deve essere della forma:\n"
+"COLOR:INTERO:PRIMOPIANO:SFONDO\n"
+"\n"
+"dove PRIMOPIANO e SFONDO devono essere uno fra:\n"
+"i termini speciali 'nocolor' o 'default', o\n"
+
+#: src/LYReadCFG.c:352
+msgid "Offending line:"
+msgstr "Riga erronea:"
+
+#: src/LYReadCFG.c:638
+#, c-format
+msgid "key remapping of %s to %s for %s failed\n"
+msgstr "Cambiamento del tasto da %s a %s per %s fallito\n"
+
+#: src/LYReadCFG.c:645
+#, c-format
+msgid "key remapping of %s to %s failed\n"
+msgstr "Cambiamento del tasto da %s a %s fallito\n"
+
+#: src/LYReadCFG.c:666
+#, c-format
+msgid "invalid line-editor selection %s for key %s, selecting all\n"
+msgstr "Scelta line-editor %s per tasto %s non valida, scelgo tutto\n"
+
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
+msgstr "impostazione azione editor per tasto %s (0x%x) a 0x%x per %s fallita.\n"
+
+#: src/LYReadCFG.c:711
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
+msgstr "impostazione azione editor per tasto %s (0x%x) per %s fallita.\n"
+
+#: src/LYReadCFG.c:816
+#, c-format
+msgid "Lynx: cannot start, CERN rules file %s is not available\n"
+msgstr "Lynx: impossibile iniziare. File di regole CERN %s non disponibile.\n"
+
+#: src/LYReadCFG.c:818
+msgid "(no name)"
+msgstr "(nessun nome)"
+
+#: src/LYReadCFG.c:1782
+#, c-format
+msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
+msgstr "Oltre %d inclusioni annidate di lynx.cfg. Forse c'è un circolo vizioso?\n"
+
+#: src/LYReadCFG.c:1784
+#, c-format
+msgid "Last attempted include was '%s',\n"
+msgstr "L'ultima inclusione tentata era: '%s',\n"
+
+#: src/LYReadCFG.c:1785
+#, c-format
+msgid "included from '%s'.\n"
+msgstr "incluso da '%s'.\n"
+
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
+msgid "The following is read from your lynx.cfg file."
+msgstr "Quanto segue è tratto dal file lynx.cfg personale."
+
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
+msgid "Please read the distribution"
+msgstr "Consultare la distribuzione"
+
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
+msgid "for more comments."
+msgstr "per ulteriori commenti."
 
-#: src/LYNews.c:257
+#: src/LYReadCFG.c:2244
+msgid "RELOAD THE CHANGES"
+msgstr "RIACQUISIRE LE MODIFICHE"
+
+#: src/LYReadCFG.c:2253
+msgid "Your primary configuration"
+msgstr "La configurazione principale"
+
+#: src/LYShowInfo.c:129
+msgid "Directory that you are currently viewing"
+msgstr "Directory attualmente visualizzata"
+
+#: src/LYShowInfo.c:132
+msgid "Name:"
+msgstr "Nome:"
+
+#: src/LYShowInfo.c:135
+msgid "URL:"
+msgstr "URL:"
+
+#: src/LYShowInfo.c:146
+msgid "Directory that you have currently selected"
+msgstr "Directory attualmente selezionata"
+
+#: src/LYShowInfo.c:149
+msgid "File that you have currently selected"
+msgstr "File attualmente selezionato"
+
+#: src/LYShowInfo.c:153
+msgid "Symbolic link that you have currently selected"
+msgstr "Link simbolico attualmente selezionato"
+
+#: src/LYShowInfo.c:157
+msgid "Item that you have currently selected"
+msgstr "Voce attualmente selezionata"
+
+#: src/LYShowInfo.c:159
+msgid "Full name:"
+msgstr "Nome completo:"
+
+#: src/LYShowInfo.c:168
+msgid "Unable to follow link"
+msgstr "Impossibile attivare il link"
+
+#: src/LYShowInfo.c:170
+msgid "Points to file:"
+msgstr "Punta al file:"
+
+#: src/LYShowInfo.c:175
+msgid "Name of owner:"
+msgstr "Nome del proprietario:"
+
+#: src/LYShowInfo.c:178
+msgid "Group name:"
+msgstr "Nome del gruppo:"
+
+#: src/LYShowInfo.c:181
+msgid "File size:"
+msgstr "Lunghezza file:"
+
+#: src/LYShowInfo.c:187
+msgid "Creation date:"
+msgstr "Data di creazione:"
+
+#: src/LYShowInfo.c:190
+msgid "Last modified:"
+msgstr "Ultimo aggiornamento:"
+
+#: src/LYShowInfo.c:193
+msgid "Last accessed:"
+msgstr "Ultimo accesso:"
+
+#: src/LYShowInfo.c:195
+msgid "Access Permissions"
+msgstr "Diritti di accesso"
+
+#: src/LYShowInfo.c:261
+msgid "File that you are currently viewing"
+msgstr "File attualmente visualizzato"
+
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
+msgid "Linkname:"
+msgstr "Nome del link:"
+
+# NdT May be this translation is too long
+#: src/LYShowInfo.c:279 src/LYShowInfo.c:291
+msgid "Charset:"
+msgstr "Set di caratteri:"
+
+#: src/LYShowInfo.c:297
+msgid "Server:"
+msgstr "Server:"
+
+#: src/LYShowInfo.c:300
+msgid "Date:"
+msgstr "Data:"
+
+#: src/LYShowInfo.c:303
+msgid "Last Mod:"
+msgstr "Ultima mod:"
+
+#: src/LYShowInfo.c:309
+msgid "&nbsp;Expires:"
+msgstr "&nbsp;Scade:"
+
+#: src/LYShowInfo.c:313
+msgid "Cache-Control:"
+msgstr "Controllo cache:"
+
+#: src/LYShowInfo.c:317
+msgid "Content-Length:"
+msgstr "Lunghezza contenuto:"
+
+#: src/LYShowInfo.c:322
+msgid "Language:"
+msgstr "Lingua:"
+
+#: src/LYShowInfo.c:329
+msgid "Post Data:"
+msgstr "Dati POST:"
+
+#: src/LYShowInfo.c:333
+msgid "Post Content Type:"
+msgstr "Tipo di contenuto POST :"
+
+#: src/LYShowInfo.c:342
+msgid "Owner(s):"
+msgstr "Proprietario/i:"
+
+#: src/LYShowInfo.c:345
+msgid "size:"
+msgstr "grandezza:"
+
+#: src/LYShowInfo.c:345
+msgid "lines"
+msgstr "Righe"
+
+#: src/LYShowInfo.c:348
+msgid "mode:"
+msgstr "Modo:"
+
+#: src/LYShowInfo.c:350
+msgid "forms mode"
+msgstr "tipo modulo"
+
+#: src/LYShowInfo.c:352
+msgid "source"
+msgstr "origine"
+
+#: src/LYShowInfo.c:352
+msgid "normal"
+msgstr "normale"
+
+#: src/LYShowInfo.c:353
+msgid ", safe"
+msgstr ", protetto"
+
+#: src/LYShowInfo.c:354
+msgid ", via internal link"
+msgstr ", collegato internamente"
+
+#: src/LYShowInfo.c:360
+msgid ", no-cache"
+msgstr ", nessuna cache"
+
+#: src/LYShowInfo.c:362
+msgid ", ISMAP script"
+msgstr ", script ISMAP"
+
+#: src/LYShowInfo.c:364
+msgid ", bookmark file"
+msgstr ", file dei bookmark"
+
+#: src/LYShowInfo.c:373
+msgid "Link that you currently have selected"
+msgstr "Link attualmente selezionato"
+
+#: src/LYShowInfo.c:386
+msgid "Method:"
+msgstr "Metodo:"
+
+#: src/LYShowInfo.c:391
+msgid "Enctype:"
+msgstr "Codifica:"
+
+#: src/LYShowInfo.c:403
+msgid "(Form field)"
+msgstr "(campo del modulo)"
+
+#: src/LYShowInfo.c:418
+msgid "No Links on the current page"
+msgstr "Nessun link nella pagina attuale"
+
+#: src/LYStyle.c:278
+#, 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"
-" When you are done, press enter and put a single period (.)"
 msgstr ""
+"Errore di sintassi durante l'analisi di style nel file lss:\n"
+"[%s]\n"
+"La riga deve essere del tipo:\n"
+"OGGETTO:MONO:COLORE (es. em:bold:brightblue:white)\n"
+"dove OGGETTO è un elemento fra EM,STRONG,B,I,U,BLINK ecc.\n"
+"\n"
+
+#: src/LYTraversal.c:107
+msgid "here is a list of the history stack so that you may rebuild"
+msgstr "ecco un elenco per ricostruire la storia delle azioni svolte"
+
+#: src/LYUpload.c:78
+msgid "ERROR! - upload command is misconfigured"
+msgstr "Errore - comando di caricamento configurato male"
+
+#: src/LYUpload.c:100
+msgid "Illegal redirection \"../\" found! Request ignored."
+msgstr "Trovato reindirizzamento proibito \"../\"! Richiesta ignorata"
+
+#: src/LYUpload.c:103
+msgid "Illegal character \"/\" found! Request ignored."
+msgstr "Trovato carattere proibito \"/\"! Richiesta ignorata"
+
+#: src/LYUpload.c:106
+msgid "Illegal redirection using \"~\" found! Request ignored."
+msgstr "Reindirizzamento proibito nell'uso di \"~\"! Richiesta ignorata"
+
+#: src/LYUpload.c:163
+msgid "Unable to upload file."
+msgstr "Impossibile caricare il file."
+
+#: src/LYUpload.c:206
+msgid "Upload To:"
+msgstr "Caricare su:"
+
+#: src/LYUpload.c:207
+msgid "Upload options:"
+msgstr "Opzioni di caricamento file:"
+
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2468
+msgid "Unexpected access protocol for this URL scheme."
+msgstr "Protocollo di accesso inatteso per questo schema di URL."
+
+#: src/LYUtils.c:3294
+msgid "Too many tempfiles"
+msgstr "Troppi file temporanei"
+
+# #, fuzzy
+#: src/LYUtils.c:3595
+msgid "unknown restriction"
+msgstr "Restrizione ignota"
+
+#: src/LYUtils.c:3626
+msgid "No restrictions set.\n"
+msgstr "Nessuna restrizione impostata.\n"
+
+#: src/LYUtils.c:3629
+msgid "Restrictions set:\n"
+msgstr "Descrizione delle restrizioni:\n"
+
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr ""
+
+#: src/LYrcFile.c:21
+msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
+msgstr "Normalmente disattivato. Vedere ENABLE_LYNXRC in lynx.cfg\n"
+
+#: src/LYrcFile.c:295
+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 ""
+"accept_all_cookies consente di impostare Lynx affinché accetti automaticamente\n"
+"tutti i cookie, se così si desidera. La condizione predefinita è \"FALSE\",\n"
+"cosicché è chiesto il consenso per ogni cookie.Impostare accept_all_cookies\n"
+"a \"TRUE\" per accettare tutti i cookie.\n"
+
+#: src/LYrcFile.c:302
+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 ""
+"bookmark_file indica nome e posizione del file di segnalibri predefinito,\n"
+"nel quale l'utilizzatore può copiare i link cui accedere rapidamente\n"
+"in un momento successivo.\n"
+
+#: src/LYrcFile.c:307
+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 ""
+"Se case_sensitive_searching è posto a \"on\", allora la ricerca richiamata\n"
+"con i tasti 's' o '/' distingue caratteri maiuscoli e minuscoli presenti nel\n"
+"documento. Il valore predefinito è \"off\" (insensibile a maiusc/minusc).\n"
+
+#: src/LYrcFile.c:312
+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 ""
+"Il parametro character_set determina la rappresentazione dei caratteri a 8 bit\n"
+"per il terminale usato. Se i caratteri non vengono visualizzati correttamente\n"
+"sullo schermo, si può provare un diverso set di caratteri a 8 bit\n"
+"oppure si possono utilizzare le approssimazioni a 7 bit.\n"
+"I set di caratteri attualmente validi sono:\n"
+
+#: src/LYrcFile.c:319
+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 ""
+"cookie_accept_domains e cookie_reject_domains sono elenchi di domini, separati\n"
+"da virgole, dai quali si vuole che Lynx accetti o respinga automaticamente\n"
+"tutti i cookie. Se un dominio è indicato in entrambi gli elenchi, ha priorità\n"
+"il rifiuto. Il parametro accept_all_cookies annulla\n"
+"qualunque impostazione fatta con queste due opzioni.\n"
+
+#: src/LYrcFile.c:327
+msgid ""
+"cookie_file specifies the file from which to read persistent cookies.\n"
+"The default is ~/.lynx_cookies.\n"
+msgstr ""
+"cookie_file indica il file da cui rilevare i cookie permanenti.\n"
+"Il valore predefinito è ~/.lynx_cookies.\n"
 
-#: src/LYNews.c:258
+#: src/LYrcFile.c:332
 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 ""
+"cookie_loose_invalid_domains, cookie_strict_invalid_domains e\n"
+"cookie_query_invalid_domains sono liste di domini, separati da virgole, per\n"
+"i quali il controllo di validità è soggetto a variare. Se un dominio\n"
+"è soggetto a controllo «strict», verrà adottata una rigorosa conformità con la\n"
+"RFC2109. A un dominio con verifica «loose» verrà consentito di presentare\n"
+"cookie con attributi path o domain non validi. Per ogni dominio la condizione\n"
+"predefinita è di interpellare l'utente in caso di path o dominio non valido.\n"
+
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:351
+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 ""
+"Il parametro dir_list_styles indica lo stile degli elenchi di directory sotto\n"
+"DIRED_SUPPORT (se l'opzione è offerta). Il valore \"MIXED_STYLE\" (predefinito)\n"
+"ordina file e directory insieme. Il valore \"FILES_FIRST\" elenca prima i file,\n"
+"mentre \"DIRECTORIES_FIRST\" elenca per prime le directory.\n"
+
+#: src/LYrcFile.c:359
+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 ""
+"Se emacs_keys è posto a \"on\" allora i normali tasti di movimento:\n"
+"  ^N = giù         ^P = su\n"
+"  ^B = sinistra    ^F = destra\n"
+"sono abilitati.\n"
+
+#: src/LYrcFile.c:365
+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 ""
+"file_editor indica l'editor da richiamare per l'elaborazione dei file locali\n"
+" o per l'invio di posta. Se non viene precisato un editor, l'elaborazione dei\n"
+"file è disabilitata (a meno che non la si attivi da linea di comando) e viene\n"
+"usato l'editor di riga incorporato per la preparazione dei messaggi di posta.\n"
+
+#: src/LYrcFile.c:371
+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 ""
+"file_sorting_method indica il valore su cui eseguire l'ordinamento durante\n"
+"la consultazione di elenchi di file, quali le directory FTP. Le opzioni sono:\n"
+"   BY_FILENAME -- ordina in base al nome del file\n"
+"   BY_TYPE     -- ordina in base al tipo di file\n"
+"   BY_SIZE     -- ordina in base alla dimensione del file\n"
+"   BY_DATE     -- ordina in base alla data del file\n"
+
+#: src/LYrcFile.c:389
+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"
-" on a line and press enter again."
+"             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 ""
+"lineedit_mode indica l'associazione dei tasti da utilizzare per immettere\n"
+"sequenze di caratteri nei moduli e nelle richieste.\n"
+"Se lineedit_mode è impostato a \"Default Binding\" allora i caratteri\n"
+"di controllo seguenti sono usati per gli spostamenti e le cancellazioni:\n"
+"\n"
+"             Prec  Succ       Invio = Accetta il dato\n"
+"   Muovi car: <-    ->        ^G    = Annulla immissione\n"
+"Muovi parola: ^P    ^N        ^U    = Cancella riga\n"
+"Cancella car: ^H    ^R        ^A    = Inizio riga\n"
+"Canc. parola: ^B    ^F        ^E    = Fine riga\n"
+"\n"
+"I modi di correzione riga attuali sono:\n"
 
-#: src/LYNews.c:293
-msgid "Post this message? (y/n) "
-msgstr "Inviare questo messaggio? (s/n)"
+#: src/LYrcFile.c:404
+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 ""
+"Puoi definire sottocategorie di bookmark (segnalibri) con relative descrizioni.\n"
+"Il formato è multi_bookmark<lettera_maiuscola>=<nomefile>,<descrizione>\n"
+"Sono consentiti fino a 26 file di segnalibri (per le 26 lettere dell'alfabeto).\n"
+"Si parte da \"multi_bookmarkB\" perché 'A' è predefinito (vedi sopra).\n"
 
-#: src/LYNews.c:306
-msgid "Append '%s'?  (y/n) "
-msgstr "Aggiungere '%s'?  (s/n) "
+#: src/LYrcFile.c:410
+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 ""
+"personal_mail_address indica l'indirizzo E-mail personale. L'indirizzo\n"
+"viene inviato durante i trasferimenti di file HTTP per autorizzazioni e\n"
+"resoconti, nonché per i commenti inviati via mail.\n"
+"Se non si desidera fornire questa informazione, impostare NO_FROM_HEADER\n"
+"al valore TRUE in lynx.cfg, o usare l'opzione -nofrom sulla riga di comando.\n"
+"Si potrebbe anche lasciar vuoto questo campo, ma in tal caso l'indirizzo\n"
+"non comparirebbe nei commenti spediti.\n"
 
-#: src/LYNews.c:364
-msgid "Posting to newsgroup(s)..."
-msgstr "Inviare a aree di conferenza..."
+#: src/LYrcFile.c:419
+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 ""
+"preferred_charset precisa il set di caratteri in codice MIME (ad es.,\n"
+"ISO-8859-2, ISO-8859-5) che Lynx indicherà come preferiti nelle richieste\n"
+"ai server http che accettano l'intestazione Accept-Charset. Il valore non deve\n"
+"includere ISO-8859-1 o US-ASCII, dato che tali valori sono sempre assunti\n"
+"come predefiniti. Può essere un elenco separato da virgole.\n"
+"Se disponibile, il server invierà un file con quel set di caratteri.\n"
+"In assenza di intestazione Accept-Charset, il comportamento predefinito è che\n"
+"ogni set di caratteri è accettabile. Se c'è l'intestazione Accept-Charset,\n"
+"ma il server non è in grado di dare una risposta accettabile secondo\n"
+"l'intestazione Accept-Charset, allora il server dovrebbe dare una risposta\n"
+"di errore, malgrado l'invio di una risposta inaccettabile\n"
+"sia ugualmente consentito.\n"
 
-#: src/LYexit.c:112
+#: src/LYrcFile.c:433
 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 ""
+"preferred_language precisa la lingua in codice MIME (ad es., it,en,\n"
+"può essere un elenco separato da virgole in ordine di preferenza decrescente)\n"
+"che Lynx indicherà come preferenza ai server http.\n"
+"Se disponibile, il server invierà un file in tale lingua, altrimenti\n"
+"invierà il file nella sua lingua predefinita.\n"
+
+#: src/LYrcFile.c:442
+msgid ""
+"If run_all_execution_links is set \"on\" then all local execution links\n"
+"will be executed when they are selected.\n"
 "\n"
-"Memory exhausted!  Program aborted!\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 ""
+"Se run_all_execution_links è posto a \"on\", tutti i link eseguibili localmente\n"
+"saranno eseguiti quando verranno selezionati.\n"
 "\n"
-msgstr "\nMemoria esaurita! Fine anomala del programma!\n\n"
+"Attenzione: ciò può provocare gravi danni. Dato che si può accedere a fonti\n"
+"            sconosciute o non controllate, può accadere di registrare link\n"
+"            che sono «cavalli di Troia». Tali link potrebbero essere prodotti\n"
+"            con lo scopo di cancellare file o di compromettere la sicurezza.\n"
+"            Questo parametro va posto a \"on\" solo nel caso in cui\n"
+"            si acceda a fonti completamente affidabili.\n"
 
-#: src/LYexit.c:176
+#: src/LYrcFile.c:453
 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 ""
+"Se run_execution_links_on_local_files è posto a \"on\" tutti i link eseguibili\n"
+"trovati nei file locali verranno eseguiti quando saranno selezionati.\n"
+"Questo differisce da run_all_execution_links per il fatto che il permesso\n"
+"di esecuzione come link verrà accordato soltanto ai file che si trovano\n"
+"nel sistema locale.\n"
 "\n"
+"Attenzione: ciò può provocare gravi danni. Dato che si può accedere a fonti\n"
+"            sconosciute o non controllate, può accadere di registrare link\n"
+"            che sono «cavalli di Troia». Tali link potrebbero essere prodotti\n"
+"            con lo scopo di cancellare file o di compromettere la sicurezza.\n"
+"            Questo parametro va posto a \"on\" solo nel caso in cui\n"
+"            si acceda a fonti completamente affidabili.\n"
+
+#: src/LYrcFile.c:471
+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 ""
+"select_popups specifica se le OPTION in un blocco SELECT privo dell'attributo\n"
+"MULTIPLE sono presentate come una lista verticale di bottoni radio ovvero\n"
+"mediante un menù «pop-up». Notare che se l'attributo MULTIPLE è presente\n"
+"nel comando iniziale SELECT, Lynx genera comunque una lista verticale di\n"
+"caselle di scelta per le OPTION. Il valore \"on\" imposta i menù pop-up come\n"
+"predefiniti, mentre il valore \"off\" imposta l'uso delle caselle radio.\n"
+"Sul valore così impostato ha prevalenza l'opzione -popup da linea di comando.\n"
+
+#: src/LYrcFile.c:481
+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 ""
+"show_color indica come impostare i colori all'avvio. Il valore \"never\"\n"
+"forza l'esclusione della modalità colore (considera il terminale monocromatico)\n"
+"all'avvio, anche se il terminale è in grado di visualizzare i colori. Il valore\n"
+"\"always\" forza l'attivazione della modalità colore, anche se il terminale è\n"
+"monocromatico, se ciò è previsto dalla libreria usata per compilare Lynx.\n"
+"Il valore \"default\" presuppone che il terminale sia monocromatico, a meno che\n"
+"la capacità di visualizzare i colori venga dedotta all'avvio in base al tipo\n"
+"di terminale, o che sia indicata sulla riga di comando l'opzione -color, o che\n"
+"sia impostata la variabile di ambiente COLORTERM. Il comportamento predefinito\n"
+"è sempre adottato in caso di connessione anonima o se è impostata la\n"
+"restrizione \"option_save\". L'effetto del valore registrato può essere\n"
+"scavalcato mediante le opzioni -color e -nocolor sulla riga di comando.\n"
+"La modalità impostata all'avvio può essere cambiata nel menù 'o'pzioni agendo\n"
+"sulla voce \"show color\" (Mostrare i colori). Se le impostazioni vengono\n"
+"registrate, i valori \"on\" e \"off\" di tale voce sono trattati come \"default\".\n"
+
+#: src/LYrcFile.c:498
+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 ""
+"show_cursor indica se il cursore deve essere 'nascosto' alla destra (in fondo,\n"
+"se possibile) dello schermo, oppure se va posto alla sinistra del link attuale\n"
+"nei documenti e dell'opzione attuale nelle finestre pop-up di scelta.\n"
+"Il posizionamento del cursore alla sinistra del link o dell'opzione attuale è\n"
+"utile per le interfacce in voce o tattili (braille), e quando il terminale\n"
+"non permette di distinguere il link attivo in base alla brillantezza o al\n"
+"colore. Il valore \"on\" fissa il posizionamento alla sinistra come predefinito,\n"
+"mentre \"off\" determina l'occultamento del cursore. Il valore\n"
+"preimpostato si può scavalcare con l'opzione -show_cursor da riga di comando.\n"
+
+#: src/LYrcFile.c:509
+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 ""
+"show_dotfiles indica che l'elenco della directory deve includere file e\n"
+"directory \"nascosti\" (dot files). Se posto a \"on\", ciò sarà rispettato\n"
+"solo se abilitato tramite userdefs.h e/o lynx.cfg, e non ristretto da\n"
+"un'opzione nella riga di comando. Se la visualizzazione dei file nascosti è\n"
+"disattivata, è disattivata anche la creazione di tali file da parte di Lynx.\n"
+
+#: src/LYrcFile.c:520
+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 ""
+"Se sub_bookmarks non è \"off\" e i bookmark multipli sono stati definiti,\n"
+"(vedi più avanti) allora tutte le operazioni sui segnalibri inizieranno\n"
+"proponendo all'utilizzatore di scegliere un file di sotto-segnalibri attivo.\n"
+"Se è assegnato un file con bookmark_file (v. sopra), esso viene adottato come\n"
+"scelta predefinita. Quando questa opzione è impostata come \"advanced\", e la\n"
+"modalità d'uso è \"advanced\" (esperto), il comando 'v'edi bookmark richiama un\n"
+"sollecito nella riga di stato in luogo del menù visibile nei modi \"novice\"\n"
+"(principiante) e \"intermediate\" (medio). Quando l'opzione è impostata come\n"
+"\"standard\", viene presentato il menù indipendentemente dalla modalità d'uso.\n"
+
+#: src/LYrcFile.c:533
+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 ""
+"user_mode indica il grado di conoscenza di Lynx da parte dell'utilizzatore.\n"
+"Il valore predefinito è \"NOVICE\" (principiante) che mostra due righe di aiuto\n"
+"aggiuntive in fondo allo schermo per aiutare l'utilizzatore ad apprendere i\n"
+"comandi basilari di Lynx. Impostare user_mode a \"INTERMEDIATE\" per togliere\n"
+"le informazioni supplementari. Usare \"ADVANCED\" per vedere in fondo allo\n"
+"schermo l'URL del link attualmente selezionato.\n"
+
+#: src/LYrcFile.c:542
+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 ""
+"Se verbose_images è posto a \"on\", Lynx visualizza il nome del file origine\n"
+"dell'immagine in luogo di [INLINE], [LINK] o [IMAGE]\n"
+"(vedere anche VERBOSE_IMAGES in lynx.cfg).\n"
+
+#: src/LYrcFile.c:547
+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 ""
+"Se vi_keys è posto a \"on\", allora i consueti tasti di movimento di VI:\n"
+"  j = giù        k = su\n"
+"  h = sinistra   l = destra\n"
+"vengono abilitati. Questi tasti sono unicamente in carattere minuscolo.\n"
+"Le maiuscole 'H', 'J' e 'K' continuano a richiamare rispettivamente l'aiuto,\n"
+"le abbreviazioni (jump shortcuts) e la mappa di tastiera.\n"
+
+#: src/LYrcFile.c:555
+msgid ""
+"The visited_links setting controls how Lynx organizes the information\n"
+"in the Visited Links Page.\n"
+msgstr ""
+"L'opzione visited_links determina il modo in cui Lynx organizza le\n"
+"informazioni nella pagina dei link consultati.\n"
+
+#: src/LYrcFile.c:772
+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 ""
+"Se keypad_mode è posto a \"NUMBERS_AS_ARROWS\", i numeri del tastierino\n"
+"agiscono come le frecce, se numlock è acceso:\n"
+"              8 = Freccia su\n"
+"  4 = Fr. sinistra    6 = Fr. destra\n"
+"              2 = Freccia giù\n"
+"e i corrispondenti numeri della tastiera agiscono come le frecce,\n"
+"qualunque sia lo stato del numlock.\n"
+
+#: src/LYrcFile.c:781
+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 ""
+"Se keypad_mode è impostato come \"LINKS_ARE_NUMBERED\", a fianco di ciascun\n"
+"link compare un numero e si usano i numeri per selezionare i link.\n"
+
+#: src/LYrcFile.c:785
+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 ""
+"Se keypad_mode è impostato come \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", vengono\n"
+"posti numeri a fianco dei link e dei campi visibili dei moduli.\n"
+"Si usano i numeri per scegliere i link o per spostare il \"link attuale\" in un\n"
+"campo di immissione o in un bottone. In più le opzioni nei menù a comparsa sono\n"
+"indicizzate, in modo tale che l'utilizzatore può scrivere un numero per\n"
+"scegliere un'opzione in un menù di questo tipo, anche se l'opzione non è\n"
+"visibile sullo schermo. Gli elenchi di riferimenti e l'uscita del comando «l»\n"
+"enumerano anche i campi di immissione nei moduli.\n"
+
+#: src/LYrcFile.c:794
+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 ""
+"Nota: alcuni documenti con formato fissato possono apparire sfigurati quando\n"
+"si usano i valori \"LINKS_ARE_NUMBERED\" o \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\".\n"
+
+#: src/LYrcFile.c:827
+msgid ""
+"Lynx User Defaults File\n"
 "\n"
-"%s %s: out of memory.  Aborting..."
-msgstr "\n\n\n%s %s: Memoria esaurita! Fine anomala del programma!"
+"This file contains options saved from the Lynx Options Screen (normally\n"
+"with the '>' key).  There is normally no need to edit this file manually,\n"
+"since the defaults here can be controlled from the Options Screen, and the\n"
+"next time options are saved from the Options Screen this file will be\n"
+"completely rewritten.  You have been warned...\n"
+"If you are looking for the general configuration file - it is normally\n"
+"called lynx.cfg, and it has different content and a different format.\n"
+"It is not this file.\n"
+msgstr ""
+"File dei valori predefiniti dall'utente per Lynx.\n"
+"\n"
+"Questo file contiene impostazioni registrate nel menù parametri di Lynx\n"
+"(di solito con il tasto '>'). Normalmente non occorre modificare manualmente\n"
+"questo file, dato che i valori predefiniti possono essere modificati nel menù\n"
+"parametri: ogni volta che si esegue la registrazione dei parametri in tale menù\n"
+"questo file viene completamente riscritto. Tenerlo presente...\n"
+"\n"
+"Il file per la configurazione generale si chiama normalmente lynx.cfg ed ha\n"
+"contenuto e formato diversi, non è questo file.\n"
+
+#~ msgid "Short read from file, problem?"
+#~ msgstr "Lettura breve del file, problemi?"
+
+#~ msgid "create %s"
+#~ msgstr "generazione di %s"
+
+#~ msgid "Unable to open file management menu file."
+#~ msgstr "Impossibile aprire il menù di gestione dei file."
+
+#~ msgid "Ignoring invalid HOME"
+#~ msgstr "Nessun effetto da HOME non valida"
+
+#~ msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (^Ve for editor)."
+#~ msgstr "(Area testo) Scrivere il testo. Spostarsi con Su/Giù o Tab (^Ve per l'editor)"
+
+#~ msgid "No link chosen"
+#~ msgstr "Nessun link scelto"
+
+#~ msgid "Left mouse button or return to select, arrow keys to scroll."
+#~ msgstr "Bottone sinistro del mouse o Invio per attivare, frecce per scorrere."
diff --git a/gnu/usr.bin/lynx/po/ja.po b/gnu/usr.bin/lynx/po/ja.po
index 15c41724ae0..a592be0ba4d 100644
--- a/gnu/usr.bin/lynx/po/ja.po
+++ b/gnu/usr.bin/lynx/po/ja.po
@@ -1,17 +1,19 @@
-# Japanese PO file for Lynx.
+# Japanese messages for Lynx
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Masayuki Hatta <mhatta@po.airs.net>, 2000, 2001.
+# This file is distributed under the same license as the lynx package.
+# Masayuki Hatta <mhatta@po.airs.net>, 2000-2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.4.rel1\n"
-"POT-Creation-Date: 2001-06-01 18:55-0400\n"
-"PO-Revision-Date: 2001-05-22 16:47+09:00\n"
+"Project-Id-Version: lynx 2.8.5pre9\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-0500\n"
+"PO-Revision-Date: 2003-04-19 20:40+0900\n"
 "Last-Translator: Masayuki Hatta <mhatta@po.airs.net>\n"
-"Language-Team: Japanese <ja@li.org>\n"
+"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=euc-jp\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. ******************************************************************
 #. * The following definitions are for status line prompts, messages, or
@@ -26,7 +28,7 @@ msgstr ""
 #. * Links to collections of alternate definitions, developed by the Lynx
 #. * User Community, are maintained in Lynx links:
 #. *
-#. *    http://www.trill-home.com/lynx.html
+#. *    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
@@ -41,1992 +43,1992 @@ msgstr "·Ù¹ð!: %s"
 msgid "Welcome"
 msgstr "¤è¤¦¤³¤½"
 
-#: LYMessages.c:31 LYMessages.c:32
+#: LYMessages.c:31
 msgid "Are you sure you want to quit?"
 msgstr "ËÜÅö¤Ë½ªÎ»¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«?"
 
-#: LYMessages.c:34 LYMessages.c:35
+#: LYMessages.c:33
 msgid "Really exit from Lynx?"
 msgstr "ËÜÅö¤Ë Lynx ¤ò½ªÎ»¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:37
+#: LYMessages.c:35
 msgid "Connection interrupted."
 msgstr "Àܳ¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿¡£"
 
-#: LYMessages.c:38
+#: LYMessages.c:36
 msgid "Data transfer interrupted."
 msgstr "¥Ç¡¼¥¿Å¾Á÷¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿¡£"
 
-#: LYMessages.c:39
+#: LYMessages.c:37
 msgid "Cancelled!!!"
 msgstr "¥­¥ã¥ó¥»¥ë¤µ¤ì¤Þ¤·¤¿!!!"
 
-#: LYMessages.c:40
+#: LYMessages.c:38
 msgid "Cancelling!"
 msgstr "¥­¥ã¥ó¥»¥ë¤·¤Þ¤¹!"
 
-#: LYMessages.c:41
+#: LYMessages.c:39
 msgid "Excellent!!!"
 msgstr "¤½¤¦Íè¤Ê¤¯¤Ã¤Á¤ã!!!"
 
-#: LYMessages.c:42
+#: LYMessages.c:40
 msgid "OK"
 msgstr "OK"
 
-#: LYMessages.c:43
+#: LYMessages.c:41
 msgid "Done!"
 msgstr "´°Î»!"
 
-#: LYMessages.c:44
+#: LYMessages.c:42
 msgid "Bad request!"
 msgstr "̵¸ú¤Ê¥ê¥¯¥¨¥¹¥È¤Ç¤¹!"
 
-#: LYMessages.c:45
+#: LYMessages.c:43
 msgid "previous"
 msgstr "Á°¤Î²èÌÌ"
 
-#: LYMessages.c:46
+#: LYMessages.c:44
 msgid "next screen"
 msgstr "¼¡¤Î²èÌÌ"
 
-#: LYMessages.c:47
+#: LYMessages.c:45
 msgid "HELP!"
 msgstr "¥Ø¥ë¥×!"
 
-#: LYMessages.c:48
+#: LYMessages.c:46
 msgid ", help on "
 msgstr ", ¥Ø¥ë¥×¢ª"
 
 #. #define HELP
-#: LYMessages.c:50
+#: LYMessages.c:48
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr "¥³¥Þ¥ó¥É: [Ìð°õ¥­¡¼] °ÜÆ°¡¢[?] ¥Ø¥ë¥×¡¢[q] ½ªÎ»¡¢[¢«] Ìá¤ë"
 
 #. #define MOREHELP
-#: LYMessages.c:52
+#: LYMessages.c:50
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr "-- [¥¹¥Ú¡¼¥¹¥­¡¼] ¼¡¥Ú¡¼¥¸¤Ø [Ìð°õ¥­¡¼] °ÜÆ° [?] ¥Ø¥ë¥× [q] ½ªÎ»"
 
-#: LYMessages.c:53
+#: LYMessages.c:51
 msgid "-- press space for next page --"
 msgstr "-- ¥¹¥Ú¡¼¥¹¥­¡¼¤Ç¼¡¤Î¥Ú¡¼¥¸ --"
 
-#: LYMessages.c:54
+#: LYMessages.c:52
 msgid "URL too long"
 msgstr "URL ¤¬Ä¹¤¹¤®¤Þ¤¹"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:60
+#: LYMessages.c:58
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr "(¥Æ¥­¥¹¥ÈÆþÎÏ¥Õ¥£¡¼¥ë¥É) ¸½ºß̤ÁªÂò ¥ê¥¿¡¼¥ó¥­¡¼¤ÇÆþÎϳ«»Ï"
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:60
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr "(¥Æ¥­¥¹¥È¥¨¥ê¥¢) ¸½ºß̤ÁªÂò ¥ê¥¿¡¼¥ó¥­¡¼¤ÇÆþÎϳ«»Ï"
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:64
+#: LYMessages.c:62
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(¥Æ¥­¥¹¥È¥¨¥ê¥¢) ̤ÁªÂò ¥ê¥¿¡¼¥ó¤ÇÆþÎϳ«»Ï (%s ¤Ç¥¨¥Ç¥£¥¿µ¯Æ°)"
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:64
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É) ¸½ºß̤ÁªÂò ¥ê¥¿¡¼¥ó¥­¡¼¤ÇÊÔ½¸³«»Ï"
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:68
+#: LYMessages.c:66
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr "(¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É) ¸½ºß̤ÁªÂò ¥ê¥¿¡¼¥ó¤ÇÊÔ½¸³«»Ï (%s ¤Ï¥­¥ã¥Ã¥·¥å̵¸ú¤ÇÁ÷¿®)"
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:68
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
 msgstr "(¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É) ¸½ºß̤ÁªÂò ¥ê¥¿¡¼¥ó¤ÇÊÔ½¸¡¢¥ê¥¿¡¼¥ó2²ó¤ÇÁ÷¿®"
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:72
+#: LYMessages.c:70
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "(mailto ¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É) ¸½ºß̤ÁªÂò ¥ê¥¿¡¼¥ó¤ÇÊѹ¹"
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:74
+#: LYMessages.c:72
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "(¥Ñ¥¹¥ï¡¼¥ÉÆþÎÏ¥Õ¥£¡¼¥ë¥É) ¸½ºß̤ÁªÂò ¥ê¥¿¡¼¥ó¥­¡¼¤ÇÆþÎϳ«»Ï"
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:77
+#: LYMessages.c:75
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
 msgstr "Êѹ¹¤Ç¤­¤Ê¤¤¥Õ¥¡¥¤¥ëÆþÎÏ¥Õ¥£¡¼¥ë¥É [¢¬][¢­]¤«¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:77
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
 msgstr "(¥Õ¥¡¥¤¥ëÆþÎÏ¥Õ¥£¡¼¥ë¥É) ¥Õ¥¡¥¤¥ë̾¤òÆþÎÏ [¢¬][¢­]¤«¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:81
+#: LYMessages.c:79
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(¥Æ¥­¥¹¥ÈÆþÎÏ¥Õ¥£¡¼¥ë¥É) ¥Æ¥­¥¹¥È¤òÆþÎÏ [¢¬][¢­] ¤È¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:83
+#: LYMessages.c:81
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
 msgstr "(¥Æ¥­¥¹¥È¥¨¥ê¥¢) ¥Æ¥­¥¹¥È¤òÆþÎÏ [¢¬][¢­] ¤È¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:85
+#: LYMessages.c:83
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
 msgstr "(¥Æ¥­¥¹¥È¥¨¥ê¥¢) ¥Æ¥­¥¹¥È¤òÆþÎÏ [¢¬][¢­] ¤È¥¿¥Ö¤Ç°ÜÆ° (%s ¤Ç¥¨¥Ç¥£¥¿µ¯Æ°)"
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:87
+#: LYMessages.c:85
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
 msgstr "Êѹ¹¤Ç¤­¤Ê¤¤¥Õ¥©¡¼¥à¥Æ¥­¥¹¥È¥Õ¥£¡¼¥ë¥É [¢¬][¢­]¤«¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:87
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É) ¥Æ¥­¥¹¥È¤òÆþÎÏ ¥ê¥¿¡¼¥ó¥­¡¼¤ÇÁ÷¿®"
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:91
+#: LYMessages.c:89
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr "(¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É) ¥Æ¥­¥¹¥È¤òÆþÎÏ ¥ê¥¿¡¼¥ó¥­¡¼¤ÇÁ÷¿® (%s ¤Ç¥­¥ã¥Ã¥·¥å̵¸ú)"
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:93
+#: LYMessages.c:91
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr "(¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É) ¥Æ¥­¥¹¥È¤òÆþÎÏ ¥ê¥¿¡¼¥ó¥­¡¼¤ÇÁ÷¿®¡¢Ìð°õ¥­¡¼¤«¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:95
+#: LYMessages.c:93
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
 msgstr "Êѹ¹¤Ç¤­¤Ê¤¤¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É [¢¬][¢­]¤«¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:97
+#: LYMessages.c:95
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr "(mailto ¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É) ¥Æ¥­¥¹¥È¤òÆþÎÏ ¥ê¥¿¡¼¥ó¤ÇÁ÷¿®¡¢Ìð°õ¥­¡¼¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:99
+#: LYMessages.c:97
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr "(mailto ¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É) ¥á¡¼¥ë¤Ï¶Ø»ß¤µ¤ì¤Æ¤¤¤Þ¤¹¤Î¤ÇÁ÷¿®¤Ç¤­¤Þ¤»¤ó¡£"
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:99
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(¥Ñ¥¹¥ï¡¼¥ÉÆþÎÏ¥Õ¥£¡¼¥ë¥É) ¥Æ¥­¥¹¥È¤òÆþÎÏ [¢¬][¢­]¤«¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:101
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
 msgstr "Êѹ¹¤Ç¤­¤Ê¤¤¥Ñ¥¹¥ï¡¼¥É¥Õ¥©¡¼¥à [¢¬][¢­]¤«¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:103
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "(¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹) [¢ª] ¤«¥ê¥¿¡¼¥ó¥­¡¼¤Ç¥È¥°¥ëÊѹ¹"
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:105
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
 msgstr "Êѹ¹¤Ç¤­¤Ê¤¤¥Õ¥©¡¼¥à¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹ [¢¬][¢­]¤«¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:109
+#: LYMessages.c:107
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr "(¥é¥¸¥ª¥Ü¥¿¥ó) [¢ª] ¤«¥ê¥¿¡¼¥ó¥­¡¼¤Ç¥È¥°¥ëÁªÂò"
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:111
+#: LYMessages.c:109
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
 msgstr "Êѹ¹¤Ç¤­¤Ê¤¤¥Õ¥©¡¼¥à¥é¥¸¥ª¥Ü¥¿¥ó [¢¬][¢­]¤«¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:113
+#: LYMessages.c:111
 msgid "Submit ('x' for no cache) to "
 msgstr "Á÷¿®([x] ¤Ç¥­¥ã¥Ã¥·¥å̵¸ú): "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:115
+#: LYMessages.c:113
 msgid "Submit to "
 msgstr "Á÷¿®ÂоÝ: "
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:117
+#: LYMessages.c:115
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr "(¥Õ¥©¡¼¥àÁ÷¿®¥Ü¥¿¥ó) [¢ª] ¤«¥ê¥¿¡¼¥ó¥­¡¼¤ÇÁ÷¿® ([x] ¤Ç¥­¥ã¥Ã¥·¥å̵¸ú)"
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:119
+#: LYMessages.c:117
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(¥Õ¥©¡¼¥àÁ÷¿®¥Ü¥¿¥ó) [¢ª] ¤«¥ê¥¿¡¼¥ó¥­¡¼¤ÇÁ÷¿®"
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:121
+#: LYMessages.c:119
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
 msgstr "̵¸ú¤Ë¤µ¤ì¤¿Á÷¿®¥Ü¥¿¥ó [¢¬][¢­]¤«¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:123
+#: LYMessages.c:121
 msgid "Submit mailto form to "
 msgstr "mailto ¥Õ¥©¡¼¥à¤ò°Ê²¼¤ËÁ÷¿®: "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:125
+#: LYMessages.c:123
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr "(mailto ¥Õ¥©¡¼¥àÁ÷¿®¥Ü¥¿¥ó) [¢ª]¤«¥ê¥¿¡¼¥ó¤ÇÁ÷¿®"
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:125
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr "(mailto ¥Õ¥©¡¼¥àÁ÷¿®¥Ü¥¿¥ó) ¥á¡¼¥ë¤Ï¶Ø»ß¤µ¤ì¤Æ¤¤¤Þ¤¹¤Î¤ÇÁ÷¿®¤Ç¤­¤Þ¤»¤ó"
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:127
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr "(¥Õ¥©¡¼¥à¥ê¥»¥Ã¥È¥Ü¥¿¥ó) [¢ª] ¤«¥ê¥¿¡¼¥ó¥­¡¼¤Ç¥Õ¥©¡¼¥àÆâÍƤò¥ê¥»¥Ã¥È"
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:129
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
 msgstr "̵¸ú¤Ë¤µ¤ì¤¿¥Õ¥©¡¼¥à¥ê¥»¥Ã¥È¥Ü¥¿¥ó [¢¬][¢­]¤«¥¿¥Ö¤Ç°ÜÆ°"
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:131
 msgid "(Option list) Hit return and use arrow keys and return to select option."
 msgstr "(¥ª¥×¥·¥ç¥ó¥ê¥¹¥È) ¥ê¥¿¡¼¥ó¥­¡¼¤ò²¡¤·¡¢Ìð°õ¥­¡¼¤È¥ê¥¿¡¼¥ó¥­¡¼¤Ç°ìÍ÷¤«¤éÁªÂò"
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:133
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
 msgstr "(¥Á¥ç¥¤¥¹¥ê¥¹¥È) ¥ê¥¿¡¼¥ó¥­¡¼¤ò²¡¤·¡¢Ìð°õ¥­¡¼¤È¥ê¥¿¡¼¥ó¥­¡¼¤Ç°ìÍ÷¤«¤éÁªÂò"
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:135
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr "Êѹ¹¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¥ê¥¹¥È¤Ç¤¹¡£¥ê¥¿¡¼¥ó¤«Ìð°õ¥­¡¼¤Ç±ÜÍ÷¤Þ¤¿¤Ï°ÜÆ°"
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:137
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr "Êѹ¹¤Ç¤­¤Ê¤¤ÁªÂò¥ê¥¹¥È¤Ç¤¹¡£¥ê¥¿¡¼¥ó¥­¡¼¤«Ìð°õ¥­¡¼¤Ç±ÜÍ÷¤Þ¤¿¤Ï°ÜÆ°"
 
-#: LYMessages.c:140
+#: LYMessages.c:138
 msgid "Submitting form..."
 msgstr "¥Õ¥©¡¼¥à¤òÁ÷¿®¤·¤Æ¤¤¤Þ¤¹..."
 
-#: LYMessages.c:141
+#: LYMessages.c:139
 msgid "Resetting form..."
 msgstr "¥Õ¥©¡¼¥à¤ò¥ê¥»¥Ã¥È¤·¤Æ¤¤¤Þ¤¹..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:141
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "ʸ½ñ¤ÎºÆÆɤ߹þ¤ßÃæ¡£¥Õ¥©¡¼¥àÆâÍƤÏÁ´¤Æ¼º¤ï¤ì¤Þ¤¹!"
 
-#: LYMessages.c:144
+#: LYMessages.c:142
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Ãí°Õ: ¥Õ¥©¡¼¥à¥Ç¡¼¥¿¤ò¥­¥ã¥é¥¯¥¿¥»¥Ã¥È %s ¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:147
+#: LYMessages.c:145
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr "(Ä̾ï¥ê¥ó¥¯) [¢ª] ¤«¥ê¥¿¡¼¥ó¥­¡¼¤ÇÁªÂò"
 
-#: LYMessages.c:148
+#: LYMessages.c:146
 msgid "The resource requested is not available at this time."
 msgstr "¸½ºßÍ׵ᤵ¤ì¤¿¥ê¥½¡¼¥¹¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:149
+#: LYMessages.c:147
 msgid "Enter Lynx keystroke command: "
 msgstr "Lynx ¤Î¥³¥Þ¥ó¥É¥­¡¼¤òÆþÎÏ: "
 
-#: LYMessages.c:150
+#: LYMessages.c:148
 msgid "Looking up "
 msgstr "õº÷Ãæ: "
 
-#: LYMessages.c:151
+#: LYMessages.c:149
 #, c-format
 msgid "Getting %s"
 msgstr "%s ¤ò¼èÆÀÃæ"
 
-#: LYMessages.c:152
+#: LYMessages.c:150
 #, c-format
 msgid "Skipping %s"
 msgstr "%s ¤òÈô¤Ð¤·¤Þ¤¹"
 
-#: LYMessages.c:153
+#: LYMessages.c:151
 #, c-format
 msgid "Using %s"
 msgstr "%s ¤ò»È¤¤¤Þ¤¹"
 
-#: LYMessages.c:154
+#: LYMessages.c:152
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "ÉÔÀµ¤Ê URL ¤Ç¤¹: %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:153
 #, c-format
 msgid "Badly formed address %s"
 msgstr "%s ¤Ï¥¢¥É¥ì¥¹¤È¤·¤Æ̵¸ú¤Ç¤¹"
 
-#: LYMessages.c:156
+#: LYMessages.c:154
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:155
 msgid "Unable to access WWW file!!!"
 msgstr "WWW ¥Õ¥¡¥¤¥ë¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó!!!"
 
-#: LYMessages.c:158
+#: LYMessages.c:156
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "¤³¤ì¤Ï¸¡º÷²Äǽ¤Ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ç¤¹¡£%s ¤Ç¸¡º÷¤Ç¤­¤Þ¤¹¡£"
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:160
+#: LYMessages.c:158
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--³¤­¤¢¤ê-- ¤³¤ì¤Ï¸¡º÷²Äǽ¤Ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ç¤¹¡£%s ¤Ç¸¡º÷¤Ç¤­¤Þ¤¹¡£"
 
-#: LYMessages.c:161
+#: LYMessages.c:159
 msgid "You have entered an invalid link number."
 msgstr "ÉÔÀµ¤Ê¥ê¥ó¥¯Èֹ椬ÆþÎϤµ¤ì¤Þ¤·¤¿¡£"
 
 #. #define SOURCE_HELP
-#: LYMessages.c:163
+#: LYMessages.c:161
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "¸½ºßʸ½ñ¤Î¥½¡¼¥¹¤ò±ÜÍ÷Ãæ¤Ç¤¹¡£[\\] ¤ÇÄ̾ï²èÌ̤ËÌá¤ê¤Þ¤¹¡£"
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:165
+#: LYMessages.c:163
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
 msgstr "  Ìð°õ¥­¡¼: [¢¬][¢­]¤Ç°ÜÆ° [¢ª]¤Ç¥ê¥ó¥¯¤òé¤ë [¢«]¤Ç°ì¤ÄÌá¤ë  \n"
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:167
+#: LYMessages.c:165
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
-msgstr " [h]¥Ø¥ë¥×[o]ÀßÄê[p]°õºþ[g]°ÜÆ°[m]¥á¥¤¥ó²èÌÌ[q]½ªÎ» /=¸¡º÷ [Delete]=ÍúÎò \n"
+msgstr " [H]¥Ø¥ë¥×[o]ÀßÄê[p]°õºþ[g]°ÜÆ°[m]¥á¥¤¥ó²èÌÌ[q]½ªÎ» /=¸¡º÷ [Delete]=ÍúÎò \n"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:169
+#: LYMessages.c:167
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
-msgstr "  [o]¤½¤Î¾[h]¥Ø¥ë¥×[k]¥­¡¼ÇÛÃÖ[g]°ÜÆ°[p]°õºþ[m]¥á¥¤¥ó [o]¥ª¥×¥·¥ç¥ó [q]½ªÎ» \n"
+msgstr "  [o]¤½¤Î¾[H]¥Ø¥ë¥×[K]¥­¡¼ÇÛÃÖ[g]°ÜÆ°[p]°õºþ[m]¥á¥¤¥ó [o]¥ª¥×¥·¥ç¥ó [q]½ªÎ» \n"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:171
+#: LYMessages.c:169
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr "  [o]¤½¤Î¾[b]Ìá¤ë[e]ÊÔ½¸[d]¥À¥¦¥ó¥í¡¼¥É [^R]ºÆÆɹþ[^W]¥¯¥ê¥¢ ʸ½ñ¸¡º÷: / \n"
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:173
+#: LYMessages.c:171
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr "[o]¤½¤Î¾[c]¥³¥á¥ó¥È ÍúÎò: [Backspace] ¥Ö¥Ã¥¯¥Þ¡¼¥¯: [v]±ÜÍ÷[a]ÄɲÃ[r]ºï½ü \n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:175
+#: LYMessages.c:173
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr "            ¥­¡¼¥Ü¡¼¥É¤ò¥¿¥¤¥×¤¹¤ë¤³¤È¤Ç¥Æ¥­¥¹¥È¤ò¥Õ¥£¡¼¥ë¥ÉÆâ¤ËÆþÎÏ"
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:177
+#: LYMessages.c:175
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr "    Ctrl-U ¤Ç¥Õ¥£¡¼¥ë¥ÉÆâ¤ÎÁ´¥Æ¥­¥¹¥È¤òºï½ü¡¢[Backspace] ¤Ç°ìʸ»úºï½ü        "
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:179
+#: LYMessages.c:177
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
 msgstr "      Ctrl-U ¤Ç¥Õ¥£¡¼¥ë¥ÉÆâ¤Î¥Æ¥­¥¹¥È¤òºï½ü¡¢[Backspace] ¤Ç°ìʸ»úºï½ü      "
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:181
+#: LYMessages.c:179
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr "    %s ¤Ç¥Õ¥£¡¼¥ë¥ÉÆâ¤ÎÁ´¥Æ¥­¥¹¥È¤òºï½ü¡¢[Backspace] ¤Ç°ìʸ»úºï½ü        "
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:183
+#: LYMessages.c:181
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
 msgstr "      %s ¤Ç¥Õ¥£¡¼¥ë¥ÉÆâ¤Î¥Æ¥­¥¹¥È¤òºï½ü¡¢[Backspace] ¤Ç°ìʸ»úºï½ü     "
 
 #. mailto
-#: LYMessages.c:186
+#: LYMessages.c:184
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "ÉÔÀµ¤Ê mailto ¥Õ¥©¡¼¥àÁ÷¿®¤Ç¤¹! ¥­¥ã¥ó¥»¥ë¤µ¤ì¤Þ¤·¤¿!"
 
-#: LYMessages.c:187
+#: LYMessages.c:185
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Ãí°Õ! ¥á¡¼¥ë¥¢¥É¥ì¥¹Ãæ¤Î¥³¥ó¥È¥í¡¼¥ë¥³¡¼¥É¤Ï ? ¤ÇÃÖ´¹¤µ¤ì¤Þ¤¹"
 
-#: LYMessages.c:188
+#: LYMessages.c:186
 msgid "Mail disallowed!  Cannot submit."
 msgstr "¥á¡¼¥ë¤Ï¶Ø»ß¤µ¤ì¤Æ¤¤¤Þ¤¹! Á÷¿®¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:189
+#: LYMessages.c:187
 msgid "Mailto form submission failed!"
 msgstr "Mailto ¥Õ¥©¡¼¥à¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿!"
 
-#: LYMessages.c:190
+#: LYMessages.c:188
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Mailto ¥Õ¥©¡¼¥à¤ÎÁ÷¿®¤¬¥­¥ã¥ó¥»¥ë¤µ¤ì¤Þ¤·¤¿!!!"
 
-#: LYMessages.c:191
+#: LYMessages.c:189
 msgid "Sending form content..."
 msgstr "¥Õ¥©¡¼¥à¤ÎÆâÍƤòÁ÷¿®Ãæ..."
 
-#: LYMessages.c:192
+#: LYMessages.c:190
 msgid "No email address is present in mailto URL!"
 msgstr "mailto URL ¤ËÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:194
+#: LYMessages.c:192
 msgid "Unable to open temporary file for mailto URL!"
 msgstr "mailto URL ¤Î¤¿¤á¤Î°ì¼¡¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:196
+#: LYMessages.c:194
 msgid "Do you wish to include the original message?"
 msgstr "¸µ¤Î¥á¥Ã¥»¡¼¥¸¤ò´Þ¤á¤Þ¤¹¤«?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:196
 msgid "Do you wish to include the preparsed source?"
 msgstr "²òÀϺѤߤΥ½¡¼¥¹¤ò´Þ¤á¤Þ¤¹¤«?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:200
+#: LYMessages.c:198
 msgid "Spawning your selected editor to edit mail message"
 msgstr "¥á¡¼¥ëËÜʸ¤òÊÔ½¸¤¹¤ë¤¿¤á»ØÄê¤Î¥¨¥Ç¥£¥¿¤òµ¯Æ°¤·¤Æ¤¤¤Þ¤¹"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:202
+#: LYMessages.c:200
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr "¥¨¥Ç¥£¥¿¤Îµ¯Æ°¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£ÀßÄê¥á¥Ë¥å¡¼¤Î¥¨¥Ç¥£¥¿¤ÎÀßÄê¤ò³Î¤«¤á¤Æ²¼¤µ¤¤¡£"
 
-#: LYMessages.c:203
+#: LYMessages.c:201
 msgid "Send this comment?"
 msgstr "¤³¤Î¥³¥á¥ó¥È¤òÁ÷¤ê¤Þ¤¹¤«?"
 
-#: LYMessages.c:204
+#: LYMessages.c:202
 msgid "Send this message?"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ê¤Þ¤¹¤«?"
 
-#: LYMessages.c:205
+#: LYMessages.c:203
 msgid "Sending your message..."
 msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¤Ã¤Æ¤¤¤Þ¤¹..."
 
-#: LYMessages.c:206
+#: LYMessages.c:204
 msgid "Sending your comment:"
 msgstr "¥³¥á¥ó¥ÈÁ÷ÉÕÀè:"
 
 #. textarea
-#: LYMessages.c:209
+#: LYMessages.c:207
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "¥Æ¥­¥¹¥È¥¨¥ê¥¢¤Ç¤Ï¤Ê¤¤¤Î¤Ç³°Éô¥¨¥Ç¥£¥¿¤Ï»È¤¨¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:210
+#: LYMessages.c:208
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "¥Æ¥­¥¹¥È¥¨¥ê¥¢¤Ç¤Ï¤Ê¤¤¤Î¤Ç¥³¥Þ¥ó¥É¤Ï»È¤¨¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:213
+#: LYMessages.c:211
 msgid "file: ACTIONs are disallowed!"
 msgstr "file: ACTION ¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:213
 msgid "file: URLs via served links are disallowed!"
 msgstr "file: Ä󶡤µ¤ì¤¿¥ê¥ó¥¯·Ðͳ¤Î URL ¤Ïǧ¤á¤é¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
-#: LYMessages.c:216
+#: LYMessages.c:214
 msgid "Access to local files denied."
 msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤Ø¤Î¥¢¥¯¥»¥¹¤ÏµñÈݤµ¤ì¤Þ¤·¤¿¡£"
 
-#: LYMessages.c:217
+#: LYMessages.c:215
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "file: ¥Ö¥Ã¥¯¥Þ¡¼¥¯·Ðͳ¤Î URL ¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:217
 msgid "This special URL is not allowed in external documents!"
 msgstr "¤³¤ÎÆÃÊÌ¤Ê URL ¤Ï³°Éôʸ½ñÃæ¤Ç¤Ïǧ¤á¤é¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
-#: LYMessages.c:220
+#: LYMessages.c:218
 msgid "Press <return> to return to Lynx."
 msgstr "¥ê¥¿¡¼¥ó¥­¡¼¤Ç Lynx ¤ËÌá¤ê¤Þ¤¹¡£"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:221
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "DCL ¥µ¥Ö¥×¥í¥»¥¹¤òµ¯Æ°¤·¤Æ¤¤¤Þ¤¹¡£'logout' ¤Ç Lynx ¤ËÌá¤ê¤Þ¤¹¡£\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:225
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "EXIT ¤È¥¿¥¤¥×¤¹¤ë¤È Lynx ¤ËÌá¤ê¤Þ¤¹¡£\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:228
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr "¥Ç¥Õ¥©¥ë¥È¥·¥§¥ë¤òµ¯Æ°¤·¤Þ¤·¤¿¡£'exit' ¤Ç Lynx ¤ËÌá¤ê¤Þ¤¹¡£\n"
 
-#: LYMessages.c:233
+#: LYMessages.c:231
 msgid "Spawning is currently disabled."
 msgstr "³°Éô¥³¥Þ¥ó¥Éµ¯Æ°¤Ï¸½ºß¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:234
+#: LYMessages.c:232
 msgid "The 'd'ownload command is currently disabled."
 msgstr "¥À¥¦¥ó¥í¡¼¥É¥³¥Þ¥ó¥É [d] ¤Ï¸½ºßÍøÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:235
+#: LYMessages.c:233
 msgid "You cannot download an input field."
 msgstr "ÆþÎÏ¥Õ¥£¡¼¥ë¥É¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:236
+#: LYMessages.c:234
 msgid "Form has a mailto action!  Cannot download."
 msgstr "¥Õ¥©¡¼¥à¤Ë¤Ï mailto ¥¢¥¯¥·¥ç¥ó¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹! ¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:237
+#: LYMessages.c:235
 msgid "You cannot download a mailto: link."
 msgstr "mailto: ¥ê¥ó¥¯¤Ï¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:238
+#: LYMessages.c:236
 msgid "You cannot download cookies."
 msgstr "¥¯¥Ã¥­¡¼¤ò¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:239
+#: LYMessages.c:237
 msgid "You cannot download a printing option."
 msgstr "°õºþ¥ª¥×¥·¥ç¥ó¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:240
+#: LYMessages.c:238
 msgid "You cannot download an upload option."
 msgstr "¥¢¥Ã¥×¥í¡¼¥É¥ª¥×¥·¥ç¥ó¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:241
+#: LYMessages.c:239
 msgid "You cannot download an permit option."
 msgstr "µö²Ä¥ª¥×¥·¥ç¥ó¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:242
+#: LYMessages.c:240
 msgid "This special URL cannot be downloaded!"
 msgstr "¤³¤ÎÆüì¤Ê URL ¤Ï¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó!"
 
-#: LYMessages.c:243
+#: LYMessages.c:241
 msgid "Nothing to download."
 msgstr "¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:244
+#: LYMessages.c:242
 msgid "Trace ON!"
 msgstr "ÄÉÀ׳«»Ï!"
 
-#: LYMessages.c:245
+#: LYMessages.c:243
 msgid "Trace OFF!"
 msgstr "ÄÉÀ×½ªÎ»!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:245
 msgid "Links will be included for all images!  Reloading..."
 msgstr "²èÁü¤¹¤Ù¤Æ¤Ø¤Î¥ê¥ó¥¯¤òɽ¼¨¤·¤Þ¤¹! ºÆÆɤ߹þ¤ßÃæ..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:247
 msgid "Standard image handling restored!  Reloading..."
 msgstr "ɸ½àŪ¤Ê²èÁü¤Î¼è¤ê°·¤¤¤ËÌᤷ¤Þ¤¹! ºÆÆɤ߹þ¤ßÃæ..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:249
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr "ALT »ØÄê¤Î̵¤¤¥¤¥ó¥é¥¤¥ó¤Ëµ¿»÷Ū ALT ¤òÁÞÆþ¤·¤Þ¤¹¡£ºÆÆɤ߹þ¤ßÃæ..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:251
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "ALT »ØÄê¤Î̵¤¤¥¤¥ó¥é¥¤¥ó¤Ï̵»ë¤µ¤ì¤Þ¤¹! ºÆÆɤ߹þ¤ßÃæ..."
 
-#: LYMessages.c:254
+#: LYMessages.c:252
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "À¸ 8 ¥Ó¥Ã¥È / CJK ¥â¡¼¥É ¥È¥°¥ë¥ª¥Õ! ºÆÆɤ߹þ¤ßÃæ..."
 
-#: LYMessages.c:255
+#: LYMessages.c:253
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "À¸ 8 ¥Ó¥Ã¥È / CJK ¥â¡¼¥É ¥È¥°¥ë¥ª¥ó! ºÆÆɤ߹þ¤ßÃæ..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:255
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "[d]ʸ½ñ ¤« [l]¥ê¥ó¥¯¤Ë HEAD ¥ê¥¯¥¨¥¹¥È¤òÁ÷¤ê¤Þ¤¹¤«? ([c]¥­¥ã¥ó¥»¥ë): "
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:257
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "[d]ʸ½ñ ¤Ë HEAD ¥ê¥¯¥¨¥¹¥È¤òÁ÷¤ê¤Þ¤¹¤«? ([c]¥­¥ã¥ó¥»¥ë): "
 
-#: LYMessages.c:260
+#: LYMessages.c:258
 msgid "Sorry, the document is not an http URL."
 msgstr "¤³¤Îʸ½ñ¤Ï http URL ¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹¡£"
 
-#: LYMessages.c:261
+#: LYMessages.c:259
 msgid "Sorry, the link is not an http URL."
 msgstr "¤³¤Î¥ê¥ó¥¯¤Ï http URL ¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹¡£"
 
-#: LYMessages.c:262
+#: LYMessages.c:260
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "¤³¤Î¥Õ¥©¡¼¥à¤Ø¤Î ACTION ¤Ï¤Ç¤­¤Þ¤»¤ó¡£"
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:262
 msgid "Sorry, the ACTION for this form is not an http URL."
 msgstr "¤³¤Î¥Õ¥©¡¼¥à¤Ø¤Î ACTION ¤Ï http URL ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:265
+#: LYMessages.c:263
 msgid "Not an http URL or form ACTION!"
 msgstr "http URL ¤Ç¤â¥Õ¥©¡¼¥à ACTION ¤Ç¤â¤¢¤ê¤Þ¤»¤ó!"
 
-#: LYMessages.c:266
+#: LYMessages.c:264
 msgid "This special URL cannot be a form ACTION!"
 msgstr "¤³¤ÎÆÃÊÌ¤Ê URL ¤Ï¥Õ¥©¡¼¥à ACTION ¤Ë¤Ï¤Ê¤êÆÀ¤Þ¤»¤ó!"
 
-#: LYMessages.c:267
+#: LYMessages.c:265
 msgid "URL is not in starting realm!"
 msgstr "URL ¤¬³«»ÏÎΰè¤Ë¤¢¤ê¤Þ¤»¤ó!"
 
-#: LYMessages.c:268
+#: LYMessages.c:266
 msgid "News posting is disabled!"
 msgstr "¥Ë¥å¡¼¥¹Åê¹Æ¤Ï¤Ç¤­¤Þ¤»¤ó!"
 
-#: LYMessages.c:269
+#: LYMessages.c:267
 msgid "File management support is disabled!"
 msgstr "¥Õ¥¡¥¤¥ë´ÉÍý¥µ¥Ý¡¼¥È¤ÏÍøÍѤǤ­¤Þ¤»¤ó!"
 
-#: LYMessages.c:270
+#: LYMessages.c:268
 msgid "No jump file is currently available."
 msgstr "¸½ºßÍøÍѲÄǽ¤Ê¥¸¥ã¥ó¥×¥Õ¥¡¥¤¥ë¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:271
+#: LYMessages.c:269
 msgid "Jump to (use '?' for list): "
 msgstr "¥¸¥ã¥ó¥×Àè ([?] ¤Ç°ìÍ÷): "
 
-#: LYMessages.c:272
+#: LYMessages.c:270
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr "¥·¥ç¡¼¥È¥«¥Ã¥È URL ¤Ø¤Î¥¸¥ã¥ó¥×¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
-#: LYMessages.c:273
+#: LYMessages.c:271
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "¥é¥ó¥À¥à URL ¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó! ¥·¥ç¡¼¥È¥«¥Ã¥È¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: LYMessages.c:274
+#: LYMessages.c:272
 msgid "No random URLs have been used thus far."
 msgstr "º£¤Þ¤Ç¤Î¤È¤³¤í¥é¥ó¥À¥à URL ¤Ï°ì¤Ä¤â»È¤ï¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:275
+#: LYMessages.c:273
 msgid "Bookmark features are currently disabled."
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯µ¡Ç½¤Ï¸½ºßÍøÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:276
+#: LYMessages.c:274
 msgid "Execution via bookmarks is disabled."
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤«¤é¤Î¼Â¹Ô¤Ï¤Ç¤­¤Þ¤»¤ó¡£"
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:276
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£%s ¤Ç¥ª¥×¥·¥ç¥ó¤¬¸«¤é¤ì¤Þ¤¹¡£"
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:278
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "X Mosaic ¥Û¥Ã¥È¥ê¥¹¥ÈÊÑ´¹ÍѤΰì»þ¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:281
+#: LYMessages.c:279
 msgid "ERROR - unable to open bookmark file."
 msgstr "¥¨¥é¡¼ - ¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó¡£"
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:281
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "¥ê¥ó¥¯¤òºï½ü¤¹¤ë¤Î¤Ë¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£"
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:283
 msgid "Unable to open scratch file for deletion of link."
 msgstr "¥ê¥ó¥¯¤òºï½ü¤¹¤ë¤Î¤Ë¥¹¥¯¥é¥Ã¥Á¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:287
+#: LYMessages.c:285
 msgid "Error renaming scratch file."
 msgstr "¥¹¥¯¥é¥Ã¥Á¥Õ¥¡¥¤¥ë¤Î²þ̾»þ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
 
-#: LYMessages.c:289
+#: LYMessages.c:287
 msgid "Error renaming temporary file."
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤Î²þ̾»þ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:289
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "¥ê¥ó¥¯ºï½ü¤Î¤¿¤á¤Ë¡¢°ì»þ¥Õ¥¡¥¤¥ë¤ò¥³¥Ô¡¼¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:291
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "¥ê¥ó¥¯ºï½ü¤Î¤¿¤á¤Ë¡¢°ì»þ¥Õ¥¡¥¤¥ë¤òºÆ¥ª¡¼¥×¥ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:294
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "¥ê¥ó¥¯¤¬¡¢¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë¤Ë¤ª¤¤¤Æ¤½¤ì¤À¤±¤Ç°ì¹Ô¤Ë¤Þ¤È¤Þ¤Ã¤Æ¤¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:297
+#: LYMessages.c:295
 msgid "Bookmark deletion failed."
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯ºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:297
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë¤Ï¥È¥é¥Ð¡¼¥¹¤Ç¤­¤Þ¤»¤ó (http URL ¤Î¤ß)¡£"
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:299
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ò³«¤±¤Þ¤»¤ó¡£ºÇ½é¤Ë [a] ¤Ç¥ê¥ó¥¯¤òÊݸ¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: LYMessages.c:302
+#: LYMessages.c:300
 msgid "There are no links in this bookmark file!"
 msgstr "¤³¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë¤Ë¤Ï°ì¤Ä¤â¥ê¥ó¥¯¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:302
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr "[d]ʸ½ñ [l]¥ê¥ó¥¯ ¤ò¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ËÊݸ¤·¤Þ¤¹ ([c]¥­¥ã¥ó¥»¥ë): "
 
-#: LYMessages.c:305
+#: LYMessages.c:303
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "[d]¤Çʸ½ñ¤ò¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë¤ËÊݸ ([c]¥­¥ã¥ó¥»¥ë): "
 
-#: LYMessages.c:306
+#: LYMessages.c:304
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "[l]¤Ç¥ê¥ó¥¯¤ò¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë¤ËÊݸ ([c]¥­¥ã¥ó¥»¥ë): "
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:308
+#: LYMessages.c:306
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr "POST ¥³¥ó¥Æ¥ó¥È¤Î¥Õ¥©¡¼¥à¤«¤é¤Î¥É¥­¥å¥á¥ó¥È¤Ï¥Ö¥Ã¥¯¥Þ¡¼¥¯¤È¤·¤ÆÊݸ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:309
+#: LYMessages.c:307
 msgid "Cannot save form fields/links"
 msgstr "¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É/¥ê¥ó¥¯¤ÏÊݸ¤Ç¤­¤Þ¤»¤ó"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:311
+#: LYMessages.c:309
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "ÍúÎò¤ä¾ðÊóɽ¼¨¡¢¥á¥Ë¥å¡¼¡¢¥Õ¥¡¥¤¥ë°ìÍ÷¤Ï¥Ö¥Ã¥¯¥Þ¡¼¥¯¤È¤·¤ÆÊݸ¤Ç¤­¤Þ¤»¤ó¡£"
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:313
+#: LYMessages.c:311
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "ËÜÅö¤Ë¤³¤Î¥ê¥ó¥¯¤ò¥Ö¥Ã¥¯¥Þ¡¼¥¯¤«¤éºï½ü¤·¤Æ¤è¤í¤·¤¤¤Ç¤¹¤«?"
 
-#: LYMessages.c:314
+#: LYMessages.c:312
 msgid "Malformed address."
 msgstr "ÉÔÀµ¤Ê¥¢¥É¥ì¥¹¤Ç¤¹¡£"
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:316
+#: LYMessages.c:314
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "ÀΤʤ¬¤é¤Î¥³¥á¥ó¥È²òÀÏ¥ª¥ó(ºÇ¾®¸Â¤Î²òÀϤè¤êÍ¥Àè)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:318
+#: LYMessages.c:316
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "ÀΤʤ¬¤é¤Î¥³¥á¥ó¥È²òÀÏ¥ª¥Õ(ºÇ¾®¸Â¤Î²òÀϤ¬Í­¸ú)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:320
+#: LYMessages.c:318
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "ÀΤʤ¬¤é¤Î¥³¥á¥ó¥È²òÀÏ¥ª¥ó(¸·Ì©¤Ê²òÀϤè¤êÍ¥Àè)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:322
+#: LYMessages.c:320
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "ÀΤʤ¬¤é¤Î¥³¥á¥ó¥È²òÀÏ¥ª¥Õ(¸·Ì©¤Ê²òÀϤ¬Í­¸ú)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:324
+#: LYMessages.c:322
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "ºÇ¾®¸Â¤Î¥³¥á¥ó¥È²òÀÏ¥ª¥ó(¤«¤ÄÍ­¸ú)!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:324
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "ºÇ¾®¸Â¤Î¥³¥á¥ó¥È²òÀÏ¥ª¥Õ(¸·Ì©¤Ê²òÀϤ¬Í­¸ú)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:328
+#: LYMessages.c:326
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "ºÇ¾®¸Â¤Î¥³¥á¥ó¥È²òÀÏ¥ª¥ó(¤Ç¤âÀΤʤ¬¤é¤Î²òÀϤ¬Í­¸ú)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:330
+#: LYMessages.c:328
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "ºÇ¾®¸Â¤Î¥³¥á¥ó¥È²òÀÏ¥ª¥Õ(ÀΤʤ¬¤é¤Î²òÀϤ¬Í­¸ú)!"
 
-#: LYMessages.c:331
+#: LYMessages.c:329
 msgid "Soft double-quote parsing ON!"
 msgstr "´Ë¤ä¤«¤Ê¥À¥Ö¥ë¥¯¥©¡¼¥È²òÀÏ¥ª¥ó!"
 
-#: LYMessages.c:332
+#: LYMessages.c:330
 msgid "Soft double-quote parsing OFF!"
 msgstr "´Ë¤ä¤«¤Ê¥À¥Ö¥ë¥¯¥©¡¼¥È²òÀÏ¥ª¥Õ!"
 
-#: LYMessages.c:333
+#: LYMessages.c:331
 msgid "Now using TagSoup parsing of HTML."
 msgstr "HTML ¤ò¡Ö¥¿¥°¤Î¤´¤Ã¤¿¼Ñ¡×É÷Ì£¤Ç²òÀϤ·¤Þ¤¹¡£"
 
-#: LYMessages.c:334
+#: LYMessages.c:332
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "HTML ¤ò¡Ö¤½¤³¤½¤³¸·Ì© SGML¡×É÷Ì£¤Ç²òÀϤ·¤Þ¤¹!"
 
-#: LYMessages.c:335
+#: LYMessages.c:333
 msgid "You are already at the end of this document."
 msgstr "¤¹¤Ç¤Ë¤³¤Îʸ½ñ¤ÎËöÈø¤Ë¤¤¤Þ¤¹¡£"
 
-#: LYMessages.c:336
+#: LYMessages.c:334
 msgid "You are already at the beginning of this document."
 msgstr "¤¹¤Ç¤Ë¤³¤Îʸ½ñ¤ÎÀèƬ¤Ë¤¤¤Þ¤¹¡£"
 
-#: LYMessages.c:337
+#: LYMessages.c:335
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "¤¹¤Ç¤Ë¤³¤Îʸ½ñ¤Î %d ¥Ú¡¼¥¸Ìܤˤ¤¤Þ¤¹¡£"
 
-#: LYMessages.c:338
+#: LYMessages.c:336
 #, c-format
 msgid "Link number %d already is current."
 msgstr "¤¹¤Ç¤Ë¥ê¥ó¥¯ÈÖ¹æ %d ¤òÁªÂò¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: LYMessages.c:339
+#: LYMessages.c:337
 msgid "You are already at the first document"
 msgstr "¤³¤ì°Ê¾åÌá¤ì¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:340
+#: LYMessages.c:338
 msgid "There are no links above this line of the document."
 msgstr "Åöʸ½ñ¤Î¤³¤Î¹Ô¤è¤ê¾å¤Ë¥ê¥ó¥¯¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:341
+#: LYMessages.c:339
 msgid "There are no links below this line of the document."
 msgstr "Åöʸ½ñ¤Î¤³¤Î¹Ô¤è¤ê²¼¤Ë¥ê¥ó¥¯¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:343
+#: LYMessages.c:341
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "Ťµ¤Î¸Â³¦¤Ç¤¹! ¥Æ¥­¥¹¥È¤òºï½ü¤¹¤ë¤«¥Õ¥£¡¼¥ë¥É¤ò°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤"
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:345
+#: LYMessages.c:343
 msgid "You are not on a form submission button or normal link."
 msgstr "¸½ºß¥Õ¥©¡¼¥àÁ÷¿®¥Ü¥¿¥ó¤Þ¤¿¤ÏÄ̾ï¤Î¥ê¥ó¥¯¤Î¾å¤Ë¤¤¤Þ¤»¤ó"
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:347
+#: LYMessages.c:345
 msgid "One radio button must be checked at all times!"
 msgstr "¥é¥¸¥ª¥Ü¥¿¥ó¤ÏºÇÄã°ì¤Ä¤Ï»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó!"
 
-#: LYMessages.c:348
+#: LYMessages.c:346
 msgid "No submit button for this form, submit single text field?"
 msgstr "¥Õ¥©¡¼¥à¤Ë¤ÏÁ÷¿®¥Ü¥¿¥ó¤¬¤¢¤ê¤Þ¤»¤ó¡£Ã±°ì¤Î¥Æ¥­¥¹¥È¥Õ¥£¡¼¥ë¥É¤òÁ÷¿®¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:349
+#: LYMessages.c:347
 msgid "Do you want to go back to the previous document?"
 msgstr "°ì¤ÄÁ°¤Îʸ½ñ¤ËÌá¤ê¤Þ¤¹¤«?"
 
-#: LYMessages.c:350
+#: LYMessages.c:348
 msgid "Use arrows or tab to move off of field."
 msgstr "Ìð°õ¥­¡¼¤«¥¿¥Ö¤Ç¥Õ¥£¡¼¥ë¥É¤ò°ÜÆ°"
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:352
+#: LYMessages.c:350
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "¥Æ¥­¥¹¥È¤òÆþÎÏ Ìð°õ¥­¡¼¤«¥¿¥Ö¤Ç¥Õ¥£¡¼¥ë¥É¤ò°ÜÆ°"
 
-#: LYMessages.c:353
+#: LYMessages.c:351
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "ÉÔÀµ¤Ê HTML ¤Ç¤¹!! ¥Õ¥©¡¼¥à¥¢¥¯¥·¥ç¥ó¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó **"
 
-#: LYMessages.c:354
+#: LYMessages.c:352
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "ÉÔÀµ¤Ê HTML ¤Ç¤¹!! ¥Ý¥Ã¥×¥¢¥Ã¥×¥¦¥£¥ó¥É¥¦¤¬ºî¤ì¤Þ¤»¤ó **"
 
-#: LYMessages.c:355
+#: LYMessages.c:353
 msgid "Unable to create popup window!"
 msgstr "¥Ý¥Ã¥×¥¢¥Ã¥×¥¦¥£¥ó¥É¥¦¤¬ºî¤ì¤Þ¤»¤ó!"
 
-#: LYMessages.c:356
+#: LYMessages.c:354
 msgid "Goto a random URL is disallowed!"
 msgstr "¥é¥ó¥À¥à URL ¤Ø¤Î Goto ¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
-#: LYMessages.c:357
+#: LYMessages.c:355
 msgid "Goto a non-http URL is disallowed!"
 msgstr "Èó http URL ¤Ø¤Î Goto ¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
-#: LYMessages.c:358
+#: LYMessages.c:356
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "Goto ¤Ç \"%s\" URL ¤ò»ØÄꤹ¤ë¤Î¤Ï¶Ø»ß¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: LYMessages.c:359
+#: LYMessages.c:357
 msgid "URL to open: "
 msgstr "³«¤­¤¿¤¤ URL: "
 
-#: LYMessages.c:360
+#: LYMessages.c:358
 msgid "Edit the current Goto URL: "
 msgstr "¸½ºß¤Î Goto URL ¤òÊÔ½¸: "
 
-#: LYMessages.c:361
+#: LYMessages.c:359
 msgid "Edit the previous Goto URL: "
 msgstr "Á°¤Î Goto URL: ¤òÊÔ½¸: "
 
-#: LYMessages.c:362
+#: LYMessages.c:360
 msgid "Edit a previous Goto URL: "
 msgstr "°ÊÁ°¤Î Goto URL: ¤òÊÔ½¸: "
 
-#: LYMessages.c:363
+#: LYMessages.c:361
 msgid "Current document has POST data."
 msgstr "¸½ºß¤Îʸ½ñ¤Ï POST ¥Ç¡¼¥¿¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£"
 
-#: LYMessages.c:364
+#: LYMessages.c:362
 msgid "Edit this document's URL: "
 msgstr "¤³¤Îʸ½ñ¤Î URL ¤òÊÔ½¸: "
 
-#: LYMessages.c:365
+#: LYMessages.c:363
 msgid "Edit the current link's URL: "
 msgstr "¸½ºß¤Î URL ¥ê¥ó¥¯Àè¤òÊÔ½¸: "
 
-#: LYMessages.c:366
+#: LYMessages.c:364
 msgid "You cannot edit File Management URLs"
 msgstr "¥Õ¥¡¥¤¥ë´ÉÍý URL ¤ÏÊÔ½¸¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:367
+#: LYMessages.c:365
 msgid "Enter a database query: "
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ç¸¡º÷¤¹¤ëʸ»úÎó¤òÆþÎÏ: "
 
-#: LYMessages.c:368
+#: LYMessages.c:366
 msgid "Enter a whereis query: "
 msgstr "¸¡º÷¤¹¤ëʸ»úÎó: "
 
-#: LYMessages.c:369
+#: LYMessages.c:367
 msgid "Edit the current query: "
 msgstr "¸½ºß¤Î¸¡º÷ʸ»úÎó¤òÊÔ½¸: "
 
-#: LYMessages.c:370
+#: LYMessages.c:368
 msgid "Edit the previous query: "
 msgstr "°ì¤ÄÁ°¤Î¸¡º÷ʸ»úÎó¤òÊÔ½¸: "
 
-#: LYMessages.c:371
+#: LYMessages.c:369
 msgid "Edit a previous query: "
 msgstr "°ÊÁ°¤Î¸¡º÷ʸ»úÎó¤òÊÔ½¸: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:373
+#: LYMessages.c:371
 msgid "Use Control-R to resubmit the current query."
 msgstr "Ctrl-R ¤Ç¸½ºß¤Î¸¡º÷ʸ»úÎó¤òºÆÁ÷¿®"
 
-#: LYMessages.c:374
+#: LYMessages.c:372
 msgid "Edit the current shortcut: "
 msgstr "¸½ºß¤Î¥·¥ç¡¼¥È¥«¥Ã¥È¤òÊÔ½¸: "
 
-#: LYMessages.c:375
+#: LYMessages.c:373
 msgid "Edit the previous shortcut: "
 msgstr "°ì¤ÄÁ°¤Î¥·¥ç¡¼¥È¥«¥Ã¥È¤òÊÔ½¸: "
 
-#: LYMessages.c:376
+#: LYMessages.c:374
 msgid "Edit a previous shortcut: "
 msgstr "°ÊÁ°¤Î¥·¥ç¡¼¥È¥«¥Ã¥È¤òÊÔ½¸: "
 
-#: LYMessages.c:377
+#: LYMessages.c:375
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "¥­¡¼ '%c' ¤Ï¥¸¥ã¥ó¥×¥Õ¥¡¥¤¥ë¤Ë³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
-#: LYMessages.c:378
+#: LYMessages.c:376
 msgid "Cannot locate jump file!"
 msgstr "¥¸¥ã¥ó¥×¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó!"
 
-#: LYMessages.c:379
+#: LYMessages.c:377
 msgid "Cannot open jump file!"
 msgstr "¥¸¥ã¥ó¥×¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó!"
 
-#: LYMessages.c:380
+#: LYMessages.c:378
 msgid "Error reading jump file!"
 msgstr "¥¸¥ã¥ó¥×¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿!"
 
-#: LYMessages.c:381
+#: LYMessages.c:379
 msgid "Out of memory reading jump file!"
 msgstr "¥¸¥ã¥ó¥×¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ç¥á¥â¥ê¤¬Â­¤ê¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿!"
 
-#: LYMessages.c:382
+#: LYMessages.c:380
 msgid "Out of memory reading jump table!"
 msgstr "¥¸¥ã¥ó¥×¥Æ¡¼¥Ö¥ë¤ÎÆɤ߹þ¤ß¤Ç¥á¥â¥ê¤¬Â­¤ê¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿!"
 
-#: LYMessages.c:383
+#: LYMessages.c:381
 msgid "No index is currently available."
 msgstr "¸½ºßÍøÍѲÄǽ¤Ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:385
+#: LYMessages.c:383
 msgid "Do you really want to go to the Main screen?"
 msgstr "ËÜÅö¤Ë¥á¥¤¥ó²èÌ̤˹Ԥ­¤Þ¤¹¤«?"
 
-#: LYMessages.c:386
+#: LYMessages.c:384
 msgid "You are already at main screen!"
 msgstr "¤¹¤Ç¤Ë¥á¥¤¥ó²èÌ̤ˤ¤¤Þ¤¹!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:388
+#: LYMessages.c:386
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "¸¡º÷²Äǽ¤Êº÷°úÉÕ¤­Ê¸½ñ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó -- [/] ¤Çʸ»úÎó¤ò¸¡º÷"
 
 #. #define NO_OWNER
-#: LYMessages.c:390
+#: LYMessages.c:388
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "¥Õ¥¡¥¤¥ë¤Î½êÍ­¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ç¥³¥á¥ó¥È¤ÏÁ÷¤ì¤Þ¤»¤ó"
 
-#: LYMessages.c:391
+#: LYMessages.c:389
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "½êÍ­¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£%s ¤ò»È¤¤¤Þ¤¹¤«?"
 
-#: LYMessages.c:392
+#: LYMessages.c:390
 msgid "Do you wish to send a comment?"
 msgstr "¥³¥á¥ó¥È¤òÁ÷¤ê¤Þ¤¹¤«?"
 
-#: LYMessages.c:393
+#: LYMessages.c:391
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "¥á¡¼¥ë¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ç¥³¥á¥ó¥È¤ÏÁ÷¤ì¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:394
+#: LYMessages.c:392
 msgid "The 'e'dit command is currently disabled."
 msgstr "ÊÔ½¸ [e] ¥³¥Þ¥ó¥É¤Ï¸½ºßÍøÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:395
+#: LYMessages.c:393
 msgid "External editing is currently disabled."
 msgstr "³°ÉôÊÔ½¸µ¡Ç½¤Ï¸½ºßÍøÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:396
+#: LYMessages.c:394
 msgid "System error - failure to get status."
 msgstr "¥·¥¹¥Æ¥à¥¨¥é¡¼ - ¥¹¥Æ¡¼¥¿¥¹¤òÆÀ¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: LYMessages.c:397
+#: LYMessages.c:395
 msgid "No editor is defined!"
 msgstr "¥¨¥Ç¥£¥¿¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
-#: LYMessages.c:398
+#: LYMessages.c:396
 msgid "The 'p'rint command is currently disabled."
 msgstr "°õºþ¥³¥Þ¥ó¥É [p] ¤Ï¸½ºßÍøÍѤǤ­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:399
+#: LYMessages.c:397
 msgid "Document has no Toolbar links or Banner."
 msgstr "¤³¤Îʸ½ñ¤Ë¤Ï¥Ä¡¼¥ë¥Ð¡¼¥ê¥ó¥¯¤â¥Ð¥Ê¡¼¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:400
+#: LYMessages.c:398
 msgid "Unable to open traversal file."
 msgstr "¥È¥é¥Ð¡¼¥µ¥ë¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:401
+#: LYMessages.c:399
 msgid "Unable to open traversal found file."
 msgstr "¥È¥é¥Ð¡¼¥µ¥ëȯ¸«¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:402
+#: LYMessages.c:400
 msgid "Unable to open reject file."
 msgstr "¥ê¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:403
+#: LYMessages.c:401
 msgid "Unable to open traversal errors output file"
 msgstr "¥È¥é¥Ð¡¼¥µ¥ë¥¨¥é¡¼½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó"
 
-#: LYMessages.c:404
+#: LYMessages.c:402
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "¥È¥é¥Ð¡¼¥µ¥ë¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿"
 
-#: LYMessages.c:405
+#: LYMessages.c:403
 msgid "Follow link (or goto link or page) number: "
 msgstr "é¤ë¥ê¥ó¥¯(¤â¤·¤¯¤Ï goto ¥ê¥ó¥¯¤«¥Ú¡¼¥¸)¤ÎÈÖ¹æ: "
 
-#: LYMessages.c:406
+#: LYMessages.c:404
 msgid "Select option (or page) number: "
 msgstr "¥ª¥×¥·¥ç¥ó(¤Þ¤¿¤Ï¥Ú¡¼¥¸)ÈÖ¹æ¤òÁªÂò: "
 
-#: LYMessages.c:407
+#: LYMessages.c:405
 #, c-format
 msgid "Option number %d already is current."
 msgstr "¥ª¥×¥·¥ç¥óÈÖ¹æ %d ¤Ï¤¹¤Ç¤ËÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:409
+#: LYMessages.c:407
 msgid "You are already at the end of this option list."
 msgstr "¤¹¤Ç¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¥ê¥¹¥È¤Î½ªÃ¼¤Ë¤¤¤Þ¤¹¡£"
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:411
+#: LYMessages.c:409
 msgid "You are already at the beginning of this option list."
 msgstr "¤¹¤Ç¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¥ê¥¹¥È¤ÎÀèƬ¤Ë¤¤¤Þ¤¹¡£"
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:413
+#: LYMessages.c:411
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "¤¹¤Ç¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¥ê¥¹¥È¤Î¥Ú¡¼¥¸ %d ¤Ë¤¤¤Þ¤¹¡£"
 
-#: LYMessages.c:414
+#: LYMessages.c:412
 msgid "You have entered an invalid option number."
 msgstr "ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥óÈֹ椬ÆþÎϤµ¤ì¤Þ¤·¤¿¡£"
 
-#: LYMessages.c:415
+#: LYMessages.c:413
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** ÉÔÀµ¤Ê HTML ¤Ç¤¹!! -trace ¤Ç¸¶°ø¤òÄ´¤Ù¤é¤ì¤Þ¤¹ **"
 
-#: LYMessages.c:416
+#: LYMessages.c:414
 msgid "Give name of file to save in"
 msgstr "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: LYMessages.c:417
+#: LYMessages.c:415
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "¥Ç¡¼¥¿¤ò¥Õ¥¡¥¤¥ë¤ËÊݸ¤Ç¤­¤Þ¤»¤ó -- WWW ¤ò¥í¡¼¥«¥ë¤Ç¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: LYMessages.c:418
+#: LYMessages.c:416
 msgid "Can't open temporary file!"
 msgstr "°ì»þŪ¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó!"
 
-#: LYMessages.c:419
+#: LYMessages.c:417
 msgid "Can't open output file!  Cancelling!"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó! ¥­¥ã¥ó¥»¥ë¤·¤Þ¤¹!"
 
-#: LYMessages.c:420
+#: LYMessages.c:418
 msgid "Execution is disabled."
 msgstr "¼Â¹Ôµ¡Ç½¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£"
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:422
+#: LYMessages.c:420
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤ò¼Â¹Ô¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤ò»²¾È(%s¤ò»È¤¦)¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:424
+#: LYMessages.c:422
 msgid "Execution capabilities are not compiled into this version."
 msgstr "¼Â¹Ôµ¡Ç½¤Ï¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¥³¥ó¥Ñ¥¤¥ë»þ¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:425
+#: LYMessages.c:423
 msgid "This file cannot be displayed on this terminal."
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¸½ºß¤ÎüËö¤Ç¤Ïɽ¼¨¤Ç¤­¤Þ¤»¤ó¡£"
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:427
+#: LYMessages.c:425
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¸½ºß¤ÎüËö¤Ç¤Ïɽ¼¨¤Ç¤­¤Þ¤»¤ó¡£[d]¥À¥¦¥ó¥í¡¼¥É [c]¥­¥ã¥ó¥»¥ë"
 
-#: LYMessages.c:428
+#: LYMessages.c:426
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s [d]¥À¥¦¥ó¥í¡¼¥É ¤Þ¤¿¤Ï [c]¥­¥ã¥ó¥»¥ë"
 
-#: LYMessages.c:429
+#: LYMessages.c:427
 msgid "Cancelling file."
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥­¥ã¥ó¥»¥ë¤·¤Þ¤¹¡£"
 
-#: LYMessages.c:430
+#: LYMessages.c:428
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "¥Õ¥¡¥¤¥ë¤ò¼õ¿®Ãæ - ¤ªÂÔ¤Á¤¯¤À¤µ¤¤"
 
-#: LYMessages.c:431
+#: LYMessages.c:429
 msgid "Enter a filename: "
 msgstr "¥Õ¥¡¥¤¥ë̾¤òÆþÎÏ: "
 
-#: LYMessages.c:432
+#: LYMessages.c:430
 msgid "Edit the previous filename: "
 msgstr "°ì¤ÄÁ°¤Î¥Õ¥¡¥¤¥ë̾¤òÊÔ½¸: "
 
-#: LYMessages.c:433
+#: LYMessages.c:431
 msgid "Edit a previous filename: "
 msgstr "°ÊÁ°¤Î¥Õ¥¡¥¤¥ë̾¤òÊÔ½¸: "
 
-#: LYMessages.c:434
+#: LYMessages.c:432
 msgid "Enter a new filename: "
 msgstr "¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎÏ: "
 
-#: LYMessages.c:435
+#: LYMessages.c:433
 msgid "File name may not begin with a dot."
 msgstr "¥Õ¥¡¥¤¥ë̾¤Ï¥É¥Ã¥È¤Ç»Ï¤Þ¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:437
+#: LYMessages.c:435
 msgid "File exists.  Create higher version?"
 msgstr "¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹¡£¤è¤ê¹â¤¤¥Ð¡¼¥¸¥ç¥ó¤òºîÀ®¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:439
+#: LYMessages.c:437
 msgid "File exists.  Overwrite?"
 msgstr "¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹¡£¾å½ñ¤­¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:441
+#: LYMessages.c:439
 msgid "Cannot write to file."
 msgstr "¥Õ¥¡¥¤¥ë¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:442
+#: LYMessages.c:440
 msgid "ERROR! - download command is misconfigured."
 msgstr "¥¨¥é¡¼! - ¥À¥¦¥ó¥í¡¼¥É¥³¥Þ¥ó¥É¤ÎÀßÄ꤬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: LYMessages.c:443
+#: LYMessages.c:441
 msgid "Unable to download file."
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:444
+#: LYMessages.c:442
 msgid "Reading directory..."
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òÆɤ߹þ¤ßÃæ..."
 
-#: LYMessages.c:445
+#: LYMessages.c:443
 msgid "Building directory listing..."
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê°ìÍ÷¤òºîÀ®Ãæ..."
 
-#: LYMessages.c:446
+#: LYMessages.c:444
 msgid "Saving..."
 msgstr "Êݸ¤·¤Æ¤¤¤Þ¤¹..."
 
-#: LYMessages.c:447
+#: LYMessages.c:445
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "¥Õ¥¡¥¤¥ë '%s' ¤òÊÔ½¸¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:448
+#: LYMessages.c:446
 msgid "Unable to access document!"
 msgstr "ʸ½ñ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó!"
 
-#: LYMessages.c:449
+#: LYMessages.c:447
 msgid "Could not access file."
 msgstr "¥Õ¥¡¥¤¥ë¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:450
+#: LYMessages.c:448
 msgid "Could not access directory."
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:451
+#: LYMessages.c:449
 msgid "Could not load data."
 msgstr "¥Ç¡¼¥¿¤òÆɤ߹þ¤á¤Þ¤»¤ó¡£"
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:453
+#: LYMessages.c:451
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "¸½ºß Lynx ¤Ï¥ê¥â¡¼¥È WWW ¥Õ¥¡¥¤¥ë¤ò [e] ÊÔ½¸¤Ç¤­¤Þ¤»¤ó¡£"
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:455
+#: LYMessages.c:453
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "¤³¤Î¥Õ¥£¡¼¥ë¥É¤Ï³°Éô¥¨¥Ç¥£¥¿¤ÇÊÔ½¸ [e] ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:456
+#: LYMessages.c:454
 msgid "Bad rule"
 msgstr "ÉÔÀµ¤Ê¥ë¡¼¥ë¤Ç¤¹¡£"
 
-#: LYMessages.c:457
+#: LYMessages.c:455
 msgid "Insufficient operands:"
 msgstr "¥ª¥Ú¥é¥ó¥É¤¬Â­¤ê¤Þ¤»¤ó:"
 
-#: LYMessages.c:458
+#: LYMessages.c:456
 msgid "You are not authorized to edit this file."
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤¹¤ë¸¢¸Â¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:459
+#: LYMessages.c:457
 msgid "Title: "
 msgstr "Âê̾: "
 
-#: LYMessages.c:460
+#: LYMessages.c:458
 msgid "Subject: "
 msgstr "¥µ¥Ö¥¸¥§¥¯¥È: "
 
-#: LYMessages.c:461
+#: LYMessages.c:459
 msgid "Username: "
 msgstr "¥æ¡¼¥¶Ì¾: "
 
-#: LYMessages.c:462
+#: LYMessages.c:460
 msgid "Password: "
 msgstr "¥Ñ¥¹¥ï¡¼¥É: "
 
-#: LYMessages.c:463
+#: LYMessages.c:461
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: ¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹!!!"
 
-#: LYMessages.c:464
+#: LYMessages.c:462
 msgid "lynx: Password required!!!"
 msgstr "lynx: ¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹!!!"
 
-#: LYMessages.c:465
+#: LYMessages.c:463
 msgid "Clear all authorization info for this session?"
 msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Î¤¹¤Ù¤Æ¤Îǧ¾Ú¾ðÊó¤ò¥¯¥ê¥¢¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:466
+#: LYMessages.c:464
 msgid "Authorization info cleared."
 msgstr "ǧ¾Ú¾ðÊó¤ò¥¯¥ê¥¢¤·¤Þ¤·¤¿¡£"
 
-#: LYMessages.c:467
+#: LYMessages.c:465
 msgid "Authorization failed.  Retry?"
 msgstr "ǧ¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£ºÆ»î¹Ô¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:468
+#: LYMessages.c:466
 msgid "cgi support has been disabled."
 msgstr "cgi ¥µ¥Ý¡¼¥È¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£"
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:470
+#: LYMessages.c:468
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "Lynxcgi µ¡Ç½¤Ï¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤ÏÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:471
+#: LYMessages.c:469
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "%s ¤ò %s ¤ËÊÑ´¹¤¹¤ë¼êÃʤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:472
+#: LYMessages.c:470
 msgid "Unable to set up connection."
 msgstr "Àܳ¤ò½àÈ÷¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:473
+#: LYMessages.c:471
 msgid "Unable to make connection"
 msgstr "Àܳ¤ò³ÎΩ¤Ç¤­¤Þ¤»¤ó¡£"
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:475
+#: LYMessages.c:473
 msgid "Executable link rejected due to malformed request."
 msgstr "ÉÔÀµ¤Ê¥ê¥¯¥¨¥¹¥È¤Î¤¿¤á¡¢¼Â¹Ô²Äǽ¤Ê¥ê¥ó¥¯¤ÏµñÈݤµ¤ì¤Þ¤·¤¿¡£"
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:477
+#: LYMessages.c:475
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "¥­¥ã¥é¥¯¥¿ '%c' ¤Î¤¿¤á¡¢¼Â¹Ô²Äǽ¤Ê¥ê¥ó¥¯¤ÏµñÈݤµ¤ì¤Þ¤·¤¿¡£"
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:477
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "ÁêÂХѥ¹Ê¸»úÎó('../')¤Î¤¿¤á¡¢¼Â¹Ô²Äǽ¤Ê¥ê¥ó¥¯¤ÏµñÈݤµ¤ì¤Þ¤·¤¿¡£"
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:479
 msgid "Executable link rejected due to location or path."
 msgstr "¾ì½ê¤Þ¤¿¤Ï¥Ñ¥¹¤Î¤¿¤á¡¢¼Â¹Ô²Äǽ¤Ê¥ê¥ó¥¯¤ÏµñÈݤµ¤ì¤Þ¤·¤¿¡£"
 
-#: LYMessages.c:482
+#: LYMessages.c:480
 msgid "Mail access is disabled!"
 msgstr "¥á¡¼¥ë¥¢¥¯¥»¥¹¤ÏÍøÍѤǤ­¤Þ¤»¤ó!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:484
+#: LYMessages.c:482
 msgid "Only files and servers on the local host can be accessed."
 msgstr "¥í¡¼¥«¥ë¥Û¥¹¥È¾å¤Î¥Õ¥¡¥¤¥ë¤È¥µ¡¼¥Ð¤Î¤ß¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£"
 
-#: LYMessages.c:485
+#: LYMessages.c:483
 msgid "Telnet access is disabled!"
 msgstr "Telnet ¥¢¥¯¥»¥¹¤ÏÍøÍѤǤ­¤Þ¤»¤ó!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:487
+#: LYMessages.c:485
 msgid "Telnet port specifications are disabled."
 msgstr "Telnet ¥Ý¡¼¥È»ØÄê¤ÏÍøÍѤǤ­¤Þ¤»¤ó!"
 
-#: LYMessages.c:488
+#: LYMessages.c:486
 msgid "USENET news access is disabled!"
 msgstr "USENET ¥Ë¥å¡¼¥¹¥¢¥¯¥»¥¹¤ÏÍøÍѤǤ­¤Þ¤»¤ó!"
 
-#: LYMessages.c:489
+#: LYMessages.c:487
 msgid "Rlogin access is disabled!"
 msgstr "Rlogin ¥¢¥¯¥»¥¹¤ÏÍøÍѤǤ­¤Þ¤»¤ó!"
 
-#: LYMessages.c:490
+#: LYMessages.c:488
 msgid "Ftp access is disabled!"
 msgstr "Ftp ¥¢¥¯¥»¥¹¤ÏÍøÍѤǤ­¤Þ¤»¤ó!"
 
-#: LYMessages.c:491
+#: LYMessages.c:489
 msgid "There are no references from this document."
 msgstr "¤³¤Îʸ½ñ¤«¤é¤Î»²¾È¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:492
+#: LYMessages.c:490
 msgid "There are only hidden links from this document."
 msgstr "¤³¤Îʸ½ñ¤Ë¤Ï±£¤·¥ê¥ó¥¯¤·¤«¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:494
+#: LYMessages.c:492
 msgid "Unable to open command file."
 msgstr "¥³¥Þ¥ó¥É¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:496
+#: LYMessages.c:494
 msgid "News Post Cancelled!!!"
 msgstr "¥Ë¥å¡¼¥¹¤ÎÅê¹Æ¤Ï¥­¥ã¥ó¥»¥ë¤µ¤ì¤Þ¤·¤¿!!!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:498
+#: LYMessages.c:496
 msgid "Spawning your selected editor to edit news message"
 msgstr "»ØÄê¤Î¥¨¥Ç¥£¥¿¤òµ¯Æ°¤·¤Æ¥Ë¥å¡¼¥¹¥á¥Ã¥»¡¼¥¸¤òÊÔ½¸¤·¤Þ¤¹"
 
-#: LYMessages.c:499
+#: LYMessages.c:497
 msgid "Post this message?"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òÅê¹Æ¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:500
+#: LYMessages.c:498
 #, c-format
 msgid "Append '%s'?"
 msgstr "'%s' ¤òÄɲä·¤Þ¤¹¤«?"
 
-#: LYMessages.c:501
+#: LYMessages.c:499
 msgid "Posting to newsgroup(s)..."
 msgstr "¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤ËÅê¹ÆÃæ..."
 
-#: LYMessages.c:503
+#: LYMessages.c:501
 msgid "*** You have unread mail. ***"
 msgstr "*** ¤Þ¤ÀÆɤó¤Ç¤¤¤Ê¤¤¥á¡¼¥ë¤¬¤¢¤ê¤Þ¤¹ ***"
 
-#: LYMessages.c:505
+#: LYMessages.c:503
 msgid "*** You have mail. ***"
 msgstr "*** ¥á¡¼¥ë¤¬Íè¤Æ¤¤¤Þ¤¹ ***"
 
-#: LYMessages.c:507
+#: LYMessages.c:505
 msgid "*** You have new mail. ***"
 msgstr "*** ¿·Ãå¥á¡¼¥ë¤¬¤¢¤ê¤Þ¤¹ ***"
 
-#: LYMessages.c:508
+#: LYMessages.c:506
 msgid "File insert cancelled!!!"
 msgstr "¥Õ¥¡¥¤¥ëÁÞÆþ¤¬¥­¥ã¥ó¥»¥ë¤µ¤ì¤Þ¤·¤¿!!!"
 
-#: LYMessages.c:509
+#: LYMessages.c:507
 msgid "Not enough memory for file!"
 msgstr "¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó"
 
-#: LYMessages.c:510
+#: LYMessages.c:508
 msgid "Can't open file for reading."
 msgstr "Æɤ߹þ¤à¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:511
+#: LYMessages.c:509
 msgid "File does not exist."
 msgstr "¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:512
+#: LYMessages.c:510
 msgid "File does not exist - reenter or cancel:"
 msgstr "¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤»¤ó - ºÆÆþÎϤ«¥­¥ã¥ó¥»¥ë:"
 
-#: LYMessages.c:513
+#: LYMessages.c:511
 msgid "File is not readable."
 msgstr "¥Õ¥¡¥¤¥ë¤ÏÆɤ߹þ¤ßÉԲĤǤ¹¡£"
 
-#: LYMessages.c:514
+#: LYMessages.c:512
 msgid "File is not readable - reenter or cancel:"
 msgstr "¥Õ¥¡¥¤¥ë¤¬Æɤá¤Þ¤»¤ó - ºÆÆþÎϤ«¥­¥ã¥ó¥»¥ë:"
 
-#: LYMessages.c:515
+#: LYMessages.c:513
 msgid "Nothing to insert - file is 0-length."
 msgstr "ÁÞÆþ¤¹¤ëÆâÍƤ¬¤¢¤ê¤Þ¤»¤ó - ¥Õ¥¡¥¤¥ë¤ÎŤµ¤¬ 0 ¤Ç¤¹¡£"
 
-#: LYMessages.c:516
+#: LYMessages.c:514
 msgid "Save request cancelled!!!"
 msgstr "Êݸ¥ê¥¯¥¨¥¹¥È¤¬¥­¥ã¥ó¥»¥ë¤µ¤ì¤Þ¤·¤¿!!!"
 
-#: LYMessages.c:517
+#: LYMessages.c:515
 msgid "Mail request cancelled!!!"
 msgstr "¥á¡¼¥ë¥ê¥¯¥¨¥¹¥È¤¬¥­¥ã¥ó¥»¥ë¤µ¤ì¤Þ¤·¤¿!!!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:519
+#: LYMessages.c:517
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "²òÀϺѤߥ½¡¼¥¹¤ò±ÜÍ÷Ãæ¤Ç¤¹¡£ËÜÅö¤Ë¤³¤ì¤ò¥á¡¼¥ë¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:520
+#: LYMessages.c:518
 msgid "Please wait..."
 msgstr "¤ªÂÔ¤Á¤¯¤À¤µ¤¤..."
 
-#: LYMessages.c:521
+#: LYMessages.c:519
 msgid "Mailing file.  Please wait..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥á¡¼¥ë¤ÇÁ÷¿®Ãæ¡£¤ªÂÔ¤Á¤¯¤À¤µ¤¤..."
 
-#: LYMessages.c:522
+#: LYMessages.c:520
 msgid "ERROR - Unable to mail file"
 msgstr "¥¨¥é¡¼ - ¥Õ¥¡¥¤¥ë¤ò¥á¡¼¥ë¤ÇÁ÷¿®¤Ç¤­¤Þ¤»¤ó¡£"
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:524
+#: LYMessages.c:522
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "¥Õ¥¡¥¤¥ë¤Ï %d ²èÌÌʬ¤ÎŤµ¤Ç¤¹¡£ËÜÅö¤Ë°õºþ¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:525
+#: LYMessages.c:523
 msgid "Print request cancelled!!!"
 msgstr "°õºþ¥ê¥¯¥¨¥¹¥È¤Ï¥­¥ã¥ó¥»¥ë¤µ¤ì¤Þ¤·¤¿!!!"
 
-#: LYMessages.c:526
+#: LYMessages.c:524
 msgid "Press <return> to begin: "
 msgstr "¥ê¥¿¡¼¥ó¥­¡¼¤Ç³«»Ï: "
 
-#: LYMessages.c:527
+#: LYMessages.c:525
 msgid "Press <return> to finish: "
 msgstr "¥ê¥¿¡¼¥ó¥­¡¼¤Ç½ªÎ»"
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:527
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "¥Õ¥¡¥¤¥ë¤Ï %d ¥Ú¡¼¥¸Ê¬¤ÎŤµ¤Ç¤¹¡£ËÜÅö¤Ë°õºþ¤·¤Þ¤¹¤«?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:531
+#: LYMessages.c:529
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "¥×¥ê¥ó¥¿¤¬¥ª¥ó¥é¥¤¥ó¤«³Î¤«¤á¤Æ¤¯¤À¤µ¤¤¡£¥ê¥¿¡¼¥ó¥­¡¼¤Ç°õºþ³«»Ï:"
 
-#: LYMessages.c:532
+#: LYMessages.c:530
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "¥¨¥é¡¼ - ¥Õ¥¡¥¤¥ëÎΰ褬³ÎÊݤǤ­¤Þ¤»¤ó!!!"
 
-#: LYMessages.c:533
+#: LYMessages.c:531
 msgid "Unable to open tempfile"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó"
 
-#: LYMessages.c:534
+#: LYMessages.c:532
 msgid "Unable to open print options file"
 msgstr "°õºþ¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó"
 
-#: LYMessages.c:535
+#: LYMessages.c:533
 msgid "Printing file.  Please wait..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò°õºþ¤·¤Æ¤¤¤Þ¤¹¡£¤ªÂÔ¤Á¤¯¤À¤µ¤¤..."
 
-#: LYMessages.c:536
+#: LYMessages.c:534
 msgid "Please enter a valid internet mail address: "
 msgstr "Àµ¤·¤¤¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥á¡¼¥ë¥¢¥É¥ì¥¹¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: LYMessages.c:537
+#: LYMessages.c:535
 msgid "ERROR! - printer is misconfigured!"
 msgstr "¥¨¥é¡¼! - ¥×¥ê¥ó¥¿¤ÎÀßÄ꤬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: LYMessages.c:538
+#: LYMessages.c:536
 msgid "Image map from POST response not available!"
 msgstr "POST ¥ì¥¹¥Ý¥ó¥¹¤«¤é¤Î¥¤¥á¡¼¥¸¥Þ¥Ã¥×¤¬ÍøÍѤǤ­¤Þ¤»¤ó!"
 
-#: LYMessages.c:539
+#: LYMessages.c:537
 msgid "Misdirected client-side image MAP request!"
 msgstr "¥¯¥é¥¤¥¢¥ó¥È¥µ¥¤¥É¥¤¥á¡¼¥¸ MAP ¥ê¥¯¥¨¥¹¥È¤Î¥Ç¥£¥ì¥¯¥·¥ç¥ó¤¬ÉÔÀµ¤Ç¤¹!"
 
-#: LYMessages.c:540
+#: LYMessages.c:538
 msgid "Client-side image MAP is not accessible!"
 msgstr "¥¯¥é¥¤¥¢¥ó¥È¥µ¥¤¥É¥¤¥á¡¼¥¸ MAP ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó!"
 
-#: LYMessages.c:541
+#: LYMessages.c:539
 msgid "No client-side image MAPs are available!"
 msgstr "ÍøÍѤǤ­¤ë¥¯¥é¥¤¥¢¥ó¥È¥µ¥¤¥É¥¤¥á¡¼¥¸ MAP ¤¬¤¢¤ê¤Þ¤»¤ó!"
 
-#: LYMessages.c:542
+#: LYMessages.c:540
 msgid "Client-side image MAP is not available!"
 msgstr "¥¯¥é¥¤¥¢¥ó¥È¥µ¥¤¥É¥¤¥á¡¼¥¸ MAP ¤ÏÍøÍѤǤ­¤Þ¤»¤ó!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:545
+#: LYMessages.c:543
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤òɽ¼¨¤¹¤ë¤Ë¤Ï¥¹¥¯¥ê¡¼¥ó¤Î¹â¤µ¤¬ºÇÄã 24 ¹ÔʬɬÍפǤ¹!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:547
+#: LYMessages.c:545
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤òɽ¼¨¤¹¤ë¤Ë¤Ï¥¹¥¯¥ê¡¼¥ó¤Î¹â¤µ¤¬ºÇÄã 23 ¹ÔʬɬÍפǤ¹!"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:549
+#: LYMessages.c:547
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤òɽ¼¨¤¹¤ë¤Ë¤Ï¥¹¥¯¥ê¡¼¥ó¤Î¹â¤µ¤¬ºÇÄã 22 ¹ÔʬɬÍפǤ¹!"
 
-#: LYMessages.c:551
+#: LYMessages.c:549
 msgid "That key requires Advanced User mode."
 msgstr "¤½¤Î¥­¡¼¤ò»È¤¦¤Ë¤Ï¹âÅ٥桼¥¶¥â¡¼¥É¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:552
+#: LYMessages.c:550
 #, c-format
 msgid "Content-type: %s"
 msgstr "Content-type: %s"
 
-#: LYMessages.c:553
+#: LYMessages.c:551
 msgid "Command: "
 msgstr "¥³¥Þ¥ó¥É: "
 
-#: LYMessages.c:554
+#: LYMessages.c:552
 msgid "Unknown or ambiguous command"
 msgstr "ÉÔÌÀ¤Þ¤¿¤Ï¤¢¤¤¤Þ¤¤¤Ê¥³¥Þ¥ó¥É¤Ç¤¹"
 
-#: LYMessages.c:555
+#: LYMessages.c:553
 msgid " Version "
 msgstr " ¥Ð¡¼¥¸¥ç¥ó "
 
-#: LYMessages.c:556
+#: LYMessages.c:554
 msgid " first"
 msgstr " ¤òºÇ½é¤Ëõ¤·¤Þ¤¹"
 
-#: LYMessages.c:557
+#: LYMessages.c:555
 msgid ", guessing..."
 msgstr "¡¢¿ä¬Ãæ..."
 
-#: LYMessages.c:558
+#: LYMessages.c:556
 msgid "Permissions for "
 msgstr "¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó: "
 
-#: LYMessages.c:559
+#: LYMessages.c:557
 msgid "Select "
 msgstr "ÁªÂò "
 
-#: LYMessages.c:560
+#: LYMessages.c:558
 msgid "capital letter"
 msgstr "Âçʸ»ú"
 
-#: LYMessages.c:561
+#: LYMessages.c:559
 msgid " of option line,"
 msgstr " ¤Î¥ª¥×¥·¥ç¥ó¥é¥¤¥ó¡¢"
 
-#: LYMessages.c:562
+#: LYMessages.c:560
 msgid " to save,"
 msgstr " ¤ÇÊݸ¡¢"
 
-#: LYMessages.c:563
+#: LYMessages.c:561
 msgid " to "
 msgstr " ¤Ø "
 
-#: LYMessages.c:564
+#: LYMessages.c:562
 msgid " or "
 msgstr " ¤Þ¤¿¤Ï "
 
-#: LYMessages.c:565
+#: LYMessages.c:563
 msgid " index"
 msgstr " º÷°ú"
 
-#: LYMessages.c:566
+#: LYMessages.c:564
 msgid " to return to Lynx."
 msgstr " ¤Ç Lynx ¤ËÌá¤ë¡£"
 
-#: LYMessages.c:567
+#: LYMessages.c:565
 msgid "Accept Changes"
 msgstr "Êѹ¹¤òÍ­¸ú¤Ë¤¹¤ë"
 
-#: LYMessages.c:568
+#: LYMessages.c:566
 msgid "Reset Changes"
 msgstr "Êѹ¹¤ò¥ê¥»¥Ã¥È"
 
-#: LYMessages.c:569
+#: LYMessages.c:567
 msgid "Left Arrow cancels changes"
 msgstr "[¢«] ¥­¥ã¥ó¥»¥ë"
 
-#: LYMessages.c:570
+#: LYMessages.c:568
 msgid "Save options to disk"
 msgstr "Êѹ¹¤ò¥Ç¥£¥¹¥¯¤ËÊݸ"
 
-#: LYMessages.c:571
+#: LYMessages.c:569
 msgid "Hit RETURN to accept entered data."
 msgstr "¥ê¥¿¡¼¥ó¥­¡¼¤ÇÆþÎϤ·¤¿¥Ç¡¼¥¿¤òÅÐÏ¿"
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:573
+#: LYMessages.c:571
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr "¥ê¥¿¡¼¥ó¤ÇÆþÎϤ·¤¿¥Ç¡¼¥¿¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤ËÌ᤹¤Ë¤Ï¥Ç¡¼¥¿¤òºï½ü"
 
-#: LYMessages.c:574
+#: LYMessages.c:572
 msgid "Value accepted!"
 msgstr "Ãͤò¼õ¤±Æþ¤ì¤Þ¤·¤¿!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:576
+#: LYMessages.c:574
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Ãͤò¼õ¤±Æþ¤ì¤Þ¤·¤¿! -- Ãí°Õ: Lynx ¤Ï XWINDOWS ¸þ¤±¤ËÀßÄꤵ¤ì¤Þ¤·¤¿!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:578
+#: LYMessages.c:576
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Ãͤò¼õ¤±Æþ¤ì¤Þ¤·¤¿! -- Ãí°Õ: Lynx ¤Ï XWINDOWS ¸þ¤±¤ËÀßÄꤵ¤ì¤Æ*¤¤¤Þ¤»¤ó*"
 
-#: LYMessages.c:579
+#: LYMessages.c:577
 msgid "You are not allowed to change which editor to use!"
 msgstr "»ÈÍѤ¹¤ë¥¨¥Ç¥£¥¿¤ÎÊѹ¹¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
-#: LYMessages.c:580
+#: LYMessages.c:578
 msgid "Failed to set DISPLAY variable!"
 msgstr "´Ä¶­ÊÑ¿ô DISPLAY ¤ÎÀßÄê¤Ë¼ºÇÔ¤·¤Þ¤·¤¿!"
 
-#: LYMessages.c:581
+#: LYMessages.c:579
 msgid "Failed to clear DISPLAY variable!"
 msgstr "´Ä¶­ÊÑ¿ô DISPLAY ¤Î¥¯¥ê¥¢¤Ë¼ºÇÔ¤·¤Þ¤·¤¿!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:583
+#: LYMessages.c:581
 msgid "You are not allowed to change the bookmark file!"
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë¤ÎÊѹ¹¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
-#: LYMessages.c:584
+#: LYMessages.c:582
 msgid "Terminal does not support color"
 msgstr "üËö¤¬¥«¥é¡¼É½¼¨¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:585
+#: LYMessages.c:583
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "¤¢¤Ê¤¿¤ÎüËö '%s' ¤Ï¥«¥é¡¼É½¼¨¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:586
+#: LYMessages.c:584
 msgid "Access to dot files is disabled!"
 msgstr "¥É¥Ã¥È¥Õ¥¡¥¤¥ë¤Ø¤Î¥¢¥¯¥»¥¹¤Ï¤Ç¤­¤Þ¤»¤ó!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:588
+#: LYMessages.c:586
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr "User-Agent ¤Ë \"Lynx\" ¤¢¤ë¤¤¤Ï \"L_y_n_x\" ¤È¤¤¤¦Ê¸»úÎ󤬴ޤޤì¤Æ¤¤¤Þ¤»¤ó"
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:590
+#: LYMessages.c:588
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr "User-Agent ¤Ë \"L_y_n_x\" ¤Ê¤¤¤· \"Lynx\" ¤È¤¤¤¦Ê¸»úÎó¤ò´Þ¤á¤Æ¤¯¤À¤µ¤¤¡£¤µ¤â¤Ê¤¤¤È°Õ¿ÞŪ¤Êµ½â֤ȸ«¤Ê¤·¤Þ¤¹!"
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:592
+#: LYMessages.c:590
 msgid "Changing of the User-Agent string is disabled!"
 msgstr "User-Agent ʸ»úÎó¤ÎÊѹ¹¤Ï¤Ç¤­¤Þ¤»¤ó!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:594
+#: LYMessages.c:592
 msgid "You are not allowed to change this setting."
 msgstr "¤³¤ÎÀßÄê¤ÎÊѹ¹¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:595
+#: LYMessages.c:593
 msgid "Saving Options..."
 msgstr "ÀßÄê¤òÊݸÃæ..."
 
-#: LYMessages.c:596
+#: LYMessages.c:594
 msgid "Options saved!"
 msgstr "ÀßÄê¤òÊݸ¤·¤Þ¤·¤¿!"
 
-#: LYMessages.c:597
+#: LYMessages.c:595
 msgid "Unable to save Options!"
 msgstr "ÀßÄê¤òÊݸ¤Ç¤­¤Þ¤»¤ó!"
 
-#: LYMessages.c:598
+#: LYMessages.c:596
 msgid " 'r' to return to Lynx "
 msgstr "[r]¤Ç Lynx ¤ËÌá¤ê¤Þ¤¹ "
 
-#: LYMessages.c:599
+#: LYMessages.c:597
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr " [>] ¤ÇÊݸ¡¢[r] ¤Ç Lynx ¤ËÌá¤ê¤Þ¤¹ "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:601
+#: LYMessages.c:599
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "²¿¤«¥­¡¼¤ò²¡¤·¤ÆÃͤòÊѤ¨¤Æ¤¯¤À¤µ¤¤¡£¥ê¥¿¡¼¥ó¤ÇÅÐÏ¿"
 
-#: LYMessages.c:602
+#: LYMessages.c:600
 msgid "Error uncompressing temporary file!"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ÎŸ³«¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿!"
 
-#: LYMessages.c:603
+#: LYMessages.c:601
 msgid "Unsupported URL scheme!"
 msgstr "¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤ URL ¥¹¥­¡¼¥à¤Ç¤¹!"
 
-#: LYMessages.c:604
+#: LYMessages.c:602
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥Ç¡¼¥¿: URL! ¤È¤ê¤¢¤¨¤º SHOWINFO ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: LYMessages.c:605
+#: LYMessages.c:603
 msgid "Redirection limit of 10 URL's reached."
 msgstr "¥ê¥À¥¤¥ì¥¯¥·¥ç¥óÀ©¸Â (10 URL) ¤ËÅþ㤷¤Þ¤·¤¿¡£"
 
-#: LYMessages.c:606
+#: LYMessages.c:604
 msgid "Illegal redirection URL received from server!"
 msgstr "¥µ¡¼¥Ð¤«¤éÉÔÀµ¤Ê¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó URL ¤ò¼õ¿®¤·¤Þ¤·¤¿!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:608
+#: LYMessages.c:606
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "¥µ¡¼¥Ð¤Ï POST ¥³¥ó¥Æ¥ó¥È¤Î°Ê²¼¤Ø¤Î %d ¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó¤òÍ׵ᤷ¤Þ¤·¤¿: "
 
-#: LYMessages.c:611
+#: LYMessages.c:609
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "[p]¤Ç³¹Ô¡¢[g]GET¤ò»È¤¦¡¢[c]¥­¥ã¥ó¥»¥ë"
 
-#: LYMessages.c:612
+#: LYMessages.c:610
 msgid "P)roceed, or C)ancel "
 msgstr "[p]¤Ç³¹Ô¡¢¤Þ¤¿¤Ï [c]¥­¥ã¥ó¥»¥ë"
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:614
+#: LYMessages.c:612
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr "POST ¥³¥ó¥Æ¥ó¥È¤Î¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó [p]³¹Ô [u]URL¤ò¸«¤ë [g]GET¤ò»È¤¦ [c]¥­¥ã¥ó¥»¥ë"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:614
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "POST ¥³¥ó¥Æ¥ó¥È¤Î¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó [p]³¹Ô [u]URL¤ò¸«¤ë [c]¥­¥ã¥ó¥»¥ë"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:618
+#: LYMessages.c:616
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "POST ¥³¥ó¥Æ¥ó¥È¤ò»ý¤Ä¥Õ¥©¡¼¥à¤«¤é¤Î¥É¥­¥å¥á¥ó¥È¤Ç¤¹¡£ºÆÁ÷¿®¤·¤Þ¤¹¤«?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:620
+#: LYMessages.c:618
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "POST ¥³¥ó¥Æ¥ó¥È¤ò %s ¤ËºÆÁ÷¿®¤·¤Þ¤¹¤«?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:622
+#: LYMessages.c:620
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "POST ¥Ç¡¼¥¿¤ò»ý¤Ä¥É¥­¥å¥á¥ó¥È¤«¤é¤Î¥ê¥¹¥È¤Ç¤¹¡£%s ¤òºÆÆɤ߹þ¤ß¤·¤Þ¤¹¤«?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:624
+#: LYMessages.c:622
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "POST ¥¢¥¯¥·¥ç¥ó¤«¤é¤Îʸ½ñ¤Ç¤¹¤¬¡¢HEAD ¤ÏÍý²ò¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£Â³¹Ô¤·¤Þ¤¹¤«?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:624
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "¥Õ¥©¡¼¥àÁ÷¿®¥¢¥¯¥·¥ç¥ó¤Ï POST ¤Ç¤¹¤¬¡¢HEAD ¤ÏÍý²ò¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£Â³¹Ô¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:627
+#: LYMessages.c:625
 msgid "Proceed without a username and password?"
 msgstr "¥æ¡¼¥¶Ì¾¤â¥Ñ¥¹¥ï¡¼¥É¤â̵¤·¤Ç³¹Ô¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:628
+#: LYMessages.c:626
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "³¹Ô¤·¤Þ¤¹¤« (%s)?"
 
-#: LYMessages.c:629
+#: LYMessages.c:627
 msgid "Cannot POST to this host."
 msgstr "¤³¤Î¥Û¥¹¥È¤Ë¤Ï POST ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:630
+#: LYMessages.c:628
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "¤³¤Î URL ¤Î¤¿¤á¤Î POST ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£POST ¥Ç¡¼¥¿¤Ï̵»ë¤µ¤ì¤Þ¤¹!"
 
-#: LYMessages.c:631
+#: LYMessages.c:629
 msgid "Discarding POST data..."
 msgstr "POST ¥Ç¡¼¥¿¤òÇÑ´þ¤·¤Æ¤¤¤Þ¤¹..."
 
-#: LYMessages.c:632
+#: LYMessages.c:630
 msgid "Document will not be reloaded!"
 msgstr "ʸ½ñ¤ÏºÆÆɤ߹þ¤ß¤µ¤ì¤Þ¤»¤ó!"
 
-#: LYMessages.c:633
+#: LYMessages.c:631
 msgid "Location: "
 msgstr "¾ì½ê: "
 
-#: LYMessages.c:634
+#: LYMessages.c:632
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿!"
 
-#: LYMessages.c:635
+#: LYMessages.c:633
 msgid "Default Bookmark File"
 msgstr "¥Ç¥Õ¥©¥ë¥È¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë"
 
-#: LYMessages.c:636
+#: LYMessages.c:634
 msgid "Screen too small! (8x35 min)"
 msgstr "¥¹¥¯¥ê¡¼¥ó¤¬¾®¤µ¤¹¤®¤Þ¤¹!!! (ºÇÄã 8x35 ɬÍפǤ¹)"
 
-#: LYMessages.c:637
+#: LYMessages.c:635
 msgid "Select destination or ^G to Cancel: "
 msgstr "¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤ (^G ¤Ç¥­¥ã¥ó¥»¥ë): "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:639
+#: LYMessages.c:637
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤òÁªÂò [=] ¥á¥Ë¥å¡¼ [^g] ¥­¥ã¥ó¥»¥ë: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:641
+#: LYMessages.c:639
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "[l]¤³¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ëÆâ¤Ç¥ê¥ó¥¯¤òºÆÀ½ ([c]¥­¥ã¥ó¥»¥ë): "
 
-#: LYMessages.c:642
+#: LYMessages.c:640
 msgid "Multiple bookmark support is not available."
 msgstr "¥Þ¥ë¥Á¥Ö¥Ã¥¯¥Þ¡¼¥¯¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:643
+#: LYMessages.c:641
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤òÁªÂò (¥Ú¡¼¥¸ %d¡¢Á´ %d ¥Ú¡¼¥¸)"
 
-#: LYMessages.c:644
+#: LYMessages.c:642
 msgid "       Select Bookmark"
 msgstr "       ¥Ö¥Ã¥¯¥Þ¡¼¥¯¤òÁªÂò"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:646
+#: LYMessages.c:644
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ÎÀâÌÀ¤È¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤òÊÔ½¸ (2 ¤Î %d) "
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:648
+#: LYMessages.c:646
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ÎÀâÌÀ¤È¥Õ¥¡¥¤¥ë̾¤òÊÔ½¸"
 
-#: LYMessages.c:649
+#: LYMessages.c:647
 msgid "Letter: "
 msgstr "ʸ»ú¤òÆþÎÏ: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:652
+#: LYMessages.c:650
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "SHELL ¹½Ê¸¤Ç¤Ï¤¢¤Ê¤¿¤Î¥í¥°¥¤¥ó¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü¤¤¤¿¥Õ¥¡¥¤¥ë¥Ñ¥¹¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤!"
 
-#: LYMessages.c:654
+#: LYMessages.c:652
 msgid "Use a filepath off your home directory!"
 msgstr "¤¢¤Ê¤¿¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü¤¤¤¿¥Õ¥¡¥¤¥ë¥Ñ¥¹¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:657
+#: LYMessages.c:655
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "°ì¥Ú¡¼¥¸¤¢¤¿¤ê¤Î¥ê¥ó¥¯¤ÎºÇÂç¿ô¤òĶ¤¨¤Þ¤·¤¿! Ⱦ¥Ú¡¼¥¸¤Ê¤¤¤·Æó¹Ôñ°Ì¤Î¥¹¥¯¥í¡¼¥ë¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. #define MAXHIST_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:657
 msgid "History List maximum reached!  Document not pushed."
 msgstr "ÍúÎò¥ê¥¹¥È¤¬ºÇÂç¿ô¤òĶ¤¨¤Þ¤·¤¿! ¥É¥­¥å¥á¥ó¥È¤Ï¥×¥Ã¥·¥å¤µ¤ì¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:660
+#: LYMessages.c:658
 msgid "No previously visited links available!"
 msgstr "°ÊÁ°¤Ëˬ¤Í¤¿¥ê¥ó¥¯¤Ï°ì¤Ä¤â¤¢¤ê¤Þ¤»¤ó!"
 
-#: LYMessages.c:661
+#: LYMessages.c:659
 msgid "Memory exhausted!  Program aborted!"
 msgstr "¥á¥â¥ê¤ò»È¤¤¤­¤ê¤Þ¤·¤¿! ¥×¥í¥°¥é¥à¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿!"
 
-#: LYMessages.c:662
+#: LYMessages.c:660
 msgid "Memory exhausted!  Aborting..."
 msgstr "¥á¥â¥ê¤ò»È¤¤¤­¤ê¤Þ¤·¤¿! ½ªÎ»¤·¤Þ¤¹..."
 
-#: LYMessages.c:663
+#: LYMessages.c:661
 msgid "Not enough memory!"
 msgstr "¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó!"
 
-#: LYMessages.c:664
+#: LYMessages.c:662
 msgid "Directory/File Manager not available"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê/¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤ÏÍøÍѤǤ­¤Þ¤»¤ó"
 
-#: LYMessages.c:665
+#: LYMessages.c:663
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "BASE ¥¿¥°Ãæ¤Î HREF ¤ÏÀäÂÐ URL ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:666
+#: LYMessages.c:664
 msgid "Location URL is not absolute."
 msgstr "¥í¥±¡¼¥·¥ç¥ó URL ¤ÏÀäÂÐŪ¤Ê¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:667
+#: LYMessages.c:665
 msgid "Refresh URL is not absolute."
 msgstr "¥ê¥Õ¥ì¥Ã¥·¥å URL ¤ÏÀäÂÐŪ¤Ê¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:667
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2034,7 +2036,7 @@ msgstr ""
 "ËÜʸ¤ò´Þ¤à¥á¥Ã¥»¡¼¥¸¤ò°Ê²¼¤ØÁ÷¤í¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n"
 "  "
 
-#: LYMessages.c:670
+#: LYMessages.c:668
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2042,7 +2044,7 @@ msgstr ""
 "°Ê²¼¤Î¥¢¥É¥ì¥¹¤Ë¥³¥á¥ó¥È¤òÁ÷¤ê¤Þ¤¹:\n"
 "  "
 
-#: LYMessages.c:671
+#: LYMessages.c:669
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2052,7 +2054,7 @@ msgstr ""
 " °Ê²¼¤Ø¤â¥³¥Ô¡¼¤òÁ÷¤ê¤Þ¤¹:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:670
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2063,7 +2065,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:672
 msgid ""
 "\n"
 "\n"
@@ -2074,7 +2076,7 @@ msgstr ""
 "Ctrl-G ¤Ç¥á¥Ã¥»¡¼¥¸Á÷¿®¤òÃæ»ß¤·¤Þ¤¹\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:674
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2083,7 +2085,7 @@ msgstr ""
 "¤¢¤Ê¤¿¤Î¤ªÌ¾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¶õÇò¤Î¤Þ¤Þ¤À¤Èƿ̾¤Ë¤Ê¤ê¤Þ¤¹\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:676
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2092,11 +2094,11 @@ msgstr ""
 " ÊÖ»ö¤ò´õ˾¤¹¤ë¾ì¹ç¤Ï¡¢¥á¡¼¥ë¥¢¥É¥ì¥¹¤«¡¢¤½¤Î¾¤Î\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:678
 msgid " means to contact you, if you desire a response.\n"
 msgstr " Ï¢Íí¼êÃʤò¤³¤³¤Ç»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: LYMessages.c:681
+#: LYMessages.c:679
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2105,7 +2107,7 @@ msgstr ""
 " ¥µ¥Ö¥¸¥§¥¯¥È¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2113,11 +2115,11 @@ msgstr ""
 "\n"
 " ¤¢¤Ê¤¿¤Î¥á¥Ã¥»¡¼¥¸¤ò CC ¤¹¤ë¥á¡¼¥ë¥¢¥É¥ì¥¹¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:682
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (¤â¤·¥³¥Ô¡¼¤·¤¿¤¯¤Ê¤±¤ì¤Ð¶õÇò¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤)\n"
 
-#: LYMessages.c:685
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2127,7 +2129,7 @@ msgstr ""
 " ¥á¥Ã¥»¡¼¥¸ËÜʸ¤ò³Îǧ¤·¤Æ²¼¤µ¤¤:\n"
 "\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:684
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2135,7 +2137,7 @@ msgstr ""
 "\n"
 "³¤±¤ë¤Ë¤Ï¥ê¥¿¡¼¥ó¥­¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤: "
 
-#: LYMessages.c:687
+#: LYMessages.c:685
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2143,11 +2145,11 @@ msgstr ""
 "\n"
 "Á´¤Æºï½ü¤¹¤ë¤Ë¤Ï¥ê¥¿¡¼¥ó¥­¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤: "
 
-#: LYMessages.c:688
+#: LYMessages.c:686
 msgid " Use Control-U to erase the default.\n"
 msgstr "Ctrl-U ¤Ç¥Ç¥Õ¥©¥ë¥ÈÃͤòºï½ü¤·¤Þ¤¹¡£\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2156,7 +2158,7 @@ msgstr ""
 " ¤¢¤Ê¤¿¤Î¥á¥Ã¥»¡¼¥¸¤ò°Ê²¼¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:380
+#: LYMessages.c:689 src/LYNews.c:361
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2165,7 +2167,7 @@ msgstr ""
 " ½ª¤ï¤Ã¤¿¤é¡¢²þ¹Ô¥­¡¼¤ò²¡¤·¤Æ¤½¤Î¹Ô¤Ë¥Ô¥ê¥ª¥É (.) ¤ò°ì¤Ä"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:381
+#: LYMessages.c:691 src/LYNews.c:362
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2175,248 +2177,248 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:695
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "%s ¤«¤é¤Î¥¯¥Ã¥­¡¼: %.*s=%.*s ¼õ¤±ÉÕ¤±¤Þ¤¹¤«? (Y/N/Always/neVer)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:697
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "ÉÔÀµ¤Ê¥¯¥Ã¥­¡¼¥É¥á¥¤¥ó= %s ¤ò %s ¤È¤·¤Æ¼õ¤±ÉÕ¤±¤Þ¤¹¤«?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:699
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr "ÉÔÀµ¤Ê¥¯¥Ã¥­¡¼¥Ñ¥¹ = %s ¤ò %s ¤Î¥×¥ê¥Õ¥£¥Ã¥¯¥¹¤È¤·¤Æ¼õ¤±ÉÕ¤±¤Þ¤¹¤«? "
 
-#: LYMessages.c:702
+#: LYMessages.c:700
 msgid "Allowing this cookie."
 msgstr "¤³¤Î¥¯¥Ã¥­¡¼¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£"
 
-#: LYMessages.c:703
+#: LYMessages.c:701
 msgid "Rejecting this cookie."
 msgstr "¤³¤Î¥¯¥Ã¥­¡¼¤òµñÈݤ·¤Þ¤¹¡£"
 
-#: LYMessages.c:704
+#: LYMessages.c:702
 msgid "The Cookie Jar is empty."
 msgstr "¥¯¥Ã¥­¡¼È¢¤Ï¶õ¤Ã¤Ý¤Ç¤¹¡£"
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:706
+#: LYMessages.c:704
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "¥ê¥ó¥¯¤òé¤ë¤È¡¢¥¯¥Ã¥­¡¼¤ä¥É¥á¥¤¥óÁ´ÂΤò¡Ö¿©¤Ù¡×¤¿¤ê¡¢"
 
-#: LYMessages.c:707
+#: LYMessages.c:705
 msgid "or to change a domain's 'allow' setting."
 msgstr "¥É¥á¥¤¥ó¤´¤È¤Î¥¯¥Ã¥­¡¼¼õ¤±ÉÕ¤±ÀßÄê¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: LYMessages.c:708
+#: LYMessages.c:706
 msgid "(Cookies never allowed.)"
 msgstr "(¥¯¥Ã¥­¡¼¤ò¾ï¤ËµñÈݤ·¤Þ¤¹)"
 
-#: LYMessages.c:709
+#: LYMessages.c:707
 msgid "(Cookies always allowed.)"
 msgstr "(¥¯¥Ã¥­¡¼¤ò¾ï¤Ë¼õ¤±ÉÕ¤±¤Þ¤¹)"
 
-#: LYMessages.c:710
+#: LYMessages.c:708
 msgid "(Cookies allowed via prompt.)"
 msgstr "(¥¯¥Ã¥­¡¼¼õ¤±ÉÕ¤±¤Ï¤½¤Î¤Ä¤ÉȽÃǤ·¤Þ¤¹)"
 
-#: LYMessages.c:711
+#: LYMessages.c:709
 msgid "(Persistent Cookies.)"
 msgstr "(±Ê³Ū¤Ê¥¯¥Ã¥­¡¼)"
 
-#: LYMessages.c:712
+#: LYMessages.c:710
 msgid "(No title.)"
 msgstr "(¥¿¥¤¥È¥ë¤Ê¤·)"
 
-#: LYMessages.c:713
+#: LYMessages.c:711
 msgid "(No name.)"
 msgstr "(̾Á°¤Ê¤·)"
 
-#: LYMessages.c:714
+#: LYMessages.c:712
 msgid "(No value.)"
 msgstr "(Ãͤʤ·)"
 
-#: LYMessages.c:715
+#: LYMessages.c:713
 msgid "None"
 msgstr "¤Ê¤·"
 
-#: LYMessages.c:716
+#: LYMessages.c:714
 msgid "(End of session.)"
 msgstr "(¥»¥Ã¥·¥ç¥ó¤Î½ª¤ï¤ê)"
 
-#: LYMessages.c:717
+#: LYMessages.c:715
 msgid "Delete this cookie?"
 msgstr "¤³¤Î¥¯¥Ã¥­¡¼¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:718
+#: LYMessages.c:716
 msgid "The cookie has been eaten!"
 msgstr "¥¯¥Ã¥­¡¼¤Ï¿©¤Ù¤é¤ì¤Æ¤·¤Þ¤¤¤Þ¤·¤¿!"
 
-#: LYMessages.c:719
+#: LYMessages.c:717
 msgid "Delete this empty domain?"
 msgstr "¤³¤Î¶õ¤Ë¤Ê¤Ã¤¿¥É¥á¥¤¥ó¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:720
+#: LYMessages.c:718
 msgid "The domain has been eaten!"
 msgstr "¥É¥á¥¤¥ó¤Ï¿©¤Ù¤é¤ì¤Æ¤·¤Þ¤¤¤Þ¤·¤¿!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:722
+#: LYMessages.c:720
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "¥É¥á¥¤¥ó¤Î¥¯¥Ã¥­¡¼¤ò[d]ºï½ü¡¢¾ï¤Ë[a]¼õÉÕ[v]µñÈÝ¡¢[p]ȽÃÇ ([c]¥­¥ã¥ó¥»¥ë)? "
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:724
+#: LYMessages.c:722
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "¥É¥á¥¤¥ó¤ò[d]ºï½ü¡¢¾ï¤Ë[a]¼õÉÕ[v]µñÈÝ¡¢[p]ȽÃÇ ([c]¥­¥ã¥ó¥»¥ë)? "
 
-#: LYMessages.c:725
+#: LYMessages.c:723
 msgid "All cookies in the domain have been eaten!"
 msgstr "¥É¥á¥¤¥ó¤Î¥¯¥Ã¥­¡¼¤Ï¤¹¤Ù¤Æ¿©¤Ù¤é¤ì¤Æ¤·¤Þ¤¤¤Þ¤·¤¿!"
 
-#: LYMessages.c:726
+#: LYMessages.c:724
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "¥É¥á¥¤¥ó %s ¤«¤é¤Ï¾ï¤Ë¼õ¤±ÉÕ¤±¤Þ¤¹¡£"
 
-#: LYMessages.c:727
+#: LYMessages.c:725
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "¥É¥á¥¤¥ó %s ¤«¤é¤ÏÁ´¤ÆµñÈݤ·¤Þ¤¹¡£"
 
-#: LYMessages.c:728
+#: LYMessages.c:726
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "¥É¥á¥¤¥ó %s ¤«¤é¤Ï¤½¤Î¤Ä¤ÉȽÃǤ·¤Þ¤¹¡£"
 
-#: LYMessages.c:729
+#: LYMessages.c:727
 msgid "Delete all cookies in this domain?"
 msgstr "¤³¤Î¥É¥á¥¤¥ó¤Î¥¯¥Ã¥­¡¼¤ò¤¹¤Ù¤Æºï½ü¤·¤Þ¤¹¤«?"
 
-#: LYMessages.c:730
+#: LYMessages.c:728
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "¥¯¥Ã¥­¡¼È¢¤Î¥¯¥Ã¥­¡¼¤Ï¤ß¤ó¤Ê¿©¤Ù¤é¤ì¤Æ¤·¤Þ¤¤¤Þ¤·¤¿!"
 
-#: LYMessages.c:732
+#: LYMessages.c:730
 msgid "Port 19 not permitted in URLs."
 msgstr "¥Ý¡¼¥È 19 ¤ò URL ¤Ç»ØÄꤹ¤ë¤³¤È¤Ïǧ¤á¤é¤ì¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:733
+#: LYMessages.c:731
 msgid "Port 25 not permitted in URLs."
 msgstr "¥Ý¡¼¥È 25 ¤ò URL ¤Ç»ØÄꤹ¤ë¤³¤È¤Ïǧ¤á¤é¤ì¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:734
+#: LYMessages.c:732
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "¥Ý¡¼¥È %lu ¤ò URL ¤Ç»ØÄꤹ¤ë¤³¤È¤Ïǧ¤á¤é¤ì¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:735
+#: LYMessages.c:733
 msgid "URL has a bad port field."
 msgstr "URL ¤ËÉÔÀµ¤Ê¥Ý¡¼¥È¥Õ¥£¡¼¥ë¥É¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: LYMessages.c:736
+#: LYMessages.c:734
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "HTML ¥¨¥ì¥á¥ó¥È¤Î¥Í¥¹¥Æ¥£¥ó¥°¤¬¸Â³¦¤òĶ¤¨¤Þ¤·¤¿¡£"
 
-#: LYMessages.c:737
+#: LYMessages.c:735
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "ÉÔÀµ¤ÊÉôʬŪ»²¾È¤Ç¤¹! ÀèƬ¥É¥Ã¥È¤òºï¤ê¤Þ¤¹¡£"
 
-#: LYMessages.c:738
+#: LYMessages.c:736
 msgid "Trace Log open failed.  Trace off!"
 msgstr "ÄÉÀ×¥í¥°¤ò³«¤¯¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£ÄÉÀ×½ªÎ»!"
 
-#: LYMessages.c:739
+#: LYMessages.c:737
 msgid "Lynx Trace Log"
 msgstr "Lynx ÄÉÀ×¥í¥°"
 
-#: LYMessages.c:740
+#: LYMessages.c:738
 msgid "No trace log has been started for this session."
 msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Ç³«»Ï¤µ¤ì¤¿ÄÉÀ×¥í¥°¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:742
+#: LYMessages.c:740
 msgid "The maximum temporary file count has been reached!"
 msgstr "°ì»þŪ¥Õ¥¡¥¤¥ë¿ô¤¬¸Â³¦¤ò±Û¤¨¤Þ¤·¤¿!"
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:744
+#: LYMessages.c:742
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É¤ÎÃͤ¬¥Ð¥Ã¥Õ¥¡¤ÎŤµ¤ò±Û¤¨¤Þ¤·¤¿¡£½ªÃ¼¤òÀÚ¤ê¤Þ¤¹¡£"
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:746
+#: LYMessages.c:744
 msgid "Modified tail combined with head of form field value."
 msgstr "½ªÃ¼¤ò¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É¤ÎÃͤÎÀèƬ¤È·ë¹ç¤¹¤ë¤è¤¦Êѹ¹¤·¤Þ¤·¤¿¡£"
 
 #. HTFile.c
-#: LYMessages.c:749
+#: LYMessages.c:747
 msgid "Directory"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê"
 
-#: LYMessages.c:750
+#: LYMessages.c:748
 msgid "Directory browsing is not allowed."
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê±ÜÍ÷¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:751
+#: LYMessages.c:749
 msgid "Selective access is not enabled for this directory"
 msgstr "ÁªÂòŪ¥¢¥¯¥»¥¹¤Ï¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï»È¤¨¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:752
+#: LYMessages.c:750
 msgid "Multiformat: directory scan failed."
 msgstr "¥Þ¥ë¥Á¥Õ¥©¡¼¥Þ¥Ã¥È: ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥¹¥­¥ã¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: LYMessages.c:753
+#: LYMessages.c:751
 msgid "This directory is not readable."
 msgstr "¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ÏÆɤá¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:754
+#: LYMessages.c:752
 msgid "Can't access requested file."
 msgstr "Í׵ᤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:755
+#: LYMessages.c:753
 msgid "Could not find suitable representation for transmission."
 msgstr "ÅÁ㤹¤ëŬÅö¤Êɽ¸½¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: LYMessages.c:756
+#: LYMessages.c:754
 msgid "Could not open file for decompression!"
 msgstr "Ÿ³«¤¹¤ë¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó!"
 
-#: LYMessages.c:757
+#: LYMessages.c:755
 msgid "Files:"
 msgstr "¥Õ¥¡¥¤¥ë:"
 
-#: LYMessages.c:758
+#: LYMessages.c:756
 msgid "Subdirectories:"
 msgstr "¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê:"
 
-#: LYMessages.c:759
+#: LYMessages.c:757
 msgid " directory"
 msgstr " ¥Ç¥£¥ì¥¯¥È¥ê"
 
-#: LYMessages.c:760
+#: LYMessages.c:758
 msgid "Up to "
 msgstr "°Ê²¼¤Þ¤Ç: "
 
-#: LYMessages.c:761
+#: LYMessages.c:759
 msgid "Current directory is "
 msgstr "¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï "
 
 #. HTGopher.c
-#: LYMessages.c:764
+#: LYMessages.c:762
 msgid "No response from server!"
 msgstr "¥µ¡¼¥Ð¤«¤é±þÅú¤¬¤¢¤ê¤Þ¤»¤ó!"
 
-#: LYMessages.c:765
+#: LYMessages.c:763
 msgid "CSO index"
 msgstr "CSO ¥¤¥ó¥Ç¥Ã¥¯¥¹"
 
-#: LYMessages.c:766
+#: LYMessages.c:764
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2424,16 +2426,16 @@ msgstr ""
 "\n"
 "¤³¤ì¤ÏCSO¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¸¡º÷²Äǽ¤Ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ç¤¹¡£\n"
 
-#: LYMessages.c:767
+#: LYMessages.c:765
 msgid "CSO Search Results"
 msgstr "CSO ¸¡º÷·ë²Ì"
 
-#: LYMessages.c:768
+#: LYMessages.c:766
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "%s ¤Ç¸¡º÷¤Ë¼ºÇÔ\n"
 
-#: LYMessages.c:769
+#: LYMessages.c:767
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2441,7 +2443,7 @@ msgstr ""
 "\n"
 " 's' ¥­¡¼¤ò²¡¤·¤Æ¸¡º÷¤¹¤ë¥­¡¼¥ï¡¼¥É¤òÆþÎϤ·¤Æ²¼¤µ¤¤¡£\n"
 
-#: LYMessages.c:770
+#: LYMessages.c:768
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2449,35 +2451,35 @@ msgstr ""
 "\n"
 "¤³¤ì¤Ï¸¡º÷²Äǽ¤Ê Gopher ¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ç¤¹¡£\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:769
 msgid "Gopher index"
 msgstr "Gopher ¥¤¥ó¥Ç¥Ã¥¯¥¹"
 
-#: LYMessages.c:772
+#: LYMessages.c:770
 msgid "Gopher Menu"
 msgstr "Gopher ¥á¥Ë¥å¡¼"
 
-#: LYMessages.c:773
+#: LYMessages.c:771
 msgid " Search Results"
 msgstr " ¸¡º÷·ë²Ì"
 
-#: LYMessages.c:774
+#: LYMessages.c:772
 msgid "Sending CSO/PH request."
 msgstr "CSO/PH ¥ê¥¯¥¨¥¹¥È¤òÁ÷¿®Ãæ¡£"
 
-#: LYMessages.c:775
+#: LYMessages.c:773
 msgid "Sending Gopher request."
 msgstr "Gopher ¥ê¥¯¥¨¥¹¥È¤òÁ÷¿®Ãæ¡£"
 
-#: LYMessages.c:776
+#: LYMessages.c:774
 msgid "CSO/PH request sent; waiting for response."
 msgstr "CSO/PH ¥ê¥¯¥¨¥¹¥È¤òÁ÷¿®¤·¤Þ¤·¤¿¡£±þÅú¤òÂԤäƤ¤¤Þ¤¹¡£"
 
-#: LYMessages.c:777
+#: LYMessages.c:775
 msgid "Gopher request sent; waiting for response."
 msgstr "Gopher ¥ê¥¯¥¨¥¹¥È¤òÁ÷¿®¤·¤Þ¤·¤¿¡£±þÅú¤òÂԤäƤ¤¤Þ¤¹¡£"
 
-#: LYMessages.c:778
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2485,7 +2487,7 @@ msgstr ""
 "\n"
 "¸¡º÷¤¹¤ë¥­¡¼¥ï¡¼¥É¤òÆþÎϤ·¤Æ²¼¤µ¤¤¡£\n"
 
-#: LYMessages.c:779
+#: LYMessages.c:777
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2493,193 +2495,198 @@ msgstr ""
 "\n"
 "ÆþÎϤ·¤¿¥­¡¼¥ï¡¼¥É¤Ë¤è¤ê¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤Î¸Ä¿Í»á̾¤ò"
 
-#: LYMessages.c:780
+#: LYMessages.c:778
 msgid " person's name in the database.\n"
 msgstr "¸¡º÷¤¹¤ë¤³¤È¤¬²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 
 #. HTNews.c
-#: LYMessages.c:783
+#: LYMessages.c:781
 msgid "Connection closed ???"
 msgstr "Àܳ¤¬ÊĤ¸¤é¤ì¤¿¤Î¤«¤â ???"
 
-#: LYMessages.c:784
+#: LYMessages.c:782
 msgid "Cannot open temporary file for news POST."
 msgstr "¥Ë¥å¡¼¥¹ POST ¤Î¤¿¤á¤Î°ì»þ¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:785
+#: LYMessages.c:783
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "¤³¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ç¤Ï¥Ë¥å¡¼¥¹¤ò SSL ·Ðͳ¤Ç¥Ý¥¹¥È¤¹¤ëµ¡Ç½¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
 #. HTStyle.c
-#: LYMessages.c:788
+#: LYMessages.c:786
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "¥¹¥¿¥¤¥ë %d `%s'¡¢SGML:%s¡£ ¥Õ¥©¥ó¥È %s %.1f ¥Ý¥¤¥ó¥È¡£\n"
 
-#: LYMessages.c:789
+#: LYMessages.c:787
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\t¥¤¥ó¥Ç¥ó¥È: ºÇ½é=%.0f ¤½¤Î¾=%.0f¡¢¹â¤µ=%.1f Desc=%.1f\n"
 
-#: LYMessages.c:790
+#: LYMessages.c:788
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "\tÄ´À°=%d¡¢%d ¥¿¥Ö¡£(Á°¤Ë %.0f¡¢¸å¤Ë %.0f)\n"
 
-#: LYMessages.c:791
+#: LYMessages.c:789
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "\t\t¥¿¥Ö ¼ïÎà=%d (%.0f ¤Ë¤ª¤±¤ë)\n"
 
 #. HTTP.c
-#: LYMessages.c:794
+#: LYMessages.c:792
 msgid "Can't proceed without a username and password."
 msgstr "¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É̵¤·¤Ç¤Ï³¹Ô¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: LYMessages.c:795
+#: LYMessages.c:793
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "ǧ¾ÚÉÕ¤­¤ÇºÆ»î¹Ô¤Ç¤­¤Þ¤»¤ó! ¥µ¡¼¥Ð¤Î¥¦¥§¥Ö¥Þ¥¹¥¿¤ËÏ¢Íí¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: LYMessages.c:796
+#: LYMessages.c:794
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "¥×¥í¥­¥·Ç§¾ÚÉÕ¤­¤ÇºÆ»î¹Ô¤Ç¤­¤Þ¤»¤ó! ¥µ¡¼¥Ð¤Î¥¦¥§¥Ö¥Þ¥¹¥¿¤ËÏ¢Íí¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: LYMessages.c:797
+#: LYMessages.c:795
 msgid "Retrying with proxy authorization information."
 msgstr "¥×¥í¥­¥·Ç§¾Ú¾ðÊóÉÕ¤­¤ÇºÆ»î¹Ô¤·¤Æ¤¤¤Þ¤¹¡£"
 
 #. HTWAIS.c
-#: LYMessages.c:800
+#: LYMessages.c:798
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: ¥ê¥¿¡¼¥ó¥á¥Ã¥»¡¼¥¸¤¬Â礭¤¹¤®¤Þ¤¹¡£"
 
-#: LYMessages.c:801
+#: LYMessages.c:799
 msgid "Enter WAIS query: "
 msgstr "WAIS ¸¡º÷ʸ»úÎó¤òÆþÎÏ: "
 
 #. Miscellaneous status
-#: LYMessages.c:804
+#: LYMessages.c:802
 msgid "Retrying as HTTP0 request."
 msgstr "HTTP0 ¥ê¥¯¥¨¥¹¥È¤È¤·¤ÆºÆÁ÷¿®¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: LYMessages.c:805
+#: LYMessages.c:803
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "%d ¥Ð¥¤¥ÈžÁ÷ºÑ"
 
-#: LYMessages.c:806
+#: LYMessages.c:804
 msgid "Data transfer complete"
 msgstr "¥Ç¡¼¥¿Å¾Á÷´°Î»"
 
-#: LYMessages.c:807
+#: LYMessages.c:805
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "%d ¹ÔÌÜ(%s Ãæ)¤Î½èÍý¤Ç¥¨¥é¡¼\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:810
+#: LYMessages.c:808
 msgid "Address List Page"
 msgstr "¥¢¥É¥ì¥¹¥ê¥¹¥È¥Ú¡¼¥¸"
 
-#: LYMessages.c:811
+#: LYMessages.c:809
 msgid "Bookmark file"
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë"
 
-#: LYMessages.c:812
+#: LYMessages.c:810
 msgid "Configuration Definitions"
 msgstr "¥³¥ó¥Ñ¥¤¥ë»þ¤ËÄêµÁ¤µ¤ì¤¿ÀßÄê"
 
-#: LYMessages.c:813
+#: LYMessages.c:811
 msgid "Cookie Jar"
 msgstr "¥¯¥Ã¥­¡¼È¢"
 
-#: LYMessages.c:814
+#: LYMessages.c:812
 msgid "Current Key Map"
 msgstr "¸½ºß¤Î¥­¡¼¥Þ¥Ã¥×"
 
-#: LYMessages.c:815
+#: LYMessages.c:813
 msgid "File Management Options"
 msgstr "¥Õ¥¡¥¤¥ë´ÉÍý¥ª¥×¥·¥ç¥ó"
 
-#: LYMessages.c:816
+#: LYMessages.c:814
 msgid "Download Options"
 msgstr "¥À¥¦¥ó¥í¡¼¥ÉÀè¤òÁªÂò"
 
-#: LYMessages.c:817
+#: LYMessages.c:815
 msgid "History Page"
 msgstr "ÍúÎò¥Ú¡¼¥¸"
 
-#: LYMessages.c:818
+#: LYMessages.c:816
 msgid "List Page"
 msgstr "¥ê¥¹¥È¥Ú¡¼¥¸"
 
-#: LYMessages.c:819
+#: LYMessages.c:817
 msgid "Lynx.cfg Information"
 msgstr "Lynx.cfg ¤Î¾ðÊó"
 
-#: LYMessages.c:820
+#: LYMessages.c:818
 msgid "Converted Mosaic Hotlist"
 msgstr "ÊÑ´¹¤µ¤ì¤¿ Mosaic ¤Î Hotlist"
 
-#: LYMessages.c:821
+#: LYMessages.c:819
 msgid "Options Menu"
 msgstr "ÀßÄê¥á¥Ë¥å¡¼"
 
-#: LYMessages.c:822
+#: LYMessages.c:820
 msgid "File Permission Options"
 msgstr "¥Õ¥¡¥¤¥ë¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤ÎÀßÄê"
 
-#: LYMessages.c:823
+#: LYMessages.c:821
 msgid "Printing Options"
 msgstr "°õºþ¤ÎÀßÄê"
 
-#: LYMessages.c:824
+#: LYMessages.c:822
 msgid "Information about the current document"
 msgstr "¸½ºß¤Îʸ½ñ¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó"
 
-#: LYMessages.c:825
+#: LYMessages.c:823
 msgid "Your recent statusline messages"
 msgstr "ºÇ¶á¤Î¥¹¥Æ¡¼¥¿¥¹¥é¥¤¥ó¥á¥Ã¥»¡¼¥¸"
 
-#: LYMessages.c:826
+#: LYMessages.c:824
 msgid "Upload Options"
 msgstr "¥¢¥Ã¥×¥í¡¼¥É¤ÎÀßÄê"
 
-#: LYMessages.c:827
+#: LYMessages.c:825
 msgid "Visited Links Page"
 msgstr "ˬ¤ì¤¿¥ê¥ó¥¯°ìÍ÷"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:830
+#: LYMessages.c:828
 msgid "See also"
 msgstr "¤³¤Á¤é¤â»²¾È:"
 
-#: LYMessages.c:831
+#: LYMessages.c:829
 msgid "your"
 msgstr "¤¢¤Ê¤¿¤Î"
 
-#: LYMessages.c:832
+#: LYMessages.c:830
 msgid "for runtime options"
 msgstr "¥é¥ó¥¿¥¤¥à¥ª¥×¥·¥ç¥ó¸þ¤±"
 
-#: LYMessages.c:833
+#: LYMessages.c:831
 msgid "compile time options"
 msgstr "¥³¥ó¥Ñ¥¤¥ë»þ¤Î¥ª¥×¥·¥ç¥ó"
 
-#: LYMessages.c:834
+#: LYMessages.c:832
+#, fuzzy
+msgid "color-style configuration"
+msgstr "ºÇ½é¤Ë»²¾È¤µ¤ì¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Ï"
+
+#: LYMessages.c:833
 msgid "latest release"
 msgstr "ºÇ¿·ÈÇ"
 
-#: LYMessages.c:835
+#: LYMessages.c:834
 msgid "pre-release version"
 msgstr "¥×¥ì¥ê¥ê¡¼¥¹ÈÇ"
 
-#: LYMessages.c:836
+#: LYMessages.c:835
 msgid "development version"
 msgstr "³«È¯ÈÇ"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:838
+#: LYMessages.c:837
 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"
@@ -2690,7 +2697,7 @@ msgstr ""
 "´Þ¤á¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:842
+#: LYMessages.c:841
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2699,104 +2706,103 @@ msgstr ""
 "¥³¥ó¥Ñ¥¤¥ë»þÄêµÁ¤È¤·¤Æ»È¤ï¤ì¤¿¤â¤Î¤Ç¤¹¡£"
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:847
+#: LYMessages.c:846
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "  [c]ºîÀ® [d]¥À¥¦¥ó¥í¡¼¥É [e]ÊÔ½¸ [f]¥Õ¥ë¥á¥Ë¥å¡¼ [m]Êѹ¹ [r]ºï½ü [t]¥¿¥° [u]¥¢¥Ã¥×¥í¡¼¥É     \n"
 
-#: LYMessages.c:848
+#: LYMessages.c:847
 msgid "Failed to obtain status of current link!"
 msgstr "¸½ºß¤Î¥ê¥ó¥¯¤Î¥¹¥Æ¡¼¥¿¥¹¤ÎÆþ¼ê¤Ë¼ºÇÔ¤·¤Þ¤·¤¿!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:851
+#: LYMessages.c:850
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "ÆÃÊÌ URL ¤Ï¸½ºß¤Î¥Õ¥¡¥¤¥ëµö²Ä¥á¥Ë¥å¡¼¤«¤é¤Î¤ßÍ­¸ú¤Ç¤¹!"
 
-#: LYMessages.c:855
+#: LYMessages.c:854
 msgid "External support is currently disabled."
 msgstr "³°Éô¥µ¥Ý¡¼¥È¤Ï¸½ºß̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:859
-#, fuzzy
+#: LYMessages.c:858
 msgid "Changing working-directory is currently disabled."
-msgstr "³°Éô¥³¥Þ¥ó¥Éµ¯Æ°¤Ï¸½ºß¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr "ºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤ÎÊѹ¹¤Ï¸½ºß̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: LYMessages.c:860
-#, fuzzy
+#: LYMessages.c:859
 msgid "Linewrap OFF!"
-msgstr "ÄÉÀ×½ªÎ»!"
+msgstr "¹Ô¥é¥Ã¥× ¥ª¥Õ!"
 
-#: LYMessages.c:861
+#: LYMessages.c:860
 msgid "Linewrap ON!"
-msgstr ""
+msgstr "¹Ô¥é¥Ã¥× ¥ª¥ó!"
 
-#: LYMessages.c:862
-#, fuzzy
+#: LYMessages.c:861
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
-msgstr "À¸ 8 ¥Ó¥Ã¥È / CJK ¥â¡¼¥É ¥È¥°¥ë¥ª¥Õ! ºÆÆɤ߹þ¤ßÃæ..."
+msgstr "Æþ¤ì»Ò¥Æ¡¼¥Ö¥ë¤Î²òÀÏ ¥È¥°¥ë¥ª¥Õ! ºÆÆɤ߹þ¤ßÃæ..."
 
-#: LYMessages.c:863
-#, fuzzy
+#: LYMessages.c:862
 msgid "Parsing nested-tables toggled ON!  Reloading..."
-msgstr "À¸ 8 ¥Ó¥Ã¥È / CJK ¥â¡¼¥É ¥È¥°¥ë¥ª¥ó! ºÆÆɤ߹þ¤ßÃæ..."
+msgstr "Æþ¤ì»Ò¥Æ¡¼¥Ö¥ë¤Î²òÀÏ ¥È¥°¥ë¥ª¥ó! ºÆÆɤ߹þ¤ßÃæ..."
 
-#: LYMessages.c:864
+#: LYMessages.c:863
 msgid "Shifting is disabled while line-wrap is in effect"
-msgstr ""
+msgstr "¹Ô¥é¥Ã¥×¤¬Í­¸ú¤Ê´Ö¡¢°ÜÆ°¤Ï̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: LYMessages.c:865
-#, fuzzy
+#: LYMessages.c:864
 msgid "Trace not supported"
-msgstr "üËö¤¬¥«¥é¡¼É½¼¨¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£"
+msgstr "ÄÉÀפϥµ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: WWW/Library/Implementation/HTAABrow.c:648
+#: WWW/Library/Implementation/HTAABrow.c:647
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "'%s' ¤Î¤¿¤á¤Î %s '%s%s' ¤Ë¤ª¤±¤ë¥æ¡¼¥¶Ì¾:"
 
-#: WWW/Library/Implementation/HTAABrow.c:914
+#: WWW/Library/Implementation/HTAABrow.c:913
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr "¤³¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ï¤³¤Î¥¹¥­¡¼¥à¸þ¤±¤Ë¥×¥í¥­¥·Ç§¾Ú¾ðÊó¤ò¹½À®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: WWW/Library/Implementation/HTAABrow.c:989
+#: WWW/Library/Implementation/HTAABrow.c:988
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "¤³¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ï¤³¤Î¥¹¥­¡¼¥à¸þ¤±¤Ëǧ¾Ú¾ðÊó¤ò¹½À®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: WWW/Library/Implementation/HTAABrow.c:1097
+#: WWW/Library/Implementation/HTAABrow.c:1096
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "ÉÔÀµ¤Ê¥Ø¥Ã¥À '%s%s%s%s%s' ¤Ç¤¹"
 
-#: WWW/Library/Implementation/HTAABrow.c:1201
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
 msgstr "¥×¥í¥­¥·Ç§¾Ú¤¬É¬ÍפǤ¹ -- ºÆ»î¹Ô¤·¤Æ¤¤¤Þ¤¹"
 
-#: WWW/Library/Implementation/HTAABrow.c:1260
+#: WWW/Library/Implementation/HTAABrow.c:1259
 msgid "Access without authorization denied -- retrying"
 msgstr "ǧ¾Ú̵¤·¤Î¥¢¥¯¥»¥¹¤ÏµñÈݤµ¤ì¤Þ¤·¤¿ -- ºÆ»î¹Ô¤·¤Æ¤¤¤Þ¤¹"
 
-#: WWW/Library/Implementation/HTAccess.c:683
+#: WWW/Library/Implementation/HTAccess.c:677
 msgid "Access forbidden by rule"
 msgstr "µ¬Â§¤Ë¤è¤ê¥¢¥¯¥»¥¹¤Ï¶Ø»ß¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: WWW/Library/Implementation/HTAccess.c:785
+#: WWW/Library/Implementation/HTAccess.c:779
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "POST ¥³¥ó¥Æ¥ó¥Ä¤ò´Þ¤à¥É¥­¥å¥á¥ó¥È¤Ï¥­¥ã¥Ã¥·¥å¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£ºÆÁ÷¿®¤·¤Þ¤¹¤«?"
 
-#: WWW/Library/Implementation/HTAccess.c:1026 src/GridText.c:8039
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
 msgid "Loading incomplete."
 msgstr "Æɤ߹þ¤ß¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿¡£"
 
-#: WWW/Library/Implementation/HTAccess.c:1056
+#: WWW/Library/Implementation/HTAccess.c:1077
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr "*** HTAccess: ¥½¥±¥Ã¥È¤«¥Õ¥¡¥¤¥ë¤ÎÈֹ椬¡¢µì¼°¤ÎÆɤ߹þ¤ß¥ë¡¼¥Á¥ó¤«¤éÊÖ¤µ¤ì¤Æ¤¤¤Þ¤¹!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1058
+#: WWW/Library/Implementation/HTAccess.c:1079
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
 msgstr "**** HTAccess: ¥½¥Õ¥È¥¦¥§¥¢ÆâÉô¤Î¥¨¥é¡¼¤Ç¤¹¡£lynx-dev@sig.net ¤Ë¥á¡¼¥ë¤ÇÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1059
+#: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "**** HTAccess: Ê֤äƤ­¤¿¥¹¥Æ¡¼¥¿¥¹¤Ï: %d\n"
@@ -2805,28 +2811,28 @@ msgstr "**** HTAccess: Ê֤äƤ­¤¿¥¹¥Æ¡¼¥¿¥¹¤Ï: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7834
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
 msgid "Can't Access"
 msgstr "¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: WWW/Library/Implementation/HTAccess.c:1073
+#: WWW/Library/Implementation/HTAccess.c:1094
 msgid "Unable to access document."
 msgstr "ʸ½ñ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: WWW/Library/Implementation/HTFTP.c:756
+#: WWW/Library/Implementation/HTFTP.c:766
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "¥æ¡¼¥¶ %s@%s ¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎÏ:"
 
-#: WWW/Library/Implementation/HTFTP.c:784
+#: WWW/Library/Implementation/HTFTP.c:794
 msgid "Unable to connect to FTP host."
 msgstr "FTP ¥Û¥¹¥È¤ËÀܳ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: WWW/Library/Implementation/HTFTP.c:1054
+#: WWW/Library/Implementation/HTFTP.c:1064
 msgid "close master socket"
 msgstr "¥Þ¥¹¥¿¡¼¥½¥±¥Ã¥È¤¬ÊĤ¸¤Þ¤¹"
 
-#: WWW/Library/Implementation/HTFTP.c:1116
+#: WWW/Library/Implementation/HTFTP.c:1126
 msgid "socket for master socket"
 msgstr "¥Þ¥¹¥¿¡¼¥½¥±¥Ã¥ÈÍÑ¥½¥±¥Ã¥È"
 
@@ -2835,36 +2841,36 @@ msgstr "¥Þ¥¹¥¿¡¼¥½¥±¥Ã¥ÈÍÑ¥½¥±¥Ã¥È"
 #. **  knowing if it is symbolic?	I think so since
 #. **  it might be a directory.
 #.
-#: WWW/Library/Implementation/HTFTP.c:1630 WWW/Library/Implementation/HTFTP.c:2251
+#: WWW/Library/Implementation/HTFTP.c:1640 WWW/Library/Implementation/HTFTP.c:2261
 msgid "Symbolic Link"
 msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯"
 
-#: WWW/Library/Implementation/HTFTP.c:2612
+#: WWW/Library/Implementation/HTFTP.c:2622
 msgid "Receiving FTP directory."
 msgstr "FTP ¥Ç¥£¥ì¥¯¥È¥ê¤ò¼õ¿®Ãæ"
 
-#: WWW/Library/Implementation/HTFTP.c:2755
+#: WWW/Library/Implementation/HTFTP.c:2762
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "%d ¥Ð¥¤¥ÈžÁ÷ºÑ (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3083
 msgid "connect for data"
 msgstr "¥Ç¡¼¥¿¤ËÀܳ"
 
-#: WWW/Library/Implementation/HTFTP.c:3690
+#: WWW/Library/Implementation/HTFTP.c:3731
 msgid "Receiving FTP file."
 msgstr "FTP ¥Õ¥¡¥¤¥ë¤ò¼õ¿®Ãæ"
 
-#: WWW/Library/Implementation/HTFinger.c:275
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
 msgstr "finger Àܳ¤òÍѰդǤ­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
 msgstr "¥Ç¡¼¥¿¤¬Æɤ߹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿(finger URL ¤Ë¥µ¥¤¥È̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó)"
 
-#: WWW/Library/Implementation/HTFinger.c:328
+#: WWW/Library/Implementation/HTFinger.c:331
 msgid "Invalid port number - will only use port 79!"
 msgstr "ÉÔÀµ¤Ê¥Ý¡¼¥ÈÈÖ¹æ¤Ç¤¹ - ¥Ý¡¼¥È 79 ¤Î¤ß¤ò»È¤¤¤Þ¤¹!"
 
@@ -2872,7 +2878,7 @@ msgstr "ÉÔÀµ¤Ê¥Ý¡¼¥ÈÈÖ¹æ¤Ç¤¹ - ¥Ý¡¼¥È 79 ¤Î¤ß¤ò»È¤¤¤Þ¤¹!"
 msgid "Could not access finger host."
 msgstr "finger ¥Û¥¹¥È¤ËÀܳ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: WWW/Library/Implementation/HTFinger.c:407
+#: WWW/Library/Implementation/HTFinger.c:404
 msgid "No response from finger server."
 msgstr "finger ¥µ¡¼¥Ð¤¬±þÅú¤·¤Þ¤»¤ó¡£"
 
@@ -2898,12 +2904,12 @@ msgstr "¥Ë¥å¡¼¥¹¥Û¥¹¥È '%s' ¤Î¥Ñ¥¹¥ï¡¼¥É:"
 msgid "Change password?"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤·¤Þ¤¹¤«?"
 
-#: WWW/Library/Implementation/HTNews.c:1691
+#: WWW/Library/Implementation/HTNews.c:1690
 #, c-format
 msgid "No matches for: %s"
 msgstr "³ºÅö¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1744
+#: WWW/Library/Implementation/HTNews.c:1743
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2911,7 +2917,7 @@ msgstr ""
 "\n"
 "¤³¤Î¥°¥ë¡¼¥×Æâ¤Ë¤Ïµ­»ö¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: WWW/Library/Implementation/HTNews.c:1757
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2922,16 +2928,16 @@ msgstr ""
 #.
 #. **	Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1770
+#: WWW/Library/Implementation/HTNews.c:1769
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s¡¢µ­»ö %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1792
+#: WWW/Library/Implementation/HTNews.c:1791
 msgid "Earlier articles"
 msgstr "°ÊÁ°¤Îµ­»ö"
 
-#: WWW/Library/Implementation/HTNews.c:1805
+#: WWW/Library/Implementation/HTNews.c:1804
 #, c-format
 msgid ""
 "\n"
@@ -2942,41 +2948,41 @@ msgstr ""
 "¸½ºß %d Ä̤ۤɤε­»ö¤ò %s ¤ÇÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹¡£ID ¤Ï°Ê²¼¤ÎÄ̤ê:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1865
+#: WWW/Library/Implementation/HTNews.c:1864
 msgid "All available articles in "
 msgstr "°Ê²¼¤ÇÆɤá¤ëÁ´µ­»ö: "
 
-#: WWW/Library/Implementation/HTNews.c:2081
+#: WWW/Library/Implementation/HTNews.c:2080
 msgid "Later articles"
 msgstr "¤½¤Î¸å¤Îµ­»ö"
 
-#: WWW/Library/Implementation/HTNews.c:2105
+#: WWW/Library/Implementation/HTNews.c:2104
 msgid "Post to "
 msgstr "°Ê²¼¤Ø¥Ý¥¹¥È: "
 
-#: WWW/Library/Implementation/HTNews.c:2323
+#: WWW/Library/Implementation/HTNews.c:2322
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "¤³¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ë¤Ï SNEWS URL ¤Î¥µ¥Ý¡¼¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: WWW/Library/Implementation/HTNews.c:2531
+#: WWW/Library/Implementation/HTNews.c:2530
 msgid "No target for raw text!"
 msgstr "À¸¥Æ¥­¥¹¥È¸þ¤±¤Î¥¿¡¼¥²¥Ã¥È¤¬¤¢¤ê¤Þ¤»¤ó!"
 
-#: WWW/Library/Implementation/HTNews.c:2561
+#: WWW/Library/Implementation/HTNews.c:2560
 msgid "Connecting to NewsHost ..."
 msgstr "¥Ë¥å¡¼¥¹¥Û¥¹¥È¤ËÀܳÃæ ..."
 
-#: WWW/Library/Implementation/HTNews.c:2612
+#: WWW/Library/Implementation/HTNews.c:2611
 #, c-format
 msgid "Could not access %s."
 msgstr "%s ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: WWW/Library/Implementation/HTNews.c:2712
+#: WWW/Library/Implementation/HTNews.c:2711
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "¥Ë¥å¡¼¥¹¾ðÊó¤¬Æɤá¤Þ¤»¤ó¡£¥Ë¥å¡¼¥¹¥Û¥¹¥È %.20s ¤Î±þÅú: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2716
+#: WWW/Library/Implementation/HTNews.c:2715
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "¥Ë¥å¡¼¥¹¾ðÊó¤¬Æɤá¤Þ¤»¤ó¡£¥Û¥¹¥È %s ¤«¤é¤Î±þÅú¤Ï¶õ¤Ç¤¹"
@@ -2984,34 +2990,34 @@ msgstr "¥Ë¥å¡¼¥¹¾ðÊó¤¬Æɤá¤Þ¤»¤ó¡£¥Û¥¹¥È %s ¤«¤é¤Î±þÅú¤Ï¶õ¤Ç¤¹"
 #.
 #. **	List available newsgroups. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2920
+#: WWW/Library/Implementation/HTNews.c:2919
 msgid "Reading list of available newsgroups."
 msgstr "ÍøÍѲÄǽ¤Ê¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤Î¥ê¥¹¥È¤òÆɤ߹þ¤ßÃæ¡£"
 
-#: WWW/Library/Implementation/HTNews.c:2942
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of articles in newsgroup."
 msgstr "¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×Æâ¤Îµ­»ö¤Î¥ê¥¹¥È¤òÆɤ߹þ¤ßÃæ¡£"
 
 #.
 #. **	Get an article from a news group. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2948
+#: WWW/Library/Implementation/HTNews.c:2947
 msgid "Reading news article."
 msgstr "¥Ë¥å¡¼¥¹µ­»ö¤òÆɤ߹þ¤ßÃæ¡£"
 
-#: WWW/Library/Implementation/HTNews.c:2978
+#: WWW/Library/Implementation/HTNews.c:2977
 msgid "Sorry, could not load requested news."
 msgstr "¤¦¤¦¤à¡¢Í׵ᤵ¤ì¤¿¥Ë¥å¡¼¥¹¤òÆɤ߹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: WWW/Library/Implementation/HTTCP.c:1233
+#: WWW/Library/Implementation/HTTCP.c:1239
 msgid "Address has invalid port"
 msgstr "¥¢¥É¥ì¥¹¤ËÉÔÀµ¤Ê¥Ý¡¼¥È¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: WWW/Library/Implementation/HTTCP.c:1336
+#: WWW/Library/Implementation/HTTCP.c:1327
 msgid "Address length looks invalid"
 msgstr "¥¢¥É¥ì¥¹Ä¹¤¬ÉÔÀµ¤Î¤è¤¦¤Ç¤¹"
 
-#: WWW/Library/Implementation/HTTCP.c:1574 WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "¥ê¥â¡¼¥È¥Û¥¹¥È %s ¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£"
@@ -3020,62 +3026,85 @@ msgstr "¥ê¥â¡¼¥È¥Û¥¹¥È %s ¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£"
 #. *  immediately; but not HTAlert, because typically
 #. *  there will be other alerts from the callers. - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1589 WWW/Library/Implementation/HTTelnet.c:103
+#: WWW/Library/Implementation/HTTCP.c:1575 WWW/Library/Implementation/HTTelnet.c:103
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "%s ¤ÏÉÔÀµ¤Ê¥Û¥¹¥È̾¤Ç¤¹"
 
-#: WWW/Library/Implementation/HTTCP.c:1603
+#: WWW/Library/Implementation/HTTCP.c:1589
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "%s ¤Ç %s ¤ËÀܳÃæ"
 
-#: WWW/Library/Implementation/HTTCP.c:1619
+#: WWW/Library/Implementation/HTTCP.c:1605
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "¥½¥±¥Ã¥È¤¬¼ºÇÔ¤·¤Þ¤·¤¿: ¥Õ¥¡¥ß¥ê %d ¥¢¥É¥ì¥¹ %s ¥Ý¡¼¥È %s¡£"
 
-#: WWW/Library/Implementation/HTTCP.c:1628
+#: WWW/Library/Implementation/HTTCP.c:1614
 msgid "socket failed."
 msgstr "¥½¥±¥Ã¥È¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: WWW/Library/Implementation/HTTCP.c:1648
+#: WWW/Library/Implementation/HTTCP.c:1634
 msgid "Could not make connection non-blocking."
 msgstr "Àܳ¤òÈó¥Ö¥í¥Ã¥­¥ó¥°¤Ë¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: WWW/Library/Implementation/HTTCP.c:1717
+#: WWW/Library/Implementation/HTTCP.c:1703
 msgid "Connection failed (too many retries)."
 msgstr "Àܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ (ºÆ»î¹Ô¤¬Â¿¤¹¤®¤Þ¤¹)"
 
-#: WWW/Library/Implementation/HTTCP.c:1910
+#: WWW/Library/Implementation/HTTCP.c:1896
 msgid "Could not restore socket to blocking."
 msgstr "¥Ö¥í¥Ã¥­¥ó¥°¤Î¤¿¤á¤Î¥½¥±¥Ã¥È¤òÉüµì¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: WWW/Library/Implementation/HTTCP.c:1976
+#: WWW/Library/Implementation/HTTCP.c:1962
 msgid "Socket read failed for 180,000 tries."
 msgstr "180,000 ²ó»î¹Ô¤·¤Þ¤·¤¿¤¬¥½¥±¥Ã¥È¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
-#: WWW/Library/Implementation/HTTP.c:466
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr "¥¢¥É¥ì¥¹¤Ï¥æ¡¼¥¶Ì¾ %s ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹"
+
+#: WWW/Library/Implementation/HTTP.c:503
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "¤³¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ï HTTPS URL ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: WWW/Library/Implementation/HTTP.c:491
+#: WWW/Library/Implementation/HTTP.c:528
 msgid "Unable to connect to remote host."
 msgstr "¥ê¥â¡¼¥È¥Û¥¹¥È¤ËÀܳ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: WWW/Library/Implementation/HTTP.c:1005
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr "TLS¤ò»È¤ï¤º¤ËÀܳ¤òºÆ»î¹Ô¤·¤Æ¤¤¤Þ¤¹¡£"
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr "SSL¥¨¥é¡¼: ¥Û¥¹¥È(%s) ¤¬ cert(%s) ¤È°ìÃפ·¤Þ¤»¤ó ³¤±¤Þ¤¹¤«?"
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr "¥»¥­¥å¥¢¤Ê %d ¥Ó¥Ã¥È %s (%s) HTTP Àܳ"
+
+#: WWW/Library/Implementation/HTTP.c:1091
 msgid "Sending HTTP request."
 msgstr "HTTP ¥ê¥¯¥¨¥¹¥È¤òÁ÷¿®Ãæ"
 
-#: WWW/Library/Implementation/HTTP.c:1039
+#: WWW/Library/Implementation/HTTP.c:1125
 msgid "Unexpected network write error; connection aborted."
 msgstr "ÆÍÁ³¤Î¥Í¥Ã¥È¥ï¡¼¥¯½ñ¤­¹þ¤ß¥¨¥é¡¼: Àܳ¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿¡£"
 
-#: WWW/Library/Implementation/HTTP.c:1045
+#: WWW/Library/Implementation/HTTP.c:1131
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP ¥ê¥¯¥¨¥¹¥È¤òÁ÷¿®¤·¤Þ¤·¤¿: ±þÅú¤òÂԤäƤ¤¤Þ¤¹"
 
-#: WWW/Library/Implementation/HTTP.c:1109
+#: WWW/Library/Implementation/HTTP.c:1195
 msgid "Unexpected network read error; connection aborted."
 msgstr "ÆÍÁ³¤Î¥Í¥Ã¥È¥ï¡¼¥¯Æɤ߹þ¤ß¥¨¥é¡¼: Àܳ¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿¡£"
 
@@ -3089,7 +3118,7 @@ msgstr "ÆÍÁ³¤Î¥Í¥Ã¥È¥ï¡¼¥¯Æɤ߹þ¤ß¥¨¥é¡¼: Àܳ¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿¡£"
 #. **	so we'll deal with them by showing the full
 #. **	header to the user as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1305
+#: WWW/Library/Implementation/HTTP.c:1391
 msgid "Got unexpected Informational Status."
 msgstr "ͽ´ü¤·¤Ê¤¤ Informational Status ¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡£"
 
@@ -3100,7 +3129,7 @@ msgstr "ͽ´ü¤·¤Ê¤¤ Informational Status ¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡£"
 #. *  user to do that, and restore the current
 #. *  document. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1340
+#: WWW/Library/Implementation/HTTP.c:1426
 msgid "Request fulfilled.  Reset Content."
 msgstr "¥ê¥¯¥¨¥¹¥È¤¬¼Â¹Ô¤µ¤ì¤Þ¤·¤¿¡£¥³¥ó¥Æ¥ó¥È¤ò¥ê¥»¥Ã¥È¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
@@ -3111,27 +3140,27 @@ msgstr "¥ê¥¯¥¨¥¹¥È¤¬¼Â¹Ô¤µ¤ì¤Þ¤·¤¿¡£¥³¥ó¥Æ¥ó¥È¤ò¥ê¥»¥Ã¥È¤·¤Æ¤¯¤À¤µ¤¤¡£"
 #. *  with it by showing the full header to the user
 #. *  as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1459
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "Got unexpected 304 Not Modified status."
 msgstr "ͽ´ü¤»¤Ì 304 Not Modified ¥¹¥Æ¡¼¥¿¥¹¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡£"
 
-#: WWW/Library/Implementation/HTTP.c:1526
+#: WWW/Library/Implementation/HTTP.c:1612
 msgid "Redirection of POST content requires user approval."
 msgstr "POST ¥³¥ó¥Æ¥ó¥È¤Î¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó¤Ë¤Ï¥æ¡¼¥¶¤Î¾µÇ§¤¬É¬ÍפǤ¹¡£"
 
-#: WWW/Library/Implementation/HTTP.c:1541
+#: WWW/Library/Implementation/HTTP.c:1627
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "POST ¥³¥ó¥Æ¥ó¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£±Ê³Ū¤Ê¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó¤ò°ì»þŪ¤Ê¤â¤Î¤È¤·¤Æ°·¤¤¤Þ¤¹¡£\n"
 
-#: WWW/Library/Implementation/HTTP.c:1586
+#: WWW/Library/Implementation/HTTP.c:1672
 msgid "Retrying with access authorization information."
 msgstr "¥¢¥¯¥»¥¹Ç§¾Ú¾ðÊóÉÕ¤­¤ÇºÆ»î¹Ô¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1684
 msgid "Show the 401 message body?"
 msgstr "401 ¥á¥Ã¥»¡¼¥¸ËÜÂΤò¸«¤Þ¤¹¤«?"
 
-#: WWW/Library/Implementation/HTTP.c:1643
+#: WWW/Library/Implementation/HTTP.c:1729
 msgid "Show the 407 message body?"
 msgstr "407 ¥á¥Ã¥»¡¼¥¸ËÜÂΤò¸«¤Þ¤¹¤«?"
 
@@ -3140,7 +3169,7 @@ msgstr "407 ¥á¥Ã¥»¡¼¥¸ËÜÂΤò¸«¤Þ¤¹¤«?"
 #. **	Take a chance and hope there is
 #. **	something to display. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1748
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Unknown status reply from server!"
 msgstr "¥µ¡¼¥Ð¤«¤é¤ÎÉÔÌÀ¤Ê¥¹¥Æ¡¼¥¿¥¹¥ê¥×¥é¥¤¤Ç¤¹!"
 
@@ -3222,27 +3251,27 @@ msgstr ""
 "\n"
 "¥³¡¼¥É¥ì¥³¡¼¥É¡¢É½¼¨ÉÔǽ\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:691
+#: WWW/Library/Implementation/HTWAIS.c:689
 msgid "Syntax error in WAIS URL"
 msgstr "WAIS URL ¤Î¹½Ê¸¥¨¥é¡¼¤Ç¤¹¡£"
 
-#: WWW/Library/Implementation/HTWAIS.c:761
+#: WWW/Library/Implementation/HTWAIS.c:759
 msgid " (WAIS Index)"
 msgstr "(WAIS ¥¤¥ó¥Ç¥Ã¥¯¥¹)"
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:766
 msgid "WAIS Index: "
 msgstr "WAIS ¥¤¥ó¥Ç¥Ã¥¯¥¹: "
 
-#: WWW/Library/Implementation/HTWAIS.c:774
+#: WWW/Library/Implementation/HTWAIS.c:772
 msgid "This is a link for searching the "
 msgstr "¤³¤ì¤Ï°Ê²¼¤ò¸¡º÷¤¹¤ë¤¿¤á¤Î¥ê¥ó¥¯¤Ç¤¹: "
 
-#: WWW/Library/Implementation/HTWAIS.c:778
+#: WWW/Library/Implementation/HTWAIS.c:776
 msgid " WAIS Index.\n"
 msgstr " WAIS ¥¤¥ó¥Ç¥Ã¥¯¥¹¡£\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:805
+#: WWW/Library/Implementation/HTWAIS.c:803
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
@@ -3250,48 +3279,48 @@ msgstr ""
 "\n"
 "¸¡º÷¥³¥Þ¥ó¥É 's' ¤òÆþÎϤ·¡¢¸¡º÷¤¹¤ë¸ÀÍÕ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:827
+#: WWW/Library/Implementation/HTWAIS.c:825
 msgid " (in "
 msgstr " (´Þ¤Þ¤ì¤Æ¤¤¤ë¤Î¤Ï "
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:834
 msgid "WAIS Search of \""
 msgstr "WAIS ¥µ¡¼¥Á ÂоÝ: \""
 
-#: WWW/Library/Implementation/HTWAIS.c:840
+#: WWW/Library/Implementation/HTWAIS.c:838
 msgid "\" in: "
 msgstr "\" ´Þ¤Þ¤ì¤ë¤Î¤Ï: "
 
-#: WWW/Library/Implementation/HTWAIS.c:855
+#: WWW/Library/Implementation/HTWAIS.c:853
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: ¥ê¥¯¥¨¥¹¥È¤¬Â礭¤¹¤®¤Þ¤¹¡£"
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:862
 msgid "Searching WAIS database..."
 msgstr "WAIS ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¸¡º÷¤·¤Æ¤¤¤Þ¤¹..."
 
-#: WWW/Library/Implementation/HTWAIS.c:874
+#: WWW/Library/Implementation/HTWAIS.c:872
 msgid "Search interrupted."
 msgstr "¸¡º÷¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿¡£"
 
-#: WWW/Library/Implementation/HTWAIS.c:924
+#: WWW/Library/Implementation/HTWAIS.c:922
 msgid "Can't convert format of WAIS document"
 msgstr "WAIS ¥É¥­¥å¥á¥ó¥È¤Î·Á¼°¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: WWW/Library/Implementation/HTWAIS.c:968
+#: WWW/Library/Implementation/HTWAIS.c:966
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: ¥ê¥¯¥¨¥¹¥È¤¬Ä¹¤¹¤®¤Þ¤¹¡£"
 
 #.
 #. **	Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:982
+#: WWW/Library/Implementation/HTWAIS.c:980
 msgid "Fetching WAIS document..."
 msgstr "WAIS ¥É¥­¥å¥á¥ó¥È¤ò¼èÆÀÃæ..."
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1021
+#: WWW/Library/Implementation/HTWAIS.c:1019
 msgid "No text was returned!\n"
 msgstr "Ê֤äƤ­¤¿¥Æ¥­¥¹¥È¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
 
@@ -3311,167 +3340,160 @@ msgstr " ÀâÌÀ"
 msgid "Access links"
 msgstr "¥ê¥ó¥¯¤Ë¥¢¥¯¥»¥¹"
 
-#: WWW/Library/Implementation/HTWSRC.c:345
+#: WWW/Library/Implementation/HTWSRC.c:346
 msgid "Direct access"
 msgstr "ľÀÜ¥¢¥¯¥»¥¹"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:348
+#: WWW/Library/Implementation/HTWSRC.c:349
 msgid " (or via proxy server, if defined)"
 msgstr "(¤¢¤ë¤¤¤Ï¥×¥í¥­¥·¥µ¡¼¥Ð·Ðͳ¤Ç¡¢¤â¤·ÄêµÁ¤µ¤ì¤Æ¤¤¤ì¤Ð)"
 
-#: WWW/Library/Implementation/HTWSRC.c:363
+#: WWW/Library/Implementation/HTWSRC.c:364
 msgid "Maintainer"
 msgstr "¥á¥ó¥Æ¥Ê"
 
-#: WWW/Library/Implementation/HTWSRC.c:371
+#: WWW/Library/Implementation/HTWSRC.c:372
 msgid "Host"
 msgstr "¥Û¥¹¥È"
 
-#: src/GridText.c:607
+#: src/GridText.c:688
 msgid "Memory exhausted, display interrupted!"
 msgstr "¥á¥â¥ê¤ò»È¤¤¤­¤ê¤Þ¤·¤¿¡£É½¼¨¤òÃæÃǤ·¤Þ¤¹!"
 
-#: src/GridText.c:612
+#: src/GridText.c:693
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "¥á¥â¥ê¤ò»È¤¤¤­¤ê¤Þ¤·¤¿¡£Å¾Á÷¤òÃæÃǤ·¤Þ¤¹!"
 
-#: src/GridText.c:3395
+#: src/GridText.c:3578
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr "*** ¥á¥â¥ê¤ò»È¤¤¤­¤ê¤Þ¤·¤¿ ***"
 
-#: src/GridText.c:5733 src/GridText.c:5740 src/LYList.c:258
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
 msgid "unknown field or link"
 msgstr "̤ÃΤΥե£¡¼¥ë¥É¤Þ¤¿¤Ï¥ê¥ó¥¯¤Ç¤¹"
 
-#: src/GridText.c:5749
+#: src/GridText.c:6023
 msgid "text entry field"
 msgstr "¥Æ¥­¥¹¥ÈÆþÎÏ¥Õ¥£¡¼¥ë¥É"
 
-#: src/GridText.c:5752
+#: src/GridText.c:6026
 msgid "password entry field"
 msgstr "¥Ñ¥¹¥ï¡¼¥ÉÆþÎÏ¥Õ¥£¡¼¥ë¥É"
 
-#: src/GridText.c:5755
+#: src/GridText.c:6029
 msgid "checkbox"
 msgstr "¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹"
 
-#: src/GridText.c:5758
+#: src/GridText.c:6032
 msgid "radio button"
 msgstr "¥é¥¸¥ª¥Ü¥¿¥ó"
 
-#: src/GridText.c:5761
+#: src/GridText.c:6035
 msgid "submit button"
 msgstr "Á÷¿®¥Ü¥¿¥ó"
 
-#: src/GridText.c:5764
+#: src/GridText.c:6038
 msgid "reset button"
 msgstr "¥ê¥»¥Ã¥È¥Ü¥¿¥ó"
 
-#: src/GridText.c:5767
+#: src/GridText.c:6041
 msgid "popup menu"
 msgstr "¥Ý¥Ã¥×¥¢¥Ã¥×¥á¥Ë¥å¡¼"
 
-#: src/GridText.c:5770
+#: src/GridText.c:6044
 msgid "hidden form field"
 msgstr "±£¤µ¤ì¤¿¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É"
 
-#: src/GridText.c:5773
+#: src/GridText.c:6047
 msgid "text entry area"
 msgstr "¥Æ¥­¥¹¥ÈÆþÎÏ¥¨¥ê¥¢"
 
-#: src/GridText.c:5776
+#: src/GridText.c:6050
 msgid "range entry field"
 msgstr "ÈÏ°ÏÆþÎÏ¥Õ¥£¡¼¥ë¥É"
 
-#: src/GridText.c:5779
+#: src/GridText.c:6053
 msgid "file entry field"
 msgstr "¥Õ¥¡¥¤¥ëÆþÎÏ¥Õ¥£¡¼¥ë¥É"
 
-#: src/GridText.c:5782
+#: src/GridText.c:6056
 msgid "text-submit field"
 msgstr "¥Æ¥­¥¹¥ÈÁ÷¿®¥Õ¥£¡¼¥ë¥É"
 
-#: src/GridText.c:5785
+#: src/GridText.c:6059
 msgid "image-submit button"
 msgstr "²èÁüÁ÷¿®¥Ü¥¿¥ó"
 
-#: src/GridText.c:5788
+#: src/GridText.c:6062
 msgid "keygen field"
 msgstr "keygen ¥Õ¥£¡¼¥ë¥É"
 
-#: src/GridText.c:5791
+#: src/GridText.c:6065
 msgid "unknown form field"
 msgstr "̤ÃΤΥե©¡¼¥à¥Õ¥£¡¼¥ë¥É"
 
-#. We can't open the file, what do we do?
-#: src/GridText.c:10348
-#, fuzzy
+#: src/GridText.c:10066
 msgid "Can't open file for uploading"
-msgstr "Æɤ߹þ¤à¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£"
+msgstr "¥¢¥Ã¥×¥í¡¼¥É¤¹¤ë¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó¡£"
 
-#. We got an error reading the file, what do we do?
-#: src/GridText.c:10359
-msgid "Short read from file, problem?"
-msgstr ""
-
-#: src/GridText.c:10721
+#: src/GridText.c:11218
 #, c-format
 msgid "Submitting %s"
 msgstr "%s ¤òÁ÷¿®Ãæ"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:11887
+#: src/GridText.c:12375
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
-msgstr ""
+msgstr "¥Ï¥ó¥°¸¡½Ð: TextAnchor ¹½Â¤ÂΤ¬²õ¤ì¤Þ¤·¤¿ - ½ªÎ»¤ò¤ª´«¤á¤·¤Þ¤¹!"
 
 #. don't show previous state
-#: src/GridText.c:12092
+#: src/GridText.c:12581
 msgid "Wrap lines to fit displayed area?"
 msgstr "ɽ¼¨Îΰè¤Ë¼ý¤Þ¤ë¤è¤¦¹Ô¤òÀÞ¤êÊÖ¤·¤Þ¤¹¤«?"
 
-#: src/GridText.c:12144
+#: src/GridText.c:12633
 msgid "Very long lines have been wrapped!"
 msgstr "Ť¹¤®¤ë¹Ô¤ÏÀÞ¤êÊÖ¤µ¤ì¤Þ¤¹!"
 
-#: src/GridText.c:12591
+#: src/GridText.c:13079
 msgid "Very long lines have been truncated!"
 msgstr "Ť¹¤®¤ë¹Ô¤ÏÀÚ¤êµÍ¤á¤é¤ì¤Þ¤¹!"
 
-#: src/HTAlert.c:155 src/LYShowInfo.c:318
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
 msgid "bytes"
 msgstr "¥Ð¥¤¥È"
 
-#: src/HTAlert.c:156
+#: src/HTAlert.c:155
 msgid "KB"
 msgstr "KB"
 
-#: src/HTAlert.c:255
+#: src/HTAlert.c:274
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "%s (%s Ãæ) Æɤ߹þ¤ßºÑ"
 
-#: src/HTAlert.c:257
+#: src/HTAlert.c:276
 #, c-format
 msgid "Read %s of data"
 msgstr "%s Æɤ߹þ¤ßºÑ"
 
-#: src/HTAlert.c:262
+#: src/HTAlert.c:281
 #, c-format
 msgid ", %s/sec"
 msgstr "¡¢%s/ÉÃ"
 
-#: src/HTAlert.c:269
+#: src/HTAlert.c:290
 #, c-format
-msgid " (stalled for %ld sec)"
-msgstr " (%ld ÉÃÄä»ßÃæ)"
+msgid " (stalled for %s)"
+msgstr " (%s ÉÃÄä»ßÃæ)"
 
-#: src/HTAlert.c:271
+#: src/HTAlert.c:294
 #, c-format
-msgid ", ETA %ld sec"
-msgstr "¡¢ ETA %ld ÉÃ"
+msgid ", ETA %s"
+msgstr "¡¢ ETA %s ÉÃ"
 
-#: src/HTAlert.c:277
+#: src/HTAlert.c:301
 msgid " (Press 'z' to abort)"
 msgstr " ([z] ¤ÇÃæ»ß)"
 
@@ -3500,43 +3522,43 @@ msgstr " ([z] ¤ÇÃæ»ß)"
 #. *  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:334
+#: src/HTAlert.c:342 src/HTAlert.c:390
 msgid "yes"
 msgstr "yes"
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:345 src/HTAlert.c:391
 msgid "no"
 msgstr "no"
 
-#: src/HTML.c:6342
+#: src/HTML.c:5985
 msgid "Description:"
 msgstr "ÀâÌÀ:"
 
-#: src/HTML.c:6347
+#: src/HTML.c:5990
 msgid "(none)"
 msgstr "(¤Ê¤·)"
 
-#: src/HTML.c:6351
+#: src/HTML.c:5994
 msgid "Filepath:"
 msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹:"
 
-#: src/HTML.c:6356
+#: src/HTML.c:5999
 msgid "(unknown)"
 msgstr "(ÉÔÌÀ)"
 
-#: src/HTML.c:7804
+#: src/HTML.c:7452
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "ʸ½ñ¤Ë¤Ï±£¤·¥ê¥ó¥¯¤·¤«¤¢¤ê¤Þ¤»¤ó¡£[l]¤«¤éé¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/HTML.c:8328
+#: src/HTML.c:7958
 msgid "Source cache error - disk full?"
 msgstr "¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¥¨¥é¡¼¤Ç¤¹ - ¥Ç¥£¥¹¥¯¤¬°ìÇÕ¤«¤â?"
 
-#: src/HTML.c:8341
+#: src/HTML.c:7971
 msgid "Source cache error - not enough memory!"
 msgstr "¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¥¨¥é¡¼¤Ç¤¹ - ¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó!"
 
-#: src/LYBookmark.c:166
+#: src/LYBookmark.c:167
 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"
@@ -3548,7 +3570,7 @@ msgstr ""
 "     ¤³¤Î¥³¥Þ¥ó¥É¤ÏÄ̾ï [r] ¥­¡¼¤Ë³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¤¢¤Ê¤¿¤«¥·¥¹¥Æ¥à\n"
 "     ´ÉÍý¼Ô¤Ë¤è¤Ã¤ÆÊѹ¹¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£"
 
-#: src/LYBookmark.c:382
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
@@ -3556,7 +3578,7 @@ msgstr ""
 "     [r] ¥­¡¼¤Ç¥ê¥ó¥¯¤òºï½ü¤Ç¤­¤Þ¤¹<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:385
+#: src/LYBookmark.c:382
 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"
@@ -3566,7 +3588,7 @@ msgstr ""
 "     Ä̾ï [r] ¥­¡¼¤Ë³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¤¢¤Ê¤¿¤«¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ë¤è¤Ã¤Æ\n"
 "     Êѹ¹¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£"
 
-#: src/LYBookmark.c:389
+#: src/LYBookmark.c:386
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3575,7 +3597,7 @@ msgstr ""
 "     ¸Å¤«¤Ã¤¿¤ê´Ö°ã¤Ã¤¿¤ê¤·¤Æ¤¤¤ë¥ê¥ó¥¯¤òºï½ü¤·¤¿¤ê¡¢\n"
 "     ½çÈÖ¤òÊѤ¨¤¿¤ê¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£"
 
-#: src/LYBookmark.c:392
+#: src/LYBookmark.c:389
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3586,7 +3608,7 @@ msgstr ""
 "      Êѹ¹¤·¤¿¤ê¡¢Â¾¤Î HTML ¥Þ¡¼¥¯¥¢¥Ã¥×¤ò²Ã¤¨¤¿¤ê¤·¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£\n"
 "      ¥Ö¥Ã¥¯¥Þ¡¼¥¯¤Î¥ê¥ó¥¯¤Ï°ì¹Ô¤Ë¼ý¤Þ¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/LYBookmark.c:683
+#: src/LYBookmark.c:681
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Î´Ö¤Ï %s ¤«¤é¥Õ¥¡¥¤¥ë¤òÉüµì¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤«¤â¤·¤ì¤Þ¤»¤ó"
@@ -3595,71 +3617,71 @@ msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Î´Ö¤Ï %s ¤«¤é¥Õ¥¡¥¤¥ë¤òÉüµì¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤«¤â¤·¤ì¤Þ¤»¤ó
 #. *  Neither the path as given nor any components examined by
 #. *  backing up were stat()able. - kw
 #.
-#: src/LYCgi.c:232
+#: src/LYCgi.c:231
 msgid "Unable to access cgi script"
 msgstr "cgi ¥¹¥¯¥ê¥×¥È¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó"
 
-#: src/LYCgi.c:651 src/LYCgi.c:654
+#: src/LYCgi.c:654 src/LYCgi.c:657
 msgid "Good Advice"
 msgstr "Îɤ¤¥¢¥É¥Ð¥¤¥¹"
 
-#: src/LYCgi.c:657
+#: src/LYCgi.c:660
 msgid "An excellent http server for VMS is available via"
 msgstr "VMS ¤Ë¤·¤Æ¤Ï¤Ê¤«¤Ê¤«Í¥¤ì¤¿ http ¥µ¡¼¥Ð¤¬°Ê²¼¤«¤éÍøÍѲÄǽ¤Ç¤¹: "
 
-#: src/LYCgi.c:664
+#: src/LYCgi.c:667
 msgid "this link"
 msgstr "¤³¤Î¥ê¥ó¥¯"
 
-#: src/LYCgi.c:668
+#: src/LYCgi.c:671
 msgid "It provides state of the art CGI script support.\n"
 msgstr "¸½ºß˾¤ß¤¦¤ëºÇ¹â¿å½à¤Î CGI ¥¹¥¯¥ê¥×¥È¥µ¥Ý¡¼¥È¤òÈ÷¤¨¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: src/LYClean.c:108
+#: src/LYClean.c:122
 msgid "Exiting via interrupt:"
 msgstr "½ªÎ»¤·¤Þ¤¹ ¸¶°ø: ³ä¤ê¹þ¤ß"
 
-#: src/LYCookie.c:2659
+#: src/LYCookie.c:2462
 msgid "(from a previous session)"
 msgstr "(°ÊÁ°¤Î¥»¥Ã¥·¥ç¥ó¤«¤é)"
 
-#: src/LYCookie.c:2719
+#: src/LYCookie.c:2522
 msgid "Maximum Gobble Date:"
 msgstr "¾ÞÌ£´ü¸Â:"
 
-#: src/LYCookie.c:2764
+#: src/LYCookie.c:2564
 msgid "Internal"
 msgstr "ÆâÉô"
 
-#: src/LYCookie.c:2765
+#: src/LYCookie.c:2565
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set ¥¨¥é¡¼¡¢¥×¥í¥°¥é¥à¤ò½ªÎ»¤·¤Þ¤¹"
 
-#: src/LYCurses.c:936
+#: src/LYCurses.c:1004
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "üËö¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ - üËö¤Î¥¿¥¤¥×¤¬ÉÔÌÀ?"
 
-#: src/LYCurses.c:1328
+#: src/LYCurses.c:1426
 msgid "Terminal ="
 msgstr "üËö ="
 
-#: src/LYCurses.c:1332
+#: src/LYCurses.c:1430
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "¤³¤Î¥×¥í¥°¥é¥à¤Ï vt100¡¢200 ¤Ê¤É¤ÎüËö¾å¤Ç¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/LYCurses.c:1384
+#: src/LYCurses.c:1480
 msgid "Your Terminal type is unknown!"
 msgstr "¤ª»È¤¤¤ÎüËö¥¿¥¤¥×¤¬Ê¬¤«¤ê¤Þ¤»¤ó!"
 
-#: src/LYCurses.c:1385
+#: src/LYCurses.c:1481
 msgid "Enter a terminal type:"
 msgstr "üËö¥¿¥¤¥×¤òÆþÎÏ:"
 
-#: src/LYCurses.c:1398
+#: src/LYCurses.c:1495
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "ÀßÄꤵ¤ì¤ëüËö¥¿¥¤¥×¤Ï"
 
-#: src/LYCurses.c:1749
+#: src/LYCurses.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -3668,7 +3690,7 @@ msgstr ""
 "\n"
 "Ã×̿Ū¤Ê¥¨¥é¡¼¤¬ %s ¥Ð¡¼¥¸¥ç¥ó %s ¤ÇȯÀ¸¤·¤Þ¤·¤¿\n"
 
-#: src/LYCurses.c:1751
+#: src/LYCurses.c:1996
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -3683,136 +3705,162 @@ msgstr ""
 "URL ¤ÎÀµ³Î¤ÊÀâÌÀ¤È¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à̾(¥Ð¡¼¥¸¥ç¥óÈÖ¹æ´Þ¤à)¡¢TCPIP \n"
 "¼ÂÁõ¡¢¤â¤·Ê᪤Ǥ­¤¿¤Ê¤é¤Ð TRACEBACK¡¢¤½¤Î¾¤ÎŬÀڤʾðÊó¤ò´Þ¤á¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/LYEdit.c:264
+#: src/LYEdit.c:249
 msgid "Editor killed by signal"
 msgstr "¥¨¥Ç¥£¥¿¤¬°Û¾ï½ªÎ»¤·¤Þ¤·¤¿ ¥·¥°¥Ê¥ë:"
 
-#: src/LYEdit.c:266
+#: src/LYEdit.c:251
 #, c-format
 msgid "Editor returned with error status, %s"
 msgstr "¥¨¥Ç¥£¥¿¤Ï¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹ %s ¤òÊÖ¤·¤Þ¤·¤¿"
 
-#: src/LYEdit.c:267
+#: src/LYEdit.c:252
 msgid "reason unknown."
 msgstr "(ÉÔÌÀ)"
 
-#: src/LYDownload.c:520
+#: src/LYDownload.c:517
 msgid "Downloaded link:"
 msgstr "¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥ê¥ó¥¯:"
 
-#: src/LYDownload.c:525
+#: src/LYDownload.c:522
 msgid "Suggested file name:"
 msgstr "¿ä¾©¤¹¤ë¥Õ¥¡¥¤¥ë̾:"
 
-#: src/LYDownload.c:530
+#: src/LYDownload.c:527
 msgid "Standard download options:"
 msgstr "ɸ½à¤Î¥À¥¦¥ó¥í¡¼¥ÉÀè:"
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:528
 msgid "Download options:"
 msgstr "¥À¥¦¥ó¥í¡¼¥ÉÀè"
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:544
 msgid "Save to disk"
 msgstr "¥Ç¥£¥¹¥¯¤ËÊݸ"
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "¥Õ¥¡¥¤¥ë¤ò±ÜÍ÷"
+
+#: src/LYDownload.c:565
 msgid "Save to disk disabled."
 msgstr "¥Ç¥£¥¹¥¯¤ËÊݸ¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/LYDownload.c:551 src/LYPrint.c:1338
+#: src/LYDownload.c:569 src/LYPrint.c:1327
 msgid "Local additions:"
 msgstr "¥í¡¼¥«¥ë¤Ç¤ÎÄɲÃ:"
 
-#: src/LYDownload.c:560 src/LYUpload.c:224
+#: src/LYDownload.c:578 src/LYUpload.c:216
 msgid "No Name Given"
 msgstr "̾Á°¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/LYHistory.c:633
+#: src/LYHistory.c:657
 msgid "You selected:"
 msgstr "ÁªÂò¤·¤¿¥Ú¡¼¥¸: "
 
-#: src/LYHistory.c:657 src/LYHistory.c:905
+#: src/LYHistory.c:681 src/LYHistory.c:921
 msgid "(no address)"
 msgstr "(¥¢¥É¥ì¥¹¤Ê¤·)"
 
-#: src/LYHistory.c:661
+#: src/LYHistory.c:685
 msgid " (internal)"
 msgstr " (ÆâÉô)"
 
-#: src/LYHistory.c:663
+#: src/LYHistory.c:687
 msgid " (was internal)"
 msgstr "(¤«¤Ä¤ÆÆâÉô)"
 
-#: src/LYHistory.c:761
+#: src/LYHistory.c:785
 msgid " (From History)"
 msgstr " (ÍúÎò¤è¤ê)"
 
-#: src/LYHistory.c:825
+#: src/LYHistory.c:841
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "¤¢¤Ê¤¿¤¬Ë¬¤ì¤¿¥ê¥ó¥¯(POST¡¢¥Ö¥Ã¥¯¥Þ¡¼¥¯¡¢¥á¥Ë¥å¡¼¡¢¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤Ï½ü¤¯):"
 
-#: src/LYHistory.c:1124
+#: src/LYHistory.c:1137
 msgid "(No messages yet)"
 msgstr "(¤Þ¤À¥á¥Ã¥»¡¼¥¸¤Ï̵¤¤)"
 
-#: src/LYLeaks.c:78
+#: src/LYLeaks.c:209
 msgid "Invalid pointer detected."
 msgstr "ÉÔÀµ¤Ê¥Ý¥¤¥ó¥¿¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿¡£"
 
-#: src/LYLeaks.c:80 src/LYLeaks.c:117
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
 msgid "Pointer:"
 msgstr "¥Ý¥¤¥ó¥¿:"
 
-#: src/LYLeaks.c:91 src/LYLeaks.c:98 src/LYLeaks.c:136
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
 msgid "FileName:"
 msgstr "¥Õ¥¡¥¤¥ë̾:"
 
-#: src/LYLeaks.c:94 src/LYLeaks.c:101 src/LYLeaks.c:139 src/LYLeaks.c:150
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
 msgid "LineCount:"
 msgstr "¹Ô¿ô:"
 
-#: src/LYLeaks.c:115
+#: src/LYLeaks.c:249
 msgid "Memory leak detected."
 msgstr "¥á¥â¥ê¥ê¡¼¥¯¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿¡£"
 
-#: src/LYLeaks.c:120
+#: src/LYLeaks.c:257
 msgid "Contains:"
 msgstr "´Þ¤à:"
 
-#: src/LYLeaks.c:133
+#: src/LYLeaks.c:270
 msgid "ByteSize:"
 msgstr "¥Ð¥¤¥È¥µ¥¤¥º:"
 
-#: src/LYLeaks.c:147
+#: src/LYLeaks.c:284
 msgid "realloced:"
 msgstr "ºÆ³ä¤êÅö¤Æ:"
 
-#: src/LYLeaks.c:170
+#: src/LYLeaks.c:307
 msgid "Total memory leakage this run:"
 msgstr "º£²ó¤Î¼Â¹Ô¤Ç¤Î¥á¥â¥ê¥ê¡¼¥¯ÁíÎÌ"
 
-#: src/LYList.c:91
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+#, fuzzy
+msgid "Bytes allocated"
+msgstr "ºÆ³ä¤êÅö¤Æ:"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
 msgid "References in "
 msgstr "±¦¤«¤é¤Î»²¾È: "
 
-#: src/LYList.c:92
+#: src/LYList.c:86
 msgid "this document:"
 msgstr "¤³¤Îʸ½ñ:"
 
-#: src/LYList.c:98
+#: src/LYList.c:92
 msgid "Visible links:"
 msgstr "¸«¤¨¤ë¥ê¥ó¥¯:"
 
-#: src/LYList.c:199 src/LYList.c:319
+#: src/LYList.c:194 src/LYList.c:315
 msgid "Hidden links:"
 msgstr "±£¤µ¤ì¤¿¥ê¥ó¥¯:"
 
-#: src/LYList.c:267
+#: src/LYList.c:262
 msgid "References"
 msgstr "»²¾È"
 
-#: src/LYList.c:269
+#: src/LYList.c:264
 msgid "Visible links"
 msgstr "¸«¤¨¤ë¥ê¥ó¥¯"
 
@@ -3825,314 +3873,314 @@ msgstr "'%s' ¤Î¥¹¥Æ¡¼¥¿¥¹¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Ï¥Õ¥¡¥¤¥ë¤Ç¤â¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤â¤¢¤ê¤Þ¤»¤ó¡£¥ê¥¯¥¨¥¹¥È¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£"
 
-#: src/LYLocal.c:383
+#: src/LYLocal.c:366
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "¥·¥¹¥Æ¥à¥¨¥é¡¼¤Ë¤è¤ê %s ¤Ç¤­¤Þ¤»¤ó!"
 
 #. error return
-#: src/LYLocal.c:415
+#: src/LYLocal.c:400
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "¥·¥¹¥Æ¥à¥¨¥é¡¼¤Ë¤è¤ê %s ¤¬¼ºÇÔ¤·¤¿¤è¤¦¤Ç¤¹!"
 
-#: src/LYLocal.c:453
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "%s ¤òºï½ü¤·¤Þ¤¹"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr "%s ¤ò touch ¤·¤Þ¤¹"
+
+#: src/LYLocal.c:508
 #, c-format
 msgid "move %s to %s"
 msgstr "%s ¤ò %s ¤Ë°ÜÆ°¤·¤Þ¤¹"
 
-#: src/LYLocal.c:475
+#: src/LYLocal.c:548
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "»ØÄê¤Î̾Á°¤ò»ý¤Ä¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¹¤Ç¤Ë¸ºß¤·¤Þ¤¹! ¥ê¥¯¥¨¥¹¥È¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿¡£"
 
-#: src/LYLocal.c:477
+#: src/LYLocal.c:550
 msgid "There is already a file with that name!  Request ignored."
 msgstr "»ØÄê¤Î̾Á°¤ò»ý¤Ä¥Õ¥¡¥¤¥ë¤¬¤¹¤Ç¤Ë¸ºß¤·¤Þ¤¹! ¥ê¥¯¥¨¥¹¥È¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿¡£"
 
-#: src/LYLocal.c:479
+#: src/LYLocal.c:552
 msgid "The specified name is already in use!  Request ignored."
 msgstr "»ØÄê¤Î̾Á°¤Ï¤¹¤Ç¤Ë»È¤ï¤ì¤Æ¤¤¤Þ¤¹! ¥ê¥¯¥¨¥¹¥È¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿¡£"
 
-#: src/LYLocal.c:490
+#: src/LYLocal.c:563
 msgid "Destination has different owner!  Request denied."
 msgstr "ÌÜŪÃϤϽêÍ­¼Ô¤¬°Û¤Ê¤ê¤Þ¤¹! ¥ê¥¯¥¨¥¹¥È¤ÏµñÈݤµ¤ì¤Þ¤·¤¿¡£"
 
-#: src/LYLocal.c:493
+#: src/LYLocal.c:566
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "ÌÜŪÃϤÏÀµ¤·¤¤¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó! Í×µá¤ÏµñÈݤµ¤ì¤Þ¤·¤¿¡£"
 
-#: src/LYLocal.c:516
+#: src/LYLocal.c:588
 msgid "Remove all tagged files and directories?"
 msgstr "ÁªÂò¤·¤¿Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/LYLocal.c:537
-#, c-format
-msgid "remove %s"
-msgstr "%s ¤òºï½ü¤·¤Þ¤¹"
-
-#: src/LYLocal.c:580
+#: src/LYLocal.c:647
 msgid "Enter new location for tagged items: "
 msgstr "ÁªÂò¤·¤¿¥¢¥¤¥Æ¥à¤Î¿·¤·¤¤¾ì½ê¤òÆþÎÏ: "
 
-#: src/LYLocal.c:649
+#: src/LYLocal.c:716
 msgid "Path too long"
 msgstr "¥Ñ¥¹¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: src/LYLocal.c:680
+#: src/LYLocal.c:747
 msgid "Source and destination are the same location - request ignored!"
 msgstr "¥½¡¼¥¹¤ÈÌÜŪÃϤ¬Æ±¤¸¾ì½ê¤Ç¤¹ - Í×µá¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿!"
 
-#: src/LYLocal.c:738
+#: src/LYLocal.c:805
 msgid "Enter new name for directory: "
 msgstr "¿·¤·¤¤¥Ç¥£¥ì¥¯¥È¥ê̾¤òÆþÎÏ"
 
-#: src/LYLocal.c:740
+#: src/LYLocal.c:807
 msgid "Enter new name for file: "
 msgstr "¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎÏ: "
 
-#: src/LYLocal.c:751
+#: src/LYLocal.c:819
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "ÉÔÀµ¤Ê¥­¥ã¥é¥¯¥¿(¥Ñ¥¹¥»¥Ñ¥ì¡¼¥¿)¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿! ¥ê¥¯¥¨¥¹¥È¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿¡£"
 
-#: src/LYLocal.c:800
+#: src/LYLocal.c:868
 msgid "Enter new location for directory: "
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¿·¤·¤¤¾ì½ê¤òÆþÎÏ: "
 
-#: src/LYLocal.c:802
+#: src/LYLocal.c:874
 msgid "Enter new location for file: "
 msgstr "¥Õ¥¡¥¤¥ë¤Î¿·¤·¤¤¾ì½ê¤òÆþÎÏ: "
 
-#: src/LYLocal.c:827
+#: src/LYLocal.c:901
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "ͽ´ü¤»¤Ì¼ºÇÔ - Äɤ¦¥Ñ¥¹¥»¥Ñ¥ì¡¼¥¿¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:921
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "¥½¡¼¥¹¤ÈÌÜŪÃϤ¬Æ±¤¸¾ì½ê¤Ç¤¹! ¥ê¥¯¥¨¥¹¥È¤Ï̵»ë¤µ¤ì¤Þ¤¹!"
 
-#: src/LYLocal.c:894
+#: src/LYLocal.c:970
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "[n]̾Á°¡¢[l]¾ì½ê¡¢¤¢¤ë¤¤¤Ï [p]¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤òÊѹ¹: "
 
-#: src/LYLocal.c:896
+#: src/LYLocal.c:972
 msgid "Modify name or location (n or l): "
 msgstr "[n]̾Á° ¤¢¤ë¤¤¤Ï [l]¾ì½ê¤òÊѹ¹: "
 
 #.
 #. *	Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:925
+#: src/LYLocal.c:1001
 msgid "This feature not yet implemented!"
 msgstr "¤³¤Îµ¡Ç½¤Ï¤Þ¤À¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
-#: src/LYLocal.c:943
+#: src/LYLocal.c:1019
 msgid "Enter name of file to create: "
 msgstr "ºîÀ®¤¹¤ë¥Õ¥¡¥¤¥ë̾¤òÆþÎÏ: "
 
-#: src/LYLocal.c:951 src/LYLocal.c:999
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "ÉÔÀµ¤Ê¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó \"//\" ¤ò¸¡½Ð¤·¤Þ¤·¤¿! Í×µá¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£"
 
-#: src/LYLocal.c:966
-#, c-format
-msgid "create %s"
-msgstr "%s ¤òºîÀ®¤·¤Þ¤¹"
-
-#: src/LYLocal.c:991
+#: src/LYLocal.c:1061
 msgid "Enter name for new directory: "
 msgstr "¿·¤·¤¤¥Ç¥£¥ì¥¯¥È¥ê̾¤òÆþÎÏ: "
 
-#: src/LYLocal.c:1042
+#: src/LYLocal.c:1106
 msgid "Create file or directory (f or d): "
 msgstr "¥Õ¥¡¥¤¥ë [f] ¤Þ¤¿¤Ï ¥Ç¥£¥ì¥¯¥È¥ê [d] ¤òºîÀ®: "
 
-#: src/LYLocal.c:1083
+#: src/LYLocal.c:1146
 #, c-format
 msgid "Remove '%s' and all of its contents?"
 msgstr "'%s' ¤È¤½¤ÎÁ´¤Æ¤ÎÆâÍƤòºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/LYLocal.c:1086
+#: src/LYLocal.c:1149
 msgid "Remove directory and all of its contents?"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤È¤½¤ÎÁ´¤Æ¤ÎÆâÍƤòºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/LYLocal.c:1090
+#: src/LYLocal.c:1153
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "¥Õ¥¡¥¤¥ë '%s' ¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/LYLocal.c:1092
+#: src/LYLocal.c:1155
 msgid "Remove file?"
 msgstr "¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/LYLocal.c:1097
+#: src/LYLocal.c:1160
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯ '%s' ¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/LYLocal.c:1099
+#: src/LYLocal.c:1162
 msgid "Remove symbolic link?"
 msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1248
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Èó UNIX ¥Õ¥¡¥¤¥ë¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤Ï¤Þ¤À°·¤¨¤Þ¤»¤ó¡£"
 
-#: src/LYLocal.c:1220
+#: src/LYLocal.c:1278
 msgid "Unable to open permit options file"
 msgstr "¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó"
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1305
 msgid "Specify permissions below:"
 msgstr "°Ê²¼¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤ò»ØÄê:"
 
-#: src/LYLocal.c:1248 src/LYShowInfo.c:196
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
 msgid "Owner:"
 msgstr "½êÍ­¼Ô:"
 
-#: src/LYLocal.c:1264
+#: src/LYLocal.c:1322
 msgid "Group"
 msgstr "¥°¥ë¡¼¥×"
 
-#: src/LYLocal.c:1280
+#: src/LYLocal.c:1338
 msgid "Others:"
 msgstr "¤½¤Î¾:"
 
-#: src/LYLocal.c:1298
+#: src/LYLocal.c:1356
 msgid "form to permit"
 msgstr "µö²Ä¤¹¤ë¥Õ¥©¡¼¥à"
 
-#: src/LYLocal.c:1396
+#: src/LYLocal.c:1452
 msgid "Invalid mode format."
 msgstr "ÉÔÀµ¤Ê¥â¡¼¥É¥Õ¥©¡¼¥Þ¥Ã¥È"
 
-#: src/LYLocal.c:1400
+#: src/LYLocal.c:1456
 msgid "Invalid syntax format."
 msgstr "ÉÔÀµ¤Ê¹½Ê¸¥Õ¥©¡¼¥Þ¥Ã¥È"
 
-#: src/LYLocal.c:1575
-msgid "NULL URL pointer"
-msgstr "¥Ì¥ë URL ¥Ý¥¤¥ó¥¿"
-
-#: src/LYLocal.c:1670
+#: src/LYLocal.c:1645
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Ãí°Õ! UUDecode ¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ï¤¢¤Ê¤¿¤¬ Lynx ¤òµ¯Æ°¤·¤¿¥Ç¥£¥ì¥¯¥È¥êÆâ¤ËÃÖ¤«¤ì¤Þ¤¹¡£"
 
-#: src/LYLocal.c:1782
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr "¥Ì¥ë URL ¥Ý¥¤¥ó¥¿"
+
+#: src/LYLocal.c:1908
 #, c-format
 msgid "Executing %s "
 msgstr "%s ¤ò¼Â¹ÔÃæ "
 
-#: src/LYLocal.c:1785
+#: src/LYLocal.c:1911
 msgid "Executing system command. This might take a while."
 msgstr "¥·¥¹¥Æ¥à¥³¥Þ¥ó¥É¤ò¼Â¹ÔÃæ¤Ç¤¹¡£¤·¤Ð¤é¤¯¤«¤«¤ê¤Þ¤¹¡£"
 
-#: src/LYLocal.c:1831
-msgid "Unable to open file management menu file."
-msgstr "¥Õ¥¡¥¤¥ë´ÉÍý¥á¥Ë¥å¡¼¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó¡£"
-
-#: src/LYLocal.c:1862
+#: src/LYLocal.c:1985
 msgid "Current directory:"
 msgstr "¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê:"
 
-#: src/LYLocal.c:1865 src/LYLocal.c:1883
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
 msgid "Current selection:"
 msgstr "¸½ºßÁªÂò:"
 
-#: src/LYLocal.c:1869
+#: src/LYLocal.c:1992
 msgid "Nothing currently selected."
 msgstr "¸½ºß²¿¤âÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged item:"
 msgstr "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à:"
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged items:"
 msgstr "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à:"
 
-#: src/LYLocal.c:1983 src/LYLocal.c:1994
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
 msgid "Illegal filename; request ignored."
 msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë̾¤Ç¤¹: Í×µá¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£"
 
-#: src/LYLocal.c:2137
-msgid "The selected item is not a directory!  Request ignored."
-msgstr "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó! Í×µá¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£"
-
 #. directory not writable
-#: src/LYLocal.c:2141
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
 msgid "Install in the selected directory not permitted."
 msgstr "ÁªÂò¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: src/LYLocal.c:2146
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr "ÁªÂò¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó! Í×µá¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£"
+
+#: src/LYLocal.c:2276
 msgid "Just a moment, ..."
 msgstr "¤ªÂÔ¤Á¤¯¤À¤µ¤¤ ..."
 
-#: src/LYLocal.c:2163
+#: src/LYLocal.c:2293
 msgid "Error buiding install args"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë°ú¿ô¤òÀ¸À®¤¹¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: src/LYLocal.c:2178 src/LYLocal.c:2210
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "¥½¡¼¥¹¤È¥¿¡¼¥²¥Ã¥È¤¬Æ±¤¸¤Ç¤¹: %s"
 
-#: src/LYLocal.c:2188 src/LYLocal.c:2220
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "¤¹¤Ç¤Ë¥¿¡¼¥²¥Ã¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¤¤Þ¤¹: %s"
 
-#: src/LYLocal.c:2238
+#: src/LYLocal.c:2362
 msgid "Installation complete"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë´°Î»"
 
-#: src/LYLocal.c:2427
+#: src/LYLocal.c:2551
 msgid "Temporary URL or list would be too long."
 msgstr "°ì»þŪ URL ¤¢¤ë¤¤¤Ï¥ê¥¹¥È¤¬Ä¹¤¹¤®¤ë¤è¤¦¤Ç¤¹¡£"
 
-#: src/LYMail.c:503
+#: src/LYMail.c:534
 msgid "Sending"
 msgstr "Á÷¿®Ãæ"
 
-#: src/LYMail.c:989
+#: src/LYMail.c:1024
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "¥ê¥ó¥¯   %s :?: %s \n"
 
-#: src/LYMail.c:991
+#: src/LYMail.c:1026
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "\"%s\"¤È¤·¤Æ¸Æ¤Ð¤ì¤ë\n"
 
-#: src/LYMail.c:992
+#: src/LYMail.c:1027
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ç \"%s\" ¤È¸Æ¤Ð¤ì¤ë\n"
 
-#: src/LYMail.c:993
+#: src/LYMail.c:1028
 msgid "was requested but was not available."
 msgstr "¤¬Í׵ᤵ¤ì¤Þ¤·¤¿¤¬ÍøÍѤǤ­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: src/LYMail.c:994
+#: src/LYMail.c:1029
 msgid "Thought you might want to know."
 msgstr "¤¢¤Ê¤¿¤¬ÃΤꤿ¤¤¤«¤â¤·¤ì¤Ê¤¤¤È»×¤¤¤Þ¤·¤¿¡£"
 
-#: src/LYMail.c:996
+#: src/LYMail.c:1031
 msgid "This message was automatically generated by"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï°Ê²¼¤Ë¤è¤Ã¤Æ¼«Æ°Åª¤ËÀ¸À®¤µ¤ì¤Þ¤·¤¿: "
 
-#: src/LYMain.c:897
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:969
 msgid "No Winsock found, sorry."
 msgstr "Winsock ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
 
-#: src/LYMain.c:1103
+#: src/LYMain.c:1170
 msgid "You MUST define a valid TMP or TEMP area!\n"
 msgstr "TMP ¤Ê¤¤¤· TEMP Îΰè¤òÀµ¤·¤¯ÄêµÁ¤·¤Ê¤±¤ì¤Ð*¤Ê¤ê¤Þ¤»¤ó*!\n"
 
-#: src/LYMain.c:1156 src/LYMainLoop.c:5117
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
 msgid "No such directory"
 msgstr "¤½¤ó¤Ê¥Ç¥£¥ì¥¯¥È¥ê¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/LYMain.c:1378
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4143,7 +4191,7 @@ msgstr ""
 "ÄêµÁ¥Õ¥¡¥¤¥ë %s ¤¬ÍøÍѤǤ­¤Þ¤»¤ó¡£\n"
 "\n"
 
-#: src/LYMain.c:1388
+#: src/LYMain.c:1446
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
@@ -4153,7 +4201,7 @@ msgstr ""
 "Lynx ¥­¥ã¥é¥¯¥¿¥»¥Ã¥È¤¬Àë¸À¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 "\n"
 
-#: src/LYMain.c:1417
+#: src/LYMain.c:1475
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
@@ -4163,7 +4211,7 @@ msgstr ""
 "Lynx ÊÔ½¸¥Þ¥Ã¥×¤¬Àë¸À¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 "\n"
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1504
 #, c-format
 msgid ""
 "\n"
@@ -4174,60 +4222,60 @@ msgstr ""
 "Lynx ¥Õ¥¡¥¤¥ë %s ¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£\n"
 "\n"
 
-#: src/LYMain.c:1704
+#: src/LYMain.c:1743
 msgid "Warning:"
 msgstr "Ãí°Õ: "
 
-#: src/LYMain.c:2247
+#: src/LYMain.c:2293
 msgid "persistent cookies state will be changed in next session only."
 msgstr "±Ê³Ū¥¯¥Ã¥­¡¼¤Î¾õÂ֤ϼ¡¤Î¥»¥Ã¥·¥ç¥ó¤Ë¤Ê¤é¤Ê¤¤¤ÈÊѹ¹¤µ¤ì¤Þ¤»¤ó¡£"
 
-#: src/LYMain.c:2477 src/LYMain.c:2525
+#: src/LYMain.c:2540 src/LYMain.c:2588
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ÉÔÌÀ¤Ê¥­¥ã¥é¥¯¥¿¥»¥Ã¥È %s ¤ò̵»ë¤·¤Þ¤¹¡£\n"
 
-#: src/LYMain.c:3047
-#, c-format
-msgid "%s Version %s (%s)\n"
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
 msgstr "%s ¥Ð¡¼¥¸¥ç¥ó %s (%s)\n"
 
-#: src/LYMain.c:3072
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "%s ¾å¤Ç %s %s ¤Ë¥Ó¥ë¥É¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/LYMain.c:3077
+#: src/LYMain.c:3166
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
 msgstr "¥«¥ó¥¶¥¹Âç³Ø¡¢CERN ¤È¤½¤Î¾¤Î¹×¸¥¼Ô¤¬Ãøºî¸¢¤òÊÝÍ­¤·¡¢\n"
 
-#: src/LYMain.c:3079
+#: src/LYMain.c:3168
 msgid "Distributed under the GNU General Public License.\n"
 msgstr "GNU °ìÈ̸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤Î²¼¤ÇÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: src/LYMain.c:3081
+#: src/LYMain.c:3170
 msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
+"See http://lynx.isc.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
-"¾Ü¤·¤¯¤Ï http://lynx.browser.org/ ¤È¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¤ò¤´Í÷¤¯¤À¤µ¤¤¡£\n"
+"¾Ü¤·¤¯¤Ï http://lynx.isc.org/ ¤È¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¤ò¤´Í÷¤¯¤À¤µ¤¤¡£\n"
 "\n"
 
-#: src/LYMain.c:3800
+#: src/LYMain.c:3919
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë]\n"
 
-#: src/LYMain.c:3801
+#: src/LYMain.c:3920
 msgid "Options are:\n"
 msgstr "¥ª¥×¥·¥ç¥ó:\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4191
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹: %s\n"
 
-#: src/LYMainLoop.c:512
+#: src/LYMainLoop.c:539
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "ÆâÉô¥¨¥é¡¼: %d ¤ÏÉÔÀµ¤Ê¥Þ¥¦¥¹¥ê¥ó¥¯¤Ç¤¹!"
@@ -4235,80 +4283,109 @@ msgstr "ÆâÉô¥¨¥é¡¼: %d ¤ÏÉÔÀµ¤Ê¥Þ¥¦¥¹¥ê¥ó¥¯¤Ç¤¹!"
 #.
 #. * Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:625 src/LYMainLoop.c:5139
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
 msgid "A URL specified by the user"
 msgstr "¥æ¡¼¥¶¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤¿ URL"
 
-#: src/LYMainLoop.c:1114
+#: src/LYMainLoop.c:1110
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "Enctype multipart/form-data ¤Ï¤Þ¤À¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó! Á÷¿®¤Ç¤­¤Þ¤»¤ó¡£"
 
 #.
 #. *  Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3097
+#: src/LYMainLoop.c:3053
 msgid "Help Screen"
 msgstr "¥Ø¥ë¥×²èÌÌ"
 
-#: src/LYMainLoop.c:3231
+#: src/LYMainLoop.c:3177
 msgid "System Index"
 msgstr "¥·¥¹¥Æ¥à¥¤¥ó¥Ç¥Ã¥¯¥¹"
 
-#: src/LYMainLoop.c:3611 src/LYMainLoop.c:5347
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
 msgid "Entry into main screen"
 msgstr "¥á¥¤¥ó²èÌ̤ؤÎÆþÎÏ"
 
-#: src/LYMainLoop.c:3897
+#: src/LYMainLoop.c:3824
 msgid "No next document present"
-msgstr ""
+msgstr "¼¡¤Î¥É¥­¥å¥á¥ó¥È¤¬Â¸ºß¤·¤Þ¤»¤ó"
 
-#: src/LYMainLoop.c:4206
+#: src/LYMainLoop.c:4131
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "¤³¤Îʸ½ñ¤Î¥­¥ã¥é¥¯¥¿¥»¥Ã¥È¤ÏÌÀ¼¨Åª¤Ë»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹..."
 
-#: src/LYMainLoop.c:5093
+#: src/LYMainLoop.c:5004
 msgid "cd to:"
 msgstr "°Ê²¼¤Ø°ÜÆ°:"
 
-#: src/LYMainLoop.c:5120
+#: src/LYMainLoop.c:5031
 msgid "A component of path is not a directory"
 msgstr "¥Ñ¥¹¤Î°ìÉô¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/LYMainLoop.c:5123
+#: src/LYMainLoop.c:5034
 msgid "failed to change directory"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: src/LYMainLoop.c:6291
+#: src/LYMainLoop.c:6204
 msgid "Reparsing document under current settings..."
 msgstr "¸½ºß¤ÎÀßÄê¤Î²¼¤Çʸ½ñ¤òºÆ²ò¼áÃæ..."
 
-#: src/LYMainLoop.c:6579 src/LYMainLoop.c:6583
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Ã×̿Ū¥¨¥é¡¼ - ½ÐÎÏ¥Õ¥¡¥¤¥ë %s ¤¬³«¤±¤Þ¤»¤ó\n"
 
-#: src/LYMainLoop.c:7719 src/LYMainLoop.c:7892
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6914
+#, fuzzy
+msgid "Current URL is empty."
+msgstr "¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê:"
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr ""
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
 msgid "-index-"
 msgstr "-¥¤¥ó¥Ç¥Ã¥¯¥¹-"
 
-#: src/LYMainLoop.c:7829
+#: src/LYMainLoop.c:7731
 msgid "lynx: Can't access startfile"
 msgstr "lynx: ¥¹¥¿¡¼¥È¥Õ¥¡¥¤¥ë¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó"
 
-#: src/LYMainLoop.c:7842
+#: src/LYMainLoop.c:7744
 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:7843
+#: src/LYMainLoop.c:7745
 msgid "      Exiting..."
 msgstr "      ½ªÎ»¤·¤Þ¤¹..."
 
-#: src/LYMainLoop.c:7886
+#: src/LYMainLoop.c:7788
 msgid "-more-"
 msgstr "-³¤­¤¢¤ê-"
 
 #. Enable scrolling.
-#: src/LYNews.c:203
+#: src/LYNews.c:187
 msgid "You will be posting to:"
 msgstr "Åê¹ÆÀè: "
 
@@ -4316,7 +4393,7 @@ msgstr "Åê¹ÆÀè: "
 #. *  Get the mail address for the From header,
 #. *  offering personal_mail_address as default.
 #.
-#: src/LYNews.c:212
+#: src/LYNews.c:196
 msgid ""
 "\n"
 "\n"
@@ -4331,7 +4408,7 @@ msgstr ""
 #. *  document's title as the default if this is a
 #. *  followup rather than a new post. - FM
 #.
-#: src/LYNews.c:230
+#: src/LYNews.c:214
 msgid ""
 "\n"
 "\n"
@@ -4341,7 +4418,7 @@ msgstr ""
 "\n"
 " Subject: ¥Ø¥Ã¥À¤òÊÔ½¸¤·¤ÆÍÑ°Õ¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: src/LYNews.c:322
+#: src/LYNews.c:303
 msgid ""
 "\n"
 "\n"
@@ -4354,7 +4431,7 @@ msgstr ""
 #.
 #. *  Use the built in line editior.
 #.
-#: src/LYNews.c:379
+#: src/LYNews.c:360
 msgid ""
 "\n"
 "\n"
@@ -4364,94 +4441,112 @@ msgstr ""
 "\n"
 " °Ê²¼¤Ë¤¢¤Ê¤¿¤Î¥á¥Ã¥»¡¼¥¸¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/LYNews.c:425
+#: src/LYNews.c:406
 msgid "Message has no original text!"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ë¤Ï¸µ¤Î¥Æ¥­¥¹¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó!"
 
-#: src/LYOptions.c:743
+#: src/LYOptions.c:746
 msgid "review/edit B)ookmarks files"
 msgstr "[b]¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë¤ò±ÜÍ÷/ÊÔ½¸"
 
-#: src/LYOptions.c:745
+#: src/LYOptions.c:748
 msgid "B)ookmark file: "
 msgstr "[b]¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë"
 
-#: src/LYOptions.c:2507 src/LYOptions.c:2531
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "%s ¤ÇÀßÄê¥á¥Ë¥å¡¼¤òµ¯Æ°¤·¤Þ¤¹!"
 
-#: src/LYOptions.c:3208
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr "((!) ¤¬¤Ä¤¤¤¿¥ª¥×¥·¥ç¥ó¤ÏÊݸ¤µ¤ì¤Þ¤»¤ó)"
+
+#: src/LYOptions.c:3261
 msgid "General Preferences"
 msgstr "Á´ÈÌŪ¤ÊÀßÄê"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3212
+#: src/LYOptions.c:3265
 msgid "User mode"
 msgstr "¥æ¡¼¥¶¥â¡¼¥É"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3218
+#: src/LYOptions.c:3271
 msgid "Editor"
 msgstr "»ÈÍѤ¹¤ë¥¨¥Ç¥£¥¿"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3223
+#: src/LYOptions.c:3276
 msgid "Type of Search"
 msgstr "¸¡º÷¥¿¥¤¥×"
 
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3229
+#: src/LYOptions.c:3285
 msgid "Cookies"
 msgstr "¥¯¥Ã¥­¡¼"
 
-#: src/LYOptions.c:3243
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
 msgid "Keyboard Input"
 msgstr "¥­¡¼¥Ü¡¼¥ÉÆþÎÏ"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3247
+#: src/LYOptions.c:3316
 msgid "Keypad mode"
 msgstr "¥­¡¼¥Ñ¥Ã¥É¤Î¥â¡¼¥É"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3253
+#: src/LYOptions.c:3322
 msgid "Emacs keys"
 msgstr "Emacs É÷¥­¡¼ÇÛÎó"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3259
+#: src/LYOptions.c:3328
 msgid "VI keys"
 msgstr "VI É÷¥­¡¼ÇÛÎó"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3266
+#: src/LYOptions.c:3335
 msgid "Line edit style"
-msgstr ""
+msgstr "¹ÔÊÔ½¸¥¹¥¿¥¤¥ë"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3278
-#, fuzzy
+#: src/LYOptions.c:3347
 msgid "Keyboard layout"
-msgstr "¥­¡¼¥Ü¡¼¥ÉÆþÎÏ"
+msgstr "¥­¡¼¥Ü¡¼¥É¥ì¥¤¥¢¥¦¥È"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3291
+#: src/LYOptions.c:3360
 msgid "Display and Character Set"
 msgstr "ɽ¼¨¤È¥­¥ã¥é¥¯¥¿¥»¥Ã¥È"
 
 #. ***************************************************************
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3295
+#: src/LYOptions.c:3364
 msgid "Display character set"
 msgstr "ɽ¼¨¤¹¤ë¥­¥ã¥é¥¯¥¿¥»¥Ã¥È"
 
-#: src/LYOptions.c:3324
+#: src/LYOptions.c:3393
 msgid "Assumed document character set"
 msgstr "²¾Äꤹ¤ë¥­¥ã¥é¥¯¥¿¥»¥Ã¥È"
 
@@ -4460,202 +4555,216 @@ msgstr "²¾Äꤹ¤ë¥­¥ã¥é¥¯¥¿¥»¥Ã¥È"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3344
+#: src/LYOptions.c:3413
 msgid "CJK mode"
 msgstr "CJK ¥â¡¼¥É"
 
-#: src/LYOptions.c:3346
+#: src/LYOptions.c:3415
 msgid "Raw 8-bit"
 msgstr "À¸ 8 ¥Ó¥Ã¥È"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3354
+#: src/LYOptions.c:3423
 msgid "X Display"
 msgstr "X ¥Ç¥£¥¹¥×¥ì¥¤"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3360
+#: src/LYOptions.c:3429
 msgid "Document Appearance"
 msgstr "ʸ½ñ¤Î³°¸«"
 
-#: src/LYOptions.c:3366
+#: src/LYOptions.c:3435
 msgid "Show color"
 msgstr "¿§¤òÉÕ¤±¤ë"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3390
+#: src/LYOptions.c:3459
 msgid "Show cursor"
 msgstr "¥«¡¼¥½¥ë¤ò¸«¤»¤ë"
 
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr "¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤òɽ¼¨"
+
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3396
+#: src/LYOptions.c:3473
 msgid "Popups for select fields"
 msgstr "¥Õ¥£¡¼¥ë¥ÉÁªÂò»þ¤Ë¥Ý¥Ã¥×¥¢¥Ã¥×"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3403
+#: src/LYOptions.c:3479
 msgid "HTML error recovery"
 msgstr "HTML ¥¨¥é¡¼¤«¤é¤Î²óÉü"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3410
+#: src/LYOptions.c:3485
 msgid "Show images"
 msgstr "²èÁü¤Îɽ¼¨"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3424
+#: src/LYOptions.c:3499
 msgid "Verbose images"
 msgstr "¾éĹ¤Ê²èÁüɽ¼¨"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3432
+#: src/LYOptions.c:3507
 msgid "Headers Transferred to Remote Servers"
 msgstr "¥ê¥â¡¼¥È¥µ¡¼¥Ð¤ËžÁ÷¤µ¤ì¤ë¥Ø¥Ã¥À"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3436
+#: src/LYOptions.c:3511
 msgid "Personal mail address"
 msgstr "¸Ä¿Í¤Î¥á¡¼¥ë¥¢¥É¥ì¥¹"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3516
 msgid "Preferred document character set"
 msgstr "ɽ¼¨¤·¤¿¤¤¥­¥ã¥é¥¯¥¿¡¼¥»¥Ã¥È"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3446
+#: src/LYOptions.c:3521
 msgid "Preferred document language"
 msgstr "ɽ¼¨¤·¤¿¤¤¸À¸ì"
 
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3527
 msgid "User-Agent header"
 msgstr "User-Agent ¥Ø¥Ã¥À"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3460
+#: src/LYOptions.c:3535
 msgid "Listing and Accessing Files"
 msgstr "¥ê¥¹¥Èɽ¼¨¤È¥Õ¥¡¥¤¥ë¤Ø¤Î¥¢¥¯¥»¥¹"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3464
+#: src/LYOptions.c:3539
 msgid "FTP sort criteria"
 msgstr "FTP ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥½¡¼¥È´ð½à"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3471
+#: src/LYOptions.c:3546
 msgid "Local directory sort criteria"
 msgstr "¥í¡¼¥«¥ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥½¡¼¥È´ð½à"
 
-#: src/LYOptions.c:3479
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+msgid "Local directory sort order"
+msgstr "¥í¡¼¥«¥ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥½¡¼¥È½ç"
+
+#: src/LYOptions.c:3561
 msgid "Show dot files"
 msgstr "¥É¥Ã¥È¥Õ¥¡¥¤¥ë¤òɽ¼¨"
 
-#: src/LYOptions.c:3487
+#: src/LYOptions.c:3569
 msgid "Execution links"
 msgstr "¥ê¥ó¥¯¤ò¼Â¹Ô"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3507
+#: src/LYOptions.c:3589
 msgid "Show transfer rate"
 msgstr "žÁ÷¥ì¡¼¥È¤òɽ¼¨"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3516
+#: src/LYOptions.c:3598
 msgid "Special Files and Screens"
 msgstr "ÆÃÊÌ¥Õ¥¡¥¤¥ë¤È²èÌÌ"
 
-#: src/LYOptions.c:3521
+#: src/LYOptions.c:3603
 msgid "Multi-bookmarks"
 msgstr "¥Þ¥ë¥Á¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ò»È¤¦"
 
-#: src/LYOptions.c:3529
+#: src/LYOptions.c:3611
 msgid "Review/edit Bookmarks files"
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë¤Î±ÜÍ÷/ÊÔ½¸"
 
-#: src/LYOptions.c:3531
+#: src/LYOptions.c:3613
 msgid "Goto multi-bookmark menu"
 msgstr "¥Þ¥ë¥Á¥Ö¥Ã¥¯¥Þ¡¼¥¯¥á¥Ë¥å¡¼¤Ø"
 
-#: src/LYOptions.c:3533
+#: src/LYOptions.c:3615
 msgid "Bookmarks file"
 msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3539
+#: src/LYOptions.c:3621
 msgid "Visited Pages"
 msgstr "ˬ¤ì¤¿¥Ú¡¼¥¸"
 
-#: src/LYPrint.c:959
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr "¥Õ¥¡¥¤¥ë¤ò±ÜÍ÷"
+
+#: src/LYPrint.c:952
 msgid " Print job complete.\n"
 msgstr "°õºþ¥¸¥ç¥Ö¤¬´°Î»¤·¤Þ¤·¤¿¡£\n"
 
-#: src/LYPrint.c:1296
+#: src/LYPrint.c:1281
 msgid "Document:"
 msgstr "ʸ½ñ:"
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1282
 msgid "Number of lines:"
 msgstr "¹Ô¿ô:"
 
-#: src/LYPrint.c:1298
+#: src/LYPrint.c:1283
 msgid "Number of pages:"
 msgstr "¥Ú¡¼¥¸¿ô:"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "pages"
 msgstr "¥Ú¡¼¥¸"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "page"
 msgstr "¥Ú¡¼¥¸"
 
-#: src/LYPrint.c:1300
+#: src/LYPrint.c:1285
 msgid "(approximately)"
 msgstr "(³µ»»)"
 
-#: src/LYPrint.c:1305
+#: src/LYPrint.c:1290
 msgid "Some print functions have been disabled!"
 msgstr "°õºþµ¡Ç½¤Î°ìÉô¤Ï»È¤¨¤Þ¤»¤ó!"
 
-#: src/LYPrint.c:1309
+#: src/LYPrint.c:1294
 msgid "Standard print options:"
 msgstr "ɸ½à¤Î°õºþÀè"
 
-#: src/LYPrint.c:1310
+#: src/LYPrint.c:1295
 msgid "Print options:"
 msgstr "°õºþÀè¤òÁªÂò:"
 
-#: src/LYPrint.c:1316
+#: src/LYPrint.c:1302
 msgid "Save to a local file"
 msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤ËÊݸ"
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1304
 msgid "Save to disk disabled"
 msgstr "¥Ç¥£¥¹¥¯¤Ø¤ÎÊݸ¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: src/LYPrint.c:1324
+#: src/LYPrint.c:1311
 msgid "Mail the file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥á¡¼¥ë¤ÇÁ÷¿®"
 
-#: src/LYPrint.c:1330
+#: src/LYPrint.c:1318
 msgid "Print to the screen"
 msgstr "²èÌ̤Ëɽ¼¨"
 
-#: src/LYPrint.c:1334
+#: src/LYPrint.c:1323
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "¤¢¤Ê¤¿¤Î vt100 üËö¤ËÀܳ¤µ¤ì¤¿¥×¥ê¥ó¥¿¤Ë°õºþ"
 
-#: src/LYReadCFG.c:340
+#: src/LYReadCFG.c:339
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
 "The line must be of the form:\n"
@@ -4671,76 +4780,76 @@ msgstr ""
 "FOREGROUND ¤È BACKGROUND ¤Ï°Ê²¼¤Î¤¦¤Á°ì¤Ä¤ò¼è¤ê¤Þ¤¹:\n"
 "ÆÃÊÌʸ»úÎó¤Î¡Önocolor¡×¡¢¡Ödefault¡×¡¢¤¢¤ë¤¤¤Ï\n"
 
-#: src/LYReadCFG.c:353
+#: src/LYReadCFG.c:352
 msgid "Offending line:"
 msgstr "ÌäÂê¤Î¹Ô:"
 
-#: src/LYReadCFG.c:660
+#: src/LYReadCFG.c:638
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr "¥­¡¼ %s ¤ò %s ¤Ø (Æ°ºî¤Ï %s) ºÆÄêµÁ¤¹¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: src/LYReadCFG.c:667
+#: src/LYReadCFG.c:645
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "¥­¡¼ %s ¤ò %s ¤ØºÆÄêµÁ¤¹¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:666
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr "¥­¡¼ %s ¤Î¹Ô¥¨¥Ç¥£¥¿ÁªÂò %s ¤¬ÉÔÀµ¤Ç¤¹¡¢Á´ÂΤòÁªÂò¤·¤Þ¤¹\n"
 
-#: src/LYReadCFG.c:715 src/LYReadCFG.c:728
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr "¹Ô¥¨¥Ç¥£¥¿¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ç¥­¡¼ %s (0x%x) ¤ò 0x%x (Æ°ºî ¤Ï %s)¤ËÀßÄꤹ¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: src/LYReadCFG.c:733
+#: src/LYReadCFG.c:711
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr "¹Ô¥¨¥Ç¥£¥¿¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ç¥­¡¼ %s (0x%x) ¤òÆ°ºî %s¤ËÀßÄꤹ¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:816
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr "Lynx: ³«»Ï¤Ç¤­¤Þ¤»¤ó¡£CERN ¥ë¡¼¥ë¥Õ¥¡¥¤¥ë %s ¤¬ÍøÍѤǤ­¤Þ¤»¤ó\n"
 
-#: src/LYReadCFG.c:840
+#: src/LYReadCFG.c:818
 msgid "(no name)"
 msgstr "(̾Á°Ìµ¤·)"
 
-#: src/LYReadCFG.c:1658
+#: src/LYReadCFG.c:1782
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "lynx.cfg ¥¤¥ó¥¯¥ë¡¼¥É¤¬ %d ²ó°Ê¾å¤ÎÆþ¤ì»Ò¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹ -- ¤ª¤½¤é¤¯¥ë¡¼¥×¤¬¤¢¤ë¤Î¤Ç¤Ï!?\n"
 
-#: src/LYReadCFG.c:1660
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "ºÇ¸å¤Ë»î¤ß¤¿¥¤¥ó¥¯¥ë¡¼¥É¤Ï '%s' ¤Ç¡¢\n"
 
-#: src/LYReadCFG.c:1661
+#: src/LYReadCFG.c:1785
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "'%s' ¤«¤é¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: src/LYReadCFG.c:2116 src/LYReadCFG.c:2129 src/LYReadCFG.c:2165
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
 msgid "The following is read from your lynx.cfg file."
 msgstr "°Ê²¼¤Ï¤¢¤Ê¤¿¤Î lynx.cfg ¥Õ¥¡¥¤¥ë¤«¤éÆɤ߹þ¤Þ¤ì¤¿¾ðÊó¤Ç¤¹¡£"
 
-#: src/LYReadCFG.c:2117 src/LYReadCFG.c:2130
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
 msgid "Please read the distribution"
 msgstr "ÇÛÉÛ¤Î"
 
-#: src/LYReadCFG.c:2123 src/LYReadCFG.c:2133
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
 msgid "for more comments."
 msgstr "¤Ë¤Ï¾ÜºÙ¤ÊÃí¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤¹¤Î¤Ç»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/LYReadCFG.c:2147
+#: src/LYReadCFG.c:2244
 msgid "RELOAD THE CHANGES"
 msgstr "Êѹ¹¤òºÆÆɤ߹þ¤ß"
 
-#: src/LYReadCFG.c:2156
+#: src/LYReadCFG.c:2253
 msgid "Your primary configuration"
 msgstr "ºÇ½é¤Ë»²¾È¤µ¤ì¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Ï"
 
@@ -4816,7 +4925,7 @@ msgstr "¥¢¥¯¥»¥¹µö²Ä"
 msgid "File that you are currently viewing"
 msgstr "¸½ºß¤¢¤Ê¤¿¤¬¸«¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë"
 
-#: src/LYShowInfo.c:266 src/LYShowInfo.c:375
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
 msgid "Linkname:"
 msgstr "¥ê¥ó¥¯Ì¾"
 
@@ -4856,79 +4965,79 @@ msgstr "¸À¸ì:"
 msgid "Post Data:"
 msgstr "Post ¥Ç¡¼¥¿:"
 
-#: src/LYShowInfo.c:331
+#: src/LYShowInfo.c:333
 msgid "Post Content Type:"
 msgstr "Post ¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×:"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:342
 msgid "Owner(s):"
 msgstr "½êÍ­¼Ô:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "size:"
 msgstr "¥µ¥¤¥º:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "lines"
 msgstr "¹Ô"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:348
 msgid "mode:"
 msgstr "¥â¡¼¥É:"
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:350
 msgid "forms mode"
 msgstr "Ê£¿ô¥Õ¥©¡¼¥à¥â¡¼¥É"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "source"
 msgstr "¥½¡¼¥¹"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "normal"
 msgstr "Ä̾ï"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:353
 msgid ", safe"
 msgstr "¡¢°ÂÁ´"
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:354
 msgid ", via internal link"
 msgstr "¡¢ÆâÉô¥ê¥ó¥¯·Ðͳ"
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:360
 msgid ", no-cache"
 msgstr "¡¢¥­¥ã¥Ã¥·¥å̵¤·"
 
-#: src/LYShowInfo.c:360
+#: src/LYShowInfo.c:362
 msgid ", ISMAP script"
 msgstr "¡¢ISMAP ¥¹¥¯¥ê¥×¥È"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:364
 msgid ", bookmark file"
 msgstr "¡¢¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë"
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:373
 msgid "Link that you currently have selected"
 msgstr "¸½ºßÁªÂò¤·¤Æ¤¤¤ë¥ê¥ó¥¯"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:386
 msgid "Method:"
 msgstr "¥á¥½¥Ã¥É:"
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:391
 msgid "Enctype:"
 msgstr "Enctype:"
 
-#: src/LYShowInfo.c:401
+#: src/LYShowInfo.c:403
 msgid "(Form field)"
 msgstr "(¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ë¥É)"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:418
 msgid "No Links on the current page"
 msgstr "¸½ºß¤Î¥Ú¡¼¥¸¤Ë¤Ï¥ê¥ó¥¯¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/LYStyle.c:250
+#: src/LYStyle.c:278
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -4969,44 +5078,47 @@ msgstr "ÉÔÀµ¤Ê¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó \"~\" ȯ¸«! ¥ê¥¯¥¨¥¹¥È¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£"
 msgid "Unable to upload file."
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥¢¥Ã¥×¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: src/LYUpload.c:214
+#: src/LYUpload.c:206
 msgid "Upload To:"
 msgstr "°Ê²¼¤Ë¥¢¥Ã¥×¥í¡¼¥É:"
 
-#: src/LYUpload.c:215
+#: src/LYUpload.c:207
 msgid "Upload options:"
 msgstr "¥¢¥Ã¥×¥í¡¼¥É¥ª¥×¥·¥ç¥ó:"
 
-#: src/LYUtils.c:3075
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2468
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "¤³¤Î URL ¥¹¥­¡¼¥à¤Ç¤ÏÁÛÄꤵ¤ì¤Æ¤¤¤Ê¤¤¥¢¥¯¥»¥¹¥×¥í¥È¥³¥ë¤Ç¤¹¡£"
 
-#: src/LYUtils.c:3915
+#: src/LYUtils.c:3294
 msgid "Too many tempfiles"
-msgstr ""
+msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: src/LYUtils.c:4217
-#, fuzzy
+#: src/LYUtils.c:3595
 msgid "unknown restriction"
-msgstr "À©¸Â¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+msgstr "ÉÔÌÀ¤ÊÀ©¸Â"
 
-#: src/LYUtils.c:4248
+#: src/LYUtils.c:3626
 msgid "No restrictions set.\n"
 msgstr "À©¸Â¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: src/LYUtils.c:4251
+#: src/LYUtils.c:3629
 msgid "Restrictions set:\n"
 msgstr "À©¸Â¤ò°Ê²¼¤ËÀßÄê:\n"
 
-#: src/LYUtils.c:5601
-msgid "Ignoring invalid HOME"
-msgstr "ÉÔÀµ¤Ê HOME ¤ò̵»ë¤·¤Þ¤¹"
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr "HOME ¥Ç¥£¥ì¥¯¥È¥ê¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: src/LYrcFile.c:20
+#: src/LYrcFile.c:21
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
-msgstr ""
+msgstr "Ä̾ï¤Ï̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£lynx.cfg ¤Î ENABLE_LYNXRC ¤ÎÉôʬ¤ò»²¾È¤·¤Æ²¼¤µ¤¤\n"
 
-#: src/LYrcFile.c:242
+#: src/LYrcFile.c:295
 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"
@@ -5018,7 +5130,7 @@ msgstr ""
 "prompt for each cookie.  Set accept_all_cookies to \"TRUE\" to accept\n"
 "all cookies.\n"
 
-#: src/LYrcFile.c:249
+#: src/LYrcFile.c:302
 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"
@@ -5028,7 +5140,7 @@ msgstr ""
 "file into which the user can paste links for easy access at a later\n"
 "date.\n"
 
-#: src/LYrcFile.c:254
+#: src/LYrcFile.c:307
 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"
@@ -5038,7 +5150,7 @@ msgstr ""
 "using the 's' or '/' keys, the search performed will be case sensitive\n"
 "instead of case INsensitive.  The default is usually \"off\".\n"
 
-#: src/LYrcFile.c:259
+#: src/LYrcFile.c:312
 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"
@@ -5052,7 +5164,7 @@ msgstr ""
 "set or using the 7 bit character approximations.\n"
 "Current valid characters sets are:\n"
 
-#: src/LYrcFile.c:266
+#: src/LYrcFile.c:319
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5066,7 +5178,7 @@ msgstr ""
 "take precedence.  The accept_all_cookies parameter will override any\n"
 "settings made here.\n"
 
-#: src/LYrcFile.c:274
+#: src/LYrcFile.c:327
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/.lynx_cookies.\n"
@@ -5074,7 +5186,7 @@ msgstr ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/.lynx_cookies.\n"
 
-#: src/LYrcFile.c:279
+#: src/LYrcFile.c:332
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5092,7 +5204,15 @@ msgstr ""
 "with an invalid path or domain attribute.  All domains will default to\n"
 "querying the user for an invalid path or domain.\n"
 
-#: src/LYrcFile.c:292
+#: src/LYrcFile.c:346
+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 specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+
+#: src/LYrcFile.c:351
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5104,7 +5224,7 @@ msgstr ""
 "files and directories together.  \"FILES_FIRST\" lists files first and\n"
 "\"DIRECTORIES_FIRST\" lists directories first.\n"
 
-#: src/LYrcFile.c:300
+#: src/LYrcFile.c:359
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5116,7 +5236,7 @@ msgstr ""
 "  ^B = left    ^F = right\n"
 "will be enabled.\n"
 
-#: src/LYrcFile.c:306
+#: src/LYrcFile.c:365
 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"
@@ -5128,7 +5248,7 @@ msgstr ""
 "unless it is activated from the command line, and the built-in line editor\n"
 "will be used for sending mail.\n"
 
-#: src/LYrcFile.c:312
+#: src/LYrcFile.c:371
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5144,7 +5264,7 @@ msgstr ""
 "   BY_SIZE     -- sorts on the size of the file\n"
 "   BY_DATE     -- sorts on the date of the file\n"
 
-#: src/LYrcFile.c:324
+#: src/LYrcFile.c:389
 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"
@@ -5170,7 +5290,7 @@ msgstr ""
 "\n"
 "Current lineedit modes are:\n"
 
-#: src/LYrcFile.c:339
+#: src/LYrcFile.c:404
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5182,7 +5302,7 @@ msgstr ""
 "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"
 
-#: src/LYrcFile.c:345
+#: src/LYrcFile.c:410
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5200,7 +5320,7 @@ msgstr ""
 "could leave this field blank, but then you won't have it included in\n"
 "your mailed comments.\n"
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:419
 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"
@@ -5228,21 +5348,16 @@ msgstr ""
 "an error response, though the sending of an unacceptable response\n"
 "is also allowed.\n"
 
-#: src/LYrcFile.c:368
+#: src/LYrcFile.c:433
 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 it's default language.\n"
-msgstr ""
-"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 it's default language.\n"
+"Otherwise, the server will send the file in its default language.\n"
+msgstr " ----\n"
 
-#: src/LYrcFile.c:377
+#: src/LYrcFile.c:442
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5264,7 +5379,7 @@ msgstr ""
 "          or compromise security.  This should only be set to \"on\" if\n"
 "          you are viewing trusted source information.\n"
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:453
 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"
@@ -5292,7 +5407,7 @@ msgstr ""
 "          or compromise security.  This should only be set to \"on\" if\n"
 "          you are viewing trusted source information.\n"
 
-#: src/LYrcFile.c:403
+#: src/LYrcFile.c:471
 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"
@@ -5310,7 +5425,7 @@ msgstr ""
 "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"
 
-#: src/LYrcFile.c:413
+#: src/LYrcFile.c:481
 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"
@@ -5344,7 +5459,7 @@ msgstr ""
 "the 'o'ptions menu.  If the option settings are saved, the \"on\" and\n"
 "\"off\" \"show color\" settings will be treated as \"default\".\n"
 
-#: src/LYrcFile.c:430
+#: src/LYrcFile.c:498
 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"
@@ -5366,7 +5481,7 @@ msgstr ""
 "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"
 
-#: src/LYrcFile.c:441
+#: src/LYrcFile.c:509
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5380,7 +5495,7 @@ msgstr ""
 "restricted via a command line switch.  If display of hidden files\n"
 "is disabled, creation of such files via Lynx also is disabled.\n"
 
-#: src/LYrcFile.c:452
+#: src/LYrcFile.c:520
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5402,7 +5517,7 @@ msgstr ""
 "user modes.  When this option is set to \"standard\", the menu will be\n"
 "presented regardless of user mode.\n"
 
-#: src/LYrcFile.c:464
+#: src/LYrcFile.c:533
 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"
@@ -5418,7 +5533,7 @@ msgstr ""
 "Use \"ADVANCED\" to see the URL of the currently selected link at the\n"
 "bottom of the screen.\n"
 
-#: src/LYrcFile.c:472
+#: src/LYrcFile.c:542
 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"
@@ -5428,7 +5543,7 @@ msgstr ""
 "source file in place of [INLINE], [LINK] or [IMAGE]\n"
 "See also VERBOSE_IMAGES in lynx.cfg\n"
 
-#: src/LYrcFile.c:477
+#: src/LYrcFile.c:547
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5444,7 +5559,7 @@ msgstr ""
 "Capital 'H', 'J' and 'K will still activate help, jump shortcuts,\n"
 "and the keymap display, respectively.\n"
 
-#: src/LYrcFile.c:485
+#: src/LYrcFile.c:555
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
@@ -5452,7 +5567,7 @@ msgstr ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
 
-#: src/LYrcFile.c:693
+#: src/LYrcFile.c:772
 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"
@@ -5470,7 +5585,7 @@ msgstr ""
 "and the corresponding keyboard numbers will act as arrow keys,\n"
 "regardless of whether numlock is on.\n"
 
-#: src/LYrcFile.c:702
+#: src/LYrcFile.c:781
 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"
@@ -5478,7 +5593,7 @@ msgstr ""
 "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"
 
-#: src/LYrcFile.c:706
+#: src/LYrcFile.c:785
 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"
@@ -5496,7 +5611,7 @@ msgstr ""
 "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"
 
-#: src/LYrcFile.c:715
+#: src/LYrcFile.c:794
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -5506,7 +5621,7 @@ msgstr ""
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
 "enabled.\n"
 
-#: src/LYrcFile.c:748
+#: src/LYrcFile.c:827
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -5529,3 +5644,9 @@ msgstr ""
 "If you are looking for the general configuration file - it is normally\n"
 "called lynx.cfg, and it has different content and a different format.\n"
 "It is not this file.\n"
+
+#~ msgid "Short read from file, problem?"
+#~ msgstr "¥Õ¥¡¥¤¥ë¤«¤é¤ÎÆɤ߹þ¤ß¤¬ÃæÃǤ·¤Þ¤·¤¿ ÌäÂêȯÀ¸¤«¤â?"
+
+#~ msgid "Unable to open file management menu file."
+#~ msgstr "¥Õ¥¡¥¤¥ë´ÉÍý¥á¥Ë¥å¡¼¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó¡£"
diff --git a/gnu/usr.bin/lynx/po/ko.po b/gnu/usr.bin/lynx/po/ko.po
deleted file mode 100644
index 413ecd3f631..00000000000
--- a/gnu/usr.bin/lynx/po/ko.po
+++ /dev/null
@@ -1,11 +0,0 @@
-msgid ""
-msgstr ""
-"Date: 1998-08-22 16:12:20-0400\n"
-"From: Webmaster Jim <jspath@bcpl.net>\n"
-"Content-Type: text/plain; charset=\n"
-"Xgettext-Options: --default-domain=po/de\n"
-"Files: src/LYMain.c\n"
-
-#: src/LYMain.c:2502
-msgid "%s Version %s %s"
-msgstr ""
diff --git a/gnu/usr.bin/lynx/po/lynx.pot b/gnu/usr.bin/lynx/po/lynx.pot
index 70d0f9ecf4c..6fb3048c02d 100644
--- a/gnu/usr.bin/lynx/po/lynx.pot
+++ b/gnu/usr.bin/lynx/po/lynx.pot
@@ -1,12 +1,9 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-06-01 18:55-0400\n"
+"Project-Id-Version: lynx 2.8.5pre.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-26 20:35-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"
@@ -27,7 +24,7 @@ msgstr ""
 #. * Links to collections of alternate definitions, developed by the Lynx
 #. * User Community, are maintained in Lynx links:
 #. *
-#. *    http://www.trill-home.com/lynx.html
+#. *    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
@@ -42,2049 +39,2049 @@ msgstr ""
 msgid "Welcome"
 msgstr ""
 
-#: LYMessages.c:31 LYMessages.c:32
+#: LYMessages.c:31
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: LYMessages.c:34 LYMessages.c:35
+#: LYMessages.c:33
 msgid "Really exit from Lynx?"
 msgstr ""
 
-#: LYMessages.c:37
+#: LYMessages.c:35
 msgid "Connection interrupted."
 msgstr ""
 
-#: LYMessages.c:38
+#: LYMessages.c:36
 msgid "Data transfer interrupted."
 msgstr ""
 
-#: LYMessages.c:39
+#: LYMessages.c:37
 msgid "Cancelled!!!"
 msgstr ""
 
-#: LYMessages.c:40
+#: LYMessages.c:38
 msgid "Cancelling!"
 msgstr ""
 
-#: LYMessages.c:41
+#: LYMessages.c:39
 msgid "Excellent!!!"
 msgstr ""
 
-#: LYMessages.c:42
+#: LYMessages.c:40
 msgid "OK"
 msgstr ""
 
-#: LYMessages.c:43
+#: LYMessages.c:41
 msgid "Done!"
 msgstr ""
 
-#: LYMessages.c:44
+#: LYMessages.c:42
 msgid "Bad request!"
 msgstr ""
 
-#: LYMessages.c:45
+#: LYMessages.c:43
 msgid "previous"
 msgstr ""
 
-#: LYMessages.c:46
+#: LYMessages.c:44
 msgid "next screen"
 msgstr ""
 
-#: LYMessages.c:47
+#: LYMessages.c:45
 msgid "HELP!"
 msgstr ""
 
-#: LYMessages.c:48
+#: LYMessages.c:46
 msgid ", help on "
 msgstr ""
 
 #. #define HELP
-#: LYMessages.c:50
+#: LYMessages.c:48
 msgid ""
 "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr ""
 
 #. #define MOREHELP
-#: LYMessages.c:52
+#: LYMessages.c:50
 msgid ""
 "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr ""
 
-#: LYMessages.c:53
+#: LYMessages.c:51
 msgid "-- press space for next page --"
 msgstr ""
 
-#: LYMessages.c:54
+#: LYMessages.c:52
 msgid "URL too long"
 msgstr ""
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:60
+#: LYMessages.c:58
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr ""
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:60
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr ""
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:64
+#: LYMessages.c:62
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:64
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr ""
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:68
+#: LYMessages.c:66
 #, c-format
 msgid ""
 "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr ""
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:68
 msgid ""
 "(Form field) Inactive. Press <return> to edit, press <return> twice to "
 "submit."
 msgstr ""
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:72
+#: LYMessages.c:70
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr ""
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:74
+#: LYMessages.c:72
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr ""
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:77
+#: LYMessages.c:75
 msgid ""
 "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:77
 msgid ""
 "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:81
+#: LYMessages.c:79
 msgid ""
 "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:83
+#: LYMessages.c:81
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:85
+#: LYMessages.c:83
 #, c-format
 msgid ""
 "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:87
+#: LYMessages.c:85
 msgid ""
 "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:87
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:91
+#: LYMessages.c:89
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:93
+#: LYMessages.c:91
 msgid ""
 "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:95
+#: LYMessages.c:93
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:97
+#: LYMessages.c:95
 msgid ""
 "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:99
+#: LYMessages.c:97
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr ""
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:99
 msgid ""
 "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:101
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:103
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr ""
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:105
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:109
+#: LYMessages.c:107
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr ""
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:111
+#: LYMessages.c:109
 msgid ""
 "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:113
+#: LYMessages.c:111
 msgid "Submit ('x' for no cache) to "
 msgstr ""
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:115
+#: LYMessages.c:113
 msgid "Submit to "
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:117
+#: LYMessages.c:115
 msgid ""
 "(Form submit button) Use right-arrow or <return> to submit ('x' for no "
 "cache)."
 msgstr ""
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:119
+#: LYMessages.c:117
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:121
+#: LYMessages.c:119
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:123
+#: LYMessages.c:121
 msgid "Submit mailto form to "
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:125
+#: LYMessages.c:123
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:125
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr ""
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:127
 msgid ""
 "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr ""
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:129
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:131
 msgid ""
 "(Option list) Hit return and use arrow keys and return to select option."
 msgstr ""
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:133
 msgid ""
 "(Choice list) Hit return and use arrow keys and return to select option."
 msgstr ""
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:135
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr ""
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:137
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr ""
 
-#: LYMessages.c:140
+#: LYMessages.c:138
 msgid "Submitting form..."
 msgstr ""
 
-#: LYMessages.c:141
+#: LYMessages.c:139
 msgid "Resetting form..."
 msgstr ""
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:141
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr ""
 
-#: LYMessages.c:144
+#: LYMessages.c:142
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr ""
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:147
+#: LYMessages.c:145
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr ""
 
-#: LYMessages.c:148
+#: LYMessages.c:146
 msgid "The resource requested is not available at this time."
 msgstr ""
 
-#: LYMessages.c:149
+#: LYMessages.c:147
 msgid "Enter Lynx keystroke command: "
 msgstr ""
 
-#: LYMessages.c:150
+#: LYMessages.c:148
 msgid "Looking up "
 msgstr ""
 
-#: LYMessages.c:151
+#: LYMessages.c:149
 #, c-format
 msgid "Getting %s"
 msgstr ""
 
-#: LYMessages.c:152
+#: LYMessages.c:150
 #, c-format
 msgid "Skipping %s"
 msgstr ""
 
-#: LYMessages.c:153
+#: LYMessages.c:151
 #, c-format
 msgid "Using %s"
 msgstr ""
 
-#: LYMessages.c:154
+#: LYMessages.c:152
 #, c-format
 msgid "Illegal URL: %s"
 msgstr ""
 
-#: LYMessages.c:155
+#: LYMessages.c:153
 #, c-format
 msgid "Badly formed address %s"
 msgstr ""
 
-#: LYMessages.c:156
+#: LYMessages.c:154
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: LYMessages.c:157
+#: LYMessages.c:155
 msgid "Unable to access WWW file!!!"
 msgstr ""
 
-#: LYMessages.c:158
+#: LYMessages.c:156
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr ""
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:160
+#: LYMessages.c:158
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr ""
 
-#: LYMessages.c:161
+#: LYMessages.c:159
 msgid "You have entered an invalid link number."
 msgstr ""
 
 #. #define SOURCE_HELP
-#: LYMessages.c:163
+#: LYMessages.c:161
 msgid ""
 "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr ""
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:165
+#: LYMessages.c:163
 msgid ""
 "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go "
 "back.  \n"
 msgstr ""
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:167
+#: LYMessages.c:165
 msgid ""
 " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history "
 "list \n"
 msgstr ""
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:169
+#: LYMessages.c:167
 msgid ""
 "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)"
 "uit  \n"
 msgstr ""
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:171
+#: LYMessages.c:169
 msgid ""
 "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search "
 "doc: / \n"
 msgstr ""
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:173
+#: LYMessages.c:171
 msgid ""
 "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)"
 "emove \n"
 msgstr ""
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:175
+#: LYMessages.c:173
 msgid ""
 "            Enter text into the field by typing on the keyboard              "
 msgstr ""
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:177
+#: LYMessages.c:175
 msgid ""
 "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr ""
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:179
+#: LYMessages.c:177
 msgid ""
 "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
 msgstr ""
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:181
+#: LYMessages.c:179
 #, c-format
 msgid ""
 "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr ""
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:183
+#: LYMessages.c:181
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
 msgstr ""
 
 #. mailto
-#: LYMessages.c:186
+#: LYMessages.c:184
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr ""
 
-#: LYMessages.c:187
+#: LYMessages.c:185
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr ""
 
-#: LYMessages.c:188
+#: LYMessages.c:186
 msgid "Mail disallowed!  Cannot submit."
 msgstr ""
 
-#: LYMessages.c:189
+#: LYMessages.c:187
 msgid "Mailto form submission failed!"
 msgstr ""
 
-#: LYMessages.c:190
+#: LYMessages.c:188
 msgid "Mailto form submission Cancelled!!!"
 msgstr ""
 
-#: LYMessages.c:191
+#: LYMessages.c:189
 msgid "Sending form content..."
 msgstr ""
 
-#: LYMessages.c:192
+#: LYMessages.c:190
 msgid "No email address is present in mailto URL!"
 msgstr ""
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:194
+#: LYMessages.c:192
 msgid "Unable to open temporary file for mailto URL!"
 msgstr ""
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:196
+#: LYMessages.c:194
 msgid "Do you wish to include the original message?"
 msgstr ""
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:196
 msgid "Do you wish to include the preparsed source?"
 msgstr ""
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:200
+#: LYMessages.c:198
 msgid "Spawning your selected editor to edit mail message"
 msgstr ""
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:202
+#: LYMessages.c:200
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr ""
 
-#: LYMessages.c:203
+#: LYMessages.c:201
 msgid "Send this comment?"
 msgstr ""
 
-#: LYMessages.c:204
+#: LYMessages.c:202
 msgid "Send this message?"
 msgstr ""
 
-#: LYMessages.c:205
+#: LYMessages.c:203
 msgid "Sending your message..."
 msgstr ""
 
-#: LYMessages.c:206
+#: LYMessages.c:204
 msgid "Sending your comment:"
 msgstr ""
 
 #. textarea
-#: LYMessages.c:209
+#: LYMessages.c:207
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr ""
 
-#: LYMessages.c:210
+#: LYMessages.c:208
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr ""
 
-#: LYMessages.c:213
+#: LYMessages.c:211
 msgid "file: ACTIONs are disallowed!"
 msgstr ""
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:213
 msgid "file: URLs via served links are disallowed!"
 msgstr ""
 
-#: LYMessages.c:216
+#: LYMessages.c:214
 msgid "Access to local files denied."
 msgstr ""
 
-#: LYMessages.c:217
+#: LYMessages.c:215
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr ""
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:217
 msgid "This special URL is not allowed in external documents!"
 msgstr ""
 
-#: LYMessages.c:220
+#: LYMessages.c:218
 msgid "Press <return> to return to Lynx."
 msgstr ""
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:221
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr ""
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:225
 msgid "Type EXIT to return to Lynx.\n"
 msgstr ""
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:228
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr ""
 
-#: LYMessages.c:233
+#: LYMessages.c:231
 msgid "Spawning is currently disabled."
 msgstr ""
 
-#: LYMessages.c:234
+#: LYMessages.c:232
 msgid "The 'd'ownload command is currently disabled."
 msgstr ""
 
-#: LYMessages.c:235
+#: LYMessages.c:233
 msgid "You cannot download an input field."
 msgstr ""
 
-#: LYMessages.c:236
+#: LYMessages.c:234
 msgid "Form has a mailto action!  Cannot download."
 msgstr ""
 
-#: LYMessages.c:237
+#: LYMessages.c:235
 msgid "You cannot download a mailto: link."
 msgstr ""
 
-#: LYMessages.c:238
+#: LYMessages.c:236
 msgid "You cannot download cookies."
 msgstr ""
 
-#: LYMessages.c:239
+#: LYMessages.c:237
 msgid "You cannot download a printing option."
 msgstr ""
 
-#: LYMessages.c:240
+#: LYMessages.c:238
 msgid "You cannot download an upload option."
 msgstr ""
 
-#: LYMessages.c:241
+#: LYMessages.c:239
 msgid "You cannot download an permit option."
 msgstr ""
 
-#: LYMessages.c:242
+#: LYMessages.c:240
 msgid "This special URL cannot be downloaded!"
 msgstr ""
 
-#: LYMessages.c:243
+#: LYMessages.c:241
 msgid "Nothing to download."
 msgstr ""
 
-#: LYMessages.c:244
+#: LYMessages.c:242
 msgid "Trace ON!"
 msgstr ""
 
-#: LYMessages.c:245
+#: LYMessages.c:243
 msgid "Trace OFF!"
 msgstr ""
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:245
 msgid "Links will be included for all images!  Reloading..."
 msgstr ""
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:247
 msgid "Standard image handling restored!  Reloading..."
 msgstr ""
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:249
 msgid ""
 "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr ""
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:251
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr ""
 
-#: LYMessages.c:254
+#: LYMessages.c:252
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr ""
 
-#: LYMessages.c:255
+#: LYMessages.c:253
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr ""
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:255
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr ""
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:257
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr ""
 
-#: LYMessages.c:260
+#: LYMessages.c:258
 msgid "Sorry, the document is not an http URL."
 msgstr ""
 
-#: LYMessages.c:261
+#: LYMessages.c:259
 msgid "Sorry, the link is not an http URL."
 msgstr ""
 
-#: LYMessages.c:262
+#: LYMessages.c:260
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr ""
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:262
 msgid "Sorry, the ACTION for this form is not an http URL."
 msgstr ""
 
-#: LYMessages.c:265
+#: LYMessages.c:263
 msgid "Not an http URL or form ACTION!"
 msgstr ""
 
-#: LYMessages.c:266
+#: LYMessages.c:264
 msgid "This special URL cannot be a form ACTION!"
 msgstr ""
 
-#: LYMessages.c:267
+#: LYMessages.c:265
 msgid "URL is not in starting realm!"
 msgstr ""
 
-#: LYMessages.c:268
+#: LYMessages.c:266
 msgid "News posting is disabled!"
 msgstr ""
 
-#: LYMessages.c:269
+#: LYMessages.c:267
 msgid "File management support is disabled!"
 msgstr ""
 
-#: LYMessages.c:270
+#: LYMessages.c:268
 msgid "No jump file is currently available."
 msgstr ""
 
-#: LYMessages.c:271
+#: LYMessages.c:269
 msgid "Jump to (use '?' for list): "
 msgstr ""
 
-#: LYMessages.c:272
+#: LYMessages.c:270
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr ""
 
-#: LYMessages.c:273
+#: LYMessages.c:271
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr ""
 
-#: LYMessages.c:274
+#: LYMessages.c:272
 msgid "No random URLs have been used thus far."
 msgstr ""
 
-#: LYMessages.c:275
+#: LYMessages.c:273
 msgid "Bookmark features are currently disabled."
 msgstr ""
 
-#: LYMessages.c:276
+#: LYMessages.c:274
 msgid "Execution via bookmarks is disabled."
 msgstr ""
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:276
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr ""
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:278
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr ""
 
-#: LYMessages.c:281
+#: LYMessages.c:279
 msgid "ERROR - unable to open bookmark file."
 msgstr ""
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:281
 msgid "Unable to open bookmark file for deletion of link."
 msgstr ""
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:283
 msgid "Unable to open scratch file for deletion of link."
 msgstr ""
 
-#: LYMessages.c:287
+#: LYMessages.c:285
 msgid "Error renaming scratch file."
 msgstr ""
 
-#: LYMessages.c:289
+#: LYMessages.c:287
 msgid "Error renaming temporary file."
 msgstr ""
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:289
 msgid "Unable to copy temporary file for deletion of link."
 msgstr ""
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:291
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr ""
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:294
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr ""
 
-#: LYMessages.c:297
+#: LYMessages.c:295
 msgid "Bookmark deletion failed."
 msgstr ""
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:297
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr ""
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:299
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr ""
 
-#: LYMessages.c:302
+#: LYMessages.c:300
 msgid "There are no links in this bookmark file!"
 msgstr ""
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:302
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr ""
 
-#: LYMessages.c:305
+#: LYMessages.c:303
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr ""
 
-#: LYMessages.c:306
+#: LYMessages.c:304
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr ""
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:308
+#: LYMessages.c:306
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr ""
 
-#: LYMessages.c:309
+#: LYMessages.c:307
 msgid "Cannot save form fields/links"
 msgstr ""
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:311
+#: LYMessages.c:309
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr ""
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:313
+#: LYMessages.c:311
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr ""
 
-#: LYMessages.c:314
+#: LYMessages.c:312
 msgid "Malformed address."
 msgstr ""
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:316
+#: LYMessages.c:314
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr ""
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:318
+#: LYMessages.c:316
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr ""
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:320
+#: LYMessages.c:318
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr ""
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:322
+#: LYMessages.c:320
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr ""
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:324
+#: LYMessages.c:322
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr ""
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:324
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr ""
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:328
+#: LYMessages.c:326
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr ""
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:330
+#: LYMessages.c:328
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr ""
 
-#: LYMessages.c:331
+#: LYMessages.c:329
 msgid "Soft double-quote parsing ON!"
 msgstr ""
 
-#: LYMessages.c:332
+#: LYMessages.c:330
 msgid "Soft double-quote parsing OFF!"
 msgstr ""
 
-#: LYMessages.c:333
+#: LYMessages.c:331
 msgid "Now using TagSoup parsing of HTML."
 msgstr ""
 
-#: LYMessages.c:334
+#: LYMessages.c:332
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr ""
 
-#: LYMessages.c:335
+#: LYMessages.c:333
 msgid "You are already at the end of this document."
 msgstr ""
 
-#: LYMessages.c:336
+#: LYMessages.c:334
 msgid "You are already at the beginning of this document."
 msgstr ""
 
-#: LYMessages.c:337
+#: LYMessages.c:335
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr ""
 
-#: LYMessages.c:338
+#: LYMessages.c:336
 #, c-format
 msgid "Link number %d already is current."
 msgstr ""
 
-#: LYMessages.c:339
+#: LYMessages.c:337
 msgid "You are already at the first document"
 msgstr ""
 
-#: LYMessages.c:340
+#: LYMessages.c:338
 msgid "There are no links above this line of the document."
 msgstr ""
 
-#: LYMessages.c:341
+#: LYMessages.c:339
 msgid "There are no links below this line of the document."
 msgstr ""
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:343
+#: LYMessages.c:341
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr ""
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:345
+#: LYMessages.c:343
 msgid "You are not on a form submission button or normal link."
 msgstr ""
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:347
+#: LYMessages.c:345
 msgid "One radio button must be checked at all times!"
 msgstr ""
 
-#: LYMessages.c:348
+#: LYMessages.c:346
 msgid "No submit button for this form, submit single text field?"
 msgstr ""
 
-#: LYMessages.c:349
+#: LYMessages.c:347
 msgid "Do you want to go back to the previous document?"
 msgstr ""
 
-#: LYMessages.c:350
+#: LYMessages.c:348
 msgid "Use arrows or tab to move off of field."
 msgstr ""
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:352
+#: LYMessages.c:350
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr ""
 
-#: LYMessages.c:353
+#: LYMessages.c:351
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr ""
 
-#: LYMessages.c:354
+#: LYMessages.c:352
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr ""
 
-#: LYMessages.c:355
+#: LYMessages.c:353
 msgid "Unable to create popup window!"
 msgstr ""
 
-#: LYMessages.c:356
+#: LYMessages.c:354
 msgid "Goto a random URL is disallowed!"
 msgstr ""
 
-#: LYMessages.c:357
+#: LYMessages.c:355
 msgid "Goto a non-http URL is disallowed!"
 msgstr ""
 
-#: LYMessages.c:358
+#: LYMessages.c:356
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr ""
 
-#: LYMessages.c:359
+#: LYMessages.c:357
 msgid "URL to open: "
 msgstr ""
 
-#: LYMessages.c:360
+#: LYMessages.c:358
 msgid "Edit the current Goto URL: "
 msgstr ""
 
-#: LYMessages.c:361
+#: LYMessages.c:359
 msgid "Edit the previous Goto URL: "
 msgstr ""
 
-#: LYMessages.c:362
+#: LYMessages.c:360
 msgid "Edit a previous Goto URL: "
 msgstr ""
 
-#: LYMessages.c:363
+#: LYMessages.c:361
 msgid "Current document has POST data."
 msgstr ""
 
-#: LYMessages.c:364
+#: LYMessages.c:362
 msgid "Edit this document's URL: "
 msgstr ""
 
-#: LYMessages.c:365
+#: LYMessages.c:363
 msgid "Edit the current link's URL: "
 msgstr ""
 
-#: LYMessages.c:366
+#: LYMessages.c:364
 msgid "You cannot edit File Management URLs"
 msgstr ""
 
-#: LYMessages.c:367
+#: LYMessages.c:365
 msgid "Enter a database query: "
 msgstr ""
 
-#: LYMessages.c:368
+#: LYMessages.c:366
 msgid "Enter a whereis query: "
 msgstr ""
 
-#: LYMessages.c:369
+#: LYMessages.c:367
 msgid "Edit the current query: "
 msgstr ""
 
-#: LYMessages.c:370
+#: LYMessages.c:368
 msgid "Edit the previous query: "
 msgstr ""
 
-#: LYMessages.c:371
+#: LYMessages.c:369
 msgid "Edit a previous query: "
 msgstr ""
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:373
+#: LYMessages.c:371
 msgid "Use Control-R to resubmit the current query."
 msgstr ""
 
-#: LYMessages.c:374
+#: LYMessages.c:372
 msgid "Edit the current shortcut: "
 msgstr ""
 
-#: LYMessages.c:375
+#: LYMessages.c:373
 msgid "Edit the previous shortcut: "
 msgstr ""
 
-#: LYMessages.c:376
+#: LYMessages.c:374
 msgid "Edit a previous shortcut: "
 msgstr ""
 
-#: LYMessages.c:377
+#: LYMessages.c:375
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr ""
 
-#: LYMessages.c:378
+#: LYMessages.c:376
 msgid "Cannot locate jump file!"
 msgstr ""
 
-#: LYMessages.c:379
+#: LYMessages.c:377
 msgid "Cannot open jump file!"
 msgstr ""
 
-#: LYMessages.c:380
+#: LYMessages.c:378
 msgid "Error reading jump file!"
 msgstr ""
 
-#: LYMessages.c:381
+#: LYMessages.c:379
 msgid "Out of memory reading jump file!"
 msgstr ""
 
-#: LYMessages.c:382
+#: LYMessages.c:380
 msgid "Out of memory reading jump table!"
 msgstr ""
 
-#: LYMessages.c:383
+#: LYMessages.c:381
 msgid "No index is currently available."
 msgstr ""
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:385
+#: LYMessages.c:383
 msgid "Do you really want to go to the Main screen?"
 msgstr ""
 
-#: LYMessages.c:386
+#: LYMessages.c:384
 msgid "You are already at main screen!"
 msgstr ""
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:388
+#: LYMessages.c:386
 msgid ""
 "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr ""
 
 #. #define NO_OWNER
-#: LYMessages.c:390
+#: LYMessages.c:388
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr ""
 
-#: LYMessages.c:391
+#: LYMessages.c:389
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr ""
 
-#: LYMessages.c:392
+#: LYMessages.c:390
 msgid "Do you wish to send a comment?"
 msgstr ""
 
-#: LYMessages.c:393
+#: LYMessages.c:391
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr ""
 
-#: LYMessages.c:394
+#: LYMessages.c:392
 msgid "The 'e'dit command is currently disabled."
 msgstr ""
 
-#: LYMessages.c:395
+#: LYMessages.c:393
 msgid "External editing is currently disabled."
 msgstr ""
 
-#: LYMessages.c:396
+#: LYMessages.c:394
 msgid "System error - failure to get status."
 msgstr ""
 
-#: LYMessages.c:397
+#: LYMessages.c:395
 msgid "No editor is defined!"
 msgstr ""
 
-#: LYMessages.c:398
+#: LYMessages.c:396
 msgid "The 'p'rint command is currently disabled."
 msgstr ""
 
-#: LYMessages.c:399
+#: LYMessages.c:397
 msgid "Document has no Toolbar links or Banner."
 msgstr ""
 
-#: LYMessages.c:400
+#: LYMessages.c:398
 msgid "Unable to open traversal file."
 msgstr ""
 
-#: LYMessages.c:401
+#: LYMessages.c:399
 msgid "Unable to open traversal found file."
 msgstr ""
 
-#: LYMessages.c:402
+#: LYMessages.c:400
 msgid "Unable to open reject file."
 msgstr ""
 
-#: LYMessages.c:403
+#: LYMessages.c:401
 msgid "Unable to open traversal errors output file"
 msgstr ""
 
-#: LYMessages.c:404
+#: LYMessages.c:402
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr ""
 
-#: LYMessages.c:405
+#: LYMessages.c:403
 msgid "Follow link (or goto link or page) number: "
 msgstr ""
 
-#: LYMessages.c:406
+#: LYMessages.c:404
 msgid "Select option (or page) number: "
 msgstr ""
 
-#: LYMessages.c:407
+#: LYMessages.c:405
 #, c-format
 msgid "Option number %d already is current."
 msgstr ""
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:409
+#: LYMessages.c:407
 msgid "You are already at the end of this option list."
 msgstr ""
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:411
+#: LYMessages.c:409
 msgid "You are already at the beginning of this option list."
 msgstr ""
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:413
+#: LYMessages.c:411
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr ""
 
-#: LYMessages.c:414
+#: LYMessages.c:412
 msgid "You have entered an invalid option number."
 msgstr ""
 
-#: LYMessages.c:415
+#: LYMessages.c:413
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr ""
 
-#: LYMessages.c:416
+#: LYMessages.c:414
 msgid "Give name of file to save in"
 msgstr ""
 
-#: LYMessages.c:417
+#: LYMessages.c:415
 msgid "Can't save data to file -- please run WWW locally"
 msgstr ""
 
-#: LYMessages.c:418
+#: LYMessages.c:416
 msgid "Can't open temporary file!"
 msgstr ""
 
-#: LYMessages.c:419
+#: LYMessages.c:417
 msgid "Can't open output file!  Cancelling!"
 msgstr ""
 
-#: LYMessages.c:420
+#: LYMessages.c:418
 msgid "Execution is disabled."
 msgstr ""
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:422
+#: LYMessages.c:420
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr ""
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:424
+#: LYMessages.c:422
 msgid "Execution capabilities are not compiled into this version."
 msgstr ""
 
-#: LYMessages.c:425
+#: LYMessages.c:423
 msgid "This file cannot be displayed on this terminal."
 msgstr ""
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:427
+#: LYMessages.c:425
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr ""
 
-#: LYMessages.c:428
+#: LYMessages.c:426
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr ""
 
-#: LYMessages.c:429
+#: LYMessages.c:427
 msgid "Cancelling file."
 msgstr ""
 
-#: LYMessages.c:430
+#: LYMessages.c:428
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr ""
 
-#: LYMessages.c:431
+#: LYMessages.c:429
 msgid "Enter a filename: "
 msgstr ""
 
-#: LYMessages.c:432
+#: LYMessages.c:430
 msgid "Edit the previous filename: "
 msgstr ""
 
-#: LYMessages.c:433
+#: LYMessages.c:431
 msgid "Edit a previous filename: "
 msgstr ""
 
-#: LYMessages.c:434
+#: LYMessages.c:432
 msgid "Enter a new filename: "
 msgstr ""
 
-#: LYMessages.c:435
+#: LYMessages.c:433
 msgid "File name may not begin with a dot."
 msgstr ""
 
-#: LYMessages.c:437
+#: LYMessages.c:435
 msgid "File exists.  Create higher version?"
 msgstr ""
 
-#: LYMessages.c:439
+#: LYMessages.c:437
 msgid "File exists.  Overwrite?"
 msgstr ""
 
-#: LYMessages.c:441
+#: LYMessages.c:439
 msgid "Cannot write to file."
 msgstr ""
 
-#: LYMessages.c:442
+#: LYMessages.c:440
 msgid "ERROR! - download command is misconfigured."
 msgstr ""
 
-#: LYMessages.c:443
+#: LYMessages.c:441
 msgid "Unable to download file."
 msgstr ""
 
-#: LYMessages.c:444
+#: LYMessages.c:442
 msgid "Reading directory..."
 msgstr ""
 
-#: LYMessages.c:445
+#: LYMessages.c:443
 msgid "Building directory listing..."
 msgstr ""
 
-#: LYMessages.c:446
+#: LYMessages.c:444
 msgid "Saving..."
 msgstr ""
 
-#: LYMessages.c:447
+#: LYMessages.c:445
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr ""
 
-#: LYMessages.c:448
+#: LYMessages.c:446
 msgid "Unable to access document!"
 msgstr ""
 
-#: LYMessages.c:449
+#: LYMessages.c:447
 msgid "Could not access file."
 msgstr ""
 
-#: LYMessages.c:450
+#: LYMessages.c:448
 msgid "Could not access directory."
 msgstr ""
 
-#: LYMessages.c:451
+#: LYMessages.c:449
 msgid "Could not load data."
 msgstr ""
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:453
+#: LYMessages.c:451
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr ""
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:455
+#: LYMessages.c:453
 msgid "This field cannot be (e)dited with an external editor."
 msgstr ""
 
-#: LYMessages.c:456
+#: LYMessages.c:454
 msgid "Bad rule"
 msgstr ""
 
-#: LYMessages.c:457
+#: LYMessages.c:455
 msgid "Insufficient operands:"
 msgstr ""
 
-#: LYMessages.c:458
+#: LYMessages.c:456
 msgid "You are not authorized to edit this file."
 msgstr ""
 
-#: LYMessages.c:459
+#: LYMessages.c:457
 msgid "Title: "
 msgstr ""
 
-#: LYMessages.c:460
+#: LYMessages.c:458
 msgid "Subject: "
 msgstr ""
 
-#: LYMessages.c:461
+#: LYMessages.c:459
 msgid "Username: "
 msgstr ""
 
-#: LYMessages.c:462
+#: LYMessages.c:460
 msgid "Password: "
 msgstr ""
 
-#: LYMessages.c:463
+#: LYMessages.c:461
 msgid "lynx: Username and Password required!!!"
 msgstr ""
 
-#: LYMessages.c:464
+#: LYMessages.c:462
 msgid "lynx: Password required!!!"
 msgstr ""
 
-#: LYMessages.c:465
+#: LYMessages.c:463
 msgid "Clear all authorization info for this session?"
 msgstr ""
 
-#: LYMessages.c:466
+#: LYMessages.c:464
 msgid "Authorization info cleared."
 msgstr ""
 
-#: LYMessages.c:467
+#: LYMessages.c:465
 msgid "Authorization failed.  Retry?"
 msgstr ""
 
-#: LYMessages.c:468
+#: LYMessages.c:466
 msgid "cgi support has been disabled."
 msgstr ""
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:470
+#: LYMessages.c:468
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr ""
 
-#: LYMessages.c:471
+#: LYMessages.c:469
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr ""
 
-#: LYMessages.c:472
+#: LYMessages.c:470
 msgid "Unable to set up connection."
 msgstr ""
 
-#: LYMessages.c:473
+#: LYMessages.c:471
 msgid "Unable to make connection"
 msgstr ""
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:475
+#: LYMessages.c:473
 msgid "Executable link rejected due to malformed request."
 msgstr ""
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:477
+#: LYMessages.c:475
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr ""
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:477
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr ""
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:479
 msgid "Executable link rejected due to location or path."
 msgstr ""
 
-#: LYMessages.c:482
+#: LYMessages.c:480
 msgid "Mail access is disabled!"
 msgstr ""
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:484
+#: LYMessages.c:482
 msgid "Only files and servers on the local host can be accessed."
 msgstr ""
 
-#: LYMessages.c:485
+#: LYMessages.c:483
 msgid "Telnet access is disabled!"
 msgstr ""
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:487
+#: LYMessages.c:485
 msgid "Telnet port specifications are disabled."
 msgstr ""
 
-#: LYMessages.c:488
+#: LYMessages.c:486
 msgid "USENET news access is disabled!"
 msgstr ""
 
-#: LYMessages.c:489
+#: LYMessages.c:487
 msgid "Rlogin access is disabled!"
 msgstr ""
 
-#: LYMessages.c:490
+#: LYMessages.c:488
 msgid "Ftp access is disabled!"
 msgstr ""
 
-#: LYMessages.c:491
+#: LYMessages.c:489
 msgid "There are no references from this document."
 msgstr ""
 
-#: LYMessages.c:492
+#: LYMessages.c:490
 msgid "There are only hidden links from this document."
 msgstr ""
 
-#: LYMessages.c:494
+#: LYMessages.c:492
 msgid "Unable to open command file."
 msgstr ""
 
-#: LYMessages.c:496
+#: LYMessages.c:494
 msgid "News Post Cancelled!!!"
 msgstr ""
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:498
+#: LYMessages.c:496
 msgid "Spawning your selected editor to edit news message"
 msgstr ""
 
-#: LYMessages.c:499
+#: LYMessages.c:497
 msgid "Post this message?"
 msgstr ""
 
-#: LYMessages.c:500
+#: LYMessages.c:498
 #, c-format
 msgid "Append '%s'?"
 msgstr ""
 
-#: LYMessages.c:501
+#: LYMessages.c:499
 msgid "Posting to newsgroup(s)..."
 msgstr ""
 
-#: LYMessages.c:503
+#: LYMessages.c:501
 msgid "*** You have unread mail. ***"
 msgstr ""
 
-#: LYMessages.c:505
+#: LYMessages.c:503
 msgid "*** You have mail. ***"
 msgstr ""
 
-#: LYMessages.c:507
+#: LYMessages.c:505
 msgid "*** You have new mail. ***"
 msgstr ""
 
-#: LYMessages.c:508
+#: LYMessages.c:506
 msgid "File insert cancelled!!!"
 msgstr ""
 
-#: LYMessages.c:509
+#: LYMessages.c:507
 msgid "Not enough memory for file!"
 msgstr ""
 
-#: LYMessages.c:510
+#: LYMessages.c:508
 msgid "Can't open file for reading."
 msgstr ""
 
-#: LYMessages.c:511
+#: LYMessages.c:509
 msgid "File does not exist."
 msgstr ""
 
-#: LYMessages.c:512
+#: LYMessages.c:510
 msgid "File does not exist - reenter or cancel:"
 msgstr ""
 
-#: LYMessages.c:513
+#: LYMessages.c:511
 msgid "File is not readable."
 msgstr ""
 
-#: LYMessages.c:514
+#: LYMessages.c:512
 msgid "File is not readable - reenter or cancel:"
 msgstr ""
 
-#: LYMessages.c:515
+#: LYMessages.c:513
 msgid "Nothing to insert - file is 0-length."
 msgstr ""
 
-#: LYMessages.c:516
+#: LYMessages.c:514
 msgid "Save request cancelled!!!"
 msgstr ""
 
-#: LYMessages.c:517
+#: LYMessages.c:515
 msgid "Mail request cancelled!!!"
 msgstr ""
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:519
+#: LYMessages.c:517
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr ""
 
-#: LYMessages.c:520
+#: LYMessages.c:518
 msgid "Please wait..."
 msgstr ""
 
-#: LYMessages.c:521
+#: LYMessages.c:519
 msgid "Mailing file.  Please wait..."
 msgstr ""
 
-#: LYMessages.c:522
+#: LYMessages.c:520
 msgid "ERROR - Unable to mail file"
 msgstr ""
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:524
+#: LYMessages.c:522
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr ""
 
-#: LYMessages.c:525
+#: LYMessages.c:523
 msgid "Print request cancelled!!!"
 msgstr ""
 
-#: LYMessages.c:526
+#: LYMessages.c:524
 msgid "Press <return> to begin: "
 msgstr ""
 
-#: LYMessages.c:527
+#: LYMessages.c:525
 msgid "Press <return> to finish: "
 msgstr ""
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:527
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr ""
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:531
+#: LYMessages.c:529
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr ""
 
-#: LYMessages.c:532
+#: LYMessages.c:530
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr ""
 
-#: LYMessages.c:533
+#: LYMessages.c:531
 msgid "Unable to open tempfile"
 msgstr ""
 
-#: LYMessages.c:534
+#: LYMessages.c:532
 msgid "Unable to open print options file"
 msgstr ""
 
-#: LYMessages.c:535
+#: LYMessages.c:533
 msgid "Printing file.  Please wait..."
 msgstr ""
 
-#: LYMessages.c:536
+#: LYMessages.c:534
 msgid "Please enter a valid internet mail address: "
 msgstr ""
 
-#: LYMessages.c:537
+#: LYMessages.c:535
 msgid "ERROR! - printer is misconfigured!"
 msgstr ""
 
-#: LYMessages.c:538
+#: LYMessages.c:536
 msgid "Image map from POST response not available!"
 msgstr ""
 
-#: LYMessages.c:539
+#: LYMessages.c:537
 msgid "Misdirected client-side image MAP request!"
 msgstr ""
 
-#: LYMessages.c:540
+#: LYMessages.c:538
 msgid "Client-side image MAP is not accessible!"
 msgstr ""
 
-#: LYMessages.c:541
+#: LYMessages.c:539
 msgid "No client-side image MAPs are available!"
 msgstr ""
 
-#: LYMessages.c:542
+#: LYMessages.c:540
 msgid "Client-side image MAP is not available!"
 msgstr ""
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:545
+#: LYMessages.c:543
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr ""
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:547
+#: LYMessages.c:545
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr ""
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:549
+#: LYMessages.c:547
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr ""
 
-#: LYMessages.c:551
+#: LYMessages.c:549
 msgid "That key requires Advanced User mode."
 msgstr ""
 
-#: LYMessages.c:552
+#: LYMessages.c:550
 #, c-format
 msgid "Content-type: %s"
 msgstr ""
 
-#: LYMessages.c:553
+#: LYMessages.c:551
 msgid "Command: "
 msgstr ""
 
-#: LYMessages.c:554
+#: LYMessages.c:552
 msgid "Unknown or ambiguous command"
 msgstr ""
 
-#: LYMessages.c:555
+#: LYMessages.c:553
 msgid " Version "
 msgstr ""
 
-#: LYMessages.c:556
+#: LYMessages.c:554
 msgid " first"
 msgstr ""
 
-#: LYMessages.c:557
+#: LYMessages.c:555
 msgid ", guessing..."
 msgstr ""
 
-#: LYMessages.c:558
+#: LYMessages.c:556
 msgid "Permissions for "
 msgstr ""
 
-#: LYMessages.c:559
+#: LYMessages.c:557
 msgid "Select "
 msgstr ""
 
-#: LYMessages.c:560
+#: LYMessages.c:558
 msgid "capital letter"
 msgstr ""
 
-#: LYMessages.c:561
+#: LYMessages.c:559
 msgid " of option line,"
 msgstr ""
 
-#: LYMessages.c:562
+#: LYMessages.c:560
 msgid " to save,"
 msgstr ""
 
-#: LYMessages.c:563
+#: LYMessages.c:561
 msgid " to "
 msgstr ""
 
-#: LYMessages.c:564
+#: LYMessages.c:562
 msgid " or "
 msgstr ""
 
-#: LYMessages.c:565
+#: LYMessages.c:563
 msgid " index"
 msgstr ""
 
-#: LYMessages.c:566
+#: LYMessages.c:564
 msgid " to return to Lynx."
 msgstr ""
 
-#: LYMessages.c:567
+#: LYMessages.c:565
 msgid "Accept Changes"
 msgstr ""
 
-#: LYMessages.c:568
+#: LYMessages.c:566
 msgid "Reset Changes"
 msgstr ""
 
-#: LYMessages.c:569
+#: LYMessages.c:567
 msgid "Left Arrow cancels changes"
 msgstr ""
 
-#: LYMessages.c:570
+#: LYMessages.c:568
 msgid "Save options to disk"
 msgstr ""
 
-#: LYMessages.c:571
+#: LYMessages.c:569
 msgid "Hit RETURN to accept entered data."
 msgstr ""
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:573
+#: LYMessages.c:571
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr ""
 
-#: LYMessages.c:574
+#: LYMessages.c:572
 msgid "Value accepted!"
 msgstr ""
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:576
+#: LYMessages.c:574
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr ""
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:578
+#: LYMessages.c:576
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr ""
 
-#: LYMessages.c:579
+#: LYMessages.c:577
 msgid "You are not allowed to change which editor to use!"
 msgstr ""
 
-#: LYMessages.c:580
+#: LYMessages.c:578
 msgid "Failed to set DISPLAY variable!"
 msgstr ""
 
-#: LYMessages.c:581
+#: LYMessages.c:579
 msgid "Failed to clear DISPLAY variable!"
 msgstr ""
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:583
+#: LYMessages.c:581
 msgid "You are not allowed to change the bookmark file!"
 msgstr ""
 
-#: LYMessages.c:584
+#: LYMessages.c:582
 msgid "Terminal does not support color"
 msgstr ""
 
-#: LYMessages.c:585
+#: LYMessages.c:583
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr ""
 
-#: LYMessages.c:586
+#: LYMessages.c:584
 msgid "Access to dot files is disabled!"
 msgstr ""
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:588
+#: LYMessages.c:586
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr ""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:590
+#: LYMessages.c:588
 msgid ""
 "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional "
 "deception!"
 msgstr ""
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:592
+#: LYMessages.c:590
 msgid "Changing of the User-Agent string is disabled!"
 msgstr ""
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:594
+#: LYMessages.c:592
 msgid "You are not allowed to change this setting."
 msgstr ""
 
-#: LYMessages.c:595
+#: LYMessages.c:593
 msgid "Saving Options..."
 msgstr ""
 
-#: LYMessages.c:596
+#: LYMessages.c:594
 msgid "Options saved!"
 msgstr ""
 
-#: LYMessages.c:597
+#: LYMessages.c:595
 msgid "Unable to save Options!"
 msgstr ""
 
-#: LYMessages.c:598
+#: LYMessages.c:596
 msgid " 'r' to return to Lynx "
 msgstr ""
 
-#: LYMessages.c:599
+#: LYMessages.c:597
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr ""
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:601
+#: LYMessages.c:599
 msgid "Hit any key to change value; RETURN to accept."
 msgstr ""
 
-#: LYMessages.c:602
+#: LYMessages.c:600
 msgid "Error uncompressing temporary file!"
 msgstr ""
 
-#: LYMessages.c:603
+#: LYMessages.c:601
 msgid "Unsupported URL scheme!"
 msgstr ""
 
-#: LYMessages.c:604
+#: LYMessages.c:602
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr ""
 
-#: LYMessages.c:605
+#: LYMessages.c:603
 msgid "Redirection limit of 10 URL's reached."
 msgstr ""
 
-#: LYMessages.c:606
+#: LYMessages.c:604
 msgid "Illegal redirection URL received from server!"
 msgstr ""
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:608
+#: LYMessages.c:606
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr ""
 
-#: LYMessages.c:611
+#: LYMessages.c:609
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr ""
 
-#: LYMessages.c:612
+#: LYMessages.c:610
 msgid "P)roceed, or C)ancel "
 msgstr ""
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:614
+#: LYMessages.c:612
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr ""
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:614
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr ""
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:618
+#: LYMessages.c:616
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr ""
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:620
+#: LYMessages.c:618
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr ""
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:622
+#: LYMessages.c:620
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr ""
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:624
+#: LYMessages.c:622
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr ""
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:624
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr ""
 
-#: LYMessages.c:627
+#: LYMessages.c:625
 msgid "Proceed without a username and password?"
 msgstr ""
 
-#: LYMessages.c:628
+#: LYMessages.c:626
 #, c-format
 msgid "Proceed (%s)?"
 msgstr ""
 
-#: LYMessages.c:629
+#: LYMessages.c:627
 msgid "Cannot POST to this host."
 msgstr ""
 
-#: LYMessages.c:630
+#: LYMessages.c:628
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr ""
 
-#: LYMessages.c:631
+#: LYMessages.c:629
 msgid "Discarding POST data..."
 msgstr ""
 
-#: LYMessages.c:632
+#: LYMessages.c:630
 msgid "Document will not be reloaded!"
 msgstr ""
 
-#: LYMessages.c:633
+#: LYMessages.c:631
 msgid "Location: "
 msgstr ""
 
-#: LYMessages.c:634
+#: LYMessages.c:632
 #, c-format
 msgid "'%s' not found!"
 msgstr ""
 
-#: LYMessages.c:635
+#: LYMessages.c:633
 msgid "Default Bookmark File"
 msgstr ""
 
-#: LYMessages.c:636
+#: LYMessages.c:634
 msgid "Screen too small! (8x35 min)"
 msgstr ""
 
-#: LYMessages.c:637
+#: LYMessages.c:635
 msgid "Select destination or ^G to Cancel: "
 msgstr ""
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:639
+#: LYMessages.c:637
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr ""
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:641
+#: LYMessages.c:639
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr ""
 
-#: LYMessages.c:642
+#: LYMessages.c:640
 msgid "Multiple bookmark support is not available."
 msgstr ""
 
-#: LYMessages.c:643
+#: LYMessages.c:641
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr ""
 
-#: LYMessages.c:644
+#: LYMessages.c:642
 msgid "       Select Bookmark"
 msgstr ""
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:646
+#: LYMessages.c:644
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr ""
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:648
+#: LYMessages.c:646
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr ""
 
-#: LYMessages.c:649
+#: LYMessages.c:647
 msgid "Letter: "
 msgstr ""
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:652
+#: LYMessages.c:650
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr ""
 
-#: LYMessages.c:654
+#: LYMessages.c:652
 msgid "Use a filepath off your home directory!"
 msgstr ""
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:657
+#: LYMessages.c:655
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr ""
 
 #. #define MAXHIST_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:657
 msgid "History List maximum reached!  Document not pushed."
 msgstr ""
 
-#: LYMessages.c:660
+#: LYMessages.c:658
 msgid "No previously visited links available!"
 msgstr ""
 
-#: LYMessages.c:661
+#: LYMessages.c:659
 msgid "Memory exhausted!  Program aborted!"
 msgstr ""
 
-#: LYMessages.c:662
+#: LYMessages.c:660
 msgid "Memory exhausted!  Aborting..."
 msgstr ""
 
-#: LYMessages.c:663
+#: LYMessages.c:661
 msgid "Not enough memory!"
 msgstr ""
 
-#: LYMessages.c:664
+#: LYMessages.c:662
 msgid "Directory/File Manager not available"
 msgstr ""
 
-#: LYMessages.c:665
+#: LYMessages.c:663
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr ""
 
-#: LYMessages.c:666
+#: LYMessages.c:664
 msgid "Location URL is not absolute."
 msgstr ""
 
-#: LYMessages.c:667
+#: LYMessages.c:665
 msgid "Refresh URL is not absolute."
 msgstr ""
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:667
 msgid ""
 "You are sending a message with body to:\n"
 "  "
 msgstr ""
 
-#: LYMessages.c:670
+#: LYMessages.c:668
 msgid ""
 "You are sending a comment to:\n"
 "  "
 msgstr ""
 
-#: LYMessages.c:671
+#: LYMessages.c:669
 msgid ""
 "\n"
 " With copy to:\n"
 "  "
 msgstr ""
 
-#: LYMessages.c:672
+#: LYMessages.c:670
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2092,7 +2089,7 @@ msgid ""
 msgstr ""
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:672
 msgid ""
 "\n"
 "\n"
@@ -2100,79 +2097,79 @@ msgid ""
 msgstr ""
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:674
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
 msgstr ""
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:676
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
 msgstr ""
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:678
 msgid " means to contact you, if you desire a response.\n"
 msgstr ""
 
-#: LYMessages.c:681
+#: LYMessages.c:679
 msgid ""
 "\n"
 " Please enter a subject line.\n"
 msgstr ""
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
 msgstr ""
 
-#: LYMessages.c:684
+#: LYMessages.c:682
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr ""
 
-#: LYMessages.c:685
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please review the message body:\n"
 "\n"
 msgstr ""
 
-#: LYMessages.c:686
+#: LYMessages.c:684
 msgid ""
 "\n"
 "Press RETURN to continue: "
 msgstr ""
 
-#: LYMessages.c:687
+#: LYMessages.c:685
 msgid ""
 "\n"
 "Press RETURN to clean up: "
 msgstr ""
 
-#: LYMessages.c:688
+#: LYMessages.c:686
 msgid " Use Control-U to erase the default.\n"
 msgstr ""
 
-#: LYMessages.c:689
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please enter your message below."
 msgstr ""
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:380
+#: LYMessages.c:689 src/LYNews.c:361
 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:381
+#: LYMessages.c:691 src/LYNews.c:362
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2180,502 +2177,506 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:695
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr ""
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:697
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr ""
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:699
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr ""
 
-#: LYMessages.c:702
+#: LYMessages.c:700
 msgid "Allowing this cookie."
 msgstr ""
 
-#: LYMessages.c:703
+#: LYMessages.c:701
 msgid "Rejecting this cookie."
 msgstr ""
 
-#: LYMessages.c:704
+#: LYMessages.c:702
 msgid "The Cookie Jar is empty."
 msgstr ""
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:706
+#: LYMessages.c:704
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr ""
 
-#: LYMessages.c:707
+#: LYMessages.c:705
 msgid "or to change a domain's 'allow' setting."
 msgstr ""
 
-#: LYMessages.c:708
+#: LYMessages.c:706
 msgid "(Cookies never allowed.)"
 msgstr ""
 
-#: LYMessages.c:709
+#: LYMessages.c:707
 msgid "(Cookies always allowed.)"
 msgstr ""
 
-#: LYMessages.c:710
+#: LYMessages.c:708
 msgid "(Cookies allowed via prompt.)"
 msgstr ""
 
-#: LYMessages.c:711
+#: LYMessages.c:709
 msgid "(Persistent Cookies.)"
 msgstr ""
 
-#: LYMessages.c:712
+#: LYMessages.c:710
 msgid "(No title.)"
 msgstr ""
 
-#: LYMessages.c:713
+#: LYMessages.c:711
 msgid "(No name.)"
 msgstr ""
 
-#: LYMessages.c:714
+#: LYMessages.c:712
 msgid "(No value.)"
 msgstr ""
 
-#: LYMessages.c:715
+#: LYMessages.c:713
 msgid "None"
 msgstr ""
 
-#: LYMessages.c:716
+#: LYMessages.c:714
 msgid "(End of session.)"
 msgstr ""
 
-#: LYMessages.c:717
+#: LYMessages.c:715
 msgid "Delete this cookie?"
 msgstr ""
 
-#: LYMessages.c:718
+#: LYMessages.c:716
 msgid "The cookie has been eaten!"
 msgstr ""
 
-#: LYMessages.c:719
+#: LYMessages.c:717
 msgid "Delete this empty domain?"
 msgstr ""
 
-#: LYMessages.c:720
+#: LYMessages.c:718
 msgid "The domain has been eaten!"
 msgstr ""
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:722
+#: LYMessages.c:720
 msgid ""
 "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr ""
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:724
+#: LYMessages.c:722
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr ""
 
-#: LYMessages.c:725
+#: LYMessages.c:723
 msgid "All cookies in the domain have been eaten!"
 msgstr ""
 
-#: LYMessages.c:726
+#: LYMessages.c:724
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr ""
 
-#: LYMessages.c:727
+#: LYMessages.c:725
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr ""
 
-#: LYMessages.c:728
+#: LYMessages.c:726
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr ""
 
-#: LYMessages.c:729
+#: LYMessages.c:727
 msgid "Delete all cookies in this domain?"
 msgstr ""
 
-#: LYMessages.c:730
+#: LYMessages.c:728
 msgid "All of the cookies in the jar have been eaten!"
 msgstr ""
 
-#: LYMessages.c:732
+#: LYMessages.c:730
 msgid "Port 19 not permitted in URLs."
 msgstr ""
 
-#: LYMessages.c:733
+#: LYMessages.c:731
 msgid "Port 25 not permitted in URLs."
 msgstr ""
 
-#: LYMessages.c:734
+#: LYMessages.c:732
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr ""
 
-#: LYMessages.c:735
+#: LYMessages.c:733
 msgid "URL has a bad port field."
 msgstr ""
 
-#: LYMessages.c:736
+#: LYMessages.c:734
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr ""
 
-#: LYMessages.c:737
+#: LYMessages.c:735
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr ""
 
-#: LYMessages.c:738
+#: LYMessages.c:736
 msgid "Trace Log open failed.  Trace off!"
 msgstr ""
 
-#: LYMessages.c:739
+#: LYMessages.c:737
 msgid "Lynx Trace Log"
 msgstr ""
 
-#: LYMessages.c:740
+#: LYMessages.c:738
 msgid "No trace log has been started for this session."
 msgstr ""
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:742
+#: LYMessages.c:740
 msgid "The maximum temporary file count has been reached!"
 msgstr ""
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:744
+#: LYMessages.c:742
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr ""
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:746
+#: LYMessages.c:744
 msgid "Modified tail combined with head of form field value."
 msgstr ""
 
 #. HTFile.c
-#: LYMessages.c:749
+#: LYMessages.c:747
 msgid "Directory"
 msgstr ""
 
-#: LYMessages.c:750
+#: LYMessages.c:748
 msgid "Directory browsing is not allowed."
 msgstr ""
 
-#: LYMessages.c:751
+#: LYMessages.c:749
 msgid "Selective access is not enabled for this directory"
 msgstr ""
 
-#: LYMessages.c:752
+#: LYMessages.c:750
 msgid "Multiformat: directory scan failed."
 msgstr ""
 
-#: LYMessages.c:753
+#: LYMessages.c:751
 msgid "This directory is not readable."
 msgstr ""
 
-#: LYMessages.c:754
+#: LYMessages.c:752
 msgid "Can't access requested file."
 msgstr ""
 
-#: LYMessages.c:755
+#: LYMessages.c:753
 msgid "Could not find suitable representation for transmission."
 msgstr ""
 
-#: LYMessages.c:756
+#: LYMessages.c:754
 msgid "Could not open file for decompression!"
 msgstr ""
 
-#: LYMessages.c:757
+#: LYMessages.c:755
 msgid "Files:"
 msgstr ""
 
-#: LYMessages.c:758
+#: LYMessages.c:756
 msgid "Subdirectories:"
 msgstr ""
 
-#: LYMessages.c:759
+#: LYMessages.c:757
 msgid " directory"
 msgstr ""
 
-#: LYMessages.c:760
+#: LYMessages.c:758
 msgid "Up to "
 msgstr ""
 
-#: LYMessages.c:761
+#: LYMessages.c:759
 msgid "Current directory is "
 msgstr ""
 
 #. HTGopher.c
-#: LYMessages.c:764
+#: LYMessages.c:762
 msgid "No response from server!"
 msgstr ""
 
-#: LYMessages.c:765
+#: LYMessages.c:763
 msgid "CSO index"
 msgstr ""
 
-#: LYMessages.c:766
+#: LYMessages.c:764
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
 msgstr ""
 
-#: LYMessages.c:767
+#: LYMessages.c:765
 msgid "CSO Search Results"
 msgstr ""
 
-#: LYMessages.c:768
+#: LYMessages.c:766
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr ""
 
-#: LYMessages.c:769
+#: LYMessages.c:767
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
 msgstr ""
 
-#: LYMessages.c:770
+#: LYMessages.c:768
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
 msgstr ""
 
-#: LYMessages.c:771
+#: LYMessages.c:769
 msgid "Gopher index"
 msgstr ""
 
-#: LYMessages.c:772
+#: LYMessages.c:770
 msgid "Gopher Menu"
 msgstr ""
 
-#: LYMessages.c:773
+#: LYMessages.c:771
 msgid " Search Results"
 msgstr ""
 
-#: LYMessages.c:774
+#: LYMessages.c:772
 msgid "Sending CSO/PH request."
 msgstr ""
 
-#: LYMessages.c:775
+#: LYMessages.c:773
 msgid "Sending Gopher request."
 msgstr ""
 
-#: LYMessages.c:776
+#: LYMessages.c:774
 msgid "CSO/PH request sent; waiting for response."
 msgstr ""
 
-#: LYMessages.c:777
+#: LYMessages.c:775
 msgid "Gopher request sent; waiting for response."
 msgstr ""
 
-#: LYMessages.c:778
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Please enter search keywords.\n"
 msgstr ""
 
-#: LYMessages.c:779
+#: LYMessages.c:777
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
 msgstr ""
 
-#: LYMessages.c:780
+#: LYMessages.c:778
 msgid " person's name in the database.\n"
 msgstr ""
 
 #. HTNews.c
-#: LYMessages.c:783
+#: LYMessages.c:781
 msgid "Connection closed ???"
 msgstr ""
 
-#: LYMessages.c:784
+#: LYMessages.c:782
 msgid "Cannot open temporary file for news POST."
 msgstr ""
 
-#: LYMessages.c:785
+#: LYMessages.c:783
 msgid "This client does not contain support for posting to news with SSL."
 msgstr ""
 
 #. HTStyle.c
-#: LYMessages.c:788
+#: LYMessages.c:786
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr ""
 
-#: LYMessages.c:789
+#: LYMessages.c:787
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr ""
 
-#: LYMessages.c:790
+#: LYMessages.c:788
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr ""
 
-#: LYMessages.c:791
+#: LYMessages.c:789
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr ""
 
 #. HTTP.c
-#: LYMessages.c:794
+#: LYMessages.c:792
 msgid "Can't proceed without a username and password."
 msgstr ""
 
-#: LYMessages.c:795
+#: LYMessages.c:793
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr ""
 
-#: LYMessages.c:796
+#: LYMessages.c:794
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr ""
 
-#: LYMessages.c:797
+#: LYMessages.c:795
 msgid "Retrying with proxy authorization information."
 msgstr ""
 
 #. HTWAIS.c
-#: LYMessages.c:800
+#: LYMessages.c:798
 msgid "HTWAIS: Return message too large."
 msgstr ""
 
-#: LYMessages.c:801
+#: LYMessages.c:799
 msgid "Enter WAIS query: "
 msgstr ""
 
 #. Miscellaneous status
-#: LYMessages.c:804
+#: LYMessages.c:802
 msgid "Retrying as HTTP0 request."
 msgstr ""
 
-#: LYMessages.c:805
+#: LYMessages.c:803
 #, c-format
 msgid "Transferred %d bytes"
 msgstr ""
 
-#: LYMessages.c:806
+#: LYMessages.c:804
 msgid "Data transfer complete"
 msgstr ""
 
-#: LYMessages.c:807
+#: LYMessages.c:805
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr ""
 
 #. Lynx internal page titles
-#: LYMessages.c:810
+#: LYMessages.c:808
 msgid "Address List Page"
 msgstr ""
 
-#: LYMessages.c:811
+#: LYMessages.c:809
 msgid "Bookmark file"
 msgstr ""
 
-#: LYMessages.c:812
+#: LYMessages.c:810
 msgid "Configuration Definitions"
 msgstr ""
 
-#: LYMessages.c:813
+#: LYMessages.c:811
 msgid "Cookie Jar"
 msgstr ""
 
-#: LYMessages.c:814
+#: LYMessages.c:812
 msgid "Current Key Map"
 msgstr ""
 
-#: LYMessages.c:815
+#: LYMessages.c:813
 msgid "File Management Options"
 msgstr ""
 
-#: LYMessages.c:816
+#: LYMessages.c:814
 msgid "Download Options"
 msgstr ""
 
-#: LYMessages.c:817
+#: LYMessages.c:815
 msgid "History Page"
 msgstr ""
 
-#: LYMessages.c:818
+#: LYMessages.c:816
 msgid "List Page"
 msgstr ""
 
-#: LYMessages.c:819
+#: LYMessages.c:817
 msgid "Lynx.cfg Information"
 msgstr ""
 
-#: LYMessages.c:820
+#: LYMessages.c:818
 msgid "Converted Mosaic Hotlist"
 msgstr ""
 
-#: LYMessages.c:821
+#: LYMessages.c:819
 msgid "Options Menu"
 msgstr ""
 
-#: LYMessages.c:822
+#: LYMessages.c:820
 msgid "File Permission Options"
 msgstr ""
 
-#: LYMessages.c:823
+#: LYMessages.c:821
 msgid "Printing Options"
 msgstr ""
 
-#: LYMessages.c:824
+#: LYMessages.c:822
 msgid "Information about the current document"
 msgstr ""
 
-#: LYMessages.c:825
+#: LYMessages.c:823
 msgid "Your recent statusline messages"
 msgstr ""
 
-#: LYMessages.c:826
+#: LYMessages.c:824
 msgid "Upload Options"
 msgstr ""
 
-#: LYMessages.c:827
+#: LYMessages.c:825
 msgid "Visited Links Page"
 msgstr ""
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:830
+#: LYMessages.c:828
 msgid "See also"
 msgstr ""
 
-#: LYMessages.c:831
+#: LYMessages.c:829
 msgid "your"
 msgstr ""
 
-#: LYMessages.c:832
+#: LYMessages.c:830
 msgid "for runtime options"
 msgstr ""
 
-#: LYMessages.c:833
+#: LYMessages.c:831
 msgid "compile time options"
 msgstr ""
 
-#: LYMessages.c:834
+#: LYMessages.c:832
+msgid "color-style configuration"
+msgstr ""
+
+#: LYMessages.c:833
 msgid "latest release"
 msgstr ""
 
-#: LYMessages.c:835
+#: LYMessages.c:834
 msgid "pre-release version"
 msgstr ""
 
-#: LYMessages.c:836
+#: LYMessages.c:835
 msgid "development version"
 msgstr ""
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:838
+#: LYMessages.c:837
 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"
@@ -2683,113 +2684,117 @@ msgid ""
 msgstr ""
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:842
+#: LYMessages.c:841
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
 msgstr ""
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:847
+#: LYMessages.c:846
 msgid ""
 "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)"
 "pload     \n"
 msgstr ""
 
-#: LYMessages.c:848
+#: LYMessages.c:847
 msgid "Failed to obtain status of current link!"
 msgstr ""
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:851
+#: LYMessages.c:850
 msgid "Special URL only valid from current File Permission menu!"
 msgstr ""
 
-#: LYMessages.c:855
+#: LYMessages.c:854
 msgid "External support is currently disabled."
 msgstr ""
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:859
+#: LYMessages.c:858
 msgid "Changing working-directory is currently disabled."
 msgstr ""
 
-#: LYMessages.c:860
+#: LYMessages.c:859
 msgid "Linewrap OFF!"
 msgstr ""
 
-#: LYMessages.c:861
+#: LYMessages.c:860
 msgid "Linewrap ON!"
 msgstr ""
 
-#: LYMessages.c:862
+#: LYMessages.c:861
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr ""
 
-#: LYMessages.c:863
+#: LYMessages.c:862
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr ""
 
-#: LYMessages.c:864
+#: LYMessages.c:863
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr ""
 
-#: LYMessages.c:865
+#: LYMessages.c:864
 msgid "Trace not supported"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:648
+#: WWW/Library/Implementation/HTAABrow.c:647
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:914
+#: WWW/Library/Implementation/HTAABrow.c:913
 msgid ""
 "This client doesn't know how to compose proxy authorization information for "
 "scheme"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:989
+#: WWW/Library/Implementation/HTAABrow.c:988
 msgid ""
 "This client doesn't know how to compose authorization information for scheme"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:1097
+#: WWW/Library/Implementation/HTAABrow.c:1096
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:1201
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:1260
+#: WWW/Library/Implementation/HTAABrow.c:1259
 msgid "Access without authorization denied -- retrying"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:683
+#: WWW/Library/Implementation/HTAccess.c:677
 msgid "Access forbidden by rule"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:785
+#: WWW/Library/Implementation/HTAccess.c:779
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1026 src/GridText.c:8039
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8311
 msgid "Loading incomplete."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1056
+#: WWW/Library/Implementation/HTAccess.c:1077
 msgid ""
 "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1058
+#: WWW/Library/Implementation/HTAccess.c:1079
 msgid ""
 "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1059
+#: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr ""
@@ -2798,28 +2803,28 @@ msgstr ""
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7834
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7735
 msgid "Can't Access"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1073
+#: WWW/Library/Implementation/HTAccess.c:1094
 msgid "Unable to access document."
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:756
+#: WWW/Library/Implementation/HTFTP.c:766
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:784
+#: WWW/Library/Implementation/HTFTP.c:794
 msgid "Unable to connect to FTP host."
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:1054
+#: WWW/Library/Implementation/HTFTP.c:1064
 msgid "close master socket"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:1116
+#: WWW/Library/Implementation/HTFTP.c:1126
 msgid "socket for master socket"
 msgstr ""
 
@@ -2828,37 +2833,37 @@ msgstr ""
 #. **  knowing if it is symbolic?	I think so since
 #. **  it might be a directory.
 #.
-#: WWW/Library/Implementation/HTFTP.c:1630
-#: WWW/Library/Implementation/HTFTP.c:2251
+#: WWW/Library/Implementation/HTFTP.c:1640
+#: WWW/Library/Implementation/HTFTP.c:2261
 msgid "Symbolic Link"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:2612
+#: WWW/Library/Implementation/HTFTP.c:2622
 msgid "Receiving FTP directory."
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:2755
+#: WWW/Library/Implementation/HTFTP.c:2762
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3083
 msgid "connect for data"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:3690
+#: WWW/Library/Implementation/HTFTP.c:3731
 msgid "Receiving FTP file."
 msgstr ""
 
-#: WWW/Library/Implementation/HTFinger.c:275
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
 msgstr ""
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFinger.c:328
+#: WWW/Library/Implementation/HTFinger.c:331
 msgid "Invalid port number - will only use port 79!"
 msgstr ""
 
@@ -2866,7 +2871,7 @@ msgstr ""
 msgid "Could not access finger host."
 msgstr ""
 
-#: WWW/Library/Implementation/HTFinger.c:407
+#: WWW/Library/Implementation/HTFinger.c:404
 msgid "No response from finger server."
 msgstr ""
 
@@ -2892,18 +2897,18 @@ msgstr ""
 msgid "Change password?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1691
+#: WWW/Library/Implementation/HTNews.c:1690
 #, c-format
 msgid "No matches for: %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1744
+#: WWW/Library/Implementation/HTNews.c:1743
 msgid ""
 "\n"
 "No articles in this group.\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1757
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2912,16 +2917,16 @@ msgstr ""
 #.
 #. **	Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1770
+#: WWW/Library/Implementation/HTNews.c:1769
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1792
+#: WWW/Library/Implementation/HTNews.c:1791
 msgid "Earlier articles"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1805
+#: WWW/Library/Implementation/HTNews.c:1804
 #, c-format
 msgid ""
 "\n"
@@ -2929,41 +2934,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1865
+#: WWW/Library/Implementation/HTNews.c:1864
 msgid "All available articles in "
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2081
+#: WWW/Library/Implementation/HTNews.c:2080
 msgid "Later articles"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2105
+#: WWW/Library/Implementation/HTNews.c:2104
 msgid "Post to "
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2323
+#: WWW/Library/Implementation/HTNews.c:2322
 msgid "This client does not contain support for SNEWS URLs."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2531
+#: WWW/Library/Implementation/HTNews.c:2530
 msgid "No target for raw text!"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2561
+#: WWW/Library/Implementation/HTNews.c:2560
 msgid "Connecting to NewsHost ..."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2612
+#: WWW/Library/Implementation/HTNews.c:2611
 #, c-format
 msgid "Could not access %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2712
+#: WWW/Library/Implementation/HTNews.c:2711
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2716
+#: WWW/Library/Implementation/HTNews.c:2715
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr ""
@@ -2971,35 +2976,35 @@ msgstr ""
 #.
 #. **	List available newsgroups. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2920
+#: WWW/Library/Implementation/HTNews.c:2919
 msgid "Reading list of available newsgroups."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2942
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of articles in newsgroup."
 msgstr ""
 
 #.
 #. **	Get an article from a news group. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2948
+#: WWW/Library/Implementation/HTNews.c:2947
 msgid "Reading news article."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2978
+#: WWW/Library/Implementation/HTNews.c:2977
 msgid "Sorry, could not load requested news."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1233
+#: WWW/Library/Implementation/HTTCP.c:1239
 msgid "Address has invalid port"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1336
+#: WWW/Library/Implementation/HTTCP.c:1327
 msgid "Address length looks invalid"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1574
-#: WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1560
+#: WWW/Library/Implementation/HTTCP.c:1578
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr ""
@@ -3008,63 +3013,86 @@ msgstr ""
 #. *  immediately; but not HTAlert, because typically
 #. *  there will be other alerts from the callers. - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1589
+#: WWW/Library/Implementation/HTTCP.c:1575
 #: WWW/Library/Implementation/HTTelnet.c:103
 #, c-format
 msgid "Invalid hostname %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1603
+#: WWW/Library/Implementation/HTTCP.c:1589
 #, c-format
 msgid "Making %s connection to %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1619
+#: WWW/Library/Implementation/HTTCP.c:1605
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1628
+#: WWW/Library/Implementation/HTTCP.c:1614
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1648
+#: WWW/Library/Implementation/HTTCP.c:1634
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1717
+#: WWW/Library/Implementation/HTTCP.c:1703
 msgid "Connection failed (too many retries)."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1910
+#: WWW/Library/Implementation/HTTCP.c:1897
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1976
+#: WWW/Library/Implementation/HTTCP.c:1964
 msgid "Socket read failed for 180,000 tries."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:466
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:503
 msgid "This client does not contain support for HTTPS URLs."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:491
+#: WWW/Library/Implementation/HTTP.c:528
 msgid "Unable to connect to remote host."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1005
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1091
 msgid "Sending HTTP request."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1039
+#: WWW/Library/Implementation/HTTP.c:1125
 msgid "Unexpected network write error; connection aborted."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1045
+#: WWW/Library/Implementation/HTTP.c:1131
 msgid "HTTP request sent; waiting for response."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1109
+#: WWW/Library/Implementation/HTTP.c:1195
 msgid "Unexpected network read error; connection aborted."
 msgstr ""
 
@@ -3078,7 +3106,7 @@ msgstr ""
 #. **	so we'll deal with them by showing the full
 #. **	header to the user as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1305
+#: WWW/Library/Implementation/HTTP.c:1391
 msgid "Got unexpected Informational Status."
 msgstr ""
 
@@ -3089,7 +3117,7 @@ msgstr ""
 #. *  user to do that, and restore the current
 #. *  document. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1340
+#: WWW/Library/Implementation/HTTP.c:1426
 msgid "Request fulfilled.  Reset Content."
 msgstr ""
 
@@ -3100,27 +3128,27 @@ msgstr ""
 #. *  with it by showing the full header to the user
 #. *  as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1459
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "Got unexpected 304 Not Modified status."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1526
+#: WWW/Library/Implementation/HTTP.c:1612
 msgid "Redirection of POST content requires user approval."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1541
+#: WWW/Library/Implementation/HTTP.c:1627
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1586
+#: WWW/Library/Implementation/HTTP.c:1672
 msgid "Retrying with access authorization information."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1684
 msgid "Show the 401 message body?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1643
+#: WWW/Library/Implementation/HTTP.c:1729
 msgid "Show the 407 message body?"
 msgstr ""
 
@@ -3129,7 +3157,7 @@ msgstr ""
 #. **	Take a chance and hope there is
 #. **	something to display. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1748
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Unknown status reply from server!"
 msgstr ""
 
@@ -3203,74 +3231,74 @@ msgid ""
 "Code record, can't display\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:691
+#: WWW/Library/Implementation/HTWAIS.c:689
 msgid "Syntax error in WAIS URL"
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:761
+#: WWW/Library/Implementation/HTWAIS.c:759
 msgid " (WAIS Index)"
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:766
 msgid "WAIS Index: "
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:774
+#: WWW/Library/Implementation/HTWAIS.c:772
 msgid "This is a link for searching the "
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:778
+#: WWW/Library/Implementation/HTWAIS.c:776
 msgid " WAIS Index.\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:805
+#: WWW/Library/Implementation/HTWAIS.c:803
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:827
+#: WWW/Library/Implementation/HTWAIS.c:825
 msgid " (in "
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:834
 msgid "WAIS Search of \""
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:840
+#: WWW/Library/Implementation/HTWAIS.c:838
 msgid "\" in: "
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:855
+#: WWW/Library/Implementation/HTWAIS.c:853
 msgid "HTWAIS: Request too large."
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:862
 msgid "Searching WAIS database..."
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:874
+#: WWW/Library/Implementation/HTWAIS.c:872
 msgid "Search interrupted."
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:924
+#: WWW/Library/Implementation/HTWAIS.c:922
 msgid "Can't convert format of WAIS document"
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:968
+#: WWW/Library/Implementation/HTWAIS.c:966
 msgid "HTWAIS: Request too long."
 msgstr ""
 
 #.
 #. **	Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:982
+#: WWW/Library/Implementation/HTWAIS.c:980
 msgid "Fetching WAIS document..."
 msgstr ""
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1021
+#: WWW/Library/Implementation/HTWAIS.c:1019
 msgid "No text was returned!\n"
 msgstr ""
 
@@ -3290,166 +3318,156 @@ msgstr ""
 msgid "Access links"
 msgstr ""
 
-#: WWW/Library/Implementation/HTWSRC.c:345
+#: WWW/Library/Implementation/HTWSRC.c:346
 msgid "Direct access"
 msgstr ""
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:348
+#: WWW/Library/Implementation/HTWSRC.c:349
 msgid " (or via proxy server, if defined)"
 msgstr ""
 
-#: WWW/Library/Implementation/HTWSRC.c:363
+#: WWW/Library/Implementation/HTWSRC.c:364
 msgid "Maintainer"
 msgstr ""
 
-#: WWW/Library/Implementation/HTWSRC.c:371
+#: WWW/Library/Implementation/HTWSRC.c:372
 msgid "Host"
 msgstr ""
 
-#: src/GridText.c:607
+#: src/GridText.c:684
 msgid "Memory exhausted, display interrupted!"
 msgstr ""
 
-#: src/GridText.c:612
+#: src/GridText.c:689
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr ""
 
-#: src/GridText.c:3395
+#: src/GridText.c:3574
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr ""
 
-#: src/GridText.c:5733 src/GridText.c:5740 src/LYList.c:258
+#: src/GridText.c:6006 src/GridText.c:6013 src/LYList.c:252
 msgid "unknown field or link"
 msgstr ""
 
-#: src/GridText.c:5749
+#: src/GridText.c:6022
 msgid "text entry field"
 msgstr ""
 
-#: src/GridText.c:5752
+#: src/GridText.c:6025
 msgid "password entry field"
 msgstr ""
 
-#: src/GridText.c:5755
+#: src/GridText.c:6028
 msgid "checkbox"
 msgstr ""
 
-#: src/GridText.c:5758
+#: src/GridText.c:6031
 msgid "radio button"
 msgstr ""
 
-#: src/GridText.c:5761
+#: src/GridText.c:6034
 msgid "submit button"
 msgstr ""
 
-#: src/GridText.c:5764
+#: src/GridText.c:6037
 msgid "reset button"
 msgstr ""
 
-#: src/GridText.c:5767
+#: src/GridText.c:6040
 msgid "popup menu"
 msgstr ""
 
-#: src/GridText.c:5770
+#: src/GridText.c:6043
 msgid "hidden form field"
 msgstr ""
 
-#: src/GridText.c:5773
+#: src/GridText.c:6046
 msgid "text entry area"
 msgstr ""
 
-#: src/GridText.c:5776
+#: src/GridText.c:6049
 msgid "range entry field"
 msgstr ""
 
-#: src/GridText.c:5779
+#: src/GridText.c:6052
 msgid "file entry field"
 msgstr ""
 
-#: src/GridText.c:5782
+#: src/GridText.c:6055
 msgid "text-submit field"
 msgstr ""
 
-#: src/GridText.c:5785
+#: src/GridText.c:6058
 msgid "image-submit button"
 msgstr ""
 
-#: src/GridText.c:5788
+#: src/GridText.c:6061
 msgid "keygen field"
 msgstr ""
 
-#: src/GridText.c:5791
+#: src/GridText.c:6064
 msgid "unknown form field"
 msgstr ""
 
-#. We can't open the file, what do we do?
-#: src/GridText.c:10348
+#: src/GridText.c:10065
 msgid "Can't open file for uploading"
 msgstr ""
 
-#. We got an error reading the file, what do we do?
-#: src/GridText.c:10359
-msgid "Short read from file, problem?"
-msgstr ""
-
-#: src/GridText.c:10721
+#: src/GridText.c:11217
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:11887
+#: src/GridText.c:12374
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12092
+#: src/GridText.c:12580
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12144
+#: src/GridText.c:12632
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:12591
+#: src/GridText.c:13078
 msgid "Very long lines have been truncated!"
 msgstr ""
 
-#: src/HTAlert.c:155 src/LYShowInfo.c:318
+#: src/HTAlert.c:150 src/LYShowInfo.c:318
 msgid "bytes"
 msgstr ""
 
-#: src/HTAlert.c:156
-msgid "KB"
-msgstr ""
-
-#: src/HTAlert.c:255
+#: src/HTAlert.c:282
 #, c-format
 msgid "Read %s of %s of data"
 msgstr ""
 
-#: src/HTAlert.c:257
+#: src/HTAlert.c:284
 #, c-format
 msgid "Read %s of data"
 msgstr ""
 
-#: src/HTAlert.c:262
+#: src/HTAlert.c:289
 #, c-format
 msgid ", %s/sec"
 msgstr ""
 
-#: src/HTAlert.c:269
+#: src/HTAlert.c:298
 #, c-format
-msgid " (stalled for %ld sec)"
+msgid " (stalled for %s)"
 msgstr ""
 
-#: src/HTAlert.c:271
+#: src/HTAlert.c:302
 #, c-format
-msgid ", ETA %ld sec"
+msgid ", ETA %s"
 msgstr ""
 
-#: src/HTAlert.c:277
+#: src/HTAlert.c:309
 msgid " (Press 'z' to abort)"
 msgstr ""
 
@@ -3478,43 +3496,43 @@ msgstr ""
 #. *  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:334
+#: src/HTAlert.c:350 src/HTAlert.c:398
 msgid "yes"
 msgstr ""
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:353 src/HTAlert.c:399
 msgid "no"
 msgstr ""
 
-#: src/HTML.c:6342
+#: src/HTML.c:5928
 msgid "Description:"
 msgstr ""
 
-#: src/HTML.c:6347
+#: src/HTML.c:5933
 msgid "(none)"
 msgstr ""
 
-#: src/HTML.c:6351
+#: src/HTML.c:5937
 msgid "Filepath:"
 msgstr ""
 
-#: src/HTML.c:6356
+#: src/HTML.c:5942
 msgid "(unknown)"
 msgstr ""
 
-#: src/HTML.c:7804
+#: src/HTML.c:7390
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr ""
 
-#: src/HTML.c:8328
+#: src/HTML.c:7887
 msgid "Source cache error - disk full?"
 msgstr ""
 
-#: src/HTML.c:8341
+#: src/HTML.c:7900
 msgid "Source cache error - not enough memory!"
 msgstr ""
 
-#: src/LYBookmark.c:166
+#: src/LYBookmark.c:167
 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"
@@ -3522,26 +3540,26 @@ msgid ""
 "     been remapped by you or your system administrator."
 msgstr ""
 
-#: src/LYBookmark.c:382
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
 msgstr ""
 
-#: src/LYBookmark.c:385
+#: src/LYBookmark.c:382
 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 ""
 
-#: src/LYBookmark.c:389
+#: src/LYBookmark.c:386
 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 ""
 
-#: src/LYBookmark.c:392
+#: src/LYBookmark.c:389
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3549,7 +3567,7 @@ msgid ""
 "      Make sure any bookmark link is saved as a single line."
 msgstr ""
 
-#: src/LYBookmark.c:683
+#: src/LYBookmark.c:681
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr ""
@@ -3558,78 +3576,78 @@ msgstr ""
 #. *  Neither the path as given nor any components examined by
 #. *  backing up were stat()able. - kw
 #.
-#: src/LYCgi.c:232
+#: src/LYCgi.c:231
 msgid "Unable to access cgi script"
 msgstr ""
 
-#: src/LYCgi.c:651 src/LYCgi.c:654
+#: src/LYCgi.c:654 src/LYCgi.c:657
 msgid "Good Advice"
 msgstr ""
 
-#: src/LYCgi.c:657
+#: src/LYCgi.c:660
 msgid "An excellent http server for VMS is available via"
 msgstr ""
 
-#: src/LYCgi.c:664
+#: src/LYCgi.c:667
 msgid "this link"
 msgstr ""
 
-#: src/LYCgi.c:668
+#: src/LYCgi.c:671
 msgid "It provides state of the art CGI script support.\n"
 msgstr ""
 
-#: src/LYClean.c:108
+#: src/LYClean.c:122
 msgid "Exiting via interrupt:"
 msgstr ""
 
-#: src/LYCookie.c:2659
+#: src/LYCookie.c:2462
 msgid "(from a previous session)"
 msgstr ""
 
-#: src/LYCookie.c:2719
+#: src/LYCookie.c:2522
 msgid "Maximum Gobble Date:"
 msgstr ""
 
-#: src/LYCookie.c:2764
+#: src/LYCookie.c:2564
 msgid "Internal"
 msgstr ""
 
-#: src/LYCookie.c:2765
+#: src/LYCookie.c:2565
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
-#: src/LYCurses.c:936
+#: src/LYCurses.c:1000
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr ""
 
-#: src/LYCurses.c:1328
+#: src/LYCurses.c:1424
 msgid "Terminal ="
 msgstr ""
 
-#: src/LYCurses.c:1332
+#: src/LYCurses.c:1428
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr ""
 
-#: src/LYCurses.c:1384
+#: src/LYCurses.c:1478
 msgid "Your Terminal type is unknown!"
 msgstr ""
 
-#: src/LYCurses.c:1385
+#: src/LYCurses.c:1479
 msgid "Enter a terminal type:"
 msgstr ""
 
-#: src/LYCurses.c:1398
+#: src/LYCurses.c:1493
 msgid "TERMINAL TYPE IS SET TO"
 msgstr ""
 
-#: src/LYCurses.c:1749
+#: src/LYCurses.c:1992
 #, c-format
 msgid ""
 "\n"
 "A Fatal error has occurred in %s Ver. %s\n"
 msgstr ""
 
-#: src/LYCurses.c:1751
+#: src/LYCurses.c:1994
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -3639,456 +3657,480 @@ msgid ""
 "TRACEBACK if it can be captured, and any other relevant information.\n"
 msgstr ""
 
-#: src/LYEdit.c:264
+#: src/LYEdit.c:249
 msgid "Editor killed by signal"
 msgstr ""
 
-#: src/LYEdit.c:266
+#: src/LYEdit.c:251
 #, c-format
 msgid "Editor returned with error status, %s"
 msgstr ""
 
-#: src/LYEdit.c:267
+#: src/LYEdit.c:252
 msgid "reason unknown."
 msgstr ""
 
-#: src/LYDownload.c:520
+#: src/LYDownload.c:517
 msgid "Downloaded link:"
 msgstr ""
 
-#: src/LYDownload.c:525
+#: src/LYDownload.c:522
 msgid "Suggested file name:"
 msgstr ""
 
-#: src/LYDownload.c:530
+#: src/LYDownload.c:527
 msgid "Standard download options:"
 msgstr ""
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:528
 msgid "Download options:"
 msgstr ""
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:544
 msgid "Save to disk"
 msgstr ""
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:558
+msgid "View temporary file"
+msgstr ""
+
+#: src/LYDownload.c:565
 msgid "Save to disk disabled."
 msgstr ""
 
-#: src/LYDownload.c:551 src/LYPrint.c:1338
+#: src/LYDownload.c:569 src/LYPrint.c:1327
 msgid "Local additions:"
 msgstr ""
 
-#: src/LYDownload.c:560 src/LYUpload.c:224
+#: src/LYDownload.c:578 src/LYUpload.c:216
 msgid "No Name Given"
 msgstr ""
 
-#: src/LYHistory.c:633
+#: src/LYHistory.c:658
 msgid "You selected:"
 msgstr ""
 
-#: src/LYHistory.c:657 src/LYHistory.c:905
+#: src/LYHistory.c:682 src/LYHistory.c:912
 msgid "(no address)"
 msgstr ""
 
-#: src/LYHistory.c:661
+#: src/LYHistory.c:686
 msgid " (internal)"
 msgstr ""
 
-#: src/LYHistory.c:663
+#: src/LYHistory.c:688
 msgid " (was internal)"
 msgstr ""
 
-#: src/LYHistory.c:761
+#: src/LYHistory.c:786
 msgid " (From History)"
 msgstr ""
 
-#: src/LYHistory.c:825
+#: src/LYHistory.c:832
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr ""
 
-#: src/LYHistory.c:1124
+#: src/LYHistory.c:1128
 msgid "(No messages yet)"
 msgstr ""
 
-#: src/LYLeaks.c:78
+#: src/LYLeaks.c:209
 msgid "Invalid pointer detected."
 msgstr ""
 
-#: src/LYLeaks.c:80 src/LYLeaks.c:117
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
 msgid "Pointer:"
 msgstr ""
 
-#: src/LYLeaks.c:91 src/LYLeaks.c:98 src/LYLeaks.c:136
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
 msgid "FileName:"
 msgstr ""
 
-#: src/LYLeaks.c:94 src/LYLeaks.c:101 src/LYLeaks.c:139 src/LYLeaks.c:150
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
 msgid "LineCount:"
 msgstr ""
 
-#: src/LYLeaks.c:115
+#: src/LYLeaks.c:249
 msgid "Memory leak detected."
 msgstr ""
 
-#: src/LYLeaks.c:120
+#: src/LYLeaks.c:257
 msgid "Contains:"
 msgstr ""
 
-#: src/LYLeaks.c:133
+#: src/LYLeaks.c:270
 msgid "ByteSize:"
 msgstr ""
 
-#: src/LYLeaks.c:147
+#: src/LYLeaks.c:284
 msgid "realloced:"
 msgstr ""
 
-#: src/LYLeaks.c:170
+#: src/LYLeaks.c:307
 msgid "Total memory leakage this run:"
 msgstr ""
 
-#: src/LYList.c:91
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr ""
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
 msgid "References in "
 msgstr ""
 
-#: src/LYList.c:92
+#: src/LYList.c:86
 msgid "this document:"
 msgstr ""
 
-#: src/LYList.c:98
+#: src/LYList.c:92
 msgid "Visible links:"
 msgstr ""
 
-#: src/LYList.c:199 src/LYList.c:319
+#: src/LYList.c:194 src/LYList.c:315
 msgid "Hidden links:"
 msgstr ""
 
-#: src/LYList.c:267
+#: src/LYList.c:262
 msgid "References"
 msgstr ""
 
-#: src/LYList.c:269
+#: src/LYList.c:264
 msgid "Visible links"
 msgstr ""
 
-#: src/LYLocal.c:267
+#: src/LYLocal.c:268
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr ""
 
-#: src/LYLocal.c:301
+#: src/LYLocal.c:302
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:383
+#: src/LYLocal.c:367
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr ""
 
 #. error return
-#: src/LYLocal.c:415
+#: src/LYLocal.c:401
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr ""
 
-#: src/LYLocal.c:453
+#: src/LYLocal.c:464 src/LYLocal.c:485
+#, c-format
+msgid "remove %s"
+msgstr ""
+
+#: src/LYLocal.c:503
+#, c-format
+msgid "touch %s"
+msgstr ""
+
+#: src/LYLocal.c:530
 #, c-format
 msgid "move %s to %s"
 msgstr ""
 
-#: src/LYLocal.c:475
+#: src/LYLocal.c:570
 msgid "There is already a directory with that name!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:477
+#: src/LYLocal.c:572
 msgid "There is already a file with that name!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:479
+#: src/LYLocal.c:574
 msgid "The specified name is already in use!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:490
+#: src/LYLocal.c:585
 msgid "Destination has different owner!  Request denied."
 msgstr ""
 
-#: src/LYLocal.c:493
+#: src/LYLocal.c:588
 msgid "Destination is not a valid directory!  Request denied."
 msgstr ""
 
-#: src/LYLocal.c:516
+#: src/LYLocal.c:610
 msgid "Remove all tagged files and directories?"
 msgstr ""
 
-#: src/LYLocal.c:537
-#, c-format
-msgid "remove %s"
-msgstr ""
-
-#: src/LYLocal.c:580
+#: src/LYLocal.c:669
 msgid "Enter new location for tagged items: "
 msgstr ""
 
-#: src/LYLocal.c:649
+#: src/LYLocal.c:738
 msgid "Path too long"
 msgstr ""
 
-#: src/LYLocal.c:680
+#: src/LYLocal.c:769
 msgid "Source and destination are the same location - request ignored!"
 msgstr ""
 
-#: src/LYLocal.c:738
+#: src/LYLocal.c:827
 msgid "Enter new name for directory: "
 msgstr ""
 
-#: src/LYLocal.c:740
+#: src/LYLocal.c:829
 msgid "Enter new name for file: "
 msgstr ""
 
-#: src/LYLocal.c:751
+#: src/LYLocal.c:841
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:800
+#: src/LYLocal.c:890
 msgid "Enter new location for directory: "
 msgstr ""
 
-#: src/LYLocal.c:802
+#: src/LYLocal.c:896
 msgid "Enter new location for file: "
 msgstr ""
 
-#: src/LYLocal.c:827
+#: src/LYLocal.c:923
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr ""
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:943
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr ""
 
-#: src/LYLocal.c:894
+#: src/LYLocal.c:992
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr ""
 
-#: src/LYLocal.c:896
+#: src/LYLocal.c:994
 msgid "Modify name or location (n or l): "
 msgstr ""
 
 #.
 #. *	Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:925
+#: src/LYLocal.c:1023
 msgid "This feature not yet implemented!"
 msgstr ""
 
-#: src/LYLocal.c:943
+#: src/LYLocal.c:1041
 msgid "Enter name of file to create: "
 msgstr ""
 
-#: src/LYLocal.c:951 src/LYLocal.c:999
+#: src/LYLocal.c:1049 src/LYLocal.c:1091
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:966
-#, c-format
-msgid "create %s"
-msgstr ""
-
-#: src/LYLocal.c:991
+#: src/LYLocal.c:1083
 msgid "Enter name for new directory: "
 msgstr ""
 
-#: src/LYLocal.c:1042
+#: src/LYLocal.c:1128
 msgid "Create file or directory (f or d): "
 msgstr ""
 
-#: src/LYLocal.c:1083
+#: src/LYLocal.c:1169
 #, c-format
-msgid "Remove '%s' and all of its contents?"
+msgid "Remove directory '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1086
-msgid "Remove directory and all of its contents?"
+#: src/LYLocal.c:1172
+msgid "Remove directory?"
 msgstr ""
 
-#: src/LYLocal.c:1090
+#: src/LYLocal.c:1177
 #, c-format
 msgid "Remove file '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1092
+#: src/LYLocal.c:1179
 msgid "Remove file?"
 msgstr ""
 
-#: src/LYLocal.c:1097
+#: src/LYLocal.c:1184
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1099
+#: src/LYLocal.c:1186
 msgid "Remove symbolic link?"
 msgstr ""
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1274
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr ""
 
-#: src/LYLocal.c:1220
+#: src/LYLocal.c:1304
 msgid "Unable to open permit options file"
 msgstr ""
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1331
 msgid "Specify permissions below:"
 msgstr ""
 
-#: src/LYLocal.c:1248 src/LYShowInfo.c:196
+#: src/LYLocal.c:1332 src/LYShowInfo.c:196
 msgid "Owner:"
 msgstr ""
 
-#: src/LYLocal.c:1264
+#: src/LYLocal.c:1348
 msgid "Group"
 msgstr ""
 
-#: src/LYLocal.c:1280
+#: src/LYLocal.c:1364
 msgid "Others:"
 msgstr ""
 
-#: src/LYLocal.c:1298
+#: src/LYLocal.c:1382
 msgid "form to permit"
 msgstr ""
 
-#: src/LYLocal.c:1396
+#: src/LYLocal.c:1478
 msgid "Invalid mode format."
 msgstr ""
 
-#: src/LYLocal.c:1400
+#: src/LYLocal.c:1482
 msgid "Invalid syntax format."
 msgstr ""
 
-#: src/LYLocal.c:1575
-msgid "NULL URL pointer"
+#: src/LYLocal.c:1671
+msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr ""
 
-#: src/LYLocal.c:1670
-msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
+#: src/LYLocal.c:1862
+msgid "NULL URL pointer"
 msgstr ""
 
-#: src/LYLocal.c:1782
+#: src/LYLocal.c:1945
 #, c-format
 msgid "Executing %s "
 msgstr ""
 
-#: src/LYLocal.c:1785
+#: src/LYLocal.c:1948
 msgid "Executing system command. This might take a while."
 msgstr ""
 
-#: src/LYLocal.c:1831
-msgid "Unable to open file management menu file."
-msgstr ""
-
-#: src/LYLocal.c:1862
+#: src/LYLocal.c:2022
 msgid "Current directory:"
 msgstr ""
 
-#: src/LYLocal.c:1865 src/LYLocal.c:1883
+#: src/LYLocal.c:2025 src/LYLocal.c:2043
 msgid "Current selection:"
 msgstr ""
 
-#: src/LYLocal.c:1869
+#: src/LYLocal.c:2029
 msgid "Nothing currently selected."
 msgstr ""
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2044
 msgid "tagged item:"
 msgstr ""
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2044
 msgid "tagged items:"
 msgstr ""
 
-#: src/LYLocal.c:1983 src/LYLocal.c:1994
+#: src/LYLocal.c:2142 src/LYLocal.c:2153
 msgid "Illegal filename; request ignored."
 msgstr ""
 
-#: src/LYLocal.c:2137
-msgid "The selected item is not a directory!  Request ignored."
-msgstr ""
-
 #. directory not writable
-#: src/LYLocal.c:2141
+#: src/LYLocal.c:2250 src/LYLocal.c:2308
 msgid "Install in the selected directory not permitted."
 msgstr ""
 
-#: src/LYLocal.c:2146
+#: src/LYLocal.c:2304
+msgid "The selected item is not a directory!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:2313
 msgid "Just a moment, ..."
 msgstr ""
 
-#: src/LYLocal.c:2163
+#: src/LYLocal.c:2330
 msgid "Error buiding install args"
 msgstr ""
 
-#: src/LYLocal.c:2178 src/LYLocal.c:2210
+#: src/LYLocal.c:2345 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr ""
 
-#: src/LYLocal.c:2188 src/LYLocal.c:2220
+#: src/LYLocal.c:2352 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr ""
 
-#: src/LYLocal.c:2238
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr ""
 
-#: src/LYLocal.c:2427
+#: src/LYLocal.c:2588
 msgid "Temporary URL or list would be too long."
 msgstr ""
 
-#: src/LYMail.c:503
+#: src/LYMail.c:534
 msgid "Sending"
 msgstr ""
 
-#: src/LYMail.c:989
+#: src/LYMail.c:1024
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr ""
 
-#: src/LYMail.c:991
+#: src/LYMail.c:1026
 #, c-format
 msgid "called \"%s\"\n"
 msgstr ""
 
-#: src/LYMail.c:992
+#: src/LYMail.c:1027
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr ""
 
-#: src/LYMail.c:993
+#: src/LYMail.c:1028
 msgid "was requested but was not available."
 msgstr ""
 
-#: src/LYMail.c:994
+#: src/LYMail.c:1029
 msgid "Thought you might want to know."
 msgstr ""
 
-#: src/LYMail.c:996
+#: src/LYMail.c:1031
 msgid "This message was automatically generated by"
 msgstr ""
 
-#: src/LYMain.c:897
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:976
 msgid "No Winsock found, sorry."
 msgstr ""
 
-#: src/LYMain.c:1103
+#: src/LYMain.c:1178
 msgid "You MUST define a valid TMP or TEMP area!\n"
 msgstr ""
 
-#: src/LYMain.c:1156 src/LYMainLoop.c:5117
+#: src/LYMain.c:1232 src/LYMainLoop.c:5027
 msgid "No such directory"
 msgstr ""
 
-#: src/LYMain.c:1378
+#: src/LYMain.c:1444
 #, c-format
 msgid ""
 "\n"
@@ -4096,21 +4138,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1388
+#: src/LYMain.c:1454
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1417
+#: src/LYMain.c:1483
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1512
 #, c-format
 msgid ""
 "\n"
@@ -4118,59 +4160,59 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1704
+#: src/LYMain.c:1755
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2247
+#: src/LYMain.c:2305
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2477 src/LYMain.c:2525
+#: src/LYMain.c:2552 src/LYMain.c:2600
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3047
+#: src/LYMain.c:3132
 #, c-format
-msgid "%s Version %s (%s)\n"
+msgid "%s Version %s (%s)"
 msgstr ""
 
-#: src/LYMain.c:3072
+#: src/LYMain.c:3155
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr ""
 
-#: src/LYMain.c:3077
+#: src/LYMain.c:3178
 msgid ""
 "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
 msgstr ""
 
-#: src/LYMain.c:3079
+#: src/LYMain.c:3180
 msgid "Distributed under the GNU General Public License.\n"
 msgstr ""
 
-#: src/LYMain.c:3081
+#: src/LYMain.c:3182
 msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
+"See http://lynx.isc.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
 
-#: src/LYMain.c:3800
+#: src/LYMain.c:3935
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr ""
 
-#: src/LYMain.c:3801
+#: src/LYMain.c:3936
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4207
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:512
+#: src/LYMainLoop.c:538
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr ""
@@ -4178,80 +4220,108 @@ msgstr ""
 #.
 #. * Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:625 src/LYMainLoop.c:5139
+#: src/LYMainLoop.c:652 src/LYMainLoop.c:5049
 msgid "A URL specified by the user"
 msgstr ""
 
-#: src/LYMainLoop.c:1114
+#: src/LYMainLoop.c:1109
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr ""
 
 #.
 #. *  Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3097
+#: src/LYMainLoop.c:3052
 msgid "Help Screen"
 msgstr ""
 
-#: src/LYMainLoop.c:3231
+#: src/LYMainLoop.c:3176
 msgid "System Index"
 msgstr ""
 
-#: src/LYMainLoop.c:3611 src/LYMainLoop.c:5347
+#: src/LYMainLoop.c:3548 src/LYMainLoop.c:5269
 msgid "Entry into main screen"
 msgstr ""
 
-#: src/LYMainLoop.c:3897
+#: src/LYMainLoop.c:3823
 msgid "No next document present"
 msgstr ""
 
-#: src/LYMainLoop.c:4206
+#: src/LYMainLoop.c:4130
 msgid "charset for this document specified explicitly, sorry..."
 msgstr ""
 
-#: src/LYMainLoop.c:5093
+#: src/LYMainLoop.c:5003
 msgid "cd to:"
 msgstr ""
 
-#: src/LYMainLoop.c:5120
+#: src/LYMainLoop.c:5030
 msgid "A component of path is not a directory"
 msgstr ""
 
-#: src/LYMainLoop.c:5123
+#: src/LYMainLoop.c:5033
 msgid "failed to change directory"
 msgstr ""
 
-#: src/LYMainLoop.c:6291
+#: src/LYMainLoop.c:6203
 msgid "Reparsing document under current settings..."
 msgstr ""
 
-#: src/LYMainLoop.c:6579 src/LYMainLoop.c:6583
+#: src/LYMainLoop.c:6488 src/LYMainLoop.c:6492
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:7719 src/LYMainLoop.c:7892
+#: src/LYMainLoop.c:6833
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6836
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6913
+msgid "Current URL is empty."
+msgstr ""
+
+#: src/LYMainLoop.c:6915 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr ""
+
+#: src/LYMainLoop.c:6917
+msgid "Document URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6919
+msgid "Link URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6945
+msgid "No URL in the clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:7620 src/LYMainLoop.c:7793
 msgid "-index-"
 msgstr ""
 
-#: src/LYMainLoop.c:7829
+#: src/LYMainLoop.c:7730
 msgid "lynx: Can't access startfile"
 msgstr ""
 
-#: src/LYMainLoop.c:7842
+#: src/LYMainLoop.c:7743
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr ""
 
-#: src/LYMainLoop.c:7843
+#: src/LYMainLoop.c:7744
 msgid "      Exiting..."
 msgstr ""
 
-#: src/LYMainLoop.c:7886
+#: src/LYMainLoop.c:7787
 msgid "-more-"
 msgstr ""
 
 #. Enable scrolling.
-#: src/LYNews.c:203
+#: src/LYNews.c:187
 msgid "You will be posting to:"
 msgstr ""
 
@@ -4259,7 +4329,7 @@ msgstr ""
 #. *  Get the mail address for the From header,
 #. *  offering personal_mail_address as default.
 #.
-#: src/LYNews.c:212
+#: src/LYNews.c:196
 msgid ""
 "\n"
 "\n"
@@ -4271,14 +4341,14 @@ msgstr ""
 #. *  document's title as the default if this is a
 #. *  followup rather than a new post. - FM
 #.
-#: src/LYNews.c:230
+#: src/LYNews.c:214
 msgid ""
 "\n"
 "\n"
 " Please provide or edit the Subject: header\n"
 msgstr ""
 
-#: src/LYNews.c:322
+#: src/LYNews.c:303
 msgid ""
 "\n"
 "\n"
@@ -4288,100 +4358,316 @@ msgstr ""
 #.
 #. *  Use the built in line editior.
 #.
-#: src/LYNews.c:379
+#: src/LYNews.c:360
 msgid ""
 "\n"
 "\n"
 " Please enter your message below."
 msgstr ""
 
-#: src/LYNews.c:425
+#: src/LYNews.c:406
 msgid "Message has no original text!"
 msgstr ""
 
-#: src/LYOptions.c:743
+#: src/LYOptions.c:746
 msgid "review/edit B)ookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:745
+#: src/LYOptions.c:748
 msgid "B)ookmark file: "
 msgstr ""
 
-#: src/LYOptions.c:2507 src/LYOptions.c:2531
+#: src/LYOptions.c:2103 src/LYOptions.c:2109
+msgid "ON"
+msgstr ""
+
+#. verbose_img variable
+#: src/LYOptions.c:2104 src/LYOptions.c:2108 src/LYOptions.c:2237
+#: src/LYOptions.c:2246
+msgid "OFF"
+msgstr ""
+
+#: src/LYOptions.c:2105
+msgid "NEVER"
+msgstr ""
+
+#: src/LYOptions.c:2106
+msgid "ALWAYS"
+msgstr ""
+
+#: src/LYOptions.c:2120 src/LYOptions.c:2230
+msgid "ignore"
+msgstr ""
+
+#: src/LYOptions.c:2121
+msgid "ask user"
+msgstr ""
+
+#: src/LYOptions.c:2122
+msgid "accept all"
+msgstr ""
+
+#: src/LYOptions.c:2133
+msgid "ALWAYS OFF"
+msgstr ""
+
+#: src/LYOptions.c:2134
+msgid "FOR LOCAL FILES ONLY"
+msgstr ""
+
+#: src/LYOptions.c:2136
+msgid "ALWAYS ON"
+msgstr ""
+
+#: src/LYOptions.c:2146
+msgid "Numbers act as arrows"
+msgstr ""
+
+#: src/LYOptions.c:2148
+msgid "Links are numbered"
+msgstr ""
+
+#: src/LYOptions.c:2151
+msgid "Links and form fields are numbered"
+msgstr ""
+
+#: src/LYOptions.c:2154
+msgid "Form fields are numbered"
+msgstr ""
+
+#: src/LYOptions.c:2161
+msgid "Case insensitive"
+msgstr ""
+
+#: src/LYOptions.c:2162
+msgid "Case sensitive"
+msgstr ""
+
+#: src/LYOptions.c:2183
+msgid "prompt normally"
+msgstr ""
+
+#: src/LYOptions.c:2184
+msgid "force yes-response"
+msgstr ""
+
+#: src/LYOptions.c:2185
+msgid "force no-response"
+msgstr ""
+
+#: src/LYOptions.c:2200
+msgid "Novice"
+msgstr ""
+
+#: src/LYOptions.c:2201
+msgid "Intermediate"
+msgstr ""
+
+#: src/LYOptions.c:2202
+msgid "Advanced"
+msgstr ""
+
+#: src/LYOptions.c:2209
+msgid "By First Visit"
+msgstr ""
+
+#: src/LYOptions.c:2211
+msgid "By First Visit Reversed"
+msgstr ""
+
+#: src/LYOptions.c:2212
+msgid "As Visit Tree"
+msgstr ""
+
+#: src/LYOptions.c:2213
+msgid "By Last Visit"
+msgstr ""
+
+#: src/LYOptions.c:2215
+msgid "By Last Visit Reversed"
+msgstr ""
+
+#. Old_DTD variable
+#: src/LYOptions.c:2224
+msgid "relaxed (TagSoup mode)"
+msgstr ""
+
+#: src/LYOptions.c:2225
+msgid "strict (SortaSGML mode)"
+msgstr ""
+
+#: src/LYOptions.c:2231
+msgid "as labels"
+msgstr ""
+
+#: src/LYOptions.c:2232
+msgid "as links"
+msgstr ""
+
+#: src/LYOptions.c:2238
+msgid "show filename"
+msgstr ""
+
+#: src/LYOptions.c:2247
+msgid "STANDARD"
+msgstr ""
+
+#: src/LYOptions.c:2248
+msgid "ADVANCED"
+msgstr ""
+
+#: src/LYOptions.c:2272
+msgid "Directories first"
+msgstr ""
+
+#: src/LYOptions.c:2273
+msgid "Files first"
+msgstr ""
+
+#: src/LYOptions.c:2274
+msgid "Mixed style"
+msgstr ""
+
+#: src/LYOptions.c:2279 src/LYOptions.c:2294
+msgid "By Name"
+msgstr ""
+
+#: src/LYOptions.c:2280 src/LYOptions.c:2295
+msgid "By Type"
+msgstr ""
+
+#: src/LYOptions.c:2281 src/LYOptions.c:2296
+msgid "By Size"
+msgstr ""
+
+#: src/LYOptions.c:2282 src/LYOptions.c:2297
+msgid "By Date"
+msgstr ""
+
+#: src/LYOptions.c:2283
+msgid "By Mode"
+msgstr ""
+
+#: src/LYOptions.c:2285
+msgid "By User"
+msgstr ""
+
+#: src/LYOptions.c:2286
+msgid "By Group"
+msgstr ""
+
+#: src/LYOptions.c:2303
+msgid "Do not show rate"
+msgstr ""
+
+#: src/LYOptions.c:2304 src/LYOptions.c:2305
+#, c-format
+msgid "Show %s/sec rate"
+msgstr ""
+
+#: src/LYOptions.c:2307 src/LYOptions.c:2308
+#, c-format
+msgid "Show %s/sec, ETA"
+msgstr ""
+
+#: src/LYOptions.c:2558 src/LYOptions.c:2582
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr ""
 
-#: src/LYOptions.c:3208
+#: src/LYOptions.c:3297
+msgid "(options marked with (!) will not be saved)"
+msgstr ""
+
+#: src/LYOptions.c:3305
 msgid "General Preferences"
 msgstr ""
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3212
+#: src/LYOptions.c:3309
 msgid "User mode"
 msgstr ""
 
 #. Editor: INPUT
-#: src/LYOptions.c:3218
+#: src/LYOptions.c:3315
 msgid "Editor"
 msgstr ""
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3223
+#: src/LYOptions.c:3320
 msgid "Type of Search"
 msgstr ""
 
+#: src/LYOptions.c:3325
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3229
+#: src/LYOptions.c:3329
 msgid "Cookies"
 msgstr ""
 
-#: src/LYOptions.c:3243
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3343
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3350
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3356
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3247
+#: src/LYOptions.c:3360
 msgid "Keypad mode"
 msgstr ""
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3253
+#: src/LYOptions.c:3366
 msgid "Emacs keys"
 msgstr ""
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3259
+#: src/LYOptions.c:3372
 msgid "VI keys"
 msgstr ""
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3266
+#: src/LYOptions.c:3379
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3278
+#: src/LYOptions.c:3391
 msgid "Keyboard layout"
 msgstr ""
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3291
+#: src/LYOptions.c:3404
 msgid "Display and Character Set"
 msgstr ""
 
-#. ***************************************************************
+#. Use locale-based character set: ON/OFF
+#: src/LYOptions.c:3409
+msgid "Use locale-based character set"
+msgstr ""
+
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3295
+#: src/LYOptions.c:3418
 msgid "Display character set"
 msgstr ""
 
-#: src/LYOptions.c:3324
+#: src/LYOptions.c:3447
 msgid "Assumed document character set"
 msgstr ""
 
@@ -4390,202 +4676,221 @@ msgstr ""
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3344
+#: src/LYOptions.c:3467
 msgid "CJK mode"
 msgstr ""
 
-#: src/LYOptions.c:3346
+#: src/LYOptions.c:3469
 msgid "Raw 8-bit"
 msgstr ""
 
 #. X Display: INPUT
-#: src/LYOptions.c:3354
+#: src/LYOptions.c:3477
 msgid "X Display"
 msgstr ""
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3360
+#: src/LYOptions.c:3483
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:3366
+#: src/LYOptions.c:3489
 msgid "Show color"
 msgstr ""
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3390
+#: src/LYOptions.c:3513
 msgid "Show cursor"
 msgstr ""
 
+#. Underline links: ON/OFF
+#: src/LYOptions.c:3519
+msgid "Underline links"
+msgstr ""
+
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3526
+msgid "Show scrollbar"
+msgstr ""
+
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3396
+#: src/LYOptions.c:3533
 msgid "Popups for select fields"
 msgstr ""
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3403
+#: src/LYOptions.c:3539
 msgid "HTML error recovery"
 msgstr ""
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3410
+#: src/LYOptions.c:3545
 msgid "Show images"
 msgstr ""
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3424
+#: src/LYOptions.c:3559
 msgid "Verbose images"
 msgstr ""
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3432
+#: src/LYOptions.c:3567
 msgid "Headers Transferred to Remote Servers"
 msgstr ""
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3436
+#: src/LYOptions.c:3571
 msgid "Personal mail address"
 msgstr ""
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3576
 msgid "Preferred document character set"
 msgstr ""
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3446
+#: src/LYOptions.c:3581
 msgid "Preferred document language"
 msgstr ""
 
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3587
 msgid "User-Agent header"
 msgstr ""
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3460
+#: src/LYOptions.c:3595
 msgid "Listing and Accessing Files"
 msgstr ""
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3464
+#: src/LYOptions.c:3599
 msgid "FTP sort criteria"
 msgstr ""
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3471
+#: src/LYOptions.c:3606
 msgid "Local directory sort criteria"
 msgstr ""
 
-#: src/LYOptions.c:3479
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3612
+msgid "Local directory sort order"
+msgstr ""
+
+#: src/LYOptions.c:3621
 msgid "Show dot files"
 msgstr ""
 
-#: src/LYOptions.c:3487
+#: src/LYOptions.c:3629
 msgid "Execution links"
 msgstr ""
 
-#. Local Directory Sort: SELECT
-#: src/LYOptions.c:3507
+#. Show transfer rate: SELECT
+#: src/LYOptions.c:3649
 msgid "Show transfer rate"
 msgstr ""
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3516
+#: src/LYOptions.c:3668
 msgid "Special Files and Screens"
 msgstr ""
 
-#: src/LYOptions.c:3521
+#: src/LYOptions.c:3673
 msgid "Multi-bookmarks"
 msgstr ""
 
-#: src/LYOptions.c:3529
+#: src/LYOptions.c:3681
 msgid "Review/edit Bookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:3531
+#: src/LYOptions.c:3683
 msgid "Goto multi-bookmark menu"
 msgstr ""
 
-#: src/LYOptions.c:3533
+#: src/LYOptions.c:3685
 msgid "Bookmarks file"
 msgstr ""
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3539
+#: src/LYOptions.c:3691
 msgid "Visited Pages"
 msgstr ""
 
-#: src/LYPrint.c:959
+#: src/LYOptions.c:3696
+msgid "View the file "
+msgstr ""
+
+#: src/LYPrint.c:952
 msgid " Print job complete.\n"
 msgstr ""
 
-#: src/LYPrint.c:1296
+#: src/LYPrint.c:1281
 msgid "Document:"
 msgstr ""
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1282
 msgid "Number of lines:"
 msgstr ""
 
-#: src/LYPrint.c:1298
+#: src/LYPrint.c:1283
 msgid "Number of pages:"
 msgstr ""
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "pages"
 msgstr ""
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "page"
 msgstr ""
 
-#: src/LYPrint.c:1300
+#: src/LYPrint.c:1285
 msgid "(approximately)"
 msgstr ""
 
-#: src/LYPrint.c:1305
+#: src/LYPrint.c:1290
 msgid "Some print functions have been disabled!"
 msgstr ""
 
-#: src/LYPrint.c:1309
+#: src/LYPrint.c:1294
 msgid "Standard print options:"
 msgstr ""
 
-#: src/LYPrint.c:1310
+#: src/LYPrint.c:1295
 msgid "Print options:"
 msgstr ""
 
-#: src/LYPrint.c:1316
+#: src/LYPrint.c:1302
 msgid "Save to a local file"
 msgstr ""
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1304
 msgid "Save to disk disabled"
 msgstr ""
 
-#: src/LYPrint.c:1324
+#: src/LYPrint.c:1311
 msgid "Mail the file"
 msgstr ""
 
-#: src/LYPrint.c:1330
+#: src/LYPrint.c:1318
 msgid "Print to the screen"
 msgstr ""
 
-#: src/LYPrint.c:1334
+#: src/LYPrint.c:1323
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr ""
 
-#: src/LYReadCFG.c:340
+#: src/LYReadCFG.c:339
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
 "The line must be of the form:\n"
@@ -4595,77 +4900,77 @@ msgid ""
 "The special strings 'nocolor' or 'default', or\n"
 msgstr ""
 
-#: src/LYReadCFG.c:353
+#: src/LYReadCFG.c:352
 msgid "Offending line:"
 msgstr ""
 
-#: src/LYReadCFG.c:660
+#: src/LYReadCFG.c:638
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:667
+#: src/LYReadCFG.c:645
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:666
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr ""
 
-#: src/LYReadCFG.c:715 src/LYReadCFG.c:728
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
 #, c-format
 msgid ""
 "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:733
+#: src/LYReadCFG.c:711
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:816
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr ""
 
-#: src/LYReadCFG.c:840
+#: src/LYReadCFG.c:818
 msgid "(no name)"
 msgstr ""
 
-#: src/LYReadCFG.c:1658
+#: src/LYReadCFG.c:1787
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1660
+#: src/LYReadCFG.c:1789
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1661
+#: src/LYReadCFG.c:1790
 #, c-format
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2116 src/LYReadCFG.c:2129 src/LYReadCFG.c:2165
+#: src/LYReadCFG.c:2196 src/LYReadCFG.c:2209 src/LYReadCFG.c:2267
 msgid "The following is read from your lynx.cfg file."
 msgstr ""
 
-#: src/LYReadCFG.c:2117 src/LYReadCFG.c:2130
+#: src/LYReadCFG.c:2197 src/LYReadCFG.c:2210
 msgid "Please read the distribution"
 msgstr ""
 
-#: src/LYReadCFG.c:2123 src/LYReadCFG.c:2133
+#: src/LYReadCFG.c:2203 src/LYReadCFG.c:2213
 msgid "for more comments."
 msgstr ""
 
-#: src/LYReadCFG.c:2147
+#: src/LYReadCFG.c:2249
 msgid "RELOAD THE CHANGES"
 msgstr ""
 
-#: src/LYReadCFG.c:2156
+#: src/LYReadCFG.c:2258
 msgid "Your primary configuration"
 msgstr ""
 
@@ -4741,7 +5046,7 @@ msgstr ""
 msgid "File that you are currently viewing"
 msgstr ""
 
-#: src/LYShowInfo.c:266 src/LYShowInfo.c:375
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
 msgid "Linkname:"
 msgstr ""
 
@@ -4781,79 +5086,79 @@ msgstr ""
 msgid "Post Data:"
 msgstr ""
 
-#: src/LYShowInfo.c:331
+#: src/LYShowInfo.c:333
 msgid "Post Content Type:"
 msgstr ""
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:342
 msgid "Owner(s):"
 msgstr ""
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "size:"
 msgstr ""
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "lines"
 msgstr ""
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:348
 msgid "mode:"
 msgstr ""
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:350
 msgid "forms mode"
 msgstr ""
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "source"
 msgstr ""
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "normal"
 msgstr ""
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:353
 msgid ", safe"
 msgstr ""
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:354
 msgid ", via internal link"
 msgstr ""
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:360
 msgid ", no-cache"
 msgstr ""
 
-#: src/LYShowInfo.c:360
+#: src/LYShowInfo.c:362
 msgid ", ISMAP script"
 msgstr ""
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:364
 msgid ", bookmark file"
 msgstr ""
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:373
 msgid "Link that you currently have selected"
 msgstr ""
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:386
 msgid "Method:"
 msgstr ""
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:391
 msgid "Enctype:"
 msgstr ""
 
-#: src/LYShowInfo.c:401
+#: src/LYShowInfo.c:403
 msgid "(Form field)"
 msgstr ""
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:418
 msgid "No Links on the current page"
 msgstr ""
 
-#: src/LYStyle.c:250
+#: src/LYStyle.c:278
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -4888,43 +5193,47 @@ msgstr ""
 msgid "Unable to upload file."
 msgstr ""
 
-#: src/LYUpload.c:214
+#: src/LYUpload.c:206
 msgid "Upload To:"
 msgstr ""
 
-#: src/LYUpload.c:215
+#: src/LYUpload.c:207
 msgid "Upload options:"
 msgstr ""
 
-#: src/LYUtils.c:3075
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2468
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3915
+#: src/LYUtils.c:3294
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:4217
+#: src/LYUtils.c:3595
 msgid "unknown restriction"
 msgstr ""
 
-#: src/LYUtils.c:4248
+#: src/LYUtils.c:3626
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:4251
+#: src/LYUtils.c:3629
 msgid "Restrictions set:\n"
 msgstr ""
 
-#: src/LYUtils.c:5601
-msgid "Ignoring invalid HOME"
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
 msgstr ""
 
-#: src/LYrcFile.c:20
+#: src/LYrcFile.c:21
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr ""
 
-#: src/LYrcFile.c:242
+#: src/LYrcFile.c:295
 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"
@@ -4932,21 +5241,21 @@ msgid ""
 "all cookies.\n"
 msgstr ""
 
-#: src/LYrcFile.c:249
+#: src/LYrcFile.c:302
 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 ""
 
-#: src/LYrcFile.c:254
+#: src/LYrcFile.c:307
 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 ""
 
-#: src/LYrcFile.c:259
+#: src/LYrcFile.c:312
 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"
@@ -4955,7 +5264,7 @@ msgid ""
 "Current valid characters sets are:\n"
 msgstr ""
 
-#: src/LYrcFile.c:266
+#: src/LYrcFile.c:319
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -4964,13 +5273,13 @@ msgid ""
 "settings made here.\n"
 msgstr ""
 
-#: src/LYrcFile.c:274
+#: src/LYrcFile.c:327
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/.lynx_cookies.\n"
 msgstr ""
 
-#: src/LYrcFile.c:279
+#: src/LYrcFile.c:332
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -4981,7 +5290,13 @@ msgid ""
 "querying the user for an invalid path or domain.\n"
 msgstr ""
 
-#: src/LYrcFile.c:292
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:351
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -4989,7 +5304,7 @@ msgid ""
 "\"DIRECTORIES_FIRST\" lists directories first.\n"
 msgstr ""
 
-#: src/LYrcFile.c:300
+#: src/LYrcFile.c:359
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -4997,7 +5312,7 @@ msgid ""
 "will be enabled.\n"
 msgstr ""
 
-#: src/LYrcFile.c:306
+#: src/LYrcFile.c:365
 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"
@@ -5005,7 +5320,7 @@ msgid ""
 "will be used for sending mail.\n"
 msgstr ""
 
-#: src/LYrcFile.c:312
+#: src/LYrcFile.c:371
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5015,7 +5330,7 @@ msgid ""
 "   BY_DATE     -- sorts on the date of the file\n"
 msgstr ""
 
-#: src/LYrcFile.c:324
+#: src/LYrcFile.c:389
 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"
@@ -5030,7 +5345,7 @@ msgid ""
 "Current lineedit modes are:\n"
 msgstr ""
 
-#: src/LYrcFile.c:339
+#: src/LYrcFile.c:407
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5038,7 +5353,7 @@ msgid ""
 "We start with \"multi_bookmarkB\" since 'A' is the default (see above).\n"
 msgstr ""
 
-#: src/LYrcFile.c:345
+#: src/LYrcFile.c:413
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5049,7 +5364,7 @@ msgid ""
 "your mailed comments.\n"
 msgstr ""
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:422
 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"
@@ -5065,16 +5380,16 @@ msgid ""
 "is also allowed.\n"
 msgstr ""
 
-#: src/LYrcFile.c:368
+#: src/LYrcFile.c:436
 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 it's default language.\n"
+"Otherwise, the server will send the file in its default language.\n"
 msgstr ""
 
-#: src/LYrcFile.c:377
+#: src/LYrcFile.c:445
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5087,7 +5402,7 @@ msgid ""
 "          you are viewing trusted source information.\n"
 msgstr ""
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:456
 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"
@@ -5103,7 +5418,7 @@ msgid ""
 "          you are viewing trusted source information.\n"
 msgstr ""
 
-#: src/LYrcFile.c:403
+#: src/LYrcFile.c:474
 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"
@@ -5114,7 +5429,7 @@ msgid ""
 "The default can be overridden via the -popup command line toggle.\n"
 msgstr ""
 
-#: src/LYrcFile.c:413
+#: src/LYrcFile.c:484
 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"
@@ -5133,7 +5448,7 @@ msgid ""
 "\"off\" \"show color\" settings will be treated as \"default\".\n"
 msgstr ""
 
-#: src/LYrcFile.c:430
+#: src/LYrcFile.c:501
 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"
@@ -5146,7 +5461,7 @@ msgid ""
 "The default can be overridden via the -show_cursor command line toggle.\n"
 msgstr ""
 
-#: src/LYrcFile.c:441
+#: src/LYrcFile.c:512
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5155,7 +5470,7 @@ msgid ""
 "is disabled, creation of such files via Lynx also is disabled.\n"
 msgstr ""
 
-#: src/LYrcFile.c:452
+#: src/LYrcFile.c:523
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5168,7 +5483,7 @@ msgid ""
 "presented regardless of user mode.\n"
 msgstr ""
 
-#: src/LYrcFile.c:464
+#: src/LYrcFile.c:537
 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"
@@ -5178,14 +5493,14 @@ msgid ""
 "bottom of the screen.\n"
 msgstr ""
 
-#: src/LYrcFile.c:472
+#: src/LYrcFile.c:546
 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 ""
 
-#: src/LYrcFile.c:477
+#: src/LYrcFile.c:551
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5195,13 +5510,13 @@ msgid ""
 "and the keymap display, respectively.\n"
 msgstr ""
 
-#: src/LYrcFile.c:485
+#: src/LYrcFile.c:559
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
 msgstr ""
 
-#: src/LYrcFile.c:693
+#: src/LYrcFile.c:776
 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"
@@ -5212,13 +5527,13 @@ msgid ""
 "regardless of whether numlock is on.\n"
 msgstr ""
 
-#: src/LYrcFile.c:702
+#: src/LYrcFile.c:785
 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 ""
 
-#: src/LYrcFile.c:706
+#: src/LYrcFile.c:789
 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"
@@ -5229,14 +5544,14 @@ msgid ""
 "lists and output from the list command also enumerate form inputs.\n"
 msgstr ""
 
-#: src/LYrcFile.c:715
+#: src/LYrcFile.c:798
 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 ""
 
-#: src/LYrcFile.c:748
+#: src/LYrcFile.c:831
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
diff --git a/gnu/usr.bin/lynx/po/makefile.inn b/gnu/usr.bin/lynx/po/makefile.inn
index 7b63ddbeeec..a3c3ed5aa11 100644
--- a/gnu/usr.bin/lynx/po/makefile.inn
+++ b/gnu/usr.bin/lynx/po/makefile.inn
@@ -90,7 +90,7 @@ $(srcdir)/$(PACKAGE).pot: $(POTFILES)
 	  --files-from=$(srcdir)/POTFILES.in \
 	&& test ! -f $(PACKAGE).po \
 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
-		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
+		&& ( sed -e 1,5d -e s/"Project-Id-Version: PACKAGE VERSION"/"Project-Id-Version: $(PACKAGE) $(VERSION)"/ $(PACKAGE).po > $(srcdir)/$(PACKAGE).pot ) )
 
 $(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
 $(srcdir)/stamp-cat-id: $(PACKAGE).pot
diff --git a/gnu/usr.bin/lynx/po/nl.po b/gnu/usr.bin/lynx/po/nl.po
index e925c73c216..e59777d4ef7 100644
--- a/gnu/usr.bin/lynx/po/nl.po
+++ b/gnu/usr.bin/lynx/po/nl.po
@@ -1,14 +1,16 @@
 # Dutch messages for Lynx.
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Tijs van Bakel <smoke@casema.net>, 1999, 2000.
+# Aanpassingen: Pieter-Paul Spiertz <pspiertz@sci.kun.nl>, 2002.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.4\n"
-"POT-Creation-Date: 2001-06-01 18:55-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-0500\n"
 "PO-Revision-Date: 2000-04-08 21:13+02:00\n"
 "Last-Translator: Tijs van Bakel <smoke@casema.net>\n"
-"Language-Team: Dutch <nl@li.org>\n"
+"Language-Team: Dutch <vertaling@nl.linux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -26,7 +28,7 @@ msgstr ""
 #. * Links to collections of alternate definitions, developed by the Lynx
 #. * User Community, are maintained in Lynx links:
 #. *
-#. *    http://www.trill-home.com/lynx.html
+#. *    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
@@ -35,1998 +37,1998 @@ msgstr ""
 #: LYMessages.c:29
 #, c-format
 msgid "Alert!: %s"
-msgstr "Let op!: %s"
+msgstr "Let op: %s"
 
 #: LYMessages.c:30
 msgid "Welcome"
 msgstr "Welkom"
 
-#: LYMessages.c:31 LYMessages.c:32
+#: LYMessages.c:31
 msgid "Are you sure you want to quit?"
 msgstr "Weet u zeker dat u wilt stoppen?"
 
-#: LYMessages.c:34 LYMessages.c:35
+#: LYMessages.c:33
 msgid "Really exit from Lynx?"
-msgstr "Wilt u lynx echt beëindigen?"
+msgstr "Wilt u Lynx echt beëindigen?"
 
-#: LYMessages.c:37
+#: LYMessages.c:35
 msgid "Connection interrupted."
 msgstr "Verbinding onderbroken."
 
-#: LYMessages.c:38
+#: LYMessages.c:36
 msgid "Data transfer interrupted."
 msgstr "Gegevensoverdracht gestopt."
 
-#: LYMessages.c:39
+#: LYMessages.c:37
 msgid "Cancelled!!!"
 msgstr "Geannuleerd!!!"
 
-#: LYMessages.c:40
+#: LYMessages.c:38
 msgid "Cancelling!"
 msgstr "Annuleren!"
 
-#: LYMessages.c:41
+#: LYMessages.c:39
 msgid "Excellent!!!"
 msgstr "Prima!!!"
 
-#: LYMessages.c:42
+#: LYMessages.c:40
 msgid "OK"
 msgstr "OK"
 
-#: LYMessages.c:43
+#: LYMessages.c:41
 msgid "Done!"
-msgstr "Klaar!"
+msgstr "Voltooid!"
 
-#: LYMessages.c:44
+#: LYMessages.c:42
 msgid "Bad request!"
 msgstr "Ongeldig verzoek!"
 
-#: LYMessages.c:45
+#: LYMessages.c:43
 msgid "previous"
 msgstr "vorige"
 
-#: LYMessages.c:46
+#: LYMessages.c:44
 msgid "next screen"
 msgstr "volgend scherm"
 
-#: LYMessages.c:47
+#: LYMessages.c:45
 msgid "HELP!"
 msgstr "HELP!"
 
-#: LYMessages.c:48
+#: LYMessages.c:46
 msgid ", help on "
 msgstr ", hulp bij "
 
 #. #define HELP
-#: LYMessages.c:50
+#: LYMessages.c:48
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr "Commando's: pijltjes-verplaatsen, '?'-help, 'q'-stoppen, '<-'-ga terug."
 
 #. #define MOREHELP
-#: LYMessages.c:52
+#: LYMessages.c:50
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr "-- spatiebalk-volgende pagina, pijltjes-verplaatsen, '?'-help, 'q'-stoppen."
 
-#: LYMessages.c:53
+#: LYMessages.c:51
 msgid "-- press space for next page --"
 msgstr "-- druk op de spatiebalk voor volgende pagina --"
 
-#: LYMessages.c:54
+#: LYMessages.c:52
 msgid "URL too long"
 msgstr "URL te lang"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:60
+#: LYMessages.c:58
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr "(Text invoer veld) Niet actief.  Druk op <return> om te activeren."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:60
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr "(Tekstgebied) Niet actief.  Druk op <return> om te activeren."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:64
+#: LYMessages.c:62
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(Tekstgebied) Niet actief.  Druk op <return> om te activeren (%s voor editor)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:64
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(Formulierveld) Niet actief.  Gebruik <return> om te wijzigen."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:68
+#: LYMessages.c:66
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr "(Form.veld) Niet actief.  Wijzig met <return> (%s - verzenden zonder cache)"
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:68
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
 msgstr "(Form.veld) Niet actief.  Wijzig met <return>, verzenden met twee keer <return>"
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:72
+#: LYMessages.c:70
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "(email-formulierveld) Niet actief.  Gebruik <return> om te wijzigen."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:74
+#: LYMessages.c:72
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "(Wachtwoord veld) Niet actief.  Gebruik <return> om te activeren."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:77
+#: LYMessages.c:75
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
-msgstr "VASTSTAAND bestandsnaam invoerveld.  Ga weg met pijltjes of tab."
+msgstr "VASTSTAAND bestandsnaam invoerveld.  Verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:77
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Bestandsnaam veld) Voer een bestandsnaam in.  Ga weg met pijltjes of tab."
+msgstr "(Bestandsnaam veld) Voer een bestandsnaam in.  Verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:81
+#: LYMessages.c:79
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Tekst invoer) Voer tekst in.  Ga weg met pijltjes of tab."
+msgstr "(Tekst invoer) Voer tekst in.  Verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:83
+#: LYMessages.c:81
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
-msgstr "(Tekstgebied) Voer tekst in.  Ga weg met pijltjes of tab."
+msgstr "(Tekstgebied) Voer tekst in.  Verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:85
+#: LYMessages.c:83
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
-msgstr "(Tekstgebied) Voer tekst in.  Ga weg met pijltjes of tab (%s voor editor)."
+msgstr "(Tekstgebied) Voer tekst in.  Verlaat met pijltjes of tab (%s voor editor)."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:87
+#: LYMessages.c:85
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
-msgstr "VASTSTAAND formulier tekst veld.  Ga weg met pijltjes of tab."
+msgstr "VASTSTAAND formulier tekst veld.  Verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:87
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(Formulierveld) Voer tekst in.  Verzend met <return>."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:91
+#: LYMessages.c:89
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr "(Formulierveld) Voer tekst in.  Verzend met <return> (%s - geen cache)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:93
+#: LYMessages.c:91
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
-msgstr "(Form.veld) Voer tekst in.  <return>-verzenden, ga weg met pijltjes of tab."
+msgstr "(Form.veld) Voer tekst in.  <return>-verzenden, verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:95
+#: LYMessages.c:93
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
-msgstr "NIET WIJZIGBAAR formulierveld.  Ga weg met pijltjes of tab."
+msgstr "NIET WIJZIGBAAR formulierveld.  Verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:97
+#: LYMessages.c:95
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
-msgstr "(email-formulierveld) Voer tekst in.  Verzend met <return>, ga weg met pijltjes."
+msgstr "(email-formulierveld) Voer tekst in.  Verzend met <return>, verlaat met pijltjes"
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:99
+#: LYMessages.c:97
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr "(email-formulierveld) Post verzenden is niet toegestaan, dus u kunt niets versturen."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:99
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Wachtwoord veld) Voer tekst in.  Ga weg met pijltjes of tab."
+msgstr "(Wachtwoord veld) Voer tekst in.  Verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:101
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
-msgstr "NIET WIJZIGBAAR formulier wachtwoord.  Ga weg met pijltjes of tab."
+msgstr "NIET WIJZIGBAAR formulier wachtwoord.  Verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:103
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "(Aanvink Veld)  Gebruik pijltje-rechts of <return> om te veranderen."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:105
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
-msgstr "NIET WIJZIGBAAR formulier aanvinkveld.  Ga weg met pijltjes of tab."
+msgstr "NIET WIJZIGBAAR formulier aanvinkveld.  Verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:109
+#: LYMessages.c:107
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
-msgstr "(druk-knop)  Gebruik pijltje-rechts of <return> om te veranderen."
+msgstr "(radio-knop)  Gebruik pijltje-rechts of <return> om te kiezen."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:111
+#: LYMessages.c:109
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
-msgstr "NIET WIJZIGBARE formulier drukknop.  Ga weg met pijltjes of tab."
+msgstr "NIET WIJZIGBARE formulier drukknop.  Verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:113
+#: LYMessages.c:111
 msgid "Submit ('x' for no cache) to "
 msgstr "Verzend ('x' voor geen cache) naar "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:115
+#: LYMessages.c:113
 msgid "Submit to "
 msgstr "Verzend naar "
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:117
+#: LYMessages.c:115
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr "(Form. verzendknop)  Verzend met pijltje rechts of <return> ('x'-geen cache)."
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:119
+#: LYMessages.c:117
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(Formulier verzendknop) Verzend met pijltje rechts of <return>."
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:121
+#: LYMessages.c:119
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
-msgstr "NIET BESCHIKBAAR: formulier verzendknop.  Ga weg met pijltjes of tab."
+msgstr "NIET BESCHIKBAAR: formulier verzendknop.  Verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:123
+#: LYMessages.c:121
 msgid "Submit mailto form to "
 msgstr "Verzend email-formulier naar "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:125
+#: LYMessages.c:123
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr "(email-formulier verzendknop)  Verzend met pijltje rechts of <return>."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:125
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr "(email-formulier verzendknop) Email is niet toegestaan; u kunt niet verzenden."
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:127
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr "(Formulier herstelknop)  Herstel met pijltje rechts of <return>."
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:129
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
-msgstr "NIET BESCHIKBAAR formulier herstelknop.  Ga weg met pijltjes of tab."
+msgstr "NIET BESCHIKBAAR formulier herstelknop.  Verlaat met pijltjes of tab."
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:131
 msgid "(Option list) Hit return and use arrow keys and return to select option."
 msgstr "(Lijst van opties) Druk op enter, dan pijltjes en enter om een optie te kiezen."
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:133
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
-msgstr "(Keuzelijst) Druk op enter, dan pijltjes en enter om een optie te kiezen."
+msgstr "(Keuzelijst) Gebruik de pijltjes en dan enter om een optie te kiezen."
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:135
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr "ONVERANDERBARE optielijst.  Enter en pijltjes om te herzien of weg te gaan."
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:137
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr "ONVERANDERBARE keuzelijst.  Enter of pijltjes om na te lezen of weg te gaan."
 
-#: LYMessages.c:140
+#: LYMessages.c:138
 msgid "Submitting form..."
 msgstr "Bezig formulier te verzenden..."
 
-#: LYMessages.c:141
+#: LYMessages.c:139
 msgid "Resetting form..."
 msgstr "Het oorspronkelijke formulier wordt hersteld..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:141
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Bezig document te herladen.  Alle formulier-invoer gaat verloren!"
 
-#: LYMessages.c:144
+#: LYMessages.c:142
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Let op: Kan de formuliergegevens niet omvormen naar karakterset %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:147
+#: LYMessages.c:145
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr "(GEWONE LINK)   Activeer met pijltje rechts of <return>."
 
-#: LYMessages.c:148
+#: LYMessages.c:146
 msgid "The resource requested is not available at this time."
 msgstr "De gevraagde hulpbron is op dit moment niet beschikbaar."
 
-#: LYMessages.c:149
+#: LYMessages.c:147
 msgid "Enter Lynx keystroke command: "
 msgstr "Voer een Lynx-sneltoets commando in: "
 
-#: LYMessages.c:150
+#: LYMessages.c:148
 msgid "Looking up "
 msgstr "Opzoeken van "
 
-#: LYMessages.c:151
+#: LYMessages.c:149
 #, c-format
 msgid "Getting %s"
 msgstr "%s wordt opgehaald"
 
-#: LYMessages.c:152
+#: LYMessages.c:150
 #, c-format
 msgid "Skipping %s"
 msgstr "%s wordt overgeslagen"
 
-#: LYMessages.c:153
+#: LYMessages.c:151
 #, c-format
 msgid "Using %s"
 msgstr "%s wordt gebruikt"
 
-#: LYMessages.c:154
+#: LYMessages.c:152
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "Ongeldige URL: %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:153
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Foutief adres %s"
 
-#: LYMessages.c:156
+#: LYMessages.c:154
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:155
 msgid "Unable to access WWW file!!!"
 msgstr "Kan WWW bestand niet vinden!!!"
 
-#: LYMessages.c:158
+#: LYMessages.c:156
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "Deze index kan doorzocht worden.  Gebruik %s om te zoeken."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:160
+#: LYMessages.c:158
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--Meer--  Deze index kan doorzocht worden.  Gebruik %s om te zoeken."
 
-#: LYMessages.c:161
+#: LYMessages.c:159
 msgid "You have entered an invalid link number."
 msgstr "U heeft een ongeldig link-nummer ingevoerd."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:163
+#: LYMessages.c:161
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "Dit is de brontekst van het document. Druk op '\\' voor de verwerkte versie. "
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:165
+#: LYMessages.c:163
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
 msgstr "Pijltjes omhoog en omlaag-verplaatsen; Rechts-volg link; Links-ga terug.\n"
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:167
+#: LYMessages.c:165
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
-msgstr "H)elp O)pties P)rint G)a naar M)-beginscherm Q)-stop /=zoek [del]=historie\n"
+msgstr "H)elp O)pties P)rint G)a naar M)-beginscherm Q)-stop /=zoek [bksp]=historie\n"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:169
+#: LYMessages.c:167
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
 msgstr "O)verige cmds H)elp K)eymap G)a naar P)rint M)-beginscherm o)pties Q)-stop\n"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:171
+#: LYMessages.c:169
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr "O)verige cmds B)-terug E)-wijzig D)ownload ^R)-herladen ^W)is scherm  zoek doc: /\n"
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:173
+#: LYMessages.c:171
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr "O)verige C)ommentaar <backspace>-Historie Boekenleggers: V)-inzien A)-toevoegen R)-wissen\n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:175
+#: LYMessages.c:173
 msgid "            Enter text into the field by typing on the keyboard              "
-msgstr "Type tekst in de invoervelden"
+msgstr "Typ tekst in de invoervelden"
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:177
+#: LYMessages.c:175
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr "Ctrl-U wist alle tekst in het invoerveld, [Backspace] wist één teken"
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:179
+#: LYMessages.c:177
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
 msgstr "Ctrl-U wist tekst in het invoerveld, [Backspace] wist één teken"
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:181
+#: LYMessages.c:179
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr "%s wist alle tekst in het invoerveld, [Backspace] wist één teken"
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:183
+#: LYMessages.c:181
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
 msgstr "%s wist tekst in het invoerveld, [Backspace] wist één teken"
 
 #. mailto
-#: LYMessages.c:186
+#: LYMessages.c:184
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "Verkeerd geformuleerde mailto-form verzending!  Geannuleerd!"
 
-#: LYMessages.c:187
+#: LYMessages.c:185
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Let op!  Controle codes in mail-adres vervangen door ?"
 
-#: LYMessages.c:188
+#: LYMessages.c:186
 msgid "Mail disallowed!  Cannot submit."
 msgstr "U mag niet e-mailen!  Gegevens kunnen niet worden verzonden."
 
-#: LYMessages.c:189
+#: LYMessages.c:187
 msgid "Mailto form submission failed!"
 msgstr "Mailto-form verzending mislukt!"
 
-#: LYMessages.c:190
+#: LYMessages.c:188
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Mailto-form verzending geannuleerd!!!"
 
-#: LYMessages.c:191
+#: LYMessages.c:189
 msgid "Sending form content..."
 msgstr "Gegevens worden verzonden..."
 
-#: LYMessages.c:192
+#: LYMessages.c:190
 msgid "No email address is present in mailto URL!"
 msgstr "Er staat geen e-mail adres in de mailto URL!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:194
+#: LYMessages.c:192
 msgid "Unable to open temporary file for mailto URL!"
 msgstr "Kan geen tijdelijk bestand voor mailto URL maken!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:196
+#: LYMessages.c:194
 msgid "Do you wish to include the original message?"
 msgstr "Wilt u het originele bericht opnemen?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:196
 msgid "Do you wish to include the preparsed source?"
-msgstr "Wilt u de ontleedde broncode opnemen?"
+msgstr "Wilt u de ontlede broncode opnemen?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:200
+#: LYMessages.c:198
 msgid "Spawning your selected editor to edit mail message"
 msgstr "Uw editor wordt gestart om het email-bericht te maken"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:202
+#: LYMessages.c:200
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr "De editor wil niet starten, controleer de instellingen in het Opties-menu"
 
-#: LYMessages.c:203
+#: LYMessages.c:201
 msgid "Send this comment?"
 msgstr "Dit commentaar verzenden?"
 
-#: LYMessages.c:204
+#: LYMessages.c:202
 msgid "Send this message?"
 msgstr "Dit bericht verzenden?"
 
-#: LYMessages.c:205
+#: LYMessages.c:203
 msgid "Sending your message..."
 msgstr "Het bericht wordt verzonden..."
 
-#: LYMessages.c:206
+#: LYMessages.c:204
 msgid "Sending your comment:"
 msgstr "Het commentaar wordt verzonden:"
 
 #. textarea
-#: LYMessages.c:209
+#: LYMessages.c:207
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "Niet in een TEKSTVELD; een externe editor heeft hiervoor geen zin."
 
-#: LYMessages.c:210
+#: LYMessages.c:208
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "Niet in een TEKSTVELD; dit commando heeft hier geen zin."
 
-#: LYMessages.c:213
+#: LYMessages.c:211
 msgid "file: ACTIONs are disallowed!"
 msgstr "bestand: ACTIEs zijn niet toegestaan!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:213
 msgid "file: URLs via served links are disallowed!"
 msgstr "bestand: URL's via aangeboden links zijn niet toegestaan!"
 
-#: LYMessages.c:216
+#: LYMessages.c:214
 msgid "Access to local files denied."
 msgstr "Geen toegang tot lokale bestanden."
 
-#: LYMessages.c:217
+#: LYMessages.c:215
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "bestand: URL's via boekenleggers niet toegestaan!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:217
 msgid "This special URL is not allowed in external documents!"
 msgstr "Dit specifieke URL is niet toegestaand in externe documenten!"
 
-#: LYMessages.c:220
+#: LYMessages.c:218
 msgid "Press <return> to return to Lynx."
 msgstr "Druk op <return> om terug te keren naar Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:221
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "DCL subproces wordt aangeroepen.  Gebruik 'logout' om terug te keren naar Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:225
 msgid "Type EXIT to return to Lynx.\n"
-msgstr "Type EXIT om terug te keren naar Lynx.\n"
+msgstr "Typ EXIT om terug te keren naar Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:228
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
-msgstr "Uw standaard shell wordt aangeroepen.  Type 'exit' om terug te keren naar Lynx.\n"
+msgstr "Uw standaard shell wordt aangeroepen.  Typ 'exit' om terug te keren naar Lynx.\n"
 
-#: LYMessages.c:233
+#: LYMessages.c:231
 msgid "Spawning is currently disabled."
-msgstr "Het starten van externe programma's starten is uitgezet."
+msgstr "Het starten van externe programma's is momenteel uitgeschakeld."
 
-#: LYMessages.c:234
+#: LYMessages.c:232
 msgid "The 'd'ownload command is currently disabled."
 msgstr "Het 'd'ownload commando is momenteel uitgezet."
 
-#: LYMessages.c:235
+#: LYMessages.c:233
 msgid "You cannot download an input field."
 msgstr "U kunt niet downloaden in een invoerveld."
 
-#: LYMessages.c:236
+#: LYMessages.c:234
 msgid "Form has a mailto action!  Cannot download."
 msgstr "Form heeft een mailto-actie!  Kan niet downloaden."
 
-#: LYMessages.c:237
+#: LYMessages.c:235
 msgid "You cannot download a mailto: link."
 msgstr "U kunt een 'mailto:' koppeling niet downloaden."
 
-#: LYMessages.c:238
+#: LYMessages.c:236
 msgid "You cannot download cookies."
-msgstr "U kunt koekjes niet downloaden."
+msgstr "U kunt cookies niet downloaden."
 
-#: LYMessages.c:239
+#: LYMessages.c:237
 msgid "You cannot download a printing option."
 msgstr "U kunt een printopdracht niet downloaden."
 
-#: LYMessages.c:240
+#: LYMessages.c:238
 msgid "You cannot download an upload option."
 msgstr "U kunt een upload-optie niet downloaden."
 
-#: LYMessages.c:241
+#: LYMessages.c:239
 msgid "You cannot download an permit option."
 msgstr "U kunt een toestemmings-optie niet downloaden."
 
-#: LYMessages.c:242
+#: LYMessages.c:240
 msgid "This special URL cannot be downloaded!"
 msgstr "Dit specifieke URL kan niet worden gedownload!"
 
-#: LYMessages.c:243
+#: LYMessages.c:241
 msgid "Nothing to download."
 msgstr "Niets om te downloaden."
 
-#: LYMessages.c:244
+#: LYMessages.c:242
 msgid "Trace ON!"
 msgstr "Traceren AAN!"
 
-#: LYMessages.c:245
+#: LYMessages.c:243
 msgid "Trace OFF!"
 msgstr "Traceren UIT!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:245
 msgid "Links will be included for all images!  Reloading..."
 msgstr "Links voor alle afbeeldingen worden opgenomen!  Bezig met herladen..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:247
 msgid "Standard image handling restored!  Reloading..."
 msgstr "Normale afhandeling voor afbeeldingen teruggezet!  Bezig met herladen..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:249
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr "Voeg Pseudo_ALT's in voor inlines zonder ALT strings! Bezig met herladen..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:251
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "Inlines zonder ALT strings worden genegeerd! Bezig met herladen..."
 
-#: LYMessages.c:254
+#: LYMessages.c:252
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Ruwe 8-bit of CJK mode UIT gezet!  Bezig met herladen..."
 
-#: LYMessages.c:255
+#: LYMessages.c:253
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "Ruwe 8-bit of CJK mode AAN gezet!  Bezig met herladen..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:255
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "Zend `HEAD' verzoek voor D)ocument, L)ink of C)-annuleer? (d,l,c): "
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:257
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "Zend HEAD verzoek voor D)ocument of C)-annuleer? (d,c): "
 
-#: LYMessages.c:260
+#: LYMessages.c:258
 msgid "Sorry, the document is not an http URL."
 msgstr "Sorry, het document is niet een http URL."
 
-#: LYMessages.c:261
+#: LYMessages.c:259
 msgid "Sorry, the link is not an http URL."
-msgstr "Sorry, de link is niet een http URL."
+msgstr "Sorry, deze link is geen http URL."
 
-#: LYMessages.c:262
+#: LYMessages.c:260
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "Sorry, de ACTIE voor dit formulier is uitgezet."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:262
 msgid "Sorry, the ACTION for this form is not an http URL."
-msgstr "Sorry, de ACTIE voor dit formulier is niet een http URL."
+msgstr "Sorry, de ACTIE voor dit formulier is geen http URL."
 
-#: LYMessages.c:265
+#: LYMessages.c:263
 msgid "Not an http URL or form ACTION!"
-msgstr "Niet een http URL of form ACTIE!"
+msgstr "Geen http URL of form ACTIE!"
 
-#: LYMessages.c:266
+#: LYMessages.c:264
 msgid "This special URL cannot be a form ACTION!"
-msgstr "Dit specifieke URL kan niet een form ACTIE zijn!"
+msgstr "Deze specifieke URL kan geen form ACTIE zijn!"
 
-#: LYMessages.c:267
+#: LYMessages.c:265
 msgid "URL is not in starting realm!"
 msgstr "URL is niet in begin-omgeving!"
 
-#: LYMessages.c:268
+#: LYMessages.c:266
 msgid "News posting is disabled!"
-msgstr "Nieuwsberichten zenden is uitgezet!"
+msgstr "Nieuwsberichten zenden is uitgeschakeld!"
 
-#: LYMessages.c:269
+#: LYMessages.c:267
 msgid "File management support is disabled!"
-msgstr "Bestandsbeheer is uitgezet!"
+msgstr "Bestandsbeheer is uitgeschakeld!"
 
-#: LYMessages.c:270
+#: LYMessages.c:268
 msgid "No jump file is currently available."
 msgstr "Er is momenteel geen snelkoppelingen-bestand beschikbaar."
 
-#: LYMessages.c:271
+#: LYMessages.c:269
 msgid "Jump to (use '?' for list): "
 msgstr "Spring naar (vraag een lijst op met '?'): "
 
-#: LYMessages.c:272
+#: LYMessages.c:270
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr "Springen naar een snelkoppeling-URL is niet toegestaan!"
 
-#: LYMessages.c:273
+#: LYMessages.c:271
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "Willekeurig URL is niet toegestaan!  Gebruik een sneltoets."
 
-#: LYMessages.c:274
+#: LYMessages.c:272
 msgid "No random URLs have been used thus far."
 msgstr "Tot nog toe zijn er geen willeukeurige URL's gebruikt."
 
-#: LYMessages.c:275
+#: LYMessages.c:273
 msgid "Bookmark features are currently disabled."
 msgstr "Boekenlegger-mogelijkheden zijn momenteel uitgezet."
 
-#: LYMessages.c:276
+#: LYMessages.c:274
 msgid "Execution via bookmarks is disabled."
 msgstr "Uitvoeren via boekenleggers is uitgezet."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:276
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "boekenleggerbestand is niet opgegeven. Gebruik %s om de opties te zien."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:278
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "Niet in staat om tijdelijk bestand te openen voor 'X Mosaic hotlist' conversie."
 
-#: LYMessages.c:281
+#: LYMessages.c:279
 msgid "ERROR - unable to open bookmark file."
 msgstr "FOUT - niet in staat om boekenleggerbestand te openen."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:281
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "Kan boekenleggerbestand niet openen om link te verwijderen."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:283
 msgid "Unable to open scratch file for deletion of link."
 msgstr "Kan kladblok-bestand niet openen om link te verwijderen."
 
-#: LYMessages.c:287
+#: LYMessages.c:285
 msgid "Error renaming scratch file."
 msgstr "Fout bij het hernoemen van kladblok-bestand."
 
-#: LYMessages.c:289
+#: LYMessages.c:287
 msgid "Error renaming temporary file."
 msgstr "Fout bij het hernoemen van tijdelijk bestand."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:289
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "Kan tijdelijk bestand niet kopiëren om link te verwijderen."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:291
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "Kan tijdelijk bestand niet heropenen om link te verwijderen."
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:294
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "De link vult meer dan één regel in het boekenleggerbestand."
 
-#: LYMessages.c:297
+#: LYMessages.c:295
 msgid "Bookmark deletion failed."
 msgstr "Boekenlegger kon niet gewist worden."
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:297
 msgid "Bookmark files cannot be traversed (only http URLs)."
-msgstr "boekenleggerbestanden kunnen niet doorkruist worden (enkel http URL's)."
+msgstr "Boekenleggerbestanden kunnen niet doorkruist worden (enkel http URL's)."
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:299
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "Kan boekenleggerbestand niet openen, gebruik 'a' om de link eerst op te slaan"
 
-#: LYMessages.c:302
+#: LYMessages.c:300
 msgid "There are no links in this bookmark file!"
 msgstr "Er zijn geen links in dit boekenleggerbestand!"
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:302
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr "Opslaan in boekenleggerbestand: D)ocument, L)ink of C)-annuleren? (d,l,c): "
 
-#: LYMessages.c:305
+#: LYMessages.c:303
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "Opslaan in boekenleggerbestand: D)ocument of C)-annuleren? (d,c): "
 
-#: LYMessages.c:306
+#: LYMessages.c:304
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "Opslaan in boekenleggerbestand: L)ink of C)-annuleren? (l,c): "
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:308
+#: LYMessages.c:306
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr "Kan geen boekenleggers maken van documenten van form's met POST-informatie."
 
-#: LYMessages.c:309
+#: LYMessages.c:307
 msgid "Cannot save form fields/links"
 msgstr "Kan form-velden/links niet opslaan"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:311
+#: LYMessages.c:309
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "Kan geen boekenleggers maken van historie, info-overzicht, menu of lijsten."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:313
+#: LYMessages.c:311
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Wilt u echt deze link uit het boekenleggerbestand verwijderen?"
 
-#: LYMessages.c:314
+#: LYMessages.c:312
 msgid "Malformed address."
 msgstr "Ongeldig adres."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:316
+#: LYMessages.c:314
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "Oorspronkelijke commentaar-verwerking AAN (Minimale methode onderdrukt)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:318
+#: LYMessages.c:316
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "Oorspronkelijke commentaar-verwerking UIT (Minimale methode is actief)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:320
+#: LYMessages.c:318
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "Oorspronkelijke commentaar-verwerking AAN (Geldige methode onderdrukt)"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:322
+#: LYMessages.c:320
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "Oorspronkelijke commentaar-ontleding UIT (Geldige methode is actief)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:324
+#: LYMessages.c:322
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "Minimale verwerking van commentaar AAN (en actief)!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:324
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "Minimale verwerking van commentaar UIT (Geldige methode is actief)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:328
+#: LYMessages.c:326
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "Minimale verwerking van commentaar AAN (Oorspronkelijke methode is actief)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:330
+#: LYMessages.c:328
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "Minimale verwerking van commentaar UIT (Oorspronkelijke methode actief)!"
 
-#: LYMessages.c:331
+#: LYMessages.c:329
 msgid "Soft double-quote parsing ON!"
 msgstr "`Soft double-quote' ontleden AAN!"
 
-#: LYMessages.c:332
+#: LYMessages.c:330
 msgid "Soft double-quote parsing OFF!"
 msgstr "`Soft double-quote' ontleden UIT!"
 
-#: LYMessages.c:333
+#: LYMessages.c:331
 msgid "Now using TagSoup parsing of HTML."
 msgstr "Vanaf nu wordt `TagSoup' gebruikt om HTML te ontleden."
 
-#: LYMessages.c:334
+#: LYMessages.c:332
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "Vanaf nu wordt `SortaSGML' gebruikt om HTML te ontleden."
 
-#: LYMessages.c:335
+#: LYMessages.c:333
 msgid "You are already at the end of this document."
 msgstr "U bent al aan het einde van het document."
 
-#: LYMessages.c:336
+#: LYMessages.c:334
 msgid "You are already at the beginning of this document."
 msgstr "U bent al aan het begin van het document."
 
-#: LYMessages.c:337
+#: LYMessages.c:335
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "U bent al op pagina %d van dit document."
 
-#: LYMessages.c:338
+#: LYMessages.c:336
 #, c-format
 msgid "Link number %d already is current."
 msgstr "Link nummer %d is al geselecteerd."
 
-#: LYMessages.c:339
+#: LYMessages.c:337
 msgid "You are already at the first document"
 msgstr "U bent al bij het eerste document"
 
-#: LYMessages.c:340
+#: LYMessages.c:338
 msgid "There are no links above this line of the document."
 msgstr "Er zijn geen links boven deze regel in het document."
 
-#: LYMessages.c:341
+#: LYMessages.c:339
 msgid "There are no links below this line of the document."
 msgstr "Er zijn geen links meer beneden deze regel in het document."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:343
+#: LYMessages.c:341
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "Maximale lengte bereikt!  Verwijder tekst of ga hier weg."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:345
+#: LYMessages.c:343
 msgid "You are not on a form submission button or normal link."
 msgstr "U staat niet op een form-verzendknop of op een normale link."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:347
+#: LYMessages.c:345
 msgid "One radio button must be checked at all times!"
 msgstr "Er moet altijd één drukknop ingedrukt zijn!"
 
-#: LYMessages.c:348
+#: LYMessages.c:346
 msgid "No submit button for this form, submit single text field?"
-msgstr ""
+msgstr "Geen invoerknop aanwezig, verzend dit tekstveld?"
 
-#: LYMessages.c:349
+#: LYMessages.c:347
 msgid "Do you want to go back to the previous document?"
 msgstr "Wilt u terug gaan naar het vorige document?"
 
-#: LYMessages.c:350
+#: LYMessages.c:348
 msgid "Use arrows or tab to move off of field."
-msgstr "Ga weg van dit veld met pijltjes of tab."
+msgstr "Verlaat dit veld met pijltjes of tab."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:352
+#: LYMessages.c:350
 msgid "Enter text.  Use arrows or tab to move off of field."
-msgstr "Voer tekst in.  Ga weg met pijltjes of tab."
+msgstr "Voer tekst in.  Verlaat dit veld met pijltjes of tab."
 
-#: LYMessages.c:353
+#: LYMessages.c:351
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** Onjuiste HTML!!  Geen form-actie gedefiniëerd. **"
 
-#: LYMessages.c:354
+#: LYMessages.c:352
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "Onjuiste HTML!!  Kan geen popup-venster aanmaken!"
 
-#: LYMessages.c:355
+#: LYMessages.c:353
 msgid "Unable to create popup window!"
 msgstr "Kan geen popup-venster aanmaken!"
 
-#: LYMessages.c:356
+#: LYMessages.c:354
 msgid "Goto a random URL is disallowed!"
 msgstr "Naar een willekeurige URL gaan is niet toegestaan!"
 
-#: LYMessages.c:357
+#: LYMessages.c:355
 msgid "Goto a non-http URL is disallowed!"
 msgstr "Naar een niet-http URL gaan is niet toegestaan!"
 
-#: LYMessages.c:358
+#: LYMessages.c:356
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "Het is niet toegestaan naar \"%s\" URL's te gaan"
 
-#: LYMessages.c:359
+#: LYMessages.c:357
 msgid "URL to open: "
 msgstr "URL om te openen: "
 
-#: LYMessages.c:360
+#: LYMessages.c:358
 msgid "Edit the current Goto URL: "
 msgstr "Wijzig de huidige Ga-naar URL: "
 
-#: LYMessages.c:361
+#: LYMessages.c:359
 msgid "Edit the previous Goto URL: "
 msgstr "Wijzig de vorige Ga-naar URL: "
 
-#: LYMessages.c:362
+#: LYMessages.c:360
 msgid "Edit a previous Goto URL: "
 msgstr "Wijzig een vorige Ga-naar URL: "
 
-#: LYMessages.c:363
+#: LYMessages.c:361
 msgid "Current document has POST data."
-msgstr "Huidige document bevat geen POST informatie."
+msgstr "Het huidige document bevat geen POST informatie."
 
-#: LYMessages.c:364
+#: LYMessages.c:362
 msgid "Edit this document's URL: "
 msgstr "Wijzig de URL van dit document: "
 
-#: LYMessages.c:365
+#: LYMessages.c:363
 msgid "Edit the current link's URL: "
 msgstr "Wijzig de URL van de huidige link: "
 
-#: LYMessages.c:366
+#: LYMessages.c:364
 msgid "You cannot edit File Management URLs"
 msgstr "U kunt Bestandsbeheer URL's niet wijzigen"
 
-#: LYMessages.c:367
+#: LYMessages.c:365
 msgid "Enter a database query: "
 msgstr "Voer een database-opdracht in: "
 
-#: LYMessages.c:368
+#: LYMessages.c:366
 msgid "Enter a whereis query: "
-msgstr "Voer een zoekopdracht in: "
+msgstr "Zoek op: "
 
-#: LYMessages.c:369
+#: LYMessages.c:367
 msgid "Edit the current query: "
 msgstr "Wijzig de huidige opdracht: "
 
-#: LYMessages.c:370
+#: LYMessages.c:368
 msgid "Edit the previous query: "
 msgstr "Wijzig de vorige opdracht: "
 
-#: LYMessages.c:371
+#: LYMessages.c:369
 msgid "Edit a previous query: "
 msgstr "Wijzig een voorgaande opdracht: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:373
+#: LYMessages.c:371
 msgid "Use Control-R to resubmit the current query."
 msgstr "Gebruik Control-R om de huidige opdracht nog eens te verzenden."
 
-#: LYMessages.c:374
+#: LYMessages.c:372
 msgid "Edit the current shortcut: "
 msgstr "Wijzig de huidige snelkoppeling: "
 
-#: LYMessages.c:375
+#: LYMessages.c:373
 msgid "Edit the previous shortcut: "
 msgstr "Wijzig de voorgaande snelkoppeling: "
 
-#: LYMessages.c:376
+#: LYMessages.c:374
 msgid "Edit a previous shortcut: "
 msgstr "Wijzig een voorgaande snelkoppeling: "
 
-#: LYMessages.c:377
+#: LYMessages.c:375
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "Toets '%c'is niet verbonden aan een snelkoppeling-bestand!"
 
-#: LYMessages.c:378
+#: LYMessages.c:376
 msgid "Cannot locate jump file!"
 msgstr "Kan snelkoppeling-bestand niet vinden!"
 
-#: LYMessages.c:379
+#: LYMessages.c:377
 msgid "Cannot open jump file!"
 msgstr "Kan snelkoppeling-bestand niet openen!"
 
-#: LYMessages.c:380
+#: LYMessages.c:378
 msgid "Error reading jump file!"
 msgstr "Fout bij het lezen van snelkoppeling-bestand!"
 
-#: LYMessages.c:381
+#: LYMessages.c:379
 msgid "Out of memory reading jump file!"
 msgstr "Geen geheugen meer beschikbaar bij het lezen van snelkoppeling-bestand!"
 
-#: LYMessages.c:382
+#: LYMessages.c:380
 msgid "Out of memory reading jump table!"
 msgstr "Geen geheugen meer beschikbaar bij het lezen van snelkoppeling-tabel!"
 
-#: LYMessages.c:383
+#: LYMessages.c:381
 msgid "No index is currently available."
 msgstr "Er is momenteel geen index beschikbaar."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:385
+#: LYMessages.c:383
 msgid "Do you really want to go to the Main screen?"
 msgstr "Wilt u echt naar het Beginscherm gaan?"
 
-#: LYMessages.c:386
+#: LYMessages.c:384
 msgid "You are already at main screen!"
-msgstr "U bent al in het beginscherm!"
+msgstr "Dit is al het beginscherm!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:388
+#: LYMessages.c:386
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "Dit is niet een geïndexeerd document -- gebruik '/' om een tekenreeks te zoeken"
 
 #. #define NO_OWNER
-#: LYMessages.c:390
+#: LYMessages.c:388
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "Geen eigenaar opgegeven voor dit bestand, dus u kunt geen commentaar zenden"
 
-#: LYMessages.c:391
+#: LYMessages.c:389
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Geen eigenaar opgegeven. Gebruik %s?"
 
-#: LYMessages.c:392
+#: LYMessages.c:390
 msgid "Do you wish to send a comment?"
 msgstr "Wilt u commentaar versturen?"
 
-#: LYMessages.c:393
+#: LYMessages.c:391
 msgid "Mail is disallowed so you cannot send a comment"
-msgstr "Email is niet toegestaan dus u kunt geen commentaar zenden"
+msgstr "Email is niet toegestaan, dus u kunt geen commentaar zenden."
 
-#: LYMessages.c:394
+#: LYMessages.c:392
 msgid "The 'e'dit command is currently disabled."
 msgstr "Het 'e'dit command is momenteel uitgeschakeld."
 
-#: LYMessages.c:395
+#: LYMessages.c:393
 msgid "External editing is currently disabled."
 msgstr "Extern editen is momenteel uitgeschakeld."
 
-#: LYMessages.c:396
+#: LYMessages.c:394
 msgid "System error - failure to get status."
 msgstr "Systeemfout - niet gelukt om status op te vragen."
 
-#: LYMessages.c:397
+#: LYMessages.c:395
 msgid "No editor is defined!"
 msgstr "Er is geen editor opgegeven!"
 
-#: LYMessages.c:398
+#: LYMessages.c:396
 msgid "The 'p'rint command is currently disabled."
 msgstr "Het 'p'rint commando is momenteel uitgeschakeld."
 
-#: LYMessages.c:399
+#: LYMessages.c:397
 msgid "Document has no Toolbar links or Banner."
 msgstr "Het document heeft geen Werkbalk links of koptekst."
 
-#: LYMessages.c:400
+#: LYMessages.c:398
 msgid "Unable to open traversal file."
 msgstr "Kan bestand met doorkruisingen niet openen."
 
-#: LYMessages.c:401
+#: LYMessages.c:399
 msgid "Unable to open traversal found file."
 msgstr "Kan bestand met gevonden doorkruisingen niet openen."
 
-#: LYMessages.c:402
+#: LYMessages.c:400
 msgid "Unable to open reject file."
 msgstr "Kan bestand met verwerpingen niet openen."
 
-#: LYMessages.c:403
+#: LYMessages.c:401
 msgid "Unable to open traversal errors output file"
 msgstr "Kan bestand met fouten van doorkruisingen niet vinden"
 
-#: LYMessages.c:404
+#: LYMessages.c:402
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "DOORKRUISING WERD ONDERBROKEN"
 
-#: LYMessages.c:405
+#: LYMessages.c:403
 msgid "Follow link (or goto link or page) number: "
 msgstr "Volg link (of ga naar link of pagina) nummer: "
 
-#: LYMessages.c:406
+#: LYMessages.c:404
 msgid "Select option (or page) number: "
 msgstr "Selecteer optie (of pagina) nummer: "
 
-#: LYMessages.c:407
+#: LYMessages.c:405
 #, c-format
 msgid "Option number %d already is current."
 msgstr "Optie-nummer %d is al het huidige."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:409
+#: LYMessages.c:407
 msgid "You are already at the end of this option list."
 msgstr "U bent al aan het einde van deze optielijst."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:411
+#: LYMessages.c:409
 msgid "You are already at the beginning of this option list."
 msgstr "U bent al aan het begin van deze optielijst."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:413
+#: LYMessages.c:411
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "U bent al op pagina %d van deze optielijst."
 
-#: LYMessages.c:414
+#: LYMessages.c:412
 msgid "You have entered an invalid option number."
 msgstr "U hebt een ongeldig optienummer ingevoerd."
 
-#: LYMessages.c:415
+#: LYMessages.c:413
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** Ongeldige HTML!!  Gebruik -trace om een diagnose op te maken. **"
 
-#: LYMessages.c:416
+#: LYMessages.c:414
 msgid "Give name of file to save in"
 msgstr "Voer naam in van het bestand om in op te slaan"
 
-#: LYMessages.c:417
+#: LYMessages.c:415
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "Kan gegevens niet opslaan in bestand -- draai a.u.b. lokaal WWW"
 
-#: LYMessages.c:418
+#: LYMessages.c:416
 msgid "Can't open temporary file!"
 msgstr "Kan tijdelijk bestand niet openen!"
 
-#: LYMessages.c:419
+#: LYMessages.c:417
 msgid "Can't open output file!  Cancelling!"
 msgstr "Kan uitvoerbestand niet openen!  Bezig met annuleren!"
 
-#: LYMessages.c:420
+#: LYMessages.c:418
 msgid "Execution is disabled."
 msgstr "Uitvoeren is uitgezet."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:422
+#: LYMessages.c:420
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "Uitvoeren is niet aangezet voor dit bestand.  Zie het optiemenu (gebruik %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:424
+#: LYMessages.c:422
 msgid "Execution capabilities are not compiled into this version."
 msgstr "Uitvoermogelijkheden zijn niet ingebouwd in deze versie."
 
-#: LYMessages.c:425
+#: LYMessages.c:423
 msgid "This file cannot be displayed on this terminal."
-msgstr "Dit bestand kan niet op deze terminal getoond worden."
+msgstr "Dit bestand kan niet getoond worden op deze terminal."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:427
+#: LYMessages.c:425
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
-msgstr "Dit bestand kan niet op deze terminal getoond worden:  D)ownload, C)-annuleren"
+msgstr "Dit bestand kan niet getoond worden op deze terminal:  D)ownload, C)-annuleren"
 
-#: LYMessages.c:428
+#: LYMessages.c:426
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D)ownload, of C)-annuleren"
 
-#: LYMessages.c:429
+#: LYMessages.c:427
 msgid "Cancelling file."
 msgstr "Bestand wordt geannuleerd."
 
-#: LYMessages.c:430
+#: LYMessages.c:428
 msgid "Retrieving file.  - PLEASE WAIT -"
-msgstr "Bezig met ophalen van bestand.  - EEN OGENBLIK GEDULD A.U.B. -"
+msgstr "Bezig met ophalen van bestand.  - een ogenblik geduld a.u.b. -"
 
-#: LYMessages.c:431
+#: LYMessages.c:429
 msgid "Enter a filename: "
 msgstr "Voer een bestandsnaam in: "
 
-#: LYMessages.c:432
+#: LYMessages.c:430
 msgid "Edit the previous filename: "
 msgstr "Wijzig de vorige bestandsnaam: "
 
-#: LYMessages.c:433
+#: LYMessages.c:431
 msgid "Edit a previous filename: "
 msgstr "Wijzig een voorgaande bestandsnaam: "
 
-#: LYMessages.c:434
+#: LYMessages.c:432
 msgid "Enter a new filename: "
 msgstr "Voer een nieuwe bestandsnaam in: "
 
-#: LYMessages.c:435
+#: LYMessages.c:433
 msgid "File name may not begin with a dot."
 msgstr "Bestandsnaam mag niet met een punt beginnen."
 
-#: LYMessages.c:437
+#: LYMessages.c:435
 msgid "File exists.  Create higher version?"
-msgstr "Bestand bestaat.  Hogere versie aanmaken?"
+msgstr "Bestand bestaat.  Nieuwere versie aanmaken?"
 
-#: LYMessages.c:439
+#: LYMessages.c:437
 msgid "File exists.  Overwrite?"
 msgstr "Bestand bestaat.  Overschrijven?"
 
-#: LYMessages.c:441
+#: LYMessages.c:439
 msgid "Cannot write to file."
 msgstr "Kan niet naar bestand schrijven."
 
-#: LYMessages.c:442
+#: LYMessages.c:440
 msgid "ERROR! - download command is misconfigured."
 msgstr "FOUT! - download commando is foutief geconfigureerd."
 
-#: LYMessages.c:443
+#: LYMessages.c:441
 msgid "Unable to download file."
 msgstr "Kan bestand niet downloaden."
 
-#: LYMessages.c:444
+#: LYMessages.c:442
 msgid "Reading directory..."
 msgstr "Bezig met lezen van bestandenoverzicht..."
 
-#: LYMessages.c:445
+#: LYMessages.c:443
 msgid "Building directory listing..."
 msgstr "Bezig lijst te maken voor map..."
 
-#: LYMessages.c:446
+#: LYMessages.c:444
 msgid "Saving..."
 msgstr "Bezig met opslaan..."
 
-#: LYMessages.c:447
+#: LYMessages.c:445
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Kan bestand '%s' niet wijzigen."
 
-#: LYMessages.c:448
+#: LYMessages.c:446
 msgid "Unable to access document!"
 msgstr "Geen toegang tot document!"
 
-#: LYMessages.c:449
+#: LYMessages.c:447
 msgid "Could not access file."
 msgstr "Geen toegang tot bestand."
 
-#: LYMessages.c:450
+#: LYMessages.c:448
 msgid "Could not access directory."
 msgstr "Geen toegang tot map."
 
-#: LYMessages.c:451
+#: LYMessages.c:449
 msgid "Could not load data."
 msgstr "Kan gegevens niet inlezen."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:453
+#: LYMessages.c:451
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "Lynx kan momenteel geen WWW bestanden op een andere computer wijzigen."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:455
+#: LYMessages.c:453
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "Dit veld kan niet gewijzigd worden met een externe editor."
 
-#: LYMessages.c:456
+#: LYMessages.c:454
 msgid "Bad rule"
 msgstr "Foutieve regel"
 
-#: LYMessages.c:457
+#: LYMessages.c:455
 msgid "Insufficient operands:"
 msgstr "Onvolledige operandi:"
 
-#: LYMessages.c:458
+#: LYMessages.c:456
 msgid "You are not authorized to edit this file."
-msgstr "U bent niet geauthoriseerd om dit bestand te wijzigen."
+msgstr "U bent niet geautoriseerd om dit bestand te wijzigen."
 
-#: LYMessages.c:459
+#: LYMessages.c:457
 msgid "Title: "
 msgstr "Titel: "
 
-#: LYMessages.c:460
+#: LYMessages.c:458
 msgid "Subject: "
 msgstr "Onderwerp: "
 
-#: LYMessages.c:461
+#: LYMessages.c:459
 msgid "Username: "
 msgstr "Gebruikersnaam: "
 
-#: LYMessages.c:462
+#: LYMessages.c:460
 msgid "Password: "
 msgstr "Wachtwoord: "
 
-#: LYMessages.c:463
+#: LYMessages.c:461
 msgid "lynx: Username and Password required!!!"
-msgstr "lynx: Gebruikersnaam en Wachtwoord vereist!!!"
+msgstr "lynx: Gebruikersnaam en wachtwoord vereist!!!"
 
-#: LYMessages.c:464
+#: LYMessages.c:462
 msgid "lynx: Password required!!!"
 msgstr "lynx: Wachtwoord vereist!!!"
 
-#: LYMessages.c:465
+#: LYMessages.c:463
 msgid "Clear all authorization info for this session?"
-msgstr "Wis alle authorisatie informatie voor deze sessie?"
+msgstr "Wis alle autorisatie informatie voor deze sessie?"
 
-#: LYMessages.c:466
+#: LYMessages.c:464
 msgid "Authorization info cleared."
 msgstr "Authorisatie informatie gewist."
 
-#: LYMessages.c:467
+#: LYMessages.c:465
 msgid "Authorization failed.  Retry?"
 msgstr "Authorisatie mislukt.  Nog eens proberen?"
 
-#: LYMessages.c:468
+#: LYMessages.c:466
 msgid "cgi support has been disabled."
 msgstr "cgi ondersteuning is uitgezet."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:470
+#: LYMessages.c:468
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "Lynxcgi mogelijkheden zijn niet ingebouwd in deze versie."
 
-#: LYMessages.c:471
+#: LYMessages.c:469
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Sorry, geen bekende manier om %s naar %s te converteren."
 
-#: LYMessages.c:472
+#: LYMessages.c:470
 msgid "Unable to set up connection."
 msgstr "Kan verbinding niet voorbereiden."
 
-#: LYMessages.c:473
+#: LYMessages.c:471
 msgid "Unable to make connection"
 msgstr "Kan verbinding niet maken"
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:475
+#: LYMessages.c:473
 msgid "Executable link rejected due to malformed request."
 msgstr "Uitvoerbare link verworpen vanwege een verkeerd geformuleerde opdracht."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:477
+#: LYMessages.c:475
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "Uitvoerbare link verworpen vanwege `%c' karakter."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:477
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "Uitvoerbare link verworpen omdat een relatief pad aangeven wordt ('../')."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:479
 msgid "Executable link rejected due to location or path."
 msgstr "Uitvoerbare link verworpen vanwege locatie of pad."
 
-#: LYMessages.c:482
+#: LYMessages.c:480
 msgid "Mail access is disabled!"
 msgstr "Email toegang is uitgezet!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:484
+#: LYMessages.c:482
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Enkel toegang tot bestanden en servers op de lokale host."
 
-#: LYMessages.c:485
+#: LYMessages.c:483
 msgid "Telnet access is disabled!"
 msgstr "Toegang tot Telnet is uitgezet!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:487
+#: LYMessages.c:485
 msgid "Telnet port specifications are disabled."
 msgstr "Telnet poort specificaties zijn uitgezet."
 
-#: LYMessages.c:488
+#: LYMessages.c:486
 msgid "USENET news access is disabled!"
 msgstr "Toegang tot USENET nieuws is uitgezet!"
 
-#: LYMessages.c:489
+#: LYMessages.c:487
 msgid "Rlogin access is disabled!"
 msgstr "Toegang tot Rlogin is uitgezet!"
 
-#: LYMessages.c:490
+#: LYMessages.c:488
 msgid "Ftp access is disabled!"
 msgstr "Toegang tot FTP is uitgezet!"
 
-#: LYMessages.c:491
+#: LYMessages.c:489
 msgid "There are no references from this document."
 msgstr "Er zijn geen referenties van dit document."
 
-#: LYMessages.c:492
+#: LYMessages.c:490
 msgid "There are only hidden links from this document."
 msgstr "Er zijn enkel verborgen links van dit document."
 
-#: LYMessages.c:494
+#: LYMessages.c:492
 msgid "Unable to open command file."
 msgstr "Kan opdrachten bestand niet openen."
 
-#: LYMessages.c:496
+#: LYMessages.c:494
 msgid "News Post Cancelled!!!"
 msgstr "Nieuws Verzending Geannuleerd!!!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:498
+#: LYMessages.c:496
 msgid "Spawning your selected editor to edit news message"
-msgstr "Uw geselecteerde editor wordt opgestart om een nieuwsbericht in te voeren"
+msgstr "Uw editor wordt opgestart om een nieuwsbericht in te voeren"
 
-#: LYMessages.c:499
+#: LYMessages.c:497
 msgid "Post this message?"
 msgstr "Dit bericht posten?"
 
-#: LYMessages.c:500
+#: LYMessages.c:498
 #, c-format
 msgid "Append '%s'?"
 msgstr "Voeg '%s' aan einde toe?"
 
-#: LYMessages.c:501
+#: LYMessages.c:499
 msgid "Posting to newsgroup(s)..."
 msgstr "Bezig met posten naar nieuwsgroep(en)..."
 
-#: LYMessages.c:503
+#: LYMessages.c:501
 msgid "*** You have unread mail. ***"
 msgstr "*** U hebt ongelezen email. ***"
 
-#: LYMessages.c:505
+#: LYMessages.c:503
 msgid "*** You have mail. ***"
 msgstr "*** U hebt email. ***"
 
-#: LYMessages.c:507
+#: LYMessages.c:505
 msgid "*** You have new mail. ***"
 msgstr "*** U hebt nieuwe email. ***"
 
-#: LYMessages.c:508
+#: LYMessages.c:506
 msgid "File insert cancelled!!!"
 msgstr "Opname van bestand geannuleerd!!!"
 
-#: LYMessages.c:509
+#: LYMessages.c:507
 msgid "Not enough memory for file!"
 msgstr "Niet genoeg geheugen voor bestand!"
 
-#: LYMessages.c:510
+#: LYMessages.c:508
 msgid "Can't open file for reading."
 msgstr "Kan bestand niet openen om te lezen."
 
-#: LYMessages.c:511
+#: LYMessages.c:509
 msgid "File does not exist."
 msgstr "Bestand bestaat niet."
 
-#: LYMessages.c:512
+#: LYMessages.c:510
 msgid "File does not exist - reenter or cancel:"
 msgstr "Bestand bestaat niet - voer opnieuw in of annuleer:"
 
-#: LYMessages.c:513
+#: LYMessages.c:511
 msgid "File is not readable."
 msgstr "Bestand is niet leesbaar."
 
-#: LYMessages.c:514
+#: LYMessages.c:512
 msgid "File is not readable - reenter or cancel:"
 msgstr "Bestand is niet leesbaar - voer opnieuw in of annuleer:"
 
-#: LYMessages.c:515
+#: LYMessages.c:513
 msgid "Nothing to insert - file is 0-length."
 msgstr "Niets om in te voegen - bestand heeft lengte 0."
 
-#: LYMessages.c:516
+#: LYMessages.c:514
 msgid "Save request cancelled!!!"
 msgstr "Verzoek om op te slaan geannuleerd!!!"
 
-#: LYMessages.c:517
+#: LYMessages.c:515
 msgid "Mail request cancelled!!!"
 msgstr "Email opdracht geannuleerd!!!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:519
+#: LYMessages.c:517
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "Voorverwerkte brontekst wordt getoond.  Weet u zeker dat u het wilt verzenden?"
 
-#: LYMessages.c:520
+#: LYMessages.c:518
 msgid "Please wait..."
 msgstr "Een ogenblik geduld a.u.b..."
 
-#: LYMessages.c:521
+#: LYMessages.c:519
 msgid "Mailing file.  Please wait..."
 msgstr "Bezig met verzenden van bestand.  Een ogenblik geduld a.u.b..."
 
-#: LYMessages.c:522
+#: LYMessages.c:520
 msgid "ERROR - Unable to mail file"
 msgstr "FOUT - Kan email bestand niet openen"
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:524
+#: LYMessages.c:522
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "Bestand is %d schermen lang.  Weet u zeker dat u het wilt afdrukken?"
 
-#: LYMessages.c:525
+#: LYMessages.c:523
 msgid "Print request cancelled!!!"
 msgstr "Verzoek tot afdrukken geannuleerd!!!"
 
-#: LYMessages.c:526
+#: LYMessages.c:524
 msgid "Press <return> to begin: "
 msgstr "Druk op <return> om te beginnen: "
 
-#: LYMessages.c:527
+#: LYMessages.c:525
 msgid "Press <return> to finish: "
 msgstr "Druk op <return> om te voltooien: "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:527
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "Bestand is %d pagina's lang.  Weet u zeker dat u het wilt afdrukken?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:531
+#: LYMessages.c:529
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "Zorg dat de printer on-line is.  Druk op <return> om het afdrukken te beginnen:"
 
-#: LYMessages.c:532
+#: LYMessages.c:530
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "FOUT - Kan bestandsruimte niet reserveren!!!"
 
-#: LYMessages.c:533
+#: LYMessages.c:531
 msgid "Unable to open tempfile"
 msgstr "Kan tijdelijk bestand niet openen"
 
-#: LYMessages.c:534
+#: LYMessages.c:532
 msgid "Unable to open print options file"
 msgstr "Kan opties-bestand niet afdrukken"
 
-#: LYMessages.c:535
+#: LYMessages.c:533
 msgid "Printing file.  Please wait..."
 msgstr "Bezig met afdrukken van bestand.  Een ogenblik geduld a.u.b..."
 
-#: LYMessages.c:536
+#: LYMessages.c:534
 msgid "Please enter a valid internet mail address: "
 msgstr "Voer een geldig email adres in: "
 
-#: LYMessages.c:537
+#: LYMessages.c:535
 msgid "ERROR! - printer is misconfigured!"
 msgstr "FOUT! - printer is niet goed ingesteld!"
 
-#: LYMessages.c:538
+#: LYMessages.c:536
 msgid "Image map from POST response not available!"
 msgstr "Menu-plaatje van POST antwoord is niet beschikbaar!"
 
-#: LYMessages.c:539
+#: LYMessages.c:537
 msgid "Misdirected client-side image MAP request!"
 msgstr "Verkeerd gericht opdracht voor afbeelding-menu aan client-zijde!"
 
-#: LYMessages.c:540
+#: LYMessages.c:538
 msgid "Client-side image MAP is not accessible!"
 msgstr "Afbeelding-menu aan client-zijde is niet bereikbaar!"
 
-#: LYMessages.c:541
+#: LYMessages.c:539
 msgid "No client-side image MAPs are available!"
 msgstr "Er zijn geen afbeelding-menu's bereikbaar aan client-zijde!"
 
-#: LYMessages.c:542
+#: LYMessages.c:540
 msgid "Client-side image MAP is not available!"
 msgstr "Afbeelding-menu aan client-zijde is niet beschikbaar!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:545
+#: LYMessages.c:543
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "De schermhoogte moet ten minste 24 regels zijn voor het Configuratie menu!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:547
+#: LYMessages.c:545
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "De schermhoogte moet ten minste 23 regels zijn voor het Configuratie menu!"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:549
+#: LYMessages.c:547
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "De schermhoogte moet ten minste 22 regels zijn voor het Configuratie menu!"
 
-#: LYMessages.c:551
+#: LYMessages.c:549
 msgid "That key requires Advanced User mode."
 msgstr "Die toetsaanslag werkt enkel in Expert Gebruiker-modus."
 
-#: LYMessages.c:552
+#: LYMessages.c:550
 #, c-format
 msgid "Content-type: %s"
 msgstr "Inhoud-type: %s"
 
-#: LYMessages.c:553
+#: LYMessages.c:551
 msgid "Command: "
 msgstr "Commando: "
 
-#: LYMessages.c:554
+#: LYMessages.c:552
 msgid "Unknown or ambiguous command"
-msgstr ""
+msgstr "Onbekend of ambigu commando"
 
-#: LYMessages.c:555
+#: LYMessages.c:553
 msgid " Version "
 msgstr "Versie "
 
-#: LYMessages.c:556
+#: LYMessages.c:554
 msgid " first"
 msgstr ", als eerste poging."
 
-#: LYMessages.c:557
+#: LYMessages.c:555
 msgid ", guessing..."
 msgstr " ; misschien werkt dat?..."
 
-#: LYMessages.c:558
+#: LYMessages.c:556
 msgid "Permissions for "
 msgstr "Toegangsrechten voor "
 
-#: LYMessages.c:559
+#: LYMessages.c:557
 msgid "Select "
 msgstr "Selecteer "
 
-#: LYMessages.c:560
+#: LYMessages.c:558
 msgid "capital letter"
 msgstr "hoofdletter"
 
-#: LYMessages.c:561
+#: LYMessages.c:559
 msgid " of option line,"
 msgstr " van optieregel,"
 
-#: LYMessages.c:562
+#: LYMessages.c:560
 msgid " to save,"
 msgstr " om op te slaan,"
 
-#: LYMessages.c:563
+#: LYMessages.c:561
 msgid " to "
 msgstr " aan "
 
-#: LYMessages.c:564
+#: LYMessages.c:562
 msgid " or "
 msgstr " of "
 
-#: LYMessages.c:565
+#: LYMessages.c:563
 msgid " index"
 msgstr " index"
 
-#: LYMessages.c:566
+#: LYMessages.c:564
 msgid " to return to Lynx."
 msgstr " om terug te keren naar Lynx."
 
-#: LYMessages.c:567
+#: LYMessages.c:565
 msgid "Accept Changes"
 msgstr "Bevestigen"
 
-#: LYMessages.c:568
+#: LYMessages.c:566
 msgid "Reset Changes"
 msgstr "Annuleren"
 
-#: LYMessages.c:569
+#: LYMessages.c:567
 msgid "Left Arrow cancels changes"
 msgstr "annuleren met pijltje naar links"
 
-#: LYMessages.c:570
+#: LYMessages.c:568
 msgid "Save options to disk"
 msgstr "Opties op schijf opslaan"
 
-#: LYMessages.c:571
+#: LYMessages.c:569
 msgid "Hit RETURN to accept entered data."
 msgstr "Druk op <return> om ingevoerde gegevens te accepteren."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:573
+#: LYMessages.c:571
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr "Druk op <return> om de gegevens te accepteren.  Wis data om te herstellen."
 
-#: LYMessages.c:574
+#: LYMessages.c:572
 msgid "Value accepted!"
 msgstr "Waarde geaccepteerd!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:576
+#: LYMessages.c:574
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Waarde geaccepteerd! -- LET OP: Lynx is geconfigureerd voor X Windows!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:578
+#: LYMessages.c:576
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Waarde geaccepteerd! -- LET OP: Lynx is NIET geconfigureerd voor X Windows!"
 
-#: LYMessages.c:579
+#: LYMessages.c:577
 msgid "You are not allowed to change which editor to use!"
 msgstr "U mag niet opgeven welke editor u wilt gebruiken!"
 
-#: LYMessages.c:580
+#: LYMessages.c:578
 msgid "Failed to set DISPLAY variable!"
 msgstr "DISPLAY variabele zetten is mislukt!"
 
-#: LYMessages.c:581
+#: LYMessages.c:579
 msgid "Failed to clear DISPLAY variable!"
 msgstr "DISPLAY variabele wissen is mislukt!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:583
+#: LYMessages.c:581
 msgid "You are not allowed to change the bookmark file!"
 msgstr "U mag het boekenleggerbestand niet veranderen!"
 
-#: LYMessages.c:584
+#: LYMessages.c:582
 msgid "Terminal does not support color"
 msgstr "Terminal ondersteunt geen kleur"
 
-#: LYMessages.c:585
+#: LYMessages.c:583
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "Uw '%s' terminal ondersteunt geen kleur."
 
-#: LYMessages.c:586
+#: LYMessages.c:584
 msgid "Access to dot files is disabled!"
 msgstr "Toegang tot punt-bestanden is uitgezet!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:588
+#: LYMessages.c:586
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr "User-Agent waarde bevat geen \"Lynx\" of \"L_y_n_x\""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:590
+#: LYMessages.c:588
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr "Gebruik \"L_y_n_x\" of \"Lynx\" in User-Agent, anders lijkt het op opzettelijk bedrog."
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:592
+#: LYMessages.c:590
 msgid "Changing of the User-Agent string is disabled!"
 msgstr "Wijzigen van de User-Agent waarde is uitgezet!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:594
+#: LYMessages.c:592
 msgid "You are not allowed to change this setting."
 msgstr "U mag deze instelling niet wijzigen."
 
-#: LYMessages.c:595
+#: LYMessages.c:593
 msgid "Saving Options..."
 msgstr "Bezig met opslaan van Opties..."
 
-#: LYMessages.c:596
+#: LYMessages.c:594
 msgid "Options saved!"
 msgstr "Opties opgeslagen!"
 
-#: LYMessages.c:597
+#: LYMessages.c:595
 msgid "Unable to save Options!"
 msgstr "Kan Opties niet opslaan!"
 
-#: LYMessages.c:598
+#: LYMessages.c:596
 msgid " 'r' to return to Lynx "
 msgstr " 'r' om terug te keren naar Lynx "
 
-#: LYMessages.c:599
+#: LYMessages.c:597
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr " '>' om op te slaan, of 'r' om terug te keren naar Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:601
+#: LYMessages.c:599
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "Druk op een toets om de waarde te veranderen; <return> om te accepteren."
 
-#: LYMessages.c:602
+#: LYMessages.c:600
 msgid "Error uncompressing temporary file!"
 msgstr "Fout bij decomprimeren van tijdelijk bestand!"
 
-#: LYMessages.c:603
+#: LYMessages.c:601
 msgid "Unsupported URL scheme!"
 msgstr "Niet ondersteunde URL methode!"
 
-#: LYMessages.c:604
+#: LYMessages.c:602
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "Niet ondersteunde data: URL!  Gebruik SHOWINFO, voor zolang als dat nodig is."
 
-#: LYMessages.c:605
+#: LYMessages.c:603
 msgid "Redirection limit of 10 URL's reached."
 msgstr "Doorverwijzing-limiet van 10 URL's bereikt."
 
-#: LYMessages.c:606
+#: LYMessages.c:604
 msgid "Illegal redirection URL received from server!"
 msgstr "Ongeldige doorverwijzing-URL ontvangen van server!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:608
+#: LYMessages.c:606
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "Server vroeg om %d doorverwijzing van POST inhoud naar"
 
-#: LYMessages.c:611
+#: LYMessages.c:609
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P)-doorgaan, gebruik G)ET of C)-annuleer "
 
-#: LYMessages.c:612
+#: LYMessages.c:610
 msgid "P)roceed, or C)ancel "
 msgstr "P)-doorgaan, of C)-annuleren "
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:614
+#: LYMessages.c:612
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr "Doorverwezen POST inhoud.  P)-ga door, bekijk U)RL, gebruik G)ET of C)-annuleer\""
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:614
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "Doorverwezen POST inhoud.  P)-ga door, bekijk U)RL, of C)-annuleer"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:618
+#: LYMessages.c:616
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "Document van Formulier met POST inhoud.  Opnieuw verzenden?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:620
+#: LYMessages.c:618
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Opnieuw POST inhoud naar %s verzenden ?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:622
+#: LYMessages.c:620
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "Lijst van document met POST informatie.  Opnieuw %s laden ?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:624
+#: LYMessages.c:622
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "Document met POST actie, HEAD wordt mogelijk niet begrepen.  Doorgaan?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:624
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "Formulier verzend actie is POST, HEAD wordt mogelijk niet begrepen.  Doorgaan?"
 
-#: LYMessages.c:627
+#: LYMessages.c:625
 msgid "Proceed without a username and password?"
 msgstr "Doorgaan zonder gebruikersnaam en wachtwoord?"
 
-#: LYMessages.c:628
+#: LYMessages.c:626
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Doorgaan (%s)?"
 
-#: LYMessages.c:629
+#: LYMessages.c:627
 msgid "Cannot POST to this host."
 msgstr "Kan niet `POST'en naar deze host."
 
-#: LYMessages.c:630
+#: LYMessages.c:628
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "POST wordt niet ondersteund voor deze URL - POST informatie worden genegeerd!"
 
-#: LYMessages.c:631
+#: LYMessages.c:629
 msgid "Discarding POST data..."
 msgstr "POST informatie worden weggegooid..."
 
-#: LYMessages.c:632
+#: LYMessages.c:630
 msgid "Document will not be reloaded!"
 msgstr "Document zal niet opnieuw geladen worden!"
 
-#: LYMessages.c:633
+#: LYMessages.c:631
 msgid "Location: "
 msgstr "Locatie: "
 
-#: LYMessages.c:634
+#: LYMessages.c:632
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' niet gevonden!"
 
-#: LYMessages.c:635
+#: LYMessages.c:633
 msgid "Default Bookmark File"
 msgstr "Standaard Boekenlegger Bestand"
 
-#: LYMessages.c:636
+#: LYMessages.c:634
 msgid "Screen too small! (8x35 min)"
 msgstr "Scherm te klein! (minimaal 8x35)"
 
-#: LYMessages.c:637
+#: LYMessages.c:635
 msgid "Select destination or ^G to Cancel: "
 msgstr "Selecteer bestemming of ^G om te annuleren: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:639
+#: LYMessages.c:637
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "Selecteer subboekenlegger, '=' voor menu, of ^G om te annuleren: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:641
+#: LYMessages.c:639
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "Reproduceer L)ink in dit boekenlegger bestand of C)-annuleer? (l,c): "
 
-#: LYMessages.c:642
+#: LYMessages.c:640
 msgid "Multiple bookmark support is not available."
 msgstr "Meervoudige boekenlegger ondersteuning is niet beschikbaar."
 
-#: LYMessages.c:643
+#: LYMessages.c:641
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr " Selecteer Boekenlegger (scherm %d van de %d)"
 
-#: LYMessages.c:644
+#: LYMessages.c:642
 msgid "       Select Bookmark"
 msgstr "       Selecteer Boekenlegger"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:646
+#: LYMessages.c:644
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "Bezig met wijzigen van Boekenlegger OMSCHRIJVING en BESTANDSPAD (%d van 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:648
+#: LYMessages.c:646
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "     Wijzigen van Boekenlegger OMSCHRIJVING en BESTANDSPAD"
 
-#: LYMessages.c:649
+#: LYMessages.c:647
 msgid "Letter: "
 msgstr "Letter: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:652
+#: LYMessages.c:650
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Gebruik een bestandspad vanuit uw login map in SHELL syntaxis!"
 
-#: LYMessages.c:654
+#: LYMessages.c:652
 msgid "Use a filepath off your home directory!"
 msgstr "Gebruik een bestandspad vanuit uw thuismap!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:657
+#: LYMessages.c:655
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Teveel links per pagina!  Blader per halve-pagina of twee-regelig."
 
 #. #define MAXHIST_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:657
 msgid "History List maximum reached!  Document not pushed."
 msgstr "Maximum van Historie Lijst bereikt!  Document niet toegevoegd."
 
-#: LYMessages.c:660
+#: LYMessages.c:658
 msgid "No previously visited links available!"
 msgstr "Geen voorgaande bezochte links beschikbaar!"
 
-#: LYMessages.c:661
+#: LYMessages.c:659
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Geen geheugen meer beschikbaar!  Programma afgebroken!"
 
-#: LYMessages.c:662
+#: LYMessages.c:660
 msgid "Memory exhausted!  Aborting..."
 msgstr "Geen geheugen meer beschikbaar!  Bezig met afbreken..."
 
-#: LYMessages.c:663
+#: LYMessages.c:661
 msgid "Not enough memory!"
 msgstr "Niet genoeg geheugen!"
 
-#: LYMessages.c:664
+#: LYMessages.c:662
 msgid "Directory/File Manager not available"
 msgstr "Map/Bestandsbeheer niet beschikbaar"
 
-#: LYMessages.c:665
+#: LYMessages.c:663
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "HREF in `BASIS' element is niet een absolute URL."
 
-#: LYMessages.c:666
+#: LYMessages.c:664
 msgid "Location URL is not absolute."
 msgstr "Locatie URL is niet absoluut."
 
-#: LYMessages.c:667
+#: LYMessages.c:665
 msgid "Refresh URL is not absolute."
 msgstr "Verversings URL is niet absoluut."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:667
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2034,7 +2036,7 @@ msgstr ""
 "U zendt een bericht met inhoud naar:\n"
 "  "
 
-#: LYMessages.c:670
+#: LYMessages.c:668
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2042,7 +2044,7 @@ msgstr ""
 "U zendt commentaar naar:\n"
 "  "
 
-#: LYMessages.c:671
+#: LYMessages.c:669
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2052,7 +2054,7 @@ msgstr ""
 " Met kopie naar:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:670
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2063,7 +2065,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:672
 msgid ""
 "\n"
 "\n"
@@ -2074,7 +2076,7 @@ msgstr ""
 "Gebruik Ctrl-G om te annuleren als u het bericht niet wilt verzenden\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:674
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2083,7 +2085,7 @@ msgstr ""
 " Voer uw naam in, of laat het leeg om anoniem te blijven\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:676
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2092,11 +2094,11 @@ msgstr ""
 " Vul een email adres in of een andere\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:678
 msgid " means to contact you, if you desire a response.\n"
 msgstr " manier om u te bereiken, als u antwoord wenst te ontvangen.\n"
 
-#: LYMessages.c:681
+#: LYMessages.c:679
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2105,7 +2107,7 @@ msgstr ""
 " Vul een onderwerp in.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2113,11 +2115,11 @@ msgstr ""
 "\n"
 "Voer een email adres in om een kopie van het bericht naar toe te sturen.\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:682
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (Laat leeg indien u geen kopie wilt.)\n"
 
-#: LYMessages.c:685
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2127,7 +2129,7 @@ msgstr ""
 " Herzie de inhoud van het bericht a.u.b.:\n"
 "\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:684
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2135,7 +2137,7 @@ msgstr ""
 "\n"
 "Druk op <return> om door te gaan: "
 
-#: LYMessages.c:687
+#: LYMessages.c:685
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2143,11 +2145,11 @@ msgstr ""
 "\n"
 "Druk op <return> om op te ruimen: "
 
-#: LYMessages.c:688
+#: LYMessages.c:686
 msgid " Use Control-U to erase the default.\n"
 msgstr " Gebruik Control-U om de huidige regel te wissen.\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2156,7 +2158,7 @@ msgstr ""
 " Schrijf uw bericht hieronder."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:380
+#: LYMessages.c:689 src/LYNews.c:361
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2165,7 +2167,7 @@ msgstr ""
 " Indien u klaar bent, druk dan op <return> en plaats vervolgens"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:381
+#: LYMessages.c:691 src/LYNews.c:362
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2175,248 +2177,248 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:695
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
-msgstr "%s koekje: %.*s=%.*s  Toestaan? J)a, N)ee, A)ltijd, V)-nooit"
+msgstr "%s cookie: %.*s=%.*s  Toestaan? J)a, N)ee, A)ltijd, V)-nooit"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:697
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
-msgstr "Accepteer ongeldig koekjesdomein=%s voor '%s'?"
+msgstr "Accepteer ongeldig cookiesdomein=%s voor '%s'?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:699
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
-msgstr "Accepteer ongeldig koekjespad=%s als een prefix voor '%s'?"
+msgstr "Accepteer ongeldig cookiespad=%s als een prefix voor '%s'?"
 
-#: LYMessages.c:702
+#: LYMessages.c:700
 msgid "Allowing this cookie."
-msgstr "Dit koekje wordt toegelaten."
+msgstr "Dit cookie wordt toegelaten."
 
-#: LYMessages.c:703
+#: LYMessages.c:701
 msgid "Rejecting this cookie."
-msgstr "Dit koekje wordt niet toegelaten."
+msgstr "Dit cookie wordt niet toegelaten."
 
-#: LYMessages.c:704
+#: LYMessages.c:702
 msgid "The Cookie Jar is empty."
 msgstr "De Koekjes Trommel is leeg."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:706
+#: LYMessages.c:704
 msgid "Activate links to gobble up cookies or entire domains,"
-msgstr "Activeer de links om koekjes over hun houdbaarheidsdatum heen te helpen,"
+msgstr "Activeer de links om cookies over hun houdbaarheidsdatum heen te helpen,"
 
-#: LYMessages.c:707
+#: LYMessages.c:705
 msgid "or to change a domain's 'allow' setting."
 msgstr "of om de 'toelaatbaarheids' instelling van een domein te wijzigen."
 
-#: LYMessages.c:708
+#: LYMessages.c:706
 msgid "(Cookies never allowed.)"
-msgstr "(Koekjes nooit toegestaan.)"
+msgstr "(Cookies nooit toegestaan.)"
 
-#: LYMessages.c:709
+#: LYMessages.c:707
 msgid "(Cookies always allowed.)"
-msgstr "(Koekjes altijd toegestaan.)"
+msgstr "(Cookies altijd toegestaan.)"
 
-#: LYMessages.c:710
+#: LYMessages.c:708
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Koekjes toegestaan met prompt.)"
 
-#: LYMessages.c:711
+#: LYMessages.c:709
 msgid "(Persistent Cookies.)"
-msgstr "(Persistente Koekjes.)"
+msgstr "(Persistente Cookies.)"
 
-#: LYMessages.c:712
+#: LYMessages.c:710
 msgid "(No title.)"
 msgstr "(Geen titel.)"
 
-#: LYMessages.c:713
+#: LYMessages.c:711
 msgid "(No name.)"
 msgstr "(Geen naam.)"
 
-#: LYMessages.c:714
+#: LYMessages.c:712
 msgid "(No value.)"
 msgstr "(Geen waarde.)"
 
-#: LYMessages.c:715
+#: LYMessages.c:713
 msgid "None"
 msgstr "Geen"
 
-#: LYMessages.c:716
+#: LYMessages.c:714
 msgid "(End of session.)"
 msgstr "(Einde sessie.)"
 
-#: LYMessages.c:717
+#: LYMessages.c:715
 msgid "Delete this cookie?"
-msgstr "Verwijder dit koekje?"
+msgstr "Verwijder dit cookie?"
 
-#: LYMessages.c:718
+#: LYMessages.c:716
 msgid "The cookie has been eaten!"
-msgstr "Dit koekje is opgegeten!"
+msgstr "Dit cookie is opgegeten!"
 
-#: LYMessages.c:719
+#: LYMessages.c:717
 msgid "Delete this empty domain?"
 msgstr "Verwijder dit lege domein?"
 
-#: LYMessages.c:720
+#: LYMessages.c:718
 msgid "The domain has been eaten!"
 msgstr "Dit domein is opgegeten!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:722
+#: LYMessages.c:720
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)omein wissen; zet toelaten op A)ltijd/P)rompt/V)-nooit; of C)-annuleren? "
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:724
+#: LYMessages.c:722
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)omein wissen, zet toestaan A)ltijd/P)rompt/V)-nooit, of C)-annuleren? "
 
-#: LYMessages.c:725
+#: LYMessages.c:723
 msgid "All cookies in the domain have been eaten!"
-msgstr "Alle koekjes in het domein zijn opgegeten!"
+msgstr "Alle cookies in het domein zijn opgegeten!"
 
-#: LYMessages.c:726
+#: LYMessages.c:724
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "'A'ltijd toelaten van domein '%s'."
 
-#: LYMessages.c:727
+#: LYMessages.c:725
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "nooit (V) toelaten van domein '%s'."
 
-#: LYMessages.c:728
+#: LYMessages.c:726
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "'P'rompt voor toestaan van domein '%s'."
 
-#: LYMessages.c:729
+#: LYMessages.c:727
 msgid "Delete all cookies in this domain?"
-msgstr "Verwijder alle koekjes in dit domein?"
+msgstr "Verwijder alle cookies in dit domein?"
 
-#: LYMessages.c:730
+#: LYMessages.c:728
 msgid "All of the cookies in the jar have been eaten!"
-msgstr "Alle koekjes in de trommel zijn opgegeten!"
+msgstr "Alle cookies in de trommel zijn opgegeten!"
 
-#: LYMessages.c:732
+#: LYMessages.c:730
 msgid "Port 19 not permitted in URLs."
 msgstr "Poort 19 is niet toegestaan in URL's."
 
-#: LYMessages.c:733
+#: LYMessages.c:731
 msgid "Port 25 not permitted in URLs."
 msgstr "Poort 25 is niet toegestaan in URL's."
 
-#: LYMessages.c:734
+#: LYMessages.c:732
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "Poort %lu niet toegestaan in URL's."
 
-#: LYMessages.c:735
+#: LYMessages.c:733
 msgid "URL has a bad port field."
 msgstr "URL heeft een foutief poort-veld."
 
-#: LYMessages.c:736
+#: LYMessages.c:734
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "Maximale nest-diepte van HTML elementen overschreden."
 
-#: LYMessages.c:737
+#: LYMessages.c:735
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Foutieve gedeeltelijke referentie!  Voorafgaande puntjes worden weggelaten."
 
-#: LYMessages.c:738
+#: LYMessages.c:736
 msgid "Trace Log open failed.  Trace off!"
 msgstr "Kan Traceer logbestand niet openen.  Traceren uitgezet!"
 
-#: LYMessages.c:739
+#: LYMessages.c:737
 msgid "Lynx Trace Log"
 msgstr "Lynx Traceer Logbestand"
 
-#: LYMessages.c:740
+#: LYMessages.c:738
 msgid "No trace log has been started for this session."
 msgstr "Er is geen traceer logbestand gestart voor deze sessie."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:742
+#: LYMessages.c:740
 msgid "The maximum temporary file count has been reached!"
 msgstr "Het maximale aantal tijdelijke bestanden is bereikt!"
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:744
+#: LYMessages.c:742
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "Waarde in form veld overschrijdt lengte van de buffer!  Staart wordt afgeknipt."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:746
+#: LYMessages.c:744
 msgid "Modified tail combined with head of form field value."
 msgstr "Veranderde staart samengevoegd met kop van waarde uit form veld."
 
 #. HTFile.c
-#: LYMessages.c:749
+#: LYMessages.c:747
 msgid "Directory"
 msgstr "Map"
 
-#: LYMessages.c:750
+#: LYMessages.c:748
 msgid "Directory browsing is not allowed."
 msgstr "Bladeren door mappen is niet toegestaan."
 
-#: LYMessages.c:751
+#: LYMessages.c:749
 msgid "Selective access is not enabled for this directory"
 msgstr "Selectieve toegang is niet aangezet voor deze map"
 
-#: LYMessages.c:752
+#: LYMessages.c:750
 msgid "Multiformat: directory scan failed."
 msgstr "Multiformat: doorzoeken van map mislukt."
 
-#: LYMessages.c:753
+#: LYMessages.c:751
 msgid "This directory is not readable."
 msgstr "Deze map is niet leesbaar."
 
-#: LYMessages.c:754
+#: LYMessages.c:752
 msgid "Can't access requested file."
 msgstr "Geen toegang tot opgevraagd bestand."
 
-#: LYMessages.c:755
+#: LYMessages.c:753
 msgid "Could not find suitable representation for transmission."
 msgstr "Kan geen passende representatie vinden voor overdracht."
 
-#: LYMessages.c:756
+#: LYMessages.c:754
 msgid "Could not open file for decompression!"
 msgstr "Kan bestand niet openen voor decompressie!"
 
-#: LYMessages.c:757
+#: LYMessages.c:755
 msgid "Files:"
 msgstr "Bestanden:"
 
-#: LYMessages.c:758
+#: LYMessages.c:756
 msgid "Subdirectories:"
 msgstr "Submappen:"
 
-#: LYMessages.c:759
+#: LYMessages.c:757
 msgid " directory"
 msgstr " map"
 
-#: LYMessages.c:760
+#: LYMessages.c:758
 msgid "Up to "
 msgstr "Terug naar "
 
-#: LYMessages.c:761
+#: LYMessages.c:759
 msgid "Current directory is "
 msgstr "Huidige map is "
 
 #. HTGopher.c
-#: LYMessages.c:764
+#: LYMessages.c:762
 msgid "No response from server!"
 msgstr "Geen reactie van die server!"
 
-#: LYMessages.c:765
+#: LYMessages.c:763
 msgid "CSO index"
 msgstr "CSO index"
 
-#: LYMessages.c:766
+#: LYMessages.c:764
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2424,16 +2426,16 @@ msgstr ""
 "\n"
 "Dit is een doorzoekbare index van een CSO database.\n"
 
-#: LYMessages.c:767
+#: LYMessages.c:765
 msgid "CSO Search Results"
 msgstr "CSO Zoek Resultaten"
 
-#: LYMessages.c:768
+#: LYMessages.c:766
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Zoekopdracht mislukt op %s\n"
 
-#: LYMessages.c:769
+#: LYMessages.c:767
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2441,7 +2443,7 @@ msgstr ""
 "\n"
 "Druk op de 's'toets en voer zoektermen in.\n"
 
-#: LYMessages.c:770
+#: LYMessages.c:768
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2449,35 +2451,35 @@ msgstr ""
 "\n"
 "Dit is een doorzoekbare Gopher index.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:769
 msgid "Gopher index"
 msgstr "Gopher index"
 
-#: LYMessages.c:772
+#: LYMessages.c:770
 msgid "Gopher Menu"
 msgstr "Gopher Menu"
 
-#: LYMessages.c:773
+#: LYMessages.c:771
 msgid " Search Results"
 msgstr " Zoek Resultaten"
 
-#: LYMessages.c:774
+#: LYMessages.c:772
 msgid "Sending CSO/PH request."
 msgstr "Bezig met verzenden van CSO/PH verzoek."
 
-#: LYMessages.c:775
+#: LYMessages.c:773
 msgid "Sending Gopher request."
 msgstr "Bezig met verzenden van Gopher verzoek."
 
-#: LYMessages.c:776
+#: LYMessages.c:774
 msgid "CSO/PH request sent; waiting for response."
 msgstr "CSO/PH verzoek verzonden; wacht op antwoord."
 
-#: LYMessages.c:777
+#: LYMessages.c:775
 msgid "Gopher request sent; waiting for response."
 msgstr "Gopher verzoek verzonden; wacht op antwoord."
 
-#: LYMessages.c:778
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2485,7 +2487,7 @@ msgstr ""
 "\n"
 "Voer zoektermen in.\n"
 
-#: LYMessages.c:779
+#: LYMessages.c:777
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2493,193 +2495,198 @@ msgstr ""
 "\n"
 "De zoektermen die u opgeeft maken het mogelijk te zoeken op"
 
-#: LYMessages.c:780
+#: LYMessages.c:778
 msgid " person's name in the database.\n"
 msgstr " een persoonsnaam in de database.\n"
 
 #. HTNews.c
-#: LYMessages.c:783
+#: LYMessages.c:781
 msgid "Connection closed ???"
 msgstr "Verbinding gesloten ???"
 
-#: LYMessages.c:784
+#: LYMessages.c:782
 msgid "Cannot open temporary file for news POST."
 msgstr "Kan tijdelijk bestand niet openen voor nieuws POST."
 
-#: LYMessages.c:785
+#: LYMessages.c:783
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Dit programma heeft geen ondersteuning voor nieuwsberichten versturen met SSL."
 
 #. HTStyle.c
-#: LYMessages.c:788
+#: LYMessages.c:786
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Stijl %d `%s' SGML:%s.  Lettertype %s %.1f punts.\n"
 
-#: LYMessages.c:789
+#: LYMessages.c:787
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "        Inspringen: eerste=%.0f overigen=%.0f, hoogte=%.1f omschr=%.1f\n"
 
-#: LYMessages.c:790
+#: LYMessages.c:788
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "        Uitlijnen=%d, %d tabs. (%.0f voor, %.0f na)\n"
 
-#: LYMessages.c:791
+#: LYMessages.c:789
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "                Tab soort=%d op %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:794
+#: LYMessages.c:792
 msgid "Can't proceed without a username and password."
 msgstr "Kan niet verder zonder gebruikersnaam en wachtwoord."
 
-#: LYMessages.c:795
+#: LYMessages.c:793
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
-msgstr "Herhalen gaat niet zonder authorisatie!  Vraag beheerder van de webserver."
+msgstr "Herhalen gaat niet zonder autorisatie!  Vraag beheerder van de webserver."
 
-#: LYMessages.c:796
+#: LYMessages.c:794
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
-msgstr "Herhalen gaat niet met proxy authorisatie! Vraag beheerder van de webserver."
+msgstr "Herhalen gaat niet met proxy autorisatie! Vraag beheerder van de webserver."
 
-#: LYMessages.c:797
+#: LYMessages.c:795
 msgid "Retrying with proxy authorization information."
-msgstr "Bezig opnieuw te proberen met proxy authorisatie informatie."
+msgstr "Opnieuw proberen met proxy autorisatie informatie."
 
 #. HTWAIS.c
-#: LYMessages.c:800
+#: LYMessages.c:798
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Terugkeer-bericht te groot."
 
-#: LYMessages.c:801
+#: LYMessages.c:799
 msgid "Enter WAIS query: "
 msgstr "Voer een WAIS verzoek in: "
 
 #. Miscellaneous status
-#: LYMessages.c:804
+#: LYMessages.c:802
 msgid "Retrying as HTTP0 request."
 msgstr "Bezig opnieuw te proberen als HTTP0 verzoek."
 
-#: LYMessages.c:805
+#: LYMessages.c:803
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "%d bytes overgezet"
 
-#: LYMessages.c:806
+#: LYMessages.c:804
 msgid "Data transfer complete"
 msgstr "Gegevensoverdracht voltooid"
 
-#: LYMessages.c:807
+#: LYMessages.c:805
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Fout bij behandeling van regel %d van %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:810
+#: LYMessages.c:808
 msgid "Address List Page"
 msgstr "Adreslijst Pagina"
 
-#: LYMessages.c:811
+#: LYMessages.c:809
 msgid "Bookmark file"
 msgstr "Boekenlegger bestand"
 
-#: LYMessages.c:812
+#: LYMessages.c:810
 msgid "Configuration Definitions"
 msgstr "Instellingen"
 
-#: LYMessages.c:813
+#: LYMessages.c:811
 msgid "Cookie Jar"
 msgstr "Koekjes Trommel"
 
-#: LYMessages.c:814
+#: LYMessages.c:812
 msgid "Current Key Map"
 msgstr "Huidige Toetsenbord Mapping"
 
-#: LYMessages.c:815
+#: LYMessages.c:813
 msgid "File Management Options"
 msgstr "Bestandsbeheer Opties"
 
-#: LYMessages.c:816
+#: LYMessages.c:814
 msgid "Download Options"
 msgstr "Download Opties"
 
-#: LYMessages.c:817
+#: LYMessages.c:815
 msgid "History Page"
 msgstr "Historie Pagina"
 
-#: LYMessages.c:818
+#: LYMessages.c:816
 msgid "List Page"
 msgstr "Lijst Pagina"
 
-#: LYMessages.c:819
+#: LYMessages.c:817
 msgid "Lynx.cfg Information"
 msgstr "Lynx.cfg Informatie"
 
-#: LYMessages.c:820
+#: LYMessages.c:818
 msgid "Converted Mosaic Hotlist"
 msgstr "Geconverteerde Mosaic Hotlist"
 
-#: LYMessages.c:821
+#: LYMessages.c:819
 msgid "Options Menu"
 msgstr "Opties Menu"
 
-#: LYMessages.c:822
+#: LYMessages.c:820
 msgid "File Permission Options"
 msgstr "Bestands Permissie Opties"
 
-#: LYMessages.c:823
+#: LYMessages.c:821
 msgid "Printing Options"
 msgstr "Afdruk Opties"
 
-#: LYMessages.c:824
+#: LYMessages.c:822
 msgid "Information about the current document"
 msgstr "Informatie over het huidige document"
 
-#: LYMessages.c:825
+#: LYMessages.c:823
 msgid "Your recent statusline messages"
 msgstr "De meest recente berichten in de statusregel"
 
-#: LYMessages.c:826
+#: LYMessages.c:824
 msgid "Upload Options"
 msgstr "Upload Opties"
 
-#: LYMessages.c:827
+#: LYMessages.c:825
 msgid "Visited Links Page"
-msgstr "Bezochte Links Pagina"
+msgstr "Overzicht van bezochte links"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:830
+#: LYMessages.c:828
 msgid "See also"
 msgstr "Zie ook"
 
-#: LYMessages.c:831
+#: LYMessages.c:829
 msgid "your"
 msgstr "uw"
 
-#: LYMessages.c:832
+#: LYMessages.c:830
 msgid "for runtime options"
 msgstr "voor uitvoer opties"
 
-#: LYMessages.c:833
+#: LYMessages.c:831
 msgid "compile time options"
 msgstr "compile opties"
 
-#: LYMessages.c:834
+#: LYMessages.c:832
+#, fuzzy
+msgid "color-style configuration"
+msgstr "Uw primaire configuratie"
+
+#: LYMessages.c:833
 msgid "latest release"
 msgstr "laatste versie"
 
-#: LYMessages.c:835
+#: LYMessages.c:834
 msgid "pre-release version"
 msgstr "ontwikkelversie"
 
-#: LYMessages.c:836
+#: LYMessages.c:835
 msgid "development version"
 msgstr "ontwikkelversie"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:838
+#: LYMessages.c:837
 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"
@@ -2690,7 +2697,7 @@ msgstr ""
 "het rapporteren van een bug."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:842
+#: LYMessages.c:841
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2700,104 +2707,108 @@ msgstr ""
 "werd gemaakt."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:847
+#: LYMessages.c:846
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "C)reëer D)ownload E)dit F)-volledig menu M)-wijzig R)-wis T)-vink U)pload\n"
 
-#: LYMessages.c:848
+#: LYMessages.c:847
 msgid "Failed to obtain status of current link!"
 msgstr "Kan status van de huidige link niet verkrijgen!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:851
+#: LYMessages.c:850
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "Speciale URL alleen geldig vanuit huidige Bestands Permissie menu!"
 
-#: LYMessages.c:855
+#: LYMessages.c:854
 msgid "External support is currently disabled."
 msgstr "Externe ondersteuning is momenteel uitgezet."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:859
+#: LYMessages.c:858
 #, fuzzy
 msgid "Changing working-directory is currently disabled."
 msgstr "Het starten van externe programma's starten is uitgezet."
 
-#: LYMessages.c:860
+#: LYMessages.c:859
 #, fuzzy
 msgid "Linewrap OFF!"
 msgstr "Traceren UIT!"
 
-#: LYMessages.c:861
+#: LYMessages.c:860
 msgid "Linewrap ON!"
 msgstr ""
 
-#: LYMessages.c:862
+#: LYMessages.c:861
 #, fuzzy
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr "Ruwe 8-bit of CJK mode UIT gezet!  Bezig met herladen..."
 
-#: LYMessages.c:863
+#: LYMessages.c:862
 #, fuzzy
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr "Ruwe 8-bit of CJK mode AAN gezet!  Bezig met herladen..."
 
-#: LYMessages.c:864
+#: LYMessages.c:863
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr ""
 
-#: LYMessages.c:865
+#: LYMessages.c:864
 #, fuzzy
 msgid "Trace not supported"
 msgstr "Terminal ondersteunt geen kleur"
 
-#: WWW/Library/Implementation/HTAABrow.c:648
+#: WWW/Library/Implementation/HTAABrow.c:647
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "Gebruikersnaam voor '%s' op %s '%s%s':"
 
-#: WWW/Library/Implementation/HTAABrow.c:914
+#: WWW/Library/Implementation/HTAABrow.c:913
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr "Dit programma weet niet hoe proxy authorisatie informatie te maken voor schema"
 
-#: WWW/Library/Implementation/HTAABrow.c:989
+#: WWW/Library/Implementation/HTAABrow.c:988
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "Dit programma weet niet hoe authorisatie informatie te maken voor schema"
 
-#: WWW/Library/Implementation/HTAABrow.c:1097
+#: WWW/Library/Implementation/HTAABrow.c:1096
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Foutieve kop '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1201
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
-msgstr "Proxy authorisatie vereisd -- ik probeer op nieuw"
+msgstr "Proxy authorisatie vereist -- ik probeer opnieuw"
 
-#: WWW/Library/Implementation/HTAABrow.c:1260
+#: WWW/Library/Implementation/HTAABrow.c:1259
 msgid "Access without authorization denied -- retrying"
-msgstr "Toegang zonder authorisatie geweigerd -- ik probeer op nieuw"
+msgstr "Toegang zonder authorisatie geweigerd -- ik probeer opnieuw"
 
-#: WWW/Library/Implementation/HTAccess.c:683
+#: WWW/Library/Implementation/HTAccess.c:677
 msgid "Access forbidden by rule"
 msgstr "Toegang verboden volgens regel"
 
-#: WWW/Library/Implementation/HTAccess.c:785
+#: WWW/Library/Implementation/HTAccess.c:779
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "Document met POST inhoud niet gevonden in cache.  Nog eens verzenden?"
 
-#: WWW/Library/Implementation/HTAccess.c:1026 src/GridText.c:8039
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
 msgid "Loading incomplete."
 msgstr "Laden niet voltooid."
 
-#: WWW/Library/Implementation/HTAccess.c:1056
+#: WWW/Library/Implementation/HTAccess.c:1077
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr "**** HTAccess: socket of bestandsnummer teruggegeven door verouderde laadroutine!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1058
+#: WWW/Library/Implementation/HTAccess.c:1079
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
 msgstr "**** HTAccess: Interne software fout.  Email a.u.b. lynx-dev@sig.net!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1059
+#: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "**** HTAccess: Geretourneerde status was: %d\n"
@@ -2806,28 +2817,28 @@ msgstr "**** HTAccess: Geretourneerde status was: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7834
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
 msgid "Can't Access"
 msgstr "Kan geen toegang krijgen"
 
-#: WWW/Library/Implementation/HTAccess.c:1073
+#: WWW/Library/Implementation/HTAccess.c:1094
 msgid "Unable to access document."
-msgstr "Kan geen toegang krijgen tot document."
+msgstr "Document is niet toegankelijk."
 
-#: WWW/Library/Implementation/HTFTP.c:756
+#: WWW/Library/Implementation/HTFTP.c:766
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Voer wachtwoord in voor gebruiker %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:784
+#: WWW/Library/Implementation/HTFTP.c:794
 msgid "Unable to connect to FTP host."
 msgstr "Kan niet verbinden met FTP host."
 
-#: WWW/Library/Implementation/HTFTP.c:1054
+#: WWW/Library/Implementation/HTFTP.c:1064
 msgid "close master socket"
 msgstr "sluit hoofdsocket af"
 
-#: WWW/Library/Implementation/HTFTP.c:1116
+#: WWW/Library/Implementation/HTFTP.c:1126
 msgid "socket for master socket"
 msgstr "socket voor hoofdsocket"
 
@@ -2836,36 +2847,36 @@ msgstr "socket voor hoofdsocket"
 #. **  knowing if it is symbolic?	I think so since
 #. **  it might be a directory.
 #.
-#: WWW/Library/Implementation/HTFTP.c:1630 WWW/Library/Implementation/HTFTP.c:2251
+#: WWW/Library/Implementation/HTFTP.c:1640 WWW/Library/Implementation/HTFTP.c:2261
 msgid "Symbolic Link"
 msgstr "Symbolische Koppeling"
 
-#: WWW/Library/Implementation/HTFTP.c:2612
+#: WWW/Library/Implementation/HTFTP.c:2622
 msgid "Receiving FTP directory."
 msgstr "Bezig met ophalen van FTP bestandenoverzicht."
 
-#: WWW/Library/Implementation/HTFTP.c:2755
+#: WWW/Library/Implementation/HTFTP.c:2762
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "%d bytes overgezet (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3083
 msgid "connect for data"
 msgstr "verbinden voor datastroom"
 
-#: WWW/Library/Implementation/HTFTP.c:3690
+#: WWW/Library/Implementation/HTFTP.c:3731
 msgid "Receiving FTP file."
 msgstr "Bezig met ophalen van FTP bestand."
 
-#: WWW/Library/Implementation/HTFinger.c:275
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
 msgstr "Kan finger-verbinding niet voorbereiden."
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
 msgstr "Kan gegevens niet laden (geen site-naam in finger URL)"
 
-#: WWW/Library/Implementation/HTFinger.c:328
+#: WWW/Library/Implementation/HTFinger.c:331
 msgid "Invalid port number - will only use port 79!"
 msgstr "Ongeldig poortnummer - zal enkel poort 79 gebruiken!"
 
@@ -2873,7 +2884,7 @@ msgstr "Ongeldig poortnummer - zal enkel poort 79 gebruiken!"
 msgid "Could not access finger host."
 msgstr "Kan finger host niet bereiken."
 
-#: WWW/Library/Implementation/HTFinger.c:407
+#: WWW/Library/Implementation/HTFinger.c:404
 msgid "No response from finger server."
 msgstr "Geen antwoord van finger server."
 
@@ -2899,12 +2910,12 @@ msgstr "Wachtwoord voor nieuws host '%s':"
 msgid "Change password?"
 msgstr "Wijzig wachtwoord?"
 
-#: WWW/Library/Implementation/HTNews.c:1691
+#: WWW/Library/Implementation/HTNews.c:1690
 #, c-format
 msgid "No matches for: %s"
 msgstr "Geen overeenkomsten voor: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1744
+#: WWW/Library/Implementation/HTNews.c:1743
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2912,7 +2923,7 @@ msgstr ""
 "\n"
 "Geen artikelen gevonden in deze groep.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1757
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2923,16 +2934,16 @@ msgstr ""
 #.
 #. **	Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1770
+#: WWW/Library/Implementation/HTNews.c:1769
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Artikelen %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1792
+#: WWW/Library/Implementation/HTNews.c:1791
 msgid "Earlier articles"
 msgstr "Vroegere artikelen"
 
-#: WWW/Library/Implementation/HTNews.c:1805
+#: WWW/Library/Implementation/HTNews.c:1804
 #, c-format
 msgid ""
 "\n"
@@ -2943,41 +2954,41 @@ msgstr ""
 "Er zijn momenteel ongeveer %d artikelen beschikbaar in %s, met volgende ID-nr's:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1865
+#: WWW/Library/Implementation/HTNews.c:1864
 msgid "All available articles in "
 msgstr "Alle beschikbare artikelen in "
 
-#: WWW/Library/Implementation/HTNews.c:2081
+#: WWW/Library/Implementation/HTNews.c:2080
 msgid "Later articles"
 msgstr "Latere artikelen"
 
-#: WWW/Library/Implementation/HTNews.c:2105
+#: WWW/Library/Implementation/HTNews.c:2104
 msgid "Post to "
 msgstr "Posten naar "
 
-#: WWW/Library/Implementation/HTNews.c:2323
+#: WWW/Library/Implementation/HTNews.c:2322
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Dit programma ondersteunt geen SNEWS URL's."
 
-#: WWW/Library/Implementation/HTNews.c:2531
+#: WWW/Library/Implementation/HTNews.c:2530
 msgid "No target for raw text!"
 msgstr "Geen bestemming voor ruwe tekst!"
 
-#: WWW/Library/Implementation/HTNews.c:2561
+#: WWW/Library/Implementation/HTNews.c:2560
 msgid "Connecting to NewsHost ..."
 msgstr "Bezig met verbinden naar NieuwsHost ..."
 
-#: WWW/Library/Implementation/HTNews.c:2612
+#: WWW/Library/Implementation/HTNews.c:2611
 #, c-format
 msgid "Could not access %s."
 msgstr "Geen toegang tot %s."
 
-#: WWW/Library/Implementation/HTNews.c:2712
+#: WWW/Library/Implementation/HTNews.c:2711
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Kan nieuws informatie niet lezen.  Nieuws host %.20s antwoordde: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2716
+#: WWW/Library/Implementation/HTNews.c:2715
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Kan nieuws informatie niet lezen, loos antwoord van host %s"
@@ -2985,34 +2996,34 @@ msgstr "Kan nieuws informatie niet lezen, loos antwoord van host %s"
 #.
 #. **	List available newsgroups. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2920
+#: WWW/Library/Implementation/HTNews.c:2919
 msgid "Reading list of available newsgroups."
 msgstr "Bezig met lijst lezen van beschikbare nieuwsgroepen."
 
-#: WWW/Library/Implementation/HTNews.c:2942
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of articles in newsgroup."
 msgstr "Bezig met lijst lezen van artikelen in nieuwsgroep."
 
 #.
 #. **	Get an article from a news group. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2948
+#: WWW/Library/Implementation/HTNews.c:2947
 msgid "Reading news article."
 msgstr "Bezig met lezen van nieuws-artikel."
 
-#: WWW/Library/Implementation/HTNews.c:2978
+#: WWW/Library/Implementation/HTNews.c:2977
 msgid "Sorry, could not load requested news."
 msgstr "Sorry, kan het opgevraagde nieuws niet laden."
 
-#: WWW/Library/Implementation/HTTCP.c:1233
+#: WWW/Library/Implementation/HTTCP.c:1239
 msgid "Address has invalid port"
 msgstr "Adres heeft ongeldige poort"
 
-#: WWW/Library/Implementation/HTTCP.c:1336
+#: WWW/Library/Implementation/HTTCP.c:1327
 msgid "Address length looks invalid"
 msgstr "Adres-lengte ziet er verkeerd uit"
 
-#: WWW/Library/Implementation/HTTCP.c:1574 WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Niet in staat om computer %s te vinden."
@@ -3021,62 +3032,86 @@ msgstr "Niet in staat om computer %s te vinden."
 #. *  immediately; but not HTAlert, because typically
 #. *  there will be other alerts from the callers. - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1589 WWW/Library/Implementation/HTTelnet.c:103
+#: WWW/Library/Implementation/HTTCP.c:1575 WWW/Library/Implementation/HTTelnet.c:103
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ongeldige computernaam %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1603
+#: WWW/Library/Implementation/HTTCP.c:1589
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "%s verbinding met %s wordt gemaakt."
 
-#: WWW/Library/Implementation/HTTCP.c:1619
+#: WWW/Library/Implementation/HTTCP.c:1605
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1628
+#: WWW/Library/Implementation/HTTCP.c:1614
 msgid "socket failed."
 msgstr "socket mislukt."
 
-#: WWW/Library/Implementation/HTTCP.c:1648
+#: WWW/Library/Implementation/HTTCP.c:1634
 msgid "Could not make connection non-blocking."
 msgstr "Het is mislukt de verbinding niet-blokkerend maken."
 
-#: WWW/Library/Implementation/HTTCP.c:1717
+#: WWW/Library/Implementation/HTTCP.c:1703
 msgid "Connection failed (too many retries)."
 msgstr "Verbinden mislukt (te vaak opnieuw geprobeerd)."
 
-#: WWW/Library/Implementation/HTTCP.c:1910
+#: WWW/Library/Implementation/HTTCP.c:1896
 msgid "Could not restore socket to blocking."
 msgstr "Kon socket niet naar blokkerende modus herstellen."
 
-#: WWW/Library/Implementation/HTTCP.c:1976
+#: WWW/Library/Implementation/HTTCP.c:1962
 msgid "Socket read failed for 180,000 tries."
 msgstr "Lezen uit socket mislukt na 180,000 (!) pogingen."
 
-#: WWW/Library/Implementation/HTTP.c:466
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:503
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Dit programma ondersteunt geen HTTPS URL's."
 
-#: WWW/Library/Implementation/HTTP.c:491
+#: WWW/Library/Implementation/HTTP.c:528
 msgid "Unable to connect to remote host."
-msgstr "Niet in staat om met de andere computer te verbinden."
+msgstr "Verbinding met server mislukt."
+
+#: WWW/Library/Implementation/HTTP.c:557
+#, fuzzy
+msgid "Retrying connection without TLS."
+msgstr "%s verbinding met %s wordt gemaakt."
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1005
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1091
 msgid "Sending HTTP request."
 msgstr "Bezig met zenden van HTTP verzoek."
 
-#: WWW/Library/Implementation/HTTP.c:1039
+#: WWW/Library/Implementation/HTTP.c:1125
 msgid "Unexpected network write error; connection aborted."
 msgstr "Onverwachte fout bij schrijven naar netwerk: verbinding verbroken."
 
-#: WWW/Library/Implementation/HTTP.c:1045
+#: WWW/Library/Implementation/HTTP.c:1131
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP verzoek verzonden; wacht op antwoord."
 
-#: WWW/Library/Implementation/HTTP.c:1109
+#: WWW/Library/Implementation/HTTP.c:1195
 msgid "Unexpected network read error; connection aborted."
 msgstr "Onverwachte fout bij lezen uit netwerk; verbinding verbroken."
 
@@ -3090,7 +3125,7 @@ msgstr "Onverwachte fout bij lezen uit netwerk; verbinding verbroken."
 #. **	so we'll deal with them by showing the full
 #. **	header to the user as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1305
+#: WWW/Library/Implementation/HTTP.c:1391
 msgid "Got unexpected Informational Status."
 msgstr "Onverwachte informatieve status ontvangen."
 
@@ -3101,7 +3136,7 @@ msgstr "Onverwachte informatieve status ontvangen."
 #. *  user to do that, and restore the current
 #. *  document. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1340
+#: WWW/Library/Implementation/HTTP.c:1426
 msgid "Request fulfilled.  Reset Content."
 msgstr "Verzoek volbracht.  Herstel inhoud."
 
@@ -3112,27 +3147,27 @@ msgstr "Verzoek volbracht.  Herstel inhoud."
 #. *  with it by showing the full header to the user
 #. *  as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1459
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Kreeg een onverwachte 304 Niet Gewijzigd statusmelding."
 
-#: WWW/Library/Implementation/HTTP.c:1526
+#: WWW/Library/Implementation/HTTP.c:1612
 msgid "Redirection of POST content requires user approval."
 msgstr "Doorverwijzing van POST inhoud vereist toestemming van de gebruiker."
 
-#: WWW/Library/Implementation/HTTP.c:1541
+#: WWW/Library/Implementation/HTTP.c:1627
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Heb POST inhoud.  Permanente doorverwijzing wordt behandeld als een tijdelijke.\n"
 
-#: WWW/Library/Implementation/HTTP.c:1586
+#: WWW/Library/Implementation/HTTP.c:1672
 msgid "Retrying with access authorization information."
 msgstr "Bezig opnieuw te proberen met informatie over toegangs-authorisatie."
 
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1684
 msgid "Show the 401 message body?"
 msgstr "Inhoud van het 401 bericht laten zien?"
 
-#: WWW/Library/Implementation/HTTP.c:1643
+#: WWW/Library/Implementation/HTTP.c:1729
 msgid "Show the 407 message body?"
 msgstr "Inhoud van het 407 bericht laten zien?"
 
@@ -3141,7 +3176,7 @@ msgstr "Inhoud van het 407 bericht laten zien?"
 #. **	Take a chance and hope there is
 #. **	something to display. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1748
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Unknown status reply from server!"
 msgstr "Onbekend status-antwoord van server!"
 
@@ -3223,27 +3258,27 @@ msgstr ""
 "\n"
 "Code structuur, niet toonbaar\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:691
+#: WWW/Library/Implementation/HTWAIS.c:689
 msgid "Syntax error in WAIS URL"
 msgstr "Syntactische fout in WAIS URL"
 
-#: WWW/Library/Implementation/HTWAIS.c:761
+#: WWW/Library/Implementation/HTWAIS.c:759
 msgid " (WAIS Index)"
 msgstr "(WAIS Index)"
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:766
 msgid "WAIS Index: "
 msgstr "WAIS Index: "
 
-#: WWW/Library/Implementation/HTWAIS.c:774
+#: WWW/Library/Implementation/HTWAIS.c:772
 msgid "This is a link for searching the "
 msgstr "Deze link is om te zoeken in de "
 
-#: WWW/Library/Implementation/HTWAIS.c:778
+#: WWW/Library/Implementation/HTWAIS.c:776
 msgid " WAIS Index.\n"
 msgstr " WAIS Index.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:805
+#: WWW/Library/Implementation/HTWAIS.c:803
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
@@ -3251,48 +3286,48 @@ msgstr ""
 "\n"
 "Voer het 's'-zoek commando in en specificeer zoektermen.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:827
+#: WWW/Library/Implementation/HTWAIS.c:825
 msgid " (in "
 msgstr " (in "
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:834
 msgid "WAIS Search of \""
 msgstr "WAIS Doorzoeken naar \""
 
-#: WWW/Library/Implementation/HTWAIS.c:840
+#: WWW/Library/Implementation/HTWAIS.c:838
 msgid "\" in: "
 msgstr "\"in: "
 
-#: WWW/Library/Implementation/HTWAIS.c:855
+#: WWW/Library/Implementation/HTWAIS.c:853
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: Verzoek te groot."
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:862
 msgid "Searching WAIS database..."
 msgstr "Bezig met doorzoeken van WAIS database..."
 
-#: WWW/Library/Implementation/HTWAIS.c:874
+#: WWW/Library/Implementation/HTWAIS.c:872
 msgid "Search interrupted."
 msgstr "Zoeken onderbroken."
 
-#: WWW/Library/Implementation/HTWAIS.c:924
+#: WWW/Library/Implementation/HTWAIS.c:922
 msgid "Can't convert format of WAIS document"
 msgstr "Kan opmaak van WAIS document niet converteren"
 
-#: WWW/Library/Implementation/HTWAIS.c:968
+#: WWW/Library/Implementation/HTWAIS.c:966
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: Verzoek te lang."
 
 #.
 #. **	Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:982
+#: WWW/Library/Implementation/HTWAIS.c:980
 msgid "Fetching WAIS document..."
 msgstr "Bezig met ophalen van WAIS document..."
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1021
+#: WWW/Library/Implementation/HTWAIS.c:1019
 msgid "No text was returned!\n"
 msgstr "Er is geen tekst geretourneerd!\n"
 
@@ -3312,167 +3347,161 @@ msgstr " omschrijving"
 msgid "Access links"
 msgstr "Toegangs-links"
 
-#: WWW/Library/Implementation/HTWSRC.c:345
+#: WWW/Library/Implementation/HTWSRC.c:346
 msgid "Direct access"
 msgstr "Directe toegang"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:348
+#: WWW/Library/Implementation/HTWSRC.c:349
 msgid " (or via proxy server, if defined)"
 msgstr " (of via een proxy server, indien opgegeven)"
 
-#: WWW/Library/Implementation/HTWSRC.c:363
+#: WWW/Library/Implementation/HTWSRC.c:364
 msgid "Maintainer"
 msgstr "Beheerder"
 
-#: WWW/Library/Implementation/HTWSRC.c:371
+#: WWW/Library/Implementation/HTWSRC.c:372
 msgid "Host"
 msgstr "Host"
 
-#: src/GridText.c:607
+#: src/GridText.c:688
 msgid "Memory exhausted, display interrupted!"
 msgstr "Geen geheugen meer beschikbar, beeldweergave onderbroken!"
 
-#: src/GridText.c:612
+#: src/GridText.c:693
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Geen geheugen meer beschikbaar, overdracht zal worden afgebroken!"
 
-#: src/GridText.c:3395
+#: src/GridText.c:3578
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** GEHEUGEN VERMOEID ***"
 
-#: src/GridText.c:5733 src/GridText.c:5740 src/LYList.c:258
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
 msgid "unknown field or link"
 msgstr "onbekend veld of link"
 
-#: src/GridText.c:5749
+#: src/GridText.c:6023
 msgid "text entry field"
 msgstr "tekst invoerveld"
 
-#: src/GridText.c:5752
+#: src/GridText.c:6026
 msgid "password entry field"
 msgstr "wachtwoord invoerveld"
 
-#: src/GridText.c:5755
+#: src/GridText.c:6029
 msgid "checkbox"
 msgstr "aanvinkvakje"
 
-#: src/GridText.c:5758
+#: src/GridText.c:6032
 msgid "radio button"
 msgstr "drukknop"
 
-#: src/GridText.c:5761
+#: src/GridText.c:6035
 msgid "submit button"
 msgstr "verzendknop"
 
-#: src/GridText.c:5764
+#: src/GridText.c:6038
 msgid "reset button"
 msgstr "herstelknop"
 
-#: src/GridText.c:5767
+#: src/GridText.c:6041
 msgid "popup menu"
 msgstr "popup menu"
 
-#: src/GridText.c:5770
+#: src/GridText.c:6044
 msgid "hidden form field"
 msgstr "verborgen form veld"
 
-#: src/GridText.c:5773
+#: src/GridText.c:6047
 msgid "text entry area"
 msgstr "tekst invoergebied"
 
-#: src/GridText.c:5776
+#: src/GridText.c:6050
 msgid "range entry field"
 msgstr "bereik invoerveld"
 
-#: src/GridText.c:5779
+#: src/GridText.c:6053
 msgid "file entry field"
 msgstr "bestandsnaam invoerveld"
 
-#: src/GridText.c:5782
+#: src/GridText.c:6056
 msgid "text-submit field"
 msgstr "tekst-verzendveld"
 
-#: src/GridText.c:5785
+#: src/GridText.c:6059
 msgid "image-submit button"
 msgstr "afbeelding-verzendknop"
 
-#: src/GridText.c:5788
+#: src/GridText.c:6062
 msgid "keygen field"
 msgstr "sleutelaanmaak veld"
 
-#: src/GridText.c:5791
+#: src/GridText.c:6065
 msgid "unknown form field"
 msgstr "onbekend formulier veld"
 
-#. We can't open the file, what do we do?
-#: src/GridText.c:10348
+#: src/GridText.c:10066
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Kan bestand niet openen om te lezen."
 
-#. We got an error reading the file, what do we do?
-#: src/GridText.c:10359
-msgid "Short read from file, problem?"
-msgstr ""
-
-#: src/GridText.c:10721
+#: src/GridText.c:11218
 #, c-format
 msgid "Submitting %s"
 msgstr "Bezig met verzenden van %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:11887
+#: src/GridText.c:12375
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12092
+#: src/GridText.c:12581
 msgid "Wrap lines to fit displayed area?"
 msgstr "Regels omvouwen zodat alles zichtbaar is?"
 
-#: src/GridText.c:12144
+#: src/GridText.c:12633
 msgid "Very long lines have been wrapped!"
 msgstr "Erg lange regels zijn omgevouwen!"
 
-#: src/GridText.c:12591
+#: src/GridText.c:13079
 msgid "Very long lines have been truncated!"
 msgstr "Erg lange regels zijn afgekapt!"
 
-#: src/HTAlert.c:155 src/LYShowInfo.c:318
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
 msgid "bytes"
 msgstr "bytes"
 
-#: src/HTAlert.c:156
+#: src/HTAlert.c:155
 msgid "KB"
 msgstr "KB"
 
-#: src/HTAlert.c:255
+#: src/HTAlert.c:274
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "%s van %s aan gegevens gelezen"
 
-#: src/HTAlert.c:257
+#: src/HTAlert.c:276
 #, c-format
 msgid "Read %s of data"
 msgstr "%s aan gegevens gelezen"
 
-#: src/HTAlert.c:262
+#: src/HTAlert.c:281
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s/s"
 
-#: src/HTAlert.c:269
-#, c-format
-msgid " (stalled for %ld sec)"
+#: src/HTAlert.c:290
+#, fuzzy, c-format
+msgid " (stalled for %s)"
 msgstr " (%ld sec. vastgelopen)"
 
-#: src/HTAlert.c:271
-#, c-format
-msgid ", ETA %ld sec"
+#: src/HTAlert.c:294
+#, fuzzy, c-format
+msgid ", ETA %s"
 msgstr ", geschatte duur: %ld sec."
 
-#: src/HTAlert.c:277
+#: src/HTAlert.c:301
 msgid " (Press 'z' to abort)"
 msgstr " (Druk op 'z' om te stoppen)"
 
@@ -3501,44 +3530,44 @@ msgstr " (Druk op 'z' om te stoppen)"
 #. *  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:334
+#: src/HTAlert.c:342 src/HTAlert.c:390
 msgid "yes"
 msgstr "ja"
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:345 src/HTAlert.c:391
 msgid "no"
 msgstr "nee"
 
-#: src/HTML.c:6342
+#: src/HTML.c:5985
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: src/HTML.c:6347
+#: src/HTML.c:5990
 msgid "(none)"
 msgstr "(geen)"
 
-#: src/HTML.c:6351
+#: src/HTML.c:5994
 msgid "Filepath:"
 msgstr "Bestandspad:"
 
-#: src/HTML.c:6356
+#: src/HTML.c:5999
 msgid "(unknown)"
 msgstr "(onbekend)"
 
-#: src/HTML.c:7804
+#: src/HTML.c:7452
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Document heeft slechts verborgen links.  Gebruik het 'l'ijst commando."
 
 # Source?
-#: src/HTML.c:8328
+#: src/HTML.c:7958
 msgid "Source cache error - disk full?"
 msgstr "Cache fout - schijf vol?"
 
-#: src/HTML.c:8341
+#: src/HTML.c:7971
 msgid "Source cache error - not enough memory!"
 msgstr "Cache fout - niet genoeg geheugen!"
 
-#: src/LYBookmark.c:166
+#: src/LYBookmark.c:167
 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"
@@ -3550,7 +3579,7 @@ msgstr ""
 "     het 'verwijder boekenlegger', welke doorgaans gekoppeld is aan\n"
 "     de 'R' toets, maar uw systeembeheerder heeft dit wellicht gewijzigd."
 
-#: src/LYBookmark.c:382
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
@@ -3558,7 +3587,7 @@ msgstr ""
 "     U kunt links verwijderen met de 'R' toets<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:385
+#: src/LYBookmark.c:382
 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"
@@ -3568,7 +3597,7 @@ msgstr ""
 "     Dit is doorgaans de 'R' toets, maar uw systeembeheerder kan dit\n"
 "     gewijzigd hebben."
 
-#: src/LYBookmark.c:389
+#: src/LYBookmark.c:386
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3576,7 +3605,7 @@ msgstr ""
 "     Dit bestand kan ook met een doorsnee tekst-editor worden gewijzigd om\n"
 "     verlopen of foutieve links te wissen, of om de volgorde aan te passen."
 
-#: src/LYBookmark.c:392
+#: src/LYBookmark.c:389
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3588,7 +3617,7 @@ msgstr ""
 "      of andere HTML opmaak toevoegen.\n"
 "      Boekenlegger-links dienen als één regel te worden opgeslagen."
 
-#: src/LYBookmark.c:683
+#: src/LYBookmark.c:681
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr "Het bestand is gedurende deze sessie wellicht terug te halen uit %s"
@@ -3597,71 +3626,71 @@ msgstr "Het bestand is gedurende deze sessie wellicht terug te halen uit %s"
 #. *  Neither the path as given nor any components examined by
 #. *  backing up were stat()able. - kw
 #.
-#: src/LYCgi.c:232
+#: src/LYCgi.c:231
 msgid "Unable to access cgi script"
 msgstr "Geen toegang tot cgi script"
 
-#: src/LYCgi.c:651 src/LYCgi.c:654
+#: src/LYCgi.c:654 src/LYCgi.c:657
 msgid "Good Advice"
 msgstr "Goede Raad"
 
-#: src/LYCgi.c:657
+#: src/LYCgi.c:660
 msgid "An excellent http server for VMS is available via"
 msgstr "Een uitstekende http server voor VMS is bereikbaar via"
 
-#: src/LYCgi.c:664
+#: src/LYCgi.c:667
 msgid "this link"
 msgstr "deze link"
 
-#: src/LYCgi.c:668
+#: src/LYCgi.c:671
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Het biedt voortreffelijke CGI script ondersteuning.\n"
 
-#: src/LYClean.c:108
+#: src/LYClean.c:122
 msgid "Exiting via interrupt:"
 msgstr "Beëindiging via interrupt:"
 
-#: src/LYCookie.c:2659
+#: src/LYCookie.c:2462
 msgid "(from a previous session)"
 msgstr "(van een eerdere sessie)"
 
-#: src/LYCookie.c:2719
+#: src/LYCookie.c:2522
 msgid "Maximum Gobble Date:"
 msgstr "Uiterste Houdbaarheidsdatum:"
 
-#: src/LYCookie.c:2764
+#: src/LYCookie.c:2564
 msgid "Internal"
 msgstr "Intern"
 
-#: src/LYCookie.c:2765
+#: src/LYCookie.c:2565
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set fout, programma wordt afgebroken"
 
-#: src/LYCurses.c:936
+#: src/LYCurses.c:1004
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Terminal initialisatie mislukt - onbekend terminal type?"
 
-#: src/LYCurses.c:1328
+#: src/LYCurses.c:1426
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1332
+#: src/LYCurses.c:1430
 msgid "You must use a vt100, 200, etc. terminal with this program."
-msgstr "U mout een vt100, 200, enz. terminal gebruiken met dit programma."
+msgstr "U moet een vt100 terminal of hoger gebruiken."
 
-#: src/LYCurses.c:1384
+#: src/LYCurses.c:1480
 msgid "Your Terminal type is unknown!"
 msgstr "Uw terminal type is onbekend!"
 
-#: src/LYCurses.c:1385
+#: src/LYCurses.c:1481
 msgid "Enter a terminal type:"
 msgstr "Voer een terminal type in:"
 
-#: src/LYCurses.c:1398
+#: src/LYCurses.c:1495
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINAL TYPE IS GEZET OP"
 
-#: src/LYCurses.c:1749
+#: src/LYCurses.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -3670,7 +3699,7 @@ msgstr ""
 "\n"
 "Een fatale fout is opgetreden in %s Ver. %s\n"
 
-#: src/LYCurses.c:1751
+#: src/LYCurses.c:1996
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -3688,136 +3717,162 @@ msgstr ""
 "implementatie, de TRACEBACK, indien deze gevangen kan worden, en elke\n"
 "andere relevante informatie.\n"
 
-#: src/LYEdit.c:264
+#: src/LYEdit.c:249
 msgid "Editor killed by signal"
 msgstr "Editor gedood door signaal"
 
-#: src/LYEdit.c:266
+#: src/LYEdit.c:251
 #, c-format
 msgid "Editor returned with error status, %s"
 msgstr "Editor gaf een foutstatus terug, %s"
 
-#: src/LYEdit.c:267
+#: src/LYEdit.c:252
 msgid "reason unknown."
 msgstr "reden onbekend."
 
-#: src/LYDownload.c:520
+#: src/LYDownload.c:517
 msgid "Downloaded link:"
 msgstr "Gedownloade link:"
 
-#: src/LYDownload.c:525
+#: src/LYDownload.c:522
 msgid "Suggested file name:"
 msgstr "Voorgestelde bestandsnaam:"
 
-#: src/LYDownload.c:530
+#: src/LYDownload.c:527
 msgid "Standard download options:"
 msgstr "Standaard download mogelijkheden:"
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:528
 msgid "Download options:"
 msgstr "Download mogelijkheden:"
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:544
 msgid "Save to disk"
 msgstr "Opslaan op schijf"
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "Post het bestand"
+
+#: src/LYDownload.c:565
 msgid "Save to disk disabled."
 msgstr "Opslaan op schijf uitgezet."
 
-#: src/LYDownload.c:551 src/LYPrint.c:1338
+#: src/LYDownload.c:569 src/LYPrint.c:1327
 msgid "Local additions:"
 msgstr "Lokale toevoegingen:"
 
-#: src/LYDownload.c:560 src/LYUpload.c:224
+#: src/LYDownload.c:578 src/LYUpload.c:216
 msgid "No Name Given"
 msgstr "Geen naam opgegeven"
 
-#: src/LYHistory.c:633
+#: src/LYHistory.c:657
 msgid "You selected:"
 msgstr "U selecteerde:"
 
-#: src/LYHistory.c:657 src/LYHistory.c:905
+#: src/LYHistory.c:681 src/LYHistory.c:921
 msgid "(no address)"
 msgstr "(geen adres)"
 
-#: src/LYHistory.c:661
+#: src/LYHistory.c:685
 msgid " (internal)"
 msgstr "(intern)"
 
-#: src/LYHistory.c:663
+#: src/LYHistory.c:687
 msgid " (was internal)"
 msgstr "(was intern)"
 
-#: src/LYHistory.c:761
+#: src/LYHistory.c:785
 msgid " (From History)"
 msgstr "(Uit Historie)"
 
-#: src/LYHistory.c:825
+#: src/LYHistory.c:841
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "U bezocht (m.u.v. POSTs, boekenlegger, menu en lijstbestanden):"
 
-#: src/LYHistory.c:1124
+#: src/LYHistory.c:1137
 msgid "(No messages yet)"
 msgstr "(Nog geen vermeldingen)"
 
-#: src/LYLeaks.c:78
+#: src/LYLeaks.c:209
 msgid "Invalid pointer detected."
 msgstr "Foutieve verwijzing gevonden."
 
-#: src/LYLeaks.c:80 src/LYLeaks.c:117
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
 msgid "Pointer:"
 msgstr "Verwijzing:"
 
-#: src/LYLeaks.c:91 src/LYLeaks.c:98 src/LYLeaks.c:136
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
 msgid "FileName:"
 msgstr "BestandsNaam:"
 
-#: src/LYLeaks.c:94 src/LYLeaks.c:101 src/LYLeaks.c:139 src/LYLeaks.c:150
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
 msgid "LineCount:"
 msgstr "RegelAantal:"
 
-#: src/LYLeaks.c:115
+#: src/LYLeaks.c:249
 msgid "Memory leak detected."
 msgstr "Geheugenlek ontdekt."
 
-#: src/LYLeaks.c:120
+#: src/LYLeaks.c:257
 msgid "Contains:"
 msgstr "Bevat:"
 
-#: src/LYLeaks.c:133
+#: src/LYLeaks.c:270
 msgid "ByteSize:"
 msgstr "ByteGrootte:"
 
-#: src/LYLeaks.c:147
+#: src/LYLeaks.c:284
 msgid "realloced:"
 msgstr "Opnieuw Gereserveerd:"
 
-#: src/LYLeaks.c:170
+#: src/LYLeaks.c:307
 msgid "Total memory leakage this run:"
 msgstr "Totale geheugen lekkage tijdens deze uitvoering:"
 
-#: src/LYList.c:91
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+#, fuzzy
+msgid "Bytes allocated"
+msgstr "Opnieuw Gereserveerd:"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
 msgid "References in "
 msgstr "Referenties in "
 
-#: src/LYList.c:92
+#: src/LYList.c:86
 msgid "this document:"
 msgstr "dit document:"
 
-#: src/LYList.c:98
+#: src/LYList.c:92
 msgid "Visible links:"
 msgstr "Zichtbare links:"
 
-#: src/LYList.c:199 src/LYList.c:319
+#: src/LYList.c:194 src/LYList.c:315
 msgid "Hidden links:"
 msgstr "Verborgen links:"
 
-#: src/LYList.c:267
+#: src/LYList.c:262
 msgid "References"
 msgstr "Referenties"
 
-#: src/LYList.c:269
+#: src/LYList.c:264
 msgid "Visible links"
 msgstr "Zichtbare links"
 
@@ -3830,314 +3885,314 @@ msgstr "Kan status van '%s' niet opvragen."
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Het geselecteerde item is geen bestand of map!  Verzoek genegeerd."
 
-#: src/LYLocal.c:383
+#: src/LYLocal.c:366
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Kan niet %s vanwege systeemfout!"
 
 #. error return
-#: src/LYLocal.c:415
+#: src/LYLocal.c:400
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Mogelijke fout van %s vanwege systeemfout!"
 
-#: src/LYLocal.c:453
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "verwijder %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr ""
+
+#: src/LYLocal.c:508
 #, c-format
 msgid "move %s to %s"
 msgstr "verplaats %s naar %s"
 
-#: src/LYLocal.c:475
+#: src/LYLocal.c:548
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Er is al een map met die naam!  Verzoek genegeerd."
 
-#: src/LYLocal.c:477
+#: src/LYLocal.c:550
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Er is al een bestand met die naam!  Verzoek genegeerd."
 
-#: src/LYLocal.c:479
+#: src/LYLocal.c:552
 msgid "The specified name is already in use!  Request ignored."
 msgstr "De opgegeven naam is al in gebruik!  Verzoek genegeerd."
 
-#: src/LYLocal.c:490
+#: src/LYLocal.c:563
 msgid "Destination has different owner!  Request denied."
 msgstr "Bestemming heeft een andere eigenaar!  Verzoek genegeerd."
 
-#: src/LYLocal.c:493
+#: src/LYLocal.c:566
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Bestemming is geen geldige map!  Verzoek genegeerd."
 
-#: src/LYLocal.c:516
+#: src/LYLocal.c:588
 msgid "Remove all tagged files and directories?"
 msgstr "Verwijder alle aangevinkte bestand en mappen?"
 
-#: src/LYLocal.c:537
-#, c-format
-msgid "remove %s"
-msgstr "verwijder %s"
-
-#: src/LYLocal.c:580
+#: src/LYLocal.c:647
 msgid "Enter new location for tagged items: "
 msgstr "Voer een nieuwe bestemming in voor aangevinkte items: "
 
-#: src/LYLocal.c:649
+#: src/LYLocal.c:716
 msgid "Path too long"
 msgstr "Pad te lang"
 
-#: src/LYLocal.c:680
+#: src/LYLocal.c:747
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Bron en bestemming zijn dezelfde locatie - verzoek genegeerd!"
 
-#: src/LYLocal.c:738
+#: src/LYLocal.c:805
 msgid "Enter new name for directory: "
 msgstr "Voer een nieuwe naam in voor map: "
 
-#: src/LYLocal.c:740
+#: src/LYLocal.c:807
 msgid "Enter new name for file: "
 msgstr "Voer een nieuwe naam in voor bestand: "
 
-#: src/LYLocal.c:751
+#: src/LYLocal.c:819
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Ongeldig teken (pad-separatie-teken) gevonden! Verzoek genegeerd."
 
-#: src/LYLocal.c:800
+#: src/LYLocal.c:868
 msgid "Enter new location for directory: "
 msgstr "Voer een nieuwe locatie in voor map: "
 
-#: src/LYLocal.c:802
+#: src/LYLocal.c:874
 msgid "Enter new location for file: "
 msgstr "Voer een nieuwe locatie voor bestand in: "
 
-#: src/LYLocal.c:827
+#: src/LYLocal.c:901
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Onverwachte mislukking - kan achterkomend pad-separatie-teken niet vinden"
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:921
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Bron en bestemming zijn dezelfde locatie!  Verzoek genegeerd!"
 
-#: src/LYLocal.c:894
+#: src/LYLocal.c:970
 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:896
+#: src/LYLocal.c:972
 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:925
+#: src/LYLocal.c:1001
 msgid "This feature not yet implemented!"
 msgstr "Deze optie is nog niet geïmplementeerd!"
 
-#: src/LYLocal.c:943
+#: src/LYLocal.c:1019
 msgid "Enter name of file to create: "
 msgstr "Voer een bestandsnaam in om aan te maken: "
 
-#: src/LYLocal.c:951 src/LYLocal.c:999
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Foutieve verwijzing \"/\"gevonden! Verzoek genegeerd."
 
-#: src/LYLocal.c:966
-#, c-format
-msgid "create %s"
-msgstr "maak %s aan"
-
-#: src/LYLocal.c:991
+#: src/LYLocal.c:1061
 msgid "Enter name for new directory: "
 msgstr "Voer een naam in voor een nieuwe map: "
 
-#: src/LYLocal.c:1042
+#: src/LYLocal.c:1106
 msgid "Create file or directory (f or d): "
 msgstr "Maak F)-bestand of D)-map (f of d): "
 
-#: src/LYLocal.c:1083
+#: src/LYLocal.c:1146
 #, c-format
 msgid "Remove '%s' and all of its contents?"
 msgstr "Verwijder '%s' en haar volledige inhoud?"
 
-#: src/LYLocal.c:1086
+#: src/LYLocal.c:1149
 msgid "Remove directory and all of its contents?"
 msgstr "Verwijder map en haar volledige inhoud?"
 
-#: src/LYLocal.c:1090
+#: src/LYLocal.c:1153
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Verwijder bestand '%s'?"
 
-#: src/LYLocal.c:1092
+#: src/LYLocal.c:1155
 msgid "Remove file?"
 msgstr "Verwijder bestand?"
 
-#: src/LYLocal.c:1097
+#: src/LYLocal.c:1160
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Verwijder symbolische koppeling '%s'?"
 
-#: src/LYLocal.c:1099
+#: src/LYLocal.c:1162
 msgid "Remove symbolic link?"
 msgstr "Verwijder symbolische koppeling?"
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1248
 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:1220
+#: src/LYLocal.c:1278
 msgid "Unable to open permit options file"
 msgstr "Kan bestand met permissie-opties niet openen"
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1305
 msgid "Specify permissions below:"
 msgstr "Specificeer permissies hieronder:"
 
-#: src/LYLocal.c:1248 src/LYShowInfo.c:196
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
 msgid "Owner:"
 msgstr "Eigenaar:"
 
-#: src/LYLocal.c:1264
+#: src/LYLocal.c:1322
 msgid "Group"
 msgstr "Groep"
 
-#: src/LYLocal.c:1280
+#: src/LYLocal.c:1338
 msgid "Others:"
 msgstr "Anderen:"
 
-#: src/LYLocal.c:1298
+#: src/LYLocal.c:1356
 msgid "form to permit"
 msgstr "formulier voor permissies"
 
-#: src/LYLocal.c:1396
+#: src/LYLocal.c:1452
 msgid "Invalid mode format."
 msgstr "Onjuist formaat voor modus."
 
-#: src/LYLocal.c:1400
+#: src/LYLocal.c:1456
 msgid "Invalid syntax format."
 msgstr "Onjuiste syntaxis."
 
-#: src/LYLocal.c:1575
-msgid "NULL URL pointer"
-msgstr "NULL URL verwijzing"
-
-#: src/LYLocal.c:1670
+#: src/LYLocal.c:1645
 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:1782
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr "NULL URL verwijzing"
+
+#: src/LYLocal.c:1908
 #, c-format
 msgid "Executing %s "
 msgstr "Bezig met uitvoeren van %s "
 
-#: src/LYLocal.c:1785
+#: src/LYLocal.c:1911
 msgid "Executing system command. This might take a while."
 msgstr "Bezig met uitvoeren van systeemcommando. Dit kan even duren."
 
-#: src/LYLocal.c:1831
-msgid "Unable to open file management menu file."
-msgstr "Kan bestand met bestandsbeheer-menu niet openen."
-
-#: src/LYLocal.c:1862
+#: src/LYLocal.c:1985
 msgid "Current directory:"
 msgstr "Huidige map:"
 
-#: src/LYLocal.c:1865 src/LYLocal.c:1883
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
 msgid "Current selection:"
 msgstr "Huidige selectie:"
 
-#: src/LYLocal.c:1869
+#: src/LYLocal.c:1992
 msgid "Nothing currently selected."
 msgstr "Er is momenteel niets geselecteerd."
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged item:"
 msgstr "aangevinkt item:"
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged items:"
 msgstr "aangevinkte items:"
 
-#: src/LYLocal.c:1983 src/LYLocal.c:1994
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
 msgid "Illegal filename; request ignored."
 msgstr "Onjuiste bestandsnaam; verzoek genegeerd."
 
-#: src/LYLocal.c:2137
-msgid "The selected item is not a directory!  Request ignored."
-msgstr "Het geselecteerd item is geen map!  Verzoek genegeerd."
-
 #. directory not writable
-#: src/LYLocal.c:2141
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
 msgid "Install in the selected directory not permitted."
 msgstr "Installatie in de geselecteerde map is niet toegestaan."
 
-#: src/LYLocal.c:2146
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr "Het geselecteerd item is geen map!  Verzoek genegeerd."
+
+#: src/LYLocal.c:2276
 msgid "Just a moment, ..."
 msgstr "Een ogenblik gedlud, ..."
 
-#: src/LYLocal.c:2163
+#: src/LYLocal.c:2293
 msgid "Error buiding install args"
 msgstr "Fout bij opbouwen van installatie-argumenten"
 
-#: src/LYLocal.c:2178 src/LYLocal.c:2210
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Bron en bestemming zijn gelijk: %s"
 
-#: src/LYLocal.c:2188 src/LYLocal.c:2220
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Al in map van bestemmings: %s"
 
-#: src/LYLocal.c:2238
+#: src/LYLocal.c:2362
 msgid "Installation complete"
 msgstr "Installatie voltooid"
 
-#: src/LYLocal.c:2427
+#: src/LYLocal.c:2551
 msgid "Temporary URL or list would be too long."
 msgstr "Tijdelijke URL of lijst zou te lang zijn."
 
-#: src/LYMail.c:503
+#: src/LYMail.c:534
 msgid "Sending"
 msgstr "Bezig met zenden"
 
-#: src/LYMail.c:989
+#: src/LYMail.c:1024
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "De link   %s :?: %s\n"
 
-#: src/LYMail.c:991
+#: src/LYMail.c:1026
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "genaamd \"%s\"\n"
 
-#: src/LYMail.c:992
+#: src/LYMail.c:1027
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "in het bestand \"%s\" genaamd \"%s\"\n"
 
-#: src/LYMail.c:993
+#: src/LYMail.c:1028
 msgid "was requested but was not available."
 msgstr "is opgevraagd maar niet beschikbaar."
 
-#: src/LYMail.c:994
+#: src/LYMail.c:1029
 msgid "Thought you might want to know."
 msgstr "Leek me dat u dat wilde weten."
 
-#: src/LYMail.c:996
+#: src/LYMail.c:1031
 msgid "This message was automatically generated by"
 msgstr "Dit bericht is automatisch gegenereerd door"
 
-#: src/LYMain.c:897
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:969
 msgid "No Winsock found, sorry."
 msgstr "Geen Winsock gevonden, sorry."
 
-#: src/LYMain.c:1103
+#: src/LYMain.c:1170
 msgid "You MUST define a valid TMP or TEMP area!\n"
 msgstr "U MOET een geldig TMP of TEMP gebied opgeven!\n"
 
-#: src/LYMain.c:1156 src/LYMainLoop.c:5117
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
 msgid "No such directory"
 msgstr " map"
 
-#: src/LYMain.c:1378
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4148,7 +4203,7 @@ msgstr ""
 "Configuratiebestand %s is niet beschikbaar.\n"
 "\n"
 
-#: src/LYMain.c:1388
+#: src/LYMain.c:1446
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
@@ -4158,7 +4213,7 @@ msgstr ""
 "Lynx karaktersets zijn niet opgegeven.\n"
 "\n"
 
-#: src/LYMain.c:1417
+#: src/LYMain.c:1475
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
@@ -4168,7 +4223,7 @@ msgstr ""
 "Lynx edit-kaart niet opgegeven.\n"
 "\n"
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1504
 #, c-format
 msgid ""
 "\n"
@@ -4179,60 +4234,60 @@ msgstr ""
 "Lynx bestand %s is niet beschikbaar.\n"
 "\n"
 
-#: src/LYMain.c:1704
+#: src/LYMain.c:1743
 msgid "Warning:"
 msgstr "Let op:"
 
-#: src/LYMain.c:2247
+#: src/LYMain.c:2293
 msgid "persistent cookies state will be changed in next session only."
-msgstr "Voortbestaande stand van koekjes wordt pas in volgende sessie gewijzigd."
+msgstr "Voortbestaande stand van cookies wordt pas in volgende sessie gewijzigd."
 
-#: src/LYMain.c:2477 src/LYMain.c:2525
+#: src/LYMain.c:2540 src/LYMain.c:2588
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ik negeer onbekende karakterset=%s\n"
 
-#: src/LYMain.c:3047
-#, c-format
-msgid "%s Version %s (%s)\n"
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
 msgstr "%s Versie %s (%s)\n"
 
-#: src/LYMain.c:3072
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Gebouwd op %s %s %s\n"
 
-#: src/LYMain.c:3077
+#: src/LYMain.c:3166
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
 msgstr "Copyrights in handen van `the University of Kansas', CERN, en andere medewerkers.\n"
 
-#: src/LYMain.c:3079
+#: src/LYMain.c:3168
 msgid "Distributed under the GNU General Public License.\n"
 msgstr "Gedistribueerd onder het GNU General Public License.\n"
 
-#: src/LYMain.c:3081
+#: src/LYMain.c:3170
 msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
+"See http://lynx.isc.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
-"Zie http://lynx.browser.org/ en de online help voor meer informatie.\n"
+"Zie http://lynx.isc.org/ en de online help voor meer informatie.\n"
 "\n"
 
-#: src/LYMain.c:3800
+#: src/LYMain.c:3919
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "GEBRUIK: %s [opties] [bestand]\n"
 
-#: src/LYMain.c:3801
+#: src/LYMain.c:3920
 msgid "Options are:\n"
 msgstr "Opties zijn:\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4191
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ongeldige Optie: %s\n"
 
-#: src/LYMainLoop.c:512
+#: src/LYMainLoop.c:539
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "Interne fout: Ongeldige muis link %d!"
@@ -4240,80 +4295,109 @@ msgstr "Interne fout: Ongeldige muis link %d!"
 #.
 #. * Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:625 src/LYMainLoop.c:5139
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
 msgid "A URL specified by the user"
 msgstr "Een door de gebruiker opgegeven URL"
 
-#: src/LYMainLoop.c:1114
+#: src/LYMainLoop.c:1110
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "Enctype meerdelig/form-data nog niet ondersteund!  Kan niet verzenden."
 
 #.
 #. *  Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3097
+#: src/LYMainLoop.c:3053
 msgid "Help Screen"
 msgstr "Help Scherm"
 
-#: src/LYMainLoop.c:3231
+#: src/LYMainLoop.c:3177
 msgid "System Index"
 msgstr "Systeem Index"
 
-#: src/LYMainLoop.c:3611 src/LYMainLoop.c:5347
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
 msgid "Entry into main screen"
 msgstr "Ingang naar begin scherm"
 
-#: src/LYMainLoop.c:3897
+#: src/LYMainLoop.c:3824
 msgid "No next document present"
 msgstr ""
 
-#: src/LYMainLoop.c:4206
+#: src/LYMainLoop.c:4131
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "de tekenverzameling voor dit document is expliciet opgegeven, sorry..."
 
-#: src/LYMainLoop.c:5093
+#: src/LYMainLoop.c:5004
 msgid "cd to:"
 msgstr " aan "
 
-#: src/LYMainLoop.c:5120
+#: src/LYMainLoop.c:5031
 msgid "A component of path is not a directory"
 msgstr ""
 
-#: src/LYMainLoop.c:5123
+#: src/LYMainLoop.c:5034
 msgid "failed to change directory"
 msgstr "Geen toegang tot map."
 
-#: src/LYMainLoop.c:6291
+#: src/LYMainLoop.c:6204
 msgid "Reparsing document under current settings..."
 msgstr "Document wordt opnieuw ontleed met huidige instellingen..."
 
-#: src/LYMainLoop.c:6579 src/LYMainLoop.c:6583
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fatale fout - kan uitvoerbestand %s niet openen\n"
 
-#: src/LYMainLoop.c:7719 src/LYMainLoop.c:7892
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6914
+#, fuzzy
+msgid "Current URL is empty."
+msgstr "Huidige map:"
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr ""
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:7829
+#: src/LYMainLoop.c:7731
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Geen toegang tot startbestand"
 
-#: src/LYMainLoop.c:7842
+#: src/LYMainLoop.c:7744
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Beginbestand kan niet gevonden worden of is geen tekst/html of tekst/plain"
 
-#: src/LYMainLoop.c:7843
+#: src/LYMainLoop.c:7745
 msgid "      Exiting..."
 msgstr "      Bezig met stoppen..."
 
-#: src/LYMainLoop.c:7886
+#: src/LYMainLoop.c:7788
 msgid "-more-"
 msgstr "-meer-"
 
 #. Enable scrolling.
-#: src/LYNews.c:203
+#: src/LYNews.c:187
 msgid "You will be posting to:"
 msgstr "U zult posten naar:"
 
@@ -4321,7 +4405,7 @@ msgstr "U zult posten naar:"
 #. *  Get the mail address for the From header,
 #. *  offering personal_mail_address as default.
 #.
-#: src/LYNews.c:212
+#: src/LYNews.c:196
 msgid ""
 "\n"
 "\n"
@@ -4336,7 +4420,7 @@ msgstr ""
 #. *  document's title as the default if this is a
 #. *  followup rather than a new post. - FM
 #.
-#: src/LYNews.c:230
+#: src/LYNews.c:214
 msgid ""
 "\n"
 "\n"
@@ -4346,7 +4430,7 @@ msgstr ""
 "\n"
 " Geef of wijzig de `Subject:' (onderwerp) kop\n"
 
-#: src/LYNews.c:322
+#: src/LYNews.c:303
 msgid ""
 "\n"
 "\n"
@@ -4359,7 +4443,7 @@ msgstr ""
 #.
 #. *  Use the built in line editior.
 #.
-#: src/LYNews.c:379
+#: src/LYNews.c:360
 msgid ""
 "\n"
 "\n"
@@ -4369,93 +4453,112 @@ msgstr ""
 "\n"
 " Schrijf hieronder uw bericht."
 
-#: src/LYNews.c:425
+#: src/LYNews.c:406
 msgid "Message has no original text!"
 msgstr "Bericht heeft geen oorspronkelijke tekst!"
 
-#: src/LYOptions.c:743
+#: src/LYOptions.c:746
 msgid "review/edit B)ookmarks files"
 msgstr "herzien/wijzig B)ladwijzer bestanden"
 
-#: src/LYOptions.c:745
+#: src/LYOptions.c:748
 msgid "B)ookmark file: "
 msgstr "B)ladwijzer bestand: "
 
-#: src/LYOptions.c:2507 src/LYOptions.c:2531
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Gebruik %s om naar het Opties-menu te gaan!"
 
-#: src/LYOptions.c:3208
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr ""
+
+#: src/LYOptions.c:3261
 msgid "General Preferences"
 msgstr "Persoonlijke voorkeuren"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3212
+#: src/LYOptions.c:3265
 msgid "User mode"
-msgstr "Gebruiker-modus"
+msgstr "Type gebruiker"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3218
+#: src/LYOptions.c:3271
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3223
+#: src/LYOptions.c:3276
 msgid "Type of Search"
+msgstr "Zoekmethode"
+
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
 msgstr ""
 
+#. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3229
+#: src/LYOptions.c:3285
 msgid "Cookies"
-msgstr "Koekjes"
+msgstr "Cookies"
+
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
 
-#: src/LYOptions.c:3243
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3247
+#: src/LYOptions.c:3316
 msgid "Keypad mode"
 msgstr "Gedrag van numeriek eiland"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3253
+#: src/LYOptions.c:3322
 msgid "Emacs keys"
 msgstr "Emacs toetsen"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3259
+#: src/LYOptions.c:3328
 msgid "VI keys"
 msgstr "VI toetsen"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3266
+#: src/LYOptions.c:3335
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3278
+#: src/LYOptions.c:3347
 msgid "Keyboard layout"
 msgstr ""
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3291
+#: src/LYOptions.c:3360
 msgid "Display and Character Set"
 msgstr "Karakterset op beeldscherm"
 
 #. ***************************************************************
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3295
+#: src/LYOptions.c:3364
 msgid "Display character set"
 msgstr "Karakterset op beeldscherm"
 
-#: src/LYOptions.c:3324
+#: src/LYOptions.c:3393
 msgid "Assumed document character set"
 msgstr "Veronderstelde karakterset"
 
@@ -4464,202 +4567,219 @@ msgstr "Veronderstelde karakterset"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3344
+#: src/LYOptions.c:3413
 msgid "CJK mode"
 msgstr "CJK modus"
 
-#: src/LYOptions.c:3346
+#: src/LYOptions.c:3415
 msgid "Raw 8-bit"
 msgstr "Kale 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3354
+#: src/LYOptions.c:3423
 msgid "X Display"
 msgstr "X Display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3360
+#: src/LYOptions.c:3429
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:3366
+#: src/LYOptions.c:3435
 msgid "Show color"
 msgstr "Toon kleur"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3390
+#: src/LYOptions.c:3459
 msgid "Show cursor"
 msgstr "Toon cursor"
 
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+#, fuzzy
+msgid "Show scrollbar"
+msgstr "Toon kleur"
+
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3396
+#: src/LYOptions.c:3473
 msgid "Popups for select fields"
 msgstr "Menuutjes voor keuzevelden"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3403
+#: src/LYOptions.c:3479
 msgid "HTML error recovery"
 msgstr "HTML foutcorrectie"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3410
+#: src/LYOptions.c:3485
 msgid "Show images"
 msgstr "Afbeeldingen laten zien als"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3424
+#: src/LYOptions.c:3499
 msgid "Verbose images"
 msgstr "Naam van afbeeldingen vermelden"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3432
+#: src/LYOptions.c:3507
 msgid "Headers Transferred to Remote Servers"
 msgstr "Kopteksten die overgedragen worden naar andere computers"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3436
+#: src/LYOptions.c:3511
 msgid "Personal mail address"
 msgstr "Persoonlijk e-mail adres"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3516
 msgid "Preferred document character set"
 msgstr "Voorkeur voor karakterset"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3446
+#: src/LYOptions.c:3521
 msgid "Preferred document language"
 msgstr "Voorkeur voor taal van document"
 
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3527
 msgid "User-Agent header"
 msgstr "User-Agent koptekst"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3460
+#: src/LYOptions.c:3535
 msgid "Listing and Accessing Files"
 msgstr ""
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3464
+#: src/LYOptions.c:3539
 msgid "FTP sort criteria"
-msgstr "sorteercriteria voor FTP"
+msgstr "Sorteercriteria voor FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3471
+#: src/LYOptions.c:3546
 msgid "Local directory sort criteria"
 msgstr "Sorteercriteria lokale mappen"
 
-#: src/LYOptions.c:3479
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+#, fuzzy
+msgid "Local directory sort order"
+msgstr "Sorteercriteria lokale mappen"
+
+#: src/LYOptions.c:3561
 msgid "Show dot files"
 msgstr "Toon .-bestanden"
 
-#: src/LYOptions.c:3487
+#: src/LYOptions.c:3569
 msgid "Execution links"
 msgstr "verwijzingen die programma's starten"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3507
+#: src/LYOptions.c:3589
 msgid "Show transfer rate"
 msgstr "Gegevensoverdracht voltooid"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3516
+#: src/LYOptions.c:3598
 msgid "Special Files and Screens"
 msgstr ""
 
-#: src/LYOptions.c:3521
+#: src/LYOptions.c:3603
 msgid "Multi-bookmarks"
 msgstr "Meervoudige boekenleggers"
 
-#: src/LYOptions.c:3529
+#: src/LYOptions.c:3611
 msgid "Review/edit Bookmarks files"
 msgstr "Bekijk/wijzig Boekenlegger bestanden"
 
-#: src/LYOptions.c:3531
+#: src/LYOptions.c:3613
 msgid "Goto multi-bookmark menu"
 msgstr "Ga naar multi-boekenlegger menu"
 
-#: src/LYOptions.c:3533
+#: src/LYOptions.c:3615
 msgid "Bookmarks file"
 msgstr "Boekenlegger bestand"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3539
+#: src/LYOptions.c:3621
 msgid "Visited Pages"
 msgstr "Bezochte Pagina's"
 
-#: src/LYPrint.c:959
+#: src/LYOptions.c:3628
+#, fuzzy
+msgid "View the file "
+msgstr "Post het bestand"
+
+#: src/LYPrint.c:952
 msgid " Print job complete.\n"
 msgstr " Printopdracht voltooid.\n"
 
-#: src/LYPrint.c:1296
+#: src/LYPrint.c:1281
 msgid "Document:"
 msgstr "Document:"
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1282
 msgid "Number of lines:"
 msgstr "Aantal regels:"
 
-#: src/LYPrint.c:1298
+#: src/LYPrint.c:1283
 msgid "Number of pages:"
 msgstr "Aantal pagina's"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "pages"
 msgstr "pagina's"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "page"
 msgstr "pagina"
 
-#: src/LYPrint.c:1300
+#: src/LYPrint.c:1285
 msgid "(approximately)"
 msgstr "(bij benadering)"
 
-#: src/LYPrint.c:1305
+#: src/LYPrint.c:1290
 msgid "Some print functions have been disabled!"
 msgstr "Enkele afdrukinstellingen zijn niet beschikbaar"
 
-#: src/LYPrint.c:1309
+#: src/LYPrint.c:1294
 msgid "Standard print options:"
 msgstr "Standaard afdrukinstellingen"
 
-#: src/LYPrint.c:1310
+#: src/LYPrint.c:1295
 msgid "Print options:"
 msgstr "Afdrukinstellingen:"
 
-#: src/LYPrint.c:1316
+#: src/LYPrint.c:1302
 msgid "Save to a local file"
-msgstr "Opslaan naar een lokaal bestand"
+msgstr "Opslaan in een lokaal bestand"
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1304
 msgid "Save to disk disabled"
-msgstr "Opslaan naar schijf niet beschikbaar"
+msgstr "Opslaan op schijf niet beschikbaar"
 
-#: src/LYPrint.c:1324
+#: src/LYPrint.c:1311
 msgid "Mail the file"
 msgstr "Post het bestand"
 
-#: src/LYPrint.c:1330
+#: src/LYPrint.c:1318
 msgid "Print to the screen"
 msgstr "Afdrukken naar het scherm"
 
-#: src/LYPrint.c:1334
+#: src/LYPrint.c:1323
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Afdrukken naar een printer die verbonden is aan uw vt100 terminal"
 
-#: src/LYReadCFG.c:340
+#: src/LYReadCFG.c:339
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
 "The line must be of the form:\n"
@@ -4675,76 +4795,76 @@ msgstr ""
 "Hier kunnen VOORGROND en ACHTERGROND één van de volgende zijn:\n"
 "De uitzonderingen 'nocolor' of 'default', of\n"
 
-#: src/LYReadCFG.c:353
+#: src/LYReadCFG.c:352
 msgid "Offending line:"
 msgstr "Regel waar het mis ging:"
 
-#: src/LYReadCFG.c:660
+#: src/LYReadCFG.c:638
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr "toetsenbord afbeelding van %s naar %s voor %s mislukt\n"
 
-#: src/LYReadCFG.c:667
+#: src/LYReadCFG.c:645
 #, c-format
 msgid "key remapping of %s to %s failed\n"
-msgstr "toetsbord-mapping van %s naar %s mislukt\n"
+msgstr "toetsenbord-mapping van %s naar %s mislukt\n"
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:666
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr "ongeldige selectie %s voor toets %s; alles wordt geselecteerd\n"
 
-#: src/LYReadCFG.c:715 src/LYReadCFG.c:728
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr "maken van koppeling voor toets %s (0x%x) naar 0x%x voor %s mislukt\n"
 
-#: src/LYReadCFG.c:733
+#: src/LYReadCFG.c:711
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr "maken van koppeling voor toets %s (0x%x) voor %s mislukt\n"
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:816
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr "Lynx: kan niet starten, CERN reglement bestand %s is niet beschikbaar\n"
 
-#: src/LYReadCFG.c:840
+#: src/LYReadCFG.c:818
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#: src/LYReadCFG.c:1658
+#: src/LYReadCFG.c:1782
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Meer dan %d geneste lynx.cfg insluitingen -- misschien een lus?!?\n"
 
-#: src/LYReadCFG.c:1660
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "Last attempted include was '%s',\n"
-msgstr "De laatste insluiting die geprobeerd is, was '%s',\n"
+msgstr "De laatste include die geprobeerd is, was '%s',\n"
 
-#: src/LYReadCFG.c:1661
+#: src/LYReadCFG.c:1785
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "ingevoegd vanuit '%s'.\n"
 
-#: src/LYReadCFG.c:2116 src/LYReadCFG.c:2129 src/LYReadCFG.c:2165
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
 msgid "The following is read from your lynx.cfg file."
 msgstr "Het volgende wordt gelezen uit uw lynx.cfg bestand."
 
-#: src/LYReadCFG.c:2117 src/LYReadCFG.c:2130
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
 msgid "Please read the distribution"
 msgstr "Lees a.u.b. de meegeleverde versie"
 
-#: src/LYReadCFG.c:2123 src/LYReadCFG.c:2133
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
 msgid "for more comments."
 msgstr "voor meer opmerkingen."
 
-#: src/LYReadCFG.c:2147
+#: src/LYReadCFG.c:2244
 msgid "RELOAD THE CHANGES"
 msgstr "HERLAAD DE VERANDERINGEN"
 
-#: src/LYReadCFG.c:2156
+#: src/LYReadCFG.c:2253
 msgid "Your primary configuration"
 msgstr "Uw primaire configuratie"
 
@@ -4820,7 +4940,7 @@ msgstr "Toegangsrechten"
 msgid "File that you are currently viewing"
 msgstr "Het bestand dat u op dit moment bekijkt"
 
-#: src/LYShowInfo.c:266 src/LYShowInfo.c:375
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
 msgid "Linkname:"
 msgstr "Linknaam:"
 
@@ -4842,7 +4962,7 @@ msgstr "Laatst veranderd:"
 
 #: src/LYShowInfo.c:309
 msgid "&nbsp;Expires:"
-msgstr "Vervalt op:"
+msgstr "&nbsp;Vervalt op:"
 
 #: src/LYShowInfo.c:313
 msgid "Cache-Control:"
@@ -4860,79 +4980,79 @@ msgstr "Taal:"
 msgid "Post Data:"
 msgstr "Post Informatie:"
 
-#: src/LYShowInfo.c:331
+#: src/LYShowInfo.c:333
 msgid "Post Content Type:"
 msgstr "Inhoudstype Post:"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:342
 msgid "Owner(s):"
 msgstr "Eigenaar:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "size:"
 msgstr "grootte:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "lines"
 msgstr "regels"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:348
 msgid "mode:"
 msgstr "modus:"
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:350
 msgid "forms mode"
 msgstr "formulier modus"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "source"
 msgstr "bron"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "normal"
 msgstr "normaal"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:353
 msgid ", safe"
 msgstr ", veilig"
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:354
 msgid ", via internal link"
 msgstr ", via interne link"
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:360
 msgid ", no-cache"
 msgstr ", geen buffer"
 
-#: src/LYShowInfo.c:360
+#: src/LYShowInfo.c:362
 msgid ", ISMAP script"
 msgstr ", ISMAP script"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:364
 msgid ", bookmark file"
 msgstr ", boekenleggerbestand"
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:373
 msgid "Link that you currently have selected"
 msgstr "Link die nu geselecteerd is"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:386
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:391
 msgid "Enctype:"
 msgstr "Beveiligingstype:"
 
-#: src/LYShowInfo.c:401
+#: src/LYShowInfo.c:403
 msgid "(Form field)"
 msgstr "(Formulier veld)"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:418
 msgid "No Links on the current page"
 msgstr "Er zijn geen verwijzingen op de huidige pagina"
 
-#: src/LYStyle.c:250
+#: src/LYStyle.c:278
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -4955,7 +5075,7 @@ msgstr "hier is een lijst van de logs, zodat u opnieuw kunt bouwen"
 
 #: src/LYUpload.c:78
 msgid "ERROR! - upload command is misconfigured"
-msgstr "FOUT! - zend-commando is niet goed ingesteld"
+msgstr "FOUT! - upload-commando is niet goed ingesteld"
 
 #: src/LYUpload.c:100
 msgid "Illegal redirection \"../\" found! Request ignored."
@@ -4973,44 +5093,48 @@ msgstr "Ongeldige doorverwijzing gevonden die gebruik maakt van \"~\"! Verzoek g
 msgid "Unable to upload file."
 msgstr "Niet in staat bestand te zenden."
 
-#: src/LYUpload.c:214
+#: src/LYUpload.c:206
 msgid "Upload To:"
-msgstr "Zenden naar:"
+msgstr "Upload naar:"
 
-#: src/LYUpload.c:215
+#: src/LYUpload.c:207
 msgid "Upload options:"
-msgstr "Zend opties:"
+msgstr "Upload opties:"
+
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
 
-#: src/LYUtils.c:3075
+#: src/LYUtils.c:2468
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Onverwacht toegangsprotocol voor dit URL methode"
 
-#: src/LYUtils.c:3915
+#: src/LYUtils.c:3294
 msgid "Too many tempfiles"
-msgstr ""
+msgstr "Teveel tijdelijke bestanden"
 
-#: src/LYUtils.c:4217
+#: src/LYUtils.c:3595
 #, fuzzy
 msgid "unknown restriction"
-msgstr "Er zijn geen beperkingen gesteld.\n"
+msgstr "onbekende beperking"
 
-#: src/LYUtils.c:4248
+#: src/LYUtils.c:3626
 msgid "No restrictions set.\n"
 msgstr "Er zijn geen beperkingen gesteld.\n"
 
-#: src/LYUtils.c:4251
+#: src/LYUtils.c:3629
 msgid "Restrictions set:\n"
 msgstr "Gestelde beperkingen:\n"
 
-#: src/LYUtils.c:5601
-msgid "Ignoring invalid HOME"
-msgstr "Negeer ongeldig HOME"
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr ""
 
-#: src/LYrcFile.c:20
+#: src/LYrcFile.c:21
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
-msgstr ""
+msgstr "Normaliter uitgeschakeld.  Zie ENABLE_LYNXRC in lynx.cfg\n"
 
-#: src/LYrcFile.c:242
+#: src/LYrcFile.c:295
 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"
@@ -5018,11 +5142,11 @@ msgid ""
 "all cookies.\n"
 msgstr ""
 "accept_all_cookies stelt de gebruiker in staat om, indien gewenst,\n"
-"Lynx automatisch alle koekjes te laten accepteren.  De standaard is\n"
-"\"FALSE\", zodat voor elk koekje om bevestiging zal worden gevraagd.\n"
-"Zet accept_all_cookies op \"TRUE\" om alle koekjes te accepteren.\n"
+"Lynx automatisch alle cookies te laten accepteren.  De standaard is\n"
+"\"FALSE\", zodat voor elk cookie om bevestiging zal worden gevraagd.\n"
+"Zet accept_all_cookies op \"TRUE\" om alle cookies te accepteren.\n"
 
-#: src/LYrcFile.c:249
+#: src/LYrcFile.c:302
 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"
@@ -5032,7 +5156,7 @@ msgstr ""
 "bestand, in welke de gebruiker links kan plaatsen om deze op een later\n"
 "tijdstip eenvoudig te kunnen bereiken.\n"
 
-#: src/LYrcFile.c:254
+#: src/LYrcFile.c:307
 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"
@@ -5043,7 +5167,7 @@ msgstr ""
 "en kleine letters, in plaats van ongevoelig voor kast.  De standaard is\n"
 "meestal \"off\".\n"
 
-#: src/LYrcFile.c:259
+#: src/LYrcFile.c:312
 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"
@@ -5056,7 +5180,7 @@ msgstr ""
 "scherm, kunt u een andere 8 bit verzameling proberen of 7 bit benaderingen.\n"
 "Huidig geldige tekenverzamelingen zijn:\n"
 
-#: src/LYrcFile.c:266
+#: src/LYrcFile.c:319
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5065,18 +5189,18 @@ msgid ""
 "settings made here.\n"
 msgstr ""
 "cookie_accept_domains en cookie_reject_domains zijn door komma's gescheiden lijsten van domeinen voor welke Lynx automatisch alle "
-"koekjes respectievelijk toelaat of weigert.  Als een domein opgegeven wordt voor beide opties zal verwerping het winnen van "
+"cookies respectievelijk toelaat of weigert.  Als een domein opgegeven wordt voor beide opties zal verwerping het winnen van "
 "toelaten.  De accept_all_cookies parameter doet deze instellingen teniet.\n"
 
-#: src/LYrcFile.c:274
+#: src/LYrcFile.c:327
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/.lynx_cookies.\n"
 msgstr ""
-"cookie_file specificeert het bestand waarin blijvende koekjes worden\n"
+"cookie_file specificeert het bestand waarin blijvende cookies worden\n"
 "opgeslagen. Standaard is dit ~/.lynx_cookies.\n"
 
-#: src/LYrcFile.c:279
+#: src/LYrcFile.c:332
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5091,11 +5215,17 @@ msgstr ""
 "waarmee domeinen op verscheidene niveau's van geldigheid worden\n"
 "gecontroleerd.  Als een domein op `strict'e controle wordt gezet, moet\n"
 "strict voldaan worden aan RFC2109.  Een domein met 'loose' controle\n"
-"zal toegestaan worden om koekjes met een ongeldige padnaam of\n"
+"zal toegestaan worden om cookies met een ongeldige padnaam of\n"
 "domein-attribuut te plaatsen.  Alle domeinen zullen standaard de\n"
 "gebruiker vragen (query) in geval van ongeldig pad of domein.\n"
 
-#: src/LYrcFile.c:292
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:351
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5107,7 +5237,7 @@ msgstr ""
 "bestanden en mappen samen worden gesorteerd.  \"FILES_FIRST\" plaatst\n"
 "bestanden eerst, \"DIRECTORIES_FIRST\" plaatst mappen eerst.\n"
 
-#: src/LYrcFile.c:300
+#: src/LYrcFile.c:359
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5119,7 +5249,7 @@ msgstr ""
 "  ^B = links (backward-char)   ^F = rechts (forward-char)\n"
 "in gebruik zijn.\n"
 
-#: src/LYrcFile.c:306
+#: src/LYrcFile.c:365
 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"
@@ -5132,7 +5262,7 @@ msgstr ""
 "wordt opgegeven. De ingebouwde editor zal worden gebruikt om email te\n"
 "verzenden.\n"
 
-#: src/LYrcFile.c:312
+#: src/LYrcFile.c:371
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5148,7 +5278,7 @@ msgstr ""
 "  BY_SIZE     -- sorteert op de grootte van het bestand\n"
 "  BY_DATE     -- sorteert op de datum van het bestand\n"
 
-#: src/LYrcFile.c:324
+#: src/LYrcFile.c:389
 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"
@@ -5172,7 +5302,7 @@ msgstr ""
 "\n"
 "Huidige mogelijkheden voor lineedit_mode zijn:\n"
 
-#: src/LYrcFile.c:339
+#: src/LYrcFile.c:404
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5185,7 +5315,7 @@ msgstr ""
 "Er kunnen 26 boekenleggerbestanden zijn, voor elke hoofdletter A-Z.\n"
 "We beginnen met \"multi_bookmarkB\" omdat 'A' de gewone is (zie boven).\n"
 
-#: src/LYrcFile.c:345
+#: src/LYrcFile.c:410
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5203,7 +5333,7 @@ msgstr ""
 "ook dit veld leeg laten, maar dan wordt het ook niet opgenomen in\n"
 "uw email commentaren.\n"
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:419
 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"
@@ -5231,13 +5361,13 @@ msgstr ""
 "moeten sturen, maar het verzenden van een onacceptabel antwoord is ook\n"
 "toegestaan.\n"
 
-#: src/LYrcFile.c:368
+#: src/LYrcFile.c:433
 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 it's default language.\n"
+"Otherwise, the server will send the file in its default language.\n"
 msgstr ""
 "preferred_language specificeert de taal in MIME notatie (dat is, en,\n"
 "nl, fr, een door komma's gescheiden lijst in afnemende volgorde van\n"
@@ -5246,7 +5376,7 @@ msgstr ""
 "server het verzenden.  Als dit niet het geval is, zal de server het\n"
 "bestand in zijn standaard taal verzenden.\n"
 
-#: src/LYrcFile.c:377
+#: src/LYrcFile.c:442
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5268,7 +5398,7 @@ msgstr ""
 "         omzeilen.  Deze optie moet enkel op \"on\" gezet worden als u\n"
 "         alleen maar informatie bekijkt uit een vertrouwde bron.\n"
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:453
 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"
@@ -5295,7 +5425,7 @@ msgstr ""
 "         omzeilen.  Deze optie moet enkel op \"on\" gezet worden als u\n"
 "         alleen maar informatie bekijkt uit een vertrouwde bron.\n"
 
-#: src/LYrcFile.c:403
+#: src/LYrcFile.c:471
 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"
@@ -5314,7 +5444,7 @@ msgstr ""
 "drukknoppen zorgt.\n"
 "De standaard kan worden tenietgedaan d.m.v. de `-popup' commandoregel optie.\n"
 
-#: src/LYrcFile.c:413
+#: src/LYrcFile.c:481
 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"
@@ -5349,7 +5479,7 @@ msgstr ""
 "'o'pties menu.  Als de optie-instellingen worden opgeslagen, zullen de\n"
 "\"on\" en \"off\" instellingen worden gezien als \"default\".\n"
 
-#: src/LYrcFile.c:430
+#: src/LYrcFile.c:498
 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"
@@ -5370,7 +5500,7 @@ msgstr ""
 "Een waarde \"on\" zal de positionering links van de links of opties\n"
 "zetten, en en waarde \"off\" probeert de cursor te 'verbergen'.\n"
 
-#: src/LYrcFile.c:441
+#: src/LYrcFile.c:509
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5384,7 +5514,7 @@ msgstr ""
 "commando-regel optie.  Indien uitgezet wordt het ook onmogelijk gemaakt\n"
 "om verborgen bestanden aan te maken vanuit Lynx.\n"
 
-#: src/LYrcFile.c:452
+#: src/LYrcFile.c:520
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5407,7 +5537,7 @@ msgstr ""
 "gebruikt.  Als deze optie op \"standaard\" gezet wordt, zal ongeacht de\n"
 "gebruikersmodus het volledige menu getoond worden.\n"
 
-#: src/LYrcFile.c:464
+#: src/LYrcFile.c:533
 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"
@@ -5423,7 +5553,7 @@ msgstr ""
 "schakelen.  Gebruik \"ADVANCED\" om onder in het scherm de URL van de\n"
 "geselecteerd link te zien.\n"
 
-#: src/LYrcFile.c:472
+#: src/LYrcFile.c:542
 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"
@@ -5433,7 +5563,7 @@ msgstr ""
 "afbeelding laten zien in plaats van [INLINE], [LINK] of [IMAGE].\n"
 "Zie ook VERBOSE_IMAGES in lynx.cfg\n"
 
-#: src/LYrcFile.c:477
+#: src/LYrcFile.c:547
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5450,7 +5580,7 @@ msgstr ""
 "springen naar snelkoppelingen (j-ump) of the toetsenindeling laten\n"
 "zien (k-eymap display).\n"
 
-#: src/LYrcFile.c:485
+#: src/LYrcFile.c:555
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
@@ -5458,7 +5588,7 @@ msgstr ""
 "De visited_links optie bepaalt hoe Lynx de informatie weergeeft op de\n"
 "pagina met Bezochte Links.\n"
 
-#: src/LYrcFile.c:693
+#: src/LYrcFile.c:772
 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"
@@ -5476,7 +5606,7 @@ msgstr ""
 "De corresponderende nummers op het linkerdeel van het toetsenbord zullen\n"
 "ook als pijltjestoetsen functioneren, ongeacht de Numlock stand.\n"
 
-#: src/LYrcFile.c:702
+#: src/LYrcFile.c:781
 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"
@@ -5485,7 +5615,7 @@ msgstr ""
 "verschijnen naast elke link en nummers kunnen gebruikt worden om links\n"
 "te selecteren.\n"
 
-#: src/LYrcFile.c:706
+#: src/LYrcFile.c:785
 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"
@@ -5505,7 +5635,7 @@ msgstr ""
 "op het scherm zichtbaar is.  Referentielijsten en uitvoer van het\n"
 "lijst commando nummeren ook formulier-invoervelden.\n"
 
-#: src/LYrcFile.c:715
+#: src/LYrcFile.c:794
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -5515,7 +5645,7 @@ msgstr ""
 "verminkt uitzien als \"LINKS_ARE_NUMBERED\" of\n"
 "\"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" is aangezet.\n"
 
-#: src/LYrcFile.c:748
+#: src/LYrcFile.c:827
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -5539,3 +5669,12 @@ msgstr ""
 "Als u op zoek bent naar het algemene configuratiebestand - dat is\n"
 "meestal lynx.cfg, en het heeft andere inhoud en een andere opmaak.\n"
 "Het is niet dit bestand.\n"
+
+#~ msgid "create %s"
+#~ msgstr "maak %s aan"
+
+#~ msgid "Unable to open file management menu file."
+#~ msgstr "Kan bestand met bestandsbeheer-menu niet openen."
+
+#~ msgid "Ignoring invalid HOME"
+#~ msgstr "Negeer ongeldig HOME"
diff --git a/gnu/usr.bin/lynx/po/no.po b/gnu/usr.bin/lynx/po/no.po
deleted file mode 100644
index 413ecd3f631..00000000000
--- a/gnu/usr.bin/lynx/po/no.po
+++ /dev/null
@@ -1,11 +0,0 @@
-msgid ""
-msgstr ""
-"Date: 1998-08-22 16:12:20-0400\n"
-"From: Webmaster Jim <jspath@bcpl.net>\n"
-"Content-Type: text/plain; charset=\n"
-"Xgettext-Options: --default-domain=po/de\n"
-"Files: src/LYMain.c\n"
-
-#: src/LYMain.c:2502
-msgid "%s Version %s %s"
-msgstr ""
diff --git a/gnu/usr.bin/lynx/po/pl.po b/gnu/usr.bin/lynx/po/pl.po
deleted file mode 100644
index 413ecd3f631..00000000000
--- a/gnu/usr.bin/lynx/po/pl.po
+++ /dev/null
@@ -1,11 +0,0 @@
-msgid ""
-msgstr ""
-"Date: 1998-08-22 16:12:20-0400\n"
-"From: Webmaster Jim <jspath@bcpl.net>\n"
-"Content-Type: text/plain; charset=\n"
-"Xgettext-Options: --default-domain=po/de\n"
-"Files: src/LYMain.c\n"
-
-#: src/LYMain.c:2502
-msgid "%s Version %s %s"
-msgstr ""
diff --git a/gnu/usr.bin/lynx/po/pt.po b/gnu/usr.bin/lynx/po/pt.po
deleted file mode 100644
index 5ce001350c9..00000000000
--- a/gnu/usr.bin/lynx/po/pt.po
+++ /dev/null
@@ -1,27 +0,0 @@
-msgid ""
-msgstr ""
-"Date: 1998-08-22 16:12:20-0400\n"
-"From: Webmaster Jim <jspath@bcpl.net>\n"
-"Content-Type: text/plain; charset=\n"
-"Xgettext-Options: --default-domain=po/de\n"
-"Files: src/LYMain.c\n"
-
-#: src/LYMain.c:2502
-msgid "%s Version %s %s"
-msgstr "%s Versão %s %s"
-
-#: src/LYMain.c:2504
-msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
-msgstr "O copyright prendeu pela universidade de Kansas, de CERN, e de outros contribuinte.\n"
-
-#: src/LYMain.c:2506
-msgid "Distributed under the GNU General Public License.\n"
-msgstr "Distribuído sob a licença do general público de GNU.\n"
-
-#: src/LYMain.c:2508
-msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
-"\n"
-msgstr ""
-"Veja http://lynx.browser.org / e a ajuda em linha para mais informação.\n"
-"\n"
diff --git a/gnu/usr.bin/lynx/po/pt_BR.po b/gnu/usr.bin/lynx/po/pt_BR.po
index 02aef0c29c9..da96ee7565c 100644
--- a/gnu/usr.bin/lynx/po/pt_BR.po
+++ b/gnu/usr.bin/lynx/po/pt_BR.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.4\n"
-"POT-Creation-Date: 2001-06-01 18:55-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-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"
@@ -26,7 +27,7 @@ msgstr ""
 #. * Links to collections of alternate definitions, developed by the Lynx
 #. * User Community, are maintained in Lynx links:
 #. *
-#. *    http://www.trill-home.com/lynx.html
+#. *    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
@@ -41,1992 +42,1992 @@ msgstr "Alerta!: %s"
 msgid "Welcome"
 msgstr "Bem Vindo"
 
-#: LYMessages.c:31 LYMessages.c:32
+#: LYMessages.c:31
 msgid "Are you sure you want to quit?"
 msgstr "Você tem certeza?"
 
-#: LYMessages.c:34 LYMessages.c:35
+#: LYMessages.c:33
 msgid "Really exit from Lynx?"
 msgstr "Realmente sair do Lynx?"
 
-#: LYMessages.c:37
+#: LYMessages.c:35
 msgid "Connection interrupted."
 msgstr "Conexão interrompida."
 
-#: LYMessages.c:38
+#: LYMessages.c:36
 msgid "Data transfer interrupted."
 msgstr "Transferência de dados interrompida."
 
-#: LYMessages.c:39
+#: LYMessages.c:37
 msgid "Cancelled!!!"
 msgstr "Cancelado!!!"
 
-#: LYMessages.c:40
+#: LYMessages.c:38
 msgid "Cancelling!"
 msgstr "Cancelando!"
 
-#: LYMessages.c:41
+#: LYMessages.c:39
 msgid "Excellent!!!"
 msgstr "Excelente!!"
 
-#: LYMessages.c:42
+#: LYMessages.c:40
 msgid "OK"
 msgstr "OK"
 
-#: LYMessages.c:43
+#: LYMessages.c:41
 msgid "Done!"
 msgstr "Finalizado!"
 
-#: LYMessages.c:44
+#: LYMessages.c:42
 msgid "Bad request!"
 msgstr "Requisição mal formada!"
 
-#: LYMessages.c:45
+#: LYMessages.c:43
 msgid "previous"
 msgstr "anterior"
 
-#: LYMessages.c:46
+#: LYMessages.c:44
 msgid "next screen"
 msgstr "próxima tela"
 
-#: LYMessages.c:47
+#: LYMessages.c:45
 msgid "HELP!"
 msgstr "AJUDA!"
 
-#: LYMessages.c:48
+#: LYMessages.c:46
 msgid ", help on "
 msgstr ", ajuda em "
 
 #. #define HELP
-#: LYMessages.c:50
+#: LYMessages.c:48
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr "Comandos: Use as setas para mover,'?' ajuda, 'q' sair, '<-' voltar."
 
 #. #define MOREHELP
-#: LYMessages.c:52
+#: LYMessages.c:50
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr "espaço para continuar, use as setas para mover,'?' ajuda, 'q' sair."
 
-#: LYMessages.c:53
+#: LYMessages.c:51
 msgid "-- press space for next page --"
 msgstr "-- pressione a barra de espaço para ir para a próxima página --"
 
-#: LYMessages.c:54
+#: LYMessages.c:52
 msgid "URL too long"
 msgstr "Caminho muito grande"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:60
+#: LYMessages.c:58
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr ""
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:60
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr ""
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:64
+#: LYMessages.c:62
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(Area de texto).Setas para cima/baixo, ou TAB para sair (%s para editor)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:64
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(Campo de formulário). Use <enter> para enviar('x' para não salvar no cache)."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:68
+#: LYMessages.c:66
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr "(Campo de formulário). Use <enter> para enviar(%s para não salvar no cache)."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:68
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
 msgstr "(Campo de formulário). Use <enter> para enviar, setas ou TAB para sair."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:72
+#: LYMessages.c:70
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "(Campo de e-mail) Digite o texto. Use <enter> para enviar, setas para sair."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:74
+#: LYMessages.c:72
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "(Campo de entrada de senha). Use setas para cima/baixo ou TAB para sair."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:77
+#: LYMessages.c:75
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
 msgstr "Campo não modificável. Use setas para cima ou para baixo ou TAB para sair."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:77
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Caixa de texto). Use seta para cima, para baixo ou TAB para sair."
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:81
+#: LYMessages.c:79
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Caixa de texto) Digite o texto.Seta para cima, para baixo ou TAB para sair."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:83
+#: LYMessages.c:81
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
 msgstr "(Area de texto).Setas para cima/baixo, ou TAB para sair (^Ve para editor)."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:85
+#: LYMessages.c:83
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
 msgstr "(Area de texto).Setas para cima/baixo, ou TAB para sair (%s para editor)."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:87
+#: LYMessages.c:85
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
 msgstr "Caixa de texto não modificável. S setas para cima/baixo, ou TAB para sair."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:87
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(Campo de formulário). Use <enter> para enviar('x' para não salvar no cache)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:91
+#: LYMessages.c:89
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr "(Campo de formulário). Use <enter> para enviar(%s para não salvar no cache)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:93
+#: LYMessages.c:91
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr "(Campo de formulário). Use <enter> para enviar, setas ou TAB para sair."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:95
+#: LYMessages.c:93
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
 msgstr "Campo de texto não modificável. Use setas para cima/baixo ou TAB para sair."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:97
+#: LYMessages.c:95
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr "(Campo de e-mail) Digite o texto. Use <enter> para enviar, setas para sair."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:99
+#: LYMessages.c:97
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr "(Campo de e-mail) E-mail está desabilitado, portanto você não pode enviar."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:99
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Campo de entrada de senha). Use setas para cima/baixo ou TAB para sair."
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:101
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
 msgstr "Campo de senha não modificável. Use setas para cima/baixo ou TAB para sair."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:103
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "(Caixa de checagem) Use seta para a direita ou <enter> para marcar."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:105
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
 msgstr "Caixa de checagem não modificável. Setas para cima/baixo ou TAB para sair."
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:109
+#: LYMessages.c:107
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr "(Botão de rádio) Use seta para a direita ou <enter> para marcar."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:111
+#: LYMessages.c:109
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
 msgstr "Botão de rádio não modificável.Setas para cima/baixo ou TAB para sair."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:113
+#: LYMessages.c:111
 msgid "Submit ('x' for no cache) to "
 msgstr "Enviar ('x' para não salvar) para"
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:115
+#: LYMessages.c:113
 msgid "Submit to "
 msgstr "Enviar para"
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:117
+#: LYMessages.c:115
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr "Botão de envio.Seta para a direita ou <enter> para enviar('x' para não salvar)"
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:119
+#: LYMessages.c:117
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(Botão de envio) Use seta para a direita ou <enter> para enviar."
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:121
+#: LYMessages.c:119
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
 msgstr "Botão de rádio desabilitado. Seta para cima ou para baixo ou TAB para sair."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:123
+#: LYMessages.c:121
 msgid "Submit mailto form to "
 msgstr "Enviar formulário de e-mail para "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:125
+#: LYMessages.c:123
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr "(Botão de envio de email) Use seta para a direita ou <enter> para enviar."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:125
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr "(Botão de envio de email) E-mail desabilitado. Você não pode enviar emails agora."
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:127
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr "(Botão de limpar).Seta para a direita ou<enter> para voltar aos valores padrão"
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:129
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
 msgstr "Botão de limpar desabilitado. Seta para cima ou para baixo ou TAB para sair."
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:131
 msgid "(Option list) Hit return and use arrow keys and return to select option."
 msgstr "(Lista de opções)Tecle enter, use as setas e enter novamente para selecionar."
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:133
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
 msgstr "(Lista de opções) Tecle enter, use as setas e enter novamente para selecionar."
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:135
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr "Lista de opções não modificável. Use enter ou setas para rever ou sair."
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:137
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr "Lista de opções não modificável. Use enter ou setas para rever ou sair."
 
-#: LYMessages.c:140
+#: LYMessages.c:138
 msgid "Submitting form..."
 msgstr "Enviando formulário..."
 
-#: LYMessages.c:141
+#: LYMessages.c:139
 msgid "Resetting form..."
 msgstr "Limpando formulário..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:141
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Recarregando formulário. Qualquer entrada será perdida!"
 
-#: LYMessages.c:144
+#: LYMessages.c:142
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Atencão: Impossível transformar dados do formulario em %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:147
+#: LYMessages.c:145
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr "(Link Normal) Use seta para a direita ou <enter> para ativar."
 
-#: LYMessages.c:148
+#: LYMessages.c:146
 msgid "The resource requested is not available at this time."
 msgstr "O recurso solicitado não está disponível neste momento."
 
-#: LYMessages.c:149
+#: LYMessages.c:147
 msgid "Enter Lynx keystroke command: "
 msgstr "Entre o comando para o Lynx:"
 
-#: LYMessages.c:150
+#: LYMessages.c:148
 msgid "Looking up "
 msgstr "Procurando "
 
-#: LYMessages.c:151
+#: LYMessages.c:149
 #, c-format
 msgid "Getting %s"
 msgstr "Recebendo %s"
 
-#: LYMessages.c:152
+#: LYMessages.c:150
 #, c-format
 msgid "Skipping %s"
 msgstr "Omitindo %s"
 
-#: LYMessages.c:153
+#: LYMessages.c:151
 #, c-format
 msgid "Using %s"
 msgstr "Usando %s"
 
-#: LYMessages.c:154
+#: LYMessages.c:152
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "Link Ilegal: %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:153
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Endereço %s mal formado"
 
-#: LYMessages.c:156
+#: LYMessages.c:154
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:155
 msgid "Unable to access WWW file!!!"
 msgstr "Impossível acessar o arquivo WWW!!!"
 
-#: LYMessages.c:158
+#: LYMessages.c:156
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "Este é um índice de busca, use %s para procurar."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:160
+#: LYMessages.c:158
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--Mais-- Este é um índice de busca. Use %s para procurar."
 
-#: LYMessages.c:161
+#: LYMessages.c:159
 msgid "You have entered an invalid link number."
 msgstr "Você entrou um número inválido de link."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:163
+#: LYMessages.c:161
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "Vendo a fonte do documento.Pressione '\\' para voltar ao documento."
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:165
+#: LYMessages.c:163
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
 msgstr "Setas para cima/baixo move.A direita segue um link; A esquerda para voltar.\n"
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:167
+#: LYMessages.c:165
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
 msgstr "H)Ajuda O)Opções P)Imprimir G)Segue M)Principal Q)Sair /=procura [delete]=Histórico \n"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:169
+#: LYMessages.c:167
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
 msgstr "O)Comandos H)Ajuda K)Teclas G)Segue P)Imprimir M)Principal o)opções Q)Sair\n"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:171
+#: LYMessages.c:169
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr "O)Outros comandos B)Volta E)Edita D)Copia ^R)Recarrega ^W)Tela procura doc:\n"
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:173
+#: LYMessages.c:171
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr "O)Comandos|C)Comentário|<delete>Marcações|V)Visualizar|A) Adicionar|R)Remover\n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:175
+#: LYMessages.c:173
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr "            Entre com o texto no campo digitando no teclado"
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:177
+#: LYMessages.c:175
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr "Ctrl-U apaga todo o texto do campo. [Backspace] apaga um caractere"
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:179
+#: LYMessages.c:177
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
 msgstr "Ctrl-U apaga todo o texto do campo. [Backspace] apaga um caractere"
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:181
+#: LYMessages.c:179
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr "%s apaga todo o texto do campo. [Backspace] apaga um caractere"
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:183
+#: LYMessages.c:181
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
 msgstr "%s apaga todo o texto do campo. [Backspace] apaga um caractere"
 
 #. mailto
-#: LYMessages.c:186
+#: LYMessages.c:184
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "Formulário de envio de email mal-formado! Cancelado!"
 
-#: LYMessages.c:187
+#: LYMessages.c:185
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Atenção! Codificação de endereço de email alterado por ?"
 
-#: LYMessages.c:188
+#: LYMessages.c:186
 msgid "Mail disallowed!  Cannot submit."
 msgstr "E-mail desabilitado!! Impossível enviar."
 
-#: LYMessages.c:189
+#: LYMessages.c:187
 msgid "Mailto form submission failed!"
 msgstr "Envio de formulário de email falhou!"
 
-#: LYMessages.c:190
+#: LYMessages.c:188
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Envio de formulário de e-mail cancelado!!"
 
-#: LYMessages.c:191
+#: LYMessages.c:189
 msgid "Sending form content..."
 msgstr "Enviando dados do formulário..."
 
-#: LYMessages.c:192
+#: LYMessages.c:190
 msgid "No email address is present in mailto URL!"
 msgstr "Endereço de e-mail não está presente no campo de E-mail!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:194
+#: LYMessages.c:192
 msgid "Unable to open temporary file for mailto URL!"
 msgstr "Impossível abrir arquivo temporário para o campo de e-mail!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:196
+#: LYMessages.c:194
 msgid "Do you wish to include the original message?"
 msgstr "Você quer imcluir a mensagem original?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:196
 msgid "Do you wish to include the preparsed source?"
 msgstr "Você quer incluir o arquivo fonte?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:200
+#: LYMessages.c:198
 msgid "Spawning your selected editor to edit mail message"
 msgstr "Chamando o editor selecionado para editar o email."
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:202
+#: LYMessages.c:200
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr "Erro chamando o editor, cheque as configurações de seu editor em opções"
 
-#: LYMessages.c:203
+#: LYMessages.c:201
 msgid "Send this comment?"
 msgstr "Envia este comentário?"
 
-#: LYMessages.c:204
+#: LYMessages.c:202
 msgid "Send this message?"
 msgstr "Envia esta mensagem?"
 
-#: LYMessages.c:205
+#: LYMessages.c:203
 msgid "Sending your message..."
 msgstr "Enviando sua mensagem..."
 
-#: LYMessages.c:206
+#: LYMessages.c:204
 msgid "Sending your comment:"
 msgstr "Enviando seu comentário..."
 
 #. textarea
-#: LYMessages.c:209
+#: LYMessages.c:207
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "Fora da área de texto: impossível usar um editor externo."
 
-#: LYMessages.c:210
+#: LYMessages.c:208
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "Fora da área de texto: impossível usar um editor externo."
 
-#: LYMessages.c:213
+#: LYMessages.c:211
 msgid "file: ACTIONs are disallowed!"
 msgstr "arquivo: ACTION está desabilitado!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:213
 msgid "file: URLs via served links are disallowed!"
 msgstr "arquivo: URLs através de links estão desabilitadas!"
 
-#: LYMessages.c:216
+#: LYMessages.c:214
 msgid "Access to local files denied."
 msgstr "Acesso aos arquivos ocultos está desabilitado!"
 
-#: LYMessages.c:217
+#: LYMessages.c:215
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "arquivo: URLs através de 'favoritos' estão desabilitadas!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:217
 msgid "This special URL is not allowed in external documents!"
 msgstr "Esta URL em particular não permite entrada em documentos externos!"
 
-#: LYMessages.c:220
+#: LYMessages.c:218
 msgid "Press <return> to return to Lynx."
 msgstr "Pressione <enter> para voltar ao Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:221
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "Chamando subprocessos DCL. Use 'logout' para voltar ao Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:225
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "Digite EXIT para voltar ao Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:228
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr "Chamando seu shell padrão. Use 'exit' para voltar ao Lynx.\n"
 
-#: LYMessages.c:233
+#: LYMessages.c:231
 msgid "Spawning is currently disabled."
 msgstr "Chamadas estão atualmente desabilitadas."
 
-#: LYMessages.c:234
+#: LYMessages.c:232
 msgid "The 'd'ownload command is currently disabled."
 msgstr "O comando de 'd'ownload está atualmente desabilitado."
 
-#: LYMessages.c:235
+#: LYMessages.c:233
 msgid "You cannot download an input field."
 msgstr "Você não pode copiar um campo de entrada."
 
-#: LYMessages.c:236
+#: LYMessages.c:234
 msgid "Form has a mailto action!  Cannot download."
 msgstr "O formulário tem uma ação de envio de email. Impossível copiar."
 
-#: LYMessages.c:237
+#: LYMessages.c:235
 msgid "You cannot download a mailto: link."
 msgstr "Você não pode copiar uma ligação de e-mail."
 
-#: LYMessages.c:238
+#: LYMessages.c:236
 msgid "You cannot download cookies."
 msgstr "Você não pode copiar cookies."
 
-#: LYMessages.c:239
+#: LYMessages.c:237
 msgid "You cannot download a printing option."
 msgstr "Você não pode copiar uma opção de impressão."
 
-#: LYMessages.c:240
+#: LYMessages.c:238
 msgid "You cannot download an upload option."
 msgstr "Você não pode copiar uma opção de envio de arquivos."
 
-#: LYMessages.c:241
+#: LYMessages.c:239
 msgid "You cannot download an permit option."
 msgstr "Você não pode copiar uma opção de permissão."
 
-#: LYMessages.c:242
+#: LYMessages.c:240
 msgid "This special URL cannot be downloaded!"
 msgstr "Esta URL em particular não pode ser copiada."
 
-#: LYMessages.c:243
+#: LYMessages.c:241
 msgid "Nothing to download."
 msgstr "Nada a fazer."
 
-#: LYMessages.c:244
+#: LYMessages.c:242
 msgid "Trace ON!"
 msgstr "Traçador de rotas ligado!"
 
-#: LYMessages.c:245
+#: LYMessages.c:243
 msgid "Trace OFF!"
 msgstr "Traçador de rotas desligado!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:245
 msgid "Links will be included for all images!  Reloading..."
 msgstr "Os links serão incluídos em todas as imagens! Recarregando..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:247
 msgid "Standard image handling restored!  Reloading..."
 msgstr "Imagem padrão de ponteiro restaurada! Recarregando..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:249
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr "Pseudo nomes serão incluídos sem os nomes alternativos. Recarregando..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:251
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "Campos sem um nome alternativo serão ignorados! Recarregando..."
 
-#: LYMessages.c:254
+#: LYMessages.c:252
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Modo Raw 8-bit ou CJK estão desativados. Atualizando..."
 
-#: LYMessages.c:255
+#: LYMessages.c:253
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "Modo Raw 8-bit ou CJK estão ativados. Atualizando..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:255
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "Envia pedido de HEAD para D) Documento ou L) Link ou C) Cancela (d,l,c):"
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:257
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "Envia pedido de HEAD para D) Documento ou C) Cancela (d,c):"
 
-#: LYMessages.c:260
+#: LYMessages.c:258
 msgid "Sorry, the document is not an http URL."
 msgstr "Desculpe, o documento não é no formato de endereço http."
 
-#: LYMessages.c:261
+#: LYMessages.c:259
 msgid "Sorry, the link is not an http URL."
 msgstr "Desculpe, esta ligação não é um endereço http."
 
-#: LYMessages.c:262
+#: LYMessages.c:260
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "Desculpe, a ACTION para este formulário está desabilitada."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:262
 msgid "Sorry, the ACTION for this form is not an http URL."
 msgstr "Desculpe, a ACTION para este formulário não é um endereço http."
 
-#: LYMessages.c:265
+#: LYMessages.c:263
 msgid "Not an http URL or form ACTION!"
 msgstr "Não há um endereço http ou ação de formulário!"
 
-#: LYMessages.c:266
+#: LYMessages.c:264
 msgid "This special URL cannot be a form ACTION!"
 msgstr "Esta URL não tem uma ação de formulário!"
 
-#: LYMessages.c:267
+#: LYMessages.c:265
 msgid "URL is not in starting realm!"
 msgstr "Esta URL não tem um domínio inicial!"
 
-#: LYMessages.c:268
+#: LYMessages.c:266
 msgid "News posting is disabled!"
 msgstr "Postagem de NEWS está desabilitada!"
 
-#: LYMessages.c:269
+#: LYMessages.c:267
 msgid "File management support is disabled!"
 msgstr "Suporte a gerenciamento de arquivos está desabilitado!"
 
-#: LYMessages.c:270
+#: LYMessages.c:268
 msgid "No jump file is currently available."
 msgstr "Nenhum arquivo de pulo está disponível."
 
-#: LYMessages.c:271
+#: LYMessages.c:269
 msgid "Jump to (use '?' for list): "
 msgstr "Siga para (use '?' para ajuda):"
 
-#: LYMessages.c:272
+#: LYMessages.c:270
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr "Atalho URL de pulo está desabilitado!"
 
-#: LYMessages.c:273
+#: LYMessages.c:271
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "URL randômica está sesabilitada! Use um atalho."
 
-#: LYMessages.c:274
+#: LYMessages.c:272
 msgid "No random URLs have been used thus far."
 msgstr "Nenhuma URL randômica foi usada ultimamente."
 
-#: LYMessages.c:275
+#: LYMessages.c:273
 msgid "Bookmark features are currently disabled."
 msgstr "Insersão de URL no Livro de Marcações está desabilitada neste momento."
 
-#: LYMessages.c:276
+#: LYMessages.c:274
 msgid "Execution via bookmarks is disabled."
 msgstr "Execução via Livro de Marcações está desabilitada."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:276
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "Livro de Marcações não está definido. Use %s para ver as opções."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:278
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "Impossível abrir arquivo temporário para conversão X Mosaic"
 
-#: LYMessages.c:281
+#: LYMessages.c:279
 msgid "ERROR - unable to open bookmark file."
 msgstr "ERRO - Impossível abrir arquivo de Livro de Marcações."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:281
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "Impossível arir arquivo do Livro de Marcações para apagar a ligação."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:283
 msgid "Unable to open scratch file for deletion of link."
 msgstr "Impossível abrir arquivo de marcação para apagar a ligação."
 
-#: LYMessages.c:287
+#: LYMessages.c:285
 msgid "Error renaming scratch file."
 msgstr "Erro renomeando arquivo de marcação."
 
-#: LYMessages.c:289
+#: LYMessages.c:287
 msgid "Error renaming temporary file."
 msgstr "Erro renomeando arquivo temporário."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:289
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "Impossível copiar arquivo temporário para apagar a ligação."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:291
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "Impossível reabrir arquivo temporário para deleção de ligação."
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:294
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "Ligação não é a única na linha do arquivo do Livro de Marcações."
 
-#: LYMessages.c:297
+#: LYMessages.c:295
 msgid "Bookmark deletion failed."
 msgstr "Deleção do Livro de Marcações falhou!"
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:297
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr "Endereços do Livro de Marcações não pode ser transversal (somente http URLs)."
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:299
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "Impossível abrir Livro de Marcações, use 'a' para salvar a ligação primeiro."
 
-#: LYMessages.c:302
+#: LYMessages.c:300
 msgid "There are no links in this bookmark file!"
 msgstr "Não existem ligações neste Livro de Marcações."
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:302
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr "D)Salvar documento ou L)Marque no Livro de Marcações ou C)Cancela? (d,l,c):"
 
-#: LYMessages.c:305
+#: LYMessages.c:303
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "D) Salva documento no Livro de Marcações ou C) Cancela> (d,c): "
 
-#: LYMessages.c:306
+#: LYMessages.c:304
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "L) Salva ligação no Livro de Marcações ou C) Cancela? (l,c):"
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:308
+#: LYMessages.c:306
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr "Formulários com função de postar não podem ser marcados no Livro de Marcações."
 
-#: LYMessages.c:309
+#: LYMessages.c:307
 msgid "Cannot save form fields/links"
 msgstr "Impossível salvar campos de formulário/ligações"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:311
+#: LYMessages.c:309
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "Histórico, informações, menu e lista de arquivos não podem ser salvos no Livro de Marcações."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:313
+#: LYMessages.c:311
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Você realmente quer apagar esta ligação do seu Livro de Marcações?"
 
-#: LYMessages.c:314
+#: LYMessages.c:312
 msgid "Malformed address."
 msgstr "Endereço mal formado."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:316
+#: LYMessages.c:314
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "Mensagens do histórico de tratamento estão ligadas (Ignorando mínimas)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:318
+#: LYMessages.c:316
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "Mensagens do histórico de tratamento estão desligadas (Não ignorando nenhuma)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:320
+#: LYMessages.c:318
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "Mensagens do histórico de tratamento estão ligadas (Ignorando as válidas)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:322
+#: LYMessages.c:320
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "Mensagens do histórico de tratamento estão desligadas (Incluindo as válidas)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:324
+#: LYMessages.c:322
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "Comentários mínimos de tratamento estão ativos e ligados!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:324
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "Comentários mínimos de tratamento desligados. (Estão em efeitos os válidos)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:328
+#: LYMessages.c:326
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "Comentários mínimos de tratamento ativos. (mas histórico está ativado)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:330
+#: LYMessages.c:328
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "Comentários mínimos de tratamento desativados. (Histórico está ativado)!"
 
-#: LYMessages.c:331
+#: LYMessages.c:329
 msgid "Soft double-quote parsing ON!"
 msgstr "Interpretação de aspas duplas ativada!"
 
-#: LYMessages.c:332
+#: LYMessages.c:330
 msgid "Soft double-quote parsing OFF!"
 msgstr "Interpretação de aspas duplas desativada!"
 
-#: LYMessages.c:333
+#: LYMessages.c:331
 msgid "Now using TagSoup parsing of HTML."
 msgstr "Agora usando formato TagSoup de tratamento de HTML. "
 
-#: LYMessages.c:334
+#: LYMessages.c:332
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "Agora usando formato SortaSGML de tratamento de HTML!"
 
-#: LYMessages.c:335
+#: LYMessages.c:333
 msgid "You are already at the end of this document."
 msgstr "Você ja está no fim do documento."
 
-#: LYMessages.c:336
+#: LYMessages.c:334
 msgid "You are already at the beginning of this document."
 msgstr "Você ja está no início do documento."
 
-#: LYMessages.c:337
+#: LYMessages.c:335
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "Você está na página %d deste documento."
 
-#: LYMessages.c:338
+#: LYMessages.c:336
 #, c-format
 msgid "Link number %d already is current."
 msgstr "Ligação número %d já esta ativada."
 
-#: LYMessages.c:339
+#: LYMessages.c:337
 msgid "You are already at the first document"
 msgstr "Você está no primeiro documento."
 
-#: LYMessages.c:340
+#: LYMessages.c:338
 msgid "There are no links above this line of the document."
 msgstr "Não existem ligações acima desta linha do documento."
 
-#: LYMessages.c:341
+#: LYMessages.c:339
 msgid "There are no links below this line of the document."
 msgstr "Não existem ligações abaixo desta linha do documento."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:343
+#: LYMessages.c:341
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "Tamanho máximo atingido! Apague uma parte do texto ou saia do campo."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:345
+#: LYMessages.c:343
 msgid "You are not on a form submission button or normal link."
 msgstr "Você não está num botão de envio de formulário ou ligação normal."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:347
+#: LYMessages.c:345
 msgid "One radio button must be checked at all times!"
 msgstr "Pelo menos um botão de rádio deve estar marcado sempre!"
 
-#: LYMessages.c:348
+#: LYMessages.c:346
 msgid "No submit button for this form, submit single text field?"
 msgstr ""
 
-#: LYMessages.c:349
+#: LYMessages.c:347
 msgid "Do you want to go back to the previous document?"
 msgstr "Você quer voltar ao documento inicial?"
 
-#: LYMessages.c:350
+#: LYMessages.c:348
 msgid "Use arrows or tab to move off of field."
 msgstr "Use setas ou TAB para sair do campo."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:352
+#: LYMessages.c:350
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "Digite o texto. Use setas ou TAB para sair do campo."
 
-#: LYMessages.c:353
+#: LYMessages.c:351
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** Tag HTML desconhecida!! Sem ação de formulário definida. **"
 
-#: LYMessages.c:354
+#: LYMessages.c:352
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "** Tag HTML desconhecida ** Impossível criar janela de pop-up!"
 
-#: LYMessages.c:355
+#: LYMessages.c:353
 msgid "Unable to create popup window!"
 msgstr "Impossível criar janela pop-up!"
 
-#: LYMessages.c:356
+#: LYMessages.c:354
 msgid "Goto a random URL is disallowed!"
 msgstr "Ir para URL randômica está desabilitado!"
 
-#: LYMessages.c:357
+#: LYMessages.c:355
 msgid "Goto a non-http URL is disallowed!"
 msgstr "Ir para não-http URL está desabilitado!"
 
-#: LYMessages.c:358
+#: LYMessages.c:356
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "Você não pode ir para \"%s\" URLs"
 
-#: LYMessages.c:359
+#: LYMessages.c:357
 msgid "URL to open: "
 msgstr "URL para ir:"
 
-#: LYMessages.c:360
+#: LYMessages.c:358
 msgid "Edit the current Goto URL: "
 msgstr "Edite a URL que será apresentada:"
 
-#: LYMessages.c:361
+#: LYMessages.c:359
 msgid "Edit the previous Goto URL: "
 msgstr "Edite a URL que foi escolhida anteriormente:"
 
-#: LYMessages.c:362
+#: LYMessages.c:360
 msgid "Edit a previous Goto URL: "
 msgstr "Edite a URL que foi apresentada anteriormente:"
 
-#: LYMessages.c:363
+#: LYMessages.c:361
 msgid "Current document has POST data."
 msgstr "O documento corrente tem uma ação de postagem"
 
-#: LYMessages.c:364
+#: LYMessages.c:362
 msgid "Edit this document's URL: "
 msgstr "Edite este documento de URL:"
 
-#: LYMessages.c:365
+#: LYMessages.c:363
 msgid "Edit the current link's URL: "
 msgstr "Edite o link corrente:"
 
-#: LYMessages.c:366
+#: LYMessages.c:364
 msgid "You cannot edit File Management URLs"
 msgstr "Você não pode editar Gerenciadores de arquivos de URLs"
 
-#: LYMessages.c:367
+#: LYMessages.c:365
 msgid "Enter a database query: "
 msgstr "Digite uma pesquisa de banco de dados:"
 
-#: LYMessages.c:368
+#: LYMessages.c:366
 msgid "Enter a whereis query: "
 msgstr "Digite uma pesquisa de 'onde está':"
 
-#: LYMessages.c:369
+#: LYMessages.c:367
 msgid "Edit the current query: "
 msgstr "Edite a pesquisa atual:"
 
-#: LYMessages.c:370
+#: LYMessages.c:368
 msgid "Edit the previous query: "
 msgstr "Edite a pesquisa anterior:"
 
-#: LYMessages.c:371
+#: LYMessages.c:369
 msgid "Edit a previous query: "
 msgstr "Edite uma pesquisa anterior:"
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:373
+#: LYMessages.c:371
 msgid "Use Control-R to resubmit the current query."
 msgstr "Use Control-R para reenviar a pesquisa atual."
 
-#: LYMessages.c:374
+#: LYMessages.c:372
 msgid "Edit the current shortcut: "
 msgstr "Edite o atalho atual:"
 
-#: LYMessages.c:375
+#: LYMessages.c:373
 msgid "Edit the previous shortcut: "
 msgstr "Edite o atalho anterior:"
 
-#: LYMessages.c:376
+#: LYMessages.c:374
 msgid "Edit a previous shortcut: "
 msgstr "Edite um atalho anterior:"
 
-#: LYMessages.c:377
+#: LYMessages.c:375
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "Tecla '%c' não está mapeada para abrir um arquivo!"
 
-#: LYMessages.c:378
+#: LYMessages.c:376
 msgid "Cannot locate jump file!"
 msgstr "Não foi possível localizar um arquivo de salto!"
 
-#: LYMessages.c:379
+#: LYMessages.c:377
 msgid "Cannot open jump file!"
 msgstr "Não foi possivel abrir um arquivo de salto!"
 
-#: LYMessages.c:380
+#: LYMessages.c:378
 msgid "Error reading jump file!"
 msgstr "Erro lendo arquivo de salto!"
 
-#: LYMessages.c:381
+#: LYMessages.c:379
 msgid "Out of memory reading jump file!"
 msgstr "Estouro de memória, lendo arquivo de salto!"
 
-#: LYMessages.c:382
+#: LYMessages.c:380
 msgid "Out of memory reading jump table!"
 msgstr "Estouro de memória, lento tabela de atalhos!"
 
-#: LYMessages.c:383
+#: LYMessages.c:381
 msgid "No index is currently available."
 msgstr "Sem arquivo indexador disponível."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:385
+#: LYMessages.c:383
 msgid "Do you really want to go to the Main screen?"
 msgstr "Você quer realmente ir para o menu principal?"
 
-#: LYMessages.c:386
+#: LYMessages.c:384
 msgid "You are already at main screen!"
 msgstr "Você ja esta na tela inicial!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:388
+#: LYMessages.c:386
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "Área não passivel de busca - pressione '/' para procurar no documento."
 
 #. #define NO_OWNER
-#: LYMessages.c:390
+#: LYMessages.c:388
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "Nenhum dono definido para este arquivo, você não pode enviar um comentário"
 
-#: LYMessages.c:391
+#: LYMessages.c:389
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Nehum dono está definido. Uso %s?"
 
-#: LYMessages.c:392
+#: LYMessages.c:390
 msgid "Do you wish to send a comment?"
 msgstr "Você quer que envio um comentário?"
 
-#: LYMessages.c:393
+#: LYMessages.c:391
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "Email está desabilitado, portanto você não pode enviar um comentário"
 
-#: LYMessages.c:394
+#: LYMessages.c:392
 msgid "The 'e'dit command is currently disabled."
 msgstr "Comando 'e' Edite está atualmente desabilitado."
 
-#: LYMessages.c:395
+#: LYMessages.c:393
 msgid "External editing is currently disabled."
 msgstr "Suporte externo está desabilitado."
 
-#: LYMessages.c:396
+#: LYMessages.c:394
 msgid "System error - failure to get status."
 msgstr "Erro de sistema - Falha ao receber estado."
 
-#: LYMessages.c:397
+#: LYMessages.c:395
 msgid "No editor is defined!"
 msgstr "Nenhum editor foi definido"
 
-#: LYMessages.c:398
+#: LYMessages.c:396
 msgid "The 'p'rint command is currently disabled."
 msgstr "Comando 'p' Imprimir está atualmente desabilitado."
 
-#: LYMessages.c:399
+#: LYMessages.c:397
 msgid "Document has no Toolbar links or Banner."
 msgstr "O documento não tem uma barra de links ou Faixa."
 
-#: LYMessages.c:400
+#: LYMessages.c:398
 msgid "Unable to open traversal file."
 msgstr "Impossível abrir um arquivo transversal."
 
-#: LYMessages.c:401
+#: LYMessages.c:399
 msgid "Unable to open traversal found file."
 msgstr "Impossível abrir o arquivo transversal encontrado."
 
-#: LYMessages.c:402
+#: LYMessages.c:400
 msgid "Unable to open reject file."
 msgstr "Impossível de abrir um arquivo rejeitado."
 
-#: LYMessages.c:403
+#: LYMessages.c:401
 msgid "Unable to open traversal errors output file"
 msgstr "Impossível de abrir o log de erros transversal"
 
-#: LYMessages.c:404
+#: LYMessages.c:402
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "TRANSMISSÃO TRANSVERSAL FOI INTERROMPIDA."
 
-#: LYMessages.c:405
+#: LYMessages.c:403
 msgid "Follow link (or goto link or page) number: "
 msgstr "Segue ligação (ou vai para a pagina de ligações) número:"
 
-#: LYMessages.c:406
+#: LYMessages.c:404
 msgid "Select option (or page) number: "
 msgstr "Seleciona a opção (ou página) número:"
 
-#: LYMessages.c:407
+#: LYMessages.c:405
 #, c-format
 msgid "Option number %d already is current."
 msgstr "Opção número %d ja está ativa."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:409
+#: LYMessages.c:407
 msgid "You are already at the end of this option list."
 msgstr "Você ja está no fim desta opçao."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:411
+#: LYMessages.c:409
 msgid "You are already at the beginning of this option list."
 msgstr "Você ja esta no começo desta lista de opções."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:413
+#: LYMessages.c:411
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "Você ja está na página %d desta lista de opções."
 
-#: LYMessages.c:414
+#: LYMessages.c:412
 msgid "You have entered an invalid option number."
 msgstr "Você entrou com um número inválido de opção."
 
-#: LYMessages.c:415
+#: LYMessages.c:413
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** Tag errada no HTML!! Use -trace para diagnosticar. **"
 
-#: LYMessages.c:416
+#: LYMessages.c:414
 msgid "Give name of file to save in"
 msgstr "Informe o nome do arquivo a salvar"
 
-#: LYMessages.c:417
+#: LYMessages.c:415
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "Impossível salvar dados no arquivo -- por favor, rode WWW localmente. "
 
-#: LYMessages.c:418
+#: LYMessages.c:416
 msgid "Can't open temporary file!"
 msgstr "Impossível abrir arquivo temporário!"
 
-#: LYMessages.c:419
+#: LYMessages.c:417
 msgid "Can't open output file!  Cancelling!"
 msgstr "Impossível abrir arquivo de saída! Cancelando!"
 
-#: LYMessages.c:420
+#: LYMessages.c:418
 msgid "Execution is disabled."
 msgstr "Executar está desabilitado!"
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:422
+#: LYMessages.c:420
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "Executar não disponível para este arquivo.Veja o menu de Optins (use %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:424
+#: LYMessages.c:422
 msgid "Execution capabilities are not compiled into this version."
 msgstr "Capacidade de execução não está compilada nesta versão."
 
-#: LYMessages.c:425
+#: LYMessages.c:423
 msgid "This file cannot be displayed on this terminal."
 msgstr "Este arquivo não pode ser mostrado neste terminal."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:427
+#: LYMessages.c:425
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "Este arquivo não pode ser mostrado neste terminal: D) Copia ou C) Cancela"
 
-#: LYMessages.c:428
+#: LYMessages.c:426
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D) Copia ou C) Cancela"
 
-#: LYMessages.c:429
+#: LYMessages.c:427
 msgid "Cancelling file."
 msgstr "Cancelando arquivo."
 
-#: LYMessages.c:430
+#: LYMessages.c:428
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "Recebendo arquivo, AGUARDE!"
 
-#: LYMessages.c:431
+#: LYMessages.c:429
 msgid "Enter a filename: "
 msgstr "Entre com um nome para o arquivo:"
 
-#: LYMessages.c:432
+#: LYMessages.c:430
 msgid "Edit the previous filename: "
 msgstr "Edite o nome anterior:"
 
-#: LYMessages.c:433
+#: LYMessages.c:431
 msgid "Edit a previous filename: "
 msgstr "Edite um arquivo anterior:"
 
-#: LYMessages.c:434
+#: LYMessages.c:432
 msgid "Enter a new filename: "
 msgstr "Entre com um novo nome:"
 
-#: LYMessages.c:435
+#: LYMessages.c:433
 msgid "File name may not begin with a dot."
 msgstr "Nome do arquivo não pode começar com um ponto."
 
-#: LYMessages.c:437
+#: LYMessages.c:435
 msgid "File exists.  Create higher version?"
 msgstr "Arquivo existente. Criar nova versão?"
 
-#: LYMessages.c:439
+#: LYMessages.c:437
 msgid "File exists.  Overwrite?"
 msgstr "Arquivo existente. Sobreescrever?"
 
-#: LYMessages.c:441
+#: LYMessages.c:439
 msgid "Cannot write to file."
 msgstr "Impossível gravar no arquivo"
 
-#: LYMessages.c:442
+#: LYMessages.c:440
 msgid "ERROR! - download command is misconfigured."
 msgstr "ERRO! - comando de cópia está mal configurado."
 
-#: LYMessages.c:443
+#: LYMessages.c:441
 msgid "Unable to download file."
 msgstr "Impossível copiar arquivo."
 
-#: LYMessages.c:444
+#: LYMessages.c:442
 msgid "Reading directory..."
 msgstr "Lendo diretório..."
 
-#: LYMessages.c:445
+#: LYMessages.c:443
 msgid "Building directory listing..."
 msgstr "Criando lista de diretórios..."
 
-#: LYMessages.c:446
+#: LYMessages.c:444
 msgid "Saving..."
 msgstr "Salvando..."
 
-#: LYMessages.c:447
+#: LYMessages.c:445
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Impossível editar o arquivo '%s'."
 
-#: LYMessages.c:448
+#: LYMessages.c:446
 msgid "Unable to access document!"
 msgstr "Não foi possível acessar o documento!"
 
-#: LYMessages.c:449
+#: LYMessages.c:447
 msgid "Could not access file."
 msgstr "Impossível acessar o arquivo."
 
-#: LYMessages.c:450
+#: LYMessages.c:448
 msgid "Could not access directory."
 msgstr "Impossível acessar diretório."
 
-#: LYMessages.c:451
+#: LYMessages.c:449
 msgid "Could not load data."
 msgstr "Impossível ler dados."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:453
+#: LYMessages.c:451
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "Lynx não pode atualmente editar um arquivo WWW remoto."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:455
+#: LYMessages.c:453
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "Este campo não pode ser editado por um editor externo."
 
-#: LYMessages.c:456
+#: LYMessages.c:454
 msgid "Bad rule"
 msgstr "Domínio inválido"
 
-#: LYMessages.c:457
+#: LYMessages.c:455
 msgid "Insufficient operands:"
 msgstr "Operadores insuficientes:"
 
-#: LYMessages.c:458
+#: LYMessages.c:456
 msgid "You are not authorized to edit this file."
 msgstr "Você não está autorizado a editar este arquivo."
 
-#: LYMessages.c:459
+#: LYMessages.c:457
 msgid "Title: "
 msgstr "Título: "
 
-#: LYMessages.c:460
+#: LYMessages.c:458
 msgid "Subject: "
 msgstr "Assunto: "
 
-#: LYMessages.c:461
+#: LYMessages.c:459
 msgid "Username: "
 msgstr "Nome do Usuário: "
 
-#: LYMessages.c:462
+#: LYMessages.c:460
 msgid "Password: "
 msgstr "Senha: "
 
-#: LYMessages.c:463
+#: LYMessages.c:461
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: Nome do usuário e senha são requeridos!!!"
 
-#: LYMessages.c:464
+#: LYMessages.c:462
 msgid "lynx: Password required!!!"
 msgstr "lynx: Senha requerida!!!"
 
-#: LYMessages.c:465
+#: LYMessages.c:463
 msgid "Clear all authorization info for this session?"
 msgstr "Limpar todas as informações de autorização desta seção?"
 
-#: LYMessages.c:466
+#: LYMessages.c:464
 msgid "Authorization info cleared."
 msgstr "Informações de autorização foram apagadas."
 
-#: LYMessages.c:467
+#: LYMessages.c:465
 msgid "Authorization failed.  Retry?"
 msgstr "Falha na autorização. Repetir?"
 
-#: LYMessages.c:468
+#: LYMessages.c:466
 msgid "cgi support has been disabled."
 msgstr "Suporte a CGI foi desabilitado pelo administrador."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:470
+#: LYMessages.c:468
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "Capacidades do LynxCGI não foram compiladas com esta versão."
 
-#: LYMessages.c:471
+#: LYMessages.c:469
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Desculpe, não há protocolos disponíveis para converter %s em %s."
 
-#: LYMessages.c:472
+#: LYMessages.c:470
 msgid "Unable to set up connection."
 msgstr "Imposível preparar conecção."
 
-#: LYMessages.c:473
+#: LYMessages.c:471
 msgid "Unable to make connection"
 msgstr "Impossível criar conecção"
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:475
+#: LYMessages.c:473
 msgid "Executable link rejected due to malformed request."
 msgstr "Ligação rejeitada por má formação da requisição."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:477
+#: LYMessages.c:475
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "Ligação rejeitada devido ao caracter '%c'."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:477
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "Ligação rejeitada devido ao caminho relativo errado ('../')."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:479
 msgid "Executable link rejected due to location or path."
 msgstr "Ligação rejeitada devido a localização ou caminho."
 
-#: LYMessages.c:482
+#: LYMessages.c:480
 msgid "Mail access is disabled!"
 msgstr "Acesso ao Mail está desabilitado!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:484
+#: LYMessages.c:482
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Somente arquivos e servidores no host local podem ser acessados."
 
-#: LYMessages.c:485
+#: LYMessages.c:483
 msgid "Telnet access is disabled!"
 msgstr "Acesso telnet está desabilitado!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:487
+#: LYMessages.c:485
 msgid "Telnet port specifications are disabled."
 msgstr "Especificações de porta telnet estão desabilitadas."
 
-#: LYMessages.c:488
+#: LYMessages.c:486
 msgid "USENET news access is disabled!"
 msgstr "Acesso aos NEWS USENET está desabilitado!"
 
-#: LYMessages.c:489
+#: LYMessages.c:487
 msgid "Rlogin access is disabled!"
 msgstr "Acesso Rlogin está desabilitado!"
 
-#: LYMessages.c:490
+#: LYMessages.c:488
 msgid "Ftp access is disabled!"
 msgstr "Acesso FTP está desabilitado!"
 
-#: LYMessages.c:491
+#: LYMessages.c:489
 msgid "There are no references from this document."
 msgstr "Não existem referências a partir documento."
 
-#: LYMessages.c:492
+#: LYMessages.c:490
 msgid "There are only hidden links from this document."
 msgstr "Existem somente ligações ocultas a partir deste documento."
 
-#: LYMessages.c:494
+#: LYMessages.c:492
 msgid "Unable to open command file."
 msgstr "Impossível abrir linha de comando."
 
-#: LYMessages.c:496
+#: LYMessages.c:494
 msgid "News Post Cancelled!!!"
 msgstr "Postagem de NEWS cancelada!!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:498
+#: LYMessages.c:496
 msgid "Spawning your selected editor to edit news message"
 msgstr "Chamando seu editor preferido para editar mensagens de NEWS."
 
-#: LYMessages.c:499
+#: LYMessages.c:497
 msgid "Post this message?"
 msgstr "Postar esta mensagem?"
 
-#: LYMessages.c:500
+#: LYMessages.c:498
 #, c-format
 msgid "Append '%s'?"
 msgstr "Acrescentar '%s'?"
 
-#: LYMessages.c:501
+#: LYMessages.c:499
 msgid "Posting to newsgroup(s)..."
 msgstr "Postando aos newsgroup(s)..."
 
-#: LYMessages.c:503
+#: LYMessages.c:501
 msgid "*** You have unread mail. ***"
 msgstr "*** Você tem emails não lidos ainda. ***"
 
-#: LYMessages.c:505
+#: LYMessages.c:503
 msgid "*** You have mail. ***"
 msgstr "*** Você recebeu emails. ***"
 
-#: LYMessages.c:507
+#: LYMessages.c:505
 msgid "*** You have new mail. ***"
 msgstr "*** Você recebeu novos emails. ***"
 
-#: LYMessages.c:508
+#: LYMessages.c:506
 msgid "File insert cancelled!!!"
 msgstr "Inserção de arquivo cancelada!!!"
 
-#: LYMessages.c:509
+#: LYMessages.c:507
 msgid "Not enough memory for file!"
 msgstr "Estouro de memória, lendo arquivo de salto!"
 
-#: LYMessages.c:510
+#: LYMessages.c:508
 msgid "Can't open file for reading."
 msgstr "Impossóvel abrir arquivo para descompressão!"
 
-#: LYMessages.c:511
+#: LYMessages.c:509
 msgid "File does not exist."
 msgstr "Arquivo inexistente."
 
-#: LYMessages.c:512
+#: LYMessages.c:510
 msgid "File does not exist - reenter or cancel:"
 msgstr "Arquivo não existe - Repita ou cancele:"
 
-#: LYMessages.c:513
+#: LYMessages.c:511
 msgid "File is not readable."
 msgstr "Arquivo não pode ser lido."
 
-#: LYMessages.c:514
+#: LYMessages.c:512
 msgid "File is not readable - reenter or cancel:"
 msgstr "Arquivo não pode ser lido. Repita ou cancele:"
 
-#: LYMessages.c:515
+#: LYMessages.c:513
 msgid "Nothing to insert - file is 0-length."
 msgstr "Nada a acrescentar - arquivo tem tamanho 0"
 
-#: LYMessages.c:516
+#: LYMessages.c:514
 msgid "Save request cancelled!!!"
 msgstr "Salvamento de requisição cancelado!!!"
 
-#: LYMessages.c:517
+#: LYMessages.c:515
 msgid "Mail request cancelled!!!"
 msgstr "Requisição de e-mail cancelada!!!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:519
+#: LYMessages.c:517
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "Visualizando aquivo quebrado. Você tem certeza de que quer enviar este email?"
 
-#: LYMessages.c:520
+#: LYMessages.c:518
 msgid "Please wait..."
 msgstr "Por favor aguarde...."
 
-#: LYMessages.c:521
+#: LYMessages.c:519
 msgid "Mailing file.  Please wait..."
 msgstr "Enviando email. Por favor aguarde..."
 
-#: LYMessages.c:522
+#: LYMessages.c:520
 msgid "ERROR - Unable to mail file"
 msgstr "ERRO - Impossível enviar arquivo..."
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:524
+#: LYMessages.c:522
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "Arquivo contém %d páginas. Você quer mesmo imprimir?"
 
-#: LYMessages.c:525
+#: LYMessages.c:523
 msgid "Print request cancelled!!!"
 msgstr "Impressão da requisição foi cancelada!!!"
 
-#: LYMessages.c:526
+#: LYMessages.c:524
 msgid "Press <return> to begin: "
 msgstr "Pressione <enter> para continuar:"
 
-#: LYMessages.c:527
+#: LYMessages.c:525
 msgid "Press <return> to finish: "
 msgstr "Pressione <enter> para terminar:"
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:527
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "O arquivo tem %d páginas. Tem certeza de que quer imprimir?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:531
+#: LYMessages.c:529
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "Confira se sua impressora está on-line. Pressione <enter> para iniciar:"
 
-#: LYMessages.c:532
+#: LYMessages.c:530
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "ERRO - Impossível alocar espaço para o arquivo!!!"
 
-#: LYMessages.c:533
+#: LYMessages.c:531
 msgid "Unable to open tempfile"
 msgstr "Impossível criar arquivo temporário."
 
-#: LYMessages.c:534
+#: LYMessages.c:532
 msgid "Unable to open print options file"
 msgstr "Impossível abrir arquivo de opções da inpressora."
 
-#: LYMessages.c:535
+#: LYMessages.c:533
 msgid "Printing file.  Please wait..."
 msgstr "Imprimindo. Por favor aguarde..."
 
-#: LYMessages.c:536
+#: LYMessages.c:534
 msgid "Please enter a valid internet mail address: "
 msgstr "Por favor, entre com um endereço válido de email:"
 
-#: LYMessages.c:537
+#: LYMessages.c:535
 msgid "ERROR! - printer is misconfigured!"
 msgstr "ERRO! - A impressora está mal configurada!!"
 
-#: LYMessages.c:538
+#: LYMessages.c:536
 msgid "Image map from POST response not available!"
 msgstr "Imagem mapeada através da esposta do comando POST não está disponível!"
 
-#: LYMessages.c:539
+#: LYMessages.c:537
 msgid "Misdirected client-side image MAP request!"
 msgstr "Requisição da imagem mapeada foi perdida!"
 
-#: LYMessages.c:540
+#: LYMessages.c:538
 msgid "Client-side image MAP is not accessible!"
 msgstr "O mapeador de imagens não pôde ser acessado!!"
 
-#: LYMessages.c:541
+#: LYMessages.c:539
 msgid "No client-side image MAPs are available!"
 msgstr "Não há programa mapeador de imagem disponível!"
 
-#: LYMessages.c:542
+#: LYMessages.c:540
 msgid "Client-side image MAP is not available!"
 msgstr "O mapeador de imagens não está disponível!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:545
+#: LYMessages.c:543
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "O comprimento da tela deve ter pelo menos 24 linhas para o menu de opções."
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:547
+#: LYMessages.c:545
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "O comprimento da tela deve ter pelo menos 23 linhas para o menu de opções."
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:549
+#: LYMessages.c:547
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "O comprimento da tela deve ter pelo menos 22 linhas para o menu de opçoes."
 
-#: LYMessages.c:551
+#: LYMessages.c:549
 msgid "That key requires Advanced User mode."
 msgstr "Esta opção requere o modo de usuário avançado."
 
-#: LYMessages.c:552
+#: LYMessages.c:550
 #, c-format
 msgid "Content-type: %s"
 msgstr "Content-type: %s"
 
-#: LYMessages.c:553
+#: LYMessages.c:551
 msgid "Command: "
 msgstr "Comando:"
 
-#: LYMessages.c:554
+#: LYMessages.c:552
 msgid "Unknown or ambiguous command"
 msgstr ""
 
-#: LYMessages.c:555
+#: LYMessages.c:553
 msgid " Version "
 msgstr " Versão "
 
-#: LYMessages.c:556
+#: LYMessages.c:554
 msgid " first"
 msgstr " primeiro."
 
-#: LYMessages.c:557
+#: LYMessages.c:555
 msgid ", guessing..."
 msgstr ", solicitando..."
 
-#: LYMessages.c:558
+#: LYMessages.c:556
 msgid "Permissions for "
 msgstr "Permissão para "
 
-#: LYMessages.c:559
+#: LYMessages.c:557
 msgid "Select "
 msgstr "Selecione "
 
-#: LYMessages.c:560
+#: LYMessages.c:558
 msgid "capital letter"
 msgstr "maiuscula"
 
-#: LYMessages.c:561
+#: LYMessages.c:559
 msgid " of option line,"
 msgstr "da linha de opção."
 
-#: LYMessages.c:562
+#: LYMessages.c:560
 msgid " to save,"
 msgstr " para salvar,"
 
-#: LYMessages.c:563
+#: LYMessages.c:561
 msgid " to "
 msgstr " para "
 
-#: LYMessages.c:564
+#: LYMessages.c:562
 msgid " or "
 msgstr " ou "
 
-#: LYMessages.c:565
+#: LYMessages.c:563
 msgid " index"
 msgstr " index"
 
-#: LYMessages.c:566
+#: LYMessages.c:564
 msgid " to return to Lynx."
 msgstr " para voltar ao Lynx"
 
-#: LYMessages.c:567
+#: LYMessages.c:565
 msgid "Accept Changes"
 msgstr "Aceitar mudanças"
 
-#: LYMessages.c:568
+#: LYMessages.c:566
 msgid "Reset Changes"
 msgstr "Limpar alterações"
 
-#: LYMessages.c:569
+#: LYMessages.c:567
 msgid "Left Arrow cancels changes"
 msgstr "Setas a esquerda cancelam as mudanças"
 
-#: LYMessages.c:570
+#: LYMessages.c:568
 msgid "Save options to disk"
 msgstr "Grava as opções no disco"
 
-#: LYMessages.c:571
+#: LYMessages.c:569
 msgid "Hit RETURN to accept entered data."
 msgstr "Tecle ENTER para aceitar os dados fornecidos"
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:573
+#: LYMessages.c:571
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr "Tecle ENTER para aceitar os dados.Delete para chamar os valores padrão."
 
-#: LYMessages.c:574
+#: LYMessages.c:572
 msgid "Value accepted!"
 msgstr "Valor aceito!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:576
+#: LYMessages.c:574
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Valor aceito! - Atenção: O Lynx está configurado para XWINDOWS!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:578
+#: LYMessages.c:576
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Valor aceito! - Atenção: O Lynx não está configurado para XWINDOWS!"
 
-#: LYMessages.c:579
+#: LYMessages.c:577
 msgid "You are not allowed to change which editor to use!"
 msgstr "Você não tem permissão para alterar o editor a ser usado!"
 
-#: LYMessages.c:580
+#: LYMessages.c:578
 msgid "Failed to set DISPLAY variable!"
 msgstr "Falha ao setar a variável DISPLAY!"
 
-#: LYMessages.c:581
+#: LYMessages.c:579
 msgid "Failed to clear DISPLAY variable!"
 msgstr "Falha ao apagar a variável DISPLAY"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:583
+#: LYMessages.c:581
 msgid "You are not allowed to change the bookmark file!"
 msgstr "Você não tem permissão para alterar o Livro de Marcações!"
 
-#: LYMessages.c:584
+#: LYMessages.c:582
 msgid "Terminal does not support color"
 msgstr "O terminal não suporta cores."
 
-#: LYMessages.c:585
+#: LYMessages.c:583
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "Seu terminal '%s' não suporta cores."
 
-#: LYMessages.c:586
+#: LYMessages.c:584
 msgid "Access to dot files is disabled!"
 msgstr "Acesso aos arquivos ocultos está desabilitado!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:588
+#: LYMessages.c:586
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr ""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:590
+#: LYMessages.c:588
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr ""
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:592
+#: LYMessages.c:590
 msgid "Changing of the User-Agent string is disabled!"
 msgstr ""
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:594
+#: LYMessages.c:592
 msgid "You are not allowed to change this setting."
 msgstr "Você não tem permissão para alterar esta configuração."
 
-#: LYMessages.c:595
+#: LYMessages.c:593
 msgid "Saving Options..."
 msgstr "Salvando opções..."
 
-#: LYMessages.c:596
+#: LYMessages.c:594
 msgid "Options saved!"
 msgstr "Opções salvas."
 
-#: LYMessages.c:597
+#: LYMessages.c:595
 msgid "Unable to save Options!"
 msgstr "Impossível salvar opções!"
 
-#: LYMessages.c:598
+#: LYMessages.c:596
 msgid " 'r' to return to Lynx "
 msgstr " 'r' para voltar ao Lynx "
 
-#: LYMessages.c:599
+#: LYMessages.c:597
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr " '>' para salvar, ou 'r' para voltar ao Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:601
+#: LYMessages.c:599
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "Qualquer tecla para alterar, ENTER para submeter."
 
-#: LYMessages.c:602
+#: LYMessages.c:600
 msgid "Error uncompressing temporary file!"
 msgstr "Erro descomprimindo arquivo temporário!"
 
-#: LYMessages.c:603
+#: LYMessages.c:601
 msgid "Unsupported URL scheme!"
 msgstr "Esquema de URL não suportado!"
 
-#: LYMessages.c:604
+#: LYMessages.c:602
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "Dados não suportados. Use SHOWINFO por agora."
 
-#: LYMessages.c:605
+#: LYMessages.c:603
 msgid "Redirection limit of 10 URL's reached."
 msgstr "Limite de 10 redirecionamentos atingido."
 
-#: LYMessages.c:606
+#: LYMessages.c:604
 msgid "Illegal redirection URL received from server!"
 msgstr "Recebido um redirecionamento ilegal do servidor."
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:608
+#: LYMessages.c:606
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "O servidor perguntou sobre redirecionar o formulário postado de %d para"
 
-#: LYMessages.c:611
+#: LYMessages.c:609
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P) Procede, G) Copia, ou C) Cancela"
 
-#: LYMessages.c:612
+#: LYMessages.c:610
 msgid "P)roceed, or C)ancel "
 msgstr "P) Procede, C) Cancela"
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:614
+#: LYMessages.c:612
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr "Redirecionamento de Postagem. P)Procede, U)Ver a URL, G)Copia ou C)Cancela"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:614
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "Redirecinamento de comando de Postagem. P) Procede, U) Ver URL ou C) Cancela"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:618
+#: LYMessages.c:616
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "Documento com formulário de postagem. Reenviar?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:620
+#: LYMessages.c:618
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Reenviar formulário postado para %s ?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:622
+#: LYMessages.c:620
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "Documento com lista de dados para postagem. Re-ler %s ? "
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:624
+#: LYMessages.c:622
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "Documento de uma ação de postagem. Cabeçalho não compreendido. Continua?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:624
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "Ação de postagem de formulário. Cabeçalho não compreendido. Continua?"
 
-#: LYMessages.c:627
+#: LYMessages.c:625
 msgid "Proceed without a username and password?"
 msgstr "Continua sem um usuário e senha?"
 
-#: LYMessages.c:628
+#: LYMessages.c:626
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Proseguir (%s)?"
 
-#: LYMessages.c:629
+#: LYMessages.c:627
 msgid "Cannot POST to this host."
 msgstr "Impossível postar neste servidor."
 
-#: LYMessages.c:630
+#: LYMessages.c:628
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "Comando de postagem não suportado por esta URL - ignorando dados de postagem!"
 
-#: LYMessages.c:631
+#: LYMessages.c:629
 msgid "Discarding POST data..."
 msgstr "Apagando dados de postagem..."
 
-#: LYMessages.c:632
+#: LYMessages.c:630
 msgid "Document will not be reloaded!"
 msgstr "Documento não será atualizado!"
 
-#: LYMessages.c:633
+#: LYMessages.c:631
 msgid "Location: "
 msgstr "Localização:"
 
-#: LYMessages.c:634
+#: LYMessages.c:632
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' não encontrado!"
 
-#: LYMessages.c:635
+#: LYMessages.c:633
 msgid "Default Bookmark File"
 msgstr "Arquivo padrão do Livro de Marcações"
 
-#: LYMessages.c:636
+#: LYMessages.c:634
 msgid "Screen too small! (8x35 min)"
 msgstr "Tela muito pequena, (8x35 mínimo)"
 
-#: LYMessages.c:637
+#: LYMessages.c:635
 msgid "Select destination or ^G to Cancel: "
 msgstr "Selecione destino ou ^G para cancelar:"
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:639
+#: LYMessages.c:637
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "Selecione submarca, '=' para menu, ou ^G para cancelar:"
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:641
+#: LYMessages.c:639
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "L) Reproduzir ligação nesta marcação ou C) Cancela? (l,c):"
 
-#: LYMessages.c:642
+#: LYMessages.c:640
 msgid "Multiple bookmark support is not available."
 msgstr "Suporte a multiplos livros de marcação não está disponível."
 
-#: LYMessages.c:643
+#: LYMessages.c:641
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr "Selecione Livro de Marcação (seleção %d de %d)"
 
-#: LYMessages.c:644
+#: LYMessages.c:642
 msgid "       Select Bookmark"
 msgstr "       Selecione Livro de Marcação"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:646
+#: LYMessages.c:644
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "Editando Descrição e Localização do Livro de Marcações (%d de 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:648
+#: LYMessages.c:646
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "         Editando Descrição e Localização"
 
-#: LYMessages.c:649
+#: LYMessages.c:647
 msgid "Letter: "
 msgstr "Letra: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:652
+#: LYMessages.c:650
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Use o diretório de seu login na sintaxe do interpretador de comando."
 
-#: LYMessages.c:654
+#: LYMessages.c:652
 msgid "Use a filepath off your home directory!"
 msgstr "Use o caminho de seu diretório padrão!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:657
+#: LYMessages.c:655
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Limite de ligações atingido! Use uma página menor ou rolagem de tela dupla."
 
 #. #define MAXHIST_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:657
 msgid "History List maximum reached!  Document not pushed."
 msgstr "Máximo do histórico atingido. O documento não foi acrescentado."
 
-#: LYMessages.c:660
+#: LYMessages.c:658
 msgid "No previously visited links available!"
 msgstr "Não há ligações visitadas antes desta disponíveis!"
 
-#: LYMessages.c:661
+#: LYMessages.c:659
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Memória no limite. Programa abortado!"
 
-#: LYMessages.c:662
+#: LYMessages.c:660
 msgid "Memory exhausted!  Aborting..."
 msgstr "Memória no limite. Abortando..."
 
-#: LYMessages.c:663
+#: LYMessages.c:661
 msgid "Not enough memory!"
 msgstr ""
 
-#: LYMessages.c:664
+#: LYMessages.c:662
 msgid "Directory/File Manager not available"
 msgstr "Gerenciador de Diretórios/Arquivos não disponível"
 
-#: LYMessages.c:665
+#: LYMessages.c:663
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "HREF na tag BASE não é uma URL absoluta."
 
-#: LYMessages.c:666
+#: LYMessages.c:664
 msgid "Location URL is not absolute."
 msgstr "Ligação da URL não tem endereço absoluto."
 
-#: LYMessages.c:667
+#: LYMessages.c:665
 msgid "Refresh URL is not absolute."
 msgstr "Não há um endereço absoluto de atualização definido."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:667
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2034,7 +2035,7 @@ msgstr ""
 "Você está enviando uma mensagem para:\n"
 " "
 
-#: LYMessages.c:670
+#: LYMessages.c:668
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2042,7 +2043,7 @@ msgstr ""
 "Você está enviando um comentário para:\n"
 " "
 
-#: LYMessages.c:671
+#: LYMessages.c:669
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2052,7 +2053,7 @@ msgstr ""
 " com cópia para:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:670
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2063,7 +2064,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:672
 msgid ""
 "\n"
 "\n"
@@ -2074,7 +2075,7 @@ msgstr ""
 "Use Ctrl-G para Cancelar se você não quer enviar a mensagem.\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:674
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2083,7 +2084,7 @@ msgstr ""
 " Por favor, entre com seu nome, ou deixe em branco para enviar anônimo\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:676
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2092,11 +2093,11 @@ msgstr ""
 " Por favor, entre com o endereço de email ou outro qualquer.\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:678
 msgid " means to contact you, if you desire a response.\n"
 msgstr " quer contactar você, se você desejar responder.\n"
 
-#: LYMessages.c:681
+#: LYMessages.c:679
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2105,7 +2106,7 @@ msgstr ""
 "Por favor, entre com uma linha de assunto.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2113,11 +2114,11 @@ msgstr ""
 "\n"
 " Entre com o endereço de email para enviar uma cópia da mensagem.\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:682
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (Deixe em branco se não deseja enviar uma cópia deste email)\n"
 
-#: LYMessages.c:685
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2127,7 +2128,7 @@ msgstr ""
 " Por favor, examine o corpo da mensagem:\n"
 "\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:684
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2135,7 +2136,7 @@ msgstr ""
 "\n"
 "Pressione ENTER para continuar:"
 
-#: LYMessages.c:687
+#: LYMessages.c:685
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2143,11 +2144,11 @@ msgstr ""
 "\n"
 "Pressione ENTER para limpar:"
 
-#: LYMessages.c:688
+#: LYMessages.c:686
 msgid " Use Control-U to erase the default.\n"
 msgstr "Use Control-U para apagar o valor padrão.\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2156,7 +2157,7 @@ msgstr ""
 " Por favor entre com sua mensagem abaixo."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:380
+#: LYMessages.c:689 src/LYNews.c:361
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2165,7 +2166,7 @@ msgstr ""
 " Quando você terminar, pressione enter e aguarde alguns instantes."
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:381
+#: LYMessages.c:691 src/LYNews.c:362
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2175,248 +2176,248 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:695
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "%s cookie: %.*s=%.*s Permite? (Y Sim/N Não/A Sempre/V Nunca)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:697
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Aceita cookie inválido do domínio %s para '%s'?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:699
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr "Aceita cookie de caminho mal definido '%s' com prefixo de '%s'?"
 
-#: LYMessages.c:702
+#: LYMessages.c:700
 msgid "Allowing this cookie."
 msgstr "Aceitando este cookie."
 
-#: LYMessages.c:703
+#: LYMessages.c:701
 msgid "Rejecting this cookie."
 msgstr "Rejeitando este cookie."
 
-#: LYMessages.c:704
+#: LYMessages.c:702
 msgid "The Cookie Jar is empty."
 msgstr "O arquivo Jar do cookie está vazio."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:706
+#: LYMessages.c:704
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "Ativa ligação para pegar os cookies de todo o domínio,"
 
-#: LYMessages.c:707
+#: LYMessages.c:705
 msgid "or to change a domain's 'allow' setting."
 msgstr "ou para alterar a permissão de cookies do domínio"
 
-#: LYMessages.c:708
+#: LYMessages.c:706
 msgid "(Cookies never allowed.)"
 msgstr "(Cookies nunca serão aceitos.)"
 
-#: LYMessages.c:709
+#: LYMessages.c:707
 msgid "(Cookies always allowed.)"
 msgstr "(Cookies estão sendo aceitos.)"
 
-#: LYMessages.c:710
+#: LYMessages.c:708
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Pergunta antes de aceitar cookies.)"
 
-#: LYMessages.c:711
+#: LYMessages.c:709
 msgid "(Persistent Cookies.)"
 msgstr "(Cookies permanentes.)"
 
-#: LYMessages.c:712
+#: LYMessages.c:710
 msgid "(No title.)"
 msgstr "(Sem título.)"
 
-#: LYMessages.c:713
+#: LYMessages.c:711
 msgid "(No name.)"
 msgstr "(Sem nome.)"
 
-#: LYMessages.c:714
+#: LYMessages.c:712
 msgid "(No value.)"
 msgstr "(Sem valor.)"
 
-#: LYMessages.c:715
+#: LYMessages.c:713
 msgid "None"
 msgstr "Vazio"
 
-#: LYMessages.c:716
+#: LYMessages.c:714
 msgid "(End of session.)"
 msgstr "(Fim da seção.)"
 
-#: LYMessages.c:717
+#: LYMessages.c:715
 msgid "Delete this cookie?"
 msgstr "Delete este cookie?"
 
-#: LYMessages.c:718
+#: LYMessages.c:716
 msgid "The cookie has been eaten!"
 msgstr "O cookie foi destruido!"
 
-#: LYMessages.c:719
+#: LYMessages.c:717
 msgid "Delete this empty domain?"
 msgstr "Apaga este domínio vazio?"
 
-#: LYMessages.c:720
+#: LYMessages.c:718
 msgid "The domain has been eaten!"
 msgstr "O domínio foi destruido!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:722
+#: LYMessages.c:720
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)Deleta cookie, acerta para A)Sempre/P)Perguntar/V)Nunca ou C) Cancela?"
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:724
+#: LYMessages.c:722
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)Deleta dominio, acerta para A)Sempre/P)Perguntar/V)Nunca ou C) Cancela?"
 
-#: LYMessages.c:725
+#: LYMessages.c:723
 msgid "All cookies in the domain have been eaten!"
 msgstr "Todos os cookies deste domínio foram destruídos!"
 
-#: LYMessages.c:726
+#: LYMessages.c:724
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "'Sempre' aceitar do domínio '%s'."
 
-#: LYMessages.c:727
+#: LYMessages.c:725
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "'Nunca' aceitar do domínio '%s'."
 
-#: LYMessages.c:728
+#: LYMessages.c:726
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "'Perguntar' antes de aceitar de '%s'."
 
-#: LYMessages.c:729
+#: LYMessages.c:727
 msgid "Delete all cookies in this domain?"
 msgstr "Deleta todos os cookies deste domínio?"
 
-#: LYMessages.c:730
+#: LYMessages.c:728
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "Todos os cookies no arquivo Jar foram destruidos!"
 
-#: LYMessages.c:732
+#: LYMessages.c:730
 msgid "Port 19 not permitted in URLs."
 msgstr "Porta 19 não permitida em URLs."
 
-#: LYMessages.c:733
+#: LYMessages.c:731
 msgid "Port 25 not permitted in URLs."
 msgstr "Porta 25 nao permitida em URLs."
 
-#: LYMessages.c:734
+#: LYMessages.c:732
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "Porta %lu nao permitida em URLs."
 
-#: LYMessages.c:735
+#: LYMessages.c:733
 msgid "URL has a bad port field."
 msgstr "URL tem uma porta inválida."
 
-#: LYMessages.c:736
+#: LYMessages.c:734
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "Origens dos elementos HTML excederam o limite."
 
-#: LYMessages.c:737
+#: LYMessages.c:735
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Referência parcial inválida! Ignorando alguns pontos."
 
-#: LYMessages.c:738
+#: LYMessages.c:736
 msgid "Trace Log open failed.  Trace off!"
 msgstr "Falha ao localizar arquivo de log. Localização desligada!"
 
-#: LYMessages.c:739
+#: LYMessages.c:737
 msgid "Lynx Trace Log"
 msgstr "Registro de depuração de rotas do Lynx"
 
-#: LYMessages.c:740
+#: LYMessages.c:738
 msgid "No trace log has been started for this session."
 msgstr "Não foi aberta uma seção de traçagem de log."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:742
+#: LYMessages.c:740
 msgid "The maximum temporary file count has been reached!"
 msgstr "A quantidade máxima de arquivos temporários foi atingida."
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:744
+#: LYMessages.c:742
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "O tamanho do buffer excedeu o tramanho do campo do formulário. Cortando o fim."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:746
+#: LYMessages.c:744
 msgid "Modified tail combined with head of form field value."
 msgstr "Aba modificada combinada com o cabeçalho do campo de formulario."
 
 #. HTFile.c
-#: LYMessages.c:749
+#: LYMessages.c:747
 msgid "Directory"
 msgstr "Diretório"
 
-#: LYMessages.c:750
+#: LYMessages.c:748
 msgid "Directory browsing is not allowed."
 msgstr "Leitor de diretórios não disponível."
 
-#: LYMessages.c:751
+#: LYMessages.c:749
 msgid "Selective access is not enabled for this directory"
 msgstr "Acesso seletivo está habilitado para este diretório"
 
-#: LYMessages.c:752
+#: LYMessages.c:750
 msgid "Multiformat: directory scan failed."
 msgstr "Formatador multiplo: Leitura de diretório falhou."
 
-#: LYMessages.c:753
+#: LYMessages.c:751
 msgid "This directory is not readable."
 msgstr "Este diretório não pode ser lido."
 
-#: LYMessages.c:754
+#: LYMessages.c:752
 msgid "Can't access requested file."
 msgstr "Impossível acessar arquivo requisitado."
 
-#: LYMessages.c:755
+#: LYMessages.c:753
 msgid "Could not find suitable representation for transmission."
 msgstr "Não foi encontrado processo de representação para transmissão."
 
-#: LYMessages.c:756
+#: LYMessages.c:754
 msgid "Could not open file for decompression!"
 msgstr "Impossóvel abrir arquivo para descompressão!"
 
-#: LYMessages.c:757
+#: LYMessages.c:755
 msgid "Files:"
 msgstr "Arquivos:"
 
-#: LYMessages.c:758
+#: LYMessages.c:756
 msgid "Subdirectories:"
 msgstr "Subdiretórios:"
 
-#: LYMessages.c:759
+#: LYMessages.c:757
 msgid " directory"
 msgstr " diretório"
 
-#: LYMessages.c:760
+#: LYMessages.c:758
 msgid "Up to "
 msgstr "Segue para "
 
-#: LYMessages.c:761
+#: LYMessages.c:759
 msgid "Current directory is "
 msgstr "Diretório corrente é "
 
 #. HTGopher.c
-#: LYMessages.c:764
+#: LYMessages.c:762
 msgid "No response from server!"
 msgstr "Sem resposta do servidor!"
 
-#: LYMessages.c:765
+#: LYMessages.c:763
 msgid "CSO index"
 msgstr "CSO index"
 
-#: LYMessages.c:766
+#: LYMessages.c:764
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2424,16 +2425,16 @@ msgstr ""
 "\n"
 "Este é um campo de procura de um banco de dados CSO.\n"
 
-#: LYMessages.c:767
+#: LYMessages.c:765
 msgid "CSO Search Results"
 msgstr "Resultados da busca no CSO"
 
-#: LYMessages.c:768
+#: LYMessages.c:766
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Busca falhou em %s\n"
 
-#: LYMessages.c:769
+#: LYMessages.c:767
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2441,7 +2442,7 @@ msgstr ""
 "\n"
 "Pressione 's' e entre com os dados para busca.\n"
 
-#: LYMessages.c:770
+#: LYMessages.c:768
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2449,35 +2450,35 @@ msgstr ""
 "\n"
 "Este é um indexador de busca Gopher.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:769
 msgid "Gopher index"
 msgstr "Indexador Gopher"
 
-#: LYMessages.c:772
+#: LYMessages.c:770
 msgid "Gopher Menu"
 msgstr "Menu Gopher"
 
-#: LYMessages.c:773
+#: LYMessages.c:771
 msgid " Search Results"
 msgstr "Resultados da Busca"
 
-#: LYMessages.c:774
+#: LYMessages.c:772
 msgid "Sending CSO/PH request."
 msgstr "Enviando requisição CSO/PH."
 
-#: LYMessages.c:775
+#: LYMessages.c:773
 msgid "Sending Gopher request."
 msgstr "Enviando requisição Gopher."
 
-#: LYMessages.c:776
+#: LYMessages.c:774
 msgid "CSO/PH request sent; waiting for response."
 msgstr "requisição CSO/PH enviada; esperando pela resposta."
 
-#: LYMessages.c:777
+#: LYMessages.c:775
 msgid "Gopher request sent; waiting for response."
 msgstr "requisição Gopher enviada; esperando pela resposta."
 
-#: LYMessages.c:778
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2485,7 +2486,7 @@ msgstr ""
 "\n"
 "Por favor, entre com os dados para busca.\n"
 
-#: LYMessages.c:779
+#: LYMessages.c:777
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2493,193 +2494,198 @@ msgstr ""
 "\n"
 "Os dados que você escolheu para busca irão fazer uma busca em"
 
-#: LYMessages.c:780
+#: LYMessages.c:778
 msgid " person's name in the database.\n"
 msgstr " nome personificado na base de dados.\n"
 
 #. HTNews.c
-#: LYMessages.c:783
+#: LYMessages.c:781
 msgid "Connection closed ???"
 msgstr "Conecção fechada???"
 
-#: LYMessages.c:784
+#: LYMessages.c:782
 msgid "Cannot open temporary file for news POST."
 msgstr "Impossível abrir arquivo temporário para postagem de NEWS"
 
-#: LYMessages.c:785
+#: LYMessages.c:783
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Este cliente não contém suporte para postar NEWS com SSL."
 
 #. HTStyle.c
-#: LYMessages.c:788
+#: LYMessages.c:786
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Estilo %d '%s' SGML:%s.  Fonte %s %.1f pontos.\n"
 
-#: LYMessages.c:789
+#: LYMessages.c:787
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "Recortes: primeiro:%.0f outros=%.0f, altura=%.1f Desc.=%.1f\n"
 
-#: LYMessages.c:790
+#: LYMessages.c:788
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "Alinhamento=%d, %d tabs. (%.0f antes, %.0f depois)\n"
 
-#: LYMessages.c:791
+#: LYMessages.c:789
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "Aba tipo=%d a %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:794
+#: LYMessages.c:792
 msgid "Can't proceed without a username and password."
 msgstr "Impossível continuar sem um usuário e senha."
 
-#: LYMessages.c:795
+#: LYMessages.c:793
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Impossível repetir sem autorização! Contate o WebMaster."
 
-#: LYMessages.c:796
+#: LYMessages.c:794
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "Impossível repetir sem uma autorização de proxy. Contate o WebMaster."
 
-#: LYMessages.c:797
+#: LYMessages.c:795
 msgid "Retrying with proxy authorization information."
 msgstr "Repetindo com informações de autorização para o proxy."
 
 #. HTWAIS.c
-#: LYMessages.c:800
+#: LYMessages.c:798
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Mensagem de retorno muito grande."
 
-#: LYMessages.c:801
+#: LYMessages.c:799
 msgid "Enter WAIS query: "
 msgstr "Entre com a requisição de WAIS: "
 
 #. Miscellaneous status
-#: LYMessages.c:804
+#: LYMessages.c:802
 msgid "Retrying as HTTP0 request."
 msgstr "Repetindo com requisição HTTPO."
 
-#: LYMessages.c:805
+#: LYMessages.c:803
 #, c-format
 msgid "Transferred %d bytes"
-msgstr "Transferidos %s bytes."
+msgstr "Transferidos %d bytes."
 
-#: LYMessages.c:806
+#: LYMessages.c:804
 msgid "Data transfer complete"
 msgstr "Transferência completada"
 
-#: LYMessages.c:807
+#: LYMessages.c:805
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Erro processando linha %d de %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:810
+#: LYMessages.c:808
 msgid "Address List Page"
 msgstr "Pagina de endereços"
 
-#: LYMessages.c:811
+#: LYMessages.c:809
 msgid "Bookmark file"
 msgstr "Arquivo do Livro de Marcações"
 
-#: LYMessages.c:812
+#: LYMessages.c:810
 msgid "Configuration Definitions"
 msgstr "Definições de configuração"
 
-#: LYMessages.c:813
+#: LYMessages.c:811
 msgid "Cookie Jar"
 msgstr "Cookie Jar"
 
-#: LYMessages.c:814
+#: LYMessages.c:812
 msgid "Current Key Map"
 msgstr "Mapa de teclado corrente"
 
-#: LYMessages.c:815
+#: LYMessages.c:813
 msgid "File Management Options"
 msgstr "Opções de gerenciamento de arquivos"
 
-#: LYMessages.c:816
+#: LYMessages.c:814
 msgid "Download Options"
 msgstr "Opções de cópia"
 
-#: LYMessages.c:817
+#: LYMessages.c:815
 msgid "History Page"
 msgstr "Página de histórico"
 
-#: LYMessages.c:818
+#: LYMessages.c:816
 msgid "List Page"
 msgstr "Listas"
 
-#: LYMessages.c:819
+#: LYMessages.c:817
 msgid "Lynx.cfg Information"
 msgstr "Informações do Lynx.cfg"
 
-#: LYMessages.c:820
+#: LYMessages.c:818
 msgid "Converted Mosaic Hotlist"
 msgstr "Livro de amrcações convertido do Mosaic"
 
-#: LYMessages.c:821
+#: LYMessages.c:819
 msgid "Options Menu"
 msgstr "Menu de Opções"
 
-#: LYMessages.c:822
+#: LYMessages.c:820
 msgid "File Permission Options"
 msgstr "Opções de permissão de arquivos"
 
-#: LYMessages.c:823
+#: LYMessages.c:821
 msgid "Printing Options"
 msgstr "Opções de imporessão"
 
-#: LYMessages.c:824
+#: LYMessages.c:822
 msgid "Information about the current document"
 msgstr "Informações sobre este documento"
 
-#: LYMessages.c:825
+#: LYMessages.c:823
 msgid "Your recent statusline messages"
 msgstr "Sua linha de mensagens de estado atual"
 
-#: LYMessages.c:826
+#: LYMessages.c:824
 msgid "Upload Options"
 msgstr "Opções de Envio"
 
-#: LYMessages.c:827
+#: LYMessages.c:825
 msgid "Visited Links Page"
 msgstr "Página de ligações visitadas"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:830
+#: LYMessages.c:828
 msgid "See also"
 msgstr "Veja mais"
 
-#: LYMessages.c:831
+#: LYMessages.c:829
 msgid "your"
 msgstr "seu"
 
-#: LYMessages.c:832
+#: LYMessages.c:830
 msgid "for runtime options"
 msgstr "para opções de execução"
 
-#: LYMessages.c:833
+#: LYMessages.c:831
 msgid "compile time options"
 msgstr "Opções de tempo de compilação"
 
-#: LYMessages.c:834
+#: LYMessages.c:832
+#, fuzzy
+msgid "color-style configuration"
+msgstr "Sua configuração inicial"
+
+#: LYMessages.c:833
 msgid "latest release"
 msgstr "ultimo apresentado"
 
-#: LYMessages.c:835
+#: LYMessages.c:834
 msgid "pre-release version"
 msgstr "versão em desenvolvimento"
 
-#: LYMessages.c:836
+#: LYMessages.c:835
 msgid "development version"
 msgstr "versão em desenvolvimento"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:838
+#: LYMessages.c:837
 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"
@@ -2690,7 +2696,7 @@ msgstr ""
 "cópia desta página."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:842
+#: LYMessages.c:841
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2699,104 +2705,108 @@ msgstr ""
 "compilação quando esta cópia do Lynx foi criada."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:847
+#: LYMessages.c:846
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "C) Criar D) Copiar E) Editar F) Menu inteiro M) Alterar R) Remover T) Tag U) Enviar arquivo \n"
 
-#: LYMessages.c:848
+#: LYMessages.c:847
 msgid "Failed to obtain status of current link!"
 msgstr "Falha obtendo o estado atual desta ligação!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:851
+#: LYMessages.c:850
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "Acesso a URLs especiais só válidas pelo menu de permissões de arquivos."
 
-#: LYMessages.c:855
+#: LYMessages.c:854
 msgid "External support is currently disabled."
 msgstr "Suporte externo está desabilitado."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:859
+#: LYMessages.c:858
 #, fuzzy
 msgid "Changing working-directory is currently disabled."
 msgstr "Chamadas estão atualmente desabilitadas."
 
-#: LYMessages.c:860
+#: LYMessages.c:859
 #, fuzzy
 msgid "Linewrap OFF!"
 msgstr "Traçador de rotas desligado!"
 
-#: LYMessages.c:861
+#: LYMessages.c:860
 msgid "Linewrap ON!"
 msgstr ""
 
-#: LYMessages.c:862
+#: LYMessages.c:861
 #, fuzzy
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr "Modo Raw 8-bit ou CJK estão desativados. Atualizando..."
 
-#: LYMessages.c:863
+#: LYMessages.c:862
 #, fuzzy
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr "Modo Raw 8-bit ou CJK estão ativados. Atualizando..."
 
-#: LYMessages.c:864
+#: LYMessages.c:863
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr ""
 
-#: LYMessages.c:865
+#: LYMessages.c:864
 #, fuzzy
 msgid "Trace not supported"
 msgstr "O terminal não suporta cores."
 
-#: WWW/Library/Implementation/HTAABrow.c:648
+#: WWW/Library/Implementation/HTAABrow.c:647
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "Usuário de '%s' em %s '%s%s':"
 
-#: WWW/Library/Implementation/HTAABrow.c:914
+#: WWW/Library/Implementation/HTAABrow.c:913
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr "Este programa não está preparado para compor autorização proxy neste esquema."
 
-#: WWW/Library/Implementation/HTAABrow.c:989
+#: WWW/Library/Implementation/HTAABrow.c:988
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "Este programa não está preparado para compor autorizações neste esquema."
 
-#: WWW/Library/Implementation/HTAABrow.c:1097
+#: WWW/Library/Implementation/HTAABrow.c:1096
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Cabeçalho inválido '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1201
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
 msgstr "Autorização de proxy requerida -- repetindo"
 
-#: WWW/Library/Implementation/HTAABrow.c:1260
+#: WWW/Library/Implementation/HTAABrow.c:1259
 msgid "Access without authorization denied -- retrying"
 msgstr "Acesso sem autorização não permitido -- repetindo"
 
-#: WWW/Library/Implementation/HTAccess.c:683
+#: WWW/Library/Implementation/HTAccess.c:677
 msgid "Access forbidden by rule"
 msgstr "Acesso não permitido pelo regulamento."
 
-#: WWW/Library/Implementation/HTAccess.c:785
+#: WWW/Library/Implementation/HTAccess.c:779
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "Documento com ação de postagem não encontrado no cache. Reenviar?"
 
-#: WWW/Library/Implementation/HTAccess.c:1026 src/GridText.c:8039
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
 msgid "Loading incomplete."
 msgstr "Leitura incompleta"
 
-#: WWW/Library/Implementation/HTAccess.c:1056
+#: WWW/Library/Implementation/HTAccess.c:1077
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr "**** HTAccess: Socket ou numero de arquivos retornado pela rotina é obsoleto!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1058
+#: WWW/Library/Implementation/HTAccess.c:1079
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
 msgstr "HTAccess:Erro interno.Por favor envie email informando para lynx_dev@sig.net!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1059
+#: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "HTAccess: Retorno de estado foi: %d\n"
@@ -2805,28 +2815,28 @@ msgstr "HTAccess: Retorno de estado foi: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7834
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
 msgid "Can't Access"
 msgstr "Não foi possível acessar"
 
-#: WWW/Library/Implementation/HTAccess.c:1073
+#: WWW/Library/Implementation/HTAccess.c:1094
 msgid "Unable to access document."
 msgstr "Impossível acessar documento."
 
-#: WWW/Library/Implementation/HTFTP.c:756
+#: WWW/Library/Implementation/HTFTP.c:766
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Entre senha para usuário %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:784
+#: WWW/Library/Implementation/HTFTP.c:794
 msgid "Unable to connect to FTP host."
 msgstr "Impossível contactar servidor de FTP."
 
-#: WWW/Library/Implementation/HTFTP.c:1054
+#: WWW/Library/Implementation/HTFTP.c:1064
 msgid "close master socket"
 msgstr "fechado o socket principal."
 
-#: WWW/Library/Implementation/HTFTP.c:1116
+#: WWW/Library/Implementation/HTFTP.c:1126
 msgid "socket for master socket"
 msgstr "socket para socket principal"
 
@@ -2835,36 +2845,36 @@ msgstr "socket para socket principal"
 #. **  knowing if it is symbolic?	I think so since
 #. **  it might be a directory.
 #.
-#: WWW/Library/Implementation/HTFTP.c:1630 WWW/Library/Implementation/HTFTP.c:2251
+#: WWW/Library/Implementation/HTFTP.c:1640 WWW/Library/Implementation/HTFTP.c:2261
 msgid "Symbolic Link"
 msgstr "Ligação simbólica"
 
-#: WWW/Library/Implementation/HTFTP.c:2612
+#: WWW/Library/Implementation/HTFTP.c:2622
 msgid "Receiving FTP directory."
 msgstr "Recebendo lista de diretórios do FTP."
 
-#: WWW/Library/Implementation/HTFTP.c:2755
+#: WWW/Library/Implementation/HTFTP.c:2762
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "Transferidos %d bytes (%5d)."
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3083
 msgid "connect for data"
 msgstr "conectado para dados"
 
-#: WWW/Library/Implementation/HTFTP.c:3690
+#: WWW/Library/Implementation/HTFTP.c:3731
 msgid "Receiving FTP file."
 msgstr "Recebendo arquivo de FTP."
 
-#: WWW/Library/Implementation/HTFinger.c:275
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
 msgstr "Não foi possível conecção pelo finger."
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
 msgstr "Não foi possível ler dados. (sem site definido na URL)"
 
-#: WWW/Library/Implementation/HTFinger.c:328
+#: WWW/Library/Implementation/HTFinger.c:331
 msgid "Invalid port number - will only use port 79!"
 msgstr "Porta inválida. - Será usada somente a porta 79!"
 
@@ -2872,7 +2882,7 @@ msgstr "Porta inválida. - Será usada somente a porta 79!"
 msgid "Could not access finger host."
 msgstr "Não foi possível acessar o servidor pelo finger."
 
-#: WWW/Library/Implementation/HTFinger.c:407
+#: WWW/Library/Implementation/HTFinger.c:404
 msgid "No response from finger server."
 msgstr "Sem resposta do comando finger pelo servidor."
 
@@ -2898,12 +2908,12 @@ msgstr "Senha para o servidor NEWS '%s':"
 msgid "Change password?"
 msgstr "Troca senha?"
 
-#: WWW/Library/Implementation/HTNews.c:1691
+#: WWW/Library/Implementation/HTNews.c:1690
 #, c-format
 msgid "No matches for: %s"
 msgstr "Sem combinações para: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1744
+#: WWW/Library/Implementation/HTNews.c:1743
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2911,7 +2921,7 @@ msgstr ""
 "\n"
 "Sem objetos neste grupo.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1757
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2922,16 +2932,16 @@ msgstr ""
 #.
 #. **	Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1770
+#: WWW/Library/Implementation/HTNews.c:1769
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s, Objetos %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1792
+#: WWW/Library/Implementation/HTNews.c:1791
 msgid "Earlier articles"
 msgstr "Primeiros objetos"
 
-#: WWW/Library/Implementation/HTNews.c:1805
+#: WWW/Library/Implementation/HTNews.c:1804
 #, c-format
 msgid ""
 "\n"
@@ -2939,44 +2949,44 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Existem cerca de %s atualmente disponíveis em %s, Como segue:\n"
+"Existem cerca de %d atualmente disponíveis em %s, Como segue:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1865
+#: WWW/Library/Implementation/HTNews.c:1864
 msgid "All available articles in "
 msgstr "Todos os objetos disponíveis em "
 
-#: WWW/Library/Implementation/HTNews.c:2081
+#: WWW/Library/Implementation/HTNews.c:2080
 msgid "Later articles"
 msgstr "Próximos objetos"
 
-#: WWW/Library/Implementation/HTNews.c:2105
+#: WWW/Library/Implementation/HTNews.c:2104
 msgid "Post to "
 msgstr "Envoar pata "
 
-#: WWW/Library/Implementation/HTNews.c:2323
+#: WWW/Library/Implementation/HTNews.c:2322
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Este programa não contém suporte para SNEWS URLs."
 
-#: WWW/Library/Implementation/HTNews.c:2531
+#: WWW/Library/Implementation/HTNews.c:2530
 msgid "No target for raw text!"
 msgstr "Sem destino para texto primário!"
 
-#: WWW/Library/Implementation/HTNews.c:2561
+#: WWW/Library/Implementation/HTNews.c:2560
 msgid "Connecting to NewsHost ..."
 msgstr "Conectando ao servidor NEWS..."
 
-#: WWW/Library/Implementation/HTNews.c:2612
+#: WWW/Library/Implementation/HTNews.c:2611
 #, c-format
 msgid "Could not access %s."
 msgstr "Não foi possível acessar %s."
 
-#: WWW/Library/Implementation/HTNews.c:2712
+#: WWW/Library/Implementation/HTNews.c:2711
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Não foi possível ler notícias. Sservidor NEWS %.20s respondeu: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2716
+#: WWW/Library/Implementation/HTNews.c:2715
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Não foi possível ler notícias. Sservidor NEWS respondeu: %s"
@@ -2984,34 +2994,34 @@ msgstr "Não foi possível ler notícias. Sservidor NEWS respondeu: %s"
 #.
 #. **	List available newsgroups. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2920
+#: WWW/Library/Implementation/HTNews.c:2919
 msgid "Reading list of available newsgroups."
 msgstr "Lendo lista de grupos de NEWS disponíveis."
 
-#: WWW/Library/Implementation/HTNews.c:2942
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of articles in newsgroup."
 msgstr "Lendo lista de objetos no grupo de NEWS."
 
 #.
 #. **	Get an article from a news group. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2948
+#: WWW/Library/Implementation/HTNews.c:2947
 msgid "Reading news article."
 msgstr "Lendo objetos de NEWS."
 
-#: WWW/Library/Implementation/HTNews.c:2978
+#: WWW/Library/Implementation/HTNews.c:2977
 msgid "Sorry, could not load requested news."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1233
+#: WWW/Library/Implementation/HTTCP.c:1239
 msgid "Address has invalid port"
 msgstr "Comprimento do endereço parece estar errado"
 
-#: WWW/Library/Implementation/HTTCP.c:1336
+#: WWW/Library/Implementation/HTTCP.c:1327
 msgid "Address length looks invalid"
 msgstr "Comprimento do endereço parece estar errado"
 
-#: WWW/Library/Implementation/HTTCP.c:1574 WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Imposs;ivel localizar servidor remoto %s."
@@ -3020,62 +3030,86 @@ msgstr "Imposs;ivel localizar servidor remoto %s."
 #. *  immediately; but not HTAlert, because typically
 #. *  there will be other alerts from the callers. - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1589 WWW/Library/Implementation/HTTelnet.c:103
+#: WWW/Library/Implementation/HTTCP.c:1575 WWW/Library/Implementation/HTTelnet.c:103
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Servidor inválido %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1603
+#: WWW/Library/Implementation/HTTCP.c:1589
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Conectando com %s em %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1619
+#: WWW/Library/Implementation/HTTCP.c:1605
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1628
+#: WWW/Library/Implementation/HTTCP.c:1614
 msgid "socket failed."
 msgstr "Falha na conecção do socket."
 
-#: WWW/Library/Implementation/HTTCP.c:1648
+#: WWW/Library/Implementation/HTTCP.c:1634
 msgid "Could not make connection non-blocking."
 msgstr "Não foi possível criar conecção."
 
-#: WWW/Library/Implementation/HTTCP.c:1717
+#: WWW/Library/Implementation/HTTCP.c:1703
 msgid "Connection failed (too many retries)."
 msgstr "Conecção falhou apos 180,000 tentativas."
 
-#: WWW/Library/Implementation/HTTCP.c:1910
+#: WWW/Library/Implementation/HTTCP.c:1896
 msgid "Could not restore socket to blocking."
 msgstr "Impossível restaurar socket para blocagem."
 
-#: WWW/Library/Implementation/HTTCP.c:1976
+#: WWW/Library/Implementation/HTTCP.c:1962
 msgid "Socket read failed for 180,000 tries."
 msgstr "Leitura do socket falhou após 180,000 tentativas."
 
-#: WWW/Library/Implementation/HTTP.c:466
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:503
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Este programa não suporta URLs com HTTPS"
 
-#: WWW/Library/Implementation/HTTP.c:491
+#: WWW/Library/Implementation/HTTP.c:528
 msgid "Unable to connect to remote host."
 msgstr "Impossível conectar ao servidor remoto."
 
-#: WWW/Library/Implementation/HTTP.c:1005
+#: WWW/Library/Implementation/HTTP.c:557
+#, fuzzy
+msgid "Retrying connection without TLS."
+msgstr "Conectando com %s em %s."
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1091
 msgid "Sending HTTP request."
 msgstr "Enviando requisição HTTP."
 
-#: WWW/Library/Implementation/HTTP.c:1039
+#: WWW/Library/Implementation/HTTP.c:1125
 msgid "Unexpected network write error; connection aborted."
 msgstr "Erro inesperado de gravação na rede; conecção abortada."
 
-#: WWW/Library/Implementation/HTTP.c:1045
+#: WWW/Library/Implementation/HTTP.c:1131
 msgid "HTTP request sent; waiting for response."
 msgstr "Enviada requisição HTTP; aguardando resposta."
 
-#: WWW/Library/Implementation/HTTP.c:1109
+#: WWW/Library/Implementation/HTTP.c:1195
 msgid "Unexpected network read error; connection aborted."
 msgstr "Erro inesperado de leitura na rede; conecção abortada."
 
@@ -3089,7 +3123,7 @@ msgstr "Erro inesperado de leitura na rede; conecção abortada."
 #. **	so we'll deal with them by showing the full
 #. **	header to the user as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1305
+#: WWW/Library/Implementation/HTTP.c:1391
 msgid "Got unexpected Informational Status."
 msgstr "Recebido informação de estado não solicitada."
 
@@ -3100,7 +3134,7 @@ msgstr "Recebido informação de estado não solicitada."
 #. *  user to do that, and restore the current
 #. *  document. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1340
+#: WWW/Library/Implementation/HTTP.c:1426
 msgid "Request fulfilled.  Reset Content."
 msgstr "Estouro de requisição. Limpando pedido."
 
@@ -3111,27 +3145,27 @@ msgstr "Estouro de requisição. Limpando pedido."
 #. *  with it by showing the full header to the user
 #. *  as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1459
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Recebida resposta de valor 304."
 
-#: WWW/Library/Implementation/HTTP.c:1526
+#: WWW/Library/Implementation/HTTP.c:1612
 msgid "Redirection of POST content requires user approval."
 msgstr "Redirecionamento de postagem requer autorização do usuário."
 
-#: WWW/Library/Implementation/HTTP.c:1541
+#: WWW/Library/Implementation/HTTP.c:1627
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Há uma ação de postagem.Tratando redirecionamento permanente como temporário.\n"
 
-#: WWW/Library/Implementation/HTTP.c:1586
+#: WWW/Library/Implementation/HTTP.c:1672
 msgid "Retrying with access authorization information."
 msgstr "Repetindo com informações de autorização de acesso."
 
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1684
 msgid "Show the 401 message body?"
 msgstr "Mostra o corpo da mensagem 401?"
 
-#: WWW/Library/Implementation/HTTP.c:1643
+#: WWW/Library/Implementation/HTTP.c:1729
 msgid "Show the 407 message body?"
 msgstr "Mostra o corpo da mensagem 407?"
 
@@ -3140,7 +3174,7 @@ msgstr "Mostra o corpo da mensagem 407?"
 #. **	Take a chance and hope there is
 #. **	something to display. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1748
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Unknown status reply from server!"
 msgstr "Resposta desconhecida de estado do servidor!"
 
@@ -3222,27 +3256,27 @@ msgstr ""
 "\n"
 "Registro de código, não é possível apresentar\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:691
+#: WWW/Library/Implementation/HTWAIS.c:689
 msgid "Syntax error in WAIS URL"
 msgstr "Erro de sintaxe na URL WAIS"
 
-#: WWW/Library/Implementation/HTWAIS.c:761
+#: WWW/Library/Implementation/HTWAIS.c:759
 msgid " (WAIS Index)"
 msgstr " (WAIS Index)"
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:766
 msgid "WAIS Index: "
 msgstr "Index WAIS:"
 
-#: WWW/Library/Implementation/HTWAIS.c:774
+#: WWW/Library/Implementation/HTWAIS.c:772
 msgid "This is a link for searching the "
 msgstr "Esta é uma ligação para procurar o(a)"
 
-#: WWW/Library/Implementation/HTWAIS.c:778
+#: WWW/Library/Implementation/HTWAIS.c:776
 msgid " WAIS Index.\n"
 msgstr " Index do WAIS.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:805
+#: WWW/Library/Implementation/HTWAIS.c:803
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
@@ -3250,48 +3284,48 @@ msgstr ""
 "\n"
 "Entre com 's' para procura e especifique as palavras de busca.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:827
+#: WWW/Library/Implementation/HTWAIS.c:825
 msgid " (in "
 msgstr " (em "
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:834
 msgid "WAIS Search of \""
 msgstr "Procura WAIS de \""
 
-#: WWW/Library/Implementation/HTWAIS.c:840
+#: WWW/Library/Implementation/HTWAIS.c:838
 msgid "\" in: "
 msgstr "\" em: "
 
-#: WWW/Library/Implementation/HTWAIS.c:855
+#: WWW/Library/Implementation/HTWAIS.c:853
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: Requisição muito grande."
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:862
 msgid "Searching WAIS database..."
 msgstr "Procurando no banco de dados WAIS..."
 
-#: WWW/Library/Implementation/HTWAIS.c:874
+#: WWW/Library/Implementation/HTWAIS.c:872
 msgid "Search interrupted."
 msgstr "Procura interrompida."
 
-#: WWW/Library/Implementation/HTWAIS.c:924
+#: WWW/Library/Implementation/HTWAIS.c:922
 msgid "Can't convert format of WAIS document"
 msgstr "Impossível converter formado do documento WAIS."
 
-#: WWW/Library/Implementation/HTWAIS.c:968
+#: WWW/Library/Implementation/HTWAIS.c:966
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: Requisição muito grande."
 
 #.
 #. **	Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:982
+#: WWW/Library/Implementation/HTWAIS.c:980
 msgid "Fetching WAIS document..."
 msgstr "Procurando documento WAIS..."
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1021
+#: WWW/Library/Implementation/HTWAIS.c:1019
 msgid "No text was returned!\n"
 msgstr "Não foi retornado texto algum!\n"
 
@@ -3311,167 +3345,161 @@ msgstr " descrição"
 msgid "Access links"
 msgstr "Acesso de ligações"
 
-#: WWW/Library/Implementation/HTWSRC.c:345
+#: WWW/Library/Implementation/HTWSRC.c:346
 msgid "Direct access"
 msgstr "Acesso direto"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:348
+#: WWW/Library/Implementation/HTWSRC.c:349
 msgid " (or via proxy server, if defined)"
 msgstr " (ou via servidor de proxy, se definido)"
 
-#: WWW/Library/Implementation/HTWSRC.c:363
+#: WWW/Library/Implementation/HTWSRC.c:364
 msgid "Maintainer"
 msgstr "Mantenedor"
 
-#: WWW/Library/Implementation/HTWSRC.c:371
+#: WWW/Library/Implementation/HTWSRC.c:372
 msgid "Host"
 msgstr "Servidor"
 
-#: src/GridText.c:607
+#: src/GridText.c:688
 msgid "Memory exhausted, display interrupted!"
 msgstr "Memória exaurida, apresentação interrompida!"
 
-#: src/GridText.c:612
+#: src/GridText.c:693
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Memória exaurida, srá interrompida a transferência!"
 
-#: src/GridText.c:3395
+#: src/GridText.c:3578
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr "*** MEMÓRIA EXAURIDA ***"
 
-#: src/GridText.c:5733 src/GridText.c:5740 src/LYList.c:258
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
 msgid "unknown field or link"
 msgstr "Campo ou ligacão desconhecidos."
 
-#: src/GridText.c:5749
+#: src/GridText.c:6023
 msgid "text entry field"
 msgstr "Campo de entrada de texto"
 
-#: src/GridText.c:5752
+#: src/GridText.c:6026
 msgid "password entry field"
 msgstr "Campo de entrada de senha"
 
-#: src/GridText.c:5755
+#: src/GridText.c:6029
 msgid "checkbox"
 msgstr "Caixa de checagem"
 
-#: src/GridText.c:5758
+#: src/GridText.c:6032
 msgid "radio button"
 msgstr "Botão de rádio"
 
-#: src/GridText.c:5761
+#: src/GridText.c:6035
 msgid "submit button"
 msgstr "Botão de envio"
 
-#: src/GridText.c:5764
+#: src/GridText.c:6038
 msgid "reset button"
 msgstr "Botão de limpar"
 
-#: src/GridText.c:5767
+#: src/GridText.c:6041
 msgid "popup menu"
 msgstr "Menu de pop-up"
 
-#: src/GridText.c:5770
+#: src/GridText.c:6044
 msgid "hidden form field"
 msgstr "Campo de formulário escondido"
 
-#: src/GridText.c:5773
+#: src/GridText.c:6047
 msgid "text entry area"
 msgstr "Área de entrada de texto"
 
-#: src/GridText.c:5776
+#: src/GridText.c:6050
 msgid "range entry field"
 msgstr "Faixa de entrada de texto"
 
-#: src/GridText.c:5779
+#: src/GridText.c:6053
 msgid "file entry field"
 msgstr "Campo de entrada de arquivo"
 
-#: src/GridText.c:5782
+#: src/GridText.c:6056
 msgid "text-submit field"
 msgstr "Campo de envio de texto"
 
-#: src/GridText.c:5785
+#: src/GridText.c:6059
 msgid "image-submit button"
 msgstr "Botão de imagem de envio de formulário"
 
-#: src/GridText.c:5788
+#: src/GridText.c:6062
 msgid "keygen field"
 msgstr "Campo de 'chave'"
 
-#: src/GridText.c:5791
+#: src/GridText.c:6065
 msgid "unknown form field"
 msgstr "Campo desconhecido"
 
-#. We can't open the file, what do we do?
-#: src/GridText.c:10348
+#: src/GridText.c:10066
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Impossóvel abrir arquivo para descompressão!"
 
-#. We got an error reading the file, what do we do?
-#: src/GridText.c:10359
-msgid "Short read from file, problem?"
-msgstr ""
-
-#: src/GridText.c:10721
+#: src/GridText.c:11218
 #, c-format
 msgid "Submitting %s"
 msgstr "Enviando %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:11887
+#: src/GridText.c:12375
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12092
+#: src/GridText.c:12581
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12144
+#: src/GridText.c:12633
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:12591
+#: src/GridText.c:13079
 msgid "Very long lines have been truncated!"
 msgstr ""
 
-#: src/HTAlert.c:155 src/LYShowInfo.c:318
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
 msgid "bytes"
 msgstr "bytes"
 
-#: src/HTAlert.c:156
+#: src/HTAlert.c:155
 msgid "KB"
 msgstr "KB"
 
-#: src/HTAlert.c:255
+#: src/HTAlert.c:274
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "Lido %s de %s dos dados."
 
-#: src/HTAlert.c:257
+#: src/HTAlert.c:276
 #, c-format
 msgid "Read %s of data"
 msgstr "Lido %s dos dados"
 
-#: src/HTAlert.c:262
+#: src/HTAlert.c:281
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s/sec."
 
-#: src/HTAlert.c:269
+#: src/HTAlert.c:290
 #, c-format
-msgid " (stalled for %ld sec)"
+msgid " (stalled for %s)"
 msgstr ""
 
-#: src/HTAlert.c:271
-#, c-format
-msgid ", ETA %ld sec"
+#: src/HTAlert.c:294
+#, fuzzy, c-format
+msgid ", ETA %s"
 msgstr ", ETA %ld sec."
 
-#: src/HTAlert.c:277
+#: src/HTAlert.c:301
 msgid " (Press 'z' to abort)"
 msgstr " (Pressione 'z' para abortar)"
 
@@ -3500,43 +3528,43 @@ msgstr " (Pressione 'z' para abortar)"
 #. *  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:334
+#: src/HTAlert.c:342 src/HTAlert.c:390
 msgid "yes"
 msgstr "sim"
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:345 src/HTAlert.c:391
 msgid "no"
 msgstr "não"
 
-#: src/HTML.c:6342
+#: src/HTML.c:5985
 msgid "Description:"
 msgstr "Descrição:"
 
-#: src/HTML.c:6347
+#: src/HTML.c:5990
 msgid "(none)"
 msgstr " (vazio)"
 
-#: src/HTML.c:6351
+#: src/HTML.c:5994
 msgid "Filepath:"
 msgstr "Caminho:"
 
-#: src/HTML.c:6356
+#: src/HTML.c:5999
 msgid "(unknown)"
 msgstr "(desconhecido)"
 
-#: src/HTML.c:7804
+#: src/HTML.c:7452
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Documento contém somente ligações ocultas. Use 'l' para listar."
 
-#: src/HTML.c:8328
+#: src/HTML.c:7958
 msgid "Source cache error - disk full?"
 msgstr ""
 
-#: src/HTML.c:8341
+#: src/HTML.c:7971
 msgid "Source cache error - not enough memory!"
 msgstr ""
 
-#: src/LYBookmark.c:166
+#: src/LYBookmark.c:167
 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"
@@ -3548,13 +3576,13 @@ msgstr ""
 "      o comando de remover marcação 'R'. Este comando pode ser sido \n"
 "      alterado pelo administrador do sistema."
 
-#: src/LYBookmark.c:382
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
 msgstr ""
 
-#: src/LYBookmark.c:385
+#: src/LYBookmark.c:382
 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"
@@ -3564,7 +3592,7 @@ msgstr ""
 "     o comando de remover marcação 'R'. Este comando pode ser sido \n"
 "     alterado pelo administrador do sistema."
 
-#: src/LYBookmark.c:389
+#: src/LYBookmark.c:386
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3572,7 +3600,7 @@ msgstr ""
 "     Este arquivo também pode ser editado por um editor normal de texto para\n"
 "     apagar as ligações antigas ou inválidas, ou para alterar sua ordem.<"
 
-#: src/LYBookmark.c:392
+#: src/LYBookmark.c:389
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3583,7 +3611,7 @@ msgstr ""
 "      mudar o formato das linhas ou inserir alguma TAG HTML.\n"
 "      Tenha certeza de que cada ligação está salva como uma linha simples."
 
-#: src/LYBookmark.c:683
+#: src/LYBookmark.c:681
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr ""
@@ -3592,71 +3620,71 @@ msgstr ""
 #. *  Neither the path as given nor any components examined by
 #. *  backing up were stat()able. - kw
 #.
-#: src/LYCgi.c:232
+#: src/LYCgi.c:231
 msgid "Unable to access cgi script"
 msgstr "Impossível acessar script CGI"
 
-#: src/LYCgi.c:651 src/LYCgi.c:654
+#: src/LYCgi.c:654 src/LYCgi.c:657
 msgid "Good Advice"
 msgstr "Conselho útil"
 
-#: src/LYCgi.c:657
+#: src/LYCgi.c:660
 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:664
+#: src/LYCgi.c:667
 msgid "this link"
 msgstr "esta ligação"
 
-#: src/LYCgi.c:668
+#: src/LYCgi.c:671
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Provê o estado do suporte a scripts CGI\n"
 
-#: src/LYClean.c:108
+#: src/LYClean.c:122
 msgid "Exiting via interrupt:"
 msgstr "Saindo via interrupção:"
 
-#: src/LYCookie.c:2659
+#: src/LYCookie.c:2462
 msgid "(from a previous session)"
 msgstr "(De uma seção anterior)"
 
-#: src/LYCookie.c:2719
+#: src/LYCookie.c:2522
 msgid "Maximum Gobble Date:"
 msgstr "Data máxima de aquisição:"
 
-#: src/LYCookie.c:2764
+#: src/LYCookie.c:2564
 msgid "Internal"
 msgstr "(interno)"
 
-#: src/LYCookie.c:2765
+#: src/LYCookie.c:2565
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
-#: src/LYCurses.c:936
+#: src/LYCurses.c:1004
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Inicialização do terminal falhou - Terminal de tipo desconhecido?"
 
-#: src/LYCurses.c:1328
+#: src/LYCurses.c:1426
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1332
+#: src/LYCurses.c:1430
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Você deve usar um terminal vt100, 200, etc... com este programa."
 
-#: src/LYCurses.c:1384
+#: src/LYCurses.c:1480
 msgid "Your Terminal type is unknown!"
 msgstr "O tipo do seu terminal é desconhecido!"
 
-#: src/LYCurses.c:1385
+#: src/LYCurses.c:1481
 msgid "Enter a terminal type:"
 msgstr "Entre com o tipo do terminal:"
 
-#: src/LYCurses.c:1398
+#: src/LYCurses.c:1495
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINAL ESTÁ CONFIGURADO PARA"
 
-#: src/LYCurses.c:1749
+#: src/LYCurses.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -3665,7 +3693,7 @@ msgstr ""
 "\n"
 "Um erro fatal ocorreu em %s Ver. %s\n"
 
-#: src/LYCurses.c:1751
+#: src/LYCurses.c:1996
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -3681,136 +3709,162 @@ msgstr ""
 "operacional e sua versão, a implementação TCPIP, o 'TRACEBACK' se puder ser\n"
 "capturado, e qualquer outra informação relevante.\n"
 
-#: src/LYEdit.c:264
+#: src/LYEdit.c:249
 msgid "Editor killed by signal"
 msgstr ""
 
-#: src/LYEdit.c:266
+#: src/LYEdit.c:251
 #, c-format
 msgid "Editor returned with error status, %s"
 msgstr ""
 
-#: src/LYEdit.c:267
+#: src/LYEdit.c:252
 msgid "reason unknown."
 msgstr ""
 
-#: src/LYDownload.c:520
+#: src/LYDownload.c:517
 msgid "Downloaded link:"
 msgstr "Ligaçao copiada:"
 
-#: src/LYDownload.c:525
+#: src/LYDownload.c:522
 msgid "Suggested file name:"
 msgstr "Sugestão de nome do arquivo:"
 
-#: src/LYDownload.c:530
+#: src/LYDownload.c:527
 msgid "Standard download options:"
 msgstr "Opções padrão de cópia:"
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:528
 msgid "Download options:"
 msgstr "Opções de cópia"
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:544
 msgid "Save to disk"
 msgstr "Salva no disco"
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "Enviar arquivo por email"
+
+#: src/LYDownload.c:565
 msgid "Save to disk disabled."
 msgstr "Salvar para o disco está desabilitado."
 
-#: src/LYDownload.c:551 src/LYPrint.c:1338
+#: src/LYDownload.c:569 src/LYPrint.c:1327
 msgid "Local additions:"
 msgstr "Adições locais:"
 
-#: src/LYDownload.c:560 src/LYUpload.c:224
+#: src/LYDownload.c:578 src/LYUpload.c:216
 msgid "No Name Given"
 msgstr "Não foi informado nome"
 
-#: src/LYHistory.c:633
+#: src/LYHistory.c:657
 msgid "You selected:"
 msgstr "Você selecionou:"
 
-#: src/LYHistory.c:657 src/LYHistory.c:905
+#: src/LYHistory.c:681 src/LYHistory.c:921
 msgid "(no address)"
 msgstr "(sem endereço)"
 
-#: src/LYHistory.c:661
+#: src/LYHistory.c:685
 msgid " (internal)"
 msgstr "(interno)"
 
-#: src/LYHistory.c:663
+#: src/LYHistory.c:687
 msgid " (was internal)"
 msgstr " (foi interno)"
 
-#: src/LYHistory.c:761
+#: src/LYHistory.c:785
 msgid " (From History)"
 msgstr " (Do histórico)"
 
-#: src/LYHistory.c:825
+#: src/LYHistory.c:841
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "Você visitou (POSTs, Livro de marcações, menu e listas de arquivos excluidos):"
 
-#: src/LYHistory.c:1124
+#: src/LYHistory.c:1137
 msgid "(No messages yet)"
 msgstr ""
 
-#: src/LYLeaks.c:78
+#: src/LYLeaks.c:209
 msgid "Invalid pointer detected."
 msgstr "Ponto inválido detectado."
 
-#: src/LYLeaks.c:80 src/LYLeaks.c:117
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
 msgid "Pointer:"
 msgstr "Ponteiro:"
 
-#: src/LYLeaks.c:91 src/LYLeaks.c:98 src/LYLeaks.c:136
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
 msgid "FileName:"
 msgstr "Arquivo:"
 
-#: src/LYLeaks.c:94 src/LYLeaks.c:101 src/LYLeaks.c:139 src/LYLeaks.c:150
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
 msgid "LineCount:"
 msgstr "Numero de Linha(s):"
 
-#: src/LYLeaks.c:115
+#: src/LYLeaks.c:249
 msgid "Memory leak detected."
 msgstr "Vazamento de memória detectado."
 
-#: src/LYLeaks.c:120
+#: src/LYLeaks.c:257
 msgid "Contains:"
 msgstr "Contém:"
 
-#: src/LYLeaks.c:133
+#: src/LYLeaks.c:270
 msgid "ByteSize:"
 msgstr "Tamanho em bytes:"
 
-#: src/LYLeaks.c:147
+#: src/LYLeaks.c:284
 msgid "realloced:"
 msgstr "realocado:"
 
-#: src/LYLeaks.c:170
+#: src/LYLeaks.c:307
 msgid "Total memory leakage this run:"
 msgstr "Total de memória gasta nesta execução:"
 
-#: src/LYList.c:91
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+#, fuzzy
+msgid "Bytes allocated"
+msgstr "realocado:"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
 msgid "References in "
 msgstr "Referências em "
 
-#: src/LYList.c:92
+#: src/LYList.c:86
 msgid "this document:"
 msgstr "este documento:"
 
-#: src/LYList.c:98
+#: src/LYList.c:92
 msgid "Visible links:"
 msgstr "Ligações visíveis:"
 
-#: src/LYList.c:199 src/LYList.c:319
+#: src/LYList.c:194 src/LYList.c:315
 msgid "Hidden links:"
 msgstr "Ligações escondidas:"
 
-#: src/LYList.c:267
+#: src/LYList.c:262
 msgid "References"
 msgstr "Referências"
 
-#: src/LYList.c:269
+#: src/LYList.c:264
 msgid "Visible links"
 msgstr "Ligações visíveis"
 
@@ -3823,314 +3877,314 @@ msgstr "Impossível pegar estado de '%s'."
 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:383
+#: src/LYLocal.c:366
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Impossível executar %s em razão de falha do sistema!"
 
 #. error return
-#: src/LYLocal.c:415
+#: src/LYLocal.c:400
 #, 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:453
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "remove %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr ""
+
+#: src/LYLocal.c:508
 #, c-format
 msgid "move %s to %s"
 msgstr "move %s para %s"
 
-#: src/LYLocal.c:475
+#: src/LYLocal.c:548
 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:477
+#: src/LYLocal.c:550
 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:479
+#: src/LYLocal.c:552
 msgid "The specified name is already in use!  Request ignored."
 msgstr "O nome especificado já está em uso! Requisição ignorada."
 
-#: src/LYLocal.c:490
+#: src/LYLocal.c:563
 msgid "Destination has different owner!  Request denied."
 msgstr "Destino tem um dono difwerente! Requisição impedida."
 
-#: src/LYLocal.c:493
+#: src/LYLocal.c:566
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Destino não é um diretório válido! Requisição impedida."
 
-#: src/LYLocal.c:516
+#: src/LYLocal.c:588
 msgid "Remove all tagged files and directories?"
 msgstr "Remove todos os diretórios e arquivos marcados"
 
-#: src/LYLocal.c:537
-#, c-format
-msgid "remove %s"
-msgstr "remove %s"
-
-#: src/LYLocal.c:580
+#: src/LYLocal.c:647
 msgid "Enter new location for tagged items: "
 msgstr "Entre com novo local para itens marcados:"
 
-#: src/LYLocal.c:649
+#: src/LYLocal.c:716
 msgid "Path too long"
 msgstr "Caminho muito grande"
 
-#: src/LYLocal.c:680
+#: src/LYLocal.c:747
 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:738
+#: src/LYLocal.c:805
 msgid "Enter new name for directory: "
 msgstr "Entre com o novo nome para o diretório:"
 
-#: src/LYLocal.c:740
+#: src/LYLocal.c:807
 msgid "Enter new name for file: "
 msgstr "Entre com o novo nome do arquivo:"
 
-#: src/LYLocal.c:751
+#: src/LYLocal.c:819
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Caractere inválido \"/\" encontrado! requisição ignorada."
 
-#: src/LYLocal.c:800
+#: src/LYLocal.c:868
 msgid "Enter new location for directory: "
 msgstr "Entre com novo local para o diretório:"
 
-#: src/LYLocal.c:802
+#: src/LYLocal.c:874
 msgid "Enter new location for file: "
 msgstr "Entre com novo local para o arquivo:"
 
-#: src/LYLocal.c:827
+#: src/LYLocal.c:901
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Falha inexperada - Impossível encontrar caminho \"/\""
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:921
 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:894
+#: src/LYLocal.c:970
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Modifica nome, local, ou permissão (n,l,p):"
 
-#: src/LYLocal.c:896
+#: src/LYLocal.c:972
 msgid "Modify name or location (n or l): "
 msgstr "Modifica nome ou local (n,l):"
 
 #.
 #. *	Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:925
+#: src/LYLocal.c:1001
 msgid "This feature not yet implemented!"
 msgstr "Esta propriedade não foi implementada ainda!"
 
-#: src/LYLocal.c:943
+#: src/LYLocal.c:1019
 msgid "Enter name of file to create: "
 msgstr "Entre com o nome do arquivo a ser criado:"
 
-#: src/LYLocal.c:951 src/LYLocal.c:999
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Redirecionamento ilegal \"//\" encontrado! Requisição ignorada."
 
-#: src/LYLocal.c:966
-#, c-format
-msgid "create %s"
-msgstr "criar %s"
-
-#: src/LYLocal.c:991
+#: src/LYLocal.c:1061
 msgid "Enter name for new directory: "
 msgstr "Entre com o nome para o novo diretório:"
 
-#: src/LYLocal.c:1042
+#: src/LYLocal.c:1106
 msgid "Create file or directory (f or d): "
 msgstr "Criar 'f' arquivo ou 'd' diretório (f ou d):"
 
-#: src/LYLocal.c:1083
+#: src/LYLocal.c:1146
 #, c-format
 msgid "Remove '%s' and all of its contents?"
 msgstr "Remove '%s' e todos que ele contém:"
 
-#: src/LYLocal.c:1086
+#: src/LYLocal.c:1149
 msgid "Remove directory and all of its contents?"
 msgstr "Remove diretório e sub-diretórios:"
 
-#: src/LYLocal.c:1090
+#: src/LYLocal.c:1153
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Remove arquivo '%s':"
 
-#: src/LYLocal.c:1092
+#: src/LYLocal.c:1155
 msgid "Remove file?"
 msgstr "Remove arquivo:"
 
-#: src/LYLocal.c:1097
+#: src/LYLocal.c:1160
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Remove uma ligação simbólcia '%s':"
 
-#: src/LYLocal.c:1099
+#: src/LYLocal.c:1162
 msgid "Remove symbolic link?"
 msgstr "Remove ligação simbólica:"
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1248
 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:1220
+#: src/LYLocal.c:1278
 msgid "Unable to open permit options file"
 msgstr "Impossível abrir arquivo de opções de permissão"
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1305
 msgid "Specify permissions below:"
 msgstr "Especifique as permissões abaixo:"
 
-#: src/LYLocal.c:1248 src/LYShowInfo.c:196
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
 msgid "Owner:"
 msgstr "Dono:"
 
-#: src/LYLocal.c:1264
+#: src/LYLocal.c:1322
 msgid "Group"
 msgstr "Grupo"
 
-#: src/LYLocal.c:1280
+#: src/LYLocal.c:1338
 msgid "Others:"
 msgstr "Outros:"
 
-#: src/LYLocal.c:1298
+#: src/LYLocal.c:1356
 msgid "form to permit"
 msgstr "forma como permitir"
 
-#: src/LYLocal.c:1396
+#: src/LYLocal.c:1452
 msgid "Invalid mode format."
 msgstr "Formato de modo inválido"
 
-#: src/LYLocal.c:1400
+#: src/LYLocal.c:1456
 msgid "Invalid syntax format."
 msgstr "Formato da sintaxe inválido."
 
-#: src/LYLocal.c:1575
-msgid "NULL URL pointer"
-msgstr "Ponteiro de URL vazio"
-
-#: src/LYLocal.c:1670
+#: src/LYLocal.c:1645
 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:1782
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr "Ponteiro de URL vazio"
+
+#: src/LYLocal.c:1908
 #, c-format
 msgid "Executing %s "
 msgstr "Executando %s "
 
-#: src/LYLocal.c:1785
+#: src/LYLocal.c:1911
 msgid "Executing system command. This might take a while."
 msgstr "Executando comando de sistema. Isto pode demorar um pouco."
 
-#: src/LYLocal.c:1831
-msgid "Unable to open file management menu file."
-msgstr "Impossível abrir arquivo de menu de gerenciamento de arquivos."
-
-#: src/LYLocal.c:1862
+#: src/LYLocal.c:1985
 msgid "Current directory:"
 msgstr "Diretório corrente:"
 
-#: src/LYLocal.c:1865 src/LYLocal.c:1883
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
 msgid "Current selection:"
 msgstr "Seleção corrente:"
 
-#: src/LYLocal.c:1869
+#: src/LYLocal.c:1992
 msgid "Nothing currently selected."
 msgstr "Nada foi selecionado."
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged item:"
 msgstr "item marcado:"
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged items:"
 msgstr "itens marcados:"
 
-#: src/LYLocal.c:1983 src/LYLocal.c:1994
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
 msgid "Illegal filename; request ignored."
 msgstr "Nome de arquivo inválido. Requisição ignorada."
 
-#: src/LYLocal.c:2137
-msgid "The selected item is not a directory!  Request ignored."
-msgstr "O item selecionado não é um diretório. Requisição ignorada."
-
 #. directory not writable
-#: src/LYLocal.c:2141
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
 msgid "Install in the selected directory not permitted."
 msgstr "Instalação no diretório selecionado não é possivel."
 
-#: src/LYLocal.c:2146
+#: src/LYLocal.c:2267
+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:2276
 msgid "Just a moment, ..."
 msgstr "Só um momento..."
 
-#: src/LYLocal.c:2163
+#: src/LYLocal.c:2293
 msgid "Error buiding install args"
 msgstr ""
 
-#: src/LYLocal.c:2178 src/LYLocal.c:2210
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr ""
 
-#: src/LYLocal.c:2188 src/LYLocal.c:2220
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Lendo diretório: %s"
 
-#: src/LYLocal.c:2238
+#: src/LYLocal.c:2362
 msgid "Installation complete"
 msgstr "Instalação completa."
 
-#: src/LYLocal.c:2427
+#: src/LYLocal.c:2551
 msgid "Temporary URL or list would be too long."
 msgstr "URL temporário ou lista podem estar muito longas."
 
-#: src/LYMail.c:503
+#: src/LYMail.c:534
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/LYMail.c:989
+#: src/LYMail.c:1024
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "A ligação    %s :?: %s \n"
 
-#: src/LYMail.c:991
+#: src/LYMail.c:1026
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "chamado(a) \"%s\"\n"
 
-#: src/LYMail.c:992
+#: src/LYMail.c:1027
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "no arquivo \"%s\" chamado \"%s\" \n"
 
-#: src/LYMail.c:993
+#: src/LYMail.c:1028
 msgid "was requested but was not available."
 msgstr "foi requisitado mas não está disponível."
 
-#: src/LYMail.c:994
+#: src/LYMail.c:1029
 msgid "Thought you might want to know."
 msgstr "Embora você possa querer saber."
 
-#: src/LYMail.c:996
+#: src/LYMail.c:1031
 msgid "This message was automatically generated by"
 msgstr "Esta mensagem foi gerada automaticamente por"
 
-#: src/LYMain.c:897
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:969
 msgid "No Winsock found, sorry."
 msgstr "Não foi encontrado o Winsock, desculpe."
 
-#: src/LYMain.c:1103
+#: src/LYMain.c:1170
 msgid "You MUST define a valid TMP or TEMP area!\n"
 msgstr "Você deve definir uma área TMP ou TEMP válida!\n"
 
-#: src/LYMain.c:1156 src/LYMainLoop.c:5117
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
 msgid "No such directory"
 msgstr " diretório"
 
-#: src/LYMain.c:1378
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4141,7 +4195,7 @@ msgstr ""
 "Arquivo %s de configuração não está disponível.\n"
 "\n"
 
-#: src/LYMain.c:1388
+#: src/LYMain.c:1446
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
@@ -4151,7 +4205,7 @@ msgstr ""
 "Não foi declarada uma coleção de caracteres Lynx.\n"
 "\n"
 
-#: src/LYMain.c:1417
+#: src/LYMain.c:1475
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
@@ -4161,7 +4215,7 @@ msgstr ""
 "Editor de mapas Lynx não foi declarado.\n"
 "\n"
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1504
 #, c-format
 msgid ""
 "\n"
@@ -4172,60 +4226,60 @@ msgstr ""
 "Arquivo Lynx %s não está disponível.\n"
 "\n"
 
-#: src/LYMain.c:1704
+#: src/LYMain.c:1743
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2247
+#: src/LYMain.c:2293
 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:2477 src/LYMain.c:2525
+#: src/LYMain.c:2540 src/LYMain.c:2588
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3047
-#, c-format
-msgid "%s Version %s (%s)\n"
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
 msgstr "%s Versão %s (%s)\n"
 
-#: src/LYMain.c:3072
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Criado em %s %s %s\n"
 
-#: src/LYMain.c:3077
+#: src/LYMain.c:3166
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
 msgstr "Copyrights mantidos pela University of Kansas, CERN, e outros colaboradores.\n"
 
-#: src/LYMain.c:3079
+#: src/LYMain.c:3168
 msgid "Distributed under the GNU General Public License.\n"
 msgstr "Distribuido pela GNU General Public License.\n"
 
-#: src/LYMain.c:3081
+#: src/LYMain.c:3170
 msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
+"See http://lynx.isc.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
-"Veja http://lynx.browser.org/ e o help on-line para mais informações.\n"
+"Veja http://lynx.isc.org/ e o help on-line para mais informações.\n"
 "\n"
 
-#: src/LYMain.c:3800
+#: src/LYMain.c:3919
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "USO: %s [opções] [arquivo]\n"
 
-#: src/LYMain.c:3801
+#: src/LYMain.c:3920
 msgid "Options are:\n"
 msgstr "Opções são:\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4191
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Opção inválida: %s\n"
 
-#: src/LYMainLoop.c:512
+#: src/LYMainLoop.c:539
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr ""
@@ -4233,80 +4287,109 @@ msgstr ""
 #.
 #. * Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:625 src/LYMainLoop.c:5139
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
 msgid "A URL specified by the user"
 msgstr "Uma URL especificada pelo usuário"
 
-#: src/LYMainLoop.c:1114
+#: src/LYMainLoop.c:1110
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "multipart/form-data não é suportado ainda! Impossível enviar."
 
 #.
 #. *  Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3097
+#: src/LYMainLoop.c:3053
 msgid "Help Screen"
 msgstr "Tela de Ajuda"
 
-#: src/LYMainLoop.c:3231
+#: src/LYMainLoop.c:3177
 msgid "System Index"
 msgstr "Indexador de sistema"
 
-#: src/LYMainLoop.c:3611 src/LYMainLoop.c:5347
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
 msgid "Entry into main screen"
 msgstr "Entrada na tela principal"
 
-#: src/LYMainLoop.c:3897
+#: src/LYMainLoop.c:3824
 msgid "No next document present"
 msgstr ""
 
-#: src/LYMainLoop.c:4206
+#: src/LYMainLoop.c:4131
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "O mapa de caracteres deve ser explicito no documento, desculpe..."
 
-#: src/LYMainLoop.c:5093
+#: src/LYMainLoop.c:5004
 msgid "cd to:"
 msgstr " para "
 
-#: src/LYMainLoop.c:5120
+#: src/LYMainLoop.c:5031
 msgid "A component of path is not a directory"
 msgstr ""
 
-#: src/LYMainLoop.c:5123
+#: src/LYMainLoop.c:5034
 msgid "failed to change directory"
 msgstr "Impossível acessar diretório."
 
-#: src/LYMainLoop.c:6291
+#: src/LYMainLoop.c:6204
 msgid "Reparsing document under current settings..."
 msgstr "Reinterpretando documento pelas opções atuais..."
 
-#: src/LYMainLoop.c:6579 src/LYMainLoop.c:6583
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
 #, 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:7719 src/LYMainLoop.c:7892
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6914
+#, fuzzy
+msgid "Current URL is empty."
+msgstr "Diretório corrente:"
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr ""
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
 msgid "-index-"
 msgstr " index"
 
-#: src/LYMainLoop.c:7829
+#: src/LYMainLoop.c:7731
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Não foi possível acessar o arquivo principal"
 
-#: src/LYMainLoop.c:7842
+#: src/LYMainLoop.c:7744
 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:7843
+#: src/LYMainLoop.c:7745
 msgid "      Exiting..."
 msgstr "      Saindo..."
 
-#: src/LYMainLoop.c:7886
+#: src/LYMainLoop.c:7788
 msgid "-more-"
 msgstr ""
 
 #. Enable scrolling.
-#: src/LYNews.c:203
+#: src/LYNews.c:187
 msgid "You will be posting to:"
 msgstr "Você estará postando para:"
 
@@ -4314,7 +4397,7 @@ msgstr "Você estará postando para:"
 #. *  Get the mail address for the From header,
 #. *  offering personal_mail_address as default.
 #.
-#: src/LYNews.c:212
+#: src/LYNews.c:196
 msgid ""
 "\n"
 "\n"
@@ -4329,7 +4412,7 @@ msgstr ""
 #. *  document's title as the default if this is a
 #. *  followup rather than a new post. - FM
 #.
-#: src/LYNews.c:230
+#: src/LYNews.c:214
 msgid ""
 "\n"
 "\n"
@@ -4339,7 +4422,7 @@ msgstr ""
 "\n"
 "Por favor forneça ou edite o Assunto:\n"
 
-#: src/LYNews.c:322
+#: src/LYNews.c:303
 msgid ""
 "\n"
 "\n"
@@ -4352,7 +4435,7 @@ msgstr ""
 #.
 #. *  Use the built in line editior.
 #.
-#: src/LYNews.c:379
+#: src/LYNews.c:360
 msgid ""
 "\n"
 "\n"
@@ -4362,93 +4445,112 @@ msgstr ""
 "\n"
 "Por favor, entre com sua mensagem abaixo."
 
-#: src/LYNews.c:425
+#: src/LYNews.c:406
 msgid "Message has no original text!"
 msgstr "Mensagem não tem texto original!"
 
-#: src/LYOptions.c:743
+#: src/LYOptions.c:746
 msgid "review/edit B)ookmarks files"
 msgstr "rever/editar B) Livro de Marcações"
 
-#: src/LYOptions.c:745
+#: src/LYOptions.c:748
 msgid "B)ookmark file: "
 msgstr "B) Livro de Marcações:"
 
-#: src/LYOptions.c:2507 src/LYOptions.c:2531
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr ""
 
-#: src/LYOptions.c:3208
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr ""
+
+#: src/LYOptions.c:3261
 msgid "General Preferences"
 msgstr "Preferências pessoais"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3212
+#: src/LYOptions.c:3265
 msgid "User mode"
 msgstr "Modo usuário"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3218
+#: src/LYOptions.c:3271
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3223
+#: src/LYOptions.c:3276
 msgid "Type of Search"
 msgstr ""
 
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3229
+#: src/LYOptions.c:3285
 msgid "Cookies"
 msgstr "Cookies"
 
-#: src/LYOptions.c:3243
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3247
+#: src/LYOptions.c:3316
 msgid "Keypad mode"
 msgstr "Modo Keypad"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3253
+#: src/LYOptions.c:3322
 msgid "Emacs keys"
 msgstr "Teclas Emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3259
+#: src/LYOptions.c:3328
 msgid "VI keys"
 msgstr "Teclas VI"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3266
+#: src/LYOptions.c:3335
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3278
+#: src/LYOptions.c:3347
 msgid "Keyboard layout"
 msgstr ""
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3291
+#: src/LYOptions.c:3360
 msgid "Display and Character Set"
 msgstr "Mostra mapa de caracteres"
 
 #. ***************************************************************
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3295
+#: src/LYOptions.c:3364
 msgid "Display character set"
 msgstr "Mostra mapa de caracteres"
 
-#: src/LYOptions.c:3324
+#: src/LYOptions.c:3393
 msgid "Assumed document character set"
 msgstr "Assumindo mapa de caracteres do documento"
 
@@ -4457,202 +4559,219 @@ msgstr "Assumindo mapa de caracteres do documento"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3344
+#: src/LYOptions.c:3413
 msgid "CJK mode"
 msgstr "Modo CJK"
 
-#: src/LYOptions.c:3346
+#: src/LYOptions.c:3415
 msgid "Raw 8-bit"
 msgstr "Raw 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3354
+#: src/LYOptions.c:3423
 msgid "X Display"
 msgstr "Visual X"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3360
+#: src/LYOptions.c:3429
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:3366
+#: src/LYOptions.c:3435
 msgid "Show color"
 msgstr "Mostra cor"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3390
+#: src/LYOptions.c:3459
 msgid "Show cursor"
 msgstr "Mostra cursor"
 
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+#, fuzzy
+msgid "Show scrollbar"
+msgstr "Mostra cor"
+
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3396
+#: src/LYOptions.c:3473
 msgid "Popups for select fields"
 msgstr "Pop-ups para os campos selecionados"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3403
+#: src/LYOptions.c:3479
 msgid "HTML error recovery"
 msgstr "Erro recuperando HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3410
+#: src/LYOptions.c:3485
 msgid "Show images"
 msgstr "Mostra imagens"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3424
+#: src/LYOptions.c:3499
 msgid "Verbose images"
 msgstr "Imagens explicitadas"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3432
+#: src/LYOptions.c:3507
 msgid "Headers Transferred to Remote Servers"
 msgstr "Cabeçalhos tranferidos ao servidor remoto"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3436
+#: src/LYOptions.c:3511
 msgid "Personal mail address"
 msgstr "Endereço pessoal de email"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3516
 msgid "Preferred document character set"
 msgstr "Preferências de mapa de caracteres do documento"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3446
+#: src/LYOptions.c:3521
 msgid "Preferred document language"
 msgstr "Preferência de linguagem do documento."
 
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3527
 msgid "User-Agent header"
 msgstr "Cabeçalho de Agente de Usuário"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3460
+#: src/LYOptions.c:3535
 msgid "Listing and Accessing Files"
 msgstr ""
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3464
+#: src/LYOptions.c:3539
 msgid "FTP sort criteria"
 msgstr "Critérios de organização do FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3471
+#: src/LYOptions.c:3546
 msgid "Local directory sort criteria"
 msgstr "Critérios de organizações dos diretórios locais"
 
-#: src/LYOptions.c:3479
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+#, fuzzy
+msgid "Local directory sort order"
+msgstr "Critérios de organizações dos diretórios locais"
+
+#: src/LYOptions.c:3561
 msgid "Show dot files"
 msgstr "Monstre arquivos de pontos"
 
-#: src/LYOptions.c:3487
+#: src/LYOptions.c:3569
 msgid "Execution links"
 msgstr "Ligações de execução"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3507
+#: src/LYOptions.c:3589
 msgid "Show transfer rate"
 msgstr "Transferência completada"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3516
+#: src/LYOptions.c:3598
 msgid "Special Files and Screens"
 msgstr ""
 
-#: src/LYOptions.c:3521
+#: src/LYOptions.c:3603
 msgid "Multi-bookmarks"
 msgstr "Multiplos Livros de Marcações"
 
-#: src/LYOptions.c:3529
+#: src/LYOptions.c:3611
 msgid "Review/edit Bookmarks files"
 msgstr "Rever/editar arquivos de Livro de Marcações"
 
-#: src/LYOptions.c:3531
+#: src/LYOptions.c:3613
 msgid "Goto multi-bookmark menu"
 msgstr "Ir para menu de multiplos livros de marcações"
 
-#: src/LYOptions.c:3533
+#: src/LYOptions.c:3615
 msgid "Bookmarks file"
 msgstr "Arquivo de Livro de marcações"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3539
+#: src/LYOptions.c:3621
 msgid "Visited Pages"
 msgstr "Página de ligações visitadas"
 
-#: src/LYPrint.c:959
+#: src/LYOptions.c:3628
+#, fuzzy
+msgid "View the file "
+msgstr "Enviar arquivo por email"
+
+#: src/LYPrint.c:952
 msgid " Print job complete.\n"
 msgstr "Leitura incompleta.\n"
 
-#: src/LYPrint.c:1296
+#: src/LYPrint.c:1281
 msgid "Document:"
 msgstr "Documento:"
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1282
 msgid "Number of lines:"
 msgstr "Número de Linhas:"
 
-#: src/LYPrint.c:1298
+#: src/LYPrint.c:1283
 msgid "Number of pages:"
 msgstr "Número de páginas:"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "pages"
 msgstr "páginas"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "page"
 msgstr "página"
 
-#: src/LYPrint.c:1300
+#: src/LYPrint.c:1285
 msgid "(approximately)"
 msgstr "(aproximadamente)"
 
-#: src/LYPrint.c:1305
+#: src/LYPrint.c:1290
 msgid "Some print functions have been disabled!"
 msgstr "Algumas funções de impressão foram desabilitadas!"
 
-#: src/LYPrint.c:1309
+#: src/LYPrint.c:1294
 msgid "Standard print options:"
 msgstr "Opções padrão de impressão:"
 
-#: src/LYPrint.c:1310
+#: src/LYPrint.c:1295
 msgid "Print options:"
 msgstr "Opções de impressão:"
 
-#: src/LYPrint.c:1316
+#: src/LYPrint.c:1302
 msgid "Save to a local file"
 msgstr "Salva para um arquivo local"
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1304
 msgid "Save to disk disabled"
 msgstr "Salvar para disco desabilitado"
 
-#: src/LYPrint.c:1324
+#: src/LYPrint.c:1311
 msgid "Mail the file"
 msgstr "Enviar arquivo por email"
 
-#: src/LYPrint.c:1330
+#: src/LYPrint.c:1318
 msgid "Print to the screen"
 msgstr "Mostra na tela"
 
-#: src/LYPrint.c:1334
+#: src/LYPrint.c:1323
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Imprime numa impressora atachada num terminal vt100."
 
-#: src/LYReadCFG.c:340
+#: src/LYReadCFG.c:339
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
 "The line must be of the form:\n"
@@ -4668,76 +4787,76 @@ msgstr ""
 "Onde FRENTE e FUNDO devem ser um destes:\n"
 "O campo 'nocolor', ou 'default', ou\n"
 
-#: src/LYReadCFG.c:353
+#: src/LYReadCFG.c:352
 msgid "Offending line:"
 msgstr "Linha 'infratora': "
 
-#: src/LYReadCFG.c:660
+#: src/LYReadCFG.c:638
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:667
+#: src/LYReadCFG.c:645
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "Remapeamento de teclas\n"
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:666
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr ""
 
-#: src/LYReadCFG.c:715 src/LYReadCFG.c:728
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:733
+#: src/LYReadCFG.c:711
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:816
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr "Lynx: Impossível iniciar,CERN arquivo de regulamento %s não está disponível\n"
 
-#: src/LYReadCFG.c:840
+#: src/LYReadCFG.c:818
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: src/LYReadCFG.c:1658
+#: src/LYReadCFG.c:1782
 #, 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:1660
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Ultimo arquivo incluso chamado foi '%s',\n"
 
-#: src/LYReadCFG.c:1661
+#: src/LYReadCFG.c:1785
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "incluído a partir de '%s'\n"
 
-#: src/LYReadCFG.c:2116 src/LYReadCFG.c:2129 src/LYReadCFG.c:2165
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
 msgid "The following is read from your lynx.cfg file."
 msgstr "O seguinte foi lido em seu arquivo lynx.cfg."
 
-#: src/LYReadCFG.c:2117 src/LYReadCFG.c:2130
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
 msgid "Please read the distribution"
 msgstr "Por favor veja a distribuição"
 
-#: src/LYReadCFG.c:2123 src/LYReadCFG.c:2133
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
 msgid "for more comments."
 msgstr "para mais comentários."
 
-#: src/LYReadCFG.c:2147
+#: src/LYReadCFG.c:2244
 msgid "RELOAD THE CHANGES"
 msgstr "RELER AS ALTERAÇÕES"
 
-#: src/LYReadCFG.c:2156
+#: src/LYReadCFG.c:2253
 msgid "Your primary configuration"
 msgstr "Sua configuração inicial"
 
@@ -4813,7 +4932,7 @@ msgstr "Permissões de acesso"
 msgid "File that you are currently viewing"
 msgstr "Arquivo que você está vendo atualmente."
 
-#: src/LYShowInfo.c:266 src/LYShowInfo.c:375
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
 msgid "Linkname:"
 msgstr "Nome da Ligação:"
 
@@ -4853,79 +4972,79 @@ msgstr "Lingua:"
 msgid "Post Data:"
 msgstr "Data de postagem:"
 
-#: src/LYShowInfo.c:331
+#: src/LYShowInfo.c:333
 msgid "Post Content Type:"
 msgstr "Postar tipo de documento:"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:342
 msgid "Owner(s):"
 msgstr "Dono(s):"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "size:"
 msgstr "Tamanho:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "lines"
 msgstr "linhas"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:348
 msgid "mode:"
 msgstr "modo:"
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:350
 msgid "forms mode"
 msgstr "modo do formulário"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "source"
 msgstr "fonte"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:353
 msgid ", safe"
 msgstr ", salvo"
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:354
 msgid ", via internal link"
 msgstr ", ligação interna"
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:360
 msgid ", no-cache"
 msgstr ", sem cache"
 
-#: src/LYShowInfo.c:360
+#: src/LYShowInfo.c:362
 msgid ", ISMAP script"
 msgstr ", script ISMAP"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:364
 msgid ", bookmark file"
 msgstr ", arquivo de Livro de marcações"
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:373
 msgid "Link that you currently have selected"
 msgstr "Ligação que você acabou de selecionar"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:386
 msgid "Method:"
 msgstr "Metodo:"
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:391
 msgid "Enctype:"
 msgstr "Enctype:"
 
-#: src/LYShowInfo.c:401
+#: src/LYShowInfo.c:403
 msgid "(Form field)"
 msgstr "(Campo de formulário)"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:418
 msgid "No Links on the current page"
 msgstr "Sem ligações na página atual"
 
-#: src/LYStyle.c:250
+#: src/LYStyle.c:278
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -4966,44 +5085,48 @@ msgstr "Redirecionamento ilegal usando \"~\" encontrado! Requisição ignorada."
 msgid "Unable to upload file."
 msgstr "Impossível abrir arquivo"
 
-#: src/LYUpload.c:214
+#: src/LYUpload.c:206
 msgid "Upload To:"
 msgstr "Enviar para:"
 
-#: src/LYUpload.c:215
+#: src/LYUpload.c:207
 msgid "Upload options:"
 msgstr "Opções de envio de arquivos:"
 
-#: src/LYUtils.c:3075
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2468
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3915
+#: src/LYUtils.c:3294
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:4217
+#: src/LYUtils.c:3595
 #, fuzzy
 msgid "unknown restriction"
 msgstr "Campo ou ligacão desconhecidos."
 
-#: src/LYUtils.c:4248
+#: src/LYUtils.c:3626
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:4251
+#: src/LYUtils.c:3629
 msgid "Restrictions set:\n"
 msgstr "Descrição:\n"
 
-#: src/LYUtils.c:5601
-msgid "Ignoring invalid HOME"
-msgstr "Ignorando $HOME inválido"
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr ""
 
-#: src/LYrcFile.c:20
+#: src/LYrcFile.c:21
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr ""
 
-#: src/LYrcFile.c:242
+#: src/LYrcFile.c:295
 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"
@@ -5015,7 +5138,7 @@ msgstr ""
 "cookie que for enviado. Ajuste para \"TRUE\" a fim de aceitar qualquer\n"
 "cookie.\n"
 
-#: src/LYrcFile.c:249
+#: src/LYrcFile.c:302
 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"
@@ -5025,7 +5148,7 @@ msgstr ""
 "onde o usuário pode inserir para acessar facilmente os endereços \n"
 "preferidos.\n"
 
-#: src/LYrcFile.c:254
+#: src/LYrcFile.c:307
 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"
@@ -5035,7 +5158,7 @@ msgstr ""
 "chama uma busca usando 's' ou '/', a performance da procura será\n"
 "não sensitiva a letras maiusculas e minusculas. O padrão é \"off\".\n"
 
-#: src/LYrcFile.c:259
+#: src/LYrcFile.c:312
 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"
@@ -5049,7 +5172,7 @@ msgstr ""
 "caracteres de 7 bits.\n"
 "Atualmente os caracteres válidos são:\n"
 
-#: src/LYrcFile.c:266
+#: src/LYrcFile.c:319
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5063,7 +5186,7 @@ msgstr ""
 "em ambos, rejeitar tem preferência. O parametro accept_all_cookies irá\n"
 "sobreescrever qualquer outro parâmetro feito aqui.\n"
 
-#: src/LYrcFile.c:274
+#: src/LYrcFile.c:327
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/.lynx_cookies.\n"
@@ -5071,7 +5194,7 @@ msgstr ""
 "cookie_file especifica o arquivo em que irão ser gravados os cookies.\n"
 "O padrão é ~/.lynx_cookies.\n"
 
-#: src/LYrcFile.c:279
+#: src/LYrcFile.c:332
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5090,7 +5213,13 @@ msgstr ""
 "Todos os domínios tem como padrão perguntar ao usuário sobre um caminho\n"
 "ou parâmetro inválido no cookie.\n"
 
-#: src/LYrcFile.c:292
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:351
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5103,7 +5232,7 @@ msgstr ""
 "primeiro os arquivos, depois os diretórios.\"DIRECTORIES_FIRST\" lista\n"
 "primeiro os diretórios.\n"
 
-#: src/LYrcFile.c:300
+#: src/LYrcFile.c:359
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5114,7 +5243,7 @@ msgstr ""
 "  ^N = para baixo  ^P = para cima\n"
 "  ^B = esquerda    ^F = para direita\n"
 
-#: src/LYrcFile.c:306
+#: src/LYrcFile.c:365
 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"
@@ -5127,7 +5256,7 @@ msgstr ""
 "seja ativado na linha de comando, então o editor será usado para enviar\n"
 "emails.\n"
 
-#: src/LYrcFile.c:312
+#: src/LYrcFile.c:371
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5143,7 +5272,7 @@ msgstr ""
 "   BY_SIZE     -- classifica pelo Tamanho do arquivo\n"
 "   BY_DATE     -- classifica pela Data do arquivo\n"
 
-#: src/LYrcFile.c:324
+#: src/LYrcFile.c:389
 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"
@@ -5169,7 +5298,7 @@ msgstr ""
 "\n"
 "Atualmente os modos de edição de linha são:\n"
 
-#: src/LYrcFile.c:339
+#: src/LYrcFile.c:404
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5182,7 +5311,7 @@ msgstr ""
 "ingles). Nós começamos com \"multi_bookmarkB\" desde que 'A' é o \n"
 "padrão. (veja abaixo).\n"
 
-#: src/LYrcFile.c:345
+#: src/LYrcFile.c:410
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5199,7 +5328,7 @@ msgstr ""
 "NO_FROM_HEADER para TRUE no lynx.cfg, ou use -nofrom na linha \n"
 "de comando. Você também pode deixar este campo em branco, mas então você não poderá incluir em seus comentários de email.\n"
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:419
 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"
@@ -5224,13 +5353,13 @@ msgstr ""
 "servidor não puder enviar uma resposta que seja aceitável de acordo com\n"
 "o cabeçalho solicitado, então você poderá receber uma mensagem de erro.\n"
 
-#: src/LYrcFile.c:368
+#: src/LYrcFile.c:433
 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 it's default language.\n"
+"Otherwise, the server will send the file in its default language.\n"
 msgstr ""
 "preferred_language especifica a lingua que será informado o formato\n"
 "MIME(ex. en,fr, devem ser separados por vírgulas em ordem decrescente de\n"
@@ -5238,7 +5367,7 @@ msgstr ""
 "disponível, o servidor irá envia-lo a você. Do contrário, enviará o\n"
 "documento padrão.\n"
 
-#: src/LYrcFile.c:377
+#: src/LYrcFile.c:442
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5261,7 +5390,7 @@ msgstr ""
 "          como \"on\" se você tiver certeza das informações que estarão sendo \n"
 "          executadas ou gravadas em seu equipamento. \n"
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:453
 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"
@@ -5289,7 +5418,7 @@ msgstr ""
 "          como \"on\" se você tiver certeza das informações que estarão sendo \n"
 "          executadas ou gravadas em sei equipament.\n"
 
-#: src/LYrcFile.c:403
+#: src/LYrcFile.c:471
 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"
@@ -5305,7 +5434,7 @@ msgstr ""
 "e \"off\" forçará o uso de caixas de rádio. O valor pode ser alterado na\n"
 "linha de comando com -popup.\n"
 
-#: src/LYrcFile.c:413
+#: src/LYrcFile.c:481
 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"
@@ -5336,7 +5465,7 @@ msgstr ""
 "use o menu de opções. Se estiver salvo \"on\" ou \"off\" estes serão tratados\n"
 "como \"default\".\n"
 
-#: src/LYrcFile.c:430
+#: src/LYrcFile.c:498
 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"
@@ -5356,7 +5485,7 @@ msgstr ""
 "Um valor de \"on\" ira posiciona-lo no lado esquerdo e \"off\" irá oculta-lo\n"
 "O valor padrão pode ser sobreescrito via linha de comando -show_cursor.\n"
 
-#: src/LYrcFile.c:441
+#: src/LYrcFile.c:509
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5370,7 +5499,7 @@ msgstr ""
 "Se a apresentação de arquivos ocultos estiver \"off\", a criação dos \n"
 "mesmos pelo lynx estará desabilitada.\n"
 
-#: src/LYrcFile.c:452
+#: src/LYrcFile.c:520
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5392,7 +5521,7 @@ msgstr ""
 "esta opção estiver como \"standart\", o menu será apresentado respeitando o\n"
 "modo do usuário.\n"
 
-#: src/LYrcFile.c:464
+#: src/LYrcFile.c:533
 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"
@@ -5408,7 +5537,7 @@ msgstr ""
 "Use \"ADVANCED\" para ver a URL da ligação marcada atualmente na base\n"
 "da tela.\n"
 
-#: src/LYrcFile.c:472
+#: src/LYrcFile.c:542
 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"
@@ -5418,7 +5547,7 @@ msgstr ""
 "no local como [INLINE], [LINK], ou [IMAGE]\n"
 "Veja mais sobre em lynx.cfg\n"
 
-#: src/LYrcFile.c:477
+#: src/LYrcFile.c:547
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5434,13 +5563,13 @@ msgstr ""
 "As letras 'H', 'J' e 'K continuam ativando a ajuda,pular atalhos e mostrar\n"
 "o mapa de caracteres.\n"
 
-#: src/LYrcFile.c:485
+#: src/LYrcFile.c:555
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
 msgstr ""
 
-#: src/LYrcFile.c:693
+#: src/LYrcFile.c:772
 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"
@@ -5458,7 +5587,7 @@ msgstr ""
 "e os números do teclado responderão da mesma forma, desde que o \n"
 "numlock estiver ligado.\n"
 
-#: src/LYrcFile.c:702
+#: src/LYrcFile.c:781
 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"
@@ -5466,7 +5595,7 @@ msgstr ""
 "Se keypad_mode estiver com \"LINKS_ARE_NUMBERED\", então números\n"
 "irão aparecer ao lado das ligações e serão usados para ativá-las.\n"
 
-#: src/LYrcFile.c:706
+#: src/LYrcFile.c:785
 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"
@@ -5484,7 +5613,7 @@ msgstr ""
 "que a opção não esteja visível. Listas de referências e saídas do comando\n"
 "de lista serão numeradas também.\n"
 
-#: src/LYrcFile.c:715
+#: src/LYrcFile.c:794
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -5494,7 +5623,7 @@ msgstr ""
 "\"LINKS_ARE_NUMBERED\" ou \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" estiverem\n"
 "habilitados.\n"
 
-#: src/LYrcFile.c:748
+#: src/LYrcFile.c:827
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -5517,3 +5646,12 @@ msgstr ""
 "Se você está procurando pelo arquivo de configurações principal - \n"
 "ele é normalmente chamado de lynx.cfg, e tel forma e conteúdo dife-\n"
 "rente - não é este arquivo.\n"
+
+#~ msgid "create %s"
+#~ msgstr "criar %s"
+
+#~ msgid "Unable to open file management menu file."
+#~ msgstr "Impossível abrir arquivo de menu de gerenciamento de arquivos."
+
+#~ msgid "Ignoring invalid HOME"
+#~ msgstr "Ignorando $HOME inválido"
diff --git a/gnu/usr.bin/lynx/po/ru.po b/gnu/usr.bin/lynx/po/ru.po
index 6ec1a1b1260..bd4fdfd09e3 100644
--- a/gnu/usr.bin/lynx/po/ru.po
+++ b/gnu/usr.bin/lynx/po/ru.po
@@ -1,13 +1,14 @@
 # ðÅÒÅ×ÏÄ ÓÏÏÂÝÅÎÉÊ lynx.
 # Copyright (C) 1999, 2000 Free Software Foundation, Inc.
-# Dmitry S. Sivachenko <dima@Chg.RU>, 1999, 2000, 2001.
+# Dmitry S. Sivachenko <dima@Chg.RU>, 1999, 2000, 2001, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.4.dev20\n"
-"POT-Creation-Date: 2001-06-01 18:55-0400\n"
-"PO-Revision-Date: 2001-06-11 23:22+04:00\n"
-"Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
+"Project-Id-Version: lynx 2.8.5pre15\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
@@ -26,7 +27,7 @@ msgstr ""
 #. * Links to collections of alternate definitions, developed by the Lynx
 #. * User Community, are maintained in Lynx links:
 #. *
-#. *    http://www.trill-home.com/lynx.html
+#. *    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
@@ -41,1994 +42,1994 @@ msgstr "÷ÎÉÍÁÎÉÅ!: %s"
 msgid "Welcome"
 msgstr "äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ"
 
-#: LYMessages.c:31 LYMessages.c:32
+#: LYMessages.c:31
 msgid "Are you sure you want to quit?"
 msgstr "÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ×ÙÊÔÉ?"
 
-#: LYMessages.c:34 LYMessages.c:35
+#: LYMessages.c:33
 msgid "Really exit from Lynx?"
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ×ÙÊÔÉ ÉÚ Lynx?"
 
-#: LYMessages.c:37
+#: LYMessages.c:35
 msgid "Connection interrupted."
 msgstr "óÏÅÄÉÎÅÎÉÅ ÐÒÅÒ×ÁÎÏ."
 
-#: LYMessages.c:38
+#: LYMessages.c:36
 msgid "Data transfer interrupted."
 msgstr "ðÅÒÅÄÁÞÁ ÄÁÎÎÙÈ ÐÒÅÒ×ÁÎÁ."
 
-#: LYMessages.c:39
+#: LYMessages.c:37
 msgid "Cancelled!!!"
 msgstr "ïÔÍÅÎÅÎÏ!!!"
 
-#: LYMessages.c:40
+#: LYMessages.c:38
 msgid "Cancelling!"
 msgstr "ïÔÍÅÎÁ!"
 
-#: LYMessages.c:41
+#: LYMessages.c:39
 msgid "Excellent!!!"
 msgstr "ïÔÌÉÞÎÏ!!!"
 
-#: LYMessages.c:42
+#: LYMessages.c:40
 msgid "OK"
 msgstr "OK"
 
-#: LYMessages.c:43
+#: LYMessages.c:41
 msgid "Done!"
 msgstr "çÏÔÏ×Ï!"
 
-#: LYMessages.c:44
+#: LYMessages.c:42
 msgid "Bad request!"
 msgstr "ðÌÏÈÏÊ ÚÁÐÒÏÓ!"
 
-#: LYMessages.c:45
+#: LYMessages.c:43
 msgid "previous"
 msgstr "ÐÒÅÄÙÄÕÝÉÊ"
 
-#: LYMessages.c:46
+#: LYMessages.c:44
 msgid "next screen"
 msgstr "ÓÌÅÄÕÀÝÉÊ ÜËÒÁÎ"
 
-#: LYMessages.c:47
+#: LYMessages.c:45
 msgid "HELP!"
 msgstr "ðïíïýø!"
 
-#: LYMessages.c:48
+#: LYMessages.c:46
 msgid ", help on "
 msgstr ", ÐÏÍÏÝØ ÐÏ "
 
 #. #define HELP
-#: LYMessages.c:50
+#: LYMessages.c:48
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr "ëÏÍÁÎÄÙ: ÓÔÒÅÌËÉ - ÐÅÒÅÍÅÝÅÎÉÅ, '?' - ÐÏÍÏÝØ, 'q' - ×ÙÈÏÄ, '<-' - ÎÁÚÁÄ."
 
 #. #define MOREHELP
-#: LYMessages.c:52
+#: LYMessages.c:50
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr "-- ÎÁÖÍÉÔÅ ÐÒÏÂÅÌ ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ, ÓÔÒÅÌËÉ - ÐÅÒÅÍÅÝÅÎÉÅ, '?' ÐÏÍÏÝØ, 'q' ×ÙÈÏÄ."
 
-#: LYMessages.c:53
+#: LYMessages.c:51
 msgid "-- press space for next page --"
 msgstr "-- ÎÁÖÍÉÔÅ ÐÒÏÂÅÌ ÄÌÑ ÐÅÒÅÈÏÄÁ ÎÁ ÓÌÅÄÕÀÝÕÀ ÓÔÒÁÎÉÃÕ --"
 
-#: LYMessages.c:54
+#: LYMessages.c:52
 msgid "URL too long"
 msgstr "URL ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:60
+#: LYMessages.c:58
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr "(ðÏÌÅ ××ÏÄÁ ÔÅËÓÔÁ) îÅÁËÔÉ×ÎÏ.  îÁÖÍÉÔÅ <××ÏÄ> ÄÌÑ ÁËÔÉ×ÉÚÁÃÉÉ."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:60
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr "(Textarea) îÅÁËÔÉ×ÎÁ.  îÁÖÍÉÔÅ <××ÏÄ> ÄÌÑ ÁËÔÉ×ÉÚÁÃÉÉ."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:64
+#: LYMessages.c:62
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(Textarea) îÅÁËÔÉ×ÎÁ.  îÁÖÍÉÔÅ <××ÏÄ> ÄÌÑ ÁËÔÉ×ÉÚÁÃÉÉ (%s - ÒÅÄÁËÔÏÒ)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:64
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(ðÏÌÅ ÆÏÒÍÙ) îÅÁËÔÉ×ÎÏ.  éÓÐÏÌØÚÕÊÔÅ <××ÏÄ> ÄÌÑ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:68
+#: LYMessages.c:66
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr "(ðÏÌÅ ÆÏÒÍÙ) îÅÁËÔÉ×ÎÏ.  <××ÏÄ> ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ (%s - ÐÏÓÌÁÔØ ÂÅÚ ËÜÛÉÒÏ×ÁÎÉÑ)."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:68
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
 msgstr ""
 "(ðÏÌÅ ÆÏÒÍÙ) îÅÁËÔÉ×ÎÏ. îÁÖÍÉÔÅ <××ÏÄ> ÄÌÑ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ, <××ÏÄ> Ä×ÁÖÄÙ - \n"
 "ÐÏÓÌÁÔØ."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:72
+#: LYMessages.c:70
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "(ðÏÌÅ ÆÏÒÍÙ mailto) îÅÁËÔÉ×ÎÏ.  îÁÖÍÉÔÅ <××ÏÄ> ÄÌÑ ÉÚÍÅÎÅÎÉÑ."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:74
+#: LYMessages.c:72
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "(ðÏÌÅ ××ÏÄÁ ÐÁÒÏÌÑ) îÅÁËÔÉ×ÎÏ.  îÁÖÍÉÔÅ <××ÏÄ> ÄÌÑ ÁËÔÉ×ÉÚÁÃÉÉ."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:77
+#: LYMessages.c:75
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
 msgstr "îåíïäéæéãéòõåíïå ÐÏÌÅ ××ÏÄÁ ÆÁÊÌÁ.  óÔÒÅÌËÉ ÷÷åòè, ÷îéú ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:77
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
 msgstr "(ðÏÌÅ ××ÏÄÁ ÆÁÊÌÁ) ÷×ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ.  óÔÒÅÌËÉ ÷÷åòè, ÷îéú ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:81
+#: LYMessages.c:79
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(ðÏÌÅ ××ÏÄÁ ÔÅËÓÔÁ) ÷×ÅÄÉÔÅ ÔÅËÓÔ.  óÔÒÅÌËÉ ÷÷åòè, ÷îéú ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:83
+#: LYMessages.c:81
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
 msgstr "(Textarea) ÷×ÅÄÉÔÅ ÔÅËÓÔ. óÔÒÅÌËÉ ÷÷åòè/÷îéú ÉÌÉ TAB - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:85
+#: LYMessages.c:83
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
 msgstr "(Textarea) ÷×ÅÄÉÔÅ ÔÅËÓÔ. óÔÒÅÌËÉ ÷÷åòè/÷îéú ÉÌÉ TAB - ×ÙÈÏÄ (%s - ÒÅÄÁËÔÏÒ)."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:87
+#: LYMessages.c:85
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
 msgstr "îåíïäéæéãéòõåíïå ÐÏÌÅ ××ÏÄÁ ÔÅËÓÔÁ.  óÔÒÅÌËÉ ÷÷åòè, ÷îéú ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:87
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(ðÏÌÅ ÆÏÒÍÙ) ÷×ÅÄÉÔÅ ÔÅËÓÔ.  <××ÏÄ> - ÐÏÓÌÁÔØ."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:91
+#: LYMessages.c:89
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr "(ðÏÌÅ ÆÏÒÍÙ) ÷×ÅÄÉÔÅ ÔÅËÓÔ.  <××ÏÄ> - ÐÏÓÌÁÔØ (%s ÄÌÑ ÚÁÐÒÅÔÁ ËÜÛÉÒÏ×ÁÎÉÑ)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:93
+#: LYMessages.c:91
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr "(ðÏÌÅ ÆÏÒÍÙ) ÷×ÅÄÉÔÅ ÔÅËÓÔ.  <××ÏÄ> - ÐÏÓÌÁÔØ, ÓÔÒÅÌËÉ ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:95
+#: LYMessages.c:93
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
 msgstr "îåíïäéæéãéòõåíïå ÐÏÌÅ ÆÏÒÍÙ.  óÔÒÅÌËÉ ÷÷åòè, ÷îéú ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:97
+#: LYMessages.c:95
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr "(ðÏÌÅ ÆÏÒÍÙ mailto) ÷×ÅÄÉÔÅ ÔÅËÓÔ.  <××ÏÄ> - ÐÏÓÌÁÔØ, ÓÔÒÅÌËÉ ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:99
+#: LYMessages.c:97
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr "(ðÏÌÅ ÆÏÒÍÙ mailto) ïÔÐÒÁ×ËÁ ÐÏÞÔÙ ÚÁÐÒÅÝÅÎÁ, ÔÁË ÞÔÏ ×Ù ÎÅ ÍÏÖÅÔÅ ÐÏÓÌÁÔØ."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:99
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(ðÏÌÅ ××ÏÄÁ ÐÁÒÏÌÑ) ÷×ÅÄÉÔÅ ÔÅËÓÔ.  óÔÒÅÌËÉ ÷÷åòè, ÷îéú ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:101
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
 msgstr "îåíïäéæéãéòõåíùê ÐÁÒÏÌØ ÆÏÒÍÙ.  óÔÒÅÌËÉ ÷÷åòè, ÷îéú ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:103
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "(ðÏÌÅ ÎÅÚÁ×ÉÓÉÍÏÊ ËÎÏÐËÉ)  ðÒÁ×ÁÑ ÓÔÒÅÌËÁ ÉÌÉ <××ÏÄ> - ÐÅÒÅËÌÀÞÅÎÉÅ."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:105
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
 msgstr "îåíïäéæéãéòõåíáñ ÎÅÚÁ×ÉÓÉÍÁÑ ËÎÏÐËÁ ÆÏÒÍÙ. óÔÒÅÌËÉ ÷÷åòè, ÷îéú ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:109
+#: LYMessages.c:107
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr "(úÁ×ÉÓÉÍÁÑ ËÎÏÐËÁ)  ðÒÁ×ÁÑ ÓÔÒÅÌËÁ ÉÌÉ <××ÏÄ> - ÐÅÒÅËÌÀÞÅÎÉÅ."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:111
+#: LYMessages.c:109
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
 msgstr "îåíïäéæéãéòõåíáñ ÚÁ×ÉÓÉÍÁÑ ËÎÏÐËÁ ÆÏÒÍÙ.  óÔÒÅÌËÉ ÷÷åòè, ÷îéú ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:113
+#: LYMessages.c:111
 msgid "Submit ('x' for no cache) to "
 msgstr "ðÏÓÌÁÔØ ('x' ÄÌÑ ÚÁÐÒÅÔÁ ËÜÛÉÒÏ×ÁÎÉÑ) "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:115
+#: LYMessages.c:113
 msgid "Submit to "
 msgstr "ðÏÓÌÁÔØ "
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:117
+#: LYMessages.c:115
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr "(ëÎÏÐËÁ ÐÏÓÙÌËÉ ÆÏÒÍÙ) -> ÉÌÉ <××ÏÄ> - ÐÏÓÌÁÔØ ('x' - ÚÁÐÒÅÔ ËÜÛÉÒÏ×ÁÎÉÑ)."
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:119
+#: LYMessages.c:117
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(ëÎÏÐËÁ ÐÏÓÙÌËÉ ÆÏÒÍÙ) ðÒÁ×ÁÑ ÓÔÒÅÌËÁ ÉÌÉ <××ÏÄ> - ÐÏÓÌÁÔØ."
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:121
+#: LYMessages.c:119
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
 msgstr "ïôëìàþåîîáñ ËÎÏÐËÁ ÐÏÓÙÌËÉ ÆÏÒÍÙ.  óÔÒÅÌËÉ ÷÷åòè, ÷îéú ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:123
+#: LYMessages.c:121
 msgid "Submit mailto form to "
 msgstr "ðÏÓÌÁÔØ ÆÏÒÍÕ ÐÏ ÐÏÞÔÅ "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:125
+#: LYMessages.c:123
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr "(ëÎÏÐËÁ ÐÏÓÙÌËÉ ÆÏÒÍÙ ÐÏ ÐÏÞÔÅ) ðÒÁ×ÁÑ ÓÔÒÅÌËÁ ÉÌÉ <××ÏÄ> - ÐÏÓÌÁÔØ."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:125
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr "(ëÎÏÐËÁ ÐÏÓÙÌËÉ ÆÏÒÍÙ ÐÏ ÐÏÞÔÅ) ðÏÞÔÁ ÚÁÐÒÅÝÅÎÁ, ÔÁË ÞÔÏ ×Ù ÎÅ ÍÏÖÅÔÅ ÐÏÓÌÁÔØ."
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:127
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr "(ëÎÏÐËÁ ÏÞÉÓÔËÉ ÆÏÒÍÙ)   ðÒÁ×ÁÑ ÓÔÒÅÌËÁ ÉÌÉ <××ÏÄ> - ÏÞÉÓÔÉÔØ ÆÏÒÍÕ."
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:129
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
 msgstr "ïôëìàþåîîáñ ËÎÏÐËÁ ÏÞÉÓÔËÉ ÆÏÒÍÙ.  óÔÒÅÌËÉ ÷÷åòè, ÷îéú ÉÌÉ tab - ×ÙÈÏÄ."
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:131
 msgid "(Option list) Hit return and use arrow keys and return to select option."
 msgstr "(óÐÉÓÏË ÏÐÃÉÊ) îÁÖÍÉÔÅ ××ÏÄ É ÉÓÐÏÌØÚÕÊÔÅ ÓÔÒÅÌËÉ É ××ÏÄ ÄÌÑ ×ÙÂÏÒÁ ÏÐÃÉÉ."
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:133
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
 msgstr "(óÐÉÓÏË ×ÁÒÉÁÎÔÏ×) îÁÖÍÉÔÅ ××ÏÄ É ÉÓÐÏÌØÚÕÊÔÅ ÓÔÒÅÌËÉ É ××ÏÄ ÄÌÑ ×ÙÂÏÒÁ ×ÁÒÉÁÎÔÁ."
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:135
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr "îåíïäéæéãéòõåíùê ÓÐÉÓÏË ÏÐÃÉÊ.  ÷×ÏÄ ÉÌÉ ÓÔÒÅÌËÉ - ÐÒÏÓÍÏÔÒ ÉÌÉ ×ÙÈÏÄ."
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:137
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr "îåíïäéæéãéòõåíùê ÓÐÉÓÏË ×ÁÒÉÁÎÔÏ×.  ÷×ÏÄ ÉÌÉ ÓÔÒÅÌËÉ - ÐÒÏÓÍÏÔÒ ÉÌÉ ×ÙÈÏÄ."
 
-#: LYMessages.c:140
+#: LYMessages.c:138
 msgid "Submitting form..."
 msgstr "ðÏÓÙÌËÁ ÆÏÒÍÙ..."
 
-#: LYMessages.c:141
+#: LYMessages.c:139
 msgid "Resetting form..."
 msgstr "ïÞÉÓÔËÁ ÆÏÒÍÙ..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:141
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "ïÂÎÏ×ÌÅÎÉÅ ÄÏËÕÍÅÎÔÁ.  úÎÁÞÅÎÉÑ ×ÓÅÈ ÐÏÌÅÊ ÆÏÒÍÙ ÂÕÄÕÔ ÐÏÔÅÒÑÎÙ!"
 
-#: LYMessages.c:144
+#: LYMessages.c:142
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÕÄÁÅÔÓÑ ÐÅÒÅËÏÄÉÒÏ×ÁÔØ ÄÁÎÎÙÅ ÆÏÒÍÙ × ËÏÄÉÒÏ×ËÕ %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:147
+#: LYMessages.c:145
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr "(ïâùþîáñ óóùìëá)   éÓÐÏÌØÚÕÊÔÅ ÐÒÁ×ÕÀ ÓÔÒÅÌËÕ ÉÌÉ <××ÏÄ> ÄÌÑ ÁËÔÉ×ÉÚÁÃÉÉ."
 
-#: LYMessages.c:148
+#: LYMessages.c:146
 msgid "The resource requested is not available at this time."
 msgstr "úÁÐÒÁÛÉ×ÁÅÍÙÊ ÒÅÓÕÒÓ × ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ ÎÅÄÏÓÔÕÐÅÎ."
 
-#: LYMessages.c:149
+#: LYMessages.c:147
 msgid "Enter Lynx keystroke command: "
 msgstr "÷×ÅÄÉÔÅ ËÏÍÁÎÄÕ Lynx: "
 
-#: LYMessages.c:150
+#: LYMessages.c:148
 msgid "Looking up "
 msgstr "éÄÅÔ ÐÏÉÓË "
 
-#: LYMessages.c:151
+#: LYMessages.c:149
 #, c-format
 msgid "Getting %s"
 msgstr "ðÏÌÕÞÅÎÉÅ %s"
 
-#: LYMessages.c:152
+#: LYMessages.c:150
 #, c-format
 msgid "Skipping %s"
 msgstr "ðÒÏÐÕÓË %s"
 
-#: LYMessages.c:153
+#: LYMessages.c:151
 #, c-format
 msgid "Using %s"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ %s"
 
-#: LYMessages.c:154
+#: LYMessages.c:152
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "îÅ×ÅÒÎÙÊ URL: %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:153
 #, c-format
 msgid "Badly formed address %s"
 msgstr "îÅÐÒÁ×ÉÌØÎÏ ÓÆÏÒÍÉÒÏ×ÁÎÎÙÊ ÁÄÒÅÓ %s"
 
-#: LYMessages.c:156
+#: LYMessages.c:154
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:155
 msgid "Unable to access WWW file!!!"
 msgstr "îÅÔ ÄÏÓÔÕÐÁ Ë WWW-ÆÁÊÌÕ!!!"
 
-#: LYMessages.c:158
+#: LYMessages.c:156
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "üÔÏ ÐÏÉÓËÏ×ÙÊ ÉÎÄÅËÓ.  äÌÑ ÐÏÉÓËÁ ÉÓÐÏÌØÚÕÊÔÅ %s."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:160
+#: LYMessages.c:158
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--äÁÌÅÅ--  üÔÏ ÐÏÉÓËÏ×ÙÊ ÉÎÄÅËÓ.  äÌÑ ÐÏÉÓËÁ ÉÓÐÏÌØÚÕÊÔÅ %s."
 
-#: LYMessages.c:161
+#: LYMessages.c:159
 msgid "You have entered an invalid link number."
 msgstr "÷Ù ××ÅÌÉ ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÓÓÙÌËÉ."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:163
+#: LYMessages.c:161
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "éÄÅÔ ÐÒÏÓÍÏÔÒ ÉÓÈÏÄÎÏÇÏ ÔÅËÓÔÁ ÄÏËÕÍÅÎÔÁ.  îÁÖÍÉÔÅ '\\' ÄÌÑ ×ÏÚ×ÒÁÔÁ Ë ÒÅÖÉÍÕ ×ÉÚÕÁÌÉÚÁÃÉÉ."
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:165
+#: LYMessages.c:163
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
 msgstr "óÔÒÅÌËÉ: ÷×ÅÒÈ, ÷ÎÉÚ - ÐÅÒÅÍÅÝÅÎÉÅ. ÷ÐÒÁ×Ï - ÐÅÒÅÈÏÄ ÐÏ ÓÓÙÌËÅ; ÷ÌÅ×Ï - ×ÏÚ×ÒÁÔ.\n"
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:167
+#: LYMessages.c:165
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
 msgstr " H)elp O)ptions P)rint G)o M)çÌÁ× ÜËÒÁÎ Q)uit /=ÐÏÉÓË [delete]=ÓÐÉÓÏË ÉÓÔÏÒÉÉ \n"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:169
+#: LYMessages.c:167
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
 msgstr "  O)äÒ. ËÏÍ.  H)elp  K)eymap  G)oto  P)ðÅÞÁÔØ  M)çÌÁ× ÜËÒÁÎ  o)ðÁÒÁÍ  Q)÷ÙÈÏÄ\n"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:171
+#: LYMessages.c:169
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr "  O)äÒ. ËÏÍ.  B)ack  E)òÅÄ  D)ÚÁÇÒÕÚÉÔØ ^R)eload ^W)ipe screen  ÐÏÉÓË × ÄÏË: / \n"
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:173
+#: LYMessages.c:171
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr "O)äÒ. ËÏÍ.  C)omment  éÓÔÏÒÉÑ: <backspace>  úÁËÌÁÄËÉ: V)iew, A)dd, R)emove \n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:175
+#: LYMessages.c:173
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr "                   ÷×ÅÄÉÔÅ × ÐÏÌÅ ÔÅËÓÔ Ó ËÌÁ×ÉÁÔÕÒÙ                         "
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:177
+#: LYMessages.c:175
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr "  Ctrl-U - ÕÄÁÌÅÎÉÅ ×ÓÅÇÏ ÔÅËÓÔÁ × ÐÏÌÅ, [Backspace] - ÕÄÁÌÅÎÉÅ ÏÄÎÏÇÏ ÓÉÍ×ÏÌÁ"
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:179
+#: LYMessages.c:177
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
 msgstr " Ctrl-U - ÕÄÁÌÅÎÉÅ ×ÓÅÇÏ ÔÅËÓÔÁ × ÐÏÌÅ, [Backspace] - ÕÄÁÌÅÎÉÅ ÏÄÎÏÇÏ ÓÉÍ×ÏÌÁ "
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:181
+#: LYMessages.c:179
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr "  %s - ÕÄÁÌÅÎÉÅ ×ÓÅÇÏ ÔÅËÓÔÁ × ÐÏÌÅ, [Backspace] - ÕÄÁÌÅÎÉÅ ÏÄÎÏÇÏ ÓÉÍ×ÏÌÁ "
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:183
+#: LYMessages.c:181
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
 msgstr "  %s - ÕÄÁÌÅÎÉÅ ×ÓÅÇÏ ÔÅËÓÔÁ × ÐÏÌÅ, [Backspace] - ÕÄÁÌÅÎÉÅ ÏÄÎÏÇÏ ÓÉÍ×ÏÌÁ "
 
 #. mailto
-#: LYMessages.c:186
+#: LYMessages.c:184
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "îÅÐÒÁ×ÉÌØÎÏ ÓÆÏÒÍÉÒÏ×ÁÎÎÁÑ ÐÏÓÙÌËÁ ÆÏÒÍÙ ÐÏ ÐÏÞÔÅ!  ïÔÍÅÎÅÎÏ!"
 
-#: LYMessages.c:187
+#: LYMessages.c:185
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ!  õÐÒÁ×ÌÑÀÝÉÅ ËÏÄÙ × ÐÏÞÔÏ×ÏÍ ÁÄÒÅÓÅ ÚÁÍÅÎÅÎÙ ÎÁ ?"
 
-#: LYMessages.c:188
+#: LYMessages.c:186
 msgid "Mail disallowed!  Cannot submit."
 msgstr "ðÏÞÔÁ ÚÁÐÒÅÝÅÎÁ!  îÅ ÕÄÁÅÔÓÑ ÐÏÓÌÁÔØ."
 
-#: LYMessages.c:189
+#: LYMessages.c:187
 msgid "Mailto form submission failed!"
 msgstr "ðÏÓÙÌËÁ ÆÏÒÍÙ ÐÏ ÐÏÞÔÅ ÎÅ ×ÙÐÏÌÎÅÎÁ!"
 
-#: LYMessages.c:190
+#: LYMessages.c:188
 msgid "Mailto form submission Cancelled!!!"
 msgstr "ðÏÓÙÌËÁ ÆÏÒÍÙ ÐÏ ÐÏÞÔÅ ÏÔÍÅÎÅÎÁ!!!"
 
-#: LYMessages.c:191
+#: LYMessages.c:189
 msgid "Sending form content..."
 msgstr "ðÏÓÙÌËÁ ÓÏÄÅÒÖÉÍÏÇÏ ÆÏÒÍÙ..."
 
-#: LYMessages.c:192
+#: LYMessages.c:190
 msgid "No email address is present in mailto URL!"
 msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÐÏÞÔÏ×ÙÊ ÁÄÒÅÓ × mailto URL!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:194
+#: LYMessages.c:192
 msgid "Unable to open temporary file for mailto URL!"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ ÄÌÑ mailto URL!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:196
+#: LYMessages.c:194
 msgid "Do you wish to include the original message?"
 msgstr "÷Ù ÈÏÔÉÔÅ ×ËÌÀÞÉÔØ ÉÓÈÏÄÎÏÅ ÓÏÏÂÝÅÎÉÅ?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:196
 msgid "Do you wish to include the preparsed source?"
 msgstr "÷Ù ÈÏÔÉÔÅ ×ËÌÀÞÉÔØ ÒÁÚÏÂÒÁÎÎÙÊ ÉÓÈÏÄÎÙÊ ÔÅËÓÔ?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:200
+#: LYMessages.c:198
 msgid "Spawning your selected editor to edit mail message"
 msgstr "úÁÐÕÓË ×ÁÛÅÇÏ ×ÙÂÒÁÎÎÏÇÏ ÒÅÄÁËÔÏÒÁ ÄÌÑ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÐÏÞÔÏ×ÏÇÏ ÓÏÏÂÝÅÎÉÑ"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:202
+#: LYMessages.c:200
 msgid "Error spawning editor, check your editor definition in the options menu"
-msgstr "ïÛÉÂËÁ ÐÒÉ ÚÁÐÕÓËÅ ÒÅÄÁËÔÏÒÁ, ÐÒÏ×ÅÒØÔÅ ÏÐÒÅÄÅÌÅÎÉÅ ÒÅÄÁËÔÏÒÁ × ÍÅÎÀ ÏÐÃÉÊ"
+msgstr "ïÛÉÂËÁ ÐÒÉ ÚÁÐÕÓËÅ ÒÅÄÁËÔÏÒÁ, ÐÒÏ×ÅÒØÔÅ ÏÐÒÅÄÅÌÅÎÉÅ ÒÅÄÁËÔÏÒÁ × ÍÅÎÀ ÐÁÒÁÍÅÔÒÏ×"
 
-#: LYMessages.c:203
+#: LYMessages.c:201
 msgid "Send this comment?"
 msgstr "ðÏÓÌÁÔØ ÜÔÏÔ ËÏÍÍÅÎÔÁÒÉÊ?"
 
-#: LYMessages.c:204
+#: LYMessages.c:202
 msgid "Send this message?"
 msgstr "ðÏÓÌÁÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ?"
 
-#: LYMessages.c:205
+#: LYMessages.c:203
 msgid "Sending your message..."
 msgstr "ðÏÓÙÌËÁ ×ÁÛÅÇÏ ÓÏÏÂÝÅÎÉÑ..."
 
-#: LYMessages.c:206
+#: LYMessages.c:204
 msgid "Sending your comment:"
 msgstr "ðÏÓÙÌËÁ ×ÁÛÅÇÏ ËÏÍÍÅÎÔÁÒÉÑ:"
 
 #. textarea
-#: LYMessages.c:209
+#: LYMessages.c:207
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ ×ÎÅÛÎÅÇÏ ÒÅÄÁËÔÏÒÁ, ÎÁÈÏÄÑÓØ ×ÎÅ TEXTAREA, ÎÅ×ÏÚÍÏÖÎÏ."
 
-#: LYMessages.c:210
+#: LYMessages.c:208
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ ËÏÍÁÎÄÙ, ÎÁÈÏÄÑÓØ ×ÎÅ TEXTAREA, ÎÅ×ÏÚÍÏÖÎÏ."
 
-#: LYMessages.c:213
+#: LYMessages.c:211
 msgid "file: ACTIONs are disallowed!"
 msgstr "ÆÁÊÌ: äåêóô÷éñ ÚÁÐÒÅÝÅÎÙ!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:213
 msgid "file: URLs via served links are disallowed!"
 msgstr ""
 
-#: LYMessages.c:216
+#: LYMessages.c:214
 msgid "Access to local files denied."
 msgstr "äÏÓÔÕÐ Ë ÌÏËÁÌØÎÙÍ ÆÁÊÌÁÍ ÚÁÐÒÅÝÅÎ."
 
-#: LYMessages.c:217
+#: LYMessages.c:215
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "ÆÁÊÌ: URL ÞÅÒÅÚ ÚÁËÌÁÄËÉ ÚÁÐÒÅÝÅÎÙ!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:217
 msgid "This special URL is not allowed in external documents!"
 msgstr "üÔÏÔ ÓÐÅÃÉÁÌØÎÙÊ URL ÎÅ ÄÏÐÕÓËÁÅÔÓÑ ×Ï ×ÎÅÛÎÅÍ ÄÏËÕÍÅÎÔÅ!"
 
-#: LYMessages.c:220
+#: LYMessages.c:218
 msgid "Press <return> to return to Lynx."
 msgstr "îÁÖÍÉÔÅ <××ÏÄ> ÄÌÑ ×ÏÚ×ÒÁÔÁ × Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:221
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "úÁÐÕÓËÁÅÔÓÑ ÐÏÄÐÒÏÃÅÓÓ DCL. éÓÐÏÌØÚÕÊÔÅ 'logout' ÄÌÑ ×ÏÚ×ÒÁÔÁ × Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:225
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "÷×ÅÄÉÔÅ EXIT ÄÌÑ ×ÏÚ×ÒÁÔÁ × Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:228
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr "úÁÐÕÓË ×ÁÛÅÊ ÏÂÏÌÏÞËÉ ÐÏ ÕÍÏÌÞÁÎÉÀ.  éÓÐÏÌØÚÕÊÔÅ 'exit' ÄÌÑ ×ÏÚ×ÒÁÔÁ × Lynx.\n"
 
-#: LYMessages.c:233
+#: LYMessages.c:231
 msgid "Spawning is currently disabled."
 msgstr "úÁÐÕÓË ÐÒÏÃÅÓÓÏ× ÓÅÊÞÁÓ ÚÁÐÒÅÝÅÎ."
 
-#: LYMessages.c:234
+#: LYMessages.c:232
 msgid "The 'd'ownload command is currently disabled."
 msgstr "ëÏÍÁÎÄÁ 'd' (ÓËÁÞÁÔØ) ÓÅÊÞÁÓ ÚÁÐÒÅÝÅÎÁ."
 
-#: LYMessages.c:235
+#: LYMessages.c:233
 msgid "You cannot download an input field."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÓËÁÞÁÔØ ÐÏÌÅ ××ÏÄÁ."
 
-#: LYMessages.c:236
+#: LYMessages.c:234
 msgid "Form has a mailto action!  Cannot download."
 msgstr "äÅÊÓÔ×ÉÅÍ ÆÏÒÍÙ Ñ×ÌÑÅÔÓÑ ÐÏÓÙÌËÁ ÐÏ ÐÏÞÔÅ!  îÅ×ÏÚÍÏÖÎÏ ÓËÁÞÁÔØ."
 
-#: LYMessages.c:237
+#: LYMessages.c:235
 msgid "You cannot download a mailto: link."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÓËÁÞÁÔØ ÓÓÙÌËÕ mailto:."
 
-#: LYMessages.c:238
+#: LYMessages.c:236
 msgid "You cannot download cookies."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÓËÁÞÁÔØ cookie."
 
-#: LYMessages.c:239
+#: LYMessages.c:237
 msgid "You cannot download a printing option."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÓËÁÞÁÔØ ÐÁÒÁÍÅÔÒ ÐÅÞÁÔÉ."
 
-#: LYMessages.c:240
+#: LYMessages.c:238
 msgid "You cannot download an upload option."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÓËÁÞÁÔØ ÉÌÉ ÚÁÇÒÕÚÉÔØ ÐÁÒÁÍÅÔÒ."
 
-#: LYMessages.c:241
+#: LYMessages.c:239
 msgid "You cannot download an permit option."
 msgstr ""
 
-#: LYMessages.c:242
+#: LYMessages.c:240
 msgid "This special URL cannot be downloaded!"
 msgstr "üÔÏÔ ÓÐÅÃÉÁÌØÎÙÊ URL ÎÅ ÍÏÖÅÔ ÂÙÔØ ÓËÁÞÁÎ!"
 
-#: LYMessages.c:243
+#: LYMessages.c:241
 msgid "Nothing to download."
 msgstr "óËÁÞÉ×ÁÔØ ÎÅÞÅÇÏ."
 
-#: LYMessages.c:244
+#: LYMessages.c:242
 msgid "Trace ON!"
 msgstr "ôÒÁÓÓÉÒÏ×ËÁ ÷ëìàþåîá!"
 
-#: LYMessages.c:245
+#: LYMessages.c:243
 msgid "Trace OFF!"
 msgstr "ôÒÁÓÓÉÒÏ×ËÁ ÷ùëìàþåîá!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:245
 msgid "Links will be included for all images!  Reloading..."
 msgstr "óÓÙÌËÉ ÂÕÄÕÔ ×ËÌÀÞÅÎÙ ÄÌÑ ×ÓÅÈ ÉÚÏÂÒÁÖÅÎÉÊ!  ïÂÎÏ×ÌÅÎÉÅ..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:247
 msgid "Standard image handling restored!  Reloading..."
 msgstr "óÔÁÎÄÁÒÔÎÁÑ ÏÂÒÁÂÏÔËÁ ÉÚÏÂÒÁÖÅÎÉÊ ×ÏÓÓÔÁÎÏ×ÌÅÎÁ!  ïÂÎÏ×ÌÅÎÉÅ..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:249
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr "ðÓÅ×ÄÏ-ALT ÂÕÄÕÔ ×ÓÔÁ×ÌÅÎÙ ÄÌÑ ×ÎÕÔÒÉÓÔÒÏÞÎÙÈ ÉÚÏÂÒÁÖÅÎÉÊ ÂÅÚ ALT. ïÂÎÏ×ÌÅÎÉÅ..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:251
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "÷ÎÕÔÒÉÓÔÒÏÞÎÙÅ ÉÚÏÂÒÁÖÅÎÉÑ ÂÅÚ ÁÔÒÉÂÕÔÁ ALT ÂÕÄÕÔ ÉÇÎÏÒÉÒÏ×ÁÔØÓÑ!  ïÂÎÏ×ÌÅÎÉÅ..."
 
-#: LYMessages.c:254
+#: LYMessages.c:252
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "îÅÏÂÒÁÂÏÔÁÎÎÙÊ 8-ÂÉÔÎÙÊ ÉÌÉ CJK-ÒÅÖÉÍ ÷ùëìàþåî!  ïÂÎÏ×ÌÅÎÉÅ..."
 
-#: LYMessages.c:255
+#: LYMessages.c:253
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "îÅÏÂÒÁÂÏÔÁÎÎÙÊ 8-ÂÉÔÎÙÊ ÉÌÉ CJK-ÒÅÖÉÍ ÷ëìàþåî!  ïÂÎÏ×ÌÅÎÉÅ..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:255
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "ðÏÓÌÁÔØ ÚÁÐÒÏÓ HEAD ÄÌÑ D)ÄÏËÕÍÅÎÔÁ ÉÌÉ L)ÓÓÙÌËÉ, ÉÌÉ C)ïÔÍÅÎÉÔØ? (d,l,c): "
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:257
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "ðÏÓÌÁÔØ ÚÁÐÒÏÓ HEAD ÄÌÑ D)ÄÏËÕÍÅÎÔÁ, ÉÌÉ C)ÏÔÍÅÎÉÔØ? (d,c): "
 
-#: LYMessages.c:260
+#: LYMessages.c:258
 msgid "Sorry, the document is not an http URL."
 msgstr "éÚ×ÉÎÉÔÅ, ÄÏËÕÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ http URL."
 
-#: LYMessages.c:261
+#: LYMessages.c:259
 msgid "Sorry, the link is not an http URL."
 msgstr "éÚ×ÉÎÉÔÅ, ÓÓÙÌËÁ ÎÅ Ñ×ÌÑÅÔÓÑ http URL."
 
-#: LYMessages.c:262
+#: LYMessages.c:260
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "éÚ×ÉÎÉÔÅ, äåêóô÷éå ÄÌÑ ÜÔÏÊ ÆÏÒÍÙ ÏÔËÌÀÞÅÎÏ."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:262
 msgid "Sorry, the ACTION for this form is not an http URL."
 msgstr "éÚ×ÉÎÉÔÅ, äåêóô÷éå ÄÌÑ ÜÔÏÊ ÆÏÒÍÙ ÎÅ Ñ×ÌÑÅÔÓÑ http URL."
 
-#: LYMessages.c:265
+#: LYMessages.c:263
 msgid "Not an http URL or form ACTION!"
 msgstr "îÅ http URL ÉÌÉ äåêóô÷éå ÆÏÒÍÙ!"
 
-#: LYMessages.c:266
+#: LYMessages.c:264
 msgid "This special URL cannot be a form ACTION!"
 msgstr "üÔÏÔ ÓÐÅÃÉÁÌØÎÙÊ URL ÎÅ ÍÏÖÅÔ ÂÙÔØ äåêóô÷éåí ÆÏÒÍÙ!"
 
-#: LYMessages.c:267
+#: LYMessages.c:265
 msgid "URL is not in starting realm!"
 msgstr "URL ÎÁÈÏÄÉÔÓÑ ×ÎÅ ÎÁÞÁÌØÎÏÊ ÏÂÌÁÓÔÉ!"
 
-#: LYMessages.c:268
+#: LYMessages.c:266
 msgid "News posting is disabled!"
 msgstr "ðÏÓÙÌËÁ ÎÏ×ÏÓÔÅÊ ÚÁÐÒÅÝÅÎÁ!"
 
-#: LYMessages.c:269
+#: LYMessages.c:267
 msgid "File management support is disabled!"
 msgstr "ðÏÄÄÅÒÖËÁ ÒÁÂÏÔÙ Ó ÆÁÊÌÁÍÉ ÏÔËÌÀÞÅÎÁ!"
 
-#: LYMessages.c:270
+#: LYMessages.c:268
 msgid "No jump file is currently available."
 msgstr "÷ ÄÁÎÎÙÊ ÍÏÍÅÎÔ ÎÅÔ ÄÏÓÔÕÐÎÏÇÏ ÆÁÊÌÁ ÐÅÒÅÈÏÄÏ×."
 
-#: LYMessages.c:271
+#: LYMessages.c:269
 msgid "Jump to (use '?' for list): "
 msgstr "ðÅÒÅÊÔÉ Ë (ÉÓÐÏÌØÚÕÊÔÅ '?' ÄÌÑ ÓÐÉÓËÁ): "
 
-#: LYMessages.c:272
+#: LYMessages.c:270
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr "ðÅÒÅÈÏÄ ÐÏ ÓÏËÒÁÝÅÎÎÏÍÕ URL ÚÁÐÒÅÝÅÎ!"
 
-#: LYMessages.c:273
+#: LYMessages.c:271
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "óÌÕÞÁÊÎÙÅ URL ÚÁÐÒÅÝÅÎÙ!  éÓÐÏÌØÚÕÊÔÅ ÓÏËÒÁÝÅÎÉÅ."
 
-#: LYMessages.c:274
+#: LYMessages.c:272
 msgid "No random URLs have been used thus far."
 msgstr "óÌÕÞÁÊÎÙÅ URL ÄÏ ÓÉÈ ÐÏÒ ÎÅ ÉÓÐÏÌØÚÏ×ÁÌÉÓØ."
 
-#: LYMessages.c:275
+#: LYMessages.c:273
 msgid "Bookmark features are currently disabled."
 msgstr "úÁËÌÁÄËÉ ÓÅÊÞÁÓ ÏÔËÌÀÞÅÎÙ."
 
-#: LYMessages.c:276
+#: LYMessages.c:274
 msgid "Execution via bookmarks is disabled."
 msgstr "÷ÙÐÏÌÎÅÎÉÅ ÞÅÒÅÚ ÚÁËÌÁÄËÉ ÏÔËÌÀÞÅÎÏ."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:276
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "æÁÊÌ ÚÁËÌÁÄÏË ÎÅ ÏÐÒÅÄÅÌÅÎ. éÓÐÏÌØÚÕÊÔÅ %s ÄÌÑ ÐÒÏÓÍÏÔÒÁ ÏÐÃÉÊ."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:278
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ ÄÌÑ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ ÚÁËÌÁÄÏË X Mosaic."
 
-#: LYMessages.c:281
+#: LYMessages.c:279
 msgid "ERROR - unable to open bookmark file."
 msgstr "ïûéâëá - ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÚÁËÌÁÄÏË."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:281
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÚÁËÌÁÄÏË ÄÌÑ ÕÄÁÌÅÎÉÑ ÓÓÙÌËÉ."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:283
 msgid "Unable to open scratch file for deletion of link."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÒÁÂÏÞÉÊ ÆÁÊÌ ÄÌÑ ÕÄÁÌÅÎÉÑ ÓÓÙÌËÉ."
 
-#: LYMessages.c:287
+#: LYMessages.c:285
 msgid "Error renaming scratch file."
 msgstr "ïÛÉÂËÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ ÒÁÂÏÞÅÇÏ ÆÁÊÌÁ."
 
-#: LYMessages.c:289
+#: LYMessages.c:287
 msgid "Error renaming temporary file."
 msgstr "ïÛÉÂËÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:289
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓËÏÐÉÒÏ×ÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ ÄÌÑ ÕÄÁÌÅÎÉÑ ÓÓÙÌËÉ."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:291
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÎÏ×Ï ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ ÄÌÑ ÕÄÁÌÅÎÉÑ ÓÓÙÌËÉ."
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:294
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "óÓÙÌËÁ ÎÅ ÎÁÈÏÄÉÔÓÑ ÃÅÌÉËÏÍ ÎÁ ÏÄÎÏÊ ÓÔÒÏËÅ ÆÁÊÌÁ ÚÁËÌÁÄÏË."
 
-#: LYMessages.c:297
+#: LYMessages.c:295
 msgid "Bookmark deletion failed."
 msgstr "ïÛÉÂËÁ ÐÒÉ ÕÄÁÌÅÎÉÉ ÚÁËÌÁÄËÉ."
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:297
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr "ðÒÏÈÏÖÄÅÎÉÅ ÐÏ ÆÁÊÌÁÍ ÚÁËÌÁÄÏË ÎÅ×ÏÚÍÏÖÎÏ (ÔÏÌØËÏ ÐÏ http URL)."
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:299
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÚÁËÌÁÄÏË, ÓÎÁÞÁÌÁ ÉÓÐÏÌØÚÕÊÔÅ 'a' ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ ÓÓÙÌËÉ"
 
-#: LYMessages.c:302
+#: LYMessages.c:300
 msgid "There are no links in this bookmark file!"
 msgstr "÷ ÜÔÏÍ ÆÁÊÌÅ ÚÁËÌÁÄÏË ÎÅÔ ÓÓÙÌÏË!"
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:302
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr "óÏÈÒÁÎÉÔØ D)ÄÏËÕÍÅÎÔ ÉÌÉ L)ÓÓÙÌËÕ × ÆÁÊÌ ÚÁËÌÁÄÏË ÉÌÉ C)ÏÔÍÅÎÉÔØ? (d,l,c): "
 
-#: LYMessages.c:305
+#: LYMessages.c:303
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "óÏÈÒÁÎÉÔØ D)ÄÏËÕÍÅÎÔ × ÆÁÊÌ ÚÁËÌÁÄÏË ÉÌÉ C)ÏÔÍÅÎÉÔØ? (d,c): "
 
-#: LYMessages.c:306
+#: LYMessages.c:304
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "óÏÈÒÁÎÉÔØ L)ÓÓÙÌËÕ × ÆÁÊÌ ÚÁËÌÁÄÏË ÉÌÉ C)ÏÔÍÅÎÉÔØ? (l,c): "
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:308
+#: LYMessages.c:306
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr "äÏËÕÍÅÎÔÙ ÉÚ ÆÏÒÍ Ó ÓÏÄÅÒÖÉÍÙÍ POST ÎÅ ÍÏÇÕÔ ÂÙÔØ ÓÏÈÒÁÎÅÎÙ ËÁË ÚÁËÌÁÄËÉ."
 
-#: LYMessages.c:309
+#: LYMessages.c:307
 msgid "Cannot save form fields/links"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÈÒÁÎÉÔØ ÐÏÌÑ/ÓÓÙÌËÉ ÆÏÒÍÙ"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:311
+#: LYMessages.c:309
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "éÓÔÏÒÉÑ, ÉÎÆÏÒÍÁÃÉÑ, ÍÅÎÀ É ÆÁÊÌÙ ÓÐÉÓËÏ× ÎÅ ÍÏÇÕÔ ÂÙÔØ ÓÏÈÒÁÎÅÎÙ ËÁË ÚÁËÌÁÄËÉ."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:313
+#: LYMessages.c:311
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÜÔÕ ÓÓÙÌËÕ ÉÚ ÆÁÊÌÁ ÚÁËÌÁÄÏË?"
 
-#: LYMessages.c:314
+#: LYMessages.c:312
 msgid "Malformed address."
 msgstr "îÅÐÒÁ×ÉÌØÎÏ ÓÆÏÒÍÉÒÏ×ÁÎÎÙÊ ÁÄÒÅÓ."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:316
+#: LYMessages.c:314
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "éÓÔÏÒÉÞÅÓËÉÊ ÓÐÏÓÏ ÒÁÚÂÏÒÁ ËÏÍÍÅÎÔÁÒÉÅ× ÷ëìàþåî (ÚÁÍÅÝÁÅÔ íÉÎÉÍÁÌØÎÙÊ)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:318
+#: LYMessages.c:316
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "éÓÔÏÒÉÞÅÓËÉÊ ÓÐÏÓÏ ÒÁÚÂÏÒÁ ËÏÍÍÅÎÔÁÒÉÅ× ÷ùëìàþåî (íÉÎÉÍÁÌØÎÙÊ ÄÅÊÓÔ×ÕÅÔ)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:320
+#: LYMessages.c:318
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "éÓÔÏÒÉÞÅÓËÉÊ ÓÐÏÓÏ ÒÁÚÂÏÒÁ ËÏÍÍÅÎÔÁÒÉÅ× ÷ëìàþåî (ÚÁÍÅÝÁÅÔ ðÒÁ×ÉÌØÎÙÊ)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:322
+#: LYMessages.c:320
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "éÓÔÏÒÉÞÅÓËÉÊ ÓÐÏÓÏ ÒÁÚÂÏÒÁ ËÏÍÍÅÎÔÁÒÉÅ× ÷ùëìàþåî (ðÒÁ×ÉÌØÎÙÊ ÄÅÊÓÔ×ÕÅÔ)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:324
+#: LYMessages.c:322
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "íÉÎÉÍÁÌØÎÙÊ ÓÐÏÓÏ ÒÁÚÂÏÒÁ ËÏÍÍÅÎÔÁÒÉÅ× ÷ëìàþåî (É ÄÅÊÓÔ×ÕÅÔ)!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:324
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "íÉÎÉÍÁÌØÎÙÊ ÓÐÏÓÏ ÒÁÚÂÏÒÁ ËÏÍÍÅÎÔÁÒÉÅ× ÷ùëìàþåî (ðÒÁ×ÉÌØÎÙÊ ÄÅÊÓÔ×ÕÅÔ)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:328
+#: LYMessages.c:326
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "íÉÎÉÍÁÌØÎÙÊ ÓÐÏÓÏ ÒÁÚÂÏÒÁ ËÏÍÍÅÎÔÁÒÉÅ× ÷ëìàþåî (ÎÏ éÓÔÏÒÉÞÅÓËÉÊ ÄÅÊÓÔ×ÕÅÔ)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:330
+#: LYMessages.c:328
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "íÉÎÉÍÁÌØÎÙÊ ÓÐÏÓÏ ÒÁÚÂÏÒÁ ËÏÍÍÅÎÔÁÒÉÅ× ÷ùëìàþåî (éÓÔÏÒÉÞÅÓËÉÊ ÄÅÊÓÔ×ÕÅÔ)!"
 
-#: LYMessages.c:331
+#: LYMessages.c:329
 msgid "Soft double-quote parsing ON!"
 msgstr "íÑÇËÉÊ ÒÁÚÂÏÒ Ä×ÏÊÎÙÈ ËÁ×ÙÞÅË ÷ëìàþåî!"
 
-#: LYMessages.c:332
+#: LYMessages.c:330
 msgid "Soft double-quote parsing OFF!"
 msgstr "íÑÇËÉÊ ÒÁÚÂÏÒ Ä×ÏÊÎÙÈ ËÁ×ÙÞÅË ÷ùëìàþåî!"
 
-#: LYMessages.c:333
+#: LYMessages.c:331
 msgid "Now using TagSoup parsing of HTML."
 msgstr "ôÅÐÅÒØ ÉÓÐÏÌØÚÕÅÔÓÑ ÍÅÔÏÄ TagSoup ÒÁÚÂÏÒÁ HTML."
 
-#: LYMessages.c:334
+#: LYMessages.c:332
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "ôÅÐÅÒØ ÉÓÐÏÌØÚÕÅÔÓÑ ÍÅÔÏÄ SortaSGML ÒÁÚÂÏÒÁ HTML!"
 
-#: LYMessages.c:335
+#: LYMessages.c:333
 msgid "You are already at the end of this document."
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ × ËÏÎÃÅ ÜÔÏÇÏ ÄÏËÕÍÅÎÔÁ."
 
-#: LYMessages.c:336
+#: LYMessages.c:334
 msgid "You are already at the beginning of this document."
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ × ÎÁÞÁÌÅ ÜÔÏÇÏ ÄÏËÕÍÅÎÔÁ."
 
-#: LYMessages.c:337
+#: LYMessages.c:335
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÓÔÒÁÎÉÃÅ %d ÜÔÏÇÏ ÄÏËÕÍÅÎÔÁ."
 
-#: LYMessages.c:338
+#: LYMessages.c:336
 #, c-format
 msgid "Link number %d already is current."
 msgstr "óÓÙÌËÁ ÎÏÍÅÒ %d ÕÖÅ Ñ×ÌÑÅÔÓÑ ÔÅËÕÝÅÊ."
 
-#: LYMessages.c:339
+#: LYMessages.c:337
 msgid "You are already at the first document"
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÐÅÒ×ÏÍ ÄÏËÕÍÅÎÔÅ"
 
-#: LYMessages.c:340
+#: LYMessages.c:338
 msgid "There are no links above this line of the document."
 msgstr "÷ÙÛÅ ÜÔÏÊ ÓÔÒÏËÉ ÄÏËÕÍÅÎÔÁ ÓÓÙÌÏË ÎÅÔ."
 
-#: LYMessages.c:341
+#: LYMessages.c:339
 msgid "There are no links below this line of the document."
 msgstr "îÉÖÅ ÜÔÏÊ ÓÔÒÏËÉ ÄÏËÕÍÅÎÔÁ ÓÓÙÌÏË ÎÅÔ."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:343
+#: LYMessages.c:341
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "íÁËÓÉÍÁÌØÎÁÑ ÄÌÉÎÁ ÄÏÓÔÉÇÎÕÔÁ!  õÄÁÌÉÔÅ ÔÅËÓÔ ÉÌÉ ×ÙÊÄÅÔÅ Ó ÐÏÌÑ."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:345
+#: LYMessages.c:343
 msgid "You are not on a form submission button or normal link."
 msgstr "÷Ù ÎÁÈÏÄÉÔÅÓØ ÎÅ ÎÁ ËÎÏÐËÅ ÐÏÓÙÌËÉ ÆÏÒÍÙ ÉÌÉ ÏÂÙÞÎÏÊ ÓÓÙÌËÅ."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:347
+#: LYMessages.c:345
 msgid "One radio button must be checked at all times!"
 msgstr "÷ÓÅ ×ÒÅÍÑ ÄÏÌÖÎÁ ÂÙÔØ ×ÙÂÒÁÎÁ ÏÄÎÁ ÚÁ×ÉÓÉÍÁÑ ËÎÏÐËÁ!"
 
-#: LYMessages.c:348
+#: LYMessages.c:346
 msgid "No submit button for this form, submit single text field?"
 msgstr "÷ ÜÔÏÊ ÆÏÒÍÅ ÎÅÔ ËÎÏÐËÉ ÐÏÓÙÌËÉ, ÐÏÓÌÁÔØ ÏÄÎÏ ÔÅËÓÔÏ×ÏÅ ÐÏÌÅ?"
 
-#: LYMessages.c:349
+#: LYMessages.c:347
 msgid "Do you want to go back to the previous document?"
 msgstr "÷Ù ÈÏÔÉÔÅ ×ÅÒÎÕÔØÓÑ ÎÁÚÁÄ Ë ÐÒÅÄÙÄÕÝÅÍÕ ÄÏËÕÍÅÎÔÕ?"
 
-#: LYMessages.c:350
+#: LYMessages.c:348
 msgid "Use arrows or tab to move off of field."
 msgstr "éÓÐÏÌØÚÕÊÔÅ ÓÔÒÅÌËÉ ÉÌÉ tab ÄÌÑ ×ÙÈÏÄÁ ÉÚ ÐÏÌÑ."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:352
+#: LYMessages.c:350
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "÷×ÅÄÉÔÅ ÔÅËÓÔ.  éÓÐÏÌØÚÕÊÔÅ ÓÔÒÅÌËÉ ÉÌÉ tab ÄÌÑ ×ÙÈÏÄÁ ÉÚ ÐÏÌÑ."
 
-#: LYMessages.c:353
+#: LYMessages.c:351
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** ðÌÏÈÏÊ HTML!!  îÅ ÏÐÒÅÄÅÌÅÎÏ ÄÅÊÓÔ×ÉÅ ÆÏÒÍÙ. **"
 
-#: LYMessages.c:354
+#: LYMessages.c:352
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "ðÌÏÈÏÊ HTML!!  îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÓÐÌÙ×ÁÀÝÅÅ ÏËÎÏ!"
 
-#: LYMessages.c:355
+#: LYMessages.c:353
 msgid "Unable to create popup window!"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÓÐÌÙ×ÁÀÝÅÅ ÏËÎÏ!"
 
-#: LYMessages.c:356
+#: LYMessages.c:354
 msgid "Goto a random URL is disallowed!"
 msgstr "ðÅÒÅÈÏÄ Ë ÓÌÕÞÁÊÎÏÍÕ URL ÚÁÐÒÅÝÅÎ!"
 
-#: LYMessages.c:357
+#: LYMessages.c:355
 msgid "Goto a non-http URL is disallowed!"
 msgstr "ðÅÒÅÈÏÄ Ë ÎÅ-http URL ÚÁÐÒÅÝÅÎ!"
 
-#: LYMessages.c:358
+#: LYMessages.c:356
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "÷ÁÍ ÎÅ ÒÁÚÒÅÛÅÎÏ ÐÅÒÅÈÏÄÉÔØ Ë \"%s\" URLs"
 
-#: LYMessages.c:359
+#: LYMessages.c:357
 msgid "URL to open: "
 msgstr "ïÔËÒÙÔØ URL: "
 
-#: LYMessages.c:360
+#: LYMessages.c:358
 msgid "Edit the current Goto URL: "
 msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÔÅËÕÝÅÇÏ URL ÄÌÑ ÐÅÒÅÈÏÄÁ: "
 
-#: LYMessages.c:361
+#: LYMessages.c:359
 msgid "Edit the previous Goto URL: "
 msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÐÒÅÄÙÄÕÝÅÇÏ URL ÄÌÑ ÐÅÒÅÈÏÄÁ: "
 
-#: LYMessages.c:362
+#: LYMessages.c:360
 msgid "Edit a previous Goto URL: "
 msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÐÒÅÄÙÄÕÝÅÇÏ URL ÄÌÑ ÐÅÒÅÈÏÄÁ: "
 
-#: LYMessages.c:363
+#: LYMessages.c:361
 msgid "Current document has POST data."
 msgstr "ôÅËÕÝÉÊ ÄÏËÕÍÅÎÔ ÉÍÅÅÔ POST-ÄÁÎÎÙÅ."
 
-#: LYMessages.c:364
+#: LYMessages.c:362
 msgid "Edit this document's URL: "
 msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ URL ÜÔÏÇÏ ÄÏËÕÍÅÎÔÁ: "
 
-#: LYMessages.c:365
+#: LYMessages.c:363
 msgid "Edit the current link's URL: "
 msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ URL ÔÅËÕÝÅÊ ÓÓÙÌËÉ: "
 
-#: LYMessages.c:366
+#: LYMessages.c:364
 msgid "You cannot edit File Management URLs"
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÒÅÄÁËÔÉÒÏ×ÁÔØ URL òÁÂÏÔÙ Ó æÁÊÌÁÍÉ"
 
-#: LYMessages.c:367
+#: LYMessages.c:365
 msgid "Enter a database query: "
 msgstr "÷×ÅÄÉÔÅ ÚÁÐÒÏÓ Ë ÂÁÚÅ ÄÁÎÎÙÈ: "
 
-#: LYMessages.c:368
+#: LYMessages.c:366
 msgid "Enter a whereis query: "
 msgstr "÷×ÅÄÉÔÅ ÚÁÐÒÏÓ ÎÁ ÐÏÉÓË: "
 
-#: LYMessages.c:369
+#: LYMessages.c:367
 msgid "Edit the current query: "
 msgstr "ïÔÒÅÄÁËÔÉÒÕÊÔÅ ÔÅËÕÝÉÊ ÚÁÐÒÏÓ: "
 
-#: LYMessages.c:370
+#: LYMessages.c:368
 msgid "Edit the previous query: "
 msgstr "ïÔÒÅÄÁËÔÉÒÕÊÔÅ ÐÒÅÄÙÄÕÝÉÊ ÚÁÐÒÏÓ: "
 
-#: LYMessages.c:371
+#: LYMessages.c:369
 msgid "Edit a previous query: "
 msgstr "ïÔÒÅÄÁËÔÉÒÕÊÔÅ ÐÒÅÄÙÄÕÝÉÊ ÚÁÐÒÏÓ: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:373
+#: LYMessages.c:371
 msgid "Use Control-R to resubmit the current query."
 msgstr "éÓÐÏÌØÚÕÊÔÅ Control-R, ÞÔÏÂÙ ÐÏÓÌÁÔØ ÚÁÎÏ×Ï ÔÅËÕÝÉÊ ÚÁÐÒÏÓ."
 
-#: LYMessages.c:374
+#: LYMessages.c:372
 msgid "Edit the current shortcut: "
 msgstr "ïÔÒÅÄÁËÔÉÒÕÊÔÅ ÔÅËÕÝÅÅ ÓÏËÒÁÝÅÎÉÅ: "
 
-#: LYMessages.c:375
+#: LYMessages.c:373
 msgid "Edit the previous shortcut: "
 msgstr "ïÔÒÅÄÁËÔÉÒÕÊÔÅ ÐÒÅÄÙÄÕÝÅÅ ÓÏËÒÁÝÅÎÉÅ: "
 
-#: LYMessages.c:376
+#: LYMessages.c:374
 msgid "Edit a previous shortcut: "
 msgstr "ïÔÒÅÄÁËÔÉÒÕÊÔÅ ÐÒÅÄÙÄÕÝÅÅ ÓÏËÒÁÝÅÎÉÅ: "
 
-#: LYMessages.c:377
+#: LYMessages.c:375
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "ëÌÀÞ '%c' ÎÅ ÏÔÏÂÒÁÖÁÅÔÓÑ × ÆÁÊÌ ÐÅÒÅÈÏÄÏ×!"
 
-#: LYMessages.c:378
+#: LYMessages.c:376
 msgid "Cannot locate jump file!"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÂÎÁÒÕÖÉÔØ ÆÁÊÌ ÐÅÒÅÈÏÄÏ×!"
 
-#: LYMessages.c:379
+#: LYMessages.c:377
 msgid "Cannot open jump file!"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ ÐÅÒÅÈÏÄÏ×!"
 
-#: LYMessages.c:380
+#: LYMessages.c:378
 msgid "Error reading jump file!"
 msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ ÐÅÒÅÈÏÄÏ×!"
 
-#: LYMessages.c:381
+#: LYMessages.c:379
 msgid "Out of memory reading jump file!"
 msgstr "îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ ÄÌÑ ÞÔÅÎÉÑ ÆÁÊÌÁ ÐÅÒÅÈÏÄÏ×!"
 
-#: LYMessages.c:382
+#: LYMessages.c:380
 msgid "Out of memory reading jump table!"
 msgstr "îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ ÄÌÑ ÞÔÅÎÉÑ ÔÁÂÌÉÃÙ ÐÅÒÅÈÏÄÏ×!"
 
-#: LYMessages.c:383
+#: LYMessages.c:381
 msgid "No index is currently available."
 msgstr "óÅÊÞÁÓ ÎÅÔ ÄÏÓÔÕÐÎÏÇÏ ÉÎÄÅËÓÁ."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:385
+#: LYMessages.c:383
 msgid "Do you really want to go to the Main screen?"
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÐÅÒÅÊÔÉ Ë çÌÁ×ÎÏÍÕ ÜËÒÁÎÕ?"
 
-#: LYMessages.c:386
+#: LYMessages.c:384
 msgid "You are already at main screen!"
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÇÌÁ×ÎÏÍ ÜËÒÁÎÅ!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:388
+#: LYMessages.c:386
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "îÅ ÐÏÉÓËÏ×ÙÊ ÉÎÄÅËÓÉÒÏ×ÁÎÎÙÊ ÄÏËÕÍÅÎÔ - ÎÁÖÍÉÔÅ '/' ÄÌÑ ÐÏÉÓËÁ ÐÏ ÓÔÒÏËÅ ÔÅËÓÔÁ"
 
 #. #define NO_OWNER
-#: LYMessages.c:390
+#: LYMessages.c:388
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "äÌÑ ÜÔÏÇÏ ÆÁÊÌÁ ÎÅ ÏÐÒÅÄÅÌÅÎ ×ÌÁÄÅÌÅÃ, ÔÁË ÞÔÏ ×Ù ÎÅ ÍÏÖÅÔÅ ÐÏÓÌÁÔØ ËÏÍÍÅÎÔÁÒÉÊ"
 
-#: LYMessages.c:391
+#: LYMessages.c:389
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "÷ÌÁÄÅÌÅà ÎÅ ÏÐÒÅÄÅÌÅÎ. éÓÐÏÌØÚÕÊÔÅ %s?"
 
-#: LYMessages.c:392
+#: LYMessages.c:390
 msgid "Do you wish to send a comment?"
 msgstr "÷Ù ÈÏÔÉÔÅ ÐÏÓÌÁÔØ ËÏÍÍÅÎÔÁÒÉÊ?"
 
-#: LYMessages.c:393
+#: LYMessages.c:391
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "ðÏÞÔÁ ÚÁÐÒÅÝÅÎÁ, ÔÁË ÞÔÏ ×Ù ÎÅ ÍÏÖÅÔÅ ÐÏÓÌÁÔØ ËÏÍÍÅÎÔÁÒÉÊ"
 
-#: LYMessages.c:394
+#: LYMessages.c:392
 msgid "The 'e'dit command is currently disabled."
 msgstr "ëÏÍÁÎÄÁ e)ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÓÅÊÞÁÓ ÏÔËÌÀÞÅÎÁ."
 
-#: LYMessages.c:395
+#: LYMessages.c:393
 msgid "External editing is currently disabled."
 msgstr "÷ÎÅÛÎÅÅ ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÓÅÊÞÁÓ ÏÔËÌÀÞÅÎÏ."
 
-#: LYMessages.c:396
+#: LYMessages.c:394
 msgid "System error - failure to get status."
 msgstr "óÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ - ÎÅ ÕÄÁÅÔÓÑ ÐÏÌÕÞÉÔØ ÓÔÁÔÕÓ."
 
-#: LYMessages.c:397
+#: LYMessages.c:395
 msgid "No editor is defined!"
 msgstr "òÅÄÁËÔÏÒ ÎÅ ÏÐÒÅÄÅÌÅÎ!"
 
-#: LYMessages.c:398
+#: LYMessages.c:396
 msgid "The 'p'rint command is currently disabled."
 msgstr "ëÏÍÁÎÄÁ p)ÐÅÞÁÔÉ ÓÅÊÞÁÓ ÏÔËÌÀÞÅÎÁ."
 
-#: LYMessages.c:399
+#: LYMessages.c:397
 msgid "Document has no Toolbar links or Banner."
 msgstr "äÏËÕÍÅÎÔ ÎÅ ÉÍÅÅÔ ÓÓÙÌÏË Toolbar ÉÌÉ Banner."
 
-#: LYMessages.c:400
+#: LYMessages.c:398
 msgid "Unable to open traversal file."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ ÐÒÏÈÏÖÄÅÎÉÑ."
 
-#: LYMessages.c:401
+#: LYMessages.c:399
 msgid "Unable to open traversal found file."
 msgstr ""
 
-#: LYMessages.c:402
+#: LYMessages.c:400
 msgid "Unable to open reject file."
 msgstr ""
 
-#: LYMessages.c:403
+#: LYMessages.c:401
 msgid "Unable to open traversal errors output file"
 msgstr ""
 
-#: LYMessages.c:404
+#: LYMessages.c:402
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "ðïèïöäåîéå ðòåò÷áîï"
 
-#: LYMessages.c:405
+#: LYMessages.c:403
 msgid "Follow link (or goto link or page) number: "
 msgstr "ðÅÒÅÈÏÄ ÐÏ ÓÓÙÌËÅ (ÉÌÉ Ë ÓÓÙÌËÅ ÉÌÉ ÓÔÒÁÎÉÃÅ) Ó ÎÏÍÅÒÏÍ: "
 
-#: LYMessages.c:406
+#: LYMessages.c:404
 msgid "Select option (or page) number: "
 msgstr "÷ÙÂÅÒÉÔÅ ÎÏÍÅÒ ÏÐÃÉÉ (ÉÌÉ ÓÔÒÁÎÉÃÙ): "
 
-#: LYMessages.c:407
+#: LYMessages.c:405
 #, c-format
 msgid "Option number %d already is current."
 msgstr "ïÐÃÉÑ ÎÏÍÅÒ %d ÕÖÅ Ñ×ÌÑÅÔÓÑ ÔÅËÕÝÅÊ."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:409
+#: LYMessages.c:407
 msgid "You are already at the end of this option list."
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ × ËÏÎÃÅ ÜÔÏÇÏ ÓÐÉÓËÁ ÏÐÃÉÊ."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:411
+#: LYMessages.c:409
 msgid "You are already at the beginning of this option list."
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ × ÎÁÞÁÌÅ ÜÔÏÇÏ ÓÐÉÓËÁ ÏÐÃÉÊ."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:413
+#: LYMessages.c:411
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÓÔÒÁÎÉÃÅ %d ÜÔÏÇÏ ÓÐÉÓËÁ ÏÐÃÉÊ."
 
-#: LYMessages.c:414
+#: LYMessages.c:412
 msgid "You have entered an invalid option number."
 msgstr "÷Ù ××ÅÌÉ ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÏÐÃÉÉ."
 
-#: LYMessages.c:415
+#: LYMessages.c:413
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** ðÌÏÈÏÊ HTML!! äÌÑ ÄÉÁÇÎÏÓÔÉËÉ ÉÓÐÏÌØÚÕÊÔÅ -trace. **"
 
-#: LYMessages.c:416
+#: LYMessages.c:414
 msgid "Give name of file to save in"
 msgstr "úÁÄÁÊÔÅ ÉÍÑ ÆÁÊÌÁ ÄÌÑ ÚÁÐÉÓÉ"
 
-#: LYMessages.c:417
+#: LYMessages.c:415
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÚÁÐÉÓÁÔØ ÄÁÎÎÙÅ × ÆÁÊÌ -- ÐÏÖÁÌÕÊÓÔÁ, ÚÁÐÕÓÔÉÔÅ WWW ÌÏËÁÌØÎÏ"
 
-#: LYMessages.c:418
+#: LYMessages.c:416
 msgid "Can't open temporary file!"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ!"
 
-#: LYMessages.c:419
+#: LYMessages.c:417
 msgid "Can't open output file!  Cancelling!"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ!  ïÔÍÅÎÁ!"
 
-#: LYMessages.c:420
+#: LYMessages.c:418
 msgid "Execution is disabled."
 msgstr "÷ÙÐÏÌÎÅÎÉÅ ÏÔËÌÀÞÅÎÏ."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:422
+#: LYMessages.c:420
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "÷ÙÐÏÌÎÅÎÉÅ ÄÌÑ ÜÔÏÇÏ ÆÁÊÌÁ ÏÔËÌÀÞÅÎÏ.  óÍ. ÍÅÎÀ ïÐÃÉÊ (ÉÓÐÏÌØÚÕÊÔÅ %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:424
+#: LYMessages.c:422
 msgid "Execution capabilities are not compiled into this version."
 msgstr "÷ÏÚÍÏÖÎÏÓÔÉ ×ÙÐÏÌÎÅÎÉÑ ÎÅ ×ËÌÀÞÅÎÙ × ÜÔÕ ×ÅÒÓÉÀ."
 
-#: LYMessages.c:425
+#: LYMessages.c:423
 msgid "This file cannot be displayed on this terminal."
 msgstr "üÔÏÔ ÆÁÊÌ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÏÔÏÂÒÁÖÅÎ ÎÁ ÄÁÎÎÏÍ ÔÅÒÍÉÎÁÌÅ."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:427
+#: LYMessages.c:425
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "üÔÏÔ ÆÁÊÌ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÏÔÏÂÒÁÖÅÎ ÎÁ ÄÁÎÎÏÍ ÔÅÒÍÉÎÁÌÅ: D)ÚÁÇÒÕÚÉÔØ ÉÌÉ C)ÏÔÍÅÎÉÔØ"
 
-#: LYMessages.c:428
+#: LYMessages.c:426
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D)ÓËÁÞÁÔØ ÉÌÉ C)ÏÔÍÅÎÉÔØ"
 
-#: LYMessages.c:429
+#: LYMessages.c:427
 msgid "Cancelling file."
 msgstr "ïÔÍÅÎÁ ÆÁÊÌÁ."
 
-#: LYMessages.c:430
+#: LYMessages.c:428
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "ðÏÌÕÞÅÎÉÅ ÆÁÊÌÁ.  - ðïöáìõêóôá, ðïäïöäéôå -"
 
-#: LYMessages.c:431
+#: LYMessages.c:429
 msgid "Enter a filename: "
 msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ: "
 
-#: LYMessages.c:432
+#: LYMessages.c:430
 msgid "Edit the previous filename: "
 msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÐÒÅÄÙÄÕÝÅÇÏ ÉÍÅÎÉ ÆÁÊÌÁ: "
 
-#: LYMessages.c:433
+#: LYMessages.c:431
 msgid "Edit a previous filename: "
 msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÐÒÅÄÙÄÕÝÅÇÏ ÉÍÅÎÉ ÆÁÊÌÁ: "
 
-#: LYMessages.c:434
+#: LYMessages.c:432
 msgid "Enter a new filename: "
 msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÉÍÑ ÆÁÊÌÁ: "
 
-#: LYMessages.c:435
+#: LYMessages.c:433
 msgid "File name may not begin with a dot."
 msgstr "éÍÑ ÆÁÊÌÁ ÎÅ ÍÏÖÅÔ ÎÁÞÉÎÁÔØÓÑ Ó ÔÏÞËÉ."
 
-#: LYMessages.c:437
+#: LYMessages.c:435
 msgid "File exists.  Create higher version?"
 msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ.  óÏÚÄÁÔØ ÅÝÅ ÏÄÎÕ ×ÅÒÓÉÀ?"
 
-#: LYMessages.c:439
+#: LYMessages.c:437
 msgid "File exists.  Overwrite?"
 msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ.  ðÅÒÅÚÁÐÉÓÁÔØ?"
 
-#: LYMessages.c:441
+#: LYMessages.c:439
 msgid "Cannot write to file."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÚÁÐÉÓÁÔØ × ÆÁÊÌ."
 
-#: LYMessages.c:442
+#: LYMessages.c:440
 msgid "ERROR! - download command is misconfigured."
 msgstr "ïûéâëá! - ËÏÍÁÎÄÁ ÓËÁÞÉ×ÁÎÉÑ ÎÅÐÒÁ×ÉÌØÎÏ ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÎÁ."
 
-#: LYMessages.c:443
+#: LYMessages.c:441
 msgid "Unable to download file."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÓËÁÞÁÔØ ÆÁÊÌ."
 
-#: LYMessages.c:444
+#: LYMessages.c:442
 msgid "Reading directory..."
 msgstr "þÔÅÎÉÅ ËÁÔÁÌÏÇÁ..."
 
-#: LYMessages.c:445
+#: LYMessages.c:443
 msgid "Building directory listing..."
 msgstr "ðÏÓÔÒÏÅÎÉÅ ÓÐÉÓËÁ ËÁÔÁÌÏÇÁ..."
 
-#: LYMessages.c:446
+#: LYMessages.c:444
 msgid "Saving..."
 msgstr "óÏÈÒÁÎÅÎÉÅ..."
 
-#: LYMessages.c:447
+#: LYMessages.c:445
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔÒÅÄÁËÔÉÒÏ×ÁÔØ ÆÁÊÌ '%s'."
 
-#: LYMessages.c:448
+#: LYMessages.c:446
 msgid "Unable to access document!"
 msgstr "ïÛÉÂËÁ ÄÏÓÔÕÐÁ Ë ÄÏËÕÍÅÎÔÕ!"
 
-#: LYMessages.c:449
+#: LYMessages.c:447
 msgid "Could not access file."
 msgstr "ïÛÉÂËÁ ÄÏÓÔÕÐÁ Ë ÆÁÊÌÕ."
 
-#: LYMessages.c:450
+#: LYMessages.c:448
 msgid "Could not access directory."
 msgstr "ïÛÉÂËÁ ÄÏÓÔÕÐÁ Ë ËÁÔÁÌÏÇÕ."
 
-#: LYMessages.c:451
+#: LYMessages.c:449
 msgid "Could not load data."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÚÁÇÒÕÚÉÔØ ÄÁÎÎÙÅ."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:453
+#: LYMessages.c:451
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "÷ ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ Lynx ÎÅ ÍÏÖÅÔ e)ÒÅÄÁËÔÉÒÏ×ÁÔØ ÕÄÁÌÅÎÎÙÅ WWW ÆÁÊÌÙ."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:455
+#: LYMessages.c:453
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "üÔÏ ÐÏÌÅ ÎÅ ÍÏÖÅÔ ÂÙÔØ e)ÏÔÒÅÄÁËÔÉÒÏ×ÁÎÏ Ó ÐÏÍÏÝØÀ ×ÎÅÛÎÅÇÏ ÒÅÄÁËÔÏÒÁ."
 
-#: LYMessages.c:456
+#: LYMessages.c:454
 msgid "Bad rule"
 msgstr "ðÌÏÈÏÅ ÐÒÁ×ÉÌÏ"
 
-#: LYMessages.c:457
+#: LYMessages.c:455
 msgid "Insufficient operands:"
 msgstr "îÅÄÏÓÔÁÔÏÞÎÏ ÏÐÅÒÁÎÄÏ×:"
 
-#: LYMessages.c:458
+#: LYMessages.c:456
 msgid "You are not authorized to edit this file."
 msgstr "õ ×ÁÓ ÎÅÔ ÐÏÌÎÏÍÏÞÉÊ ÄÌÑ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÜÔÏÇÏ ÆÁÊÌÁ."
 
-#: LYMessages.c:459
+#: LYMessages.c:457
 msgid "Title: "
 msgstr "úÁÇÏÌÏ×ÏË: "
 
-#: LYMessages.c:460
+#: LYMessages.c:458
 msgid "Subject: "
 msgstr "ôÅÍÁ: "
 
-#: LYMessages.c:461
+#: LYMessages.c:459
 msgid "Username: "
 msgstr "éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ: "
 
-#: LYMessages.c:462
+#: LYMessages.c:460
 msgid "Password: "
 msgstr "ðÁÒÏÌØ: "
 
-#: LYMessages.c:463
+#: LYMessages.c:461
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: ÔÒÅÂÕÀÔÓÑ éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ É ðÁÒÏÌØ!!!"
 
-#: LYMessages.c:464
+#: LYMessages.c:462
 msgid "lynx: Password required!!!"
 msgstr "lynx: ÔÒÅÂÕÅÔÓÑ ðÁÒÏÌØ!!!"
 
-#: LYMessages.c:465
+#: LYMessages.c:463
 msgid "Clear all authorization info for this session?"
 msgstr "ïÞÉÓÔÉÔØ ×ÓÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÐÏÌÎÏÍÏÞÉÑÈ ÄÌÑ ÜÔÏÇÏ ÓÅÁÎÓÁ?"
 
-#: LYMessages.c:466
+#: LYMessages.c:464
 msgid "Authorization info cleared."
 msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÐÏÌÎÏÍÏÞÉÑÈ ÏÞÉÝÅÎÁ."
 
-#: LYMessages.c:467
+#: LYMessages.c:465
 msgid "Authorization failed.  Retry?"
 msgstr "îÅÕÄÁÞÎÁÑ ÐÒÏ×ÅÒËÁ ÐÏÌÎÏÍÏÞÉÊ.  ðÏ×ÔÏÒÉÔØ?"
 
-#: LYMessages.c:468
+#: LYMessages.c:466
 msgid "cgi support has been disabled."
 msgstr "ÐÏÄÄÅÒÖËÁ cgi ÂÙÌÁ ÏÔËÌÀÞÅÎÁ."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:470
+#: LYMessages.c:468
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "÷ÏÚÍÏÖÎÏÓÔÉ lynxcgi ÎÅ ÓËÏÍÐÉÌÉÒÏ×ÁÎÙ × ÜÔÏÊ ×ÅÒÓÉÉ."
 
-#: LYMessages.c:471
+#: LYMessages.c:469
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "éÚ×ÉÎÉÔÅ, ÎÅÔ ÉÚ×ÅÓÔÎÏÇÏ ÓÐÏÓÏÂÁ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ %s × %s."
 
-#: LYMessages.c:472
+#: LYMessages.c:470
 msgid "Unable to set up connection."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÐÏÄÇÏÔÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ."
 
-#: LYMessages.c:473
+#: LYMessages.c:471
 msgid "Unable to make connection"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ"
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:475
+#: LYMessages.c:473
 msgid "Executable link rejected due to malformed request."
 msgstr "÷ÙÐÏÌÎÑÅÍÁÑ ÓÓÙÌËÁ ÏÔ×ÅÒÇÎÕÔÁ ÉÚ-ÚÁ ÎÅÐÒÁ×ÉÌØÎÏ ÓÆÏÒÍÉÒÏ×ÁÎÎÏÇÏ ÚÁÐÒÏÓÁ."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:477
+#: LYMessages.c:475
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "÷ÙÐÏÌÎÑÅÍÁÑ ÓÓÙÌËÁ ÏÔ×ÅÒÇÎÕÔÁ ÉÚ-ÚÁ ÓÉÍ×ÏÌÁ `%c'."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:477
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "÷ÙÐÏÌÎÑÅÍÁÑ ÓÓÙÌËÁ ÏÔ×ÅÒÇÎÕÔÁ ÉÚ-ÚÁ ÓÔÒÏËÉ ÏÔÎÏÓÉÔÅÌØÎÏÇÏ ÐÕÔÉ ('../')."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:479
 msgid "Executable link rejected due to location or path."
 msgstr "÷ÙÐÏÌÎÑÅÍÁÑ ÓÓÙÌËÁ ÏÔ×ÅÒÇÎÕÔÁ ÉÚ-ÚÁ ÁÄÒÅÓÁ ÉÌÉ ÐÕÔÉ."
 
-#: LYMessages.c:482
+#: LYMessages.c:480
 msgid "Mail access is disabled!"
 msgstr "äÏÓÔÕÐ Ë ÐÏÞÔÅ ÏÔËÌÀÞÅÎ!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:484
+#: LYMessages.c:482
 msgid "Only files and servers on the local host can be accessed."
 msgstr "äÏÓÔÕÐÎÙ ÔÏÌØËÏ ÆÁÊÌÙ É ÓÅÒ×ÅÒÙ ÎÁ ÌÏËÁÌØÎÏÍ ËÏÍÐØÀÔÅÒÅ."
 
-#: LYMessages.c:485
+#: LYMessages.c:483
 msgid "Telnet access is disabled!"
 msgstr "äÏÓÔÕÐ Ë telnet ÚÁÐÒÅÝÅÎ!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:487
+#: LYMessages.c:485
 msgid "Telnet port specifications are disabled."
 msgstr "óÐÅÃÉÆÉËÁÃÉÉ ÐÏÒÔÁ ÄÌÑ telnet ÚÁÐÒÅÝÅÎÙ."
 
-#: LYMessages.c:488
+#: LYMessages.c:486
 msgid "USENET news access is disabled!"
 msgstr "äÏÓÔÕÐ Ë ÎÏ×ÏÓÔÑÍ USENET ÚÁÐÒÅÝÅÎ!"
 
-#: LYMessages.c:489
+#: LYMessages.c:487
 msgid "Rlogin access is disabled!"
 msgstr "äÏÓÔÕÐ Ë rlogin ÚÁÐÒÅÝÅÎ!"
 
-#: LYMessages.c:490
+#: LYMessages.c:488
 msgid "Ftp access is disabled!"
 msgstr "äÏÓÔÕÐ Ë ftp ÚÁÐÒÅÝÅÎ!"
 
-#: LYMessages.c:491
+#: LYMessages.c:489
 msgid "There are no references from this document."
 msgstr "éÚ ÜÔÏÇÏ ÄÏËÕÍÅÎÔÁ ÎÅÔ ÓÓÙÌÏË."
 
-#: LYMessages.c:492
+#: LYMessages.c:490
 msgid "There are only hidden links from this document."
 msgstr "÷ ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÅÓÔØ ÔÏÌØËÏ ÓËÒÙÔÙÅ ÓÓÙÌËÉ."
 
-#: LYMessages.c:494
+#: LYMessages.c:492
 msgid "Unable to open command file."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ËÏÍÁÎÄÎÙÊ ÆÁÊÌ."
 
-#: LYMessages.c:496
+#: LYMessages.c:494
 msgid "News Post Cancelled!!!"
 msgstr "ðÏÓÙÌËÁ ÎÏ×ÏÓÔÅÊ ÐÒÅÒ×ÁÎÁ!!!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:498
+#: LYMessages.c:496
 msgid "Spawning your selected editor to edit news message"
 msgstr "úÁÐÕÓË ×ÙÂÒÁÎÎÏÇÏ ×ÁÍÉ ÒÅÄÁËÔÏÒÁ ÄÌÑ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÓÏÏÂÝÅÎÉÑ ÎÏ×ÏÓÔÅÊ"
 
-#: LYMessages.c:499
+#: LYMessages.c:497
 msgid "Post this message?"
 msgstr "ðÏÓÌÁÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ?"
 
-#: LYMessages.c:500
+#: LYMessages.c:498
 #, c-format
 msgid "Append '%s'?"
 msgstr "äÏÂÁ×ÉÔØ '%s'?"
 
-#: LYMessages.c:501
+#: LYMessages.c:499
 msgid "Posting to newsgroup(s)..."
 msgstr "ðÏÓÙÌËÁ × ÇÒÕÐÐÙ ÎÏ×ÏÓÔÅÊ..."
 
-#: LYMessages.c:503
+#: LYMessages.c:501
 msgid "*** You have unread mail. ***"
 msgstr "*** õ ×ÁÓ ÅÓÔØ ÎÅÐÒÏÞÉÔÁÎÎÁÑ ÐÏÞÔÁ. ***"
 
-#: LYMessages.c:505
+#: LYMessages.c:503
 msgid "*** You have mail. ***"
 msgstr "*** õ ×ÁÓ ÅÓÔØ ÐÏÞÔÁ. ***"
 
-#: LYMessages.c:507
+#: LYMessages.c:505
 msgid "*** You have new mail. ***"
 msgstr "*** õ ×ÁÓ ÅÓÔØ ÎÏ×ÁÑ ÐÏÞÔÁ. ***"
 
-#: LYMessages.c:508
+#: LYMessages.c:506
 msgid "File insert cancelled!!!"
 msgstr "÷ÓÔÁ×ËÁ ÆÁÊÌÁ ÏÔÍÅÎÅÎÁ!!!"
 
-#: LYMessages.c:509
+#: LYMessages.c:507
 msgid "Not enough memory for file!"
 msgstr "îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ ÄÌÑ ÆÁÊÌÁ!"
 
-#: LYMessages.c:510
+#: LYMessages.c:508
 msgid "Can't open file for reading."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÞÔÅÎÉÑ!"
 
-#: LYMessages.c:511
+#: LYMessages.c:509
 msgid "File does not exist."
 msgstr "æÁÊÌ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ."
 
-#: LYMessages.c:512
+#: LYMessages.c:510
 msgid "File does not exist - reenter or cancel:"
 msgstr "æÁÊÌ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ××ÅÄÉÔÅ ÓÎÏ×Á ÉÌÉ ÏÔÍÅÎÉÔÅ:"
 
-#: LYMessages.c:513
+#: LYMessages.c:511
 msgid "File is not readable."
 msgstr "æÁÊÌ ÎÅ ÄÏÓÔÕÐÅÎ ÎÁ ÞÔÅÎÉÅ."
 
-#: LYMessages.c:514
+#: LYMessages.c:512
 msgid "File is not readable - reenter or cancel:"
 msgstr "æÁÊÌ ÎÅ ÄÏÓÔÕÐÅÎ ÎÁ ÞÔÅÎÉÅ - ××ÅÄÉÔÅ ÓÎÏ×Á ÉÌÉ ÏÔÍÅÎÉÔÅ:"
 
-#: LYMessages.c:515
+#: LYMessages.c:513
 msgid "Nothing to insert - file is 0-length."
 msgstr "÷ÓÔÁ×ÌÑÔØ ÎÅÞÅÇÏ - ÆÁÊÌ ÎÕÌÅ×ÏÊ ÄÌÉÎÙ."
 
-#: LYMessages.c:516
+#: LYMessages.c:514
 msgid "Save request cancelled!!!"
 msgstr "úÁÐÒÏÓ ÎÁ ÓÏÈÒÁÎÅÎÉÅ ÏÔÍÅÎÅÎ!!!"
 
-#: LYMessages.c:517
+#: LYMessages.c:515
 msgid "Mail request cancelled!!!"
 msgstr "úÁÐÒÏÓ ÎÁ ÐÏÓÙÌËÕ ÐÏÞÔÙ ÏÔÍÅÎÅÎ!!!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:519
+#: LYMessages.c:517
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "ðÒÏÓÍÏÔÒ ÒÁÚÏÂÒÁÎÎÏÇÏ ÉÓÈÏÄÎÏÇÏ ÔÅËÓÔÁ. ÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÏÔÐÒÁ×ÉÔØ ÅÇÏ?"
 
-#: LYMessages.c:520
+#: LYMessages.c:518
 msgid "Please wait..."
 msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ..."
 
-#: LYMessages.c:521
+#: LYMessages.c:519
 msgid "Mailing file.  Please wait..."
 msgstr "ðÏÓÙÌËÁ ÆÁÊÌÁ ÐÏ ÐÏÞÔÅ.  ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ..."
 
-#: LYMessages.c:522
+#: LYMessages.c:520
 msgid "ERROR - Unable to mail file"
 msgstr "ïûéâëá - ÎÅ ÕÄÁÅÔÓÑ ÐÏÓÌÁÔØ ÆÁÊÌ ÐÏ ÐÏÞÔÅ"
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:524
+#: LYMessages.c:522
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "æÁÊÌ ÚÁÎÉÍÁÅÔ %d ÜËÒÁÎÏ×.  ÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÅÇÏ ÎÁÐÅÞÁÔÁÔØ?"
 
-#: LYMessages.c:525
+#: LYMessages.c:523
 msgid "Print request cancelled!!!"
 msgstr "úÁÐÒÏÓ ÎÁ ÐÅÞÁÔØ ÏÔÍÅÎÅÎ!!!"
 
-#: LYMessages.c:526
+#: LYMessages.c:524
 msgid "Press <return> to begin: "
 msgstr "îÁÖÍÉÔÅ <××ÏÄ> ÄÌÑ ÎÁÞÁÌÁ: "
 
-#: LYMessages.c:527
+#: LYMessages.c:525
 msgid "Press <return> to finish: "
 msgstr "îÁÖÍÉÔÅ <××ÏÄ> ÄÌÑ ÚÁ×ÅÒÛÅÎÉÑ: "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:527
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "æÁÊÌ ÚÁÎÉÍÁÅÔ %d ÓÔÒÁÎÉÃ.  ÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÎÁÐÅÞÁÔÁÔØ?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:531
+#: LYMessages.c:529
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "õÂÅÄÉÔÅÓØ, ÞÔÏ ÐÒÉÎÔÅÒ × ÒÅÖÉÍÅ on-line. îÁÖÍÉÔÅ <××ÏÄ> ÄÌÑ ÎÁÞÁÌÁ ÐÅÞÁÔÉ:"
 
-#: LYMessages.c:532
+#: LYMessages.c:530
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "ïûéâëá - ÎÅ ÕÄÁÅÔÓÑ ×ÙÄÅÌÉÔØ ÍÅÓÔÏ ÄÌÑ ÆÁÊÌÁ!!!"
 
-#: LYMessages.c:533
+#: LYMessages.c:531
 msgid "Unable to open tempfile"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ"
 
-#: LYMessages.c:534
+#: LYMessages.c:532
 msgid "Unable to open print options file"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ Ó ÏÐÃÉÑÍÉ ÐÅÞÁÔÉ"
 
-#: LYMessages.c:535
+#: LYMessages.c:533
 msgid "Printing file.  Please wait..."
 msgstr "ðÅÞÁÔØ ÆÁÊÌÁ.  ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ..."
 
-#: LYMessages.c:536
+#: LYMessages.c:534
 msgid "Please enter a valid internet mail address: "
 msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÐÒÁ×ÉÌØÎÙÊ ÁÄÒÅÓ ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÙ: "
 
-#: LYMessages.c:537
+#: LYMessages.c:535
 msgid "ERROR! - printer is misconfigured!"
 msgstr "ïûéâëá! - ÐÒÉÎÔÅÒ ÎÅÐÒÁ×ÉÌØÎÏ ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÎ!"
 
-#: LYMessages.c:538
+#: LYMessages.c:536
 msgid "Image map from POST response not available!"
 msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÎÁ×ÉÇÁÃÉÏÎÎÁÑ ËÁÒÔÁ ÏÔ ÏÔ×ÅÔÁ POST!"
 
-#: LYMessages.c:539
+#: LYMessages.c:537
 msgid "Misdirected client-side image MAP request!"
 msgstr ""
 
-#: LYMessages.c:540
+#: LYMessages.c:538
 msgid "Client-side image MAP is not accessible!"
 msgstr "ëÌÉÅÎÔÓËÁÑ ÎÁ×ÉÇÁÃÉÏÎÎÁÑ ËÁÒÔÁ ÎÅÄÏÓÔÕÐÎÁ!"
 
-#: LYMessages.c:541
+#: LYMessages.c:539
 msgid "No client-side image MAPs are available!"
 msgstr "ëÌÉÅÎÔÓËÉÅ ÎÁ×ÉÇÁÃÉÏÎÎÙÅ ËÁÒÔÙ ÏÔÓÕÔÓÔ×ÕÀÔ!"
 
-#: LYMessages.c:542
+#: LYMessages.c:540
 msgid "Client-side image MAP is not available!"
 msgstr "ëÌÉÅÎÔÓËÁÑ ÎÁ×ÉÇÁÃÉÏÎÎÁÑ ËÁÒÔÁ ÏÔÓÕÔÓÔ×ÕÅÔ!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:545
+#: LYMessages.c:543
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "äÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÍÅÎÀ ïÐÃÉÊ, ×ÙÓÏÔÁ ÜËÒÁÎÁ ÄÏÌÖÎÁ ÂÙÔØ ÎÅ ÍÅÎÅÅ 24 ÓÔÒÏË!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:547
+#: LYMessages.c:545
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "äÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÍÅÎÀ ïÐÃÉÊ, ×ÙÓÏÔÁ ÜËÒÁÎÁ ÄÏÌÖÎÁ ÂÙÔØ ÎÅ ÍÅÎÅÅ 23 ÓÔÒÏË!"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:549
+#: LYMessages.c:547
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "äÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÍÅÎÀ ïÐÃÉÊ, ×ÙÓÏÔÁ ÜËÒÁÎÁ ÄÏÌÖÎÁ ÂÙÔØ ÎÅ ÍÅÎÅÅ 22 ÓÔÒÏË!"
 
-#: LYMessages.c:551
+#: LYMessages.c:549
 msgid "That key requires Advanced User mode."
 msgstr "üÔÏÔ ËÌÀÞ ÔÒÅÂÕÅÔ ÒÅÖÉÍÁ ÄÌÑ ðÒÏÄ×ÉÎÕÔÏÇÏ ðÏÌØÚÏ×ÁÔÅÌÑ."
 
-#: LYMessages.c:552
+#: LYMessages.c:550
 #, c-format
 msgid "Content-type: %s"
 msgstr "ôÉÐ ÓÏÄÅÒÖÉÍÏÇÏ: %s"
 
-#: LYMessages.c:553
+#: LYMessages.c:551
 msgid "Command: "
 msgstr "ëÏÍÁÎÄÁ: "
 
-#: LYMessages.c:554
+#: LYMessages.c:552
 msgid "Unknown or ambiguous command"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÉÌÉ ÎÅÏÄÎÏÚÎÁÞÎÁÑ ËÏÍÁÎÄÁ"
 
-#: LYMessages.c:555
+#: LYMessages.c:553
 msgid " Version "
 msgstr " ÷ÅÒÓÉÑ "
 
-#: LYMessages.c:556
+#: LYMessages.c:554
 msgid " first"
 msgstr " ÓÎÁÞÁÌÁ"
 
-#: LYMessages.c:557
+#: LYMessages.c:555
 msgid ", guessing..."
 msgstr ", ÕÇÁÄÙ×ÁÎÉÅ..."
 
-#: LYMessages.c:558
+#: LYMessages.c:556
 msgid "Permissions for "
 msgstr "òÁÚÒÅÛÅÎÉÅ ÄÌÑ "
 
-#: LYMessages.c:559
+#: LYMessages.c:557
 msgid "Select "
 msgstr "÷ÙÂÅÒÉÔÅ "
 
-#: LYMessages.c:560
+#: LYMessages.c:558
 msgid "capital letter"
 msgstr "ÚÁÇÌÁ×ÎÁÑ ÂÕË×Á"
 
-#: LYMessages.c:561
+#: LYMessages.c:559
 msgid " of option line,"
 msgstr " ÓÔÒÏËÉ ÏÐÃÉÊ,"
 
-#: LYMessages.c:562
+#: LYMessages.c:560
 msgid " to save,"
 msgstr " ÄÌÑ ÚÁÐÉÓÉ,"
 
-#: LYMessages.c:563
+#: LYMessages.c:561
 msgid " to "
 msgstr " ÄÌÑ "
 
-#: LYMessages.c:564
+#: LYMessages.c:562
 msgid " or "
 msgstr " ÉÌÉ "
 
-#: LYMessages.c:565
+#: LYMessages.c:563
 msgid " index"
 msgstr " ÉÎÄÅËÓ"
 
-#: LYMessages.c:566
+#: LYMessages.c:564
 msgid " to return to Lynx."
 msgstr " ÄÌÑ ×ÏÚ×ÒÁÔÁ Ë Lynx."
 
-#: LYMessages.c:567
+#: LYMessages.c:565
 msgid "Accept Changes"
 msgstr "ðÒÉÎÑÔØ ÉÚÍÅÎÅÎÉÑ"
 
-#: LYMessages.c:568
+#: LYMessages.c:566
 msgid "Reset Changes"
 msgstr "ïÔÍÅÎÉÔØ éÚÍÅÎÅÎÉÑ"
 
-#: LYMessages.c:569
+#: LYMessages.c:567
 msgid "Left Arrow cancels changes"
 msgstr "ìÅ×ÁÑ óÔÒÅÌËÁ ÏÔÍÅÎÑÅÔ ÉÚÍÅÎÅÎÉÑ"
 
-#: LYMessages.c:570
+#: LYMessages.c:568
 msgid "Save options to disk"
 msgstr "óÏÈÒÁÎÉÔØ ÏÐÃÉÉ ÎÁ ÄÉÓË"
 
-#: LYMessages.c:571
+#: LYMessages.c:569
 msgid "Hit RETURN to accept entered data."
 msgstr "îÁÖÍÉÔÅ ÷÷ïä ÄÌÑ ÐÒÉÎÑÔÉÑ ××ÅÄÅÎÎÙÈ ÄÁÎÎÙÈ."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:573
+#: LYMessages.c:571
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr "îÁÖÍÉÔÅ ÷÷ïä ÄÌÑ ÐÒÉÎÑÔÉÑ ××ÅÄÅÎÎÙÈ ÄÁÎÎÙÈ.  õÄÁÌÉÔÅ ÄÌÑ ×ÏÚ×ÒÁÔÁ Ë ÐÒÅÄÙÄÕÝÉÍ."
 
-#: LYMessages.c:574
+#: LYMessages.c:572
 msgid "Value accepted!"
 msgstr "úÎÁÞÅÎÉÅ ÐÒÉÎÑÔÏ!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:576
+#: LYMessages.c:574
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "úÎÁÞÅÎÉÅ ÐÒÉÎÑÔÏ! -- ðòåäõðòåöäåîéå: Lynx ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÎ ÄÌÑ XWINDOWS!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:578
+#: LYMessages.c:576
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "úÎÁÞÅÎÉÅ ÐÒÉÎÑÔÏ! -- ðòåäõðòåöäåîéå: Lynx îå ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÎ ÄÌÑ XWINDOWS!"
 
-#: LYMessages.c:579
+#: LYMessages.c:577
 msgid "You are not allowed to change which editor to use!"
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ÒÅÄÁËÔÏÒ, ËÏÔÏÒÙÊ ÉÓÐÏÌØÚÏ×ÁÔØ!"
 
-#: LYMessages.c:580
+#: LYMessages.c:578
 msgid "Failed to set DISPLAY variable!"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÐÅÒÅÍÅÎÎÕÀ DISPLAY!"
 
-#: LYMessages.c:581
+#: LYMessages.c:579
 msgid "Failed to clear DISPLAY variable!"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÞÉÓÔÉÔØ ÐÅÒÅÍÅÎÎÕÀ DISPLAY!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:583
+#: LYMessages.c:581
 msgid "You are not allowed to change the bookmark file!"
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ÆÁÊÌ ÚÁËÌÁÄÏË!"
 
-#: LYMessages.c:584
+#: LYMessages.c:582
 msgid "Terminal does not support color"
 msgstr "ôÅÒÍÉÎÁÌ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ Ã×ÅÔ"
 
-#: LYMessages.c:585
+#: LYMessages.c:583
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "÷ÁÛ ÔÅÒÍÉÎÁÌ '%s' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ Ã×ÅÔ."
 
-#: LYMessages.c:586
+#: LYMessages.c:584
 msgid "Access to dot files is disabled!"
 msgstr "äÏÓÔÕÐ Ë dot-ÆÁÊÌÁÍ ÏÔËÌÀÞÅÎ!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:588
+#: LYMessages.c:586
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr "óÔÒÏËÁ User-Agent ÎÅ ÓÏÄÅÒÖÉÔ \"Lynx\" ÉÌÉ \"L_y_n_x\""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:590
+#: LYMessages.c:588
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr "éÓÐÏÌØÚÕÊÔÅ \"L_y_n_x\" ÉÌÉ \"Lynx\" × User-Agent, ÉÎÁÞÅ ÜÔÏ ×ÙÇÌÑÄÉÔ ËÁË ÐÒÅÄÎÁÍÅÒÅÎÎÙÊ ÏÂÍÁÎ!"
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:592
+#: LYMessages.c:590
 msgid "Changing of the User-Agent string is disabled!"
 msgstr "÷ÏÚÍÏÖÎÏÓÔØ ÉÚÍÅÎÅÎÉÑ ÓÔÒÏËÉ User-Agent ÏÔËÌÀÞÅÎÁ!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:594
+#: LYMessages.c:592
 msgid "You are not allowed to change this setting."
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ÜÔÕ ÎÁÓÔÒÏÊËÕ."
 
-#: LYMessages.c:595
+#: LYMessages.c:593
 msgid "Saving Options..."
 msgstr "óÏÈÒÁÎÅÎÉÅ ÏÐÃÉÊ..."
 
-#: LYMessages.c:596
+#: LYMessages.c:594
 msgid "Options saved!"
 msgstr "ïÐÃÉÉ ÓÏÈÒÁÎÅÎÙ!"
 
-#: LYMessages.c:597
+#: LYMessages.c:595
 msgid "Unable to save Options!"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÓÏÈÒÁÎÉÔØ ïÐÃÉÉ!"
 
-#: LYMessages.c:598
+#: LYMessages.c:596
 msgid " 'r' to return to Lynx "
 msgstr " 'r' ÄÌÑ ×ÏÚ×ÒÁÔÁ Ë Lynx "
 
-#: LYMessages.c:599
+#: LYMessages.c:597
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr " '>' ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ, ÉÌÉ 'r' ÄÌÑ ×ÏÚ×ÒÁÔÁ Ë Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:601
+#: LYMessages.c:599
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "îÁÖÍÉÔÅ ÌÀÂÕÀ ËÌÁ×ÉÛÕ ÄÌÑ ÉÚÍÅÎÅÎÉÑ ÚÎÁÞÅÎÉÑ; ÷÷ïä ÞÔÏÂÙ ÐÒÉÎÑÔØ."
 
-#: LYMessages.c:602
+#: LYMessages.c:600
 msgid "Error uncompressing temporary file!"
 msgstr "ïÛÉÂËÁ ÒÁÚÁÒÈÉ×ÁÃÉÉ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ!"
 
-#: LYMessages.c:603
+#: LYMessages.c:601
 msgid "Unsupported URL scheme!"
 msgstr "îÅÐÏÄÄÅÒÖÉ×ÁÅÍÁÑ ÓÈÅÍÁ URL!"
 
-#: LYMessages.c:604
+#: LYMessages.c:602
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "îÅÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÄÁÎÎÙÅ: URL! éÓÐÏÌØÚÕÊÔÅ ðïëáú éîæïòíáãéé, ÐÏËÁ ÞÔÏ."
 
-#: LYMessages.c:605
+#: LYMessages.c:603
 msgid "Redirection limit of 10 URL's reached."
 msgstr "äÏÓÔÉÇÎÕÔ ÐÒÅÄÅÌ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÊ × 10 URL."
 
-#: LYMessages.c:606
+#: LYMessages.c:604
 msgid "Illegal redirection URL received from server!"
 msgstr "ïÔ ÓÅÒ×ÅÒÁ ÐÏÌÕÞÅÎ ÎÅ×ÅÒÎÙÊ URL ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÑ!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:608
+#: LYMessages.c:606
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "óÅÒ×ÅÒ ÚÁÐÒÏÓÉÌ %d ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÊ ÓÏÄÅÒÖÉÍÏÇÏ POST ÐÏ ÁÄÒÅÓÕ"
 
-#: LYMessages.c:611
+#: LYMessages.c:609
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P)ðÒÉÓÔÕÐÉÔØ, ÉÓÐÏÌØÚÕÊÔÅ G)ET ÉÌÉ C)ïÔÍÅÎÁ "
 
-#: LYMessages.c:612
+#: LYMessages.c:610
 msgid "P)roceed, or C)ancel "
 msgstr "P)ðÒÉÓÔÕÐÉÔØ, ÉÌÉ C)ïÔÍÅÎÉÔØ "
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:614
+#: LYMessages.c:612
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr "ðÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÓÏÄÅÒÖÉÍÏÇÏ POST. P)ðÒÉÓÔÕÐÉÔØ, ÐÏËÁÚÁÔØ U)RL, G)ET ÉÌÉ C)ÏÔÍÅÎÁ"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:614
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "ðÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÓÏÄÅÒÖÉÍÏÇÏ POST. P)ðÒÏÄÏÌÖÉÔØ, ÐÒÏÓÍÏÔÒÅÔØ U)RL ÉÌÉ C)ÏÔÍÅÎÉÔØ"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:618
+#: LYMessages.c:616
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "äÏËÕÍÅÎÔ ÉÚ æÏÒÍÙ Ó ÓÏÄÅÒÖÉÍÙÍ POST.  ðÏÓÌÁÔØ ÚÁÎÏ×Ï?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:620
+#: LYMessages.c:618
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "ðÏÓÌÁÔØ ÚÁÎÏ×Ï ÓÏÄÅÒÖÉÍÏÅ POST ÎÁ %s ?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:622
+#: LYMessages.c:620
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "óÐÉÓÏË ÉÚ ÄÏËÕÍÅÎÔÁ Ó ÄÁÎÎÙÍÉ POST.  ïÂÎÏ×ÉÔØ %s ?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:624
+#: LYMessages.c:622
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "äÏËÕÍÅÎÔ ÉÚ ÄÅÊÓÔ×ÉÑ POST, HEAD ÍÏÖÅÔ ÂÙÔØ ÎÅ ÐÏÎÑÔ.  ðÒÏÄÏÌÖÉÔØ?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:624
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "äÅÊÓÔ×ÉÅ ÐÏÓÙÌËÉ ÆÏÒÍÙ - POST, HEAD ÍÏÖÅÔ ÂÙÔØ ÎÅ ÐÏÎÑÔ.  ðÒÏÄÏÌÖÉÔØ?"
 
-#: LYMessages.c:627
+#: LYMessages.c:625
 msgid "Proceed without a username and password?"
 msgstr "ðÒÏÄÏÌÖÉÔØ ÂÅÚ ÉÍÅÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ É ÐÁÒÏÌÑ?"
 
-#: LYMessages.c:628
+#: LYMessages.c:626
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "ðÒÏÄÏÌÖÉÔØ (%s)?"
 
-#: LYMessages.c:629
+#: LYMessages.c:627
 msgid "Cannot POST to this host."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ POST ÎÁ ÜÔÕ ÍÁÛÉÎÕ."
 
-#: LYMessages.c:630
+#: LYMessages.c:628
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "POST ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÄÌÑ ÜÔÏÇÏ URL - ÄÁÎÎÙÅ POST ÉÇÎÏÒÉÒÕÀÔÓÑ!"
 
-#: LYMessages.c:631
+#: LYMessages.c:629
 msgid "Discarding POST data..."
 msgstr "õÎÉÞÔÏÖÅÎÉÅ ÄÁÎÎÙÈ POST..."
 
-#: LYMessages.c:632
+#: LYMessages.c:630
 msgid "Document will not be reloaded!"
 msgstr "äÏËÕÍÅÎÔ ÎÅ ÂÕÄÅÔ ÏÂÎÏ×ÌÅÎ!"
 
-#: LYMessages.c:633
+#: LYMessages.c:631
 msgid "Location: "
 msgstr "áÄÒÅÓ: "
 
-#: LYMessages.c:634
+#: LYMessages.c:632
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' ÎÅ ÎÁÊÄÅÎÏ!"
 
-#: LYMessages.c:635
+#: LYMessages.c:633
 msgid "Default Bookmark File"
 msgstr "æÁÊÌ ÚÁËÌÁÄÏË ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: LYMessages.c:636
+#: LYMessages.c:634
 msgid "Screen too small! (8x35 min)"
 msgstr "üËÒÁÎ ÓÌÉÛËÏÍ ÍÁÌÅÎØËÉÊ! (8x35 ÍÉÎÉÍÕÍ)"
 
-#: LYMessages.c:637
+#: LYMessages.c:635
 msgid "Select destination or ^G to Cancel: "
 msgstr "÷ÙÂÅÒÉÔÅ ÍÅÓÔÏ ÎÁÚÎÁÞÅÎÉÑ ÉÌÉ ^G ÄÌÑ ÏÔÍÅÎÙ: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:639
+#: LYMessages.c:637
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "÷ÙÂÅÒÉÔÅ ÐÏÄÚÁËÌÁÄËÕ, '=' ÄÌÑ ÍÅÎÀ ÉÌÉ ^G ÄÌÑ ÏÔÍÅÎÙ: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:641
+#: LYMessages.c:639
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "÷ÏÓÐÒÏÉÚ×ÅÓÔÉ L)ÓÓÙÌËÕ × ÜÔÏÍ ÆÁÊÌÅ ÚÁËÌÁÄÏË ÉÌÉ C)ÏÔÍÅÎÉÔØ? (l,c): "
 
-#: LYMessages.c:642
+#: LYMessages.c:640
 msgid "Multiple bookmark support is not available."
 msgstr "ðÏÄÄÅÒÖËÁ ÍÎÏÖÅÓÔ×ÅÎÎÙÈ ÚÁËÌÁÄÏË ÎÅ ÄÏÓÔÕÐÎÁ."
 
-#: LYMessages.c:643
+#: LYMessages.c:641
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr " ÷ÙÂÅÒÉÔÅ ÚÁËÌÁÄËÕ (ÜËÒÁÎ %d ÉÚ %d)"
 
-#: LYMessages.c:644
+#: LYMessages.c:642
 msgid "       Select Bookmark"
 msgstr "       ÷ÙÂÅÒÉÔÅ ÚÁËÌÁÄËÕ"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:646
+#: LYMessages.c:644
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ïðéóáîéñ É ðõôé ë æáêìõ ÚÁËÌÁÄÏË (%d ÉÚ 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:648
+#: LYMessages.c:646
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "         òÅÄÁËÔÉÒÏ×ÁÎÉÅ ïðéóáîéñ É ðõôé_æáêìá ÚÁËÌÁÄÏË"
 
-#: LYMessages.c:649
+#: LYMessages.c:647
 msgid "Letter: "
 msgstr "âÕË×Á: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:652
+#: LYMessages.c:650
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr ""
 
-#: LYMessages.c:654
+#: LYMessages.c:652
 msgid "Use a filepath off your home directory!"
 msgstr ""
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:657
+#: LYMessages.c:655
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr ""
 
 #. #define MAXHIST_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:657
 msgid "History List maximum reached!  Document not pushed."
 msgstr "äÏÓÔÉÇÎÕÔ ÍÁËÓÉÍÕÍ óÐÉÓËÁ éÓÔÏÒÉÉ!  äÏËÕÍÅÎÔ ÎÅ ÐÏÍÅÝÅÎ."
 
-#: LYMessages.c:660
+#: LYMessages.c:658
 msgid "No previously visited links available!"
 msgstr "òÁÎÅÅ ÐÏÓÅÝÅÎÎÙÈ ÓÓÙÌÏË ÎÅÔ!"
 
-#: LYMessages.c:661
+#: LYMessages.c:659
 msgid "Memory exhausted!  Program aborted!"
 msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ!  ðÒÏÇÒÁÍÍÁ ÐÒÅÒ×ÁÎÁ!"
 
-#: LYMessages.c:662
+#: LYMessages.c:660
 msgid "Memory exhausted!  Aborting..."
 msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ!  ðÒÅÒÙ×ÁÎÉÅ..."
 
-#: LYMessages.c:663
+#: LYMessages.c:661
 msgid "Not enough memory!"
 msgstr "îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ!"
 
-#: LYMessages.c:664
+#: LYMessages.c:662
 msgid "Directory/File Manager not available"
 msgstr "ëÁÔÁÌÏÇ/ÆÁÊÌ-ÍÅÎÅÄÖÅÒ ÎÅÄÏÓÔÕÐÅÎ"
 
-#: LYMessages.c:665
+#: LYMessages.c:663
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "HREF × ÔÅÇÅ BASE ÎÅ Ñ×ÌÑÅÔÓÑ ÁÂÓÏÌÀÔÎÙÍ URL."
 
-#: LYMessages.c:666
+#: LYMessages.c:664
 msgid "Location URL is not absolute."
 msgstr "áÄÒÅÓ URL ÎÅ ÁÂÓÏÌÀÔÎÙÊ."
 
-#: LYMessages.c:667
+#: LYMessages.c:665
 msgid "Refresh URL is not absolute."
 msgstr "URL ÏÂÎÏ×ÌÅÎÉÑ ÎÅ ÁÂÓÏÌÀÔÎÙÊ."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:667
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2036,7 +2037,7 @@ msgstr ""
 "÷Ù ÐÏÓÙÌÁÅÔÅ ÓÏÏÂÝÅÎÉÅ Ó ÔÅÌÏÍ ÐÏ ÁÄÒÅÓÕ:\n"
 "  "
 
-#: LYMessages.c:670
+#: LYMessages.c:668
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2044,7 +2045,7 @@ msgstr ""
 "÷Ù ÐÏÓÙÌÁÅÔÅ ËÏÍÍÅÎÔÁÒÉÊ ÐÏ ÁÄÒÅÓÕ:\n"
 "  "
 
-#: LYMessages.c:671
+#: LYMessages.c:669
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2054,7 +2055,7 @@ msgstr ""
 " ó ËÏÐÉÅÊ ÐÏ ÁÄÒÅÓÕ:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:670
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2065,7 +2066,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:672
 msgid ""
 "\n"
 "\n"
@@ -2076,7 +2077,7 @@ msgstr ""
 "éÓÐÏÌØÚÕÊÔÅ Ctrl-G ÄÌÑ ÏÔÍÅÎÙ, ÅÓÌÉ ×Ù ÎÅ ÈÏÔÉÔÅ ÐÏÓÙÌÁÔØ ÓÏÏÂÝÅÎÉÅ\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:674
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2085,7 +2086,7 @@ msgstr ""
 " ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ×ÁÛÅ ÉÍÑ ÉÌÉ ÏÓÔÁ×ØÔÅ ÅÇÏ ÐÕÓÔÙÍ, ÞÔÏÂÙ ÏÓÔÁÔØÓÑ ÁÎÏÎÉÍÎÙÍ\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:676
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2094,11 +2095,11 @@ msgstr ""
 " ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÐÏÞÔÏ×ÙÊ ÁÄÒÅÓ ÉÌÉ ËÁËÕÀ-ÎÉÂÕÄØ ÄÒÕÇÕÀ\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:678
 msgid " means to contact you, if you desire a response.\n"
 msgstr " ÉÎÆÏÒÍÁÃÉÀ ÄÌÑ ËÏÎÔÁËÔÁ Ó ×ÁÍÉ, ÅÓÌÉ ×Ù ÖÅÌÁÅÔÅ ÐÏÌÕÞÉÔØ ÏÔ×ÅÔ.\n"
 
-#: LYMessages.c:681
+#: LYMessages.c:679
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2107,7 +2108,7 @@ msgstr ""
 " ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÓÔÒÏËÕ ÔÅÍÙ.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2115,11 +2116,11 @@ msgstr ""
 "\n"
 " ÷×ÅÄÉÔÅ ÐÏÞÔÏ×ÙÊ ÁÄÒÅÓ ÄÌÑ ËÏÐÉÉ (CC) ×ÁÛÅÇÏ ÓÏÏÂÝÅÎÉÑ.\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:682
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (ïÓÔÁ×ØÔÅ ÐÕÓÔÙÍ, ÅÓÌÉ ×Ù ÎÅ ÈÏÔÉÔÅ ËÏÐÉÀ.)\n"
 
-#: LYMessages.c:685
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2129,7 +2130,7 @@ msgstr ""
 " ðÏÖÁÌÕÊÓÔÁ, ÐÒÏÓÍÏÔÒÉÔÅ ÔÅÌÏ ÓÏÏÂÝÅÎÉÑ:\n"
 "\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:684
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2137,7 +2138,7 @@ msgstr ""
 "\n"
 "îÁÖÍÉÔÅ ÷÷ïä ÄÌÑ ÐÒÏÄÏÌÖÅÎÉÑ: "
 
-#: LYMessages.c:687
+#: LYMessages.c:685
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2145,11 +2146,11 @@ msgstr ""
 "\n"
 "îÁÖÍÉÔÅ ÷÷ïä ÄÌÑ ÏÞÉÓÔËÉ: "
 
-#: LYMessages.c:688
+#: LYMessages.c:686
 msgid " Use Control-U to erase the default.\n"
 msgstr " éÓÐÏÌØÚÕÊÔÅ Control-U ÄÌÑ ÕÎÉÞÔÏÖÅÎÉÑ ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ.\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2158,7 +2159,7 @@ msgstr ""
 " ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÎÉÖÅ ×ÁÛÅ ÓÏÏÂÝÅÎÉÅ."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:380
+#: LYMessages.c:689 src/LYNews.c:361
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2167,7 +2168,7 @@ msgstr ""
 " ëÏÇÄÁ ×ÓÅ ÇÏÔÏ×Ï, ÎÁÖÍÉÔÅ <××ÏÄ> É ÐÏÓÔÁ×ØÔÅ ÅÄÉÎÓÔ×ÅÎÎÕÀ ÔÏÞËÕ (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:381
+#: LYMessages.c:691 src/LYNews.c:362
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2177,248 +2178,248 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:695
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "%s cookie: %.*s=%.*s ðÒÉÎÑÔØ? (Y/N/A)÷ÓÅÇÄÁ/V)îÉËÏÇÄÁ)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:697
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "ðÒÉÎÑÔØ ÎÅÐÒÁ×ÉÌØÎÙÊ ÄÏÍÅÎ=%s ÄÌÑ cookie '%s'?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:699
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr "ðÒÉÎÑÔØ ÎÅÐÒÁ×ÉÌØÎÙÊ ÐÕÔØ=%s ËÁË ÐÒÅÆÉËÓ ÄÌÑ cookie '%s'?"
 
-#: LYMessages.c:702
+#: LYMessages.c:700
 msgid "Allowing this cookie."
 msgstr "ðÒÉÎÑÔÉÅ ÜÔÏÇÏ cookie."
 
-#: LYMessages.c:703
+#: LYMessages.c:701
 msgid "Rejecting this cookie."
 msgstr "ïÔËÌÏÎÅÎÉÅ ÜÔÏÇÏ cookie."
 
-#: LYMessages.c:704
+#: LYMessages.c:702
 msgid "The Cookie Jar is empty."
 msgstr "óÐÉÓÏË cookie ÐÕÓÔ."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:706
+#: LYMessages.c:704
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "áËÔÉ×ÉÚÉÒÏ×ÁÔØ ÓÓÙÌËÉ ÄÌÑ ÕÎÉÞÔÏÖÅÎÉÑ cookie ÉÌÉ ÃÅÌÙÈ ÄÏÍÅÎÏ×,"
 
-#: LYMessages.c:707
+#: LYMessages.c:705
 msgid "or to change a domain's 'allow' setting."
 msgstr "ÉÌÉ ÄÌÑ ÉÚÍÅÎÅÎÉÑ ÕÓÔÁÎÏ×ËÉ 'allow' ÄÏÍÅÎÁ."
 
-#: LYMessages.c:708
+#: LYMessages.c:706
 msgid "(Cookies never allowed.)"
 msgstr "(Cookie ÎÉËÏÇÄÁ ÎÅ ÒÁÚÒÅÛÅÎÙ.)"
 
-#: LYMessages.c:709
+#: LYMessages.c:707
 msgid "(Cookies always allowed.)"
 msgstr "(Cookie ×ÓÅÇÄÁ ÒÁÚÒÅÛÅÎÙ.)"
 
-#: LYMessages.c:710
+#: LYMessages.c:708
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Cookie ÒÁÚÒÅÛÁÀÔÓÑ ÞÅÒÅÚ ÐÏÄÔ×ÅÒÖÄÅÎÉÅ.)"
 
-#: LYMessages.c:711
+#: LYMessages.c:709
 msgid "(Persistent Cookies.)"
 msgstr "(ðÏÓÔÏÑÎÎÙÅ cookie.)"
 
-#: LYMessages.c:712
+#: LYMessages.c:710
 msgid "(No title.)"
 msgstr "(îÅÔ ÚÁÇÏÌÏ×ËÁ.)"
 
-#: LYMessages.c:713
+#: LYMessages.c:711
 msgid "(No name.)"
 msgstr "(îÅÔ ÉÍÅÎÉ.)"
 
-#: LYMessages.c:714
+#: LYMessages.c:712
 msgid "(No value.)"
 msgstr "(îÅÔ ÚÎÁÞÅÎÉÑ.)"
 
-#: LYMessages.c:715
+#: LYMessages.c:713
 msgid "None"
 msgstr "îÅÔ"
 
-#: LYMessages.c:716
+#: LYMessages.c:714
 msgid "(End of session.)"
 msgstr "(ëÏÎÅà ÓÅÁÎÓÁ.)"
 
-#: LYMessages.c:717
+#: LYMessages.c:715
 msgid "Delete this cookie?"
 msgstr "õÄÁÌÉÔØ ÜÔÏÔ cookie?"
 
-#: LYMessages.c:718
+#: LYMessages.c:716
 msgid "The cookie has been eaten!"
 msgstr "Cookie ÕÄÁÌÅÎ!"
 
-#: LYMessages.c:719
+#: LYMessages.c:717
 msgid "Delete this empty domain?"
 msgstr "õÄÁÌÉÔØ ÜÔÏÔ ÐÕÓÔÏÊ ÄÏÍÅÎ?"
 
-#: LYMessages.c:720
+#: LYMessages.c:718
 msgid "The domain has been eaten!"
 msgstr "äÏÍÅÎ ÕÄÁÌÅÎ!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:722
+#: LYMessages.c:720
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)õÄÁÌÉÔØ cookie ÄÏÍÅÎÁ, ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÒÅÛÅÎÉÅ × A)lways/P)rompt/neVer, C)ancel?"
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:724
+#: LYMessages.c:722
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)õÄÁÌÉÔØ ÄÏÍÅÎ, ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÒÅÛÅÎÉÅ × A)lways/P)rompt/neV)er, ÉÌÉ C)ancel? "
 
-#: LYMessages.c:725
+#: LYMessages.c:723
 msgid "All cookies in the domain have been eaten!"
 msgstr "÷ÓÅ cookie × ÄÏÍÅÎÅ ÂÙÌÉ ÕÎÉÞÔÏÖÅÎÙ!"
 
-#: LYMessages.c:726
+#: LYMessages.c:724
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "A)÷ÓÅÇÄÁ ÐÒÉÎÉÍÁÔØ ÉÚ ÄÏÍÅÎÁ '%s'."
 
-#: LYMessages.c:727
+#: LYMessages.c:725
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "V)îÉËÏÇÄÁ ÎÅ ÐÒÉÎÉÍÁÔØ ÉÚ ÄÏÍÅÎÁ '%s'."
 
-#: LYMessages.c:728
+#: LYMessages.c:726
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "P)óÐÒÁÛÉ×ÁÔØ Ï ÐÒÉÅÍÅ ÉÚ ÄÏÍÅÎÁ '%s'."
 
-#: LYMessages.c:729
+#: LYMessages.c:727
 msgid "Delete all cookies in this domain?"
 msgstr "õÄÁÌÉÔØ ×ÓÅ cookie × ÜÔÏÍ ÄÏÍÅÎÅ?"
 
-#: LYMessages.c:730
+#: LYMessages.c:728
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "÷ÓÅ cookie ÉÚ ÓÐÉÓËÁ ÂÙÌÉ ÕÎÉÞÔÏÖÅÎÙ!"
 
-#: LYMessages.c:732
+#: LYMessages.c:730
 msgid "Port 19 not permitted in URLs."
 msgstr "19 ÐÏÒÔ × URL ÎÅ ÄÏÐÕÓËÁÅÔÓÑ."
 
-#: LYMessages.c:733
+#: LYMessages.c:731
 msgid "Port 25 not permitted in URLs."
 msgstr "25 ÐÏÒÔ × URL ÎÅ ÄÏÐÕÓËÁÅÔÓÑ."
 
-#: LYMessages.c:734
+#: LYMessages.c:732
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "%lu ÐÏÒÔ × URL ÎÅ ÄÏÐÕÓËÁÅÔÓÑ."
 
-#: LYMessages.c:735
+#: LYMessages.c:733
 msgid "URL has a bad port field."
 msgstr "URL ÉÍÅÅÔ ÐÌÏÈÏÅ ÐÏÌÅ ÐÏÒÔÁ."
 
-#: LYMessages.c:736
+#: LYMessages.c:734
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "ðÒÅ×ÙÛÅÎÏ ÍÁËÓÉÍÁÌØÎÏÅ ÞÉÓÌÏ ×ÌÏÖÅÎÎÙÈ ÜÌÅÍÅÎÔÏ× HTML."
 
-#: LYMessages.c:737
+#: LYMessages.c:735
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "ðÌÏÈÁÑ ÞÁÓÔÉÞÎÁÑ ÓÓÙÌËÁ!  îÁÞÁÌØÎÙÅ ÔÏÞËÉ ÉÇÎÏÒÉÒÕÀÔÓÑ."
 
-#: LYMessages.c:738
+#: LYMessages.c:736
 msgid "Trace Log open failed.  Trace off!"
 msgstr "ïÛÉÂËÁ ÐÒÉ ÏÔËÒÙÔÉÉ ÖÕÒÎÁÌÁ ÔÒÁÓÓÉÒÏ×ËÉ.  ôÒÁÓÓÉÒÏ×ËÁ ×ÙËÌÀÞÅÎÁ!"
 
-#: LYMessages.c:739
+#: LYMessages.c:737
 msgid "Lynx Trace Log"
 msgstr "öÕÒÎÁÌ ÔÒÁÓÓÉÒÏ×ËÉ Lynx"
 
-#: LYMessages.c:740
+#: LYMessages.c:738
 msgid "No trace log has been started for this session."
 msgstr "öÕÒÎÁÌ ÔÒÁÓÓÉÒÏ×ËÉ ÄÌÑ ÜÔÏÇÏ ÓÅÁÎÓÁ ÎÅ ×ÅÌÓÑ."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:742
+#: LYMessages.c:740
 msgid "The maximum temporary file count has been reached!"
 msgstr "äÏÓÔÉÇÎÕÔÏ ÍÁËÓÉÍÁÌØÎÏÅ ËÏÌÉÞÅÓÔ×Ï ×ÒÅÍÅÎÎÙÈ ÆÁÊÌÏ×!"
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:744
+#: LYMessages.c:742
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "úÎÁÞÅÎÉÅ ÐÏÌÑ ÆÏÒÍÙ ÐÒÅ×ÙÛÁÅÔ ÄÌÉÎÕ ÂÕÆÅÒÁ.  ïÂÒÅÖØÔÅ ËÏÎÅÃ."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:746
+#: LYMessages.c:744
 msgid "Modified tail combined with head of form field value."
 msgstr "íÏÄÉÆÉÃÉÒÏ×ÁÎÎÏÅ ÏËÏÎÞÁÎÉÅ ÓËÏÍÂÉÎÉÒÏ×ÁÎÏ Ó ÎÁÞÁÌÏÍ ÚÎÁÞÅÎÉÑ ÐÏÌÑ ÆÏÒÍÙ."
 
 #. HTFile.c
-#: LYMessages.c:749
+#: LYMessages.c:747
 msgid "Directory"
 msgstr "ëÁÔÁÌÏÇ"
 
-#: LYMessages.c:750
+#: LYMessages.c:748
 msgid "Directory browsing is not allowed."
 msgstr "ðÒÏÓÍÏÔÒ ËÁÔÁÌÏÇÏ× ÎÅ ÒÁÚÒÅÛÅÎ."
 
-#: LYMessages.c:751
+#: LYMessages.c:749
 msgid "Selective access is not enabled for this directory"
 msgstr "éÚÂÉÒÁÔÅÌØÎÙÊ ÄÏÓÔÕÐ ÎÅ ×ËÌÀÞÅÎ ÄÌÑ ÜÔÏÇÏ ËÁÔÁÌÏÇÁ"
 
-#: LYMessages.c:752
+#: LYMessages.c:750
 msgid "Multiformat: directory scan failed."
 msgstr "Multiformat: ÏÛÉÂËÁ ÐÒÉ ÓËÁÎÉÒÏ×ÁÎÉÉ ËÁÔÁÌÏÇÁ."
 
-#: LYMessages.c:753
+#: LYMessages.c:751
 msgid "This directory is not readable."
 msgstr "üÔÏÔ ËÁÔÁÌÏÇ ÎÅ ÄÏÓÔÕÐÅÎ ÎÁ ÞÔÅÎÉÅ."
 
-#: LYMessages.c:754
+#: LYMessages.c:752
 msgid "Can't access requested file."
 msgstr "îÅÔ ÄÏÓÔÕÐÁ Ë ÚÁÐÒÏÛÅÎÎÏÍÕ ÆÁÊÌÕ."
 
-#: LYMessages.c:755
+#: LYMessages.c:753
 msgid "Could not find suitable representation for transmission."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÎÁÊÔÉ ÐÏÄÈÏÄÑÝÅÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÅ ÄÌÑ ÐÅÒÅÄÁÞÉ."
 
-#: LYMessages.c:756
+#: LYMessages.c:754
 msgid "Could not open file for decompression!"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÒÁÚÁÒÈÉ×ÁÃÉÉ!"
 
-#: LYMessages.c:757
+#: LYMessages.c:755
 msgid "Files:"
 msgstr "æÁÊÌÙ:"
 
-#: LYMessages.c:758
+#: LYMessages.c:756
 msgid "Subdirectories:"
 msgstr "ðÏÄËÁÔÁÌÏÇÉ:"
 
-#: LYMessages.c:759
+#: LYMessages.c:757
 msgid " directory"
 msgstr " ËÁÔÁÌÏÇ"
 
-#: LYMessages.c:760
+#: LYMessages.c:758
 msgid "Up to "
 msgstr "ðÅÒÅÊÔÉ Ë "
 
-#: LYMessages.c:761
+#: LYMessages.c:759
 msgid "Current directory is "
 msgstr "ôÅËÕÝÉÊ ËÁÔÁÌÏÇ "
 
 #. HTGopher.c
-#: LYMessages.c:764
+#: LYMessages.c:762
 msgid "No response from server!"
 msgstr "îÅÔ ÏÔ×ÅÔÁ ÏÔ ÓÅÒ×ÅÒÁ!"
 
-#: LYMessages.c:765
+#: LYMessages.c:763
 msgid "CSO index"
 msgstr "éÎÄÅËÓ CSO"
 
-#: LYMessages.c:766
+#: LYMessages.c:764
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2426,16 +2427,16 @@ msgstr ""
 "\n"
 "üÔÏ ÐÏÉÓËÏ×ÙÊ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ CSO.\n"
 
-#: LYMessages.c:767
+#: LYMessages.c:765
 msgid "CSO Search Results"
 msgstr "òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ CSO"
 
-#: LYMessages.c:768
+#: LYMessages.c:766
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "ïÛÉÂËÁ ÐÏÚÉÃÉÏÎÉÒÏ×ÁÎÉÑ × %s\n"
 
-#: LYMessages.c:769
+#: LYMessages.c:767
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2443,7 +2444,7 @@ msgstr ""
 "\n"
 "îÁÖÍÉÔÅ ËÌÁ×ÉÛÕ 's' É ××ÅÄÉÔÅ ËÌÀÞÅ×ÙÅ ÓÌÏ×Á ÄÌÑ ÐÏÉÓËÁ.\n"
 
-#: LYMessages.c:770
+#: LYMessages.c:768
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2451,35 +2452,35 @@ msgstr ""
 "\n"
 "üÔÏ ÐÏÉÓËÏ×ÙÊ ÉÎÄÅËÓ Gopher.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:769
 msgid "Gopher index"
 msgstr "éÎÄÅËÓ Gopher"
 
-#: LYMessages.c:772
+#: LYMessages.c:770
 msgid "Gopher Menu"
 msgstr "íÅÎÀ Gopher"
 
-#: LYMessages.c:773
+#: LYMessages.c:771
 msgid " Search Results"
 msgstr " òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ"
 
-#: LYMessages.c:774
+#: LYMessages.c:772
 msgid "Sending CSO/PH request."
 msgstr "ðÏÓÙÌËÁ ÚÁÐÒÏÓÁ CSO/PH"
 
-#: LYMessages.c:775
+#: LYMessages.c:773
 msgid "Sending Gopher request."
 msgstr "ðÏÓÙÌËÁ ÚÁÐÒÏÓÁ Gopher."
 
-#: LYMessages.c:776
+#: LYMessages.c:774
 msgid "CSO/PH request sent; waiting for response."
 msgstr "úÁÐÒÏÓ CSO/PH ÐÏÓÌÁÎ; ÏÖÉÄÁÅÔÓÑ ÏÔ×ÅÔ."
 
-#: LYMessages.c:777
+#: LYMessages.c:775
 msgid "Gopher request sent; waiting for response."
 msgstr "úÁÐÒÏÓ Gopher ÐÏÓÌÁÎ; ÏÖÉÄÁÅÔÓÑ ÏÔ×ÅÔ."
 
-#: LYMessages.c:778
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2487,7 +2488,7 @@ msgstr ""
 "\n"
 "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ËÌÀÞÅ×ÙÅ ÓÌÏ×Á ÄÌÑ ÐÏÉÓËÁ.\n"
 
-#: LYMessages.c:779
+#: LYMessages.c:777
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2495,193 +2496,198 @@ msgstr ""
 "\n"
 "÷×ÅÄÅÎÎÙÅ ×ÁÍÉ ËÌÀÞÅ×ÙÅ ÓÌÏ×Á ÐÏÚ×ÏÌÑÔ ×ÁÍ ÉÓËÁÔØ ÐÏ"
 
-#: LYMessages.c:780
+#: LYMessages.c:778
 msgid " person's name in the database.\n"
 msgstr " ÉÍÅÎÉ ÞÅÌÏ×ÅËÁ × ÂÁÚÅ ÄÁÎÎÙÈ.\n"
 
 #. HTNews.c
-#: LYMessages.c:783
+#: LYMessages.c:781
 msgid "Connection closed ???"
 msgstr "óÏÅÄÉÎÅÎÉÅ ÚÁËÒÙÔÏ ???"
 
-#: LYMessages.c:784
+#: LYMessages.c:782
 msgid "Cannot open temporary file for news POST."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ ÄÌÑ ÐÏÓÙÌËÉ ÎÏ×ÏÓÔÅÊ."
 
-#: LYMessages.c:785
+#: LYMessages.c:783
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "üÔÏÔ ËÌÉÅÎÔ ÎÅ ÉÍÅÅÔ ÐÏÄÄÅÒÖËÉ ÄÌÑ ÐÏÓÙÌËÉ ÎÏ×ÏÓÔÅÊ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ SSL."
 
 #. HTStyle.c
-#: LYMessages.c:788
+#: LYMessages.c:786
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "óÔÉÌØ %d `%s' SGML:%s.  ûÒÉÆÔ %s %.1f ÔÏÞËÁ.\n"
 
-#: LYMessages.c:789
+#: LYMessages.c:787
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tïÔÓÔÕÐÙ: ÐÅÒ×ÙÊ=%.0f ÏÓÔÁÌØÎÙÅ=%.0f, ×ÙÓÏÔÁ=%.1f ÏÐÉÓÁÎÉÅ=%.1f\n"
 
-#: LYMessages.c:790
+#: LYMessages.c:788
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "\t÷ÙÒÁ×ÎÉ×ÁÎÉÅ=%d, %d tabs. (%.0f ÄÏ, %.0f ÐÏÓÌÅ)\n"
 
-#: LYMessages.c:791
+#: LYMessages.c:789
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr ""
 
 #. HTTP.c
-#: LYMessages.c:794
+#: LYMessages.c:792
 msgid "Can't proceed without a username and password."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÐÒÏÄÏÌÖÉÔØ ÂÅÚ ÉÍÅÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ É ÐÁÒÏÌÑ."
 
-#: LYMessages.c:795
+#: LYMessages.c:793
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÐÏ×ÔÏÒÉÔØ ÐÒÏ×ÅÒËÕ ÐÏÌÎÏÍÏÞÉÊ! ó×ÑÖÉÔÅÓØ Ó ×ÅÂÍÁÓÔÅÒÏÍ ÓÅÒ×ÅÒÁ."
 
-#: LYMessages.c:796
+#: LYMessages.c:794
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÐÏ×ÔÏÒÉÔØ ÐÒÏ×ÅÒËÕ ÐÏÌÎÏÍÏÞÉÊ ÞÅÒÅÚ ÐÒÏËÓÉ! ó×ÑÖÉÔÅÓØ Ó ×ÅÂÍÁÓÔÅÒÏÍ ÓÅÒ×ÅÒÁ."
 
-#: LYMessages.c:797
+#: LYMessages.c:795
 msgid "Retrying with proxy authorization information."
 msgstr "ðÏ×ÔÏÒ Ó ÉÎÆÏÒÍÁÃÉÅÊ ÐÒÏ×ÅÒËÉ ÐÏÌÎÏÍÏÞÉÊ ÄÌÑ ÐÒÏËÓÉ."
 
 #. HTWAIS.c
-#: LYMessages.c:800
+#: LYMessages.c:798
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: ÷ÏÚ×ÒÁÝÅÎÎÏÅ ÓÏÏÂÝÅÎÉÅ ÓÌÉÛËÏÍ ×ÅÌÉËÏ."
 
-#: LYMessages.c:801
+#: LYMessages.c:799
 msgid "Enter WAIS query: "
 msgstr "÷×ÅÄÉÔÅ ÚÁÐÒÏÓ WAIS: "
 
 #. Miscellaneous status
-#: LYMessages.c:804
+#: LYMessages.c:802
 msgid "Retrying as HTTP0 request."
 msgstr "ðÏ×ÔÏÒ ËÁË ÚÁÐÒÏÓ HTTP0."
 
-#: LYMessages.c:805
+#: LYMessages.c:803
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "ðÅÒÅÄÁÎÏ %d ÂÁÊÔ"
 
-#: LYMessages.c:806
+#: LYMessages.c:804
 msgid "Data transfer complete"
 msgstr "ðÅÒÅÄÁÞÁ ÄÁÎÎÙÈ ÚÁ×ÅÒÛÅÎÁ"
 
-#: LYMessages.c:807
+#: LYMessages.c:805
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "ïÛÉÂËÁ ÐÒÉ ÏÂÒÁÂÏÔËÅ ÓÔÒÏËÉ %d ÉÚ %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:810
+#: LYMessages.c:808
 msgid "Address List Page"
 msgstr "óÔÒÁÎÉÃÁ ÓÐÉÓËÁ ÁÄÒÅÓÏ×"
 
-#: LYMessages.c:811
+#: LYMessages.c:809
 msgid "Bookmark file"
 msgstr "æÁÊÌ ÚÁËÌÁÄÏË"
 
-#: LYMessages.c:812
+#: LYMessages.c:810
 msgid "Configuration Definitions"
 msgstr "ïÐÒÅÄÅÌÅÎÉÑ ËÏÎÆÉÇÕÒÁÃÉÉ"
 
-#: LYMessages.c:813
+#: LYMessages.c:811
 msgid "Cookie Jar"
 msgstr "óÐÉÓÏË cookie"
 
-#: LYMessages.c:814
+#: LYMessages.c:812
 msgid "Current Key Map"
 msgstr "ôÅËÕÝÅÅ ÏÔÏÂÒÁÖÅÎÉÅ ËÌÁ×ÉÛ"
 
-#: LYMessages.c:815
+#: LYMessages.c:813
 msgid "File Management Options"
 msgstr "ïÐÃÉÉ ÒÁÂÏÔÙ Ó ÆÁÊÌÁÍÉ"
 
-#: LYMessages.c:816
+#: LYMessages.c:814
 msgid "Download Options"
 msgstr "ïÐÃÉÉ ÓËÁÞÉ×ÁÎÉÑ"
 
-#: LYMessages.c:817
+#: LYMessages.c:815
 msgid "History Page"
 msgstr "óÔÒÁÎÉÃÁ ÉÓÔÏÒÉÉ"
 
-#: LYMessages.c:818
+#: LYMessages.c:816
 msgid "List Page"
 msgstr "óÔÒÁÎÉÃÁ ÓÐÉÓËÁ"
 
-#: LYMessages.c:819
+#: LYMessages.c:817
 msgid "Lynx.cfg Information"
 msgstr "éÎÆÏÒÍÁÃÉÑ lynx.cfg"
 
-#: LYMessages.c:820
+#: LYMessages.c:818
 msgid "Converted Mosaic Hotlist"
 msgstr "ðÒÅÏÂÒÁÚÏ×ÁÎÎÙÅ ÚÁËÌÁÄËÉ Mosaic"
 
-#: LYMessages.c:821
+#: LYMessages.c:819
 msgid "Options Menu"
 msgstr "íÅÎÀ ïÐÃÉÊ"
 
-#: LYMessages.c:822
+#: LYMessages.c:820
 msgid "File Permission Options"
 msgstr "ïÐÃÉÉ ÐÒÁ× ÄÏÓÔÕÐÁ Ë ÆÁÊÌÁÍ"
 
-#: LYMessages.c:823
+#: LYMessages.c:821
 msgid "Printing Options"
 msgstr "ïÐÃÉÉ ÐÅÞÁÔÉ"
 
-#: LYMessages.c:824
+#: LYMessages.c:822
 msgid "Information about the current document"
 msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÔÅËÕÝÅÍ ÄÏËÕÍÅÎÔÅ"
 
-#: LYMessages.c:825
+#: LYMessages.c:823
 msgid "Your recent statusline messages"
 msgstr "÷ÁÛÉ ÐÏÓÌÅÄÎÉÅ ÓÏÏÂÝÅÎÉÑ ÓÔÒÏËÉ ÓÔÁÔÕÓÁ"
 
-#: LYMessages.c:826
+#: LYMessages.c:824
 msgid "Upload Options"
 msgstr "ïÐÃÉÉ ÚÁÇÒÕÚËÉ"
 
-#: LYMessages.c:827
+#: LYMessages.c:825
 msgid "Visited Links Page"
 msgstr "óÔÒÁÎÉÃÁ ÐÏÓÅÝÅÎÎÙÈ ÓÓÙÌÏË"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:830
+#: LYMessages.c:828
 msgid "See also"
 msgstr "óÍ. ÔÁËÖÅ"
 
-#: LYMessages.c:831
+#: LYMessages.c:829
 msgid "your"
 msgstr "×ÁÛ"
 
-#: LYMessages.c:832
+#: LYMessages.c:830
 msgid "for runtime options"
 msgstr "ÄÌÑ ÏÐÃÉÊ ×ÒÅÍÅÎÉ ×ÙÐÏÌÎÅÎÉÑ"
 
-#: LYMessages.c:833
+#: LYMessages.c:831
 msgid "compile time options"
 msgstr "ÏÐÃÉÉ ÓÔÁÄÉÉ ËÏÍÐÉÌÑÃÉÉ"
 
-#: LYMessages.c:834
+#: LYMessages.c:832
+#, fuzzy
+msgid "color-style configuration"
+msgstr "÷ÁÛÁ ÏÓÎÏ×ÎÁÑ ËÏÎÆÉÇÕÒÁÃÉÑ"
+
+#: LYMessages.c:833
 msgid "latest release"
 msgstr "ÐÏÓÌÅÄÎÑÑ ÓÔÁÂÉÌØÎÁÑ ×ÅÒÓÉÑ"
 
-#: LYMessages.c:835
+#: LYMessages.c:834
 msgid "pre-release version"
 msgstr "ÐÏÞÔÉ ÓÔÁÂÉÌØÎÁÑ ×ÅÒÓÉÑ"
 
-#: LYMessages.c:836
+#: LYMessages.c:835
 msgid "development version"
 msgstr "ÎÅÓÔÁÂÉÌØÎÁÑ ×ÅÒÓÉÑ"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:838
+#: LYMessages.c:837
 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"
@@ -2692,7 +2698,7 @@ msgstr ""
 "×ËÌÀÞÉÔÅ ËÏÐÉÀ ÜÔÏÊ ÓÔÒÁÎÉÃÙ."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:842
+#: LYMessages.c:841
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2701,104 +2707,103 @@ msgstr ""
 "ÏÐÒÅÄÅÌÅÎÉÑ ÓÔÁÄÉÉ ËÏÍÐÉÌÑÃÉÉ ÐÒÉ ÓÂÏÒËÅ ÜÔÏÊ ËÏÐÉÉ Lynx."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:847
+#: LYMessages.c:846
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "  C)ÏÚÄÁÔØ  D)úÁÇÒ  E)òÅÄÁËÔ  F)ðÏÌÎ ÍÅÎÀ  M)éÚÍÅÎ  R)õÄÁÌ  T)ïÔÍ  U)úÁÇÒ    \n"
 
-#: LYMessages.c:848
+#: LYMessages.c:847
 msgid "Failed to obtain status of current link!"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÐÏÌÕÞÉÔØ ÓÔÁÔÕÓ ÔÅËÕÝÅÊ ÓÓÙÌËÉ!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:851
+#: LYMessages.c:850
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "óÐÅÃÉÁÌØÎÙÊ URL ÄÅÊÓÔ×ÉÔÅÌÅÎ ÔÏÌØËÏ ÉÚ ÔÅËÕÝÅÇÏ ÍÅÎÀ ðÒÁ× äÏÓÔÕÐÁ Ë æÁÊÌÁÍ!"
 
-#: LYMessages.c:855
+#: LYMessages.c:854
 msgid "External support is currently disabled."
 msgstr "÷ÎÅÛÎÑÑ ÐÏÄÄÅÒÖËÁ ÓÅÊÞÁÓ ÏÔËÌÀÞÅÎÁ."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:859
-#, fuzzy
+#: LYMessages.c:858
 msgid "Changing working-directory is currently disabled."
-msgstr "úÁÐÕÓË ÐÒÏÃÅÓÓÏ× ÓÅÊÞÁÓ ÚÁÐÒÅÝÅÎ."
+msgstr "éÚÍÅÎÅÎÉÅ ÒÁÂÏÞÅÇÏ ËÁÔÁÌÏÇÁ ÓÅÊÞÁÓ ÚÁÐÒÅÝÅÎÏ."
 
-#: LYMessages.c:860
-#, fuzzy
+#: LYMessages.c:859
 msgid "Linewrap OFF!"
-msgstr "ôÒÁÓÓÉÒÏ×ËÁ ÷ùëìàþåîá!"
+msgstr "ðÅÒÅÎÏÓ ÓÔÒÏË ïôëìàþåî!"
 
-#: LYMessages.c:861
+#: LYMessages.c:860
 msgid "Linewrap ON!"
-msgstr ""
+msgstr "ðÅÒÅÎÏÓ ÓÔÒÏË ÷ëìàþåî!"
 
-#: LYMessages.c:862
-#, fuzzy
+#: LYMessages.c:861
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
-msgstr "îÅÏÂÒÁÂÏÔÁÎÎÙÊ 8-ÂÉÔÎÙÊ ÉÌÉ CJK-ÒÅÖÉÍ ÷ùëìàþåî!  ïÂÎÏ×ÌÅÎÉÅ..."
+msgstr "òÁÚÂÏÒ ×ÌÏÖÅÎÎÙÈ ÔÁÂÌÉà ïôëìàþåî!  ïÂÎÏ×ÌÅÎÉÅ..."
 
-#: LYMessages.c:863
-#, fuzzy
+#: LYMessages.c:862
 msgid "Parsing nested-tables toggled ON!  Reloading..."
-msgstr "îÅÏÂÒÁÂÏÔÁÎÎÙÊ 8-ÂÉÔÎÙÊ ÉÌÉ CJK-ÒÅÖÉÍ ÷ëìàþåî!  ïÂÎÏ×ÌÅÎÉÅ..."
+msgstr "òÁÚÂÏÒ ×ÌÏÖÅÎÎÙÈ ÔÁÂÌÉà ÷ëìàþåî!  ïÂÎÏ×ÌÅÎÉÅ..."
 
-#: LYMessages.c:864
+#: LYMessages.c:863
 msgid "Shifting is disabled while line-wrap is in effect"
-msgstr ""
+msgstr "óÄ×ÉÇ ÚÁÐÒÅÝÅÎ ÐÏËÁ ÄÅÊÓÔ×ÕÅÔ ÐÅÒÅÎÏÓ ÓÔÒÏË"
 
-#: LYMessages.c:865
-#, fuzzy
+#: LYMessages.c:864
 msgid "Trace not supported"
-msgstr "ôÅÒÍÉÎÁÌ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ Ã×ÅÔ"
+msgstr "ôÒÁÓÓÉÒÏ×ËÁ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-#: WWW/Library/Implementation/HTAABrow.c:648
+#: WWW/Library/Implementation/HTAABrow.c:647
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ '%s' ÎÁ %s '%s%s':"
 
-#: WWW/Library/Implementation/HTAABrow.c:914
+#: WWW/Library/Implementation/HTAABrow.c:913
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr "üÔÏÔ ËÌÉÅÎÔ ÎÅ ÚÎÁÅÔ, ËÁË ÓÏÓÔÁ×ÉÔØ ÉÎÆÏÒÍÁÃÉÀ ÐÒÏ×ÅÒËÉ ÐÒÁ× ÄÌÑ ÐÒÏËÓÉ ÄÌÑ ÓÈÅÍÙ"
 
-#: WWW/Library/Implementation/HTAABrow.c:989
+#: WWW/Library/Implementation/HTAABrow.c:988
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "üÔÏÔ ËÌÉÅÎÔ ÎÅ ÚÎÁÅÔ, ËÁË ÓÏÓÔÁ×ÉÔØ ÉÎÆÏÒÍÁÃÉÀ ÐÒÏ×ÅÒËÉ ÐÒÁ× ÄÌÑ ÓÈÅÍÙ"
 
-#: WWW/Library/Implementation/HTAABrow.c:1097
+#: WWW/Library/Implementation/HTAABrow.c:1096
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "îÅ×ÅÒÎÙÊ ÚÁÇÏÌÏ×ÏË '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1201
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
 msgstr "ôÒÅÂÕÅÔÓÑ ÐÒÏ×ÅÒËÁ ÐÒÁ× ÄÌÑ ÐÒÏËÓÉ -- ÐÏ×ÔÏÒ"
 
-#: WWW/Library/Implementation/HTAABrow.c:1260
+#: WWW/Library/Implementation/HTAABrow.c:1259
 msgid "Access without authorization denied -- retrying"
 msgstr "äÏÓÔÕÐ ÂÅÚ ÐÒÏ×ÅÒËÉ ÐÒÁ× ÚÁÐÒÅÝÅÎ -- ÐÏ×ÔÏÒ"
 
-#: WWW/Library/Implementation/HTAccess.c:683
+#: WWW/Library/Implementation/HTAccess.c:677
 msgid "Access forbidden by rule"
 msgstr "äÏÓÔÕÐ ÚÁÐÒÅÝÅÎ ÐÒÁ×ÉÌÏÍ"
 
-#: WWW/Library/Implementation/HTAccess.c:785
+#: WWW/Library/Implementation/HTAccess.c:779
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "äÏËÕÍÅÎÔ Ó ÓÏÄÅÒÖÉÍÙÍ POST ÎÅ ÎÁÊÄÅÎ × ËÜÛÅ.  ðÏÓÌÁÔØ ÓÎÏ×Á?"
 
-#: WWW/Library/Implementation/HTAccess.c:1026 src/GridText.c:8039
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
 msgid "Loading incomplete."
 msgstr "úÁÇÒÕÚËÁ ÚÁ×ÅÒÛÅÎÁ ÎÅ ÐÏÌÎÏÓÔØÀ."
 
-#: WWW/Library/Implementation/HTAccess.c:1056
+#: WWW/Library/Implementation/HTAccess.c:1077
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr "**** HTAccess: ÎÏÍÅÒ ÓÏËÅÔÁ ÉÌÉ ÆÁÊÌÁ ×ÏÚ×ÒÁÝÅÎ ÕÓÔÁÒÅ×ÛÅÊ ÐÒÏÇÒÁÍÍÏÊ ÚÁÇÒÕÚËÉ!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1058
+#: WWW/Library/Implementation/HTAccess.c:1079
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
 msgstr "**** HTAccess: ÷ÎÕÔÒÅÎÎÑÑ ÐÒÏÇÒÁÍÍÎÁÑ ÏÛÉÂËÁ. ðÏÖÁÌÕÊÓÔÁ, ÎÁÐÉÛÉÔÅ × lynx-dev@sig.net!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1059
+#: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "**** HTAccess: ÷ÏÚ×ÒÁÝÅÎÎÙÊ ÓÔÁÔÕÓ: %d\n"
@@ -2807,28 +2812,28 @@ msgstr "**** HTAccess: ÷ÏÚ×ÒÁÝÅÎÎÙÊ ÓÔÁÔÕÓ: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7834
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
 msgid "Can't Access"
 msgstr "îÅÔ ÄÏÓÔÕÐÁ"
 
-#: WWW/Library/Implementation/HTAccess.c:1073
+#: WWW/Library/Implementation/HTAccess.c:1094
 msgid "Unable to access document."
 msgstr "ïÛÉÂËÁ ÄÏÓÔÕÐÁ Ë ÄÏËÕÍÅÎÔÕ."
 
-#: WWW/Library/Implementation/HTFTP.c:756
+#: WWW/Library/Implementation/HTFTP.c:766
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "÷×ÅÄÉÔÅ ÐÁÒÏÌØ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÑ %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:784
+#: WWW/Library/Implementation/HTFTP.c:794
 msgid "Unable to connect to FTP host."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ Ó FTP-ÕÚÌÏÍ."
 
-#: WWW/Library/Implementation/HTFTP.c:1054
+#: WWW/Library/Implementation/HTFTP.c:1064
 msgid "close master socket"
 msgstr "ÚÁËÒÙÔØ ×ÅÄÕÝÉÊ ÓÏËÅÔ"
 
-#: WWW/Library/Implementation/HTFTP.c:1116
+#: WWW/Library/Implementation/HTFTP.c:1126
 msgid "socket for master socket"
 msgstr "ÓÏËÅÔ ÄÌÑ ×ÅÄÕÝÅÇÏ ÓÏËÅÔÁ"
 
@@ -2837,36 +2842,36 @@ msgstr "ÓÏËÅÔ ÄÌÑ ×ÅÄÕÝÅÇÏ ÓÏËÅÔÁ"
 #. **  knowing if it is symbolic?	I think so since
 #. **  it might be a directory.
 #.
-#: WWW/Library/Implementation/HTFTP.c:1630 WWW/Library/Implementation/HTFTP.c:2251
+#: WWW/Library/Implementation/HTFTP.c:1640 WWW/Library/Implementation/HTFTP.c:2261
 msgid "Symbolic Link"
 msgstr "óÉÍ×ÏÌØÎÁÑ ÓÓÙÌËÁ"
 
-#: WWW/Library/Implementation/HTFTP.c:2612
+#: WWW/Library/Implementation/HTFTP.c:2622
 msgid "Receiving FTP directory."
 msgstr "ðÏÌÕÞÅÎÉÅ FTP-ËÁÔÁÌÏÇÁ."
 
-#: WWW/Library/Implementation/HTFTP.c:2755
+#: WWW/Library/Implementation/HTFTP.c:2762
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "ðÅÒÅÄÁÎÏ %d ÂÁÊÔ (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3083
 msgid "connect for data"
 msgstr "ÓÏÅÄÉÎÅÎÉÅ ÄÌÑ ÄÁÎÎÙÈ"
 
-#: WWW/Library/Implementation/HTFTP.c:3690
+#: WWW/Library/Implementation/HTFTP.c:3731
 msgid "Receiving FTP file."
 msgstr "ðÏÌÕÞÅÎÉÅ FTP-ÆÁÊÌÁ."
 
-#: WWW/Library/Implementation/HTFinger.c:275
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ finger."
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÚÁÇÒÕÚÉÔØ ÄÁÎÎÙÅ (ÎÅÔ ÉÍÅÎÉ ÓÁÊÔÁ × URL ÄÌÑ finger)"
 
-#: WWW/Library/Implementation/HTFinger.c:328
+#: WWW/Library/Implementation/HTFinger.c:331
 msgid "Invalid port number - will only use port 79!"
 msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÐÏÒÔÁ - ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÐÏÒÔ 79!"
 
@@ -2874,7 +2879,7 @@ msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÐÏÒÔÁ - ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÐÏÒÔ 79!"
 msgid "Could not access finger host."
 msgstr "îÅÔ ÄÏÓÔÕÐÁ Ë ÕÚÌÕ finger."
 
-#: WWW/Library/Implementation/HTFinger.c:407
+#: WWW/Library/Implementation/HTFinger.c:404
 msgid "No response from finger server."
 msgstr "îÅÔ ÏÔ×ÅÔÁ ÏÔ ÓÅÒ×ÅÒÁ finger."
 
@@ -2900,12 +2905,12 @@ msgstr "ðÁÒÏÌØ ÄÌÑ ÕÚÌÁ ÎÏ×ÏÓÔÅÊ '%s':"
 msgid "Change password?"
 msgstr "éÚÍÅÎÉÔØ ÐÁÒÏÌØ?"
 
-#: WWW/Library/Implementation/HTNews.c:1691
+#: WWW/Library/Implementation/HTNews.c:1690
 #, c-format
 msgid "No matches for: %s"
 msgstr "îÅÔ ÓÏ×ÐÁÄÅÎÉÊ ÄÌÑ: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1744
+#: WWW/Library/Implementation/HTNews.c:1743
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2913,7 +2918,7 @@ msgstr ""
 "\n"
 "÷ ÜÔÏÊ ÇÒÕÐÐÅ ÎÅÔ ÓÔÁÔÅÊ.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1757
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2924,16 +2929,16 @@ msgstr ""
 #.
 #. **	Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1770
+#: WWW/Library/Implementation/HTNews.c:1769
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  óÔÁÔØÉ %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1792
+#: WWW/Library/Implementation/HTNews.c:1791
 msgid "Earlier articles"
 msgstr "âÏÌÅÅ ÒÁÎÎÉÅ ÓÔÁÔØÉ"
 
-#: WWW/Library/Implementation/HTNews.c:1805
+#: WWW/Library/Implementation/HTNews.c:1804
 #, c-format
 msgid ""
 "\n"
@@ -2944,41 +2949,41 @@ msgstr ""
 "óÅÊÞÁÓ ÄÏÓÔÕÐÎÏ ÏËÏÌÏ %d ÓÔÁÔÅÊ × %s ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÉÄÅÎÔÉÆÉËÁÔÏÒÁÍÉ:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1865
+#: WWW/Library/Implementation/HTNews.c:1864
 msgid "All available articles in "
 msgstr "÷ÓÅ ÄÏÓÔÕÐÎÙÅ ÓÔÁÔØÉ × "
 
-#: WWW/Library/Implementation/HTNews.c:2081
+#: WWW/Library/Implementation/HTNews.c:2080
 msgid "Later articles"
 msgstr "âÏÌÅÅ ÐÏÚÄÎÉÅ ÓÔÁÔØÉ"
 
-#: WWW/Library/Implementation/HTNews.c:2105
+#: WWW/Library/Implementation/HTNews.c:2104
 msgid "Post to "
 msgstr "ðÏÓÌÁÔØ × "
 
-#: WWW/Library/Implementation/HTNews.c:2323
+#: WWW/Library/Implementation/HTNews.c:2322
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "üÔÏÔ ËÌÉÅÎÔ ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÄÄÅÒÖËÉ ÄÌÑ URL SNEWS."
 
-#: WWW/Library/Implementation/HTNews.c:2531
+#: WWW/Library/Implementation/HTNews.c:2530
 msgid "No target for raw text!"
 msgstr "îÅÔ ÃÅÌÉ ÄÌÑ ÏÂÙÞÎÏÇÏ ÔÅËÓÔÁ!"
 
-#: WWW/Library/Implementation/HTNews.c:2561
+#: WWW/Library/Implementation/HTNews.c:2560
 msgid "Connecting to NewsHost ..."
 msgstr "õÓÔÁÎÏ×ÌÅÎÉÅ ÓÏÅÄÉÎÅÎÉÑ Ó õÚÌÏÍîÏ×ÏÓÔÅÊ ..."
 
-#: WWW/Library/Implementation/HTNews.c:2612
+#: WWW/Library/Implementation/HTNews.c:2611
 #, c-format
 msgid "Could not access %s."
 msgstr "îÅÔ ÄÏÓÔÕÐÁ Ë %s."
 
-#: WWW/Library/Implementation/HTNews.c:2712
+#: WWW/Library/Implementation/HTNews.c:2711
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÎÏ×ÏÓÔÑÈ. õÚÅÌ ÎÏ×ÏÓÔÅÊ %.20s ÏÔ×ÅÔÉÌ: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2716
+#: WWW/Library/Implementation/HTNews.c:2715
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "îÕ ÕÄÁÅÔÓÑ ÐÒÏÞÉÔÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÎÏ×ÏÓÔÑÈ, ÐÕÓÔÏÊ ÏÔ×ÅÔ ÏÔ ÕÚÌÁ %s"
@@ -2986,34 +2991,34 @@ msgstr "îÕ ÕÄÁÅÔÓÑ ÐÒÏÞÉÔÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÎÏ×ÏÓÔÑÈ, ÐÕÓÔÏÊ ÏÔ×ÅÔ ÏÔ ÕÚÌÁ %s"
 #.
 #. **	List available newsgroups. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2920
+#: WWW/Library/Implementation/HTNews.c:2919
 msgid "Reading list of available newsgroups."
 msgstr "þÔÅÎÉÅ ÓÐÉÓËÁ ÄÏÓÔÕÐÎÙÈ ÇÒÕÐÐ ÎÏ×ÏÓÔÅÊ."
 
-#: WWW/Library/Implementation/HTNews.c:2942
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of articles in newsgroup."
 msgstr "þÔÅÎÉÅ ÓÐÉÓËÁ ÓÔÁÔÅÊ × ÇÒÕÐÐÅ ÎÏ×ÏÓÔÅÊ."
 
 #.
 #. **	Get an article from a news group. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2948
+#: WWW/Library/Implementation/HTNews.c:2947
 msgid "Reading news article."
 msgstr "þÔÅÎÉÅ ÓÔÁÔØÉ ÎÏ×ÏÓÔÅÊ."
 
-#: WWW/Library/Implementation/HTNews.c:2978
+#: WWW/Library/Implementation/HTNews.c:2977
 msgid "Sorry, could not load requested news."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÚÁÇÒÕÚÉÔØ ÚÁÐÒÏÛÅÎÎÙÅ ÎÏ×ÏÓÔÉ, ÉÚ×ÉÎÉÔÅ."
 
-#: WWW/Library/Implementation/HTTCP.c:1233
+#: WWW/Library/Implementation/HTTCP.c:1239
 msgid "Address has invalid port"
 msgstr "îÅ×ÅÒÎÙÊ ÐÏÒÔ Õ ÁÄÒÅÓÁ"
 
-#: WWW/Library/Implementation/HTTCP.c:1336
+#: WWW/Library/Implementation/HTTCP.c:1327
 msgid "Address length looks invalid"
 msgstr "äÌÉÎÁ ÁÄÒÅÓÁ ×ÙÇÌÑÄÉÔ ÎÅ×ÅÒÎÏÊ"
 
-#: WWW/Library/Implementation/HTTCP.c:1574 WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÂÎÁÒÕÖÉÔØ ÕÄÁÌÅÎÎÕÀ ÍÁÛÉÎÕ %s."
@@ -3022,62 +3027,85 @@ msgstr "îÅ ÕÄÁÅÔÓÑ ÏÂÎÁÒÕÖÉÔØ ÕÄÁÌÅÎÎÕÀ ÍÁÛÉÎÕ %s."
 #. *  immediately; but not HTAlert, because typically
 #. *  there will be other alerts from the callers. - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1589 WWW/Library/Implementation/HTTelnet.c:103
+#: WWW/Library/Implementation/HTTCP.c:1575 WWW/Library/Implementation/HTTelnet.c:103
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ÍÁÛÉÎÙ %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1603
+#: WWW/Library/Implementation/HTTCP.c:1589
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s ÓÏÅÄÉÎÅÎÉÅ Ó %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1619
+#: WWW/Library/Implementation/HTTCP.c:1605
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
-msgstr ""
+msgstr "ÏÛÉÂËÁ ÓÏËÅÔÁ: ÓÅÍÅÊÓÔ×Ï %d ÁÄÒÅÓ %s ÐÏÒÔ %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1628
+#: WWW/Library/Implementation/HTTCP.c:1614
 msgid "socket failed."
 msgstr "ÏÛÉÂËÁ ÓÏËÅÔÁ."
 
-#: WWW/Library/Implementation/HTTCP.c:1648
+#: WWW/Library/Implementation/HTTCP.c:1634
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1717
+#: WWW/Library/Implementation/HTTCP.c:1703
 msgid "Connection failed (too many retries)."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ (ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÏÐÙÔÏË)."
 
-#: WWW/Library/Implementation/HTTCP.c:1910
+#: WWW/Library/Implementation/HTTCP.c:1896
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1976
+#: WWW/Library/Implementation/HTTCP.c:1962
 msgid "Socket read failed for 180,000 tries."
 msgstr "ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÓÏËÅÔÁ × ÔÅÞÅÎÉÅ 180,000 ÐÏÐÙÔÏË."
 
-#: WWW/Library/Implementation/HTTP.c:466
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr "áÄÒÅÓ ÓÏÄÅÒÖÉÔ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ: %s"
+
+#: WWW/Library/Implementation/HTTP.c:503
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "üÔÏÔ ËÌÉÅÎÔ ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÄÄÅÒÖËÉ ÄÌÑ URL HTTPS."
 
-#: WWW/Library/Implementation/HTTP.c:491
+#: WWW/Library/Implementation/HTTP.c:528
 msgid "Unable to connect to remote host."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ Ó ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÏÊ."
 
-#: WWW/Library/Implementation/HTTP.c:1005
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr "ðÏÐÙÔËÁ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÂÅÚ TLS."
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr "ïÛÉÂËÁ SSL:host(%s)!=cert(%s)-ðÒÏÄÏÌÖÉÔØ?"
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr "âÅÚÏÐÁÓÎÏÅ HTTP-ÓÏÅÄÉÎÅÎÉÅ: %d ÂÉÔ %s (%s)"
+
+#: WWW/Library/Implementation/HTTP.c:1091
 msgid "Sending HTTP request."
 msgstr "ðÏÓÙÌËÁ HTTP-ÚÁÐÒÏÓÁ."
 
-#: WWW/Library/Implementation/HTTP.c:1039
+#: WWW/Library/Implementation/HTTP.c:1125
 msgid "Unexpected network write error; connection aborted."
 msgstr "îÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ ÚÁÐÉÓÉ ÐÏ ÓÅÔÉ; ÓÏÅÄÉÎÅÎÉÅ ÐÒÅÒ×ÁÎÏ."
 
-#: WWW/Library/Implementation/HTTP.c:1045
+#: WWW/Library/Implementation/HTTP.c:1131
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP-ÚÁÐÒÏÓ ÐÏÓÌÁÎ; ÏÖÉÄÁÅÔÓÑ ÏÔ×ÅÔ."
 
-#: WWW/Library/Implementation/HTTP.c:1109
+#: WWW/Library/Implementation/HTTP.c:1195
 msgid "Unexpected network read error; connection aborted."
 msgstr "îÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ ÞÔÅÎÉÑ ÐÏ ÓÅÔÉ; ÓÏÅÄÉÎÅÎÉÅ ÐÒÅÒ×ÁÎÏ."
 
@@ -3091,7 +3119,7 @@ msgstr "îÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ ÞÔÅÎÉÑ ÐÏ ÓÅÔÉ; ÓÏÅÄÉÎÅÎÉÅ ÐÒÅÒ×ÁÎÏ."
 #. **	so we'll deal with them by showing the full
 #. **	header to the user as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1305
+#: WWW/Library/Implementation/HTTP.c:1391
 msgid "Got unexpected Informational Status."
 msgstr "ðÏÌÕÞÅÎ ÎÅÏÖÉÄÁÎÎÙÊ éÎÆÏÒÍÁÃÉÏÎÎÙÊ óÔÁÔÕÓ."
 
@@ -3102,7 +3130,7 @@ msgstr "ðÏÌÕÞÅÎ ÎÅÏÖÉÄÁÎÎÙÊ éÎÆÏÒÍÁÃÉÏÎÎÙÊ óÔÁÔÕÓ."
 #. *  user to do that, and restore the current
 #. *  document. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1340
+#: WWW/Library/Implementation/HTTP.c:1426
 msgid "Request fulfilled.  Reset Content."
 msgstr "úÁÐÒÏÓ ×ÙÐÏÌÎÅÎ.  ïÂÎÏ×ÌÅÎÉÅ óÏÄÅÒÖÉÍÏÇÏ."
 
@@ -3113,27 +3141,27 @@ msgstr "úÁÐÒÏÓ ×ÙÐÏÌÎÅÎ.  ïÂÎÏ×ÌÅÎÉÅ óÏÄÅÒÖÉÍÏÇÏ."
 #. *  with it by showing the full header to the user
 #. *  as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1459
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "Got unexpected 304 Not Modified status."
 msgstr "ðÏÌÕÞÅÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÔÁÔÕÓ 304 (îÅ íÏÄÉÆÉÃÉÒÏ×ÁÎÏ)."
 
-#: WWW/Library/Implementation/HTTP.c:1526
+#: WWW/Library/Implementation/HTTP.c:1612
 msgid "Redirection of POST content requires user approval."
 msgstr "ðÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÓÏÄÅÒÖÉÍÏÇÏ POST ÔÒÅÂÕÅÔ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ ÐÏÌØÚÏ×ÁÔÅÌÑ."
 
-#: WWW/Library/Implementation/HTTP.c:1541
+#: WWW/Library/Implementation/HTTP.c:1627
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "éÍÅÅÔÓÑ ÓÏÄÅÒÖÉÍÏÅ POST. ôÒÁËÔÏ×ËÁ ðÏÓÔÏÑÎÎÏÇÏ ðÅÒÅÎÁÐÒÁ×ÌÅÎÉÑ ËÁË ÷ÒÅÍÅÎÎÏÇÏ.\n"
 
-#: WWW/Library/Implementation/HTTP.c:1586
+#: WWW/Library/Implementation/HTTP.c:1672
 msgid "Retrying with access authorization information."
 msgstr "ðÏ×ÔÏÒÅÎÉÅ Ó ÉÎÆÏÒÍÁÃÉÅÊ Ï ÐÒÁ×ÁÈ ÄÏÓÔÕÐÁ."
 
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1684
 msgid "Show the 401 message body?"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÔÅÌÏ ÓÏÏÂÝÅÎÉÑ 401?"
 
-#: WWW/Library/Implementation/HTTP.c:1643
+#: WWW/Library/Implementation/HTTP.c:1729
 msgid "Show the 407 message body?"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÔÅÌÏ ÓÏÏÂÝÅÎÉÑ 407?"
 
@@ -3142,7 +3170,7 @@ msgstr "ðÏËÁÚÙ×ÁÔØ ÔÅÌÏ ÓÏÏÂÝÅÎÉÑ 407?"
 #. **	Take a chance and hope there is
 #. **	something to display. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1748
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Unknown status reply from server!"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÓÔÁÔÕÓ ÏÔ×ÅÔÁ ÏÔ ÓÅÒ×ÅÒÁ!"
 
@@ -3224,27 +3252,27 @@ msgstr ""
 "\n"
 "úÁÐÉÓØ ëÏÄÁ, ÎÅ ÕÄÁÅÔÓÑ ÏÔÏÂÒÁÚÉÔØ\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:691
+#: WWW/Library/Implementation/HTWAIS.c:689
 msgid "Syntax error in WAIS URL"
 msgstr "óÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ × WAIS URL"
 
-#: WWW/Library/Implementation/HTWAIS.c:761
+#: WWW/Library/Implementation/HTWAIS.c:759
 msgid " (WAIS Index)"
 msgstr " (éÎÄÅËÓ WAIS)"
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:766
 msgid "WAIS Index: "
 msgstr "éÎÄÅËÓ WAIS: "
 
-#: WWW/Library/Implementation/HTWAIS.c:774
+#: WWW/Library/Implementation/HTWAIS.c:772
 msgid "This is a link for searching the "
 msgstr "üÔÏ ÓÓÙÌËÁ ÄÌÑ ÐÏÉÓËÁ × "
 
-#: WWW/Library/Implementation/HTWAIS.c:778
+#: WWW/Library/Implementation/HTWAIS.c:776
 msgid " WAIS Index.\n"
 msgstr " ÉÎÄÅËÓÅ WAIS.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:805
+#: WWW/Library/Implementation/HTWAIS.c:803
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
@@ -3252,48 +3280,48 @@ msgstr ""
 "\n"
 "÷×ÅÄÉÔÅ ËÏÍÁÎÄÕ ÐÏÉÓËÁ (s), É ÚÁÔÅÍ ÚÁÄÁÊÔÅ ÐÏÉÓËÏ×ÙÅ ÓÌÏ×Á.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:827
+#: WWW/Library/Implementation/HTWAIS.c:825
 msgid " (in "
 msgstr " (× "
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:834
 msgid "WAIS Search of \""
 msgstr "ðÏÉÓË WAIS \""
 
-#: WWW/Library/Implementation/HTWAIS.c:840
+#: WWW/Library/Implementation/HTWAIS.c:838
 msgid "\" in: "
 msgstr "\" ×: "
 
-#: WWW/Library/Implementation/HTWAIS.c:855
+#: WWW/Library/Implementation/HTWAIS.c:853
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: úÁÐÒÏÓ ÓÌÉÛËÏÍ ÂÏÌØÛÏÊ."
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:862
 msgid "Searching WAIS database..."
 msgstr "ðÏÉÓË × ÂÁÚÅ ÄÁÎÎÙÈ WAIS..."
 
-#: WWW/Library/Implementation/HTWAIS.c:874
+#: WWW/Library/Implementation/HTWAIS.c:872
 msgid "Search interrupted."
 msgstr "ðÏÉÓË ÐÒÅÒ×ÁÎ."
 
-#: WWW/Library/Implementation/HTWAIS.c:924
+#: WWW/Library/Implementation/HTWAIS.c:922
 msgid "Can't convert format of WAIS document"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÆÏÒÍÁÔ ÄÏËÕÍÅÎÔÁ WAIS"
 
-#: WWW/Library/Implementation/HTWAIS.c:968
+#: WWW/Library/Implementation/HTWAIS.c:966
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: úÁÐÒÏÓ ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ."
 
 #.
 #. **	Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:982
+#: WWW/Library/Implementation/HTWAIS.c:980
 msgid "Fetching WAIS document..."
 msgstr "ðÏÌÕÞÅÎÉÅ ÄÏËÕÍÅÎÔÁ WAIS..."
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1021
+#: WWW/Library/Implementation/HTWAIS.c:1019
 msgid "No text was returned!\n"
 msgstr "ôÅËÓÔ ÎÅ ÂÙÌ ×ÏÚ×ÒÁÝÅÎ!\n"
 
@@ -3313,167 +3341,160 @@ msgstr " ÏÐÉÓÁÎÉÅ"
 msgid "Access links"
 msgstr "óÓÙÌËÉ ÄÏÓÔÕÐÁ"
 
-#: WWW/Library/Implementation/HTWSRC.c:345
+#: WWW/Library/Implementation/HTWSRC.c:346
 msgid "Direct access"
 msgstr "ðÒÑÍÏÊ ÄÏÓÔÕÐ"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:348
+#: WWW/Library/Implementation/HTWSRC.c:349
 msgid " (or via proxy server, if defined)"
 msgstr " (ÉÌÉ ÞÅÒÅÚ ÐÒÏËÓÉ-ÓÅÒ×ÅÒ, ÅÓÌÉ ÏÎ ÏÐÒÅÄÅÌÅÎ)"
 
-#: WWW/Library/Implementation/HTWSRC.c:363
+#: WWW/Library/Implementation/HTWSRC.c:364
 msgid "Maintainer"
 msgstr "ïÔ×ÅÔÓÔ×ÅÎÎÙÊ"
 
-#: WWW/Library/Implementation/HTWSRC.c:371
+#: WWW/Library/Implementation/HTWSRC.c:372
 msgid "Host"
 msgstr "íÁÛÉÎÁ"
 
-#: src/GridText.c:607
+#: src/GridText.c:688
 msgid "Memory exhausted, display interrupted!"
 msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ, ÏÔÏÂÒÁÖÅÎÉÅ ÐÒÅÒ×ÁÎÏ!"
 
-#: src/GridText.c:612
+#: src/GridText.c:693
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ, ÐÅÒÅÄÁÞÁ ÄÁÎÎÙÈ ÂÕÄÅÔ ÐÒÅÒ×ÁÎÁ!"
 
-#: src/GridText.c:3395
+#: src/GridText.c:3578
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** ðáíñôø éóþåòðáîá ***"
 
-#: src/GridText.c:5733 src/GridText.c:5740 src/LYList.c:258
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
 msgid "unknown field or link"
 msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ÐÏÌÅ ÉÌÉ ÓÓÙÌËÁ"
 
-#: src/GridText.c:5749
+#: src/GridText.c:6023
 msgid "text entry field"
 msgstr "ÐÏÌÅ ××ÏÄÁ ÔÅËÓÔÁ"
 
-#: src/GridText.c:5752
+#: src/GridText.c:6026
 msgid "password entry field"
 msgstr "ÐÏÌÅ ××ÏÄÁ ÐÁÒÏÌÑ"
 
-#: src/GridText.c:5755
+#: src/GridText.c:6029
 msgid "checkbox"
 msgstr "ÎÅÚÁ×ÉÓÉÍÁÑ ËÎÏÐËÁ"
 
-#: src/GridText.c:5758
+#: src/GridText.c:6032
 msgid "radio button"
 msgstr "ÚÁ×ÉÓÉÍÁÑ ËÎÏÐËÁ"
 
-#: src/GridText.c:5761
+#: src/GridText.c:6035
 msgid "submit button"
 msgstr "ËÎÏÐËÁ ÐÏÓÙÌËÉ"
 
-#: src/GridText.c:5764
+#: src/GridText.c:6038
 msgid "reset button"
 msgstr "ËÎÏÐËÁ ÏÞÉÓÔËÉ"
 
-#: src/GridText.c:5767
+#: src/GridText.c:6041
 msgid "popup menu"
 msgstr "×ÓÐÌÙ×ÁÀÝÅÅ ÍÅÎÀ"
 
-#: src/GridText.c:5770
+#: src/GridText.c:6044
 msgid "hidden form field"
 msgstr "ÓËÒÙÔÏÅ ÐÏÌÅ ÆÏÒÍÙ"
 
-#: src/GridText.c:5773
+#: src/GridText.c:6047
 msgid "text entry area"
 msgstr "ÏÂÌÁÓÔØ ××ÏÄÁ ÔÅËÓÔÁ"
 
-#: src/GridText.c:5776
+#: src/GridText.c:6050
 msgid "range entry field"
 msgstr "ÐÏÌÅ ××ÏÄÁ ÄÉÁÐÁÚÏÎÁ"
 
-#: src/GridText.c:5779
+#: src/GridText.c:6053
 msgid "file entry field"
 msgstr "ÐÏÌÅ ××ÏÄÁ ÆÁÊÌÁ"
 
-#: src/GridText.c:5782
+#: src/GridText.c:6056
 msgid "text-submit field"
 msgstr "ÔÅËÓÔÏ×ÏÅ ÐÏÌÅ ÐÏÓÙÌËÉ"
 
-#: src/GridText.c:5785
+#: src/GridText.c:6059
 msgid "image-submit button"
 msgstr "ÇÒÁÆÉÞÅÓËÁÑ ËÎÏÐËÁ ÐÏÓÙÌËÉ"
 
-#: src/GridText.c:5788
+#: src/GridText.c:6062
 msgid "keygen field"
 msgstr "ÐÏÌÅ keygen"
 
-#: src/GridText.c:5791
+#: src/GridText.c:6065
 msgid "unknown form field"
 msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ÐÏÌÅ ÆÏÒÍÙ"
 
-#. We can't open the file, what do we do?
-#: src/GridText.c:10348
-#, fuzzy
+#: src/GridText.c:10066
 msgid "Can't open file for uploading"
-msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÞÔÅÎÉÑ!"
+msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÚÁÇÒÕÚËÉ!"
 
-#. We got an error reading the file, what do we do?
-#: src/GridText.c:10359
-msgid "Short read from file, problem?"
-msgstr ""
-
-#: src/GridText.c:10721
+#: src/GridText.c:11218
 #, c-format
 msgid "Submitting %s"
 msgstr "ðÏÓÙÌËÁ %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:11887
+#: src/GridText.c:12375
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12092
+#: src/GridText.c:12581
 msgid "Wrap lines to fit displayed area?"
 msgstr "ðÅÒÅÎÅÓÔÉ ÓÔÒÏËÉ, ÞÔÏÂÙ ÐÏÐÁÓÔØ × ÏÂÌÁÓÔØ ÏÔÏÂÒÁÖÅÎÉÑ?"
 
-#: src/GridText.c:12144
+#: src/GridText.c:12633
 msgid "Very long lines have been wrapped!"
 msgstr "ïÞÅÎØ ÄÌÉÎÎÙÅ ÓÔÒÏËÉ ÂÙÌÉ ÐÅÒÅÎÅÓÅÎÙ!"
 
-#: src/GridText.c:12591
+#: src/GridText.c:13079
 msgid "Very long lines have been truncated!"
 msgstr "ïÞÅÎØ ÄÌÉÎÎÙÅ ÓÔÒÏËÉ ÂÙÌÉ ÕÓÅÞÅÎÙ!"
 
-#: src/HTAlert.c:155 src/LYShowInfo.c:318
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
 msgid "bytes"
 msgstr "ÂÁÊÔ"
 
-#: src/HTAlert.c:156
+#: src/HTAlert.c:155
 msgid "KB"
 msgstr "ëâ"
 
-#: src/HTAlert.c:255
+#: src/HTAlert.c:274
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "ðÒÏÞÉÔÁÎÏ %s ÉÚ %s ÄÁÎÎÙÈ"
 
-#: src/HTAlert.c:257
+#: src/HTAlert.c:276
 #, c-format
 msgid "Read %s of data"
 msgstr "ðÒÏÞÉÔÁÎÏ %s ÄÁÎÎÙÈ"
 
-#: src/HTAlert.c:262
+#: src/HTAlert.c:281
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s/ÓÅË"
 
-#: src/HTAlert.c:269
+#: src/HTAlert.c:290
 #, c-format
-msgid " (stalled for %ld sec)"
-msgstr " (ÚÁÄÅÒÖÁÎÏ ÎÁ %ld ÓÅË)"
+msgid " (stalled for %s)"
+msgstr " (ÚÁÄÅÒÖÁÎÏ ÎÁ %s)"
 
-#: src/HTAlert.c:271
+#: src/HTAlert.c:294
 #, c-format
-msgid ", ETA %ld sec"
-msgstr ", ETA %ld ÓÅË"
+msgid ", ETA %s"
+msgstr ", ETA %s"
 
-#: src/HTAlert.c:277
+#: src/HTAlert.c:301
 msgid " (Press 'z' to abort)"
 msgstr " (îÁÖÍÉÔÅ 'z' ÞÔÏÂÙ ÐÒÅÒ×ÁÔØ)"
 
@@ -3502,43 +3523,43 @@ msgstr " (îÁÖÍÉÔÅ 'z' ÞÔÏÂÙ ÐÒÅÒ×ÁÔØ)"
 #. *  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:334
+#: src/HTAlert.c:342 src/HTAlert.c:390
 msgid "yes"
 msgstr "yes"
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:345 src/HTAlert.c:391
 msgid "no"
 msgstr "no"
 
-#: src/HTML.c:6342
+#: src/HTML.c:5985
 msgid "Description:"
 msgstr "ïÐÉÓÁÎÉÅ:"
 
-#: src/HTML.c:6347
+#: src/HTML.c:5990
 msgid "(none)"
 msgstr "(ÎÅÔ)"
 
-#: src/HTML.c:6351
+#: src/HTML.c:5994
 msgid "Filepath:"
 msgstr "ðÕÔØ Ë ÆÁÊÌÕ:"
 
-#: src/HTML.c:6356
+#: src/HTML.c:5999
 msgid "(unknown)"
 msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ)"
 
-#: src/HTML.c:7804
+#: src/HTML.c:7452
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "äÏËÕÍÅÎÔ ÉÍÅÅÔ ÔÏÌØËÏ ÓËÒÙÔÙÅ ÓÓÙÌËÉ.  éÓÐÏÌØÚÕÊÔÅ ËÏÍÁÎÄÕ 'l'ist."
 
-#: src/HTML.c:8328
+#: src/HTML.c:7958
 msgid "Source cache error - disk full?"
 msgstr "ïÛÉÂËÁ ËÜÛÉÒÏ×ÁÎÉÑ ÉÓÈÏÄÎÙÈ ÆÁÊÌÏ× - ÐÅÒÅÐÏÌÎÅÎÉÅ ÄÉÓËÁ?"
 
-#: src/HTML.c:8341
+#: src/HTML.c:7971
 msgid "Source cache error - not enough memory!"
 msgstr "ïÛÉÂËÁ ËÜÛÉÒÏ×ÁÎÉÑ ÉÓÈÏÄÎÙÈ ÆÁÊÌÏ× - ÎÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ!"
 
-#: src/LYBookmark.c:166
+#: src/LYBookmark.c:167
 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"
@@ -3550,7 +3571,7 @@ msgstr ""
 "     ËÏÍÁÎÄÙ ÕÄÁÌÅÎÉÑ ÚÁËÌÁÄËÉ, ÏÂÙÞÎÏ ËÌÁ×ÉÛÁ 'R', ÈÏÔÑ ÏÎÁ ÍÏÖÅÔ ÂÙÔØ\n"
 "     ÐÅÒÅÎÁÚÎÁÞÅÎÁ ×ÁÍÉ ÉÌÉ ÓÉÓÔÅÍÎÙÍ ÁÄÍÉÎÉÓÔÒÁÔÏÒÏÍ."
 
-#: src/LYBookmark.c:382
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
@@ -3558,7 +3579,7 @@ msgstr ""
 "     ÷Ù ÍÏÖÅÔÅ ÕÄÁÌÑÔØ ÓÓÙÌËÉ ËÌÁ×ÉÛÅÊ 'R'<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:385
+#: src/LYBookmark.c:382
 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"
@@ -3568,7 +3589,7 @@ msgstr ""
 "     ÄÅÌÁÅÔÓÑ Ó ÐÏÍÏÝØÀ ËÌÁ×ÉÛÉ 'R', ÎÏ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÎÁÚÎÁÞÅÎÏ ×ÁÍÉ ÉÌÉ\n"
 "     ×ÁÛÉÍ ÓÉÓÔÅÍÎÙÍ ÁÄÍÉÎÉÓÔÒÁÔÏÒÏÍ."
 
-#: src/LYBookmark.c:389
+#: src/LYBookmark.c:386
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3577,7 +3598,7 @@ msgstr ""
 "     ÒÅÄÁËÔÏÒÏÍ ÄÌÑ ÕÄÁÌÅÎÉÑ ÕÓÔÁÒÅ×ÛÉÈ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÙÈ ÓÓÙÌÏË, ÉÌÉ\n"
 "     ÄÌÑ ÉÚÍÅÎÅÎÉÑ ÉÈ ÐÏÒÑÄËÁ."
 
-#: src/LYBookmark.c:392
+#: src/LYBookmark.c:389
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3589,7 +3610,7 @@ msgstr ""
 "            ÉÌÉ ÄÏÂÁ×ÌÑÔØ ÄÒÕÇÉÅ ÔÅÇÉ HTML.\n"
 "            õÂÅÄÉÔÅÓØ, ÞÔÏ ËÁÖÄÁÑ ÚÁËÌÁÄËÁ ÓÏÈÒÁÎÅÎÁ ÎÁ ÅÄÉÎÓÔ×ÅÎÎÏÊ ÓÔÒÏËÅ."
 
-#: src/LYBookmark.c:683
+#: src/LYBookmark.c:681
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr "æÁÊÌ ÍÏÖÅÔ ÂÙÔØ ×ÏÓÓÔÁÎÏ×ÌÅÎ ÉÚ %s × ÔÅÞÅÎÉÅ ÜÔÏÇÏ ÓÅÁÎÓÁ"
@@ -3598,71 +3619,71 @@ msgstr "æÁÊÌ ÍÏÖÅÔ ÂÙÔØ ×ÏÓÓÔÁÎÏ×ÌÅÎ ÉÚ %s × ÔÅÞÅÎÉÅ ÜÔÏÇÏ ÓÅÁÎÓÁ"
 #. *  Neither the path as given nor any components examined by
 #. *  backing up were stat()able. - kw
 #.
-#: src/LYCgi.c:232
+#: src/LYCgi.c:231
 msgid "Unable to access cgi script"
 msgstr "ïÛÉÂËÁ ÄÏÓÔÕÐÁ Ë cgi-ÓËÒÉÐÔÕ"
 
-#: src/LYCgi.c:651 src/LYCgi.c:654
+#: src/LYCgi.c:654 src/LYCgi.c:657
 msgid "Good Advice"
 msgstr "èÏÒÏÛÉÊ ÓÏ×ÅÔ"
 
-#: src/LYCgi.c:657
+#: src/LYCgi.c:660
 msgid "An excellent http server for VMS is available via"
 msgstr "ïÔÌÉÞÎÙÊ http ÓÅÒ×ÅÒ ÄÌÑ VMS ÄÏÓÔÕÐÅÎ ÞÅÒÅÚ"
 
-#: src/LYCgi.c:664
+#: src/LYCgi.c:667
 msgid "this link"
 msgstr "ÜÔÕ ÓÓÙÌËÕ"
 
-#: src/LYCgi.c:668
+#: src/LYCgi.c:671
 msgid "It provides state of the art CGI script support.\n"
 msgstr "ðÒÅÄÏÓÔÁ×ÌÑÅÍÁÑ ÉÍ ÐÏÄÄÅÒÖËÁ CGI-ÓËÒÉÐÔÏ× Ñ×ÌÑÅÔÓÑ ÐÏÓÌÅÄÎÉÍ ÓÌÏ×ÏÍ ÔÅÈÎÉËÉ.\n"
 
-#: src/LYClean.c:108
+#: src/LYClean.c:122
 msgid "Exiting via interrupt:"
 msgstr "÷ÙÈÏÄ ÐÏ ÐÒÅÒÙ×ÁÎÉÀ:"
 
-#: src/LYCookie.c:2659
+#: src/LYCookie.c:2462
 msgid "(from a previous session)"
 msgstr "(ÉÚ ÐÒÅÄÙÄÕÝÅÇÏ ÓÅÁÎÓÁ)"
 
-#: src/LYCookie.c:2719
+#: src/LYCookie.c:2522
 msgid "Maximum Gobble Date:"
 msgstr ""
 
-#: src/LYCookie.c:2764
+#: src/LYCookie.c:2564
 msgid "Internal"
 msgstr "÷ÎÕÔÒÅÎÎÉÊ"
 
-#: src/LYCookie.c:2765
+#: src/LYCookie.c:2565
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "ÏÛÉÂËÁ cookie_domain_flag_set error, ÐÒÅÇÒÁÍÍÁ ÐÒÅÒÙ×ÁÅÔÓÑ"
 
-#: src/LYCurses.c:936
+#: src/LYCurses.c:1004
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "ïÛÉÂËÁ ÐÒÉ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÔÅÒÍÉÎÁÌÁ - ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÔÅÒÍÉÎÁÌÁ?"
 
-#: src/LYCurses.c:1328
+#: src/LYCurses.c:1426
 msgid "Terminal ="
 msgstr "ôÅÒÍÉÎÁÌ ="
 
-#: src/LYCurses.c:1332
+#: src/LYCurses.c:1430
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "ó ÜÔÏÊ ÐÒÏÇÒÁÍÍÏÊ ×Ù ÄÏÌÖÎÙ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÅÒÍÉÎÁÌ vt100, 200, É Ô.Ä."
 
-#: src/LYCurses.c:1384
+#: src/LYCurses.c:1480
 msgid "Your Terminal type is unknown!"
 msgstr "ôÉÐ ×ÁÛÅÇÏ ôÅÒÍÉÎÁÌÁ ÎÅÉÚ×ÅÓÔÅÎ!"
 
-#: src/LYCurses.c:1385
+#: src/LYCurses.c:1481
 msgid "Enter a terminal type:"
 msgstr "÷×ÅÄÉÔÅ ÔÉÐ ÔÅÒÍÉÎÁÌÁ:"
 
-#: src/LYCurses.c:1398
+#: src/LYCurses.c:1495
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "ôéð ôåòíéîáìá õóôáîï÷ìåî ÷"
 
-#: src/LYCurses.c:1749
+#: src/LYCurses.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -3671,7 +3692,7 @@ msgstr ""
 "\n"
 " ÷ %s ÷ÅÒ. %s ÐÒÏÉÚÏÛÌÁ ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ.\n"
 
-#: src/LYCurses.c:1751
+#: src/LYCurses.c:1996
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -3688,136 +3709,161 @@ msgstr ""
 "ÒÅÁÌÉÚÁÃÉÀ TCPIP, ÓÌÅÄ ×ÙÚÏ×Ï× TRACEBACK, ÅÓÌÉ ÅÇÏ ÍÏÖÎÏ ÐÏÌÕÞÉÔØ, É ÌÀÂÕÀ\n"
 "ÄÒÕÇÕÀ ÏÔÎÏÓÑÝÕÀÓÑ Ë ÄÅÌÕ ÉÎÆÏÒÍÁÃÉÀ.\n"
 
-#: src/LYEdit.c:264
+#: src/LYEdit.c:249
 msgid "Editor killed by signal"
 msgstr "òÅÄÁËÔÏÒ ÕÂÉÔ ÓÉÇÎÁÌÏÍ"
 
-#: src/LYEdit.c:266
+#: src/LYEdit.c:251
 #, c-format
 msgid "Editor returned with error status, %s"
 msgstr "òÅÄÁËÔÏÒ ÚÁ×ÅÒÛÉÌÓÑ ÓÏ ÓÔÁÔÕÓÏÍ ÏÛÉÂËÉ, %s"
 
-#: src/LYEdit.c:267
+#: src/LYEdit.c:252
 msgid "reason unknown."
 msgstr "ÐÒÉÞÉÎÁ ÎÅÉÚ×ÅÓÔÎÁ."
 
-#: src/LYDownload.c:520
+#: src/LYDownload.c:517
 msgid "Downloaded link:"
 msgstr "óËÁÞÁÎÎÁÑ ÓÓÙÌËÁ:"
 
-#: src/LYDownload.c:525
+#: src/LYDownload.c:522
 msgid "Suggested file name:"
 msgstr "ðÒÅÄÌÁÇÁÅÍÏÅ ÉÍÑ ÆÁÊÌÁ:"
 
-#: src/LYDownload.c:530
+#: src/LYDownload.c:527
 msgid "Standard download options:"
 msgstr "óÔÁÎÄÁÒÔÎÙÅ ÏÐÃÉÉ ÄÌÑ ÓËÁÞÉ×ÁÎÉÑ:"
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:528
 msgid "Download options:"
 msgstr "ïÐÃÉÉ ÓËÁÞÉ×ÁÎÉÑ:"
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:544
 msgid "Save to disk"
 msgstr "óÏÈÒÁÎÉÔØ ÎÁ ÄÉÓË"
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "ðÒÏÓÍÏÔÒÅÔØ ÆÁÊÌ"
+
+#: src/LYDownload.c:565
 msgid "Save to disk disabled."
 msgstr "óÏÈÒÁÎÅÎÉÅ ÎÁ ÄÉÓË ÏÔËÌÀÞÅÎÏ."
 
-#: src/LYDownload.c:551 src/LYPrint.c:1338
+#: src/LYDownload.c:569 src/LYPrint.c:1327
 msgid "Local additions:"
 msgstr "ìÏËÁÌØÎÙÅ ÄÏÐÏÌÎÅÎÉÑ:"
 
-#: src/LYDownload.c:560 src/LYUpload.c:224
+#: src/LYDownload.c:578 src/LYUpload.c:216
 msgid "No Name Given"
 msgstr "éÍÑ ÎÅ ÚÁÄÁÎÏ"
 
-#: src/LYHistory.c:633
+#: src/LYHistory.c:657
 msgid "You selected:"
 msgstr "÷Ù ×ÙÂÒÁÌÉ:"
 
-#: src/LYHistory.c:657 src/LYHistory.c:905
+#: src/LYHistory.c:681 src/LYHistory.c:921
 msgid "(no address)"
 msgstr "(ÎÅÔ ÁÄÒÅÓÁ)"
 
-#: src/LYHistory.c:661
+#: src/LYHistory.c:685
 msgid " (internal)"
 msgstr " (×ÎÕÔÒÅÎÎÉÊ)"
 
-#: src/LYHistory.c:663
+#: src/LYHistory.c:687
 msgid " (was internal)"
 msgstr " (ÂÙÌ ×ÎÕÔÒÅÎÎÉÊ)"
 
-#: src/LYHistory.c:761
+#: src/LYHistory.c:785
 msgid " (From History)"
 msgstr " (éÚ éÓÔÏÒÉÉ)"
 
-#: src/LYHistory.c:825
+#: src/LYHistory.c:841
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "÷Ù ÐÏÓÅÔÉÌÉ (POST, ÚÁËÌÁÄËÉ, ÍÅÎÀ É ÓÐÉÓËÉ ÆÁÊÌÏ× ÉÓËÌÀÞÁÀÔÓÑ):"
 
-#: src/LYHistory.c:1124
+#: src/LYHistory.c:1137
 msgid "(No messages yet)"
 msgstr "(ðÏËÁ ÓÏÏÂÝÅÎÉÊ ÎÅÔ)"
 
-#: src/LYLeaks.c:78
+#: src/LYLeaks.c:209
 msgid "Invalid pointer detected."
 msgstr "ïÂÎÁÒÕÖÅÎ ÎÅ×ÅÒÎÙÊ ÕËÁÚÁÔÅÌØ."
 
-#: src/LYLeaks.c:80 src/LYLeaks.c:117
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr "ðÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ:"
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
 msgid "Pointer:"
 msgstr "õËÁÚÁÔÅÌØ:"
 
-#: src/LYLeaks.c:91 src/LYLeaks.c:98 src/LYLeaks.c:136
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
 msgid "FileName:"
 msgstr "éÍÑæÁÊÌÁ:"
 
-#: src/LYLeaks.c:94 src/LYLeaks.c:101 src/LYLeaks.c:139 src/LYLeaks.c:150
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
 msgid "LineCount:"
 msgstr "îÏÍÅÒóÔÒÏËÉ:"
 
-#: src/LYLeaks.c:115
+#: src/LYLeaks.c:249
 msgid "Memory leak detected."
 msgstr "ïÂÎÁÒÕÖÅÎÁ ÕÔÅÞËÁ ÐÁÍÑÔÉ."
 
-#: src/LYLeaks.c:120
+#: src/LYLeaks.c:257
 msgid "Contains:"
 msgstr "óÏÄÅÒÖÉÔ:"
 
-#: src/LYLeaks.c:133
+#: src/LYLeaks.c:270
 msgid "ByteSize:"
 msgstr "òÁÚÍÅÒâÁÊÔÁ:"
 
-#: src/LYLeaks.c:147
+#: src/LYLeaks.c:284
 msgid "realloced:"
 msgstr "×ÙÄÅÌÅÎÏ ÚÁÎÏ×Ï:"
 
-#: src/LYLeaks.c:170
+#: src/LYLeaks.c:307
 msgid "Total memory leakage this run:"
 msgstr "ïÂÝÁÑ ÕÔÅÞËÁ ÐÁÍÑÔÉ ÚÁ ÜÔÏÔ ÚÁÐÕÓË:"
 
-#: src/LYList.c:91
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr "÷ÙÄÅÌÅÎÏ ÂÁÊÔ"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
 msgid "References in "
 msgstr "óÓÙÌÏË × "
 
-#: src/LYList.c:92
+#: src/LYList.c:86
 msgid "this document:"
 msgstr "ÜÔÏÍ ÄÏËÕÍÅÎÔÅ:"
 
-#: src/LYList.c:98
+#: src/LYList.c:92
 msgid "Visible links:"
 msgstr "÷ÉÄÉÍÙÈ ÓÓÙÌÏË:"
 
-#: src/LYList.c:199 src/LYList.c:319
+#: src/LYList.c:194 src/LYList.c:315
 msgid "Hidden links:"
 msgstr "óËÒÙÔÙÈ ÓÓÙÌÏË:"
 
-#: src/LYList.c:267
+#: src/LYList.c:262
 msgid "References"
 msgstr "óÓÙÌËÉ"
 
-#: src/LYList.c:269
+#: src/LYList.c:264
 msgid "Visible links"
 msgstr "÷ÉÄÉÍÙÅ ÓÓÙÌËÉ"
 
@@ -3830,314 +3876,314 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÓÔÁÔÕÓ '%s'."
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "÷ÙÂÒÁÎÎÙÊ ÜÌÅÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ ÆÁÊÌÏÍ ÉÌÉ ËÁÔÁÌÏÇÏÍ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:383
+#: src/LYLocal.c:366
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "îÅ ÕÄÁÅÔÓÑ %s ×ÓÌÅÄÓÔ×ÉÅ ÓÉÓÔÅÍÎÏÊ ÏÛÉÂËÉ!"
 
 #. error return
-#: src/LYLocal.c:415
+#: src/LYLocal.c:400
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "÷ÏÚÍÏÖÎÏ ÏÛÉÂËÁ %s ×ÓÌÅÄÓÔ×ÉÅ ÓÉÓÔÅÍÎÏÊ ÏÛÉÂËÉ!"
 
-#: src/LYLocal.c:453
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "ÕÄÁÌÉÔØ %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr ""
+
+#: src/LYLocal.c:508
 #, c-format
 msgid "move %s to %s"
 msgstr "ÐÅÒÅÍÅÓÔÉÔØ %s × %s"
 
-#: src/LYLocal.c:475
+#: src/LYLocal.c:548
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "ëÁÔÁÌÏÇ Ó ÔÁËÉÍ ÉÍÅÎÅÍ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:477
+#: src/LYLocal.c:550
 msgid "There is already a file with that name!  Request ignored."
 msgstr "æÁÊÌ Ó ÔÁËÉÍ ÉÍÅÎÅÍ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:479
+#: src/LYLocal.c:552
 msgid "The specified name is already in use!  Request ignored."
 msgstr "õËÁÚÁÎÎÏÅ ÉÍÑ ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:490
+#: src/LYLocal.c:563
 msgid "Destination has different owner!  Request denied."
 msgstr "æÁÊÌ ÎÁÚÎÁÞÅÎÉÑ ÉÍÅÅÔ ÄÒÕÇÏÇÏ ×ÌÁÄÅÌØÃÁ!  úÁÐÒÏÓ ÚÁÐÒÅÝÅÎ."
 
-#: src/LYLocal.c:493
+#: src/LYLocal.c:566
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "æÁÊÌ ÎÁÚÎÁÞÅÎÉÑ ÎÅ Ñ×ÌÑÅÔÓÑ ÐÒÁ×ÉÌØÎÙÍ ËÁÔÁÌÏÇÏÍ!  úÁÐÒÏÓ ÚÁÐÒÅÝÅÎ."
 
-#: src/LYLocal.c:516
+#: src/LYLocal.c:588
 msgid "Remove all tagged files and directories?"
 msgstr "õÄÁÌÉÔØ ×ÓÅ ÏÔÍÅÞÅÎÎÙÅ ÆÁÊÌÙ É ËÁÔÁÌÏÇÉ?"
 
-#: src/LYLocal.c:537
-#, c-format
-msgid "remove %s"
-msgstr "ÕÄÁÌÉÔØ %s"
-
-#: src/LYLocal.c:580
+#: src/LYLocal.c:647
 msgid "Enter new location for tagged items: "
 msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÒÁÓÐÏÌÏÖÅÎÉÅ ÄÌÑ ÏÔÍÅÞÅÎÎÙÈ ÜÌÅÍÅÎÔÏ×: "
 
-#: src/LYLocal.c:649
+#: src/LYLocal.c:716
 msgid "Path too long"
 msgstr "ðÕÔØ ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ"
 
-#: src/LYLocal.c:680
+#: src/LYLocal.c:747
 msgid "Source and destination are the same location - request ignored!"
 msgstr "éÓÔÏÞÎÉË É ÐÕÔØ ÎÁÚÎÁÞÅÎÉÑ ÓÏ×ÐÁÄÁÀÔ - ÚÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ!"
 
-#: src/LYLocal.c:738
+#: src/LYLocal.c:805
 msgid "Enter new name for directory: "
 msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÉÍÑ ÄÌÑ ËÁÔÁÌÏÇÁ: "
 
-#: src/LYLocal.c:740
+#: src/LYLocal.c:807
 msgid "Enter new name for file: "
 msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÉÍÑ ÄÌÑ ÆÁÊÌÁ: "
 
-#: src/LYLocal.c:751
+#: src/LYLocal.c:819
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "îÁÊÄÅÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ (ÒÁÚÄÅÌÉÔÅÌØ ÐÕÔÉ)! úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:800
+#: src/LYLocal.c:868
 msgid "Enter new location for directory: "
 msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÍÅÓÔÏ ÒÁÓÐÏÌÏÖÅÎÉÑ ÄÌÑ ËÁÔÁÌÏÇÁ: "
 
-#: src/LYLocal.c:802
+#: src/LYLocal.c:874
 msgid "Enter new location for file: "
 msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÍÅÓÔÏ ÒÁÓÐÏÌÏÖÅÎÉÑ ÄÌÑ ÆÁÊÌÁ: "
 
-#: src/LYLocal.c:827
+#: src/LYLocal.c:901
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "îÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ - ÎÅ ÕÄÁÅÔÓÑ ÎÁÊÔÉ ÚÁ×ÅÒÛÁÀÝÉÊ ÒÁÚÄÅÌÉÔÅÌØ ÐÕÔÉ"
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:921
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "éÓÔÏÞÎÉË É ÐÕÔØ ÎÁÚÎÁÞÅÎÉÑ ÓÏ×ÐÁÄÁÀÔ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ!"
 
-#: src/LYLocal.c:894
+#: src/LYLocal.c:970
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "éÚÍÅÎÉÔÅ ÉÍÑ, ÍÅÓÔÏ ÒÁÓÐÏÌÏÖÅÎÉÑ, ÉÌÉ ÐÒÁ×Á ÄÏÓÔÕÐÁ (n, l, ÉÌÉ p): "
 
-#: src/LYLocal.c:896
+#: src/LYLocal.c:972
 msgid "Modify name or location (n or l): "
 msgstr "éÚÍÅÎÉÔØ ÉÍÑ ÉÌÉ ÍÅÓÔÏ ÒÁÓÐÏÌÏÖÅÎÉÑ (n ÉÌÉ l): "
 
 #.
 #. *	Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:925
+#: src/LYLocal.c:1001
 msgid "This feature not yet implemented!"
 msgstr "üÔÁ ×ÏÚÍÏÖÎÏÓÔØ ÅÝÅ ÎÅ ÒÅÁÌÉÚÏ×ÁÎÁ!"
 
-#: src/LYLocal.c:943
+#: src/LYLocal.c:1019
 msgid "Enter name of file to create: "
 msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÓÏÚÄÁ×ÁÅÍÏÇÏ ÆÁÊÌÁ: "
 
-#: src/LYLocal.c:951 src/LYLocal.c:999
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "îÁÊÄÅÎÏ ÎÅ×ÅÒÎÏÅ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ! úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:966
-#, c-format
-msgid "create %s"
-msgstr "ÓÏÚÄÁÔØ %s"
-
-#: src/LYLocal.c:991
+#: src/LYLocal.c:1061
 msgid "Enter name for new directory: "
 msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÄÌÑ ÎÏ×ÏÇÏ ËÁÔÁÌÏÇÁ: "
 
-#: src/LYLocal.c:1042
+#: src/LYLocal.c:1106
 msgid "Create file or directory (f or d): "
 msgstr "óÏÚÄÁÔØ ÆÁÊÌ ÉÌÉ ËÁÔÁÌÏÇ (f ÉÌÉ d): "
 
-#: src/LYLocal.c:1083
+#: src/LYLocal.c:1146
 #, c-format
 msgid "Remove '%s' and all of its contents?"
 msgstr "õÄÁÌÉÔØ '%s' É ×ÓÅ ÅÇÏ ÓÏÄÅÒÖÉÍÏÅ?"
 
-#: src/LYLocal.c:1086
+#: src/LYLocal.c:1149
 msgid "Remove directory and all of its contents?"
 msgstr "õÄÁÌÉÔØ ËÁÔÁÌÏÇ É ×ÓÅ ÅÇÏ ÓÏÄÅÒÖÉÍÏÅ?"
 
-#: src/LYLocal.c:1090
+#: src/LYLocal.c:1153
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "õÄÁÌÉÔØ ÆÁÊÌ '%s'?"
 
-#: src/LYLocal.c:1092
+#: src/LYLocal.c:1155
 msgid "Remove file?"
 msgstr "õÄÁÌÉÔØ ÆÁÊÌ?"
 
-#: src/LYLocal.c:1097
+#: src/LYLocal.c:1160
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "õÄÁÌÉÔØ ÓÉÍ×ÏÌØÎÕÀ ÓÓÙÌËÕ '%s'?"
 
-#: src/LYLocal.c:1099
+#: src/LYLocal.c:1162
 msgid "Remove symbolic link?"
 msgstr "õÄÁÌÉÔØ ÓÉÍ×ÏÌØÎÕÀ ÓÓÙÌËÕ?"
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1248
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "éÚ×ÉÎÉÔÅ, ÐÏËÁ ÎÅ ÉÚ×ÅÓÔÎÏ, ËÁË ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÐÒÁ×Á ÄÏÓÔÕÐÁ ÄÌÑ ÎÅ-UNIX ÆÁÊÌÏ×."
 
-#: src/LYLocal.c:1220
+#: src/LYLocal.c:1278
 msgid "Unable to open permit options file"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ Ó ÏÐÃÉÑÍÉ ÐÒÁ× ÄÏÓÔÕÐÁ"
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1305
 msgid "Specify permissions below:"
 msgstr "õËÁÖÉÔÅ ÎÉÖÅ ÐÒÁ×Á ÄÏÓÔÕÐÁ:"
 
-#: src/LYLocal.c:1248 src/LYShowInfo.c:196
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
 msgid "Owner:"
 msgstr "÷ÌÁÄÅÌÅÃ:"
 
-#: src/LYLocal.c:1264
+#: src/LYLocal.c:1322
 msgid "Group"
 msgstr "çÒÕÐÐÁ"
 
-#: src/LYLocal.c:1280
+#: src/LYLocal.c:1338
 msgid "Others:"
 msgstr "äÒÕÇÉÅ:"
 
-#: src/LYLocal.c:1298
+#: src/LYLocal.c:1356
 msgid "form to permit"
 msgstr ""
 
-#: src/LYLocal.c:1396
+#: src/LYLocal.c:1452
 msgid "Invalid mode format."
 msgstr "îÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ ÒÅÖÉÍÁ."
 
-#: src/LYLocal.c:1400
+#: src/LYLocal.c:1456
 msgid "Invalid syntax format."
 msgstr "îÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ ÓÉÎÔÁËÓÉÓÁ."
 
-#: src/LYLocal.c:1575
-msgid "NULL URL pointer"
-msgstr "NULL ÕËÁÚÁÔÅÌØ ÎÁ URL"
-
-#: src/LYLocal.c:1670
+#: src/LYLocal.c:1645
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "÷ÎÉÍÁÎÉÅ! UU-ÄÅËÏÄÉÒÏ×ÁÎÎÙÊ ÆÁÊÌ ÂÕÄÅÔ × ËÁÔÁÌÏÇÅ, ÉÚ ËÏÔÏÒÏÇÏ ×Ù ÚÁÐÕÓÔÉÌÉ Lynx."
 
-#: src/LYLocal.c:1782
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr "NULL ÕËÁÚÁÔÅÌØ ÎÁ URL"
+
+#: src/LYLocal.c:1908
 #, c-format
 msgid "Executing %s "
 msgstr "÷ÙÐÏÌÎÅÎÉÅ %s"
 
-#: src/LYLocal.c:1785
+#: src/LYLocal.c:1911
 msgid "Executing system command. This might take a while."
 msgstr "÷ÙÐÏÌÎÅÎÉÅ ÓÉÓÔÅÍÎÏÊ ËÏÍÁÎÄÙ. üÔÏ ÍÏÖÅÔ ÚÁÎÑÔØ ×ÒÅÍÑ."
 
-#: src/LYLocal.c:1831
-msgid "Unable to open file management menu file."
-msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ ÍÅÎÀ ÒÁÂÏÔÙ Ó ÆÁÊÌÁÍÉ."
-
-#: src/LYLocal.c:1862
+#: src/LYLocal.c:1985
 msgid "Current directory:"
 msgstr "ôÅËÕÝÉÊ ËÁÔÁÌÏÇ:"
 
-#: src/LYLocal.c:1865 src/LYLocal.c:1883
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
 msgid "Current selection:"
 msgstr "ôÅËÕÝÉÊ ×ÙÂÏÒ:"
 
-#: src/LYLocal.c:1869
+#: src/LYLocal.c:1992
 msgid "Nothing currently selected."
 msgstr "óÅÊÞÁÓ ÎÉÞÅÇÏ ÎÅ ×ÙÂÒÁÎÏ."
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged item:"
 msgstr "ÏÔÍÅÞÅÎÎÙÊ ÜÌÅÍÅÎÔ:"
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged items:"
 msgstr "ÏÔÍÅÞÅÎÎÙÅ ÜÌÅÍÅÎÔÙ:"
 
-#: src/LYLocal.c:1983 src/LYLocal.c:1994
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
 msgid "Illegal filename; request ignored."
 msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ÆÁÊÌÁ; ÚÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:2137
-msgid "The selected item is not a directory!  Request ignored."
-msgstr "÷ÙÂÒÁÎÎÙÊ ÜÌÅÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
-
 #. directory not writable
-#: src/LYLocal.c:2141
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
 msgid "Install in the selected directory not permitted."
 msgstr "õÓÔÁÎÏ×ËÁ × ×ÙÂÒÁÎÎÙÊ ËÁÔÁÌÏÇ ÎÅ ÒÁÚÒÅÛÅÎÁ."
 
-#: src/LYLocal.c:2146
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr "÷ÙÂÒÁÎÎÙÊ ÜÌÅÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
+
+#: src/LYLocal.c:2276
 msgid "Just a moment, ..."
-msgstr "íÉÎÕÔËÕ, ..."
+msgstr "íÉÎÕÔËÕ ..."
 
-#: src/LYLocal.c:2163
+#: src/LYLocal.c:2293
 msgid "Error buiding install args"
 msgstr ""
 
-#: src/LYLocal.c:2178 src/LYLocal.c:2210
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "éÓÔÏÞÎÉË É ÃÅÌØ ÓÏ×ÐÁÄÁÀÔ: %s"
 
-#: src/LYLocal.c:2188 src/LYLocal.c:2220
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "õÖÅ × ÃÅÌÅ×ÏÍ ËÁÔÁÌÏÇÅ: %s"
 
-#: src/LYLocal.c:2238
+#: src/LYLocal.c:2362
 msgid "Installation complete"
 msgstr "õÓÔÁÎÏ×ËÁ ÚÁ×ÅÒÛÅÎÁ"
 
-#: src/LYLocal.c:2427
+#: src/LYLocal.c:2551
 msgid "Temporary URL or list would be too long."
 msgstr "÷ÒÅÍÅÎÎÙÊ URL ÉÌÉ ÓÐÉÓÏË ÄÏÌÖÅÎ ÂÙÔØ ÓÌÉÛËÏÍ ÄÌÉÎÎÙÍ."
 
-#: src/LYMail.c:503
+#: src/LYMail.c:534
 msgid "Sending"
 msgstr "ðÏÓÙÌËÁ"
 
-#: src/LYMail.c:989
+#: src/LYMail.c:1024
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "óÓÙÌËÁ   %s :?: %s \n"
 
-#: src/LYMail.c:991
+#: src/LYMail.c:1026
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "ÎÁÚ×ÁÎÎÁÑ \"%s\"\n"
 
-#: src/LYMail.c:992
+#: src/LYMail.c:1027
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "× ÆÁÊÌÅ \"%s\" ÎÁÚ×ÁÎÁ \"%s\"\n"
 
-#: src/LYMail.c:993
+#: src/LYMail.c:1028
 msgid "was requested but was not available."
 msgstr "ÂÙÌÁ ÚÁÐÒÏÛÅÎÁ, ÎÏ ÏËÁÚÁÌÁÓØ ÎÅÄÏÓÔÕÐÎÁ."
 
-#: src/LYMail.c:994
+#: src/LYMail.c:1029
 msgid "Thought you might want to know."
 msgstr "èÏÔÑ ×Ù ÍÏÖÅÔÅ ÈÏÔÅÔØ ÚÎÁÔØ."
 
-#: src/LYMail.c:996
+#: src/LYMail.c:1031
 msgid "This message was automatically generated by"
 msgstr "üÔÏ ÓÏÏÂÝÅÎÉÅ ÂÙÌÏ Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÇÅÎÅÒÉÒÏ×ÁÎÏ"
 
-#: src/LYMain.c:897
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:969
 msgid "No Winsock found, sorry."
 msgstr "ë ÓÏÖÁÌÅÎÉÀ Winsock ÎÅ ÎÁÊÄÅÎ."
 
-#: src/LYMain.c:1103
+#: src/LYMain.c:1170
 msgid "You MUST define a valid TMP or TEMP area!\n"
 msgstr "÷Ù äïìöîù ÏÐÒÅÄÅÌÉÔØ ÐÒÁ×ÉÌØÎÕÀ ÏÂÌÁÓÔØ TMP ÉÌÉ TEMP!\n"
 
-#: src/LYMain.c:1156 src/LYMainLoop.c:5117
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
 msgid "No such directory"
 msgstr "îÅÔ ËÁÔÁÌÏÇÁ"
 
-#: src/LYMain.c:1378
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4148,7 +4194,7 @@ msgstr ""
 "ëÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ %s ÎÅ ÄÏÓÔÕÐÅÎ.\n"
 "\n"
 
-#: src/LYMain.c:1388
+#: src/LYMain.c:1446
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
@@ -4158,14 +4204,14 @@ msgstr ""
 "ëÏÄÉÒÏ×ËÉ Lynx ÎÅ ÏÐÒÅÄÅÌÅÎÙ.\n"
 "\n"
 
-#: src/LYMain.c:1417
+#: src/LYMain.c:1475
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1504
 #, c-format
 msgid ""
 "\n"
@@ -4176,60 +4222,60 @@ msgstr ""
 "æÁÊÌ Lynx %s ÎÅ ÄÏÓÔÕÐÅÎ.\n"
 "\n"
 
-#: src/LYMain.c:1704
+#: src/LYMain.c:1743
 msgid "Warning:"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ:"
 
-#: src/LYMain.c:2247
+#: src/LYMain.c:2293
 msgid "persistent cookies state will be changed in next session only."
 msgstr "ÓÏÓÔÏÑÎÉÅ ÐÏÓÔÏÑÎÎÙÈ cookie ÂÕÄÅÔ ÉÚÍÅÎÅÎÏ ÔÏÌØËÏ × ÓÌÅÄÕÀÝÅÍ ÓÅÁÎÓÅ."
 
-#: src/LYMain.c:2477 src/LYMain.c:2525
+#: src/LYMain.c:2540 src/LYMain.c:2588
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ÎÅÒÁÓÐÏÚÎÁÎÎÁÑ ËÏÄÉÒÏ×ËÁ=%s ÉÇÎÏÒÉÒÕÅÔÓÑ\n"
 
-#: src/LYMain.c:3047
-#, c-format
-msgid "%s Version %s (%s)\n"
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
 msgstr "%s ÷ÅÒÓÉÑ %s (%s)\n"
 
-#: src/LYMain.c:3072
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "óÏÂÒÁÎÏ %s %s %s\n"
 
-#: src/LYMain.c:3077
+#: src/LYMain.c:3166
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
 msgstr "á×ÔÏÒÓËÉÅ ÐÒÁ×Á ÐÒÉÎÁÄÌÅÖÁÔ ÕÎÉ×ÅÒÓÉÔÅÔÕ ëÁÎÚÁÓÁ, CERN, É ÄÒÕÇÉÍ ÕÞÁÓÔÎÉËÁÍ.\n"
 
-#: src/LYMain.c:3079
+#: src/LYMain.c:3168
 msgid "Distributed under the GNU General Public License.\n"
 msgstr "òÁÓÐÒÏÓÔÒÁÎÑÅÔÓÑ × ÒÁÍËÁÈ õÎÉ×ÅÒÓÁÌØÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU.\n"
 
-#: src/LYMain.c:3081
+#: src/LYMain.c:3170
 msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
+"See http://lynx.isc.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
-"óÍ. http://lynx.browser.org/ É ÐÏÍÏÝØ ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
+"óÍ. http://lynx.isc.org/ É ÐÏÍÏÝØ ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 "\n"
 
-#: src/LYMain.c:3800
+#: src/LYMain.c:3919
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "éóðïìøúï÷áîéå: %s [ËÌÀÞÉ] [ÆÁÊÌ]\n"
 
-#: src/LYMain.c:3801
+#: src/LYMain.c:3920
 msgid "Options are:\n"
 msgstr "ëÌÀÞÉ:\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4191
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: îÅ×ÅÒÎÁÑ ÏÐÃÉÑ: %s\n"
 
-#: src/LYMainLoop.c:512
+#: src/LYMainLoop.c:539
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: îÅ×ÅÒÎÁÑ ÓÓÙÌËÁ ÍÙÛÉ %d!"
@@ -4237,80 +4283,108 @@ msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: îÅ×ÅÒÎÁÑ ÓÓÙÌËÁ ÍÙÛÉ %d!"
 #.
 #. * Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:625 src/LYMainLoop.c:5139
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
 msgid "A URL specified by the user"
 msgstr "URL, ÕËÁÚÁÎÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌÅÍ"
 
-#: src/LYMainLoop.c:1114
+#: src/LYMainLoop.c:1110
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "Enctype multipart/form-data ÅÝÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ!  îÅ ÕÄÁÅÔÓÑ ÐÏÓÌÁÔØ."
 
 #.
 #. *  Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3097
+#: src/LYMainLoop.c:3053
 msgid "Help Screen"
 msgstr "üËÒÁÎ ðÏÍÏÝÉ"
 
-#: src/LYMainLoop.c:3231
+#: src/LYMainLoop.c:3177
 msgid "System Index"
 msgstr "óÉÓÔÅÍÎÙÊ éÎÄÅËÓ"
 
-#: src/LYMainLoop.c:3611 src/LYMainLoop.c:5347
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
 msgid "Entry into main screen"
 msgstr "÷ÈÏÄ ÎÁ ÇÌÁ×ÎÙÊ ÜËÒÁÎ"
 
-#: src/LYMainLoop.c:3897
+#: src/LYMainLoop.c:3824
 msgid "No next document present"
-msgstr ""
+msgstr "óÌÅÄÕÀÝÉÊ ÄÏËÕÍÅÎÔ ÏÔÓÕÔÓÔ×ÕÅÔ"
 
-#: src/LYMainLoop.c:4206
+#: src/LYMainLoop.c:4131
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "ÉÚ×ÉÎÉÔÅ, ËÏÄÉÒÏ×ËÁ ÄÌÑ ÜÔÏÇÏ ÄÏËÕÍÅÎÔÁ ÕËÁÚÁÎÁ Ñ×ÎÏ..."
 
-#: src/LYMainLoop.c:5093
+#: src/LYMainLoop.c:5004
 msgid "cd to:"
 msgstr "ÐÅÒÅÊÔÉ ×:"
 
-#: src/LYMainLoop.c:5120
+#: src/LYMainLoop.c:5031
 msgid "A component of path is not a directory"
 msgstr "ëÏÍÐÏÎÅÎÔÁ ÐÕÔÉ ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ"
 
-#: src/LYMainLoop.c:5123
+#: src/LYMainLoop.c:5034
 msgid "failed to change directory"
 msgstr "ÎÅ ÕÄÁÌÏÓØ ÉÚÍÅÎÉÔØ ËÁÔÁÌÏÇ"
 
-#: src/LYMainLoop.c:6291
+#: src/LYMainLoop.c:6204
 msgid "Reparsing document under current settings..."
 msgstr "äÏËÕÍÅÎÔ ÒÁÚÂÉÒÁÅÔÓÑ ÚÁÎÏ×Ï Ó ÕÞÅÔÏÍ ÔÅËÕÝÉÈ ÕÓÔÁÎÏ×ÏË..."
 
-#: src/LYMainLoop.c:6579 src/LYMainLoop.c:6583
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "æÁÔÁÌØÎÁÑ ÏÛÉÂËÁ - ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ %s\n"
 
-#: src/LYMainLoop.c:7719 src/LYMainLoop.c:7892
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6914
+msgid "Current URL is empty."
+msgstr "ôÅËÕÝÉÊ URL ÐÕÓÔ."
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr "ïÝÉÂËÁ ÐÒÉ ËÏÐÉÒÏ×ÁÎÉÉ × ÂÕÆÅÒ ÏÂÍÅÎÁ."
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr "URL ÄÏËÕÍÅÎÔÁ ÐÏÍÅÝÅÎ × ÂÕÆÅÒ ÏÂÍÅÎÁ."
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr "URL ÓÓÙÌËÉ ÐÏÍÅÝÅÎ × ÂÕÆÅÒ ÏÂÍÅÎÁ."
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr "URL × ÂÕÆÅÒÅ ÏÂÍÅÎÁ ÏÔÓÕÔÓÔ×ÕÅÔ."
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
 msgid "-index-"
 msgstr "-ÉÎÄÅËÓ-"
 
-#: src/LYMainLoop.c:7829
+#: src/LYMainLoop.c:7731
 msgid "lynx: Can't access startfile"
 msgstr "lynx: îÅÔ ÄÏÓÔÕÐÁ Ë ÎÁÞÁÌØÎÏÍÕ ÆÁÊÌÕ"
 
-#: src/LYMainLoop.c:7842
+#: src/LYMainLoop.c:7744
 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:7843
+#: src/LYMainLoop.c:7745
 msgid "      Exiting..."
 msgstr "      ÷ÙÈÏÄ..."
 
-#: src/LYMainLoop.c:7886
+#: src/LYMainLoop.c:7788
 msgid "-more-"
 msgstr "-ÄÁÌÅÅ-"
 
 #. Enable scrolling.
-#: src/LYNews.c:203
+#: src/LYNews.c:187
 msgid "You will be posting to:"
 msgstr "÷Ù ÂÕÄÅÔÅ ÐÏÓÙÌÁÔØ ×:"
 
@@ -4318,7 +4392,7 @@ msgstr "÷Ù ÂÕÄÅÔÅ ÐÏÓÙÌÁÔØ ×:"
 #. *  Get the mail address for the From header,
 #. *  offering personal_mail_address as default.
 #.
-#: src/LYNews.c:212
+#: src/LYNews.c:196
 msgid ""
 "\n"
 "\n"
@@ -4333,7 +4407,7 @@ msgstr ""
 #. *  document's title as the default if this is a
 #. *  followup rather than a new post. - FM
 #.
-#: src/LYNews.c:230
+#: src/LYNews.c:214
 msgid ""
 "\n"
 "\n"
@@ -4343,7 +4417,7 @@ msgstr ""
 "\n"
 " ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ÉÌÉ ÏÔÒÅÄÁËÔÉÒÕÊÔÅ ÚÁÇÏÌÏ×ÏË Subject:\n"
 
-#: src/LYNews.c:322
+#: src/LYNews.c:303
 msgid ""
 "\n"
 "\n"
@@ -4356,7 +4430,7 @@ msgstr ""
 #.
 #. *  Use the built in line editior.
 #.
-#: src/LYNews.c:379
+#: src/LYNews.c:360
 msgid ""
 "\n"
 "\n"
@@ -4366,94 +4440,112 @@ msgstr ""
 "\n"
 " ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÎÉÖÅ ×ÁÛÅ ÓÏÏÂÝÅÎÉÅ."
 
-#: src/LYNews.c:425
+#: src/LYNews.c:406
 msgid "Message has no original text!"
 msgstr "óÏÏÂÝÅÎÉÅ ÎÅ ÉÍÅÅÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÇÏ ÔÅËÓÔÁ!"
 
-#: src/LYOptions.c:743
+#: src/LYOptions.c:746
 msgid "review/edit B)ookmarks files"
 msgstr "ÐÒÏÓÍÏÔÒÅÔØ/ÏÔÒÅÄÁËÔÉÒÏ×ÁÔØ ÆÁÊÌÙ B)ÚÁËÌÁÄÏË"
 
-#: src/LYOptions.c:745
+#: src/LYOptions.c:748
 msgid "B)ookmark file: "
 msgstr "æÁÊÌ B)ÚÁËÌÁÄÏË: "
 
-#: src/LYOptions.c:2507 src/LYOptions.c:2531
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "éÓÐÏÌØÚÕÊÔÅ %s ÄÌÑ ×ÙÚÏ×Á ÍÅÎÀ ðÁÒÁÍÅÔÒÏ×!"
 
-#: src/LYOptions.c:3208
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr "(ÐÁÒÁÍÅÔÒÙ, ÏÔÍÅÞÅÎÎÙÅ (!) ÓÏÈÒÁÎÅÎÙ ÎÅ ÂÕÄÕÔ)"
+
+#: src/LYOptions.c:3261
 msgid "General Preferences"
 msgstr "ïÂÝÉÅ ðÒÅÄÐÏÞÔÅÎÉÑ"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3212
+#: src/LYOptions.c:3265
 msgid "User mode"
 msgstr "òÅÖÉÍ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3218
+#: src/LYOptions.c:3271
 msgid "Editor"
 msgstr "òÅÄÁËÔÏÒ"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3223
+#: src/LYOptions.c:3276
 msgid "Type of Search"
 msgstr "ôÉÐ ÐÏÉÓËÁ"
 
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3229
+#: src/LYOptions.c:3285
 msgid "Cookies"
 msgstr "Cookie"
 
-#: src/LYOptions.c:3243
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
 msgid "Keyboard Input"
 msgstr "÷×ÏÄ Ó ËÌÁ×ÉÁÔÕÒÙ"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3247
+#: src/LYOptions.c:3316
 msgid "Keypad mode"
 msgstr "òÅÖÉÍ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ËÌÁ×ÉÁÔÕÒÙ"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3253
+#: src/LYOptions.c:3322
 msgid "Emacs keys"
 msgstr "ëÌÁ×ÉÛÉ Emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3259
+#: src/LYOptions.c:3328
 msgid "VI keys"
 msgstr "ëÌÁ×ÉÛÉ VI"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3266
+#: src/LYOptions.c:3335
 msgid "Line edit style"
-msgstr ""
+msgstr "óÔÉÌØ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÓÔÒÏË"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3278
-#, fuzzy
+#: src/LYOptions.c:3347
 msgid "Keyboard layout"
-msgstr "÷×ÏÄ Ó ËÌÁ×ÉÁÔÕÒÙ"
+msgstr "òÁÓËÌÁÄËÁ ËÌÁ×ÉÁÔÕÒÙ"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3291
+#: src/LYOptions.c:3360
 msgid "Display and Character Set"
 msgstr "ïÔÏÂÒÁÖÅÎÉÅ É îÁÂÏÒ óÉÍ×ÏÌÏ×"
 
 #. ***************************************************************
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3295
+#: src/LYOptions.c:3364
 msgid "Display character set"
 msgstr "ëÏÄÉÒÏ×ËÁ ÏÔÏÂÒÁÖÅÎÉÑ"
 
-#: src/LYOptions.c:3324
+#: src/LYOptions.c:3393
 msgid "Assumed document character set"
 msgstr "ðÏÄÒÁÚÕÍÅ×ÁÅÍÁÑ ËÏÄÉÒÏ×ËÁ ÄÏËÕÍÅÎÔÁ"
 
@@ -4462,202 +4554,216 @@ msgstr "ðÏÄÒÁÚÕÍÅ×ÁÅÍÁÑ ËÏÄÉÒÏ×ËÁ ÄÏËÕÍÅÎÔÁ"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3344
+#: src/LYOptions.c:3413
 msgid "CJK mode"
 msgstr "òÅÖÉÍ CJK"
 
-#: src/LYOptions.c:3346
+#: src/LYOptions.c:3415
 msgid "Raw 8-bit"
 msgstr "îÅÏÂÒÁÂÏÔÁÎÎÙÊ 8-ÂÉÔÎÙÊ ÒÅÖÉÍ"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3354
+#: src/LYOptions.c:3423
 msgid "X Display"
 msgstr "üËÒÁÎ X"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3360
+#: src/LYOptions.c:3429
 msgid "Document Appearance"
 msgstr "÷ÎÅÛÎÉÊ ×ÉÄ ÄÏËÕÍÅÎÔÁ"
 
-#: src/LYOptions.c:3366
+#: src/LYOptions.c:3435
 msgid "Show color"
 msgstr "ðÏËÁÚÙ×ÁÔØ Ã×ÅÔ"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3390
+#: src/LYOptions.c:3459
 msgid "Show cursor"
 msgstr "ðÏËÁÚÙ×ÁÔØ ËÕÒÓÏÒ"
 
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr "ðÏËÁÚÙ×ÁÔØ ÐÏÌÏÓÕ ÐÒÏËÒÕÔËÉ"
+
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3396
+#: src/LYOptions.c:3473
 msgid "Popups for select fields"
 msgstr "÷ÓÐÌÙ×ÁÀÝÉÅ ÍÅÎÀ ÄÌÑ ×ÙÂÒÁÎÎÙÈ ÐÏÌÅÊ"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3403
+#: src/LYOptions.c:3479
 msgid "HTML error recovery"
 msgstr "÷ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÏÔ ÏÛÉÂÏË × HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3410
+#: src/LYOptions.c:3485
 msgid "Show images"
 msgstr "ðÏËÁÚÁÔØ ÉÚÏÂÒÁÖÅÎÉÑ"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3424
+#: src/LYOptions.c:3499
 msgid "Verbose images"
 msgstr "úÁÍÅÎÑÔØ ÉÚÏÂÒÁÖÅÎÉÑ ÎÁ ÁÄÒÅÓÁ"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3432
+#: src/LYOptions.c:3507
 msgid "Headers Transferred to Remote Servers"
 msgstr "úÁÇÏÌÏ×ËÉ, ÐÅÒÅÄÁÎÎÙÅ ÎÁ ÕÄÁÌÅÎÎÙÅ ÓÅÒ×ÅÒÙ"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3436
+#: src/LYOptions.c:3511
 msgid "Personal mail address"
 msgstr "ðÅÒÓÏÎÁÌØÎÙÊ ÐÏÞÔÏ×ÙÊ ÁÄÒÅÓ"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3516
 msgid "Preferred document character set"
 msgstr "ðÒÅÄÐÏÞÉÔÁÅÍÁÑ ËÏÄÉÒÏ×ËÁ ÄÏËÕÍÅÎÔÁ"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3446
+#: src/LYOptions.c:3521
 msgid "Preferred document language"
 msgstr "ðÒÅÄÐÏÞÉÔÁÅÍÙÊ ÑÚÙË ÄÏËÕÍÅÎÔÁ"
 
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3527
 msgid "User-Agent header"
 msgstr "úÁÇÏÌÏ×ÏË User-Agent"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3460
+#: src/LYOptions.c:3535
 msgid "Listing and Accessing Files"
-msgstr ""
+msgstr "÷Ù×ÏÄ ÓÐÉÓËÁ ÆÁÊÌÏ× É ÄÏÓÔÕÐ Ë ÎÉÍ"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3464
+#: src/LYOptions.c:3539
 msgid "FTP sort criteria"
 msgstr "ëÒÉÔÅÒÉÊ ÓÏÒÔÉÒÏ×ËÉ FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3471
+#: src/LYOptions.c:3546
 msgid "Local directory sort criteria"
 msgstr "ëÒÉÔÅÒÉÊ ÓÏÒÔÉÒÏ×ËÉ ÌÏËÁÌØÎÏÇÏ ËÁÔÁÌÏÇÁ"
 
-#: src/LYOptions.c:3479
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+msgid "Local directory sort order"
+msgstr "ëÒÉÔÅÒÉÊ ÓÏÒÔÉÒÏ×ËÉ ÌÏËÁÌØÎÏÇÏ ËÁÔÁÌÏÇÁ"
+
+#: src/LYOptions.c:3561
 msgid "Show dot files"
 msgstr "ðÏËÁÚÙ×ÁÔØ dot-ÆÁÊÌÙ"
 
-#: src/LYOptions.c:3487
+#: src/LYOptions.c:3569
 msgid "Execution links"
 msgstr "÷ÙÐÏÌÎÅÎÉÅ ÓÓÙÌÏË"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3507
+#: src/LYOptions.c:3589
 msgid "Show transfer rate"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÓËÏÒÏÓÔØ ÐÅÒÅÄÁÞÉ"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3516
+#: src/LYOptions.c:3598
 msgid "Special Files and Screens"
 msgstr "óÐÅÃÉÁÌØÎÙÅ ÆÁÊÌÙ É ÜËÒÁÎÙ"
 
-#: src/LYOptions.c:3521
+#: src/LYOptions.c:3603
 msgid "Multi-bookmarks"
 msgstr "íÎÏÖÅÓÔ×ÅÎÎÙÅ ÚÁËÌÁÄËÉ"
 
-#: src/LYOptions.c:3529
+#: src/LYOptions.c:3611
 msgid "Review/edit Bookmarks files"
 msgstr "ðÒÏÓÍÏÔÒÅÔØ/ÏÔÒÅÄÁËÔÉÒÏ×ÁÔØ ÆÁÊÌÁ ÚÁËÌÁÄÏË"
 
-#: src/LYOptions.c:3531
+#: src/LYOptions.c:3613
 msgid "Goto multi-bookmark menu"
 msgstr "ðÅÒÅÈÏÄ Ë ÍÅÎÀ ÍÎÏÖÅÓÔ×ÅÎÎÙÈ ÚÁËÌÁÄÏË"
 
-#: src/LYOptions.c:3533
+#: src/LYOptions.c:3615
 msgid "Bookmarks file"
 msgstr "æÁÊÌ ÚÁËÌÁÄÏË"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3539
+#: src/LYOptions.c:3621
 msgid "Visited Pages"
 msgstr "ðÏÓÅÝÅÎÎÙÅ ÓÔÒÁÎÉÃÙ"
 
-#: src/LYPrint.c:959
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr "ðÒÏÓÍÏÔÒÅÔØ ÆÁÊÌ"
+
+#: src/LYPrint.c:952
 msgid " Print job complete.\n"
 msgstr " úÁÄÁÞÁ ÐÅÞÁÔÉ ÚÁ×ÅÒÛÅÎÁ.\n"
 
-#: src/LYPrint.c:1296
+#: src/LYPrint.c:1281
 msgid "Document:"
 msgstr "äÏËÕÍÅÎÔ:"
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1282
 msgid "Number of lines:"
 msgstr "þÉÓÌÏ ÓÔÒÏË:"
 
-#: src/LYPrint.c:1298
+#: src/LYPrint.c:1283
 msgid "Number of pages:"
 msgstr "þÉÓÌÏ ÓÔÒÁÎÉÃ:"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "pages"
 msgstr "ÓÔÒÁÎÉÃ"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "page"
 msgstr "ÓÔÒÁÎÉÃÁ"
 
-#: src/LYPrint.c:1300
+#: src/LYPrint.c:1285
 msgid "(approximately)"
 msgstr "(ÐÒÉÂÌÉÚÉÔÅÌØÎÏ)"
 
-#: src/LYPrint.c:1305
+#: src/LYPrint.c:1290
 msgid "Some print functions have been disabled!"
 msgstr "îÅËÏÔÏÒÙÅ ÆÕÎËÃÉÉ ÐÅÞÁÔÉ ÂÙÌÉ ÏÔËÌÀÞÅÎÙ!"
 
-#: src/LYPrint.c:1309
+#: src/LYPrint.c:1294
 msgid "Standard print options:"
 msgstr "óÔÁÎÄÁÒÔÎÙÅ ÏÐÃÉÉ ÐÅÞÁÔÉ:"
 
-#: src/LYPrint.c:1310
+#: src/LYPrint.c:1295
 msgid "Print options:"
 msgstr "ïÐÃÉÉ ÐÅÞÁÔÉ:"
 
-#: src/LYPrint.c:1316
+#: src/LYPrint.c:1302
 msgid "Save to a local file"
 msgstr "óÏÈÒÁÎÉÔØ × ÌÏËÁÌØÎÙÊ ÆÁÊÌ"
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1304
 msgid "Save to disk disabled"
 msgstr "óÏÈÒÁÎÅÎÉÅ ÎÁ ÄÉÓË ÏÔËÌÀÞÅÎÏ"
 
-#: src/LYPrint.c:1324
+#: src/LYPrint.c:1311
 msgid "Mail the file"
 msgstr "ðÏÓÌÁÔØ ÐÏÞÔÏÊ ÆÁÊÌ"
 
-#: src/LYPrint.c:1330
+#: src/LYPrint.c:1318
 msgid "Print to the screen"
 msgstr "îÁÐÅÞÁÔÁÔØ ÎÁ ÜËÒÁÎ"
 
-#: src/LYPrint.c:1334
+#: src/LYPrint.c:1323
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "îÁÐÅÞÁÔÁÔØ ÎÁ ÐÒÉÎÔÅÒ, ÐÏÄÓÏÅÄÉÎÅÎÎÙÊ Ë ×ÁÛÅÍÕ ÔÅÒÍÉÎÁÌÕ vt100"
 
-#: src/LYReadCFG.c:340
+#: src/LYReadCFG.c:339
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
 "The line must be of the form:\n"
@@ -4673,76 +4779,76 @@ msgstr ""
 "úÄÅÓØ ã÷åô É ã÷åô_æïîá ÄÏÌÖÎÙ ÂÙÔØ ÓÐÅÃÉÁÌØÎÏÊ ÓÔÒÏËÏÊ:\n"
 "'nocolor' ÉÌÉ 'default', ÉÌÉ\n"
 
-#: src/LYReadCFG.c:353
+#: src/LYReadCFG.c:352
 msgid "Offending line:"
 msgstr "ðÏ×ÒÅÖÄÅÎÎÁÑ ÓÔÒÏËÁ:"
 
-#: src/LYReadCFG.c:660
+#: src/LYReadCFG.c:638
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÐÅÒÅÎÁÚÎÁÞÅÎÉÉ ËÌÁ×ÉÛÉ %s × %s ÄÌÑ %s\n"
 
-#: src/LYReadCFG.c:667
+#: src/LYReadCFG.c:645
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "ÐÅÒÅÎÁÚÎÁÞÅÎÉÅ ËÌÁ×ÉÛÉ %s × %s ÚÁËÏÎÞÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:666
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr "ÎÅ×ÅÒÎÙÊ ×ÙÂÏÒ × ÒÅÄÁËÔÏÒÅ ÓÔÒÏËÉ %s ÄÌÑ ËÌÁ×ÉÛÉ %s, ×ÙÂÒÁÎÏ ×ÓÅ\n"
 
-#: src/LYReadCFG.c:715 src/LYReadCFG.c:728
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÒÉ×ÑÚËÉ ËÌÁ×ÉÛÉ ÒÅÄÁËÔÏÒÁ ÓÔÒÏËÉ %s (0x%x) × 0x%x ÄÌÑ %s\n"
 
-#: src/LYReadCFG.c:733
+#: src/LYReadCFG.c:711
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÒÉ×ÑÚËÉ ËÌÁ×ÉÛÉ ÒÅÄÁËÔÏÒÁ ÓÔÒÏËÉ %s (0x%x) ÄÌÑ %s\n"
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:816
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr "Lynx: ÏÛÉÂËÁ ÓÔÁÒÔÁ, ÆÁÊÌ Ó ÐÒÁ×ÉÌÁÍÉ CERN %s ÎÅ ÄÏÓÔÕÐÅÎ\n"
 
-#: src/LYReadCFG.c:840
+#: src/LYReadCFG.c:818
 msgid "(no name)"
 msgstr "(ÎÅÔ ÉÍÅÎÉ)"
 
-#: src/LYReadCFG.c:1658
+#: src/LYReadCFG.c:1782
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "âÏÌØÛÅ ÞÅÍ %d ×ÌÏÖÅÎÎÙÈ ×ËÌÀÞÅÎÉÊ lynx.cfg -- ×ÏÚÍÏÖÎÏ ÃÉËÌ?!?\n"
 
-#: src/LYReadCFG.c:1660
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "ðÏÓÌÅÄÎÑÑ ÐÏÐÙÔËÁ ×ËÌÀÞÅÎÉÑ ÂÙÌÁ '%s',\n"
 
-#: src/LYReadCFG.c:1661
+#: src/LYReadCFG.c:1785
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "×ËÌÀÞÅÎÏ ÉÚ '%s'.\n"
 
-#: src/LYReadCFG.c:2116 src/LYReadCFG.c:2129 src/LYReadCFG.c:2165
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
 msgid "The following is read from your lynx.cfg file."
 msgstr "óÌÅÄÕÀÝÅÅ ÞÉÔÁÅÔÓÑ ÉÚ ×ÁÛÅÇÏ ÆÁÊÌÁ lynx.cfg."
 
-#: src/LYReadCFG.c:2117 src/LYReadCFG.c:2130
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
 msgid "Please read the distribution"
 msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÒÏÞÉÔÁÊÔÅ ÉÓÈÏÄÎÙÊ"
 
-#: src/LYReadCFG.c:2123 src/LYReadCFG.c:2133
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
 msgid "for more comments."
 msgstr "ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ËÏÍÍÅÎÔÁÒÉÅ×."
 
-#: src/LYReadCFG.c:2147
+#: src/LYReadCFG.c:2244
 msgid "RELOAD THE CHANGES"
 msgstr "ïâîï÷éôø éúíåîåîéñ"
 
-#: src/LYReadCFG.c:2156
+#: src/LYReadCFG.c:2253
 msgid "Your primary configuration"
 msgstr "÷ÁÛÁ ÏÓÎÏ×ÎÁÑ ËÏÎÆÉÇÕÒÁÃÉÑ"
 
@@ -4818,7 +4924,7 @@ msgstr "ðÒÁ×Á ÄÏÓÔÕÐÁ"
 msgid "File that you are currently viewing"
 msgstr "æÁÊÌ, ËÏÔÏÒÙÊ ×Ù ÓÅÊÞÁÓ ÐÒÏÓÍÁÔÒÉ×ÁÅÔÅ"
 
-#: src/LYShowInfo.c:266 src/LYShowInfo.c:375
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
 msgid "Linkname:"
 msgstr "éÍÑ ÓÓÙÌËÉ:"
 
@@ -4858,79 +4964,79 @@ msgstr "ñÚÙË:"
 msgid "Post Data:"
 msgstr "äÁÎÎÙÅ Post:"
 
-#: src/LYShowInfo.c:331
+#: src/LYShowInfo.c:333
 msgid "Post Content Type:"
 msgstr "ôÉÐ ÓÏÄÅÒÖÉÍÏÇÏ Post:"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:342
 msgid "Owner(s):"
 msgstr "÷ÌÁÄÅÌØÃÙ:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "size:"
 msgstr "ÒÁÚÍÅÒ:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "lines"
 msgstr "ÓÔÒÏË"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:348
 msgid "mode:"
 msgstr "ÒÅÖÉÍ:"
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:350
 msgid "forms mode"
-msgstr ""
+msgstr "ÒÅÖÉÍ Ó ÆÏÒÍÁÍÉ"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "source"
-msgstr "ÉÓÔÏÞÎÉË"
+msgstr "ÉÓÈÏÄÎÙÊ ÔÅËÓÔ"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "normal"
 msgstr "ÏÂÙÞÎÙÊ"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:353
 msgid ", safe"
 msgstr ", ÂÅÚÏÐÁÓÎÙÊ"
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:354
 msgid ", via internal link"
 msgstr ", ÞÅÒÅÚ ×ÎÕÔÒÅÎÎÀÀ ÓÓÙÌËÕ"
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:360
 msgid ", no-cache"
 msgstr ", ÎÅ ËÜÛÉÒÏ×ÁÔØ"
 
-#: src/LYShowInfo.c:360
+#: src/LYShowInfo.c:362
 msgid ", ISMAP script"
 msgstr ", ISMAP-ÓËÒÉÐÔ"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:364
 msgid ", bookmark file"
 msgstr ", ÆÁÊÌ ÚÁËÌÁÄÏË"
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:373
 msgid "Link that you currently have selected"
 msgstr "óÓÙÌËÁ, ËÏÔÏÒÕÀ ×Ù ÓÅÊÞÁÓ ×ÙÂÒÁÌÉ"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:386
 msgid "Method:"
 msgstr "íÅÔÏÄ:"
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:391
 msgid "Enctype:"
 msgstr "ôÉÐ ÛÉÆÒÏ×ÁÎÉÑ:"
 
-#: src/LYShowInfo.c:401
+#: src/LYShowInfo.c:403
 msgid "(Form field)"
 msgstr "(ðÏÌÅ ÆÏÒÍÙ)"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:418
 msgid "No Links on the current page"
 msgstr "îÁ ÜÔÏÊ ÓÔÒÁÎÉÃÅ ÎÅÔ ÓÓÙÌÏË"
 
-#: src/LYStyle.c:250
+#: src/LYStyle.c:278
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -4971,44 +5077,47 @@ msgstr "îÁÊÄÅÎÏ ÎÅ×ÅÒÎÏÅ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ, ÉÓÐÏÌØÚÕÀÝÅÅ \"~\"! úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ
 msgid "Unable to upload file."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÚÁÇÒÕÚÉÔØ ÆÁÊÌ."
 
-#: src/LYUpload.c:214
+#: src/LYUpload.c:206
 msgid "Upload To:"
 msgstr "úÁÇÒÕÚÉÔØ ×:"
 
-#: src/LYUpload.c:215
+#: src/LYUpload.c:207
 msgid "Upload options:"
 msgstr "ïÐÃÉÉ ÚÁÇÒÕÚËÉ:"
 
-#: src/LYUtils.c:3075
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2468
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "îÅÏÖÉÄÁÎÎÙÊ ÐÒÏÔÏËÏÌ ÄÏÓÔÕÐÁ ÄÌÑ ÜÔÏÊ ÓÈÅÍÙ URL."
 
-#: src/LYUtils.c:3915
+#: src/LYUtils.c:3294
 msgid "Too many tempfiles"
-msgstr ""
+msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ×ÒÅÍÅÎÎÙÈ ÆÁÊÌÏ×"
 
-#: src/LYUtils.c:4217
-#, fuzzy
+#: src/LYUtils.c:3595
 msgid "unknown restriction"
-msgstr "ïÇÒÁÎÉÞÅÎÉÊ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÙ.\n"
+msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ÏÇÒÁÎÉÞÅÎÉÅ"
 
-#: src/LYUtils.c:4248
+#: src/LYUtils.c:3626
 msgid "No restrictions set.\n"
 msgstr "ïÇÒÁÎÉÞÅÎÉÊ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÙ.\n"
 
-#: src/LYUtils.c:4251
+#: src/LYUtils.c:3629
 msgid "Restrictions set:\n"
 msgstr "õÓÔÁÎÏ×ÌÅÎÎÙÅ ÏÇÒÁÎÉÞÅÎÉÑ:\n"
 
-#: src/LYUtils.c:5601
-msgid "Ignoring invalid HOME"
-msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ HOME ÉÇÎÏÒÉÒÏ×ÁÎÏ"
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr "äÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ ÎÅ ÎÁÊÄÅÎ"
 
-#: src/LYrcFile.c:20
+#: src/LYrcFile.c:21
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
-msgstr ""
+msgstr "ïÂÙÞÎÏ ÏÔËÌÀÞÅÎÏ.  óÍ. ENABLE_LYNXRC × lynx.cfg\n"
 
-#: src/LYrcFile.c:242
+#: src/LYrcFile.c:295
 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"
@@ -5020,7 +5129,7 @@ msgstr ""
 "ÐÏÄÔ×ÅÒÖÄÅÎÉÅ ÄÌÑ ËÁÖÄÏÇÏ cookie.  õÓÔÁÎÏ×ÉÔÅ accept_all_cookies × \"TRUE\"\n"
 "ÞÔÏÂÙ ÐÒÉÎÉÍÁÔØ ×ÓÅ cookie.\n"
 
-#: src/LYrcFile.c:249
+#: src/LYrcFile.c:302
 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"
@@ -5030,7 +5139,7 @@ msgstr ""
 "× ËÏÔÏÒÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ ÍÏÖÅÔ ÐÏÍÅÝÁÔØ ÓÓÙÌËÉ ÄÌÑ ÐÒÏÓÔÏÇÏ ÄÏÓÔÕÐÁ\n"
 "× ÂÕÄÕÝÅÍ.\n"
 
-#: src/LYrcFile.c:254
+#: src/LYrcFile.c:307
 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"
@@ -5041,7 +5150,7 @@ msgstr ""
 "ÂÕÄÅÔ ÐÒÏÉÚ×ÏÄÉÔØÓÑ Ó ÕÞÅÔÏÍ ÒÅÇÉÓÔÒÁ ÓÉÍ×ÏÌÏ×, ×ÍÅÓÔÏ ÐÏÉÓËÁ âåú ÕÞÅÔÁ\n"
 "ÒÅÇÉÓÔÒÁ.  úÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ ÏÂÙÞÎÏ \"off\".\n"
 
-#: src/LYrcFile.c:259
+#: src/LYrcFile.c:312
 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"
@@ -5055,7 +5164,7 @@ msgstr ""
 "ÎÁÂÏÒÕ ÉÌÉ ÉÓÐÏÌØÚÏ×ÁÔØ 7-ÂÉÔÎÙÅ ÐÒÉÂÌÉÖÅÎÉÑ ÓÉÍ×ÏÌÏ×.\n"
 "ôÅËÕÝÉÍÉ ÐÒÁ×ÉÌØÎÙÍÉ ËÏÄÉÒÏ×ËÁÍÉ Ñ×ÌÑÀÔÓÑ:\n"
 
-#: src/LYrcFile.c:266
+#: src/LYrcFile.c:319
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5069,7 +5178,7 @@ msgstr ""
 "ÐÒÉÏÒÉÔÅÔ ÉÍÅÅÔ ×ÔÏÒÏÊ ÓÐÉÓÏË (ÏÔ×ÅÒÇÁÔØ).  ðÁÒÁÍÅÔÒ accept_all_cookies\n"
 "ÚÁÍÅÝÁÅÔ ×ÓÅ ÕÓÔÁÎÏ×ËÉ, ÓÄÅÌÁÎÎÙÅ Ó ÐÏÍÏÝØÀ ÜÔÉÈ ÓÐÉÓËÏ×.\n"
 
-#: src/LYrcFile.c:274
+#: src/LYrcFile.c:327
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/.lynx_cookies.\n"
@@ -5077,7 +5186,7 @@ msgstr ""
 "cookie_file ÏÐÒÅÄÅÌÑÅÔ ÆÁÊÌ, ÉÚ ËÏÔÏÒÏÇÏ ÂÕÄÕÔ ÓÞÉÔÙ×ÁÔØÓÑ ÐÏÓÔÏÑÎÎÙÅ cookie.\n"
 "ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ ~/.lynx_cookies.\n"
 
-#: src/LYrcFile.c:279
+#: src/LYrcFile.c:332
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5096,7 +5205,13 @@ msgstr ""
 "ÐÕÔÉ ÉÌÉ ÄÏÍÅÎÁ.  ðÏ ÕÍÏÌÞÁÎÉÀ ×ÓÅ ÄÏÍÅÎÙ ÚÁÐÒÁÛÉ×ÁÀÔ ÐÏÄÔ×ÅÒÖÄÅÎÉÅ Õ\n"
 "ÐÏÌØÚÏ×ÁÔÅÌÑ × ÓÌÕÞÁÅ ÎÅÐÒÁ×ÉÌØÎÏÇÏ ÚÎÁÞÅÎÉÑ ÐÕÔÉ ÉÌÉ ÄÏÍÅÎÁ.\n"
 
-#: src/LYrcFile.c:292
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:351
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5108,7 +5223,7 @@ msgstr ""
 "ÞÔÏ ÓÏÒÔÉÒÕÅÔ ÆÁÊÌÙ É ËÁÔÁÌÏÇÉ ×ÍÅÓÔÅ.  \"FILES_FIRST\" ×Ù×ÏÄÉÔ ÓÎÁÞÁÌÁ ÆÁÊÌÙ,\n"
 "Á \"DIRECTORIES_FIRST\" ×Ù×ÏÄÉÔ ÓÎÁÞÁÌÁ ËÁÔÁÌÏÇÉ.\n"
 
-#: src/LYrcFile.c:300
+#: src/LYrcFile.c:359
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5120,7 +5235,7 @@ msgstr ""
 "  ^N = ×ÎÉÚ    ^P = ××ÅÒÈ\n"
 "  ^B = ×ÌÅ×Ï   ^F = ×ÐÒÁ×Ï\n"
 
-#: src/LYrcFile.c:306
+#: src/LYrcFile.c:365
 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"
@@ -5133,7 +5248,7 @@ msgstr ""
 "ÓÔÒÏËÉ, Á ÐÒÉ ÐÏÓÙÌËÅ ÐÏÞÔÙ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ×ÓÔÒÏÅÎÎÙÊ\n"
 "ÓÔÒÏËÏ×ÙÊ ÒÅÄÁËÔÏÒ.\n"
 
-#: src/LYrcFile.c:312
+#: src/LYrcFile.c:371
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5149,7 +5264,7 @@ msgstr ""
 "   BY_SIZE     -- ÓÏÒÔÉÒÏ×ÁÔØ ÐÏ ÒÁÚÍÅÒÕ ÆÁÊÌÁ\n"
 "   BY_DATE     -- ÓÏÒÔÉÒÏ×ÁÔØ ÐÏ ÄÁÔÅ ÐÏÓÌÅÄÎÅÊ ÍÏÄÉÆÉËÁÃÉÉ ÆÁÊÌÁ\n"
 
-#: src/LYrcFile.c:324
+#: src/LYrcFile.c:389
 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"
@@ -5175,7 +5290,7 @@ msgstr ""
 "          õÄÁÌÉÔØ ÓÌÏ×Ï: ^B    ^F       ^E    = ÷ ËÏÎÅà ÓÔÒÏËÉ\n"
 "ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÒÅÖÉÍÙ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÓÔÒÏËÉ:\n"
 
-#: src/LYrcFile.c:339
+#: src/LYrcFile.c:404
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5188,7 +5303,7 @@ msgstr ""
 "ÂÕË×).  óÌÅÄÕÅÔ ÎÁÞÉÎÁÔØ Ó \"multi_bookmarkB\", Ô.Ë. 'A' Ñ×ÌÑÅÔÓÑ ÚÎÁÞÅÎÉÅÍ\n"
 "ÐÏ ÕÍÏÌÞÁÎÉÀ (ÓÍ. ×ÙÛÅ).\n"
 
-#: src/LYrcFile.c:345
+#: src/LYrcFile.c:410
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5206,7 +5321,7 @@ msgstr ""
 "ÍÏÖÅÔÅ ÏÓÔÁ×ÉÔØ ÜÔÏ ÐÏÌÅ ÐÕÓÔÙÍ, ÎÏ × ÜÔÏÍ ÓÌÕÞÁÅ ÏÎÏ ÎÅ ÂÕÄÅÔ ×ËÌÀÞÁÔØÓÑ ×\n"
 "ÐÏÓÙÌÁÅÍÙÅ ËÏÍÍÅÎÔÁÒÉÉ.\n"
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:419
 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"
@@ -5233,21 +5348,21 @@ msgstr ""
 "ÔÏ ÓÅÒ×ÅÒ äïìöåî (SHOULD) ÐÏÓÌÁÔØ ÏÔ×ÅÔ, ÕËÁÚÙ×ÁÀÝÉÊ\n"
 "ÎÁ ÏÛÉÂËÕ, ÈÏÔÑ ÐÏÓÙÌËÁ ÏÔ×ÅÔÁ × ÎÅÐÒÉÅÍÌÅÍÏÊ ËÏÄÉÒÏ×ËÅ ÔÏÖÅ ÄÏÐÕÓËÁÅÔÓÑ.\n"
 
-#: src/LYrcFile.c:368
+#: src/LYrcFile.c:433
 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 it's default language.\n"
+"Otherwise, the server will send the file in its default language.\n"
 msgstr ""
 "preferred_language ÏÐÒÅÄÅÌÑÅÔ ÑÚÙË × ÎÏÔÁÃÉÉ MIME (ÎÁÐÒ. en, fr,\n"
-"ÍÏÖÅÔ ÂÙÔØ ÓÐÉÓÏË, ÒÁÚÄÅÌÅÎÎÙÊ ÚÁÐÑÔÙÍÉ, × ÕÂÙ×ÁÎÉÉ ÐÒÉÏÒÉÔÅÔÁ),\n"
+"ÍÏÖÅÔ ÂÙÔØ ÓÐÉÓÏË, ÒÁÚÄÅÌÅÎÎÙÊ ÚÁÐÑÔÙÍÉ, ÐÏ ÕÂÙ×ÁÎÉÀ ÐÒÉÏÒÉÔÅÔÁ),\n"
 "ËÏÔÏÒÙÊ Lynx ÂÕÄÅÔ ÕËÁÚÙ×ÁÔØ ËÁË ÐÒÅÄÐÏÞÔÉÔÅÌØÎÙÊ × ÚÁÐÒÏÓÁÈ Ë http ÓÅÒ×ÅÒÁÍ.\n"
 "åÓÌÉ ÆÁÊÌ ÎÁ ÜÔÏÍ ÑÚÙËÅ ÄÏÓÔÕÐÅÎ, ÓÅÒ×ÅÒ ÂÕÄÅÔ ÐÏÓÙÌÁÔØ ÅÇÏ.\n"
 "÷ ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ, ÓÅÒ×ÅÒ ÂÕÄÅÔ ÐÏÓÙÌÁÔØ ÆÁÊÌ ÎÁ Ó×ÏÅÍ ÑÚÙËÅ ÐÏ ÕÍÏÌÞÁÎÉÀ.\n"
 
-#: src/LYrcFile.c:377
+#: src/LYrcFile.c:442
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5269,7 +5384,7 @@ msgstr ""
 "       ÂÅÚÏÐÁÓÎÏÓÔÉ.  üÔÁ ÏÐÃÉÑ ÄÏÌÖÎÁ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÁ × \"on\" ÔÏÌØËÏ\n"
 "       ÅÓÌÉ ×Ù ÐÒÏÓÍÁÔÒÉ×ÁÅÔÅ ÐÒÏ×ÅÒÅÎÎÙÊ ÉÓÔÏÞÎÉË ÉÎÆÏÒÍÁÃÉÉ.\n"
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:453
 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"
@@ -5296,7 +5411,7 @@ msgstr ""
 "       ÂÅÚÏÐÁÓÎÏÓÔÉ.  üÔÁ ÏÐÃÉÑ ÄÏÌÖÎÁ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÁ × \"on\" ÔÏÌØËÏ\n"
 "       ÅÓÌÉ ×Ù ÐÒÏÓÍÁÔÒÉ×ÁÅÔÅ ÐÒÏ×ÅÒÅÎÎÙÊ ÉÓÔÏÞÎÉË ÉÎÆÏÒÍÁÃÉÉ.\n"
 
-#: src/LYrcFile.c:403
+#: src/LYrcFile.c:471
 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"
@@ -5315,7 +5430,7 @@ msgstr ""
 "ÐÏ ÕÍÏÌÞÁÎÉÀ ÍÏÖÅÔ ÂÙÔØ ÉÚÍÅÎÅÎÏ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ËÌÀÞÁ ËÏÍÁÎÄÎÏÊ\n"
 "ÓÔÒÏËÉ -popup.\n"
 
-#: src/LYrcFile.c:413
+#: src/LYrcFile.c:481
 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"
@@ -5351,7 +5466,7 @@ msgstr ""
 "\"on\" É \"off\" ÐÁÒÁÍÅÔÒÁ \"ÐÏËÁÚÙ×ÁÔØ Ã×ÅÔ\" ÂÕÄÕÔ\n"
 "ÔÒÁËÔÏ×ÁÔØÓÑ ËÁË \"default\".\n"
 
-#: src/LYrcFile.c:430
+#: src/LYrcFile.c:498
 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"
@@ -5373,7 +5488,7 @@ msgstr ""
 "úÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅËÒÙÔÏ ÏÐÃÉÅÊ ËÏÍÁÎÄÎÏÊ\n"
 "ÓÔÒÏËÉ -show_cursor.\n"
 
-#: src/LYrcFile.c:441
+#: src/LYrcFile.c:509
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5387,7 +5502,7 @@ msgstr ""
 "É ÎÅ ÚÁÐÒÅÝÅÎÏ Ó ÐÏÍÏÝØÀ ËÌÀÞÅÊ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ.  åÓÌÉ ÏÔÏÂÒÁÖÅÎÉÅ ÓËÒÙÔÙÈ\n"
 "ÆÁÊÌÏ× ÏÔËÌÀÞÅÎÏ, ÓÏÚÄÁÎÉÅ ÔÁËÉÈ ÆÁÊÌÏ× ÉÚ Lynx ÔÏÖÅ ÚÁÐÒÅÝÁÅÔÓÑ.\n"
 
-#: src/LYrcFile.c:452
+#: src/LYrcFile.c:520
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5409,7 +5524,7 @@ msgstr ""
 "intermediate.  ëÏÇÄÁ ÜÔÁ ÏÐÃÉÑ ÕÓÔÁÎÏ×ÌÅÎÁ × \"standard\", ÍÅÎÀ ÂÕÄÅÔ\n"
 "×Ù×ÏÄÉÔØÓÑ ×ÎÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ òÅÖÉÍÁ ðÏÌØÚÏ×ÁÔÅÌÑ.\n"
 
-#: src/LYrcFile.c:464
+#: src/LYrcFile.c:533
 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"
@@ -5425,7 +5540,7 @@ msgstr ""
 "ÉÎÆÏÒÍÁÃÉÀ.  éÓÐÏÌØÚÕÊÔÅ \"ADVANCED\" ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ URL ÔÅËÕÝÅÊ ×ÙÂÒÁÎÎÏÊ\n"
 "ÓÓÙÌËÉ ×ÎÉÚÕ ÜËÒÁÎÁ.\n"
 
-#: src/LYrcFile.c:472
+#: src/LYrcFile.c:542
 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"
@@ -5435,7 +5550,7 @@ msgstr ""
 "ÉÓÈÏÄÎÏÇÏ ÆÁÊÌÁ Ó ËÁÒÔÉÎËÏÊ ÎÁ ÍÅÓÔÅ [INLINE], [LINK] ÉÌÉ [IMAGE]\n"
 "óÍ. ÔÁËÖÅ VERBOSE_IMAGES × lynx.cfg\n"
 
-#: src/LYrcFile.c:477
+#: src/LYrcFile.c:547
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5452,7 +5567,7 @@ msgstr ""
 "úÁÇÌÁ×ÎÙÅ 'H', 'J' É 'K' ÂÕÄÕÔ ÐÏ-ÐÒÅÖÎÅÍÕ ÁËÔÉ×ÉÚÉÒÏ×ÁÔØ ÐÏÍÏÝØ, ÓÏËÒÁÝÅÎÉÑ\n"
 "ÐÅÒÅÈÏÄÁ É ×Ù×ÏÄ ÏÔÏÂÒÁÖÅÎÉÑ ËÌÁ×ÉÛ, ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ.\n"
 
-#: src/LYrcFile.c:485
+#: src/LYrcFile.c:555
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
@@ -5460,7 +5575,7 @@ msgstr ""
 "õÓÔÁÎÏ×ËÁ visited_links ËÏÎÔÒÏÌÉÒÕÅÔ, ËÁË Lynx ÏÒÇÁÎÉÚÕÅÔ ÉÎÆÏÒÍÁÃÉÀ\n"
 "ÎÁ óÔÒÁÎÉÃÅ ðÏÓÅÝÅÎÎÙÈ óÓÙÌÏË.\n"
 
-#: src/LYrcFile.c:693
+#: src/LYrcFile.c:772
 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"
@@ -5479,7 +5594,7 @@ msgstr ""
 "É ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÃÉÆÒÙ ÎÁ ÏÓÎÏ×ÎÏÊ ËÌÁ×ÉÁÔÕÒÅ ÂÕÄÕÔ ÄÅÊÓÔ×Ï×ÁÔØ ËÁË\n"
 "ËÌÁ×ÉÛÉ ÓÔÒÅÌÏË, ×ÎÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÓÏÓÔÏÑÎÉÑ numlock.\n"
 
-#: src/LYrcFile.c:702
+#: src/LYrcFile.c:781
 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"
@@ -5488,7 +5603,7 @@ msgstr ""
 "ÂÕÄÕÔ ÐÏÑ×ÌÑÔØÓÑ ÓÌÅÄÏÍ ÚÁ ËÁÖÄÏÊ ÓÓÙÌËÏÊ É ÏÎÉ ÍÏÇÕÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÙ ÄÌÑ\n"
 "×ÙÂÏÒÁ ÓÓÙÌËÉ.\n"
 
-#: src/LYrcFile.c:706
+#: src/LYrcFile.c:785
 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"
@@ -5506,7 +5621,7 @@ msgstr ""
 "ÎÏÍÅÒ ÏÐÃÉÉ, ÄÁÖÅ ÅÓÌÉ ÏÐÃÉÑ ÎÅ ×ÉÄÎÁ ÎÁ ÜËÒÁÎÅ.  óÐÉÓËÉ ÓÓÙÌÏË É ÒÅÚÕÌØÔÁÔ\n"
 "ËÏÍÁÎÄÙ ×Ù×ÏÄÁ ÓÐÉÓËÁ ÔÁËÖÅ ÎÕÍÅÒÕÀÔ ÐÏÌÑ ××ÏÄÁ ÆÏÒÍÙ.\n"
 
-#: src/LYrcFile.c:715
+#: src/LYrcFile.c:794
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -5516,7 +5631,7 @@ msgstr ""
 "ÏÔÏÂÒÁÖÁÔØÓÑ ÎÅÐÒÁ×ÉÌØÎÏ, ÅÓÌÉ ×ËÌÀÞÅÎÙ ÏÐÃÉÉ \"LINKS_ARE_NUMBERED\"\n"
 "ÉÌÉ \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\".\n"
 
-#: src/LYrcFile.c:748
+#: src/LYrcFile.c:827
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -5539,3 +5654,12 @@ msgstr ""
 "åÓÌÉ ×Ù ÉÝÅÔÅ ÏÂÝÉÊ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ, ÔÏ ÏÎ ÏÂÙÞÎÏ ÎÁÚÙ×ÁÅÔÓÑ lynx.cfg\n"
 "É ÉÍÅÅÔ ÄÒÕÇÏÅ ÓÏÄÅÒÖÁÎÉÅ É ÄÒÕÇÏÊ ÆÏÒÍÁÔ.\n"
 "üÔÏ ÎÅ ÔÏÔ ÆÁÊÌ.\n"
+
+#~ msgid "create %s"
+#~ msgstr " ÓÏÚÄÁÔØ %s"
+
+#~ msgid "Unable to open file management menu file."
+#~ msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ ÍÅÎÀ ÒÁÂÏÔÙ Ó ÆÁÊÌÁÍÉ."
+
+#~ msgid "Ignoring invalid HOME"
+#~ msgstr "îÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ HOME ÉÇÎÏÒÉÒÏ×ÁÎÏ"
diff --git a/gnu/usr.bin/lynx/po/sl.po b/gnu/usr.bin/lynx/po/sl.po
index 1e79a5adef6..b910f991f5d 100644
--- a/gnu/usr.bin/lynx/po/sl.po
+++ b/gnu/usr.bin/lynx/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.
-# $Id: sl.po,v 1.2 2003/05/01 18:59:38 avsm Exp $
+# $Id: sl.po,v 1.3 2004/06/22 04:01:46 avsm Exp $
 # $Source: /home/cvs/src/gnu/usr.bin/lynx/po/Attic/sl.po,v $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.4\n"
-"POT-Creation-Date: 2001-06-01 18:55-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-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"
@@ -28,7 +29,7 @@ msgstr ""
 #. * Links to collections of alternate definitions, developed by the Lynx
 #. * User Community, are maintained in Lynx links:
 #. *
-#. *    http://www.trill-home.com/lynx.html
+#. *    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
@@ -43,1992 +44,1992 @@ msgstr "Pozor!: %s"
 msgid "Welcome"
 msgstr "Dobrodo¹li"
 
-#: LYMessages.c:31 LYMessages.c:32
+#: LYMessages.c:31
 msgid "Are you sure you want to quit?"
 msgstr "Ste preprièani, da ¾elite konèati?"
 
-#: LYMessages.c:34 LYMessages.c:35
+#: LYMessages.c:33
 msgid "Really exit from Lynx?"
 msgstr "Zares zapustim Lynx?"
 
-#: LYMessages.c:37
+#: LYMessages.c:35
 msgid "Connection interrupted."
 msgstr "Povezava prekinjena."
 
-#: LYMessages.c:38
+#: LYMessages.c:36
 msgid "Data transfer interrupted."
 msgstr "Podatkovni prenos prekinjen."
 
-#: LYMessages.c:39
+#: LYMessages.c:37
 msgid "Cancelled!!!"
 msgstr "Preklicano!!!"
 
-#: LYMessages.c:40
+#: LYMessages.c:38
 msgid "Cancelling!"
 msgstr "Preklicujem!"
 
-#: LYMessages.c:41
+#: LYMessages.c:39
 msgid "Excellent!!!"
 msgstr "Izvrstno!!!"
 
-#: LYMessages.c:42
+#: LYMessages.c:40
 msgid "OK"
 msgstr "V redu."
 
-#: LYMessages.c:43
+#: LYMessages.c:41
 msgid "Done!"
 msgstr "Opravljeno!"
 
-#: LYMessages.c:44
+#: LYMessages.c:42
 msgid "Bad request!"
 msgstr "Slaba zahteva!"
 
-#: LYMessages.c:45
+#: LYMessages.c:43
 msgid "previous"
 msgstr "prej¹nji"
 
-#: LYMessages.c:46
+#: LYMessages.c:44
 msgid "next screen"
 msgstr "naslednji zaslon"
 
-#: LYMessages.c:47
+#: LYMessages.c:45
 msgid "HELP!"
 msgstr "POMOÈ!"
 
-#: LYMessages.c:48
+#: LYMessages.c:46
 msgid ", help on "
 msgstr ", pomoè za "
 
 #. #define HELP
-#: LYMessages.c:50
+#: LYMessages.c:48
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr "Ukazi: pu¹èice za premikanje ,?` za pomoè, ,q` za izhod, vraèalka za povratek."
 
 #. #define MOREHELP
-#: LYMessages.c:52
+#: LYMessages.c:50
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr "-- pritisnite presledek za veè, pu¹èice za premik, ,?` za pomoè, ,q` za izhod."
 
-#: LYMessages.c:53
+#: LYMessages.c:51
 msgid "-- press space for next page --"
 msgstr "-- pritisnite presledek za naslednjo stran --"
 
-#: LYMessages.c:54
+#: LYMessages.c:52
 msgid "URL too long"
 msgstr "Predolga pot"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:60
+#: LYMessages.c:58
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr ""
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:60
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr ""
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:64
+#: LYMessages.c:62
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(Besedilo) Vnesite besedilo. Uporabljajte GOR/DOL ali TAB (%s za urejevalnik)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:64
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(Vnosno polje) Vnesite besedilo.  Na koncu uporabite <return> ('x' brez predpomnenja)."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:68
+#: LYMessages.c:66
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr "(Vnosno polje) Vnesite besedilo.  Na koncu uporabite <return> (%s brez predpomnenja)."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:68
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
 msgstr "(Vnosno polje) Vnesite besedilo.  Na koncu uporabite <return>, pu¹èice ali tab za premik."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:72
+#: LYMessages.c:70
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr ""
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:74
+#: LYMessages.c:72
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr ""
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:77
+#: LYMessages.c:75
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
 msgstr "NESPREMENLJIVO datoteèno polje. Uporabljajte GOR/DOL ali tab."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:77
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Datoteèno polje) Vnesite ime datoteke. Uporabljajte GOR/DOL ali tab."
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:81
+#: LYMessages.c:79
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Tekstovno vnosno polje) Vnesite besedilo. Uporabljajte pu¹èici GOR/DOL ali tab."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:83
+#: LYMessages.c:81
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
 msgstr "(Besedilo) Vnesite besedilo. Uporabljajte GOR/DOL ali TAB (^Ve za urejevalnik)."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:85
+#: LYMessages.c:83
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
 msgstr "(Besedilo) Vnesite besedilo. Uporabljajte GOR/DOL ali TAB (%s za urejevalnik)."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:87
+#: LYMessages.c:85
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
 msgstr "NESPREMENLJIVO vnosno polje.  Za premik uporabite pu¹èici gor ali dol ali Tab."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:87
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(Vnosno polje) Vnesite besedilo.  Na koncu uporabite <return> ('x' brez predpomnenja)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:91
+#: LYMessages.c:89
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr "(Vnosno polje) Vnesite besedilo.  Na koncu uporabite <return> (%s brez predpomnenja)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:93
+#: LYMessages.c:91
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr "(Vnosno polje) Vnesite besedilo.  Na koncu uporabite <return>, pu¹èice ali tab za premik."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:95
+#: LYMessages.c:93
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
 msgstr "NESPREMENLJIVO polje obrazca.  Uporabite tipke gor, dol ali tab za premik drugam."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:97
+#: LYMessages.c:95
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr ""
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:99
+#: LYMessages.c:97
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr ""
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:99
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:101
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:103
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr ""
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:105
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:109
+#: LYMessages.c:107
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr ""
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:111
+#: LYMessages.c:109
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:113
+#: LYMessages.c:111
 msgid "Submit ('x' for no cache) to "
 msgstr ""
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:115
+#: LYMessages.c:113
 msgid "Submit to "
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:117
+#: LYMessages.c:115
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr ""
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:119
+#: LYMessages.c:117
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:121
+#: LYMessages.c:119
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:123
+#: LYMessages.c:121
 msgid "Submit mailto form to "
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:125
+#: LYMessages.c:123
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr ""
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:125
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr ""
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:127
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr ""
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:129
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
 msgstr ""
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:131
 msgid "(Option list) Hit return and use arrow keys and return to select option."
 msgstr ""
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:133
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
 msgstr ""
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:135
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr ""
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:137
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr ""
 
-#: LYMessages.c:140
+#: LYMessages.c:138
 msgid "Submitting form..."
 msgstr "Po¹iljamo obrazec..."
 
-#: LYMessages.c:141
+#: LYMessages.c:139
 msgid "Resetting form..."
 msgstr "Resetiramo obrazec..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:141
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Ponovno nalagamo dokument.  Vsi vnosi v obrazcu bodo izgubljeni!"
 
-#: LYMessages.c:144
+#: LYMessages.c:142
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Pozor: Prevedba podatkov v znakovni nabor %s ni mogoèa!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:147
+#: LYMessages.c:145
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr ""
 
-#: LYMessages.c:148
+#: LYMessages.c:146
 msgid "The resource requested is not available at this time."
 msgstr ""
 
-#: LYMessages.c:149
+#: LYMessages.c:147
 msgid "Enter Lynx keystroke command: "
 msgstr "Vnesite tipkovni ukaz Lynxu: "
 
-#: LYMessages.c:150
+#: LYMessages.c:148
 msgid "Looking up "
 msgstr "I¹èemo "
 
-#: LYMessages.c:151
+#: LYMessages.c:149
 #, c-format
 msgid "Getting %s"
 msgstr "Prena¹amo %s"
 
-#: LYMessages.c:152
+#: LYMessages.c:150
 #, c-format
 msgid "Skipping %s"
 msgstr "Preskakujemo %s"
 
-#: LYMessages.c:153
+#: LYMessages.c:151
 #, c-format
 msgid "Using %s"
 msgstr "Uporabljamo %s"
 
-#: LYMessages.c:154
+#: LYMessages.c:152
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "Nepravilni URL: %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:153
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Slabo oblikovan naslov %s"
 
-#: LYMessages.c:156
+#: LYMessages.c:154
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:155
 msgid "Unable to access WWW file!!!"
 msgstr "Dostop do spletne datoteke ni mogoè!!!"
 
-#: LYMessages.c:158
+#: LYMessages.c:156
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "To je kazalo z mo¾nostjo iskanja.  Uporabite %s za iskanje."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:160
+#: LYMessages.c:158
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--Naprej--  To je kazalo z mo¾nostjo iskanja.  Uporabite %s za iskanje."
 
-#: LYMessages.c:161
+#: LYMessages.c:159
 msgid "You have entered an invalid link number."
 msgstr "Vnesli ste neveljavno ¹tevilko povezave."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:163
+#: LYMessages.c:161
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr ""
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:165
+#: LYMessages.c:163
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
 msgstr ""
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:167
+#: LYMessages.c:165
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
 msgstr ""
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:169
+#: LYMessages.c:167
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
 msgstr ""
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:171
+#: LYMessages.c:169
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr ""
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:173
+#: LYMessages.c:171
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr ""
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:175
+#: LYMessages.c:173
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr ""
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:177
+#: LYMessages.c:175
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr ""
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:179
+#: LYMessages.c:177
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
 msgstr ""
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:181
+#: LYMessages.c:179
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr ""
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:183
+#: LYMessages.c:181
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
 msgstr ""
 
 #. mailto
-#: LYMessages.c:186
+#: LYMessages.c:184
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr ""
 
-#: LYMessages.c:187
+#: LYMessages.c:185
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr ""
 
-#: LYMessages.c:188
+#: LYMessages.c:186
 msgid "Mail disallowed!  Cannot submit."
 msgstr ""
 
-#: LYMessages.c:189
+#: LYMessages.c:187
 msgid "Mailto form submission failed!"
 msgstr ""
 
-#: LYMessages.c:190
+#: LYMessages.c:188
 msgid "Mailto form submission Cancelled!!!"
 msgstr ""
 
-#: LYMessages.c:191
+#: LYMessages.c:189
 msgid "Sending form content..."
 msgstr ""
 
-#: LYMessages.c:192
+#: LYMessages.c:190
 msgid "No email address is present in mailto URL!"
 msgstr ""
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:194
+#: LYMessages.c:192
 msgid "Unable to open temporary file for mailto URL!"
 msgstr ""
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:196
+#: LYMessages.c:194
 msgid "Do you wish to include the original message?"
 msgstr ""
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:196
 msgid "Do you wish to include the preparsed source?"
 msgstr ""
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:200
+#: LYMessages.c:198
 msgid "Spawning your selected editor to edit mail message"
 msgstr ""
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:202
+#: LYMessages.c:200
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr ""
 
-#: LYMessages.c:203
+#: LYMessages.c:201
 msgid "Send this comment?"
 msgstr "Po¹ljemo ta komentar?"
 
-#: LYMessages.c:204
+#: LYMessages.c:202
 msgid "Send this message?"
 msgstr "Po¹ljemo to sporoèilo?"
 
-#: LYMessages.c:205
+#: LYMessages.c:203
 msgid "Sending your message..."
 msgstr "Po¹iljamo va¹e sporoèilo..."
 
-#: LYMessages.c:206
+#: LYMessages.c:204
 msgid "Sending your comment:"
 msgstr "Po¹iljamo va¹ komentar:"
 
 #. textarea
-#: LYMessages.c:209
+#: LYMessages.c:207
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr ""
 
-#: LYMessages.c:210
+#: LYMessages.c:208
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr ""
 
-#: LYMessages.c:213
+#: LYMessages.c:211
 msgid "file: ACTIONs are disallowed!"
 msgstr ""
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:213
 msgid "file: URLs via served links are disallowed!"
 msgstr ""
 
-#: LYMessages.c:216
+#: LYMessages.c:214
 msgid "Access to local files denied."
 msgstr ""
 
-#: LYMessages.c:217
+#: LYMessages.c:215
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr ""
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:217
 msgid "This special URL is not allowed in external documents!"
 msgstr ""
 
-#: LYMessages.c:220
+#: LYMessages.c:218
 msgid "Press <return> to return to Lynx."
 msgstr "Pritisnite <return> za vrnitev v Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:221
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr ""
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:225
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "Napi¹ite EXIT za vrnitev v Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:228
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr ""
 
-#: LYMessages.c:233
+#: LYMessages.c:231
 msgid "Spawning is currently disabled."
 msgstr ""
 
-#: LYMessages.c:234
+#: LYMessages.c:232
 msgid "The 'd'ownload command is currently disabled."
 msgstr ""
 
-#: LYMessages.c:235
+#: LYMessages.c:233
 msgid "You cannot download an input field."
 msgstr ""
 
-#: LYMessages.c:236
+#: LYMessages.c:234
 msgid "Form has a mailto action!  Cannot download."
 msgstr ""
 
-#: LYMessages.c:237
+#: LYMessages.c:235
 msgid "You cannot download a mailto: link."
 msgstr ""
 
-#: LYMessages.c:238
+#: LYMessages.c:236
 msgid "You cannot download cookies."
 msgstr "Ne morete prenesti pi¹kotov."
 
-#: LYMessages.c:239
+#: LYMessages.c:237
 msgid "You cannot download a printing option."
 msgstr "Ne morete prenesti tiskalni¹ke izbire."
 
-#: LYMessages.c:240
+#: LYMessages.c:238
 msgid "You cannot download an upload option."
 msgstr "Ne morete prenesti izbire za po¹iljanje."
 
-#: LYMessages.c:241
+#: LYMessages.c:239
 msgid "You cannot download an permit option."
 msgstr "Ne morete prenesti izbire za dovoljenje."
 
-#: LYMessages.c:242
+#: LYMessages.c:240
 msgid "This special URL cannot be downloaded!"
 msgstr ""
 
-#: LYMessages.c:243
+#: LYMessages.c:241
 msgid "Nothing to download."
 msgstr "Nièesar ni za prenesti."
 
-#: LYMessages.c:244
+#: LYMessages.c:242
 msgid "Trace ON!"
 msgstr "Sledenje VKLJUÈENO!"
 
-#: LYMessages.c:245
+#: LYMessages.c:243
 msgid "Trace OFF!"
 msgstr "Sledenje IZKLJUÈENO!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:245
 msgid "Links will be included for all images!  Reloading..."
 msgstr ""
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:247
 msgid "Standard image handling restored!  Reloading..."
 msgstr ""
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:249
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr ""
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:251
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr ""
 
-#: LYMessages.c:254
+#: LYMessages.c:252
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr ""
 
-#: LYMessages.c:255
+#: LYMessages.c:253
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr ""
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:255
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr ""
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:257
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr ""
 
-#: LYMessages.c:260
+#: LYMessages.c:258
 msgid "Sorry, the document is not an http URL."
 msgstr "Oprostite, sestavek ni URL vrste http."
 
-#: LYMessages.c:261
+#: LYMessages.c:259
 msgid "Sorry, the link is not an http URL."
 msgstr "Oprostite, povezava ni URL vrste http."
 
-#: LYMessages.c:262
+#: LYMessages.c:260
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr ""
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:262
 msgid "Sorry, the ACTION for this form is not an http URL."
 msgstr ""
 
-#: LYMessages.c:265
+#: LYMessages.c:263
 msgid "Not an http URL or form ACTION!"
 msgstr ""
 
-#: LYMessages.c:266
+#: LYMessages.c:264
 msgid "This special URL cannot be a form ACTION!"
 msgstr ""
 
-#: LYMessages.c:267
+#: LYMessages.c:265
 msgid "URL is not in starting realm!"
 msgstr ""
 
-#: LYMessages.c:268
+#: LYMessages.c:266
 msgid "News posting is disabled!"
 msgstr ""
 
-#: LYMessages.c:269
+#: LYMessages.c:267
 msgid "File management support is disabled!"
 msgstr ""
 
-#: LYMessages.c:270
+#: LYMessages.c:268
 msgid "No jump file is currently available."
 msgstr ""
 
-#: LYMessages.c:271
+#: LYMessages.c:269
 msgid "Jump to (use '?' for list): "
 msgstr ""
 
-#: LYMessages.c:272
+#: LYMessages.c:270
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr ""
 
-#: LYMessages.c:273
+#: LYMessages.c:271
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr ""
 
-#: LYMessages.c:274
+#: LYMessages.c:272
 msgid "No random URLs have been used thus far."
 msgstr ""
 
-#: LYMessages.c:275
+#: LYMessages.c:273
 msgid "Bookmark features are currently disabled."
 msgstr ""
 
-#: LYMessages.c:276
+#: LYMessages.c:274
 msgid "Execution via bookmarks is disabled."
 msgstr ""
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:276
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr ""
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:278
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr ""
 
-#: LYMessages.c:281
+#: LYMessages.c:279
 msgid "ERROR - unable to open bookmark file."
 msgstr ""
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:281
 msgid "Unable to open bookmark file for deletion of link."
 msgstr ""
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:283
 msgid "Unable to open scratch file for deletion of link."
 msgstr ""
 
-#: LYMessages.c:287
+#: LYMessages.c:285
 msgid "Error renaming scratch file."
 msgstr ""
 
-#: LYMessages.c:289
+#: LYMessages.c:287
 msgid "Error renaming temporary file."
 msgstr ""
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:289
 msgid "Unable to copy temporary file for deletion of link."
 msgstr ""
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:291
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr ""
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:294
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr ""
 
-#: LYMessages.c:297
+#: LYMessages.c:295
 msgid "Bookmark deletion failed."
 msgstr ""
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:297
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr ""
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:299
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr ""
 
-#: LYMessages.c:302
+#: LYMessages.c:300
 msgid "There are no links in this bookmark file!"
 msgstr ""
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:302
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr ""
 
-#: LYMessages.c:305
+#: LYMessages.c:303
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr ""
 
-#: LYMessages.c:306
+#: LYMessages.c:304
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr ""
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:308
+#: LYMessages.c:306
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr ""
 
-#: LYMessages.c:309
+#: LYMessages.c:307
 msgid "Cannot save form fields/links"
 msgstr ""
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:311
+#: LYMessages.c:309
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr ""
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:313
+#: LYMessages.c:311
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr ""
 
-#: LYMessages.c:314
+#: LYMessages.c:312
 msgid "Malformed address."
 msgstr "Zmalièen naslov."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:316
+#: LYMessages.c:314
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr ""
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:318
+#: LYMessages.c:316
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr ""
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:320
+#: LYMessages.c:318
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr ""
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:322
+#: LYMessages.c:320
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr ""
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:324
+#: LYMessages.c:322
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr ""
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:324
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr ""
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:328
+#: LYMessages.c:326
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr ""
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:330
+#: LYMessages.c:328
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr ""
 
-#: LYMessages.c:331
+#: LYMessages.c:329
 msgid "Soft double-quote parsing ON!"
 msgstr ""
 
-#: LYMessages.c:332
+#: LYMessages.c:330
 msgid "Soft double-quote parsing OFF!"
 msgstr ""
 
-#: LYMessages.c:333
+#: LYMessages.c:331
 msgid "Now using TagSoup parsing of HTML."
 msgstr ""
 
-#: LYMessages.c:334
+#: LYMessages.c:332
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr ""
 
-#: LYMessages.c:335
+#: LYMessages.c:333
 msgid "You are already at the end of this document."
 msgstr ""
 
-#: LYMessages.c:336
+#: LYMessages.c:334
 msgid "You are already at the beginning of this document."
 msgstr ""
 
-#: LYMessages.c:337
+#: LYMessages.c:335
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr ""
 
-#: LYMessages.c:338
+#: LYMessages.c:336
 #, c-format
 msgid "Link number %d already is current."
 msgstr ""
 
-#: LYMessages.c:339
+#: LYMessages.c:337
 msgid "You are already at the first document"
 msgstr ""
 
-#: LYMessages.c:340
+#: LYMessages.c:338
 msgid "There are no links above this line of the document."
 msgstr ""
 
-#: LYMessages.c:341
+#: LYMessages.c:339
 msgid "There are no links below this line of the document."
 msgstr ""
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:343
+#: LYMessages.c:341
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr ""
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:345
+#: LYMessages.c:343
 msgid "You are not on a form submission button or normal link."
 msgstr ""
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:347
+#: LYMessages.c:345
 msgid "One radio button must be checked at all times!"
 msgstr ""
 
-#: LYMessages.c:348
+#: LYMessages.c:346
 msgid "No submit button for this form, submit single text field?"
 msgstr ""
 
-#: LYMessages.c:349
+#: LYMessages.c:347
 msgid "Do you want to go back to the previous document?"
 msgstr ""
 
-#: LYMessages.c:350
+#: LYMessages.c:348
 msgid "Use arrows or tab to move off of field."
 msgstr "Uporabite pu¹èice ali tab za premik drugam."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:352
+#: LYMessages.c:350
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "Vnesite besedilo.  Uporabite pu¹èice ali tab za premik drugam."
 
-#: LYMessages.c:353
+#: LYMessages.c:351
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** Slab HTML!!  V obrazcu ni definirane akcije. **"
 
-#: LYMessages.c:354
+#: LYMessages.c:352
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr ""
 
-#: LYMessages.c:355
+#: LYMessages.c:353
 msgid "Unable to create popup window!"
 msgstr ""
 
-#: LYMessages.c:356
+#: LYMessages.c:354
 msgid "Goto a random URL is disallowed!"
 msgstr ""
 
-#: LYMessages.c:357
+#: LYMessages.c:355
 msgid "Goto a non-http URL is disallowed!"
 msgstr "Premik na URL, ki ni http, ni dovoljen!"
 
-#: LYMessages.c:358
+#: LYMessages.c:356
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "Ni vam dovoljeno odpreti URL-jev \"%s\""
 
-#: LYMessages.c:359
+#: LYMessages.c:357
 msgid "URL to open: "
 msgstr "URL za odpiranje: "
 
-#: LYMessages.c:360
+#: LYMessages.c:358
 msgid "Edit the current Goto URL: "
 msgstr ""
 
-#: LYMessages.c:361
+#: LYMessages.c:359
 msgid "Edit the previous Goto URL: "
 msgstr ""
 
-#: LYMessages.c:362
+#: LYMessages.c:360
 msgid "Edit a previous Goto URL: "
 msgstr ""
 
-#: LYMessages.c:363
+#: LYMessages.c:361
 msgid "Current document has POST data."
 msgstr ""
 
-#: LYMessages.c:364
+#: LYMessages.c:362
 msgid "Edit this document's URL: "
 msgstr "Uredimo URL tega sestavka: "
 
-#: LYMessages.c:365
+#: LYMessages.c:363
 msgid "Edit the current link's URL: "
 msgstr "Uredimo URL trenutne povezave: "
 
-#: LYMessages.c:366
+#: LYMessages.c:364
 msgid "You cannot edit File Management URLs"
 msgstr ""
 
-#: LYMessages.c:367
+#: LYMessages.c:365
 msgid "Enter a database query: "
 msgstr ""
 
-#: LYMessages.c:368
+#: LYMessages.c:366
 msgid "Enter a whereis query: "
 msgstr ""
 
-#: LYMessages.c:369
+#: LYMessages.c:367
 msgid "Edit the current query: "
 msgstr ""
 
-#: LYMessages.c:370
+#: LYMessages.c:368
 msgid "Edit the previous query: "
 msgstr ""
 
-#: LYMessages.c:371
+#: LYMessages.c:369
 msgid "Edit a previous query: "
 msgstr ""
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:373
+#: LYMessages.c:371
 msgid "Use Control-R to resubmit the current query."
 msgstr ""
 
-#: LYMessages.c:374
+#: LYMessages.c:372
 msgid "Edit the current shortcut: "
 msgstr ""
 
-#: LYMessages.c:375
+#: LYMessages.c:373
 msgid "Edit the previous shortcut: "
 msgstr ""
 
-#: LYMessages.c:376
+#: LYMessages.c:374
 msgid "Edit a previous shortcut: "
 msgstr ""
 
-#: LYMessages.c:377
+#: LYMessages.c:375
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr ""
 
-#: LYMessages.c:378
+#: LYMessages.c:376
 msgid "Cannot locate jump file!"
 msgstr ""
 
-#: LYMessages.c:379
+#: LYMessages.c:377
 msgid "Cannot open jump file!"
 msgstr ""
 
-#: LYMessages.c:380
+#: LYMessages.c:378
 msgid "Error reading jump file!"
 msgstr ""
 
-#: LYMessages.c:381
+#: LYMessages.c:379
 msgid "Out of memory reading jump file!"
 msgstr ""
 
-#: LYMessages.c:382
+#: LYMessages.c:380
 msgid "Out of memory reading jump table!"
 msgstr ""
 
-#: LYMessages.c:383
+#: LYMessages.c:381
 msgid "No index is currently available."
 msgstr "Trenutno ni dostopno nobeno kazalo."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:385
+#: LYMessages.c:383
 msgid "Do you really want to go to the Main screen?"
 msgstr "Ali res ¾elite skoèiti na Glavni zaslon?"
 
-#: LYMessages.c:386
+#: LYMessages.c:384
 msgid "You are already at main screen!"
 msgstr "®e zdaj smo v glavnem zaslonu!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:388
+#: LYMessages.c:386
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr ""
 
 #. #define NO_OWNER
-#: LYMessages.c:390
+#: LYMessages.c:388
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "Za to datoteko ni definiranega lastnika, torej ne morete poslati komentarja"
 
-#: LYMessages.c:391
+#: LYMessages.c:389
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Lastnik ni definiran.  Uporabimo %s?"
 
-#: LYMessages.c:392
+#: LYMessages.c:390
 msgid "Do you wish to send a comment?"
 msgstr "Ali ¾elite poslati komentar?"
 
-#: LYMessages.c:393
+#: LYMessages.c:391
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "Po¹ta je onemogoèena, zato ne moremo poslati komentarja"
 
-#: LYMessages.c:394
+#: LYMessages.c:392
 msgid "The 'e'dit command is currently disabled."
 msgstr "Ukaz ur,e`di je trenutno onemogoèen."
 
-#: LYMessages.c:395
+#: LYMessages.c:393
 msgid "External editing is currently disabled."
 msgstr "Zunanja podpora je trenutno onemogoèena."
 
-#: LYMessages.c:396
+#: LYMessages.c:394
 msgid "System error - failure to get status."
 msgstr "Sistemska napaka - ne moremo dobiti statusa."
 
-#: LYMessages.c:397
+#: LYMessages.c:395
 msgid "No editor is defined!"
 msgstr "Ni definiranega urejevalnika!"
 
-#: LYMessages.c:398
+#: LYMessages.c:396
 msgid "The 'p'rint command is currently disabled."
 msgstr "Ukaz natisni (p) je trenutno onemogoèen."
 
-#: LYMessages.c:399
+#: LYMessages.c:397
 msgid "Document has no Toolbar links or Banner."
 msgstr ""
 
-#: LYMessages.c:400
+#: LYMessages.c:398
 msgid "Unable to open traversal file."
 msgstr ""
 
-#: LYMessages.c:401
+#: LYMessages.c:399
 msgid "Unable to open traversal found file."
 msgstr ""
 
-#: LYMessages.c:402
+#: LYMessages.c:400
 msgid "Unable to open reject file."
 msgstr "Ne moremo odpreti datoteke z zavrnjenimi URL-ji."
 
-#: LYMessages.c:403
+#: LYMessages.c:401
 msgid "Unable to open traversal errors output file"
 msgstr ""
 
-#: LYMessages.c:404
+#: LYMessages.c:402
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr ""
 
-#: LYMessages.c:405
+#: LYMessages.c:403
 msgid "Follow link (or goto link or page) number: "
 msgstr ""
 
-#: LYMessages.c:406
+#: LYMessages.c:404
 msgid "Select option (or page) number: "
 msgstr "Izberite ¹tevilko mo¾nosti (ali strani): "
 
-#: LYMessages.c:407
+#: LYMessages.c:405
 #, c-format
 msgid "Option number %d already is current."
 msgstr "Mo¾nost ¹tevilka %d je ¾e zdaj trenutna."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:409
+#: LYMessages.c:407
 msgid "You are already at the end of this option list."
 msgstr "®e zdaj smo na vrhu tega seznama izbir."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:411
+#: LYMessages.c:409
 msgid "You are already at the beginning of this option list."
 msgstr "®e zdaj smo na zaèetku tega seznama mo¾nosti."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:413
+#: LYMessages.c:411
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "®e zdaj smo na strani %d tega seznama mo¾nosti."
 
-#: LYMessages.c:414
+#: LYMessages.c:412
 msgid "You have entered an invalid option number."
 msgstr "Vnesli ste neveljavno ¹tevilko mo¾nosti."
 
-#: LYMessages.c:415
+#: LYMessages.c:413
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** Slab HTML!!  Uporabite -trace za diagnozo. **"
 
-#: LYMessages.c:416
+#: LYMessages.c:414
 msgid "Give name of file to save in"
 msgstr "Podajte ime datoteke za shranitev"
 
-#: LYMessages.c:417
+#: LYMessages.c:415
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "Ne moremo posneti podatkov v datoteko -- prosim, po¾enite WWW lokalno"
 
-#: LYMessages.c:418
+#: LYMessages.c:416
 msgid "Can't open temporary file!"
 msgstr "Ne moremo odpreti zaèasne datoteke!"
 
-#: LYMessages.c:419
+#: LYMessages.c:417
 msgid "Can't open output file!  Cancelling!"
 msgstr "Ne moremo odpreti izhodne datoteke!  Prekinitev!"
 
-#: LYMessages.c:420
+#: LYMessages.c:418
 msgid "Execution is disabled."
 msgstr "Izvajanje je onemogoèeno."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:422
+#: LYMessages.c:420
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "Izvajanje za to datoteko ni omogoèeno.  Poglejte menu Izbire (uporabite %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:424
+#: LYMessages.c:422
 msgid "Execution capabilities are not compiled into this version."
 msgstr "Zmo¾nosti izvajanja niso prevedene v to razlièico."
 
-#: LYMessages.c:425
+#: LYMessages.c:423
 msgid "This file cannot be displayed on this terminal."
 msgstr "Ta datoteka ne more biti prikazana na tem terminalu."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:427
+#: LYMessages.c:425
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "Ta datoteka ne more biti prikazana na tem terminalu: D) prenos ali C) prekinitev"
 
-#: LYMessages.c:428
+#: LYMessages.c:426
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D) prenos, ali C) prekinitev"
 
-#: LYMessages.c:429
+#: LYMessages.c:427
 msgid "Cancelling file."
 msgstr "Prekinjamo z datoteko."
 
-#: LYMessages.c:430
+#: LYMessages.c:428
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "Jemljemo datoteko.   - PROSIM, POÈAKAJTE -"
 
-#: LYMessages.c:431
+#: LYMessages.c:429
 msgid "Enter a filename: "
 msgstr "Vnesite ime datoteke: "
 
-#: LYMessages.c:432
+#: LYMessages.c:430
 msgid "Edit the previous filename: "
 msgstr "Uredite prej¹nje ime datoteke: "
 
-#: LYMessages.c:433
+#: LYMessages.c:431
 msgid "Edit a previous filename: "
 msgstr "Uredite kak¹no prej¹nje ime datoteke: "
 
-#: LYMessages.c:434
+#: LYMessages.c:432
 msgid "Enter a new filename: "
 msgstr "Vnesite novo ime datoteke: "
 
-#: LYMessages.c:435
+#: LYMessages.c:433
 msgid "File name may not begin with a dot."
 msgstr "Ime datoteke se ne sme zaèeti s piko."
 
-#: LYMessages.c:437
+#: LYMessages.c:435
 msgid "File exists.  Create higher version?"
 msgstr "Datoteka obstaja.  Ustvarimo vi¹jo razlièico?"
 
-#: LYMessages.c:439
+#: LYMessages.c:437
 msgid "File exists.  Overwrite?"
 msgstr "Datoteka obstaja.  Prepi¹emo?"
 
-#: LYMessages.c:441
+#: LYMessages.c:439
 msgid "Cannot write to file."
 msgstr "Ne moremo pisati v datoteko."
 
-#: LYMessages.c:442
+#: LYMessages.c:440
 msgid "ERROR! - download command is misconfigured."
 msgstr "NAPAKA! - ukaz za jemanje je napaèno nastavljen."
 
-#: LYMessages.c:443
+#: LYMessages.c:441
 msgid "Unable to download file."
 msgstr "Ne moremo prenesti datoteke."
 
-#: LYMessages.c:444
+#: LYMessages.c:442
 msgid "Reading directory..."
 msgstr "Beremo imenik..."
 
-#: LYMessages.c:445
+#: LYMessages.c:443
 msgid "Building directory listing..."
 msgstr "Gradimo seznam vsebine imenika ..."
 
-#: LYMessages.c:446
+#: LYMessages.c:444
 msgid "Saving..."
 msgstr "Shranjujemo ..."
 
-#: LYMessages.c:447
+#: LYMessages.c:445
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Ne moremo urediti datoteke ,%s`."
 
-#: LYMessages.c:448
+#: LYMessages.c:446
 msgid "Unable to access document!"
 msgstr "Ne moremo dostopati do sestavka!"
 
-#: LYMessages.c:449
+#: LYMessages.c:447
 msgid "Could not access file."
 msgstr "Ne moremo dostopati do datoteke."
 
-#: LYMessages.c:450
+#: LYMessages.c:448
 msgid "Could not access directory."
 msgstr "Ne moremo dostopati do imenika."
 
-#: LYMessages.c:451
+#: LYMessages.c:449
 msgid "Could not load data."
 msgstr "Ne moremo nalo¾iti podatkov."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:453
+#: LYMessages.c:451
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "Lynx trenutno ne zmore ur(e)diti oddaljenih spletnih datotek."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:455
+#: LYMessages.c:453
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "To polje ne more biti ur(e)jeno z zunanjim urejevalnikom."
 
-#: LYMessages.c:456
+#: LYMessages.c:454
 msgid "Bad rule"
 msgstr "Slabo pravilo"
 
-#: LYMessages.c:457
+#: LYMessages.c:455
 msgid "Insufficient operands:"
 msgstr "Premalo operandov:"
 
-#: LYMessages.c:458
+#: LYMessages.c:456
 msgid "You are not authorized to edit this file."
 msgstr "Niste poobla¹èeni za urejanje te datoteke."
 
-#: LYMessages.c:459
+#: LYMessages.c:457
 msgid "Title: "
 msgstr "Naslov: "
 
-#: LYMessages.c:460
+#: LYMessages.c:458
 msgid "Subject: "
 msgstr "Predmet: "
 
-#: LYMessages.c:461
+#: LYMessages.c:459
 msgid "Username: "
 msgstr "Uporabni¹ko ime: "
 
-#: LYMessages.c:462
+#: LYMessages.c:460
 msgid "Password: "
 msgstr "Geslo: "
 
-#: LYMessages.c:463
+#: LYMessages.c:461
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: Uporabni¹ko ime in geslo sta zahtevani!!!"
 
-#: LYMessages.c:464
+#: LYMessages.c:462
 msgid "lynx: Password required!!!"
 msgstr "lynx: Geslo je zahtevano!!!"
 
-#: LYMessages.c:465
+#: LYMessages.c:463
 msgid "Clear all authorization info for this session?"
 msgstr "Pobri¹emo vse avtorizacijske podatke za to sejo?"
 
-#: LYMessages.c:466
+#: LYMessages.c:464
 msgid "Authorization info cleared."
 msgstr "Avtorizacijski podatki pobrisani."
 
-#: LYMessages.c:467
+#: LYMessages.c:465
 msgid "Authorization failed.  Retry?"
 msgstr "Avtorizaciji je spodletelo.  Poskusimo ¹e enkrat?"
 
-#: LYMessages.c:468
+#: LYMessages.c:466
 msgid "cgi support has been disabled."
 msgstr "Sistemski upravitelj je onemogoèil podporo CGI."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:470
+#: LYMessages.c:468
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "V tej razlièici ni prevedene mo¾nosti Lynxcgi."
 
-#: LYMessages.c:471
+#: LYMessages.c:469
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "®al, ni znanega naèina za pretvarjanje %s v %s."
 
-#: LYMessages.c:472
+#: LYMessages.c:470
 msgid "Unable to set up connection."
 msgstr "Ne moremo nastaviti povezave."
 
-#: LYMessages.c:473
+#: LYMessages.c:471
 msgid "Unable to make connection"
 msgstr "Ne moremo vzpostaviti povezave."
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:475
+#: LYMessages.c:473
 msgid "Executable link rejected due to malformed request."
 msgstr "Izvedljiva povezava zavrnjena zaradi zmalièenega zahtevka."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:477
+#: LYMessages.c:475
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "Izvedljiva povezava zavrnjena zaradi znaka ,%c`."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:477
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "Izvedljiva povezava zavrnjena zaradi niza za relativno pot (,../`)."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:479
 msgid "Executable link rejected due to location or path."
 msgstr "Izvedljiva povezava zavrnjena zaradi lokacije ali poti."
 
-#: LYMessages.c:482
+#: LYMessages.c:480
 msgid "Mail access is disabled!"
 msgstr "Po¹tni dostop je onemogoèen!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:484
+#: LYMessages.c:482
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Dostopne so le datoteke in stre¾niki na lokalnem raèunalniku."
 
-#: LYMessages.c:485
+#: LYMessages.c:483
 msgid "Telnet access is disabled!"
 msgstr "Dostop prek telneta je onemogoèen!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:487
+#: LYMessages.c:485
 msgid "Telnet port specifications are disabled."
 msgstr ""
 
-#: LYMessages.c:488
+#: LYMessages.c:486
 msgid "USENET news access is disabled!"
 msgstr "Dostop novièarskih skupin USENET je onemogoèen!"
 
-#: LYMessages.c:489
+#: LYMessages.c:487
 msgid "Rlogin access is disabled!"
 msgstr "Dostop s programom rlogin je onemogoèen!"
 
-#: LYMessages.c:490
+#: LYMessages.c:488
 msgid "Ftp access is disabled!"
 msgstr "Dostop prek FTP je onemogoèen!"
 
-#: LYMessages.c:491
+#: LYMessages.c:489
 msgid "There are no references from this document."
 msgstr "Iz tega dokumenta ni sklicevanj."
 
-#: LYMessages.c:492
+#: LYMessages.c:490
 msgid "There are only hidden links from this document."
 msgstr "Iz tega dokumenta vodijo le skrite povezave."
 
-#: LYMessages.c:494
+#: LYMessages.c:492
 msgid "Unable to open command file."
 msgstr "Ne moremo odpreti ukazne datoteke."
 
-#: LYMessages.c:496
+#: LYMessages.c:494
 msgid "News Post Cancelled!!!"
 msgstr "Po¹iljanje novièarskega èlanka preklicano!!!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:498
+#: LYMessages.c:496
 msgid "Spawning your selected editor to edit news message"
 msgstr ""
 
-#: LYMessages.c:499
+#: LYMessages.c:497
 msgid "Post this message?"
 msgstr "Po¹ljemo to sporoèilo?"
 
-#: LYMessages.c:500
+#: LYMessages.c:498
 #, c-format
 msgid "Append '%s'?"
 msgstr "Pripnemo na konec ,%s`?"
 
-#: LYMessages.c:501
+#: LYMessages.c:499
 msgid "Posting to newsgroup(s)..."
 msgstr "Po¹iljamo v novièarske skupine ..."
 
-#: LYMessages.c:503
+#: LYMessages.c:501
 msgid "*** You have unread mail. ***"
 msgstr "*** Imate neprebrano po¹to. ***"
 
-#: LYMessages.c:505
+#: LYMessages.c:503
 msgid "*** You have mail. ***"
 msgstr "*** Imate po¹to. ***"
 
-#: LYMessages.c:507
+#: LYMessages.c:505
 msgid "*** You have new mail. ***"
 msgstr "*** Imate novo po¹to. ***"
 
-#: LYMessages.c:508
+#: LYMessages.c:506
 msgid "File insert cancelled!!!"
 msgstr ""
 
-#: LYMessages.c:509
+#: LYMessages.c:507
 msgid "Not enough memory for file!"
 msgstr "Ne moremo odpreti zaèasne datoteke!"
 
-#: LYMessages.c:510
+#: LYMessages.c:508
 msgid "Can't open file for reading."
 msgstr "Ne moremo odpreti izhodne datoteke!  Prekinitev!"
 
-#: LYMessages.c:511
+#: LYMessages.c:509
 msgid "File does not exist."
 msgstr "Datoteka ne obstaja."
 
-#: LYMessages.c:512
+#: LYMessages.c:510
 msgid "File does not exist - reenter or cancel:"
 msgstr "Datoteka ne obstaja - ponovni vnos ali preklic:"
 
-#: LYMessages.c:513
+#: LYMessages.c:511
 msgid "File is not readable."
 msgstr "Datoteka ni berlljiva."
 
-#: LYMessages.c:514
+#: LYMessages.c:512
 msgid "File is not readable - reenter or cancel:"
 msgstr "Datoteka ni berljiva - ponovni vnos ali preklic:"
 
-#: LYMessages.c:515
+#: LYMessages.c:513
 msgid "Nothing to insert - file is 0-length."
 msgstr "Nièesar za vnesti - datoteka je dolga 0 zlogov."
 
-#: LYMessages.c:516
+#: LYMessages.c:514
 msgid "Save request cancelled!!!"
 msgstr "Preklicana zahteva za shranjevanje!!!"
 
-#: LYMessages.c:517
+#: LYMessages.c:515
 msgid "Mail request cancelled!!!"
 msgstr "Preklicana po¹tna zahteva!!!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:519
+#: LYMessages.c:517
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr ""
 
-#: LYMessages.c:520
+#: LYMessages.c:518
 msgid "Please wait..."
 msgstr "Prosim, poèakajte ..."
 
-#: LYMessages.c:521
+#: LYMessages.c:519
 msgid "Mailing file.  Please wait..."
 msgstr "Po¹iljamo datoteko.  Prosimo, poèakajte ..."
 
-#: LYMessages.c:522
+#: LYMessages.c:520
 msgid "ERROR - Unable to mail file"
 msgstr "NAPAKA - Ne moremo poslati datoteke"
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:524
+#: LYMessages.c:522
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "Datoteka je dolga %d zaslonov.  Ste preprièani, da jo ¾elite natisniti?"
 
-#: LYMessages.c:525
+#: LYMessages.c:523
 msgid "Print request cancelled!!!"
 msgstr "Tiskalni¹ka zahteva preklicana!!!"
 
-#: LYMessages.c:526
+#: LYMessages.c:524
 msgid "Press <return> to begin: "
 msgstr "Pritisnite <return > za zaèetek: "
 
-#: LYMessages.c:527
+#: LYMessages.c:525
 msgid "Press <return> to finish: "
 msgstr "Pritisnite <return> za konec: "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:527
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "Datoteka je dolga %d strani.  Ste preprièani, da jo ¾elite natisniti?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:531
+#: LYMessages.c:529
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "Preprièajte se, da je tiskalnik na zvezi.  Pritisnite <return> za zaèetek tiskanja:"
 
-#: LYMessages.c:532
+#: LYMessages.c:530
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "NAPAKA - Ne moremo doloèiti prostora za datoteko!!!"
 
-#: LYMessages.c:533
+#: LYMessages.c:531
 msgid "Unable to open tempfile"
 msgstr "Ne moremo odpreti zaèasne datoteke"
 
-#: LYMessages.c:534
+#: LYMessages.c:532
 msgid "Unable to open print options file"
 msgstr "Ne moremo odpreti datoteke s tiskalni¹kimi izbirami"
 
-#: LYMessages.c:535
+#: LYMessages.c:533
 msgid "Printing file.  Please wait..."
 msgstr "Tiskamo datoteko.  Prosim, poèakajte ..."
 
-#: LYMessages.c:536
+#: LYMessages.c:534
 msgid "Please enter a valid internet mail address: "
 msgstr "Prosim, vnesite veljavni internetni po¹tni naslov: "
 
-#: LYMessages.c:537
+#: LYMessages.c:535
 msgid "ERROR! - printer is misconfigured!"
 msgstr "NAPAKA! - tiskalnik je nepravilno nastavljen!"
 
-#: LYMessages.c:538
+#: LYMessages.c:536
 msgid "Image map from POST response not available!"
 msgstr ""
 
-#: LYMessages.c:539
+#: LYMessages.c:537
 msgid "Misdirected client-side image MAP request!"
 msgstr ""
 
-#: LYMessages.c:540
+#: LYMessages.c:538
 msgid "Client-side image MAP is not accessible!"
 msgstr ""
 
-#: LYMessages.c:541
+#: LYMessages.c:539
 msgid "No client-side image MAPs are available!"
 msgstr ""
 
-#: LYMessages.c:542
+#: LYMessages.c:540
 msgid "Client-side image MAP is not available!"
 msgstr ""
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:545
+#: LYMessages.c:543
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "Za menu Mo¾nosti mora biti zaslon visok vsaj 24 vrstic!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:547
+#: LYMessages.c:545
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "Za menu Mo¾nosti mora biti zaslon visok vsaj 23 vrstic!"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:549
+#: LYMessages.c:547
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "Za menu Mo¾nosti mora biti zaslon visok vsaj 22 vrstic!"
 
-#: LYMessages.c:551
+#: LYMessages.c:549
 msgid "That key requires Advanced User mode."
 msgstr "Ta tipka zahteva naèin dela Izku¹eni uporabnik."
 
-#: LYMessages.c:552
+#: LYMessages.c:550
 #, c-format
 msgid "Content-type: %s"
 msgstr "Content-type: %s"
 
-#: LYMessages.c:553
+#: LYMessages.c:551
 msgid "Command: "
 msgstr "Ukaz: "
 
-#: LYMessages.c:554
+#: LYMessages.c:552
 msgid "Unknown or ambiguous command"
 msgstr ""
 
-#: LYMessages.c:555
+#: LYMessages.c:553
 msgid " Version "
 msgstr " Razlièica "
 
-#: LYMessages.c:556
+#: LYMessages.c:554
 msgid " first"
 msgstr " najprej."
 
-#: LYMessages.c:557
+#: LYMessages.c:555
 msgid ", guessing..."
 msgstr ", ugibamo ..."
 
-#: LYMessages.c:558
+#: LYMessages.c:556
 msgid "Permissions for "
 msgstr "Dovoljenja za "
 
-#: LYMessages.c:559
+#: LYMessages.c:557
 msgid "Select "
 msgstr "Izberite "
 
-#: LYMessages.c:560
+#: LYMessages.c:558
 msgid "capital letter"
 msgstr "veliko èrko"
 
-#: LYMessages.c:561
+#: LYMessages.c:559
 msgid " of option line,"
 msgstr " v vrstici z mo¾nostmi,"
 
-#: LYMessages.c:562
+#: LYMessages.c:560
 msgid " to save,"
 msgstr " za shranjevanje,"
 
-#: LYMessages.c:563
+#: LYMessages.c:561
 msgid " to "
 msgstr " v "
 
-#: LYMessages.c:564
+#: LYMessages.c:562
 msgid " or "
 msgstr " ali "
 
-#: LYMessages.c:565
+#: LYMessages.c:563
 msgid " index"
 msgstr " stvarno kazalo"
 
-#: LYMessages.c:566
+#: LYMessages.c:564
 msgid " to return to Lynx."
 msgstr " za vrnitev v Lynx."
 
-#: LYMessages.c:567
+#: LYMessages.c:565
 msgid "Accept Changes"
 msgstr "Sprejmimo spremembe"
 
-#: LYMessages.c:568
+#: LYMessages.c:566
 msgid "Reset Changes"
 msgstr "Iznièimo spremembe"
 
-#: LYMessages.c:569
+#: LYMessages.c:567
 msgid "Left Arrow cancels changes"
 msgstr "Z levo pu¹èico iznièimo spremembe"
 
-#: LYMessages.c:570
+#: LYMessages.c:568
 msgid "Save options to disk"
 msgstr "Shranimo izbire v disk"
 
-#: LYMessages.c:571
+#: LYMessages.c:569
 msgid "Hit RETURN to accept entered data."
 msgstr ""
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:573
+#: LYMessages.c:571
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr ""
 
-#: LYMessages.c:574
+#: LYMessages.c:572
 msgid "Value accepted!"
 msgstr "Vrednost sprejeta!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:576
+#: LYMessages.c:574
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Vrednost sprejeta! -- POZOR: Lynx je nastavljen za XWINDOWS!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:578
+#: LYMessages.c:576
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Vrednost sprejeta! -- POZOR: Lynx NI nastavljen za XWINDOWS!"
 
-#: LYMessages.c:579
+#: LYMessages.c:577
 msgid "You are not allowed to change which editor to use!"
 msgstr ""
 
-#: LYMessages.c:580
+#: LYMessages.c:578
 msgid "Failed to set DISPLAY variable!"
 msgstr ""
 
-#: LYMessages.c:581
+#: LYMessages.c:579
 msgid "Failed to clear DISPLAY variable!"
 msgstr ""
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:583
+#: LYMessages.c:581
 msgid "You are not allowed to change the bookmark file!"
 msgstr ""
 
-#: LYMessages.c:584
+#: LYMessages.c:582
 msgid "Terminal does not support color"
 msgstr "Terminal ne podpira barv"
 
-#: LYMessages.c:585
+#: LYMessages.c:583
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr ""
 
-#: LYMessages.c:586
+#: LYMessages.c:584
 msgid "Access to dot files is disabled!"
 msgstr ""
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:588
+#: LYMessages.c:586
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr ""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:590
+#: LYMessages.c:588
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr ""
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:592
+#: LYMessages.c:590
 msgid "Changing of the User-Agent string is disabled!"
 msgstr ""
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:594
+#: LYMessages.c:592
 msgid "You are not allowed to change this setting."
 msgstr ""
 
-#: LYMessages.c:595
+#: LYMessages.c:593
 msgid "Saving Options..."
 msgstr "Shranjujemo mo¾nosti ..."
 
-#: LYMessages.c:596
+#: LYMessages.c:594
 msgid "Options saved!"
 msgstr "Mo¾nosti shranjene!"
 
-#: LYMessages.c:597
+#: LYMessages.c:595
 msgid "Unable to save Options!"
 msgstr ""
 
-#: LYMessages.c:598
+#: LYMessages.c:596
 msgid " 'r' to return to Lynx "
 msgstr ""
 
-#: LYMessages.c:599
+#: LYMessages.c:597
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr ""
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:601
+#: LYMessages.c:599
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "Pritisnite katerokoli tipko za spremembo vrednosti; RETURN za sprejem."
 
-#: LYMessages.c:602
+#: LYMessages.c:600
 msgid "Error uncompressing temporary file!"
 msgstr "Napaka pri raz¹irjanju zaèasne datoteke!"
 
-#: LYMessages.c:603
+#: LYMessages.c:601
 msgid "Unsupported URL scheme!"
 msgstr "Nepodprta shema URL!"
 
-#: LYMessages.c:604
+#: LYMessages.c:602
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "Nepodprti podatki: URL!  Zaenkrat uporabite SHOWINFO."
 
-#: LYMessages.c:605
+#: LYMessages.c:603
 msgid "Redirection limit of 10 URL's reached."
 msgstr "Dose¾ena je bila omejitev 10 preumerjenih URL-jve."
 
-#: LYMessages.c:606
+#: LYMessages.c:604
 msgid "Illegal redirection URL received from server!"
 msgstr "Stre¾nik je poslal URL z neveljavno preusmeritvijo!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:608
+#: LYMessages.c:606
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "Server je prosil za preusmeritev %d vsebine POST na"
 
-#: LYMessages.c:611
+#: LYMessages.c:609
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P)nadaljevanje, uporabite G)poberi ali C)preklièi"
 
-#: LYMessages.c:612
+#: LYMessages.c:610
 msgid "P)roceed, or C)ancel "
 msgstr "P)nadaljevanje ali C)preklic"
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:614
+#: LYMessages.c:612
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr "Preusmeritev vsebine POST.  P)nadaljevanje, ogled U)RL, G)pobiranje ali C)preklic"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:614
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "Preusmeritev vsebine POST.  P)nadaljevanje, ogled U)URL ali C)preklic"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:618
+#: LYMessages.c:616
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "Spis iz obrazca brez vsebine POST.  Ponovno po¹ljemo zahtevo?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:620
+#: LYMessages.c:618
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Ponovno po¹ljemo vsebino POST na %s ?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:622
+#: LYMessages.c:620
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "Seznam iz dokumenta s podatki POST.  Ponovno nalo¾imo %s ?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:624
+#: LYMessages.c:622
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr ""
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:624
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr ""
 
-#: LYMessages.c:627
+#: LYMessages.c:625
 msgid "Proceed without a username and password?"
 msgstr "Nadaljujemo brez uporabni¹kega imena in gesla?"
 
-#: LYMessages.c:628
+#: LYMessages.c:626
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Nadaljujemo (%s)?"
 
-#: LYMessages.c:629
+#: LYMessages.c:627
 msgid "Cannot POST to this host."
 msgstr "Ne moremo poslati POST temu gostitelju."
 
-#: LYMessages.c:630
+#: LYMessages.c:628
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "POST ni podprt za ta URL - zanemarjamo podatke POST!"
 
-#: LYMessages.c:631
+#: LYMessages.c:629
 msgid "Discarding POST data..."
 msgstr "Zanemarjamo podatke POST..."
 
-#: LYMessages.c:632
+#: LYMessages.c:630
 msgid "Document will not be reloaded!"
 msgstr "Dokument ne bo ponovno nalo¾en!"
 
-#: LYMessages.c:633
+#: LYMessages.c:631
 msgid "Location: "
 msgstr "Lokacija: "
 
-#: LYMessages.c:634
+#: LYMessages.c:632
 #, c-format
 msgid "'%s' not found!"
 msgstr ",%s` ni bil najden!"
 
-#: LYMessages.c:635
+#: LYMessages.c:633
 msgid "Default Bookmark File"
 msgstr "Privzeta datoteka z zaznamki"
 
-#: LYMessages.c:636
+#: LYMessages.c:634
 msgid "Screen too small! (8x35 min)"
 msgstr "Premajhen zaslon! (najmanj 8×35)"
 
-#: LYMessages.c:637
+#: LYMessages.c:635
 msgid "Select destination or ^G to Cancel: "
 msgstr "Izberite cilj ali ^G za preklic: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:639
+#: LYMessages.c:637
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "Izberite podzaznamek, ,=` za menu ali ^G za preklic: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:641
+#: LYMessages.c:639
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "Reproduciramo L)povezavo v tej datoteki z zaznamki ali C)preklièemo? (l,c): "
 
-#: LYMessages.c:642
+#: LYMessages.c:640
 msgid "Multiple bookmark support is not available."
 msgstr "Podpora za veè zaznamkov ni dostopna."
 
-#: LYMessages.c:643
+#: LYMessages.c:641
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr ""
 
-#: LYMessages.c:644
+#: LYMessages.c:642
 msgid "       Select Bookmark"
 msgstr "       Izberimo zaznamek"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:646
+#: LYMessages.c:644
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "Urejamo OPIS in POT DO DATOTEKE zaznamka (%d od 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:648
+#: LYMessages.c:646
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "         Urejamo OPIS in POT DO DATOTEKE zaznamka"
 
-#: LYMessages.c:649
+#: LYMessages.c:647
 msgid "Letter: "
 msgstr "Pismo: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:652
+#: LYMessages.c:650
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Uporabite pot do datoteke od va¹ega prijavnega imenika v skladnji za lupino!"
 
-#: LYMessages.c:654
+#: LYMessages.c:652
 msgid "Use a filepath off your home directory!"
 msgstr "Uporabite ime poti od va¹ega domaèega imenika!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:657
+#: LYMessages.c:655
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Prese¾eno najveèje ¹tevilo povezav na stran!  Uporabite polovièno stran ali dvovrstièno pomikanje."
 
 #. #define MAXHIST_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:657
 msgid "History List maximum reached!  Document not pushed."
 msgstr ""
 
-#: LYMessages.c:660
+#: LYMessages.c:658
 msgid "No previously visited links available!"
 msgstr ""
 
-#: LYMessages.c:661
+#: LYMessages.c:659
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Zmanjkalo pomnilnika!  Program je prekinjen!"
 
-#: LYMessages.c:662
+#: LYMessages.c:660
 msgid "Memory exhausted!  Aborting..."
 msgstr "Zmanjkalo pomnilnika!  Konèujemo..."
 
-#: LYMessages.c:663
+#: LYMessages.c:661
 msgid "Not enough memory!"
 msgstr ""
 
-#: LYMessages.c:664
+#: LYMessages.c:662
 msgid "Directory/File Manager not available"
 msgstr "Urejevalnik imenikov/datotek ni dostopen"
 
-#: LYMessages.c:665
+#: LYMessages.c:663
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "HREF v oznaki BASE ni absolutni URL."
 
-#: LYMessages.c:666
+#: LYMessages.c:664
 msgid "Location URL is not absolute."
 msgstr "URL lokacije ni absoluten."
 
-#: LYMessages.c:667
+#: LYMessages.c:665
 msgid "Refresh URL is not absolute."
 msgstr "URL za osve¾itev strani ni absoluten."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:667
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2036,7 +2037,7 @@ msgstr ""
 "Po¹iljate sporoèilo s telesom na:\n"
 "  "
 
-#: LYMessages.c:670
+#: LYMessages.c:668
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2044,7 +2045,7 @@ msgstr ""
 "Po¹iljate komentar prejemniku:\n"
 "  "
 
-#: LYMessages.c:671
+#: LYMessages.c:669
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2054,7 +2055,7 @@ msgstr ""
 "S kopijo prejemniku:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:670
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2065,7 +2066,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:672
 msgid ""
 "\n"
 "\n"
@@ -2076,7 +2077,7 @@ msgstr ""
 "Èe ne ¾elite poslati sporoèila, uporabite Ctrl-G za preklic\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:674
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2085,7 +2086,7 @@ msgstr ""
 " Prosim, vnesite svoje ime ali pustite prazno polje za anonimnost\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:676
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2094,11 +2095,11 @@ msgstr ""
 " Prosim, vnesite po¹tni naslov ali kaj drugega\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:678
 msgid " means to contact you, if you desire a response.\n"
 msgstr " naèini za kontaktiranje, èe ¾elite odziv.\n"
 
-#: LYMessages.c:681
+#: LYMessages.c:679
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2107,7 +2108,7 @@ msgstr ""
 " Prosim, vnesite vrstico s predmetom.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2115,11 +2116,11 @@ msgstr ""
 "\n"
 " Vnesite po¹tni naslov za kopijo (CC) va¹ega sporoèila.\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:682
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (Pustite prazno, èe ne ¾elite kopije.)\n"
 
-#: LYMessages.c:685
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2129,7 +2130,7 @@ msgstr ""
 " Prosim, preglejte telo sporoèila:\n"
 "\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:684
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2137,7 +2138,7 @@ msgstr ""
 "\n"
 "Pritisnite RETURN za nadaljevanje: "
 
-#: LYMessages.c:687
+#: LYMessages.c:685
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2145,11 +2146,11 @@ msgstr ""
 "\n"
 "Pritisnite RETURN za èi¹èenje: "
 
-#: LYMessages.c:688
+#: LYMessages.c:686
 msgid " Use Control-U to erase the default.\n"
 msgstr " Uporabite Control-U za izbris privzete vrednosti.\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2158,7 +2159,7 @@ msgstr ""
 " Prosim, spodaj vnesite svoje sporoèilo."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:380
+#: LYMessages.c:689 src/LYNews.c:361
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2167,7 +2168,7 @@ msgstr ""
 " Ko opravite, pritisnite Enter in vstavite eno samo piko (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:381
+#: LYMessages.c:691 src/LYNews.c:362
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2177,248 +2178,248 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:695
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "pi¹kot %s: %.*s=%.*s  Dovolimo? (Y-da/N-ne/A-vedno/V-nikoli)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:697
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Sprejmemo neveljavno domeno=%s za pi¹kote za ,%s`?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:699
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr "Sprejmemo neveljavno pot=%s za pi¹kote s predpono ,%s`?"
 
-#: LYMessages.c:702
+#: LYMessages.c:700
 msgid "Allowing this cookie."
 msgstr "Sprejmemo ta pi¹kot."
 
-#: LYMessages.c:703
+#: LYMessages.c:701
 msgid "Rejecting this cookie."
 msgstr "Zavraèamo ta pi¹kot."
 
-#: LYMessages.c:704
+#: LYMessages.c:702
 msgid "The Cookie Jar is empty."
 msgstr "Posoda s pi¹koti je prazna."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:706
+#: LYMessages.c:704
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr ""
 
-#: LYMessages.c:707
+#: LYMessages.c:705
 msgid "or to change a domain's 'allow' setting."
 msgstr ""
 
-#: LYMessages.c:708
+#: LYMessages.c:706
 msgid "(Cookies never allowed.)"
 msgstr "(Pi¹koti nikoli dovoljeni.)"
 
-#: LYMessages.c:709
+#: LYMessages.c:707
 msgid "(Cookies always allowed.)"
 msgstr "(Pi¹koti vedno dobrodo¹li.)"
 
-#: LYMessages.c:710
+#: LYMessages.c:708
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Pi¹koti dovoljeni po vpra¹anju.)"
 
-#: LYMessages.c:711
+#: LYMessages.c:709
 msgid "(Persistent Cookies.)"
 msgstr "(Obstojni pi¹koti.)"
 
-#: LYMessages.c:712
+#: LYMessages.c:710
 msgid "(No title.)"
 msgstr "(Brez naslova.)"
 
-#: LYMessages.c:713
+#: LYMessages.c:711
 msgid "(No name.)"
 msgstr "(Brez imena.)"
 
-#: LYMessages.c:714
+#: LYMessages.c:712
 msgid "(No value.)"
 msgstr "(Brez vrednosti.)"
 
-#: LYMessages.c:715
+#: LYMessages.c:713
 msgid "None"
 msgstr "Niè"
 
-#: LYMessages.c:716
+#: LYMessages.c:714
 msgid "(End of session.)"
 msgstr "(Konec seje.)"
 
-#: LYMessages.c:717
+#: LYMessages.c:715
 msgid "Delete this cookie?"
 msgstr "Odstranimo ta pi¹kot?"
 
-#: LYMessages.c:718
+#: LYMessages.c:716
 msgid "The cookie has been eaten!"
 msgstr "Pi¹kot smo pojedli!"
 
-#: LYMessages.c:719
+#: LYMessages.c:717
 msgid "Delete this empty domain?"
 msgstr "Pobri¹emo to prazno domeno?"
 
-#: LYMessages.c:720
+#: LYMessages.c:718
 msgid "The domain has been eaten!"
 msgstr "Domeno smo pojedli!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:722
+#: LYMessages.c:720
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr ""
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:724
+#: LYMessages.c:722
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr ""
 
-#: LYMessages.c:725
+#: LYMessages.c:723
 msgid "All cookies in the domain have been eaten!"
 msgstr "Pojedli smo vse pi¹kote v domeni!"
 
-#: LYMessages.c:726
+#: LYMessages.c:724
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "A)Vedno dovolimo iz domene ,%s`."
 
-#: LYMessages.c:727
+#: LYMessages.c:725
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "V)Nikoli ne dovolimo iz domene ,%s`."
 
-#: LYMessages.c:728
+#: LYMessages.c:726
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "P)Vpra¹amo za dovoljenje za pi¹kote iz domene ,%s`."
 
-#: LYMessages.c:729
+#: LYMessages.c:727
 msgid "Delete all cookies in this domain?"
 msgstr "Odstranimo vse pi¹kote v tej domeni?"
 
-#: LYMessages.c:730
+#: LYMessages.c:728
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "Vse pi¹kote v posodi smo pojedli!"
 
-#: LYMessages.c:732
+#: LYMessages.c:730
 msgid "Port 19 not permitted in URLs."
 msgstr "Vrata 19 niso dovoljena v URL-jih."
 
-#: LYMessages.c:733
+#: LYMessages.c:731
 msgid "Port 25 not permitted in URLs."
 msgstr "Vrata 25 niso dovoljena v URL-jih."
 
-#: LYMessages.c:734
+#: LYMessages.c:732
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "Vrata %lu niso dovoljena v URL-jih."
 
-#: LYMessages.c:735
+#: LYMessages.c:733
 msgid "URL has a bad port field."
 msgstr "URL ima slabo polje z vrati."
 
-#: LYMessages.c:736
+#: LYMessages.c:734
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "Dose¾eno najgloblje gnezdenje gradnikov HTML."
 
-#: LYMessages.c:737
+#: LYMessages.c:735
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Slab delni sklic!  Odstranjujemo vodilne pike."
 
-#: LYMessages.c:738
+#: LYMessages.c:736
 msgid "Trace Log open failed.  Trace off!"
 msgstr "Odpiranje dnevnika za sledenje spodletelo.  Sledenje izkljuèeno!"
 
-#: LYMessages.c:739
+#: LYMessages.c:737
 msgid "Lynx Trace Log"
 msgstr "Dnevnik za sledenje Lynxu"
 
-#: LYMessages.c:740
+#: LYMessages.c:738
 msgid "No trace log has been started for this session."
 msgstr "V tej seji ni bilo zagnanega dnevnika za sledenje."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:742
+#: LYMessages.c:740
 msgid "The maximum temporary file count has been reached!"
 msgstr ""
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:744
+#: LYMessages.c:742
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr ""
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:746
+#: LYMessages.c:744
 msgid "Modified tail combined with head of form field value."
 msgstr ""
 
 #. HTFile.c
-#: LYMessages.c:749
+#: LYMessages.c:747
 msgid "Directory"
 msgstr "Imenik"
 
-#: LYMessages.c:750
+#: LYMessages.c:748
 msgid "Directory browsing is not allowed."
 msgstr "Brskanje po imeniku ni dovoljeno."
 
-#: LYMessages.c:751
+#: LYMessages.c:749
 msgid "Selective access is not enabled for this directory"
 msgstr ""
 
-#: LYMessages.c:752
+#: LYMessages.c:750
 msgid "Multiformat: directory scan failed."
 msgstr ""
 
-#: LYMessages.c:753
+#: LYMessages.c:751
 msgid "This directory is not readable."
 msgstr "Tega imenika ni mogoèe brati."
 
-#: LYMessages.c:754
+#: LYMessages.c:752
 msgid "Can't access requested file."
 msgstr "Ne moremo dostopati do zahtevane datoteke."
 
-#: LYMessages.c:755
+#: LYMessages.c:753
 msgid "Could not find suitable representation for transmission."
 msgstr ""
 
-#: LYMessages.c:756
+#: LYMessages.c:754
 msgid "Could not open file for decompression!"
 msgstr ""
 
-#: LYMessages.c:757
+#: LYMessages.c:755
 msgid "Files:"
 msgstr "Datoteke:"
 
-#: LYMessages.c:758
+#: LYMessages.c:756
 msgid "Subdirectories:"
 msgstr "Podimeniki:"
 
-#: LYMessages.c:759
+#: LYMessages.c:757
 msgid " directory"
 msgstr " imenik"
 
-#: LYMessages.c:760
+#: LYMessages.c:758
 msgid "Up to "
 msgstr "Do "
 
-#: LYMessages.c:761
+#: LYMessages.c:759
 msgid "Current directory is "
 msgstr "Trenutni imenik je "
 
 #. HTGopher.c
-#: LYMessages.c:764
+#: LYMessages.c:762
 msgid "No response from server!"
 msgstr "Ni odgovora od stre¾nika!"
 
-#: LYMessages.c:765
+#: LYMessages.c:763
 msgid "CSO index"
 msgstr "Indeks CSO"
 
-#: LYMessages.c:766
+#: LYMessages.c:764
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2426,16 +2427,16 @@ msgstr ""
 "\n"
 "To je iskalni indeks za zbirko podatkov CSO.\n"
 
-#: LYMessages.c:767
+#: LYMessages.c:765
 msgid "CSO Search Results"
 msgstr "Iskalni rezultati CSO"
 
-#: LYMessages.c:768
+#: LYMessages.c:766
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Napaka pri iskanju pri %s\n"
 
-#: LYMessages.c:769
+#: LYMessages.c:767
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2443,7 +2444,7 @@ msgstr ""
 "\n"
 "Pritisnite tipko ,s` in vnesite iskane kljuène besede.\n"
 
-#: LYMessages.c:770
+#: LYMessages.c:768
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2451,35 +2452,35 @@ msgstr ""
 "\n"
 "To je iskalno kazalo po Gopherju.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:769
 msgid "Gopher index"
 msgstr "Kazalo po Gopherju"
 
-#: LYMessages.c:772
+#: LYMessages.c:770
 msgid "Gopher Menu"
 msgstr "Menu Gopherja"
 
-#: LYMessages.c:773
+#: LYMessages.c:771
 msgid " Search Results"
 msgstr " Rezultati iskanja"
 
-#: LYMessages.c:774
+#: LYMessages.c:772
 msgid "Sending CSO/PH request."
 msgstr "Po¹iljamo zahtevek CSO/PH."
 
-#: LYMessages.c:775
+#: LYMessages.c:773
 msgid "Sending Gopher request."
 msgstr "Po¹iljamo zahtevek Gopherju."
 
-#: LYMessages.c:776
+#: LYMessages.c:774
 msgid "CSO/PH request sent; waiting for response."
 msgstr "Zahtevek CSO/PH poslan; èakamo na odgovor."
 
-#: LYMessages.c:777
+#: LYMessages.c:775
 msgid "Gopher request sent; waiting for response."
 msgstr "Zahteva Gopherju poslana; èakamo na odgovor."
 
-#: LYMessages.c:778
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2487,7 +2488,7 @@ msgstr ""
 "\n"
 "Prosim, vnesite iskane kljuène besede.\n"
 
-#: LYMessages.c:779
+#: LYMessages.c:777
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2495,193 +2496,197 @@ msgstr ""
 "\n"
 "Kljuène besede, ki jih boste vnesli, bodo omogoèile iskanje po"
 
-#: LYMessages.c:780
+#: LYMessages.c:778
 msgid " person's name in the database.\n"
 msgstr " imenu osebe v zbirki podatkov.\n"
 
 #. HTNews.c
-#: LYMessages.c:783
+#: LYMessages.c:781
 msgid "Connection closed ???"
 msgstr "Povezava zaprta???"
 
-#: LYMessages.c:784
+#: LYMessages.c:782
 msgid "Cannot open temporary file for news POST."
 msgstr "Ne moremo odpreti zaèasne datoteke za PO©ILJANJE novic."
 
-#: LYMessages.c:785
+#: LYMessages.c:783
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Ta odjemnik ne vsebuje podpore za po¹iljanje novic s SSL."
 
 #. HTStyle.c
-#: LYMessages.c:788
+#: LYMessages.c:786
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Slog %d ,%s` SGML:%s.  Pisava %s %.1f pik.\n"
 
-#: LYMessages.c:789
+#: LYMessages.c:787
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tZamiki: prvi=%.0f ostali=%.0f, vi¹ina=%.1f globina=%.1f\n"
 
-#: LYMessages.c:790
+#: LYMessages.c:788
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "\tPoravnava=%d, %d predelènikov. (%.0f prej, %.0f pozneje)\n"
 
-#: LYMessages.c:791
+#: LYMessages.c:789
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "\t\tVrsta predelènika=%d na %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:794
+#: LYMessages.c:792
 msgid "Can't proceed without a username and password."
 msgstr "Ne moremo nadaljevati brez uporabni¹kega imena in gesla."
 
-#: LYMessages.c:795
+#: LYMessages.c:793
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Ne moremo ponovno poskusiti brez avtorizacije!  Povpra¹ajte upravitelja spletnega stre¾nika."
 
-#: LYMessages.c:796
+#: LYMessages.c:794
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "Ne moremo ponovno poskusiti brez avtorizacije za proxy!  Povpra¹ajte upravitelja spletnega stre¾nika."
 
-#: LYMessages.c:797
+#: LYMessages.c:795
 msgid "Retrying with proxy authorization information."
 msgstr "Posku¹amo ponovno z avtorizacijo za proxy."
 
 #. HTWAIS.c
-#: LYMessages.c:800
+#: LYMessages.c:798
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Sporoèilo z odgovorom je predolgo."
 
-#: LYMessages.c:801
+#: LYMessages.c:799
 msgid "Enter WAIS query: "
 msgstr "Vnesite zahtevek za WAIS: "
 
 #. Miscellaneous status
-#: LYMessages.c:804
+#: LYMessages.c:802
 msgid "Retrying as HTTP0 request."
 msgstr "Ponovno posku¹amo z zahtevkom HTTP0."
 
-#: LYMessages.c:805
+#: LYMessages.c:803
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "Preneseno %d zlogov"
 
-#: LYMessages.c:806
+#: LYMessages.c:804
 msgid "Data transfer complete"
 msgstr "Prenos podatkov konèan"
 
-#: LYMessages.c:807
+#: LYMessages.c:805
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Napaka pri obdelavi vrstice %d datoteke %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:810
+#: LYMessages.c:808
 msgid "Address List Page"
 msgstr "Stran z imenikom naslovov"
 
-#: LYMessages.c:811
+#: LYMessages.c:809
 msgid "Bookmark file"
 msgstr "Datoteka z zaznamki"
 
-#: LYMessages.c:812
+#: LYMessages.c:810
 msgid "Configuration Definitions"
 msgstr "Definicije nastavitev"
 
-#: LYMessages.c:813
+#: LYMessages.c:811
 msgid "Cookie Jar"
 msgstr "Posoda s pi¹koti"
 
-#: LYMessages.c:814
+#: LYMessages.c:812
 msgid "Current Key Map"
 msgstr "Trenutna tipkovnica"
 
-#: LYMessages.c:815
+#: LYMessages.c:813
 msgid "File Management Options"
 msgstr "Izbire upravljanja datotek"
 
-#: LYMessages.c:816
+#: LYMessages.c:814
 msgid "Download Options"
 msgstr "Izbire za jemanje"
 
-#: LYMessages.c:817
+#: LYMessages.c:815
 msgid "History Page"
 msgstr "Stran z zgodovino"
 
-#: LYMessages.c:818
+#: LYMessages.c:816
 msgid "List Page"
 msgstr "Stran s seznamom"
 
-#: LYMessages.c:819
+#: LYMessages.c:817
 msgid "Lynx.cfg Information"
 msgstr "Informacije o Lynx.cfg"
 
-#: LYMessages.c:820
+#: LYMessages.c:818
 msgid "Converted Mosaic Hotlist"
 msgstr ""
 
-#: LYMessages.c:821
+#: LYMessages.c:819
 msgid "Options Menu"
 msgstr "Menu izbir"
 
-#: LYMessages.c:822
+#: LYMessages.c:820
 msgid "File Permission Options"
 msgstr "Izbire za dovoljenja datotek"
 
-#: LYMessages.c:823
+#: LYMessages.c:821
 msgid "Printing Options"
 msgstr "Izbire tiskanja"
 
-#: LYMessages.c:824
+#: LYMessages.c:822
 msgid "Information about the current document"
 msgstr "Informacije o trenutnem dokumentu"
 
-#: LYMessages.c:825
+#: LYMessages.c:823
 msgid "Your recent statusline messages"
 msgstr "Novej¹a sporoèila v vrstici stanja"
 
-#: LYMessages.c:826
+#: LYMessages.c:824
 msgid "Upload Options"
 msgstr "Izbire po¹iljanja"
 
-#: LYMessages.c:827
+#: LYMessages.c:825
 msgid "Visited Links Page"
 msgstr "Stran z obiskanimi povezavami"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:830
+#: LYMessages.c:828
 msgid "See also"
 msgstr "Glejte tudi"
 
-#: LYMessages.c:831
+#: LYMessages.c:829
 msgid "your"
 msgstr "va¹"
 
-#: LYMessages.c:832
+#: LYMessages.c:830
 msgid "for runtime options"
 msgstr "za izbire med tekom"
 
-#: LYMessages.c:833
+#: LYMessages.c:831
 msgid "compile time options"
 msgstr "izbire ob prevajanju"
 
-#: LYMessages.c:834
+#: LYMessages.c:832
+msgid "color-style configuration"
+msgstr ""
+
+#: LYMessages.c:833
 msgid "latest release"
 msgstr "zadnjo razlièico"
 
-#: LYMessages.c:835
+#: LYMessages.c:834
 msgid "pre-release version"
 msgstr "razvojno razlièico"
 
-#: LYMessages.c:836
+#: LYMessages.c:835
 msgid "development version"
 msgstr "razvojno razlièico"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:838
+#: LYMessages.c:837
 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"
@@ -2689,109 +2694,113 @@ msgid ""
 msgstr ""
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:842
+#: LYMessages.c:841
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
 msgstr ""
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:847
+#: LYMessages.c:846
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr ""
 
-#: LYMessages.c:848
+#: LYMessages.c:847
 msgid "Failed to obtain status of current link!"
 msgstr "Nismo mogli dobiti stanja trenutne povezave!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:851
+#: LYMessages.c:850
 msgid "Special URL only valid from current File Permission menu!"
 msgstr ""
 
-#: LYMessages.c:855
+#: LYMessages.c:854
 msgid "External support is currently disabled."
 msgstr "Zunanja podpora je trenutno onemogoèena."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:859
+#: LYMessages.c:858
 #, fuzzy
 msgid "Changing working-directory is currently disabled."
 msgstr "Ukaz natisni (p) je trenutno onemogoèen."
 
-#: LYMessages.c:860
+#: LYMessages.c:859
 #, fuzzy
 msgid "Linewrap OFF!"
 msgstr "Sledenje IZKLJUÈENO!"
 
-#: LYMessages.c:861
+#: LYMessages.c:860
 msgid "Linewrap ON!"
 msgstr ""
 
-#: LYMessages.c:862
+#: LYMessages.c:861
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr ""
 
-#: LYMessages.c:863
+#: LYMessages.c:862
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr ""
 
-#: LYMessages.c:864
+#: LYMessages.c:863
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr ""
 
-#: LYMessages.c:865
+#: LYMessages.c:864
 #, fuzzy
 msgid "Trace not supported"
 msgstr "Terminal ne podpira barv"
 
-#: WWW/Library/Implementation/HTAABrow.c:648
+#: WWW/Library/Implementation/HTAABrow.c:647
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "Uporabni¹ko ime za ,%s` na %s ,%s%s`:"
 
-#: WWW/Library/Implementation/HTAABrow.c:914
+#: WWW/Library/Implementation/HTAABrow.c:913
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:989
+#: WWW/Library/Implementation/HTAABrow.c:988
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:1097
+#: WWW/Library/Implementation/HTAABrow.c:1096
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Neveljavna glava ,%s%s%s%s%s`"
 
-#: WWW/Library/Implementation/HTAABrow.c:1201
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAABrow.c:1260
+#: WWW/Library/Implementation/HTAABrow.c:1259
 msgid "Access without authorization denied -- retrying"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:683
+#: WWW/Library/Implementation/HTAccess.c:677
 msgid "Access forbidden by rule"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:785
+#: WWW/Library/Implementation/HTAccess.c:779
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1026 src/GridText.c:8039
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
 msgid "Loading incomplete."
 msgstr "Nalaganje nepopolno."
 
-#: WWW/Library/Implementation/HTAccess.c:1056
+#: WWW/Library/Implementation/HTAccess.c:1077
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1058
+#: WWW/Library/Implementation/HTAccess.c:1079
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1059
+#: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr ""
@@ -2800,28 +2809,28 @@ msgstr ""
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7834
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
 msgid "Can't Access"
 msgstr "Ne moremo dostopati"
 
-#: WWW/Library/Implementation/HTAccess.c:1073
+#: WWW/Library/Implementation/HTAccess.c:1094
 msgid "Unable to access document."
 msgstr "Ne moremo dostopati do sestavka"
 
-#: WWW/Library/Implementation/HTFTP.c:756
+#: WWW/Library/Implementation/HTFTP.c:766
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Vnesite geslo za uporabnika %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:784
+#: WWW/Library/Implementation/HTFTP.c:794
 msgid "Unable to connect to FTP host."
 msgstr "Ne moremo se povezati z gostiteljem FTP."
 
-#: WWW/Library/Implementation/HTFTP.c:1054
+#: WWW/Library/Implementation/HTFTP.c:1064
 msgid "close master socket"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:1116
+#: WWW/Library/Implementation/HTFTP.c:1126
 msgid "socket for master socket"
 msgstr ""
 
@@ -2830,36 +2839,36 @@ msgstr ""
 #. **  knowing if it is symbolic?	I think so since
 #. **  it might be a directory.
 #.
-#: WWW/Library/Implementation/HTFTP.c:1630 WWW/Library/Implementation/HTFTP.c:2251
+#: WWW/Library/Implementation/HTFTP.c:1640 WWW/Library/Implementation/HTFTP.c:2261
 msgid "Symbolic Link"
 msgstr "Simbolna povezava"
 
-#: WWW/Library/Implementation/HTFTP.c:2612
+#: WWW/Library/Implementation/HTFTP.c:2622
 msgid "Receiving FTP directory."
 msgstr "Sprejemamo imenik za FTP."
 
-#: WWW/Library/Implementation/HTFTP.c:2755
+#: WWW/Library/Implementation/HTFTP.c:2762
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "Preneseno %d zlogov (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3083
 msgid "connect for data"
 msgstr "povezava za podatke"
 
-#: WWW/Library/Implementation/HTFTP.c:3690
+#: WWW/Library/Implementation/HTFTP.c:3731
 msgid "Receiving FTP file."
 msgstr "Jemljemo datoteko s FTP."
 
-#: WWW/Library/Implementation/HTFinger.c:275
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
 msgstr "Ne moremo vzpostaviti povezave s finger."
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFinger.c:328
+#: WWW/Library/Implementation/HTFinger.c:331
 msgid "Invalid port number - will only use port 79!"
 msgstr ""
 
@@ -2867,7 +2876,7 @@ msgstr ""
 msgid "Could not access finger host."
 msgstr ""
 
-#: WWW/Library/Implementation/HTFinger.c:407
+#: WWW/Library/Implementation/HTFinger.c:404
 msgid "No response from finger server."
 msgstr "Ni odgovora od stre¾nika za finger."
 
@@ -2893,12 +2902,12 @@ msgstr "Geslo za novièarski stre¾nik ,%s`:"
 msgid "Change password?"
 msgstr "Sprememba gesla?"
 
-#: WWW/Library/Implementation/HTNews.c:1691
+#: WWW/Library/Implementation/HTNews.c:1690
 #, c-format
 msgid "No matches for: %s"
 msgstr "Ni ujemanja za: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1744
+#: WWW/Library/Implementation/HTNews.c:1743
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2906,7 +2915,7 @@ msgstr ""
 "\n"
 "V tem obsegu ni èlankov.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1757
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2915,16 +2924,16 @@ msgstr ""
 #.
 #. **	Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1770
+#: WWW/Library/Implementation/HTNews.c:1769
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Èlanki %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1792
+#: WWW/Library/Implementation/HTNews.c:1791
 msgid "Earlier articles"
 msgstr "Prej¹nji èlanki"
 
-#: WWW/Library/Implementation/HTNews.c:1805
+#: WWW/Library/Implementation/HTNews.c:1804
 #, c-format
 msgid ""
 "\n"
@@ -2932,41 +2941,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:1865
+#: WWW/Library/Implementation/HTNews.c:1864
 msgid "All available articles in "
 msgstr "Vsi dostopni èlanki v "
 
-#: WWW/Library/Implementation/HTNews.c:2081
+#: WWW/Library/Implementation/HTNews.c:2080
 msgid "Later articles"
 msgstr "Poznej¹i èlanki"
 
-#: WWW/Library/Implementation/HTNews.c:2105
+#: WWW/Library/Implementation/HTNews.c:2104
 msgid "Post to "
 msgstr "Razpo¹ljemo v "
 
-#: WWW/Library/Implementation/HTNews.c:2323
+#: WWW/Library/Implementation/HTNews.c:2322
 msgid "This client does not contain support for SNEWS URLs."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2531
+#: WWW/Library/Implementation/HTNews.c:2530
 msgid "No target for raw text!"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2561
+#: WWW/Library/Implementation/HTNews.c:2560
 msgid "Connecting to NewsHost ..."
 msgstr "Povezujemo se z novièarskim stre¾nikom ..."
 
-#: WWW/Library/Implementation/HTNews.c:2612
+#: WWW/Library/Implementation/HTNews.c:2611
 #, c-format
 msgid "Could not access %s."
 msgstr "Ne moremo dostopati do %s."
 
-#: WWW/Library/Implementation/HTNews.c:2712
+#: WWW/Library/Implementation/HTNews.c:2711
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2716
+#: WWW/Library/Implementation/HTNews.c:2715
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr ""
@@ -2974,34 +2983,34 @@ msgstr ""
 #.
 #. **	List available newsgroups. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2920
+#: WWW/Library/Implementation/HTNews.c:2919
 msgid "Reading list of available newsgroups."
 msgstr ""
 
-#: WWW/Library/Implementation/HTNews.c:2942
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of articles in newsgroup."
 msgstr ""
 
 #.
 #. **	Get an article from a news group. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2948
+#: WWW/Library/Implementation/HTNews.c:2947
 msgid "Reading news article."
 msgstr "Beremo novièarski èlanek."
 
-#: WWW/Library/Implementation/HTNews.c:2978
+#: WWW/Library/Implementation/HTNews.c:2977
 msgid "Sorry, could not load requested news."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1233
+#: WWW/Library/Implementation/HTTCP.c:1239
 msgid "Address has invalid port"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1336
+#: WWW/Library/Implementation/HTTCP.c:1327
 msgid "Address length looks invalid"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1574 WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr ""
@@ -3010,62 +3019,85 @@ msgstr ""
 #. *  immediately; but not HTAlert, because typically
 #. *  there will be other alerts from the callers. - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1589 WWW/Library/Implementation/HTTelnet.c:103
+#: WWW/Library/Implementation/HTTCP.c:1575 WWW/Library/Implementation/HTTelnet.c:103
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Neveljavno ime gostitelja %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1603
+#: WWW/Library/Implementation/HTTCP.c:1589
 #, c-format
 msgid "Making %s connection to %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1619
+#: WWW/Library/Implementation/HTTCP.c:1605
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1628
+#: WWW/Library/Implementation/HTTCP.c:1614
 msgid "socket failed."
 msgstr "vtiènici je spodletelo."
 
-#: WWW/Library/Implementation/HTTCP.c:1648
+#: WWW/Library/Implementation/HTTCP.c:1634
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1717
+#: WWW/Library/Implementation/HTTCP.c:1703
 msgid "Connection failed (too many retries)."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1910
+#: WWW/Library/Implementation/HTTCP.c:1896
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1976
+#: WWW/Library/Implementation/HTTCP.c:1962
 msgid "Socket read failed for 180,000 tries."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:466
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:503
 msgid "This client does not contain support for HTTPS URLs."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:491
+#: WWW/Library/Implementation/HTTP.c:528
 msgid "Unable to connect to remote host."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1005
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1091
 msgid "Sending HTTP request."
 msgstr "Po¹iljamo zahtevek HTTP."
 
-#: WWW/Library/Implementation/HTTP.c:1039
+#: WWW/Library/Implementation/HTTP.c:1125
 msgid "Unexpected network write error; connection aborted."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1045
+#: WWW/Library/Implementation/HTTP.c:1131
 msgid "HTTP request sent; waiting for response."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1109
+#: WWW/Library/Implementation/HTTP.c:1195
 msgid "Unexpected network read error; connection aborted."
 msgstr ""
 
@@ -3079,7 +3111,7 @@ msgstr ""
 #. **	so we'll deal with them by showing the full
 #. **	header to the user as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1305
+#: WWW/Library/Implementation/HTTP.c:1391
 msgid "Got unexpected Informational Status."
 msgstr ""
 
@@ -3090,7 +3122,7 @@ msgstr ""
 #. *  user to do that, and restore the current
 #. *  document. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1340
+#: WWW/Library/Implementation/HTTP.c:1426
 msgid "Request fulfilled.  Reset Content."
 msgstr ""
 
@@ -3101,27 +3133,27 @@ msgstr ""
 #. *  with it by showing the full header to the user
 #. *  as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1459
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "Got unexpected 304 Not Modified status."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1526
+#: WWW/Library/Implementation/HTTP.c:1612
 msgid "Redirection of POST content requires user approval."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1541
+#: WWW/Library/Implementation/HTTP.c:1627
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1586
+#: WWW/Library/Implementation/HTTP.c:1672
 msgid "Retrying with access authorization information."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1684
 msgid "Show the 401 message body?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1643
+#: WWW/Library/Implementation/HTTP.c:1729
 msgid "Show the 407 message body?"
 msgstr ""
 
@@ -3130,7 +3162,7 @@ msgstr ""
 #. **	Take a chance and hope there is
 #. **	something to display. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1748
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Unknown status reply from server!"
 msgstr ""
 
@@ -3208,27 +3240,27 @@ msgid ""
 "Code record, can't display\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:691
+#: WWW/Library/Implementation/HTWAIS.c:689
 msgid "Syntax error in WAIS URL"
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:761
+#: WWW/Library/Implementation/HTWAIS.c:759
 msgid " (WAIS Index)"
 msgstr " (Indeks WAIS)"
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:766
 msgid "WAIS Index: "
 msgstr "Indeks WAIS: "
 
-#: WWW/Library/Implementation/HTWAIS.c:774
+#: WWW/Library/Implementation/HTWAIS.c:772
 msgid "This is a link for searching the "
 msgstr ""
 
-#: WWW/Library/Implementation/HTWAIS.c:778
+#: WWW/Library/Implementation/HTWAIS.c:776
 msgid " WAIS Index.\n"
 msgstr " Indeks WAIS.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:805
+#: WWW/Library/Implementation/HTWAIS.c:803
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
@@ -3236,48 +3268,48 @@ msgstr ""
 "\n"
 "Vnesite ukaz za i,s`kanje in potem doloèite iskalne besede.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:827
+#: WWW/Library/Implementation/HTWAIS.c:825
 msgid " (in "
 msgstr " (v "
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:834
 msgid "WAIS Search of \""
 msgstr "Iskanje z WAIS za \""
 
-#: WWW/Library/Implementation/HTWAIS.c:840
+#: WWW/Library/Implementation/HTWAIS.c:838
 msgid "\" in: "
 msgstr "\" v: "
 
-#: WWW/Library/Implementation/HTWAIS.c:855
+#: WWW/Library/Implementation/HTWAIS.c:853
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: Prevelik zahtevek."
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:862
 msgid "Searching WAIS database..."
 msgstr "Iskanje po zbirki podatkov WAIS..."
 
-#: WWW/Library/Implementation/HTWAIS.c:874
+#: WWW/Library/Implementation/HTWAIS.c:872
 msgid "Search interrupted."
 msgstr "Iskanje prekinjeno."
 
-#: WWW/Library/Implementation/HTWAIS.c:924
+#: WWW/Library/Implementation/HTWAIS.c:922
 msgid "Can't convert format of WAIS document"
 msgstr "Ne moremo pretvoriti formata dokumenta WAIS"
 
-#: WWW/Library/Implementation/HTWAIS.c:968
+#: WWW/Library/Implementation/HTWAIS.c:966
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: Predolg zahtevek."
 
 #.
 #. **	Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:982
+#: WWW/Library/Implementation/HTWAIS.c:980
 msgid "Fetching WAIS document..."
 msgstr "Pobiramo dokument WAIS..."
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1021
+#: WWW/Library/Implementation/HTWAIS.c:1019
 msgid "No text was returned!\n"
 msgstr "Besedilo ni bilo vrnjeno!\n"
 
@@ -3297,167 +3329,161 @@ msgstr " opis"
 msgid "Access links"
 msgstr "Povezave za dostop"
 
-#: WWW/Library/Implementation/HTWSRC.c:345
+#: WWW/Library/Implementation/HTWSRC.c:346
 msgid "Direct access"
 msgstr "Neposredni dostop"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:348
+#: WWW/Library/Implementation/HTWSRC.c:349
 msgid " (or via proxy server, if defined)"
 msgstr " (ali prek stre¾nika proxy, èe je definiran)"
 
-#: WWW/Library/Implementation/HTWSRC.c:363
+#: WWW/Library/Implementation/HTWSRC.c:364
 msgid "Maintainer"
 msgstr "Vzdr¾evalec"
 
-#: WWW/Library/Implementation/HTWSRC.c:371
+#: WWW/Library/Implementation/HTWSRC.c:372
 msgid "Host"
 msgstr "Gostitelj"
 
-#: src/GridText.c:607
+#: src/GridText.c:688
 msgid "Memory exhausted, display interrupted!"
 msgstr "Pomnilnik izèrpan, prikaz prekinjen!"
 
-#: src/GridText.c:612
+#: src/GridText.c:693
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Pomnilnik izèrpan, prekinili bomo prenos!"
 
-#: src/GridText.c:3395
+#: src/GridText.c:3578
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr "*** POMNILNIK IZÈRPAN ***"
 
-#: src/GridText.c:5733 src/GridText.c:5740 src/LYList.c:258
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
 msgid "unknown field or link"
 msgstr "neznano polje ali povezava"
 
-#: src/GridText.c:5749
+#: src/GridText.c:6023
 msgid "text entry field"
 msgstr "tekstovno vnosno polje"
 
-#: src/GridText.c:5752
+#: src/GridText.c:6026
 msgid "password entry field"
 msgstr "vnosno polje za geslo"
 
-#: src/GridText.c:5755
+#: src/GridText.c:6029
 msgid "checkbox"
 msgstr ""
 
-#: src/GridText.c:5758
+#: src/GridText.c:6032
 msgid "radio button"
 msgstr "radijski gumb"
 
-#: src/GridText.c:5761
+#: src/GridText.c:6035
 msgid "submit button"
 msgstr ""
 
-#: src/GridText.c:5764
+#: src/GridText.c:6038
 msgid "reset button"
 msgstr ""
 
-#: src/GridText.c:5767
+#: src/GridText.c:6041
 msgid "popup menu"
 msgstr ""
 
-#: src/GridText.c:5770
+#: src/GridText.c:6044
 msgid "hidden form field"
 msgstr ""
 
-#: src/GridText.c:5773
+#: src/GridText.c:6047
 msgid "text entry area"
 msgstr ""
 
-#: src/GridText.c:5776
+#: src/GridText.c:6050
 msgid "range entry field"
 msgstr ""
 
-#: src/GridText.c:5779
+#: src/GridText.c:6053
 msgid "file entry field"
 msgstr ""
 
-#: src/GridText.c:5782
+#: src/GridText.c:6056
 msgid "text-submit field"
 msgstr ""
 
-#: src/GridText.c:5785
+#: src/GridText.c:6059
 msgid "image-submit button"
 msgstr "gumb za po¹iljanje slike"
 
-#: src/GridText.c:5788
+#: src/GridText.c:6062
 msgid "keygen field"
 msgstr "polje za generiranje kljuèa"
 
-#: src/GridText.c:5791
+#: src/GridText.c:6065
 msgid "unknown form field"
 msgstr ""
 
-#. We can't open the file, what do we do?
-#: src/GridText.c:10348
+#: src/GridText.c:10066
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Ne moremo odpreti izhodne datoteke!  Prekinitev!"
 
-#. We got an error reading the file, what do we do?
-#: src/GridText.c:10359
-msgid "Short read from file, problem?"
-msgstr ""
-
-#: src/GridText.c:10721
+#: src/GridText.c:11218
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:11887
+#: src/GridText.c:12375
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12092
+#: src/GridText.c:12581
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12144
+#: src/GridText.c:12633
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:12591
+#: src/GridText.c:13079
 msgid "Very long lines have been truncated!"
 msgstr ""
 
-#: src/HTAlert.c:155 src/LYShowInfo.c:318
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
 msgid "bytes"
 msgstr "zlogov"
 
-#: src/HTAlert.c:156
+#: src/HTAlert.c:155
 msgid "KB"
 msgstr "KB"
 
-#: src/HTAlert.c:255
+#: src/HTAlert.c:274
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "Prebrano %s od %s podatkov"
 
-#: src/HTAlert.c:257
+#: src/HTAlert.c:276
 #, c-format
 msgid "Read %s of data"
 msgstr "Prebrano %s podatkov"
 
-#: src/HTAlert.c:262
+#: src/HTAlert.c:281
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s/sek."
 
-#: src/HTAlert.c:269
+#: src/HTAlert.c:290
 #, c-format
-msgid " (stalled for %ld sec)"
+msgid " (stalled for %s)"
 msgstr ""
 
-#: src/HTAlert.c:271
-#, c-format
-msgid ", ETA %ld sec"
+#: src/HTAlert.c:294
+#, fuzzy, c-format
+msgid ", ETA %s"
 msgstr ", ETA %ld sek."
 
-#: src/HTAlert.c:277
+#: src/HTAlert.c:301
 msgid " (Press 'z' to abort)"
 msgstr " (Pritisnite ,z` za prenehanje)"
 
@@ -3486,43 +3512,43 @@ msgstr " (Pritisnite ,z` za prenehanje)"
 #. *  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:334
+#: src/HTAlert.c:342 src/HTAlert.c:390
 msgid "yes"
 msgstr "da"
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:345 src/HTAlert.c:391
 msgid "no"
 msgstr "ne"
 
-#: src/HTML.c:6342
+#: src/HTML.c:5985
 msgid "Description:"
 msgstr "Opis:"
 
-#: src/HTML.c:6347
+#: src/HTML.c:5990
 msgid "(none)"
 msgstr "(brez)"
 
-#: src/HTML.c:6351
+#: src/HTML.c:5994
 msgid "Filepath:"
 msgstr "Pot do datoteke:"
 
-#: src/HTML.c:6356
+#: src/HTML.c:5999
 msgid "(unknown)"
 msgstr "(neznana)"
 
-#: src/HTML.c:7804
+#: src/HTML.c:7452
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokument ima le skrite povezave.  Uporabite ukaz ,l` za izpis."
 
-#: src/HTML.c:8328
+#: src/HTML.c:7958
 msgid "Source cache error - disk full?"
 msgstr ""
 
-#: src/HTML.c:8341
+#: src/HTML.c:7971
 msgid "Source cache error - not enough memory!"
 msgstr ""
 
-#: src/LYBookmark.c:166
+#: src/LYBookmark.c:167
 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"
@@ -3530,26 +3556,26 @@ msgid ""
 "     been remapped by you or your system administrator."
 msgstr ""
 
-#: src/LYBookmark.c:382
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
 msgstr ""
 
-#: src/LYBookmark.c:385
+#: src/LYBookmark.c:382
 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 ""
 
-#: src/LYBookmark.c:389
+#: src/LYBookmark.c:386
 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 ""
 
-#: src/LYBookmark.c:392
+#: src/LYBookmark.c:389
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3557,7 +3583,7 @@ msgid ""
 "      Make sure any bookmark link is saved as a single line."
 msgstr ""
 
-#: src/LYBookmark.c:683
+#: src/LYBookmark.c:681
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr ""
@@ -3566,71 +3592,71 @@ msgstr ""
 #. *  Neither the path as given nor any components examined by
 #. *  backing up were stat()able. - kw
 #.
-#: src/LYCgi.c:232
+#: src/LYCgi.c:231
 msgid "Unable to access cgi script"
 msgstr ""
 
-#: src/LYCgi.c:651 src/LYCgi.c:654
+#: src/LYCgi.c:654 src/LYCgi.c:657
 msgid "Good Advice"
 msgstr "Dober nasvet"
 
-#: src/LYCgi.c:657
+#: src/LYCgi.c:660
 msgid "An excellent http server for VMS is available via"
 msgstr "Izvrsten stre¾nik HTTP za VMS je dostopen prek"
 
-#: src/LYCgi.c:664
+#: src/LYCgi.c:667
 msgid "this link"
 msgstr "te povezave"
 
-#: src/LYCgi.c:668
+#: src/LYCgi.c:671
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Ponuja naravnost umetni¹ko podporo za skripte CGI.\n"
 
-#: src/LYClean.c:108
+#: src/LYClean.c:122
 msgid "Exiting via interrupt:"
 msgstr "Zapu¹èamo program prek prekinitve:"
 
-#: src/LYCookie.c:2659
+#: src/LYCookie.c:2462
 msgid "(from a previous session)"
 msgstr "(iz prej¹nje seje)"
 
-#: src/LYCookie.c:2719
+#: src/LYCookie.c:2522
 msgid "Maximum Gobble Date:"
 msgstr ""
 
-#: src/LYCookie.c:2764
+#: src/LYCookie.c:2564
 msgid "Internal"
 msgstr " (notranji)"
 
-#: src/LYCookie.c:2765
+#: src/LYCookie.c:2565
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
-#: src/LYCurses.c:936
+#: src/LYCurses.c:1004
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr ""
 
-#: src/LYCurses.c:1328
+#: src/LYCurses.c:1426
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1332
+#: src/LYCurses.c:1430
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "V tem programu morate uporabljati terminal vt100, 200, ipd."
 
-#: src/LYCurses.c:1384
+#: src/LYCurses.c:1480
 msgid "Your Terminal type is unknown!"
 msgstr "Vrsta va¹ega terminala je neznana!"
 
-#: src/LYCurses.c:1385
+#: src/LYCurses.c:1481
 msgid "Enter a terminal type:"
 msgstr "Vnesite vrsto terminala:"
 
-#: src/LYCurses.c:1398
+#: src/LYCurses.c:1495
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "VRSTA TERMINALA JE NASTAVLJENA NA"
 
-#: src/LYCurses.c:1749
+#: src/LYCurses.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -3639,7 +3665,7 @@ msgstr ""
 "\n"
 "Usodna napaka se je pojavila v %s Ver. %s\n"
 
-#: src/LYCurses.c:1751
+#: src/LYCurses.c:1996
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -3656,136 +3682,161 @@ msgstr ""
 "TCP/IP, podatke TRACEBACK, èe jih je mogoèe zajeti, in vse druge\n"
 "pomembne podatke.\n"
 
-#: src/LYEdit.c:264
+#: src/LYEdit.c:249
 msgid "Editor killed by signal"
 msgstr ""
 
-#: src/LYEdit.c:266
+#: src/LYEdit.c:251
 #, c-format
 msgid "Editor returned with error status, %s"
 msgstr ""
 
-#: src/LYEdit.c:267
+#: src/LYEdit.c:252
 msgid "reason unknown."
 msgstr ""
 
-#: src/LYDownload.c:520
+#: src/LYDownload.c:517
 msgid "Downloaded link:"
 msgstr "Prene¹ena povezava:"
 
-#: src/LYDownload.c:525
+#: src/LYDownload.c:522
 msgid "Suggested file name:"
 msgstr "Predlagano ime datoteke:"
 
-#: src/LYDownload.c:530
+#: src/LYDownload.c:527
 msgid "Standard download options:"
 msgstr "Standardne izbire za jemanje:"
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:528
 msgid "Download options:"
 msgstr "Izbire za jemanje:"
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:544
 msgid "Save to disk"
 msgstr "Shranimo v disk"
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "Ne moremo odpreti zaèasne datoteke!"
+
+#: src/LYDownload.c:565
 msgid "Save to disk disabled."
 msgstr "Shranjevanje v disk onemogoèeno."
 
-#: src/LYDownload.c:551 src/LYPrint.c:1338
+#: src/LYDownload.c:569 src/LYPrint.c:1327
 msgid "Local additions:"
 msgstr "Lokalni dodatki:"
 
-#: src/LYDownload.c:560 src/LYUpload.c:224
+#: src/LYDownload.c:578 src/LYUpload.c:216
 msgid "No Name Given"
 msgstr "Ni podanega imena"
 
-#: src/LYHistory.c:633
+#: src/LYHistory.c:657
 msgid "You selected:"
 msgstr "Izbrali ste:"
 
-#: src/LYHistory.c:657 src/LYHistory.c:905
+#: src/LYHistory.c:681 src/LYHistory.c:921
 msgid "(no address)"
 msgstr "(ni naslova)"
 
-#: src/LYHistory.c:661
+#: src/LYHistory.c:685
 msgid " (internal)"
 msgstr " (notranji)"
 
-#: src/LYHistory.c:663
+#: src/LYHistory.c:687
 msgid " (was internal)"
 msgstr " (je bil notranji)"
 
-#: src/LYHistory.c:761
+#: src/LYHistory.c:785
 msgid " (From History)"
 msgstr " (iz Zgodovine)"
 
-#: src/LYHistory.c:825
+#: src/LYHistory.c:841
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr ""
 
-#: src/LYHistory.c:1124
+#: src/LYHistory.c:1137
 msgid "(No messages yet)"
 msgstr ""
 
-#: src/LYLeaks.c:78
+#: src/LYLeaks.c:209
 msgid "Invalid pointer detected."
 msgstr ""
 
-#: src/LYLeaks.c:80 src/LYLeaks.c:117
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
 msgid "Pointer:"
 msgstr "Kazalec:"
 
-#: src/LYLeaks.c:91 src/LYLeaks.c:98 src/LYLeaks.c:136
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
 msgid "FileName:"
 msgstr "Ime datoteke:"
 
-#: src/LYLeaks.c:94 src/LYLeaks.c:101 src/LYLeaks.c:139 src/LYLeaks.c:150
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
 msgid "LineCount:"
 msgstr ""
 
-#: src/LYLeaks.c:115
+#: src/LYLeaks.c:249
 msgid "Memory leak detected."
 msgstr ""
 
-#: src/LYLeaks.c:120
+#: src/LYLeaks.c:257
 msgid "Contains:"
 msgstr "Vsebuje:"
 
-#: src/LYLeaks.c:133
+#: src/LYLeaks.c:270
 msgid "ByteSize:"
 msgstr "Velikost zlogov:"
 
-#: src/LYLeaks.c:147
+#: src/LYLeaks.c:284
 msgid "realloced:"
 msgstr ""
 
-#: src/LYLeaks.c:170
+#: src/LYLeaks.c:307
 msgid "Total memory leakage this run:"
 msgstr ""
 
-#: src/LYList.c:91
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr ""
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
 msgid "References in "
 msgstr ""
 
-#: src/LYList.c:92
+#: src/LYList.c:86
 msgid "this document:"
 msgstr ""
 
-#: src/LYList.c:98
+#: src/LYList.c:92
 msgid "Visible links:"
 msgstr ""
 
-#: src/LYList.c:199 src/LYList.c:319
+#: src/LYList.c:194 src/LYList.c:315
 msgid "Hidden links:"
 msgstr "Skrite povezave:"
 
-#: src/LYList.c:267
+#: src/LYList.c:262
 msgid "References"
 msgstr "Sklici"
 
-#: src/LYList.c:269
+#: src/LYList.c:264
 msgid "Visible links"
 msgstr "Vidne povezave"
 
@@ -3798,314 +3849,314 @@ msgstr ""
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:383
+#: src/LYLocal.c:366
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr ""
 
 #. error return
-#: src/LYLocal.c:415
+#: src/LYLocal.c:400
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr ""
 
-#: src/LYLocal.c:453
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr ""
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr ""
+
+#: src/LYLocal.c:508
 #, c-format
 msgid "move %s to %s"
 msgstr ""
 
-#: src/LYLocal.c:475
+#: src/LYLocal.c:548
 msgid "There is already a directory with that name!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:477
+#: src/LYLocal.c:550
 msgid "There is already a file with that name!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:479
+#: src/LYLocal.c:552
 msgid "The specified name is already in use!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:490
+#: src/LYLocal.c:563
 msgid "Destination has different owner!  Request denied."
 msgstr ""
 
-#: src/LYLocal.c:493
+#: src/LYLocal.c:566
 msgid "Destination is not a valid directory!  Request denied."
 msgstr ""
 
-#: src/LYLocal.c:516
+#: src/LYLocal.c:588
 msgid "Remove all tagged files and directories?"
 msgstr ""
 
-#: src/LYLocal.c:537
-#, c-format
-msgid "remove %s"
-msgstr ""
-
-#: src/LYLocal.c:580
+#: src/LYLocal.c:647
 msgid "Enter new location for tagged items: "
 msgstr ""
 
-#: src/LYLocal.c:649
+#: src/LYLocal.c:716
 msgid "Path too long"
 msgstr "Predolga pot"
 
-#: src/LYLocal.c:680
+#: src/LYLocal.c:747
 msgid "Source and destination are the same location - request ignored!"
 msgstr ""
 
-#: src/LYLocal.c:738
+#: src/LYLocal.c:805
 msgid "Enter new name for directory: "
 msgstr ""
 
-#: src/LYLocal.c:740
+#: src/LYLocal.c:807
 msgid "Enter new name for file: "
 msgstr ""
 
-#: src/LYLocal.c:751
+#: src/LYLocal.c:819
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:800
+#: src/LYLocal.c:868
 msgid "Enter new location for directory: "
 msgstr ""
 
-#: src/LYLocal.c:802
+#: src/LYLocal.c:874
 msgid "Enter new location for file: "
 msgstr ""
 
-#: src/LYLocal.c:827
+#: src/LYLocal.c:901
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr ""
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:921
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr ""
 
-#: src/LYLocal.c:894
+#: src/LYLocal.c:970
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr ""
 
-#: src/LYLocal.c:896
+#: src/LYLocal.c:972
 msgid "Modify name or location (n or l): "
 msgstr ""
 
 #.
 #. *	Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:925
+#: src/LYLocal.c:1001
 msgid "This feature not yet implemented!"
 msgstr ""
 
-#: src/LYLocal.c:943
+#: src/LYLocal.c:1019
 msgid "Enter name of file to create: "
 msgstr ""
 
-#: src/LYLocal.c:951 src/LYLocal.c:999
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:966
-#, c-format
-msgid "create %s"
-msgstr ""
-
-#: src/LYLocal.c:991
+#: src/LYLocal.c:1061
 msgid "Enter name for new directory: "
 msgstr ""
 
-#: src/LYLocal.c:1042
+#: src/LYLocal.c:1106
 msgid "Create file or directory (f or d): "
 msgstr ""
 
-#: src/LYLocal.c:1083
+#: src/LYLocal.c:1146
 #, c-format
 msgid "Remove '%s' and all of its contents?"
 msgstr ""
 
-#: src/LYLocal.c:1086
+#: src/LYLocal.c:1149
 msgid "Remove directory and all of its contents?"
 msgstr ""
 
-#: src/LYLocal.c:1090
+#: src/LYLocal.c:1153
 #, c-format
 msgid "Remove file '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1092
+#: src/LYLocal.c:1155
 msgid "Remove file?"
 msgstr ""
 
-#: src/LYLocal.c:1097
+#: src/LYLocal.c:1160
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1099
+#: src/LYLocal.c:1162
 msgid "Remove symbolic link?"
 msgstr "Simbolna povezava"
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1248
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr ""
 
-#: src/LYLocal.c:1220
+#: src/LYLocal.c:1278
 msgid "Unable to open permit options file"
 msgstr ""
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1305
 msgid "Specify permissions below:"
 msgstr ""
 
-#: src/LYLocal.c:1248 src/LYShowInfo.c:196
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
 msgid "Owner:"
 msgstr "Lastnik:"
 
-#: src/LYLocal.c:1264
+#: src/LYLocal.c:1322
 msgid "Group"
 msgstr "Skupina"
 
-#: src/LYLocal.c:1280
+#: src/LYLocal.c:1338
 msgid "Others:"
 msgstr "Drugi:"
 
-#: src/LYLocal.c:1298
+#: src/LYLocal.c:1356
 msgid "form to permit"
 msgstr ""
 
-#: src/LYLocal.c:1396
+#: src/LYLocal.c:1452
 msgid "Invalid mode format."
 msgstr ""
 
-#: src/LYLocal.c:1400
+#: src/LYLocal.c:1456
 msgid "Invalid syntax format."
 msgstr ""
 
-#: src/LYLocal.c:1575
-msgid "NULL URL pointer"
+#: src/LYLocal.c:1645
+msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr ""
 
-#: src/LYLocal.c:1670
-msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
 msgstr ""
 
-#: src/LYLocal.c:1782
+#: src/LYLocal.c:1908
 #, c-format
 msgid "Executing %s "
 msgstr "Izvajamo %s "
 
-#: src/LYLocal.c:1785
+#: src/LYLocal.c:1911
 msgid "Executing system command. This might take a while."
 msgstr ""
 
-#: src/LYLocal.c:1831
-msgid "Unable to open file management menu file."
-msgstr ""
-
-#: src/LYLocal.c:1862
+#: src/LYLocal.c:1985
 msgid "Current directory:"
 msgstr "Trenutni imenik:"
 
-#: src/LYLocal.c:1865 src/LYLocal.c:1883
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
 msgid "Current selection:"
 msgstr ""
 
-#: src/LYLocal.c:1869
+#: src/LYLocal.c:1992
 msgid "Nothing currently selected."
 msgstr ""
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged item:"
 msgstr ""
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged items:"
 msgstr ""
 
-#: src/LYLocal.c:1983 src/LYLocal.c:1994
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
 msgid "Illegal filename; request ignored."
 msgstr ""
 
-#: src/LYLocal.c:2137
-msgid "The selected item is not a directory!  Request ignored."
-msgstr ""
-
 #. directory not writable
-#: src/LYLocal.c:2141
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
 msgid "Install in the selected directory not permitted."
 msgstr ""
 
-#: src/LYLocal.c:2146
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:2276
 msgid "Just a moment, ..."
 msgstr ""
 
-#: src/LYLocal.c:2163
+#: src/LYLocal.c:2293
 msgid "Error buiding install args"
 msgstr ""
 
-#: src/LYLocal.c:2178 src/LYLocal.c:2210
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr ""
 
-#: src/LYLocal.c:2188 src/LYLocal.c:2220
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Beremo imenik: %s"
 
-#: src/LYLocal.c:2238
+#: src/LYLocal.c:2362
 msgid "Installation complete"
 msgstr ""
 
-#: src/LYLocal.c:2427
+#: src/LYLocal.c:2551
 msgid "Temporary URL or list would be too long."
 msgstr ""
 
-#: src/LYMail.c:503
+#: src/LYMail.c:534
 msgid "Sending"
 msgstr "Po¹iljamo"
 
-#: src/LYMail.c:989
+#: src/LYMail.c:1024
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "Povezava   %s :?: %s\n"
 
-#: src/LYMail.c:991
+#: src/LYMail.c:1026
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "je klicala \"%s\"\n"
 
-#: src/LYMail.c:992
+#: src/LYMail.c:1027
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "v datoteki \"%s\" je klicana \"%s\"\n"
 
-#: src/LYMail.c:993
+#: src/LYMail.c:1028
 msgid "was requested but was not available."
 msgstr "je bila zahtevana, a ni dostopna."
 
-#: src/LYMail.c:994
+#: src/LYMail.c:1029
 msgid "Thought you might want to know."
 msgstr ""
 
-#: src/LYMail.c:996
+#: src/LYMail.c:1031
 msgid "This message was automatically generated by"
 msgstr ""
 
-#: src/LYMain.c:897
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:969
 msgid "No Winsock found, sorry."
 msgstr "Vtiènica Winsock ¾al ni bila najdena."
 
-#: src/LYMain.c:1103
+#: src/LYMain.c:1170
 msgid "You MUST define a valid TMP or TEMP area!\n"
 msgstr "MORATE nastaviti veljavno podroèje TMP ali TEMP!\n"
 
-#: src/LYMain.c:1156 src/LYMainLoop.c:5117
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
 msgid "No such directory"
 msgstr " imenik"
 
-#: src/LYMain.c:1378
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4116,7 +4167,7 @@ msgstr ""
 "Nastavitvena datoteka %s ni dostopna.\n"
 "\n"
 
-#: src/LYMain.c:1388
+#: src/LYMain.c:1446
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
@@ -4126,7 +4177,7 @@ msgstr ""
 "Nabor znakov za Lynx ni bil doloèen.\n"
 "\n"
 
-#: src/LYMain.c:1417
+#: src/LYMain.c:1475
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
@@ -4136,7 +4187,7 @@ msgstr ""
 "Urejevalna preslikava za Lynx ni bila doloèena.\n"
 "\n"
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1504
 #, c-format
 msgid ""
 "\n"
@@ -4147,58 +4198,58 @@ msgstr ""
 "Datoteka %s za Lynx< ni dostopna.\n"
 "\n"
 
-#: src/LYMain.c:1704
+#: src/LYMain.c:1743
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2247
+#: src/LYMain.c:2293
 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:2477 src/LYMain.c:2525
+#: src/LYMain.c:2540 src/LYMain.c:2588
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3047
-#, c-format
-msgid "%s Version %s (%s)\n"
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
 msgstr "%s Razlièica %s (%s)\n"
 
-#: src/LYMain.c:3072
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Zgrajena na %s %s %s\n"
 
-#: src/LYMain.c:3077
+#: src/LYMain.c:3166
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
 msgstr "Pravice raz¹irjanja imajo Univerza v Kansasu, CERN in drugi sodelavci.\n"
 
-#: src/LYMain.c:3079
+#: src/LYMain.c:3168
 msgid "Distributed under the GNU General Public License.\n"
 msgstr "Raz¹irjano pod Splo¹no licenco GNU.\n"
 
-#: src/LYMain.c:3081
+#: src/LYMain.c:3170
 msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
+"See http://lynx.isc.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
 
-#: src/LYMain.c:3800
+#: src/LYMain.c:3919
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr ""
 
-#: src/LYMain.c:3801
+#: src/LYMain.c:3920
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4191
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:512
+#: src/LYMainLoop.c:539
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr ""
@@ -4206,80 +4257,109 @@ msgstr ""
 #.
 #. * Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:625 src/LYMainLoop.c:5139
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
 msgid "A URL specified by the user"
 msgstr ""
 
-#: src/LYMainLoop.c:1114
+#: src/LYMainLoop.c:1110
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr ""
 
 #.
 #. *  Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3097
+#: src/LYMainLoop.c:3053
 msgid "Help Screen"
 msgstr ""
 
-#: src/LYMainLoop.c:3231
+#: src/LYMainLoop.c:3177
 msgid "System Index"
 msgstr ""
 
-#: src/LYMainLoop.c:3611 src/LYMainLoop.c:5347
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
 msgid "Entry into main screen"
 msgstr ""
 
-#: src/LYMainLoop.c:3897
+#: src/LYMainLoop.c:3824
 msgid "No next document present"
 msgstr ""
 
-#: src/LYMainLoop.c:4206
+#: src/LYMainLoop.c:4131
 msgid "charset for this document specified explicitly, sorry..."
 msgstr ""
 
-#: src/LYMainLoop.c:5093
+#: src/LYMainLoop.c:5004
 msgid "cd to:"
 msgstr " v "
 
-#: src/LYMainLoop.c:5120
+#: src/LYMainLoop.c:5031
 msgid "A component of path is not a directory"
 msgstr ""
 
-#: src/LYMainLoop.c:5123
+#: src/LYMainLoop.c:5034
 msgid "failed to change directory"
 msgstr "Ne moremo dostopati do imenika."
 
-#: src/LYMainLoop.c:6291
+#: src/LYMainLoop.c:6204
 msgid "Reparsing document under current settings..."
 msgstr ""
 
-#: src/LYMainLoop.c:6579 src/LYMainLoop.c:6583
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:7719 src/LYMainLoop.c:7892
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6914
+#, fuzzy
+msgid "Current URL is empty."
+msgstr "Trenutni imenik:"
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr ""
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
 msgid "-index-"
 msgstr " stvarno kazalo"
 
-#: src/LYMainLoop.c:7829
+#: src/LYMainLoop.c:7731
 msgid "lynx: Can't access startfile"
 msgstr ""
 
-#: src/LYMainLoop.c:7842
+#: src/LYMainLoop.c:7744
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr ""
 
-#: src/LYMainLoop.c:7843
+#: src/LYMainLoop.c:7745
 msgid "      Exiting..."
 msgstr ""
 
-#: src/LYMainLoop.c:7886
+#: src/LYMainLoop.c:7788
 msgid "-more-"
 msgstr ""
 
 #. Enable scrolling.
-#: src/LYNews.c:203
+#: src/LYNews.c:187
 msgid "You will be posting to:"
 msgstr ""
 
@@ -4287,7 +4367,7 @@ msgstr ""
 #. *  Get the mail address for the From header,
 #. *  offering personal_mail_address as default.
 #.
-#: src/LYNews.c:212
+#: src/LYNews.c:196
 msgid ""
 "\n"
 "\n"
@@ -4299,14 +4379,14 @@ msgstr ""
 #. *  document's title as the default if this is a
 #. *  followup rather than a new post. - FM
 #.
-#: src/LYNews.c:230
+#: src/LYNews.c:214
 msgid ""
 "\n"
 "\n"
 " Please provide or edit the Subject: header\n"
 msgstr ""
 
-#: src/LYNews.c:322
+#: src/LYNews.c:303
 msgid ""
 "\n"
 "\n"
@@ -4316,100 +4396,119 @@ msgstr ""
 #.
 #. *  Use the built in line editior.
 #.
-#: src/LYNews.c:379
+#: src/LYNews.c:360
 msgid ""
 "\n"
 "\n"
 " Please enter your message below."
 msgstr ""
 
-#: src/LYNews.c:425
+#: src/LYNews.c:406
 msgid "Message has no original text!"
 msgstr ""
 
-#: src/LYOptions.c:743
+#: src/LYOptions.c:746
 msgid "review/edit B)ookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:745
+#: src/LYOptions.c:748
 msgid "B)ookmark file: "
 msgstr ""
 
-#: src/LYOptions.c:2507 src/LYOptions.c:2531
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr ""
 
-#: src/LYOptions.c:3208
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr ""
+
+#: src/LYOptions.c:3261
 msgid "General Preferences"
 msgstr "Sklici"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3212
+#: src/LYOptions.c:3265
 msgid "User mode"
 msgstr ""
 
 #. Editor: INPUT
-#: src/LYOptions.c:3218
+#: src/LYOptions.c:3271
 msgid "Editor"
 msgstr ""
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3223
+#: src/LYOptions.c:3276
 msgid "Type of Search"
 msgstr ""
 
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3229
+#: src/LYOptions.c:3285
 msgid "Cookies"
 msgstr ""
 
-#: src/LYOptions.c:3243
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3247
+#: src/LYOptions.c:3316
 msgid "Keypad mode"
 msgstr ""
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3253
+#: src/LYOptions.c:3322
 msgid "Emacs keys"
 msgstr ""
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3259
+#: src/LYOptions.c:3328
 msgid "VI keys"
 msgstr ""
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3266
+#: src/LYOptions.c:3335
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3278
+#: src/LYOptions.c:3347
 msgid "Keyboard layout"
 msgstr ""
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3291
+#: src/LYOptions.c:3360
 msgid "Display and Character Set"
 msgstr ""
 
 #. ***************************************************************
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3295
+#: src/LYOptions.c:3364
 msgid "Display character set"
 msgstr ""
 
-#: src/LYOptions.c:3324
+#: src/LYOptions.c:3393
 msgid "Assumed document character set"
 msgstr ""
 
@@ -4418,202 +4517,217 @@ msgstr ""
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3344
+#: src/LYOptions.c:3413
 msgid "CJK mode"
 msgstr ""
 
-#: src/LYOptions.c:3346
+#: src/LYOptions.c:3415
 msgid "Raw 8-bit"
 msgstr ""
 
 #. X Display: INPUT
-#: src/LYOptions.c:3354
+#: src/LYOptions.c:3423
 msgid "X Display"
 msgstr ""
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3360
+#: src/LYOptions.c:3429
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:3366
+#: src/LYOptions.c:3435
 msgid "Show color"
 msgstr ""
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3390
+#: src/LYOptions.c:3459
 msgid "Show cursor"
 msgstr ""
 
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr ""
+
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3396
+#: src/LYOptions.c:3473
 msgid "Popups for select fields"
 msgstr ""
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3403
+#: src/LYOptions.c:3479
 msgid "HTML error recovery"
 msgstr ""
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3410
+#: src/LYOptions.c:3485
 msgid "Show images"
 msgstr ""
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3424
+#: src/LYOptions.c:3499
 msgid "Verbose images"
 msgstr ""
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3432
+#: src/LYOptions.c:3507
 msgid "Headers Transferred to Remote Servers"
 msgstr ""
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3436
+#: src/LYOptions.c:3511
 msgid "Personal mail address"
 msgstr ""
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3516
 msgid "Preferred document character set"
 msgstr ""
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3446
+#: src/LYOptions.c:3521
 msgid "Preferred document language"
 msgstr ""
 
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3527
 msgid "User-Agent header"
 msgstr ""
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3460
+#: src/LYOptions.c:3535
 msgid "Listing and Accessing Files"
 msgstr ""
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3464
+#: src/LYOptions.c:3539
 msgid "FTP sort criteria"
 msgstr ""
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3471
+#: src/LYOptions.c:3546
 msgid "Local directory sort criteria"
 msgstr ""
 
-#: src/LYOptions.c:3479
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+#, fuzzy
+msgid "Local directory sort order"
+msgstr "Tega imenika ni mogoèe brati."
+
+#: src/LYOptions.c:3561
 msgid "Show dot files"
 msgstr ""
 
-#: src/LYOptions.c:3487
+#: src/LYOptions.c:3569
 msgid "Execution links"
 msgstr ""
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3507
+#: src/LYOptions.c:3589
 msgid "Show transfer rate"
 msgstr "Prenos podatkov konèan"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3516
+#: src/LYOptions.c:3598
 msgid "Special Files and Screens"
 msgstr ""
 
-#: src/LYOptions.c:3521
+#: src/LYOptions.c:3603
 msgid "Multi-bookmarks"
 msgstr ""
 
-#: src/LYOptions.c:3529
+#: src/LYOptions.c:3611
 msgid "Review/edit Bookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:3531
+#: src/LYOptions.c:3613
 msgid "Goto multi-bookmark menu"
 msgstr ""
 
-#: src/LYOptions.c:3533
+#: src/LYOptions.c:3615
 msgid "Bookmarks file"
 msgstr ""
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3539
+#: src/LYOptions.c:3621
 msgid "Visited Pages"
 msgstr "Stran z obiskanimi povezavami"
 
-#: src/LYPrint.c:959
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr ""
+
+#: src/LYPrint.c:952
 msgid " Print job complete.\n"
 msgstr "Nalaganje nepopolno.\n"
 
-#: src/LYPrint.c:1296
+#: src/LYPrint.c:1281
 msgid "Document:"
 msgstr ""
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1282
 msgid "Number of lines:"
 msgstr "©tevilo vrstic:"
 
-#: src/LYPrint.c:1298
+#: src/LYPrint.c:1283
 msgid "Number of pages:"
 msgstr "©tevilo strani:"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "pages"
 msgstr "strani"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "page"
 msgstr "stran"
 
-#: src/LYPrint.c:1300
+#: src/LYPrint.c:1285
 msgid "(approximately)"
 msgstr "(pribli¾no)"
 
-#: src/LYPrint.c:1305
+#: src/LYPrint.c:1290
 msgid "Some print functions have been disabled!"
 msgstr ""
 
-#: src/LYPrint.c:1309
+#: src/LYPrint.c:1294
 msgid "Standard print options:"
 msgstr ""
 
-#: src/LYPrint.c:1310
+#: src/LYPrint.c:1295
 msgid "Print options:"
 msgstr ""
 
-#: src/LYPrint.c:1316
+#: src/LYPrint.c:1302
 msgid "Save to a local file"
 msgstr ""
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1304
 msgid "Save to disk disabled"
 msgstr ""
 
-#: src/LYPrint.c:1324
+#: src/LYPrint.c:1311
 msgid "Mail the file"
 msgstr ""
 
-#: src/LYPrint.c:1330
+#: src/LYPrint.c:1318
 msgid "Print to the screen"
 msgstr ""
 
-#: src/LYPrint.c:1334
+#: src/LYPrint.c:1323
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr ""
 
-#: src/LYReadCFG.c:340
+#: src/LYReadCFG.c:339
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
 "The line must be of the form:\n"
@@ -4623,76 +4737,76 @@ msgid ""
 "The special strings 'nocolor' or 'default', or\n"
 msgstr ""
 
-#: src/LYReadCFG.c:353
+#: src/LYReadCFG.c:352
 msgid "Offending line:"
 msgstr ""
 
-#: src/LYReadCFG.c:660
+#: src/LYReadCFG.c:638
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:667
+#: src/LYReadCFG.c:645
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:666
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr ""
 
-#: src/LYReadCFG.c:715 src/LYReadCFG.c:728
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:733
+#: src/LYReadCFG.c:711
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr ""
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:816
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr ""
 
-#: src/LYReadCFG.c:840
+#: src/LYReadCFG.c:818
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: src/LYReadCFG.c:1658
+#: src/LYReadCFG.c:1782
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1660
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1661
+#: src/LYReadCFG.c:1785
 #, c-format
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2116 src/LYReadCFG.c:2129 src/LYReadCFG.c:2165
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
 msgid "The following is read from your lynx.cfg file."
 msgstr ""
 
-#: src/LYReadCFG.c:2117 src/LYReadCFG.c:2130
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
 msgid "Please read the distribution"
 msgstr "Prosim, preberite dokumentacijo v distribuciji"
 
-#: src/LYReadCFG.c:2123 src/LYReadCFG.c:2133
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
 msgid "for more comments."
 msgstr "za veè pripomb."
 
-#: src/LYReadCFG.c:2147
+#: src/LYReadCFG.c:2244
 msgid "RELOAD THE CHANGES"
 msgstr ""
 
-#: src/LYReadCFG.c:2156
+#: src/LYReadCFG.c:2253
 msgid "Your primary configuration"
 msgstr ""
 
@@ -4768,7 +4882,7 @@ msgstr ""
 msgid "File that you are currently viewing"
 msgstr ""
 
-#: src/LYShowInfo.c:266 src/LYShowInfo.c:375
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
 msgid "Linkname:"
 msgstr ""
 
@@ -4808,79 +4922,79 @@ msgstr ""
 msgid "Post Data:"
 msgstr ""
 
-#: src/LYShowInfo.c:331
+#: src/LYShowInfo.c:333
 msgid "Post Content Type:"
 msgstr ""
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:342
 msgid "Owner(s):"
 msgstr ""
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "size:"
 msgstr ""
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "lines"
 msgstr ""
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:348
 msgid "mode:"
 msgstr ""
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:350
 msgid "forms mode"
 msgstr ""
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "source"
 msgstr ""
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "normal"
 msgstr ""
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:353
 msgid ", safe"
 msgstr ""
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:354
 msgid ", via internal link"
 msgstr " (je bil notranji)"
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:360
 msgid ", no-cache"
 msgstr ""
 
-#: src/LYShowInfo.c:360
+#: src/LYShowInfo.c:362
 msgid ", ISMAP script"
 msgstr ""
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:364
 msgid ", bookmark file"
 msgstr ""
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:373
 msgid "Link that you currently have selected"
 msgstr ""
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:386
 msgid "Method:"
 msgstr ""
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:391
 msgid "Enctype:"
 msgstr ""
 
-#: src/LYShowInfo.c:401
+#: src/LYShowInfo.c:403
 msgid "(Form field)"
 msgstr ""
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:418
 msgid "No Links on the current page"
 msgstr ""
 
-#: src/LYStyle.c:250
+#: src/LYStyle.c:278
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -4915,44 +5029,48 @@ msgstr ""
 msgid "Unable to upload file."
 msgstr ""
 
-#: src/LYUpload.c:214
+#: src/LYUpload.c:206
 msgid "Upload To:"
 msgstr ""
 
-#: src/LYUpload.c:215
+#: src/LYUpload.c:207
 msgid "Upload options:"
 msgstr ""
 
-#: src/LYUtils.c:3075
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2468
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3915
+#: src/LYUtils.c:3294
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:4217
+#: src/LYUtils.c:3595
 #, fuzzy
 msgid "unknown restriction"
 msgstr "neznano polje ali povezava"
 
-#: src/LYUtils.c:4248
+#: src/LYUtils.c:3626
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:4251
+#: src/LYUtils.c:3629
 msgid "Restrictions set:\n"
 msgstr "Opis:\n"
 
-#: src/LYUtils.c:5601
-msgid "Ignoring invalid HOME"
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
 msgstr ""
 
-#: src/LYrcFile.c:20
+#: src/LYrcFile.c:21
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr ""
 
-#: src/LYrcFile.c:242
+#: src/LYrcFile.c:295
 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"
@@ -4960,21 +5078,21 @@ msgid ""
 "all cookies.\n"
 msgstr ""
 
-#: src/LYrcFile.c:249
+#: src/LYrcFile.c:302
 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 ""
 
-#: src/LYrcFile.c:254
+#: src/LYrcFile.c:307
 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 ""
 
-#: src/LYrcFile.c:259
+#: src/LYrcFile.c:312
 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"
@@ -4983,7 +5101,7 @@ msgid ""
 "Current valid characters sets are:\n"
 msgstr ""
 
-#: src/LYrcFile.c:266
+#: src/LYrcFile.c:319
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -4992,7 +5110,7 @@ msgid ""
 "settings made here.\n"
 msgstr ""
 
-#: src/LYrcFile.c:274
+#: src/LYrcFile.c:327
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/.lynx_cookies.\n"
@@ -5000,7 +5118,7 @@ msgstr ""
 "cookie_file doloèa datoteko, v kateri naj se hranijo obstojni pi¹koti.\n"
 "Privzeta je ~/.lynx_cookies.\n"
 
-#: src/LYrcFile.c:279
+#: src/LYrcFile.c:332
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5011,7 +5129,13 @@ msgid ""
 "querying the user for an invalid path or domain.\n"
 msgstr ""
 
-#: src/LYrcFile.c:292
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:351
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5019,7 +5143,7 @@ msgid ""
 "\"DIRECTORIES_FIRST\" lists directories first.\n"
 msgstr ""
 
-#: src/LYrcFile.c:300
+#: src/LYrcFile.c:359
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5027,7 +5151,7 @@ msgid ""
 "will be enabled.\n"
 msgstr ""
 
-#: src/LYrcFile.c:306
+#: src/LYrcFile.c:365
 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"
@@ -5035,7 +5159,7 @@ msgid ""
 "will be used for sending mail.\n"
 msgstr ""
 
-#: src/LYrcFile.c:312
+#: src/LYrcFile.c:371
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5045,7 +5169,7 @@ msgid ""
 "   BY_DATE     -- sorts on the date of the file\n"
 msgstr ""
 
-#: src/LYrcFile.c:324
+#: src/LYrcFile.c:389
 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"
@@ -5060,7 +5184,7 @@ msgid ""
 "Current lineedit modes are:\n"
 msgstr ""
 
-#: src/LYrcFile.c:339
+#: src/LYrcFile.c:404
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5068,7 +5192,7 @@ msgid ""
 "We start with \"multi_bookmarkB\" since 'A' is the default (see above).\n"
 msgstr ""
 
-#: src/LYrcFile.c:345
+#: src/LYrcFile.c:410
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5079,7 +5203,7 @@ msgid ""
 "your mailed comments.\n"
 msgstr ""
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:419
 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"
@@ -5095,16 +5219,16 @@ msgid ""
 "is also allowed.\n"
 msgstr ""
 
-#: src/LYrcFile.c:368
+#: src/LYrcFile.c:433
 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 it's default language.\n"
+"Otherwise, the server will send the file in its default language.\n"
 msgstr ""
 
-#: src/LYrcFile.c:377
+#: src/LYrcFile.c:442
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5126,7 +5250,7 @@ msgstr ""
 "        bilo nastavljeno na \"on\" le, èe pregledujete zaupen vir\n"
 "        informacij.\n"
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:453
 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"
@@ -5153,7 +5277,7 @@ msgstr ""
 "        pobri¹ejo datoteke ali ogrozijo varnost.  To naj bi bilo\n"
 "        nastavljeno na \"on\" le, èe pregledujete zaupen vir informacij.\n"
 
-#: src/LYrcFile.c:403
+#: src/LYrcFile.c:471
 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"
@@ -5164,7 +5288,7 @@ msgid ""
 "The default can be overridden via the -popup command line toggle.\n"
 msgstr ""
 
-#: src/LYrcFile.c:413
+#: src/LYrcFile.c:481
 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"
@@ -5183,7 +5307,7 @@ msgid ""
 "\"off\" \"show color\" settings will be treated as \"default\".\n"
 msgstr ""
 
-#: src/LYrcFile.c:430
+#: src/LYrcFile.c:498
 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"
@@ -5196,7 +5320,7 @@ msgid ""
 "The default can be overridden via the -show_cursor command line toggle.\n"
 msgstr ""
 
-#: src/LYrcFile.c:441
+#: src/LYrcFile.c:509
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5205,7 +5329,7 @@ msgid ""
 "is disabled, creation of such files via Lynx also is disabled.\n"
 msgstr ""
 
-#: src/LYrcFile.c:452
+#: src/LYrcFile.c:520
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5218,7 +5342,7 @@ msgid ""
 "presented regardless of user mode.\n"
 msgstr ""
 
-#: src/LYrcFile.c:464
+#: src/LYrcFile.c:533
 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"
@@ -5228,14 +5352,14 @@ msgid ""
 "bottom of the screen.\n"
 msgstr ""
 
-#: src/LYrcFile.c:472
+#: src/LYrcFile.c:542
 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 ""
 
-#: src/LYrcFile.c:477
+#: src/LYrcFile.c:547
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5245,13 +5369,13 @@ msgid ""
 "and the keymap display, respectively.\n"
 msgstr ""
 
-#: src/LYrcFile.c:485
+#: src/LYrcFile.c:555
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
 msgstr ""
 
-#: src/LYrcFile.c:693
+#: src/LYrcFile.c:772
 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"
@@ -5262,13 +5386,13 @@ msgid ""
 "regardless of whether numlock is on.\n"
 msgstr ""
 
-#: src/LYrcFile.c:702
+#: src/LYrcFile.c:781
 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 ""
 
-#: src/LYrcFile.c:706
+#: src/LYrcFile.c:785
 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"
@@ -5279,14 +5403,14 @@ msgid ""
 "lists and output from the list command also enumerate form inputs.\n"
 msgstr ""
 
-#: src/LYrcFile.c:715
+#: src/LYrcFile.c:794
 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 ""
 
-#: src/LYrcFile.c:748
+#: src/LYrcFile.c:827
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
diff --git a/gnu/usr.bin/lynx/po/sv.po b/gnu/usr.bin/lynx/po/sv.po
index ce1d86f27f3..6a559bb1993 100644
--- a/gnu/usr.bin/lynx/po/sv.po
+++ b/gnu/usr.bin/lynx/po/sv.po
@@ -1,12 +1,13 @@
 # Swedish translation for Lynx
-# Copyright © 2000, 2001 Free Software Foundation, Inc.
-# Peter Karlsson <peter@softwolves.pp.se>, 2000-2001.
+# Copyright © 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Peter Karlsson <peter@softwolves.pp.se>, 2000-2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.4.pre2\n"
-"POT-Creation-Date: 2001-06-01 18:55-0400\n"
-"PO-Revision-Date: 2001-06-25 21:00+0200\n"
+"Project-Id-Version: lynx 2.8.5pre15\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-0500\n"
+"PO-Revision-Date: 2003-06-07 21:36+0100\n"
 "Last-Translator: Peter Karlsson <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +27,7 @@ msgstr ""
 #. * Links to collections of alternate definitions, developed by the Lynx
 #. * User Community, are maintained in Lynx links:
 #. *
-#. *    http://www.trill-home.com/lynx.html
+#. *    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
@@ -41,1992 +42,1992 @@ msgstr "Varning!: %s"
 msgid "Welcome"
 msgstr "Välkommen"
 
-#: LYMessages.c:31 LYMessages.c:32
+#: LYMessages.c:31
 msgid "Are you sure you want to quit?"
 msgstr "Är du säker att du vill avsluta?"
 
-#: LYMessages.c:34 LYMessages.c:35
+#: LYMessages.c:33
 msgid "Really exit from Lynx?"
 msgstr "Verkligen avsluta Lynx?"
 
-#: LYMessages.c:37
+#: LYMessages.c:35
 msgid "Connection interrupted."
 msgstr "Anslutningen avbröts."
 
-#: LYMessages.c:38
+#: LYMessages.c:36
 msgid "Data transfer interrupted."
 msgstr "Dataöverföringen avbröts."
 
-#: LYMessages.c:39
+#: LYMessages.c:37
 msgid "Cancelled!!!"
 msgstr "Avbruten!!!"
 
-#: LYMessages.c:40
+#: LYMessages.c:38
 msgid "Cancelling!"
 msgstr "Avbryter!"
 
-#: LYMessages.c:41
+#: LYMessages.c:39
 msgid "Excellent!!!"
 msgstr "Underbart!!!"
 
-#: LYMessages.c:42
+#: LYMessages.c:40
 msgid "OK"
 msgstr "OK"
 
-#: LYMessages.c:43
+#: LYMessages.c:41
 msgid "Done!"
 msgstr "Klar!"
 
-#: LYMessages.c:44
+#: LYMessages.c:42
 msgid "Bad request!"
 msgstr "Felaktig förfrågan!"
 
-#: LYMessages.c:45
+#: LYMessages.c:43
 msgid "previous"
 msgstr "föregående"
 
-#: LYMessages.c:46
+#: LYMessages.c:44
 msgid "next screen"
 msgstr "nästa skärm"
 
-#: LYMessages.c:47
+#: LYMessages.c:45
 msgid "HELP!"
 msgstr "HJÄLP!"
 
-#: LYMessages.c:48
+#: LYMessages.c:46
 msgid ", help on "
 msgstr ", hjälp om "
 
 #. #define HELP
-#: LYMessages.c:50
+#: LYMessages.c:48
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr "Kommandon: Piltangenter flyttar, \"?\" ger hjälp, \"q\" avslutar, \"<-\" återgår."
 
 #. #define MOREHELP
-#: LYMessages.c:52
+#: LYMessages.c:50
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr "-- tryck blanksteg för mer, piltangenter flyttar, \"?\" ger hjälp, \"q\" avslutar."
 
-#: LYMessages.c:53
+#: LYMessages.c:51
 msgid "-- press space for next page --"
 msgstr "-- tryck blanksteg för nästa sida --"
 
-#: LYMessages.c:54
+#: LYMessages.c:52
 msgid "URL too long"
 msgstr "Adressen för lång"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:60
+#: LYMessages.c:58
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr "(Textinmatningsfält) Inaktivt. Tryck <Enter> för att aktivera."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:60
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr "(Textfält) Inaktivt. Tryck <Enter> för att aktivera."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:64
+#: LYMessages.c:62
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(Textfält) Inaktivt. Tryck <Enter> för att aktivera (%s för redigeringsprogram)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:64
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(Formulärfält) Inaktivt. Tryck <Enter> för att redigera."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:68
+#: LYMessages.c:66
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr "(Formulärfält) Inaktivt. Tryck <Enter> för att redigera (%s skickar utan cache)."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:68
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
 msgstr "(Formulärfält) Inaktivt. Redigera med <Enter>, två gånger för att skicka."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:72
+#: LYMessages.c:70
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "(e-postformulärfält) Inaktivt. Tryck <Enter> för att ändra."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:74
+#: LYMessages.c:72
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "(Lösenordsinmatningsfält) Inaktivt. Tryck <Enter> för att aktivera."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:77
+#: LYMessages.c:75
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
 msgstr "SKRIVSKYDDAT filinmatningsfält. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:77
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Filinmatningsfält) Ange filnamn. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:81
+#: LYMessages.c:79
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Textinmatningsfält) Ange text. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:83
+#: LYMessages.c:81
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
 msgstr "(Textfält) Ange text. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:85
+#: LYMessages.c:83
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
 msgstr "(Textfält) Ange text. UPP-/NED-pil eller tabb lämnar (%s redigerar med program)."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:87
+#: LYMessages.c:85
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
 msgstr "SKRIVSKYDDAT formulärtextfält. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:87
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(Formulärfält) Ange text. Tryck <Enter> för att skicka."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:91
+#: LYMessages.c:89
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr "(Formulärfält) Ange text. Tryck <Enter> för att skicka (%s förbigår cache)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:93
+#: LYMessages.c:91
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr "(Formulärfält) Ange text. <Enter> skickar, pilar eller tabb lämnar."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:95
+#: LYMessages.c:93
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
 msgstr "SKRIVSKYDDAT formulärfält. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:97
+#: LYMessages.c:95
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr "(e-postformulärfält) Ange text. <Enter> skickar, pilar lämnar."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:99
+#: LYMessages.c:97
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr "(e-postformulärfält) E-post tillåts ej, så du kan inte skicka."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:99
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Lösenordsfält) Ange text. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:101
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
 msgstr "SKRIVSKYDDAT formulärlösenord. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:103
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "(Kryssruta)   Använd högerpil eller <Enter> för att ställa om."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:105
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
 msgstr "SKRIVSKYDDAD kryssruta. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:109
+#: LYMessages.c:107
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr "(Radioknapp)   Använd högerpil eller <Enter> för att ställa om."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:111
+#: LYMessages.c:109
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
 msgstr "SKRIVSKYDDAD radioknapp. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:113
+#: LYMessages.c:111
 msgid "Submit ('x' for no cache) to "
 msgstr "Skicka (\"x\" förbigår cache) till "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:115
+#: LYMessages.c:113
 msgid "Submit to "
 msgstr "Skicka till "
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:117
+#: LYMessages.c:115
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr "(Sändknapp) Använd högerpil eller <Enter> för att skicka (\"x\" förbigår cache)."
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:119
+#: LYMessages.c:117
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(Sändknapp) Använd högerpil eller <Enter> för att skicka."
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:121
+#: LYMessages.c:119
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
 msgstr "INAKTIV sändknapp. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:123
+#: LYMessages.c:121
 msgid "Submit mailto form to "
 msgstr "Skicka e-postformulär till "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:125
+#: LYMessages.c:123
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr "(sändknapp i e-postformulär) Använd högerpil eller <Enter> för att skicka."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:125
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr "(sändknapp i e-postformulär) E-post tillåts ej, så du kan inte skicka."
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:127
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr "(Nollställningsknapp) Använd högerpil eller <Enter> för att återställa förval."
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:129
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
 msgstr "INAKTIV nollställningsknapp. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:131
 msgid "(Option list) Hit return and use arrow keys and return to select option."
 msgstr "(Alternativlista) Tryck Enter och använd pilar och Enter för att välja."
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:133
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
 msgstr "(Vallista) Tryck Enter och använd piltangenter och Enter för att välja."
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:135
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr "SKRIVSKYDDAD alternativlista. Använd Enter och pilar för att visa eller lämna."
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:137
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr "SKRIVSKYDDAD vallista. Använd Enter och piltangenter för att visa eller lämna."
 
-#: LYMessages.c:140
+#: LYMessages.c:138
 msgid "Submitting form..."
 msgstr "Skickar formulär..."
 
-#: LYMessages.c:141
+#: LYMessages.c:139
 msgid "Resetting form..."
 msgstr "Nollställer formulär..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:141
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Hämtar om dokument. Eventuellt formulärinnehåll förkastas!"
 
-#: LYMessages.c:144
+#: LYMessages.c:142
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Varning: Kan inte koda formulärdata i teckenuppsättningen %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:147
+#: LYMessages.c:145
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr "(VANLIG LÄNK)   Använd högerpil eller <Enter> för att aktivera."
 
-#: LYMessages.c:148
+#: LYMessages.c:146
 msgid "The resource requested is not available at this time."
 msgstr "Resursen du begärt är inte tillgänglig just nu."
 
-#: LYMessages.c:149
+#: LYMessages.c:147
 msgid "Enter Lynx keystroke command: "
 msgstr "Ange Lynxtangentkommando: "
 
-#: LYMessages.c:150
+#: LYMessages.c:148
 msgid "Looking up "
 msgstr "Slår upp "
 
-#: LYMessages.c:151
+#: LYMessages.c:149
 #, c-format
 msgid "Getting %s"
 msgstr "Hämtar %s"
 
-#: LYMessages.c:152
+#: LYMessages.c:150
 #, c-format
 msgid "Skipping %s"
 msgstr "Hoppas över %s"
 
-#: LYMessages.c:153
+#: LYMessages.c:151
 #, c-format
 msgid "Using %s"
 msgstr "Använder %s"
 
-#: LYMessages.c:154
+#: LYMessages.c:152
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "Felaktig adress: %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:153
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Trasig adress %s"
 
-#: LYMessages.c:156
+#: LYMessages.c:154
 #, c-format
 msgid "URL: %s"
 msgstr "Adress: %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:155
 msgid "Unable to access WWW file!!!"
 msgstr "Kan inte komma åt webbfil!!!"
 
-#: LYMessages.c:158
+#: LYMessages.c:156
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "Detta är ett sökbart index. Använd %s för att söka."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:160
+#: LYMessages.c:158
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--Mer--  Detta är ett sökbart index. Använd %s för att söka."
 
-#: LYMessages.c:161
+#: LYMessages.c:159
 msgid "You have entered an invalid link number."
 msgstr "Du har angett ett felaktigt länknummer."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:163
+#: LYMessages.c:161
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "Visar dokumentkällkod. Tryck \"\\\" för att återgå till tolkad version."
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:165
+#: LYMessages.c:163
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
 msgstr "  Piltangenter: Upp och ned flyttar. Höger följer länk; vänster återgår.  \n"
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:167
+#: LYMessages.c:165
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
 msgstr " H=Hjälp O=Val P=Utskrift G=Gå M=Huvudskärm Q=Avsluta /=sök Del=Historik \n"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:169
+#: LYMessages.c:167
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
 msgstr "  O=Fler H=Hjälp K=Tangenter G=Gå P=Utskrift M=Huvudskärm O=Val Q=Avsluta \n"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:171
+#: LYMessages.c:169
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr "  O=Fler B=Bakåt E=Redigera D=Hämta ^R=Hämta om ^W=Rita om  sök dokument: / \n"
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:173
+#: LYMessages.c:171
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr "O=Fler  C=Kommentera  Historik: backsteg  Bokmärken: V=Visa A=Nytt R=Ta bort \n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:175
+#: LYMessages.c:173
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr "           Ange text i fältet genom att skriva på tangentbordet              "
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:177
+#: LYMessages.c:175
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr "        Ctrl-U tömmer inmatningsfältet, [Backsteg] tar bort en bokstav       "
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:179
+#: LYMessages.c:177
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
 msgstr "        Ctrl-U tömmer inmatningsfältet, [Backsteg] tar bort en bokstav     "
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:181
+#: LYMessages.c:179
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr "       %s tömmer inmatningsfältet, [Backsteg] tar bort en bokstav        "
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:183
+#: LYMessages.c:181
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
 msgstr "       %s tömmer inmatningsfältet, [Backsteg] tar bort en bokstav      "
 
 #. mailto
-#: LYMessages.c:186
+#: LYMessages.c:184
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "Trasig \"mailto\" i formulär! Avbryter!"
 
-#: LYMessages.c:187
+#: LYMessages.c:185
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Varning!  Kontrollkoder i e-postadress ersatta med frågetecken"
 
-#: LYMessages.c:188
+#: LYMessages.c:186
 msgid "Mail disallowed!  Cannot submit."
 msgstr "E-post tillåts ej! Kan inte skicka."
 
-#: LYMessages.c:189
+#: LYMessages.c:187
 msgid "Mailto form submission failed!"
 msgstr "Misslyckades att skicka e-postformulär!"
 
-#: LYMessages.c:190
+#: LYMessages.c:188
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Insändning av e-postformulär avbruten!!!"
 
-#: LYMessages.c:191
+#: LYMessages.c:189
 msgid "Sending form content..."
 msgstr "Skickar formulärdata..."
 
-#: LYMessages.c:192
+#: LYMessages.c:190
 msgid "No email address is present in mailto URL!"
 msgstr "Ingen e-postadress i \"mailto\"-fältet!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:194
+#: LYMessages.c:192
 msgid "Unable to open temporary file for mailto URL!"
 msgstr "Kan inte öppna temporärfil för \"mailto\"-adress!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:196
+#: LYMessages.c:194
 msgid "Do you wish to include the original message?"
 msgstr "Vill du inkludera originalmeddelandet?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:196
 msgid "Do you wish to include the preparsed source?"
 msgstr "Vill du inkludera den färdigtolkade källkoden?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:200
+#: LYMessages.c:198
 msgid "Spawning your selected editor to edit mail message"
 msgstr "Startar ditt valda textredigeringsprogram för att skriva brevet"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:202
+#: LYMessages.c:200
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr "Fel vid start av textredigeringsprogram, se inställningar i valmenyn"
 
-#: LYMessages.c:203
+#: LYMessages.c:201
 msgid "Send this comment?"
 msgstr "Skicka denna kommentar?"
 
-#: LYMessages.c:204
+#: LYMessages.c:202
 msgid "Send this message?"
 msgstr "Skicka detta meddelande?"
 
-#: LYMessages.c:205
+#: LYMessages.c:203
 msgid "Sending your message..."
 msgstr "Skickar ditt meddelande..."
 
-#: LYMessages.c:206
+#: LYMessages.c:204
 msgid "Sending your comment:"
 msgstr "Skickar din kommentar:"
 
 #. textarea
-#: LYMessages.c:209
+#: LYMessages.c:207
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "Inte i en TEXTAREA; kan inte använda externt redigeringsprogram."
 
-#: LYMessages.c:210
+#: LYMessages.c:208
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "Inte i en TEXTAREA; kan inte använda kommando."
 
-#: LYMessages.c:213
+#: LYMessages.c:211
 msgid "file: ACTIONs are disallowed!"
 msgstr "file:-formulärmål tillåts inte!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:213
 msgid "file: URLs via served links are disallowed!"
 msgstr "file:-adresser i givna adresser tillåts ej!"
 
-#: LYMessages.c:216
+#: LYMessages.c:214
 msgid "Access to local files denied."
 msgstr "Åtkomst till lokala filer nekas."
 
-#: LYMessages.c:217
+#: LYMessages.c:215
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "file:-adresser i bokmärken tillåts ej!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:217
 msgid "This special URL is not allowed in external documents!"
 msgstr "Denna specialadress tillåts ej i externa dokument!"
 
-#: LYMessages.c:220
+#: LYMessages.c:218
 msgid "Press <return> to return to Lynx."
 msgstr "Tryck <Enter> för att återgå till Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:221
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "Startar DCL-underprocess. Använd \"logout\" för att återgå till Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:225
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "Skriv EXIT för att återgå till Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:228
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr "Startar ditt valda skal. Skriv \"exit\" för att återgå till Lynx.\n"
 
-#: LYMessages.c:233
+#: LYMessages.c:231
 msgid "Spawning is currently disabled."
 msgstr "Start av externa program tillåts ej just nu."
 
-#: LYMessages.c:234
+#: LYMessages.c:232
 msgid "The 'd'ownload command is currently disabled."
 msgstr "Hämtningskommandot (\"d\") tillåts ej just nu."
 
-#: LYMessages.c:235
+#: LYMessages.c:233
 msgid "You cannot download an input field."
 msgstr "Du kan inte hämta ett indatafält."
 
-#: LYMessages.c:236
+#: LYMessages.c:234
 msgid "Form has a mailto action!  Cannot download."
 msgstr "Detta är ett e-postformulär! Kan inte hämta."
 
-#: LYMessages.c:237
+#: LYMessages.c:235
 msgid "You cannot download a mailto: link."
 msgstr "Du kan inte hämta en mailto:-länk."
 
-#: LYMessages.c:238
+#: LYMessages.c:236
 msgid "You cannot download cookies."
 msgstr "Du kan inte hämta kakor."
 
-#: LYMessages.c:239
+#: LYMessages.c:237
 msgid "You cannot download a printing option."
 msgstr "Du kan inte hämta ett utskriftsval."
 
-#: LYMessages.c:240
+#: LYMessages.c:238
 msgid "You cannot download an upload option."
 msgstr "Du kan inte hämta ett sändningsalternativ."
 
-#: LYMessages.c:241
+#: LYMessages.c:239
 msgid "You cannot download an permit option."
 msgstr "Du kan inte hämta en inställning."
 
-#: LYMessages.c:242
+#: LYMessages.c:240
 msgid "This special URL cannot be downloaded!"
 msgstr "Denna specialadress kan inte hämtas!"
 
-#: LYMessages.c:243
+#: LYMessages.c:241
 msgid "Nothing to download."
 msgstr "Inget att hämta."
 
-#: LYMessages.c:244
+#: LYMessages.c:242
 msgid "Trace ON!"
 msgstr "Spårning AKTIV!"
 
-#: LYMessages.c:245
+#: LYMessages.c:243
 msgid "Trace OFF!"
 msgstr "Spårning INAKTIV!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:245
 msgid "Links will be included for all images!  Reloading..."
 msgstr "Länkar skapas för alla bilder! Hämtar om..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:247
 msgid "Standard image handling restored!  Reloading..."
 msgstr "Normal bildhantering återställd! Hämtar om..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:249
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr "\"Pseudo-ALT\" sätts in för bilder som saknar ALT-strängar! Hämtar om..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:251
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "Bilder utan ALT-strängar ignoreras! Hämtar om..."
 
-#: LYMessages.c:254
+#: LYMessages.c:252
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Rått 8-bitars- eller CJK-läge AV! Hämtar om..."
 
-#: LYMessages.c:255
+#: LYMessages.c:253
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "Rått 8-bitars- eller CJK-läge PÅ! Hämtar om..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:255
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "Sänd \"HEAD\" för D=dokument eller L=länk; C=Avbryt? (d,l,c): "
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:257
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "Sänd \"HEAD\" för D=dokument; C=Avbryt? (d,c): "
 
-#: LYMessages.c:260
+#: LYMessages.c:258
 msgid "Sorry, the document is not an http URL."
 msgstr "Tyvärr, dokumentet har inte en http-adress."
 
-#: LYMessages.c:261
+#: LYMessages.c:259
 msgid "Sorry, the link is not an http URL."
 msgstr "Tyvärr, länken har inte en http-adress."
 
-#: LYMessages.c:262
+#: LYMessages.c:260
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "Tyvärr, formulärmålet detta formulär är avstängt."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:262
 msgid "Sorry, the ACTION for this form is not an http URL."
 msgstr "Tyvärr, formulärmålet för detta formulär är inte en http-adress."
 
-#: LYMessages.c:265
+#: LYMessages.c:263
 msgid "Not an http URL or form ACTION!"
 msgstr "Inte en http-adress eller formulärmål!"
 
-#: LYMessages.c:266
+#: LYMessages.c:264
 msgid "This special URL cannot be a form ACTION!"
 msgstr "Denna speciella adress kan inte vara formulärmål!"
 
-#: LYMessages.c:267
+#: LYMessages.c:265
 msgid "URL is not in starting realm!"
 msgstr "Adressen är inte i startmängden!"
 
-#: LYMessages.c:268
+#: LYMessages.c:266
 msgid "News posting is disabled!"
 msgstr "Postning av artiklar deaktiverad!"
 
-#: LYMessages.c:269
+#: LYMessages.c:267
 msgid "File management support is disabled!"
 msgstr "Filhanteringsstödet är deaktiverat!"
 
-#: LYMessages.c:270
+#: LYMessages.c:268
 msgid "No jump file is currently available."
 msgstr "Ingen hoppfil finns just nu att tillgå."
 
-#: LYMessages.c:271
+#: LYMessages.c:269
 msgid "Jump to (use '?' for list): "
 msgstr "Hoppa till (\"?\"=lista): "
 
-#: LYMessages.c:272
+#: LYMessages.c:270
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr "Hopp till genvägsadress ej tillåtet!"
 
-#: LYMessages.c:273
+#: LYMessages.c:271
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "Slumpmässig adress ej tillåten! Använd en genväg."
 
-#: LYMessages.c:274
+#: LYMessages.c:272
 msgid "No random URLs have been used thus far."
 msgstr "Inga slumpmässiga adresser har ännu används."
 
-#: LYMessages.c:275
+#: LYMessages.c:273
 msgid "Bookmark features are currently disabled."
 msgstr "Bomärkesfunktionerna är just nu deaktiverade."
 
-#: LYMessages.c:276
+#: LYMessages.c:274
 msgid "Execution via bookmarks is disabled."
 msgstr "Programkörning via bokmärken är deaktiverat."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:276
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "Bokmärkesfil ej definierad. Använd %s för att se alternativ."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:278
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "Kan inte öppna temporärfil för konvertering av X Mosaics bokmärken."
 
-#: LYMessages.c:281
+#: LYMessages.c:279
 msgid "ERROR - unable to open bookmark file."
 msgstr "FEL - kan inte öppna bokmärkesfil."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:281
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "Kan inte öppna bokmärkesfil för borttagning av länk."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:283
 msgid "Unable to open scratch file for deletion of link."
 msgstr "Kan inte öppna skräpfil för borttagning av länk."
 
-#: LYMessages.c:287
+#: LYMessages.c:285
 msgid "Error renaming scratch file."
 msgstr "Fel vid namnändring av skräpfil."
 
-#: LYMessages.c:289
+#: LYMessages.c:287
 msgid "Error renaming temporary file."
 msgstr "Fel vid namnändring av temporärfil."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:289
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "Kan inte kopiera temporärfil för borttagning av länk."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:291
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "Kan inte återöppna temporärfil för borttagning av länk."
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:294
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "Länk är inte själv helt på en rad i bokmärkesfilen."
 
-#: LYMessages.c:297
+#: LYMessages.c:295
 msgid "Bookmark deletion failed."
 msgstr "Borttagning av bokmärke misslyckades."
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:297
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr "Bokmärkesfiler kan inte traverseras (endast http-adresser)."
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:299
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "Kan inte öppna bokmärkesfil, använd 'a' för att spara en länk först"
 
-#: LYMessages.c:302
+#: LYMessages.c:300
 msgid "There are no links in this bookmark file!"
 msgstr "Det finns inga länkar i denna bokmärkesfil!"
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:302
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr "Spara D)okument eller L)änk till bokmärkesfil? C=Avbryt (d,l,c): "
 
-#: LYMessages.c:305
+#: LYMessages.c:303
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "Spara D)okument till bokmärkesfil? C=Avbryt (d,c): "
 
-#: LYMessages.c:306
+#: LYMessages.c:304
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "Spara L)änk till bokmärkesfil? C=Avbryt (l,c): "
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:308
+#: LYMessages.c:306
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr "Dokument från \"POST\"-formulär kan inte lagras som bokmärken."
 
-#: LYMessages.c:309
+#: LYMessages.c:307
 msgid "Cannot save form fields/links"
 msgstr "Kan inte spara formulärfält/länkar"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:311
+#: LYMessages.c:309
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "Historik, \"showinfo\", menyer och listfiler kan inte lagras som bokmärken."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:313
+#: LYMessages.c:311
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Vill du verkligen ta bort denna länk från din bokmärkesfil?"
 
-#: LYMessages.c:314
+#: LYMessages.c:312
 msgid "Malformed address."
 msgstr "Trasig adress."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:316
+#: LYMessages.c:314
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "Historisk tolkning av kommentarer PÅ (minimal undertryckt)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:318
+#: LYMessages.c:316
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "Historisk tolkning av kommentarer AV (minmal aktiv)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:320
+#: LYMessages.c:318
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "Historisk tolkning av kommentarer PÅ (korrekt undertryckt)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:322
+#: LYMessages.c:320
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "Historisk tolkning av kommentarer AV (korrekt aktiv)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:324
+#: LYMessages.c:322
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "Minimal tolkning av kommentarer PÅ (och aktiv)!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:324
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "Minimal tolkning av kommentarer AV (korrekt aktiv)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:328
+#: LYMessages.c:326
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "Minimal tolkning av kommentarer PÅ (men historisk aktiv)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:330
+#: LYMessages.c:328
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "Minimal tolkning av kommentarer AV (historisk aktiv)!"
 
-#: LYMessages.c:331
+#: LYMessages.c:329
 msgid "Soft double-quote parsing ON!"
 msgstr "Mjuk citationsteckenstolkning PÅ!"
 
-#: LYMessages.c:332
+#: LYMessages.c:330
 msgid "Soft double-quote parsing OFF!"
 msgstr "Mjuk citationsteckenstolkning AV!"
 
-#: LYMessages.c:333
+#: LYMessages.c:331
 msgid "Now using TagSoup parsing of HTML."
 msgstr "Tolkar nu HTML enligt \"TagSoup\"-modellen."
 
-#: LYMessages.c:334
+#: LYMessages.c:332
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "Tolkar nu HTML enligt \"SortaSGML\"-modellen."
 
-#: LYMessages.c:335
+#: LYMessages.c:333
 msgid "You are already at the end of this document."
 msgstr "Du är redan i slutet av dokumentet."
 
-#: LYMessages.c:336
+#: LYMessages.c:334
 msgid "You are already at the beginning of this document."
 msgstr "Du är redan i början av dokumentet."
 
-#: LYMessages.c:337
+#: LYMessages.c:335
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "Du är redan på sida %d av dokumentet."
 
-#: LYMessages.c:338
+#: LYMessages.c:336
 #, c-format
 msgid "Link number %d already is current."
 msgstr "Länk nummer %d är redan nuvarande."
 
-#: LYMessages.c:339
+#: LYMessages.c:337
 msgid "You are already at the first document"
 msgstr "Du är redan i det första dokumentet."
 
-#: LYMessages.c:340
+#: LYMessages.c:338
 msgid "There are no links above this line of the document."
 msgstr "Det finns inga länkar över denna rad i dokumentet."
 
-#: LYMessages.c:341
+#: LYMessages.c:339
 msgid "There are no links below this line of the document."
 msgstr "Det finns inga länkar nedanför denna rad i dokumentet."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:343
+#: LYMessages.c:341
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "Maximal längd nådd! Ta bort text eller lämna fältet."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:345
+#: LYMessages.c:343
 msgid "You are not on a form submission button or normal link."
 msgstr "Du är inte på en formulärsändknapp eller normal länk."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:347
+#: LYMessages.c:345
 msgid "One radio button must be checked at all times!"
 msgstr "En radioknapp måste alltid vara markerad!"
 
-#: LYMessages.c:348
+#: LYMessages.c:346
 msgid "No submit button for this form, submit single text field?"
 msgstr "Ingen insändningsknapp i formuläret, skicka ensamt textfält?"
 
-#: LYMessages.c:349
+#: LYMessages.c:347
 msgid "Do you want to go back to the previous document?"
 msgstr "Vill du gå tillbaka till föregående dokument?"
 
-#: LYMessages.c:350
+#: LYMessages.c:348
 msgid "Use arrows or tab to move off of field."
 msgstr "Använd pilar eller tabb för att lämna."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:352
+#: LYMessages.c:350
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "Ange text. Använd pilar eller tabb för att lämna."
 
-#: LYMessages.c:353
+#: LYMessages.c:351
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** Trasig HTML!! Inget formulärmål angivet. **"
 
-#: LYMessages.c:354
+#: LYMessages.c:352
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "Trasig HTML!! Kan inte skapa popupfönster!"
 
-#: LYMessages.c:355
+#: LYMessages.c:353
 msgid "Unable to create popup window!"
 msgstr "Kan inte skapa popupfönster!"
 
-#: LYMessages.c:356
+#: LYMessages.c:354
 msgid "Goto a random URL is disallowed!"
 msgstr "Slumpmässig adress ej tillåten!"
 
-#: LYMessages.c:357
+#: LYMessages.c:355
 msgid "Goto a non-http URL is disallowed!"
 msgstr "Icke-http-adress ej tillåten!"
 
-#: LYMessages.c:358
+#: LYMessages.c:356
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "Du tillåts inte gå till \"%s\"-adresser"
 
-#: LYMessages.c:359
+#: LYMessages.c:357
 msgid "URL to open: "
 msgstr "Adress att öppna: "
 
-#: LYMessages.c:360
+#: LYMessages.c:358
 msgid "Edit the current Goto URL: "
 msgstr "Redigera aktuell gåadress: "
 
-#: LYMessages.c:361
+#: LYMessages.c:359
 msgid "Edit the previous Goto URL: "
 msgstr "Redigera föregående gåadress: "
 
-#: LYMessages.c:362
+#: LYMessages.c:360
 msgid "Edit a previous Goto URL: "
 msgstr "Redigera en tidigare gåadress: "
 
-#: LYMessages.c:363
+#: LYMessages.c:361
 msgid "Current document has POST data."
 msgstr "Aktuellt dokument har \"POST\"-data."
 
-#: LYMessages.c:364
+#: LYMessages.c:362
 msgid "Edit this document's URL: "
 msgstr "Redigera dokumentets adress: "
 
-#: LYMessages.c:365
+#: LYMessages.c:363
 msgid "Edit the current link's URL: "
 msgstr "Redigera aktull länkadress: "
 
-#: LYMessages.c:366
+#: LYMessages.c:364
 msgid "You cannot edit File Management URLs"
 msgstr "Du kan inte redigera filhanteringsadresser"
 
-#: LYMessages.c:367
+#: LYMessages.c:365
 msgid "Enter a database query: "
 msgstr "Ange en databasfråga: "
 
-#: LYMessages.c:368
+#: LYMessages.c:366
 msgid "Enter a whereis query: "
 msgstr "Ange en \"whereis\"-fråga: "
 
-#: LYMessages.c:369
+#: LYMessages.c:367
 msgid "Edit the current query: "
 msgstr "Redigera aktuell fråga: "
 
-#: LYMessages.c:370
+#: LYMessages.c:368
 msgid "Edit the previous query: "
 msgstr "Redigera föregående fråga: "
 
-#: LYMessages.c:371
+#: LYMessages.c:369
 msgid "Edit a previous query: "
 msgstr "Redigera en tidigare fråga: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:373
+#: LYMessages.c:371
 msgid "Use Control-R to resubmit the current query."
 msgstr "Använd Control-R för att skicka frågan på nytt."
 
-#: LYMessages.c:374
+#: LYMessages.c:372
 msgid "Edit the current shortcut: "
 msgstr "Redigera aktuell genväg: "
 
-#: LYMessages.c:375
+#: LYMessages.c:373
 msgid "Edit the previous shortcut: "
 msgstr "Redigera föregående genväg: "
 
-#: LYMessages.c:376
+#: LYMessages.c:374
 msgid "Edit a previous shortcut: "
 msgstr "Redigera en tidigare genväg:"
 
-#: LYMessages.c:377
+#: LYMessages.c:375
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "Tangenten \"%c\" är inte kopplad till en hoppfil!"
 
-#: LYMessages.c:378
+#: LYMessages.c:376
 msgid "Cannot locate jump file!"
 msgstr "Kan inte lokalisera hoppfil!"
 
-#: LYMessages.c:379
+#: LYMessages.c:377
 msgid "Cannot open jump file!"
 msgstr "Kan inte öppna hoppfil!"
 
-#: LYMessages.c:380
+#: LYMessages.c:378
 msgid "Error reading jump file!"
 msgstr "Fel vid läsning av hoppfil!"
 
-#: LYMessages.c:381
+#: LYMessages.c:379
 msgid "Out of memory reading jump file!"
 msgstr "Slut på minne vid läsning av hoppfil!"
 
-#: LYMessages.c:382
+#: LYMessages.c:380
 msgid "Out of memory reading jump table!"
 msgstr "Slut på minne vid läsning av hopptabell!"
 
-#: LYMessages.c:383
+#: LYMessages.c:381
 msgid "No index is currently available."
 msgstr "Inget index är tillgängligt."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:385
+#: LYMessages.c:383
 msgid "Do you really want to go to the Main screen?"
 msgstr "Vill du verkligen gå till huvudskärmen?"
 
-#: LYMessages.c:386
+#: LYMessages.c:384
 msgid "You are already at main screen!"
 msgstr "Du är redan på huvudskärmen!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:388
+#: LYMessages.c:386
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "Inte ett sökbart index -- tryck \"/\" för att söka efter en textsträng"
 
 #. #define NO_OWNER
-#: LYMessages.c:390
+#: LYMessages.c:388
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "Ingen ägare är angiven för denna fil, så du kan inte skicka en kommentar"
 
-#: LYMessages.c:391
+#: LYMessages.c:389
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Ingen ägaren är angiven. Använda %s?"
 
-#: LYMessages.c:392
+#: LYMessages.c:390
 msgid "Do you wish to send a comment?"
 msgstr "Vill du skicka en kommentar?"
 
-#: LYMessages.c:393
+#: LYMessages.c:391
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "E-post tillåts ej, så du kan inte skicka en kommentar"
 
-#: LYMessages.c:394
+#: LYMessages.c:392
 msgid "The 'e'dit command is currently disabled."
 msgstr "Redigeringskommandot är just nu deaktiverat."
 
-#: LYMessages.c:395
+#: LYMessages.c:393
 msgid "External editing is currently disabled."
 msgstr "Extern redigering är just nu deaktiverad."
 
-#: LYMessages.c:396
+#: LYMessages.c:394
 msgid "System error - failure to get status."
 msgstr "Systemfel - kunde inte hämta status."
 
-#: LYMessages.c:397
+#: LYMessages.c:395
 msgid "No editor is defined!"
 msgstr "Inget textredigeringsprogram har angivits!"
 
-#: LYMessages.c:398
+#: LYMessages.c:396
 msgid "The 'p'rint command is currently disabled."
 msgstr "Utskriftskommandot är just nu deaktiverat."
 
-#: LYMessages.c:399
+#: LYMessages.c:397
 msgid "Document has no Toolbar links or Banner."
 msgstr "Dokumentet har varken verktygsradslänkar eller baner."
 
-#: LYMessages.c:400
+#: LYMessages.c:398
 msgid "Unable to open traversal file."
 msgstr "Kan inte öppna traverseringsfil."
 
-#: LYMessages.c:401
+#: LYMessages.c:399
 msgid "Unable to open traversal found file."
 msgstr "Kan inte öppna traverseringens resultatfil."
 
-#: LYMessages.c:402
+#: LYMessages.c:400
 msgid "Unable to open reject file."
 msgstr "Kan inte öppna avvisningsfilen."
 
-#: LYMessages.c:403
+#: LYMessages.c:401
 msgid "Unable to open traversal errors output file"
 msgstr "Kan inte öppna traverseringens felfil."
 
-#: LYMessages.c:404
+#: LYMessages.c:402
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "TRAVERSERINGEN AVBRÖTS"
 
-#: LYMessages.c:405
+#: LYMessages.c:403
 msgid "Follow link (or goto link or page) number: "
 msgstr "Följ länk (eller gå till länk eller sida) nummer: "
 
-#: LYMessages.c:406
+#: LYMessages.c:404
 msgid "Select option (or page) number: "
 msgstr "Välj val- (eller sid-)nummer: "
 
-#: LYMessages.c:407
+#: LYMessages.c:405
 #, c-format
 msgid "Option number %d already is current."
 msgstr "Alternativ %d är redan markerat."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:409
+#: LYMessages.c:407
 msgid "You are already at the end of this option list."
 msgstr "Du är redan i slutet av alternativlistan."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:411
+#: LYMessages.c:409
 msgid "You are already at the beginning of this option list."
 msgstr "Du är redan i början av alternativlistan."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:413
+#: LYMessages.c:411
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "Du är redan på sida %d i alternativlistan."
 
-#: LYMessages.c:414
+#: LYMessages.c:412
 msgid "You have entered an invalid option number."
 msgstr "Du har angett ett felaktigt alternativnummer."
 
-#: LYMessages.c:415
+#: LYMessages.c:413
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** Trasig HTML!! Använd -trace för att diagnostisera. **"
 
-#: LYMessages.c:416
+#: LYMessages.c:414
 msgid "Give name of file to save in"
 msgstr "Ange filnamn att spara till"
 
-#: LYMessages.c:417
+#: LYMessages.c:415
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "Kan inte spara data till fil -- kör lokal webbläsare"
 
-#: LYMessages.c:418
+#: LYMessages.c:416
 msgid "Can't open temporary file!"
 msgstr "Kan inte öppna temporärfil!"
 
-#: LYMessages.c:419
+#: LYMessages.c:417
 msgid "Can't open output file!  Cancelling!"
 msgstr "Kan inte öppna utdatafil! Avbryter!"
 
-#: LYMessages.c:420
+#: LYMessages.c:418
 msgid "Execution is disabled."
 msgstr "Programkörning deaktiverad."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:422
+#: LYMessages.c:420
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "Programkörning inte aktiverad för denna fil. Se alternativmeny (använd %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:424
+#: LYMessages.c:422
 msgid "Execution capabilities are not compiled into this version."
 msgstr "Programkörningsmöjligheter inte inkompilerade i denna version."
 
-#: LYMessages.c:425
+#: LYMessages.c:423
 msgid "This file cannot be displayed on this terminal."
 msgstr "Denna fil kan inte visas på terminalen."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:427
+#: LYMessages.c:425
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "Denna fil kan inte visas på terminalen. D=Hämta, C=Avbryt"
 
-#: LYMessages.c:428
+#: LYMessages.c:426
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D=Hämta, C=Avbryt"
 
-#: LYMessages.c:429
+#: LYMessages.c:427
 msgid "Cancelling file."
 msgstr "Avbryter fil."
 
-#: LYMessages.c:430
+#: LYMessages.c:428
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "Hämtar fil. - VÄNLIGEN VÄNTA -"
 
-#: LYMessages.c:431
+#: LYMessages.c:429
 msgid "Enter a filename: "
 msgstr "Ange ett filnamn: "
 
-#: LYMessages.c:432
+#: LYMessages.c:430
 msgid "Edit the previous filename: "
 msgstr "Redigera föregående filnamn: "
 
-#: LYMessages.c:433
+#: LYMessages.c:431
 msgid "Edit a previous filename: "
 msgstr "Redigera ett tidigare filnamn: "
 
-#: LYMessages.c:434
+#: LYMessages.c:432
 msgid "Enter a new filename: "
 msgstr "Ange ett nytt filnamn: "
 
-#: LYMessages.c:435
+#: LYMessages.c:433
 msgid "File name may not begin with a dot."
 msgstr "Filnamnet får inte börja med en punkt."
 
-#: LYMessages.c:437
+#: LYMessages.c:435
 msgid "File exists.  Create higher version?"
 msgstr "Filen existerar. Skapa en högre version?"
 
-#: LYMessages.c:439
+#: LYMessages.c:437
 msgid "File exists.  Overwrite?"
 msgstr "Filen existerar. Skriva över?"
 
-#: LYMessages.c:441
+#: LYMessages.c:439
 msgid "Cannot write to file."
 msgstr "Kan inte skriva till fil."
 
-#: LYMessages.c:442
+#: LYMessages.c:440
 msgid "ERROR! - download command is misconfigured."
 msgstr "FEL! - hämtkommandot är felkonfigurerat."
 
-#: LYMessages.c:443
+#: LYMessages.c:441
 msgid "Unable to download file."
 msgstr "Kan inte hämta fil."
 
-#: LYMessages.c:444
+#: LYMessages.c:442
 msgid "Reading directory..."
 msgstr "Läser katalog..."
 
-#: LYMessages.c:445
+#: LYMessages.c:443
 msgid "Building directory listing..."
 msgstr "Bygger kataloglista..."
 
-#: LYMessages.c:446
+#: LYMessages.c:444
 msgid "Saving..."
 msgstr "Sparar..."
 
-#: LYMessages.c:447
+#: LYMessages.c:445
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Kan inte redigera filen \"%s\"."
 
-#: LYMessages.c:448
+#: LYMessages.c:446
 msgid "Unable to access document!"
 msgstr "Kan inte komma åt dokument!"
 
-#: LYMessages.c:449
+#: LYMessages.c:447
 msgid "Could not access file."
 msgstr "Kan inte komma åt fil."
 
-#: LYMessages.c:450
+#: LYMessages.c:448
 msgid "Could not access directory."
 msgstr "Kan inte komma åt katalog."
 
-#: LYMessages.c:451
+#: LYMessages.c:449
 msgid "Could not load data."
 msgstr "Kan inte läsa in data."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:453
+#: LYMessages.c:451
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "Lynx kan ännu inte redigera fjärrwebbfiler."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:455
+#: LYMessages.c:453
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "Detta fält kan inte redigeras med en extern redigerare."
 
-#: LYMessages.c:456
+#: LYMessages.c:454
 msgid "Bad rule"
 msgstr "Felaktig regel"
 
-#: LYMessages.c:457
+#: LYMessages.c:455
 msgid "Insufficient operands:"
 msgstr "Otillräckliga operander:"
 
-#: LYMessages.c:458
+#: LYMessages.c:456
 msgid "You are not authorized to edit this file."
 msgstr "Du har inte rättighet att redigera filen."
 
-#: LYMessages.c:459
+#: LYMessages.c:457
 msgid "Title: "
 msgstr "Titel: "
 
-#: LYMessages.c:460
+#: LYMessages.c:458
 msgid "Subject: "
 msgstr "Ärende: "
 
-#: LYMessages.c:461
+#: LYMessages.c:459
 msgid "Username: "
 msgstr "Användar-id: "
 
-#: LYMessages.c:462
+#: LYMessages.c:460
 msgid "Password: "
 msgstr "Lösenord: "
 
-#: LYMessages.c:463
+#: LYMessages.c:461
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: Användar-id och lösenord krävs!!!"
 
-#: LYMessages.c:464
+#: LYMessages.c:462
 msgid "lynx: Password required!!!"
 msgstr "lynx: Lösenord krävs!!!"
 
-#: LYMessages.c:465
+#: LYMessages.c:463
 msgid "Clear all authorization info for this session?"
 msgstr "Rensa all auktoriseringsinformation från denna session?"
 
-#: LYMessages.c:466
+#: LYMessages.c:464
 msgid "Authorization info cleared."
 msgstr "Auktoriseringsinformation rensad."
 
-#: LYMessages.c:467
+#: LYMessages.c:465
 msgid "Authorization failed.  Retry?"
 msgstr "Auktorisering misslyckades. Försök igen?"
 
-#: LYMessages.c:468
+#: LYMessages.c:466
 msgid "cgi support has been disabled."
 msgstr "cgi-stöd har deaktiverats."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:470
+#: LYMessages.c:468
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "Lynxcgi-stöd är inte inkompilerade i denna version."
 
-#: LYMessages.c:471
+#: LYMessages.c:469
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Tyvärr, kan inte konvertera %s till %s."
 
-#: LYMessages.c:472
+#: LYMessages.c:470
 msgid "Unable to set up connection."
 msgstr "Kan inte ställa in anslutning."
 
-#: LYMessages.c:473
+#: LYMessages.c:471
 msgid "Unable to make connection"
 msgstr "Kan inte skapa anslutning"
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:475
+#: LYMessages.c:473
 msgid "Executable link rejected due to malformed request."
 msgstr "Körbar länk förkastad på grund av trasig förfrågan."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:477
+#: LYMessages.c:475
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "Körbar länk förkastad på grund av tecknet \"%c\"."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:477
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "Körbar länk förkastad på grund av relativ sökvägssträng (\"../\")."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:479
 msgid "Executable link rejected due to location or path."
 msgstr "Körbar länk förkastad på grund av placering eller sökväg."
 
-#: LYMessages.c:482
+#: LYMessages.c:480
 msgid "Mail access is disabled!"
 msgstr "Åtkomst till e-post deaktiverad!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:484
+#: LYMessages.c:482
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Endast filer och servrar på den lokala värden kan nås."
 
-#: LYMessages.c:485
+#: LYMessages.c:483
 msgid "Telnet access is disabled!"
 msgstr "Telnetåtkomst är deaktiverad!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:487
+#: LYMessages.c:485
 msgid "Telnet port specifications are disabled."
 msgstr "Specificering av telnetport är deaktiverad."
 
-#: LYMessages.c:488
+#: LYMessages.c:486
 msgid "USENET news access is disabled!"
 msgstr "Åtkomst till Usenet news är deaktiverad!"
 
-#: LYMessages.c:489
+#: LYMessages.c:487
 msgid "Rlogin access is disabled!"
 msgstr "Rloginåtkomst är deaktiverad!"
 
-#: LYMessages.c:490
+#: LYMessages.c:488
 msgid "Ftp access is disabled!"
 msgstr "Ftpåtkomst är deaktiverad!"
 
-#: LYMessages.c:491
+#: LYMessages.c:489
 msgid "There are no references from this document."
 msgstr "Det finns inga referenser i detta dokument."
 
-#: LYMessages.c:492
+#: LYMessages.c:490
 msgid "There are only hidden links from this document."
 msgstr "Det finns inga dolda länkar i detta dokument."
 
-#: LYMessages.c:494
+#: LYMessages.c:492
 msgid "Unable to open command file."
 msgstr "Kan inte öppna kommandofil."
 
-#: LYMessages.c:496
+#: LYMessages.c:494
 msgid "News Post Cancelled!!!"
 msgstr "Postning av inlägg avbruten!!!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:498
+#: LYMessages.c:496
 msgid "Spawning your selected editor to edit news message"
 msgstr "Startar ditt valda textredigeringsprogram för att redigera inlägg"
 
-#: LYMessages.c:499
+#: LYMessages.c:497
 msgid "Post this message?"
 msgstr "Posta inlägget?"
 
-#: LYMessages.c:500
+#: LYMessages.c:498
 #, c-format
 msgid "Append '%s'?"
 msgstr "Lägga till \"%s\"?"
 
-#: LYMessages.c:501
+#: LYMessages.c:499
 msgid "Posting to newsgroup(s)..."
 msgstr "Postar till diskussionsgrupp(er)..."
 
-#: LYMessages.c:503
+#: LYMessages.c:501
 msgid "*** You have unread mail. ***"
 msgstr "*** Du har oläst e-post. ***"
 
-#: LYMessages.c:505
+#: LYMessages.c:503
 msgid "*** You have mail. ***"
 msgstr "*** Du har e-post. ***"
 
-#: LYMessages.c:507
+#: LYMessages.c:505
 msgid "*** You have new mail. ***"
 msgstr "*** Du har ny e-post. ***"
 
-#: LYMessages.c:508
+#: LYMessages.c:506
 msgid "File insert cancelled!!!"
 msgstr "Filinläggning avbruten!!!"
 
-#: LYMessages.c:509
+#: LYMessages.c:507
 msgid "Not enough memory for file!"
 msgstr "Minnet slut för fil!"
 
-#: LYMessages.c:510
+#: LYMessages.c:508
 msgid "Can't open file for reading."
 msgstr "Kan inte öppna fil för läsning."
 
-#: LYMessages.c:511
+#: LYMessages.c:509
 msgid "File does not exist."
 msgstr "Filen existerar inte."
 
-#: LYMessages.c:512
+#: LYMessages.c:510
 msgid "File does not exist - reenter or cancel:"
 msgstr "Filen existerar inte - ange igen eller avbryt:"
 
-#: LYMessages.c:513
+#: LYMessages.c:511
 msgid "File is not readable."
 msgstr "Filen är inte läsbar."
 
-#: LYMessages.c:514
+#: LYMessages.c:512
 msgid "File is not readable - reenter or cancel:"
 msgstr "Filen är inte läsbar - ange igen eller avbryt:"
 
-#: LYMessages.c:515
+#: LYMessages.c:513
 msgid "Nothing to insert - file is 0-length."
 msgstr "Inget att lägga in - filen har nollstorlek."
 
-#: LYMessages.c:516
+#: LYMessages.c:514
 msgid "Save request cancelled!!!"
 msgstr "Sparning avbruten!!!"
 
-#: LYMessages.c:517
+#: LYMessages.c:515
 msgid "Mail request cancelled!!!"
 msgstr "E-post avbrutet!!!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:519
+#: LYMessages.c:517
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "Visar tolkad källkod. Är du säker på att du vill skicka den?"
 
-#: LYMessages.c:520
+#: LYMessages.c:518
 msgid "Please wait..."
 msgstr "Var god vänta..."
 
-#: LYMessages.c:521
+#: LYMessages.c:519
 msgid "Mailing file.  Please wait..."
 msgstr "Skickar fil. Var god vänta..."
 
-#: LYMessages.c:522
+#: LYMessages.c:520
 msgid "ERROR - Unable to mail file"
 msgstr "FEL - Kan inte skicka fil per e-post"
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:524
+#: LYMessages.c:522
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "Filen är %d skärmar lång. Är du säker att du vill skriva ut?"
 
-#: LYMessages.c:525
+#: LYMessages.c:523
 msgid "Print request cancelled!!!"
 msgstr "Utskrift avbruten!!!"
 
-#: LYMessages.c:526
+#: LYMessages.c:524
 msgid "Press <return> to begin: "
 msgstr "Tryck <Enter> för att börja: "
 
-#: LYMessages.c:527
+#: LYMessages.c:525
 msgid "Press <return> to finish: "
 msgstr "Tryck <Enter> för att avsluta: "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:527
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "Filen är %d sidor lång. Är du säker att du vill skriva ut?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:531
+#: LYMessages.c:529
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "Försäkra dig om att skrivaren är inkopplad. Tryck <Enter> för att påbörja utskriften:"
 
-#: LYMessages.c:532
+#: LYMessages.c:530
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "FEL - kan inte reservera filutrymme!!!"
 
-#: LYMessages.c:533
+#: LYMessages.c:531
 msgid "Unable to open tempfile"
 msgstr "Kan inte öppna temporärfil"
 
-#: LYMessages.c:534
+#: LYMessages.c:532
 msgid "Unable to open print options file"
 msgstr "Kan inte öppna utskriftsalternativfil"
 
-#: LYMessages.c:535
+#: LYMessages.c:533
 msgid "Printing file.  Please wait..."
 msgstr "Skriver ut fil. Var god vänta..."
 
-#: LYMessages.c:536
+#: LYMessages.c:534
 msgid "Please enter a valid internet mail address: "
 msgstr "Ange en giltig Internet-e-postadress: "
 
-#: LYMessages.c:537
+#: LYMessages.c:535
 msgid "ERROR! - printer is misconfigured!"
 msgstr "FEL! - skrivaren är felkonfigurerad!"
 
-#: LYMessages.c:538
+#: LYMessages.c:536
 msgid "Image map from POST response not available!"
 msgstr "Bildkarta från \"POST\"-svar ej tillgänglig!"
 
-#: LYMessages.c:539
+#: LYMessages.c:537
 msgid "Misdirected client-side image MAP request!"
 msgstr "Feldirigerad klientbildkarteförfrågan!"
 
-#: LYMessages.c:540
+#: LYMessages.c:538
 msgid "Client-side image MAP is not accessible!"
 msgstr "Klientbildkarta ej åtkomlig!"
 
-#: LYMessages.c:541
+#: LYMessages.c:539
 msgid "No client-side image MAPs are available!"
 msgstr "Inga klientbildkartor är tillgängliga!"
 
-#: LYMessages.c:542
+#: LYMessages.c:540
 msgid "Client-side image MAP is not available!"
 msgstr "Klientbildkarta ej tillgänglig!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:545
+#: LYMessages.c:543
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "Skärmhöjden måste vara minst 24 rader för alternativmenyn!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:547
+#: LYMessages.c:545
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "Skärmhöjden måste vara minst 23 rader för alternativmenyn!"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:549
+#: LYMessages.c:547
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "Skärmhöjden måste vara minst 22 rader för alternativmenyn!"
 
-#: LYMessages.c:551
+#: LYMessages.c:549
 msgid "That key requires Advanced User mode."
 msgstr "Den knappen kräver avancerat användarläge."
 
-#: LYMessages.c:552
+#: LYMessages.c:550
 #, c-format
 msgid "Content-type: %s"
 msgstr "Datatyp: %s"
 
-#: LYMessages.c:553
+#: LYMessages.c:551
 msgid "Command: "
 msgstr "Kommando: "
 
-#: LYMessages.c:554
+#: LYMessages.c:552
 msgid "Unknown or ambiguous command"
 msgstr "Okänt eller tvetydigt kommando"
 
-#: LYMessages.c:555
+#: LYMessages.c:553
 msgid " Version "
 msgstr " Version "
 
-#: LYMessages.c:556
+#: LYMessages.c:554
 msgid " first"
 msgstr " först"
 
-#: LYMessages.c:557
+#: LYMessages.c:555
 msgid ", guessing..."
 msgstr ", gissar..."
 
-#: LYMessages.c:558
+#: LYMessages.c:556
 msgid "Permissions for "
 msgstr "Behörighet för "
 
-#: LYMessages.c:559
+#: LYMessages.c:557
 msgid "Select "
 msgstr "Välj "
 
-#: LYMessages.c:560
+#: LYMessages.c:558
 msgid "capital letter"
 msgstr "stora bokstaven"
 
-#: LYMessages.c:561
+#: LYMessages.c:559
 msgid " of option line,"
 msgstr " i alternativet,"
 
-#: LYMessages.c:562
+#: LYMessages.c:560
 msgid " to save,"
 msgstr " för att lagra,"
 
-#: LYMessages.c:563
+#: LYMessages.c:561
 msgid " to "
 msgstr " till "
 
-#: LYMessages.c:564
+#: LYMessages.c:562
 msgid " or "
 msgstr " eller "
 
-#: LYMessages.c:565
+#: LYMessages.c:563
 msgid " index"
 msgstr " index"
 
-#: LYMessages.c:566
+#: LYMessages.c:564
 msgid " to return to Lynx."
 msgstr " för att återgå till Lynx"
 
-#: LYMessages.c:567
+#: LYMessages.c:565
 msgid "Accept Changes"
 msgstr "Bekräfta ändringar"
 
-#: LYMessages.c:568
+#: LYMessages.c:566
 msgid "Reset Changes"
 msgstr "Nollställ ändringar"
 
-#: LYMessages.c:569
+#: LYMessages.c:567
 msgid "Left Arrow cancels changes"
 msgstr "Vänsterpil avbryter ändringar"
 
-#: LYMessages.c:570
+#: LYMessages.c:568
 msgid "Save options to disk"
 msgstr "Spara inställningar till disk"
 
-#: LYMessages.c:571
+#: LYMessages.c:569
 msgid "Hit RETURN to accept entered data."
 msgstr "Tryck ENTER för att bekräfta angiven data."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:573
+#: LYMessages.c:571
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr "Tryck ENTER för att bekräfta angiven data. Ta bort för att återställa förval."
 
-#: LYMessages.c:574
+#: LYMessages.c:572
 msgid "Value accepted!"
 msgstr "Värdet accepterat!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:576
+#: LYMessages.c:574
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Värdet accepterat! -- VARNING: Lynx har ställts in för XWINDOWS!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:578
+#: LYMessages.c:576
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Värdet accepterat! -- VARNING: Lynx har INTE ställts in för XWINDOWS!"
 
-#: LYMessages.c:579
+#: LYMessages.c:577
 msgid "You are not allowed to change which editor to use!"
 msgstr "Du har inte rättighet att ändra textredigeringsprogram!"
 
-#: LYMessages.c:580
+#: LYMessages.c:578
 msgid "Failed to set DISPLAY variable!"
 msgstr "Kunde inte ställa in DISPLAY-variabel!"
 
-#: LYMessages.c:581
+#: LYMessages.c:579
 msgid "Failed to clear DISPLAY variable!"
 msgstr "Kunde inte ta bort DISPLAY-variabel!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:583
+#: LYMessages.c:581
 msgid "You are not allowed to change the bookmark file!"
 msgstr "Du har inte rättighet att ändra bokmärkesfil!"
 
-#: LYMessages.c:584
+#: LYMessages.c:582
 msgid "Terminal does not support color"
 msgstr "Terminalen stöder inte färg"
 
-#: LYMessages.c:585
+#: LYMessages.c:583
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "Din \"%s\"-terminal stöder inte färg."
 
-#: LYMessages.c:586
+#: LYMessages.c:584
 msgid "Access to dot files is disabled!"
 msgstr "Tillgång till punktfiler är deaktiverad!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:588
+#: LYMessages.c:586
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr "Identifieringssträngen innehåller inte \"Lynx\" eller \"L_y_n_x\""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:590
+#: LYMessages.c:588
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr "Använd \"L_y_n_x\" eller \"Lynx\" i identifieringen, annars ser det ut som medvetet bedrägeri"
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:592
+#: LYMessages.c:590
 msgid "Changing of the User-Agent string is disabled!"
 msgstr "Ändring av identifieringssträngen är deaktiverad!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:594
+#: LYMessages.c:592
 msgid "You are not allowed to change this setting."
 msgstr "Du har inte behörighet att ändra denna inställning."
 
-#: LYMessages.c:595
+#: LYMessages.c:593
 msgid "Saving Options..."
 msgstr "Sparar inställningar..."
 
-#: LYMessages.c:596
+#: LYMessages.c:594
 msgid "Options saved!"
 msgstr "Inställningar sparade!"
 
-#: LYMessages.c:597
+#: LYMessages.c:595
 msgid "Unable to save Options!"
 msgstr "Kan inte spara inställningar!"
 
-#: LYMessages.c:598
+#: LYMessages.c:596
 msgid " 'r' to return to Lynx "
 msgstr " 'r' återgår till Lynx "
 
-#: LYMessages.c:599
+#: LYMessages.c:597
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr " '>' sparar, 'r' återgår till Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:601
+#: LYMessages.c:599
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "Valfri tangent ändrar, förutom ENTER som accepterar."
 
-#: LYMessages.c:602
+#: LYMessages.c:600
 msgid "Error uncompressing temporary file!"
 msgstr "Fel vid dekomprimering av temporärfil!"
 
-#: LYMessages.c:603
+#: LYMessages.c:601
 msgid "Unsupported URL scheme!"
 msgstr "Adresstypen stöds ej!"
 
-#: LYMessages.c:604
+#: LYMessages.c:602
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "Data stöds ej: URL! Använd SHOWINFO så länge."
 
-#: LYMessages.c:605
+#: LYMessages.c:603
 msgid "Redirection limit of 10 URL's reached."
 msgstr "Gräns på 10 adressomdirigeringar nådd."
 
-#: LYMessages.c:606
+#: LYMessages.c:604
 msgid "Illegal redirection URL received from server!"
 msgstr "Felaktig omdirigeringsadress mottagen från servern!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:608
+#: LYMessages.c:606
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "Servern bad om %d-omdirigering för POST-data till"
 
-#: LYMessages.c:611
+#: LYMessages.c:609
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P=Fortsätt, G=använd Get, C=Avbryt"
 
-#: LYMessages.c:612
+#: LYMessages.c:610
 msgid "P)roceed, or C)ancel "
 msgstr "P=Fortsätt, C=Avbryt "
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:614
+#: LYMessages.c:612
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr "Omdirigering av POST-data. P=Fortsätt, U=Se adress, G=använd GET, C=Avbryt"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:614
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "Omdirigering av POST-data. P=Fortsätt, U=Se adress, C=Avbryt"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:618
+#: LYMessages.c:616
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "Dokument från formulär med POST-data. Skicka igen?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:620
+#: LYMessages.c:618
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Skicka POST-data till %s igen?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:622
+#: LYMessages.c:620
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "Lista från dokument med POST-data. Hämta om %s?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:624
+#: LYMessages.c:622
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "Dokument från POST-formulär, HEAD kanske inte förstås. Fortsätta?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:624
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "Formulärmetod är POST, HEAD kanske inte förstås. Fortsätta?"
 
-#: LYMessages.c:627
+#: LYMessages.c:625
 msgid "Proceed without a username and password?"
 msgstr "Fortsätta utan användar-id och lösenord?"
 
-#: LYMessages.c:628
+#: LYMessages.c:626
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Fortsätta (%s)?"
 
-#: LYMessages.c:629
+#: LYMessages.c:627
 msgid "Cannot POST to this host."
 msgstr "Kan inte skicka POST-data till denna värd."
 
-#: LYMessages.c:630
+#: LYMessages.c:628
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "POST stöds inte för denna adress - ignorerar POST-data!"
 
-#: LYMessages.c:631
+#: LYMessages.c:629
 msgid "Discarding POST data..."
 msgstr "Kastar POST-data..."
 
-#: LYMessages.c:632
+#: LYMessages.c:630
 msgid "Document will not be reloaded!"
 msgstr "Dokumentet hämtas inte om!"
 
-#: LYMessages.c:633
+#: LYMessages.c:631
 msgid "Location: "
 msgstr "Plats: "
 
-#: LYMessages.c:634
+#: LYMessages.c:632
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' hittades ej!"
 
-#: LYMessages.c:635
+#: LYMessages.c:633
 msgid "Default Bookmark File"
 msgstr "Förinställd bokmärkesfil"
 
-#: LYMessages.c:636
+#: LYMessages.c:634
 msgid "Screen too small! (8x35 min)"
 msgstr "Skärm för liten! (min. 8x35)"
 
-#: LYMessages.c:637
+#: LYMessages.c:635
 msgid "Select destination or ^G to Cancel: "
 msgstr "Välj destination eller ^G för att avbryta: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:639
+#: LYMessages.c:637
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "Välj underbokmärke. '=' ger meny, ^G avbryter: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:641
+#: LYMessages.c:639
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "L=Avbilda länk i bokmärkesfil, C=Avbryt? (l,c): "
 
-#: LYMessages.c:642
+#: LYMessages.c:640
 msgid "Multiple bookmark support is not available."
 msgstr "Stöd för multipla bokmärken ej tillgängligt."
 
-#: LYMessages.c:643
+#: LYMessages.c:641
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr " Välj bokmärke (skärm %d av %d)"
 
-#: LYMessages.c:644
+#: LYMessages.c:642
 msgid "       Select Bookmark"
 msgstr "       Välj bokmärke"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:646
+#: LYMessages.c:644
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "Redigerar bokmärkes-BESKRIVNING och SÖKVÄG (%d av 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:648
+#: LYMessages.c:646
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "         Redigerar bokmärkes-BESKRIVNING och SÖKVÄG"
 
-#: LYMessages.c:649
+#: LYMessages.c:647
 msgid "Letter: "
 msgstr "Bokstav: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:652
+#: LYMessages.c:650
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Använd en sökväg från din inloggningskatalog enligt SKAL-syntax!"
 
-#: LYMessages.c:654
+#: LYMessages.c:652
 msgid "Use a filepath off your home directory!"
 msgstr "Använd en sökväg från din hemkatalog!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:657
+#: LYMessages.c:655
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Max antal länkar per sida överskreds! Använd halvsides- eller tvåradsrullning."
 
 #. #define MAXHIST_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:657
 msgid "History List maximum reached!  Document not pushed."
 msgstr "Historiklistemaximum nått! Dokumentet lagrades inte."
 
-#: LYMessages.c:660
+#: LYMessages.c:658
 msgid "No previously visited links available!"
 msgstr "Inga tidigare besökta länkar tillgängliga!"
 
-#: LYMessages.c:661
+#: LYMessages.c:659
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Minnet slut! Programmet avbrutet!"
 
-#: LYMessages.c:662
+#: LYMessages.c:660
 msgid "Memory exhausted!  Aborting..."
 msgstr "Minnet slut! Avbryter..."
 
-#: LYMessages.c:663
+#: LYMessages.c:661
 msgid "Not enough memory!"
 msgstr "Ej tillräckligt minne!"
 
-#: LYMessages.c:664
+#: LYMessages.c:662
 msgid "Directory/File Manager not available"
 msgstr "Katalog-/filhanterare ej tillgänglig"
 
-#: LYMessages.c:665
+#: LYMessages.c:663
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "HREF i BASE-märke är inte en absolut adress."
 
-#: LYMessages.c:666
+#: LYMessages.c:664
 msgid "Location URL is not absolute."
 msgstr "\"Location\"-adress ej absolut."
 
-#: LYMessages.c:667
+#: LYMessages.c:665
 msgid "Refresh URL is not absolute."
 msgstr "\"Refresh\"-adress ej absolut."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:667
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2034,7 +2035,7 @@ msgstr ""
 "Du sänder ett meddelande med textkropp till:\n"
 "  "
 
-#: LYMessages.c:670
+#: LYMessages.c:668
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2042,7 +2043,7 @@ msgstr ""
 "Du sänder en kommentar till:\n"
 "  "
 
-#: LYMessages.c:671
+#: LYMessages.c:669
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2052,7 +2053,7 @@ msgstr ""
 " Med kopia till:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:670
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2063,7 +2064,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:672
 msgid ""
 "\n"
 "\n"
@@ -2074,7 +2075,7 @@ msgstr ""
 "Använd Ctrl-G för att avbryta om du inte vill skicka ett meddelande\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:674
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2083,7 +2084,7 @@ msgstr ""
 " Ange ditt namn eller lämna blankt för att förbli anonym\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:676
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2092,11 +2093,11 @@ msgstr ""
 " Skriv din e-postadress eller något annat\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:678
 msgid " means to contact you, if you desire a response.\n"
 msgstr " sätt du kan nås på, om du vill ha ett svar.\n"
 
-#: LYMessages.c:681
+#: LYMessages.c:679
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2105,7 +2106,7 @@ msgstr ""
 " Ange en ärenderad.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2113,11 +2114,11 @@ msgstr ""
 "\n"
 " Ange e-postadress som får kopia på ditt meddelande.\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:682
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (Lämna blankt om du inte vill ha en kopia).\n"
 
-#: LYMessages.c:685
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2127,7 +2128,7 @@ msgstr ""
 " Se över meddelandekroppen:\n"
 "\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:684
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2135,7 +2136,7 @@ msgstr ""
 "\n"
 "Tryck ENTER för att fortsätta: "
 
-#: LYMessages.c:687
+#: LYMessages.c:685
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2143,11 +2144,11 @@ msgstr ""
 "\n"
 "Tryck ENTER för att städa upp: "
 
-#: LYMessages.c:688
+#: LYMessages.c:686
 msgid " Use Control-U to erase the default.\n"
 msgstr " Använd Control-U för att rensa förvalet.\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2156,7 +2157,7 @@ msgstr ""
 " Skriv ditt meddelande nedan."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:380
+#: LYMessages.c:689 src/LYNews.c:361
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2165,7 +2166,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:381
+#: LYMessages.c:691 src/LYNews.c:362
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2175,248 +2176,248 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:695
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "%s kaka: %.*s=%.*s  Tillåta? (J/N/Alltid/V=aldrig)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:697
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Tillåta ogiltig kakdomän=%s för \"%s\"?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:699
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr "Tillåta ogiltig kaksökväg=%s som prefix för \"%s\"?"
 
-#: LYMessages.c:702
+#: LYMessages.c:700
 msgid "Allowing this cookie."
 msgstr "Tillåter kakan."
 
-#: LYMessages.c:703
+#: LYMessages.c:701
 msgid "Rejecting this cookie."
 msgstr "Avvisar kakan."
 
-#: LYMessages.c:704
+#: LYMessages.c:702
 msgid "The Cookie Jar is empty."
 msgstr "Kakburken är tom."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:706
+#: LYMessages.c:704
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "Aktivera länk för att äta upp kakor eller hela domäner,"
 
-#: LYMessages.c:707
+#: LYMessages.c:705
 msgid "or to change a domain's 'allow' setting."
 msgstr "eller ändra ändra domänens \"tillåt\"-inställning."
 
-#: LYMessages.c:708
+#: LYMessages.c:706
 msgid "(Cookies never allowed.)"
 msgstr "(Kakor tillåts aldrig)"
 
-#: LYMessages.c:709
+#: LYMessages.c:707
 msgid "(Cookies always allowed.)"
 msgstr "(Kakor tillåts alltid)"
 
-#: LYMessages.c:710
+#: LYMessages.c:708
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Kakor tillåts via fråga)"
 
-#: LYMessages.c:711
+#: LYMessages.c:709
 msgid "(Persistent Cookies.)"
 msgstr "(Persistenta kakor)"
 
-#: LYMessages.c:712
+#: LYMessages.c:710
 msgid "(No title.)"
 msgstr "(Titel saknas)"
 
-#: LYMessages.c:713
+#: LYMessages.c:711
 msgid "(No name.)"
 msgstr "(Inget namn)"
 
-#: LYMessages.c:714
+#: LYMessages.c:712
 msgid "(No value.)"
 msgstr "(Inget värde)"
 
-#: LYMessages.c:715
+#: LYMessages.c:713
 msgid "None"
 msgstr "Ingen"
 
-#: LYMessages.c:716
+#: LYMessages.c:714
 msgid "(End of session.)"
 msgstr "(Slut på session)"
 
-#: LYMessages.c:717
+#: LYMessages.c:715
 msgid "Delete this cookie?"
 msgstr "Radera denna kaka?"
 
-#: LYMessages.c:718
+#: LYMessages.c:716
 msgid "The cookie has been eaten!"
 msgstr "Kakan har ätits upp!"
 
-#: LYMessages.c:719
+#: LYMessages.c:717
 msgid "Delete this empty domain?"
 msgstr "Radera denna tomma domän?"
 
-#: LYMessages.c:720
+#: LYMessages.c:718
 msgid "The domain has been eaten!"
 msgstr "Domänen har ätits upp!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:722
+#: LYMessages.c:720
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D=Radera domänens kakor, ställ in A=Alltid/P=Fråga/V=Aldrig, C=Avbryt? "
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:724
+#: LYMessages.c:722
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D=Radera domän, ställ in A=Alltid/P=Fråga/V=Aldrig, C=Avbryt? "
 
-#: LYMessages.c:725
+#: LYMessages.c:723
 msgid "All cookies in the domain have been eaten!"
 msgstr "Alla kakor från domänen har ätits upp!"
 
-#: LYMessages.c:726
+#: LYMessages.c:724
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "Tillåter alla kakor från domänen \"%s\"."
 
-#: LYMessages.c:727
+#: LYMessages.c:725
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "Avvisar alla kakor från domänen \"%s\"."
 
-#: LYMessages.c:728
+#: LYMessages.c:726
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "Frågar om alla kakor från domänen \"%s\"."
 
-#: LYMessages.c:729
+#: LYMessages.c:727
 msgid "Delete all cookies in this domain?"
 msgstr "Radera alla kakor i denna domän?"
 
-#: LYMessages.c:730
+#: LYMessages.c:728
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "Alla kakor i kakburken har ätits upp!"
 
-#: LYMessages.c:732
+#: LYMessages.c:730
 msgid "Port 19 not permitted in URLs."
 msgstr "Port 19 ej tillåten i adress."
 
-#: LYMessages.c:733
+#: LYMessages.c:731
 msgid "Port 25 not permitted in URLs."
 msgstr "Port 25 ej tillåten i adress."
 
-#: LYMessages.c:734
+#: LYMessages.c:732
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "Port %lu ej tillåten i adress."
 
-#: LYMessages.c:735
+#: LYMessages.c:733
 msgid "URL has a bad port field."
 msgstr "Adressen har ett felaktigt portfält."
 
-#: LYMessages.c:736
+#: LYMessages.c:734
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "Maximal stapling av HTML-element överskreds."
 
-#: LYMessages.c:737
+#: LYMessages.c:735
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Felaktig partiell referens! Raderar inledande punkter."
 
-#: LYMessages.c:738
+#: LYMessages.c:736
 msgid "Trace Log open failed.  Trace off!"
 msgstr "Öppning av spårningslogg misslyckades. Spårning avslagen!"
 
-#: LYMessages.c:739
+#: LYMessages.c:737
 msgid "Lynx Trace Log"
 msgstr "Lynx' spårningslogg"
 
-#: LYMessages.c:740
+#: LYMessages.c:738
 msgid "No trace log has been started for this session."
 msgstr "Ingen spårningslogg har startats för denna session."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:742
+#: LYMessages.c:740
 msgid "The maximum temporary file count has been reached!"
 msgstr "Maximalt antal temporärfiler har nåtts!"
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:744
+#: LYMessages.c:742
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "Värdet för formulärfält är längre än bufferten! Klipp på slutet."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:746
+#: LYMessages.c:744
 msgid "Modified tail combined with head of form field value."
 msgstr "Modifierad avslutning kombinerad med huvudet i formulärfältsvärdet."
 
 #. HTFile.c
-#: LYMessages.c:749
+#: LYMessages.c:747
 msgid "Directory"
 msgstr "Katalog"
 
-#: LYMessages.c:750
+#: LYMessages.c:748
 msgid "Directory browsing is not allowed."
 msgstr "Katalogbläddring tillåts ej."
 
-#: LYMessages.c:751
+#: LYMessages.c:749
 msgid "Selective access is not enabled for this directory"
 msgstr "Selektiv åtkomst är inte tillgänglig för denna katalog"
 
-#: LYMessages.c:752
+#: LYMessages.c:750
 msgid "Multiformat: directory scan failed."
 msgstr "Multiformat: katalogavsökning misslyckades."
 
-#: LYMessages.c:753
+#: LYMessages.c:751
 msgid "This directory is not readable."
 msgstr "Denna katalog är inte läsbar."
 
-#: LYMessages.c:754
+#: LYMessages.c:752
 msgid "Can't access requested file."
 msgstr "Kan inte komma åt vald fil."
 
-#: LYMessages.c:755
+#: LYMessages.c:753
 msgid "Could not find suitable representation for transmission."
 msgstr "Kunde inte hitta en lämplig representation för överföring."
 
-#: LYMessages.c:756
+#: LYMessages.c:754
 msgid "Could not open file for decompression!"
 msgstr "Kunde inte öppna filen för dekomprimering!"
 
-#: LYMessages.c:757
+#: LYMessages.c:755
 msgid "Files:"
 msgstr "Filer:"
 
-#: LYMessages.c:758
+#: LYMessages.c:756
 msgid "Subdirectories:"
 msgstr "Underkataloger:"
 
-#: LYMessages.c:759
+#: LYMessages.c:757
 msgid " directory"
 msgstr " katalog"
 
-#: LYMessages.c:760
+#: LYMessages.c:758
 msgid "Up to "
 msgstr "Upp till "
 
-#: LYMessages.c:761
+#: LYMessages.c:759
 msgid "Current directory is "
 msgstr "Aktuell katalog är "
 
 #. HTGopher.c
-#: LYMessages.c:764
+#: LYMessages.c:762
 msgid "No response from server!"
 msgstr "Inget svar från servern!"
 
-#: LYMessages.c:765
+#: LYMessages.c:763
 msgid "CSO index"
 msgstr "CSO-index"
 
-#: LYMessages.c:766
+#: LYMessages.c:764
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2424,16 +2425,16 @@ msgstr ""
 "\n"
 "Detta är ett sökbart index i en CSO-databas.\n"
 
-#: LYMessages.c:767
+#: LYMessages.c:765
 msgid "CSO Search Results"
 msgstr "CSO-sökresultat"
 
-#: LYMessages.c:768
+#: LYMessages.c:766
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Sökning misslyckades på %s\n"
 
-#: LYMessages.c:769
+#: LYMessages.c:767
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2441,7 +2442,7 @@ msgstr ""
 "\n"
 "Tryck \"s\"-tangenten och ange söknyckelord.\n"
 
-#: LYMessages.c:770
+#: LYMessages.c:768
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2449,35 +2450,35 @@ msgstr ""
 "\n"
 "Detta är ett sökbart Gopherindex.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:769
 msgid "Gopher index"
 msgstr "Gopherindex"
 
-#: LYMessages.c:772
+#: LYMessages.c:770
 msgid "Gopher Menu"
 msgstr "Gophermeny"
 
-#: LYMessages.c:773
+#: LYMessages.c:771
 msgid " Search Results"
 msgstr " Sökresultats"
 
-#: LYMessages.c:774
+#: LYMessages.c:772
 msgid "Sending CSO/PH request."
 msgstr "Sänder CSO/PH-fråga."
 
-#: LYMessages.c:775
+#: LYMessages.c:773
 msgid "Sending Gopher request."
 msgstr "Sänder Gopherfråga."
 
-#: LYMessages.c:776
+#: LYMessages.c:774
 msgid "CSO/PH request sent; waiting for response."
 msgstr "CSO/PH-fråga sänd; väntar på svar."
 
-#: LYMessages.c:777
+#: LYMessages.c:775
 msgid "Gopher request sent; waiting for response."
 msgstr "Gopherfråga sänd; väntar på svar."
 
-#: LYMessages.c:778
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2485,7 +2486,7 @@ msgstr ""
 "\n"
 "Ange söknyckelord.\n"
 
-#: LYMessages.c:779
+#: LYMessages.c:777
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2493,193 +2494,197 @@ msgstr ""
 "\n"
 "Nyckelorden du anger gör det möjligt att söka på en"
 
-#: LYMessages.c:780
+#: LYMessages.c:778
 msgid " person's name in the database.\n"
 msgstr " persons namn i databasen.\n"
 
 #. HTNews.c
-#: LYMessages.c:783
+#: LYMessages.c:781
 msgid "Connection closed ???"
 msgstr "Anslutning stängd???"
 
-#: LYMessages.c:784
+#: LYMessages.c:782
 msgid "Cannot open temporary file for news POST."
 msgstr "Kan inte öppna temporärfil för diskussionsinlägg."
 
-#: LYMessages.c:785
+#: LYMessages.c:783
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Denna klient innehåller inte stöd för att posta inlägg över SSL."
 
 #. HTStyle.c
-#: LYMessages.c:788
+#: LYMessages.c:786
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Stil %d \"%s\" SGML:%s. Teckensnitt %s %.1f punkter.\n"
 
-#: LYMessages.c:789
+#: LYMessages.c:787
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tIndrag: första=%.0f övriga=%.0f, Höjd=%.1f Djup=%.1f\n"
 
-#: LYMessages.c:790
+#: LYMessages.c:788
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "\tJustering=%d, %d tabbar. (%.0f före, %.0f efter)\n"
 
-#: LYMessages.c:791
+#: LYMessages.c:789
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "\t\tTabbsort=%d på %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:794
+#: LYMessages.c:792
 msgid "Can't proceed without a username and password."
 msgstr "Kan inte fortsätta utan användar-id och lösenord."
 
-#: LYMessages.c:795
+#: LYMessages.c:793
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Kan inte försöka igen utan tillåtelse! Kontakta serverns ansvariga."
 
-#: LYMessages.c:796
+#: LYMessages.c:794
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "Kan ej försöka igen utan mellanserverauktorisering! Kontakta serverns ansvariga."
 
-#: LYMessages.c:797
+#: LYMessages.c:795
 msgid "Retrying with proxy authorization information."
 msgstr "Försöker igen med mellanserverauktoriseringsinformation."
 
 #. HTWAIS.c
-#: LYMessages.c:800
+#: LYMessages.c:798
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Returmeddelande för stort."
 
-#: LYMessages.c:801
+#: LYMessages.c:799
 msgid "Enter WAIS query: "
 msgstr "Ange WAIS-fråga: "
 
 #. Miscellaneous status
-#: LYMessages.c:804
+#: LYMessages.c:802
 msgid "Retrying as HTTP0 request."
 msgstr "Försöker ingen som HTTP0-fråga."
 
-#: LYMessages.c:805
+#: LYMessages.c:803
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "Överförde %d byte"
 
-#: LYMessages.c:806
+#: LYMessages.c:804
 msgid "Data transfer complete"
 msgstr "Dataöverföring färdig"
 
-#: LYMessages.c:807
+#: LYMessages.c:805
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Fel vid tolkning av rad %d i %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:810
+#: LYMessages.c:808
 msgid "Address List Page"
 msgstr "Adresslistesida"
 
-#: LYMessages.c:811
+#: LYMessages.c:809
 msgid "Bookmark file"
 msgstr "Bokmärkesfil"
 
-#: LYMessages.c:812
+#: LYMessages.c:810
 msgid "Configuration Definitions"
 msgstr "Konfigurationsdefinitioner"
 
-#: LYMessages.c:813
+#: LYMessages.c:811
 msgid "Cookie Jar"
 msgstr "Kakburk"
 
-#: LYMessages.c:814
+#: LYMessages.c:812
 msgid "Current Key Map"
 msgstr "Aktuella tangentbordsbindningar"
 
-#: LYMessages.c:815
+#: LYMessages.c:813
 msgid "File Management Options"
 msgstr "Filhanteringsalternativ"
 
-#: LYMessages.c:816
+#: LYMessages.c:814
 msgid "Download Options"
 msgstr "Hämtningalternativ"
 
-#: LYMessages.c:817
+#: LYMessages.c:815
 msgid "History Page"
 msgstr "Historiksida"
 
-#: LYMessages.c:818
+#: LYMessages.c:816
 msgid "List Page"
 msgstr "Listsida"
 
-#: LYMessages.c:819
+#: LYMessages.c:817
 msgid "Lynx.cfg Information"
 msgstr "Lynx.cfg-information"
 
-#: LYMessages.c:820
+#: LYMessages.c:818
 msgid "Converted Mosaic Hotlist"
 msgstr "Konverterade Mosaicbokmärken"
 
-#: LYMessages.c:821
+#: LYMessages.c:819
 msgid "Options Menu"
 msgstr "Alternativmeny"
 
-#: LYMessages.c:822
+#: LYMessages.c:820
 msgid "File Permission Options"
 msgstr "Filbehörighetsalternativ"
 
-#: LYMessages.c:823
+#: LYMessages.c:821
 msgid "Printing Options"
 msgstr "Utskriftsalternativ"
 
-#: LYMessages.c:824
+#: LYMessages.c:822
 msgid "Information about the current document"
 msgstr "Information om det aktuella dokumentet"
 
-#: LYMessages.c:825
+#: LYMessages.c:823
 msgid "Your recent statusline messages"
 msgstr "Dina senaste statusradmeddelanden"
 
-#: LYMessages.c:826
+#: LYMessages.c:824
 msgid "Upload Options"
 msgstr "Insändningsalternativ"
 
-#: LYMessages.c:827
+#: LYMessages.c:825
 msgid "Visited Links Page"
 msgstr "Använda länkar"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:830
+#: LYMessages.c:828
 msgid "See also"
 msgstr "Se även"
 
-#: LYMessages.c:831
+#: LYMessages.c:829
 msgid "your"
 msgstr "din"
 
-#: LYMessages.c:832
+#: LYMessages.c:830
 msgid "for runtime options"
 msgstr "för körningsalternativ"
 
-#: LYMessages.c:833
+#: LYMessages.c:831
 msgid "compile time options"
 msgstr "kompileringsalternativ"
 
-#: LYMessages.c:834
+#: LYMessages.c:832
+msgid "color-style configuration"
+msgstr "konfigurering av color-style"
+
+#: LYMessages.c:833
 msgid "latest release"
 msgstr "senaste utgåva"
 
-#: LYMessages.c:835
+#: LYMessages.c:834
 msgid "pre-release version"
 msgstr "förhandsversion"
 
-#: LYMessages.c:836
+#: LYMessages.c:835
 msgid "development version"
 msgstr "utvecklingsversion"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:838
+#: LYMessages.c:837
 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"
@@ -2690,7 +2695,7 @@ msgstr ""
 "inkludera en kopia av denna sida."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:842
+#: LYMessages.c:841
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2699,99 +2704,103 @@ msgstr ""
 "när denna kopia av Lynx kompilerades."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:847
+#: LYMessages.c:846
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "C=Skapa  D=Hämta  E=Redigera  F=Full meny  M=Ändra  R=Radera  T=Märk  U=Skicka\n"
 
-#: LYMessages.c:848
+#: LYMessages.c:847
 msgid "Failed to obtain status of current link!"
 msgstr "Kunde inte hämta status för aktuell länk!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:851
+#: LYMessages.c:850
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "Speciell adress endast giltig i menyn för filbehörigheter!"
 
-#: LYMessages.c:855
+#: LYMessages.c:854
 msgid "External support is currently disabled."
 msgstr "Externt stöd är just nu deaktiverat."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:859
+#: LYMessages.c:858
 msgid "Changing working-directory is currently disabled."
 msgstr "Byte av arbetskatalog tillåts ej just nu."
 
-#: LYMessages.c:860
+#: LYMessages.c:859
 msgid "Linewrap OFF!"
 msgstr "Radbrytning AV!"
 
-#: LYMessages.c:861
+#: LYMessages.c:860
 msgid "Linewrap ON!"
 msgstr "Radbrytning PÅ!"
 
-#: LYMessages.c:862
+#: LYMessages.c:861
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr "Tolkning av nästlade tabeller AV! Hämtar om..."
 
-#: LYMessages.c:863
+#: LYMessages.c:862
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr "Tolkning av nästlade tabeller PÅ! Hämtar om..."
 
-#: LYMessages.c:864
+#: LYMessages.c:863
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr "Skiftning är deaktiverad när radbrytning är aktiv"
 
-#: LYMessages.c:865
+#: LYMessages.c:864
 msgid "Trace not supported"
 msgstr "Spårning stöds ej"
 
-#: WWW/Library/Implementation/HTAABrow.c:648
+#: WWW/Library/Implementation/HTAABrow.c:647
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "Användar-id för \"%s\" på %s \"%s%s\":"
 
-#: WWW/Library/Implementation/HTAABrow.c:914
+#: WWW/Library/Implementation/HTAABrow.c:913
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr "Denna klient kan inte skapa mellanserverauktoriseringsinformation för protokolltyp"
 
-#: WWW/Library/Implementation/HTAABrow.c:989
+#: WWW/Library/Implementation/HTAABrow.c:988
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "Denna klient kan inte skapa auktoriseringsinformation för protokolltyp"
 
-#: WWW/Library/Implementation/HTAABrow.c:1097
+#: WWW/Library/Implementation/HTAABrow.c:1096
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Felaktigt huvud \"%s%s%s%s%s\""
 
-#: WWW/Library/Implementation/HTAABrow.c:1201
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
 msgstr "Mellanserverauktorisering krävs -- försöker igen"
 
-#: WWW/Library/Implementation/HTAABrow.c:1260
+#: WWW/Library/Implementation/HTAABrow.c:1259
 msgid "Access without authorization denied -- retrying"
 msgstr "Åtkomst utan auktorisering avvisad -- försöker igen"
 
-#: WWW/Library/Implementation/HTAccess.c:683
+#: WWW/Library/Implementation/HTAccess.c:677
 msgid "Access forbidden by rule"
 msgstr "Åtkomst förbjuden av regel"
 
-#: WWW/Library/Implementation/HTAccess.c:785
+#: WWW/Library/Implementation/HTAccess.c:779
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "Dokument med POST-data hittades ej i cache. Skicka in igen?"
 
-#: WWW/Library/Implementation/HTAccess.c:1026 src/GridText.c:8039
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
 msgid "Loading incomplete."
 msgstr "Hämtning ej komplett."
 
-#: WWW/Library/Implementation/HTAccess.c:1056
+#: WWW/Library/Implementation/HTAccess.c:1077
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr "**** HTAccess: uttag eller filnummer returnerad av föråldrad inläsningsrutin!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1058
+#: WWW/Library/Implementation/HTAccess.c:1079
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
 msgstr "**** HTAccess: Internt programvarufel. Meddela lynx-dev@sig.net!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1059
+#: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "**** HTAccess: Returnerad status var: %d\n"
@@ -2800,28 +2809,28 @@ msgstr "**** HTAccess: Returnerad status var: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7834
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
 msgid "Can't Access"
 msgstr "Kan inte komma åt"
 
-#: WWW/Library/Implementation/HTAccess.c:1073
+#: WWW/Library/Implementation/HTAccess.c:1094
 msgid "Unable to access document."
 msgstr "Kan inte komma åt dokument."
 
-#: WWW/Library/Implementation/HTFTP.c:756
+#: WWW/Library/Implementation/HTFTP.c:766
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Ange lösenord för användar-id %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:784
+#: WWW/Library/Implementation/HTFTP.c:794
 msgid "Unable to connect to FTP host."
 msgstr "Kan inte ansluta till ftp-värd."
 
-#: WWW/Library/Implementation/HTFTP.c:1054
+#: WWW/Library/Implementation/HTFTP.c:1064
 msgid "close master socket"
 msgstr "stängd huvuduttag (master socket)"
 
-#: WWW/Library/Implementation/HTFTP.c:1116
+#: WWW/Library/Implementation/HTFTP.c:1126
 msgid "socket for master socket"
 msgstr "uttag (socket) för huvuduttag"
 
@@ -2830,36 +2839,36 @@ msgstr "uttag (socket) för huvuduttag"
 #. **  knowing if it is symbolic?	I think so since
 #. **  it might be a directory.
 #.
-#: WWW/Library/Implementation/HTFTP.c:1630 WWW/Library/Implementation/HTFTP.c:2251
+#: WWW/Library/Implementation/HTFTP.c:1640 WWW/Library/Implementation/HTFTP.c:2261
 msgid "Symbolic Link"
 msgstr "Symbolisk länk"
 
-#: WWW/Library/Implementation/HTFTP.c:2612
+#: WWW/Library/Implementation/HTFTP.c:2622
 msgid "Receiving FTP directory."
 msgstr "Hämtar ftp-katalog."
 
-#: WWW/Library/Implementation/HTFTP.c:2755
+#: WWW/Library/Implementation/HTFTP.c:2762
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "Överförde %d byte (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3083
 msgid "connect for data"
 msgstr "ansluter för data"
 
-#: WWW/Library/Implementation/HTFTP.c:3690
+#: WWW/Library/Implementation/HTFTP.c:3731
 msgid "Receiving FTP file."
 msgstr "Hämtar ftp-fil."
 
-#: WWW/Library/Implementation/HTFinger.c:275
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
 msgstr "Kunde inte skapa \"finger\"-anslutning."
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
 msgstr "Kunde inte hämta data (inget värdnamn i \"finger\"-adress)"
 
-#: WWW/Library/Implementation/HTFinger.c:328
+#: WWW/Library/Implementation/HTFinger.c:331
 msgid "Invalid port number - will only use port 79!"
 msgstr "Felaktigt portnummer - använder endast port 79!"
 
@@ -2867,7 +2876,7 @@ msgstr "Felaktigt portnummer - använder endast port 79!"
 msgid "Could not access finger host."
 msgstr "Kunde inta komma åt \"finger\"-värd."
 
-#: WWW/Library/Implementation/HTFinger.c:407
+#: WWW/Library/Implementation/HTFinger.c:404
 msgid "No response from finger server."
 msgstr "Inget svar från \"finger\"-server."
 
@@ -2893,12 +2902,12 @@ msgstr "Lösenord för diskussionsvärd \"%s\":"
 msgid "Change password?"
 msgstr "Ändra lösenord?"
 
-#: WWW/Library/Implementation/HTNews.c:1691
+#: WWW/Library/Implementation/HTNews.c:1690
 #, c-format
 msgid "No matches for: %s"
 msgstr "Inga träffar för: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1744
+#: WWW/Library/Implementation/HTNews.c:1743
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2906,7 +2915,7 @@ msgstr ""
 "\n"
 "Inga artiklar i denna grupp.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1757
+#: WWW/Library/Implementation/HTNews.c:1756
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2917,16 +2926,16 @@ msgstr ""
 #.
 #. **	Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1770
+#: WWW/Library/Implementation/HTNews.c:1769
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s, artiklar %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1792
+#: WWW/Library/Implementation/HTNews.c:1791
 msgid "Earlier articles"
 msgstr "Tidigare artiklar"
 
-#: WWW/Library/Implementation/HTNews.c:1805
+#: WWW/Library/Implementation/HTNews.c:1804
 #, c-format
 msgid ""
 "\n"
@@ -2937,41 +2946,41 @@ msgstr ""
 "Det finns ca %d artiklar tillgängliga i %s nu med följande identifierare:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1865
+#: WWW/Library/Implementation/HTNews.c:1864
 msgid "All available articles in "
 msgstr "Alla tillgängliga artiklar i "
 
-#: WWW/Library/Implementation/HTNews.c:2081
+#: WWW/Library/Implementation/HTNews.c:2080
 msgid "Later articles"
 msgstr "Senare artiklar"
 
-#: WWW/Library/Implementation/HTNews.c:2105
+#: WWW/Library/Implementation/HTNews.c:2104
 msgid "Post to "
 msgstr "Skicka till "
 
-#: WWW/Library/Implementation/HTNews.c:2323
+#: WWW/Library/Implementation/HTNews.c:2322
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Denna klient innehåller inte stöd för SNEWS-adresser."
 
-#: WWW/Library/Implementation/HTNews.c:2531
+#: WWW/Library/Implementation/HTNews.c:2530
 msgid "No target for raw text!"
 msgstr "Inget mål för rå text!"
 
-#: WWW/Library/Implementation/HTNews.c:2561
+#: WWW/Library/Implementation/HTNews.c:2560
 msgid "Connecting to NewsHost ..."
 msgstr "Ansluter till diskussionsvärd..."
 
-#: WWW/Library/Implementation/HTNews.c:2612
+#: WWW/Library/Implementation/HTNews.c:2611
 #, c-format
 msgid "Could not access %s."
 msgstr "Kunde inte komma åt %s."
 
-#: WWW/Library/Implementation/HTNews.c:2712
+#: WWW/Library/Implementation/HTNews.c:2711
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Kan inte läsa dikussionsinformation. Värden %.20s svarade %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2716
+#: WWW/Library/Implementation/HTNews.c:2715
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Kan inte läsa diskussionsinformation, tomt svar från värd %s"
@@ -2979,34 +2988,34 @@ msgstr "Kan inte läsa diskussionsinformation, tomt svar från värd %s"
 #.
 #. **	List available newsgroups. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2920
+#: WWW/Library/Implementation/HTNews.c:2919
 msgid "Reading list of available newsgroups."
 msgstr "Läser lista över tillgängliga grupper."
 
-#: WWW/Library/Implementation/HTNews.c:2942
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of articles in newsgroup."
 msgstr "Läser lista över artiklar i grupp."
 
 #.
 #. **	Get an article from a news group. - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2948
+#: WWW/Library/Implementation/HTNews.c:2947
 msgid "Reading news article."
 msgstr "Läser artikel."
 
-#: WWW/Library/Implementation/HTNews.c:2978
+#: WWW/Library/Implementation/HTNews.c:2977
 msgid "Sorry, could not load requested news."
 msgstr "Kunde inte hämta begärda artiklar."
 
-#: WWW/Library/Implementation/HTTCP.c:1233
+#: WWW/Library/Implementation/HTTCP.c:1239
 msgid "Address has invalid port"
 msgstr "Adressen har en ogiltig port"
 
-#: WWW/Library/Implementation/HTTCP.c:1336
+#: WWW/Library/Implementation/HTTCP.c:1327
 msgid "Address length looks invalid"
 msgstr "Adresslängden verkar ogiltig"
 
-#: WWW/Library/Implementation/HTTCP.c:1574 WWW/Library/Implementation/HTTCP.c:1592
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Kan inte hitta värd %s."
@@ -3015,62 +3024,88 @@ msgstr "Kan inte hitta värd %s."
 #. *  immediately; but not HTAlert, because typically
 #. *  there will be other alerts from the callers. - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1589 WWW/Library/Implementation/HTTelnet.c:103
+#: WWW/Library/Implementation/HTTCP.c:1575 WWW/Library/Implementation/HTTelnet.c:103
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ogiltigt värdnamn %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1603
+#: WWW/Library/Implementation/HTTCP.c:1589
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Kopplar upp %s-anslutning till %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1619
+#: WWW/Library/Implementation/HTTCP.c:1605
 #, 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:1628
+#: WWW/Library/Implementation/HTTCP.c:1614
 msgid "socket failed."
 msgstr "uttag misslyckades."
 
-#: WWW/Library/Implementation/HTTCP.c:1648
+#: WWW/Library/Implementation/HTTCP.c:1634
 msgid "Could not make connection non-blocking."
 msgstr "Kunde inte koppla upp icke-blockerande anslutning."
 
-#: WWW/Library/Implementation/HTTCP.c:1717
+#: WWW/Library/Implementation/HTTCP.c:1703
 msgid "Connection failed (too many retries)."
 msgstr "Uppkoppling misslyckades (för många försök)."
 
-#: WWW/Library/Implementation/HTTCP.c:1910
+#: WWW/Library/Implementation/HTTCP.c:1896
 msgid "Could not restore socket to blocking."
 msgstr "Kunde inte återställa blockering i uttag."
 
-#: WWW/Library/Implementation/HTTCP.c:1976
+#: WWW/Library/Implementation/HTTCP.c:1962
 msgid "Socket read failed for 180,000 tries."
 msgstr "Läsning från uttag misslyckades 180.000 gånger."
 
-#: WWW/Library/Implementation/HTTP.c:466
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr "Adress innehåller användar-id: %s"
+
+#: WWW/Library/Implementation/HTTP.c:503
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Denna klient innehåller inte stöd för HTTPS-adresser."
 
-#: WWW/Library/Implementation/HTTP.c:491
+#: WWW/Library/Implementation/HTTP.c:528
 msgid "Unable to connect to remote host."
 msgstr "Kan inte ansluta till värd."
 
-#: WWW/Library/Implementation/HTTP.c:1005
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr "Gör nytt försök; ansluter utan TLS."
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr "SSL-fel:Hittar inte vanligt namn i certifikat-Fortsätta?"
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr "SSL-fel:värd(%s)!=cert(%s)-Fortsätta?"
+
+# %d = SSL_get_cipher_bits(handle,NULL)
+# %s = SSL_get_cipher_version(handle)
+# %s = SSL_get_cipher(handle)
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr "Säker %d-bitars HTTP-anslutning med %s (%s)"
+
+#: WWW/Library/Implementation/HTTP.c:1091
 msgid "Sending HTTP request."
 msgstr "Sänder HTTP-fråga."
 
-#: WWW/Library/Implementation/HTTP.c:1039
+#: WWW/Library/Implementation/HTTP.c:1125
 msgid "Unexpected network write error; connection aborted."
 msgstr "Oväntat skrivfel på nätverket; uppkopplingen avbröts."
 
-#: WWW/Library/Implementation/HTTP.c:1045
+#: WWW/Library/Implementation/HTTP.c:1131
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP-fråga sänd; väntar på svar."
 
-#: WWW/Library/Implementation/HTTP.c:1109
+#: WWW/Library/Implementation/HTTP.c:1195
 msgid "Unexpected network read error; connection aborted."
 msgstr "Oväntat läsfel på nätverket; uppkopplingen avbröts."
 
@@ -3084,7 +3119,7 @@ msgstr "Oväntat läsfel på nätverket; uppkopplingen avbröts."
 #. **	so we'll deal with them by showing the full
 #. **	header to the user as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1305
+#: WWW/Library/Implementation/HTTP.c:1391
 msgid "Got unexpected Informational Status."
 msgstr "Fick oväntad informationsstatus."
 
@@ -3095,7 +3130,7 @@ msgstr "Fick oväntad informationsstatus."
 #. *  user to do that, and restore the current
 #. *  document. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1340
+#: WWW/Library/Implementation/HTTP.c:1426
 msgid "Request fulfilled.  Reset Content."
 msgstr "Frågan slutförd. Nollställ innehåll."
 
@@ -3106,27 +3141,27 @@ msgstr "Frågan slutförd. Nollställ innehåll."
 #. *  with it by showing the full header to the user
 #. *  as text/plain. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1459
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Fick oväntad \"ej modifierad\"-(304)-status."
 
-#: WWW/Library/Implementation/HTTP.c:1526
+#: WWW/Library/Implementation/HTTP.c:1612
 msgid "Redirection of POST content requires user approval."
 msgstr "Omdirigering av POST-innehåll kräver användarens samtycke."
 
-#: WWW/Library/Implementation/HTTP.c:1541
+#: WWW/Library/Implementation/HTTP.c:1627
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Har POST-innehåll. Behandlar permanent omdirigering som temporär.\n"
 
-#: WWW/Library/Implementation/HTTP.c:1586
+#: WWW/Library/Implementation/HTTP.c:1672
 msgid "Retrying with access authorization information."
 msgstr "Försöker igen med auktoriseringsinformation."
 
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1684
 msgid "Show the 401 message body?"
 msgstr "Visa kroppen för 401-meddelandet?"
 
-#: WWW/Library/Implementation/HTTP.c:1643
+#: WWW/Library/Implementation/HTTP.c:1729
 msgid "Show the 407 message body?"
 msgstr "Via kroppen för 407-meddelandet?"
 
@@ -3135,7 +3170,7 @@ msgstr "Via kroppen för 407-meddelandet?"
 #. **	Take a chance and hope there is
 #. **	something to display. - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1748
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Unknown status reply from server!"
 msgstr "Okänt statussvar från server!"
 
@@ -3217,27 +3252,27 @@ msgstr ""
 "\n"
 "Kodfält, kan inte visa\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:691
+#: WWW/Library/Implementation/HTWAIS.c:689
 msgid "Syntax error in WAIS URL"
 msgstr "Syntaxfel i WAIS-adress"
 
-#: WWW/Library/Implementation/HTWAIS.c:761
+#: WWW/Library/Implementation/HTWAIS.c:759
 msgid " (WAIS Index)"
 msgstr " (WAIS-index)"
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:766
 msgid "WAIS Index: "
 msgstr "WAIS-index: "
 
-#: WWW/Library/Implementation/HTWAIS.c:774
+#: WWW/Library/Implementation/HTWAIS.c:772
 msgid "This is a link for searching the "
 msgstr "Detta är en länk för att söka i "
 
-#: WWW/Library/Implementation/HTWAIS.c:778
+#: WWW/Library/Implementation/HTWAIS.c:776
 msgid " WAIS Index.\n"
 msgstr " WAIS-index.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:805
+#: WWW/Library/Implementation/HTWAIS.c:803
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
@@ -3245,48 +3280,48 @@ msgstr ""
 "\n"
 "Välj S=sök och ange sedan sökord.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:827
+#: WWW/Library/Implementation/HTWAIS.c:825
 msgid " (in "
 msgstr " (i "
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:834
 msgid "WAIS Search of \""
 msgstr "WAIS-sökning efter \""
 
-#: WWW/Library/Implementation/HTWAIS.c:840
+#: WWW/Library/Implementation/HTWAIS.c:838
 msgid "\" in: "
 msgstr "\" i: "
 
-#: WWW/Library/Implementation/HTWAIS.c:855
+#: WWW/Library/Implementation/HTWAIS.c:853
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: Fråga för stor."
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:862
 msgid "Searching WAIS database..."
 msgstr "Söker WAIS-databas..."
 
-#: WWW/Library/Implementation/HTWAIS.c:874
+#: WWW/Library/Implementation/HTWAIS.c:872
 msgid "Search interrupted."
 msgstr "Sökning avbruten."
 
-#: WWW/Library/Implementation/HTWAIS.c:924
+#: WWW/Library/Implementation/HTWAIS.c:922
 msgid "Can't convert format of WAIS document"
 msgstr "Kan inte konvertera WAIS-dokumentformat"
 
-#: WWW/Library/Implementation/HTWAIS.c:968
+#: WWW/Library/Implementation/HTWAIS.c:966
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: Fråga för lång."
 
 #.
 #. **	Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:982
+#: WWW/Library/Implementation/HTWAIS.c:980
 msgid "Fetching WAIS document..."
 msgstr "Hämtar WAIS-dokument..."
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1021
+#: WWW/Library/Implementation/HTWAIS.c:1019
 msgid "No text was returned!\n"
 msgstr "Ingen text returnerades!\n"
 
@@ -3306,166 +3341,160 @@ msgstr " beskrivning"
 msgid "Access links"
 msgstr "Åtkomstlänkar"
 
-#: WWW/Library/Implementation/HTWSRC.c:345
+#: WWW/Library/Implementation/HTWSRC.c:346
 msgid "Direct access"
 msgstr "Direktåtkomst"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:348
+#: WWW/Library/Implementation/HTWSRC.c:349
 msgid " (or via proxy server, if defined)"
 msgstr " (eller via mellanserver, om angiven)"
 
-#: WWW/Library/Implementation/HTWSRC.c:363
+#: WWW/Library/Implementation/HTWSRC.c:364
 msgid "Maintainer"
 msgstr "Ansvarig"
 
-#: WWW/Library/Implementation/HTWSRC.c:371
+#: WWW/Library/Implementation/HTWSRC.c:372
 msgid "Host"
 msgstr "Värd"
 
-#: src/GridText.c:607
+#: src/GridText.c:688
 msgid "Memory exhausted, display interrupted!"
 msgstr "Minnet slut, visning avbruten!"
 
-#: src/GridText.c:612
+#: src/GridText.c:693
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Minnet slut, avbryter överföring!"
 
-#: src/GridText.c:3395
+#: src/GridText.c:3578
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** MINNET SLUT ***"
 
-#: src/GridText.c:5733 src/GridText.c:5740 src/LYList.c:258
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
 msgid "unknown field or link"
 msgstr "okänt fält eller länk"
 
-#: src/GridText.c:5749
+#: src/GridText.c:6023
 msgid "text entry field"
 msgstr "textinmatningsfält"
 
-#: src/GridText.c:5752
+#: src/GridText.c:6026
 msgid "password entry field"
 msgstr "lösenordsinmatningsfält"
 
-#: src/GridText.c:5755
+#: src/GridText.c:6029
 msgid "checkbox"
 msgstr "kryssruta"
 
-#: src/GridText.c:5758
+#: src/GridText.c:6032
 msgid "radio button"
 msgstr "radioknapp"
 
-#: src/GridText.c:5761
+#: src/GridText.c:6035
 msgid "submit button"
 msgstr "sändknapp"
 
-#: src/GridText.c:5764
+#: src/GridText.c:6038
 msgid "reset button"
 msgstr "nollställningsknapp"
 
-#: src/GridText.c:5767
+#: src/GridText.c:6041
 msgid "popup menu"
 msgstr "popup-meny"
 
-#: src/GridText.c:5770
+#: src/GridText.c:6044
 msgid "hidden form field"
 msgstr "dolt formulärfält"
 
-#: src/GridText.c:5773
+#: src/GridText.c:6047
 msgid "text entry area"
 msgstr "textinmatningsområde"
 
-#: src/GridText.c:5776
+#: src/GridText.c:6050
 msgid "range entry field"
 msgstr "områdesinmatningsfält"
 
-#: src/GridText.c:5779
+#: src/GridText.c:6053
 msgid "file entry field"
 msgstr "filinmatningsfält"
 
-#: src/GridText.c:5782
+#: src/GridText.c:6056
 msgid "text-submit field"
 msgstr "textsändfält"
 
-#: src/GridText.c:5785
+#: src/GridText.c:6059
 msgid "image-submit button"
 msgstr "bildsändfält"
 
-#: src/GridText.c:5788
+#: src/GridText.c:6062
 msgid "keygen field"
 msgstr "nyckelgenerering misslyckades"
 
-#: src/GridText.c:5791
+#: src/GridText.c:6065
 msgid "unknown form field"
 msgstr "okänt formulärfält"
 
-#. We can't open the file, what do we do?
-#: src/GridText.c:10348
+#: src/GridText.c:10066
 msgid "Can't open file for uploading"
 msgstr "Kan inte öppna fil för sändning"
 
-#. We got an error reading the file, what do we do?
-#: src/GridText.c:10359
-msgid "Short read from file, problem?"
-msgstr "Filen tog slut tidigt, problem?"
-
-#: src/GridText.c:10721
+#: src/GridText.c:11218
 #, c-format
 msgid "Submitting %s"
 msgstr "Skickar %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:11887
+#: src/GridText.c:12375
 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:12092
+#: src/GridText.c:12581
 msgid "Wrap lines to fit displayed area?"
 msgstr "Ombryt rader så att de passar i visat fält?"
 
-#: src/GridText.c:12144
+#: src/GridText.c:12633
 msgid "Very long lines have been wrapped!"
 msgstr "Mycket långa rader har ombrutits!"
 
-#: src/GridText.c:12591
+#: src/GridText.c:13079
 msgid "Very long lines have been truncated!"
 msgstr "mycket långa rader har trunkerats!"
 
-#: src/HTAlert.c:155 src/LYShowInfo.c:318
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
 msgid "bytes"
 msgstr "byte"
 
-#: src/HTAlert.c:156
+#: src/HTAlert.c:155
 msgid "KB"
 msgstr "KB"
 
-#: src/HTAlert.c:255
+#: src/HTAlert.c:274
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "Läste %s av %s data"
 
-#: src/HTAlert.c:257
+#: src/HTAlert.c:276
 #, c-format
 msgid "Read %s of data"
 msgstr "Läste %s data"
 
-#: src/HTAlert.c:262
+#: src/HTAlert.c:281
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s/s"
 
-#: src/HTAlert.c:269
+#: src/HTAlert.c:290
 #, c-format
-msgid " (stalled for %ld sec)"
-msgstr " (avstannad i %lds)"
+msgid " (stalled for %s)"
+msgstr " (avstannad i %s)"
 
-#: src/HTAlert.c:271
+#: src/HTAlert.c:294
 #, c-format
-msgid ", ETA %ld sec"
-msgstr ", %lds kvar"
+msgid ", ETA %s"
+msgstr ", %s kvar"
 
-#: src/HTAlert.c:277
+#: src/HTAlert.c:301
 msgid " (Press 'z' to abort)"
 msgstr " (\"z\" avbryter)"
 
@@ -3494,43 +3523,43 @@ msgstr " (\"z\" avbryter)"
 #. *  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:334
+#: src/HTAlert.c:342 src/HTAlert.c:390
 msgid "yes"
 msgstr "ja"
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:345 src/HTAlert.c:391
 msgid "no"
 msgstr "nej"
 
-#: src/HTML.c:6342
+#: src/HTML.c:5985
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: src/HTML.c:6347
+#: src/HTML.c:5990
 msgid "(none)"
 msgstr "(ingen)"
 
-#: src/HTML.c:6351
+#: src/HTML.c:5994
 msgid "Filepath:"
 msgstr "Sökväg:"
 
-#: src/HTML.c:6356
+#: src/HTML.c:5999
 msgid "(unknown)"
 msgstr "(okänd)"
 
-#: src/HTML.c:7804
+#: src/HTML.c:7452
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokumentet innehåller endast dolda länkar. Använd \"l\"istkommandot."
 
-#: src/HTML.c:8328
+#: src/HTML.c:7958
 msgid "Source cache error - disk full?"
 msgstr "Källkodscachefel - disk full?"
 
-#: src/HTML.c:8341
+#: src/HTML.c:7971
 msgid "Source cache error - not enough memory!"
 msgstr "Källkodscachefel - minnet slut!"
 
-#: src/LYBookmark.c:166
+#: src/LYBookmark.c:167
 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"
@@ -3542,7 +3571,7 @@ msgstr ""
 "     kommandot radera bokmärke, vilket vanligtvis nås via tangenten \"R\",\n"
 "     men som kan ha ändrats av dig eller din systemadministratör."
 
-#: src/LYBookmark.c:382
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
@@ -3550,7 +3579,7 @@ msgstr ""
 "     Du kan ta bort länkar med \"R\"-tangenten<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:385
+#: src/LYBookmark.c:382
 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"
@@ -3560,7 +3589,7 @@ msgstr ""
 "     nås via tangenten \"R\", men som kan ha ändrats av dig eller din\n"
 "     systemadministratör."
 
-#: src/LYBookmark.c:389
+#: src/LYBookmark.c:386
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3569,7 +3598,7 @@ msgstr ""
 "     att ta bort föråldrade eller ogiltiga länkar, eller ändra den inbördes\n"
 "     ordningen."
 
-#: src/LYBookmark.c:392
+#: src/LYBookmark.c:389
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3581,7 +3610,7 @@ msgstr ""
 "      eller lägga till annan HTML-kod.\n"
 "      Se till att alla bokmärkeslänkar lagras som enskilda rader."
 
-#: src/LYBookmark.c:683
+#: src/LYBookmark.c:681
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr "Filen kan kanske återskapas från %s under denna session"
@@ -3590,71 +3619,71 @@ msgstr "Filen kan kanske återskapas från %s under denna session"
 #. *  Neither the path as given nor any components examined by
 #. *  backing up were stat()able. - kw
 #.
-#: src/LYCgi.c:232
+#: src/LYCgi.c:231
 msgid "Unable to access cgi script"
 msgstr "Kan inte nå cgi-skript"
 
-#: src/LYCgi.c:651 src/LYCgi.c:654
+#: src/LYCgi.c:654 src/LYCgi.c:657
 msgid "Good Advice"
 msgstr "Gott råd"
 
-#: src/LYCgi.c:657
+#: src/LYCgi.c:660
 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:664
+#: src/LYCgi.c:667
 msgid "this link"
 msgstr "denna länk"
 
-#: src/LYCgi.c:668
+#: src/LYCgi.c:671
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Den ger förstklassigt stöd för CGI-skript.\n"
 
-#: src/LYClean.c:108
+#: src/LYClean.c:122
 msgid "Exiting via interrupt:"
 msgstr "Avslutar via avbrott:"
 
-#: src/LYCookie.c:2659
+#: src/LYCookie.c:2462
 msgid "(from a previous session)"
 msgstr "(från en tidigare session)"
 
-#: src/LYCookie.c:2719
+#: src/LYCookie.c:2522
 msgid "Maximum Gobble Date:"
 msgstr "Maximalt ätdatum:"
 
-#: src/LYCookie.c:2764
+#: src/LYCookie.c:2564
 msgid "Internal"
 msgstr "Intern"
 
-#: src/LYCookie.c:2765
+#: src/LYCookie.c:2565
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "\"cookie_domain_flag_set\"-fel, avbryter programmet"
 
-#: src/LYCurses.c:936
+#: src/LYCurses.c:1004
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Terminalinitiering misslyckades - okänd terminaltyp?"
 
-#: src/LYCurses.c:1328
+#: src/LYCurses.c:1426
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1332
+#: src/LYCurses.c:1430
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Du måste använda en vt100-, -200-, etc. -terminal med detta program."
 
-#: src/LYCurses.c:1384
+#: src/LYCurses.c:1480
 msgid "Your Terminal type is unknown!"
 msgstr "Din terminaltyp är okänd!"
 
-#: src/LYCurses.c:1385
+#: src/LYCurses.c:1481
 msgid "Enter a terminal type:"
 msgstr "Ange en terminaltyp:"
 
-#: src/LYCurses.c:1398
+#: src/LYCurses.c:1495
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINALTYP SATT TILL"
 
-#: src/LYCurses.c:1749
+#: src/LYCurses.c:1994
 #, c-format
 msgid ""
 "\n"
@@ -3663,7 +3692,7 @@ msgstr ""
 "\n"
 "Ett fatalt fel har uppstått i %s ver. %s\n"
 
-#: src/LYCurses.c:1751
+#: src/LYCurses.c:1996
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -3679,136 +3708,161 @@ msgstr ""
 "felet uppstår, namn och versionsnummer på operativsystemet, använd TCP/IP-\n"
 "implementation, TRACEBACK om den kan fås, och all annan relevant information.\n"
 
-#: src/LYEdit.c:264
+#: src/LYEdit.c:249
 msgid "Editor killed by signal"
 msgstr "Redigeringsprogram dödat av signal"
 
-#: src/LYEdit.c:266
+#: src/LYEdit.c:251
 #, c-format
 msgid "Editor returned with error status, %s"
 msgstr "Redigeringsprogrammet gav felstatus %s"
 
-#: src/LYEdit.c:267
+#: src/LYEdit.c:252
 msgid "reason unknown."
 msgstr "okänd anledning."
 
-#: src/LYDownload.c:520
+#: src/LYDownload.c:517
 msgid "Downloaded link:"
 msgstr "Hämtad länk:"
 
-#: src/LYDownload.c:525
+#: src/LYDownload.c:522
 msgid "Suggested file name:"
 msgstr "Föreslaget filnamn:"
 
-#: src/LYDownload.c:530
+#: src/LYDownload.c:527
 msgid "Standard download options:"
 msgstr "Fördefinierade hämtalternativ:"
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:528
 msgid "Download options:"
 msgstr "Hämtalternativ:"
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:544
 msgid "Save to disk"
 msgstr "Spara på disk"
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "Visa filen "
+
+#: src/LYDownload.c:565
 msgid "Save to disk disabled."
 msgstr "\"Spara på disk\" deaktiverad."
 
-#: src/LYDownload.c:551 src/LYPrint.c:1338
+#: src/LYDownload.c:569 src/LYPrint.c:1327
 msgid "Local additions:"
 msgstr "Lokala tillägg:"
 
-#: src/LYDownload.c:560 src/LYUpload.c:224
+#: src/LYDownload.c:578 src/LYUpload.c:216
 msgid "No Name Given"
 msgstr "Inget namn har angetts"
 
-#: src/LYHistory.c:633
+#: src/LYHistory.c:657
 msgid "You selected:"
 msgstr "Du valde:"
 
-#: src/LYHistory.c:657 src/LYHistory.c:905
+#: src/LYHistory.c:681 src/LYHistory.c:921
 msgid "(no address)"
 msgstr "(ingen adress)"
 
-#: src/LYHistory.c:661
+#: src/LYHistory.c:685
 msgid " (internal)"
 msgstr " (intern)"
 
-#: src/LYHistory.c:663
+#: src/LYHistory.c:687
 msgid " (was internal)"
 msgstr " (var intern)"
 
-#: src/LYHistory.c:761
+#: src/LYHistory.c:785
 msgid " (From History)"
 msgstr " (Från historik)"
 
-#: src/LYHistory.c:825
+#: src/LYHistory.c:841
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "Du besökte (POST, bokmärkes-, meny- och listfiler ej medräknade):"
 
-#: src/LYHistory.c:1124
+#: src/LYHistory.c:1137
 msgid "(No messages yet)"
 msgstr "(Inga meddelanden ännu)"
 
-#: src/LYLeaks.c:78
+#: src/LYLeaks.c:209
 msgid "Invalid pointer detected."
 msgstr "Ogiltig pekare upptäckt."
 
-#: src/LYLeaks.c:80 src/LYLeaks.c:117
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr "Sekvens:"
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
 msgid "Pointer:"
 msgstr "Pekare:"
 
-#: src/LYLeaks.c:91 src/LYLeaks.c:98 src/LYLeaks.c:136
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
 msgid "FileName:"
 msgstr "Filnamn:"
 
-#: src/LYLeaks.c:94 src/LYLeaks.c:101 src/LYLeaks.c:139 src/LYLeaks.c:150
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
 msgid "LineCount:"
 msgstr "Radnummer:"
 
-#: src/LYLeaks.c:115
+#: src/LYLeaks.c:249
 msgid "Memory leak detected."
 msgstr "Minnesläcka upptäckt."
 
-#: src/LYLeaks.c:120
+#: src/LYLeaks.c:257
 msgid "Contains:"
 msgstr "Innehåller:"
 
-#: src/LYLeaks.c:133
+#: src/LYLeaks.c:270
 msgid "ByteSize:"
 msgstr "Bytestorlek:"
 
-#: src/LYLeaks.c:147
+#: src/LYLeaks.c:284
 msgid "realloced:"
 msgstr "omallokerad:"
 
-#: src/LYLeaks.c:170
+#: src/LYLeaks.c:307
 msgid "Total memory leakage this run:"
 msgstr "Totalt minnesläckage denna körning:"
 
-#: src/LYList.c:91
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr "Mesta allokering"
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr "Byte allokerade"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr "Totalt antal malloc"
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr "Totalt antal free"
+
+#: src/LYList.c:85
 msgid "References in "
 msgstr "Referenser i "
 
-#: src/LYList.c:92
+#: src/LYList.c:86
 msgid "this document:"
 msgstr "detta dokument:"
 
-#: src/LYList.c:98
+#: src/LYList.c:92
 msgid "Visible links:"
 msgstr "Besökta länkar:"
 
-#: src/LYList.c:199 src/LYList.c:319
+#: src/LYList.c:194 src/LYList.c:315
 msgid "Hidden links:"
 msgstr "Dolda länkar:"
 
-#: src/LYList.c:267
+#: src/LYList.c:262
 msgid "References"
 msgstr "Referenser"
 
-#: src/LYList.c:269
+#: src/LYList.c:264
 msgid "Visible links"
 msgstr "Synliga länkar"
 
@@ -3821,314 +3875,314 @@ msgstr "Kan inte ta status på \"%s\"."
 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:383
+#: src/LYLocal.c:366
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Kan inte %s på grund av systemfel!"
 
 #. error return
-#: src/LYLocal.c:415
+#: src/LYLocal.c:400
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Möjligt misslyckande i %s på grund av systemfel!"
 
-#: src/LYLocal.c:453
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "ta bort %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr "ändra datum på %s"
+
+#: src/LYLocal.c:508
 #, c-format
 msgid "move %s to %s"
 msgstr "flytta %s till %s"
 
-#: src/LYLocal.c:475
+#: src/LYLocal.c:548
 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:477
+#: src/LYLocal.c:550
 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:479
+#: src/LYLocal.c:552
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Angivet filnamn används redan! Begäran ignoreras."
 
-#: src/LYLocal.c:490
+#: src/LYLocal.c:563
 msgid "Destination has different owner!  Request denied."
 msgstr "Målet har annan ägare! Begäran avvisas."
 
-#: src/LYLocal.c:493
+#: src/LYLocal.c:566
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Målet är inte en giltig katalog! Begäran avvisas."
 
-#: src/LYLocal.c:516
+#: src/LYLocal.c:588
 msgid "Remove all tagged files and directories?"
 msgstr "Ta bort alla markerade filer och kataloger?"
 
-#: src/LYLocal.c:537
-#, c-format
-msgid "remove %s"
-msgstr "ta bort %s"
-
-#: src/LYLocal.c:580
+#: src/LYLocal.c:647
 msgid "Enter new location for tagged items: "
 msgstr "Ange ny plats för markerade poster: "
 
-#: src/LYLocal.c:649
+#: src/LYLocal.c:716
 msgid "Path too long"
 msgstr "Sökväg för lång"
 
-#: src/LYLocal.c:680
+#: src/LYLocal.c:747
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Källa och mål är samma - begäran ignoreras!"
 
-#: src/LYLocal.c:738
+#: src/LYLocal.c:805
 msgid "Enter new name for directory: "
 msgstr "Ange nytt namn för katalog: "
 
-#: src/LYLocal.c:740
+#: src/LYLocal.c:807
 msgid "Enter new name for file: "
 msgstr "Ange nytt namn för fil: "
 
-#: src/LYLocal.c:751
+#: src/LYLocal.c:819
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Felaktigt tecken (sökvägsavdelare) funnen! Begäran ignorerad."
 
-#: src/LYLocal.c:800
+#: src/LYLocal.c:868
 msgid "Enter new location for directory: "
 msgstr "Ange ny plats för katalog: "
 
-#: src/LYLocal.c:802
+#: src/LYLocal.c:874
 msgid "Enter new location for file: "
 msgstr "Ange ny plats för fil: "
 
-#: src/LYLocal.c:827
+#: src/LYLocal.c:901
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Oväntat misslyckande - kan inte hitta avslutande sökvägsavdelare"
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:921
 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:894
+#: src/LYLocal.c:970
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Ända N=namn, L=plats eller P=behörighet? "
 
-#: src/LYLocal.c:896
+#: src/LYLocal.c:972
 msgid "Modify name or location (n or l): "
 msgstr "Ändra N=namn eller L=plats? "
 
 #.
 #. *	Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:925
+#: src/LYLocal.c:1001
 msgid "This feature not yet implemented!"
 msgstr "Denna funktion är ännu ej implementerad!"
 
-#: src/LYLocal.c:943
+#: src/LYLocal.c:1019
 msgid "Enter name of file to create: "
 msgstr "Ange namn på fil att skapa: "
 
-#: src/LYLocal.c:951 src/LYLocal.c:999
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Felaktig omdirigering \"//\" funnen! Begäran ignoreras."
 
-#: src/LYLocal.c:966
-#, c-format
-msgid "create %s"
-msgstr "skapa %s"
-
-#: src/LYLocal.c:991
+#: src/LYLocal.c:1061
 msgid "Enter name for new directory: "
 msgstr "Ange namn på ny katalog: "
 
-#: src/LYLocal.c:1042
+#: src/LYLocal.c:1106
 msgid "Create file or directory (f or d): "
 msgstr "Skapa F=fil eller D=katalog? "
 
-#: src/LYLocal.c:1083
+#: src/LYLocal.c:1146
 #, c-format
 msgid "Remove '%s' and all of its contents?"
 msgstr "Ta bort \"%s\" och allt dess innehåll?"
 
-#: src/LYLocal.c:1086
+#: src/LYLocal.c:1149
 msgid "Remove directory and all of its contents?"
 msgstr "Ta bort katalog och allt dess innehåll?"
 
-#: src/LYLocal.c:1090
+#: src/LYLocal.c:1153
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Ta bort fil \"%s\"?"
 
-#: src/LYLocal.c:1092
+#: src/LYLocal.c:1155
 msgid "Remove file?"
 msgstr "Ta bort fil?"
 
-#: src/LYLocal.c:1097
+#: src/LYLocal.c:1160
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Ta bort symbolisk länk \"%s\"?"
 
-#: src/LYLocal.c:1099
+#: src/LYLocal.c:1162
 msgid "Remove symbolic link?"
 msgstr "Ta bort symbolisk länk?"
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1248
 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:1220
+#: src/LYLocal.c:1278
 msgid "Unable to open permit options file"
 msgstr "Kan inte öppna behörighetsalternativfil"
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1305
 msgid "Specify permissions below:"
 msgstr "Ange behörighet nedan:"
 
-#: src/LYLocal.c:1248 src/LYShowInfo.c:196
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
 msgid "Owner:"
 msgstr "Ägare:"
 
-#: src/LYLocal.c:1264
+#: src/LYLocal.c:1322
 msgid "Group"
 msgstr "Grupp"
 
-#: src/LYLocal.c:1280
+#: src/LYLocal.c:1338
 msgid "Others:"
 msgstr "Övriga:"
 
-#: src/LYLocal.c:1298
+#: src/LYLocal.c:1356
 msgid "form to permit"
 msgstr "formulär för att ändra behörighet för"
 
-#: src/LYLocal.c:1396
+#: src/LYLocal.c:1452
 msgid "Invalid mode format."
 msgstr "Ogiltigt format på behörighet."
 
-#: src/LYLocal.c:1400
+#: src/LYLocal.c:1456
 msgid "Invalid syntax format."
 msgstr "Ogiltig syntaxformat."
 
-#: src/LYLocal.c:1575
-msgid "NULL URL pointer"
-msgstr "URL-pekare är NULL"
-
-#: src/LYLocal.c:1670
+#: src/LYLocal.c:1645
 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:1782
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr "URL-pekare är NULL"
+
+#: src/LYLocal.c:1908
 #, c-format
 msgid "Executing %s "
 msgstr "Kör %s "
 
-#: src/LYLocal.c:1785
+#: src/LYLocal.c:1911
 msgid "Executing system command. This might take a while."
 msgstr "Kör systemkommando. Detta kan ta en stund."
 
-#: src/LYLocal.c:1831
-msgid "Unable to open file management menu file."
-msgstr "Kan inte öppna filhanteringsmenyfil."
-
-#: src/LYLocal.c:1862
+#: src/LYLocal.c:1985
 msgid "Current directory:"
 msgstr "Aktuell katalog:"
 
-#: src/LYLocal.c:1865 src/LYLocal.c:1883
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
 msgid "Current selection:"
 msgstr "Aktuell markering:"
 
-#: src/LYLocal.c:1869
+#: src/LYLocal.c:1992
 msgid "Nothing currently selected."
 msgstr "Ingenting har markerats."
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged item:"
 msgstr "markerad post:"
 
-#: src/LYLocal.c:1884
+#: src/LYLocal.c:2007
 msgid "tagged items:"
 msgstr "markerade poster:"
 
-#: src/LYLocal.c:1983 src/LYLocal.c:1994
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
 msgid "Illegal filename; request ignored."
 msgstr "Ogiltigt filnamn; begäran ignorerad."
 
-#: src/LYLocal.c:2137
-msgid "The selected item is not a directory!  Request ignored."
-msgstr "Vald post är inte en katalog! Begäran ignorerad."
-
 #. directory not writable
-#: src/LYLocal.c:2141
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
 msgid "Install in the selected directory not permitted."
 msgstr "Installation i vald katalog ej tillåten."
 
-#: src/LYLocal.c:2146
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr "Vald post är inte en katalog! Begäran ignorerad."
+
+#: src/LYLocal.c:2276
 msgid "Just a moment, ..."
 msgstr "Ett ögonblick, ..."
 
-#: src/LYLocal.c:2163
+#: src/LYLocal.c:2293
 msgid "Error buiding install args"
 msgstr "Fel vid uppbyggning av installationsflaggor"
 
-#: src/LYLocal.c:2178 src/LYLocal.c:2210
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Källa och mål är samma: %s"
 
-#: src/LYLocal.c:2188 src/LYLocal.c:2220
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Redan i målkatalog: %s"
 
-#: src/LYLocal.c:2238
+#: src/LYLocal.c:2362
 msgid "Installation complete"
 msgstr "Installation färdig"
 
-#: src/LYLocal.c:2427
+#: src/LYLocal.c:2551
 msgid "Temporary URL or list would be too long."
 msgstr "Temporär adress eller lista skulle vara för lång."
 
-#: src/LYMail.c:503
+#: src/LYMail.c:534
 msgid "Sending"
 msgstr "Skickar"
 
-#: src/LYMail.c:989
+#: src/LYMail.c:1024
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "Länken %s :?: %s \n"
 
-#: src/LYMail.c:991
+#: src/LYMail.c:1026
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "anropade \"%s\"\n"
 
-#: src/LYMail.c:992
+#: src/LYMail.c:1027
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "i filen \"%s\" anropade \"%s\"\n"
 
-#: src/LYMail.c:993
+#: src/LYMail.c:1028
 msgid "was requested but was not available."
 msgstr "efterfrågades men var inte tillgänglig."
 
-#: src/LYMail.c:994
+#: src/LYMail.c:1029
 msgid "Thought you might want to know."
 msgstr "Tänkte att du kanske ville veta."
 
-#: src/LYMail.c:996
+#: src/LYMail.c:1031
 msgid "This message was automatically generated by"
 msgstr "Detta meddelande automatgenererades av"
 
-#: src/LYMain.c:897
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr "E-postprogram inte konfigurerat i systemet"
+
+#: src/LYMain.c:969
 msgid "No Winsock found, sorry."
 msgstr "Ingen Winsock hittades, ursäkta."
 
-#: src/LYMain.c:1103
+#: src/LYMain.c:1170
 msgid "You MUST define a valid TMP or TEMP area!\n"
 msgstr "Du MÅSTE ange ett giltigt TMP- eller TEMP-område!\n"
 
-#: src/LYMain.c:1156 src/LYMainLoop.c:5117
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
 msgid "No such directory"
 msgstr "Katalogen finns ej"
 
-#: src/LYMain.c:1378
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4139,7 +4193,7 @@ msgstr ""
 "Konfigurationsfil %s ej tillgänglig.\n"
 "\n"
 
-#: src/LYMain.c:1388
+#: src/LYMain.c:1446
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
@@ -4149,7 +4203,7 @@ msgstr ""
 "Lynxteckenuppsättningar ej deklarerade.\n"
 "\n"
 
-#: src/LYMain.c:1417
+#: src/LYMain.c:1475
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
@@ -4159,7 +4213,7 @@ msgstr ""
 "Lynxredigeringskarta ej deklarerad.\n"
 "\n"
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1504
 #, c-format
 msgid ""
 "\n"
@@ -4170,60 +4224,60 @@ msgstr ""
 "Lynxfil %s ej tillgänglig.\n"
 "\n"
 
-#: src/LYMain.c:1704
+#: src/LYMain.c:1743
 msgid "Warning:"
 msgstr "Varning:"
 
-#: src/LYMain.c:2247
+#: src/LYMain.c:2293
 msgid "persistent cookies state will be changed in next session only."
 msgstr "varaktiga kakinställningar ändras endast i nästa session."
 
-#: src/LYMain.c:2477 src/LYMain.c:2525
+#: src/LYMain.c:2540 src/LYMain.c:2588
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignorerar okänd teckenuppsättning %s\n"
 
-#: src/LYMain.c:3047
-#, c-format
-msgid "%s Version %s (%s)\n"
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
 msgstr "%s version %s (%s)\n"
 
-#: src/LYMain.c:3072
+#: src/LYMain.c:3143
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Byggd %s %s %s\n"
 
-#: src/LYMain.c:3077
+#: src/LYMain.c:3166
 msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
 msgstr "Upphovsrätten ägs av University of Kansas, CERN, och andra bidragslämnare.\n"
 
-#: src/LYMain.c:3079
+#: src/LYMain.c:3168
 msgid "Distributed under the GNU General Public License.\n"
 msgstr "Distribuerad enligt GNU General Public License.\n"
 
-#: src/LYMain.c:3081
+#: src/LYMain.c:3170
 msgid ""
-"See http://lynx.browser.org/ and the online help for more information.\n"
+"See http://lynx.isc.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
-"Se http://lynx.browser.org/ och direkthjälpen för ytterligare information.\n"
+"Se http://lynx.isc.org/ och direkthjälpen för ytterligare information.\n"
 "\n"
 
-#: src/LYMain.c:3800
+#: src/LYMain.c:3919
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "ANVÄNDNING: %s [flaggor] [fil]\n"
 
-#: src/LYMain.c:3801
+#: src/LYMain.c:3920
 msgid "Options are:\n"
 msgstr "Flaggorna är:\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4191
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Okänd flagga: %s\n"
 
-#: src/LYMainLoop.c:512
+#: src/LYMainLoop.c:539
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "Internt fel: Ogiltig muslänk %d!"
@@ -4231,80 +4285,110 @@ msgstr "Internt fel: Ogiltig muslänk %d!"
 #.
 #. * Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:625 src/LYMainLoop.c:5139
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
 msgid "A URL specified by the user"
 msgstr "En adress angiven av användaren"
 
-#: src/LYMainLoop.c:1114
+#: src/LYMainLoop.c:1110
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "Kodningen multiport/form-data stöds inte ännu! Kan inte skicka."
 
 #.
 #. *  Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3097
+#: src/LYMainLoop.c:3053
 msgid "Help Screen"
 msgstr "Hjälpskärm"
 
-#: src/LYMainLoop.c:3231
+#: src/LYMainLoop.c:3177
 msgid "System Index"
 msgstr "Systemindex"
 
-#: src/LYMainLoop.c:3611 src/LYMainLoop.c:5347
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
 msgid "Entry into main screen"
 msgstr "Ingång till huvudskärm"
 
-#: src/LYMainLoop.c:3897
+#: src/LYMainLoop.c:3824
 msgid "No next document present"
 msgstr "Det finns inget nästa dokument"
 
-#: src/LYMainLoop.c:4206
+#: src/LYMainLoop.c:4131
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "teckenuppsättning för detta dokumentet explicit deklarerat, ursäkta..."
 
-#: src/LYMainLoop.c:5093
+#: src/LYMainLoop.c:5004
 msgid "cd to:"
 msgstr "byt katalog till:"
 
-#: src/LYMainLoop.c:5120
+#: src/LYMainLoop.c:5031
 msgid "A component of path is not a directory"
 msgstr "En del av sökvägen är inte en katalog"
 
-#: src/LYMainLoop.c:5123
+#: src/LYMainLoop.c:5034
 msgid "failed to change directory"
 msgstr "lyckades inte byta katalog"
 
-#: src/LYMainLoop.c:6291
+#: src/LYMainLoop.c:6204
 msgid "Reparsing document under current settings..."
 msgstr "Tolkar om dokumentet med aktuella inställningar..."
 
-#: src/LYMainLoop.c:6579 src/LYMainLoop.c:6583
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fatalt fel - kunde inte öppna utdatafil %s\n"
 
-#: src/LYMainLoop.c:7719 src/LYMainLoop.c:7892
+# Kollas!
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr "Tabellcentrering aktiverad."
+
+# Kollas!
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr "Tabellcentrering inaktiverad."
+
+#: src/LYMainLoop.c:6914
+msgid "Current URL is empty."
+msgstr "Nuvarande adress är tom."
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr "Misslyckades kopiera till urklipp."
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr "Dokumentadress lagd i urklipp."
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr "Länkadress lagd i urklipp."
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr "Ingen adress i urklipp."
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:7829
+#: src/LYMainLoop.c:7731
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Kan inte komma åt startfil"
 
-#: src/LYMainLoop.c:7842
+#: src/LYMainLoop.c:7744
 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:7843
+#: src/LYMainLoop.c:7745
 msgid "      Exiting..."
 msgstr "      Avslutar..."
 
-#: src/LYMainLoop.c:7886
+#: src/LYMainLoop.c:7788
 msgid "-more-"
 msgstr "-mer-"
 
 #. Enable scrolling.
-#: src/LYNews.c:203
+#: src/LYNews.c:187
 msgid "You will be posting to:"
 msgstr "Du kommer att skicka till:"
 
@@ -4312,7 +4396,7 @@ msgstr "Du kommer att skicka till:"
 #. *  Get the mail address for the From header,
 #. *  offering personal_mail_address as default.
 #.
-#: src/LYNews.c:212
+#: src/LYNews.c:196
 msgid ""
 "\n"
 "\n"
@@ -4327,7 +4411,7 @@ msgstr ""
 #. *  document's title as the default if this is a
 #. *  followup rather than a new post. - FM
 #.
-#: src/LYNews.c:230
+#: src/LYNews.c:214
 msgid ""
 "\n"
 "\n"
@@ -4337,7 +4421,7 @@ msgstr ""
 "\n"
 " Ange eller redigera ärenderaden\n"
 
-#: src/LYNews.c:322
+#: src/LYNews.c:303
 msgid ""
 "\n"
 "\n"
@@ -4350,7 +4434,7 @@ msgstr ""
 #.
 #. *  Use the built in line editior.
 #.
-#: src/LYNews.c:379
+#: src/LYNews.c:360
 msgid ""
 "\n"
 "\n"
@@ -4360,93 +4444,112 @@ msgstr ""
 "\n"
 " Skriv ditt inlägg nedan."
 
-#: src/LYNews.c:425
+#: src/LYNews.c:406
 msgid "Message has no original text!"
 msgstr "Inlägget har ingen ursprunglig text!"
 
-#: src/LYOptions.c:743
+#: src/LYOptions.c:746
 msgid "review/edit B)ookmarks files"
 msgstr "se/redigera B)okmärkesfiler"
 
-#: src/LYOptions.c:745
+#: src/LYOptions.c:748
 msgid "B)ookmark file: "
 msgstr "B)okmärkesfil: "
 
-#: src/LYOptions.c:2507 src/LYOptions.c:2531
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Använd %s för att nå alternativmenyn!"
 
-#: src/LYOptions.c:3208
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr "(inställningar markerade med (!) kommer ej att sparas)"
+
+#: src/LYOptions.c:3261
 msgid "General Preferences"
 msgstr "Allmänna inställningar"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3212
+#: src/LYOptions.c:3265
 msgid "User mode"
 msgstr "Användarläge"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3218
+#: src/LYOptions.c:3271
 msgid "Editor"
 msgstr "Redigeringsprogram"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3223
+#: src/LYOptions.c:3276
 msgid "Type of Search"
 msgstr "Söktyp"
 
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3229
+#: src/LYOptions.c:3285
 msgid "Cookies"
 msgstr "Kakor"
 
-#: src/LYOptions.c:3243
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
 msgid "Keyboard Input"
 msgstr "Tangentbordsindata"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3247
+#: src/LYOptions.c:3316
 msgid "Keypad mode"
 msgstr "Numeriskt tangentbord"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3253
+#: src/LYOptions.c:3322
 msgid "Emacs keys"
 msgstr "Emacstangenter"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3259
+#: src/LYOptions.c:3328
 msgid "VI keys"
 msgstr "VI-tangenter"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3266
+#: src/LYOptions.c:3335
 msgid "Line edit style"
 msgstr "Radredigeringsstil"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3278
+#: src/LYOptions.c:3347
 msgid "Keyboard layout"
 msgstr "Tangentbordsmall"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3291
+#: src/LYOptions.c:3360
 msgid "Display and Character Set"
 msgstr "Visning och teckenuppsättning"
 
 #. ***************************************************************
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3295
+#: src/LYOptions.c:3364
 msgid "Display character set"
 msgstr "Teckenuppsättning för visning"
 
-#: src/LYOptions.c:3324
+#: src/LYOptions.c:3393
 msgid "Assumed document character set"
 msgstr "Förvald dokumentteckenuppsättning"
 
@@ -4455,202 +4558,216 @@ msgstr "Förvald dokumentteckenuppsättning"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3344
+#: src/LYOptions.c:3413
 msgid "CJK mode"
 msgstr "CJK-läge"
 
-#: src/LYOptions.c:3346
+#: src/LYOptions.c:3415
 msgid "Raw 8-bit"
 msgstr "Rå 8-bitars"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3354
+#: src/LYOptions.c:3423
 msgid "X Display"
 msgstr "X-display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3360
+#: src/LYOptions.c:3429
 msgid "Document Appearance"
 msgstr "Dokumentutseende"
 
-#: src/LYOptions.c:3366
+#: src/LYOptions.c:3435
 msgid "Show color"
 msgstr "Visa färg"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3390
+#: src/LYOptions.c:3459
 msgid "Show cursor"
 msgstr "Visa markör"
 
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr "Visa rullningslist"
+
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3396
+#: src/LYOptions.c:3473
 msgid "Popups for select fields"
 msgstr "Popup för valfält"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3403
+#: src/LYOptions.c:3479
 msgid "HTML error recovery"
 msgstr "HTML-felåterhämtning"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3410
+#: src/LYOptions.c:3485
 msgid "Show images"
 msgstr "Visa bilder"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3424
+#: src/LYOptions.c:3499
 msgid "Verbose images"
 msgstr "Pratsamma bilder"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3432
+#: src/LYOptions.c:3507
 msgid "Headers Transferred to Remote Servers"
 msgstr "Frågehuvud överfört till fjärrservrar"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3436
+#: src/LYOptions.c:3511
 msgid "Personal mail address"
 msgstr "Egen e-postadress"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3441
+#: src/LYOptions.c:3516
 msgid "Preferred document character set"
 msgstr "Önskad dokumentteckenuppsättning"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3446
+#: src/LYOptions.c:3521
 msgid "Preferred document language"
 msgstr "Önskade dokumentspråk"
 
-#: src/LYOptions.c:3452
+#: src/LYOptions.c:3527
 msgid "User-Agent header"
 msgstr "Webbläsaridentifiering"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3460
+#: src/LYOptions.c:3535
 msgid "Listing and Accessing Files"
 msgstr "Visning av och åtkomst till filer"
 
 #. ***************************************************************
 #. FTP sort: SELECT
-#: src/LYOptions.c:3464
+#: src/LYOptions.c:3539
 msgid "FTP sort criteria"
 msgstr "Sortering för ftp-kataloger"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3471
+#: src/LYOptions.c:3546
 msgid "Local directory sort criteria"
 msgstr "Sortering för lokala kataloger"
 
-#: src/LYOptions.c:3479
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+msgid "Local directory sort order"
+msgstr "Sortering för lokala kataloger"
+
+#: src/LYOptions.c:3561
 msgid "Show dot files"
 msgstr "Visa punktfiler"
 
-#: src/LYOptions.c:3487
+#: src/LYOptions.c:3569
 msgid "Execution links"
 msgstr "Exekveringslänkar"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3507
+#: src/LYOptions.c:3589
 msgid "Show transfer rate"
 msgstr "Visa överföringshastighet"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3516
+#: src/LYOptions.c:3598
 msgid "Special Files and Screens"
 msgstr "Speciella filer och skärmar"
 
-#: src/LYOptions.c:3521
+#: src/LYOptions.c:3603
 msgid "Multi-bookmarks"
 msgstr "Multibokmärken"
 
-#: src/LYOptions.c:3529
+#: src/LYOptions.c:3611
 msgid "Review/edit Bookmarks files"
 msgstr "Se/ändra bokmärkesfiler"
 
-#: src/LYOptions.c:3531
+#: src/LYOptions.c:3613
 msgid "Goto multi-bookmark menu"
 msgstr "Gå till multibokmärkesmenyn"
 
-#: src/LYOptions.c:3533
+#: src/LYOptions.c:3615
 msgid "Bookmarks file"
 msgstr "Bokmärkesfil"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3539
+#: src/LYOptions.c:3621
 msgid "Visited Pages"
 msgstr "Besökta sidor"
 
-#: src/LYPrint.c:959
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr "Visa filen "
+
+#: src/LYPrint.c:952
 msgid " Print job complete.\n"
 msgstr " Utskriftsjobb färdigt.\n"
 
-#: src/LYPrint.c:1296
+#: src/LYPrint.c:1281
 msgid "Document:"
 msgstr "Dokument:"
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1282
 msgid "Number of lines:"
 msgstr "Antal länkar:"
 
-#: src/LYPrint.c:1298
+#: src/LYPrint.c:1283
 msgid "Number of pages:"
 msgstr "Antal sidor:"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "pages"
 msgstr "sidor"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1284
 msgid "page"
 msgstr "sida"
 
-#: src/LYPrint.c:1300
+#: src/LYPrint.c:1285
 msgid "(approximately)"
 msgstr "(ungefär)"
 
-#: src/LYPrint.c:1305
+#: src/LYPrint.c:1290
 msgid "Some print functions have been disabled!"
 msgstr "Vissa utskriftsfunktioner har deaktiverats!"
 
-#: src/LYPrint.c:1309
+#: src/LYPrint.c:1294
 msgid "Standard print options:"
 msgstr "Fördefinierade utskriftsalternativ:"
 
-#: src/LYPrint.c:1310
+#: src/LYPrint.c:1295
 msgid "Print options:"
 msgstr "Utskriftsalternativ"
 
-#: src/LYPrint.c:1316
+#: src/LYPrint.c:1302
 msgid "Save to a local file"
 msgstr "Spara som lokal fil"
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1304
 msgid "Save to disk disabled"
 msgstr "\"Spara på disk\" deaktiverad"
 
-#: src/LYPrint.c:1324
+#: src/LYPrint.c:1311
 msgid "Mail the file"
 msgstr "Sänd filer per e-post"
 
-#: src/LYPrint.c:1330
+#: src/LYPrint.c:1318
 msgid "Print to the screen"
 msgstr "Skriv ut på skärmen"
 
-#: src/LYPrint.c:1334
+#: src/LYPrint.c:1323
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Skriv ut på en skrivare ansluten till din vt100-terminal"
 
-#: src/LYReadCFG.c:340
+#: src/LYReadCFG.c:339
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
 "The line must be of the form:\n"
@@ -4666,76 +4783,76 @@ msgstr ""
 "FÖRGRUND och BAKGRUND måste vara en av:\n"
 "specialsträngarna \"nocolor\" eller \"default\", eller\n"
 
-#: src/LYReadCFG.c:353
+#: src/LYReadCFG.c:352
 msgid "Offending line:"
 msgstr "Felaktig rad:"
 
-#: src/LYReadCFG.c:660
+#: src/LYReadCFG.c:638
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr "tangentomdefiniering av %s till %s för %s misslyckades\n"
 
-#: src/LYReadCFG.c:667
+#: src/LYReadCFG.c:645
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "tangentomdefiniering av %s till %s misslyckades\n"
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:666
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr "ogiltig radredigeringsval %s för tangent %s, väljer alla\n"
 
-#: src/LYReadCFG.c:715 src/LYReadCFG.c:728
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr "inställning av radredigeringsdefinition för tangent %s (0x%x) till 0x%x för %s misslyckades\n"
 
-#: src/LYReadCFG.c:733
+#: src/LYReadCFG.c:711
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr "inställning av radredigeringsdefinition för tangent %s (0x%x) för %s misslyckades\n"
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:816
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr "Lynx: kan inte börja, CERN-regelfilen %s ej tillgänglig\n"
 
-#: src/LYReadCFG.c:840
+#: src/LYReadCFG.c:818
 msgid "(no name)"
 msgstr "(inget namn)"
 
-#: src/LYReadCFG.c:1658
+#: src/LYReadCFG.c:1782
 #, 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:1660
+#: src/LYReadCFG.c:1784
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Sista försökta inkludering var \"%s\",\n"
 
-#: src/LYReadCFG.c:1661
+#: src/LYReadCFG.c:1785
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "inkluderad från \"%s\".\n"
 
-#: src/LYReadCFG.c:2116 src/LYReadCFG.c:2129 src/LYReadCFG.c:2165
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
 msgid "The following is read from your lynx.cfg file."
 msgstr "Följande läses från din lynx.cfg-fil."
 
-#: src/LYReadCFG.c:2117 src/LYReadCFG.c:2130
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
 msgid "Please read the distribution"
 msgstr "Se distributionens"
 
-#: src/LYReadCFG.c:2123 src/LYReadCFG.c:2133
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
 msgid "for more comments."
 msgstr "för ytterligare kommentarer."
 
-#: src/LYReadCFG.c:2147
+#: src/LYReadCFG.c:2244
 msgid "RELOAD THE CHANGES"
 msgstr "HÄMTA OM ÄNDRINGARNA"
 
-#: src/LYReadCFG.c:2156
+#: src/LYReadCFG.c:2253
 msgid "Your primary configuration"
 msgstr "Din primära konfiguration"
 
@@ -4811,7 +4928,7 @@ msgstr "Åtkomstbehörighet"
 msgid "File that you are currently viewing"
 msgstr "Visad fil"
 
-#: src/LYShowInfo.c:266 src/LYShowInfo.c:375
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
 msgid "Linkname:"
 msgstr "Länknamn:"
 
@@ -4851,79 +4968,79 @@ msgstr "Språk:"
 msgid "Post Data:"
 msgstr "\"POST\"-data:"
 
-#: src/LYShowInfo.c:331
+#: src/LYShowInfo.c:333
 msgid "Post Content Type:"
 msgstr "\"POST\"-datatyp:"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:342
 msgid "Owner(s):"
 msgstr "Ägare:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "size:"
 msgstr "storlek:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:345
 msgid "lines"
 msgstr "rader"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:348
 msgid "mode:"
 msgstr "läge:"
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:350
 msgid "forms mode"
 msgstr "formulärläge"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "source"
 msgstr "källkod"
 
-#: src/LYShowInfo.c:350
+#: src/LYShowInfo.c:352
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:353
 msgid ", safe"
 msgstr ", säker"
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:354
 msgid ", via internal link"
 msgstr ", via intern länk"
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:360
 msgid ", no-cache"
 msgstr ", ingen cache"
 
-#: src/LYShowInfo.c:360
+#: src/LYShowInfo.c:362
 msgid ", ISMAP script"
 msgstr ", ISMAP-skript"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:364
 msgid ", bookmark file"
 msgstr ", bokmärkesfil"
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:373
 msgid "Link that you currently have selected"
 msgstr "Markerad länk"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:386
 msgid "Method:"
 msgstr "Metod:"
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:391
 msgid "Enctype:"
 msgstr "Kodningstyp:"
 
-#: src/LYShowInfo.c:401
+#: src/LYShowInfo.c:403
 msgid "(Form field)"
 msgstr "(Formulärfält)"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:418
 msgid "No Links on the current page"
 msgstr "Ingen länk på aktuell sida"
 
-#: src/LYStyle.c:250
+#: src/LYStyle.c:278
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -4964,43 +5081,47 @@ msgstr "Ogiltig omdirigering med \"~\" hittad! Begäran ignorerad."
 msgid "Unable to upload file."
 msgstr "Kan inte skicka fil."
 
-#: src/LYUpload.c:214
+#: src/LYUpload.c:206
 msgid "Upload To:"
 msgstr "Skicka till:"
 
-#: src/LYUpload.c:215
+#: src/LYUpload.c:207
 msgid "Upload options:"
 msgstr "Insändningsalternativ:"
 
-#: src/LYUtils.c:3075
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr "Adress till hämtat dokument lagt i urklipp."
+
+#: src/LYUtils.c:2468
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Oväntat åtkomstprotokoll för denna adresstyp."
 
-#: src/LYUtils.c:3915
+#: src/LYUtils.c:3294
 msgid "Too many tempfiles"
 msgstr "För många temporärfiler"
 
-#: src/LYUtils.c:4217
+#: src/LYUtils.c:3595
 msgid "unknown restriction"
 msgstr "okänd begränsning"
 
-#: src/LYUtils.c:4248
+#: src/LYUtils.c:3626
 msgid "No restrictions set.\n"
 msgstr "Inga begränsningar satta.\n"
 
-#: src/LYUtils.c:4251
+#: src/LYUtils.c:3629
 msgid "Restrictions set:\n"
 msgstr "Satta begränsningar:\n"
 
-#: src/LYUtils.c:5601
-msgid "Ignoring invalid HOME"
-msgstr "Ignorerar ogiltig HOME"
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr "Hittar inte hemkatalogen (HOME)"
 
-#: src/LYrcFile.c:20
+#: src/LYrcFile.c:21
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
-msgstr ""
+msgstr "Vanligtvis avstängd. Se ENABLE_LYNXRC i lynx.cfg\n"
 
-#: src/LYrcFile.c:242
+#: src/LYrcFile.c:295
 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"
@@ -5012,7 +5133,7 @@ msgstr ""
 "varje kaka. Sätt accept_all_cookies till \"TRUE\" för att acceptera\n"
 "alla kakor.\n"
 
-#: src/LYrcFile.c:249
+#: src/LYrcFile.c:302
 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"
@@ -5021,7 +5142,7 @@ msgstr ""
 "bookmark_file anger namn och plats för standardbokmärkesfilen, i vilken\n"
 "användaren kan klistra in länkar för att lätt komma åt dem senare.\n"
 
-#: src/LYrcFile.c:254
+#: src/LYrcFile.c:307
 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"
@@ -5031,7 +5152,7 @@ msgstr ""
 "med \"s\" eller \"/\" kommer sökningen som genomförs att göra skillnad på\n"
 "gemener och versaler. Förvalet är normalt sett av (\"off\").\n"
 
-#: src/LYrcFile.c:259
+#: src/LYrcFile.c:312
 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"
@@ -5045,7 +5166,7 @@ msgstr ""
 "använda sjubitarstolkningarna.\n"
 "Giltiga teckenuppsättningar är:\n"
 
-#: src/LYrcFile.c:266
+#: src/LYrcFile.c:319
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5059,7 +5180,7 @@ msgstr ""
 "att gå före. Flaggan accept_all_cookies går före alla inställningar\n"
 "som görs här.\n"
 
-#: src/LYrcFile.c:274
+#: src/LYrcFile.c:327
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/.lynx_cookies.\n"
@@ -5067,7 +5188,7 @@ msgstr ""
 "cookie_file anger filen som varaktiga kakor skall läsas från.\n"
 "Förval är ~/.lynx_cookies.\n"
 
-#: src/LYrcFile.c:279
+#: src/LYrcFile.c:332
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5085,7 +5206,15 @@ msgstr ""
 "sökväg- eller domänattribut. Alla domäner får som förval frågor till\n"
 "användaren för felaktiga sökvägar eller domäner.\n"
 
-#: src/LYrcFile.c:292
+#: src/LYrcFile.c:346
+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 anger kataloglistesortering i DIRED_SUPPORT (om det är\n"
+"implementerat). Förvalet är \"ORDER_BY_NAME\"\n"
+
+#: src/LYrcFile.c:351
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5097,7 +5226,7 @@ msgstr ""
 "och kataloger tillsammanns. \"FILES_FIRST\" listar filer först, och\n"
 "\"DIRECTORIES_FIRST\" listar kataloger först.\n"
 
-#: src/LYrcFile.c:300
+#: src/LYrcFile.c:359
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5109,7 +5238,7 @@ msgstr ""
 "  ^N = ned      ^P = upp\n"
 "  ^B = vänster  ^F = höger\n"
 
-#: src/LYrcFile.c:306
+#: src/LYrcFile.c:365
 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"
@@ -5121,7 +5250,7 @@ msgstr ""
 "filredigering, såvida det inte aktiveras från kommandoraden, och den inbyggda\n"
 "radredigeraren används för e-post.\n"
 
-#: src/LYrcFile.c:312
+#: src/LYrcFile.c:371
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5137,7 +5266,7 @@ msgstr ""
 "   BY_SIZE     -- sorterar efter filstorlek\n"
 "   BY_DATE     -- sorterar efter fildatum\n"
 
-#: src/LYrcFile.c:324
+#: src/LYrcFile.c:389
 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"
@@ -5163,7 +5292,7 @@ msgstr ""
 "    Radera ord: ^B    ^F        ^E    = Radslut\n"
 "\n"
 
-#: src/LYrcFile.c:339
+#: src/LYrcFile.c:404
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5176,7 +5305,7 @@ msgstr ""
 "Upp till 26 bokmärkesfiler (de stora bokstäverna A-Z) tillåts.\n"
 "Vi börjar med \"multi_bookmarkB\" eftersom \"A\" är förvalet (se ovan).\n"
 
-#: src/LYrcFile.c:345
+#: src/LYrcFile.c:410
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5194,7 +5323,7 @@ msgstr ""
 "även lämna detta fält blankt, men då inkluderas det inte i kommentarer\n"
 "du sänder.\n"
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:419
 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"
@@ -5221,13 +5350,13 @@ msgstr ""
 "servern sända ett felmeddelande, även om det är tillåtet att sända även\n"
 "ett icke-acceptabelt svar.\n"
 
-#: src/LYrcFile.c:368
+#: src/LYrcFile.c:433
 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 it's default language.\n"
+"Otherwise, the server will send the file in its default language.\n"
 msgstr ""
 "preferred_language anger de språk som Lynx kommer att ange att du önskar\n"
 "ta emot i frågor till webbservrar i MIME-notation (t.ex en,fr, kan vara\n"
@@ -5235,7 +5364,7 @@ msgstr ""
 "Om en fil i det språket finns att tillgå kommer servern sända den.\n"
 "Annars kommer servern sända filen i sitt standardspråk.\n"
 
-#: src/LYrcFile.c:377
+#: src/LYrcFile.c:442
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5257,7 +5386,7 @@ msgstr ""
 "          Detta bör endast aktiveras (\"on\") om du visar information från\n"
 "          tillförlitliga källor.\n"
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:453
 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"
@@ -5285,7 +5414,7 @@ msgstr ""
 "          Detta bör endast aktiveras (\"on\") om du visar information från\n"
 "          tillförlitliga källor.\n"
 
-#: src/LYrcFile.c:403
+#: src/LYrcFile.c:471
 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"
@@ -5303,7 +5432,7 @@ msgstr ""
 "värdet \"off\" väljer radioknappar. Förvalet kan gås förbi via\n"
 "kommandoradsflaggan -popup.\n"
 
-#: src/LYrcFile.c:413
+#: src/LYrcFile.c:481
 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"
@@ -5336,7 +5465,7 @@ msgstr ""
 "alternativmenyn. Om alternativen sparas kommer inställningarna \"on\" och\n"
 "\"off\" att tolkas som \"default\".\n"
 
-#: src/LYrcFile.c:430
+#: src/LYrcFile.c:498
 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"
@@ -5357,7 +5486,7 @@ msgstr ""
 "\"on\" placerar markören till vänster som förval, medan \"off\" \"gömmer\"\n"
 "markören. Förvalet kan gås förbi via kommandoradsflaggan -show_cursor.\n"
 
-#: src/LYrcFile.c:441
+#: src/LYrcFile.c:509
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5372,7 +5501,7 @@ msgstr ""
 "filer är deaktiverat kommer skapandet av sådana filer via Lynx\n"
 "också att deaktiveras.\n"
 
-#: src/LYrcFile.c:452
+#: src/LYrcFile.c:520
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5394,7 +5523,7 @@ msgstr ""
 "mellannivåer. Om detta alternativ sätts till \"standard\" visas menyn\n"
 "oavsett användarläge.\n"
 
-#: src/LYrcFile.c:464
+#: src/LYrcFile.c:533
 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"
@@ -5410,7 +5539,7 @@ msgstr ""
 "stänga av extrainformationen. Använd \"ADVANCED\" för att se adressen\n"
 "för den markerade länken nederst på skärmen.\n"
 
-#: src/LYrcFile.c:472
+#: src/LYrcFile.c:542
 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"
@@ -5420,7 +5549,7 @@ msgstr ""
 "istället för [INLINE], [LINK] eller [IMAGE]\n"
 "Se även VERBOSE_IMAGES i lynx.cfg\n"
 
-#: src/LYrcFile.c:477
+#: src/LYrcFile.c:547
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5436,7 +5565,7 @@ msgstr ""
 "Versala \"H\", \"J\" och \"K\" aktiverar hjälp, hoppgenvägar respektiva\n"
 "tangentbordsinställningarna.\n"
 
-#: src/LYrcFile.c:485
+#: src/LYrcFile.c:555
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
@@ -5444,7 +5573,7 @@ msgstr ""
 "Inställningen visited_links anger hur Lynx organiserar informationen\n"
 "på sidan Använda länkar.\n"
 
-#: src/LYrcFile.c:693
+#: src/LYrcFile.c:772
 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"
@@ -5462,7 +5591,7 @@ msgstr ""
 "och motsvarande siffertangenter på tangentbordet fungerar som\n"
 "piltangetner, oavsett om NumLock är aktivt eller inte.\n"
 
-#: src/LYrcFile.c:702
+#: src/LYrcFile.c:781
 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"
@@ -5470,7 +5599,7 @@ msgstr ""
 "Om keypad_mode sätts till \"LINKS_ARE_NUMBERED\" kommer siffror\n"
 "att visas vid varje länk, och siffror används för att välja länk.\n"
 
-#: src/LYrcFile.c:706
+#: src/LYrcFile.c:785
 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"
@@ -5489,7 +5618,7 @@ msgstr ""
 "alternativet inte är synligt på skärmen. Referenslistor och utdata från\n"
 "listkommandot kommer även de att numrera formulärindatafält.\n"
 
-#: src/LYrcFile.c:715
+#: src/LYrcFile.c:794
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -5499,7 +5628,7 @@ msgstr ""
 "\"LINKS_ARE_NUMBERED\" eller \"LINKS_AND_FORM_FILES_ARE_NUMBERED\" är\n"
 "aktiva.\n"
 
-#: src/LYrcFile.c:748
+#: src/LYrcFile.c:827
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -5522,3 +5651,125 @@ msgstr ""
 "Om du letar efter den generella konfigurationsfilen heter den normalt\n"
 "lynx.cfg, och har annat innehåll och ett annat format. Det är inte denna\n"
 "fil.\n"
+
+#~ msgid "Short read from file, problem?"
+#~ msgstr "Filen tog slut tidigt, problem?"
+
+#~ msgid "Unable to open file management menu file."
+#~ msgstr "Kan inte öppna filhanteringsmenyfil."
+
+#~ msgid "create %s"
+#~ msgstr "skapa %s"
+
+#~ msgid "Ignoring invalid HOME"
+#~ msgstr "Ignorerar ogiltig HOME"
+
+#~ msgid "(From Cookie Jar)"
+#~ msgstr "(Från kakburk)"
+
+#~ msgid ""
+#~ "partial_thres specifies the number of lines Lynx should download and render\n"
+#~ "before we redraw the screen in Partial Display logic\n"
+#~ "e.g., partial_thres=2\n"
+#~ "would have Lynx redraw every 2 lines that it renders\n"
+#~ "partial_thres=-1 would use the entire screensize\n"
+#~ msgstr ""
+#~ "partial_thres anger antalet rader Lynx skall hämta och tolka innan skärmen\n"
+#~ "ritas om. partial_thres=2 gör att Lynx ritar om skärmen för varannan rad\n"
+#~ "som tolkas. partial_thres=-1 använder skärmstorleken\n"
+
+#~ msgid "Comment request cancelled!!!"
+#~ msgstr "Kommentaren avbruten!!!"
+
+#~ msgid "You are not allowed to goto \"file:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"file:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"finger:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"finger:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"ftp:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"ftp:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"gopher:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"gopher:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"http:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"http:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"https:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"https:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"lynxcgi:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"lynxcgi:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"lynxexec:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"lynxexec:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"lynxprog:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"lynxprog:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"mailto:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"mailto:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"news:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"news:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"nntp:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"nntp:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"rlogin:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"rlogin:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"snews:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"snews:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"telnet:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"telnet:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"tn3270:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"tn3270:\"-adresser"
+
+#~ msgid "You are not allowed to goto \"wais:\" URLs"
+#~ msgstr "Du tillåts inte gå till \"wais:\"-adresser"
+
+#~ msgid "This special URL is not allowed as a goto!"
+#~ msgstr "Denna specialadress tillåts inte gås till!"
+
+#~ msgid "Option choice (or page) number: "
+#~ msgstr "Välj alternativ- (eller sid-)nummer: "
+
+#~ msgid "Choice number %d already is current."
+#~ msgstr "Val %d är redan markerat."
+
+#~ msgid "You are already at the end of this choice list."
+#~ msgstr "Du är redan i slutet av vallistan."
+
+#~ msgid "You are already at the beginning of this choice list."
+#~ msgstr "Du är redan i början av vallistan."
+
+#~ msgid "You are already at page %d of this choice list."
+#~ msgstr "Du är redan på sida %d i vallistan."
+
+#~ msgid "You have entered an invalid choice number."
+#~ msgstr "Du har angett ett felaktigt valnummer."
+
+#~ msgid "Read %ld of %ld %s of data"
+#~ msgstr "Läste %ld av %ld%s data"
+
+#~ msgid "Read %ld %s of data"
+#~ msgstr "Läste %ld%s data"
+
+#~ msgid ", %ld %s/sec."
+#~ msgstr ", %ld%s/s"
+
+#~ msgid "Lynx ver. %s"
+#~ msgstr "Lynx ver. %s"
+
+#~ msgid "Personal Name: "
+#~ msgstr "Namn: "
+
+#~ msgid "Inactive text input, activate to edit (e.g., press ENTER)"
+#~ msgstr "Inaktiv textindata, aktivera för att redigera (tryck Enter)"
+
+#~ msgid "Left mouse button or return to select, arrow keys to scroll."
+#~ msgstr "Vänster musknapp eller Enter väljer, piltangenter rullar."
diff --git a/gnu/usr.bin/lynx/po/tr.po b/gnu/usr.bin/lynx/po/tr.po
new file mode 100644
index 00000000000..d1eb50a2fbf
--- /dev/null
+++ b/gnu/usr.bin/lynx/po/tr.po
@@ -0,0 +1,5649 @@
+# Lynx Turkish translation 2.8.5pre15
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Eyüp Hakan Duran <hakan_duran@hotmail.com>, 2002.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lynx 2.8.5pre15\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-0500\n"
+"PO-Revision-Date: 2003-06-04 14:06GMT\n"
+"Last-Translator: Eyüp Hakan Duran <hakan_duran@hotmail.com>\n"
+"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-9\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.9.5\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:29
+#, c-format
+msgid "Alert!: %s"
+msgstr "Alarm!: %s"
+
+#: LYMessages.c:30
+msgid "Welcome"
+msgstr "Hoþgeldiniz"
+
+#: LYMessages.c:31
+msgid "Are you sure you want to quit?"
+msgstr "Çýkmak istediðinizden emin misiniz?"
+
+#: LYMessages.c:33
+msgid "Really exit from Lynx?"
+msgstr "Lynx'ten cidden çýkýlsýn mý?"
+
+#: LYMessages.c:35
+msgid "Connection interrupted."
+msgstr "Baðlantý kesildi."
+
+#: LYMessages.c:36
+msgid "Data transfer interrupted."
+msgstr "Veri aktarýmý kesildi."
+
+#: LYMessages.c:37
+msgid "Cancelled!!!"
+msgstr "Ýptal edildi!!!"
+
+#: LYMessages.c:38
+msgid "Cancelling!"
+msgstr "Ýptal ediliyor!"
+
+#: LYMessages.c:39
+msgid "Excellent!!!"
+msgstr "Mükemmel!!!"
+
+#: LYMessages.c:40
+msgid "OK"
+msgstr "Tamam"
+
+#: LYMessages.c:41
+msgid "Done!"
+msgstr "Bitti!"
+
+#: LYMessages.c:42
+msgid "Bad request!"
+msgstr "Kötü istem!"
+
+#: LYMessages.c:43
+msgid "previous"
+msgstr "önceki"
+
+#: LYMessages.c:44
+msgid "next screen"
+msgstr "sonraki ekran"
+
+#: LYMessages.c:45
+msgid "HELP!"
+msgstr "YARDIM!"
+
+#: LYMessages.c:46
+msgid ", help on "
+msgstr ", yardým konusu "
+
+#. #define HELP
+#: LYMessages.c:48
+msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
+msgstr "Komutlar: Gezinmek için ok tuþlarýný, yardým için '?'ni, çýkýþ için 'q'yu, geri dönmek için '<-'u kullanýnýz."
+
+#. #define MOREHELP
+#: LYMessages.c:50
+msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
+msgstr "-- devamý için boþluða, gezinmek için ok tuþlarýna, yardým için '?'ne, çýkmak için 'q'ya basýnýz."
+
+#: LYMessages.c:51
+msgid "-- press space for next page --"
+msgstr "-- sonraki sayfa için boþluða basýnýz --"
+
+#: LYMessages.c:52
+msgid "URL too long"
+msgstr "çok uzun URL"
+
+#. Inactive input fields, messages used with -tna option - kw
+#. #define FORM_LINK_TEXT_MESSAGE_INA
+#: LYMessages.c:58
+msgid "(Text entry field) Inactive.  Press <return> to activate."
+msgstr "(Metin giriþ alaný) Etkin deðil.  Etkinleþtirmek için <return>'e basýnýz."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
+#: LYMessages.c:60
+msgid "(Textarea) Inactive.  Press <return> to activate."
+msgstr "(Metin alaný) Etkin deðil.  Etkinleþtirmek için <return>'e basýnýz."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
+#: LYMessages.c:62
+#, c-format
+msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
+msgstr "(Metin alaný) Etkin deðil.  Etkinleþtirmek için <return>'e basýnýz (düzenleyici için %s)."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
+#: LYMessages.c:64
+msgid "(Form field) Inactive.  Use <return> to edit."
+msgstr "(Form alaný) Etkin deðil.  Düzenlemek için <return>'ü kullanýnýz."
+
+#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
+#: LYMessages.c:66
+#, c-format
+msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
+msgstr "(Form alaný) Etkin deðil.  Düzenlemek için <return>'ü kullanýnýz (önbelleksiz göndermek için %s)."
+
+#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
+#: LYMessages.c:68
+msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
+msgstr "(Form alaný) Etkin deðil. Düzenlemek için <return>'e bir kez, göndermek için iki kez basýnýz."
+
+#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
+#: LYMessages.c:70
+msgid "(mailto form field) Inactive.  Press <return> to change."
+msgstr "(e-posta form alaný) Etkin deðil.  Deðiþtirmek için <return>'e basýnýz."
+
+#. #define FORM_LINK_PASSWORD_MESSAGE_INA
+#: LYMessages.c:72
+msgid "(Password entry field) Inactive.  Press <return> to activate."
+msgstr "(Parola giriþ alaný) Etkin deðil.  Etkinleþtirmek için <return>'e basýnýz."
+
+#. #define FORM_LINK_FILE_UNM_MSG
+#: LYMessages.c:75
+msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
+msgstr "DEÐÝÞTÝRÝLEMEZ dosya giriþ alaný.  Dýþýna çýkmak için YUKARI / AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_FILE_MESSAGE
+#: LYMessages.c:77
+msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Dosya giriþ alaný) Dosya adý giriniz.  Dýþýna çýkmak için YUKARI / AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_TEXT_MESSAGE
+#: LYMessages.c:79
+msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Metin giriþ alaný) Metin giriniz.  Dýþýna çýkmak için YUKARI / AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE
+#: LYMessages.c:81
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
+msgstr "(Metin alaný) Metin giriniz. Dýþýna çýkmak için YUKARI/AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_E
+#: LYMessages.c:83
+#, c-format
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
+msgstr "(Metin alaný) Metin giriniz. Dýþýna çýkmak için YUKARI/AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz (düzenleyici için %s)."
+
+#. #define FORM_LINK_TEXT_UNM_MSG
+#: LYMessages.c:85
+msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
+msgstr "DEÐÝÞTÝRÝLEMEZ form metin alaný. Dýþýna çýkmak için YUKARI/AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
+#: LYMessages.c:87
+msgid "(Form field) Enter text.  Use <return> to submit."
+msgstr "(Form alaný) Metin giriniz.  Göndermek için <return>'ü kullanýnýz."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
+#: LYMessages.c:89
+#, c-format
+msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
+msgstr "(Form alaný) Metin giriniz. Göndermek için <return>'ü kullanýnýz (önbelleksiz gönderim %s)."
+
+#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
+#: LYMessages.c:91
+msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
+msgstr "(Form alaný) Metin giriniz. Göndermek için <return>, dýþýna çýkmak için oklar ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
+#: LYMessages.c:93
+msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
+msgstr "DEÐÝÞTÝRÝLEBÝLÝR form alaný. Dýþýna çýkmak için YUKARI/AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
+#: LYMessages.c:95
+msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
+msgstr "(e-posta form alaný) Metin giriniz. Göndermek için <return>, dýþýna çýkmak için oklarý kullanýnýz."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:97
+msgid "(mailto form field) Mail is disallowed so you cannot submit."
+msgstr "(e-posta form alaný) Mektuba izin verilmiyor, dolayýsýyla gönderemezsiniz."
+
+#. #define FORM_LINK_PASSWORD_MESSAGE
+#: LYMessages.c:99
+msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Parola giriþ alaný) Metin giriniz.  Dýþýna çýkmak için YUKARI/AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_PASSWORD_UNM_MSG
+#: LYMessages.c:101
+msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
+msgstr "DEÐÝÞTÝRÝLEMEZ form parolasý.  Dýþýna çýkmak için YUKARI/AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_CHECKBOX_MESSAGE
+#: LYMessages.c:103
+msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
+msgstr "(Onay kutusu Alaný)   Seçmek için sað ok ya da <return>'ü kullanýnýz."
+
+#. #define FORM_LINK_CHECKBOX_UNM_MSG
+#: LYMessages.c:105
+msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
+msgstr "DEÐÝÞTÝRÝLEMEZ form onay kutusu.  Dýþýna çýkmak için YUKARI/AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_RADIO_MESSAGE
+#: LYMessages.c:107
+msgid "(Radio Button)   Use right-arrow or <return> to toggle."
+msgstr "(Radyo Düðmesi)   Seçmek için sað ok ya da <return>'ü kullanýnýz."
+
+#. #define FORM_LINK_RADIO_UNM_MSG
+#: LYMessages.c:109
+msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
+msgstr "DEÐÝÞTÝRÝLEMEZ form radyo düðmesi.  Dýþýna çýkmak için YUKARI/AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_SUBMIT_PREFIX
+#: LYMessages.c:111
+msgid "Submit ('x' for no cache) to "
+msgstr "Alýcý (önbelleksiz gönderim 'x') "
+
+#. #define FORM_LINK_RESUBMIT_PREFIX
+#: LYMessages.c:113
+msgid "Submit to "
+msgstr "Alýcý "
+
+#. #define FORM_LINK_SUBMIT_MESSAGE
+#: LYMessages.c:115
+msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
+msgstr "(Form gönderme düðmesi) Göndermek için sað ok ya da <return>'ü kullanýnýz (önbelleksiz gönderim 'x')."
+
+#. #define FORM_LINK_RESUBMIT_MESSAGE
+#: LYMessages.c:117
+msgid "(Form submit button) Use right-arrow or <return> to submit."
+msgstr "(Form gönderme düðmesi) Göndermek için sað ok ya da <return>'ü kullanýnýz."
+
+#. #define FORM_LINK_SUBMIT_DIS_MSG
+#: LYMessages.c:119
+msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
+msgstr "DEVRE DIÞI form gönderme tuþu.  Dýþýna çýkmak için YUKARI/AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
+#: LYMessages.c:121
+msgid "Submit mailto form to "
+msgstr "E-posta formu alýcýsý "
+
+#. #define FORM_LINK_SUBMIT_MAILTO_MSG
+#: LYMessages.c:123
+msgid "(mailto form submit button) Use right-arrow or <return> to submit."
+msgstr "(e-posta formu gönderme düðmesi) Göndermek için sað ok ya da <return>'ü kullanýnýz."
+
+#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:125
+msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
+msgstr "(e-posta formu gönderme düðmesi) Mektuba izin verilmiyor, dolayýsýyla gönderemezsiniz."
+
+#. #define FORM_LINK_RESET_MESSAGE
+#: LYMessages.c:127
+msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
+msgstr "(Form temizleme düðmesi)  Formu öntanýmlýya dönüþtürmek için sað ok ya da <return>'ü kullanýnýz."
+
+#. #define FORM_LINK_RESET_DIS_MSG
+#: LYMessages.c:129
+msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
+msgstr "DEVRE DIÞI form temizleme düðmesi.  Dýþýna çýkmak için YUKARI/AÞAÐI ok tuþlarýný ya da sekmeyi kullanýnýz."
+
+#. #define FORM_LINK_OPTION_LIST_MESSAGE
+#: LYMessages.c:131
+msgid "(Option list) Hit return and use arrow keys and return to select option."
+msgstr "(Seçenek listesi) Return'e basýp, seçmek için ok tuþlarý ve return'ü kullanýnýz."
+
+#. #define CHOICE_LIST_MESSAGE
+#: LYMessages.c:133
+msgid "(Choice list) Hit return and use arrow keys and return to select option."
+msgstr "(Tercih listesi) Return'e basýp, seçmek için ok tuþlarý ve return'ü kullanýnýz."
+
+#. #define FORM_LINK_OPTION_LIST_UNM_MSG
+#: LYMessages.c:135
+msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
+msgstr "DEÐÝÞTÝRÝLEMEZ seçenek listesi.  Göz gezdirmek ya da terketmek için ok tuþlarý ya da retun'ü kullanýnýz."
+
+#. #define CHOICE_LIST_UNM_MSG
+#: LYMessages.c:137
+msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
+msgstr "DEÐÝÞTÝRÝLEMEZ tercih listesi.  Göz gezdirmek ya da terketmek için ok tuþlarý ya da retun'ü kullanýnýz."
+
+#: LYMessages.c:138
+msgid "Submitting form..."
+msgstr "Form gönderiliyor..."
+
+#: LYMessages.c:139
+msgid "Resetting form..."
+msgstr "Form temizleniyor..."
+
+#. #define RELOADING_FORM
+#: LYMessages.c:141
+msgid "Reloading document.  Any form entries will be lost!"
+msgstr "Belge yeniden yükleniyor.  Forma girdikleriniz yitirilecek!"
+
+#: LYMessages.c:142
+#, c-format
+msgid "Warning: Cannot transcode form data to charset %s!"
+msgstr "Uyarý: Form verisi %s karakter kümesine çevrilemiyor!"
+
+#. #define NORMAL_LINK_MESSAGE
+#: LYMessages.c:145
+msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
+msgstr "(NORMAL LÝNK)   Etkinleþtirmek için sað ok ya da<return>'ü kullanýnýz."
+
+#: LYMessages.c:146
+msgid "The resource requested is not available at this time."
+msgstr "Ýstenen kaynak, þu anda temin edilemiyor."
+
+#: LYMessages.c:147
+msgid "Enter Lynx keystroke command: "
+msgstr "Lynx tuþbasým komutunu giriniz: "
+
+#: LYMessages.c:148
+msgid "Looking up "
+msgstr "Aranýyor "
+
+#: LYMessages.c:149
+#, c-format
+msgid "Getting %s"
+msgstr "%s alýnýyor"
+
+#: LYMessages.c:150
+#, c-format
+msgid "Skipping %s"
+msgstr "%s atlanýyor"
+
+#: LYMessages.c:151
+#, c-format
+msgid "Using %s"
+msgstr "%s kullanýlýyor"
+
+#: LYMessages.c:152
+#, c-format
+msgid "Illegal URL: %s"
+msgstr "Kuraldýþý URL: %s"
+
+#: LYMessages.c:153
+#, c-format
+msgid "Badly formed address %s"
+msgstr "Yanlýþ yazýlmýþ adres: %s"
+
+#: LYMessages.c:154
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: LYMessages.c:155
+msgid "Unable to access WWW file!!!"
+msgstr "WWW dosyasýna eriþilemiyor!!!"
+
+#: LYMessages.c:156
+#, c-format
+msgid "This is a searchable index.  Use %s to search."
+msgstr "Bu, aranabilir bir indeks...  Aramak için %s kullanýnýz."
+
+#. #define WWW_INDEX_MORE_MESSAGE
+#: LYMessages.c:158
+#, c-format
+msgid "--More--  This is a searchable index.  Use %s to search."
+msgstr "--Devam--  Bu, aranabilir bir indeks...Aramak için %s kullanýnýz."
+
+#: LYMessages.c:159
+msgid "You have entered an invalid link number."
+msgstr "Geçersiz bir link numarasý girdiniz."
+
+#. #define SOURCE_HELP
+#: LYMessages.c:161
+msgid "Currently viewing document source.  Press '\\' to return to rendered version."
+msgstr "Halen belge kaynaðý görüntüleniyor.  Yorumlanmýþ (rendered) sürüme dönmek için '\\'a basýnýz."
+
+#. #define NOVICE_LINE_ONE
+#: LYMessages.c:163
+msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
+msgstr "  Ok tuþlarý: Gezinmek için Yukarý ve Aþaðý.  Linke gitmek için Sað; geriye gitmek için Sol.  \n"
+
+#. #define NOVICE_LINE_TWO
+#: LYMessages.c:165
+msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
+msgstr " H)Yardým O)Seçenekler P)Yazdýr G)Git M)Ana ekran Q)Çýkýþ /=ara [delete]=tarihçe listesi\n"
+
+#. #define NOVICE_LINE_TWO_A
+#: LYMessages.c:167
+msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
+msgstr "..O)Diðer komutlar  H)Yardým  K)Tuþeþlem  G)Git  P)Yazdýr  M)Ana ekran  o)Seçenekler  Q)Çýkýþ  \n"
+
+#. #define NOVICE_LINE_TWO_B
+#: LYMessages.c:169
+msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
+msgstr "..O)Diðer komutlar  B)Geri  E)Düzenle  D)Ýndir ^R)Geri yükle ^W)Ekraný sil  belgeyi ara: / \n"
+
+#. #define NOVICE_LINE_TWO_C
+#: LYMessages.c:171
+msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
+msgstr "O)Diðer komutlar  C)Yorum  Tarihçe: <backspace>  Yer imleri: V)Görüntüle, A)Ekle, R)Çýkart \n"
+
+#. #define FORM_NOVICELINE_ONE
+#: LYMessages.c:173
+msgid "            Enter text into the field by typing on the keyboard              "
+msgstr "            Klavyeyi kullanarak alana metin giriniz                        "
+
+#. #define FORM_NOVICELINE_TWO
+#: LYMessages.c:175
+msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
+msgstr "    Alandaki tüm metni silmek için Ctrl-U, tek karakter silmek için [Backspace]    "
+
+#. #define FORM_NOVICELINE_TWO_DELBL
+#: LYMessages.c:177
+msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
+msgstr "      Alandaki metni silmek için Ctrl-U,tek karakter silmek için [Backspace]    "
+
+#. #define FORM_NOVICELINE_TWO_VAR
+#: LYMessages.c:179
+#, c-format
+msgid "    %s to delete all text in field, [Backspace] to delete a character    "
+msgstr "    Alandaki tüm metni silmek için %s, tek karakter silmek için [Backspace]    "
+
+#. #define FORM_NOVICELINE_TWO_DELBL_VAR
+#: LYMessages.c:181
+#, c-format
+msgid "      %s to delete text in field, [Backspace] to delete a character    "
+msgstr "      Alandaki metni silmek için %s, tek karakter silmek için [Backspace]    "
+
+#. mailto
+#: LYMessages.c:184
+msgid "Malformed mailto form submission!  Cancelled!"
+msgstr "Bozuk e-posta formu gönderimi!  Ýptal edildi!"
+
+#: LYMessages.c:185
+msgid "Warning!  Control codes in mail address replaced by ?"
+msgstr "Uyarý!  E-posta adresindeki kontrol kodlarý yerine ? konuldu."
+
+#: LYMessages.c:186
+msgid "Mail disallowed!  Cannot submit."
+msgstr "E-postaya izin verilmiyor!  Gönderilemedi."
+
+#: LYMessages.c:187
+msgid "Mailto form submission failed!"
+msgstr "E-posta formunun gönderimi baþarýsýz!"
+
+#: LYMessages.c:188
+msgid "Mailto form submission Cancelled!!!"
+msgstr "E-posta formunun gönderimi iptal edildi!!!"
+
+#: LYMessages.c:189
+msgid "Sending form content..."
+msgstr "Form içeriði gönderiliyor..."
+
+#: LYMessages.c:190
+msgid "No email address is present in mailto URL!"
+msgstr "E-posta URL'sinde mektup adresi yok!"
+
+#. #define MAILTO_URL_TEMPOPEN_FAILED
+#: LYMessages.c:192
+msgid "Unable to open temporary file for mailto URL!"
+msgstr "E-posta URL'si için geçici dosya açýlamadý!"
+
+#. #define INC_ORIG_MSG_PROMPT
+#: LYMessages.c:194
+msgid "Do you wish to include the original message?"
+msgstr "Orijinal iletinin içerilmesini ister misiniz?"
+
+#. #define INC_PREPARSED_MSG_PROMPT
+#: LYMessages.c:196
+msgid "Do you wish to include the preparsed source?"
+msgstr "Ayrýþtýrýlmamýþ kaynaðýn içerilmesini ister misiniz?"
+
+#. #define SPAWNING_EDITOR_FOR_MAIL
+#: LYMessages.c:198
+msgid "Spawning your selected editor to edit mail message"
+msgstr "Ýletinin düzenlenmesi için seçilmiþ düzenleyiciniz baþlatýlýyor"
+
+#. #define ERROR_SPAWNING_EDITOR
+#: LYMessages.c:200
+msgid "Error spawning editor, check your editor definition in the options menu"
+msgstr "Düzenleyici baþlatmada hata, seçenekler menüsündeki düzenleyici tanýmýnýzý kontrol ediniz"
+
+#: LYMessages.c:201
+msgid "Send this comment?"
+msgstr "Bu yorum gönderilsin mi?"
+
+#: LYMessages.c:202
+msgid "Send this message?"
+msgstr "Bu ileti gönderilsin mi?"
+
+#: LYMessages.c:203
+msgid "Sending your message..."
+msgstr "Ýletiniz gönderiliyor..."
+
+#: LYMessages.c:204
+msgid "Sending your comment:"
+msgstr "Yorumunuz gönderiliyor:"
+
+#. textarea
+#: LYMessages.c:207
+msgid "Not in a TEXTAREA; cannot use external editor."
+msgstr "Bir METÝN ALANI'nda deðil(siniz); harici düzenleyici kullanýlamýyor."
+
+#: LYMessages.c:208
+msgid "Not in a TEXTAREA; cannot use command."
+msgstr "Bir METÝN ALANI'nda deðil(siniz); komut kullanýlamýyor."
+
+#: LYMessages.c:211
+msgid "file: ACTIONs are disallowed!"
+msgstr "dosya: EYLEMlere izin verilmiyor!"
+
+#. #define FILE_SERVED_LINKS_DISALLOWED
+#: LYMessages.c:213
+msgid "file: URLs via served links are disallowed!"
+msgstr "dosya: sunulan linkler aracýlýðýyla URL'lere izin verilmiyor!"
+
+#: LYMessages.c:214
+msgid "Access to local files denied."
+msgstr "Yerel dosyalara eriþim reddedildi."
+
+#: LYMessages.c:215
+msgid "file: URLs via bookmarks are disallowed!"
+msgstr "dosya: Yer imleri aracýlýðýyla URL'lere izin verilmiyor!"
+
+#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
+#: LYMessages.c:217
+msgid "This special URL is not allowed in external documents!"
+msgstr "Harici belgelerde bu özel URL'ye izin verilmiyor!"
+
+#: LYMessages.c:218
+msgid "Press <return> to return to Lynx."
+msgstr "Lynx'e dönmek için <return>'e basýnýz."
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:221
+msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
+msgstr "DCL altsüreci baþlatýlýyor.  Lynx'e dönmek için 'logout'u kullanýnýz.\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:225
+msgid "Type EXIT to return to Lynx.\n"
+msgstr "Lynx'e dönmek için EXIT tuþlayýnýz.\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:228
+msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
+msgstr "Öntanýmlý kabuðunuz baþlatýlýyor.  Lynx'e dönmek için 'exit'i kullanýnýz.\n"
+
+#: LYMessages.c:231
+msgid "Spawning is currently disabled."
+msgstr "Baþlatma (spawning) þu an devre dýþý."
+
+#: LYMessages.c:232
+msgid "The 'd'ownload command is currently disabled."
+msgstr "Ýndir komutu(d) þu an devre dýþý."
+
+#: LYMessages.c:233
+msgid "You cannot download an input field."
+msgstr "Bir giriþ alanýný indiremezsiniz."
+
+#: LYMessages.c:234
+msgid "Form has a mailto action!  Cannot download."
+msgstr "Formda bir e-posta eylemi mevcut!  Ýndirilemiyor."
+
+#: LYMessages.c:235
+msgid "You cannot download a mailto: link."
+msgstr "Bir e-posta: linkini indiremezsiniz."
+
+#: LYMessages.c:236
+msgid "You cannot download cookies."
+msgstr "Çerez indiremezsiniz."
+
+#: LYMessages.c:237
+msgid "You cannot download a printing option."
+msgstr "Bir yazdýrma seçeneðini indiremezsiniz."
+
+#: LYMessages.c:238
+msgid "You cannot download an upload option."
+msgstr "Bir yükleme seçeneðini indiremezsiniz."
+
+#: LYMessages.c:239
+msgid "You cannot download an permit option."
+msgstr "Bir izin seçeneðini indiremezsiniz."
+
+#: LYMessages.c:240
+msgid "This special URL cannot be downloaded!"
+msgstr "Bu özel URL indirilemez!"
+
+#: LYMessages.c:241
+msgid "Nothing to download."
+msgstr "Ýndirilecek hiçbir þey yok."
+
+#: LYMessages.c:242
+msgid "Trace ON!"
+msgstr "Ýz(leme) AÇIK!"
+
+#: LYMessages.c:243
+msgid "Trace OFF!"
+msgstr "Ýz(leme) KAPALI!"
+
+#. #define CLICKABLE_IMAGES_ON
+#: LYMessages.c:245
+msgid "Links will be included for all images!  Reloading..."
+msgstr "Tüm resimler için link içerilecek!  Yeniden yükleniyor..."
+
+#. #define CLICKABLE_IMAGES_OFF
+#: LYMessages.c:247
+msgid "Standard image handling restored!  Reloading..."
+msgstr "Standart resim becerimi geri kuruldu!  Yeniden yükleniyor..."
+
+#. #define PSEUDO_INLINE_ALTS_ON
+#: LYMessages.c:249
+msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
+msgstr "ALT dizgesi olmayan içeriðe(inline) yalancý_ALT'lar atanacak!  Yeniden yükleniyor..."
+
+#. #define PSEUDO_INLINE_ALTS_OFF
+#: LYMessages.c:251
+msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
+msgstr "Belirtilmiþ ALT dizgesi olmayan içerik(inlines) yoksayýlacak!  Yeniden yükleniyor..."
+
+#: LYMessages.c:252
+msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
+msgstr "Ham 8-bit ya da CJK modu KAPATILDI!  Yeniden yükleniyor..."
+
+#: LYMessages.c:253
+msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
+msgstr "Ham 8-bit ya da CJK modu AÇILDI!  Yeniden yükleniyor..."
+
+#. #define HEAD_D_L_OR_CANCEL
+#: LYMessages.c:255
+msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
+msgstr "Belge(D), link(L) için BAÞLIK istemi gönderilsin mi, iptal(C) mi edilsin? (d,l,c): "
+
+#. #define HEAD_D_OR_CANCEL
+#: LYMessages.c:257
+msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
+msgstr "Belge(D) için BAÞLIK istemi gönderilsin mi, iptal(C) mi edilsin? (d,c): "
+
+#: LYMessages.c:258
+msgid "Sorry, the document is not an http URL."
+msgstr "Üzgünüm, belge bir http URL deðil..."
+
+#: LYMessages.c:259
+msgid "Sorry, the link is not an http URL."
+msgstr "Üzgünüm, link bir http URL deðil..."
+
+#: LYMessages.c:260
+msgid "Sorry, the ACTION for this form is disabled."
+msgstr "Üzgünüm, bu form için EYLEM devre dýþý..."
+
+#. #define FORM_ACTION_NOT_HTTP_URL
+#: LYMessages.c:262
+msgid "Sorry, the ACTION for this form is not an http URL."
+msgstr "Üzgünüm, bu form için EYLEM bir http URL deðil..."
+
+#: LYMessages.c:263
+msgid "Not an http URL or form ACTION!"
+msgstr "http URL ya da form EYLEMi deðil!.."
+
+#: LYMessages.c:264
+msgid "This special URL cannot be a form ACTION!"
+msgstr "Bu özel URL, bir form EYLEMi olamaz!"
+
+#: LYMessages.c:265
+msgid "URL is not in starting realm!"
+msgstr "URL, baþlangýç bölgesinde deðil!.."
+
+#: LYMessages.c:266
+msgid "News posting is disabled!"
+msgstr "Haber gönderme devre dýþý!.."
+
+#: LYMessages.c:267
+msgid "File management support is disabled!"
+msgstr "Dosya yönetim desteði devre dýþý!.."
+
+#: LYMessages.c:268
+msgid "No jump file is currently available."
+msgstr "Mevcut hiçbir sýçrama dosyasý yok."
+
+#: LYMessages.c:269
+msgid "Jump to (use '?' for list): "
+msgstr "Sýçranacak yer (liste için '?' kullanýnýz): "
+
+#: LYMessages.c:270
+msgid "Jumping to a shortcut URL is disallowed!"
+msgstr "Bir kýsayol URL'ye sýçramaya izin verilmiyor!"
+
+#: LYMessages.c:271
+msgid "Random URL is disallowed!  Use a shortcut."
+msgstr "Rastgele URL'ye izin verilmiyor!  Bir kýsayol kullanýnýz."
+
+#: LYMessages.c:272
+msgid "No random URLs have been used thus far."
+msgstr "Þimdiye dek hiç rastgele URL kullanýlmadý."
+
+#: LYMessages.c:273
+msgid "Bookmark features are currently disabled."
+msgstr "Yer imi özellikleri halen devre dýþý..."
+
+#: LYMessages.c:274
+msgid "Execution via bookmarks is disabled."
+msgstr "Yer imleriyle icra devre dýþý..."
+
+#. #define BOOKMARK_FILE_NOT_DEFINED
+#: LYMessages.c:276
+#, c-format
+msgid "Bookmark file is not defined. Use %s to see options."
+msgstr "Yer imi dosyasý tanýmlanmamýþ. Seçenekleri görmek için %s kullanýnýz."
+
+#. #define NO_TEMP_FOR_HOTLIST
+#: LYMessages.c:278
+msgid "Unable to open tempfile for X Mosaic hotlist conversion."
+msgstr "X Mosaic sýcakliste dönüþümü için geçici dosya açýlamadý."
+
+#: LYMessages.c:279
+msgid "ERROR - unable to open bookmark file."
+msgstr "HATA - yer imi dosyasý açýlamadý."
+
+#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:281
+msgid "Unable to open bookmark file for deletion of link."
+msgstr "Linkin silinebilmesi için yer imi dosyasý açýlamadý."
+
+#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:283
+msgid "Unable to open scratch file for deletion of link."
+msgstr "Linkin silinebilmesi için müsvedde dosyasý açýlamadý."
+
+#: LYMessages.c:285
+msgid "Error renaming scratch file."
+msgstr "Müsvedde dosyasýnýn yeniden adlandýrýlmasýnda hata..."
+
+#: LYMessages.c:287
+msgid "Error renaming temporary file."
+msgstr "Geçici dosyanýn yeniden adlandýrýlmasýnda hata..."
+
+#. #define BOOKTEMP_COPY_FAIL
+#: LYMessages.c:289
+msgid "Unable to copy temporary file for deletion of link."
+msgstr "Linkin silinebilmesi için geçici dosya kopyalanamýyor."
+
+#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
+#: LYMessages.c:291
+msgid "Unable to reopen temporary file for deletion of link."
+msgstr "Linkin silinebilmesi için geçici dosya yeniden açýlamýyor."
+
+#. #define BOOKMARK_LINK_NOT_ONE_LINE
+#: LYMessages.c:294
+msgid "Link is not by itself all on one line in bookmark file."
+msgstr "Yer imi dosyasýndaki link kendi baþýna tek satýrda deðil."
+
+#: LYMessages.c:295
+msgid "Bookmark deletion failed."
+msgstr "Yer iminin silinmesi baþarýsýz."
+
+#. #define BOOKMARKS_NOT_TRAVERSED
+#: LYMessages.c:297
+msgid "Bookmark files cannot be traversed (only http URLs)."
+msgstr "Yer imi dosyalarý nakledilemez (yalnýzca http URL'ler edilebilir)."
+
+#. #define BOOKMARKS_NOT_OPEN
+#: LYMessages.c:299
+msgid "Unable to open bookmark file, use 'a' to save a link first"
+msgstr "Yer imi dosyasý açýlamadý, önce linki kaydetmek için 'a'yý kullanýn"
+
+#: LYMessages.c:300
+msgid "There are no links in this bookmark file!"
+msgstr "Bu yer imi dosyasýnda hiç link yok!"
+
+#. #define BOOK_D_L_OR_CANCEL
+#: LYMessages.c:302
+msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
+msgstr "Yer imi dosyasýna belge(D), link(L) kaydedilsin mi, iptal(C) mi edilsin? (d,l,c): "
+
+#: LYMessages.c:303
+msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
+msgstr "Yer imi dosyasýna belge(D) kaydedilsin mi, iptal(C) mi edilsin? (d,c): "
+
+#: LYMessages.c:304
+msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
+msgstr "Yer imi dosyasýna link(L) kaydedilsin mi, iptal(C) mi edilsin? (l,c): "
+
+#. #define NOBOOK_POST_FORM
+#: LYMessages.c:306
+msgid "Documents from forms with POST content cannot be saved as bookmarks."
+msgstr "POST içerikli formdan olan belgeler, yer imi olarak kaydedilemez."
+
+#: LYMessages.c:307
+msgid "Cannot save form fields/links"
+msgstr "Form alanlarý/linkleri kaydedilemiyor"
+
+#. #define NOBOOK_HSML
+#: LYMessages.c:309
+msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
+msgstr "Tarihçe, bilgi-göster, menü ve liste dosyalarý yer imi olarak kaydedilemez."
+
+#. #define CONFIRM_BOOKMARK_DELETE
+#: LYMessages.c:311
+msgid "Do you really want to delete this link from your bookmark file?"
+msgstr "Yer imi dosyanýzdan bu linki silmek istediðinize emin misiniz?"
+
+#: LYMessages.c:312
+msgid "Malformed address."
+msgstr "Bozuk adres "
+
+#. #define HISTORICAL_ON_MINIMAL_OFF
+#: LYMessages.c:314
+msgid "Historical comment parsing ON (Minimal is overridden)!"
+msgstr "Tarihsel yorum ayrýþtýrma AÇIK (Minimal geçersiz kýlýnmýþ)!"
+
+#. #define HISTORICAL_OFF_MINIMAL_ON
+#: LYMessages.c:316
+msgid "Historical comment parsing OFF (Minimal is in effect)!"
+msgstr "Tarihsel yorum ayrýþtýrma KAPALI (Minimal yürürlükte)!"
+
+#. #define HISTORICAL_ON_VALID_OFF
+#: LYMessages.c:318
+msgid "Historical comment parsing ON (Valid is overridden)!"
+msgstr "Tarihsel yorum ayrýþtýrma AÇIK (Valid geçersiz kýlýnmýþ)!"
+
+#. #define HISTORICAL_OFF_VALID_ON
+#: LYMessages.c:320
+msgid "Historical comment parsing OFF (Valid is in effect)!"
+msgstr "Tarihsel yorum ayrýþtýrma KAPALI (Valid yürürlükte)!"
+
+#. #define MINIMAL_ON_IN_EFFECT
+#: LYMessages.c:322
+msgid "Minimal comment parsing ON (and in effect)!"
+msgstr "Minimal yorum ayrýþtýrma AÇIK (ve yürürlükte)!"
+
+#. #define MINIMAL_OFF_VALID_ON
+#: LYMessages.c:324
+msgid "Minimal comment parsing OFF (Valid is in effect)!"
+msgstr "Minimal yorum ayrýþtýrma KAPALI (Valid yürürlükte)!"
+
+#. #define MINIMAL_ON_BUT_HISTORICAL
+#: LYMessages.c:326
+msgid "Minimal comment parsing ON (but Historical is in effect)!"
+msgstr "Minimal yorum ayrýþtýrma AÇIK (ancak Tarihsel yürürlükte)!"
+
+#. #define MINIMAL_OFF_HISTORICAL_ON
+#: LYMessages.c:328
+msgid "Minimal comment parsing OFF (Historical is in effect)!"
+msgstr "Minimal yorum ayrýþtýrma KAPALI (Tarihsel yürürlükte)!"
+
+#: LYMessages.c:329
+msgid "Soft double-quote parsing ON!"
+msgstr "Salt çift-týrnak ayrýþtýrma AÇIK!"
+
+#: LYMessages.c:330
+msgid "Soft double-quote parsing OFF!"
+msgstr "Salt çift-týrnak ayrýþtýrma KAPALI!"
+
+#: LYMessages.c:331
+msgid "Now using TagSoup parsing of HTML."
+msgstr "Þu an HTML'nin TagSoup ayrýþtýrmasý kullanýlýyor."
+
+#: LYMessages.c:332
+msgid "Now using SortaSGML parsing of HTML!"
+msgstr "Þu an HTML'nin SortaSGML ayrýþtýrmasý kullanýlýyor!"
+
+#: LYMessages.c:333
+msgid "You are already at the end of this document."
+msgstr "Zaten bu belgenin sonundasýnýz."
+
+#: LYMessages.c:334
+msgid "You are already at the beginning of this document."
+msgstr "Zaten bu belgenin baþýndasýnýz."
+
+#: LYMessages.c:335
+#, c-format
+msgid "You are already at page %d of this document."
+msgstr "Zaten bu belgenin %d. sayfasýndasýnýz."
+
+#: LYMessages.c:336
+#, c-format
+msgid "Link number %d already is current."
+msgstr "%d no'lu link zaten güncel..."
+
+#: LYMessages.c:337
+msgid "You are already at the first document"
+msgstr "Zaten birinci belgedesiniz"
+
+#: LYMessages.c:338
+msgid "There are no links above this line of the document."
+msgstr "Belgenin bu satýrýndan önce hiç link yok..."
+
+#: LYMessages.c:339
+msgid "There are no links below this line of the document."
+msgstr "Belgenin bu satýrýndan sonra hiç link yok..."
+
+#. #define MAXLEN_REACHED_DEL_OR_MOV
+#: LYMessages.c:341
+msgid "Maximum length reached!  Delete text or move off field."
+msgstr "Maksimum uzunluða ulaþýldý!  Metin silin ya da alanýn dýþýna çýkýn."
+
+#. #define NOT_ON_SUBMIT_OR_LINK
+#: LYMessages.c:343
+msgid "You are not on a form submission button or normal link."
+msgstr "Form gönderme düðmesi ya da normal baðlantý üzerinde deðilsiniz."
+
+#. #define NEED_CHECKED_RADIO_BUTTON
+#: LYMessages.c:345
+msgid "One radio button must be checked at all times!"
+msgstr "Radyo düðmelerinden biri mutlaka seçilmiþ olmalýdýr!"
+
+#: LYMessages.c:346
+msgid "No submit button for this form, submit single text field?"
+msgstr "Formda gönder düðmesi yok, tek metin alaný gönderilsin mi?"
+
+#: LYMessages.c:347
+msgid "Do you want to go back to the previous document?"
+msgstr "Önceki belgeye dönmek ister misiniz?"
+
+#: LYMessages.c:348
+msgid "Use arrows or tab to move off of field."
+msgstr "Alanýn dýþýna çýkmak için oklarý ya da sekmeyi kullanýnýz."
+
+#. #define ENTER_TEXT_ARROWS_OR_TAB
+#: LYMessages.c:350
+msgid "Enter text.  Use arrows or tab to move off of field."
+msgstr "Metin giriniz.  Alanýn dýþýna çýkmak için oklarý ya da sekmeyi kullanýnýz."
+
+#: LYMessages.c:351
+msgid "** Bad HTML!!  No form action defined. **"
+msgstr "**Bozuk HTML!!  Hiçbir form eylemi tanýmlanmamýþ. **"
+
+#: LYMessages.c:352
+msgid "Bad HTML!!  Unable to create popup window!"
+msgstr "Bozuk HTML!!  Beliriveren pencere oluþturulamadý!"
+
+#: LYMessages.c:353
+msgid "Unable to create popup window!"
+msgstr "Beliriveren pencere oluþturulamadý!"
+
+#: LYMessages.c:354
+msgid "Goto a random URL is disallowed!"
+msgstr "Rastgele URL'ye gitmeye izin verilmiyor!"
+
+#: LYMessages.c:355
+msgid "Goto a non-http URL is disallowed!"
+msgstr "Http olmayan URL'ye gitmeye izin verilmiyor!"
+
+#: LYMessages.c:356
+#, c-format
+msgid "You are not allowed to goto \"%s\" URLs"
+msgstr "\"%s\" URL'lere gitme izniniz yok"
+
+#: LYMessages.c:357
+msgid "URL to open: "
+msgstr "Açýlacak URL: "
+
+#: LYMessages.c:358
+msgid "Edit the current Goto URL: "
+msgstr "Mevcut Gidilecek URL'yi düzenleyiniz: "
+
+#: LYMessages.c:359
+msgid "Edit the previous Goto URL: "
+msgstr "Önceki Gidilecek URL'yi düzenleyiniz: "
+
+#: LYMessages.c:360
+msgid "Edit a previous Goto URL: "
+msgstr "Önceki Gidilecek URL'lerden birini düzenleyiniz: "
+
+#: LYMessages.c:361
+msgid "Current document has POST data."
+msgstr "Mevcut belgede POST verisi var."
+
+#: LYMessages.c:362
+msgid "Edit this document's URL: "
+msgstr "Bu belgenin URL'sini düzenleyiniz: "
+
+#: LYMessages.c:363
+msgid "Edit the current link's URL: "
+msgstr "Mevcut linkin URL'sini düzenleyiniz: "
+
+#: LYMessages.c:364
+msgid "You cannot edit File Management URLs"
+msgstr "Dosya Yönetim URL'lerini düzenleyemezsiniz"
+
+#: LYMessages.c:365
+msgid "Enter a database query: "
+msgstr "Bir veritabaný sorgusu giriniz: "
+
+#: LYMessages.c:366
+msgid "Enter a whereis query: "
+msgstr "Bir whereis sorgusu giriniz: "
+
+#: LYMessages.c:367
+msgid "Edit the current query: "
+msgstr "Mevcut sorguyu düzenleyiniz: "
+
+#: LYMessages.c:368
+msgid "Edit the previous query: "
+msgstr "Önceki sorguyu düzenleyiniz: "
+
+#: LYMessages.c:369
+msgid "Edit a previous query: "
+msgstr "Önceki sorgulardan birini düzenleyiniz: "
+
+#. #define USE_C_R_TO_RESUB_CUR_QUERY
+#: LYMessages.c:371
+msgid "Use Control-R to resubmit the current query."
+msgstr "Mevcut sorguyu yeniden göndermek için Control-R'yi kullanýnýz."
+
+#: LYMessages.c:372
+msgid "Edit the current shortcut: "
+msgstr "Mevcut kýsayolu düzenleyiniz: "
+
+#: LYMessages.c:373
+msgid "Edit the previous shortcut: "
+msgstr "Önceki kýsayolu düzenleyiniz: "
+
+#: LYMessages.c:374
+msgid "Edit a previous shortcut: "
+msgstr "Önceki kýsayollardan birini düzenleyiniz: "
+
+#: LYMessages.c:375
+#, c-format
+msgid "Key '%c' is not mapped to a jump file!"
+msgstr "'%c' tuþu, herhangi bir sýçrama dosyasýna eþlemlenmemiþ!"
+
+#: LYMessages.c:376
+msgid "Cannot locate jump file!"
+msgstr "Sýçrama dosyasý konumlandýrýlamýyor!"
+
+#: LYMessages.c:377
+msgid "Cannot open jump file!"
+msgstr "Sýçrama dosyasý açýlamýyor!"
+
+#: LYMessages.c:378
+msgid "Error reading jump file!"
+msgstr "Sýçrama dosyasýnýn okunmasýnda hata!"
+
+#: LYMessages.c:379
+msgid "Out of memory reading jump file!"
+msgstr "Sýçrama dosyasýnýn okunmasýnda bellek yetersiz!"
+
+#: LYMessages.c:380
+msgid "Out of memory reading jump table!"
+msgstr "Sýçrama tablosunun okunmasýnda bellek yetersiz!"
+
+#: LYMessages.c:381
+msgid "No index is currently available."
+msgstr "Halen hiç indeks yok."
+
+#. #define CONFIRM_MAIN_SCREEN
+#: LYMessages.c:383
+msgid "Do you really want to go to the Main screen?"
+msgstr "Ana ekrana gitmeyi gerçekten istiyor musunuz?"
+
+#: LYMessages.c:384
+msgid "You are already at main screen!"
+msgstr "Zaten ana ekrandasýnýz!"
+
+#. #define NOT_ISINDEX
+#: LYMessages.c:386
+msgid "Not a searchable indexed document -- press '/' to search for a text string"
+msgstr "Aranabilir indekslenmiþ bir belge deðil -- metin dizgesi aramak için '/'ye basýnýz"
+
+#. #define NO_OWNER
+#: LYMessages.c:388
+msgid "No owner is defined for this file so you cannot send a comment"
+msgstr "Bu dosya için bir sahip tanýmlanmadýðýndan yorum gönderemezsiniz"
+
+#: LYMessages.c:389
+#, c-format
+msgid "No owner is defined. Use %s?"
+msgstr "Sahip tanýmlanmamýþ. %s kullanmak ister misiniz?"
+
+#: LYMessages.c:390
+msgid "Do you wish to send a comment?"
+msgstr "Yorum göndermek ister misiniz?"
+
+#: LYMessages.c:391
+msgid "Mail is disallowed so you cannot send a comment"
+msgstr "Mektuba izin verilmediðinden yorum gönderemezsiniz"
+
+#: LYMessages.c:392
+msgid "The 'e'dit command is currently disabled."
+msgstr "Düzenl'e' komutu halen devre dýþý..."
+
+#: LYMessages.c:393
+msgid "External editing is currently disabled."
+msgstr "Harici düzenleme halen devre dýþý..."
+
+#: LYMessages.c:394
+msgid "System error - failure to get status."
+msgstr "Sistem hatasý - durum alýmý baþarýsýz."
+
+#: LYMessages.c:395
+msgid "No editor is defined!"
+msgstr "Hiçbir düzenleyici tanýmlanmamýþ!"
+
+#: LYMessages.c:396
+msgid "The 'p'rint command is currently disabled."
+msgstr "Yazdýr(p) komutu halen devre dýþý..."
+
+#: LYMessages.c:397
+msgid "Document has no Toolbar links or Banner."
+msgstr "Belgede araç çubuðu linki ya da afiþ yok..."
+
+#: LYMessages.c:398
+msgid "Unable to open traversal file."
+msgstr "Nakil dosyasý açýlamýyor."
+
+#: LYMessages.c:399
+msgid "Unable to open traversal found file."
+msgstr "Nakil bulunmuþ dosya açýlamýyor."
+
+#: LYMessages.c:400
+msgid "Unable to open reject file."
+msgstr "Red dosyasý açýlamýyor."
+
+#: LYMessages.c:401
+msgid "Unable to open traversal errors output file"
+msgstr "Nakil hatalarý çýktý dosyasý açýlamýyor"
+
+#: LYMessages.c:402
+msgid "TRAVERSAL WAS INTERRUPTED"
+msgstr "NAKÝL YARIDA KESÝLDÝ"
+
+#: LYMessages.c:403
+msgid "Follow link (or goto link or page) number: "
+msgstr "Ýzlenecek link (ya da Gidilecek link/sayfa) no: "
+
+#: LYMessages.c:404
+msgid "Select option (or page) number: "
+msgstr "Seçenek (ya da sayfa) no seçiniz: "
+
+#: LYMessages.c:405
+#, c-format
+msgid "Option number %d already is current."
+msgstr "%d no'lu seçenek zaten güncel."
+
+#. #define ALREADY_AT_OPTION_END
+#: LYMessages.c:407
+msgid "You are already at the end of this option list."
+msgstr "Zaten bu seçenek listesinin sonundasýnýz."
+
+#. #define ALREADY_AT_OPTION_BEGIN
+#: LYMessages.c:409
+msgid "You are already at the beginning of this option list."
+msgstr "Zaten bu seçenek listesinin baþýndasýnýz."
+
+#. #define ALREADY_AT_OPTION_PAGE
+#: LYMessages.c:411
+#, c-format
+msgid "You are already at page %d of this option list."
+msgstr "zaten bu seçenek listesinin %d. sayfasýndasýnýz."
+
+#: LYMessages.c:412
+msgid "You have entered an invalid option number."
+msgstr "Geçersiz bir seçenek no'su girdiniz."
+
+#: LYMessages.c:413
+msgid "** Bad HTML!!  Use -trace to diagnose. **"
+msgstr "** Bozuk HTML!!  Taný için -trace kullanýnýz. **"
+
+#: LYMessages.c:414
+msgid "Give name of file to save in"
+msgstr "Ýçine kaydedilecek dosya adý veriniz"
+
+#: LYMessages.c:415
+msgid "Can't save data to file -- please run WWW locally"
+msgstr "Veri, dosyaya kaydedilemiyor -- lütfen WWW'yu yerel çalýþtýrýn"
+
+#: LYMessages.c:416
+msgid "Can't open temporary file!"
+msgstr "Geçici dosya açýlamýyor!"
+
+#: LYMessages.c:417
+msgid "Can't open output file!  Cancelling!"
+msgstr "Çýktý dosyasý açýlamýyor!  Ýptal ediliyor!"
+
+#: LYMessages.c:418
+msgid "Execution is disabled."
+msgstr "Ýcra etme devre dýþý..."
+
+#. #define EXECUTION_DISABLED_FOR_FILE
+#: LYMessages.c:420
+#, c-format
+msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
+msgstr "Ýcra etme, bu dosya için etkinleþtirilmemiþ.  Seçenekler menüsüne bakýnýz (%s kullanýn)."
+
+#. #define EXECUTION_NOT_COMPILED
+#: LYMessages.c:422
+msgid "Execution capabilities are not compiled into this version."
+msgstr "Ýcra etme yetileri bu sürüm içine derlenmemiþ."
+
+#: LYMessages.c:423
+msgid "This file cannot be displayed on this terminal."
+msgstr "Bu dosya, bu uçbirimde görüntülenemez."
+
+#. #define CANNOT_DISPLAY_FILE_D_OR_C
+#: LYMessages.c:425
+msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
+msgstr "Bu dosya, bu uçbirimde görüntülenemez:  Ýndir(D) ya da Ýptal et(C)"
+
+#: LYMessages.c:426
+#, c-format
+msgid "%s  D)ownload, or C)ancel"
+msgstr "%s  Ýndir(D) ya da Ýptal et(C)"
+
+#: LYMessages.c:427
+msgid "Cancelling file."
+msgstr "Dosya iptal ediliyor."
+
+#: LYMessages.c:428
+msgid "Retrieving file.  - PLEASE WAIT -"
+msgstr "Dosya alýnýyor.  - LÜTFEN BEKLEYÝNÝZ -"
+
+#: LYMessages.c:429
+msgid "Enter a filename: "
+msgstr "Bir dosya adý giriniz: "
+
+#: LYMessages.c:430
+msgid "Edit the previous filename: "
+msgstr "Önceki dosya adýný düzenleyiniz: "
+
+#: LYMessages.c:431
+msgid "Edit a previous filename: "
+msgstr "Önceki dosya adlarýndan birini düzenleyiniz: "
+
+#: LYMessages.c:432
+msgid "Enter a new filename: "
+msgstr "Yeni bir dosya adý giriniz: "
+
+#: LYMessages.c:433
+msgid "File name may not begin with a dot."
+msgstr "Dosya adý noktayla baþlayamaz."
+
+#: LYMessages.c:435
+msgid "File exists.  Create higher version?"
+msgstr "Dosya zaten var.  Daha yüksek sürüm oluþturulsun mu?"
+
+#: LYMessages.c:437
+msgid "File exists.  Overwrite?"
+msgstr "Dosya zaten var.  Üzerine yazýlsýn mý?"
+
+#: LYMessages.c:439
+msgid "Cannot write to file."
+msgstr "Dosyaya yazýlamýyor."
+
+#: LYMessages.c:440
+msgid "ERROR! - download command is misconfigured."
+msgstr "HATA! - indir komutu yanlýþ ayarlanmýþ."
+
+#: LYMessages.c:441
+msgid "Unable to download file."
+msgstr "Dosya indirilemiyor."
+
+#: LYMessages.c:442
+msgid "Reading directory..."
+msgstr "Dizin okunuyor..."
+
+#: LYMessages.c:443
+msgid "Building directory listing..."
+msgstr "Dizin listesi yapýlanýyor..."
+
+#: LYMessages.c:444
+msgid "Saving..."
+msgstr "Kaydediliyor..."
+
+#: LYMessages.c:445
+#, c-format
+msgid "Could not edit file '%s'."
+msgstr "'%s' dosyasý düzenlenemedi."
+
+#: LYMessages.c:446
+msgid "Unable to access document!"
+msgstr "Belgeye eriþilemedi!"
+
+#: LYMessages.c:447
+msgid "Could not access file."
+msgstr "Dosyaya eriþilemedi."
+
+#: LYMessages.c:448
+msgid "Could not access directory."
+msgstr "Dizine eriþilemedi."
+
+#: LYMessages.c:449
+msgid "Could not load data."
+msgstr "Veri yüklenemedi."
+
+#. #define CANNOT_EDIT_REMOTE_FILES
+#: LYMessages.c:451
+msgid "Lynx cannot currently (e)dit remote WWW files."
+msgstr "Lynx, halen uzak WWW dosyalarýný düz(e)nleyemiyor."
+
+#. #define CANNOT_EDIT_FIELD
+#: LYMessages.c:453
+msgid "This field cannot be (e)dited with an external editor."
+msgstr "Bu alan, harici bir düzenleyiciyle düz(e)nlenemez."
+
+#: LYMessages.c:454
+msgid "Bad rule"
+msgstr "Hatalý kural"
+
+#: LYMessages.c:455
+msgid "Insufficient operands:"
+msgstr "Ýþlenenler yetersiz:"
+
+#: LYMessages.c:456
+msgid "You are not authorized to edit this file."
+msgstr "Bu dosyayý düzenleme yetkiniz yok."
+
+#: LYMessages.c:457
+msgid "Title: "
+msgstr "Baþlýk: "
+
+#: LYMessages.c:458
+msgid "Subject: "
+msgstr "Konu: "
+
+#: LYMessages.c:459
+msgid "Username: "
+msgstr "Kullanýcý adý: "
+
+#: LYMessages.c:460
+msgid "Password: "
+msgstr "Parola: "
+
+#: LYMessages.c:461
+msgid "lynx: Username and Password required!!!"
+msgstr "lynx: Kullanýcý adý ve Parola zorunludur!!!"
+
+#: LYMessages.c:462
+msgid "lynx: Password required!!!"
+msgstr "lynx: Parola zorunludur!!!"
+
+#: LYMessages.c:463
+msgid "Clear all authorization info for this session?"
+msgstr "Bu oturum için tüm yetkilendirme bilgisi silinsin mi?"
+
+#: LYMessages.c:464
+msgid "Authorization info cleared."
+msgstr "Yetkilendirme bilgisi silindi."
+
+#: LYMessages.c:465
+msgid "Authorization failed.  Retry?"
+msgstr "Yetkilendirme baþarýsýz.  Yinele?"
+
+#: LYMessages.c:466
+msgid "cgi support has been disabled."
+msgstr "cgi desteði devre dýþý..."
+
+#. #define CGI_NOT_COMPILED
+#: LYMessages.c:468
+msgid "Lynxcgi capabilities are not compiled into this version."
+msgstr "Lynxcgi yetileri bu sürüm içine derlenmemiþ."
+
+#: LYMessages.c:469
+#, c-format
+msgid "Sorry, no known way of converting %s to %s."
+msgstr "Üzgünüm, %s'i %s'e dönüþtürmenin bilinen yöntemi yok."
+
+#: LYMessages.c:470
+msgid "Unable to set up connection."
+msgstr "Baðlantý saðlanamýyor."
+
+#: LYMessages.c:471
+msgid "Unable to make connection"
+msgstr "Baðlantý kurulamýyor"
+
+#. #define MALFORMED_EXEC_REQUEST
+#: LYMessages.c:473
+msgid "Executable link rejected due to malformed request."
+msgstr "Bozuk istem nedeniyle icra edilebilir baðlantý geri çevrildi."
+
+#. #define BADCHAR_IN_EXEC_LINK
+#: LYMessages.c:475
+#, c-format
+msgid "Executable link rejected due to `%c' character."
+msgstr "`%c' karakteri nedeniyle icra edilebilir baðlantý geri çevrildi."
+
+#. #define RELPATH_IN_EXEC_LINK
+#: LYMessages.c:477
+msgid "Executable link rejected due to relative path string ('../')."
+msgstr "Göreli yol dizgesi ('../') nedeniyle icra edilebilir baðlantý reddedildi."
+
+#. #define BADLOCPATH_IN_EXEC_LINK
+#: LYMessages.c:479
+msgid "Executable link rejected due to location or path."
+msgstr "Konum ya da yol nedeniyle icra edilebilir baðlantý reddedildi."
+
+#: LYMessages.c:480
+msgid "Mail access is disabled!"
+msgstr "E-posta eriþimi devre dýþý!.."
+
+#. #define ACCESS_ONLY_LOCALHOST
+#: LYMessages.c:482
+msgid "Only files and servers on the local host can be accessed."
+msgstr "Yalnýzca yerel makinadaki dosya ve sunuculara eriþilebilir."
+
+#: LYMessages.c:483
+msgid "Telnet access is disabled!"
+msgstr "Telnet eriþimi devre dýþý!.."
+
+#. #define TELNET_PORT_SPECS_DISABLED
+#: LYMessages.c:485
+msgid "Telnet port specifications are disabled."
+msgstr "Telnet port belirleyicileri devre dýþý..."
+
+#: LYMessages.c:486
+msgid "USENET news access is disabled!"
+msgstr "USENET haber eriþimi devre dýþý!.."
+
+#: LYMessages.c:487
+msgid "Rlogin access is disabled!"
+msgstr "Rlogin eriþimi devre dýþý!.."
+
+#: LYMessages.c:488
+msgid "Ftp access is disabled!"
+msgstr "Ftp eriþimi devre dýþý!.."
+
+#: LYMessages.c:489
+msgid "There are no references from this document."
+msgstr "Bu belgeden hiç referans yok..."
+
+#: LYMessages.c:490
+msgid "There are only hidden links from this document."
+msgstr "Bu belgeden yalnýzca gizli linkler var..."
+
+#: LYMessages.c:492
+msgid "Unable to open command file."
+msgstr "Komut dosyasý açýlamýyor."
+
+#: LYMessages.c:494
+msgid "News Post Cancelled!!!"
+msgstr "Haber Gönderimi Ýptal Edildi!!!"
+
+#. #define SPAWNING_EDITOR_FOR_NEWS
+#: LYMessages.c:496
+msgid "Spawning your selected editor to edit news message"
+msgstr "Haber iletisini düzenlemek için seçilmiþ düzenleyici baþlatýlýyor"
+
+#: LYMessages.c:497
+msgid "Post this message?"
+msgstr "Ýleti gönderilsin mi?"
+
+#: LYMessages.c:498
+#, c-format
+msgid "Append '%s'?"
+msgstr "'%s' sona eklensin mi?"
+
+#: LYMessages.c:499
+msgid "Posting to newsgroup(s)..."
+msgstr "Haber grubu (ya da gruplarýna) gönderiliyor..."
+
+#: LYMessages.c:501
+msgid "*** You have unread mail. ***"
+msgstr "*** Okunmamýþ mektubunuz var. ***"
+
+#: LYMessages.c:503
+msgid "*** You have mail. ***"
+msgstr "*** Mektubunuz var. ***"
+
+#: LYMessages.c:505
+msgid "*** You have new mail. ***"
+msgstr "*** Yeni mektubunuz var. ***"
+
+#: LYMessages.c:506
+msgid "File insert cancelled!!!"
+msgstr "Dosya ekleme iptal edildi!!!"
+
+#: LYMessages.c:507
+msgid "Not enough memory for file!"
+msgstr "Dosya için yeterli bellek yok!"
+
+#: LYMessages.c:508
+msgid "Can't open file for reading."
+msgstr "Okumak için dosya açýlamýyor."
+
+#: LYMessages.c:509
+msgid "File does not exist."
+msgstr "Dosya mevcut deðil."
+
+#: LYMessages.c:510
+msgid "File does not exist - reenter or cancel:"
+msgstr "Dosya mevcut deðil - yeniden girin ya da vazgeçin:"
+
+#: LYMessages.c:511
+msgid "File is not readable."
+msgstr "Dosya okunabilir durumda deðil."
+
+#: LYMessages.c:512
+msgid "File is not readable - reenter or cancel:"
+msgstr "Dosya okunabilir durumda deðil - yeniden girin ya da vazgeçin:"
+
+#: LYMessages.c:513
+msgid "Nothing to insert - file is 0-length."
+msgstr "Eklenecek hiçbir þey yok - dosya 0 uzunlukta..."
+
+#: LYMessages.c:514
+msgid "Save request cancelled!!!"
+msgstr "Kaydetme istemi iptal edildi!"
+
+#: LYMessages.c:515
+msgid "Mail request cancelled!!!"
+msgstr "Mektup istemi iptal edildi!!!"
+
+#. #define CONFIRM_MAIL_SOURCE_PREPARSED
+#: LYMessages.c:517
+msgid "Viewing preparsed source.  Are you sure you want to mail it?"
+msgstr "Ayrýþtýrma öncesi kaynak görüntüleniyor.  Mektupla göndermek istediðinizden emin misiniz?"
+
+#: LYMessages.c:518
+msgid "Please wait..."
+msgstr "Lütfen bekleyiniz..."
+
+#: LYMessages.c:519
+msgid "Mailing file.  Please wait..."
+msgstr "Dosya mektupla gönderiliyor.  Lütfen bekleyiniz..."
+
+#: LYMessages.c:520
+msgid "ERROR - Unable to mail file"
+msgstr "HATA - Dosya mektupla gönderilemedi"
+
+#. #define CONFIRM_LONG_SCREEN_PRINT
+#: LYMessages.c:522
+#, c-format
+msgid "File is %d screens long.  Are you sure you want to print?"
+msgstr "Dosya %d ekran uzunluðunda.  Yazdýrmak istediðinizden emin misiniz?"
+
+#: LYMessages.c:523
+msgid "Print request cancelled!!!"
+msgstr "Yazdýrma istemi iptal edildi!!!"
+
+#: LYMessages.c:524
+msgid "Press <return> to begin: "
+msgstr "Baþlamak için <return>'e basýnýz: "
+
+#: LYMessages.c:525
+msgid "Press <return> to finish: "
+msgstr "Bitirmek için <return>'e basýnýz: "
+
+#. #define CONFIRM_LONG_PAGE_PRINT
+#: LYMessages.c:527
+#, c-format
+msgid "File is %d pages long.  Are you sure you want to print?"
+msgstr "Dosya %d sayfa uzunluðunda.  Yazdýrmak istediðinizden emin misiniz?"
+
+#. #define CHECK_PRINTER
+#: LYMessages.c:529
+msgid "Be sure your printer is on-line.  Press <return> to start printing:"
+msgstr "Yazýcýnýzýn çevrimiçi olduðundan emin olun.  Yazdýrmaya baþlamak için lütfen <return>'e basýnýz::"
+
+#: LYMessages.c:530
+msgid "ERROR - Unable to allocate file space!!!"
+msgstr "HATA - dosya boþluðu tahsis edilemedi!!!"
+
+#: LYMessages.c:531
+msgid "Unable to open tempfile"
+msgstr "Geçici dosya açýlamadý"
+
+#: LYMessages.c:532
+msgid "Unable to open print options file"
+msgstr "Yazdýrma seçenekleri dosyasý açýlamadý"
+
+#: LYMessages.c:533
+msgid "Printing file.  Please wait..."
+msgstr "Dosya yazdýrýlýyor.  Lütfen bekleyiniz..."
+
+#: LYMessages.c:534
+msgid "Please enter a valid internet mail address: "
+msgstr "Lütfen geçerli bir internet mektup adresi giriniz: "
+
+#: LYMessages.c:535
+msgid "ERROR! - printer is misconfigured!"
+msgstr "HATA! - Yazýcý yanlýþ ayarlanmýþ!"
+
+#: LYMessages.c:536
+msgid "Image map from POST response not available!"
+msgstr "POST yanýtýndan resim eþlemi temin edilemiyor!"
+
+#: LYMessages.c:537
+msgid "Misdirected client-side image MAP request!"
+msgstr "Yanlýþ yönlendirilmiþ alýcý-tarafý resim EÞLEM istemi!"
+
+#: LYMessages.c:538
+msgid "Client-side image MAP is not accessible!"
+msgstr "Alýcý-tarafý resim EÞLEMine eriþilemez!"
+
+#: LYMessages.c:539
+msgid "No client-side image MAPs are available!"
+msgstr "Hiçbir alýcý-tarafý resim EÞLEMi yok!.."
+
+#: LYMessages.c:540
+msgid "Client-side image MAP is not available!"
+msgstr "Alýcý-tarafý resim EÞLEMi yok!"
+
+#. #define OPTION_SCREEN_NEEDS_24
+#: LYMessages.c:543
+msgid "Screen height must be at least 24 lines for the Options menu!"
+msgstr "Seçenekler menüsü için ekran boyu en az 24 satýr olmalýdýr!"
+
+#. #define OPTION_SCREEN_NEEDS_23
+#: LYMessages.c:545
+msgid "Screen height must be at least 23 lines for the Options menu!"
+msgstr "Seçenekler menüsü için ekran boyu en az 23 satýr olmalýdýr!"
+
+#. #define OPTION_SCREEN_NEEDS_22
+#: LYMessages.c:547
+msgid "Screen height must be at least 22 lines for the Options menu!"
+msgstr "Seçenekler menüsü için ekran boyu en az 22 satýr olmalýdýr!"
+
+#: LYMessages.c:549
+msgid "That key requires Advanced User mode."
+msgstr "O tuþ, Ýleri Düzey Kullanýcý kipi gerektirir."
+
+#: LYMessages.c:550
+#, c-format
+msgid "Content-type: %s"
+msgstr "Ýçerik türü: %s"
+
+#: LYMessages.c:551
+msgid "Command: "
+msgstr "Komut: "
+
+#: LYMessages.c:552
+msgid "Unknown or ambiguous command"
+msgstr "Bilinmeyen ya da belirsiz komut"
+
+#: LYMessages.c:553
+msgid " Version "
+msgstr " Sürüm "
+
+#: LYMessages.c:554
+msgid " first"
+msgstr " ilk"
+
+#: LYMessages.c:555
+msgid ", guessing..."
+msgstr ", tahmin ediliyor..."
+
+#: LYMessages.c:556
+msgid "Permissions for "
+msgstr "Ýzinlerin sahibi "
+
+#: LYMessages.c:557
+msgid "Select "
+msgstr "Seçiniz "
+
+#: LYMessages.c:558
+msgid "capital letter"
+msgstr "büyük harf"
+
+#: LYMessages.c:559
+msgid " of option line,"
+msgstr "seçenek satýrýnýn,"
+
+#: LYMessages.c:560
+msgid " to save,"
+msgstr " kaydetmek için,"
+
+#: LYMessages.c:561
+msgid " to "
+msgstr " hedef "
+
+#: LYMessages.c:562
+msgid " or "
+msgstr " ya da "
+
+#: LYMessages.c:563
+msgid " index"
+msgstr " indeks"
+
+#: LYMessages.c:564
+msgid " to return to Lynx."
+msgstr " Lynx'e dönmek için."
+
+#: LYMessages.c:565
+msgid "Accept Changes"
+msgstr "Deðiþiklikleri kabul et"
+
+#: LYMessages.c:566
+msgid "Reset Changes"
+msgstr "Deðiþiklikleri Sýfýrla"
+
+#: LYMessages.c:567
+msgid "Left Arrow cancels changes"
+msgstr "Sol Ok deðiþiklikleri iptal eder"
+
+#: LYMessages.c:568
+msgid "Save options to disk"
+msgstr "Seçenekleri diske Kaydet"
+
+#: LYMessages.c:569
+msgid "Hit RETURN to accept entered data."
+msgstr "Girilen veriyi kabul etmek için RETURN'e basýnýz."
+
+#. #define ACCEPT_DATA_OR_DEFAULT
+#: LYMessages.c:571
+msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
+msgstr "Girilen veriyi kabul etmek için RETURN'e basýnýz.  Öntanýmlýyý çaðýrmak için veriyi siliniz."
+
+#: LYMessages.c:572
+msgid "Value accepted!"
+msgstr "Deðer kabul edildi!"
+
+#. #define VALUE_ACCEPTED_WARNING_X
+#: LYMessages.c:574
+msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
+msgstr "Deðer kabul edildi! -- UYARI: Lynx, XWINDOWS için ayarlanmýþtýr!"
+
+#. #define VALUE_ACCEPTED_WARNING_NONX
+#: LYMessages.c:576
+msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
+msgstr "Deðer kabul edildi! -- UYARI: Lynx, XWINDOWS için ayarlanmamýþtýr!"
+
+#: LYMessages.c:577
+msgid "You are not allowed to change which editor to use!"
+msgstr "Kullanýlacak düzenleyiciyi deðiþtirmenize izin verilmiyor!"
+
+#: LYMessages.c:578
+msgid "Failed to set DISPLAY variable!"
+msgstr "DISPLAY deðiþkeninin atanmasý baþarýlamadý!"
+
+#: LYMessages.c:579
+msgid "Failed to clear DISPLAY variable!"
+msgstr "DISPLAY deðiþkeninin silinmesi baþarýlamadý!"
+
+#. #define BOOKMARK_CHANGE_DISALLOWED
+#: LYMessages.c:581
+msgid "You are not allowed to change the bookmark file!"
+msgstr "Yer imi dosyasýný deðiþtirmenize izin verilmiyor!"
+
+#: LYMessages.c:582
+msgid "Terminal does not support color"
+msgstr "Uçbirim renk(li çýktýyý) desteklemiyor"
+
+#: LYMessages.c:583
+#, c-format
+msgid "Your '%s' terminal does not support color."
+msgstr "'%s' uçbiriminiz, renk(li çýktýyý) desteklemiyor."
+
+#: LYMessages.c:584
+msgid "Access to dot files is disabled!"
+msgstr "nokta dosyalara eriþim devre dýþý!.."
+
+#. #define UA_NO_LYNX_WARNING
+#: LYMessages.c:586
+msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
+msgstr "Kullanýcý Ajaný dizgesi \"Lynx\" ya da \"L_y_n_x\" içermiyor"
+
+#. #define UA_PLEASE_USE_LYNX
+#: LYMessages.c:588
+msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
+msgstr "Kullanýcý Ajaný'nda \"L_y_n_x\" ya da \"Lynx\" kullanýn, deðilse kasýtlý aldatmacaya benziyor!"
+
+#. #define UA_CHANGE_DISABLED
+#: LYMessages.c:590
+msgid "Changing of the User-Agent string is disabled!"
+msgstr "Kullanýcý Ajan dizgesinin deðiþtirilmesi devre dýþý!.."
+
+#. #define CHANGE_OF_SETTING_DISALLOWED
+#: LYMessages.c:592
+msgid "You are not allowed to change this setting."
+msgstr "Bu ayarý deðiþtirmenize izin verilmiyor."
+
+#: LYMessages.c:593
+msgid "Saving Options..."
+msgstr "Seçenekler Kaydediliyor..."
+
+#: LYMessages.c:594
+msgid "Options saved!"
+msgstr "Seçenekler kaydedildi!"
+
+#: LYMessages.c:595
+msgid "Unable to save Options!"
+msgstr "Seçenekler kaydedilemedi!"
+
+#: LYMessages.c:596
+msgid " 'r' to return to Lynx "
+msgstr " Lynx'e dönmek için 'r' "
+
+#: LYMessages.c:597
+msgid " '>' to save, or 'r' to return to Lynx "
+msgstr " kaydetmek için '>', ya da Lynx'e dönmek için 'r' "
+
+#. #define ANY_KEY_CHANGE_RET_ACCEPT
+#: LYMessages.c:599
+msgid "Hit any key to change value; RETURN to accept."
+msgstr "Deðeri deðiþtirmek için herhangi bir tuþa, kabul etmek için RETURNe basýnýz."
+
+#: LYMessages.c:600
+msgid "Error uncompressing temporary file!"
+msgstr "Geçici dosyanýn geniþletilmesinde hata!"
+
+#: LYMessages.c:601
+msgid "Unsupported URL scheme!"
+msgstr "Desteklenmeyen URL þemasý!"
+
+#: LYMessages.c:602
+msgid "Unsupported data: URL!  Use SHOWINFO, for now."
+msgstr "Desteklenmeyen veri: URL!  Þimdilik SHOWINFO (bilgi-göster) kullanýnýz."
+
+#: LYMessages.c:603
+msgid "Redirection limit of 10 URL's reached."
+msgstr "Yeniden yönlendirme limiti olan 10 URL'ye eriþildi."
+
+#: LYMessages.c:604
+msgid "Illegal redirection URL received from server!"
+msgstr "Sunucudan kuraldýþý yeniden yönlendirme URL'si alýndý!"
+
+#. #define SERVER_ASKED_FOR_REDIRECTION
+#: LYMessages.c:606
+#, c-format
+msgid "Server asked for %d redirection of POST content to"
+msgstr "Sunucu, POST içeriðinin þuraya %d yeniden yönlendirilmesini istedi"
+
+#: LYMessages.c:609
+msgid "P)roceed, use G)ET or C)ancel "
+msgstr "Devam et(P), Al(G) ya da Vazgeç(C) "
+
+#: LYMessages.c:610
+msgid "P)roceed, or C)ancel "
+msgstr "Devam et(P) ya da Vazgeç(C) "
+
+#. #define ADVANCED_POST_GET_REDIRECT
+#: LYMessages.c:612
+msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
+msgstr "POST içeriðinin yeniden yönlendirilmesi.  Devam et(P), (U)RL'ye bak, Al(G) ya da Vazgeç(C)"
+
+#. #define ADVANCED_POST_REDIRECT
+#: LYMessages.c:614
+msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
+msgstr "POST içeriðinin yeniden yönlendirilmesi.  Devam et(P), (U)RL'ye bak, ya da Vazgeç(C)"
+
+#. #define CONFIRM_POST_RESUBMISSION
+#: LYMessages.c:616
+msgid "Document from Form with POST content.  Resubmit?"
+msgstr "POST içerikli formdan belge.  Yeniden gönderilsin mi?"
+
+#. #define CONFIRM_POST_RESUBMISSION_TO
+#: LYMessages.c:618
+#, c-format
+msgid "Resubmit POST content to %s ?"
+msgstr "POST içeriði %s'e yeniden gönderilsin mi?"
+
+#. #define CONFIRM_POST_LIST_RELOAD
+#: LYMessages.c:620
+#, c-format
+msgid "List from document with POST data.  Reload %s ?"
+msgstr "POST verili belgeden liste.  %s yeniden yüklensin mi?"
+
+#. #define CONFIRM_POST_DOC_HEAD
+#: LYMessages.c:622
+msgid "Document from POST action, HEAD may not be understood.  Proceed?"
+msgstr "POST eyleminden belge, BAÞLIK anlaþýlmamýþ olabilir.  Devam edilsin mi?"
+
+#. #define CONFIRM_POST_LINK_HEAD
+#: LYMessages.c:624
+msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
+msgstr "Form gönderme eylemi POST, KAFA anlaþýlmamýþ olabilir.  Devam edilsin mi?"
+
+#: LYMessages.c:625
+msgid "Proceed without a username and password?"
+msgstr "Kullanýcý adý ve parola olmaksýzýn devam edecek misiniz?"
+
+#: LYMessages.c:626
+#, c-format
+msgid "Proceed (%s)?"
+msgstr "Devam edilsin mi (%s)?"
+
+#: LYMessages.c:627
+msgid "Cannot POST to this host."
+msgstr "Bu makinaya POST yapýlamýyor."
+
+#: LYMessages.c:628
+msgid "POST not supported for this URL - ignoring POST data!"
+msgstr "Bu URL için POST desteklenmiyor - POST verisi yok sayýlýyor!"
+
+#: LYMessages.c:629
+msgid "Discarding POST data..."
+msgstr "POST verisi siliniyor..."
+
+#: LYMessages.c:630
+msgid "Document will not be reloaded!"
+msgstr "Belge geri yüklenmeyecek!"
+
+#: LYMessages.c:631
+msgid "Location: "
+msgstr "Konum: "
+
+#: LYMessages.c:632
+#, c-format
+msgid "'%s' not found!"
+msgstr "'%s' bulunamadý!"
+
+#: LYMessages.c:633
+msgid "Default Bookmark File"
+msgstr "Öntanýmlý Yer Ými Dosyasý"
+
+#: LYMessages.c:634
+msgid "Screen too small! (8x35 min)"
+msgstr "Ekran çok küçük! (en az 8x35)"
+
+#: LYMessages.c:635
+msgid "Select destination or ^G to Cancel: "
+msgstr "Varýþ noktasýný seçiniz ya da iptal etmek için ^G: "
+
+#. #define MULTIBOOKMARKS_SELECT
+#: LYMessages.c:637
+msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
+msgstr "Alt yer imini seçiniz, menü için '=' ya da iptal etmek için ^G: "
+
+#. #define MULTIBOOKMARKS_SELF
+#: LYMessages.c:639
+msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
+msgstr "Bu yer imi dosyasýndaki bað(L)antý çoðaltýlsýn mý, iptal(C) mi edilsin? (l,c): "
+
+#: LYMessages.c:640
+msgid "Multiple bookmark support is not available."
+msgstr "Çok sayýda yer imi desteði mevcut deðil..."
+
+#: LYMessages.c:641
+#, c-format
+msgid " Select Bookmark (screen %d of %d)"
+msgstr " Yer imini seçiniz (%2$d ekranýn %1$d.'si)"
+
+#: LYMessages.c:642
+msgid "       Select Bookmark"
+msgstr "       Yer Ýmini Seçiniz"
+
+#. #define MULTIBOOKMARKS_EHEAD_MASK
+#: LYMessages.c:644
+#, c-format
+msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
+msgstr "Yer Ými AÇIKLAMASI ve DOSYAYOLU düzenleniyor (2'nin %d'i)"
+
+#. #define MULTIBOOKMARKS_EHEAD
+#: LYMessages.c:646
+msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
+msgstr "         Yer Ými AÇIKLAMASI ve DOSYAYOLU düzenleniyor"
+
+#: LYMessages.c:647
+msgid "Letter: "
+msgstr "Mektup: "
+
+#. #define USE_PATH_OFF_HOME
+#: LYMessages.c:650
+msgid "Use a filepath off your login directory in SHELL syntax!"
+msgstr "KABUK sözdiziminde giriþ dizininiz dýþýnda bir dosyayolu kullanýn!"
+
+#: LYMessages.c:652
+msgid "Use a filepath off your home directory!"
+msgstr "Ana dizininiz dýþýnda bir dosyayolu kullanýn!"
+
+#. #define MAXLINKS_REACHED
+#: LYMessages.c:655
+msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
+msgstr "Sayfa baþýna maksimum link aþýldý!  Yarým sayfa ya da iki satýrlýk kaydýrma kullanýn."
+
+#. #define MAXHIST_REACHED
+#: LYMessages.c:657
+msgid "History List maximum reached!  Document not pushed."
+msgstr "Tarihçe Listesi'nin maksimumuna ulaþýldý!  Belge zorlanmadý."
+
+#: LYMessages.c:658
+msgid "No previously visited links available!"
+msgstr "Önceden uðranmýþ link mevcut deðil!.."
+
+#: LYMessages.c:659
+msgid "Memory exhausted!  Program aborted!"
+msgstr "Bellek tükendi!  Program yarýda kesildi!"
+
+#: LYMessages.c:660
+msgid "Memory exhausted!  Aborting..."
+msgstr "Bellek tükendi!  Yarýda kesiliyor..."
+
+#: LYMessages.c:661
+msgid "Not enough memory!"
+msgstr "Bellek yetersiz!"
+
+#: LYMessages.c:662
+msgid "Directory/File Manager not available"
+msgstr "Dizin/Dosya Yöneticisi mevcut deðil"
+
+#: LYMessages.c:663
+msgid "HREF in BASE tag is not an absolute URL."
+msgstr "BASE etiketindeki HREF mutlak bir URL deðil."
+
+#: LYMessages.c:664
+msgid "Location URL is not absolute."
+msgstr "Konum URL'si mutlak deðil..."
+
+#: LYMessages.c:665
+msgid "Refresh URL is not absolute."
+msgstr "Yenile URL'si mutlak deðil..."
+
+#. #define SENDING_MESSAGE_WITH_BODY_TO
+#: LYMessages.c:667
+msgid ""
+"You are sending a message with body to:\n"
+"  "
+msgstr ""
+"Þuraya gövdeli bir mesaj gönderiyorsunuz: \n"
+"  "
+
+#: LYMessages.c:668
+msgid ""
+"You are sending a comment to:\n"
+"  "
+msgstr ""
+"Þuraya bir yorum gönderiyorsunuz:\n"
+"  "
+
+#: LYMessages.c:669
+msgid ""
+"\n"
+" With copy to:\n"
+"  "
+msgstr ""
+"\n"
+"Þuraya kopya ile:\n"
+"  "
+
+#: LYMessages.c:670
+msgid ""
+"\n"
+" With copies to:\n"
+"  "
+msgstr ""
+"\n"
+" Þuraya kopyalar ile:\n"
+"  "
+
+#. #define CTRL_G_TO_CANCEL_SEND
+#: LYMessages.c:672
+msgid ""
+"\n"
+"\n"
+"Use Ctrl-G to cancel if you do not want to send a message\n"
+msgstr ""
+"\n"
+"\n"
+"Eðer bir mesaj göndermek istemiyorsanýz iptal etmek için Ctrl-G kullanýn\n"
+
+#. #define ENTER_NAME_OR_BLANK
+#: LYMessages.c:674
+msgid ""
+"\n"
+" Please enter your name, or leave it blank to remain anonymous\n"
+msgstr ""
+"\n"
+" Lütfen ya adýnýzý girin, ya da anonim kalmak için boþ býrakýn\n"
+
+#. #define ENTER_MAIL_ADDRESS_OR_OTHER
+#: LYMessages.c:676
+msgid ""
+"\n"
+" Please enter a mail address or some other\n"
+msgstr ""
+"\n"
+" Lütfen bir e-posta adresi ya da benzerini girin\n"
+
+#. #define MEANS_TO_CONTACT_FOR_RESPONSE
+#: LYMessages.c:678
+msgid " means to contact you, if you desire a response.\n"
+msgstr " eðer bir yanýt arzularsanýz, size ulaþma yollarý.\n"
+
+#: LYMessages.c:679
+msgid ""
+"\n"
+" Please enter a subject line.\n"
+msgstr ""
+"\n"
+" Lütfen bir konu satýrý giriniz. \n"
+
+#. #define ENTER_ADDRESS_FOR_CC
+#: LYMessages.c:681
+msgid ""
+"\n"
+" Enter a mail address for a CC of your message.\n"
+msgstr ""
+"\n"
+" Mesajýnýzýn KK'sý için lütfen bir e-posta adresi giriniz.\n"
+
+#: LYMessages.c:682
+msgid " (Leave blank if you don't want a copy.)\n"
+msgstr " (Bir kopya istemiyorsanýz boþ býrakýnýz.)\n"
+
+#: LYMessages.c:683
+msgid ""
+"\n"
+" Please review the message body:\n"
+"\n"
+msgstr ""
+"\n"
+" Lütfen mesaj gövdesini gözden geçiriniz:\n"
+"\n"
+
+#: LYMessages.c:684
+msgid ""
+"\n"
+"Press RETURN to continue: "
+msgstr ""
+"\n"
+"Devam etmek için RETURN'e basýnýz: "
+
+#: LYMessages.c:685
+msgid ""
+"\n"
+"Press RETURN to clean up: "
+msgstr ""
+"\n"
+"Temizlemek için RETURN'e basýnýz: "
+
+#: LYMessages.c:686
+msgid " Use Control-U to erase the default.\n"
+msgstr " Öntanýmlýyý silmek için Control-U kullanýnýz.\n"
+
+#: LYMessages.c:687
+msgid ""
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+" Lütfen mesajýnýzý aþaðýya giriniz."
+
+#. #define ENTER_PERIOD_WHEN_DONE_A
+#: LYMessages.c:689 src/LYNews.c:361
+msgid ""
+"\n"
+" When you are done, press enter and put a single period (.)"
+msgstr ""
+"\n"
+" Bitirdiðinizde enter'a basýp, yeni satýra tek bir nokta (.)"
+
+#. #define ENTER_PERIOD_WHEN_DONE_B
+#: LYMessages.c:691 src/LYNews.c:362
+msgid ""
+"\n"
+" on a line and press enter again."
+msgstr ""
+"\n"
+" koyup tekrar enter'a basýnýz."
+
+#. Cookies messages
+#. #define ADVANCED_COOKIE_CONFIRMATION
+#: LYMessages.c:695
+#, c-format
+msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
+msgstr "%s çerez: %.*s=%.*s  Ýzin verir misiniz? Evet(Y)/Hayýr(N)/Her zaman(A)/Asla(V)"
+
+#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
+#: LYMessages.c:697
+#, c-format
+msgid "Accept invalid cookie domain=%s for '%s'?"
+msgstr "'%2$s' için geçersiz çerez yöresi=%1$s kabul edilsin mi?"
+
+#. #define INVALID_COOKIE_PATH_CONFIRMATION
+#: LYMessages.c:699
+#, c-format
+msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
+msgstr "'%2$s'in öneki olarak geçersiz çerez yolu=%1$s kabul edilsin mi?"
+
+#: LYMessages.c:700
+msgid "Allowing this cookie."
+msgstr "Bu çereze izin veriliyor."
+
+#: LYMessages.c:701
+msgid "Rejecting this cookie."
+msgstr "Bu çerez reddediliyor."
+
+#: LYMessages.c:702
+msgid "The Cookie Jar is empty."
+msgstr "Çerez kavanozu boþ..."
+
+#. #define ACTIVATE_TO_GOBBLE
+#: LYMessages.c:704
+msgid "Activate links to gobble up cookies or entire domains,"
+msgstr "Çerezleri ya da tüm yöreleri silip süpürmek, bir yörenin 'izin' ayarlarýný "
+
+#: LYMessages.c:705
+msgid "or to change a domain's 'allow' setting."
+msgstr "deðiþtirmek için linkleri etkinleþtiriniz."
+
+#: LYMessages.c:706
+msgid "(Cookies never allowed.)"
+msgstr "(Çerezlere asla izin verilmiyor.)"
+
+#: LYMessages.c:707
+msgid "(Cookies always allowed.)"
+msgstr "(Çerezlere her zaman izin veriliyor.)"
+
+#: LYMessages.c:708
+msgid "(Cookies allowed via prompt.)"
+msgstr "(Çerezlere bilgi istemi aracýlýðýyla izin veriliyor.)"
+
+#: LYMessages.c:709
+msgid "(Persistent Cookies.)"
+msgstr "(Kalýcý çerezler.)"
+
+#: LYMessages.c:710
+msgid "(No title.)"
+msgstr "(Baþlýk yok.)"
+
+#: LYMessages.c:711
+msgid "(No name.)"
+msgstr "(Ýsim yok.)"
+
+#: LYMessages.c:712
+msgid "(No value.)"
+msgstr "(Deðer yok.)"
+
+#: LYMessages.c:713
+msgid "None"
+msgstr "Hiçbiri"
+
+#: LYMessages.c:714
+msgid "(End of session.)"
+msgstr "(Oturum sonu.)"
+
+#: LYMessages.c:715
+msgid "Delete this cookie?"
+msgstr "Bu çerez silinsin mi?"
+
+#: LYMessages.c:716
+msgid "The cookie has been eaten!"
+msgstr "Çerez yendi!"
+
+#: LYMessages.c:717
+msgid "Delete this empty domain?"
+msgstr "Bu boþ yöre silinsin mi?"
+
+#: LYMessages.c:718
+msgid "The domain has been eaten!"
+msgstr "Yöre yendi!"
+
+#. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:720
+msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "Yörenin çerezlerini silin(D), izin verin her zaman(A)/sor(P)/asla(V), ya da vazgeç(C)? "
+
+#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:722
+msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "Yöreyi silin(D), izin verin her zaman(A)/sor(P)/asla(V), ya da vazgeç(C)? "
+
+#: LYMessages.c:723
+msgid "All cookies in the domain have been eaten!"
+msgstr "Yöredeki tüm çerezler yendi!"
+
+#: LYMessages.c:724
+#, c-format
+msgid "'A'lways allowing from domain '%s'."
+msgstr "'%s' yöresine her zaman(A) izin veriliyor."
+
+#: LYMessages.c:725
+#, c-format
+msgid "ne'V'er allowing from domain '%s'."
+msgstr "'%s' yöresine asla(V) izin verilmiyor."
+
+#: LYMessages.c:726
+#, c-format
+msgid "'P'rompting to allow from domain '%s'."
+msgstr "'%s' yöresine izin vermek için soruluyor(P)."
+
+#: LYMessages.c:727
+msgid "Delete all cookies in this domain?"
+msgstr "Bu yöredeki tüm çerezler silinsin mi?"
+
+#: LYMessages.c:728
+msgid "All of the cookies in the jar have been eaten!"
+msgstr "Kavanozdaki tüm çerezler yendi!"
+
+#: LYMessages.c:730
+msgid "Port 19 not permitted in URLs."
+msgstr "Port 19'a URL'lerde izin verilmiyor."
+
+#: LYMessages.c:731
+msgid "Port 25 not permitted in URLs."
+msgstr "Port 25'e URL'lerde izin verilmiyor."
+
+#: LYMessages.c:732
+#, c-format
+msgid "Port %lu not permitted in URLs."
+msgstr "Port %lu'e URL'lerde izin verilmiyor."
+
+#: LYMessages.c:733
+msgid "URL has a bad port field."
+msgstr "URL'de bozuk port alaný var."
+
+#: LYMessages.c:734
+msgid "Maximum nesting of HTML elements exceeded."
+msgstr "HTML bileþenlerinin maksimum içiçe geçme sýnýrý aþýldý."
+
+#: LYMessages.c:735
+msgid "Bad partial reference!  Stripping lead dots."
+msgstr "Bozuk kýsmi referans!  Yol gösterici noktalar soyuluyor."
+
+#: LYMessages.c:736
+msgid "Trace Log open failed.  Trace off!"
+msgstr "Ýzleme Kütüðünün açýlmasý baþarýsýz.  Ýzleme kapatýldý!"
+
+#: LYMessages.c:737
+msgid "Lynx Trace Log"
+msgstr "Lynx Ýzleme Kütüðü"
+
+#: LYMessages.c:738
+msgid "No trace log has been started for this session."
+msgstr "Bu oturum için hiç izleme kütüðü baþlatýlmadý."
+
+#. #define MAX_TEMPCOUNT_REACHED
+#: LYMessages.c:740
+msgid "The maximum temporary file count has been reached!"
+msgstr "Maksimum geçici dosya sayýsýna ulaþýldý!"
+
+#. #define FORM_VALUE_TOO_LONG
+#: LYMessages.c:742
+msgid "Form field value exceeds buffer length!  Trim the tail."
+msgstr "Form alaný deðeri tampon uzunluðunu aþmakta!  Kuyruðunu kýrpýn."
+
+#. #define FORM_TAIL_COMBINED_WITH_HEAD
+#: LYMessages.c:744
+msgid "Modified tail combined with head of form field value."
+msgstr "Form alaný deðeri baþlýðýyla birleþik deðiþtirilmiþ kuyruk."
+
+#. HTFile.c
+#: LYMessages.c:747
+msgid "Directory"
+msgstr "Dizin"
+
+#: LYMessages.c:748
+msgid "Directory browsing is not allowed."
+msgstr "Dizine göz atmaya izin verilmiyor."
+
+#: LYMessages.c:749
+msgid "Selective access is not enabled for this directory"
+msgstr "Bu dizin için seçici eriþim etkinleþtirilmemiþ"
+
+#: LYMessages.c:750
+msgid "Multiformat: directory scan failed."
+msgstr "Çokbiçim: dizin taramasý baþarýsýz."
+
+#: LYMessages.c:751
+msgid "This directory is not readable."
+msgstr "Bu dizin okunabilir (durumda) deðil."
+
+#: LYMessages.c:752
+msgid "Can't access requested file."
+msgstr "Ýstenen dosyaya eriþilemiyor."
+
+#: LYMessages.c:753
+msgid "Could not find suitable representation for transmission."
+msgstr "Ýletim için uygun temsil (tarzý) bulunamadý."
+
+#: LYMessages.c:754
+msgid "Could not open file for decompression!"
+msgstr "Geniþletmek üzere dosya açýlamadý!"
+
+#: LYMessages.c:755
+msgid "Files:"
+msgstr "Dosyalar:"
+
+#: LYMessages.c:756
+msgid "Subdirectories:"
+msgstr "Altdizinler:"
+
+#: LYMessages.c:757
+msgid " directory"
+msgstr " dizin"
+
+#: LYMessages.c:758
+msgid "Up to "
+msgstr "Üst sýnýr "
+
+#: LYMessages.c:759
+msgid "Current directory is "
+msgstr "Mevcut dizin "
+
+#. HTGopher.c
+#: LYMessages.c:762
+msgid "No response from server!"
+msgstr "Sunucudan yanýt yok!"
+
+#: LYMessages.c:763
+msgid "CSO index"
+msgstr "CSO indeksi"
+
+#: LYMessages.c:764
+msgid ""
+"\n"
+"This is a searchable index of a CSO database.\n"
+msgstr ""
+"\n"
+"Bu, CSO veritabanýnýn aranabilir bir indeksidir.\n"
+
+#: LYMessages.c:765
+msgid "CSO Search Results"
+msgstr "CSO Arama Sonuçlarý"
+
+#: LYMessages.c:766
+#, c-format
+msgid "Seek fail on %s\n"
+msgstr "Arama %s'de baþarýsýz\n"
+
+#: LYMessages.c:767
+msgid ""
+"\n"
+"Press the 's' key and enter search keywords.\n"
+msgstr ""
+"\n"
+"'s' tuþuna basýp, anahtar sözcükleri giriniz.\n"
+
+#: LYMessages.c:768
+msgid ""
+"\n"
+"This is a searchable Gopher index.\n"
+msgstr ""
+"\n"
+"Bu, arama yapýlabilen bir Gopher indeksidir.\n"
+
+#: LYMessages.c:769
+msgid "Gopher index"
+msgstr "Gopher indeksi"
+
+#: LYMessages.c:770
+msgid "Gopher Menu"
+msgstr "Gopher Menüsü"
+
+#: LYMessages.c:771
+msgid " Search Results"
+msgstr " Arama Sonuçlarý"
+
+#: LYMessages.c:772
+msgid "Sending CSO/PH request."
+msgstr "CSO/PH istemi gönderiliyor."
+
+#: LYMessages.c:773
+msgid "Sending Gopher request."
+msgstr "Gopher istemi gönderiliyor."
+
+#: LYMessages.c:774
+msgid "CSO/PH request sent; waiting for response."
+msgstr "CSO/PH istemi gönderildi; yanýt bekleniyor."
+
+#: LYMessages.c:775
+msgid "Gopher request sent; waiting for response."
+msgstr "Gopher istemi gönderildi; yanýt bekleniyor."
+
+#: LYMessages.c:776
+msgid ""
+"\n"
+"Please enter search keywords.\n"
+msgstr ""
+"\n"
+"Lütfen arama için anahtar sözcükleri giriniz.\n"
+
+#: LYMessages.c:777
+msgid ""
+"\n"
+"The keywords that you enter will allow you to search on a"
+msgstr ""
+"\n"
+"Girdiðiniz anahtar sözcükler, veri tabanýnda bir kiþi adýnýn"
+
+#: LYMessages.c:778
+msgid " person's name in the database.\n"
+msgstr " aranmasýný saðlayacak.\n"
+
+#. HTNews.c
+#: LYMessages.c:781
+msgid "Connection closed ???"
+msgstr "Baðlantý kapatýldý mý ???"
+
+#: LYMessages.c:782
+msgid "Cannot open temporary file for news POST."
+msgstr "Haber POSTu için geçici dosya açýlamýyor."
+
+#: LYMessages.c:783
+msgid "This client does not contain support for posting to news with SSL."
+msgstr "Bu istemci SSL'li habere postalamak için destek içermiyor."
+
+#. HTStyle.c
+#: LYMessages.c:786
+#, c-format
+msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
+msgstr "Stil %d `%s' SGML:%s.  Yazýtipi %s %.1f boyut.\n"
+
+#: LYMessages.c:787
+#, c-format
+msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
+msgstr "\tGirinti: ilk satýr=%.0f diðerleri=%.0f, Yükseklik=%.1f Alt çýkýntý=%.1f\n"
+
+#: LYMessages.c:788
+#, c-format
+msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
+msgstr "\tYaslama=%d, %d sekme. (%.0f önce, %.0f sonra)\n"
+
+#: LYMessages.c:789
+#, c-format
+msgid "\t\tTab kind=%d at %.0f\n"
+msgstr "\t\tSekme türü=%d konum %.0f\n"
+
+#. HTTP.c
+#: LYMessages.c:792
+msgid "Can't proceed without a username and password."
+msgstr "Kullanýcý adý ve parola olmadan devam edilemez."
+
+#: LYMessages.c:793
+msgid "Can't retry with authorization!  Contact the server's WebMaster."
+msgstr "Yetkilendirme yeniden denenemez!  Sunucunun site yöneticisiyle temas kurun."
+
+#: LYMessages.c:794
+msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
+msgstr "Vekil(proxy) yetkilendirmesi yeniden denenemez! Sunucunun site yöneticisiyle temas kurun."
+
+#: LYMessages.c:795
+msgid "Retrying with proxy authorization information."
+msgstr "Vekil(proxy) yetkilendirme bilgisiyle yeniden deneniyor."
+
+#. HTWAIS.c
+#: LYMessages.c:798
+msgid "HTWAIS: Return message too large."
+msgstr "HTWAIS: Dönüþ mesajý çok büyük."
+
+#: LYMessages.c:799
+msgid "Enter WAIS query: "
+msgstr "WAIS sorgusu giriniz: "
+
+#. Miscellaneous status
+#: LYMessages.c:802
+msgid "Retrying as HTTP0 request."
+msgstr "HTTP0 istemi olarak yeniden deneniyor."
+
+#: LYMessages.c:803
+#, c-format
+msgid "Transferred %d bytes"
+msgstr "%d bayt aktarýldý"
+
+#: LYMessages.c:804
+msgid "Data transfer complete"
+msgstr "Veri aktarýmý tamamlandý"
+
+#: LYMessages.c:805
+#, c-format
+msgid "Error processing line %d of %s\n"
+msgstr "%2$s satýrdan %1$d.'sinin iþlenmesinde hata\n"
+
+#. Lynx internal page titles
+#: LYMessages.c:808
+msgid "Address List Page"
+msgstr "Adres Listesi Sayfasý"
+
+#: LYMessages.c:809
+msgid "Bookmark file"
+msgstr "Yer imi dosyasý"
+
+#: LYMessages.c:810
+msgid "Configuration Definitions"
+msgstr "Ayar Tanýmlarý"
+
+#: LYMessages.c:811
+msgid "Cookie Jar"
+msgstr "Çerez kavanozu"
+
+#: LYMessages.c:812
+msgid "Current Key Map"
+msgstr "Mevcut Tuþ Eþlemi"
+
+#: LYMessages.c:813
+msgid "File Management Options"
+msgstr "Dosya Yönetim Seçenekleri"
+
+#: LYMessages.c:814
+msgid "Download Options"
+msgstr "Ýndirme Seçenekleri"
+
+#: LYMessages.c:815
+msgid "History Page"
+msgstr "Tarihçe Sayfasý"
+
+#: LYMessages.c:816
+msgid "List Page"
+msgstr "Liste Sayfasý"
+
+#: LYMessages.c:817
+msgid "Lynx.cfg Information"
+msgstr "Lynx.cfg Bilgileri"
+
+#: LYMessages.c:818
+msgid "Converted Mosaic Hotlist"
+msgstr "Dönüþtürülmüþ Mosaic Sýcaklistesi"
+
+#: LYMessages.c:819
+msgid "Options Menu"
+msgstr "Seçenekler Menüsü"
+
+#: LYMessages.c:820
+msgid "File Permission Options"
+msgstr "Dosya Ýzin Seçenekleri"
+
+#: LYMessages.c:821
+msgid "Printing Options"
+msgstr "Yazdýrma Seçenekleri"
+
+#: LYMessages.c:822
+msgid "Information about the current document"
+msgstr "Mevcut dosya bilgileri"
+
+#: LYMessages.c:823
+msgid "Your recent statusline messages"
+msgstr "Son durumsatýrý mesajlarýnýz"
+
+#: LYMessages.c:824
+msgid "Upload Options"
+msgstr "Yükleme Seçenekleri"
+
+#: LYMessages.c:825
+msgid "Visited Links Page"
+msgstr "Uðranmýþ Linkler Sayfasý"
+
+#. CONFIG_DEF_TITLE subtitles
+#: LYMessages.c:828
+msgid "See also"
+msgstr "Ayrýca bakýnýz"
+
+#: LYMessages.c:829
+msgid "your"
+msgstr "sizin"
+
+#: LYMessages.c:830
+msgid "for runtime options"
+msgstr "yürütüm süresi seçenekleri için"
+
+#: LYMessages.c:831
+msgid "compile time options"
+msgstr "derleme süresi seçenekleri"
+
+#: LYMessages.c:832
+msgid "color-style configuration"
+msgstr "renk stili ayarlama"
+
+#: LYMessages.c:833
+msgid "latest release"
+msgstr "son daðýtým"
+
+#: LYMessages.c:834
+msgid "pre-release version"
+msgstr "daðýtým öncesi sürüm"
+
+#: LYMessages.c:835
+msgid "development version"
+msgstr "geliþtirme sürümü"
+
+#. #define AUTOCONF_CONFIG_CACHE
+#: LYMessages.c:837
+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 ""
+"Aþaðýdaki veri, Lynx'in bu kopyasýnýn otomatik ayarlanma/yapýlandýrma süreci\n"
+"sýrasýnda türetilmiþtir.  Yazýlým hatasý bildirirken, lütfen bu sayfanýn bir\n"
+"kopyasýný da dahil ediniz."
+
+#. #define AUTOCONF_LYNXCFG_H
+#: LYMessages.c:841
+msgid ""
+"The following data were used as automatically-configured compile-time\n"
+"definitions when this copy of Lynx was built."
+msgstr ""
+"Aþaðýdaki veri, Lynx'in bu kopyasý yapýlandýrýlýrken otomatik-ayarlanmýþ\n"
+"derleme süresi tanýmlarý olarak kullanýlmýþtýr."
+
+#. #define DIRED_NOVICELINE
+#: LYMessages.c:846
+msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
+msgstr "..Oluþtur(C)  Ýndir(D)  Düzenle(E)  Tam menü(F)  Deðiþtir(M)  Çýkart(R)  Ýþaretle(T)  Yükle(U)     \n"
+
+#: LYMessages.c:847
+msgid "Failed to obtain status of current link!"
+msgstr "Mevcut linkin durumu elde edilemedi!"
+
+#. #define INVALID_PERMIT_URL
+#: LYMessages.c:850
+msgid "Special URL only valid from current File Permission menu!"
+msgstr "Özel URL yalnýzca güncel Dosya Ýzin menüsünden geçerlidir!"
+
+#: LYMessages.c:854
+msgid "External support is currently disabled."
+msgstr "Harici destek halen devre dýþý..."
+
+#. new with 2.8.4dev.21
+#: LYMessages.c:858
+msgid "Changing working-directory is currently disabled."
+msgstr "Çalýþma dizinini deðiþtirme þu an devre dýþý."
+
+#: LYMessages.c:859
+msgid "Linewrap OFF!"
+msgstr "Satýrsarma KAPALI!"
+
+#: LYMessages.c:860
+msgid "Linewrap ON!"
+msgstr "Satýrsarma AÇIK!"
+
+#: LYMessages.c:861
+msgid "Parsing nested-tables toggled OFF!  Reloading..."
+msgstr "Ýçice geçmiþ-tablo ayrýþtýrma KAPATILDI!  Yeniden yükleniyor..."
+
+#: LYMessages.c:862
+msgid "Parsing nested-tables toggled ON!  Reloading..."
+msgstr "Ýçice geçmiþ-tablo ayrýþtýrma AÇILDI!  Yeniden yükleniyor..."
+
+#: LYMessages.c:863
+msgid "Shifting is disabled while line-wrap is in effect"
+msgstr "Satýr-sarma etkinken kaydýrma (shifting) devre dýþýdýr"
+
+#: LYMessages.c:864
+msgid "Trace not supported"
+msgstr "Ýz(leme) desteklenmiyor"
+
+#: WWW/Library/Implementation/HTAABrow.c:647
+#, c-format
+msgid "Username for '%s' at %s '%s%s':"
+msgstr "%2$s '%3$s%4$s'deki '%1$s' için kullanýcý adý:"
+
+#: WWW/Library/Implementation/HTAABrow.c:913
+msgid "This client doesn't know how to compose proxy authorization information for scheme"
+msgstr "Bu istemci þema için vekil(proxy) yetkilendirme bilgisi oluþturmayý bilmiyor"
+
+#: WWW/Library/Implementation/HTAABrow.c:988
+msgid "This client doesn't know how to compose authorization information for scheme"
+msgstr "Bu istemci þema için yetkilendirme bilgisi oluþturmayý bilmiyor"
+
+#: WWW/Library/Implementation/HTAABrow.c:1096
+#, c-format
+msgid "Invalid header '%s%s%s%s%s'"
+msgstr "Geçersiz baþlýk '%s%s%s%s%s'"
+
+#: WWW/Library/Implementation/HTAABrow.c:1200
+msgid "Proxy authorization required -- retrying"
+msgstr "Vekil(proxy) yetkilendirmesi gerekli -- yeniden deneniyor"
+
+#: WWW/Library/Implementation/HTAABrow.c:1259
+msgid "Access without authorization denied -- retrying"
+msgstr "Yetkilendirilmeden eriþim reddedildi -- yeniden deneniyor"
+
+#: WWW/Library/Implementation/HTAccess.c:677
+msgid "Access forbidden by rule"
+msgstr "Eriþim kuralla yasaklanmýþ"
+
+#: WWW/Library/Implementation/HTAccess.c:779
+msgid "Document with POST content not found in cache.  Resubmit?"
+msgstr "Önbellekte POST içerikli belge bulunmadý.  Yeniden gönderilsin mi?"
+
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
+msgid "Loading incomplete."
+msgstr "Yükleme tamamlanmadý."
+
+#: WWW/Library/Implementation/HTAccess.c:1077
+msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
+msgstr "**** HTAcess: Yürürlükten kalkmýþ yük rutini tarafýndan soket ya da dosya numarasý döndü!\n"
+
+#: WWW/Library/Implementation/HTAccess.c:1079
+msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
+msgstr "**** HTAcess: Dahili yazýlým hatasý.  Lütfen lynx-dev@sig.net adresine bildiriniz.\n"
+
+#: WWW/Library/Implementation/HTAccess.c:1080
+#, c-format
+msgid "**** HTAccess: Status returned was: %d\n"
+msgstr "**** HTAccess: Dönen durum: %d\n"
+
+#.
+#. * hack: if we fail in HTAccess.c
+#. * avoid duplicating URL, oh.
+#.
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
+msgid "Can't Access"
+msgstr "Eriþilemiyor"
+
+#: WWW/Library/Implementation/HTAccess.c:1094
+msgid "Unable to access document."
+msgstr "Belgeye eriþilemiyor."
+
+#: WWW/Library/Implementation/HTFTP.c:766
+#, c-format
+msgid "Enter password for user %s@%s:"
+msgstr "%s@%s kullanýcýsý için parola giriniz:"
+
+#: WWW/Library/Implementation/HTFTP.c:794
+msgid "Unable to connect to FTP host."
+msgstr "FTP makinasýna baðlanýlamadý."
+
+#: WWW/Library/Implementation/HTFTP.c:1064
+msgid "close master socket"
+msgstr "ana soketi kapatýnýz"
+
+#: WWW/Library/Implementation/HTFTP.c:1126
+msgid "socket for master socket"
+msgstr "ana soket için soket"
+
+#.
+#. **  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:1640 WWW/Library/Implementation/HTFTP.c:2261
+msgid "Symbolic Link"
+msgstr "Simgesel Link"
+
+#: WWW/Library/Implementation/HTFTP.c:2622
+msgid "Receiving FTP directory."
+msgstr "FTP dizini alýnýyor."
+
+#: WWW/Library/Implementation/HTFTP.c:2762
+#, c-format
+msgid "Transferred %d bytes (%5d)"
+msgstr "%d bayt aktarýldý (%5d)"
+
+#: WWW/Library/Implementation/HTFTP.c:3083
+msgid "connect for data"
+msgstr "veri için baðlan"
+
+#: WWW/Library/Implementation/HTFTP.c:3731
+msgid "Receiving FTP file."
+msgstr "FTP dosyasý alýnýyor"
+
+#: WWW/Library/Implementation/HTFinger.c:278
+msgid "Could not set up finger connection."
+msgstr "Finger baðlantýsý saðlanamýyor."
+
+#: WWW/Library/Implementation/HTFinger.c:325
+msgid "Could not load data (no sitename in finger URL)"
+msgstr "Veri yüklenemiyor (finger URL'sinde site adý yok)"
+
+#: WWW/Library/Implementation/HTFinger.c:331
+msgid "Invalid port number - will only use port 79!"
+msgstr "Geçersiz port no - yalnýzca port 79 kullanýlacak!"
+
+#: WWW/Library/Implementation/HTFinger.c:396
+msgid "Could not access finger host."
+msgstr "Finger makinasýna eriþilemedi."
+
+#: WWW/Library/Implementation/HTFinger.c:404
+msgid "No response from finger server."
+msgstr "Finger sunucusundan yanýt yok."
+
+#: WWW/Library/Implementation/HTNews.c:372
+#, c-format
+msgid "Username for news host '%s':"
+msgstr "'%s' adlý haber makinasý için kullanýcý adý:"
+
+#: WWW/Library/Implementation/HTNews.c:425
+msgid "Change username?"
+msgstr "Kullanýcý adý deðiþtirilsin mi?"
+
+#: WWW/Library/Implementation/HTNews.c:429
+msgid "Username:"
+msgstr "Kullanýcý adý:"
+
+#: WWW/Library/Implementation/HTNews.c:453
+#, c-format
+msgid "Password for news host '%s':"
+msgstr "'%s' adlý haber makinasý için parola:"
+
+#: WWW/Library/Implementation/HTNews.c:536
+msgid "Change password?"
+msgstr "Parola deðiþtirilsin mi?"
+
+#: WWW/Library/Implementation/HTNews.c:1690
+#, c-format
+msgid "No matches for: %s"
+msgstr "%s için eþleþme yok..."
+
+#: WWW/Library/Implementation/HTNews.c:1743
+msgid ""
+"\n"
+"No articles in this group.\n"
+msgstr ""
+"\n"
+"Bu grupta hiç mesaj yok.\n"
+
+#: WWW/Library/Implementation/HTNews.c:1756
+msgid ""
+"\n"
+"No articles in this range.\n"
+msgstr ""
+"\n"
+"Bu erimde hiç mesaj yok.\n"
+
+#.
+#. **	Set window title.
+#.
+#: WWW/Library/Implementation/HTNews.c:1769
+#, c-format
+msgid "%s,  Articles %d-%d"
+msgstr "%s,  %d-%d mesaj"
+
+#: WWW/Library/Implementation/HTNews.c:1791
+msgid "Earlier articles"
+msgstr "Önceki mesajlar"
+
+#: WWW/Library/Implementation/HTNews.c:1804
+#, c-format
+msgid ""
+"\n"
+"There are about %d articles currently available in %s, IDs as follows:\n"
+"\n"
+msgstr ""
+"\n"
+"Halen %2$s'de yaklaþýk %1$d mesaj mevcut, kimlikler þu þekilde:\n"
+"\n"
+
+#: WWW/Library/Implementation/HTNews.c:1864
+msgid "All available articles in "
+msgstr "Tüm mevcut mesajlar "
+
+#: WWW/Library/Implementation/HTNews.c:2080
+msgid "Later articles"
+msgstr "Sonraki mesajlar"
+
+#: WWW/Library/Implementation/HTNews.c:2104
+msgid "Post to "
+msgstr "Kime Gönderilecek "
+
+#: WWW/Library/Implementation/HTNews.c:2322
+msgid "This client does not contain support for SNEWS URLs."
+msgstr "Bu istemci SNEWS URL'ler için destek içermiyor."
+
+#: WWW/Library/Implementation/HTNews.c:2530
+msgid "No target for raw text!"
+msgstr "Ham metin için hiç hedef yok!"
+
+#: WWW/Library/Implementation/HTNews.c:2560
+msgid "Connecting to NewsHost ..."
+msgstr "Haber makinasýna baðlanýlýyor ..."
+
+#: WWW/Library/Implementation/HTNews.c:2611
+#, c-format
+msgid "Could not access %s."
+msgstr "%s'e eriþilemiyor."
+
+#: WWW/Library/Implementation/HTNews.c:2711
+#, c-format
+msgid "Can't read news info.  News host %.20s responded: %.200s"
+msgstr "Haber bilgisi okunamýyor.  %.20s adlý haber makinasýnýn yanýtý: %.200s"
+
+#: WWW/Library/Implementation/HTNews.c:2715
+#, c-format
+msgid "Can't read news info, empty response from host %s"
+msgstr "Haber bilgisi okunamýyor, %s makinasýndan boþ yanýt"
+
+#.
+#. **	List available newsgroups. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2919
+msgid "Reading list of available newsgroups."
+msgstr "Mevcut haber gruplarýnýn listesi okunuyor."
+
+#: WWW/Library/Implementation/HTNews.c:2941
+msgid "Reading list of articles in newsgroup."
+msgstr "Haber grubundaki mesaj listesi okunuyor."
+
+#.
+#. **	Get an article from a news group. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2947
+msgid "Reading news article."
+msgstr "Haber mesajý okunuyor."
+
+#: WWW/Library/Implementation/HTNews.c:2977
+msgid "Sorry, could not load requested news."
+msgstr "Üzgünüm, istenen haber yüklenemedi."
+
+#: WWW/Library/Implementation/HTTCP.c:1239
+msgid "Address has invalid port"
+msgstr "Adres portu geçersiz"
+
+#: WWW/Library/Implementation/HTTCP.c:1327
+msgid "Address length looks invalid"
+msgstr "Adres uzunluðu geçersiz görünüyor"
+
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
+#, c-format
+msgid "Unable to locate remote host %s."
+msgstr "%s adlý karþý makina konumlandýrýlamýyor."
+
+#. 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:1575 WWW/Library/Implementation/HTTelnet.c:103
+#, c-format
+msgid "Invalid hostname %s"
+msgstr "Geçersiz makina adý %s"
+
+#: WWW/Library/Implementation/HTTCP.c:1589
+#, c-format
+msgid "Making %s connection to %s"
+msgstr "%2$s'e %1$s baðlantýsý kuruluyor"
+
+#: WWW/Library/Implementation/HTTCP.c:1605
+#, 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:1614
+msgid "socket failed."
+msgstr "soket baþarýsýz."
+
+#: WWW/Library/Implementation/HTTCP.c:1634
+msgid "Could not make connection non-blocking."
+msgstr "Baðlantý engelsizleþtirilemedi (non-blocking)."
+
+#: WWW/Library/Implementation/HTTCP.c:1703
+msgid "Connection failed (too many retries)."
+msgstr "Baðlantý baþarýsýz (çok sayýda yeniden deneme)."
+
+#: WWW/Library/Implementation/HTTCP.c:1896
+msgid "Could not restore socket to blocking."
+msgstr "Soket engellemeye (blocking) geri yüklenemedi."
+
+#: WWW/Library/Implementation/HTTCP.c:1962
+msgid "Socket read failed for 180,000 tries."
+msgstr "Soket okunmasý 180,000 kez baþarýsýz."
+
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr "Adres bir kullanýcý adý içeriyor: %s"
+
+#: WWW/Library/Implementation/HTTP.c:503
+msgid "This client does not contain support for HTTPS URLs."
+msgstr "Bu istemci HTTPS URL'ler için destek içermiyor."
+
+#: WWW/Library/Implementation/HTTP.c:528
+msgid "Unable to connect to remote host."
+msgstr "Karþý makinaya baðlanýlamadý."
+
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr "Baðlantý, TLS'siz tekrar deneniyor."
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr "SSL hatasý:sertifikada ortak ad bulunamadý-Devam?"
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr "SSL hatasý:makina(%s)!=sert(%s)-Devam edilsin mi?"
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr "Güvenli %d-bit %s (%s) HTTP baðlantýsý"
+
+#: WWW/Library/Implementation/HTTP.c:1091
+msgid "Sending HTTP request."
+msgstr "HTTP istemi gönderiliyor."
+
+#: WWW/Library/Implementation/HTTP.c:1125
+msgid "Unexpected network write error; connection aborted."
+msgstr "Umulmadýk aða yazma hatasý; baðlantý yarýda kesildi."
+
+#: WWW/Library/Implementation/HTTP.c:1131
+msgid "HTTP request sent; waiting for response."
+msgstr "HTTP istemi gönderildi; yanýt bekleniyor."
+
+#: WWW/Library/Implementation/HTTP.c:1195
+msgid "Unexpected network read error; connection aborted."
+msgstr "Umulmadýk aða yazma hatasý; baðlantý yarýda kesildi."
+
+#.
+#. **	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:1391
+msgid "Got unexpected Informational Status."
+msgstr "Umulmadýk Bilgisel Durum alýndý."
+
+#.
+#. *  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:1426
+msgid "Request fulfilled.  Reset Content."
+msgstr "Ýstem karþýlandý.  Ýçeriði temizle."
+
+#. 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:1545
+msgid "Got unexpected 304 Not Modified status."
+msgstr "Umulmadýk 304 Deðiþtirilmedi durumu alýndý."
+
+#: WWW/Library/Implementation/HTTP.c:1612
+msgid "Redirection of POST content requires user approval."
+msgstr "POST içeriðinin yeniden yönlendirilmesi kullanýcý onayý gerektirir."
+
+#: WWW/Library/Implementation/HTTP.c:1627
+msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
+msgstr "POST içeriði mevcut.  Kalýcý Yeniden Yönlendirmeye Geçici muamelesi yapýlýyor.\n"
+
+#: WWW/Library/Implementation/HTTP.c:1672
+msgid "Retrying with access authorization information."
+msgstr "Eriþim yetkilendirme bilgisiyle yeniden deneniyor."
+
+#: WWW/Library/Implementation/HTTP.c:1684
+msgid "Show the 401 message body?"
+msgstr "401 mesaj gövdesi gösterilsin mi?"
+
+#: WWW/Library/Implementation/HTTP.c:1729
+msgid "Show the 407 message body?"
+msgstr "407 mesaj gövdesi gösterilsin mi?"
+
+#.
+#. **	Bad or unknown server_status number.
+#. **	Take a chance and hope there is
+#. **	something to display. - FM
+#.
+#: WWW/Library/Implementation/HTTP.c:1834
+msgid "Unknown status reply from server!"
+msgstr "Sunucudan bilinmeyen durum yanýtý!"
+
+#: WWW/Library/Implementation/HTTelnet.c:101
+#, c-format
+msgid "remote %s session:"
+msgstr "uzak %s oturumu:"
+
+#: WWW/Library/Implementation/HTWAIS.c:161
+msgid "Could not connect to WAIS server."
+msgstr "WAIS sunucusuna baðlanýlamadý."
+
+#: WWW/Library/Implementation/HTWAIS.c:170
+msgid "Could not open WAIS connection for reading."
+msgstr "Okuma için WAIS baðlantýsý açýlamadý."
+
+#: WWW/Library/Implementation/HTWAIS.c:194
+msgid "Diagnostic code is "
+msgstr "Tanýsal kod: "
+
+#: WWW/Library/Implementation/HTWAIS.c:463
+msgid "Index "
+msgstr "Ýndeks "
+
+#: WWW/Library/Implementation/HTWAIS.c:467
+#, c-format
+msgid " contains the following %d item%s relevant to \""
+msgstr " aþaðýdaki ilgili %d öðe%s(y)i içerir \""
+
+#: WWW/Library/Implementation/HTWAIS.c:475
+msgid "The first figure after each entry is its relative score, "
+msgstr "Herbir girdiden sonraki ilk sayý, onun göreceli skoru, "
+
+#: WWW/Library/Implementation/HTWAIS.c:476
+msgid "the second is the number of lines in the item."
+msgstr "ikincisiyse, öðedeki satýr sayýsýdýr."
+
+#: WWW/Library/Implementation/HTWAIS.c:517
+msgid " (bad file name)"
+msgstr " (bozuk dosya adý)"
+
+#: WWW/Library/Implementation/HTWAIS.c:542
+msgid "(bad doc id)"
+msgstr "(bozuk belge no)"
+
+#: WWW/Library/Implementation/HTWAIS.c:558
+msgid "(Short Header record, can't display)"
+msgstr "(Kýsa Baþlýk kaydý, görüntülenemiyor)"
+
+#: WWW/Library/Implementation/HTWAIS.c:565
+msgid ""
+"\n"
+"Long Header record, can't display\n"
+msgstr ""
+"\n"
+"Uzun Baþlýk kaydý, görüntülenemiyor\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:572
+msgid ""
+"\n"
+"Text record\n"
+msgstr ""
+"\n"
+"Metin kaydý\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:581
+msgid ""
+"\n"
+"Headline record, can't display\n"
+msgstr ""
+"\n"
+"Baþlýk kaydý, görüntülenemiyor\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:589
+msgid ""
+"\n"
+"Code record, can't display\n"
+msgstr ""
+"\n"
+"Kod kaydý, görüntülenemiyor\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:689
+msgid "Syntax error in WAIS URL"
+msgstr "WAIS URL'de sözdizimi hatasý"
+
+#: WWW/Library/Implementation/HTWAIS.c:759
+msgid " (WAIS Index)"
+msgstr " (WAIS Ýndeksi)"
+
+#: WWW/Library/Implementation/HTWAIS.c:766
+msgid "WAIS Index: "
+msgstr "WAIS Ýndeksi: "
+
+#: WWW/Library/Implementation/HTWAIS.c:772
+msgid "This is a link for searching the "
+msgstr "Bu, WAIS indeksini aramak için "
+
+#: WWW/Library/Implementation/HTWAIS.c:776
+msgid " WAIS Index.\n"
+msgstr " bir linktir.\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:803
+msgid ""
+"\n"
+"Enter the 's'earch command and then specify search words.\n"
+msgstr ""
+"\n"
+"Ara(s) komutunu girip arama sözcüklerini belirleyiniz.\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:825
+msgid " (in "
+msgstr " (þurada "
+
+#: WWW/Library/Implementation/HTWAIS.c:834
+msgid "WAIS Search of \""
+msgstr "WAIS Aramasý \""
+
+#: WWW/Library/Implementation/HTWAIS.c:838
+msgid "\" in: "
+msgstr "\" þurada: "
+
+#: WWW/Library/Implementation/HTWAIS.c:853
+msgid "HTWAIS: Request too large."
+msgstr "HTWAIS: Ýstem çok büyük."
+
+#: WWW/Library/Implementation/HTWAIS.c:862
+msgid "Searching WAIS database..."
+msgstr "WAIS veritabaný aranýyor..."
+
+#: WWW/Library/Implementation/HTWAIS.c:872
+msgid "Search interrupted."
+msgstr "Arama kesildi."
+
+#: WWW/Library/Implementation/HTWAIS.c:922
+msgid "Can't convert format of WAIS document"
+msgstr "WAIS belgesinin biçemi dönüþtürülemiyor"
+
+#: WWW/Library/Implementation/HTWAIS.c:966
+msgid "HTWAIS: Request too long."
+msgstr "HTWAIS: Ýstem çok uzun."
+
+#.
+#. **	Actually do the transaction given by request_message.
+#.
+#: WWW/Library/Implementation/HTWAIS.c:980
+msgid "Fetching WAIS document..."
+msgstr "WAIS belgesi getiriliyor..."
+
+#. display_search_response(target, retrieval_response,
+#. wais_database, keywords);
+#: WWW/Library/Implementation/HTWAIS.c:1019
+msgid "No text was returned!\n"
+msgstr "Hiç metin dönmedi!\n"
+
+#: WWW/Library/Implementation/HTWSRC.c:287
+msgid " NOT GIVEN in source file; "
+msgstr " kaynak dosyada VERÝLMEDÝ; "
+
+#: WWW/Library/Implementation/HTWSRC.c:311
+msgid " WAIS source file"
+msgstr " WAIS kaynak dosyasý"
+
+#: WWW/Library/Implementation/HTWSRC.c:318
+msgid " description"
+msgstr " açýklama"
+
+#: WWW/Library/Implementation/HTWSRC.c:328
+msgid "Access links"
+msgstr "Eriþim linkleri"
+
+#: WWW/Library/Implementation/HTWSRC.c:346
+msgid "Direct access"
+msgstr "Dolaysýz eriþim"
+
+#. * Proxy will be used if defined, so let user know that - FM *
+#: WWW/Library/Implementation/HTWSRC.c:349
+msgid " (or via proxy server, if defined)"
+msgstr " (ya da tanýmlýysa, vekil(proxy) sunucu aracýlýðýyla)"
+
+#: WWW/Library/Implementation/HTWSRC.c:364
+msgid "Maintainer"
+msgstr "Yönetici"
+
+#: WWW/Library/Implementation/HTWSRC.c:372
+msgid "Host"
+msgstr "Bilgisayar"
+
+#: src/GridText.c:688
+msgid "Memory exhausted, display interrupted!"
+msgstr "Bellek tükendi, görüntü kesildi!"
+
+#: src/GridText.c:693
+msgid "Memory exhausted, will interrupt transfer!"
+msgstr "Bellek tükendi, aktarým kesilecek!"
+
+#: src/GridText.c:3578
+msgid " *** MEMORY EXHAUSTED ***"
+msgstr " *** BELLEK TÜKENDÝ ***"
+
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
+msgid "unknown field or link"
+msgstr "bilinmeyen alan ya da link"
+
+#: src/GridText.c:6023
+msgid "text entry field"
+msgstr "metin giriþ alaný"
+
+#: src/GridText.c:6026
+msgid "password entry field"
+msgstr "parola giriþ alaný"
+
+#: src/GridText.c:6029
+msgid "checkbox"
+msgstr "onay kutusu"
+
+#: src/GridText.c:6032
+msgid "radio button"
+msgstr "radyo düðmesi"
+
+#: src/GridText.c:6035
+msgid "submit button"
+msgstr "gönderme düðmesi"
+
+#: src/GridText.c:6038
+msgid "reset button"
+msgstr "temizleme düðmesi"
+
+#: src/GridText.c:6041
+msgid "popup menu"
+msgstr "açýlýr menü"
+
+#: src/GridText.c:6044
+msgid "hidden form field"
+msgstr "gizli form alaný"
+
+#: src/GridText.c:6047
+msgid "text entry area"
+msgstr "metin giriþ alaný"
+
+#: src/GridText.c:6050
+msgid "range entry field"
+msgstr "erim giriþ alaný"
+
+#: src/GridText.c:6053
+msgid "file entry field"
+msgstr "dosya giriþ alaný"
+
+#: src/GridText.c:6056
+msgid "text-submit field"
+msgstr "metin-gönderme alaný"
+
+#: src/GridText.c:6059
+msgid "image-submit button"
+msgstr "resim-gönderme alaný"
+
+#: src/GridText.c:6062
+msgid "keygen field"
+msgstr "keygen alaný"
+
+#: src/GridText.c:6065
+msgid "unknown form field"
+msgstr "bilinmeyen form alaný"
+
+#: src/GridText.c:10066
+msgid "Can't open file for uploading"
+msgstr "Yüklemek için dosya açýlamýyor."
+
+#: src/GridText.c:11218
+#, c-format
+msgid "Submitting %s"
+msgstr "%s gönderiliyor"
+
+#. ugliness has happened; inform user and do the best we can
+#: src/GridText.c:12375
+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:12581
+msgid "Wrap lines to fit displayed area?"
+msgstr "Görüntülenen alana sýðmak üzere satýrlar sarmalansýn mý?"
+
+#: src/GridText.c:12633
+msgid "Very long lines have been wrapped!"
+msgstr "Çok uzun satýrlar sarmalandý!"
+
+#: src/GridText.c:13079
+msgid "Very long lines have been truncated!"
+msgstr "Çok uzun satýrlarýn sonundan kýrpýldý!"
+
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
+msgid "bytes"
+msgstr "bayt"
+
+#: src/HTAlert.c:155
+msgid "KB"
+msgstr "KB"
+
+#: src/HTAlert.c:274
+#, c-format
+msgid "Read %s of %s of data"
+msgstr "%2$s verinin %1$s'i okundu"
+
+#: src/HTAlert.c:276
+#, c-format
+msgid "Read %s of data"
+msgstr "Verinin %s'i okundu"
+
+#: src/HTAlert.c:281
+#, c-format
+msgid ", %s/sec"
+msgstr ", %s/sn"
+
+#: src/HTAlert.c:290
+#, c-format
+msgid " (stalled for %s)"
+msgstr " (%s süresince durakladý)"
+
+#: src/HTAlert.c:294
+#, c-format
+msgid ", ETA %s"
+msgstr ", ETA %s"
+
+#: src/HTAlert.c:301
+msgid " (Press 'z' to abort)"
+msgstr " (Yarýda kesmek için 'z'ye basýnýz)"
+
+#. 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:342 src/HTAlert.c:390
+msgid "yes"
+msgstr "evet"
+
+#: src/HTAlert.c:345 src/HTAlert.c:391
+msgid "no"
+msgstr "hayýr"
+
+#: src/HTML.c:5985
+msgid "Description:"
+msgstr "Açýklama:"
+
+#: src/HTML.c:5990
+msgid "(none)"
+msgstr "(hiçbiri)"
+
+#: src/HTML.c:5994
+msgid "Filepath:"
+msgstr "Dosya yolu:"
+
+#: src/HTML.c:5999
+msgid "(unknown)"
+msgstr "(bilinmiyor)"
+
+#: src/HTML.c:7452
+msgid "Document has only hidden links.  Use the 'l'ist command."
+msgstr "Belgede yalnýzca gizli linkler var.  Listele(l) komutunu kullanýnýz."
+
+#: src/HTML.c:7958
+msgid "Source cache error - disk full?"
+msgstr "Kaynak önbellek hatasý - disk tamamen dolu mu?"
+
+#: src/HTML.c:7971
+msgid "Source cache error - not enough memory!"
+msgstr "Kaynak önbellek hatasý - bellek yetersiz!"
+
+#: src/LYBookmark.c:167
+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 ""
+"     Bu dosya, X Mosaic sýcak listesinin bir HTML temsilidir.\n"
+"     Kullanýmdan kalkmýþ ya da geçersiz linkler, yer imi çýkartma\n"
+"     komutu kullanýlarak çýkartýlabilir, bu genellikle 'R' tuþudur, ancak\n"
+"     siz ya da sistem yöneticiniz tarafýndan yeniden eþlemlenmiþ olabilir."
+
+#: src/LYBookmark.c:379
+msgid ""
+"     You can delete links by the 'R' key<br>\n"
+"<ol>\n"
+msgstr ""
+"     Linkleri 'R' tuþuyla silebilirsiniz<br>\n"
+"<ol>\n"
+
+#: src/LYBookmark.c:382
+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 ""
+"     Linkleri yer imi çýkartma komutunu kullanarak silebilirsiniz.  Bu genellikle\n"
+"     'R' tuþudur, ancak siz ya da sistem yöneticiniz tarafýndan yeniden\n"
+"    .eþlemlenmiþ olabilir."
+
+#: src/LYBookmark.c:386
+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 ""
+"     Bu dosya, kullanýmdan kalkmýþ, geçersiz linkleri silmek ya da sýralarýný\n"
+"     deðiþtirmek üzere standart bir metin düzenleyiciyle de düzenlenebilir."
+
+#: src/LYBookmark.c:389
+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 ""
+"Not: Eðer bu dosyayý elle düzenlerseniz\n"
+"      satýr içlerindeki biçimi deðiþtirmemeli, ya da\n"
+"      baþka HTML belirteci eklememelisiniz.\n"
+"      Herbir linkin tek satýr olarak kaydedildiðine emin olun."
+
+#: src/LYBookmark.c:681
+#, c-format
+msgid "File may be recoverable from %s during this session"
+msgstr "Dosya, bu oturum boyunca %s'den kurtarýlabilir"
+
+#.
+#. *  Neither the path as given nor any components examined by
+#. *  backing up were stat()able. - kw
+#.
+#: src/LYCgi.c:231
+msgid "Unable to access cgi script"
+msgstr "cgi betiðine eriþilemiyor"
+
+#: src/LYCgi.c:654 src/LYCgi.c:657
+msgid "Good Advice"
+msgstr "Ýyi Öneri"
+
+#: src/LYCgi.c:660
+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:667
+msgid "this link"
+msgstr "temin edilebilir"
+
+#: src/LYCgi.c:671
+msgid "It provides state of the art CGI script support.\n"
+msgstr "Güncel CGI betik desteðini saðlar.\n"
+
+#: src/LYClean.c:122
+msgid "Exiting via interrupt:"
+msgstr "Ýþkesmesi aracýlýðýyla kapanýyor:"
+
+#: src/LYCookie.c:2462
+msgid "(from a previous session)"
+msgstr "(önceki bir oturumdan)"
+
+#: src/LYCookie.c:2522
+msgid "Maximum Gobble Date:"
+msgstr "Maksimum Silip Süpürme Tarihi:"
+
+#: src/LYCookie.c:2564
+msgid "Internal"
+msgstr "Dahili"
+
+#: src/LYCookie.c:2565
+msgid "cookie_domain_flag_set error, aborting program"
+msgstr "cookie_domain_flag_set hatasý, program yarýda kesiliyor"
+
+#: src/LYCurses.c:1004
+msgid "Terminal initialisation failed - unknown terminal type?"
+msgstr "Uçbirim ön deðer atamasý baþarýsýz - bilinmeyen uçbirim türü?"
+
+#: src/LYCurses.c:1426
+msgid "Terminal ="
+msgstr "Uçbirim ="
+
+#: src/LYCurses.c:1430
+msgid "You must use a vt100, 200, etc. terminal with this program."
+msgstr "Bu programla bir vt100, 200 vb. uçbirim kullanmalýsýnýz."
+
+#: src/LYCurses.c:1480
+msgid "Your Terminal type is unknown!"
+msgstr "Uçbirim türünüz bilinmiyor!"
+
+#: src/LYCurses.c:1481
+msgid "Enter a terminal type:"
+msgstr "Bir uçbirim türü giriniz:"
+
+#: src/LYCurses.c:1495
+msgid "TERMINAL TYPE IS SET TO"
+msgstr "UÇBÝRÝM TÜRÜ AYARI"
+
+#: src/LYCurses.c:1994
+#, c-format
+msgid ""
+"\n"
+"A Fatal error has occurred in %s Ver. %s\n"
+msgstr ""
+"\n"
+"%2$s Sür. %1$s'de ölümcül bir hata oluþtu\n"
+
+#: src/LYCurses.c:1996
+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"
+"Lütfen sistem yöneticinize bir yazýlým hatasýný doðrulatmak için, ve\n"
+"eðer doðrulanýrsa lynx-dev listesine bildirmesi için haber veriniz.\n"
+"Hata raporlarý, soruna yol açan komutun ve/veya URL'nin kýsa açýklamasýný,\n"
+"iþletim sistemi adýyla sürüm numarasýný, TCPIP uygulamasýný,\n"
+"kapýlabildiyse GERÝÝZSÜRÜMÜnü ve ilgili diðer bilgileri içermelidir.\n"
+
+#: src/LYEdit.c:249
+msgid "Editor killed by signal"
+msgstr "Düzenleyici sinyalle öldürüldü"
+
+#: src/LYEdit.c:251
+#, c-format
+msgid "Editor returned with error status, %s"
+msgstr "Düzenleyici %s hata durumuyla döndü."
+
+#: src/LYEdit.c:252
+msgid "reason unknown."
+msgstr "neden bilinmiyor."
+
+#: src/LYDownload.c:517
+msgid "Downloaded link:"
+msgstr "Ýndirilmiþ link:"
+
+#: src/LYDownload.c:522
+msgid "Suggested file name:"
+msgstr "Önerilen dosya adý:"
+
+#: src/LYDownload.c:527
+msgid "Standard download options:"
+msgstr "Standart indirme seçenekleri:"
+
+#: src/LYDownload.c:528
+msgid "Download options:"
+msgstr "Ýndirme seçenekleri:"
+
+#: src/LYDownload.c:544
+msgid "Save to disk"
+msgstr "Diske kaydet"
+
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "Dosyayý görüntüle"
+
+#: src/LYDownload.c:565
+msgid "Save to disk disabled."
+msgstr "Diske kaydetme devre dýþý..."
+
+#: src/LYDownload.c:569 src/LYPrint.c:1327
+msgid "Local additions:"
+msgstr "Yerel eklentiler:"
+
+#: src/LYDownload.c:578 src/LYUpload.c:216
+msgid "No Name Given"
+msgstr "Ýsim Verilmemiþ"
+
+#: src/LYHistory.c:657
+msgid "You selected:"
+msgstr "Seçiminiz:"
+
+#: src/LYHistory.c:681 src/LYHistory.c:921
+msgid "(no address)"
+msgstr "(adres yok)"
+
+#: src/LYHistory.c:685
+msgid " (internal)"
+msgstr " (dahili)"
+
+#: src/LYHistory.c:687
+msgid " (was internal)"
+msgstr " (dahiliydi)"
+
+#: src/LYHistory.c:785
+msgid " (From History)"
+msgstr " (Tarihçe'den)"
+
+#: src/LYHistory.c:841
+msgid "You visited (POSTs, bookmark, menu and list files excluded):"
+msgstr "Uðradýklarýnýz (POSTlar, yer imi, menü ve liste dosyalarý hariç):"
+
+#: src/LYHistory.c:1137
+msgid "(No messages yet)"
+msgstr "(Henüz hiç mesaj yok)"
+
+#: src/LYLeaks.c:209
+msgid "Invalid pointer detected."
+msgstr "Geçersiz imleyici saptandý."
+
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr "Sýra:"
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
+msgid "Pointer:"
+msgstr "Ýmleyici:"
+
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
+msgid "FileName:"
+msgstr "DosyaAdý:"
+
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
+msgid "LineCount:"
+msgstr "SatýrSayýsý:"
+
+#: src/LYLeaks.c:249
+msgid "Memory leak detected."
+msgstr "Bellek sýzýntýsý saptandý."
+
+#: src/LYLeaks.c:257
+msgid "Contains:"
+msgstr "Ýçindekiler:"
+
+#: src/LYLeaks.c:270
+msgid "ByteSize:"
+msgstr "BaytÖlçüsü:"
+
+#: src/LYLeaks.c:284
+msgid "realloced:"
+msgstr "Yeniden özgülenen:"
+
+#: src/LYLeaks.c:307
+msgid "Total memory leakage this run:"
+msgstr "Bu yürütmedeki toplam bellek sýzýntýsý:"
+
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr "Tepe ayýrma"
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr "Ayrýlan bayt"
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr "Ayrýlan toplam bellek"
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr "Toplam boþ"
+
+#: src/LYList.c:85
+msgid "References in "
+msgstr "Bu belgedeki "
+
+#: src/LYList.c:86
+msgid "this document:"
+msgstr "referanslar:"
+
+#: src/LYList.c:92
+msgid "Visible links:"
+msgstr "Görünür linkler:"
+
+#: src/LYList.c:194 src/LYList.c:315
+msgid "Hidden links:"
+msgstr "Gizli Linkler:"
+
+#: src/LYList.c:262
+msgid "References"
+msgstr "Referanslar"
+
+#: src/LYList.c:264
+msgid "Visible links"
+msgstr "Görünür linkler"
+
+#: src/LYLocal.c:267
+#, c-format
+msgid "Unable to get status of '%s'."
+msgstr "'%s'in durumu alýnamýyor."
+
+#: src/LYLocal.c:301
+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:366
+#, c-format
+msgid "Unable to %s due to system error!"
+msgstr "Sistem hatasý nedeniyle %s yapýlamýyor!"
+
+#. error return
+#: src/LYLocal.c:400
+#, c-format
+msgid "Probable failure to %s due to system error!"
+msgstr "Sistem hatasý nedeniyle olasý %s baþarýsýzlýðý!"
+
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "%s'i çýkart"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr "%s'e dokun"
+
+#: src/LYLocal.c:508
+#, c-format
+msgid "move %s to %s"
+msgstr "%s'i %s'e taþý"
+
+#: src/LYLocal.c:548
+msgid "There is already a directory with that name!  Request ignored."
+msgstr "O isimde bir dizin zaten var!  Ýstem yoksayýldý."
+
+#: src/LYLocal.c:550
+msgid "There is already a file with that name!  Request ignored."
+msgstr "O isimde bir dosya zaten var!  Ýstem yoksayýldý."
+
+#: src/LYLocal.c:552
+msgid "The specified name is already in use!  Request ignored."
+msgstr "Belirtilmiþ isim zaten kullanýmda!  Ýstem yoksayýldý."
+
+#: src/LYLocal.c:563
+msgid "Destination has different owner!  Request denied."
+msgstr "Varýþ yerinin sahibi farklý!  Ýstem reddedildi."
+
+#: src/LYLocal.c:566
+msgid "Destination is not a valid directory!  Request denied."
+msgstr "Varýþ yeri geçerli bir dizin deðil!  Ýstem reddedildi."
+
+#: src/LYLocal.c:588
+msgid "Remove all tagged files and directories?"
+msgstr "Bütün iþaretlenmiþ dosya ve dizinler çýkartýlsýn mý?"
+
+#: src/LYLocal.c:647
+msgid "Enter new location for tagged items: "
+msgstr "Ýþaretlenmiþ öðeler için yeni konum giriniz: "
+
+#: src/LYLocal.c:716
+msgid "Path too long"
+msgstr "Yol çok uzun"
+
+#: src/LYLocal.c:747
+msgid "Source and destination are the same location - request ignored!"
+msgstr "Çýkýþ ve varýþ konumlarý ayný - istem yoksayýldý!"
+
+#: src/LYLocal.c:805
+msgid "Enter new name for directory: "
+msgstr "Dizin için yeni isim giriniz: "
+
+#: src/LYLocal.c:807
+msgid "Enter new name for file: "
+msgstr "Dosya için yeni isim giriniz: "
+
+#: src/LYLocal.c:819
+msgid "Illegal character (path-separator) found! Request ignored."
+msgstr "Kuraldýþý karakter (yol-ayracý) bulundu! Ýstem yoksayýldý."
+
+#: src/LYLocal.c:868
+msgid "Enter new location for directory: "
+msgstr "Dizin için yeni konum giriniz: "
+
+#: src/LYLocal.c:874
+msgid "Enter new location for file: "
+msgstr "Dosya için yeni konum giriniz: "
+
+#: src/LYLocal.c:901
+msgid "Unexpected failure - unable to find trailing path separator"
+msgstr "Umulmadýk aksaklýk - izleme yolu ayracý bulunamadý"
+
+#: src/LYLocal.c:921
+msgid "Source and destination are the same location!  Request ignored!"
+msgstr "Çýkýþ ve varýþ konumlarý ayný!  Ýstem yoksayýldý!"
+
+#: src/LYLocal.c:970
+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:972
+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:1001
+msgid "This feature not yet implemented!"
+msgstr "Bu nitelik daha tamamlanmadý!"
+
+#: src/LYLocal.c:1019
+msgid "Enter name of file to create: "
+msgstr "Oluþturulacak dosyanýn adýný giriniz: "
+
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
+msgid "Illegal redirection \"//\" found! Request ignored."
+msgstr "Kuraldýþý yeniden yönlendirme \"//\" bulundu! Ýstem yoksayýldý."
+
+#: src/LYLocal.c:1061
+msgid "Enter name for new directory: "
+msgstr "Yeni dizin için isim giriniz: "
+
+#: src/LYLocal.c:1106
+msgid "Create file or directory (f or d): "
+msgstr "Dosya(f) ya da dizin(d) oluþtur: "
+
+#: src/LYLocal.c:1146
+#, c-format
+msgid "Remove '%s' and all of its contents?"
+msgstr "'%s' ve tüm içeriði çýkartýlsýn mý?"
+
+#: src/LYLocal.c:1149
+msgid "Remove directory and all of its contents?"
+msgstr "Dizin ve tüm içeriði çýkartýlsýn mý?"
+
+#: src/LYLocal.c:1153
+#, c-format
+msgid "Remove file '%s'?"
+msgstr "'%s' dosyasý çýkartýlsýn mý?"
+
+#: src/LYLocal.c:1155
+msgid "Remove file?"
+msgstr "Dosya çýkartýlsýn mý?"
+
+#: src/LYLocal.c:1160
+#, c-format
+msgid "Remove symbolic link '%s'?"
+msgstr "'%s' simgesel linki çýkartýlsýn mý?"
+
+#: src/LYLocal.c:1162
+msgid "Remove symbolic link?"
+msgstr "Simgesel link çýkartýlsýn mý?"
+
+#: src/LYLocal.c:1248
+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:1278
+msgid "Unable to open permit options file"
+msgstr "Ýzin seçenekleri dosyasý açýlamýyor"
+
+#: src/LYLocal.c:1305
+msgid "Specify permissions below:"
+msgstr "Ýzinleri aþaðýda belirtin:"
+
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
+msgid "Owner:"
+msgstr "Sahip:"
+
+#: src/LYLocal.c:1322
+msgid "Group"
+msgstr "Grup"
+
+#: src/LYLocal.c:1338
+msgid "Others:"
+msgstr "Diðerleri:"
+
+#: src/LYLocal.c:1356
+msgid "form to permit"
+msgstr "izin verilecek form"
+
+#: src/LYLocal.c:1452
+msgid "Invalid mode format."
+msgstr "Kip biçemi geçersiz."
+
+#: src/LYLocal.c:1456
+msgid "Invalid syntax format."
+msgstr "Betik biçemi geçersiz."
+
+#: src/LYLocal.c:1645
+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:1825
+msgid "NULL URL pointer"
+msgstr "BOÞ URL imleyici"
+
+#: src/LYLocal.c:1908
+#, c-format
+msgid "Executing %s "
+msgstr "%s icra ediliyor "
+
+#: src/LYLocal.c:1911
+msgid "Executing system command. This might take a while."
+msgstr "Sistem komutu icra ediliyor. Bu, bir süre alabilir."
+
+#: src/LYLocal.c:1985
+msgid "Current directory:"
+msgstr "Mevcut dizin:"
+
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
+msgid "Current selection:"
+msgstr "Mevcut seçim:"
+
+#: src/LYLocal.c:1992
+msgid "Nothing currently selected."
+msgstr "Halen hiçbir þey.seçili deðil."
+
+#: src/LYLocal.c:2007
+msgid "tagged item:"
+msgstr "iþaretlenmiþ öðe:"
+
+#: src/LYLocal.c:2007
+msgid "tagged items:"
+msgstr "iþaretlenmiþ öðeler:"
+
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
+msgid "Illegal filename; request ignored."
+msgstr "Kuraldýþý dosya adý; istem yoksayýldý."
+
+#. directory not writable
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
+msgid "Install in the selected directory not permitted."
+msgstr "Seçili dizine kurmaya izin verilmiyor."
+
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr "Seçili öðe bir dizin deðil! Ýstem yoksayýldý."
+
+#: src/LYLocal.c:2276
+msgid "Just a moment, ..."
+msgstr "Bir dakikacýk, ..."
+
+#: src/LYLocal.c:2293
+msgid "Error buiding install args"
+msgstr "Kurma arg'larýný yapýlandýrmada hata"
+
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
+#, c-format
+msgid "Source and target are the same: %s"
+msgstr "Kaynak ve hedef ayný: %s"
+
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
+#, c-format
+msgid "Already in target directory: %s"
+msgstr "Zaten hedef dizinde: %s"
+
+#: src/LYLocal.c:2362
+msgid "Installation complete"
+msgstr "Kurma tamamlandý"
+
+#: src/LYLocal.c:2551
+msgid "Temporary URL or list would be too long."
+msgstr "Geçici URL ya da liste çok uzun olacaktý."
+
+#: src/LYMail.c:534
+msgid "Sending"
+msgstr "Gönderiliyor"
+
+#: src/LYMail.c:1024
+#, c-format
+msgid "The link   %s :?: %s \n"
+msgstr "%s :?: %s baðý\n"
+
+#: src/LYMail.c:1026
+#, c-format
+msgid "called \"%s\"\n"
+msgstr "\"%s\" çaðrýldý \n"
+
+#: src/LYMail.c:1027
+#, c-format
+msgid "in the file \"%s\" called \"%s\"\n"
+msgstr "\"%2$s\" adlý dosyanýn içinde \"%1$s\" olup\n"
+
+#: src/LYMail.c:1028
+msgid "was requested but was not available."
+msgstr "istendi, fakat temin edilemedi."
+
+#: src/LYMail.c:1029
+msgid "Thought you might want to know."
+msgstr "Bilmek isteyeceðinizi sandým."
+
+#: src/LYMail.c:1031
+msgid "This message was automatically generated by"
+msgstr "Bu mesajý otomatik olarak oluþturan"
+
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr "Ayarlanmýþ sistem postacýsý yok"
+
+#: src/LYMain.c:969
+msgid "No Winsock found, sorry."
+msgstr "Winsock bulunamadý, üzgünüm."
+
+#: src/LYMain.c:1170
+msgid "You MUST define a valid TMP or TEMP area!\n"
+msgstr "Geçerli bir TMP ya da TEMP alaný tanýmlamalýsýnýz!\n"
+
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
+msgid "No such directory"
+msgstr "Böyle bir dizin yok"
+
+#: src/LYMain.c:1436
+#, c-format
+msgid ""
+"\n"
+"Configuration file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"Ayarlama dosyasý %s temin edilemiyor.\n"
+"\n"
+
+#: src/LYMain.c:1446
+msgid ""
+"\n"
+"Lynx character sets not declared.\n"
+"\n"
+msgstr ""
+"\n"
+"Lynx karakter kümeleri bildirilmemiþ.\n"
+"\n"
+
+#: src/LYMain.c:1475
+msgid ""
+"\n"
+"Lynx edit map not declared.\n"
+"\n"
+msgstr ""
+"\n"
+"Lynx düzenleme eþlemi bildirilmemiþ.\n"
+"\n"
+
+#: src/LYMain.c:1504
+#, c-format
+msgid ""
+"\n"
+"Lynx file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"Lynx dosyasý %s temin edilemiyor.\n"
+"\n"
+
+#: src/LYMain.c:1743
+msgid "Warning:"
+msgstr "Uyarý:"
+
+#: src/LYMain.c:2293
+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:2540 src/LYMain.c:2588
+#, c-format
+msgid "Lynx: ignoring unrecognized charset=%s\n"
+msgstr "Lynx: tanýnmayan karakterkümesi=%s yoksayýlýyor\n"
+
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
+msgstr "%s Sürüm %s (%s)\n"
+
+#: src/LYMain.c:3143
+#, c-format
+msgid "Built on %s %s %s\n"
+msgstr "%s %s %s üzerine yapýlandýrýldý\n"
+
+#: src/LYMain.c:3166
+msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+msgstr "Telif hakký Kansas Üniversitesi, CERN ve diðer katýlýmcýlar tarafýndan (saklý) tutulmaktadýr.\n"
+
+#: src/LYMain.c:3168
+msgid "Distributed under the GNU General Public License.\n"
+msgstr "GNU Genel Kamu Lisansý altýnda daðýtýlmaktadýr.\n"
+
+#: src/LYMain.c:3170
+msgid ""
+"See http://lynx.isc.org/ and the online help for more information.\n"
+"\n"
+msgstr ""
+"Daha fazla bilgi için http://lynx.isc.org/ ve çevrim içi yardýma bakýnýz.\n"
+"\n"
+
+#: src/LYMain.c:3919
+#, c-format
+msgid "USAGE: %s [options] [file]\n"
+msgstr "KULLANIM: %s [seçenekler] [dosya]\n"
+
+#: src/LYMain.c:3920
+msgid "Options are:\n"
+msgstr "Seçenekler:\n"
+
+#: src/LYMain.c:4191
+#, c-format
+msgid "%s: Invalid Option: %s\n"
+msgstr "%s: Geçersiz Seçenek: %s\n"
+
+#: src/LYMainLoop.c:539
+#, c-format
+msgid "Internal error: Invalid mouse link %d!"
+msgstr "Dahili hata: Geçersiz fare linki %d!"
+
+#.
+#. * Make a name for this new URL.
+#.
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
+msgid "A URL specified by the user"
+msgstr "Kullanýcý tarafýndan belirtilmiþ bir URL"
+
+#: src/LYMainLoop.c:1110
+msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
+msgstr "Enctip çok parçalý/form verisi henüz desteklenmiyor!  Gönderilemez."
+
+#.
+#. *  Make a name for this help file.
+#.
+#: src/LYMainLoop.c:3053
+msgid "Help Screen"
+msgstr "Yardým Ekraný"
+
+#: src/LYMainLoop.c:3177
+msgid "System Index"
+msgstr "Sistem Ýndeksi"
+
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
+msgid "Entry into main screen"
+msgstr "Ana ekrana giriþ"
+
+#: src/LYMainLoop.c:3824
+msgid "No next document present"
+msgstr "Sonrasýnda baþka belge yok"
+
+#: src/LYMainLoop.c:4131
+msgid "charset for this document specified explicitly, sorry..."
+msgstr "bu belge için karakterkümesi özgün þekilde belirtilmiþtir, üzgünüm..."
+
+#: src/LYMainLoop.c:5004
+msgid "cd to:"
+msgstr "hangi dizine cd:"
+
+#: src/LYMainLoop.c:5031
+msgid "A component of path is not a directory"
+msgstr "Yolun bileþenlerinden biri dizin deðildir"
+
+#: src/LYMainLoop.c:5034
+msgid "failed to change directory"
+msgstr "dizin deðiþtirme baþarýsýz"
+
+#: src/LYMainLoop.c:6204
+msgid "Reparsing document under current settings..."
+msgstr "Mevcut ayarlarla belge yeniden ayrýþtýrýlýyor..."
+
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
+#, 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:6834
+msgid "TABLE center enable."
+msgstr "TABLO ortala(mayý) etkinleþtir."
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr "TABLO ortala(mayý) devre dýþý býrak."
+
+#: src/LYMainLoop.c:6914
+msgid "Current URL is empty."
+msgstr "Mevcut URL boþ."
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr "Panoya kopyalama baþarýsýz."
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr "Belge URL'sini panoya koy."
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr "Link URL'sini panoya koy."
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr "Panoda URL yok."
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
+msgid "-index-"
+msgstr "-indeks-"
+
+#: src/LYMainLoop.c:7731
+msgid "lynx: Can't access startfile"
+msgstr "lynx: baþlat dosyasýna (startfile) eriþilemiyor"
+
+#: src/LYMainLoop.c:7744
+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:7745
+msgid "      Exiting..."
+msgstr "      Kapanýyor..."
+
+#: src/LYMainLoop.c:7788
+msgid "-more-"
+msgstr "-devam-"
+
+#. Enable scrolling.
+#: src/LYNews.c:187
+msgid "You will be posting to:"
+msgstr "Postalayacaðýnýz yer/kiþi:"
+
+#.
+#. *  Get the mail address for the From header,
+#. *  offering personal_mail_address as default.
+#.
+#: src/LYNews.c:196
+msgid ""
+"\n"
+"\n"
+" Please provide your mail address for the From: header\n"
+msgstr ""
+"\n"
+"\n"
+" Lütfen Gönderen: hanesi için e-posta adresinizi giriniz\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:214
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Subject: header\n"
+msgstr ""
+"\n"
+"\n"
+" Lütfen Konu: hanesini giriniz ya da düzenleyiniz\n"
+
+#: src/LYNews.c:303
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Organization: header\n"
+msgstr ""
+"\n"
+"\n"
+" Lütfen Kurum: hanesini giriniz ya da düzenleyiniz\n"
+
+#.
+#. *  Use the built in line editior.
+#.
+#: src/LYNews.c:360
+msgid ""
+"\n"
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+"\n"
+" Lütfen mesajýnýzý aþaðýya giriniz."
+
+#: src/LYNews.c:406
+msgid "Message has no original text!"
+msgstr "Mesajda orijinal metin yok!"
+
+#: src/LYOptions.c:746
+msgid "review/edit B)ookmarks files"
+msgstr "Yer imi(B) dosyalarýný gözden geçir/düzenle"
+
+#: src/LYOptions.c:748
+msgid "B)ookmark file: "
+msgstr "Yer imi(B) dosyasý: "
+
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
+#, c-format
+msgid "Use %s to invoke the Options menu!"
+msgstr "Seçenekler menüsünü çaðýrmak için %s kullanýnýz!"
+
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr "((!) ile iþaretlenmiþ seçenekler kaydedilmeyecek)"
+
+#: src/LYOptions.c:3261
+msgid "General Preferences"
+msgstr "Genel Tercihler"
+
+#. ***************************************************************
+#. User Mode: SELECT
+#: src/LYOptions.c:3265
+msgid "User mode"
+msgstr "Kullanýcý kipi"
+
+#. Editor: INPUT
+#: src/LYOptions.c:3271
+msgid "Editor"
+msgstr "Düzenleyici"
+
+#. Search Type: SELECT
+#: src/LYOptions.c:3276
+msgid "Type of Search"
+msgstr "Arama Tipi"
+
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
+#. Cookies: SELECT
+#: src/LYOptions.c:3285
+msgid "Cookies"
+msgstr "Çerezler"
+
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
+msgid "Keyboard Input"
+msgstr "Klavye Girdisi"
+
+#. ***************************************************************
+#. Keypad Mode: SELECT
+#: src/LYOptions.c:3316
+msgid "Keypad mode"
+msgstr "Mini klavye(keypad) kipi"
+
+#. Emacs keys: ON/OFF
+#: src/LYOptions.c:3322
+msgid "Emacs keys"
+msgstr "Emacs tuþlarý"
+
+#. VI Keys: ON/OFF
+#: src/LYOptions.c:3328
+msgid "VI keys"
+msgstr "VI tuþlarý"
+
+#. Line edit style: SELECT
+#. well, at least 2 line edit styles available
+#: src/LYOptions.c:3335
+msgid "Line edit style"
+msgstr "Satýr düzenleme stili"
+
+#. Keyboard layout: SELECT
+#: src/LYOptions.c:3347
+msgid "Keyboard layout"
+msgstr "Klavye yerleþimi"
+
+#.
+#. * Display and Character Set
+#.
+#: src/LYOptions.c:3360
+msgid "Display and Character Set"
+msgstr "Görüntüleme ve Karakter Kümesi"
+
+#. ***************************************************************
+#. Display Character Set: SELECT
+#: src/LYOptions.c:3364
+msgid "Display character set"
+msgstr "Karakter kümesini görüntüle"
+
+#: src/LYOptions.c:3393
+msgid "Assumed document character set"
+msgstr "Varsayýlan belge karakter kümesi"
+
+#.
+#. * 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:3413
+msgid "CJK mode"
+msgstr "CJK kipi"
+
+#: src/LYOptions.c:3415
+msgid "Raw 8-bit"
+msgstr "Ham 8-bit"
+
+#. X Display: INPUT
+#: src/LYOptions.c:3423
+msgid "X Display"
+msgstr "X Görüntüleme"
+
+#.
+#. * Document Appearance
+#.
+#: src/LYOptions.c:3429
+msgid "Document Appearance"
+msgstr "Belge Görünümü"
+
+#: src/LYOptions.c:3435
+msgid "Show color"
+msgstr "Renkleri göster"
+
+#. Show cursor: ON/OFF
+#: src/LYOptions.c:3459
+msgid "Show cursor"
+msgstr "Ýmleci göster"
+
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr "Kaydýrma çubuðunu göster"
+
+#. Select Popups: ON/OFF
+#: src/LYOptions.c:3473
+msgid "Popups for select fields"
+msgstr "Seçme alanlar için açýlýrlar(popups)"
+
+#. HTML error recovery: SELECT
+#: src/LYOptions.c:3479
+msgid "HTML error recovery"
+msgstr "HTML hata kurtarma"
+
+#. Show Images: SELECT
+#: src/LYOptions.c:3485
+msgid "Show images"
+msgstr "Resimleri göster"
+
+#. Verbose Images: ON/OFF
+#: src/LYOptions.c:3499
+msgid "Verbose images"
+msgstr "Resimleri dillendir"
+
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3507
+msgid "Headers Transferred to Remote Servers"
+msgstr "Baþlýklar Karþý Sunuculara Aktarýldý"
+
+#. ***************************************************************
+#. Mail Address: INPUT
+#: src/LYOptions.c:3511
+msgid "Personal mail address"
+msgstr "Kiþisel mektup adresi"
+
+#. Preferred Document Character Set: INPUT
+#: src/LYOptions.c:3516
+msgid "Preferred document character set"
+msgstr "Tercih edilen belge karakter kümesi"
+
+#. Preferred Document Language: INPUT
+#: src/LYOptions.c:3521
+msgid "Preferred document language"
+msgstr "Tercih edilen belge dili"
+
+#: src/LYOptions.c:3527
+msgid "User-Agent header"
+msgstr "Kullanýcý-Ajaný baþlýðý"
+
+#.
+#. * Listing and Accessing Files
+#.
+#: src/LYOptions.c:3535
+msgid "Listing and Accessing Files"
+msgstr "Dosya Listeleme ve Eriþim"
+
+#. ***************************************************************
+#. FTP sort: SELECT
+#: src/LYOptions.c:3539
+msgid "FTP sort criteria"
+msgstr "FTP sýralama ölçütleri"
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3546
+msgid "Local directory sort criteria"
+msgstr "Yerel dizin sýralama ölçütleri"
+
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+msgid "Local directory sort order"
+msgstr "Yerel dizin sýralama ölçütleri"
+
+#: src/LYOptions.c:3561
+msgid "Show dot files"
+msgstr "Nokta dosyalarý göster"
+
+#: src/LYOptions.c:3569
+msgid "Execution links"
+msgstr "Ýcra linkleri"
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3589
+msgid "Show transfer rate"
+msgstr "Aktarým hýzýný göster"
+
+#.
+#. * Special Files and Screens
+#.
+#: src/LYOptions.c:3598
+msgid "Special Files and Screens"
+msgstr "Özel Dosyalar ve Ekranlar"
+
+#: src/LYOptions.c:3603
+msgid "Multi-bookmarks"
+msgstr "Çoklu-yer imleri"
+
+#: src/LYOptions.c:3611
+msgid "Review/edit Bookmarks files"
+msgstr "Yer Ými dosyalarýný gözden geçir/düzenle"
+
+#: src/LYOptions.c:3613
+msgid "Goto multi-bookmark menu"
+msgstr "Çoklu-yer imi menüsüne git"
+
+#: src/LYOptions.c:3615
+msgid "Bookmarks file"
+msgstr "Yer Ýmleri dosyasý"
+
+#. Visited Pages: SELECT
+#: src/LYOptions.c:3621
+msgid "Visited Pages"
+msgstr "Uðranan Sayfalar"
+
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr "Dosyayý görüntüle"
+
+#: src/LYPrint.c:952
+msgid " Print job complete.\n"
+msgstr " Yazdýrma iþi tamamlandý.\n"
+
+#: src/LYPrint.c:1281
+msgid "Document:"
+msgstr "Belge:"
+
+#: src/LYPrint.c:1282
+msgid "Number of lines:"
+msgstr "Satýr sayýsý:"
+
+#: src/LYPrint.c:1283
+msgid "Number of pages:"
+msgstr "Sayfa sayýsý:"
+
+#: src/LYPrint.c:1284
+msgid "pages"
+msgstr "sayfa"
+
+#: src/LYPrint.c:1284
+msgid "page"
+msgstr "sayfa"
+
+#: src/LYPrint.c:1285
+msgid "(approximately)"
+msgstr "(yaklaþýk)"
+
+#: src/LYPrint.c:1290
+msgid "Some print functions have been disabled!"
+msgstr "Bazý yazdýrma iþlevleri devre dýþý!.."
+
+#: src/LYPrint.c:1294
+msgid "Standard print options:"
+msgstr "Standart yazdýrma seçenekleri:"
+
+#: src/LYPrint.c:1295
+msgid "Print options:"
+msgstr "Yazdýrma seçenekleri:"
+
+#: src/LYPrint.c:1302
+msgid "Save to a local file"
+msgstr "Yerel bir dosyaya kaydet"
+
+#: src/LYPrint.c:1304
+msgid "Save to disk disabled"
+msgstr "Diske kaydetme devre dýþý"
+
+#: src/LYPrint.c:1311
+msgid "Mail the file"
+msgstr "Dosyayý postala"
+
+#: src/LYPrint.c:1318
+msgid "Print to the screen"
+msgstr "Ekrana yazdýr"
+
+#: src/LYPrint.c:1323
+msgid "Print out on a printer attached to your vt100 terminal"
+msgstr "vt100 uçbiriminize baðlý bir yazýcýya yazdýrýn"
+
+#: src/LYReadCFG.c:339
+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 ""
+"Ayarlama dosyasýnda RENK ayrýþtýrma Betik Hatasý:\n"
+"Satýr þu þekilde olmalýdýr:\n"
+"RENK:TAMSAYI:ÖNPLAN:ARKAPLAN\n"
+"\n"
+"Burada ÖNPLAN ve ARKAPLAN özel dizgeler olan\n"
+"'nocolor' ya da 'default' (ya da) 'dan biri olmalýdýr\n"
+
+#: src/LYReadCFG.c:352
+msgid "Offending line:"
+msgstr "Ýncitici satýr:"
+
+#: src/LYReadCFG.c:638
+#, c-format
+msgid "key remapping of %s to %s for %s failed\n"
+msgstr "%s'in %s'e tuþ yeniden eþlemlemesi %s kez baþarýsýz\n"
+
+#: src/LYReadCFG.c:645
+#, c-format
+msgid "key remapping of %s to %s failed\n"
+msgstr "%s'in %s'e tuþ yeniden eþlemlemesi baþarýsýz\n"
+
+#: src/LYReadCFG.c:666
+#, c-format
+msgid "invalid line-editor selection %s for key %s, selecting all\n"
+msgstr "%2$s tuþu için geçersiz satýr-düzenleyici seçimi %1$s, tümü seçiliyor\n"
+
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
+msgstr "%s (0x%x) tuþu için 0x%x'e satýr-düzenleyici baðlantýsý kurulmasý %s kez baþarýsýz\n"
+
+#: src/LYReadCFG.c:711
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
+msgstr "%s (0x%x) tuþu için satýr-düzenleyici baðlantýsý kurulmasý %s kez baþarýsýz\n"
+
+#: src/LYReadCFG.c:816
+#, c-format
+msgid "Lynx: cannot start, CERN rules file %s is not available\n"
+msgstr "Lynx: baþlayamýyor, CERN kurallarý dosyasý %s temin edilemiyor\n"
+
+#: src/LYReadCFG.c:818
+msgid "(no name)"
+msgstr "(isimsiz)"
+
+#: src/LYReadCFG.c:1782
+#, 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:1784
+#, c-format
+msgid "Last attempted include was '%s',\n"
+msgstr "Son kalkýþýlan içerme '%s' idi,\n"
+
+#: src/LYReadCFG.c:1785
+#, c-format
+msgid "included from '%s'.\n"
+msgstr "'%s'den içerilmiþti.\n"
+
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
+msgid "The following is read from your lynx.cfg file."
+msgstr "Aþaðýdaki, lynx.cfg dosyanýzdan okunmuþtur."
+
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
+msgid "Please read the distribution"
+msgstr "Lütfen daha fazla yorum için"
+
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
+msgid "for more comments."
+msgstr "daðýtýmý okuyunuz."
+
+#: src/LYReadCFG.c:2244
+msgid "RELOAD THE CHANGES"
+msgstr "DEÐÝÞÝKLÝKLERÝ YENÝDEN YÜKLE"
+
+#: src/LYReadCFG.c:2253
+msgid "Your primary configuration"
+msgstr "Birincil ayarlarýnýz"
+
+#: src/LYShowInfo.c:129
+msgid "Directory that you are currently viewing"
+msgstr "Halen görüntülediðiniz dizin"
+
+#: src/LYShowInfo.c:132
+msgid "Name:"
+msgstr "Ýsim:"
+
+#: src/LYShowInfo.c:135
+msgid "URL:"
+msgstr "URL:"
+
+#: src/LYShowInfo.c:146
+msgid "Directory that you have currently selected"
+msgstr "Halen seçilmiþ dizin"
+
+#: src/LYShowInfo.c:149
+msgid "File that you have currently selected"
+msgstr "Halen seçilmiþ dosya"
+
+#: src/LYShowInfo.c:153
+msgid "Symbolic link that you have currently selected"
+msgstr "Halen seçilmiþ simgesel link"
+
+#: src/LYShowInfo.c:157
+msgid "Item that you have currently selected"
+msgstr "Halen seçilmiþ öðe"
+
+#: src/LYShowInfo.c:159
+msgid "Full name:"
+msgstr "Tam isim:"
+
+#: src/LYShowInfo.c:168
+msgid "Unable to follow link"
+msgstr "Link takip edilemiyor"
+
+#: src/LYShowInfo.c:170
+msgid "Points to file:"
+msgstr "Ýmlediði dosya:"
+
+#: src/LYShowInfo.c:175
+msgid "Name of owner:"
+msgstr "Sahibinin adý:"
+
+#: src/LYShowInfo.c:178
+msgid "Group name:"
+msgstr "Grup adý:"
+
+#: src/LYShowInfo.c:181
+msgid "File size:"
+msgstr "Dosya boyutu:"
+
+#: src/LYShowInfo.c:187
+msgid "Creation date:"
+msgstr "Oluþturulma tarihi:"
+
+#: src/LYShowInfo.c:190
+msgid "Last modified:"
+msgstr "Son deðiþiklik:"
+
+#: src/LYShowInfo.c:193
+msgid "Last accessed:"
+msgstr "Son eriþim:"
+
+#: src/LYShowInfo.c:195
+msgid "Access Permissions"
+msgstr "Eriþim Ýzinleri"
+
+#: src/LYShowInfo.c:261
+msgid "File that you are currently viewing"
+msgstr "Halen görüntülediðiniz dosya"
+
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
+msgid "Linkname:"
+msgstr "Link adý:"
+
+#: src/LYShowInfo.c:279 src/LYShowInfo.c:291
+msgid "Charset:"
+msgstr "Karakter Kümesi:"
+
+#: src/LYShowInfo.c:297
+msgid "Server:"
+msgstr "Sunucu:"
+
+#: src/LYShowInfo.c:300
+msgid "Date:"
+msgstr "Tarih:"
+
+#: src/LYShowInfo.c:303
+msgid "Last Mod:"
+msgstr "Son Kip:"
+
+#: src/LYShowInfo.c:309
+msgid "&nbsp;Expires:"
+msgstr "&nbsp;zamanaþýmý tarihi:"
+
+#: src/LYShowInfo.c:313
+msgid "Cache-Control:"
+msgstr "Önbellek-Konrolü:"
+
+#: src/LYShowInfo.c:317
+msgid "Content-Length:"
+msgstr "Ýçerik Uzunluðu:"
+
+#: src/LYShowInfo.c:322
+msgid "Language:"
+msgstr "Dil:"
+
+#: src/LYShowInfo.c:329
+msgid "Post Data:"
+msgstr "Post Verisi:"
+
+#: src/LYShowInfo.c:333
+msgid "Post Content Type:"
+msgstr "Post Ýçerik Tipi:"
+
+#: src/LYShowInfo.c:342
+msgid "Owner(s):"
+msgstr "Sahip(ler):"
+
+#: src/LYShowInfo.c:345
+msgid "size:"
+msgstr "boyut:"
+
+#: src/LYShowInfo.c:345
+msgid "lines"
+msgstr "satýr"
+
+#: src/LYShowInfo.c:348
+msgid "mode:"
+msgstr "kip:"
+
+#: src/LYShowInfo.c:350
+msgid "forms mode"
+msgstr "form kipi"
+
+#: src/LYShowInfo.c:352
+msgid "source"
+msgstr "kaynak"
+
+#: src/LYShowInfo.c:352
+msgid "normal"
+msgstr "normal"
+
+#: src/LYShowInfo.c:353
+msgid ", safe"
+msgstr ", güvenli"
+
+#: src/LYShowInfo.c:354
+msgid ", via internal link"
+msgstr ", dahili link aracýlýðýyla"
+
+#: src/LYShowInfo.c:360
+msgid ", no-cache"
+msgstr ", ön belleksiz"
+
+#: src/LYShowInfo.c:362
+msgid ", ISMAP script"
+msgstr ", ISMAP betiði"
+
+#: src/LYShowInfo.c:364
+msgid ", bookmark file"
+msgstr ", yer imi dosyasý"
+
+#: src/LYShowInfo.c:373
+msgid "Link that you currently have selected"
+msgstr "Halen seçmiþ olduðunuz link"
+
+#: src/LYShowInfo.c:386
+msgid "Method:"
+msgstr "Yöntem:"
+
+#: src/LYShowInfo.c:391
+msgid "Enctype:"
+msgstr "Enctipi:"
+
+#: src/LYShowInfo.c:403
+msgid "(Form field)"
+msgstr "(Form alaný)"
+
+#: src/LYShowInfo.c:418
+msgid "No Links on the current page"
+msgstr "Mevcut sayfada link yok"
+
+#: src/LYStyle.c:278
+#, 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 ""
+"lss dosyasý tarz ayrýþtýrma Betik Hatasý:\n"
+"[%s]\n"
+"Satýr þu þekilde olmalýdýr:\n"
+"NESNE:MONO:RENK (yani em:kalýn:açýkmavi:beyaz)\n"
+"burada NESNE EM,STRONG,B,I,U,BLINK vs'den biri olmalýdýr.\n"
+"\n"
+
+#: src/LYTraversal.c:107
+msgid "here is a list of the history stack so that you may rebuild"
+msgstr "yeniden yapýlandýrabilmeniz için iþte bir tarihçe yýðýný listesi"
+
+#: src/LYUpload.c:78
+msgid "ERROR! - upload command is misconfigured"
+msgstr "HATA! - yükle komutu yanlýþ ayarlanmýþ..."
+
+#: src/LYUpload.c:100
+msgid "Illegal redirection \"../\" found! Request ignored."
+msgstr "Kuraldýþý yeniden yönlendirme \"  /\" bulundu! Ýstem yoksayýldý."
+
+#: src/LYUpload.c:103
+msgid "Illegal character \"/\" found! Request ignored."
+msgstr "Kuraldýþý karakter \"/\" bulundu! Ýstem yoksayýldý."
+
+#: src/LYUpload.c:106
+msgid "Illegal redirection using \"~\" found! Request ignored."
+msgstr "\"~\" kullanan kuraldýþý yeniden yönlendirme bulundu! Ýstem yoksayýldý."
+
+#: src/LYUpload.c:163
+msgid "Unable to upload file."
+msgstr "Dosya yüklenemiyor."
+
+#: src/LYUpload.c:206
+msgid "Upload To:"
+msgstr "Yüklenecek yer:"
+
+#: src/LYUpload.c:207
+msgid "Upload options:"
+msgstr "Yükleme seçenekleri:"
+
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr "Belge indirme URL'sini panoya koy."
+
+#: src/LYUtils.c:2468
+msgid "Unexpected access protocol for this URL scheme."
+msgstr "Bu URL þemasý için umulmadýk eriþim protokolü."
+
+#: src/LYUtils.c:3294
+msgid "Too many tempfiles"
+msgstr "Çok sayýda geçici dosya"
+
+#: src/LYUtils.c:3595
+msgid "unknown restriction"
+msgstr "bilinmeyen kýsýtlama"
+
+#: src/LYUtils.c:3626
+msgid "No restrictions set.\n"
+msgstr "Hiçbir kýsýtlama kurulmamýþ.\n"
+
+#: src/LYUtils.c:3629
+msgid "Restrictions set:\n"
+msgstr "Kurulmuþ kýsýtlamalar:\n"
+
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr "EV dizini bulunamýyor"
+
+#: src/LYrcFile.c:21
+msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
+msgstr "Normalde devre dýþýdýr.  Bkz. lynx.cfg'de ENABLE_LYNXRC\n"
+
+#: src/LYrcFile.c:295
+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 ""
+"accept_all_cookies, arzu edildiðinde kullanýcýnýn Lynx'e tüm çerezleri\n"
+"otomatikman kabul etmesini söylemesini saðlar.  Öntanýmlý \"FALSE\" (yanlýþ)\n"
+"olup, her çerez için sorulmasýný saðlar.  Tüm çerezleri kabul etmek için\n"
+"accept_all_cookies'i \"TRUE\" (doðru)ya ayarlayýn.\n"
+
+#: src/LYrcFile.c:302
+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 ""
+"bookmark_file, kullanýcýnýn daha sonraki bir tarihte kolay eriþim\n"
+"için linkleri içine yapýþtýrdýðý öntanýmlý yer imi dosyasýnýn adý\n"
+"ve konumunu belirtir.\n"
+
+#: src/LYrcFile.c:307
+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 ""
+"case_sensitive_searching \"on\" (açýk)a ayarlanmýþsa, kullanýcý 's' ya da '/' tuþlarýyla\n"
+"bir arama baþlattýðýnda, arama büyük/küçük harfe duyarSIZ olmak yerine duyarlý\n"
+"olarak yapýlacaktýr.  Öntanýmlýsý genellikle \"off\" (kapalý)dýr.\n"
+
+#: src/LYrcFile.c:312
+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 ""
+"character_set tanýmý 8 bit karakterlerin uçbiriminizde gösterilmesini\n"
+"denetler.  Eðer ekranýnýzda 8 bit karakterler doðru þekilde\n"
+"gösterilmiyorsa baþka bir 8 bit kümesi ya da 7 bit karakter\n"
+"yaklaþýklýklarýný deneyebilirsiniz.\n"
+"Mevcut geçerli karakter kümeleri þunlardýr:\n"
+
+#: src/LYrcFile.c:319
+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 ""
+"cookie_accept_domains ve cookie_reject_domains, Lynx'in sýrasýyla, otomatikman\n"
+"tüm çerezleri kabul ya da reddedeceði yörelerin virgülle ayrýlmýþ\n"
+"listeleridir.  Eðer bir yöre, her iki listede de belirtildiyse, reddetme\n"
+"öncelik taþýr.  accept_all_cookies parametresi, burada yapýlan tüm ayarlarý\n"
+"geçersiz kýlar.\n"
+
+#: src/LYrcFile.c:327
+msgid ""
+"cookie_file specifies the file from which to read persistent cookies.\n"
+"The default is ~/.lynx_cookies.\n"
+msgstr ""
+"cookie_file kalýcý çerezlerin okunacaðý dosyayý belirler.\n"
+"Öntanýmlýsý ~/.lynx_cookies'dir.\n"
+
+#: src/LYrcFile.c:332
+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 ""
+"cookie_loose_invalid_domains, cookie_strict_invalid_domains ve\n"
+"cookie_query_invalid_domains, hangi yörenin hangi derecede geçerlilik\n"
+"kontrolüne uðrayacaðýný belirleyen virgülle ayrýlmýþ yöre listeleridir.\n"
+"Eðer bir yöre katý(strict) kontrole tabi tutuluyorsa, RFC2109'a katý\n"
+"uyumluluk uygulanacaktýr.  Gevþek(loose) kontrollü bir yöreye, geçersiz\n"
+"yol ya da yöre öznitelikli çerez kurma izni verilir.  Tüm yöreler, öntanýmlý\n"
+"olarak, geçersiz bir yol ya da yöre (özniteliðini) kullanýcýya sorgulatýr.\n"
+
+#: src/LYrcFile.c:346
+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 (eðer mevcutsa) DIRED_SUPPORT altýndaki dizin listesi\n"
+"sýrasýný belirler.  Öntanýmlýsý \"ORDER_BY_NAME\"'dir\n"
+
+#: src/LYrcFile.c:351
+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 ""
+"dir_list_styles, (eðer yerine getirilmiþse) DIRED_SUPPORT altýnda\n"
+"dizin liste tarzýný belirler.  Öntanýmlý, \"MIXED_STYLE\" olup, dosya\n"
+"ve dizinleri birlikte sýralar.  \"FILES_FIRST\" önce dosyalarý,\n"
+"\"DIRECTORIES_FIRST\" önce dizinleri sýralar.\n"
+
+#: src/LYrcFile.c:359
+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 ""
+"Eðer emacs_keys \"on\" (açýk)sa, o zaman normal EMACS gezinme tuþlarý olan\n"
+"  ^N = aþaðý    ^P = yukarý\n"
+"  ^B = sol      ^F = sað\n"
+"etkinleþtirilecektir.\n"
+
+#: src/LYrcFile.c:365
+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 ""
+"file_editor yerel dosyalar düzenlenirken ya da posta gönderilirken\n"
+"çaðrýlacak düzenleyiciyi belirtir.  Eðer bir düzenleyici belirtilmemiþse, komut satýrýndan\n"
+"etkinleþtirilmedikçe dosya düzenleme devre dýþý kalýr ve posta göndermek için yerleþik satýr\n"
+"düzenleyici kullanýlýr.\n"
+
+#: src/LYrcFile.c:371
+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 ""
+"file_sorting_method, FTP dizinleri gibi dosya listeleri görüntülenirken\n"
+"hangi deðere göre sýralama yapýlacaðýný belirler.  Seçenekler:\n"
+"   BY_FILENAME -- dosya adýna göre sýralar\n"
+"   BY_TYPE     -- dosya türüne göre sýralar\n"
+"   BY_SIZE     -- dosya boyutuna göre sýralar\n"
+"   BY_DATE     -- dosyanýn tarihine göre sýralar\n"
+
+#: src/LYrcFile.c:389
+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 ""
+"lineedit_mode, bilgi istemi ve formlara dizge giriþi için kullanýlan\n"
+"tuþ karþýlýklarýný belirler.  Eðer lineedit_mode \"Default Binding\"e\n"
+"ayarlanýrsa, gezinme ve silme için aþaðýdaki kontrol karakterleri kullanýlýr:\n"
+"\n"
+"             Önceki  Sonraki   Enter = Girdiyi kabul et\n"
+" Kark'i taþý: <-       ->      ^G    = Girdiyi iptal et\n"
+" Sözc'ü taþý: ^P       ^N      ^U    = Satýr sil\n"
+"  Kark'i sil: ^H       ^R      ^A    = Satýr baþý\n"
+"  Sözc'ü sil: ^B       ^F      ^E    = Satýr sonu\n"
+"\n"
+"Mevcut satýr düzenleme kipleri þunlardýr:\n"
+
+#: src/LYrcFile.c:404
+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 ""
+"Aþaðýdaki, sizin alt-yer imi dosya ve açýklamalarýný tanýmlamanýzý saðlayacaktýr.\n"
+"Biçem, multi_bookmark<büyük_harf>=<dosya_adý>,<açýklama> þeklindedir.\n"
+"26 yer imi dosyasýna (Ýngilizce'deki büyük harfler) kadar izin verilir.\n"
+"\"multi_bookmarkB\" ile baþlanýr, zira 'A' öntanýmlý olandýr (yukarýya bkz).\n"
+
+#: src/LYrcFile.c:410
+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 ""
+"personal_mail_address, sizin kiþisel e-posta adresinizi belirler.  Bu adres,\n"
+"HTTP dosya aktarýmlarý sýrasýnda yetkilendirme ve oturum açma amaçlý olarak, ve\n"
+"yorum postalama sýrasýnda gönderilecektir.\n"
+"Eðer bu bilginin verilmesini istemiyorsanýz, lynx.cfg'de NO_FROM_HEADER'ý TRUE\n"
+"olarak ayarlayýn, ya da -nofrom\n"
+" komut satýr seçeneðini kullanýn.  Bu alaný\n"
+"boþ da býrakabilirsiniz, ama o zaman gönderilmiþ yorumlarýnýzda da\n"
+"bu alan içerilmeyecektir.\n"
+
+#: src/LYrcFile.c:419
+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 ""
+"preferred_charset, MIME gösterimindeki karakter kümesini belirler\n"
+"(örn, ISO-8859-2, ISO-8859-5), Lynx bunu, http sunucularýndan yaptýðýnýz\n"
+"istemlerde sizin tercihiniz olarak bir Accept-Charset baþlýðýyla belirtir.\n"
+"Deðer, ISO-8859-1 ya da US-ASCII'yi, bunlar her zaman öntanýmlý olarak\n"
+"varsayýldýðýndan, içermemelidir.  Virgülle ayrýlmýþ bir liste olabilir.\n"
+"Eðer o karakter kümesinde bir dosya mevcutsa, sunucu onu gönderecektir.\n"
+"Eðer Accept-Charset baþlýðý yoksa öntanýmlý olan, tüm karakter kümelerinin\n"
+"kabul edilebilirliðidir.  Eðer bir Accept-Charset baþlýðý var ve sunucu bu\n"
+"baþlýk uyarýnca kabul edilebilir bir yanýt gönderemiyorsa, sunucunun bir\n"
+"hata yanýtý göndermesi gerekmekle birlikte, bir kabul edilemez yanýtýnýn\n"
+"gönderimine de izin verilir.\n"
+"\n"
+
+#: src/LYrcFile.c:433
+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 ""
+"preferred_language, MIME gösterimindeki dili belirler (örn, en,fr,\n"
+"tercih sýrasýna göre virgülle ayrýlmýþ bir liste olabilir); Lynx bunu\n"
+"http sunucularýndan istemde bulunurken sizin tercihiniz olarak belirtir.\n"
+"O dilde bir dosya mevcutsa, sunucu onu gönderecektir.\n"
+"Aksi halde, sunucu öntanýmlý dilindeki dosyayý gönderir.\n"
+
+#: src/LYrcFile.c:442
+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 ""
+"Eðer run_all_execution_links \"on\" (açýk)a ayarlanýrsa, tüm yerel icraat linkleri\n"
+"seçildiklerinde icra edilecektir.\n"
+"\n"
+"UYARI - Bu, potansiyel olarak çok tehlikelidir.  Bilinmeyen ve güvenilmez\n"
+"        kaynaklar tarafýndan yazýlmýþ bilgileri görüntüleyebileceðinizden dolayý\n"
+"        Truva atý linklerinin yazýlma olasýlýðý mevcuttur.  Truva atý linkleri\n"
+"        dosyalarý silmek ya da güvenliði zayýflatmak için yazýlabilir.  Bu ayar\n"
+"        yalnýzca güvenilir kaynak bilgisi görüntülediðiniz koþulda \"on\" (açýk)a\n"
+"        ayarlanmalýdýr.\n"
+
+#: src/LYrcFile.c:453
+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 ""
+"Eðer run_execution_links_on_local_files \"on\" (açýk)a ayarlanýrsa YEREL\n"
+"dosyalarda bulunan tüm yerel icraat linkleri seçildiklerinde icra edilecektir.\n"
+"Bu, run_all_execution_links'ten farklý olup, yalnýzca yerel sistemde yerleþik\n"
+"bulunan dosyalarýn icraat link izinleri vardýr.\n"
+"\n"
+"UYARI - Bu, potansiyel olarak çok tehlikelidir.  Bilinmeyen ve güvenilmez\n"
+"        kaynaklar tarafýndan yazýlmýþ bilgileri görüntüleyebileceðinizden dolayý\n"
+"        Truva atý linklerinin yazýlma olasýlýðý mevcuttur.  Truva atý linkleri\n"
+"        dosyalarý silmek ya da güvenliði zayýflatmak için yazýlabilir.  Bu ayar\n"
+"        yalnýzca güvenilir kaynak bilgisi görüntülediðiniz koþulda \"on\" (açýk)a\n"
+"        ayarlanmalýdýr.\n"
+
+#: src/LYrcFile.c:471
+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 ""
+"select_popups, MULTIPLE özniteliðinden yoksun olan SELECT bloðundaki\n"
+"OPTIONlarýn dikey bir radyo düðmesi listesi olarak mý, yoksa açýlýr menü \n"
+"olarak mý gösterileceðini belirler.  MULTIPLE özniteliðinin SELECT baþlangýç\n"
+"etiketinde yer almasýnýn, Lynx'in OPTIONlar için her zaman dikey onay kutusu\n"
+"listesi oluþturmasýna yol açacaðýný kaydediniz.  Bir \"on\" (açýk) deðeri, öntanýmlý\n"
+"olarak açýlýr menüler kurarken, \"off\" (kapalý), radyo kutularý kullanýmýný kuracaktýr.\n"
+"Öntanýmlý, -popup komut satýr anahtarýyla geçersiz kýlýnabilir.\n"
+
+#: src/LYrcFile.c:481
+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 ""
+"show_color, baþlangýçta renk kipinin nasýl ayarlanacaðýný belirler.  Bir\n"
+"\"never\" (asla) deðeri, uçbirim renk yetisine sahip olsa da, renk kipini kapanmaya\n"
+"zorlayacaktýr (uçbirime siyah/beyaz muamelesi yapacaktýr).  Bir \"always\"\n"
+"(her zaman) deðeri, uçbirim siyah/beyaz görünse de, lynx yapýlandýrýlýrken kullanýlan \n"
+"kitaplýk desteklediði takdirde renkli kipe zorlayacaktýr.  Bir \"default\"\n"
+"(öntanýmlý) deðeri, renk yetisi baþlangýçta uçbirim türüne dayandýrýlarak çýkarsanmýþ,\n"
+"-color komut satýrý seçeneði, ya da COLORTERM çevre deðiþkeniyle atanmýþ\n"
+"olmadýkça, siyah/beyaz bir uçbirim varsayma davranýþý sergileyecektir.\n"
+"Öntanýmlý davranýþ, anonim hesaplarda ya da \"option_save\" kýsýtlamasý\n"
+"kurulduðunda her zaman kullanýlýr.  Kaydedilmiþ deðerin etkisi, -color ve\n"
+"-nocolor komut satýr seçenekleriyle geçersiz kýlýnabilir.\n"
+"Baþlangýçtaki kip ayarý, seçenekler(o) menüsündeki \"renkleri göster\"\n"
+"seçeneði aracýlýðýyla deðiþtirilebilir.  Eðer seçenek ayarlarý kaydedilmiþse,\n"
+"\"on\" (açýk) \"off\" (kapalý) ve \"show color\" (renk göster) ayarlarý \"default\"\n"
+"(öntanýmlý) olarak muamele görecektir.\n"
+
+#: src/LYrcFile.c:498
+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 ""
+"show_cursor, imlecin ekranýn (mümkünse) saðýna mý, yoksa belgelerdeki\n"
+"linkin ya da seçkin beliriveren pencerelerdeki mevcut seçeneðin\n"
+"soluna mý yerleþtirileceðini belirler.  Ýmleci mevcut link ya da\n"
+"seçeneðin soluna yerleþtirmek, konuþma ya da körler alfabesi arayüzleri\n"
+"için, ayrýca uçbirimin parlaklaþtýrarak ya da renkle mevcut linki\n"
+"ayýrdetmediði durumlarda yararlýdýr.  Bir \"on\" (açýk) deðeri,\n"
+"konumlandýrmayý öntanýmlý olarak sola yönlendirirken, \"off\" (kapalý) deðeri,\n"
+"imlecin gizlenmesini saðlar.\n"
+"Öntanýmlý, -show_cursor komut satýr anahtarýyla geçersiz kýlýnabilir.\n"
+
+#: src/LYrcFile.c:509
+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 ""
+"show_dotfiles dizin listelemenin \"hidden\" (nokta) dosyalar/dizinleri içerip\n"
+"içermeyeceðini belirler.  Eðer \"on\" (açýk)a ayarlanýrsa, yalnýzca userdefs.h ve/veya\n"
+"lynx.cfg aracýlýðýyla etkinleþtirildiðinde bu onurlandýrma saðlanacak ve komut\n"
+"satýr seçeneðiyle kýsýtlanmayacaktýr.  Eðer gizli dosyalarýn gösterimi devre dýþý\n"
+"býrakýlýrsa, Lynx aracýlýðýyla bu tür dosyalarýn oluþturulmasý da devre dýþý kalacaktýr.\n"
+
+#: src/LYrcFile.c:520
+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 ""
+"Eðer sub_bookmarks \"off\" (kapalý) deðilse ve çok sayýda yer imi tanýmlanmýþsa\n"
+"(aþaðýya bkz), tüm yer imi iþlemleri ilk olarak kullanýcýdan etkin bir\n"
+"alt-yer imi dosyasý seçmesini ister.  Eðer öntanýmlý Lynx yer imi dosyasý\n"
+"tanýmlanmýþsa (yukarýya bkz) bu, öntanýmlý seçim olarak kullanýlacaktýr.\n"
+"Bu seçenek \"advanced\" (ileri düzey)e ayarlanmýþ ve kullanýcý kipi de ileri düzeyse,\n"
+"yer imini göster(v) komutu, acemi ve orta düzey kullanýcý kiplerinde görülen\n"
+"menü yerine bir durumsatýrý bilgi istemi çaðýracaktýr.  Bu seçenek\n"
+"\"standard\"a ayarlandýðýnda menü, kullanýcý kipinden baðýmsýz olarak\n"
+"görüntülenecektir.\n"
+
+#: src/LYrcFile.c:533
+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 ""
+"user_mode, kullanýcýnýn Lynx bilgi düzeyini belirler.  Öntanýmlý \"NOVICE\"\n"
+"(acemi) olup, kullanýcýnýn temel Lynx komutlarýný öðrenmesine yardýmcý\n"
+"olmak için ekranýn en altýnda iki satýrlýk yardým (mesajlarý) görüntüler.\n"
+"Bu fazladan bilgiyi kapatmak için user_mode'u \"INTERMEDIATE\" (orta düzey)e\n"
+"ayarlayýnýz.  Ekranýn en altýnda mevcut seçilmiþ linkin URL'sini görmek için\n"
+"\"ADVANCED\" (ileri düzey)i kullanýn.\n"
+
+#: src/LYrcFile.c:542
+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 ""
+"Eðer verbose_images \"on\" (açýk) ise lynx, [INLINE], [LINK] ya da\n"
+"[IMAGE] yerine resim kaynak dosyasýnýn ismini yazacaktýr.\n"
+"Ayrýca lynx.cfg'deki VERBOSE_IMAGES'a bkz\n"
+
+#: src/LYrcFile.c:547
+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 ""
+"Eðer vi_keys \"on\" (açýk)a ayarlandýysa, o zaman normal VI gezinme tuþlarý olan\n"
+"  j = aþaðý    k = yukarý\n"
+"  h = sol      l = sað\n"
+"etkinleþtirilecektir.  Bu tuþlar yalnýzca küçük harf þeklinde kullanýlýr.\n"
+"Büyük 'H', 'J' ve 'K', hâlâ sýrasýyla yardým, kýsayollara\n"
+"sýçrama ve tuþeþlem görüntülemeyi etkinleþtireceklerdir.\n"
+
+#: src/LYrcFile.c:555
+msgid ""
+"The visited_links setting controls how Lynx organizes the information\n"
+"in the Visited Links Page.\n"
+msgstr ""
+"visited_links ayarý, Lynx'in Uðranmýþ Linkler Sayfasý'ndaki bilgiyi\n"
+"nasýl düzenleyeceðini denetler.\n"
+
+#: src/LYrcFile.c:772
+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 ""
+"Eðer keypad_mode \"NUMBERS_AS_ARROWS\"a ayarlanýrsa, mini klavyenizdeki\n"
+"rakamlar, numlock açýk olduðunda ok tuþlarý gibi davranacaktýr:\n"
+"            8 = Yukarý Ok\n"
+"  4 = Sol Ok    6 = Sað Ok\n"
+"            2 = Aþaðý Ok\n"
+"ve karþýlýk gelen klavye rakamlarý, numlock'ýn açýk olup olmadýðýndan\n"
+"baðýmsýz olarak ok tuþlarý gibi davranacaktýr.\n"
+
+#: src/LYrcFile.c:781
+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 ""
+"Eðer keypad_mode \"LINKS_ARE_NUMBERED\"e ayarlanýrsa, her linkin yanýnda\n"
+"numaralar belirecek ve bu numaralar linkleri seçmekte kullanýlacaktýr.\n"
+
+#: src/LYrcFile.c:785
+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 ""
+"Eðer keypad_mode \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\"e ayarlanýrsa,\n"
+"her link ve görünür form girdi alanýnýn yanýnda numaralar belirecektir.\n"
+"Bu numaralar, linkleri seçmede ya da \"current link\"(mevcut link)i bir form girdi\n"
+"alaný ya da düðmesine taþýmakta kullanýlýr.  Ek olarak, açýlýr menülerdeki\n"
+"seçenekler indekslenmiþ olup, kullanýcý, seçenek ekranda görünmese bile\n"
+"bir seçenek no'su tuþlayarak seçeneði seçebilir.  Referans listeleri ve\n"
+"list komutu çýktýsý da form girdilerini numaralandýrýr.\n"
+
+#: src/LYrcFile.c:794
+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 ""
+"NOT: \"LINKS_ARE_NUMBERED\" ya da \"LINKS_AND_FORM_FIELDS_ARE NUMBERED\"\n"
+"etkinleþtirildiðinde, bazý sabit biçemli belgeler bozuk þekilde\n"
+"görünebilir.\n"
+
+#: src/LYrcFile.c:827
+msgid ""
+"Lynx User Defaults File\n"
+"\n"
+"This file contains options saved from the Lynx Options Screen (normally\n"
+"with the '>' key).  There is normally no need to edit this file manually,\n"
+"since the defaults here can be controlled from the Options Screen, and the\n"
+"next time options are saved from the Options Screen this file will be\n"
+"completely rewritten.  You have been warned...\n"
+"If you are looking for the general configuration file - it is normally\n"
+"called lynx.cfg, and it has different content and a different format.\n"
+"It is not this file.\n"
+msgstr ""
+"Lynx Kullanýcý Öntanýmlýlarý Dosyasý\n"
+"\n"
+"Bu dosya, Lynx Seçenekler Ekraný'ndan (normalde '>' tuþuyla) kaydedilmiþ\n"
+"seçenekler içerir.  Buradaki öntanýmlýlar Seçenekler Ekraný'ndan kontrol\n"
+"edilebildiði ve seçenekler, Seçenekler Ekraný'ndan bir sonraki sefer\n"
+"kaydedildiðinde bu dosya tümüyle yeniden yazýlacaðýndan, normalde\n"
+"bu dosyayý elle düzenlemek gerekmez.  Uyarýlmýþ oldunuz...\n"
+"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"
diff --git a/gnu/usr.bin/lynx/po/uk.po b/gnu/usr.bin/lynx/po/uk.po
new file mode 100644
index 00000000000..19c8dcf73a7
--- /dev/null
+++ b/gnu/usr.bin/lynx/po/uk.po
@@ -0,0 +1,5627 @@
+# ðÅÒÅËÌÁÄ Lynx ÎÁ ÕËÒÁ§ÎÓØËÕ
+# Copyright (C) 2003 Free Software Foundation, Inc.
+# 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.1 2004/06/22 04:01:46 avsm Exp $
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lynx 2.8.5pre9\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=koi8-u\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:29
+#, c-format
+msgid "Alert!: %s"
+msgstr "ïÊ!: %s"
+
+#: LYMessages.c:30
+msgid "Welcome"
+msgstr "ìÁÓËÁ×Ï ÐÒÏÓÉÍÏ"
+
+# @ glade- konsole lynx
+# * Yuriy Syrota <yuri@renome.rovno.ua>
+#: LYMessages.c:31
+msgid "Are you sure you want to quit?"
+msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ×ÉÊÔÉ?"
+
+#: LYMessages.c:33
+msgid "Really exit from Lynx?"
+msgstr "óÐÒÁ×Ħ ×ÉÊÔÉ Ú Lynx?"
+
+#: LYMessages.c:35
+msgid "Connection interrupted."
+msgstr "ú'¤ÄÎÁÎÎÑ ÒÏÚ¦Ò×ÁÎÏ."
+
+#: LYMessages.c:36
+msgid "Data transfer interrupted."
+msgstr "ïÂͦΠÄÁÎÉÍÉ ÐÅÒÅÒ×ÁÎÏ."
+
+#: LYMessages.c:37
+msgid "Cancelled!!!"
+msgstr "óËÁÓÏ×ÁÎÏ!!!"
+
+#: LYMessages.c:38
+msgid "Cancelling!"
+msgstr "óËÁÓÏ×ÕÀ!"
+
+#: LYMessages.c:39
+msgid "Excellent!!!"
+msgstr "þÕÄÏ×Ï!!!"
+
+#: LYMessages.c:40
+msgid "OK"
+msgstr "çÁÒÁÚÄ"
+
+#: LYMessages.c:41
+msgid "Done!"
+msgstr "úÒÏÂÌÅÎÏ!"
+
+# :-) îÅ ÐÒÉÎÃÉÐÏ×Ï -- ÑË ÚÁÌÉÛÉÛ, ÔÁË ¦ ÂÕÄÅ.
+# :-) îÅ ÐÒÉÎÃÉÐÏ×Ï -- ÑË ÚÁÌÉÛÉÛ, ÔÁË ¦ ÂÕÄÅ.
+#: LYMessages.c:42
+msgid "Bad request!"
+msgstr "îÅÚÒÏÚÕͦÌÉÊ ÚÁÐÉÔ!"
+
+#: LYMessages.c:43
+msgid "previous"
+msgstr "ÐÏÐÅÒÅÄΦÊ"
+
+#: LYMessages.c:44
+msgid "next screen"
+msgstr "ÎÁÓÔÕÐÎÉÊ ÅËÒÁÎ"
+
+#: LYMessages.c:45
+msgid "HELP!"
+msgstr "äï÷¶äëá!"
+
+#: LYMessages.c:46
+msgid ", help on "
+msgstr ", ÄÏצÄËÁ ÐÏ "
+
+#. #define HELP
+#: LYMessages.c:48
+msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
+msgstr "ëÏÍÁÎÄÉ: óÔÒ¦ÌËÉ - ÐÅÒÅͦÝÅÎÎÑ, '?' - ÄÏצÄËÁ, 'q' - ×ÉȦÄ, '<-' - ÎÁÚÁÄ."
+
+#. #define MOREHELP
+#: LYMessages.c:50
+msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
+msgstr "-- ÐÒÏÂ¦Ì - ÄÁ̦, ÓÔÒ¦ÌËÉ - ÐÅÒÅͦÝÅÎÎÑ, '?' - ÄÏצÄËÁ, 'q' - ×ÉȦÄ."
+
+# ÞÏÍÕ "ÄÌÑ ÎÁÓÔÕÐÎϧ ÓÔÏÒ¦ÎËÉ" ? ×ÏÎÏ §Ê ÔÒÅÂÁ?-)
+# ÞÏÍÕ "ÄÌÑ ÎÁÓÔÕÐÎϧ ÓÔÏÒ¦ÎËÉ" ? ×ÏÎÏ §Ê ÔÒÅÂÁ?-)
+#: LYMessages.c:51
+msgid "-- press space for next page --"
+msgstr "-- ÎÁÔÉÓΦÔØ ÐÒÏÂ¦Ì ÄÌÑ ÐÅÒÅÈÏÄÕ ÎÁ ÎÁÓÔÕÐÎÕ ÓÔÏÒ¦ÎËÕ --"
+
+#: LYMessages.c:52
+msgid "URL too long"
+msgstr "úÁÄÏ×ÇÉÊ URL"
+
+#. Inactive input fields, messages used with -tna option - kw
+#. #define FORM_LINK_TEXT_MESSAGE_INA
+#: LYMessages.c:58
+msgid "(Text entry field) Inactive.  Press <return> to activate."
+msgstr "(ôÅËÓÔÏ×Á ÒÑÄÏË) îÅÁËÔÉ×ÎÁ. îÁÔÉÓΦÔØ <×צÄ> ÝÏ ÁËÔÉצÚÕ×ÁÔÉ."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
+#: LYMessages.c:60
+msgid "(Textarea) Inactive.  Press <return> to activate."
+msgstr "(ôÅËÓÔÏ×Á ÏÂÌÁÓÔØ) îÅÁËÔÉ×ÎÅ. îÁÔÉÓΦÔØ <×צÄ> ÝÏ ÁËÔÉצÚÕ×ÁÔÉ."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
+#: LYMessages.c:62
+#, c-format
+msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
+msgstr "(ôÅËÓÔÏ×Á ÏÂÌÁÓÔØ) îÅÁËÔÉ×ÎÅ. <÷צÄ> ÁËÔÉצÚÕ¤ (%s -ÒÅÄÁËÔÏÒ)."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
+#: LYMessages.c:64
+msgid "(Form field) Inactive.  Use <return> to edit."
+msgstr "(ðÏÌÅ ÆÏÒÍÉ) îÅÁËÔÉ×ÎÅ. îÁÔÉÓΦÔØ <×צÄ> ÝÏ ÒÅÄÁÇÕ×ÁÔÉ."
+
+#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
+#: LYMessages.c:66
+#, c-format
+msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
+msgstr "(ðÏÌÅ ÆÏÒÍÉ) îÅÁËÔÉ×ÎÅ.  <÷צÄ> - ÒÅÄÁÇÕ×ÁÔÉ (%s - צĦÓÌÁÔÉ ÂÅÚ ËÅÛÁ)."
+
+#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
+#: LYMessages.c:68
+msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
+msgstr "(ðÏÌÅ ÆÏÒÍÉ) îÅÁËÔÉ×ÎÅ. <÷צÄ> - ÒÅÄÁÇÕ×ÁÔÉ, <×צÄ> Äצަ - צĦÓÌÁÔÉ."
+
+#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
+#: LYMessages.c:70
+msgid "(mailto form field) Inactive.  Press <return> to change."
+msgstr "(ðÏÌÅ mailto) îÅÁËÔÉ×ÎÅ. îÁÔÉÓΦÔØ <×צÄ> ÝÏ ÚͦÎÉÔÉ."
+
+#. #define FORM_LINK_PASSWORD_MESSAGE_INA
+#: LYMessages.c:72
+msgid "(Password entry field) Inactive.  Press <return> to activate."
+msgstr "(ðÏÌÅ ÄÌÑ ÐÁÒÏÌÑ) îÅÁËÔÉ×ÎÅ. îÁÔÉÓΦÔØ <×צÄ> ÝÏ ÁËÔÉצÚÕ×ÁÔÉ."
+
+#. #define FORM_LINK_FILE_UNM_MSG
+#: LYMessages.c:75
+msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
+msgstr "îåúí¶îîå ÐÏÌÅ ÄÌÑ ÆÁÊÌÕ.  óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâõìñã¶ñ - Ú¦ÊÔÉ."
+
+#. #define FORM_LINK_FILE_MESSAGE
+#: LYMessages.c:77
+msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
+msgstr "(ðÏÌÅ ÄÌÑ ÆÁÊÌÕ) ÷×ÅĦÔØ ¦Í'Ñ ÆÁÊÌÕ. óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâõìñã¶ñ - Ú¦ÊÔÉ."
+
+# Ñ ÂÉ ÚÁÌÉÛÉ× "Ó×Ϥ", ÂÏ ÔÅËÓÔÏ×Å ÐÏÌÅ Õ ÍÅÎÅ textarea
+#. #define FORM_LINK_TEXT_MESSAGE
+#: LYMessages.c:79
+msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(ôÅËÓÔÏ×ÉÊ ÒÑÄÏË) ÷×ÅĦÔØ ÔÅËÓÔ. óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâõìñã¶ñ - Ú¦ÊÔÉ."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE
+#: LYMessages.c:81
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
+msgstr "(ôÅËÓÔÏ×Á ÏÂÌÁÓÔØ) úÁÐÏ×ΦÔØ. óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâõìñã¶ñ - Ú¦ÊÔÉ."
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_E
+#: LYMessages.c:83
+#, c-format
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
+msgstr "(ôÅËÓÔÏ×Á ÏÂÌÁÓÔØ) úÁÐÏ×ΦÔØ. óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâ - Ú¦ÊÔÉ (%s - ÒÅÄÁËÔÏÒ)."
+
+#. #define FORM_LINK_TEXT_UNM_MSG
+#: LYMessages.c:85
+msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
+msgstr "îåúí¶îîå ÔÅËÓÔÏ×Å ÐÏÌÅ.  óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâõìñã¶ñ - Ú¦ÊÔÉ."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
+#: LYMessages.c:87
+msgid "(Form field) Enter text.  Use <return> to submit."
+msgstr "(ðÏÌÅ ÆÏÒÍÉ) ÷×ÅĦÔØ ÔÅËÓÔ. <÷צÄ> ÝÏ צĦÓÌÁÔÉ ÆÏÒÍÕ."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
+#: LYMessages.c:89
+#, c-format
+msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
+msgstr "(ðÏÌÅ ÆÏÒÍÉ) ÷×ÅĦÔØ ÔÅËÓÔ. <÷צÄ> ÝÏ צĦÓÌÁÔÉ (%s - ÂÅÚ ËÅÛÁ)."
+
+#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
+#: LYMessages.c:91
+msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
+msgstr "(ðÏÌÅ ÆÏÒÍÉ) ÷×ÅĦÔØ ÔÅËÓÔ. <÷צÄ> - צÄÓÉÌÁ¤, ÓÔÒ¦ÌËÉ/ÔÁÂÕÌÑÃ¦Ñ - Ú¦ÊÔÉ."
+
+#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
+#: LYMessages.c:93
+msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
+msgstr "îåúí¶îîå ÐÏÌÅ ÆÏÒÍÉ.  óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâõìñã¶ñ - Ú¦ÊÔÉ."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
+#: LYMessages.c:95
+msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
+msgstr "(ðÏÌÅ mailto) ÷×ÅĦÔØ ÔÅËÓÔ. <÷צÄ> - צĦÓÌÁÔÉ, ÓÔÒ¦ÌËÉ - Ú¦ÊÔÉ."
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:97
+msgid "(mailto form field) Mail is disallowed so you cannot submit."
+msgstr "(ðÏÌÅ mailto)  îÁÄÓÉÌÁÎÎÑ ÐÏÛÔÉ ÚÁÂÏÒÏÎÅÎÅ, צĦÓÌÁÔÉ ÎÅÍÏÖÌÉ×Ï."
+
+#. #define FORM_LINK_PASSWORD_MESSAGE
+#: LYMessages.c:99
+msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(ðÏÌÅ ××ÏÄÕ ÐÁÒÏÌÑ) ÷×ÅĦÔØ ÔÅËÓÔ. óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâõìñã¶ñ - Ú¦ÊÔÉ."
+
+#. #define FORM_LINK_PASSWORD_UNM_MSG
+#: LYMessages.c:101
+msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
+msgstr "îåúí¶îîå ÐÏÌÅ ××ÏÄÕ ÐÁÒÏÌÑ.  óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâõìñã¶ñ - Ú¦ÊÔÉ."
+
+#. #define FORM_LINK_CHECKBOX_MESSAGE
+#: LYMessages.c:103
+msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
+msgstr "(ðÏÌÅ \"ÐÅÒÅÍÉËÁÞ\")   ðÒÁ×Á ÓÔÒ¦ÌËÁ ÞÉ <×צÄ> ÐÅÒÅÍÉËÁ¤ ÓÔÁÎ."
+
+#. #define FORM_LINK_CHECKBOX_UNM_MSG
+#: LYMessages.c:105
+msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
+msgstr "îåúí¶îîéê ÐÅÒÅÍÉËÁÞ.  óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâõìñã¶ñ - Ú¦ÊÔÉ."
+
+#. #define FORM_LINK_RADIO_MESSAGE
+#: LYMessages.c:107
+msgid "(Radio Button)   Use right-arrow or <return> to toggle."
+msgstr "(òÁĦÏËÎÏÐËÁ)    ðÒÁ×Á ÓÔÒ¦ÌËÁ ÞÉ <×צÄ> ÐÅÒÅÍÉËÁ¤."
+
+#. #define FORM_LINK_RADIO_UNM_MSG
+#: LYMessages.c:109
+msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
+msgstr "îåúí¶îîá ÒÁĦÏËÎÏÐËÁ.  óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâõìñã¶ñ - Ú¦ÊÔÉ."
+
+# ôåòí¶îïìïç¶ñ!!! ôÒÅÂÁ ÏÂÇÏ×ÏÒÀ×ÁÔÉ.
+# íÅΦ ǦÒÛÅ "÷¦Ä¦ÓÌÁÔÉ", ÂÏ ÔÏĦ ÎÅ×ÉÐÒÁ×ÄÁÎÁ ÔÁ×ÔÏÌÏÇ¦Ñ Õ LYMessages.c:127
+# ôåòí¶îïìïç¶ñ!!! ôÒÅÂÁ ÏÂÇÏ×ÏÒÀ×ÁÔÉ.
+# íÅΦ ǦÒÛÅ "÷¦Ä¦ÓÌÁÔÉ", ÂÏ ÔÏĦ ÎÅ×ÉÐÒÁ×ÄÁÎÁ ÔÁ×ÔÏÌÏÇ¦Ñ Õ LYMessages.c:127
+#. #define FORM_LINK_SUBMIT_PREFIX
+#: LYMessages.c:111
+msgid "Submit ('x' for no cache) to "
+msgstr "úÁÔ×ÅÒÄÉÔÉ ('x' - ÂÅÚ ËÅÛÁ) ÎÁ "
+
+#. #define FORM_LINK_RESUBMIT_PREFIX
+#: LYMessages.c:113
+msgid "Submit to "
+msgstr "úÁÔ×ÅÒÄÉÔÉ ÎÁ "
+
+#. #define FORM_LINK_SUBMIT_MESSAGE
+#: LYMessages.c:115
+msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
+msgstr "(ëÎÏÐËÁ צÄÓÉÌÁÎÎÑ ÆÏÒÍÉ) ÷¦Ä¦ÓÌÁÔÉ - ÓÔÒ¦ÌËÁ ×ÐÒÁ×Ï ÞÉ <×צÄ> ('x' - ÂÅÚ ËÅÛÁ)"
+
+#. #define FORM_LINK_RESUBMIT_MESSAGE
+#: LYMessages.c:117
+msgid "(Form submit button) Use right-arrow or <return> to submit."
+msgstr "(ëÎÏÐËÁ צÄÓÉÌÁÎÎÑ ÆÏÒÍÉ) ÷¦Ä¦ÓÌÁÔÉ - ÓÔÒ¦ÌËÁ ×ÐÒÁ×Ï ÞÉ <×צÄ>."
+
+#. #define FORM_LINK_SUBMIT_DIS_MSG
+#: LYMessages.c:119
+msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
+msgstr "úáâìïëï÷áîá ËÎÏÐËÁ ÚÁÔ×ÅÒÄÖÅÎÎÑ. óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâ - Ú¦ÊÔÉ."
+
+#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
+#: LYMessages.c:121
+msgid "Submit mailto form to "
+msgstr "úÁÔ×ÅÒÄÉÔÉ mailto ÎÁ "
+
+#. #define FORM_LINK_SUBMIT_MAILTO_MSG
+#: LYMessages.c:123
+msgid "(mailto form submit button) Use right-arrow or <return> to submit."
+msgstr "(ëÎÏÐËÁ צÄÓÉÌÁÎÎÑ ÞÅÒÅÚ mailto) ÷¦Ä¦ÓÌÁÔÉ - ÓÔÒ¦ÌËÁ ×ÐÒÁ×Ï ÞÉ <×צÄ>."
+
+#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:125
+msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
+msgstr "(ëÎÏÐËÁ צÄÓÉÌÁÎÎÑ ÞÅÒÅÚ mailto) îÁÄÓÉÌÁÔÉ ÐÏÛÔÕ ÚÁÂÏÒÏÎÅÎÏ, צĦÓÌÁÔÉ ÎÅÍÏÖÌÉ×Ï."
+
+#. #define FORM_LINK_RESET_MESSAGE
+#: LYMessages.c:127
+msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
+msgstr "(ëÎÏÐËÁ צÄÎÏ×ÌÅÎÎÑ ÆÏÒÍÉ) óÔÒ¦ÌËÁ ×ÐÒÁ×Ï ÞÉ <×צÄ> - ÄÏ ÐÏÞÁÔËÏ×ÏÇÏ ÓÔÁÎÕ."
+
+#. #define FORM_LINK_RESET_DIS_MSG
+#: LYMessages.c:129
+msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
+msgstr "úáâìïëï÷áîá ËÎÏÐËÁ צÄÎÏ×ÌÅÎÎÑ. óÔÒ¦ÌËÉ ÷çïòõ/÷îéú, ÞÉ ôáâ - Ú¦ÊÔÉ."
+
+#. #define FORM_LINK_OPTION_LIST_MESSAGE
+#: LYMessages.c:131
+msgid "(Option list) Hit return and use arrow keys and return to select option."
+msgstr "(óÐÉÓÏË ×ÁÒ¦ÁÎÔ¦×) îÁÔÉÓΦÔØ ×צÄ, ×ÉÂÅÒ¦ÔØ ÓÔÒ¦ÌËÁÍÉ ÔÁ ÎÁÔÉÓΦÔØ ×צÄ."
+
+#. #define CHOICE_LIST_MESSAGE
+#: LYMessages.c:133
+msgid "(Choice list) Hit return and use arrow keys and return to select option."
+msgstr "(óÐÉÓÏË ×ÁÒ¦ÁÎÔ¦×) îÁÔÉÓΦÔØ ×צÄ, ×ÉÂÅÒ¦ÔØ ÓÔÒ¦ÌËÁÍÉ ÔÁ ÎÁÔÉÓΦÔØ ×צÄ."
+
+#. #define FORM_LINK_OPTION_LIST_UNM_MSG
+#: LYMessages.c:135
+msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
+msgstr "îåúí¶îîéê ÓÐÉÓÏË ×ÁÒ¦ÁÎÔ¦×. óÔÒ¦ÌËÉ ÞÉ ××¦Ä - ÐÒÏÄÉ×ÉÔÉÓÑ Ê Ú¦ÊÔÉ."
+
+#. #define CHOICE_LIST_UNM_MSG
+#: LYMessages.c:137
+msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
+msgstr "úáâìïëï÷áîéê ÓÐÉÓÏË ×ÁÒ¦ÁÎÔ¦×. óÔÒ¦ÌËÉ ÞÉ ××¦Ä - ÐÒÏÄÉ×ÉÔÉÓÑ Ê Ú¦ÊÔÉ."
+
+#: LYMessages.c:138
+msgid "Submitting form..."
+msgstr "úÁÔ×ÅÒÄÖÕ¤ÍÏ ÆÏÒÍÕ..."
+
+#: LYMessages.c:139
+msgid "Resetting form..."
+msgstr "÷¦ÄÎÏ×ÌÀ¤ÍÏ ÆÏÒÍÕ..."
+
+#. #define RELOADING_FORM
+#: LYMessages.c:141
+msgid "Reloading document.  Any form entries will be lost!"
+msgstr "ðÅÒÅÚÁ×ÁÎÔÁÖÕ¤ÍÏ ÄÏËÕÍÅÎÔ.  õÓ¦ ××ÅÄÅΦ ÚÎÁÞÅÎÎÑ ÂÕÄÕÔØ ×ÔÒÁÞÅΦ!"
+
+#: LYMessages.c:142
+#, c-format
+msgid "Warning: Cannot transcode form data to charset %s!"
+msgstr "õ×ÁÇÁ: îÅÍÏÖÌÉ×Ï ÐÅÒÅËÏÄÕ×ÁÔÉ ÄÁΦ Õ %s!"
+
+#. #define NORMAL_LINK_MESSAGE
+#: LYMessages.c:145
+msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
+msgstr "(ðïóéìáîîñ) áËÔÉ×ÕÊÔÅ ÓÔÒ¦ÌËÏÀ ×ÐÒÁ×Ï ÞÉ <×צÄ>'ÏÍ"
+
+#: LYMessages.c:146
+msgid "The resource requested is not available at this time."
+msgstr "ãÅÊ ÒÅÓÕÒÓ ÎÁÒÁÚ¦ ÎÅÄÏÓÔÕÐÎÉÊ."
+
+#: LYMessages.c:147
+msgid "Enter Lynx keystroke command: "
+msgstr "÷×ÅĦÔØ ËÏÍÁÎÄÕ Lynx: "
+
+#: LYMessages.c:148
+msgid "Looking up "
+msgstr "ûÕËÁ¤ÍÏ "
+
+#: LYMessages.c:149
+#, c-format
+msgid "Getting %s"
+msgstr "ïÔÒÉÍÕ¤ÍÏ %s"
+
+#: LYMessages.c:150
+#, c-format
+msgid "Skipping %s"
+msgstr "ðÒÏÐÕÓËÁ¤ÍÏ %s"
+
+#: LYMessages.c:151
+#, c-format
+msgid "Using %s"
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ¤ÍÏ %s"
+
+#: LYMessages.c:152
+#, c-format
+msgid "Illegal URL: %s"
+msgstr "îÅצÒÎÉÊ URL: %s"
+
+#: LYMessages.c:153
+#, c-format
+msgid "Badly formed address %s"
+msgstr "îÅÐÒÁ×ÉÌØÎÏ ÓÆÏÒÍÏ×ÁÎÁ ÁÄÒÅÓÁ %s"
+
+#: LYMessages.c:154
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: LYMessages.c:155
+msgid "Unable to access WWW file!!!"
+msgstr "îÅÍÏÖÌÉ×Ï Ä¦ÓÔÁÔÉÓÑ ÄÏ WWW ÆÁÊÌÕ!!!"
+
+#: LYMessages.c:156
+#, c-format
+msgid "This is a searchable index.  Use %s to search."
+msgstr "ãÅ ¦ÎÄÅËÓ ¦Ú ÐÏÛÕËÏÍ.  ÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ ÄÌÑ ÐÏÛÕËÕ %s."
+
+#. #define WWW_INDEX_MORE_MESSAGE
+#: LYMessages.c:158
+#, c-format
+msgid "--More--  This is a searchable index.  Use %s to search."
+msgstr "--äÁ̦-- ãÅ ¦ÎÄÅËÓ ¦Ú ÐÏÛÕËÏÍ.  ÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ ÄÌÑ ÐÏÛÕËÕ %s."
+
+#: LYMessages.c:159
+msgid "You have entered an invalid link number."
+msgstr "÷É ××ÅÌÉ ÎÅצÒÎÉÊ ÎÏÍÅÒ ÐÏÓÉÌÁÎÎÑ."
+
+# "ÚÇÅÎÅÒÏ×ÁÎϧ ×ÅÒÓ¦§" ??
+# "ÚÇÅÎÅÒÏ×ÁÎϧ ×ÅÒÓ¦§" ??
+#. #define SOURCE_HELP
+#: LYMessages.c:161
+msgid "Currently viewing document source.  Press '\\' to return to rendered version."
+msgstr "ãÅ ÄÖÅÒÅÌÏ ÄÏËÕÍÅÎÔÁ. îÁÔÉÓΦÔØ '\\' ÝÏ ÐÏ×ÅÒÎÕÔÉÓÑ ÄÏ ÏÐÒÁÃØÏ×ÁÎϧ ×ÅÒÓ¦§."
+
+#. #define NOVICE_LINE_ONE
+#: LYMessages.c:163
+msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
+msgstr "  óÔÒ¦ÌËÉ: ×ÇÏÒÕ/×ÎÉÚ - ÐÅÒÅͦÝÅÎÎÑ,  ×ÐÒÁ×Ï - ÚÁ ÐÏÓÉÌÁÎÎÑÍ, ×̦×Ï - ÎÁÚÁÄ.  \n"
+
+#. #define NOVICE_LINE_TWO
+#: LYMessages.c:165
+msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
+msgstr " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=ÐÏÛÕË  [delete]=history list \n"
+
+#. #define NOVICE_LINE_TWO_A
+#: LYMessages.c:167
+msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
+msgstr ""
+
+#. #define NOVICE_LINE_TWO_B
+#: LYMessages.c:169
+msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
+msgstr ""
+
+#. #define NOVICE_LINE_TWO_C
+#: LYMessages.c:171
+msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
+msgstr "O)¦ÎÛ¦ ËÍ C)ËÏÍÅÎÔÁÒ¦ ¶ÓÔÏÒ¦Ñ: <ÚÁ¦Ê> úÁËÌÁÄËÉ: V)ÐÅÒÅÇÌÑÄ A)ÄÏÄÁÔÉ R)×ÉÄÁÌÉÔÉ\n"
+
+#. #define FORM_NOVICELINE_ONE
+#: LYMessages.c:173
+msgid "            Enter text into the field by typing on the keyboard              "
+msgstr "                        ÷×ÅĦÔØ ÔÅËÓÔ Ú ËÌÁצÁÔÕÒÉ                           "
+
+# Õ ÓÔÒ¦Þæ, Õ ÒÑÄËÕ -- ÍÅΦ ÔÒÅÂÁ ×ÉÚÎÁÞÉÔÉÓÑ.
+# Ñ ×ÖÅ ÎÁÚÉ×Á× textfield ÔÅËÓÔÏ×ÏÀ ÓÔÒ¦ÞËÏÀ, ÔÒÅÂÁ ÒÏÚ¦ÂÒÁÔÉÓÑ
+# Õ ÓÔÒ¦Þæ, Õ ÒÑÄËÕ -- ÍÅΦ ÔÒÅÂÁ ×ÉÚÎÁÞÉÔÉÓÑ.
+# Ñ ×ÖÅ ÎÁÚÉ×Á× textfield ÔÅËÓÔÏ×ÏÀ ÓÔÒ¦ÞËÏÀ, ÔÒÅÂÁ ÒÏÚ¦ÂÒÁÔÉÓÑ
+#. #define FORM_NOVICELINE_TWO
+#: LYMessages.c:175
+msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
+msgstr "    Ctrl-U - ÓÔÅÒÔÉ ×ÅÓØ ÔÅËÓÔ Õ ÒÑÄËÕ, [úÁ¦Ê] - ÓÔÅÒÔÉ ÏÄÉÎ ÓÉÍ×ÏÌ   "
+
+# Õ ÓÔÒ¦Þæ, Õ ÒÑÄËÕ -- ÍÅΦ ÔÒÅÂÁ ×ÉÚÎÁÞÉÔÉÓÑ.
+# Ñ ×ÖÅ ÎÁÚÉ×Á× textfield ÔÅËÓÔÏ×ÏÀ ÓÔÒ¦ÞËÏÀ, ÔÒÅÂÁ ÒÏÚ¦ÂÒÁÔÉÓÑ
+#. #define FORM_NOVICELINE_TWO_DELBL
+#: LYMessages.c:177
+msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
+msgstr "   Ctrl-U - ÓÔÅÒÔÉ ×ÅÓØ ÔÅËÓÔ Õ ÒÑÄËÕ, [úÁ¦Ê] - ÓÔÅÒÔÉ ÏÄÉÎ ÓÉÍ×ÏÌ  "
+
+# Õ ÓÔÒ¦Þæ, Õ ÒÑÄËÕ -- ÍÅΦ ÔÒÅÂÁ ×ÉÚÎÁÞÉÔÉÓÑ.
+# Ñ ×ÖÅ ÎÁÚÉ×Á× textfield ÔÅËÓÔÏ×ÏÀ ÓÔÒ¦ÞËÏÀ, ÔÒÅÂÁ ÒÏÚ¦ÂÒÁÔÉÓÑ
+#. #define FORM_NOVICELINE_TWO_VAR
+#: LYMessages.c:179
+#, c-format
+msgid "    %s to delete all text in field, [Backspace] to delete a character    "
+msgstr "    %s - ÓÔÅÒÔÉ ×ÅÓØ ÔÅËÓÔ Õ ÒÑÄËÕ, [úÁ¦Ê] - ÓÔÅÒÔÉ ÏÄÉÎ ÓÉÍ×ÏÌ   "
+
+# Õ ÓÔÒ¦Þæ, Õ ÒÑÄËÕ -- ÍÅΦ ÔÒÅÂÁ ×ÉÚÎÁÞÉÔÉÓÑ.
+# Ñ ×ÖÅ ÎÁÚÉ×Á× textfield ÔÅËÓÔÏ×ÏÀ ÓÔÒ¦ÞËÏÀ, ÔÒÅÂÁ ÒÏÚ¦ÂÒÁÔÉÓÑ
+#. #define FORM_NOVICELINE_TWO_DELBL_VAR
+#: LYMessages.c:181
+#, c-format
+msgid "      %s to delete text in field, [Backspace] to delete a character    "
+msgstr "  %s - ÓÔÅÒÔÉ ×ÅÓØ ÔÅËÓÔ Õ ÒÑÄËÕ, [úÁ¦Ê] - ÓÔÅÒÔÉ ÏÄÉÎ ÓÉÍ×ÏÌ   "
+
+#. mailto
+#: LYMessages.c:184
+msgid "Malformed mailto form submission!  Cancelled!"
+msgstr "îÅÐÒÁ×ÉÌØÎÏ ÓÆÏÒÍÏ×ÁÎÅ ÚÁÔ×ÅÒÄÖÅÎÎÑ ÆÏÒÍÉ mailto! óËÁÓÏ×ÁÎÏ!"
+
+#: LYMessages.c:185
+msgid "Warning!  Control codes in mail address replaced by ?"
+msgstr "õ×ÁÇÁ! ëÏÄÉ ËÅÒÕ×ÁÎÎÑ Õ ÐÏÛÔÏ×¦Ê ÁÄÒÅÓ¦ ÚÁͦÎÅÎÏ ÎÁ ?"
+
+#: LYMessages.c:186
+msgid "Mail disallowed!  Cannot submit."
+msgstr "îÁÄÓÉÌÁÎÎÑ ÐÏÛÔÉ ÚÁÂÏÒÏÎÅÎÅ! úÁÔ×ÅÒÄÖÅÎÎÑ ÎÅÍÏÖÌÉ×Å."
+
+#: LYMessages.c:187
+msgid "Mailto form submission failed!"
+msgstr "îÅ×ÄÁÞÁ ÚÁÔ×ÅÒÄÖÅÎÎÑ ÆÏÒÍÉ mailto!"
+
+#: LYMessages.c:188
+msgid "Mailto form submission Cancelled!!!"
+msgstr "úÁÔ×ÅÒÄÖÅÎÎÑ ÆÏÒÍÉ mailto ÓËÁÓÏ×ÁÎÏ!!!"
+
+#: LYMessages.c:189
+msgid "Sending form content..."
+msgstr "÷¦ÄÐÒÁ×ÌѤÍÏ ÚÁÐÏ×ÎÅÎÕ ÆÏÒÍÕ..."
+
+#: LYMessages.c:190
+msgid "No email address is present in mailto URL!"
+msgstr "îÅÍÁ ÐÏÛÔÏ×ϧ ÁÄÒÅÓÉ Õ mailto URL!"
+
+#. #define MAILTO_URL_TEMPOPEN_FAILED
+#: LYMessages.c:192
+msgid "Unable to open temporary file for mailto URL!"
+msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ ÄÌÑ mailto URL!"
+
+#. #define INC_ORIG_MSG_PROMPT
+#: LYMessages.c:194
+msgid "Do you wish to include the original message?"
+msgstr "þÉ ÂÁÖÁ¤ÔÅ ÄÏÄÁÔÉ ÏÔÒÉÍÁÎÏÇÏ ÌÉÓÔÁ?"
+
+#. #define INC_PREPARSED_MSG_PROMPT
+#: LYMessages.c:196
+msgid "Do you wish to include the preparsed source?"
+msgstr "þÉ ÂÁÖÁ¤ÔÅ ÄÏÄÁÔÉ ÏÂÒÏÂÌÅÎÅ ÄÖÅÒÅÌÏ ÌÉÓÔÁ?"
+
+#. #define SPAWNING_EDITOR_FOR_MAIL
+#: LYMessages.c:198
+msgid "Spawning your selected editor to edit mail message"
+msgstr "úÁÐÕÓËÁ¤ÍÏ ×ÉÂÒÁÎÏÇÏ ×ÁÍÉ ÒÅÄÁËÔÏÒÁ ÄÌÑ ÒÅÄÁÇÕ×ÁÎÎÑ ÌÉÓÔÁ"
+
+#. #define ERROR_SPAWNING_EDITOR
+#: LYMessages.c:200
+msgid "Error spawning editor, check your editor definition in the options menu"
+msgstr "ðÏÍÉÌËÁ ÚÁÐÕÓËÕ ÒÅÄÁËÔÏÒÁ, ÐÅÒÅצÒÔÅ ÕÓÔÁÎÏ×ËÉ Õ ÍÅÎÀ ÎÁÌÁÛÔÕ×ÁÎØ"
+
+#: LYMessages.c:201
+msgid "Send this comment?"
+msgstr "÷¦Ä¦ÓÌÁÔÉ ÃÅÊ ËÏÍÅÎÔÁÒ?"
+
+#: LYMessages.c:202
+msgid "Send this message?"
+msgstr "÷¦Ä¦ÓÌÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ?"
+
+#: LYMessages.c:203
+msgid "Sending your message..."
+msgstr "÷¦ÄÓÉÌÁÎÎÑ ×ÁÛÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ..."
+
+#: LYMessages.c:204
+msgid "Sending your comment:"
+msgstr "÷¦ÄÓÉÌÁÎÎÑ ×ÁÛÏÇÏ ËÏÍÅÎÔÁÒÑ:"
+
+#. textarea
+#: LYMessages.c:207
+msgid "Not in a TEXTAREA; cannot use external editor."
+msgstr "ãÅ ÎÅ ôåëóôï÷á ïâìáóôø; ×ÉËÏÒÉÓÔÁÎÎÑ ÚÏ×ΦÛÎØÏÇÏ ÒÅÄÁËÔÏÒÁ ÎÅÍÏÖÌÉ×Å."
+
+#: LYMessages.c:208
+msgid "Not in a TEXTAREA; cannot use command."
+msgstr "ãÅ ÎÅ ôåëóôï÷á ïâìáóôø; ×ÉËÏÒÉÓÔÁÎÎÑ ËÏÍÁÎÄÉ ÎÅÍÏÖÌÉ×Å."
+
+#: LYMessages.c:211
+msgid "file: ACTIONs are disallowed!"
+msgstr "file: 䶷 (ACTIONs) ÚÁÂÏÒÏÎÅΦ!"
+
+#. #define FILE_SERVED_LINKS_DISALLOWED
+#: LYMessages.c:213
+msgid "file: URLs via served links are disallowed!"
+msgstr ""
+
+#: LYMessages.c:214
+msgid "Access to local files denied."
+msgstr "äÏÓÔÕÐ ÄÏ ÌÏËÁÌØÎÉÈ ÆÁÊÌ¦× ÚÁÂÏÒÏÎÅÎÏ."
+
+#: LYMessages.c:215
+msgid "file: URLs via bookmarks are disallowed!"
+msgstr "file: URL ÞÅÒÅÚ ÚÁËÌÁÄÉÎËÉ ÚÁÂÏÒÏÎÅÎÏ!"
+
+#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
+#: LYMessages.c:217
+msgid "This special URL is not allowed in external documents!"
+msgstr "ãÅÊ ÓÐÅæÁÌØÎÉÊ URL ÎÅ ÄÏÚ×ÏÌÅÎÉÊ Õ ÚÏ×ΦÛÎ¦È ÄÏËÕÍÅÎÔÁÈ!"
+
+#: LYMessages.c:218
+msgid "Press <return> to return to Lynx."
+msgstr "îÁÔÉÓΦÔØ <×צÄ> ÄÌÑ ÐÏ×ÅÒÎÅÎÎÑ ÄÏ Lynx'Á."
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:221
+msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
+msgstr "úÁÐÕÓËÁ¤ÍÏ Ð¦ÄÐÒÏÃÅÓ DCL.  'logout' ÐÏ×ÅÒÎÅ ×ÁÓ ÄÏ Lynx.\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:225
+msgid "Type EXIT to return to Lynx.\n"
+msgstr "îÁÂÅÒ¦ÔØ exit ÄÌÑ ÐÏ×ÅÒÎÅÎÎÑ ÄÏ Lynx'Á.\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:228
+msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
+msgstr "úÁÐÕÓËÁ¤ÍÏ ËÏÍÁÎÄÎÕ ÏÂÏÌÏÎËÕ. 'exit' ÐÏ×ÅÒÎÅ ×ÁÓ ÄÏ Lynx.\n"
+
+#: LYMessages.c:231
+msgid "Spawning is currently disabled."
+msgstr "úÁÐÕÓË Ð¦ÄÐÒÏÃÅÓ¦× ÎÁÒÁÚ¦ ÚÁÂÏÒÏÎÅÎÏ."
+
+#: LYMessages.c:232
+msgid "The 'd'ownload command is currently disabled."
+msgstr "ëÏÍÁÎÄÁ 'd'ownload ÎÁÒÁÚ¦ ÚÁÂÏÒÏÎÅÎÁ."
+
+#: LYMessages.c:233
+msgid "You cannot download an input field."
+msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÚÁ×ÁÎÔÁÖÉÔÉ ÐÏÌÅ input."
+
+#: LYMessages.c:234
+msgid "Form has a mailto action!  Cannot download."
+msgstr "æÏÒÍÁ ÍÁ¤ ĦÀ \"mailto\"! úÁ×ÁÎÔÁÖÅÎÎÑ ÎÅÍÏÖÌÉ×Å."
+
+#: LYMessages.c:235
+msgid "You cannot download a mailto: link."
+msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÚÁ×ÁÎÔÁÖÉÔÉ ÐÏÓÉÌÁÎÎÑ \"mailto:\"."
+
+#: LYMessages.c:236
+msgid "You cannot download cookies."
+msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÚÁ×ÁÎÔÁÖÉÔÉ ëÕËÉ."
+
+#: LYMessages.c:237
+msgid "You cannot download a printing option."
+msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÚÁ×ÁÎÔÁÖÉÔÉ ËÏÍÁÎÄÕ ÄÒÕËÕ."
+
+#: LYMessages.c:238
+msgid "You cannot download an upload option."
+msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÚÁ×ÁÎÔÁÖÉÔÉ ËÏÍÁÎÄÕ ÐÅÒÅÓÉÌÁÎÎÑ."
+
+#: LYMessages.c:239
+msgid "You cannot download an permit option."
+msgstr "÷É ÎÅ ÍÏÖÅÔÅ \"ÚÁ×ÁÎÔÁÖÉÔÉ\" ÏÐæÀ \"permit\"."
+
+#: LYMessages.c:240
+msgid "This special URL cannot be downloaded!"
+msgstr "ãÅÊ ÎÅÔÉÐÏ×ÉÊ URL ÚÁ×ÁÎÔÁÖÉÔÉ ÎÅÍÏÖÌÉ×Ï!"
+
+# (Ñ ÎÅ ÚÎÁÀ, ΦÑËÉÈ ÕÐÏÄÏÂÁÎØ, ÄÁ×ÁÊ ÏÂÇÏ×ÏÒÀ×ÁÔÉ;)
+# (Ñ ÎÅ ÚÎÁÀ, ΦÑËÉÈ ÕÐÏÄÏÂÁÎØ, ÄÁ×ÁÊ ÏÂÇÏ×ÏÒÀ×ÁÔÉ;)
+#: LYMessages.c:241
+msgid "Nothing to download."
+msgstr "îÅÍÁ ÞÏÇÏ ÚÁ×ÁÎÔÁÖÕ×ÁÔÉ."
+
+# ÎÁÇÏÌÏÓ ÎÁ "õ÷¶íëîåîï!"
+# ÎÁÇÏÌÏÓ ÎÁ "õ÷¶íëîåîï!"
+#: LYMessages.c:242
+msgid "Trace ON!"
+msgstr "ôÒÁÓÕ×ÁÎÎÑ õ÷¶íëîåîï!"
+
+#: LYMessages.c:243
+msgid "Trace OFF!"
+msgstr "ôÒÁÓÕ×ÁÎÎÑ ÷éíëîåîï!"
+
+#. #define CLICKABLE_IMAGES_ON
+#: LYMessages.c:245
+msgid "Links will be included for all images!  Reloading..."
+msgstr "ðÏÓÉÌÁÎÎÑ ÂÕÄÕÔØ ÄÏÄÁΦ ÄÌÑ ÕÓ¦È ÚÏÂÒÁÖÅÎØ!  ðÅÒÅÚÁ×ÁÎÔÁÖÕ¤ÍÏ..."
+
+#. #define CLICKABLE_IMAGES_OFF
+#: LYMessages.c:247
+msgid "Standard image handling restored!  Reloading..."
+msgstr "óÔÁÎÄÁÒÔΦ ÍÁΦÐÕÌÑæ§ ¦Ú ÚÏÂÒÁÖÅÎÎÑÍÉ ÐÏÎÏ×ÌÅÎÏ! ðÅÒÅÚÁ×ÁÎÔÁÖÕ¤ÍÏ..."
+
+#. #define PSEUDO_INLINE_ALTS_ON
+#: LYMessages.c:249
+msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
+msgstr "ðÓÅ×ÄÏ-ALT ÂÕÄÅ ×ÓÔÁ×ÌÅÎÏ ÄÌÑ ÚÏÂÒÁÖÅÎØ ÂÅÚ ×ËÁÚÁÎÉÈ ALT! ðÅÒÅÚÁ×ÁÎÔÁÖÕ¤ÍÏ..."
+
+#. #define PSEUDO_INLINE_ALTS_OFF
+#: LYMessages.c:251
+msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
+msgstr "úÏÂÒÁÖÅÎÎÑ ÂÅÚ ×ËÁÚÁÎÉÈ ALT ÂÕÄÅ ÐÒϦÇÎÏÒÏ×ÁÎÏ! ðÅÒÅÚÁ×ÁÎÔÁÖÕ¤ÍÏ..."
+
+#: LYMessages.c:252
+msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
+msgstr "òÅÖÉÍ Raw 8-bit ÞÉ CJK ÷éíëîåîï! ðÅÒÅÚÁ×ÁÎÔÁÖÕ¤ÍÏ..."
+
+#: LYMessages.c:253
+msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
+msgstr "òÅÖÉÍ Raw 8-bit ÞÉ CJK õ÷¶íëîåîï! ðÅÒÅÚÁ×ÁÎÔÁÖÕ¤ÍÏ..."
+
+#. #define HEAD_D_L_OR_CANCEL
+#: LYMessages.c:255
+msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
+msgstr "îÁĦÓÌÁÔÉ ÚÁÐÉÔ HEAD ÄÌÑ D)ÏËÕÍÅÎÔÁ ÞÉ L)ink, ÞÉ C)ËÁÓÕ×ÁÔÉ? (d,l,c): "
+
+#. #define HEAD_D_OR_CANCEL
+#: LYMessages.c:257
+msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
+msgstr "îÁĦÓÌÁÔÉ ÚÁÐÉÔ HEAD ÄÌÑ D)ÏËÕÍÅÎÔÁ, ÞÉ C)ËÁÓÕ×ÁÔÉ? (d,c): "
+
+#: LYMessages.c:258
+msgid "Sorry, the document is not an http URL."
+msgstr "÷ÉÂÁÞÔÅ, ÄÏËÕÍÅÎÔ ÎÅ ¤ http URL."
+
+#: LYMessages.c:259
+msgid "Sorry, the link is not an http URL."
+msgstr "÷ÉÂÁÞÔÅ, ÐÏÓÉÌÁÎÎÑ ÎÅ ¤ http URL."
+
+#: LYMessages.c:260
+msgid "Sorry, the ACTION for this form is disabled."
+msgstr "÷ÉÂÁÞÔÅ ä¶à (ACTION) ÄÌÑ Ã¦¤§ ÆÏÒÍÉ ÚÁÂÏÒÏÎÅÎÏ."
+
+#. #define FORM_ACTION_NOT_HTTP_URL
+#: LYMessages.c:262
+msgid "Sorry, the ACTION for this form is not an http URL."
+msgstr "÷ÉÂÁÞÔÅ, ä¶ñ (ACTION) ÄÌÑ Ã¦¤§ ÆÏÒÍÉ ÎÅ ¤ http URL."
+
+#: LYMessages.c:263
+msgid "Not an http URL or form ACTION!"
+msgstr "ãÅ ÎÅ http URL ÞÉ ä¶ñ (ACTION) ÆÏÒÍÉ!"
+
+#: LYMessages.c:264
+msgid "This special URL cannot be a form ACTION!"
+msgstr "ãÅÊ ÎÅÔÉÐÏ×ÉÊ URL ÎÅ ÍÏÖÅ ÂÕÔÉ ä¶´à (ACTION) ÆÏÒÍÉ!"
+
+#: LYMessages.c:265
+msgid "URL is not in starting realm!"
+msgstr "URL ÚÁ ÍÅÖÁÍÉ ÐÏÞÁÔËÏ×ϧ ÏÂÌÁÓÔ¦ ÄÏÓÔÕÐÕ!"
+
+#: LYMessages.c:266
+msgid "News posting is disabled!"
+msgstr "îÁÄÓÉÌÁÎÎÑ ÎÏ×ÉÎ ÚÁÂÏÒÏÎÅÎÏ!"
+
+#: LYMessages.c:267
+msgid "File management support is disabled!"
+msgstr "ð¦ÄÔÒÉÍËÕ ÕÐÒÁ×̦ÎÎÑ ÆÁÊÌÁÍÉ ÚÁÂÏÒÏÎÅÎÏ!"
+
+#: LYMessages.c:268
+msgid "No jump file is currently available."
+msgstr ""
+
+#: LYMessages.c:269
+msgid "Jump to (use '?' for list): "
+msgstr "óÔÒÉÂÎÕÔÉ ÄÏ ('?' ÐÏËÁÖÅ ÓÐÉÓÏË): "
+
+#: LYMessages.c:270
+msgid "Jumping to a shortcut URL is disallowed!"
+msgstr "óÔÒÉÂÁÔÉ ÄÏ shortcut URL ÚÁÂÏÒÏÎÅÎÏ!"
+
+#: LYMessages.c:271
+msgid "Random URL is disallowed!  Use a shortcut."
+msgstr ""
+
+#: LYMessages.c:272
+msgid "No random URLs have been used thus far."
+msgstr ""
+
+#: LYMessages.c:273
+msgid "Bookmark features are currently disabled."
+msgstr "ïÐÅÒÁæ§ ¦Ú ÚÁËÌÁÄÉÎËÁÍÉ ÎÁÒÁÚ¦ ÚÁÂÏÒÏÎÅÎÏ."
+
+#: LYMessages.c:274
+msgid "Execution via bookmarks is disabled."
+msgstr "úÁÐÕÓËÁÔÉ ÐÒÏÇÒÁÍÉ ÞÅÒÅÚ ÚÁËÌÁÄÉÎËÉ ÚÁÂÏÒÏÎÅÎÏ."
+
+#. #define BOOKMARK_FILE_NOT_DEFINED
+#: LYMessages.c:276
+#, c-format
+msgid "Bookmark file is not defined. Use %s to see options."
+msgstr "æÁÊÌÁ ÚÁËÌÁÄÉÎÏË ÎÅ ×ÉÚÎÁÞÅÎÏ. %s ÐÏËÁÖÅ ×ÁÒ¦ÁÎÔÉ."
+
+#. #define NO_TEMP_FOR_HOTLIST
+#: LYMessages.c:278
+msgid "Unable to open tempfile for X Mosaic hotlist conversion."
+msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ ÄÌÑ ËÏÎ×ÅÒÓ¦§ X Mosaic hotlist."
+
+#: LYMessages.c:279
+msgid "ERROR - unable to open bookmark file."
+msgstr "ðïíéìëá - ÎÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ ÚÁËÌÁÄÉÎÏË."
+
+#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:281
+msgid "Unable to open bookmark file for deletion of link."
+msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ ÚÁËÌÁÄÉÎÏË ÄÌÑ ×ÉÄÁÌÅÎÎÑ ÐÏÓÉÌÁÎÎÑ."
+
+#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:283
+msgid "Unable to open scratch file for deletion of link."
+msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ ÄÌÑ ×ÉÄÁÌÅÎÎÑ ÐÏÓÉÌÁÎÎÑ."
+
+#: LYMessages.c:285
+msgid "Error renaming scratch file."
+msgstr "ðÏÍÉÌËÁ ÐÅÒÅÊÍÅÎÕ×ÁÎÎÑ ÔÉÍÞÁÓÏ×ÏÇÏ ÆÁÊÌÕ."
+
+#: LYMessages.c:287
+msgid "Error renaming temporary file."
+msgstr "ðÏÍÉÌËÁ ÐÅÒÅÊÍÅÎÕ×ÁÎÎÑ ÔÉÍÞÁÓÏ×ÏÇÏ ÆÁÊÌÕ."
+
+#. #define BOOKTEMP_COPY_FAIL
+#: LYMessages.c:289
+msgid "Unable to copy temporary file for deletion of link."
+msgstr "îÅÍÏÖÌÉ×Ï ÓËÏЦÀ×ÁÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ ÄÌÑ ×ÉÄÁÌÅÎÎÑ ÐÏÓÉÌÁÎÎÑ."
+
+#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
+#: LYMessages.c:291
+msgid "Unable to reopen temporary file for deletion of link."
+msgstr "îÅÍÏÖÌÉ×Ï ÐÅÒÅצÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ ÄÌÑ ×ÉÄÁÌÅÎÎÑ ÐÏÓÉÌÁÎÎÑ."
+
+#. #define BOOKMARK_LINK_NOT_ONE_LINE
+#: LYMessages.c:294
+msgid "Link is not by itself all on one line in bookmark file."
+msgstr "ðÏÓÉÌÁÎÎÑ ÚÁÊÍÁ¤ ¦ÌØÛÅ ÏÄÎÏÇÏ ÒÑÄËÁ Õ ÆÁÊ̦ ÚÁËÌÁÄÉÎÏË."
+
+#: LYMessages.c:295
+msgid "Bookmark deletion failed."
+msgstr "÷ÉÄÁÌÉÔÉ ÚÁËÌÁÄÉÎËÕ ÎÅ ×ÄÁÌÏÓÑ."
+
+#. #define BOOKMARKS_NOT_TRAVERSED
+#: LYMessages.c:297
+msgid "Bookmark files cannot be traversed (only http URLs)."
+msgstr ""
+
+#. #define BOOKMARKS_NOT_OPEN
+#: LYMessages.c:299
+msgid "Unable to open bookmark file, use 'a' to save a link first"
+msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ ÚÁËÌÁÄÉÎÏË, ÓÐÅÒÛÕ ÚÂÅÒÅÖ¦ÔØ ÔÁÍ ÝÏÓØ ('a')"
+
+#: LYMessages.c:300
+msgid "There are no links in this bookmark file!"
+msgstr "õ ÆÁÊ̦ ÚÁËÌÁÄÉÎÏË ÎÅÍÁ¤ ÐÏÓÉÌÁÎØ!"
+
+#. #define BOOK_D_L_OR_CANCEL
+#: LYMessages.c:302
+msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
+msgstr "úÂÅÒÅÇÔÉ D)ÏËÕÍÅÎÔ, ÚÒÏÂÉÔÉ ÚÁËL)ÁÄÉÎËÕ ÞÉ C)ËÁÓÕ×ÁÔÉ? (d,l,c): "
+
+#: LYMessages.c:303
+msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
+msgstr "úÂÅÒÅÇÔÉ D)ÏËÕÍÅÎÔ Õ ÆÁÊ̦ ÚÁËÌÁÄÉÎÏË ÞÉ C)ËÁÓÕ×ÁÔÉ? (d,c): "
+
+#: LYMessages.c:304
+msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
+msgstr "úÂÅÒÅÇÔÉ ÐÏÓÉL)ÁÎÎÑ Õ ÆÁÊ̦ ÚÁËÌÁÄÉÎÏË ÞÉ C)ËÁÓÕ×ÁÔÉ? (l,c): "
+
+#. #define NOBOOK_POST_FORM
+#: LYMessages.c:306
+msgid "Documents from forms with POST content cannot be saved as bookmarks."
+msgstr "äÏËÕÍÅÎÔÉ, ÏÔÒÉÍÁΦ ÞÅÒÅÚ ÆÏÒÍÕ POST, ÎÅÍÏÖÌÉ×Ï ÚÂÅÒÅÇÔÉ ÑË ÚÁËÌÁÄÉÎËÉ."
+
+#: LYMessages.c:307
+msgid "Cannot save form fields/links"
+msgstr "îÅÍÏÖÌÉ×Ï ÚÂÅÒÅÇÔÉ ÐÏÌÑ/ÐÏÓÉÌÁÎÎÑ ÆÏÒÍÉ"
+
+#. #define NOBOOK_HSML
+#: LYMessages.c:309
+msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
+msgstr "¶ÓÔÏÒ¦À, showinfo, ÍÅÎÀ ÔÁ ÆÁÊÌÉ ÓÐÉÓË¦× ÎÅÍÏÖÌÉ×Ï ÚÂÅÒ¦ÇÁÔÉ ÑË ÚÁËÌÁÄÉÎËÉ."
+
+#. #define CONFIRM_BOOKMARK_DELETE
+#: LYMessages.c:311
+msgid "Do you really want to delete this link from your bookmark file?"
+msgstr "þÉ ×É Ä¦ÊÓÎÏ ÂÁÖÁ¤ÔÅ ÚÎÉÝÉÔÉ ÃÅ ÐÏÓÉÌÁÎÎÑ ¦Ú ÆÁÊÌÕ ÚÁËÌÁÄÉÎÏË?"
+
+#: LYMessages.c:312
+msgid "Malformed address."
+msgstr "îÅצÒÎÏ ÓÆÏÒÍÏ×ÁÎÁ ÁÄÒÅÓÁ."
+
+#. #define HISTORICAL_ON_MINIMAL_OFF
+#: LYMessages.c:314
+msgid "Historical comment parsing ON (Minimal is overridden)!"
+msgstr ""
+
+#. #define HISTORICAL_OFF_MINIMAL_ON
+#: LYMessages.c:316
+msgid "Historical comment parsing OFF (Minimal is in effect)!"
+msgstr ""
+
+#. #define HISTORICAL_ON_VALID_OFF
+#: LYMessages.c:318
+msgid "Historical comment parsing ON (Valid is overridden)!"
+msgstr ""
+
+#. #define HISTORICAL_OFF_VALID_ON
+#: LYMessages.c:320
+msgid "Historical comment parsing OFF (Valid is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_ON_IN_EFFECT
+#: LYMessages.c:322
+msgid "Minimal comment parsing ON (and in effect)!"
+msgstr ""
+
+#. #define MINIMAL_OFF_VALID_ON
+#: LYMessages.c:324
+msgid "Minimal comment parsing OFF (Valid is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_ON_BUT_HISTORICAL
+#: LYMessages.c:326
+msgid "Minimal comment parsing ON (but Historical is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_OFF_HISTORICAL_ON
+#: LYMessages.c:328
+msgid "Minimal comment parsing OFF (Historical is in effect)!"
+msgstr ""
+
+#: LYMessages.c:329
+msgid "Soft double-quote parsing ON!"
+msgstr "\"í'ÑËÉÊ\" ÒÅÖÉÍ ÏÂÒÏÂËÉ ÐÏÄצÊÎÉÈ ÌÁÐÏË õ÷¶íëîåîï!"
+
+#: LYMessages.c:330
+msgid "Soft double-quote parsing OFF!"
+msgstr "\"í'ÑËÉÊ\" ÒÅÖÉÍ ÏÂÒÏÂËÉ ÐÏÄצÊÎÉÈ ÌÁÐÏË ÷éíëîåîï!"
+
+#: LYMessages.c:331
+msgid "Now using TagSoup parsing of HTML."
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ¤ÍÏ TagSoup-ÏÂÒÏÂËÕ HTML."
+
+#: LYMessages.c:332
+msgid "Now using SortaSGML parsing of HTML!"
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ¤ÍÏ SortaSGML-ÏÂÒÏÂËÕ HTML!"
+
+#: LYMessages.c:333
+msgid "You are already at the end of this document."
+msgstr "÷É ×ÖÅ × Ë¦Îæ ÃØÏÇÏ ÄÏËÕÍÅÎÔÁ."
+
+#: LYMessages.c:334
+msgid "You are already at the beginning of this document."
+msgstr "÷É ×ÖÅ ÎÁ ÐÏÞÁÔËÕ ÃØÏÇÏ ÄÏËÕÍÅÎÔÁ."
+
+#: LYMessages.c:335
+#, c-format
+msgid "You are already at page %d of this document."
+msgstr "÷É ×ÖÅ ÎÁ ÓÔÏÒ¦Îæ %d ÃØÏÇÏ ÄÏËÕÍÅÎÔÁ."
+
+#: LYMessages.c:336
+#, c-format
+msgid "Link number %d already is current."
+msgstr "ðÏÓÉÌÁÎÎÑ Ú ÎÏÍÅÒÏÍ %d ÑËÒÁÚ ¤ ÐÏÔÏÞÎÉÍ."
+
+#  ÍÅΦ ÎÅ ÐÏÄÏÂÁ¤ÔØÓÑ "ÎÁ ÄÏËÕÍÅÎÔ¦"
+#  ÍÅΦ ÎÅ ÐÏÄÏÂÁ¤ÔØÓÑ "ÎÁ ÄÏËÕÍÅÎÔ¦"
+#: LYMessages.c:337
+msgid "You are already at the first document"
+msgstr "÷É ×ÖÅ ÂÁÞÉÔÅ ÐÅÒÛÉÊ ÄÏËÕÍÅÎÔ"
+
+#: LYMessages.c:338
+msgid "There are no links above this line of the document."
+msgstr "îÁÄ ÃÉÍ ÒÑÄËÏÍ ÄÏËÕÍÅÎÔÁ ÐÏÓÉÌÁÎØ ÎÅÍÁ¤."
+
+#: LYMessages.c:339
+msgid "There are no links below this line of the document."
+msgstr "ð¦Ä ÃÉÍ ÒÑÄËÏÍ ÄÏËÕÍÅÎÔÁ ÐÏÓÉÌÁÎØ ÎÅÍÁ¤."
+
+#. #define MAXLEN_REACHED_DEL_OR_MOV
+#: LYMessages.c:341
+msgid "Maximum length reached!  Delete text or move off field."
+msgstr "äÏÓÑÇÎÕÔÏ ÍÁËÓÉÍÁÌØÎϧ ÄÏ×ÖÉÎÉ! ú¦ÔÒ¦ÔØ ÔÅËÓÔ ÞÉ ÚÁÌÉÛÔÅ ÐÏÌÅ."
+
+#. #define NOT_ON_SUBMIT_OR_LINK
+#: LYMessages.c:343
+msgid "You are not on a form submission button or normal link."
+msgstr "÷É ÎÅ ÎÁ ËÎÏÐæ ÚÁÔ×ÅÒÄÖÅÎÎÑ ÆÏÒÍÉ ÞÉ Ú×ÉÞÁÊÎÏÍÕ ÐÏÓÉÌÁÎΦ."
+
+#. #define NEED_CHECKED_RADIO_BUTTON
+#: LYMessages.c:345
+msgid "One radio button must be checked at all times!"
+msgstr "ïÄÎÁ ÒÁĦÏËÎÏÐËÁ ÚÁ×ÖÄÉ ÍÕÓÉÔØ ÂÕÔÉ ÁËÔÉ×Ï×ÁÎÁ!"
+
+#: LYMessages.c:346
+msgid "No submit button for this form, submit single text field?"
+msgstr "îÅÍÁ ËÎÏÐËÉ ×¦ÄÓÉÌÁÎÎÑ Ã¦¤§ ÆÏÒÍÉ, צĦÓÌÁÔÉ ÌÉÛÅ ÔÅËÓÔÏ×Å ÐÏÌÅ?"
+
+#: LYMessages.c:347
+msgid "Do you want to go back to the previous document?"
+msgstr "âÁÖÁ¤ÔÅ ÐÏ×ÅÒÎÕÔÉÓÑ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÄÏËÕÍÅÎÔÁ?"
+
+#: LYMessages.c:348
+msgid "Use arrows or tab to move off of field."
+msgstr "÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ ÓÔÒ¦ÌËÉ ÞÉ ÔÁÂÕÌÑæÀ ÝÏ ڦÊÔÉ Ú ÐÏÌÑ ÆÏÒÍÉ."
+
+#. #define ENTER_TEXT_ARROWS_OR_TAB
+#: LYMessages.c:350
+msgid "Enter text.  Use arrows or tab to move off of field."
+msgstr "÷×ÅĦÔØ ÔÅËÓÔ. ÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ ÓÔÒ¦ÌËÉ ÞÉ ÔÁÂÕÌÑæÀ, ÝÏ ڦÊÔÉ."
+
+#: LYMessages.c:351
+msgid "** Bad HTML!!  No form action defined. **"
+msgstr "** ðÏÇÁÎÉÊ HTML!!  îÅ ×ÉÚÎÁÞÅÎÏ ä¶à ÆÏÒÍÉ. **"
+
+#: LYMessages.c:352
+msgid "Bad HTML!!  Unable to create popup window!"
+msgstr "** äÕÒÎÉÊ HTML!! îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÓÐÌÉ×ÁÀÞŠצËÎÏ!"
+
+#: LYMessages.c:353
+msgid "Unable to create popup window!"
+msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÓÐÌÉ×ÁÀÞŠצËÎÏ!"
+
+#: LYMessages.c:354
+msgid "Goto a random URL is disallowed!"
+msgstr "ðÅÒÅÈÏÄÉ ÎÁ ×ÉÐÁÄËÏצ URL'¦ ÚÁÂÏÒÏÎÅΦ!"
+
+#: LYMessages.c:355
+msgid "Goto a non-http URL is disallowed!"
+msgstr "ðÅÒÅÈÏÄÉ ÎÁ ÎÅ-http URL'¦ ÚÁÂÏÒÏÎÅΦ!"
+
+#: LYMessages.c:356
+#, c-format
+msgid "You are not allowed to goto \"%s\" URLs"
+msgstr "÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ÐÅÒÅÈÏÄÉÔÉ ÄÏ \"%s:\" URL'¦×"
+
+#: LYMessages.c:357
+msgid "URL to open: "
+msgstr "÷×ÅĦÔØ ÁÄÒÅÓÕ: "
+
+#: LYMessages.c:358
+msgid "Edit the current Goto URL: "
+msgstr "úËÏÒÉÇÕÊÔÅ ÃÀ ÁÄÒÅÓÕ: "
+
+#: LYMessages.c:359
+msgid "Edit the previous Goto URL: "
+msgstr "úËÏÒÉÇÕÊÔÅ ÐÏÐÅÒÅÄÎÀ ÁÄÒÅÓÕ: "
+
+#: LYMessages.c:360
+msgid "Edit a previous Goto URL: "
+msgstr "úËÏÒÉÇÕÊÔÅ ÐÏÐÅÒÅÄÎÀ ÁÄÒÅÓÕ: "
+
+#: LYMessages.c:361
+msgid "Current document has POST data."
+msgstr "ãÅÊ ÄÏËÕÍÅÎÔ Í¦ÓÔÉÔØ ÄÁΦ ÄÌÑ POST"
+
+#: LYMessages.c:362
+msgid "Edit this document's URL: "
+msgstr "úËÏÒÉÇÕÊÔÅ ÁÄÒÅÓÕ ÃØÏÇÏ ÄÏËÕÍÅÎÔÁ: "
+
+#: LYMessages.c:363
+msgid "Edit the current link's URL: "
+msgstr "úËÏÒÉÇÕÊÔÅ ÁÄÒÅÓÕ ÃØÏÇÏ ÐÏÓÉÌÁÎÎÑ: "
+
+#: LYMessages.c:364
+msgid "You cannot edit File Management URLs"
+msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÒÅÄÁÇÕ×ÁÔÉ URL'¦ ËÅÒÕ×ÁÎÎÑ ÆÁÊÌÁÍÉ"
+
+#: LYMessages.c:365
+msgid "Enter a database query: "
+msgstr "÷×ÅĦÔØ ÚÁÐÉÔ ÄÏ ÂÁÚÉ ÄÁÎÉÈ: "
+
+#: LYMessages.c:366
+msgid "Enter a whereis query: "
+msgstr "÷×ÅĦÔØ ÚÁÐÉÔ whereis: "
+
+#: LYMessages.c:367
+msgid "Edit the current query: "
+msgstr "úËÏÒÉÇÕÊÔÅ ÃÅÊ ÚÁÐÉÔ: "
+
+#: LYMessages.c:368
+msgid "Edit the previous query: "
+msgstr "úËÏÒÉÇÕÊÔÅ ÐÏÐÅÒÅÄÎ¦Ê ÚÁÐÉÔ: "
+
+#: LYMessages.c:369
+msgid "Edit a previous query: "
+msgstr "úËÏÒÉÇÕÊÔÅ ÐÏÐÅÒÅÄÎ¦Ê ÚÁÐÉÔ: "
+
+#. #define USE_C_R_TO_RESUB_CUR_QUERY
+#: LYMessages.c:371
+msgid "Use Control-R to resubmit the current query."
+msgstr "îÁÔÉÓΦÔØ Control-R ÄÌÑ ÐÅÒÅÚÁÔ×ÅÒÄÖÅÎÎÑ ÃØÏÇÏ ÚÁÐÉÔÕ."
+
+#: LYMessages.c:372
+msgid "Edit the current shortcut: "
+msgstr "úËÏÒÉÇÕÊÔÅ ÃÀ ÚÁËÌÁÄÉÎËÕ: "
+
+#: LYMessages.c:373
+msgid "Edit the previous shortcut: "
+msgstr "úËÏÒÉÇÕÊÔÅ ÐÏÐÅÒÅÄÎÀ ÚÁËÌÁÄÉÎËÕ: "
+
+#: LYMessages.c:374
+msgid "Edit a previous shortcut: "
+msgstr "úËÏÒÉÇÕÊÔÅ ÐÏÐÅÒÅÄÎÀ ÚÁËÌÁÄÉÎËÕ: "
+
+#: LYMessages.c:375
+#, c-format
+msgid "Key '%c' is not mapped to a jump file!"
+msgstr ""
+
+#: LYMessages.c:376
+msgid "Cannot locate jump file!"
+msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ jump file!"
+
+#: LYMessages.c:377
+msgid "Cannot open jump file!"
+msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ jump file!"
+
+#: LYMessages.c:378
+msgid "Error reading jump file!"
+msgstr "ðÏÍÉÌËÁ ÞÉÔÁÎÎÑ jump file!"
+
+#: LYMessages.c:379
+msgid "Out of memory reading jump file!"
+msgstr "îÅ ×ÉÓÔÁÞÉÌÏ ÐÁÍ'ÑÔ¦ ÐÒÉ ÞÉÔÁÎΦ jump file!"
+
+#: LYMessages.c:380
+msgid "Out of memory reading jump table!"
+msgstr "îÅ ×ÉÓÔÁÞÉÌÏ ÐÁÍ'ÑÔ¦ ÐÒÉ ÞÉÔÁÎΦ jump table!"
+
+#: LYMessages.c:381
+msgid "No index is currently available."
+msgstr "öÏÄÅÎ ¦ÎÄÅËÓ ÎÁÒÁÚ¦ ÎÅÄÏÓÔÕÐÎÉÊ."
+
+# ÐÅÒÅÊÔÉ ÎÁ ÅËÒÁÎ - ÃÅ ÝÏÓØ Ë¦ÎÏÛÎÅ ;)
+# ÐÅÒÅÊÔÉ ÎÁ ÅËÒÁÎ - ÃÅ ÝÏÓØ Ë¦ÎÏÛÎÅ ;)
+#. #define CONFIRM_MAIN_SCREEN
+#: LYMessages.c:383
+msgid "Do you really want to go to the Main screen?"
+msgstr "÷É ÓÐÒÁ×Ħ ÈÏÞÅÔÅ ÐÅÒÅÊÔÉ ÄÏ ÇÏÌÏ×ÎÏÇÏ ÅËÒÁÎÕ?"
+
+# ÎÁ ÅËÒÁΦ - ÃÅ ÝÏÓØ Ë¦ÎÏÛÎÅ ;)
+# ÎÁ ÅËÒÁΦ - ÃÅ ÝÏÓØ Ë¦ÎÏÛÎÅ ;)
+#: LYMessages.c:384
+msgid "You are already at main screen!"
+msgstr "÷É ÑËÒÁÚ ÂÁÞÉÔÅ ÇÏÌÏ×ÎÉÊ ÅËÒÁÎ!"
+
+#. #define NOT_ISINDEX
+#: LYMessages.c:386
+msgid "Not a searchable indexed document -- press '/' to search for a text string"
+msgstr ""
+
+#. #define NO_OWNER
+#: LYMessages.c:388
+msgid "No owner is defined for this file so you cannot send a comment"
+msgstr "÷ÌÁÓÎÉËÁ ÃØÏÇÏ ÆÁÊÌÕ ÎÅ ×ÉÚÎÁÞÅÎÏ, ÏÔÖÅ ÎÅÍÏÖÌÉ×Ï ÎÁĦÓÌÁÔÉ ËÏÍÅÎÔÁÒ"
+
+#: LYMessages.c:389
+#, c-format
+msgid "No owner is defined. Use %s?"
+msgstr "÷ÌÁÓÎÉËÁ ÎÅ ×ÉÚÎÁÞÅÎÏ. ÷ÉËÏÒÉÓÔÁÔÉ %s?"
+
+#: LYMessages.c:390
+msgid "Do you wish to send a comment?"
+msgstr "÷É ÂÁÖÁ¤ÔŠצĦÓÌÁÔÉ ËÏÍÅÎÔÁÒ?"
+
+#: LYMessages.c:391
+msgid "Mail is disallowed so you cannot send a comment"
+msgstr "îÁÄÓÉÌÁÔÉ ÐÏÛÔÕ ÚÁÂÏÒÏÎÅÎÏ, ÔÏÖ ×É ÎÅ ÍÏÖÅÔŠצĦÓÌÁÔÉ ËÏÍÅÎÔÁÒ."
+
+#: LYMessages.c:392
+msgid "The 'e'dit command is currently disabled."
+msgstr "ëÏÍÁÎÄÕ Ò'Å'ÄÁÇÕ×ÁÔÉ ÎÁÒÁÚ¦ ÚÁÂÏÒÏÎÅÎÏ."
+
+#: LYMessages.c:393
+msgid "External editing is currently disabled."
+msgstr "úÏ×ΦÛΤ ÒÅÄÁÇÕ×ÁÎÎÑ ÎÁÒÁÚ¦ ÚÁÂÏÒÏÎÅÎÏ."
+
+#: LYMessages.c:394
+msgid "System error - failure to get status."
+msgstr "óÉÓÔÅÍÎÁ ÐÏÍÉÌËÁ - ÎÅ ×ÄÁÌÏÓÑ ÏÔÒÉÍÁÔÉ ÓÔÁÔÕÓ."
+
+#: LYMessages.c:395
+msgid "No editor is defined!"
+msgstr "îÅ ×ÉÚÎÁÞÅÎÏ ÐÒÏÇÒÁÍÕ ÄÌÑ ÒÅÄÁÇÕ×ÁÎÎÑ!"
+
+#: LYMessages.c:396
+msgid "The 'p'rint command is currently disabled."
+msgstr "ëÏÍÁÎÄÕ Ä'Ò'ÕËÕ×ÁÔÉ ÎÁÒÁÚ¦ ÚÁÂÏÒÏÎÅÎÏ."
+
+#: LYMessages.c:397
+msgid "Document has no Toolbar links or Banner."
+msgstr "äÏËÕÍÅÎÔ ÎŠͦÓÔÉÔØ ÐÏÓÉÌÁÎØ ÐÁÎÅ̦ ¦ÎÓÔÒÕÍÅÎÔ¦× ÞÉ ÂÁÎÅÒ¦×."
+
+#: LYMessages.c:398
+msgid "Unable to open traversal file."
+msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ traversal file."
+
+#: LYMessages.c:399
+msgid "Unable to open traversal found file."
+msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ traversal found file."
+
+#: LYMessages.c:400
+msgid "Unable to open reject file."
+msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ reject file."
+
+#: LYMessages.c:401
+msgid "Unable to open traversal errors output file"
+msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ traversal errors output file"
+
+#: LYMessages.c:402
+msgid "TRAVERSAL WAS INTERRUPTED"
+msgstr ""
+
+#: LYMessages.c:403
+msgid "Follow link (or goto link or page) number: "
+msgstr "êÔÉ ÚÁ ÐÏÓÉÌÁÎÎÑÍ (ÁÂÏ ÐÅÒÅÊÔÉ ÎÁ ÓÔÏÒ¦ÎËÕ) ¦Ú ÎÏÍÅÒÏÍ: "
+
+#: LYMessages.c:404
+msgid "Select option (or page) number: "
+msgstr "÷ËÁÖ¦ÔØ ÎÏÍÅÒ ×ÁÒ¦ÁÎÔÕ ÞÉ ÓÔÏÒ¦ÎËÉ: "
+
+#: LYMessages.c:405
+#, c-format
+msgid "Option number %d already is current."
+msgstr "÷ÁÒ¦ÁÎÔ ÎÏÍÅÒ %d ÑËÒÁÚ ¤ ÐÏÔÏÞÎÉÍ."
+
+#. #define ALREADY_AT_OPTION_END
+#: LYMessages.c:407
+msgid "You are already at the end of this option list."
+msgstr "÷É ×ÖÅ × Ë¦Îæ ÃØÏÇÏ ÓÐÉÓËÕ."
+
+#. #define ALREADY_AT_OPTION_BEGIN
+#: LYMessages.c:409
+msgid "You are already at the beginning of this option list."
+msgstr "÷É ×ÖÅ ÎÁ ÐÏÞÁÔËÕ ÃØÏÇÏ ÓÐÉÓËÕ."
+
+#. #define ALREADY_AT_OPTION_PAGE
+#: LYMessages.c:411
+#, c-format
+msgid "You are already at page %d of this option list."
+msgstr "÷É ×ÖÅ ÑËÒÁÚ ÓÔÏÒ¦Îæ %d ÃØÏÇÏ ÓÐÉÓËÕ."
+
+#: LYMessages.c:412
+msgid "You have entered an invalid option number."
+msgstr "÷É ××ÅÌÉ ÎÅצÒÎÉÊ ÎÏÍÅÒ ×ÁÒ¦ÁÎÔÕ."
+
+#: LYMessages.c:413
+msgid "** Bad HTML!!  Use -trace to diagnose. **"
+msgstr "** ðÏÇÁÎÉÊ HTML!! äÌÑ Ä¦ÁÇÎÏÓÔÉËÉ ×ÉËÏÒÉÓÔÁÊÔÅ ÐÁÒÁÍÅÔÒ -trace. **"
+
+#: LYMessages.c:414
+msgid "Give name of file to save in"
+msgstr "÷ËÁÖ¦ÔØ ¦Í'Ñ ÆÁÊÌÕ, Õ ÑËÏÍÕ ÚÂÅÒÅÇÔÉ"
+
+#: LYMessages.c:415
+msgid "Can't save data to file -- please run WWW locally"
+msgstr ""
+
+#: LYMessages.c:416
+msgid "Can't open temporary file!"
+msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ!"
+
+#: LYMessages.c:417
+msgid "Can't open output file!  Cancelling!"
+msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ×ÉȦÄÎÉÊ ÆÁÊÌ!  ÷¦ÄͦÎÅÎÏ!"
+
+#: LYMessages.c:418
+msgid "Execution is disabled."
+msgstr "úÁÐÕÓËÁÔÉ ËÏÍÁÎÄÉ ÚÁÂÏÒÏÎÅÎÏ."
+
+#. #define EXECUTION_DISABLED_FOR_FILE
+#: LYMessages.c:420
+#, c-format
+msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
+msgstr "÷ÉËÏÎÁÎÎÑ ÎÅ ÄÏÚ×ÏÌÅÎÅ ÄÌÑ ÃØÏÇÏ ÆÁÊÌÕ.  äÉ×ÉÓØ ÍÅÎÀ ÐÁÒÁÍÅÔÒ¦× (%s)."
+
+#. #define EXECUTION_NOT_COMPILED
+#: LYMessages.c:422
+msgid "Execution capabilities are not compiled into this version."
+msgstr "íÏÖÌÉצÓÔØ ÚÁÐÕÓËÁÎÎÑ ÐÒÏÇÒÁÍ ÎÅ ÓËÏÍЦÌØÏ×ÁÎÁ × Ã¦Ê ×ÅÒÓ¦§."
+
+#: LYMessages.c:423
+msgid "This file cannot be displayed on this terminal."
+msgstr "ãÅÊ ÆÁÊÌ ÎÅÍÏÖÌÉ×Ï ÐÏËÁÚÁÔÉ ÎÁ ÔÁËÏÍÕ ÔÅÒͦÎÁ̦."
+
+#. #define CANNOT_DISPLAY_FILE_D_OR_C
+#: LYMessages.c:425
+msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
+msgstr "ãÅÊ ÆÁÊÌ ÎÅÍÏÖÌÉ×Ï ÐÏËÁÚÁÔÉ ÎÁ ÔÅÒͦÎÁ̦: D) ÔÑÇÔÉ ÞÉ C)ËÁÓÕ×ÁÔÉ"
+
+# nothing to say
+# nothing to say
+#: LYMessages.c:426
+#, c-format
+msgid "%s  D)ownload, or C)ancel"
+msgstr "%s  D) ÔÑÇÔÉ ÞÉ C)ËÁÓÕ×ÁÔÉ"
+
+#: LYMessages.c:427
+msgid "Cancelling file."
+msgstr "æÁÊÌ ÓËÁÓÏ×ÁÎÏ."
+
+#: LYMessages.c:428
+msgid "Retrieving file.  - PLEASE WAIT -"
+msgstr "ôÑÇÎÅÍÏ ÆÁÊÌ.  - úáþåëáêôå -"
+
+#: LYMessages.c:429
+msgid "Enter a filename: "
+msgstr "÷×ÅĦÔØ ¦Í'Ñ ÆÁÊÌÕ: "
+
+#: LYMessages.c:430
+msgid "Edit the previous filename: "
+msgstr "÷×ÅĦÔØ ÐÏÐÅÒÅÄΤ ¦Í'Ñ ÆÁÊÌÕ: "
+
+#: LYMessages.c:431
+msgid "Edit a previous filename: "
+msgstr "úËÏÒÉÇÕÊÔÅ ÐÏÐÅÒÅÄΤ ¦Í'Ñ ÆÁÊÌÁ: "
+
+#: LYMessages.c:432
+msgid "Enter a new filename: "
+msgstr "÷×ÅĦÔØ ÎÏ×Å ¦Í'Ñ ÆÁÊÌÕ: "
+
+#: LYMessages.c:433
+msgid "File name may not begin with a dot."
+msgstr "îÅ ÍÏÖÎÁ ÐÏÞÉÎÁÔÉ ¦Í'Ñ ÆÁÊÌÕ Ú ËÒÁÐËÉ."
+
+#: LYMessages.c:435
+msgid "File exists.  Create higher version?"
+msgstr "æÁÊÌ ¦ÓÎÕ¤.  óÔ×ÏÒÉÔÉ ÎÏ×Õ ×ÅÒÓ¦À?"
+
+# ÎÅÐÒÉÎÃÉÐÏ×Ï - ÑË ÚÁÌÉÛÉÛ. Õ ÏÒÉǦÎÁ̦ Ä×Á ÐÒϦÌÉ ;)
+# ÎÅÐÒÉÎÃÉÐÏ×Ï - ÑË ÚÁÌÉÛÉÛ. Õ ÏÒÉǦÎÁ̦ Ä×Á ÐÒϦÌÉ ;)
+#: LYMessages.c:437
+msgid "File exists.  Overwrite?"
+msgstr "æÁÊÌ ¦ÓÎÕ¤.  ðÅÒÅÚÁÐÉÓÁÔÉ?"
+
+#: LYMessages.c:439
+msgid "Cannot write to file."
+msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ Õ ÆÁÊÌ."
+
+#: LYMessages.c:440
+msgid "ERROR! - download command is misconfigured."
+msgstr "ðïíéìëá! - ËÏÍÁÎÄÕ ÚÁÔÑÇÕ×ÁÎÎÑ ÎÅ ÓËÏÎƦÇÕÒÏ×ÁÎÏ."
+
+#: LYMessages.c:441
+msgid "Unable to download file."
+msgstr "îÅÍÏÖÌÉ×Ï ÚÁÔÑÇÔÉ ÆÁÊÌ."
+
+# ôåòí¶îïìïç¶ñ (Á ÝÏ ËÁÖÅ ÐÒÏÅËÔ ÓÌÏ×ÎÉËÁ?)
+# ôåòí¶îïìïç¶ñ (Á ÝÏ ËÁÖÅ ÐÒÏÅËÔ ÓÌÏ×ÎÉËÁ?)
+#: LYMessages.c:442
+msgid "Reading directory..."
+msgstr "þÉÔÁ¤ÍÏ ËÁÔÁÌÏÇ..."
+
+#: LYMessages.c:443
+msgid "Building directory listing..."
+msgstr "âÕÄÕÀ ÓÐÉÓÏË ÆÁÊÌ¦× Õ ËÁÔÁÌÏÚ¦..."
+
+# úÂÅÒÅÖÅÎÎÑ - ÐÒÏÃÅÓ, ÚÁÐÉÓ - ÏÂ'¤ËÔ (Õ ÂÌÏËÎÏÔ¦, ÎÁÐÒÉËÌÁÄ)
+# úÂÅÒÅÖÅÎÎÑ - ÐÒÏÃÅÓ, ÚÁÐÉÓ - ÏÂ'¤ËÔ (Õ ÂÌÏËÎÏÔ¦, ÎÁÐÒÉËÌÁÄ)
+#: LYMessages.c:444
+msgid "Saving..."
+msgstr "úÂÅÒÅÖÅÎÎÑ..."
+
+#: LYMessages.c:445
+#, c-format
+msgid "Could not edit file '%s'."
+msgstr "îÅ ÍÏÖÕ ÒÅÄÁÇÕ×ÁÔÉ ÆÁÊÌ '%s'."
+
+#: LYMessages.c:446
+msgid "Unable to access document!"
+msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ ÄÏ ÄÏËÕÍÅÎÔÁ!"
+
+#: LYMessages.c:447
+msgid "Could not access file."
+msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ ÄÏ ÆÁÊÌÕ."
+
+#: LYMessages.c:448
+msgid "Could not access directory."
+msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ ÄÏ ËÁÔÁÌÏÇÕ."
+
+#: LYMessages.c:449
+msgid "Could not load data."
+msgstr "îÅ ÍÏÖÕ ÚÁ×ÁÎÔÁÖÉÔÉ ÄÁΦ."
+
+#. #define CANNOT_EDIT_REMOTE_FILES
+#: LYMessages.c:451
+msgid "Lynx cannot currently (e)dit remote WWW files."
+msgstr "Lynx ÝÅ ÎÅ ÚÄÁÔÎÉÊ Ò(e)ÄÁÇÕ×ÁÔÉ ×¦ÄÄÁÌÅΦ WWW ÆÁÊÌÉ."
+
+#. #define CANNOT_EDIT_FIELD
+#: LYMessages.c:453
+msgid "This field cannot be (e)dited with an external editor."
+msgstr "ãÅ ÐÏÌÅ ÎÅÍÏÖÌÉ×Ï ×¦ÄÒ(e)ÄÁÇÕ×ÁÔÉ ÚÏ×ΦÛÎ¦Í ÒÅÄÁËÔÏÒÏÍ."
+
+#: LYMessages.c:454
+msgid "Bad rule"
+msgstr "ðÏÇÁÎÅ ÐÒÁ×ÉÌÏ"
+
+#: LYMessages.c:455
+msgid "Insufficient operands:"
+msgstr "îÅÄÏÓÔÁÔÎØÏ ÏÐÅÒÁÎĦ×:"
+
+#: LYMessages.c:456
+msgid "You are not authorized to edit this file."
+msgstr "÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ÒÅÄÁÇÕ×ÁÔÉ ÃÅÊ ÆÁÊÌ."
+
+#: LYMessages.c:457
+msgid "Title: "
+msgstr "úÁÇÏÌÏ×ÏË: "
+
+#: LYMessages.c:458
+msgid "Subject: "
+msgstr "ôÅÍÁ: "
+
+#: LYMessages.c:459
+msgid "Username: "
+msgstr "¶Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ: "
+
+#: LYMessages.c:460
+msgid "Password: "
+msgstr "ðÁÒÏÌØ: "
+
+#: LYMessages.c:461
+msgid "lynx: Username and Password required!!!"
+msgstr "lynx: îÅÏÂȦÄΦ ¦Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ ÔÁ ÐÁÒÏÌØ!!!"
+
+#: LYMessages.c:462
+msgid "lynx: Password required!!!"
+msgstr "lynx: ôÒÅÂÁ ÐÁÒÏÌØ!!!"
+
+#: LYMessages.c:463
+msgid "Clear all authorization info for this session?"
+msgstr "úÁÂÕÔÉ ÄÁΦ Á×ÔÏÒÉÚÁæ§ ÄÌÑ Ã¦¤§ ÓÅÓ¦§?"
+
+#: LYMessages.c:464
+msgid "Authorization info cleared."
+msgstr "äÁΦ Á×ÔÏÒÉÚÁæ§ ÚÁÂÕÔÏ."
+
+#: LYMessages.c:465
+msgid "Authorization failed.  Retry?"
+msgstr "îÅ ×ÄÁÌÏÓÑ Á×ÔÏÒÉÚÕ×ÁÔÉÓÑ. ðÒÏÂÕ¤ÍÏ ÝÅ?"
+
+#: LYMessages.c:466
+msgid "cgi support has been disabled."
+msgstr "ð¦ÄÔÒÉÍËÕ cgi ÂÕÌÏ ÚÁÂÏÒÏÎÅÎÏ."
+
+#. #define CGI_NOT_COMPILED
+#: LYMessages.c:468
+msgid "Lynxcgi capabilities are not compiled into this version."
+msgstr "íÏÖÌÉ×ÏÓÔ¦ Lynxcgi ÎÅ ÓËÏÍЦÌØÏ×ÁΦ Õ Ã¦Ê ×ÅÒÓ¦§."
+
+#: LYMessages.c:469
+#, c-format
+msgid "Sorry, no known way of converting %s to %s."
+msgstr "÷ÉÂÁÞÔÅ, ÎÅ ÚÎÁÀ, ÑË ÓËÏÎ×ÅÒÔÕ×ÁÔÉ %s Õ %s."
+
+#: LYMessages.c:470
+msgid "Unable to set up connection."
+msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ Ú'¤ÄÎÁÎÎÑ."
+
+#: LYMessages.c:471
+msgid "Unable to make connection"
+msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ Ú'¤ÄÎÁÎÎÑ"
+
+#. #define MALFORMED_EXEC_REQUEST
+#: LYMessages.c:473
+msgid "Executable link rejected due to malformed request."
+msgstr "ðÏÓÉÌÁÎÎÑ ¦Ú ×ÉËÏÎÁÎÎÑÍ ×¦ÄËÉÎÕÔÏ ÞÅÒÅÚ ÐÏÇÁÎÏ ÓÆÏÒÍÏ×ÁÎÉÊ ÚÁÐÉÔ."
+
+#. #define BADCHAR_IN_EXEC_LINK
+#: LYMessages.c:475
+#, c-format
+msgid "Executable link rejected due to `%c' character."
+msgstr "ðÏÓÉÌÁÎÎÑ ¦Ú ×ÉËÏÎÁÎÎÑÍ ×¦ÄËÉÎÕÔÏ ÞÅÒÅÚ ÓÉÍ×ÏÌ \"%c\"."
+
+#. #define RELPATH_IN_EXEC_LINK
+#: LYMessages.c:477
+msgid "Executable link rejected due to relative path string ('../')."
+msgstr "ðÏÓÉÌÁÎÎÑ ¦Ú ×ÉËÏÎÁÎÎÑÍ ×¦ÄËÉÎÕÔÏ ÞÅÒÅÚ ÒÑÄÏË ×¦ÄÎÏÓÎÏÇÏ ÛÌÑÈÕ ('../')."
+
+#. #define BADLOCPATH_IN_EXEC_LINK
+#: LYMessages.c:479
+msgid "Executable link rejected due to location or path."
+msgstr "ðÏÓÉÌÁÎÎÑ ¦Ú ×ÉËÏÎÁÎÎÑÍ ×¦ÄËÉÎÕÔÏ Ú ÐÒÉÞÉÎ, ÝÏ ÓÔÏÓÕÀÔØÓÑ Í¦ÓÃÑ ÞÉ ÛÌÑÈÕ."
+
+#: LYMessages.c:480
+msgid "Mail access is disabled!"
+msgstr "ìÉÓÔÕ×ÁÎÎÑ ÚÁÂÏÒÏÎÅÎÅ!"
+
+#. #define ACCESS_ONLY_LOCALHOST
+#: LYMessages.c:482
+msgid "Only files and servers on the local host can be accessed."
+msgstr "ìÉÛÅ ÆÁÊÌÉ ÔÁ ÓÅÒ×ÅÒÉ ÎÁ ÌÏËÁÌØÎ¦Ê ÍÁÛÉΦ ÍÏÖÕÔØ ÂÕÔÉ ÄÏÓÔÕÐÎÉÍÉ."
+
+#: LYMessages.c:483
+msgid "Telnet access is disabled!"
+msgstr "ôÅÌÎÅÔÁ ÚÁÂÏÒÏÎÅÎÏ!"
+
+#. #define TELNET_PORT_SPECS_DISABLED
+#: LYMessages.c:485
+msgid "Telnet port specifications are disabled."
+msgstr "÷ËÁÚÕ×ÁÔÉ ÐÏÒÔ ÔÅÌÎÅÔÁ ÚÁÂÏÒÏÎÅÎÏ."
+
+#: LYMessages.c:486
+msgid "USENET news access is disabled!"
+msgstr "äÏÓÔÕÐ ÄÏ ÎÏ×ÉÎ USENET ÚÁÂÏÒÏÎÅÎÉÊ!"
+
+#: LYMessages.c:487
+msgid "Rlogin access is disabled!"
+msgstr "äÏÓÔÕÐ rlogin ÚÁÂÏÒÏÎÅÎÉÊ!"
+
+#: LYMessages.c:488
+msgid "Ftp access is disabled!"
+msgstr "äÏÓÔÕÐ FTP ÚÁÂÏÒÏÎÅÎÉÊ!"
+
+#: LYMessages.c:489
+msgid "There are no references from this document."
+msgstr "îÅÍÁ¤ ÐÏÓÉÌÁÎØ Ú ÃØÏÇÏ ÄÏËÕÍÅÎÔÁ."
+
+#: LYMessages.c:490
+msgid "There are only hidden links from this document."
+msgstr "ìÉÛÅ ÓÈÏ×ÁΦ ÐÏÓÉÌÁÎÎÑ Ú ÃØÏÇÏ ÄÏËÕÍÅÎÔÁ."
+
+#: LYMessages.c:492
+msgid "Unable to open command file."
+msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ËÏÍÁÎÄÎÏÇÏ ÆÁÊÌÕ."
+
+#: LYMessages.c:494
+msgid "News Post Cancelled!!!"
+msgstr "îÁÄÓÉÌÁÎÎÑ ÌÉÓÔÁ îÏ×ÉÎ óËÁÓÏ×ÁÎÏ!!!"
+
+#. #define SPAWNING_EDITOR_FOR_NEWS
+#: LYMessages.c:496
+msgid "Spawning your selected editor to edit news message"
+msgstr "úÁÐÕÓËÁ¤ÍÏ ÏÂÒÁÎÏÇÏ ×ÁÍÉ ÒÅÄÁËÔÏÒÁ ÄÌÑ ÒÅÄÁÇÕ×ÁÎÎÑ ÌÉÓÔÁ"
+
+#: LYMessages.c:497
+msgid "Post this message?"
+msgstr "÷¦Ä¦ÓÌÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ?"
+
+#: LYMessages.c:498
+#, c-format
+msgid "Append '%s'?"
+msgstr "äÏÄÁÔÉ '%s'?"
+
+#: LYMessages.c:499
+msgid "Posting to newsgroup(s)..."
+msgstr "îÁÄÓÉÌÁ¤ÍÏ ÄÏ ÇÒÕÐ(É) ÎÏ×ÉÎ..."
+
+#: LYMessages.c:501
+msgid "*** You have unread mail. ***"
+msgstr "*** õ ×ÁÓ ¤ ÎÅÐÒÏÞÉÔÁÎÁ ÐÏÛÔÁ. ***"
+
+#: LYMessages.c:503
+msgid "*** You have mail. ***"
+msgstr "*** õ ×ÁÓ ¤ ÐÏÛÔÁ. ***"
+
+#: LYMessages.c:505
+msgid "*** You have new mail. ***"
+msgstr "*** õ ×ÁÓ ¤ ÎÏ×Á ÐÏÛÔÁ. ***"
+
+#: LYMessages.c:506
+msgid "File insert cancelled!!!"
+msgstr "÷ÓÔÁ×ÌÑÎÎÑ ÆÁÊÌÕ ×¦ÄͦÎÅÎÅ!!!"
+
+#: LYMessages.c:507
+msgid "Not enough memory for file!"
+msgstr "îÅÄÏÓÔÁÔÎØÏ ÐÁÍ'ÑÔ¦ ÄÌÑ ÆÁÊÌÕ!"
+
+#: LYMessages.c:508
+msgid "Can't open file for reading."
+msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÞÉÔÁÎÎÑ."
+
+# "æÁÊÌ" - ÚÎÁÞÉÔØ, *ÆÁÊÌ*, ÑË ¦Ú the Õ ÁÎÇÌ. ÍÏצ. áÌÅ ÊÏÇÏ Ö ÎÅÍÁ!
+# äÕÍÁÀ, ËÒÁÝÅ "ôÁËÏÇÏ ÆÁÊÌÕ ÎÅ ¦ÓÎÕ¤."
+#: LYMessages.c:509
+msgid "File does not exist."
+msgstr "ôÁËÏÇÏ ÆÁÊÌÕ ÎÅ ¦ÓÎÕ¤."
+
+#: LYMessages.c:510
+msgid "File does not exist - reenter or cancel:"
+msgstr "ôÁËÏÇÏ ÆÁÊÌÕ ÎÅ ¦ÓÎÕ¤ - ××ÅÄÕÔØ ÚÎÏ×Õ ÞÉ ÓËÁÓÕÊÔÅ:"
+
+#: LYMessages.c:511
+msgid "File is not readable."
+msgstr "æÁÊÌ ÎÅÍÏÖÌÉ×Ï ÐÒÏÞÉÔÁÔÉ."
+
+#: LYMessages.c:512
+msgid "File is not readable - reenter or cancel:"
+msgstr "æÁÊÌ ÎÅÍÏÖÌÉ×Ï ÐÒÏÞÉÔÁÔÉ - ××ÅĦÔØ ÝÅ ÒÁÚ ÞÉ ÓËÁÓÕÊÔÅ:"
+
+#: LYMessages.c:513
+msgid "Nothing to insert - file is 0-length."
+msgstr "îÅÍÁ ÞÏÇÏ ×ÓÔÁ×ÌÑÔÉ - ÆÁÊÌ ÚÁ×ÄÏ×ÖËÉ 0 ÂÁÊÔ."
+
+#: LYMessages.c:514
+msgid "Save request cancelled!!!"
+msgstr "úÁÐÉÔ ÎÁ ÚÂÅÒÅÖÅÎÎÑ ÓËÁÓÏ×ÁÎÏ!!!"
+
+#: LYMessages.c:515
+msgid "Mail request cancelled!!!"
+msgstr "úÁÐÉÔ ÎÁ צÄÐÒÁ×ËÕ ÌÉÓÔÁ ÓËÁÓÏ×ÁÎÏ!!!"
+
+#. #define CONFIRM_MAIL_SOURCE_PREPARSED
+#: LYMessages.c:517
+msgid "Viewing preparsed source.  Are you sure you want to mail it?"
+msgstr "ðÏËÁÚÕÀ ÎÅÏÐÒÁÃØÏ×ÁΦ ÓÉÒæ.  ÷É Ä¦ÊÓÎÏ ÈÏÞÅÔÅ ÎÁĦÓÌÁÔÉ ÓÁÍÅ §È?"
+
+# @ ark drakconf evolution gimp lynx
+# * Yuri Syrota <rasta@renome.rovno.ua>
+#: LYMessages.c:518
+msgid "Please wait..."
+msgstr "âÕÄØ ÌÁÓËÁ, ÚÁÞÅËÁÊÔÅ..."
+
+#: LYMessages.c:519
+msgid "Mailing file.  Please wait..."
+msgstr "îÁÄÓÉÌÁ¤ÍÏ ÆÁÊÌ. âÕÄØÔÅ ÌÁÓËÁצ, ÚÁÞÅËÁÊÔÅ..."
+
+#: LYMessages.c:520
+msgid "ERROR - Unable to mail file"
+msgstr "ðïíéìëá - ÎÅ ×ÄÁÌÏÓÑ ÎÁĦÓÌÁÔÉ ÆÁÊÌ"
+
+#. #define CONFIRM_LONG_SCREEN_PRINT
+#: LYMessages.c:522
+#, c-format
+msgid "File is %d screens long.  Are you sure you want to print?"
+msgstr "ãÅÊ ÆÁÊÌ ÚÁ×ÄÏ×ÖËÉ %d ÅËÒÁΦ×. ÷É ×ÐÅ×ÎÅΦ, ÝÏ ÂÁÖÁ¤ÔÅ ÊÏÇÏ ÄÒÕËÕ×ÁÔÉ?"
+
+#: LYMessages.c:523
+msgid "Print request cancelled!!!"
+msgstr "äÒÕËÕ×ÁÎÎÑ ÓËÁÓÏ×ÁÎÏ!!!"
+
+#: LYMessages.c:524
+msgid "Press <return> to begin: "
+msgstr "îÁÔÉÓΦÔØ <×צÄ> ÝÏ ÐÏÞÁÔÉ: "
+
+#: LYMessages.c:525
+msgid "Press <return> to finish: "
+msgstr "îÁÔÉÓΦÔØ <×צÄ> ÝÏ ÚÁ˦ÎÞÉÔÉ: "
+
+#. #define CONFIRM_LONG_PAGE_PRINT
+#: LYMessages.c:527
+#, c-format
+msgid "File is %d pages long.  Are you sure you want to print?"
+msgstr "ãÅÊ ÆÁÊÌ ÚÁ×ÄÏ×ÖËÉ %d ÓÔÏÒ¦ÎÏË. ÷É ×ÐÅ×ÎÅΦ, ÝÏ ÂÁÖÁ¤ÔÅ ÊÏÇÏ ÄÒÕËÕ×ÁÔÉ?"
+
+#. #define CHECK_PRINTER
+#: LYMessages.c:529
+msgid "Be sure your printer is on-line.  Press <return> to start printing:"
+msgstr "÷ÐÅ×ΦÔØÓÑ, ÝÏ ÄÒÕËÁÒËÁ ÇÏÔÏ×Á.  îÁÔÉÓΦÔØ <×צÄ> ÝÏ ÐÏÞÁÔÉ ÄÒÕË:"
+
+#: LYMessages.c:530
+msgid "ERROR - Unable to allocate file space!!!"
+msgstr "ðïíéìëá - îÅÍÏÖÌÉ×Ï ×ÉĦÌÉÔÉ Í¦ÓÃÅ ÄÌÑ ÆÁÊÌÁ!!!"
+
+#: LYMessages.c:531
+msgid "Unable to open tempfile"
+msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ"
+
+#: LYMessages.c:532
+msgid "Unable to open print options file"
+msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÎÁÌÁÛÔÕ×ÁÎØ ÄÒÕËÁÒËÉ"
+
+#: LYMessages.c:533
+msgid "Printing file.  Please wait..."
+msgstr "äÒÕËÕ¤ÍÏ ÆÁÊÌ. âÕÄØÔÅ ÌÁÓËÁצ, ÚÁÞÅËÁÊÔÅ..."
+
+#: LYMessages.c:534
+msgid "Please enter a valid internet mail address: "
+msgstr "âÕÄØ ÌÁÓËÁ, ××ÅĦÔØ ×¦ÒÎÕ ÐÏÛÔÏ×Õ ÁÄÒÅÓÕ: "
+
+#: LYMessages.c:535
+msgid "ERROR! - printer is misconfigured!"
+msgstr "ðïíéìëá - ÄÒÕËÁÒËÕ ÎÅ ÓËÏÎƦÇÕÒÏ×ÁÎÏ!"
+
+#: LYMessages.c:536
+msgid "Image map from POST response not available!"
+msgstr ""
+
+#: LYMessages.c:537
+msgid "Misdirected client-side image MAP request!"
+msgstr ""
+
+#: LYMessages.c:538
+msgid "Client-side image MAP is not accessible!"
+msgstr ""
+
+#: LYMessages.c:539
+msgid "No client-side image MAPs are available!"
+msgstr ""
+
+#: LYMessages.c:540
+msgid "Client-side image MAP is not available!"
+msgstr ""
+
+#. #define OPTION_SCREEN_NEEDS_24
+#: LYMessages.c:543
+msgid "Screen height must be at least 24 lines for the Options menu!"
+msgstr "äÌÑ ÍÅÎÀ îÁÌÁÛÔÕ×ÁÎØ ÅËÒÁÎ ÍÕÓÉÔØ ÂÕÔÉ ÎÅ ÍÅÎÛ, Î¦Ö 24 ÒÑÄËÉ!"
+
+#. #define OPTION_SCREEN_NEEDS_23
+#: LYMessages.c:545
+msgid "Screen height must be at least 23 lines for the Options menu!"
+msgstr "äÌÑ ÍÅÎÀ îÁÌÁÛÔÕ×ÁÎØ ÅËÒÁÎ ÍÕÓÉÔØ ÂÕÔÉ ÎÅ ÍÅÎÛ, Î¦Ö 23-É ÒÑÄËÉ!"
+
+#. #define OPTION_SCREEN_NEEDS_22
+#: LYMessages.c:547
+msgid "Screen height must be at least 22 lines for the Options menu!"
+msgstr "äÌÑ ÍÅÎÀ îÁÌÁÛÔÕ×ÁÎØ ÅËÒÁÎ ÍÕÓÉÔØ ÂÕÔÉ ÎÅ ÍÅÎÛ, Î¦Ö 22-Á ÒÑÄËÁ!"
+
+#: LYMessages.c:549
+msgid "That key requires Advanced User mode."
+msgstr "ãÑ ËÏÍÁÎÄÁ ÐÒÁÃÀ¤ ÌÉÛÅ Õ ÒÅÖÉͦ ËÏÒÉÓÔÕ×ÁÎÎÑ Advanced."
+
+#: LYMessages.c:550
+#, c-format
+msgid "Content-type: %s"
+msgstr "ôÉÐ ×ͦÓÔÕ: %s"
+
+#: LYMessages.c:551
+msgid "Command: "
+msgstr "ëÏÍÁÎÄÁ: "
+
+#: LYMessages.c:552
+msgid "Unknown or ambiguous command"
+msgstr "îÅצÄÏÍÁ ÞÉ ÎÅÏÄÎÏÚÎÁÞÎÁ ËÏÍÁÎÄÁ"
+
+#: LYMessages.c:553
+msgid " Version "
+msgstr " ÷ÅÒÓ¦Ñ "
+
+# ôÑÇÎÅÍÏ http://enigma.x-telecom.net/ ×ÐÅÒÛÅ (ÍÉ ÔÁÍ ÝÅ ÎÅ ÂÕÌÉ)
+# ôÑÇÎÅÍÏ http://enigma.x-telecom.net/ ×ÐÅÒÛÅ (ÍÉ ÔÁÍ ÝÅ ÎÅ ÂÕÌÉ)
+#: LYMessages.c:554
+msgid " first"
+msgstr " ×ÐÅÒÛÅ"
+
+# # FIXME: of course, I'm not sure:
+# of course, I'm not sure:
+# msgstr ", ЦÄÓÔÁÎÏ×ËÁ..."
+#: LYMessages.c:555
+msgid ", guessing..."
+msgstr ", ÚÄÏÇÁÄÕ¤ÍÏÓÑ..."
+
+#: LYMessages.c:556
+msgid "Permissions for "
+msgstr "ðÒÁ×Á ÄÏÓÔÕÐÕ ÄÏ "
+
+#: LYMessages.c:557
+msgid "Select "
+msgstr "÷ÉÂÒÁÔÉ "
+
+#: LYMessages.c:558
+msgid "capital letter"
+msgstr "×ÅÌÉËÁ ̦ÔÅÒÁ"
+
+#: LYMessages.c:559
+msgid " of option line,"
+msgstr ""
+
+#: LYMessages.c:560
+msgid " to save,"
+msgstr " ÝÏÂ ÚÂÅÒÅÇÔÉ,"
+
+#: LYMessages.c:561
+msgid " to "
+msgstr " ÄÏ "
+
+#: LYMessages.c:562
+msgid " or "
+msgstr " ÞÉ "
+
+#: LYMessages.c:563
+msgid " index"
+msgstr " ¦ÎÄÅËÓ"
+
+# # FIXME: of course, I'm not sure:
+#: LYMessages.c:564
+msgid " to return to Lynx."
+msgstr " ÝÏ ÐÏ×ÅÒÎÕÔÉÓÑ ÄÏ Lynx."
+
+# msgstr "ðÒÉÊÎÑÔÉ"
+# ÍÍÍÍ... ÎÅ ÚÎÁÀ. (ËÏÎÔÒ)ÁÒÇÕÍÅÎÔÉ?
+#: LYMessages.c:565
+msgid "Accept Changes"
+msgstr "úÁÐÒÏ×ÁÄÉÔÉ ÚͦÎÉ"
+
+# msgstr "ðÒÉÊÎÑÔÉ úͦÎÉ"
+#: LYMessages.c:566
+msgid "Reset Changes"
+msgstr "óËÁÓÕ×ÁÔÉ"
+
+# msgstr "÷¦ÄͦÎÉÔÉ úͦÎÉ"
+#: LYMessages.c:567
+msgid "Left Arrow cancels changes"
+msgstr "ÓÔÒ¦ÌËÁ ×̦×Ï ÓËÁÓÏ×Õ¤ ÚͦÎÉ"
+
+#: LYMessages.c:568
+msgid "Save options to disk"
+msgstr "úÂÅÒÅÇÔÉ ÐÁÒÁÍÅÔÒÉ ÎÁ ÄÉÓËÕ"
+
+#: LYMessages.c:569
+msgid "Hit RETURN to accept entered data."
+msgstr "îÁÔÉÓΦÔØ RETURN ÝÏ ЦÄÔ×ÅÒÄÉÔÉ ××ÅÄÅΦ ÄÁΦ."
+
+#. #define ACCEPT_DATA_OR_DEFAULT
+#: LYMessages.c:571
+msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
+msgstr "<÷צÄ> ЦÄÔ×ÅÒÄÉÔØ ××ÅÄÅΦ ÄÁΦ. ÷ÉÄÁ̦ÔØ ÕÓÅ ÄÌÑ ÐÏ×ÅÒÎÅÎÎÑ ÄÏ ÐÏÞÁÔËÕ."
+
+#: LYMessages.c:572
+msgid "Value accepted!"
+msgstr "úÎÁÞÅÎÎÑ ÓÐÒÉÊÎÑÔÏ!"
+
+#. #define VALUE_ACCEPTED_WARNING_X
+#: LYMessages.c:574
+msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
+msgstr "úÎÁÞÅÎÎÑ ÓÐÒÉÊÎÑÔÏ! -- õ÷áçá: Lynx ÓËÏÎƦÇÕÒÏ×ÁÎÏ ÄÌÑ XWINDOWS!"
+
+#. #define VALUE_ACCEPTED_WARNING_NONX
+#: LYMessages.c:576
+msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
+msgstr "úÎÁÞÅÎÎÑ ÓÐÒÉÊÎÑÔÏ! -- õ÷áçá: Lynx îå ÓËÏÎƦÇÕÒÏ×ÁÎÏ ÄÌÑ XWINDOWS!"
+
+#: LYMessages.c:577
+msgid "You are not allowed to change which editor to use!"
+msgstr "÷ÁÍ ÎÅ ÍÏÖÎÁ ×ÉÂÉÒÁÔÉ ÒÅÄÁËÔÏÒÁ!"
+
+#: LYMessages.c:578
+msgid "Failed to set DISPLAY variable!"
+msgstr "îÅ ×ÄÁÌÏÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÚͦÎÎÕ DISPLAY!"
+
+#: LYMessages.c:579
+msgid "Failed to clear DISPLAY variable!"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÏÞÉÓÔÉÔÉ ÚͦÎÎÕ DISPLAY!"
+
+#. #define BOOKMARK_CHANGE_DISALLOWED
+#: LYMessages.c:581
+msgid "You are not allowed to change the bookmark file!"
+msgstr "÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ÚͦÎÀ×ÁÔÉ ÆÁÊÌ ÚÁËÌÁÄÉÎÏË!"
+
+#: LYMessages.c:582
+msgid "Terminal does not support color"
+msgstr "ôÅÒͦÎÁÌ ÎŠЦÄÔÒÉÍÕ¤ ËÏÌØÏÒÉ"
+
+#: LYMessages.c:583
+#, c-format
+msgid "Your '%s' terminal does not support color."
+msgstr "÷ÁÛ ÔÅÒͦÎÁÌ '%s' ΊЦÄÔÒÉÍÕ¤ ËÏÌØÏÒÉ."
+
+#: LYMessages.c:584
+msgid "Access to dot files is disabled!"
+msgstr "äÏÓÔÕÐ ÄÏ ÓÈÏ×ÁÎÉÈ ÆÁÊÌ¦× ÚÁÂÌÏËÏ×ÁÎÏ!"
+
+#. #define UA_NO_LYNX_WARNING
+#: LYMessages.c:586
+msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
+msgstr "óÔÒ¦ÞËÁ User-Agent ΊͦÓÔÉÔØ \"Lynx\" ÞÉ \"L_y_n_x\""
+
+#. #define UA_PLEASE_USE_LYNX
+#: LYMessages.c:588
+msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
+msgstr "÷ÐÉÛ¦ÔØ \"L_y_n_x\" ÞÉ \"Lynx\" ÄÏ ÒÑÄËÁ User-Agent, ¦ÎÁËÛÅ ×É ÍÁÔÉÍÅÔÅ ×ÉÇÌÑÄ ÐÒÏÊÄÉÓצÔÁ!"
+
+#. #define UA_CHANGE_DISABLED
+#: LYMessages.c:590
+msgid "Changing of the User-Agent string is disabled!"
+msgstr "í¦ÎÑÔÉ ÒÑÄÏË User-Agent ÚÁÂÏÒÏÎÅÎÏ!"
+
+#. #define CHANGE_OF_SETTING_DISALLOWED
+#: LYMessages.c:592
+msgid "You are not allowed to change this setting."
+msgstr "÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ Í¦ÎÑÔÉ Ã¦ ÕÓÔÁÎÏ×ËÉ."
+
+#: LYMessages.c:593
+msgid "Saving Options..."
+msgstr "úÂÅÒÅÖÅÎÎÑ ÐÁÒÁÍÅÔÒ¦×..."
+
+#: LYMessages.c:594
+msgid "Options saved!"
+msgstr "ðÁÒÁÍÅÔÒÉ ÚÂÅÒÅÖÅÎÏ!"
+
+#: LYMessages.c:595
+msgid "Unable to save Options!"
+msgstr "îÅ ÍÏÖÕ ÚÂÅÒÅÇÔÉ ðÁÒÁÍÅÔÒÉ!"
+
+#: LYMessages.c:596
+msgid " 'r' to return to Lynx "
+msgstr " 'r' ÐÏ×ÅÒÔÁ¤ ÄÏ Lynx "
+
+#: LYMessages.c:597
+msgid " '>' to save, or 'r' to return to Lynx "
+msgstr " '>' ÚÂÅÒ¦ÇÁ¤, 'r' ÐÏ×ÅÒÔÁ¤ ÄÏ Lynx "
+
+#. #define ANY_KEY_CHANGE_RET_ACCEPT
+#: LYMessages.c:599
+msgid "Hit any key to change value; RETURN to accept."
+msgstr "îÁÔÉÓΦÔØ ÂÕÄØ-ÝÏ, ÝÏ ÚͦÎÉÔÉ; RETURN, ÝÏ ÐÏÇÏÄÉÔÉÓÑ."
+
+#: LYMessages.c:600
+msgid "Error uncompressing temporary file!"
+msgstr "ðÏÍÉÌËÁ ÒÏÚÔÉÓËÁÎÎÑ ÔÉÍÞÁÓÏ×ÏÇÏ ÆÁÊÌÕ!"
+
+#: LYMessages.c:601
+msgid "Unsupported URL scheme!"
+msgstr "ôÁËÉÊ URL ΊЦÄÔÒÉÍÕ¤ÔØÓÑ!"
+
+#: LYMessages.c:602
+msgid "Unsupported data: URL!  Use SHOWINFO, for now."
+msgstr ""
+
+#: LYMessages.c:603
+msgid "Redirection limit of 10 URL's reached."
+msgstr ""
+
+#: LYMessages.c:604
+msgid "Illegal redirection URL received from server!"
+msgstr ""
+
+#. #define SERVER_ASKED_FOR_REDIRECTION
+#: LYMessages.c:606
+#, c-format
+msgid "Server asked for %d redirection of POST content to"
+msgstr ""
+
+#: LYMessages.c:609
+msgid "P)roceed, use G)ET or C)ancel "
+msgstr "ÐP)ÏÄÏ×ÖÉÔÉ, ÞÉ ×ÉÔÑG)ÔÉ ÞÉ C)ËÁÓÕ×ÁÔÉ "
+
+#: LYMessages.c:610
+msgid "P)roceed, or C)ancel "
+msgstr "ÐP)ÏÄÏ×ÖÉÔÉ ÞÉ C)ËÁÓÕ×ÁÔÉ "
+
+#. #define ADVANCED_POST_GET_REDIRECT
+#: LYMessages.c:612
+msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
+msgstr "ðÅÒÅÎÁÐÒÁ×ÌÅÎÎÑ POST.  ÐP)ÏÄÏ×ÖÉÔÉ, ÄÉ×. U)RL, ×ÉÔÑG)ÔÉ ÞÉ C)ËÁÓÕ×ÁÔÉ"
+
+#. #define ADVANCED_POST_REDIRECT
+#: LYMessages.c:614
+msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
+msgstr "ðÅÒÅÎÁÐÒÁ×ÌÅÎÎÑ ×ͦÓÔÕ POST. ÐP)ÏÄÏ×ÖÉÔÉ, ÄÉ×ÉÔÉÓÑ U)RL ÞÉ C)ËÁÓÕ×ÁÔÉ"
+
+#. #define CONFIRM_POST_RESUBMISSION
+#: LYMessages.c:616
+msgid "Document from Form with POST content.  Resubmit?"
+msgstr "äÏËÕÍÅÎÔ Ú æÏÒÍÉ ¦Ú ×ͦÓÔÏÍ POST. ÷¦Ä¦ÓÌÁÔÉ ÚÁÎÏ×Ï?"
+
+#. #define CONFIRM_POST_RESUBMISSION_TO
+#: LYMessages.c:618
+#, c-format
+msgid "Resubmit POST content to %s ?"
+msgstr "ðÅÒÅÚÁÔ×ÅÒÄÉÔÉ ×ͦÓÔ POST ÄÏ %s?"
+
+#. #define CONFIRM_POST_LIST_RELOAD
+#: LYMessages.c:620
+#, c-format
+msgid "List from document with POST data.  Reload %s ?"
+msgstr ""
+
+#. #define CONFIRM_POST_DOC_HEAD
+#: LYMessages.c:622
+msgid "Document from POST action, HEAD may not be understood.  Proceed?"
+msgstr ""
+
+#. #define CONFIRM_POST_LINK_HEAD
+#: LYMessages.c:624
+msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
+msgstr ""
+
+#: LYMessages.c:625
+msgid "Proceed without a username and password?"
+msgstr "ðÒÏÄÏ×ÖÉÔÉ ÂÅÚ ¦ÍÅΦ ËÏÒÉÓÔÕ×ÁÞÁ ÔÁ ÐÁÒÏÌÑ?"
+
+#: LYMessages.c:626
+#, c-format
+msgid "Proceed (%s)?"
+msgstr "ðÒÏÄÏ×ÖÉÔÉ (%s)?"
+
+#: LYMessages.c:627
+msgid "Cannot POST to this host."
+msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄÐÒÁ×ÉÔÉ ÄÁΦ POST ÎÁ ÃÅÊ ÓÅÒ×ÅÒ."
+
+#: LYMessages.c:628
+msgid "POST not supported for this URL - ignoring POST data!"
+msgstr ""
+
+#: LYMessages.c:629
+msgid "Discarding POST data..."
+msgstr "÷¦ÄËÉÄÁ¤ÍÏ ÄÁΦ POST..."
+
+# msgstr "äÏËÕÍÅÎÔ ÎÅ ÂÕÄÅ ÐÅÒÅÚÁ×ÁÎÔÁÖÅÎÏ!"
+# ËÁÔÅÇÏÒÉÞΦÛÅ :)
+#: LYMessages.c:630
+msgid "Document will not be reloaded!"
+msgstr "äÏËÕÍÅÎÔ ÐÅÒÅÚÁ×ÁÎÔÁÖÅÎÏ ÎÅ ÂÕÄÅ!"
+
+#: LYMessages.c:631
+msgid "Location: "
+msgstr "òÏÚͦÝÅÎÎÑ: "
+
+#: LYMessages.c:632
+#, c-format
+msgid "'%s' not found!"
+msgstr "'%s' ÎÅ ÚÎÁÊÄÅÎÏ!"
+
+#: LYMessages.c:633
+msgid "Default Bookmark File"
+msgstr "óÔÁÒÔÏ×ÉÊ ÆÁÊÌ ÚÁËÌÁÄÉÎÏË"
+
+#: LYMessages.c:634
+msgid "Screen too small! (8x35 min)"
+msgstr "úÁÍÁÌÉÊ ÅËÒÁÎ! (8x35 ͦΦÍÕÍ)"
+
+#: LYMessages.c:635
+msgid "Select destination or ^G to Cancel: "
+msgstr "÷ËÁÖ¦ÔØ, ËÕÄÉ, ÞÉ ^G ÝÏ ÓËÁÓÕ×ÁÔÉ: "
+
+#. #define MULTIBOOKMARKS_SELECT
+#: LYMessages.c:637
+msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
+msgstr "÷ÉÂÅÒ¦ÔØ Ð¦ÄÆÁÊÌ ÚÁËÌÁÄÉÎÏË, '=' - ÍÅÎÀ, ÞÉ ^G - ÓËÁÓÕ×ÁÔÉ: "
+
+#. #define MULTIBOOKMARKS_SELF
+#: LYMessages.c:639
+msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
+msgstr ""
+
+#: LYMessages.c:640
+msgid "Multiple bookmark support is not available."
+msgstr ""
+
+#: LYMessages.c:641
+#, c-format
+msgid " Select Bookmark (screen %d of %d)"
+msgstr " ÷ÉÂÅÒ¦ÔØ ÚÁËÌÁÄÉÎËÕ (ÅËÒÁÎ %d Ú %d)"
+
+#: LYMessages.c:642
+msgid "       Select Bookmark"
+msgstr "      ÷ÉÂÅÒ¦ÔØ ÚÁËÌÁÄÉÎËÕ"
+
+#. #define MULTIBOOKMARKS_EHEAD_MASK
+#: LYMessages.c:644
+#, c-format
+msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
+msgstr "òÅÄÁÇÕ×ÁÎÎÑ ïðéóõ ÔÁ í¶óãñ æáêìá úÁËÌÁÄÉÎÏË (%d Ú 2)"
+
+#. #define MULTIBOOKMARKS_EHEAD
+#: LYMessages.c:646
+msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
+msgstr "       òÅÄÁÇÕ×ÁÎÎÑ ïðéóõ ÔÁ ûìñèõ äï æáêìá ÚÁËÌÁÄÉÎÏË"
+
+# ?????
+# msgstr "ì¦ÔÅÒÁ: "
+#: LYMessages.c:647
+msgid "Letter: "
+msgstr "ìÉÓÔ: "
+
+#. #define USE_PATH_OFF_HOME
+#: LYMessages.c:650
+msgid "Use a filepath off your login directory in SHELL syntax!"
+msgstr ""
+
+#: LYMessages.c:652
+msgid "Use a filepath off your home directory!"
+msgstr ""
+
+#. #define MAXLINKS_REACHED
+#: LYMessages.c:655
+msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
+msgstr ""
+
+#. #define MAXHIST_REACHED
+#: LYMessages.c:657
+msgid "History List maximum reached!  Document not pushed."
+msgstr ""
+
+#: LYMessages.c:658
+msgid "No previously visited links available!"
+msgstr "îÅÍÁ¤ ÐÏÓÉÌÁÎØ, Ñ˦ ×É ×¦ÄצÄÕ×ÁÌÉ ÒÁΦÛÅ."
+
+# ËÒÁÝÅ "ÐÅÒÅÒ×ÁÎÏ", ÁÌÅ ÎÅ ÐÒÉÎÃÉÐÏ×Ï ËÒÁÝÅ
+# msgstr "÷ÉÞÅÒÐÁÎÏ ÐÁÍ'ÑÔØ! ðÒÏÇÒÁÍÕ Ï¦Ò×ÁÎÏ!"
+#: LYMessages.c:659
+msgid "Memory exhausted!  Program aborted!"
+msgstr "îÅ ÓÔÁÌÏ ÐÁÍ'ÑÔ¦!  ðÒÏÇÒÁÍÕ ÐÅÒÅÒ×ÁÎÏ!"
+
+#: LYMessages.c:660
+msgid "Memory exhausted!  Aborting..."
+msgstr "îÅ ÓÔÁÌÏ ÐÁÍ'ÑÔ¦!  ïÂÒÉ×Á¤ÍÏÓÑ..."
+
+#: LYMessages.c:661
+msgid "Not enough memory!"
+msgstr "îÅ ×ÉÓÔÁÞÁ¤ ÐÁÍ'ÑÔ¦!"
+
+#: LYMessages.c:662
+msgid "Directory/File Manager not available"
+msgstr ""
+
+#: LYMessages.c:663
+msgid "HREF in BASE tag is not an absolute URL."
+msgstr ""
+
+#: LYMessages.c:664
+msgid "Location URL is not absolute."
+msgstr "URL ÐÅÒÅÎÁÐÒÁ×ÌÅÎÎÑ ÎÅ ÁÂÓÏÌÀÔÎÉÊ."
+
+#: LYMessages.c:665
+msgid "Refresh URL is not absolute."
+msgstr "\"Refresh\" URL ÎÅ ÁÂÓÏÌÀÔÎÉÊ."
+
+#. #define SENDING_MESSAGE_WITH_BODY_TO
+#: LYMessages.c:667
+msgid ""
+"You are sending a message with body to:\n"
+"  "
+msgstr ""
+"÷É ×¦ÄÓÉÌÁ¤ÔÅ ÐÏצÄÏÍÌÅÎÎÑ Ú Ô¦ÌÏÍ ÄÏ:\n"
+"  "
+
+#: LYMessages.c:668
+msgid ""
+"You are sending a comment to:\n"
+"  "
+msgstr ""
+"÷É ×¦ÄÓÉÌÁ¤ÔÅ ËÏÍÅÎÔÁÒ ÄÏ:\n"
+"  "
+
+#: LYMessages.c:669
+msgid ""
+"\n"
+" With copy to:\n"
+"  "
+msgstr ""
+"\n"
+" ú ËÏЦ¤À ÄÏ:\n"
+"  "
+
+#: LYMessages.c:670
+msgid ""
+"\n"
+" With copies to:\n"
+"  "
+msgstr ""
+"\n"
+" ú ËÏЦÑÍÉ ÄÏ:\n"
+"  "
+
+#. #define CTRL_G_TO_CANCEL_SEND
+#: LYMessages.c:672
+msgid ""
+"\n"
+"\n"
+"Use Ctrl-G to cancel if you do not want to send a message\n"
+msgstr ""
+"\n"
+"\n"
+"îÁÔÉÓΦÔØ Ctrl-G, ÑËÝÏ ×É ÎÅ ÈÏÞÅÔŠצÄÓÉÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ\n"
+
+#. #define ENTER_NAME_OR_BLANK
+#: LYMessages.c:674
+msgid ""
+"\n"
+" Please enter your name, or leave it blank to remain anonymous\n"
+msgstr ""
+"\n"
+" ÷×ÅĦÔØ ×ÁÛÅ ¦Í'Ñ, ÞÉ ÚÁÌÉÛÁÊÔÅÓØ ÁÎÏΦÍÏÍ\n"
+
+#. #define ENTER_MAIL_ADDRESS_OR_OTHER
+#: LYMessages.c:676
+msgid ""
+"\n"
+" Please enter a mail address or some other\n"
+msgstr ""
+"\n"
+" âÕÄØ ÌÁÓËÁ, ××ÅĦÔØ ÐÏÛÔÏ×Õ ÁÄÒÅÓÕ ÞÉ ÝÏÓØ ¦ÎÛÅ\n"
+
+#. #define MEANS_TO_CONTACT_FOR_RESPONSE
+#: LYMessages.c:678
+msgid " means to contact you, if you desire a response.\n"
+msgstr ""
+
+#: LYMessages.c:679
+msgid ""
+"\n"
+" Please enter a subject line.\n"
+msgstr ""
+"\n"
+" âÕÄØ ÌÁÓËÁ, ××ÅĦÔØ ÒÑÄÏË ÔÅÍÉ.\n"
+
+#. #define ENTER_ADDRESS_FOR_CC
+#: LYMessages.c:681
+msgid ""
+"\n"
+" Enter a mail address for a CC of your message.\n"
+msgstr ""
+"\n"
+" ÷×ÅĦÔØ ÐÏÛÔÏ×Õ ÁÄÒÅÓÕ ÄÌÑ ÎÁÄÓÉÌÁÎÎÑ ÔÏÞÎϧ ËÏЦ§ (CC) ÌÉÓÔÁ.\n"
+
+#: LYMessages.c:682
+msgid " (Leave blank if you don't want a copy.)\n"
+msgstr " (úÁÌÉÛÔÅ ÐÏÒÏÖΦÍ, ÑËÝÏ ÎÅ ÂÁÖÁ¤ÔÅ ÒÏÂÉÔÉ ËÏЦÀ.)\n"
+
+#: LYMessages.c:683
+msgid ""
+"\n"
+" Please review the message body:\n"
+"\n"
+msgstr ""
+"\n"
+" âÕÄØ ÌÁÓËÁ, ÐÅÒÅÇÌÑÎØÔÅ ÌÉÓÔÁ:\n"
+"\n"
+
+#: LYMessages.c:684
+msgid ""
+"\n"
+"Press RETURN to continue: "
+msgstr ""
+"\n"
+"îÁÔÉÓΦÔØ ÷÷¶ä, ÝÏ ÐÒÏÄÏ×ÖÉÔÉ: "
+
+#: LYMessages.c:685
+msgid ""
+"\n"
+"Press RETURN to clean up: "
+msgstr ""
+"\n"
+"îÁÔÉÓΦÔØ ÷÷¶ä, ÝÏ ÏÞÉÓÔÉÔÉ: "
+
+#: LYMessages.c:686
+msgid " Use Control-U to erase the default.\n"
+msgstr " ÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ Control-U, ÝÏ ÓÔÅÒÔÉ ÐÏÞÁÔËÏצ ÚÎÁÞÅÎÎÑ.\n"
+
+#: LYMessages.c:687
+msgid ""
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+" âÕÄØ ÌÁÓËÁ, ÎÁÂÅÒ¦ÔØ ×ÁÛÅ ÐÏצÄÏÍÌÅÎÎÑ ÎÉÖÞÅ."
+
+#. #define ENTER_PERIOD_WHEN_DONE_A
+#: LYMessages.c:689 src/LYNews.c:361
+msgid ""
+"\n"
+" When you are done, press enter and put a single period (.)"
+msgstr ""
+"\n"
+" ëÏÌÉ ÚÁ˦ÎÞÉÔÅ, ÎÁÔÉÓΦÔØ ××¦Ä ÔÁ ××ÅĦÔØ ÏÄÎÕ ËÒÁÐËÕ (.)"
+
+#. #define ENTER_PERIOD_WHEN_DONE_B
+#: LYMessages.c:691 src/LYNews.c:362
+msgid ""
+"\n"
+" on a line and press enter again."
+msgstr ""
+"\n"
+" ÔÁ ÎÁÔÉÓΦÔØ ××¦Ä ÚÎÏ×Õ."
+
+#. Cookies messages
+#. #define ADVANCED_COOKIE_CONFIRMATION
+#: LYMessages.c:695
+#, c-format
+msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
+msgstr "%s ËÏÒÖÉË: %.*s=%.*s  äÏÚ×ÏÌÉÔÉ? (Y/N/ÚA×ÖÄÉ/neVer)"
+
+#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
+#: LYMessages.c:697
+#, c-format
+msgid "Accept invalid cookie domain=%s for '%s'?"
+msgstr "ðÒÉÊÍÁÔÉ ÐÏÌÁÍÁÎÏÇÏ ËÏÒÖÉËÁ domain=%s ÄÌÑ '%s'?"
+
+#. #define INVALID_COOKIE_PATH_CONFIRMATION
+#: LYMessages.c:699
+#, c-format
+msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
+msgstr "ðÒÉÊÍÁÔÉ ÐÏÌÁÍÁÎÏÇÏ ËÏÒÖÉËÁ path=%s ÑË ÐÒÅƦËÓ %s'?"
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#: LYMessages.c:700
+msgid "Allowing this cookie."
+msgstr "âÅÒÅÍÏ ÃØÏÇÏ ËÏÒÖÉËÁ."
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#: LYMessages.c:701
+msgid "Rejecting this cookie."
+msgstr "÷¦ÄËÉÄÁ¤ÍÏ ÃØÏÇÏ ËÏÒÖÉËÁ."
+
+#: LYMessages.c:702
+msgid "The Cookie Jar is empty."
+msgstr "Jar ÄÌÑ ëÏÒÖÉË¦× ÐÏÒÏÖΦÊ."
+
+#. #define ACTIVATE_TO_GOBBLE
+#: LYMessages.c:704
+msgid "Activate links to gobble up cookies or entire domains,"
+msgstr ""
+
+#: LYMessages.c:705
+msgid "or to change a domain's 'allow' setting."
+msgstr ""
+
+#: LYMessages.c:706
+msgid "(Cookies never allowed.)"
+msgstr "(î¦ËÏÌÉ ÎÅ ÐÒÉÊÍÁÔÉ ËÏÒÖÉËÉ.)"
+
+#: LYMessages.c:707
+msgid "(Cookies always allowed.)"
+msgstr "(úÁ×ÖÄÉ ÂÅÒÅÍÏ ËÏÒÖÉËÉ.)"
+
+#: LYMessages.c:708
+msgid "(Cookies allowed via prompt.)"
+msgstr "(âÅÒÅÍÏ ËÏÒÖÉËÉ Ð¦ÓÌÑ ÄÏÚ×ÏÌÕ.)"
+
+#: LYMessages.c:709
+msgid "(Persistent Cookies.)"
+msgstr ""
+
+#: LYMessages.c:710
+msgid "(No title.)"
+msgstr "(âÅÚ ÚÁÇÏÌÏ×ËÁ.)"
+
+#: LYMessages.c:711
+msgid "(No name.)"
+msgstr "(âÅÚ ¦ÍÅΦ.)"
+
+#: LYMessages.c:712
+msgid "(No value.)"
+msgstr "(âÅÚ ÚÎÁÞÅÎÎÑ.)"
+
+#: LYMessages.c:713
+msgid "None"
+msgstr "î¦ÞÏÇÏ"
+
+#: LYMessages.c:714
+msgid "(End of session.)"
+msgstr "(ë¦ÎÅÃØ ÓÅÁÎÓÕ.)"
+
+#: LYMessages.c:715
+msgid "Delete this cookie?"
+msgstr "÷ÉÄÁÌÉÔÉ ÃØÏÇÏ ËÏÒÖÉËÁ?"
+
+#: LYMessages.c:716
+msgid "The cookie has been eaten!"
+msgstr "ðÒÏËÏ×ÔÎÕÌÉ ËÏÒÖÉËÁ!"
+
+#: LYMessages.c:717
+msgid "Delete this empty domain?"
+msgstr "÷ÉÄÁÌÉÔÉ ÃÅÊ ÐÏÒÏÖÎ¦Ê ÄÏÍÅÎ?"
+
+#: LYMessages.c:718
+msgid "The domain has been eaten!"
+msgstr "äÏÍÅÎÁ Ú'§ÌÉ!"
+
+#. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:720
+msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "÷ÉD)ÁÌÉÔÉ ËÏÒÖ¦ ÄÏÍÅÎÁ, ×ÓÔÁÎÏ×ÉÔÉ ÄÏÚ×¦Ì ÚA)×ÖÄÉ/P)rompt/neV)er ÞÉ C)ËÁÓ.?"
+
+#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:722
+msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "÷ÉD)ÁÌÉÔÉ ÄÏÍÅÎ, ×ÓÔÁÎÏ×ÉÔÉ ÄÏÚ×¦Ì ÚA)×ÖÄÉ/P)rompt/neV)er ÞÉ C)ËÁÓÕ×.?"
+
+#: LYMessages.c:723
+msgid "All cookies in the domain have been eaten!"
+msgstr "õÓ¦ ËÏÒÖ¦ Õ ÄÏÍÅΦ ÚÖÅÒÔÏ!"
+
+#: LYMessages.c:724
+#, c-format
+msgid "'A'lways allowing from domain '%s'."
+msgstr "ú'A'×ÖÄÉ ÂÅÒÅÍÏ Ú ÄÏÍÅÎÁ '%s'."
+
+#: LYMessages.c:725
+#, c-format
+msgid "ne'V'er allowing from domain '%s'."
+msgstr "î¦ËÏÌÉ ('V') ÎÅ ÂÅÒÅÍÏ Ú ÄÏÍÅÎÁ '%s'."
+
+#: LYMessages.c:726
+#, c-format
+msgid "'P'rompting to allow from domain '%s'."
+msgstr "ðÉÔÁ¤ÍÏ ('P'), ÞÉ ÂÒÁÔÉ Ú ÄÏÍÅÎÁ '%s'."
+
+#: LYMessages.c:727
+msgid "Delete all cookies in this domain?"
+msgstr "÷ÉÄÁÌÉÔÉ ÕÓ¦ ËÏÒÖ¦ Õ ÃØÏÍÕ ÄÏÍÅΦ?"
+
+#: LYMessages.c:728
+msgid "All of the cookies in the jar have been eaten!"
+msgstr "õÓ¦ ËÏÒÖÉËÉ Ú jar Ú'§ÄÅÎÏ!"
+
+#: LYMessages.c:730
+msgid "Port 19 not permitted in URLs."
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÐÏÒÔ 19 Õ URL ÚÁÂÏÒÏÎÅÎÏ."
+
+#: LYMessages.c:731
+msgid "Port 25 not permitted in URLs."
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÐÏÒÔ 25 Õ URL ÚÁÂÏÒÏÎÅÎÏ."
+
+#: LYMessages.c:732
+#, c-format
+msgid "Port %lu not permitted in URLs."
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÐÏÒÔ %lu Õ URL ÚÁÂÏÒÏÎÅÎÏ."
+
+#: LYMessages.c:733
+msgid "URL has a bad port field."
+msgstr "URL ͦÓÔÉÔØ ÎÅצÒÎÉÊ ÐÏÒÔ."
+
+#: LYMessages.c:734
+msgid "Maximum nesting of HTML elements exceeded."
+msgstr ""
+
+#: LYMessages.c:735
+msgid "Bad partial reference!  Stripping lead dots."
+msgstr ""
+
+#: LYMessages.c:736
+msgid "Trace Log open failed.  Trace off!"
+msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ÖÕÒÎÁÌ ÔÒÁÓÕ×ÁÎÎÑ. ôÒÁÓÕ×ÁÎÎÑ ×ÉÍËÎÅÎÏ!"
+
+#: LYMessages.c:737
+msgid "Lynx Trace Log"
+msgstr "öÕÒÎÁÌ ôÒÁÓÕ×ÁÎÎÑ Lynx"
+
+#: LYMessages.c:738
+msgid "No trace log has been started for this session."
+msgstr "ôÒÁÓÕ×ÁÎÎÑ ÄÌÑ Ã¦¤§ ÓÅÓ¦§ ÎÅ ÂÕÌÏ ÐÏÞÁÔÏ."
+
+#. #define MAX_TEMPCOUNT_REACHED
+#: LYMessages.c:740
+msgid "The maximum temporary file count has been reached!"
+msgstr "äÏÓÑÇÎÕÔÏ ÍÁËÓÉÍÁÌØÎϧ ˦ÌØËÏÓÔ¦ ÔÉÍÞÁÓÏ×ÉÈ ÆÁÊ̦×!"
+
+#. #define FORM_VALUE_TOO_LONG
+#: LYMessages.c:742
+msgid "Form field value exceeds buffer length!  Trim the tail."
+msgstr "úÎÁÞÅÎÎÑ ÐÏÌÑ ÆÏÒÍÉ ÐÅÒÅ×ÉÝÕ¤ ÒÏÚÍ¦Ò ÂÕÆÅÒÁ! ÷¦ÄËÉÄÁ¤ÍÏ ÚÁÊ×Å."
+
+#. #define FORM_TAIL_COMBINED_WITH_HEAD
+#: LYMessages.c:744
+msgid "Modified tail combined with head of form field value."
+msgstr ""
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#. HTFile.c
+#: LYMessages.c:747
+msgid "Directory"
+msgstr "ëÁÔÁÌÏÇ"
+
+#: LYMessages.c:748
+msgid "Directory browsing is not allowed."
+msgstr "ðÅÒÅÇÌÑÄ ËÁÔÁÌÏÇÕ ÚÁÂÏÒÏÎÅÎÏ."
+
+#: LYMessages.c:749
+msgid "Selective access is not enabled for this directory"
+msgstr "÷ɦÒËÏ×ÉÊ ÄÏÓÔÕÐ ÄÏ Ã¦ÌÏÇÏ ËÁÔÁÌÏÇÕ ÚÁÂÏÒÏÎÅÎÏ"
+
+#: LYMessages.c:750
+msgid "Multiformat: directory scan failed."
+msgstr ""
+
+#: LYMessages.c:751
+msgid "This directory is not readable."
+msgstr "îÅ ÍÏÖÕ ÐÒÏÞÉÔÁÔÉ ÃÅÊ ËÁÔÁÌÏÇ."
+
+#: LYMessages.c:752
+msgid "Can't access requested file."
+msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ ÚÁÐÉÔÕ×ÁÎÏÇÏ ÆÁÊÌÕ."
+
+#: LYMessages.c:753
+msgid "Could not find suitable representation for transmission."
+msgstr ""
+
+#: LYMessages.c:754
+msgid "Could not open file for decompression!"
+msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÒÏÚÔÉÓËÁÎÎÑ!"
+
+#: LYMessages.c:755
+msgid "Files:"
+msgstr "æÁÊÌÉ:"
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#: LYMessages.c:756
+msgid "Subdirectories:"
+msgstr "ð¦ÄËÁÔÁÌÏÇÉ:"
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#: LYMessages.c:757
+msgid " directory"
+msgstr " ËÁÔÁÌÏÇ"
+
+# 8-| ÎÅ ÚÎÁÀ...
+# msgstr "÷×ÅÒÈ ÄÏ "
+#: LYMessages.c:758
+msgid "Up to "
+msgstr "áÖ ÄÏ "
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#: LYMessages.c:759
+msgid "Current directory is "
+msgstr "ðÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ "
+
+#. HTGopher.c
+#: LYMessages.c:762
+msgid "No response from server!"
+msgstr "óÅÒ×ÅÒ ÎŠצÄÐÏצÄÁ¤!"
+
+#: LYMessages.c:763
+msgid "CSO index"
+msgstr "CSO ¦ÎÄÅËÓ"
+
+#: LYMessages.c:764
+msgid ""
+"\n"
+"This is a searchable index of a CSO database.\n"
+msgstr ""
+
+#: LYMessages.c:765
+msgid "CSO Search Results"
+msgstr "òÅÚÕÌØÔÁÔÉ ÐÏÛÕËÕ CSO"
+
+#: LYMessages.c:766
+#, c-format
+msgid "Seek fail on %s\n"
+msgstr ""
+
+#: LYMessages.c:767
+msgid ""
+"\n"
+"Press the 's' key and enter search keywords.\n"
+msgstr ""
+"\n"
+"îÁÔÉÓΦÔØ 's' ÔÁ ××ÅĦÔØ ËÌÀÞÏצ ÓÌÏ×Á ÄÌÑ ÐÏÛÕËÕ.\n"
+
+#: LYMessages.c:768
+msgid ""
+"\n"
+"This is a searchable Gopher index.\n"
+msgstr ""
+
+#: LYMessages.c:769
+msgid "Gopher index"
+msgstr "Gopher ¦ÎÄÅËÓ"
+
+#: LYMessages.c:770
+msgid "Gopher Menu"
+msgstr "Gopher ÍÅÎÀ"
+
+#: LYMessages.c:771
+msgid " Search Results"
+msgstr " òÅÚÕÌØÔÁÔÉ ðÏÛÕËÕ"
+
+#: LYMessages.c:772
+msgid "Sending CSO/PH request."
+msgstr "îÁÄÓÉÌÁÀ ÚÁÐÉÔ CSO/PH."
+
+#: LYMessages.c:773
+msgid "Sending Gopher request."
+msgstr "îÁÄÓÉÌÁ¤ÍÏ ÚÁÐÉÔ Gopher"
+
+#: LYMessages.c:774
+msgid "CSO/PH request sent; waiting for response."
+msgstr "úÁÐÉÔ CSO/PH ÐÏÓÌÁÎÏ, ÞÅËÁÀ ÎÁ צÄÇÕË."
+
+#: LYMessages.c:775
+msgid "Gopher request sent; waiting for response."
+msgstr "úÁÐÉÔ Gopher ÎÁĦÓÌÁÎÏ: ÞÅËÁ¤ÍÏ ×¦ÄÇÕËÕ."
+
+#: LYMessages.c:776
+msgid ""
+"\n"
+"Please enter search keywords.\n"
+msgstr ""
+"\n"
+"âÕÄØ ÌÁÓËÁ, ××ÅĦÔØ ËÌÀÞÏצ ÓÌÏ×Á ÄÌÑ ÐÏÛÕËÕ.\n"
+
+#: LYMessages.c:777
+msgid ""
+"\n"
+"The keywords that you enter will allow you to search on a"
+msgstr ""
+
+#: LYMessages.c:778
+msgid " person's name in the database.\n"
+msgstr ""
+
+#. HTNews.c
+#: LYMessages.c:781
+msgid "Connection closed ???"
+msgstr "ú'¤ÄÎÁÎÎÑ ÚÁËÒÉÔÏ ???"
+
+#: LYMessages.c:782
+msgid "Cannot open temporary file for news POST."
+msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ ÄÌÑ ×¦ÄÐÒÁ×ËÉ ÌÉÓÔÁ ÄÏ ËÏÎÆÅÒÅÎæ§."
+
+#: LYMessages.c:783
+msgid "This client does not contain support for posting to news with SSL."
+msgstr "ãÅÊ Ë̦¤ÎÔ ÎÅ ÍÁ¤ ЦÄÔÒÉÍËÉ ÄÌÑ ÎÁÄÓÉÌÁÎÎÑ ÎÏ×ÉÎ ÞÅÒÅÚ SSL."
+
+#. HTStyle.c
+#: LYMessages.c:786
+#, c-format
+msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
+msgstr "óÔÉÌØ %d \"%s\" SGML:%s.  ûÒÉÆÔ %s %.1f ÔÏÞÏË.\n"
+
+#: LYMessages.c:787
+#, c-format
+msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
+msgstr ""
+
+#: LYMessages.c:788
+#, c-format
+msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
+msgstr ""
+
+#: LYMessages.c:789
+#, c-format
+msgid "\t\tTab kind=%d at %.0f\n"
+msgstr ""
+
+#. HTTP.c
+#: LYMessages.c:792
+msgid "Can't proceed without a username and password."
+msgstr "îÅÍÏÖÌÉ×Ï ÐÒÏÄÏ×ÖÉÔÉ ÂÅÚ ¦ÍÅΦ ËÏÒÉÓÔÕ×ÁÞÁ ÔÁ ÐÁÒÏÌÑ."
+
+#: LYMessages.c:793
+msgid "Can't retry with authorization!  Contact the server's WebMaster."
+msgstr "îÅÍÏÖÌÉ×Ï ÐÏ×ÔÏÒÉÔÉ Á×ÔÏÒÉÚÁæÀ!  ú×ÅÒΦÔØÓÑ ÄÏ ×ÅÂÍÁÊÓÔÒÁ ÓÅÒ×ÅÒÁ."
+
+#: LYMessages.c:794
+msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
+msgstr "îÅÍÏÖÌÉ×Ï ÐÏ×ÔÏÒÉÔÉ ÐÒÏËÓ¦-Á×ÔÏÒÉÚÁæÀ!  ú×ÅÒΦÔØÓÑ ÄÏ ×ÅÂÍÁÊÓÔÒÁ."
+
+#: LYMessages.c:795
+msgid "Retrying with proxy authorization information."
+msgstr ""
+
+#. HTWAIS.c
+#: LYMessages.c:798
+msgid "HTWAIS: Return message too large."
+msgstr ""
+
+#: LYMessages.c:799
+msgid "Enter WAIS query: "
+msgstr "÷×ÅĦÔØ ÚÁÐÉÔ WAIS: "
+
+#. Miscellaneous status
+#: LYMessages.c:802
+msgid "Retrying as HTTP0 request."
+msgstr "ðÏ×ÔÏÒÀ¤ÍÏ ÑË HTTP0 ÚÁÐÉÔ."
+
+# ÐÅÒÅËÁÞÁÎÏ - ÂÏ ÎÅ ÚÎÁÀ, ËÕÄÉ, Õ ÑËÉÊ Â¦Ë.
+# ÐÅÒÅËÁÞÁÎÏ - ÂÏ ÎÅ ÚÎÁÀ, ËÕÄÉ, Õ ÑËÉÊ Â¦Ë.
+#: LYMessages.c:803
+#, c-format
+msgid "Transferred %d bytes"
+msgstr "ðÅÒÅËÁÞÁÎÏ %d ÂÁÊÔ¦×"
+
+# ÐÅÒÅËÁÞÕ×ÁÎÎÑ - ÂÏ ÎÅ ÚÎÁÀ, ËÕÄÉ, Õ ÑËÉÊ Â¦Ë.
+# (×ÖÅ ËÒÁÝÅ "ÐÅÒÅÄÁ×ÁÎÎÑ", ÂÏ ÐÅÒÅÄÁÞÁ - ÎÅ ÚÏ×Ó¦Í ÐÒÏÃÅÓ, ÎÁÞÅ)
+#: LYMessages.c:804
+msgid "Data transfer complete"
+msgstr "ðÅÒÅËÁÞÕ×ÁÎÎÑ ÄÁÎÉÈ ÚÁ×ÅÒÛÅÎÏ."
+
+#: LYMessages.c:805
+#, c-format
+msgid "Error processing line %d of %s\n"
+msgstr "ðÏÍÉÌËÁ ÏÐÒÁÃØÏ×Õ×ÁÎÎÑ ÒÑÄËÁ %d Ú %s\n"
+
+#. Lynx internal page titles
+#: LYMessages.c:808
+msgid "Address List Page"
+msgstr "óÔÏÒ¦ÎËÁ ÓÐÉÓËÕ ÁÄÒÅÓ"
+
+#: LYMessages.c:809
+msgid "Bookmark file"
+msgstr "æÁÊÌ ÚÁËÌÁÄÉÎÏË"
+
+#: LYMessages.c:810
+msgid "Configuration Definitions"
+msgstr "ëÏÎƦÇÕÒÁæÊΦ ×ÉÚÎÁÞÅÎÎÑ"
+
+#: LYMessages.c:811
+msgid "Cookie Jar"
+msgstr "Jar ÄÌÑ ëÏÒÖÉ˦×"
+
+#: LYMessages.c:812
+msgid "Current Key Map"
+msgstr ""
+
+#: LYMessages.c:813
+msgid "File Management Options"
+msgstr "ïÐÅÒÁæ§ Ú ÆÁÊÌÁÍÉ"
+
+#: LYMessages.c:814
+msgid "Download Options"
+msgstr "ðÁÒÁÍÅÔÒÉ óËÁÞÕ×ÁÎÎÑ"
+
+#: LYMessages.c:815
+msgid "History Page"
+msgstr "óÔÏÒ¦ÎËÁ ¶ÓÔÏÒ¦§"
+
+#: LYMessages.c:816
+msgid "List Page"
+msgstr "óÔÏÒ¦ÎËÁ ÓÐÉÓËÕ"
+
+# msgstr "IÎÆÏÒÍÁÃ¦Ñ lynx.cfg"
+# msgstr "IÎÆÏÒÍÁÃ¦Ñ lynx.cfg"
+#: LYMessages.c:817
+msgid "Lynx.cfg Information"
+msgstr "¶ÎÆÏÒÍÁÃ¦Ñ ÝÏÄÏ Lynx.cfg"
+
+#: LYMessages.c:818
+msgid "Converted Mosaic Hotlist"
+msgstr "úËÏÎ×ÅÒÔÏ×ÁÎÉÊ Mosaic Hotlist"
+
+#: LYMessages.c:819
+msgid "Options Menu"
+msgstr "íÅÎÀ ÐÁÒÁÍÅÔÒ¦×"
+
+#: LYMessages.c:820
+msgid "File Permission Options"
+msgstr "ðÁÒÁÍÅÔÒÉ ÐÒÁ× ÄÏÓÔÕÐÕ ÄÏ ÆÁÊ̦×"
+
+#: LYMessages.c:821
+msgid "Printing Options"
+msgstr "ðÁÒÁÍÅÔÒÉ ÄÒÕËÕ"
+
+#: LYMessages.c:822
+msgid "Information about the current document"
+msgstr "¶ÎÆÏÒÍÁÃ¦Ñ ÐÒÏ ÐÏÔÏÞÎÉÊ ÄÏËÕÍÅÎÔ"
+
+#: LYMessages.c:823
+msgid "Your recent statusline messages"
+msgstr "ïÓÔÁÎΦ ÐÏצÄÏÍÌÅÎÎÑ ÓÔÁÔÕÓÎÏÇÏ ÒÑÄËÕ"
+
+# * Yuri Syrota <rasta@renome.rovno.ua>
+#: LYMessages.c:824
+msgid "Upload Options"
+msgstr "ðÁÒÁÍÅÔÒÉ ×É×ÁÎÔÁÖÅÎÎÑ"
+
+#: LYMessages.c:825
+msgid "Visited Links Page"
+msgstr "óÔÏÒ¦ÎËÁ צÄצÄÁÎÉÈ ÐÏÓÉÌÁÎØ"
+
+#. CONFIG_DEF_TITLE subtitles
+#: LYMessages.c:828
+msgid "See also"
+msgstr "äÉ×. ÔÁËÏÖ"
+
+#: LYMessages.c:829
+msgid "your"
+msgstr "÷ÁÛ"
+
+#: LYMessages.c:830
+msgid "for runtime options"
+msgstr ""
+
+#: LYMessages.c:831
+msgid "compile time options"
+msgstr "ÐÁÒÁÍÅÔÒÉ ÞÁÓÕ ËÏÍЦÌÑæ§"
+
+#: LYMessages.c:832
+#, fuzzy
+msgid "color-style configuration"
+msgstr "÷ÁÛÁ ÏÓÎÏ×ÎÁ ËÏÎƦÇÕÒÁæÑ"
+
+#: LYMessages.c:833
+msgid "latest release"
+msgstr "ÏÓÔÁÎÎ¦Ê ÒÅ̦Ú"
+
+#: LYMessages.c:834
+msgid "pre-release version"
+msgstr "ÐÏÐÅÒÅÄÎÑ ×ÅÒÓ¦Ñ"
+
+#: LYMessages.c:835
+msgid "development version"
+msgstr "ÒÏÚÒÏÂÎÉÃØËÁ ×ÅÒÓ¦Ñ"
+
+#. #define AUTOCONF_CONFIG_CACHE
+#: LYMessages.c:837
+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 ""
+
+#. #define AUTOCONF_LYNXCFG_H
+#: LYMessages.c:841
+msgid ""
+"The following data were used as automatically-configured compile-time\n"
+"definitions when this copy of Lynx was built."
+msgstr ""
+
+#. #define DIRED_NOVICELINE
+#: LYMessages.c:846
+msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
+msgstr ""
+
+#: LYMessages.c:847
+msgid "Failed to obtain status of current link!"
+msgstr ""
+
+#. #define INVALID_PERMIT_URL
+#: LYMessages.c:850
+msgid "Special URL only valid from current File Permission menu!"
+msgstr ""
+
+#: LYMessages.c:854
+msgid "External support is currently disabled."
+msgstr ""
+
+#. new with 2.8.4dev.21
+#: LYMessages.c:858
+msgid "Changing working-directory is currently disabled."
+msgstr "úÁÐÕÓË Ð¦ÄÐÒÏÃÅÓ¦× ÎÁÒÁÚ¦ ÚÁÂÏÒÏÎÅÎÏ."
+
+# "ÚÁ×ÅÒÔÁÎÎÑ" - ÃÅ *ÎÁÚÁÄ*, Á ÐÅÒÅÎÏÓ ÐÏÇÁÎÏ
+# (ÂÏ ËÒÁÝÅ ÐÅÒÅÎÅÓÅÎÎÑ, ÁÌÅ ÐÅÒÅÎÅÓÅÎÎÑ ÔÅÖ ÐÏÇÁÎÏ)
+#: LYMessages.c:859
+msgid "Linewrap OFF!"
+msgstr "ðÅÒÅÎÏÓ ÒÑÄË¦× ÷éíëîåîï!"
+
+#: LYMessages.c:860
+msgid "Linewrap ON!"
+msgstr "ðÅÒÅÎÏÓ ÒÑÄË¦× õ÷¶íëîåîï!"
+
+#: LYMessages.c:861
+msgid "Parsing nested-tables toggled OFF!  Reloading..."
+msgstr "òÅÖÉÍ Raw 8-bit ÞÉ CJK ÷éíëîåîï! ðÅÒÅÚÁ×ÁÎÔÁÖÕ¤ÍÏ..."
+
+#: LYMessages.c:862
+msgid "Parsing nested-tables toggled ON!  Reloading..."
+msgstr "òÅÖÉÍ Raw 8-bit ÞÉ CJK õ÷¶íëîåîï! ðÅÒÅÚÁ×ÁÎÔÁÖÕ¤ÍÏ..."
+
+#: LYMessages.c:863
+msgid "Shifting is disabled while line-wrap is in effect"
+msgstr ""
+
+#: LYMessages.c:864
+msgid "Trace not supported"
+msgstr "ôÅÒͦÎÁÌ ÎŠЦÄÔÒÉÍÕ¤ ËÏÌØÏÒÉ"
+
+#: WWW/Library/Implementation/HTAABrow.c:647
+#, c-format
+msgid "Username for '%s' at %s '%s%s':"
+msgstr "¶Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ ÄÌÑ '%s' ÎÁ %s '%s%s':"
+
+#: WWW/Library/Implementation/HTAABrow.c:913
+msgid "This client doesn't know how to compose proxy authorization information for scheme"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:988
+msgid "This client doesn't know how to compose authorization information for scheme"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:1096
+#, c-format
+msgid "Invalid header '%s%s%s%s%s'"
+msgstr "îÅצÒÎÉÊ ÚÁÇÏÌÏ×ÏË '%s%s%s%s%s'"
+
+#: WWW/Library/Implementation/HTAABrow.c:1200
+msgid "Proxy authorization required -- retrying"
+msgstr "ðÏÔÒ¦ÂÎÁ Á×ÔÏÒÉÚÁÃ¦Ñ ÎÁ ÐÒÏËÓ¦ -- ÐÒÏÂÕ¤ÍÏ ÝÅ"
+
+#: WWW/Library/Implementation/HTAABrow.c:1259
+msgid "Access without authorization denied -- retrying"
+msgstr "äÏÓÔÕÐ ÂÅÚ Á×ÔÏÒÉÚÁæ§ ÚÁÂÏÒÏÎÅÎÉÊ -- ÐÒÏÂÕ¤ÍÏ ÝÅ"
+
+#: WWW/Library/Implementation/HTAccess.c:677
+msgid "Access forbidden by rule"
+msgstr "äÏÓÔÕÐ ÚÁÂÏÒÏÎÅÎÉÊ ÐÒÁ×ÉÌÏÍ"
+
+#: WWW/Library/Implementation/HTAccess.c:779
+msgid "Document with POST content not found in cache.  Resubmit?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
+msgid "Loading incomplete."
+msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÎÅ ÚÁ×ÅÒÛÅÎÏ."
+
+#: WWW/Library/Implementation/HTAccess.c:1077
+msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1079
+msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1080
+#, 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:1086 src/LYMainLoop.c:7736
+msgid "Can't Access"
+msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ"
+
+#: WWW/Library/Implementation/HTAccess.c:1094
+msgid "Unable to access document."
+msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ ÄÏ ÄÏËÕÍÅÎÔÁ."
+
+#: WWW/Library/Implementation/HTFTP.c:766
+#, c-format
+msgid "Enter password for user %s@%s:"
+msgstr "÷×ÅĦÔØ ÐÁÒÏÌØ ËÏÒÉÓÔÕ×ÁÞÁ %s@%s:"
+
+#: WWW/Library/Implementation/HTFTP.c:794
+msgid "Unable to connect to FTP host."
+msgstr "îÅ ÍÏÖÕ Ð¦Ä'¤ÄÎÁÔÉÓÑ ÄÏ FTP ÓÅÒ×ÅÒÕ."
+
+#: WWW/Library/Implementation/HTFTP.c:1064
+msgid "close master socket"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:1126
+msgid "socket for master socket"
+msgstr ""
+
+# 8-| ÎÅ ÚÎÁÀ...
+# 8-| ÎÅ ÚÎÁÀ...
+#.
+#. **  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:1640 WWW/Library/Implementation/HTFTP.c:2261
+msgid "Symbolic Link"
+msgstr "óÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ"
+
+#: WWW/Library/Implementation/HTFTP.c:2622
+msgid "Receiving FTP directory."
+msgstr "ïÔÒÉÍÕ¤ÍÏ ËÁÔÁÌÏÇ FTP."
+
+# ÐÅÒÅËÁÞÁÎÏ! - ÂÏ ÎÅ ÚÎÁÀ, Õ ÑËÉÊ Â¦Ë
+# ÐÅÒÅËÁÞÁÎÏ! - ÂÏ ÎÅ ÚÎÁÀ, Õ ÑËÉÊ Â¦Ë
+#: WWW/Library/Implementation/HTFTP.c:2762
+#, c-format
+msgid "Transferred %d bytes (%5d)"
+msgstr "ðÅÒÅËÁÞÁÎÏ %d ÂÁÊÔ¦× (%5d)"
+
+#: WWW/Library/Implementation/HTFTP.c:3083
+msgid "connect for data"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:3731
+msgid "Receiving FTP file."
+msgstr "ïÔÒÉÍÕ¤ÍÏ ÆÁÊÌ FTP."
+
+#: WWW/Library/Implementation/HTFinger.c:278
+msgid "Could not set up finger connection."
+msgstr "îÅÍÏÖÌÉ×Ï ×ÓÔÁÎÏ×ÉÔÉ Ú'¤ÄÎÁÎÎÑ finger."
+
+#: WWW/Library/Implementation/HTFinger.c:325
+msgid "Could not load data (no sitename in finger URL)"
+msgstr "îÅÍÏÖÌÉ×Ï ÚÁ×ÁÎÔÁÖÉÔÉ ÄÁΦ (ÎÅÍÁ ¦ÍÅΦ ÓÅÒ×ÅÒÁ Õ finger URL)"
+
+#: WWW/Library/Implementation/HTFinger.c:331
+msgid "Invalid port number - will only use port 79!"
+msgstr "îÅצÒÎÉÊ ÎÏÍÅÒ ÐÏÒÔÕ - ×ÉËÏÒÉÓÔÏ×Õ¤ÍÏ ÌÉÛÅ ÐÏÒÔ 79!"
+
+#: WWW/Library/Implementation/HTFinger.c:396
+msgid "Could not access finger host."
+msgstr "îÅÍÏÖÌÉ×Ï Ä¦ÓÔÁÔÉÓÑ ÓÅÒ×ÅÒÁ finger."
+
+#: WWW/Library/Implementation/HTFinger.c:404
+msgid "No response from finger server."
+msgstr "Finger-ÓÅÒ×ÅÒ ÎŠצÄÐÏצÄÁ¤"
+
+#: WWW/Library/Implementation/HTNews.c:372
+#, c-format
+msgid "Username for news host '%s':"
+msgstr "¶Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ ÎÁ ÓÅÒ×ÅÒ¦ ÎÏ×ÉÎ '%s':"
+
+#: WWW/Library/Implementation/HTNews.c:425
+msgid "Change username?"
+msgstr "úͦÎÉÔÉ ¦Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ?"
+
+#: WWW/Library/Implementation/HTNews.c:429
+msgid "Username:"
+msgstr "¶Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ:"
+
+#: WWW/Library/Implementation/HTNews.c:453
+#, c-format
+msgid "Password for news host '%s':"
+msgstr "ðÁÒÏÌØ ËÏÒÉÓÔÕ×ÁÞÁ ÎÁ ÓÅÒ×ÅÒ¦ ÎÏ×ÉÎ '%s':"
+
+#: WWW/Library/Implementation/HTNews.c:536
+msgid "Change password?"
+msgstr "úͦÎÉÔÉ ÐÁÒÏÌØ?"
+
+#: WWW/Library/Implementation/HTNews.c:1690
+#, c-format
+msgid "No matches for: %s"
+msgstr "î¦ÞÏÇÏ ÓÈÏÖÏÇÏ ÎÁ %s"
+
+#: WWW/Library/Implementation/HTNews.c:1743
+msgid ""
+"\n"
+"No articles in this group.\n"
+msgstr ""
+"\n"
+"îÅÍÁ¤ ÓÔÁÔÅÊ Õ Ã¦Ê ÇÒÕЦ.\n"
+
+#: WWW/Library/Implementation/HTNews.c:1756
+msgid ""
+"\n"
+"No articles in this range.\n"
+msgstr ""
+"\n"
+"îÅÍÁ¤ ÓÔÁÔÅÊ Õ ÃØÏÍÕ Ä¦ÁÐÁÚÏΦ.\n"
+
+#.
+#. **	Set window title.
+#.
+#: WWW/Library/Implementation/HTNews.c:1769
+#, c-format
+msgid "%s,  Articles %d-%d"
+msgstr "%s,  óÔÁÔÔ¦ %d-%d"
+
+#: WWW/Library/Implementation/HTNews.c:1791
+msgid "Earlier articles"
+msgstr "â¦ÌØÛ ÒÁÎΦ ÓÔÁÔÔ¦"
+
+#: WWW/Library/Implementation/HTNews.c:1804
+#, c-format
+msgid ""
+"\n"
+"There are about %d articles currently available in %s, IDs as follows:\n"
+"\n"
+msgstr ""
+"\n"
+"´ ÄÏÓÔÕÐÎÉÍÉ Â¦ÌÑ %d ÓÔÁÔÅÊ Õ %s, Ú ÔÁËÉÍÉ ID:\n"
+"\n"
+
+#: WWW/Library/Implementation/HTNews.c:1864
+msgid "All available articles in "
+msgstr "õÓ¦ ÄÏÓÔÕÐΦ ÓÔÁÔÔ¦ Õ "
+
+#: WWW/Library/Implementation/HTNews.c:2080
+msgid "Later articles"
+msgstr "â¦ÌØÛ Ð¦ÚΦ ÓÔÁÔÔ¦"
+
+#: WWW/Library/Implementation/HTNews.c:2104
+msgid "Post to "
+msgstr "îÁĦÓÌÁÔÉ ÓÔÁÔÔÀ ÄÏ "
+
+#: WWW/Library/Implementation/HTNews.c:2322
+msgid "This client does not contain support for SNEWS URLs."
+msgstr "ãÅÊ Ë̦¤ÎÔ ÎÅ ÍÁ¤ ЦÄÔÒÉÍËÉ SNEWS URL'¦×."
+
+#: WWW/Library/Implementation/HTNews.c:2530
+msgid "No target for raw text!"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2560
+msgid "Connecting to NewsHost ..."
+msgstr "ð¦Ä'¤ÄÎÕ¤ÍÏÓÑ ÄÏ óÅÒ×ÅÒÁ îÏ×ÉÎ ..."
+
+#: WWW/Library/Implementation/HTNews.c:2611
+#, c-format
+msgid "Could not access %s."
+msgstr "îÅÍÏÖÌÉ×Ï Ð¦Ä'¤ÄÎÁÔÉÓÑ ÄÏ %s."
+
+#: WWW/Library/Implementation/HTNews.c:2711
+#, c-format
+msgid "Can't read news info.  News host %.20s responded: %.200s"
+msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ¦ÎÆÏÒÍÁæÀ. óÅÒ×ÅÒ ÎÏ×ÉÎ %.20s ËÁÖÅ: %.200s"
+
+#: WWW/Library/Implementation/HTNews.c:2715
+#, c-format
+msgid "Can't read news info, empty response from host %s"
+msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ¦ÎÆÏÒÍÁæÀ, ÐÏÒÏÖÎ¦Ê ×¦ÄÇÕË ×¦Ä ÓÅÒ×ÅÒÁ %s"
+
+#.
+#. **	List available newsgroups. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2919
+msgid "Reading list of available newsgroups."
+msgstr "þÉÔÁ¤ÍÏ ÓÐÉÓÏË ÄÏÓÔÕÐÎÉÈ ÇÒÕÐ ÎÏ×ÉÎ."
+
+#: WWW/Library/Implementation/HTNews.c:2941
+msgid "Reading list of articles in newsgroup."
+msgstr "þÉÔÁ¤ÍÏ ÓÐÉÓÏË ÓÔÁÔÅÊ Õ ËÏÎÆÅÒÅÎæ§."
+
+#.
+#. **	Get an article from a news group. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2947
+msgid "Reading news article."
+msgstr "ïÔÒÉÍÕ¤ÍÏ ÓÔÁÔÔÀ."
+
+#: WWW/Library/Implementation/HTNews.c:2977
+msgid "Sorry, could not load requested news."
+msgstr "÷ÉÂÁÞÔÅ, ÎÅ ×ÄÁÌÏÓÑ ×ÉÔÑÇÔÉ ÂÁÖÁΦ ÎÏ×ÉÎÉ."
+
+#: WWW/Library/Implementation/HTTCP.c:1239
+msgid "Address has invalid port"
+msgstr "áÄÒÅÓÁ ÍÁ¤ ÎÅצÒÎÏÇÏ ÐÏÒÔÕ"
+
+#: WWW/Library/Implementation/HTTCP.c:1327
+msgid "Address length looks invalid"
+msgstr "äÏ×ÖÉÎÁ ÁÄÒÅÓÉ, ÓÈÏÖÅ, ÎÅצÒÎÁ"
+
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
+#, c-format
+msgid "Unable to locate remote host %s."
+msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ×¦ÄÄÁÌÅÎÉÊ ÓÅÒ×ÅÒ %s."
+
+#. 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:1575 WWW/Library/Implementation/HTTelnet.c:103
+#, c-format
+msgid "Invalid hostname %s"
+msgstr "îÅÐÒÁ×ÉÌØÎÅ ¦Í'Ñ ÍÁÛÉÎÉ %s"
+
+#: WWW/Library/Implementation/HTTCP.c:1589
+#, c-format
+msgid "Making %s connection to %s"
+msgstr "÷ÓÔÁÎÏ×ÌÀ¤ÍÏ %s Ú'¤ÄÎÁÎÎÑ ÄÏ %s"
+
+#: WWW/Library/Implementation/HTTCP.c:1605
+#, c-format
+msgid "socket failed: family %d addr %s port %s."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1614
+msgid "socket failed."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1634
+msgid "Could not make connection non-blocking."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1703
+msgid "Connection failed (too many retries)."
+msgstr "ú'¤ÄÎÁÔÉÓÑ ÎÅ ×ÄÁÌÏÓÑ (ÚÁÂÁÇÁÔÏ ÓÐÒÏÂ)."
+
+#: WWW/Library/Implementation/HTTCP.c:1896
+msgid "Could not restore socket to blocking."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1962
+msgid "Socket read failed for 180,000 tries."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:503
+msgid "This client does not contain support for HTTPS URLs."
+msgstr "ãÅÊ Ë̦¤ÎÔ ÎÅ ÍÁ¤ ЦÄÔÒÉÍËÉ ÄÌÑ HTTPS URL'¦×."
+
+#: WWW/Library/Implementation/HTTP.c:528
+msgid "Unable to connect to remote host."
+msgstr "îÅÍÏÖÌÉ×Ï Ð¦Ä'¤ÄÎÁÔÉÓÑ ÄÏ ×¦ÄÄÁÌÅÎÏÇÏ ÓÅÒ×ÅÒÁ."
+
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr "÷ÓÔÁÎÏ×ÌÀ¤ÍÏ %s Ú'¤ÄÎÁÎÎÑ ÄÏ %s"
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1091
+msgid "Sending HTTP request."
+msgstr "îÁÄÓÉÌÁ¤ÍÏ ÚÁÐÉÔ HTTP."
+
+#: WWW/Library/Implementation/HTTP.c:1125
+msgid "Unexpected network write error; connection aborted."
+msgstr "îÅÓÐÏĦ×ÁÎÁ ÐÏÍÉÌËÁ ÚÁÐÉÓÕ ÄÏ ÍÅÒÅÖ¦; Ú'¤ÄÎÁÎÎÑ Ï¦Ò×ÁÎÅ."
+
+#: WWW/Library/Implementation/HTTP.c:1131
+msgid "HTTP request sent; waiting for response."
+msgstr "HTTP ÚÁÐÉÔÁ ÎÁĦÓÌÁÎÏ; ÞÅËÁ¤ÍÏ ÎÁ צÄÐÏצÄØ."
+
+#: WWW/Library/Implementation/HTTP.c:1195
+msgid "Unexpected network read error; connection aborted."
+msgstr "îÅÓÐÏĦ×ÁÎÁ ÐÏÍÉÌËÁ ÞÉÔÁÎÎÑ ¦Ú ÍÅÒÅÖ¦; Ú'¤ÄÎÁÎÎÑ Ï¦Ò×ÁÎÅ."
+
+#.
+#. **	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:1391
+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:1426
+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:1545
+msgid "Got unexpected 304 Not Modified status."
+msgstr "ïÔÒÉÍÁÎÏ ÎÅÓÐÏĦ×ÁÎÏÇÏ ÓÔÁÔÕÓÁ 304 Not Modified."
+
+#: WWW/Library/Implementation/HTTP.c:1612
+msgid "Redirection of POST content requires user approval."
+msgstr "ðÅÒÅÎÁÐÒÁ×ÌÅÎÎÑ ×ͦÓÔÕ POST ×ÉÍÁÇÁ¤ ÄÏÚ×ÏÌÕ ËÏÒÉÓÔÕ×ÁÞÁ."
+
+#: WWW/Library/Implementation/HTTP.c:1627
+msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1672
+msgid "Retrying with access authorization information."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1684
+msgid "Show the 401 message body?"
+msgstr "ðÏËÁÚÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ËÏÄÕ 401?"
+
+#: WWW/Library/Implementation/HTTP.c:1729
+msgid "Show the 407 message body?"
+msgstr "ðÏËÁÚÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ËÏÄÕ 407?"
+
+#.
+#. **	Bad or unknown server_status number.
+#. **	Take a chance and hope there is
+#. **	something to display. - FM
+#.
+#: WWW/Library/Implementation/HTTP.c:1834
+msgid "Unknown status reply from server!"
+msgstr "îÅצÄÏÍÉÊ ×¦ÄÇÕË ÓÔÁÔÕÓÕ ×¦Ä ÓÅÒ×ÅÒÁ!"
+
+#: WWW/Library/Implementation/HTTelnet.c:101
+#, c-format
+msgid "remote %s session:"
+msgstr "צÄÁÌÅÎÁ %s ÓÅÓ¦Ñ:"
+
+#: WWW/Library/Implementation/HTWAIS.c:161
+msgid "Could not connect to WAIS server."
+msgstr "îÅÍÏÖÌÉ×Ï Ð¦Ä'¤ÄÎÁÔÉÓÑ ÄÏ ÓÅÒ×ÅÒÁ WAIS."
+
+#: WWW/Library/Implementation/HTWAIS.c:170
+msgid "Could not open WAIS connection for reading."
+msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ Ú'¤ÄÎÁÎÎÑ ÄÏ WAIS ÄÌÑ ÞÉÔÁÎÎÑ."
+
+#: WWW/Library/Implementation/HTWAIS.c:194
+msgid "Diagnostic code is "
+msgstr "ëÏÄ Ä¦ÁÇÎÏÓÔÉËÉ ¤ "
+
+#: WWW/Library/Implementation/HTWAIS.c:463
+msgid "Index "
+msgstr "¶ÎÄÅËÓ "
+
+#: WWW/Library/Implementation/HTWAIS.c:467
+#, c-format
+msgid " contains the following %d item%s relevant to \""
+msgstr " ͦÓÔÉÔØ ÎÁÓÔÕÐΦ %d ÐÕÎËÔ%s ÓÔÏÓÏ×ÎÏ \""
+
+#: WWW/Library/Implementation/HTWAIS.c:475
+msgid "The first figure after each entry is its relative score, "
+msgstr "ðÅÒÛÁ ƦÇÕÒÁ ЦÓÌÑ ËÏÖÎÏÇÏ ÐÕÎËÔÕ - ÊÏÇÏ ×¦ÄÎÏÓÎÉÊ ÂÁÌ, "
+
+#: WWW/Library/Implementation/HTWAIS.c:476
+msgid "the second is the number of lines in the item."
+msgstr "ÄÒÕÇÁ - ˦ÌØ˦ÓÔØ ÒÑÄË¦× Õ ÎØÏÍÕ."
+
+#: WWW/Library/Implementation/HTWAIS.c:517
+msgid " (bad file name)"
+msgstr " (ÐÏÇÁÎÅ ¦Í'Ñ ÆÁÊÌÕ)"
+
+#: WWW/Library/Implementation/HTWAIS.c:542
+msgid "(bad doc id)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:558
+msgid "(Short Header record, can't display)"
+msgstr "(ëÏÒÏÔËÅ ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ, ÎÅÍÏÖÌÉ×Ï ×¦ÄÏÂÒÁÚÉÔÉ)"
+
+#: WWW/Library/Implementation/HTWAIS.c:565
+msgid ""
+"\n"
+"Long Header record, can't display\n"
+msgstr ""
+"\n"
+"úÁÄÏ×ÇÅ ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ, ÎÅÍÏÖÌÉ×Ï ×¦ÄÏÂÒÁÚÉÔÉ\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:572
+msgid ""
+"\n"
+"Text record\n"
+msgstr ""
+"\n"
+"ôÅËÓÔÏ×Å ÐÏÌÅ\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:581
+msgid ""
+"\n"
+"Headline record, can't display\n"
+msgstr ""
+"\n"
+"ðÏÌÅ \"Headline\", ÎÅÍÏÖÌÉ×Ï ×¦ÄÏÂÒÁÚÉÔÉ\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:589
+msgid ""
+"\n"
+"Code record, can't display\n"
+msgstr ""
+"\n"
+"ðÏÌÅ \"Code\", ÎÅÍÏÖÌÉ×Ï ×¦ÄÏÂÒÁÚÉÔÉ\n"
+"\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:689
+msgid "Syntax error in WAIS URL"
+msgstr "óÉÎÔÁËÓÉÞÎÁ ÐÏÍÉÌËÁ Õ WAIS URL"
+
+#: WWW/Library/Implementation/HTWAIS.c:759
+msgid " (WAIS Index)"
+msgstr " (¶ÎÄÅËÓ WAIS)"
+
+#: WWW/Library/Implementation/HTWAIS.c:766
+msgid "WAIS Index: "
+msgstr "¶ÎÄÅËÓ WAIS: "
+
+#: WWW/Library/Implementation/HTWAIS.c:772
+msgid "This is a link for searching the "
+msgstr "ãÅ ÐÏÓÉÌÁÎÎÑ ÄÌÑ ÐÏÛÕËÕ Õ "
+
+#: WWW/Library/Implementation/HTWAIS.c:776
+msgid " WAIS Index.\n"
+msgstr " ¶ÎÄÅËÓ¦ WAIS.\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:803
+msgid ""
+"\n"
+"Enter the 's'earch command and then specify search words.\n"
+msgstr ""
+"\n"
+"÷×ÅĦÔØ 's' ÄÌÑ ÐÏÛÕËÕ ÔÁ ×ËÁÖ¦ÔØ ËÌÀÞÏצ ÓÌÏ×Á.\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:825
+msgid " (in "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:834
+msgid "WAIS Search of \""
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:838
+msgid "\" in: "
+msgstr "\" Õ: "
+
+#: WWW/Library/Implementation/HTWAIS.c:853
+msgid "HTWAIS: Request too large."
+msgstr "HTWAIS: úÁÐÉÔ ÚÁ×ÅÌÉËÉÊ."
+
+#: WWW/Library/Implementation/HTWAIS.c:862
+msgid "Searching WAIS database..."
+msgstr "ûÕËÁ¤ÍÏ Õ ÂÁÚ¦ ÄÁÎÉÈ WAIS..."
+
+#: WWW/Library/Implementation/HTWAIS.c:872
+msgid "Search interrupted."
+msgstr "ðÏÛÕË ÐÅÒÅÒ×ÁÎÏ."
+
+#: WWW/Library/Implementation/HTWAIS.c:922
+msgid "Can't convert format of WAIS document"
+msgstr "îÅ ÍÏÖÕ ÓËÏÎ×ÅÒÔÕ×ÁÔÉ ÆÏÒÍÁÔ ÄÏËÕÍÅÎÔÁ WAIS"
+
+#: WWW/Library/Implementation/HTWAIS.c:966
+msgid "HTWAIS: Request too long."
+msgstr "HTWAIS: úÁÐÉÔ ÚÁÄÏ×ÇÉÊ."
+
+#.
+#. **	Actually do the transaction given by request_message.
+#.
+#: WWW/Library/Implementation/HTWAIS.c:980
+msgid "Fetching WAIS document..."
+msgstr "ôÑÇÎÅÍÏ ÄÏËÕÍÅÎÔ WAIS..."
+
+#. display_search_response(target, retrieval_response,
+#. wais_database, keywords);
+#: WWW/Library/Implementation/HTWAIS.c:1019
+msgid "No text was returned!\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:287
+msgid " NOT GIVEN in source file; "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:311
+msgid " WAIS source file"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:318
+msgid " description"
+msgstr " ÏÐÉÓ"
+
+#: WWW/Library/Implementation/HTWSRC.c:328
+msgid "Access links"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:346
+msgid "Direct access"
+msgstr "ðÒÑÍÉÊ ÄÏÓÔÕÐ"
+
+#. * Proxy will be used if defined, so let user know that - FM *
+#: WWW/Library/Implementation/HTWSRC.c:349
+msgid " (or via proxy server, if defined)"
+msgstr " (ÞÉ ÞÅÒÅÚ ÐÒÏËÓ¦, ÑËÝÏ ÊÏÇÏ ×ÉÚÎÁÞÅÎÏ)"
+
+# * Andriy Rysin <arysin@yahoo.com>
+#: WWW/Library/Implementation/HTWSRC.c:364
+msgid "Maintainer"
+msgstr "óÕÐÒÏצÄ"
+
+#: WWW/Library/Implementation/HTWSRC.c:372
+msgid "Host"
+msgstr "èÏÓÔ"
+
+#: src/GridText.c:688
+msgid "Memory exhausted, display interrupted!"
+msgstr ""
+
+#: src/GridText.c:693
+msgid "Memory exhausted, will interrupt transfer!"
+msgstr ""
+
+#: src/GridText.c:3578
+msgid " *** MEMORY EXHAUSTED ***"
+msgstr " *** ðáí'ñôø ÷éþåòðáîï ***"
+
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
+msgid "unknown field or link"
+msgstr "ÎÅצÄÏÍÅ ÐÏÌÅ ÞÉ ÐÏÓÉÌÁÎÎÑ"
+
+#: src/GridText.c:6023
+msgid "text entry field"
+msgstr "ÔÅËÓÔÏ×Å ÐÏÌÅ"
+
+#: src/GridText.c:6026
+msgid "password entry field"
+msgstr "ÐÏÌÅ ××ÏÄÕ ÐÁÒÏÌÑ"
+
+#: src/GridText.c:6029
+msgid "checkbox"
+msgstr "ÐÅÒÅÍÉËÁÞ"
+
+#: src/GridText.c:6032
+msgid "radio button"
+msgstr "ÒÁĦÏËÎÏÐËÁ"
+
+#: src/GridText.c:6035
+msgid "submit button"
+msgstr "ËÎÏÐËÁ ÚÁÔ×ÅÒÄÖÅÎÎÑ"
+
+#: src/GridText.c:6038
+msgid "reset button"
+msgstr "ËÌÁצÛÁ צÄͦÎÉ ÚͦÎ"
+
+#: src/GridText.c:6041
+msgid "popup menu"
+msgstr "×ÓÐÌÉ×ÁÀÞÅ ÍÅÎÀ"
+
+#: src/GridText.c:6044
+msgid "hidden form field"
+msgstr "ÐÒÉÈÏ×ÁÎÅ ÐÏÌÅ ÆÏÒÍÉ"
+
+#: src/GridText.c:6047
+msgid "text entry area"
+msgstr "ÔÅËÓÔÏ×Á ÏÂÌÁÓÔØ"
+
+#: src/GridText.c:6050
+msgid "range entry field"
+msgstr ""
+
+#: src/GridText.c:6053
+msgid "file entry field"
+msgstr "ÐÏÌÅ ××ÏÄÕ ÆÁÊÌÕ"
+
+#: src/GridText.c:6056
+msgid "text-submit field"
+msgstr ""
+
+#: src/GridText.c:6059
+msgid "image-submit button"
+msgstr "ÚÏÂÒÁÖÅÎÎÑ-ËÎÏÐËÁ ÄÌÑ ×¦ÄÓÉÌËÉ"
+
+#: src/GridText.c:6062
+msgid "keygen field"
+msgstr ""
+
+#: src/GridText.c:6065
+msgid "unknown form field"
+msgstr "ÎÅצÄÏÍÅ ÐÏÌÅ ÆÏÒÍÉ"
+
+#: src/GridText.c:10066
+msgid "Can't open file for uploading"
+msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÞÉÔÁÎÎÑ."
+
+#: src/GridText.c:11218
+#, c-format
+msgid "Submitting %s"
+msgstr "úÁÔ×ÅÒÄÖÕ¤ÍÏ %s"
+
+#. ugliness has happened; inform user and do the best we can
+#: src/GridText.c:12375
+msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
+msgstr ""
+
+#. don't show previous state
+#: src/GridText.c:12581
+msgid "Wrap lines to fit displayed area?"
+msgstr ""
+
+#: src/GridText.c:12633
+msgid "Very long lines have been wrapped!"
+msgstr "äÕÖÅ ÄÏ×Ǧ ÒÑÄËÉ ÂÕÌÉ ÚÁ×ÅÒÎÕÔ¦!"
+
+#: src/GridText.c:13079
+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:154 src/LYShowInfo.c:318
+msgid "bytes"
+msgstr "ÂÁÊÔÉ"
+
+# @ EasyTag cupsdconf.po kfind kfindpart kppp lynx
+# * Olexander Kunytsa, <kunia@istc.kiev.ua>
+#: src/HTAlert.c:155
+msgid "KB"
+msgstr "ëÂ"
+
+#: src/HTAlert.c:274
+#, c-format
+msgid "Read %s of %s of data"
+msgstr "ðÒÏÞÉÔÁÎÏ %s Ú %s ÄÁÎÉÈ"
+
+#: src/HTAlert.c:276
+#, c-format
+msgid "Read %s of data"
+msgstr "ðÒÏÞÉÔÁÎÏ %s ÄÁÎÉÈ"
+
+#: src/HTAlert.c:281
+#, c-format
+msgid ", %s/sec"
+msgstr ", %s/ÓÅË"
+
+#: src/HTAlert.c:290
+#, fuzzy, c-format
+msgid " (stalled for %s)"
+msgstr " (ÐÒÉÚÕÐÉÎÅÎÏ ÎÁ %ld ÓÅË)"
+
+#: src/HTAlert.c:294
+#, fuzzy, c-format
+msgid ", ETA %s"
+msgstr ", ETA %ld ÓÅË"
+
+#: src/HTAlert.c:301
+msgid " (Press 'z' to abort)"
+msgstr " (îÁÔÉÓΦÔØ 'z' ÝÏ ÚÕÐÉÎÉÔÉ)"
+
+# @ CenterICQ Dia Gabber gnome-libs gphoto guppi kdelibs kview libgnomeui lynx mc mutt-1.4-4.src.rpm.dir_1_1_mutt-_po_uk.po
+# * Cawko Xakep <xakep@snark.ukma.kiev.ua>
+#. 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:342 src/HTAlert.c:390
+msgid "yes"
+msgstr "ÔÁË"
+
+#: src/HTAlert.c:345 src/HTAlert.c:391
+msgid "no"
+msgstr "Φ"
+
+#: src/HTML.c:5985
+msgid "Description:"
+msgstr "ïÐÉÓ:"
+
+# @ GIMP evolution gimp-perl guppi kcminfo kfind kfindpart kpm kppp lynx nautilus rpmdrake xmms
+# * Andriy Rysin <arysin@yahoo.com>
+#: src/HTML.c:5990
+msgid "(none)"
+msgstr "(ΦÞÏÇÏ)"
+
+#: src/HTML.c:5994
+msgid "Filepath:"
+msgstr ""
+
+#: src/HTML.c:5999
+msgid "(unknown)"
+msgstr "(ÎÅצÄÏÍÉÊ)"
+
+#: src/HTML.c:7452
+msgid "Document has only hidden links.  Use the 'l'ist command."
+msgstr "äÏËÕÍÅÎÔ Í¦ÓÔÉÔØ ÌÉÛÅ ÐÒÉÈÏ×ÁΦ ÐÏÓÉÌÁÎÎÑ. ÷ÉËÏÒÉÓÔÁÊÔÅ ËÏÍÁÎÄÕ 'l'ist."
+
+#: src/HTML.c:7958
+msgid "Source cache error - disk full?"
+msgstr "ðÏÍÉÌËÁ ËÅÛÕ×ÁÎÎÑ ÄÖÅÒÅÌÁ - ÚÁÐÏ×ÎÅÎÉÊ ÄÉÓË?"
+
+#: src/HTML.c:7971
+msgid "Source cache error - not enough memory!"
+msgstr "ðÏÍÉÌËÁ ËÅÛÕ×ÁÎÎÑ ÄÖÅÒÅÌÁ - ÎÅÄÏÓÔÁÔÎØÏ ÐÁÍ'ÑÔ¦!"
+
+#: src/LYBookmark.c:167
+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 ""
+
+#: src/LYBookmark.c:379
+msgid ""
+"     You can delete links by the 'R' key<br>\n"
+"<ol>\n"
+msgstr ""
+"     úÁËÌÁÄÉÎËÕ ÍÏÖÎÁ ×ÉÄÁÌÉÔÉ ÎÁÔÉÓÎÕ×ÛÉ ËÌÁצÛÕ 'R'<br>\n"
+"<ol>\n"
+
+#: src/LYBookmark.c:382
+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 ""
+"     ÷É ÍÏÖÅÔÅ ×ÉÄÁÌÑÔÉ ÚÁËÌÁÄÉÎËÉ ÚÁ ÄÏÐÏÍÏÇÏÀ ËÏÍÁÎÄÉ ×ÉÄÁÌÅÎÎÑ. úÁÚ×ÉÞÁÊ\n"
+"     ÃÅ ËÌÁצÛÁ 'R', ÈÏÞÁ ÃÅ ÍÏÖÅ ÂÕÔÉ ÚͦÎÅÎÏ ×ÁÛÉÍ ÓÉÓÔÅÍÎÉÍ\n"
+"     ÁÄͦΦÓÔÒÁÔÏÒÏÍ."
+
+#: src/LYBookmark.c:386
+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 ""
+"     ãÅÊ ÆÁÊÌ ÍÏÖÎÁ ÔÁËÏÖ ÒÅÄÁÇÕ×ÁÔÉ Ú×ÉÞÁÊÎÉÍ ÔÅËÓÔÏ×ÉÍ ÒÅÄÁËÔÏÒÏÍ, ÝÏÂ\n"
+"     ×ÉÄÁÌÑÔÉ ÓÔÁÒ¦ ÞÉ ÎÅצÒΦ ÐÏÓÉÌÁÎÎÑ, ÞÉ Í¦ÎÑÔÉ §È ÐÏÒÑÄÏË."
+
+#: src/LYBookmark.c:389
+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 ""
+"õ×ÁÇÁ: ÑËÝÏ ×É ÒÅÄÁÇÕ¤ÔÅ ÃÅÊ ÆÁÊÌ \"×ÒÕÞÎÕ\",\n"
+"       ÎÅ ÚͦÎÀÊÔÅ ÆÏÒÍÁÔ ÒÑÄ˦×\n"
+"       ÔÁ ÎÅ ÄÏÄÁ×ÁÊÔÅ ¦ÎÛ¦ ÔÅÇÉ HTML.\n"
+"       ÷ÐÅ×ÎÀÊÔÅÓÑ, ÝÏ ËÏÖÎÁ ÚÁËÌÁÄÉÎËÁ ÐÏÓ¦ÄÁ¤ ÏËÒÅÍÉÊ ÒÑÄÏË."
+
+#: src/LYBookmark.c:681
+#, c-format
+msgid "File may be recoverable from %s during this session"
+msgstr ""
+
+#.
+#. *  Neither the path as given nor any components examined by
+#. *  backing up were stat()able. - kw
+#.
+#: src/LYCgi.c:231
+msgid "Unable to access cgi script"
+msgstr "îÅÍÏÖÌÉ×Ï Ä¦ÓÔÁÔÉÓÑ ÄÏ ÓËÒÉÐÔÁ cgi"
+
+#: src/LYCgi.c:654 src/LYCgi.c:657
+msgid "Good Advice"
+msgstr "çÁÒÎÁ ðÏÒÁÄÁ"
+
+#: src/LYCgi.c:660
+msgid "An excellent http server for VMS is available via"
+msgstr "þÕÄÏ×ÉÊ http ÓÅÒ×ÅÒ ÓÔÏÓÏ×ÎÏ VMS ÄÏÓÔÕÐÎÉÊ ÞÅÒÅÚ"
+
+#: src/LYCgi.c:667
+msgid "this link"
+msgstr "ÃÅ ÐÏÓÉÌÁÎÎÑ"
+
+#: src/LYCgi.c:671
+msgid "It provides state of the art CGI script support.\n"
+msgstr ""
+
+# msgstr "÷ÉÈ¦Ä ÞÅÒÅÚ ÐÅÒÅÒÉ×ÁÎÎÑ:"
+# msgstr "÷ÉÈ¦Ä ÞÅÒÅÚ ÐÅÒÅÒÉ×ÁÎÎÑ:"
+#: src/LYClean.c:122
+msgid "Exiting via interrupt:"
+msgstr "úÁ×ÅÒÛÕ¤ÍÏ ÚÁ ÓÉÇÎÁÌÏÍ:"
+
+#: src/LYCookie.c:2462
+msgid "(from a previous session)"
+msgstr "(Ú ÐÏÐÅÒÅÄÎØϧ ÓÅÓ¦§)"
+
+#: src/LYCookie.c:2522
+msgid "Maximum Gobble Date:"
+msgstr ""
+
+#: src/LYCookie.c:2564
+msgid "Internal"
+msgstr "÷ÎÕÔÒ¦ÛΦÊ"
+
+#: src/LYCookie.c:2565
+msgid "cookie_domain_flag_set error, aborting program"
+msgstr "ÐÏÍÉÌËÁ Õ cookie_domain_flag_set, ÕÒÉ×Á¤ÍÏ ÐÒÏÇÒÁÍÕ"
+
+#: src/LYCurses.c:1004
+msgid "Terminal initialisation failed - unknown terminal type?"
+msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÔÅÒͦÎÁÌ - ÎÅצÄÏÍÉÊ ÔÉÐ ÔÅÒͦÎÁÌÕ?"
+
+#: src/LYCurses.c:1426
+msgid "Terminal ="
+msgstr "ôÅÒͦÎÁÌ ="
+
+#: src/LYCurses.c:1430
+msgid "You must use a vt100, 200, etc. terminal with this program."
+msgstr "÷É ÍÁ¤ÔÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ Ú Ã¦¤À ÐÒÏÇÒÁÍÏÀ ÔÅÒͦÎÁÌÉ vt100, 200 ÔÏÝÏ."
+
+#: src/LYCurses.c:1480
+msgid "Your Terminal type is unknown!"
+msgstr "ôÉÐ ×ÁÛÏÇÏ ÔÅÒͦÎÁÌÕ ÎÅצÄÏÍÉÊ!"
+
+#: src/LYCurses.c:1481
+msgid "Enter a terminal type:"
+msgstr "÷×ÅĦÔØ ÔÉÐ ÔÅÒͦÎÁÌÕ:"
+
+#: src/LYCurses.c:1495
+msgid "TERMINAL TYPE IS SET TO"
+msgstr "ôéð ôåòí¶îáìõ ÷óôáîï÷ìåîï õ"
+
+#: src/LYCurses.c:1994
+#, c-format
+msgid ""
+"\n"
+"A Fatal error has occurred in %s Ver. %s\n"
+msgstr ""
+"\n"
+"æÁÔÁÌØÎÁ ÐÏÍÉÌËÁ × %s, ×ÅÒÓ¦Ñ %s\n"
+
+#: src/LYCurses.c:1996
+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 ""
+
+#: src/LYEdit.c:249
+msgid "Editor killed by signal"
+msgstr "òÅÄÁËÔÏÒÁ ×ÂÉÔÏ ÓÉÇÎÁÌÏÍ"
+
+#: src/LYEdit.c:251
+#, c-format
+msgid "Editor returned with error status, %s"
+msgstr "òÅÄÁËÔÏÒ ÐÏ×ÅÒÎÕ× ÐÏÍÉÌËÕ, %s"
+
+#: src/LYEdit.c:252
+msgid "reason unknown."
+msgstr "ÐÒÉÞÉÎÁ ÎÅצÄÏÍÁ."
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#: src/LYDownload.c:517
+msgid "Downloaded link:"
+msgstr "úÁ×ÁÎÔÁÖÅÎÏ ÐÏÓÉÌÁÎÎÑ:"
+
+# msgstr "ðÒÏÐÏÎÕ¤ÔØÓÑ ¦Í'Ñ ÆÁÊÌÕ:"
+# msgstr "ðÒÏÐÏÎÕ¤ÔØÓÑ ¦Í'Ñ ÆÁÊÌÕ:"
+#: src/LYDownload.c:522
+msgid "Suggested file name:"
+msgstr "úÁÐÒÏÐÏÎÏ×ÁÎÅ ¦Í'Ñ ÆÁÊÌÕ:"
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#: src/LYDownload.c:527
+msgid "Standard download options:"
+msgstr "óÔÁÎÄÁÒÔΦ ÐÁÒÁÍÅÔÒÉ ÚÁ×ÁÎÔÁÖÕ×ÁÎÎÑ:"
+
+#: src/LYDownload.c:528
+msgid "Download options:"
+msgstr "ðÁÒÁÍÅÔÒÉ ÚÁ×ÁÎÔÁÖÕ×ÁÎÎÑ:"
+
+# @ Galeon- drkonqi kdelibs kmail konqueror lynx
+# * Andriy Rysin <arysin@yahoo.com>
+#: src/LYDownload.c:544
+msgid "Save to disk"
+msgstr "úÂÅÒÅÇÔÉ ÎÁ ÄÉÓË"
+
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "ðÅÒÅÇÌÑÎÕÔÉ ÆÁÊÌ "
+
+#: src/LYDownload.c:565
+msgid "Save to disk disabled."
+msgstr "úÁÐÉÓÕ×ÁÔÉ ÎÁ ÄÉÓË ÚÁÂÏÒÏÎÅÎÏ."
+
+#: src/LYDownload.c:569 src/LYPrint.c:1327
+msgid "Local additions:"
+msgstr "ìÏËÁÌØΦ ÄÏÄÁÔËÉ:"
+
+#: src/LYDownload.c:578 src/LYUpload.c:216
+msgid "No Name Given"
+msgstr "¶Í'Ñ ÎÅ ÚÁÄÁÎÅ"
+
+# 8-| ÎÅ ÚÎÁÀ...
+# 8-| ÎÅ ÚÎÁÀ...
+#: src/LYHistory.c:657
+msgid "You selected:"
+msgstr "÷É ×ÉÂÒÁÌÉ:"
+
+#: src/LYHistory.c:681 src/LYHistory.c:921
+msgid "(no address)"
+msgstr "(ÂÅÚ ÁÄÒÅÓÉ)"
+
+#: src/LYHistory.c:685
+msgid " (internal)"
+msgstr " (×ÎÕÔÒ¦ÛΦÊ)"
+
+#: src/LYHistory.c:687
+msgid " (was internal)"
+msgstr " (ÂÕ× ×ÎÕÔÒ¦ÛΦÊ)"
+
+#: src/LYHistory.c:785
+msgid " (From History)"
+msgstr " (ú ÖÕÒÎÁÌÕ)"
+
+#: src/LYHistory.c:841
+msgid "You visited (POSTs, bookmark, menu and list files excluded):"
+msgstr "÷É ×¦ÄצÄÕ×ÁÌÉ (ÏËÒ¦Í POSTs, ÚÁËÌÁÄÉÎÏË, ÍÅÎÀ ÔÁ ÓÐÉÓË¦× ÆÁÊ̦×):"
+
+#: src/LYHistory.c:1137
+msgid "(No messages yet)"
+msgstr "(ìÉÓÔ¦× ÝÅ ÎÅÍÁ)"
+
+#: src/LYLeaks.c:209
+msgid "Invalid pointer detected."
+msgstr ""
+
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
+msgid "Pointer:"
+msgstr "÷ËÁÚ¦×ÎÉË:"
+
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
+msgid "FileName:"
+msgstr "¶Í'Ñ ÆÁÊÌÕ:"
+
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
+msgid "LineCount:"
+msgstr "ë¦ÌØË. ÒÑÄ˦×:"
+
+#: src/LYLeaks.c:249
+msgid "Memory leak detected."
+msgstr "ðÏͦÞÅÎÏ ×ÉÔ¦Ë ÐÁÍ'ÑÔ¦."
+
+#: src/LYLeaks.c:257
+msgid "Contains:"
+msgstr "í¦ÓÔÉÔØ:"
+
+#: src/LYLeaks.c:270
+msgid "ByteSize:"
+msgstr "âÁÊÔ¦×:"
+
+#: src/LYLeaks.c:284
+msgid "realloced:"
+msgstr ""
+
+#: src/LYLeaks.c:307
+msgid "Total memory leakage this run:"
+msgstr ""
+
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr ""
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
+msgid "References in "
+msgstr "ðÏÓÉÌÁÎØ Õ "
+
+#: src/LYList.c:86
+msgid "this document:"
+msgstr "ÃØÏÍÕ ÄÏËÕÍÅÎÔ¦:"
+
+#: src/LYList.c:92
+msgid "Visible links:"
+msgstr "÷ÉÄÉͦ ÐÏÓÉÌÁÎÎÑ:"
+
+#: src/LYList.c:194 src/LYList.c:315
+msgid "Hidden links:"
+msgstr "ðÒÉÈÏ×ÁΦ ÐÏÓÉÌÁÎÎÑ:"
+
+#: src/LYList.c:262
+msgid "References"
+msgstr "ðÏÓÉÌÁÎÎÑ"
+
+#: src/LYList.c:264
+msgid "Visible links"
+msgstr "÷ÉÄÉͦ ÐÏÓÉÌÁÎÎÑ"
+
+#: src/LYLocal.c:267
+#, c-format
+msgid "Unable to get status of '%s'."
+msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÓÔÁÔÕÓ '%s'."
+
+#: src/LYLocal.c:301
+msgid "The selected item is not a file or a directory!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:366
+#, c-format
+msgid "Unable to %s due to system error!"
+msgstr ""
+
+#. error return
+#: src/LYLocal.c:400
+#, c-format
+msgid "Probable failure to %s due to system error!"
+msgstr ""
+
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "×ÉÄÁÌÉÔÉ %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr ""
+
+#: src/LYLocal.c:508
+#, c-format
+msgid "move %s to %s"
+msgstr ""
+
+#: src/LYLocal.c:548
+msgid "There is already a directory with that name!  Request ignored."
+msgstr "ëÁÔÁÌÏÇ Ú ÔÁËÉÍ ¦ÍÅÎÅÍ ÕÖÅ ¦ÓÎÕ¤!  ÷ÉÍÏÇÕ ÐÒϦÇÎÏÒÏ×ÁÎÏ."
+
+#: src/LYLocal.c:550
+msgid "There is already a file with that name!  Request ignored."
+msgstr "æÁÊÌ ¦Ú ÔÁËÉÍ ¦ÍÅÎÅÍ ÕÖÅ ¦ÓÎÕ¤!  ÷ÉÍÏÇÕ ÐÒϦÇÎÏÒÏ×ÁÎÏ."
+
+#: src/LYLocal.c:552
+msgid "The specified name is already in use!  Request ignored."
+msgstr "÷ËÁÚÁÎÅ ¦Í'Ñ ×ÖÅ × ÒÏÂÏÔ¦!  ÷ÉÍÏÇÕ ÐÒϦÇÎÏÒÏ×ÁÎÏ."
+
+#: src/LYLocal.c:563
+msgid "Destination has different owner!  Request denied."
+msgstr ""
+
+#: src/LYLocal.c:566
+msgid "Destination is not a valid directory!  Request denied."
+msgstr ""
+
+#: src/LYLocal.c:588
+msgid "Remove all tagged files and directories?"
+msgstr "÷ÉÄÁÌÉÔÉ ÕÓ¦ ÐÏÚÎÁÞÅΦ ÆÁÊÌÉ ÔÁ ËÁÔÁÌÏÇÉ?"
+
+#: src/LYLocal.c:647
+msgid "Enter new location for tagged items: "
+msgstr "÷×ÅĦÔØ ÎÏ׊ͦÓÃÅ ÄÌÑ ÐÏÚÎÁÞÅÎÉÈ ÐÕÎËÔ¦×: "
+
+#: src/LYLocal.c:716
+msgid "Path too long"
+msgstr "úÁÄÏ×ÇÉÊ ÛÌÑÈ"
+
+#: src/LYLocal.c:747
+msgid "Source and destination are the same location - request ignored!"
+msgstr ""
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#: src/LYLocal.c:805
+msgid "Enter new name for directory: "
+msgstr "÷×ÅĦÔØ ÎÏ×Å ¦Í'Ñ ÄÌÑ ËÁÔÁÌÏÇÕ: "
+
+#: src/LYLocal.c:807
+msgid "Enter new name for file: "
+msgstr "÷×ÅĦÔØ ÎÏ×Å ¦Í'Ñ ÄÌÑ ÆÁÊÌÕ: "
+
+#: src/LYLocal.c:819
+msgid "Illegal character (path-separator) found! Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:868
+msgid "Enter new location for directory: "
+msgstr "÷×ÅĦÔØ ÎÏ×ÉÊ ÛÌÑÈ ËÁÔÁÌÏÇÕ: "
+
+#: src/LYLocal.c:874
+msgid "Enter new location for file: "
+msgstr "÷×ÅĦÔØ ÎÏ×ÉÊ ÛÌÑÈ ÆÁÊÌÕ: "
+
+#: src/LYLocal.c:901
+msgid "Unexpected failure - unable to find trailing path separator"
+msgstr ""
+
+#: src/LYLocal.c:921
+msgid "Source and destination are the same location!  Request ignored!"
+msgstr ""
+
+#: src/LYLocal.c:970
+msgid "Modify name, location, or permission (n, l, or p): "
+msgstr "úͦÎÉÔÉ ÎÁÚ×Õ(n), ÛÌÑÈ(l) ÞÉ ÐÒÁ×Á ÄÏÓÔÕÐÕ(p): "
+
+#: src/LYLocal.c:972
+msgid "Modify name or location (n or l): "
+msgstr "úͦÎÉÔÉ ÎÁÚ×Õ(n) ÞÉ ÛÌÑÈ(l): "
+
+#.
+#. *	Code for changing ownership needed here.
+#.
+#: src/LYLocal.c:1001
+msgid "This feature not yet implemented!"
+msgstr "ãÀ ÍÏÖÌÉצÓÔØ ÝÅ ÎÅ ÒÅÁ̦ÚÏ×ÁÎÏ!"
+
+#: src/LYLocal.c:1019
+msgid "Enter name of file to create: "
+msgstr "÷×ÅĦÔØ ¦Í'Ñ ÆÁÊÌÕ: "
+
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
+msgid "Illegal redirection \"//\" found! Request ignored."
+msgstr ""
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#: src/LYLocal.c:1061
+msgid "Enter name for new directory: "
+msgstr "÷×ÅĦÔØ ÎÏ×Å ¦Í'Ñ ÄÌÑ ËÁÔÁÌÏÇÕ: "
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#: src/LYLocal.c:1106
+msgid "Create file or directory (f or d): "
+msgstr "óÔ×ÏÒÉÔÉ ÆÁÊÌ ÞÉ ËÁÔÁÌÏÇ (f ÞÉ d): "
+
+#: src/LYLocal.c:1146
+#, c-format
+msgid "Remove '%s' and all of its contents?"
+msgstr "÷ÉÄÁÌÉÔÉ '%s' ÒÁÚÏÍ ¦Ú ÕÓ¦Í ×ͦÓÔÏÍ?"
+
+#: src/LYLocal.c:1149
+msgid "Remove directory and all of its contents?"
+msgstr "÷ÉÄÁÌÉÔÉ ËÁÔÁÌÏÇ ÒÁÚÏÍ ¦Ú ÕÓ¦Í ×ͦÓÔÏÍ?"
+
+#: src/LYLocal.c:1153
+#, c-format
+msgid "Remove file '%s'?"
+msgstr "÷ÉÄÁÌÉÔÉ ÆÁÊÌ '%s'?"
+
+#: src/LYLocal.c:1155
+msgid "Remove file?"
+msgstr "÷ÉÄÁÌÉÔÉ ÆÁÊÌ?"
+
+# 8-| ÎÅ ÚÎÁÀ...
+# 8-| ÎÅ ÚÎÁÀ...
+#: src/LYLocal.c:1160
+#, c-format
+msgid "Remove symbolic link '%s'?"
+msgstr "÷ÉÄÁÌÉÔÉ ÓÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ '%s'?"
+
+# 8-| ÎÅ ÚÎÁÀ...
+# 8-| ÎÅ ÚÎÁÀ...
+#: src/LYLocal.c:1162
+msgid "Remove symbolic link?"
+msgstr "÷ÉÄÁÌÉÔÉ ÓÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ?"
+
+#: src/LYLocal.c:1248
+msgid "Sorry, don't know how to permit non-UNIX files yet."
+msgstr ""
+
+#: src/LYLocal.c:1278
+msgid "Unable to open permit options file"
+msgstr ""
+
+#: src/LYLocal.c:1305
+msgid "Specify permissions below:"
+msgstr "÷ËÁÖ¦ÔØ ÐÒÁ×Á ÄÏÓÔÕÐÕ:"
+
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
+msgid "Owner:"
+msgstr "÷ÌÁÓÎÉË:"
+
+#: src/LYLocal.c:1322
+msgid "Group"
+msgstr "çÒÕÐÁ"
+
+#: src/LYLocal.c:1338
+msgid "Others:"
+msgstr "¶ÎÛ¦:"
+
+#: src/LYLocal.c:1356
+msgid "form to permit"
+msgstr ""
+
+#: src/LYLocal.c:1452
+msgid "Invalid mode format."
+msgstr "îÅצÒÎÉÊ ÆÏÒÍÁÔ ÒÅÖÉÍÕ."
+
+#: src/LYLocal.c:1456
+msgid "Invalid syntax format."
+msgstr "îÅצÒÎÉÊ ÆÏÒÍÁÔ ÓÉÎÔÁËÓÉÓÕ."
+
+#: src/LYLocal.c:1645
+msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
+msgstr ""
+
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr ""
+
+#: src/LYLocal.c:1908
+#, c-format
+msgid "Executing %s "
+msgstr "÷ÉËÏÎÕÀ %s "
+
+#: src/LYLocal.c:1911
+msgid "Executing system command. This might take a while."
+msgstr "÷ÉËÏÎÕÀ ÓÉÓÔÅÍÎÕ ËÏÍÁÎÄÕ. ãÅ ÍÏÖÅ ÚÁÊÎÑÔÉ ÔÒÏÈÉ ÞÁÓÕ."
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#: src/LYLocal.c:1985
+msgid "Current directory:"
+msgstr "ðÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ:"
+
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
+msgid "Current selection:"
+msgstr "÷ÉĦÌÅÎÉÊ ÅÌÅÍÅÎÔ:"
+
+#: src/LYLocal.c:1992
+msgid "Nothing currently selected."
+msgstr "î¦ÞÏÇÏ ÎÅ ×ÉĦÌÅÎÏ"
+
+#: src/LYLocal.c:2007
+msgid "tagged item:"
+msgstr "צÄͦÞÅÎÉÊ ÅÌÅÍÅÎÔ:"
+
+#: src/LYLocal.c:2007
+msgid "tagged items:"
+msgstr "צÄͦÞÅΦ ÅÌÅÍÅÎÔÉ:"
+
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
+msgid "Illegal filename; request ignored."
+msgstr "îÅצÒÎÅ ¦Í'Ñ ÆÁÊÌÕ, ÚÁÐÉÔ ×¦ÄÈÉÌÅÎÏ."
+
+#. directory not writable
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
+msgid "Install in the selected directory not permitted."
+msgstr ""
+
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr ""
+
+# msgstr "è×ÉÌÉÎÏÞËÕ, ..."
+# msgstr "è×ÉÌÉÎÏÞËÕ, ..."
+#: src/LYLocal.c:2276
+msgid "Just a moment, ..."
+msgstr "úÁÞÅËÁÊÔÅ È×ÉÌØËÕ, ..."
+
+#: src/LYLocal.c:2293
+msgid "Error buiding install args"
+msgstr ""
+
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
+#, c-format
+msgid "Source and target are the same: %s"
+msgstr ""
+
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
+#, c-format
+msgid "Already in target directory: %s"
+msgstr ""
+
+# msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ ×ÉËÏÎÁÎÏ"
+# msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ ×ÉËÏÎÁÎÏ"
+#: src/LYLocal.c:2362
+msgid "Installation complete"
+msgstr "¶ÎÓÔÁÌÑæÀ ÚÁ×ÅÒÛÅÎÏ"
+
+#: src/LYLocal.c:2551
+msgid "Temporary URL or list would be too long."
+msgstr ""
+
+# * Yuriy Syrota <rasta@renome.rovno.ua>
+#: src/LYMail.c:534
+msgid "Sending"
+msgstr "÷¦ÄÓÉÌÁÎÎÑ"
+
+#: src/LYMail.c:1024
+#, c-format
+msgid "The link   %s :?: %s \n"
+msgstr ""
+
+#: src/LYMail.c:1026
+#, c-format
+msgid "called \"%s\"\n"
+msgstr "×ÉËÌÉËÁÎÏ \"%s\"\n"
+
+#: src/LYMail.c:1027
+#, c-format
+msgid "in the file \"%s\" called \"%s\"\n"
+msgstr "Õ ÆÁÊ̦ \"%s\" ×ÉËÌÉËÁÎÏÍÕ \"%s\"\n"
+
+#: src/LYMail.c:1028
+msgid "was requested but was not available."
+msgstr ""
+
+#: src/LYMail.c:1029
+msgid "Thought you might want to know."
+msgstr ""
+
+#: src/LYMail.c:1031
+msgid "This message was automatically generated by"
+msgstr "ãÅ ÐÏצÄÏÍÌÅÎÎÑ ÚÇÅÎÅÒÏ×ÁÎÏ Á×ÔÏÍÁÔÉÞÎÏ ÍÎÏÀ,"
+
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:969
+msgid "No Winsock found, sorry."
+msgstr "äÁÒÕÊÔÅ, Winsock ÎÅ ÚÎÁÊÄÅÎÏ."
+
+#: src/LYMain.c:1170
+msgid "You MUST define a valid TMP or TEMP area!\n"
+msgstr "÷É íõóéôå ×ËÁÚÁÔÉ TMP ÞÉ TEMP!\n"
+
+# ôåòí¶îïìïç¶ñ
+# msgstr "îÅÍÁ¤ ÔÁËÏÇÏ ËÁÔÁÌÏÇÕ"
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
+msgid "No such directory"
+msgstr "ôÁËÏÇÏ ËÁÔÁÌÏÇÕ ÎÅÍÁ¤"
+
+#: src/LYMain.c:1436
+#, c-format
+msgid ""
+"\n"
+"Configuration file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"æÁÊÌ ËÏÎƦÇÕÒÁÃ¦Ê %s ÎÅÄÏÓÔÕÐÎÉÊ.\n"
+"\n"
+
+#: src/LYMain.c:1446
+msgid ""
+"\n"
+"Lynx character sets not declared.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:1475
+msgid ""
+"\n"
+"Lynx edit map not declared.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:1504
+#, c-format
+msgid ""
+"\n"
+"Lynx file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"æÁÊÌ Lynx %s ÎÅÄÏÓÔÕÐÎÉÊ.\n"
+"\n"
+
+#: src/LYMain.c:1743
+msgid "Warning:"
+msgstr "õ×ÁÇÁ:"
+
+#: src/LYMain.c:2293
+msgid "persistent cookies state will be changed in next session only."
+msgstr ""
+
+#: src/LYMain.c:2540 src/LYMain.c:2588
+#, c-format
+msgid "Lynx: ignoring unrecognized charset=%s\n"
+msgstr ""
+
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
+msgstr "%s ÷ÅÒÓ¦Ñ %s (%s)\n"
+
+#: src/LYMain.c:3143
+#, c-format
+msgid "Built on %s %s %s\n"
+msgstr "ú¦ÂÒÁÎÏ ÎÁ %s %s %s\n"
+
+#: src/LYMain.c:3166
+msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+msgstr ""
+
+#: src/LYMain.c:3168
+msgid "Distributed under the GNU General Public License.\n"
+msgstr "òÏÚÐÏ×ÓÀÄÖÕ¤ÔØÓÑ ÚǦÄÎÏ Ú GNU General Public License.\n"
+
+#: src/LYMain.c:3170
+msgid ""
+"See http://lynx.isc.org/ and the online help for more information.\n"
+"\n"
+msgstr ""
+"äÉ× http://lynx.isc.org/ ÔÁ ÏÎÌÁÊÎ-ÄÏÐÏÍÏÇÕ, ÝÏ ×ÚÎÁÔÉ Â¦ÌØÛÅ.\n"
+"\n"
+
+#: src/LYMain.c:3919
+#, c-format
+msgid "USAGE: %s [options] [file]\n"
+msgstr "÷éëïòéóôáîîñ: %s [ÐÁÒÁÍÅÔÒÉ] [ÆÁÊÌ]\n"
+
+#: src/LYMain.c:3920
+msgid "Options are:\n"
+msgstr "ðÁÒÁÍÅÔÒÉ:\n"
+
+#: src/LYMain.c:4191
+#, c-format
+msgid "%s: Invalid Option: %s\n"
+msgstr "%s: îÅצÒÎÉÊ ÐÁÒÁÍÅÔÒ: %s\n"
+
+#: src/LYMainLoop.c:539
+#, c-format
+msgid "Internal error: Invalid mouse link %d!"
+msgstr ""
+
+#.
+#. * Make a name for this new URL.
+#.
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
+msgid "A URL specified by the user"
+msgstr "URL ×ËÁÚÁÎÉÊ ËÏÒÉÓÔÕ×ÁÞÅÍ"
+
+#: src/LYMainLoop.c:1110
+msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
+msgstr ""
+
+#.
+#. *  Make a name for this help file.
+#.
+#: src/LYMainLoop.c:3053
+msgid "Help Screen"
+msgstr "åËÒÁÎ äÏÐÏÍÏÇÉ"
+
+#: src/LYMainLoop.c:3177
+msgid "System Index"
+msgstr ""
+
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
+msgid "Entry into main screen"
+msgstr ""
+
+#: src/LYMainLoop.c:3824
+msgid "No next document present"
+msgstr ""
+
+#: src/LYMainLoop.c:4131
+msgid "charset for this document specified explicitly, sorry..."
+msgstr ""
+
+#: src/LYMainLoop.c:5004
+msgid "cd to:"
+msgstr "ÐÅÒÅÊÔÉ ÄÏ:"
+
+#: src/LYMainLoop.c:5031
+msgid "A component of path is not a directory"
+msgstr ""
+
+#: src/LYMainLoop.c:5034
+msgid "failed to change directory"
+msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ ÄÏ ËÁÔÁÌÏÇÕ."
+
+#: src/LYMainLoop.c:6204
+msgid "Reparsing document under current settings..."
+msgstr "ïÐÒÁÃØÏ×Õ¤ÍÏ ÄÏËÕÍÅÎÔ ÚǦÄÎÏ Ú ÐÏÔÏÞÎÉÍÉ ÕÓÔÁÎÏ×ËÁÍÉ..."
+
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
+#, c-format
+msgid "Fatal error - could not open output file %s\n"
+msgstr "æÁÔÁÌØÎÁ ÐÏÍÉÌËÁ - ÎÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ×ÉȦÄÎÉÊ ÆÁÊÌ %s\n"
+
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr ""
+
+# ôåòí¶îïìïç¶ñ
+# ôåòí¶îïìïç¶ñ
+#: src/LYMainLoop.c:6914
+#, fuzzy
+msgid "Current URL is empty."
+msgstr "ðÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ:"
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr ""
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
+msgid "-index-"
+msgstr "-¦ÎÄÅËÓ-"
+
+#: src/LYMainLoop.c:7731
+msgid "lynx: Can't access startfile"
+msgstr "lynx: îÅÍÏÖÌÉ×Ï ÚÁ×ÁÎÔÁÖÉÔÉ ÓÔÁÒÔÏ×ÉÊ ÆÁÊÌ"
+
+#: src/LYMainLoop.c:7744
+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:7745
+msgid "      Exiting..."
+msgstr "     ÷ÉÈÏÄÉÍÏ..."
+
+#: src/LYMainLoop.c:7788
+msgid "-more-"
+msgstr "-ÄÁ̦-"
+
+#. Enable scrolling.
+#: src/LYNews.c:187
+msgid "You will be posting to:"
+msgstr "÷É ÎÁÄÓÉÌÁ¤ÔÅ ÌÉÓÔÁ ÄÏ:"
+
+#.
+#. *  Get the mail address for the From header,
+#. *  offering personal_mail_address as default.
+#.
+#: src/LYNews.c:196
+msgid ""
+"\n"
+"\n"
+" Please provide your mail address for the From: header\n"
+msgstr ""
+"\n"
+"\n"
+" âÕÄØ ÌÁÓËÁ, ×ËÁÖ¦ÔØ ÐÏÛÔÏ×Õ ÁÄÒÅÓÕ ÄÌÑ ÚÁÇÏÌÏ×ËÁ \"÷¦Ä:\"\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:214
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Subject: header\n"
+msgstr ""
+"\n"
+"\n"
+" âÕÄØ ÌÁÓËÁ, ×ËÁÖ¦ÔØ ÞÉ ×¦ÄÒÅÄÁÇÕÊÔÅ ÚÁÇÏÌÏ×ÏË \"ôÅÍÁ:\"\n"
+
+#: src/LYNews.c:303
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Organization: header\n"
+msgstr ""
+"\n"
+"\n"
+" âÕÄØ ÌÁÓËÁ, ×ËÁÖ¦ÔØ ÞÉ ×¦ÄÒÅÄÁÇÕÊÔÅ ÚÁÇÏÌÏ×ÏË \"ïÒÇÁΦÚÁæÑ:\"\n"
+
+#.
+#. *  Use the built in line editior.
+#.
+#: src/LYNews.c:360
+msgid ""
+"\n"
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+"\n"
+" âÕÄØ ÌÁÓËÁ, ××ÅĦÔØ ×ÁÛÅ ÐÏצÄÏÍÌÅÎÎÑ ÎÉÖÞÅ."
+
+#: src/LYNews.c:406
+msgid "Message has no original text!"
+msgstr ""
+
+#: src/LYOptions.c:746
+msgid "review/edit B)ookmarks files"
+msgstr "ÐÒÏÇÌÑÎÕÔÉ/ÚͦÎÉÔÉ ÆÁÊÌ úÁËÌÁÄÉÎÏË (B)"
+
+#: src/LYOptions.c:748
+msgid "B)ookmark file: "
+msgstr "B) ÆÁÊÌ ÚÁËÌÁÄÉÎÏË: "
+
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
+#, c-format
+msgid "Use %s to invoke the Options menu!"
+msgstr "%s ×ÉËÌÉËÁ¤ íÅÎÀ îÁÌÁÛÔÕ×ÁÎØ!"
+
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr "(ÐÁÒÁÍÅÔÒÉ ×¦ÄͦÅΦ (!) ÎÅ ÂÕÄÕÔØ ÚÁÐÉÓÁΦ)"
+
+# @ GIMP lynx
+# * Yuri Syrota <rasta@renome.rovno.ua>
+#: src/LYOptions.c:3261
+msgid "General Preferences"
+msgstr "úÁÇÁÌØΦ ÎÁÌÁÛÔÕ×ÁÎÎÑ"
+
+# ¦ÌØÛÅ ÐÏÄÏÂÁ¤ÔØÓÑ "ËÏÒÉÓÔÕ×ÁÎÎÑ"
+# ¦ÌØÛÅ ÐÏÄÏÂÁ¤ÔØÓÑ "ËÏÒÉÓÔÕ×ÁÎÎÑ"
+#. ***************************************************************
+#. User Mode: SELECT
+#: src/LYOptions.c:3265
+msgid "User mode"
+msgstr "òÅÖÉÍ ËÏÒÉÓÔÕ×ÁÎÎÑ"
+
+#. Editor: INPUT
+#: src/LYOptions.c:3271
+msgid "Editor"
+msgstr "òÅÄÁËÔÏÒ"
+
+#. Search Type: SELECT
+#: src/LYOptions.c:3276
+msgid "Type of Search"
+msgstr "ôÉÐ ÐÏÛÕËÕ"
+
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
+#. Cookies: SELECT
+#: src/LYOptions.c:3285
+msgid "Cookies"
+msgstr "ëÏÒÖÉËÉ"
+
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
+msgid "Keyboard Input"
+msgstr "÷×¦Ä Ú ËÌÁצÁÔÕÒÉ"
+
+#. ***************************************************************
+#. Keypad Mode: SELECT
+#: src/LYOptions.c:3316
+msgid "Keypad mode"
+msgstr "ãÉÆÒÏ×Á ËÌÁצÁÔÕÒÁ"
+
+# msgstr "ëÌÁצۦ Emacs"
+# msgstr "ëÌÁצۦ Emacs"
+#. Emacs keys: ON/OFF
+#: src/LYOptions.c:3322
+msgid "Emacs keys"
+msgstr "ëÌÀÞ¦ Emacs"
+
+#. VI Keys: ON/OFF
+#: src/LYOptions.c:3328
+msgid "VI keys"
+msgstr "ëÌÀÞ¦ VI"
+
+#. Line edit style: SELECT
+#. well, at least 2 line edit styles available
+#: src/LYOptions.c:3335
+msgid "Line edit style"
+msgstr ""
+
+#. Keyboard layout: SELECT
+#: src/LYOptions.c:3347
+msgid "Keyboard layout"
+msgstr "òÏÚËÌÁÄËÁ ËÌÁצÁÔÕÒÉ"
+
+#.
+#. * Display and Character Set
+#.
+#: src/LYOptions.c:3360
+msgid "Display and Character Set"
+msgstr "äÉÓÐÌÅÊ ÔÁ ÎÁÂ¦Ò ÓÉÍ×Ï̦×"
+
+# ???
+# msgstr "îÁÂ¦Ò ÓÉÍ×ÏÌ¦× ÄÉÓÐÌÅÀ"
+# ???
+# msgstr "îÁÂ¦Ò ÓÉÍ×ÏÌ¦× ÄÉÓÐÌÅÀ"
+#. ***************************************************************
+#. Display Character Set: SELECT
+#: src/LYOptions.c:3364
+msgid "Display character set"
+msgstr "îÁÂ¦Ò ÓÉÍ×ÏÌ¦× ÄÉÓÐÌÅÑ"
+
+#: src/LYOptions.c:3393
+msgid "Assumed document character set"
+msgstr "÷×ÁÖÁÔÉ ËÏÄÕ×ÁÎÎÑÍ ÄÏËÕÍÅÎÔÁ"
+
+#.
+#. * 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:3413
+msgid "CJK mode"
+msgstr "òÅÖÉÍ CJK"
+
+# msgstr "óÐÒÁ×ÖΦ 8¦Ô"
+# ÍÏÖÅ "8-bit - ÑË ¤" ?-)
+#: src/LYOptions.c:3415
+msgid "Raw 8-bit"
+msgstr "òÅÖÉÍ Raw 8-bit"
+
+#. X Display: INPUT
+#: src/LYOptions.c:3423
+msgid "X Display"
+msgstr "X äÉÓÐÌÅÊ"
+
+#.
+#. * Document Appearance
+#.
+#: src/LYOptions.c:3429
+msgid "Document Appearance"
+msgstr "÷ÉÇÌÑÄ ÄÏËÕÍÅÎÔÁ"
+
+#: src/LYOptions.c:3435
+msgid "Show color"
+msgstr "ðÏËÁÚÕ×ÁÔÉ ËÏÌØÏÒÉ"
+
+#. Show cursor: ON/OFF
+#: src/LYOptions.c:3459
+msgid "Show cursor"
+msgstr "ðÏËÁÚÕ×ÁÔÉ ËÕÒÓÏÒ"
+
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr "ðÏËÁÚÕ×ÁÔÉ ËÏÌØÏÒÉ"
+
+#. Select Popups: ON/OFF
+#: src/LYOptions.c:3473
+msgid "Popups for select fields"
+msgstr "òÏÚËÒÉÔÔÑ ÐÏÌ¦× ×ÉÂÏÒÕ"
+
+#. HTML error recovery: SELECT
+#: src/LYOptions.c:3479
+msgid "HTML error recovery"
+msgstr "÷ÉÐÒÁ×ÌÑÎÎÑ ÐÏÍÉÌÏË HTML"
+
+#. Show Images: SELECT
+#: src/LYOptions.c:3485
+msgid "Show images"
+msgstr "ðÏËÁÚÕ×ÁÔÉ ÚÏÂÒÁÖÅÎÎÑ"
+
+#. Verbose Images: ON/OFF
+#: src/LYOptions.c:3499
+msgid "Verbose images"
+msgstr "äÏÄÁÔËÏ×Ï ÐÒÏ ÚÏÂÒÁÖÅÎÎÑ"
+
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3507
+msgid "Headers Transferred to Remote Servers"
+msgstr "úÁÇÏÌÏ×ËÉ ÄÌÑ îÁÄÓÉÌÁÎÎÑ ÎÁ óÅÒ×ÅÒÉ"
+
+# 8-|  ×ÓÅ ÏÄÎÏ....
+# msgstr "áÄÒÅÓÁ ÅÌÅËÔÒÏÎÎϧ ÐÏÛÔÉ"
+# 8-|  ×ÓÅ ÏÄÎÏ....
+# msgstr "áÄÒÅÓÁ ÅÌÅËÔÒÏÎÎϧ ÐÏÛÔÉ"
+#. ***************************************************************
+#. Mail Address: INPUT
+#: src/LYOptions.c:3511
+msgid "Personal mail address"
+msgstr "ðÅÒÓÏÎÁÌØÎÁ ÐÏÛÔÏ×Á ÁÄÒÅÓÁ"
+
+#. Preferred Document Character Set: INPUT
+#: src/LYOptions.c:3516
+msgid "Preferred document character set"
+msgstr "õÌÀÂÌÅÎÉÊ ÎÁÂ¦Ò ÓÉÍ×Ï̦×"
+
+#. Preferred Document Language: INPUT
+#: src/LYOptions.c:3521
+msgid "Preferred document language"
+msgstr "õÌÀÂÌÅÎÁ ÍÏ×Á ÄÏËÕÍÅÎÔÁ"
+
+#: src/LYOptions.c:3527
+msgid "User-Agent header"
+msgstr "úÁÇÏÌÏ×ÏË User-Agent"
+
+# ÏÂÉÄ×Á ÎÅ×ÄÁ̦, ÑË ÎÁ ÍÅÎÅ 8-(
+# msgstr "äÏÓÔÕÐ ÔÁ ÐÏËÁÚ ÆÁÊ̦×"
+# ÏÂÉÄ×Á ÎÅ×ÄÁ̦, ÑË ÎÁ ÍÅÎÅ 8-(
+# msgstr "äÏÓÔÕÐ ÔÁ ÐÏËÁÚ ÆÁÊ̦×"
+#.
+#. * Listing and Accessing Files
+#.
+#: src/LYOptions.c:3535
+msgid "Listing and Accessing Files"
+msgstr "óÐÉÓËÉ ÔÁ äÏÓÔÕÐ ÄÏ æÁÊ̦×"
+
+#. ***************************************************************
+#. FTP sort: SELECT
+#: src/LYOptions.c:3539
+msgid "FTP sort criteria"
+msgstr "ëÒÉÔÅÒ¦Ê ÓÏÒÔÕ×ÁÎÎÑ ËÁÔÁÌÏÇ¦× FTP"
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3546
+msgid "Local directory sort criteria"
+msgstr "ëÒÉÔÅÒ¦Ê ÓÏÒÔÕ×ÁÎÎÑ ÌÏËÁÌØÎÉÈ ËÁÔÁÌÏǦ×"
+
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+msgid "Local directory sort order"
+msgstr "ðÏÒÑÄÏË ÓÏÒÔÕ×ÁÎÎÑ ÌÏËÁÌØÎÉÈ ËÁÔÁÌÏǦ×"
+
+#: src/LYOptions.c:3561
+msgid "Show dot files"
+msgstr "ðÏËÁÚÕ×ÁÔÉ ÐÒÉÈÏ×ÁΦ ÆÁÊÌÉ"
+
+#: src/LYOptions.c:3569
+msgid "Execution links"
+msgstr "úÁÐÕÓËÁÎÎÑ ÐÒÏÇÒÁÍ ÚÁ ÐÏÓÉÌÁÎÎÑÍÉ"
+
+# ÐÅÒÅËÁÞÕ×ÁÎÎÑ - ÂÏ ÎÅ ÚÎÁÀ, ËÕÄÉ, Õ ÑËÉÊ Â¦Ë.
+# (×ÖÅ ËÒÁÝÅ "ÐÅÒÅÄÁ×ÁÎÎÑ", ÂÏ ÐÅÒÅÄÁÞÁ - ÎÅ ÚÏ×Ó¦Í ÐÒÏÃÅÓ, ÎÁÞÅ)
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3589
+msgid "Show transfer rate"
+msgstr "ðÅÒÅËÁÞÕ×ÁÎÎÑ ÄÁÎÉÈ ÚÁ×ÅÒÛÅÎÏ."
+
+#.
+#. * Special Files and Screens
+#.
+#: src/LYOptions.c:3598
+msgid "Special Files and Screens"
+msgstr "óÐÅæÁÌØΦ æÁÊÌÉ ÔÁ åËÒÁÎÉ"
+
+#: src/LYOptions.c:3603
+msgid "Multi-bookmarks"
+msgstr "þÉÓÅÌØΦ ÆÁÊÌÉ ÚÁËÌÁÄÉÎÏË"
+
+#: src/LYOptions.c:3611
+msgid "Review/edit Bookmarks files"
+msgstr "ðÒÏÄÉ×ÉÔÉÓÑ/òÅÄÁÇÕ×ÁÔÉ ÚÁËÌÁÄÉÎËÉ"
+
+#: src/LYOptions.c:3613
+msgid "Goto multi-bookmark menu"
+msgstr "ðÅÒÅÊÔÉ ÄÏ ÍÅÎÀ multi-bookmar"
+
+#: src/LYOptions.c:3615
+msgid "Bookmarks file"
+msgstr "æÁÊÌ ÚÁËÌÁÄÉÎÏË"
+
+#. Visited Pages: SELECT
+#: src/LYOptions.c:3621
+msgid "Visited Pages"
+msgstr "ðÒÏÇÌÑÎÕÔ¦ ÓÔÏÒ¦ÎËÉ"
+
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr "ðÅÒÅÇÌÑÎÕÔÉ ÆÁÊÌ "
+
+#: src/LYPrint.c:952
+msgid " Print job complete.\n"
+msgstr " äÒÕË ÚÁ×ÅÒÛÅÎÏ.\n"
+
+#: src/LYPrint.c:1281
+msgid "Document:"
+msgstr "äÏËÕÍÅÎÔ:"
+
+#: src/LYPrint.c:1282
+msgid "Number of lines:"
+msgstr "ë¦ÌØ˦ÓÔØ ÒÑÄ˦×:"
+
+#: src/LYPrint.c:1283
+msgid "Number of pages:"
+msgstr "ë¦ÌØ˦ÓÔØ ÓÔÏÒ¦ÎÏË:"
+
+#: src/LYPrint.c:1284
+msgid "pages"
+msgstr "ÓÔÏÒ¦ÎÏË"
+
+#: src/LYPrint.c:1284
+msgid "page"
+msgstr "ÓÔÏÒ¦ÎËÁ"
+
+#: src/LYPrint.c:1285
+msgid "(approximately)"
+msgstr "(ÐÒÉÂÌÉÚÎÏ)"
+
+#: src/LYPrint.c:1290
+msgid "Some print functions have been disabled!"
+msgstr "äÅÑ˦ ÆÕÎËæ§ ÄÒÕËÕ ÂÕÌÏ ÚÁÂÏÒÏÎÅÎÏ!"
+
+#: src/LYPrint.c:1294
+msgid "Standard print options:"
+msgstr "óÔÁÎÄÁÒÔΦ ÐÁÒÁÍÅÔÒÉ ÄÒÕËÕ:"
+
+#: src/LYPrint.c:1295
+msgid "Print options:"
+msgstr "ðÁÒÁÍÅÔÒÉ ÄÒÕËÕ:"
+
+#: src/LYPrint.c:1302
+msgid "Save to a local file"
+msgstr "úÁÐÉÓÁÔÉ × ÌÏËÁÌØÎÉÈ ÆÁÊÌ"
+
+#: src/LYPrint.c:1304
+msgid "Save to disk disabled"
+msgstr "úÁÐÉÓÕ×ÁÔÉ ÎÁ ÄÉÓË ÚÁÂÏÒÏÎÅÎÏ"
+
+#: src/LYPrint.c:1311
+msgid "Mail the file"
+msgstr "ðÅÒÅÓÌÁÔÉ ÆÁÊÌ ÐÏÛÔÏÀ"
+
+#: src/LYPrint.c:1318
+msgid "Print to the screen"
+msgstr "òÏÚÄÒÕËÕ×ÁÔÉ ÎÁ ÅËÒÁΦ"
+
+#: src/LYPrint.c:1323
+msgid "Print out on a printer attached to your vt100 terminal"
+msgstr "òÏÚÄÒÕËÕ×ÁÔÉ ÎÁ ÐÒÉÎÔÅÒ¦, ЦÄ'¤ÄÎÁÎÏÍÕ ÄÏ ×ÁÛÏÇÏ vt100-ÔÅÒͦÎÁÌÕ"
+
+#: src/LYReadCFG.c:339
+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 ""
+
+#: src/LYReadCFG.c:352
+msgid "Offending line:"
+msgstr ""
+
+#: src/LYReadCFG.c:638
+#, c-format
+msgid "key remapping of %s to %s for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:645
+#, c-format
+msgid "key remapping of %s to %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:666
+#, c-format
+msgid "invalid line-editor selection %s for key %s, selecting all\n"
+msgstr ""
+
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:711
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:816
+#, c-format
+msgid "Lynx: cannot start, CERN rules file %s is not available\n"
+msgstr ""
+
+#: src/LYReadCFG.c:818
+msgid "(no name)"
+msgstr "(ÎÅÍÁ ¦ÍÅΦ)"
+
+#: src/LYReadCFG.c:1782
+#, c-format
+msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
+msgstr ""
+
+#: src/LYReadCFG.c:1784
+#, c-format
+msgid "Last attempted include was '%s',\n"
+msgstr ""
+
+#: src/LYReadCFG.c:1785
+#, c-format
+msgid "included from '%s'.\n"
+msgstr "×ËÌÀÞÅÎÏÍÕ Ú '%s'.\n"
+
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
+msgid "The following is read from your lynx.cfg file."
+msgstr "ïÓØ ÔÁËÅ ÂÕÌÏ ÚÎÁÊÄÅÎÏ Õ ×ÁÛÏÍÕ ÆÁÊ̦ lynx.cfg."
+
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
+msgid "Please read the distribution"
+msgstr "ú×ÅÒΦÔØÓÑ ÄÏ ÄÉÓÔÒÉÂÕÔÉ×Á"
+
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
+msgid "for more comments."
+msgstr "ÐÏ ÄÏÄÁÔËÏ×Õ ¦ÎÆÏÒÍÁæÀ."
+
+#: src/LYReadCFG.c:2244
+msgid "RELOAD THE CHANGES"
+msgstr "ðåòåþéôáôé"
+
+#: src/LYReadCFG.c:2253
+msgid "Your primary configuration"
+msgstr "÷ÁÛÁ ÏÓÎÏ×ÎÁ ËÏÎƦÇÕÒÁæÑ"
+
+#: src/LYShowInfo.c:129
+msgid "Directory that you are currently viewing"
+msgstr "ëÁÔÁÌÏÇ, ÑËÉÊ ×É ÚÁÒÁÚ ÐÅÒÅÇÌÑÄÁ¤ÔÅ"
+
+# @ Dia GIMP Gabber Galeon- Ximian-setup-tools balsa control-center evolution gimp gimp-std-plugins- glade- gnome-core gnome-libs gnome-pim gnomeicu gphoto graphite guppi kandy kandy.po kateprojectmanager.po kcmemail kcmkio kde-i18n_4:2.2.2-2_kdeprintfax.po kdelibs kmail kmenuedit knode koffice korganizer ksysguard kword lynx pybliographer red-carpet rpmdrake screem userdrake xchat
+# * Yuriy Syrota <yuri@renome.rovno.ua>
+#: src/LYShowInfo.c:132
+msgid "Name:"
+msgstr "îÁÚ×Á:"
+
+#: src/LYShowInfo.c:135
+msgid "URL:"
+msgstr "URL:"
+
+#: src/LYShowInfo.c:146
+msgid "Directory that you have currently selected"
+msgstr "ëÁÔÁÌÏÇ, ÑËÉÊ ÚÁÒÁÚ ×ÉĦÌÅÎÏ"
+
+#: src/LYShowInfo.c:149
+msgid "File that you have currently selected"
+msgstr "æÁÊÌ, ÑËÉÊ ÚÁÒÁÚ ×ÉĦÌÅÎÏ"
+
+#: src/LYShowInfo.c:153
+msgid "Symbolic link that you have currently selected"
+msgstr ""
+
+#: src/LYShowInfo.c:157
+msgid "Item that you have currently selected"
+msgstr ""
+
+# 8-| ÎÅ ÚÎÁÀ...
+# msgstr " ðÏ×ÎÁ ÎÁÚ×Á:"
+#: src/LYShowInfo.c:159
+msgid "Full name:"
+msgstr "ðÏ×ÎÅ ¦Í'Ñ:"
+
+#: src/LYShowInfo.c:168
+msgid "Unable to follow link"
+msgstr ""
+
+#: src/LYShowInfo.c:170
+msgid "Points to file:"
+msgstr ""
+
+#: src/LYShowInfo.c:175
+msgid "Name of owner:"
+msgstr "      ÷ÌÁÓÎÉË:"
+
+# @ evolution kuser lynx
+# * Andriy Rysin <arysin@yahoo.com>
+#: src/LYShowInfo.c:178
+msgid "Group name:"
+msgstr "îÁÚ×Á ÇÒÕÐÉ:"
+
+#: src/LYShowInfo.c:181
+msgid "File size:"
+msgstr "òÏÚÍ¦Ò ÆÁÊÌÕ:"
+
+#: src/LYShowInfo.c:187
+msgid "Creation date:"
+msgstr "     óÔ×ÏÒÅÎÏ:"
+
+# @ KDat lynx
+# * Andriy Rysin <arysin@yahoo.com>
+#: src/LYShowInfo.c:190
+msgid "Last modified:"
+msgstr "ïÓÔÁÎÎÑ ÍÏÄÉƦËÁæÑ:"
+
+# @ KDat lynx
+# * Andriy Rysin <arysin@yahoo.com>
+#: src/LYShowInfo.c:193
+msgid "Last accessed:"
+msgstr "ïÓÔÁÎΤ Ú×ÅÒÎÅÎÎÑ:"
+
+#: src/LYShowInfo.c:195
+msgid "Access Permissions"
+msgstr "ðÒÁ×Á ÄÏÓÔÕÐÕ"
+
+#: src/LYShowInfo.c:261
+msgid "File that you are currently viewing"
+msgstr "æÁÊÌ, ÑËÉÊ ×É ÚÁÒÁÚ ÐÅÒÅÇÌÑÄÁ¤ÔÅ"
+
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
+msgid "Linkname:"
+msgstr ""
+
+#: src/LYShowInfo.c:279 src/LYShowInfo.c:291
+msgid "Charset:"
+msgstr "îÁÂ¦Ò ÓÉÍ×Ï̦×:"
+
+#: src/LYShowInfo.c:297
+msgid "Server:"
+msgstr "óÅÒ×ÅÒ:"
+
+#: src/LYShowInfo.c:300
+msgid "Date:"
+msgstr "äÁÔÁ:"
+
+#: src/LYShowInfo.c:303
+msgid "Last Mod:"
+msgstr ""
+
+#: src/LYShowInfo.c:309
+msgid "&nbsp;Expires:"
+msgstr ""
+
+#: src/LYShowInfo.c:313
+msgid "Cache-Control:"
+msgstr ""
+
+#: src/LYShowInfo.c:317
+msgid "Content-Length:"
+msgstr "äÏ×ÖÉÎÁ ×ͦÓÔÕ:"
+
+#: src/LYShowInfo.c:322
+msgid "Language:"
+msgstr "íÏ×Á:"
+
+#: src/LYShowInfo.c:329
+msgid "Post Data:"
+msgstr ""
+
+#: src/LYShowInfo.c:333
+msgid "Post Content Type:"
+msgstr ""
+
+#: src/LYShowInfo.c:342
+msgid "Owner(s):"
+msgstr "÷ÌÁÓÎÉË(É):"
+
+#: src/LYShowInfo.c:345
+msgid "size:"
+msgstr "ÒÏÚͦÒ:"
+
+# @ Galeon- lynx xfce
+# * Andriy Rysin <arysin@yahoo.com>
+#: src/LYShowInfo.c:345
+msgid "lines"
+msgstr "ÒÑÄËÉ"
+
+#: src/LYShowInfo.c:348
+msgid "mode:"
+msgstr "ÒÅÖÉÍ:"
+
+#: src/LYShowInfo.c:350
+msgid "forms mode"
+msgstr ""
+
+#: src/LYShowInfo.c:352
+msgid "source"
+msgstr "ÄÖÅÒÅÌÏ"
+
+#: src/LYShowInfo.c:352
+msgid "normal"
+msgstr "Ú×ÉÞÁÊÎÉÊ"
+
+#: src/LYShowInfo.c:353
+msgid ", safe"
+msgstr ""
+
+#: src/LYShowInfo.c:354
+msgid ", via internal link"
+msgstr ""
+
+#: src/LYShowInfo.c:360
+msgid ", no-cache"
+msgstr ""
+
+#: src/LYShowInfo.c:362
+msgid ", ISMAP script"
+msgstr ""
+
+#: src/LYShowInfo.c:364
+msgid ", bookmark file"
+msgstr ", ÆÁÊÌ ÚÁËÌÁÄÉÎÏË"
+
+#: src/LYShowInfo.c:373
+msgid "Link that you currently have selected"
+msgstr "ðÏÓÉÌÁÎÎÑ, ÑËÉÊ ÚÁÒÁÚ ×ÉĦÌÅÎÏ"
+
+#: src/LYShowInfo.c:386
+msgid "Method:"
+msgstr "íÅÔÏÄ:"
+
+#: src/LYShowInfo.c:391
+msgid "Enctype:"
+msgstr ""
+
+#: src/LYShowInfo.c:403
+msgid "(Form field)"
+msgstr "(ðÏÌÅ ÆÏÒÍÉ)"
+
+#: src/LYShowInfo.c:418
+msgid "No Links on the current page"
+msgstr "îÁ Ã¦Ê ÓÔÏÒ¦Îæ ÎÅÍÁ¤ ÐÏÓÉÌÁÎØ"
+
+#: src/LYStyle.c:278
+#, 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 ""
+
+#: src/LYTraversal.c:107
+msgid "here is a list of the history stack so that you may rebuild"
+msgstr ""
+
+#: src/LYUpload.c:78
+msgid "ERROR! - upload command is misconfigured"
+msgstr ""
+
+#: src/LYUpload.c:100
+msgid "Illegal redirection \"../\" found! Request ignored."
+msgstr ""
+
+#: src/LYUpload.c:103
+msgid "Illegal character \"/\" found! Request ignored."
+msgstr ""
+
+#: src/LYUpload.c:106
+msgid "Illegal redirection using \"~\" found! Request ignored."
+msgstr ""
+
+#: src/LYUpload.c:163
+msgid "Unable to upload file."
+msgstr "îÅÍÏÖÌÉ×Ï ÐÅÒÅÄÁÔÉ ÆÁÊÌ."
+
+#: src/LYUpload.c:206
+msgid "Upload To:"
+msgstr "÷¦Ä×ÁÎÔÁÖÉÔÉ ÄÏ:"
+
+#: src/LYUpload.c:207
+msgid "Upload options:"
+msgstr "ðÁÒÁÍÅÔÒÉ ×¦Ä×ÁÎÔÁÖÅÎÎÑ:"
+
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2468
+msgid "Unexpected access protocol for this URL scheme."
+msgstr ""
+
+#: src/LYUtils.c:3294
+msgid "Too many tempfiles"
+msgstr ""
+
+#: src/LYUtils.c:3595
+msgid "unknown restriction"
+msgstr "ÎÅצÄÏÍÅ ÏÂÍÅÖÅÎÎÑ"
+
+#: src/LYUtils.c:3626
+msgid "No restrictions set.\n"
+msgstr "ïÂÍÅÖÅÎÎÑ ×¦ÄÓÕÔΦ.\n"
+
+#: src/LYUtils.c:3629
+msgid "Restrictions set:\n"
+msgstr "îÁÂ¦Ò ÏÂÍÅÖÅÎØ:\n"
+
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
+
+#: src/LYrcFile.c:21
+msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
+msgstr ""
+
+#: src/LYrcFile.c:295
+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 ""
+
+#: src/LYrcFile.c:302
+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 ""
+"bookmark_file ×ÉÚÎÁÞÁ¤ ¦Í'Ñ ÔÁ ÒÏÚÔÁÛÕ×ÁÎÎÑ ÐÏÞÁÔËÏ×ÏÇÏ ÆÁÊÌÕ ÚÁËÌÁÄÉÎÏË,\n"
+"ÄÏ ÑËÏÇÏ ËÏÒÉÓÔÕ×ÁÞ ÍÏÖÅ ÄÏÄÁ×ÁÔÉ ÐÏÓÉÌÁÎÎÑ ÄÌÑ Û×ÉÄËÏÇÏ ×¦ÄÎÁÊÄÅÎÎÑ\n"
+"ЦÚΦÛÅ.\n"
+
+#: src/LYrcFile.c:307
+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 ""
+
+#: src/LYrcFile.c:312
+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 ""
+
+#: src/LYrcFile.c:319
+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 ""
+
+#: src/LYrcFile.c:327
+msgid ""
+"cookie_file specifies the file from which to read persistent cookies.\n"
+"The default is ~/.lynx_cookies.\n"
+msgstr ""
+
+#: src/LYrcFile.c:332
+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 ""
+
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:351
+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 ""
+
+#: src/LYrcFile.c:359
+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 ""
+
+#: src/LYrcFile.c:365
+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 ""
+"file_editor ×ÉÚÎÁÞÁ¤ ÒÅÄÁËÔÏÒÁ ÄÌÑ ÒÅÄÁÇÕ×ÁÎÎÑ ÌÏËÁÌØÎÉÈ ÆÁÊÌ¦× ÞÉ ÐÏÛÔÏ×ÉÈ\n"
+"ÐÏצÄÏÍÌÅÎØ.  ñËÝÏ ÒÅÄÁËÔÏÒÁ ÎÅ ×ÉÚÎÁÞÅÎÏ, ÒÅÄÁÇÕ×ÁÎÎÑ ÚÁÂÏÒÏÎÅÎÅ, ȦÂÁ ÝÏ\n"
+"ÞÅÒÅÚ ×ÉËÌÉË ÒÅÄÁËÔÏÒÁ Ú ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÁ; ¦ ÄÌÑ ÎÁÐÉÓÁÎÎÑ ÌÉÓÔ¦× ÂÕÄÅÍÏ\n"
+"×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ×ÍÏÎÔÏ×ÁÎÏÇÏ ÏÄÎÏÒÑÄËÏ×ÏÇÏ ÒÅÄÁËÔÏÒÁ.\n"
+
+#: src/LYrcFile.c:371
+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 ""
+"file_sorting_method ×ÉÚÎÁÞÁ¤, ÑË ÐÒÉ ÐÅÒÅÇÌÑĦ ÓÏÒÔÕ×ÁÔÉ ÓÐÉÓËÉ ÆÁÊ̦×,\n"
+"ÎÁÐÒÉËÌÁÄ, ËÁÔÁÌÏÇÉ FTP.  íÏÖÌÉצ ×ÁÒ¦ÁÎÔÉ:\n"
+"   BY_FILENAME -- ÓÏÒÔÕ×ÁÔÉ ÚÁ ¦ÍÅÎÅÍ ÆÁÊÌÕ\n"
+"   BY_TYPE     -- ÓÏÒÔÕ×ÁÔÉ ÚÁ ÔÉÐÏÍ ÆÁÊÌÕ\n"
+"   BY_SIZE     -- ÓÏÒÔÕ×ÁÔÉ ÚÁ ÒÏÚͦÒÏÍ ÆÁÊÌÕ\n"
+"   BY_DATE     -- ÓÏÒÔÕ×ÁÔÉ ÚÁ ÄÁÔÏÀ ÆÁÊÌÕ\n"
+
+#: src/LYrcFile.c:389
+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 ""
+
+#: src/LYrcFile.c:404
+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 ""
+"㦠ËÏÍÁÎÄÉ ÄÁÀÔØ ÚÍÏÇÕ ×ÉÚÎÁÞÉÔÉ sub-bookmark ÆÁÊÌÉ ÔÁ §ÈΦ ÏÐÉÓÉ.\n"
+"æÏÒÍÁÔ ÔÁËÉÊ: multi_bookmark<×ÅÌÉËÁ_̦ÔÅÒÁ>=<ÆÁÊÌ>,<ÏÐÉÓ>\n"
+"íÏÖÌÉ×Ï ×ÉÚÎÁÞÉÔÉ ÄÏ 26 ÆÁÊÌ¦× ÚÁËÌÁÄÉÎÏË (ÄÌÑ ÁÎÇ̦ÊÓØËÉÈ ×ÅÌÉËÉÈ Ì¦ÔÅÒ).\n"
+"íÉ ÐÏÞÉÎÁ¤ÍÏ Ú \"multi_bookmarkB\", ÂÏ 'A' ¤ ÓÔÁÒÔÏ×ÉÍ (ÄÉ×. ×ÉÝÅ).\n"
+
+#: src/LYrcFile.c:410
+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 ""
+"personal_mail_address ×ÉÚÎÁÞÁ¤ ×ÁÛÕ ×ÌÁÓÎÕ ÐÏÛÔÏ×Õ ÁÄÒÅÓÕ. áÄÒÅÓÁ ÂÕÄÅ\n"
+"ÎÁÄÓÉÌÁÔÉÓÑ Ð¦Ä ÞÁÓ ÐÅÒÅÄÁÞ¦ ÆÁÊÌ¦× ÐÏ HTTP ÄÌÑ Á×ÔÏÒÉÚÁæ§ ÔÁ ×ÈÏÄÕ\n"
+"× ÓÉÓÔÅÍÕ, ÔÁ ÄÌÑ ÎÁÄÓÉÌÁÎÎÑ ËÏÍÅÎÔÁÒ¦×.\n"
+"ñËÝÏ Ö ×É ÎÅ ÂÁÖÁ¤ÔÅ ÎÁÄÁ×ÁÔÉ ÃÀ ¦ÎÆÏÒÍÁæÀ, ×ÓÔÁÎÏצÔØ Õ ÆÁÊ̦ lynx.cfg\n"
+"\"NO_FROM_HEADER:TRUE\", ÞÉ ÚÁÐÕÓËÁÊÔÅ lynx Ú ËÌÀÞÅÍ -nofrom. ÷É ÔÁËÏÖ\n"
+"ÍÏÖÅÔÅ ÚÁÌÉÛÉÔÉ ÃÅ ÐÏÌÅ ÐÏÒÏÖΦÍ, ÁÌÅ ÔÏĦ ×ÏÎÏ ÎÅ ×ËÌÀÞÁÔÉÍÅÔØÓÑ Õ ×ÁÛ¦\n"
+"ËÏÍÅÎÔÁÒ¦ ÐÒÉ ÌÉÓÔÕ×ÁÎΦ.\n"
+
+#: src/LYrcFile.c:419
+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 ""
+
+#: src/LYrcFile.c:433
+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 ""
+
+#: src/LYrcFile.c:442
+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 ""
+
+#: src/LYrcFile.c:453
+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 ""
+
+#: src/LYrcFile.c:471
+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 ""
+
+#: src/LYrcFile.c:481
+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 ""
+
+#: src/LYrcFile.c:498
+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 ""
+
+#: src/LYrcFile.c:509
+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 ""
+
+#: src/LYrcFile.c:520
+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 ""
+"ñËÝÏ sub_bookmarks ÎÅ ×ÉÍËÎÅÎÏ (\"off\"), ÔÁ  multiple bookmarks ÂÕÌÏ\n"
+"×ÉÚÎÁÞÅÎÏ (ÄÉ×ÉÓØ ÎÉÖÞÅ), ÔÏĦ ×Ó¦ ÐÒÉ ÂÕÄØ-ÑË¦Ê Ä¦§ ¦Ú ÚÁËÌÁÄÉÎËÁÍÉ\n"
+"ËÏÒÉÓÔÕ×ÁÞÅצ ÂÕÄÅ ÚÁÐÒÏÐÏÎÏ×ÁÎÏ ×ÉÂÒÁÔÉ sub-bookmark ÆÁÊÌ. ñËÝÏ\n"
+"bookmark_file ×ÉÚÎÁÞÅÎÏ (ÄÉ×ÉÓØ ×ÉÝÅ), צΠÂÕÄÅ ÚÁÐÒÏÐÏÎÏ×ÁÎÉÍ ×ÉÂÏÒÏÍ.\n"
+"ëÏÌÉ ÃÀ ÏÐæÀ ×ÓÔÁÎÏ×ÌÅÎÏ Õ \"advanced\", ÔÁ ÒÅÖÉÍ ËÏÒÉÓÔÕ×ÁÎÎÑ ÔÁËÏÖ\n"
+"advanced, ÔÏĦ ËÏÍÁÎÄÁ ÐÅÒÅÇÌÑÄÕ ÚÁËÌÁÄÉÎÏË ('v'iew) ÎÁÄÁÓÔØ ÚÁÐÒÏÛÅÎÎÑ\n"
+"Õ ÒÑÄËÕ ÓÔÁÔÕÓÕ ÚÁͦÓÔØ ÍÅÎÀ, ÑË Õ ÒÅÖÉÍÁÈ \"ÎÏ×ÁÞÏË\" ÔÁ intermediate.\n"
+"ëÏÌÉ ÃÀ ÏÐæÀ ×ÓÔÁÎÏ×ÌÅÎÏ Õ \"standard\", ÂÕÄÅ ÎÁÄÁÎÏ ÍÅÎÀ, ÎÅÚÁÌÅÖÎÏ\n"
+"×¦Ä ÒÅÖÉÍÕ ËÏÒÉÓÔÕ×ÁÎÎÑ.\n"
+
+#: src/LYrcFile.c:533
+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 ""
+
+#: src/LYrcFile.c:542
+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 ""
+
+#: src/LYrcFile.c:547
+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 ""
+
+#: src/LYrcFile.c:555
+msgid ""
+"The visited_links setting controls how Lynx organizes the information\n"
+"in the Visited Links Page.\n"
+msgstr ""
+"õÓÔÁÎÏ×ËÁ visted_links ×ÉÚÎÁÞÁ¤, ÑË Lynx צÄÏÂÒÁÖÁ¤ ¦ÎÆÏÒÍÁæÀ\n"
+"ÎÁ óÔÏÒ¦Îæ ÷¦ÄצÄÁÎÉÈ ðÏÓÉÌÁÎØ.\n"
+
+#: src/LYrcFile.c:772
+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 ""
+
+#: src/LYrcFile.c:781
+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 ""
+
+#: src/LYrcFile.c:785
+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 ""
+
+#: src/LYrcFile.c:794
+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 ""
+
+#: src/LYrcFile.c:827
+msgid ""
+"Lynx User Defaults File\n"
+"\n"
+"This file contains options saved from the Lynx Options Screen (normally\n"
+"with the '>' key).  There is normally no need to edit this file manually,\n"
+"since the defaults here can be controlled from the Options Screen, and the\n"
+"next time options are saved from the Options Screen this file will be\n"
+"completely rewritten.  You have been warned...\n"
+"If you are looking for the general configuration file - it is normally\n"
+"called lynx.cfg, and it has different content and a different format.\n"
+"It is not this file.\n"
+msgstr ""
+"æÁÊÌ ðÏÞÁÔËÏ×ÉÈ îÁÌÁÛÔÕ×ÁÎØ ëÏÒÉÓÔÕ×ÁÞÁ Lynx\n"
+"\n"
+"ãÅÊ ÆÁÊÌ Í¦ÓÔÉÔØ ÎÁÌÁÛÔÕ×ÁÎÎÑ Ú åËÒÁÎÕ îÁÌÁÛÔÕ×ÁÎØ Lynx (ÚÁÚ×ÉÞÁÊ\n"
+"Ú ËÌÀÞÅÍ '>').  úÁÚ×ÉÞÁÊ ÎÅÍÁ ΦÑËϧ ÎÅÏÂȦÄÎÏÓÔ¦ ÒÅÄÁÇÕ×ÁÔÉ ÊÏÇÏ,\n"
+"ÏÓ˦ÌØËÉ ÓÔÁÒÔÏצ ÎÁÌÁÛÔÕ×ÁÎÎÑ ×ÓÔÁÎÏ×ÌÀÀÔØ ÞÅÒÅÚ åËÒÁÎ îÁÌÁÛÔÕ×ÁÎØ, ÏÔÖÅ,\n"
+"ËÏÌÉ ÎÁÓÔÕÐÎÏÇÏ ÒÁÚÕ ×É ÚÂÅÒÅÖÅÔÅ §È Ú åËÒÁÎÕ îÁÌÁÛÔÕ×ÁÎØ, ÃÅÊ ÆÁÊÌ\n"
+"ÂÕÄÅ ÐÅÒÅÚÁÐÉÓÁÎÏ.  ÷ÁÓ ÐÏÐÅÒÅÄÉÌÉ, ÍÁÊÔÅ ÎÁ Õ×ÁÚ¦...\n"
+"ñËÝÏ Ö ×É ÎÁÓÐÒÁ×Ħ ÛÕËÁ¤ÔÅ ÆÁÊÌ ÚÁÇÁÌØÎÉÈ ÎÁÌÁÛÔÕ×ÁÎØ - ÔÏ ÃÅ, ÑË ÐÒÁ×ÉÌÏ,\n"
+"ÆÁÊÌ lynx.cfg, Ê ×¦Î ÍÁ¤ ¦ÎÛÉÊ ÚͦÓÔ ÔÁ ¦ÎÛÉÊ ÆÏÒÍÁÔ.\n"
+"ôÏÖ ÃÅ ÎÅ ÔÏÊ ÆÁÊÌ ;-)\n"
+
+#~ msgid "Unable to open file management menu file."
+#~ msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÍÅÎÀ ËÅÒÕ×ÁÎÎÑ ÆÁÊÌÁÍÉ."
diff --git a/gnu/usr.bin/lynx/po/zh_CN.po b/gnu/usr.bin/lynx/po/zh_CN.po
new file mode 100644
index 00000000000..188328598f0
--- /dev/null
+++ b/gnu/usr.bin/lynx/po/zh_CN.po
@@ -0,0 +1,5322 @@
+# Lynx 2.8.5pre9 Simplified Chinese translation
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Wu XiaoGuang <xgwu@linux.net.cn>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lynx-2.8.5pre9\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\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:29
+#, c-format
+msgid "Alert!: %s"
+msgstr "警告�：%s"
+
+#: LYMessages.c:30
+msgid "Welcome"
+msgstr "欢迎"
+
+#: LYMessages.c:31
+msgid "Are you sure you want to quit?"
+msgstr "您确信�退出�？"
+
+#: LYMessages.c:33
+msgid "Really exit from Lynx?"
+msgstr "真的�离开 Lynx ？"
+
+#: LYMessages.c:35
+msgid "Connection interrupted."
+msgstr "连接被中断。"
+
+#: LYMessages.c:36
+msgid "Data transfer interrupted."
+msgstr "数�传输被中断。"
+
+#: LYMessages.c:37
+msgid "Cancelled!!!"
+msgstr "已�消�"
+
+#: LYMessages.c:38
+msgid "Cancelling!"
+msgstr "正在�消�"
+
+#: LYMessages.c:39
+msgid "Excellent!!!"
+msgstr "�常好�"
+
+#: LYMessages.c:40
+msgid "OK"
+msgstr ""
+
+#: LYMessages.c:41
+msgid "Done!"
+msgstr "完��"
+
+#: LYMessages.c:42
+msgid "Bad request!"
+msgstr "请求错误�"
+
+#: LYMessages.c:43
+msgid "previous"
+msgstr "�一个"
+
+#: LYMessages.c:44
+msgid "next screen"
+msgstr "下一�"
+
+#: LYMessages.c:45
+msgid "HELP!"
+msgstr "求助�"
+
+#: LYMessages.c:46
+msgid ", help on "
+msgstr "，在这方�的帮助"
+
+#. #define HELP
+#: LYMessages.c:48
+msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
+msgstr "命令：移动用方�键，求助用‘？’，退出用‘q’，返回用‘<-’。"
+
+#. #define MOREHELP
+#: LYMessages.c:50
+msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
+msgstr "――更多请按空格，移动用方�键，求助用‘？’，退出用‘q’。"
+
+#: LYMessages.c:51
+msgid "-- press space for next page --"
+msgstr "―― 看下一页请按回车 ――"
+
+#: LYMessages.c:52
+msgid "URL too long"
+msgstr "是�是 URL 太长了 "
+
+#. Inactive input fields, messages used with -tna option - kw
+#. #define FORM_LINK_TEXT_MESSAGE_INA
+#: LYMessages.c:58
+msgid "(Text entry field) Inactive.  Press <return> to activate."
+msgstr "（文本�目区域）未被激活，请按回车激活。"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
+#: LYMessages.c:60
+msgid "(Textarea) Inactive.  Press <return> to activate."
+msgstr "（文本域）未激活，请按回车激活。"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
+#: LYMessages.c:62
+#, c-format
+msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
+msgstr "（文本域）未激活，请按回车激活（编辑器用 %s ）。"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
+#: LYMessages.c:64
+msgid "(Form field) Inactive.  Use <return> to edit."
+msgstr "（表�区域）未激活，编辑按回车。"
+
+#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
+#: LYMessages.c:66
+#, c-format
+msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
+msgstr "（表�区域）未激活，编辑按回车（ �作修改递交请按 %s ）。"
+
+#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
+#: LYMessages.c:68
+msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
+msgstr "（表�区域）未激活，编辑按回车，递交按两次回车。"
+
+#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
+#: LYMessages.c:70
+msgid "(mailto form field) Inactive.  Press <return> to change."
+msgstr "（ mailto 表�域）未激活，修正按回车。"
+
+#. #define FORM_LINK_PASSWORD_MESSAGE_INA
+#: LYMessages.c:72
+msgid "(Password entry field) Inactive.  Press <return> to activate."
+msgstr "（ Password �目域）未被激活，按回车激活。"
+
+#. #define FORM_LINK_FILE_UNM_MSG
+#: LYMessages.c:75
+msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
+msgstr "�准改动的文件�目域，离开按�上键��上键或 Tab 键。"
+
+#. #define FORM_LINK_FILE_MESSAGE
+#: LYMessages.c:77
+msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
+msgstr "（文件�目域）输入文件�，离开按�上键��上键或 Tab 键。"
+
+#. #define FORM_LINK_TEXT_MESSAGE
+#: LYMessages.c:79
+msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "（文本�目域）输入文字，离开按�上键��上键或 Tab 键。"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE
+#: LYMessages.c:81
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
+msgstr "（文本区域）输入文字，离开按�上键��上键或 Tab 键。"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_E
+#: LYMessages.c:83
+#, c-format
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
+msgstr "（文本区域）输入文字，离开按�上键��上键或 Tab 键（编辑器用 %s）。"
+
+#. #define FORM_LINK_TEXT_UNM_MSG
+#: LYMessages.c:85
+msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
+msgstr "�准改动的表�文本区域，离开按�上键��上键或 Tab 键。"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
+#: LYMessages.c:87
+msgid "(Form field) Enter text.  Use <return> to submit."
+msgstr "（表�区域）输入文字，递交按回车。"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
+#: LYMessages.c:89
+#, c-format
+msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
+msgstr "（表�区域）输入文字，递交按回车（�消缓存用 %s）"
+
+#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
+#: LYMessages.c:91
+msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
+msgstr "（表�区域）输入文字，递交按回车，离开用方�键或 Tab 。"
+
+#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
+#: LYMessages.c:93
+msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
+msgstr "�准改动的表�域，离开用�上键��上键或 Tab 键。"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
+#: LYMessages.c:95
+msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
+msgstr "（mailto 表�域）输入文字，递交按回车，离开按方�键。"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:97
+msgid "(mailto form field) Mail is disallowed so you cannot submit."
+msgstr "（mailto 表�域）�止�信，所以您无法递交。"
+
+#. #define FORM_LINK_PASSWORD_MESSAGE
+#: LYMessages.c:99
+msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "（Password �目域）输入文字，离开用�上键��上键或 Tab 键。"
+
+#. #define FORM_LINK_PASSWORD_UNM_MSG
+#: LYMessages.c:101
+msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
+msgstr "�准改动的 password 表�，离开按�上��上方�键或 Tab 键。"
+
+#. #define FORM_LINK_CHECKBOX_MESSAGE
+#: LYMessages.c:103
+msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
+msgstr "（Checkbox 域）翻�按��键或回车。"
+
+#. #define FORM_LINK_CHECKBOX_UNM_MSG
+#: LYMessages.c:105
+msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
+msgstr "�准改动的 chenkbox 表�，离开用�上键��上键或 Tab 键。"
+
+#. #define FORM_LINK_RADIO_MESSAGE
+#: LYMessages.c:107
+msgid "(Radio Button)   Use right-arrow or <return> to toggle."
+msgstr "（Radio 按钮） 翻�用��键或回车。"
+
+#. #define FORM_LINK_RADIO_UNM_MSG
+#: LYMessages.c:109
+msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
+msgstr "�准改动的 radio 按钮表�，离开按�上键��上键或 Tab 键。"
+
+#. #define FORM_LINK_SUBMIT_PREFIX
+#: LYMessages.c:111
+msgid "Submit ('x' for no cache) to "
+msgstr "递交（�消缓存用‘x’）至"
+
+#. #define FORM_LINK_RESUBMIT_PREFIX
+#: LYMessages.c:113
+msgid "Submit to "
+msgstr "递交至"
+
+#. #define FORM_LINK_SUBMIT_MESSAGE
+#: LYMessages.c:115
+msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
+msgstr "（表�的 submit 按钮）递交按��或回车键（�消缓存用‘x’）。"
+
+#. #define FORM_LINK_RESUBMIT_MESSAGE
+#: LYMessages.c:117
+msgid "(Form submit button) Use right-arrow or <return> to submit."
+msgstr "（表�的 submit 按钮） 递交按��键或回车键。"
+
+#. #define FORM_LINK_SUBMIT_DIS_MSG
+#: LYMessages.c:119
+msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
+msgstr "�用表�的 submit 按钮，离开按�上键��上键或 Tab 键。"
+
+#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
+#: LYMessages.c:121
+msgid "Submit mailto form to "
+msgstr "将 mailto 表�递交至"
+
+#. #define FORM_LINK_SUBMIT_MAILTO_MSG
+#: LYMessages.c:123
+msgid "(mailto form submit button) Use right-arrow or <return> to submit."
+msgstr "（mailto 表�的 submit 按钮）递交按��键或回车键。"
+
+#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:125
+msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
+msgstr "（mailto 表�的 submit 按钮）Mail 已�用 ，所以您无法递交。 "
+
+#. #define FORM_LINK_RESET_MESSAGE
+#: LYMessages.c:127
+msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
+msgstr "（表�的 reset 按钮） 回�至默认表�，请按��键或回车键。"
+
+#. #define FORM_LINK_RESET_DIS_MSG
+#: LYMessages.c:129
+msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
+msgstr "表�的 reset 按钮已�用，离开请按�上键��上键或 Tab 键。"
+
+#. #define FORM_LINK_OPTION_LIST_MESSAGE
+#: LYMessages.c:131
+msgid "(Option list) Hit return and use arrow keys and return to select option."
+msgstr "（Option list）选择请按方�键，选中请按回车。"
+
+#. #define CHOICE_LIST_MESSAGE
+#: LYMessages.c:133
+msgid "(Choice list) Hit return and use arrow keys and return to select option."
+msgstr "（Choice list）选择请按方�键，选中请按回车。"
+
+#. #define FORM_LINK_OPTION_LIST_UNM_MSG
+#: LYMessages.c:135
+msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
+msgstr "�准改动的 option list ，预览或离开请按回车�方�键。"
+
+#. #define CHOICE_LIST_UNM_MSG
+#: LYMessages.c:137
+msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
+msgstr "�准改动的 choice list ，预览或离开请按回车�方�键。"
+
+#: LYMessages.c:138
+msgid "Submitting form..."
+msgstr "表�正在递交中……"
+
+#: LYMessages.c:139
+msgid "Resetting form..."
+msgstr "表�正被�置……"
+
+#. #define RELOADING_FORM
+#: LYMessages.c:141
+msgid "Reloading document.  Any form entries will be lost!"
+msgstr "正在�新�入文档，将�失表��目�"
+
+#: LYMessages.c:142
+#, c-format
+msgid "Warning: Cannot transcode form data to charset %s!"
+msgstr "警告：无法将表�的数�转� %s 字符集�"
+
+#. #define NORMAL_LINK_MESSAGE
+#: LYMessages.c:145
+msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
+msgstr "（NORMAL LINK） 激活用��键或回车。"
+
+#: LYMessages.c:146
+msgid "The resource requested is not available at this time."
+msgstr "此时无法获�被请求的资�。"
+
+#: LYMessages.c:147
+msgid "Enter Lynx keystroke command: "
+msgstr "输入 Lynx keystroke 命令："
+
+#: LYMessages.c:148
+msgid "Looking up "
+msgstr "寻找"
+
+#: LYMessages.c:149
+#, c-format
+msgid "Getting %s"
+msgstr "获得 %s"
+
+#: LYMessages.c:150
+#, c-format
+msgid "Skipping %s"
+msgstr "忽略 %s"
+
+#: LYMessages.c:151
+#, c-format
+msgid "Using %s"
+msgstr "使用 %s"
+
+#: LYMessages.c:152
+#, c-format
+msgid "Illegal URL: %s"
+msgstr "�法的 URL ：%s"
+
+#: LYMessages.c:153
+#, c-format
+msgid "Badly formed address %s"
+msgstr "错误的地�格� %s"
+
+#: LYMessages.c:154
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: LYMessages.c:155
+msgid "Unable to access WWW file!!!"
+msgstr "无法访问 WWW 文件���"
+
+#: LYMessages.c:156
+#, c-format
+msgid "This is a searchable index.  Use %s to search."
+msgstr "这是个��索的 index ，请用 %s 进行�索。"
+
+#. #define WWW_INDEX_MORE_MESSAGE
+#: LYMessages.c:158
+#, c-format
+msgid "--More--  This is a searchable index.  Use %s to search."
+msgstr "――More――  这是个��索的 index ，请用 %s 进行�索。"
+
+#: LYMessages.c:159
+msgid "You have entered an invalid link number."
+msgstr "您输入了一个�法的链接�。"
+
+#. #define SOURCE_HELP
+#: LYMessages.c:161
+msgid "Currently viewing document source.  Press '\\' to return to rendered version."
+msgstr "当�正在�览�文件。查看效果，请按“\\�。"
+
+#. #define NOVICE_LINE_ONE
+#: LYMessages.c:163
+msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
+msgstr "方�键：移动用上下键；选中链接用��键；返回用�左键。\n"
+
+#. #define NOVICE_LINE_TWO
+#: LYMessages.c:165
+msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
+msgstr ""
+
+#. #define NOVICE_LINE_TWO_A
+#: LYMessages.c:167
+msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
+msgstr ""
+
+#. #define NOVICE_LINE_TWO_B
+#: LYMessages.c:169
+msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
+msgstr ""
+
+#. #define NOVICE_LINE_TWO_C
+#: LYMessages.c:171
+msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
+msgstr ""
+
+#. #define FORM_NOVICELINE_ONE
+#: LYMessages.c:173
+msgid "            Enter text into the field by typing on the keyboard              "
+msgstr "用键盘敲入文字。"
+
+#. #define FORM_NOVICELINE_TWO
+#: LYMessages.c:175
+msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
+msgstr "删除域中的所有文字，用 Ctrl-U ；�删除一个字符，用 [Backspace] "
+
+#. #define FORM_NOVICELINE_TWO_DELBL
+#: LYMessages.c:177
+msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
+msgstr "删除域中的所有文字，用 Ctrl-U ；�删除一个字符，用 [Backspace]"
+
+#. #define FORM_NOVICELINE_TWO_VAR
+#: LYMessages.c:179
+#, c-format
+msgid "    %s to delete all text in field, [Backspace] to delete a character    "
+msgstr "删除域中的所有文字，用 %s ；�删除一个字符，用 [Backspace]"
+
+#. #define FORM_NOVICELINE_TWO_DELBL_VAR
+#: LYMessages.c:181
+#, c-format
+msgid "      %s to delete text in field, [Backspace] to delete a character    "
+msgstr "删除域中的所有文字，用 %s ；�删除一个字符，用 [Backspace]"
+
+#. mailto
+#: LYMessages.c:184
+msgid "Malformed mailto form submission!  Cancelled!"
+msgstr "错误的 mailto 表��已��消�"
+
+#: LYMessages.c:185
+msgid "Warning!  Control codes in mail address replaced by ?"
+msgstr "警告�邮件地�中的控制代�已�被 ？�代"
+
+#: LYMessages.c:186
+msgid "Mail disallowed!  Cannot submit."
+msgstr "�用邮件�无法递交。"
+
+#: LYMessages.c:187
+msgid "Mailto form submission failed!"
+msgstr "Mailto 表�递交出错�"
+
+#: LYMessages.c:188
+msgid "Mailto form submission Cancelled!!!"
+msgstr "�消了 Mailto 递交表�"
+
+#: LYMessages.c:189
+msgid "Sending form content..."
+msgstr "正在��表�内容..."
+
+#: LYMessages.c:190
+msgid "No email address is present in mailto URL!"
+msgstr "mailto URL 中没有邮件地��"
+
+#. #define MAILTO_URL_TEMPOPEN_FAILED
+#: LYMessages.c:192
+msgid "Unable to open temporary file for mailto URL!"
+msgstr "无法为 mailto URL 打开临时文件�"
+
+#. #define INC_ORIG_MSG_PROMPT
+#: LYMessages.c:194
+msgid "Do you wish to include the original message?"
+msgstr "您想�包�原始消��？"
+
+#. #define INC_PREPARSED_MSG_PROMPT
+#: LYMessages.c:196
+msgid "Do you wish to include the preparsed source?"
+msgstr "您想�包�预先解�的�文件�？"
+
+#. #define SPAWNING_EDITOR_FOR_MAIL
+#: LYMessages.c:198
+msgid "Spawning your selected editor to edit mail message"
+msgstr "正在调用您的编辑器�写邮件"
+
+#. #define ERROR_SPAWNING_EDITOR
+#: LYMessages.c:200
+msgid "Error spawning editor, check your editor definition in the options menu"
+msgstr "调用编辑器出错，请核查 option menu 中的编辑器定义"
+
+#: LYMessages.c:201
+msgid "Send this comment?"
+msgstr "��评语？"
+
+#: LYMessages.c:202
+msgid "Send this message?"
+msgstr "��消�？"
+
+#: LYMessages.c:203
+msgid "Sending your message..."
+msgstr "正在��您的消�……"
+
+#: LYMessages.c:204
+msgid "Sending your comment:"
+msgstr "正在��您的评语："
+
+#. textarea
+#: LYMessages.c:207
+msgid "Not in a TEXTAREA; cannot use external editor."
+msgstr "�在文本域中，无法使用外挂的编辑器。"
+
+#: LYMessages.c:208
+msgid "Not in a TEXTAREA; cannot use command."
+msgstr "�在文本域中，无法使用命令。"
+
+#: LYMessages.c:211
+msgid "file: ACTIONs are disallowed!"
+msgstr "file：ACTIONs 已�用�"
+
+#. #define FILE_SERVED_LINKS_DISALLOWED
+#: LYMessages.c:213
+msgid "file: URLs via served links are disallowed!"
+msgstr "file：链接的 URLs 已�用"
+
+#: LYMessages.c:214
+msgid "Access to local files denied."
+msgstr "本地文件拒�访问。"
+
+#: LYMessages.c:215
+msgid "file: URLs via bookmarks are disallowed!"
+msgstr "file：无法访问书签中的 URLs "
+
+#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
+#: LYMessages.c:217
+msgid "This special URL is not allowed in external documents!"
+msgstr "无法通过外部文档访问指定 URL �"
+
+#: LYMessages.c:218
+msgid "Press <return> to return to Lynx."
+msgstr "返回 Lynx ，请按回车。"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:221
+msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
+msgstr "正在调用 DCL �进程，返回 Lynx ，请用 ‘logout’。\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:225
+msgid "Type EXIT to return to Lynx.\n"
+msgstr "返回 Lynx ，请输入 EXIT 。\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:228
+msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
+msgstr "正在调用默认的 shell ，返回 Lynx ，请用 ‘exit’。\n"
+
+#: LYMessages.c:231
+msgid "Spawning is currently disabled."
+msgstr "当�无法调用。"
+
+#: LYMessages.c:232
+msgid "The 'd'ownload command is currently disabled."
+msgstr "当�无法用 ‘d’ownload 命令。"
+
+#: LYMessages.c:233
+msgid "You cannot download an input field."
+msgstr "您无法下载输入域。"
+
+#: LYMessages.c:234
+msgid "Form has a mailto action!  Cannot download."
+msgstr "表�� mailto 动作�无法下载。"
+
+#: LYMessages.c:235
+msgid "You cannot download a mailto: link."
+msgstr "您无法下载一个 mailto: 链接。"
+
+#: LYMessages.c:236
+msgid "You cannot download cookies."
+msgstr "您无法下载 cookies 。"
+
+#: LYMessages.c:237
+msgid "You cannot download a printing option."
+msgstr "您无法下载一个 printing option 。"
+
+#: LYMessages.c:238
+msgid "You cannot download an upload option."
+msgstr "您无法下载一个 upload option 。"
+
+#: LYMessages.c:239
+msgid "You cannot download an permit option."
+msgstr "您无法下载一个 permit option 。"
+
+#: LYMessages.c:240
+msgid "This special URL cannot be downloaded!"
+msgstr "无法下载指定的 URL"
+
+#: LYMessages.c:241
+msgid "Nothing to download."
+msgstr "没东西下载。"
+
+#: LYMessages.c:242
+msgid "Trace ON!"
+msgstr ""
+
+#: LYMessages.c:243
+msgid "Trace OFF!"
+msgstr ""
+
+#. #define CLICKABLE_IMAGES_ON
+#: LYMessages.c:245
+msgid "Links will be included for all images!  Reloading..."
+msgstr "被包�所有图�的链接�正在�新载入……"
+
+#. #define CLICKABLE_IMAGES_OFF
+#: LYMessages.c:247
+msgid "Standard image handling restored!  Reloading..."
+msgstr "回�标准图�处��正在�新载入……"
+
+#. #define PSEUDO_INLINE_ALTS_ON
+#: LYMessages.c:249
+msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
+msgstr "伪 ALT 键�是以 ALT 字符串，而是以内�方��入�正在�新载入……"
+
+#. #define PSEUDO_INLINE_ALTS_OFF
+#: LYMessages.c:251
+msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
+msgstr "将忽略没有 ALT 字符串指定的内�方��正在�新载入……"
+
+#: LYMessages.c:252
+msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
+msgstr "关闭原始的 8-bit 或 CJK 模��正在�新载入……"
+
+#: LYMessages.c:253
+msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
+msgstr "开�原始的 8-bit 或 CJK 模��正在�新载入……"
+
+#. #define HEAD_D_L_OR_CANCEL
+#: LYMessages.c:255
+msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
+msgstr "� D)ocument 还是 L)ink �� HEAD 请求，亦或 C)ancel ? (d,l,c): "
+
+#. #define HEAD_D_OR_CANCEL
+#: LYMessages.c:257
+msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
+msgstr "� D)ocument �� HEAD 请求，亦或 C)ancel ? (d,l,c): "
+
+#: LYMessages.c:258
+msgid "Sorry, the document is not an http URL."
+msgstr "抱歉，该文档并� http URL 。"
+
+#: LYMessages.c:259
+msgid "Sorry, the link is not an http URL."
+msgstr "抱歉，该链接并� http URL 。"
+
+#: LYMessages.c:260
+msgid "Sorry, the ACTION for this form is disabled."
+msgstr "抱歉，该表�的 ACTION 已�用。"
+
+#. #define FORM_ACTION_NOT_HTTP_URL
+#: LYMessages.c:262
+msgid "Sorry, the ACTION for this form is not an http URL."
+msgstr "抱歉，该表�的 ACTION 并� http URL 。"
+
+#: LYMessages.c:263
+msgid "Not an http URL or form ACTION!"
+msgstr "并�为 http URL 或 表�的 ACTION �"
+
+#: LYMessages.c:264
+msgid "This special URL cannot be a form ACTION!"
+msgstr "指定的 URL �是表�的 ACTION �"
+
+#: LYMessages.c:265
+msgid "URL is not in starting realm!"
+msgstr "URL �在开始的域中�"
+
+#: LYMessages.c:266
+msgid "News posting is disabled!"
+msgstr "已�止新闻�布�"
+
+#: LYMessages.c:267
+msgid "File management support is disabled!"
+msgstr "已�消对文件管�的支��"
+
+#: LYMessages.c:268
+msgid "No jump file is currently available."
+msgstr "当�没有跳转文件。"
+
+#: LYMessages.c:269
+msgid "Jump to (use '?' for list): "
+msgstr "跳转到（‘?’将给出列表）："
+
+#: LYMessages.c:270
+msgid "Jumping to a shortcut URL is disallowed!"
+msgstr "��许跳转到 URL 快�键�"
+
+#: LYMessages.c:271
+msgid "Random URL is disallowed!  Use a shortcut."
+msgstr "��许�机的 URL �请用快�键。"
+
+#: LYMessages.c:272
+msgid "No random URLs have been used thus far."
+msgstr "目�为止，还没有使用�机的 URLs 。"
+
+#: LYMessages.c:273
+msgid "Bookmark features are currently disabled."
+msgstr "当�书签功能已�用。"
+
+#: LYMessages.c:274
+msgid "Execution via bookmarks is disabled."
+msgstr "通过书签执行已�用"
+
+#. #define BOOKMARK_FILE_NOT_DEFINED
+#: LYMessages.c:276
+#, c-format
+msgid "Bookmark file is not defined. Use %s to see options."
+msgstr "没有指定书签文件。请用 %s 查看 options 。"
+
+#. #define NO_TEMP_FOR_HOTLIST
+#: LYMessages.c:278
+msgid "Unable to open tempfile for X Mosaic hotlist conversion."
+msgstr "无法打开 tempfile 完� X Mosaic hotlist 的转�。"
+
+#: LYMessages.c:279
+msgid "ERROR - unable to open bookmark file."
+msgstr "错误――无法打开书签文件。"
+
+#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:281
+msgid "Unable to open bookmark file for deletion of link."
+msgstr "无法打开书签文件以删去链接。"
+
+#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:283
+msgid "Unable to open scratch file for deletion of link."
+msgstr "无法打开�稿文件以删去链接。"
+
+#: LYMessages.c:285
+msgid "Error renaming scratch file."
+msgstr "�命��稿文件时出错。"
+
+#: LYMessages.c:287
+msgid "Error renaming temporary file."
+msgstr "�命�临时文件时出错。"
+
+#. #define BOOKTEMP_COPY_FAIL
+#: LYMessages.c:289
+msgid "Unable to copy temporary file for deletion of link."
+msgstr "无法打开临时文件以删去链接。"
+
+#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
+#: LYMessages.c:291
+msgid "Unable to reopen temporary file for deletion of link."
+msgstr "无法�打开临时文件以删去链接。"
+
+#. #define BOOKMARK_LINK_NOT_ONE_LINE
+#: LYMessages.c:294
+msgid "Link is not by itself all on one line in bookmark file."
+msgstr "书签文件中的链接并��独在一行中。"
+
+#: LYMessages.c:295
+msgid "Bookmark deletion failed."
+msgstr "删去书签时出错。"
+
+#. #define BOOKMARKS_NOT_TRAVERSED
+#: LYMessages.c:297
+msgid "Bookmark files cannot be traversed (only http URLs)."
+msgstr "无法�历书签文件 （�有 http URLs）。"
+
+#. #define BOOKMARKS_NOT_OPEN
+#: LYMessages.c:299
+msgid "Unable to open bookmark file, use 'a' to save a link first"
+msgstr "无法打开书签文件，用 'a' 先�存链接"
+
+#: LYMessages.c:300
+msgid "There are no links in this bookmark file!"
+msgstr "该书签文件中没有链接�"
+
+#. #define BOOK_D_L_OR_CANCEL
+#: LYMessages.c:302
+msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
+msgstr ""
+
+#: LYMessages.c:303
+msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
+msgstr ""
+
+#: LYMessages.c:304
+msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
+msgstr ""
+
+#. #define NOBOOK_POST_FORM
+#: LYMessages.c:306
+msgid "Documents from forms with POST content cannot be saved as bookmarks."
+msgstr "文档中�有 POST 内容的表�，故无法�存为书签。"
+
+#: LYMessages.c:307
+msgid "Cannot save form fields/links"
+msgstr "无法�存表�的域�链接"
+
+#. #define NOBOOK_HSML
+#: LYMessages.c:309
+msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
+msgstr "无法将历�记录�showinfo�menu � list files �存为书签。"
+
+#. #define CONFIRM_BOOKMARK_DELETE
+#: LYMessages.c:311
+msgid "Do you really want to delete this link from your bookmark file?"
+msgstr "您真的�将此链接从书签中删除？"
+
+#: LYMessages.c:312
+msgid "Malformed address."
+msgstr "地�有误。"
+
+#. #define HISTORICAL_ON_MINIMAL_OFF
+#: LYMessages.c:314
+msgid "Historical comment parsing ON (Minimal is overridden)!"
+msgstr ""
+
+#. #define HISTORICAL_OFF_MINIMAL_ON
+#: LYMessages.c:316
+msgid "Historical comment parsing OFF (Minimal is in effect)!"
+msgstr ""
+
+#. #define HISTORICAL_ON_VALID_OFF
+#: LYMessages.c:318
+msgid "Historical comment parsing ON (Valid is overridden)!"
+msgstr ""
+
+#. #define HISTORICAL_OFF_VALID_ON
+#: LYMessages.c:320
+msgid "Historical comment parsing OFF (Valid is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_ON_IN_EFFECT
+#: LYMessages.c:322
+msgid "Minimal comment parsing ON (and in effect)!"
+msgstr ""
+
+#. #define MINIMAL_OFF_VALID_ON
+#: LYMessages.c:324
+msgid "Minimal comment parsing OFF (Valid is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_ON_BUT_HISTORICAL
+#: LYMessages.c:326
+msgid "Minimal comment parsing ON (but Historical is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_OFF_HISTORICAL_ON
+#: LYMessages.c:328
+msgid "Minimal comment parsing OFF (Historical is in effect)!"
+msgstr ""
+
+#: LYMessages.c:329
+msgid "Soft double-quote parsing ON!"
+msgstr ""
+
+#: LYMessages.c:330
+msgid "Soft double-quote parsing OFF!"
+msgstr ""
+
+#: LYMessages.c:331
+msgid "Now using TagSoup parsing of HTML."
+msgstr ""
+
+#: LYMessages.c:332
+msgid "Now using SortaSGML parsing of HTML!"
+msgstr ""
+
+#: LYMessages.c:333
+msgid "You are already at the end of this document."
+msgstr "已��于文档底部。"
+
+#: LYMessages.c:334
+msgid "You are already at the beginning of this document."
+msgstr "已��于文档开头。"
+
+#: LYMessages.c:335
+#, c-format
+msgid "You are already at page %d of this document."
+msgstr "已��于文档的第 %d 页。"
+
+#: LYMessages.c:336
+#, c-format
+msgid "Link number %d already is current."
+msgstr "当�就是链接� %d 。"
+
+#: LYMessages.c:337
+msgid "You are already at the first document"
+msgstr "已��于第一个文档"
+
+#: LYMessages.c:338
+msgid "There are no links above this line of the document."
+msgstr "此行��的文档中没有链接。"
+
+#: LYMessages.c:339
+msgid "There are no links below this line of the document."
+msgstr "此行��的文档中没有链接。"
+
+#. #define MAXLEN_REACHED_DEL_OR_MOV
+#: LYMessages.c:341
+msgid "Maximum length reached!  Delete text or move off field."
+msgstr "已�到达最大长度�删除文字，或离开该区域。"
+
+#. #define NOT_ON_SUBMIT_OR_LINK
+#: LYMessages.c:343
+msgid "You are not on a form submission button or normal link."
+msgstr "�在表格�交按钮或普通链接上。"
+
+#. #define NEED_CHECKED_RADIO_BUTTON
+#: LYMessages.c:345
+msgid "One radio button must be checked at all times!"
+msgstr "无论如何，得在�选框中选一个�"
+
+#: LYMessages.c:346
+msgid "No submit button for this form, submit single text field?"
+msgstr "没有该表�的�交按钮，��交�独的文本域�？"
+
+#: LYMessages.c:347
+msgid "Do you want to go back to the previous document?"
+msgstr "想�回到�一个文档�？"
+
+#: LYMessages.c:348
+msgid "Use arrows or tab to move off of field."
+msgstr "离开该区域，请用方�键或 Tab 。"
+
+#. #define ENTER_TEXT_ARROWS_OR_TAB
+#: LYMessages.c:350
+msgid "Enter text.  Use arrows or tab to move off of field."
+msgstr "请输入文字。离开该区域，请用方�键或 Tab 。"
+
+#: LYMessages.c:351
+msgid "** Bad HTML!!  No form action defined. **"
+msgstr "＊＊ HTML 有问题��没有定义表�动作。＊＊"
+
+#: LYMessages.c:352
+msgid "Bad HTML!!  Unable to create popup window!"
+msgstr "HTML 有问题��无法新建弹出创��"
+
+#: LYMessages.c:353
+msgid "Unable to create popup window!"
+msgstr "无法新建弹出创��"
+
+#: LYMessages.c:354
+msgid "Goto a random URL is disallowed!"
+msgstr "访问�机 URL 功能已�用�"
+
+#: LYMessages.c:355
+msgid "Goto a non-http URL is disallowed!"
+msgstr "��许访问 non-http URL�"
+
+#: LYMessages.c:356
+#, c-format
+msgid "You are not allowed to goto \"%s\" URLs"
+msgstr "��许访问 \\'%s\\\" URLs"
+
+#: LYMessages.c:357
+msgid "URL to open: "
+msgstr "打开 URL："
+
+#: LYMessages.c:358
+msgid "Edit the current Goto URL: "
+msgstr "编辑当�的 URL："
+
+#: LYMessages.c:359
+msgid "Edit the previous Goto URL: "
+msgstr "编辑上一个所在的 URL："
+
+#: LYMessages.c:360
+msgid "Edit a previous Goto URL: "
+msgstr "编辑上一个所在的 URL："
+
+#: LYMessages.c:361
+msgid "Current document has POST data."
+msgstr "当�文档�有 POST 数�。"
+
+#: LYMessages.c:362
+msgid "Edit this document's URL: "
+msgstr "编辑此文档的 URL："
+
+#: LYMessages.c:363
+msgid "Edit the current link's URL: "
+msgstr "编辑此链接的 URL："
+
+#: LYMessages.c:364
+msgid "You cannot edit File Management URLs"
+msgstr "您无法编辑文件管�的 URLs"
+
+#: LYMessages.c:365
+msgid "Enter a database query: "
+msgstr "输入资料库的查询："
+
+#: LYMessages.c:366
+msgid "Enter a whereis query: "
+msgstr "输入 whereis 查询："
+
+#: LYMessages.c:367
+msgid "Edit the current query: "
+msgstr "编辑当�的查询："
+
+#: LYMessages.c:368
+msgid "Edit the previous query: "
+msgstr "编辑�一�查询："
+
+#: LYMessages.c:369
+msgid "Edit a previous query: "
+msgstr "编辑�一�查询："
+
+#. #define USE_C_R_TO_RESUB_CUR_QUERY
+#: LYMessages.c:371
+msgid "Use Control-R to resubmit the current query."
+msgstr "�新递交当�查询，请用 Ctrl-R 。"
+
+#: LYMessages.c:372
+msgid "Edit the current shortcut: "
+msgstr "编辑当�快�键："
+
+#: LYMessages.c:373
+msgid "Edit the previous shortcut: "
+msgstr "编辑�一个快�键："
+
+#: LYMessages.c:374
+msgid "Edit a previous shortcut: "
+msgstr "编辑�一个快�键："
+
+#: LYMessages.c:375
+#, c-format
+msgid "Key '%c' is not mapped to a jump file!"
+msgstr "'%c' 键无法映射到一个跳转的文件�"
+
+#: LYMessages.c:376
+msgid "Cannot locate jump file!"
+msgstr "无法定�跳转的文件�"
+
+#: LYMessages.c:377
+msgid "Cannot open jump file!"
+msgstr "无法打开跳转的文件�"
+
+#: LYMessages.c:378
+msgid "Error reading jump file!"
+msgstr "读�跳转文件时出错�"
+
+#: LYMessages.c:379
+msgid "Out of memory reading jump file!"
+msgstr "读�跳转文件时内存�够�"
+
+#: LYMessages.c:380
+msgid "Out of memory reading jump table!"
+msgstr "读�跳转表格时内存�够�"
+
+#: LYMessages.c:381
+msgid "No index is currently available."
+msgstr "当�没有�用的索引。"
+
+#. #define CONFIRM_MAIN_SCREEN
+#: LYMessages.c:383
+msgid "Do you really want to go to the Main screen?"
+msgstr "您真的�到主窗��？"
+
+#: LYMessages.c:384
+msgid "You are already at main screen!"
+msgstr "已��于主窗��"
+
+#. #define NOT_ISINDEX
+#: LYMessages.c:386
+msgid "Not a searchable indexed document -- press '/' to search for a text string"
+msgstr "�是��索文档 ―― �索文本字符串，请按 '/'"
+
+#. #define NO_OWNER
+#: LYMessages.c:388
+msgid "No owner is defined for this file so you cannot send a comment"
+msgstr "这个文件没有定义所有者，所以您无法��评语"
+
+#: LYMessages.c:389
+#, c-format
+msgid "No owner is defined. Use %s?"
+msgstr "未定义所有者。用 %s ？"
+
+#: LYMessages.c:390
+msgid "Do you wish to send a comment?"
+msgstr "您想���评语�？"
+
+#: LYMessages.c:391
+msgid "Mail is disallowed so you cannot send a comment"
+msgstr "��许使用邮件，所以您无法��评语"
+
+#: LYMessages.c:392
+msgid "The 'e'dit command is currently disabled."
+msgstr "当� 'e'dit 命令已�用。"
+
+#: LYMessages.c:393
+msgid "External editing is currently disabled."
+msgstr "当�外部编辑已�用。"
+
+#: LYMessages.c:394
+msgid "System error - failure to get status."
+msgstr "系统错误 ―― 无法获�状�。"
+
+#: LYMessages.c:395
+msgid "No editor is defined!"
+msgstr "没有定义编辑器�"
+
+#: LYMessages.c:396
+msgid "The 'p'rint command is currently disabled."
+msgstr "当� 'p'rint 命令已�用。"
+
+#: LYMessages.c:397
+msgid "Document has no Toolbar links or Banner."
+msgstr "文档没有工具�链接或 Banner 。"
+
+#: LYMessages.c:398
+msgid "Unable to open traversal file."
+msgstr "无法打开�历的文件。"
+
+#: LYMessages.c:399
+msgid "Unable to open traversal found file."
+msgstr "无法打开�历的 found 文件。"
+
+#: LYMessages.c:400
+msgid "Unable to open reject file."
+msgstr "无法打开 reject 文件。"
+
+#: LYMessages.c:401
+msgid "Unable to open traversal errors output file"
+msgstr "无法打开�历的错误输出文件"
+
+#: LYMessages.c:402
+msgid "TRAVERSAL WAS INTERRUPTED"
+msgstr "�历被中断"
+
+#: LYMessages.c:403
+msgid "Follow link (or goto link or page) number: "
+msgstr "跟�链接（或 goto 链接�页�）��："
+
+#: LYMessages.c:404
+msgid "Select option (or page) number: "
+msgstr "选择�选项（或页�）��："
+
+#: LYMessages.c:405
+#, c-format
+msgid "Option number %d already is current."
+msgstr "当�就是�选项�� %d 。"
+
+#. #define ALREADY_AT_OPTION_END
+#: LYMessages.c:407
+msgid "You are already at the end of this option list."
+msgstr "已��于�选项列表底部。"
+
+#. #define ALREADY_AT_OPTION_BEGIN
+#: LYMessages.c:409
+msgid "You are already at the beginning of this option list."
+msgstr "已��于�选项列表顶部。"
+
+#. #define ALREADY_AT_OPTION_PAGE
+#: LYMessages.c:411
+#, c-format
+msgid "You are already at page %d of this option list."
+msgstr "已��于该�选项列表的 %d 页。"
+
+#: LYMessages.c:412
+msgid "You have entered an invalid option number."
+msgstr "您输入了一个�法的�选项��。"
+
+#: LYMessages.c:413
+msgid "** Bad HTML!!  Use -trace to diagnose. **"
+msgstr "** HTML 有问题�� 请用 -trace 进行诊断。**"
+
+#: LYMessages.c:414
+msgid "Give name of file to save in"
+msgstr "请给出��存的文件�"
+
+#: LYMessages.c:415
+msgid "Can't save data to file -- please run WWW locally"
+msgstr "无法将数��存到文件 ―― 请在本地�行 WWW"
+
+#: LYMessages.c:416
+msgid "Can't open temporary file!"
+msgstr "无法打开临时文件�"
+
+#: LYMessages.c:417
+msgid "Can't open output file!  Cancelling!"
+msgstr "无法打开输出文件�正在�消�"
+
+#: LYMessages.c:418
+msgid "Execution is disabled."
+msgstr "�止执行。"
+
+#. #define EXECUTION_DISABLED_FOR_FILE
+#: LYMessages.c:420
+#, c-format
+msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
+msgstr "该文件没有�用执行，请�看�选项��（用 %s ）。"
+
+#. #define EXECUTION_NOT_COMPILED
+#: LYMessages.c:422
+msgid "Execution capabilities are not compiled into this version."
+msgstr "此版本在编译时没有加入执行功能。"
+
+#: LYMessages.c:423
+msgid "This file cannot be displayed on this terminal."
+msgstr "该文件无法在当�终端中�行。"
+
+#. #define CANNOT_DISPLAY_FILE_D_OR_C
+#: LYMessages.c:425
+msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
+msgstr "该文件无法在当�终端中�行：D)ownload，或 C)ancel"
+
+#: LYMessages.c:426
+#, c-format
+msgid "%s  D)ownload, or C)ancel"
+msgstr ""
+
+#: LYMessages.c:427
+msgid "Cancelling file."
+msgstr "正在�消文件。"
+
+#: LYMessages.c:428
+msgid "Retrieving file.  - PLEASE WAIT -"
+msgstr "�新获�文件，―― 请�候 ――"
+
+#: LYMessages.c:429
+msgid "Enter a filename: "
+msgstr "请输入一个文件�："
+
+#: LYMessages.c:430
+msgid "Edit the previous filename: "
+msgstr "编辑�一个文件�："
+
+#: LYMessages.c:431
+msgid "Edit a previous filename: "
+msgstr "编辑�一个文件�："
+
+#: LYMessages.c:432
+msgid "Enter a new filename: "
+msgstr "输入一个新的文件�："
+
+#: LYMessages.c:433
+msgid "File name may not begin with a dot."
+msgstr "文件��能以点�开头。"
+
+#: LYMessages.c:435
+msgid "File exists.  Create higher version?"
+msgstr "文件已存在，�创建新版本�？"
+
+#: LYMessages.c:437
+msgid "File exists.  Overwrite?"
+msgstr "文件已存在，�覆盖�？"
+
+#: LYMessages.c:439
+msgid "Cannot write to file."
+msgstr "无法写入文件。"
+
+#: LYMessages.c:440
+msgid "ERROR! - download command is misconfigured."
+msgstr "出错�―― 下载命令�置错误。"
+
+#: LYMessages.c:441
+msgid "Unable to download file."
+msgstr "无法下载文件。"
+
+#: LYMessages.c:442
+msgid "Reading directory..."
+msgstr "正在读�目录……"
+
+#: LYMessages.c:443
+msgid "Building directory listing..."
+msgstr "正在建立目录列表……"
+
+#: LYMessages.c:444
+msgid "Saving..."
+msgstr "正在�存……"
+
+#: LYMessages.c:445
+#, c-format
+msgid "Could not edit file '%s'."
+msgstr "无法编辑文件 '%s' 。"
+
+#: LYMessages.c:446
+msgid "Unable to access document!"
+msgstr "无法存�文档�"
+
+#: LYMessages.c:447
+msgid "Could not access file."
+msgstr "无法存�文件。"
+
+#: LYMessages.c:448
+msgid "Could not access directory."
+msgstr "无法存�目录。"
+
+#: LYMessages.c:449
+msgid "Could not load data."
+msgstr "无法载入数�。"
+
+#. #define CANNOT_EDIT_REMOTE_FILES
+#: LYMessages.c:451
+msgid "Lynx cannot currently (e)dit remote WWW files."
+msgstr "当� Lynx 无法 (e)dit 远程的 WWW 文件。"
+
+#. #define CANNOT_EDIT_FIELD
+#: LYMessages.c:453
+msgid "This field cannot be (e)dited with an external editor."
+msgstr "该文件无法由外部的编辑器进行 (e)dit 。"
+
+#: LYMessages.c:454
+msgid "Bad rule"
+msgstr "规则有问题"
+
+#: LYMessages.c:455
+msgid "Insufficient operands:"
+msgstr "�作数�够："
+
+#: LYMessages.c:456
+msgid "You are not authorized to edit this file."
+msgstr "您没有获得修改此文件的授�。"
+
+#: LYMessages.c:457
+msgid "Title: "
+msgstr "标题："
+
+#: LYMessages.c:458
+msgid "Subject: "
+msgstr "主题："
+
+#: LYMessages.c:459
+msgid "Username: "
+msgstr "用户�："
+
+#: LYMessages.c:460
+msgid "Password: "
+msgstr "密�："
+
+#: LYMessages.c:461
+msgid "lynx: Username and Password required!!!"
+msgstr "lynx：�求用户�和密����"
+
+#: LYMessages.c:462
+msgid "lynx: Password required!!!"
+msgstr "lynx：�求密����"
+
+#: LYMessages.c:463
+msgid "Clear all authorization info for this session?"
+msgstr "�清除该对�中的所有验�信��？"
+
+#: LYMessages.c:464
+msgid "Authorization info cleared."
+msgstr "验�信�已被清除。"
+
+#: LYMessages.c:465
+msgid "Authorization failed.  Retry?"
+msgstr "验�失败，�试一次？"
+
+#: LYMessages.c:466
+msgid "cgi support has been disabled."
+msgstr "已�用 cgi 功能。"
+
+#. #define CGI_NOT_COMPILED
+#: LYMessages.c:468
+msgid "Lynxcgi capabilities are not compiled into this version."
+msgstr "此版本在编译时没有加入 Lynxcgi 功能。"
+
+#: LYMessages.c:469
+#, c-format
+msgid "Sorry, no known way of converting %s to %s."
+msgstr "抱歉，没办法将 %s 转�为 %s 。"
+
+#: LYMessages.c:470
+msgid "Unable to set up connection."
+msgstr "无法建立转�"
+
+#: LYMessages.c:471
+msgid "Unable to make connection"
+msgstr "无法完�转�"
+
+#. #define MALFORMED_EXEC_REQUEST
+#: LYMessages.c:473
+msgid "Executable link rejected due to malformed request."
+msgstr ""
+
+#. #define BADCHAR_IN_EXEC_LINK
+#: LYMessages.c:475
+#, c-format
+msgid "Executable link rejected due to `%c' character."
+msgstr ""
+
+#. #define RELPATH_IN_EXEC_LINK
+#: LYMessages.c:477
+msgid "Executable link rejected due to relative path string ('../')."
+msgstr ""
+
+#. #define BADLOCPATH_IN_EXEC_LINK
+#: LYMessages.c:479
+msgid "Executable link rejected due to location or path."
+msgstr ""
+
+#: LYMessages.c:480
+msgid "Mail access is disabled!"
+msgstr ""
+
+#. #define ACCESS_ONLY_LOCALHOST
+#: LYMessages.c:482
+msgid "Only files and servers on the local host can be accessed."
+msgstr ""
+
+#: LYMessages.c:483
+msgid "Telnet access is disabled!"
+msgstr ""
+
+#. #define TELNET_PORT_SPECS_DISABLED
+#: LYMessages.c:485
+msgid "Telnet port specifications are disabled."
+msgstr ""
+
+#: LYMessages.c:486
+msgid "USENET news access is disabled!"
+msgstr ""
+
+#: LYMessages.c:487
+msgid "Rlogin access is disabled!"
+msgstr ""
+
+#: LYMessages.c:488
+msgid "Ftp access is disabled!"
+msgstr ""
+
+#: LYMessages.c:489
+msgid "There are no references from this document."
+msgstr ""
+
+#: LYMessages.c:490
+msgid "There are only hidden links from this document."
+msgstr ""
+
+#: LYMessages.c:492
+msgid "Unable to open command file."
+msgstr ""
+
+#: LYMessages.c:494
+msgid "News Post Cancelled!!!"
+msgstr ""
+
+#. #define SPAWNING_EDITOR_FOR_NEWS
+#: LYMessages.c:496
+msgid "Spawning your selected editor to edit news message"
+msgstr ""
+
+#: LYMessages.c:497
+msgid "Post this message?"
+msgstr ""
+
+#: LYMessages.c:498
+#, c-format
+msgid "Append '%s'?"
+msgstr ""
+
+#: LYMessages.c:499
+msgid "Posting to newsgroup(s)..."
+msgstr ""
+
+#: LYMessages.c:501
+msgid "*** You have unread mail. ***"
+msgstr ""
+
+#: LYMessages.c:503
+msgid "*** You have mail. ***"
+msgstr ""
+
+#: LYMessages.c:505
+msgid "*** You have new mail. ***"
+msgstr ""
+
+#: LYMessages.c:506
+msgid "File insert cancelled!!!"
+msgstr ""
+
+#: LYMessages.c:507
+msgid "Not enough memory for file!"
+msgstr ""
+
+#: LYMessages.c:508
+msgid "Can't open file for reading."
+msgstr ""
+
+#: LYMessages.c:509
+msgid "File does not exist."
+msgstr ""
+
+#: LYMessages.c:510
+msgid "File does not exist - reenter or cancel:"
+msgstr ""
+
+#: LYMessages.c:511
+msgid "File is not readable."
+msgstr ""
+
+#: LYMessages.c:512
+msgid "File is not readable - reenter or cancel:"
+msgstr ""
+
+#: LYMessages.c:513
+msgid "Nothing to insert - file is 0-length."
+msgstr ""
+
+#: LYMessages.c:514
+msgid "Save request cancelled!!!"
+msgstr ""
+
+#: LYMessages.c:515
+msgid "Mail request cancelled!!!"
+msgstr ""
+
+#. #define CONFIRM_MAIL_SOURCE_PREPARSED
+#: LYMessages.c:517
+msgid "Viewing preparsed source.  Are you sure you want to mail it?"
+msgstr ""
+
+#: LYMessages.c:518
+msgid "Please wait..."
+msgstr ""
+
+#: LYMessages.c:519
+msgid "Mailing file.  Please wait..."
+msgstr ""
+
+#: LYMessages.c:520
+msgid "ERROR - Unable to mail file"
+msgstr ""
+
+#. #define CONFIRM_LONG_SCREEN_PRINT
+#: LYMessages.c:522
+#, c-format
+msgid "File is %d screens long.  Are you sure you want to print?"
+msgstr ""
+
+#: LYMessages.c:523
+msgid "Print request cancelled!!!"
+msgstr ""
+
+#: LYMessages.c:524
+msgid "Press <return> to begin: "
+msgstr ""
+
+#: LYMessages.c:525
+msgid "Press <return> to finish: "
+msgstr ""
+
+#. #define CONFIRM_LONG_PAGE_PRINT
+#: LYMessages.c:527
+#, c-format
+msgid "File is %d pages long.  Are you sure you want to print?"
+msgstr ""
+
+#. #define CHECK_PRINTER
+#: LYMessages.c:529
+msgid "Be sure your printer is on-line.  Press <return> to start printing:"
+msgstr ""
+
+#: LYMessages.c:530
+msgid "ERROR - Unable to allocate file space!!!"
+msgstr ""
+
+#: LYMessages.c:531
+msgid "Unable to open tempfile"
+msgstr ""
+
+#: LYMessages.c:532
+msgid "Unable to open print options file"
+msgstr ""
+
+#: LYMessages.c:533
+msgid "Printing file.  Please wait..."
+msgstr ""
+
+#: LYMessages.c:534
+msgid "Please enter a valid internet mail address: "
+msgstr ""
+
+#: LYMessages.c:535
+msgid "ERROR! - printer is misconfigured!"
+msgstr ""
+
+#: LYMessages.c:536
+msgid "Image map from POST response not available!"
+msgstr ""
+
+#: LYMessages.c:537
+msgid "Misdirected client-side image MAP request!"
+msgstr ""
+
+#: LYMessages.c:538
+msgid "Client-side image MAP is not accessible!"
+msgstr ""
+
+#: LYMessages.c:539
+msgid "No client-side image MAPs are available!"
+msgstr ""
+
+#: LYMessages.c:540
+msgid "Client-side image MAP is not available!"
+msgstr ""
+
+#. #define OPTION_SCREEN_NEEDS_24
+#: LYMessages.c:543
+msgid "Screen height must be at least 24 lines for the Options menu!"
+msgstr ""
+
+#. #define OPTION_SCREEN_NEEDS_23
+#: LYMessages.c:545
+msgid "Screen height must be at least 23 lines for the Options menu!"
+msgstr ""
+
+#. #define OPTION_SCREEN_NEEDS_22
+#: LYMessages.c:547
+msgid "Screen height must be at least 22 lines for the Options menu!"
+msgstr ""
+
+#: LYMessages.c:549
+msgid "That key requires Advanced User mode."
+msgstr ""
+
+#: LYMessages.c:550
+#, c-format
+msgid "Content-type: %s"
+msgstr ""
+
+#: LYMessages.c:551
+msgid "Command: "
+msgstr ""
+
+#: LYMessages.c:552
+msgid "Unknown or ambiguous command"
+msgstr ""
+
+#: LYMessages.c:553
+msgid " Version "
+msgstr ""
+
+#: LYMessages.c:554
+msgid " first"
+msgstr ""
+
+#: LYMessages.c:555
+msgid ", guessing..."
+msgstr ""
+
+#: LYMessages.c:556
+msgid "Permissions for "
+msgstr ""
+
+#: LYMessages.c:557
+msgid "Select "
+msgstr ""
+
+#: LYMessages.c:558
+msgid "capital letter"
+msgstr ""
+
+#: LYMessages.c:559
+msgid " of option line,"
+msgstr ""
+
+#: LYMessages.c:560
+msgid " to save,"
+msgstr ""
+
+#: LYMessages.c:561
+msgid " to "
+msgstr ""
+
+#: LYMessages.c:562
+msgid " or "
+msgstr ""
+
+#: LYMessages.c:563
+msgid " index"
+msgstr ""
+
+#: LYMessages.c:564
+msgid " to return to Lynx."
+msgstr ""
+
+#: LYMessages.c:565
+msgid "Accept Changes"
+msgstr ""
+
+#: LYMessages.c:566
+msgid "Reset Changes"
+msgstr ""
+
+#: LYMessages.c:567
+msgid "Left Arrow cancels changes"
+msgstr ""
+
+#: LYMessages.c:568
+msgid "Save options to disk"
+msgstr ""
+
+#: LYMessages.c:569
+msgid "Hit RETURN to accept entered data."
+msgstr ""
+
+#. #define ACCEPT_DATA_OR_DEFAULT
+#: LYMessages.c:571
+msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
+msgstr ""
+
+#: LYMessages.c:572
+msgid "Value accepted!"
+msgstr ""
+
+#. #define VALUE_ACCEPTED_WARNING_X
+#: LYMessages.c:574
+msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
+msgstr ""
+
+#. #define VALUE_ACCEPTED_WARNING_NONX
+#: LYMessages.c:576
+msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
+msgstr ""
+
+#: LYMessages.c:577
+msgid "You are not allowed to change which editor to use!"
+msgstr ""
+
+#: LYMessages.c:578
+msgid "Failed to set DISPLAY variable!"
+msgstr ""
+
+#: LYMessages.c:579
+msgid "Failed to clear DISPLAY variable!"
+msgstr ""
+
+#. #define BOOKMARK_CHANGE_DISALLOWED
+#: LYMessages.c:581
+msgid "You are not allowed to change the bookmark file!"
+msgstr ""
+
+#: LYMessages.c:582
+msgid "Terminal does not support color"
+msgstr ""
+
+#: LYMessages.c:583
+#, c-format
+msgid "Your '%s' terminal does not support color."
+msgstr ""
+
+#: LYMessages.c:584
+msgid "Access to dot files is disabled!"
+msgstr ""
+
+#. #define UA_NO_LYNX_WARNING
+#: LYMessages.c:586
+msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
+msgstr ""
+
+#. #define UA_PLEASE_USE_LYNX
+#: LYMessages.c:588
+msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
+msgstr ""
+
+#. #define UA_CHANGE_DISABLED
+#: LYMessages.c:590
+msgid "Changing of the User-Agent string is disabled!"
+msgstr ""
+
+#. #define CHANGE_OF_SETTING_DISALLOWED
+#: LYMessages.c:592
+msgid "You are not allowed to change this setting."
+msgstr ""
+
+#: LYMessages.c:593
+msgid "Saving Options..."
+msgstr ""
+
+#: LYMessages.c:594
+msgid "Options saved!"
+msgstr ""
+
+#: LYMessages.c:595
+msgid "Unable to save Options!"
+msgstr ""
+
+#: LYMessages.c:596
+msgid " 'r' to return to Lynx "
+msgstr ""
+
+#: LYMessages.c:597
+msgid " '>' to save, or 'r' to return to Lynx "
+msgstr ""
+
+#. #define ANY_KEY_CHANGE_RET_ACCEPT
+#: LYMessages.c:599
+msgid "Hit any key to change value; RETURN to accept."
+msgstr ""
+
+#: LYMessages.c:600
+msgid "Error uncompressing temporary file!"
+msgstr ""
+
+#: LYMessages.c:601
+msgid "Unsupported URL scheme!"
+msgstr ""
+
+#: LYMessages.c:602
+msgid "Unsupported data: URL!  Use SHOWINFO, for now."
+msgstr ""
+
+#: LYMessages.c:603
+msgid "Redirection limit of 10 URL's reached."
+msgstr ""
+
+#: LYMessages.c:604
+msgid "Illegal redirection URL received from server!"
+msgstr ""
+
+#. #define SERVER_ASKED_FOR_REDIRECTION
+#: LYMessages.c:606
+#, c-format
+msgid "Server asked for %d redirection of POST content to"
+msgstr ""
+
+#: LYMessages.c:609
+msgid "P)roceed, use G)ET or C)ancel "
+msgstr ""
+
+#: LYMessages.c:610
+msgid "P)roceed, or C)ancel "
+msgstr ""
+
+#. #define ADVANCED_POST_GET_REDIRECT
+#: LYMessages.c:612
+msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
+msgstr ""
+
+#. #define ADVANCED_POST_REDIRECT
+#: LYMessages.c:614
+msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
+msgstr ""
+
+#. #define CONFIRM_POST_RESUBMISSION
+#: LYMessages.c:616
+msgid "Document from Form with POST content.  Resubmit?"
+msgstr ""
+
+#. #define CONFIRM_POST_RESUBMISSION_TO
+#: LYMessages.c:618
+#, c-format
+msgid "Resubmit POST content to %s ?"
+msgstr ""
+
+#. #define CONFIRM_POST_LIST_RELOAD
+#: LYMessages.c:620
+#, c-format
+msgid "List from document with POST data.  Reload %s ?"
+msgstr ""
+
+#. #define CONFIRM_POST_DOC_HEAD
+#: LYMessages.c:622
+msgid "Document from POST action, HEAD may not be understood.  Proceed?"
+msgstr ""
+
+#. #define CONFIRM_POST_LINK_HEAD
+#: LYMessages.c:624
+msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
+msgstr ""
+
+#: LYMessages.c:625
+msgid "Proceed without a username and password?"
+msgstr ""
+
+#: LYMessages.c:626
+#, c-format
+msgid "Proceed (%s)?"
+msgstr ""
+
+#: LYMessages.c:627
+msgid "Cannot POST to this host."
+msgstr ""
+
+#: LYMessages.c:628
+msgid "POST not supported for this URL - ignoring POST data!"
+msgstr ""
+
+#: LYMessages.c:629
+msgid "Discarding POST data..."
+msgstr ""
+
+#: LYMessages.c:630
+msgid "Document will not be reloaded!"
+msgstr ""
+
+#: LYMessages.c:631
+msgid "Location: "
+msgstr ""
+
+#: LYMessages.c:632
+#, c-format
+msgid "'%s' not found!"
+msgstr ""
+
+#: LYMessages.c:633
+msgid "Default Bookmark File"
+msgstr ""
+
+#: LYMessages.c:634
+msgid "Screen too small! (8x35 min)"
+msgstr ""
+
+#: LYMessages.c:635
+msgid "Select destination or ^G to Cancel: "
+msgstr ""
+
+#. #define MULTIBOOKMARKS_SELECT
+#: LYMessages.c:637
+msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
+msgstr ""
+
+#. #define MULTIBOOKMARKS_SELF
+#: LYMessages.c:639
+msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
+msgstr ""
+
+#: LYMessages.c:640
+msgid "Multiple bookmark support is not available."
+msgstr ""
+
+#: LYMessages.c:641
+#, c-format
+msgid " Select Bookmark (screen %d of %d)"
+msgstr ""
+
+#: LYMessages.c:642
+msgid "       Select Bookmark"
+msgstr ""
+
+#. #define MULTIBOOKMARKS_EHEAD_MASK
+#: LYMessages.c:644
+#, c-format
+msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
+msgstr ""
+
+#. #define MULTIBOOKMARKS_EHEAD
+#: LYMessages.c:646
+msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
+msgstr ""
+
+#: LYMessages.c:647
+msgid "Letter: "
+msgstr ""
+
+#. #define USE_PATH_OFF_HOME
+#: LYMessages.c:650
+msgid "Use a filepath off your login directory in SHELL syntax!"
+msgstr ""
+
+#: LYMessages.c:652
+msgid "Use a filepath off your home directory!"
+msgstr ""
+
+#. #define MAXLINKS_REACHED
+#: LYMessages.c:655
+msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
+msgstr ""
+
+#. #define MAXHIST_REACHED
+#: LYMessages.c:657
+msgid "History List maximum reached!  Document not pushed."
+msgstr ""
+
+#: LYMessages.c:658
+msgid "No previously visited links available!"
+msgstr ""
+
+#: LYMessages.c:659
+msgid "Memory exhausted!  Program aborted!"
+msgstr ""
+
+#: LYMessages.c:660
+msgid "Memory exhausted!  Aborting..."
+msgstr ""
+
+#: LYMessages.c:661
+msgid "Not enough memory!"
+msgstr ""
+
+#: LYMessages.c:662
+msgid "Directory/File Manager not available"
+msgstr ""
+
+#: LYMessages.c:663
+msgid "HREF in BASE tag is not an absolute URL."
+msgstr ""
+
+#: LYMessages.c:664
+msgid "Location URL is not absolute."
+msgstr ""
+
+#: LYMessages.c:665
+msgid "Refresh URL is not absolute."
+msgstr ""
+
+#. #define SENDING_MESSAGE_WITH_BODY_TO
+#: LYMessages.c:667
+msgid ""
+"You are sending a message with body to:\n"
+"  "
+msgstr ""
+
+#: LYMessages.c:668
+msgid ""
+"You are sending a comment to:\n"
+"  "
+msgstr ""
+
+#: LYMessages.c:669
+msgid ""
+"\n"
+" With copy to:\n"
+"  "
+msgstr ""
+
+#: LYMessages.c:670
+msgid ""
+"\n"
+" With copies to:\n"
+"  "
+msgstr ""
+
+#. #define CTRL_G_TO_CANCEL_SEND
+#: LYMessages.c:672
+msgid ""
+"\n"
+"\n"
+"Use Ctrl-G to cancel if you do not want to send a message\n"
+msgstr ""
+
+#. #define ENTER_NAME_OR_BLANK
+#: LYMessages.c:674
+msgid ""
+"\n"
+" Please enter your name, or leave it blank to remain anonymous\n"
+msgstr ""
+
+#. #define ENTER_MAIL_ADDRESS_OR_OTHER
+#: LYMessages.c:676
+msgid ""
+"\n"
+" Please enter a mail address or some other\n"
+msgstr ""
+
+#. #define MEANS_TO_CONTACT_FOR_RESPONSE
+#: LYMessages.c:678
+msgid " means to contact you, if you desire a response.\n"
+msgstr ""
+
+#: LYMessages.c:679
+msgid ""
+"\n"
+" Please enter a subject line.\n"
+msgstr ""
+
+#. #define ENTER_ADDRESS_FOR_CC
+#: LYMessages.c:681
+msgid ""
+"\n"
+" Enter a mail address for a CC of your message.\n"
+msgstr ""
+
+#: LYMessages.c:682
+msgid " (Leave blank if you don't want a copy.)\n"
+msgstr ""
+
+#: LYMessages.c:683
+msgid ""
+"\n"
+" Please review the message body:\n"
+"\n"
+msgstr ""
+
+#: LYMessages.c:684
+msgid ""
+"\n"
+"Press RETURN to continue: "
+msgstr ""
+
+#: LYMessages.c:685
+msgid ""
+"\n"
+"Press RETURN to clean up: "
+msgstr ""
+
+#: LYMessages.c:686
+msgid " Use Control-U to erase the default.\n"
+msgstr ""
+
+#: LYMessages.c:687
+msgid ""
+"\n"
+" Please enter your message below."
+msgstr ""
+
+#. #define ENTER_PERIOD_WHEN_DONE_A
+#: LYMessages.c:689 src/LYNews.c:361
+msgid ""
+"\n"
+" When you are done, press enter and put a single period (.)"
+msgstr ""
+
+#. #define ENTER_PERIOD_WHEN_DONE_B
+#: LYMessages.c:691 src/LYNews.c:362
+msgid ""
+"\n"
+" on a line and press enter again."
+msgstr ""
+
+#. Cookies messages
+#. #define ADVANCED_COOKIE_CONFIRMATION
+#: LYMessages.c:695
+#, c-format
+msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
+msgstr ""
+
+#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
+#: LYMessages.c:697
+#, c-format
+msgid "Accept invalid cookie domain=%s for '%s'?"
+msgstr ""
+
+#. #define INVALID_COOKIE_PATH_CONFIRMATION
+#: LYMessages.c:699
+#, c-format
+msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
+msgstr ""
+
+#: LYMessages.c:700
+msgid "Allowing this cookie."
+msgstr ""
+
+#: LYMessages.c:701
+msgid "Rejecting this cookie."
+msgstr ""
+
+#: LYMessages.c:702
+msgid "The Cookie Jar is empty."
+msgstr ""
+
+#. #define ACTIVATE_TO_GOBBLE
+#: LYMessages.c:704
+msgid "Activate links to gobble up cookies or entire domains,"
+msgstr ""
+
+#: LYMessages.c:705
+msgid "or to change a domain's 'allow' setting."
+msgstr ""
+
+#: LYMessages.c:706
+msgid "(Cookies never allowed.)"
+msgstr ""
+
+#: LYMessages.c:707
+msgid "(Cookies always allowed.)"
+msgstr ""
+
+#: LYMessages.c:708
+msgid "(Cookies allowed via prompt.)"
+msgstr ""
+
+#: LYMessages.c:709
+msgid "(Persistent Cookies.)"
+msgstr ""
+
+#: LYMessages.c:710
+msgid "(No title.)"
+msgstr ""
+
+#: LYMessages.c:711
+msgid "(No name.)"
+msgstr ""
+
+#: LYMessages.c:712
+msgid "(No value.)"
+msgstr ""
+
+#: LYMessages.c:713
+msgid "None"
+msgstr ""
+
+#: LYMessages.c:714
+msgid "(End of session.)"
+msgstr ""
+
+#: LYMessages.c:715
+msgid "Delete this cookie?"
+msgstr ""
+
+#: LYMessages.c:716
+msgid "The cookie has been eaten!"
+msgstr ""
+
+#: LYMessages.c:717
+msgid "Delete this empty domain?"
+msgstr ""
+
+#: LYMessages.c:718
+msgid "The domain has been eaten!"
+msgstr ""
+
+#. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:720
+msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr ""
+
+#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:722
+msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr ""
+
+#: LYMessages.c:723
+msgid "All cookies in the domain have been eaten!"
+msgstr ""
+
+#: LYMessages.c:724
+#, c-format
+msgid "'A'lways allowing from domain '%s'."
+msgstr ""
+
+#: LYMessages.c:725
+#, c-format
+msgid "ne'V'er allowing from domain '%s'."
+msgstr ""
+
+#: LYMessages.c:726
+#, c-format
+msgid "'P'rompting to allow from domain '%s'."
+msgstr ""
+
+#: LYMessages.c:727
+msgid "Delete all cookies in this domain?"
+msgstr ""
+
+#: LYMessages.c:728
+msgid "All of the cookies in the jar have been eaten!"
+msgstr ""
+
+#: LYMessages.c:730
+msgid "Port 19 not permitted in URLs."
+msgstr ""
+
+#: LYMessages.c:731
+msgid "Port 25 not permitted in URLs."
+msgstr ""
+
+#: LYMessages.c:732
+#, c-format
+msgid "Port %lu not permitted in URLs."
+msgstr ""
+
+#: LYMessages.c:733
+msgid "URL has a bad port field."
+msgstr ""
+
+#: LYMessages.c:734
+msgid "Maximum nesting of HTML elements exceeded."
+msgstr ""
+
+#: LYMessages.c:735
+msgid "Bad partial reference!  Stripping lead dots."
+msgstr ""
+
+#: LYMessages.c:736
+msgid "Trace Log open failed.  Trace off!"
+msgstr ""
+
+#: LYMessages.c:737
+msgid "Lynx Trace Log"
+msgstr ""
+
+#: LYMessages.c:738
+msgid "No trace log has been started for this session."
+msgstr ""
+
+#. #define MAX_TEMPCOUNT_REACHED
+#: LYMessages.c:740
+msgid "The maximum temporary file count has been reached!"
+msgstr ""
+
+#. #define FORM_VALUE_TOO_LONG
+#: LYMessages.c:742
+msgid "Form field value exceeds buffer length!  Trim the tail."
+msgstr ""
+
+#. #define FORM_TAIL_COMBINED_WITH_HEAD
+#: LYMessages.c:744
+msgid "Modified tail combined with head of form field value."
+msgstr ""
+
+#. HTFile.c
+#: LYMessages.c:747
+msgid "Directory"
+msgstr ""
+
+#: LYMessages.c:748
+msgid "Directory browsing is not allowed."
+msgstr ""
+
+#: LYMessages.c:749
+msgid "Selective access is not enabled for this directory"
+msgstr ""
+
+#: LYMessages.c:750
+msgid "Multiformat: directory scan failed."
+msgstr ""
+
+#: LYMessages.c:751
+msgid "This directory is not readable."
+msgstr ""
+
+#: LYMessages.c:752
+msgid "Can't access requested file."
+msgstr ""
+
+#: LYMessages.c:753
+msgid "Could not find suitable representation for transmission."
+msgstr ""
+
+#: LYMessages.c:754
+msgid "Could not open file for decompression!"
+msgstr ""
+
+#: LYMessages.c:755
+msgid "Files:"
+msgstr ""
+
+#: LYMessages.c:756
+msgid "Subdirectories:"
+msgstr ""
+
+#: LYMessages.c:757
+msgid " directory"
+msgstr ""
+
+#: LYMessages.c:758
+msgid "Up to "
+msgstr ""
+
+#: LYMessages.c:759
+msgid "Current directory is "
+msgstr ""
+
+#. HTGopher.c
+#: LYMessages.c:762
+msgid "No response from server!"
+msgstr ""
+
+#: LYMessages.c:763
+msgid "CSO index"
+msgstr ""
+
+#: LYMessages.c:764
+msgid ""
+"\n"
+"This is a searchable index of a CSO database.\n"
+msgstr ""
+
+#: LYMessages.c:765
+msgid "CSO Search Results"
+msgstr ""
+
+#: LYMessages.c:766
+#, c-format
+msgid "Seek fail on %s\n"
+msgstr ""
+
+#: LYMessages.c:767
+msgid ""
+"\n"
+"Press the 's' key and enter search keywords.\n"
+msgstr ""
+
+#: LYMessages.c:768
+msgid ""
+"\n"
+"This is a searchable Gopher index.\n"
+msgstr ""
+
+#: LYMessages.c:769
+msgid "Gopher index"
+msgstr ""
+
+#: LYMessages.c:770
+msgid "Gopher Menu"
+msgstr ""
+
+#: LYMessages.c:771
+msgid " Search Results"
+msgstr ""
+
+#: LYMessages.c:772
+msgid "Sending CSO/PH request."
+msgstr ""
+
+#: LYMessages.c:773
+msgid "Sending Gopher request."
+msgstr ""
+
+#: LYMessages.c:774
+msgid "CSO/PH request sent; waiting for response."
+msgstr ""
+
+#: LYMessages.c:775
+msgid "Gopher request sent; waiting for response."
+msgstr ""
+
+#: LYMessages.c:776
+msgid ""
+"\n"
+"Please enter search keywords.\n"
+msgstr ""
+
+#: LYMessages.c:777
+msgid ""
+"\n"
+"The keywords that you enter will allow you to search on a"
+msgstr ""
+
+#: LYMessages.c:778
+msgid " person's name in the database.\n"
+msgstr ""
+
+#. HTNews.c
+#: LYMessages.c:781
+msgid "Connection closed ???"
+msgstr ""
+
+#: LYMessages.c:782
+msgid "Cannot open temporary file for news POST."
+msgstr ""
+
+#: LYMessages.c:783
+msgid "This client does not contain support for posting to news with SSL."
+msgstr ""
+
+#. HTStyle.c
+#: LYMessages.c:786
+#, c-format
+msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
+msgstr ""
+
+#: LYMessages.c:787
+#, c-format
+msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
+msgstr ""
+
+#: LYMessages.c:788
+#, c-format
+msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
+msgstr ""
+
+#: LYMessages.c:789
+#, c-format
+msgid "\t\tTab kind=%d at %.0f\n"
+msgstr ""
+
+#. HTTP.c
+#: LYMessages.c:792
+msgid "Can't proceed without a username and password."
+msgstr ""
+
+#: LYMessages.c:793
+msgid "Can't retry with authorization!  Contact the server's WebMaster."
+msgstr ""
+
+#: LYMessages.c:794
+msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
+msgstr ""
+
+#: LYMessages.c:795
+msgid "Retrying with proxy authorization information."
+msgstr ""
+
+#. HTWAIS.c
+#: LYMessages.c:798
+msgid "HTWAIS: Return message too large."
+msgstr ""
+
+#: LYMessages.c:799
+msgid "Enter WAIS query: "
+msgstr ""
+
+#. Miscellaneous status
+#: LYMessages.c:802
+msgid "Retrying as HTTP0 request."
+msgstr ""
+
+#: LYMessages.c:803
+#, c-format
+msgid "Transferred %d bytes"
+msgstr ""
+
+#: LYMessages.c:804
+msgid "Data transfer complete"
+msgstr ""
+
+#: LYMessages.c:805
+#, c-format
+msgid "Error processing line %d of %s\n"
+msgstr ""
+
+#. Lynx internal page titles
+#: LYMessages.c:808
+msgid "Address List Page"
+msgstr ""
+
+#: LYMessages.c:809
+msgid "Bookmark file"
+msgstr ""
+
+#: LYMessages.c:810
+msgid "Configuration Definitions"
+msgstr ""
+
+#: LYMessages.c:811
+msgid "Cookie Jar"
+msgstr ""
+
+#: LYMessages.c:812
+msgid "Current Key Map"
+msgstr ""
+
+#: LYMessages.c:813
+msgid "File Management Options"
+msgstr ""
+
+#: LYMessages.c:814
+msgid "Download Options"
+msgstr ""
+
+#: LYMessages.c:815
+msgid "History Page"
+msgstr ""
+
+#: LYMessages.c:816
+msgid "List Page"
+msgstr ""
+
+#: LYMessages.c:817
+msgid "Lynx.cfg Information"
+msgstr ""
+
+#: LYMessages.c:818
+msgid "Converted Mosaic Hotlist"
+msgstr ""
+
+#: LYMessages.c:819
+msgid "Options Menu"
+msgstr ""
+
+#: LYMessages.c:820
+msgid "File Permission Options"
+msgstr ""
+
+#: LYMessages.c:821
+msgid "Printing Options"
+msgstr ""
+
+#: LYMessages.c:822
+msgid "Information about the current document"
+msgstr ""
+
+#: LYMessages.c:823
+msgid "Your recent statusline messages"
+msgstr ""
+
+#: LYMessages.c:824
+msgid "Upload Options"
+msgstr ""
+
+#: LYMessages.c:825
+msgid "Visited Links Page"
+msgstr ""
+
+#. CONFIG_DEF_TITLE subtitles
+#: LYMessages.c:828
+msgid "See also"
+msgstr ""
+
+#: LYMessages.c:829
+msgid "your"
+msgstr ""
+
+#: LYMessages.c:830
+msgid "for runtime options"
+msgstr ""
+
+#: LYMessages.c:831
+msgid "compile time options"
+msgstr ""
+
+#: LYMessages.c:832
+msgid "color-style configuration"
+msgstr ""
+
+#: LYMessages.c:833
+msgid "latest release"
+msgstr ""
+
+#: LYMessages.c:834
+msgid "pre-release version"
+msgstr ""
+
+#: LYMessages.c:835
+msgid "development version"
+msgstr ""
+
+#. #define AUTOCONF_CONFIG_CACHE
+#: LYMessages.c:837
+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 ""
+
+#. #define AUTOCONF_LYNXCFG_H
+#: LYMessages.c:841
+msgid ""
+"The following data were used as automatically-configured compile-time\n"
+"definitions when this copy of Lynx was built."
+msgstr ""
+
+#. #define DIRED_NOVICELINE
+#: LYMessages.c:846
+msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
+msgstr ""
+
+#: LYMessages.c:847
+msgid "Failed to obtain status of current link!"
+msgstr ""
+
+#. #define INVALID_PERMIT_URL
+#: LYMessages.c:850
+msgid "Special URL only valid from current File Permission menu!"
+msgstr ""
+
+#: LYMessages.c:854
+msgid "External support is currently disabled."
+msgstr ""
+
+#. new with 2.8.4dev.21
+#: LYMessages.c:858
+msgid "Changing working-directory is currently disabled."
+msgstr ""
+
+#: LYMessages.c:859
+msgid "Linewrap OFF!"
+msgstr ""
+
+#: LYMessages.c:860
+msgid "Linewrap ON!"
+msgstr ""
+
+#: LYMessages.c:861
+msgid "Parsing nested-tables toggled OFF!  Reloading..."
+msgstr ""
+
+#: LYMessages.c:862
+msgid "Parsing nested-tables toggled ON!  Reloading..."
+msgstr ""
+
+#: LYMessages.c:863
+msgid "Shifting is disabled while line-wrap is in effect"
+msgstr ""
+
+#: LYMessages.c:864
+msgid "Trace not supported"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:647
+#, c-format
+msgid "Username for '%s' at %s '%s%s':"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:913
+msgid "This client doesn't know how to compose proxy authorization information for scheme"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:988
+msgid "This client doesn't know how to compose authorization information for scheme"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:1096
+#, c-format
+msgid "Invalid header '%s%s%s%s%s'"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:1200
+msgid "Proxy authorization required -- retrying"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:1259
+msgid "Access without authorization denied -- retrying"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:677
+msgid "Access forbidden by rule"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:779
+msgid "Document with POST content not found in cache.  Resubmit?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
+msgid "Loading incomplete."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1077
+msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1079
+msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1080
+#, 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:1086 src/LYMainLoop.c:7736
+msgid "Can't Access"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1094
+msgid "Unable to access document."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:766
+#, c-format
+msgid "Enter password for user %s@%s:"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:794
+msgid "Unable to connect to FTP host."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:1064
+msgid "close master socket"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:1126
+msgid "socket for master socket"
+msgstr ""
+
+#.
+#. **  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:1640 WWW/Library/Implementation/HTFTP.c:2261
+msgid "Symbolic Link"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:2622
+msgid "Receiving FTP directory."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:2762
+#, c-format
+msgid "Transferred %d bytes (%5d)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:3083
+msgid "connect for data"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:3731
+msgid "Receiving FTP file."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFinger.c:278
+msgid "Could not set up finger connection."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFinger.c:325
+msgid "Could not load data (no sitename in finger URL)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFinger.c:331
+msgid "Invalid port number - will only use port 79!"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFinger.c:396
+msgid "Could not access finger host."
+msgstr ""
+
+#: WWW/Library/Implementation/HTFinger.c:404
+msgid "No response from finger server."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:372
+#, c-format
+msgid "Username for news host '%s':"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:425
+msgid "Change username?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:429
+msgid "Username:"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:453
+#, c-format
+msgid "Password for news host '%s':"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:536
+msgid "Change password?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1690
+#, c-format
+msgid "No matches for: %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1743
+msgid ""
+"\n"
+"No articles in this group.\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1756
+msgid ""
+"\n"
+"No articles in this range.\n"
+msgstr ""
+
+#.
+#. **	Set window title.
+#.
+#: WWW/Library/Implementation/HTNews.c:1769
+#, c-format
+msgid "%s,  Articles %d-%d"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1791
+msgid "Earlier articles"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1804
+#, c-format
+msgid ""
+"\n"
+"There are about %d articles currently available in %s, IDs as follows:\n"
+"\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1864
+msgid "All available articles in "
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2080
+msgid "Later articles"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2104
+msgid "Post to "
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2322
+msgid "This client does not contain support for SNEWS URLs."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2530
+msgid "No target for raw text!"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2560
+msgid "Connecting to NewsHost ..."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2611
+#, c-format
+msgid "Could not access %s."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2711
+#, c-format
+msgid "Can't read news info.  News host %.20s responded: %.200s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2715
+#, c-format
+msgid "Can't read news info, empty response from host %s"
+msgstr ""
+
+#.
+#. **	List available newsgroups. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2919
+msgid "Reading list of available newsgroups."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2941
+msgid "Reading list of articles in newsgroup."
+msgstr ""
+
+#.
+#. **	Get an article from a news group. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2947
+msgid "Reading news article."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2977
+msgid "Sorry, could not load requested news."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1239
+msgid "Address has invalid port"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1327
+msgid "Address length looks invalid"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
+#, c-format
+msgid "Unable to locate remote host %s."
+msgstr ""
+
+#. 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:1575 WWW/Library/Implementation/HTTelnet.c:103
+#, c-format
+msgid "Invalid hostname %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1589
+#, c-format
+msgid "Making %s connection to %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1605
+#, c-format
+msgid "socket failed: family %d addr %s port %s."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1614
+msgid "socket failed."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1634
+msgid "Could not make connection non-blocking."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1703
+msgid "Connection failed (too many retries)."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1896
+msgid "Could not restore socket to blocking."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1962
+msgid "Socket read failed for 180,000 tries."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:503
+msgid "This client does not contain support for HTTPS URLs."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:528
+msgid "Unable to connect to remote host."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1091
+msgid "Sending HTTP request."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1125
+msgid "Unexpected network write error; connection aborted."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1131
+msgid "HTTP request sent; waiting for response."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1195
+msgid "Unexpected network read error; connection aborted."
+msgstr ""
+
+#.
+#. **	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:1391
+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:1426
+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:1545
+msgid "Got unexpected 304 Not Modified status."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1612
+msgid "Redirection of POST content requires user approval."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1627
+msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1672
+msgid "Retrying with access authorization information."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1684
+msgid "Show the 401 message body?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1729
+msgid "Show the 407 message body?"
+msgstr ""
+
+#.
+#. **	Bad or unknown server_status number.
+#. **	Take a chance and hope there is
+#. **	something to display. - FM
+#.
+#: WWW/Library/Implementation/HTTP.c:1834
+msgid "Unknown status reply from server!"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTelnet.c:101
+#, c-format
+msgid "remote %s session:"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:161
+msgid "Could not connect to WAIS server."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:170
+msgid "Could not open WAIS connection for reading."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:194
+msgid "Diagnostic code is "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:463
+msgid "Index "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:467
+#, c-format
+msgid " contains the following %d item%s relevant to \""
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:475
+msgid "The first figure after each entry is its relative score, "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:476
+msgid "the second is the number of lines in the item."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:517
+msgid " (bad file name)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:542
+msgid "(bad doc id)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:558
+msgid "(Short Header record, can't display)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:565
+msgid ""
+"\n"
+"Long Header record, can't display\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:572
+msgid ""
+"\n"
+"Text record\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:581
+msgid ""
+"\n"
+"Headline record, can't display\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:589
+msgid ""
+"\n"
+"Code record, can't display\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:689
+msgid "Syntax error in WAIS URL"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:759
+msgid " (WAIS Index)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:766
+msgid "WAIS Index: "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:772
+msgid "This is a link for searching the "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:776
+msgid " WAIS Index.\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:803
+msgid ""
+"\n"
+"Enter the 's'earch command and then specify search words.\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:825
+msgid " (in "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:834
+msgid "WAIS Search of \""
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:838
+msgid "\" in: "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:853
+msgid "HTWAIS: Request too large."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:862
+msgid "Searching WAIS database..."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:872
+msgid "Search interrupted."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:922
+msgid "Can't convert format of WAIS document"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:966
+msgid "HTWAIS: Request too long."
+msgstr ""
+
+#.
+#. **	Actually do the transaction given by request_message.
+#.
+#: WWW/Library/Implementation/HTWAIS.c:980
+msgid "Fetching WAIS document..."
+msgstr ""
+
+#. display_search_response(target, retrieval_response,
+#. wais_database, keywords);
+#: WWW/Library/Implementation/HTWAIS.c:1019
+msgid "No text was returned!\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:287
+msgid " NOT GIVEN in source file; "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:311
+msgid " WAIS source file"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:318
+msgid " description"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:328
+msgid "Access links"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:346
+msgid "Direct access"
+msgstr ""
+
+#. * Proxy will be used if defined, so let user know that - FM *
+#: WWW/Library/Implementation/HTWSRC.c:349
+msgid " (or via proxy server, if defined)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:364
+msgid "Maintainer"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:372
+msgid "Host"
+msgstr ""
+
+#: src/GridText.c:688
+msgid "Memory exhausted, display interrupted!"
+msgstr ""
+
+#: src/GridText.c:693
+msgid "Memory exhausted, will interrupt transfer!"
+msgstr ""
+
+#: src/GridText.c:3578
+msgid " *** MEMORY EXHAUSTED ***"
+msgstr ""
+
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
+msgid "unknown field or link"
+msgstr ""
+
+#: src/GridText.c:6023
+msgid "text entry field"
+msgstr ""
+
+#: src/GridText.c:6026
+msgid "password entry field"
+msgstr ""
+
+#: src/GridText.c:6029
+msgid "checkbox"
+msgstr ""
+
+#: src/GridText.c:6032
+msgid "radio button"
+msgstr ""
+
+#: src/GridText.c:6035
+msgid "submit button"
+msgstr ""
+
+#: src/GridText.c:6038
+msgid "reset button"
+msgstr ""
+
+#: src/GridText.c:6041
+msgid "popup menu"
+msgstr ""
+
+#: src/GridText.c:6044
+msgid "hidden form field"
+msgstr ""
+
+#: src/GridText.c:6047
+msgid "text entry area"
+msgstr ""
+
+#: src/GridText.c:6050
+msgid "range entry field"
+msgstr ""
+
+#: src/GridText.c:6053
+msgid "file entry field"
+msgstr ""
+
+#: src/GridText.c:6056
+msgid "text-submit field"
+msgstr ""
+
+#: src/GridText.c:6059
+msgid "image-submit button"
+msgstr ""
+
+#: src/GridText.c:6062
+msgid "keygen field"
+msgstr ""
+
+#: src/GridText.c:6065
+msgid "unknown form field"
+msgstr ""
+
+#: src/GridText.c:10066
+msgid "Can't open file for uploading"
+msgstr ""
+
+#: src/GridText.c:11218
+#, c-format
+msgid "Submitting %s"
+msgstr ""
+
+#. ugliness has happened; inform user and do the best we can
+#: src/GridText.c:12375
+msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
+msgstr ""
+
+#. don't show previous state
+#: src/GridText.c:12581
+msgid "Wrap lines to fit displayed area?"
+msgstr ""
+
+#: src/GridText.c:12633
+msgid "Very long lines have been wrapped!"
+msgstr ""
+
+#: src/GridText.c:13079
+msgid "Very long lines have been truncated!"
+msgstr ""
+
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
+msgid "bytes"
+msgstr ""
+
+#: src/HTAlert.c:155
+msgid "KB"
+msgstr ""
+
+#: src/HTAlert.c:274
+#, c-format
+msgid "Read %s of %s of data"
+msgstr ""
+
+#: src/HTAlert.c:276
+#, c-format
+msgid "Read %s of data"
+msgstr ""
+
+#: src/HTAlert.c:281
+#, c-format
+msgid ", %s/sec"
+msgstr ""
+
+#: src/HTAlert.c:290
+#, c-format
+msgid " (stalled for %s)"
+msgstr ""
+
+#: src/HTAlert.c:294
+#, c-format
+msgid ", ETA %s"
+msgstr ""
+
+#: src/HTAlert.c:301
+msgid " (Press 'z' to abort)"
+msgstr ""
+
+#. 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:342 src/HTAlert.c:390
+msgid "yes"
+msgstr ""
+
+#: src/HTAlert.c:345 src/HTAlert.c:391
+msgid "no"
+msgstr ""
+
+#: src/HTML.c:5985
+msgid "Description:"
+msgstr ""
+
+#: src/HTML.c:5990
+msgid "(none)"
+msgstr ""
+
+#: src/HTML.c:5994
+msgid "Filepath:"
+msgstr ""
+
+#: src/HTML.c:5999
+msgid "(unknown)"
+msgstr ""
+
+#: src/HTML.c:7452
+msgid "Document has only hidden links.  Use the 'l'ist command."
+msgstr ""
+
+#: src/HTML.c:7958
+msgid "Source cache error - disk full?"
+msgstr ""
+
+#: src/HTML.c:7971
+msgid "Source cache error - not enough memory!"
+msgstr ""
+
+#: src/LYBookmark.c:167
+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 ""
+
+#: src/LYBookmark.c:379
+msgid ""
+"     You can delete links by the 'R' key<br>\n"
+"<ol>\n"
+msgstr ""
+
+#: src/LYBookmark.c:382
+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 ""
+
+#: src/LYBookmark.c:386
+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 ""
+
+#: src/LYBookmark.c:389
+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 ""
+
+#: src/LYBookmark.c:681
+#, c-format
+msgid "File may be recoverable from %s during this session"
+msgstr ""
+
+#.
+#. *  Neither the path as given nor any components examined by
+#. *  backing up were stat()able. - kw
+#.
+#: src/LYCgi.c:231
+msgid "Unable to access cgi script"
+msgstr ""
+
+#: src/LYCgi.c:654 src/LYCgi.c:657
+msgid "Good Advice"
+msgstr ""
+
+#: src/LYCgi.c:660
+msgid "An excellent http server for VMS is available via"
+msgstr ""
+
+#: src/LYCgi.c:667
+msgid "this link"
+msgstr ""
+
+#: src/LYCgi.c:671
+msgid "It provides state of the art CGI script support.\n"
+msgstr ""
+
+#: src/LYClean.c:122
+msgid "Exiting via interrupt:"
+msgstr ""
+
+#: src/LYCookie.c:2462
+msgid "(from a previous session)"
+msgstr ""
+
+#: src/LYCookie.c:2522
+msgid "Maximum Gobble Date:"
+msgstr ""
+
+#: src/LYCookie.c:2564
+msgid "Internal"
+msgstr ""
+
+#: src/LYCookie.c:2565
+msgid "cookie_domain_flag_set error, aborting program"
+msgstr ""
+
+#: src/LYCurses.c:1004
+msgid "Terminal initialisation failed - unknown terminal type?"
+msgstr ""
+
+#: src/LYCurses.c:1426
+msgid "Terminal ="
+msgstr ""
+
+#: src/LYCurses.c:1430
+msgid "You must use a vt100, 200, etc. terminal with this program."
+msgstr ""
+
+#: src/LYCurses.c:1480
+msgid "Your Terminal type is unknown!"
+msgstr ""
+
+#: src/LYCurses.c:1481
+msgid "Enter a terminal type:"
+msgstr ""
+
+#: src/LYCurses.c:1495
+msgid "TERMINAL TYPE IS SET TO"
+msgstr ""
+
+#: src/LYCurses.c:1994
+#, c-format
+msgid ""
+"\n"
+"A Fatal error has occurred in %s Ver. %s\n"
+msgstr ""
+
+#: src/LYCurses.c:1996
+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 ""
+
+#: src/LYEdit.c:249
+msgid "Editor killed by signal"
+msgstr ""
+
+#: src/LYEdit.c:251
+#, c-format
+msgid "Editor returned with error status, %s"
+msgstr ""
+
+#: src/LYEdit.c:252
+msgid "reason unknown."
+msgstr ""
+
+#: src/LYDownload.c:517
+msgid "Downloaded link:"
+msgstr ""
+
+#: src/LYDownload.c:522
+msgid "Suggested file name:"
+msgstr ""
+
+#: src/LYDownload.c:527
+msgid "Standard download options:"
+msgstr ""
+
+#: src/LYDownload.c:528
+msgid "Download options:"
+msgstr ""
+
+#: src/LYDownload.c:544
+msgid "Save to disk"
+msgstr ""
+
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "无法打开临时文件�"
+
+#: src/LYDownload.c:565
+msgid "Save to disk disabled."
+msgstr ""
+
+#: src/LYDownload.c:569 src/LYPrint.c:1327
+msgid "Local additions:"
+msgstr ""
+
+#: src/LYDownload.c:578 src/LYUpload.c:216
+msgid "No Name Given"
+msgstr ""
+
+#: src/LYHistory.c:657
+msgid "You selected:"
+msgstr ""
+
+#: src/LYHistory.c:681 src/LYHistory.c:921
+msgid "(no address)"
+msgstr ""
+
+#: src/LYHistory.c:685
+msgid " (internal)"
+msgstr ""
+
+#: src/LYHistory.c:687
+msgid " (was internal)"
+msgstr ""
+
+#: src/LYHistory.c:785
+msgid " (From History)"
+msgstr ""
+
+#: src/LYHistory.c:841
+msgid "You visited (POSTs, bookmark, menu and list files excluded):"
+msgstr ""
+
+#: src/LYHistory.c:1137
+msgid "(No messages yet)"
+msgstr ""
+
+#: src/LYLeaks.c:209
+msgid "Invalid pointer detected."
+msgstr ""
+
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
+msgid "Pointer:"
+msgstr ""
+
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
+msgid "FileName:"
+msgstr ""
+
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
+msgid "LineCount:"
+msgstr ""
+
+#: src/LYLeaks.c:249
+msgid "Memory leak detected."
+msgstr ""
+
+#: src/LYLeaks.c:257
+msgid "Contains:"
+msgstr ""
+
+#: src/LYLeaks.c:270
+msgid "ByteSize:"
+msgstr ""
+
+#: src/LYLeaks.c:284
+msgid "realloced:"
+msgstr ""
+
+#: src/LYLeaks.c:307
+msgid "Total memory leakage this run:"
+msgstr ""
+
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr ""
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
+msgid "References in "
+msgstr ""
+
+#: src/LYList.c:86
+msgid "this document:"
+msgstr ""
+
+#: src/LYList.c:92
+msgid "Visible links:"
+msgstr ""
+
+#: src/LYList.c:194 src/LYList.c:315
+msgid "Hidden links:"
+msgstr ""
+
+#: src/LYList.c:262
+msgid "References"
+msgstr ""
+
+#: src/LYList.c:264
+msgid "Visible links"
+msgstr ""
+
+#: src/LYLocal.c:267
+#, c-format
+msgid "Unable to get status of '%s'."
+msgstr ""
+
+#: src/LYLocal.c:301
+msgid "The selected item is not a file or a directory!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:366
+#, c-format
+msgid "Unable to %s due to system error!"
+msgstr ""
+
+#. error return
+#: src/LYLocal.c:400
+#, c-format
+msgid "Probable failure to %s due to system error!"
+msgstr ""
+
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr ""
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr ""
+
+#: src/LYLocal.c:508
+#, c-format
+msgid "move %s to %s"
+msgstr ""
+
+#: src/LYLocal.c:548
+msgid "There is already a directory with that name!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:550
+msgid "There is already a file with that name!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:552
+msgid "The specified name is already in use!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:563
+msgid "Destination has different owner!  Request denied."
+msgstr ""
+
+#: src/LYLocal.c:566
+msgid "Destination is not a valid directory!  Request denied."
+msgstr ""
+
+#: src/LYLocal.c:588
+msgid "Remove all tagged files and directories?"
+msgstr ""
+
+#: src/LYLocal.c:647
+msgid "Enter new location for tagged items: "
+msgstr ""
+
+#: src/LYLocal.c:716
+msgid "Path too long"
+msgstr ""
+
+#: src/LYLocal.c:747
+msgid "Source and destination are the same location - request ignored!"
+msgstr ""
+
+#: src/LYLocal.c:805
+msgid "Enter new name for directory: "
+msgstr ""
+
+#: src/LYLocal.c:807
+msgid "Enter new name for file: "
+msgstr ""
+
+#: src/LYLocal.c:819
+msgid "Illegal character (path-separator) found! Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:868
+msgid "Enter new location for directory: "
+msgstr ""
+
+#: src/LYLocal.c:874
+msgid "Enter new location for file: "
+msgstr ""
+
+#: src/LYLocal.c:901
+msgid "Unexpected failure - unable to find trailing path separator"
+msgstr ""
+
+#: src/LYLocal.c:921
+msgid "Source and destination are the same location!  Request ignored!"
+msgstr ""
+
+#: src/LYLocal.c:970
+msgid "Modify name, location, or permission (n, l, or p): "
+msgstr ""
+
+#: src/LYLocal.c:972
+msgid "Modify name or location (n or l): "
+msgstr ""
+
+#.
+#. *	Code for changing ownership needed here.
+#.
+#: src/LYLocal.c:1001
+msgid "This feature not yet implemented!"
+msgstr ""
+
+#: src/LYLocal.c:1019
+msgid "Enter name of file to create: "
+msgstr ""
+
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
+msgid "Illegal redirection \"//\" found! Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:1061
+msgid "Enter name for new directory: "
+msgstr ""
+
+#: src/LYLocal.c:1106
+msgid "Create file or directory (f or d): "
+msgstr ""
+
+#: src/LYLocal.c:1146
+#, c-format
+msgid "Remove '%s' and all of its contents?"
+msgstr ""
+
+#: src/LYLocal.c:1149
+msgid "Remove directory and all of its contents?"
+msgstr ""
+
+#: src/LYLocal.c:1153
+#, c-format
+msgid "Remove file '%s'?"
+msgstr ""
+
+#: src/LYLocal.c:1155
+msgid "Remove file?"
+msgstr ""
+
+#: src/LYLocal.c:1160
+#, c-format
+msgid "Remove symbolic link '%s'?"
+msgstr ""
+
+#: src/LYLocal.c:1162
+msgid "Remove symbolic link?"
+msgstr ""
+
+#: src/LYLocal.c:1248
+msgid "Sorry, don't know how to permit non-UNIX files yet."
+msgstr ""
+
+#: src/LYLocal.c:1278
+msgid "Unable to open permit options file"
+msgstr ""
+
+#: src/LYLocal.c:1305
+msgid "Specify permissions below:"
+msgstr ""
+
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
+msgid "Owner:"
+msgstr ""
+
+#: src/LYLocal.c:1322
+msgid "Group"
+msgstr ""
+
+#: src/LYLocal.c:1338
+msgid "Others:"
+msgstr ""
+
+#: src/LYLocal.c:1356
+msgid "form to permit"
+msgstr ""
+
+#: src/LYLocal.c:1452
+msgid "Invalid mode format."
+msgstr ""
+
+#: src/LYLocal.c:1456
+msgid "Invalid syntax format."
+msgstr ""
+
+#: src/LYLocal.c:1645
+msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
+msgstr ""
+
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr ""
+
+#: src/LYLocal.c:1908
+#, c-format
+msgid "Executing %s "
+msgstr ""
+
+#: src/LYLocal.c:1911
+msgid "Executing system command. This might take a while."
+msgstr ""
+
+#: src/LYLocal.c:1985
+msgid "Current directory:"
+msgstr ""
+
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
+msgid "Current selection:"
+msgstr ""
+
+#: src/LYLocal.c:1992
+msgid "Nothing currently selected."
+msgstr ""
+
+#: src/LYLocal.c:2007
+msgid "tagged item:"
+msgstr ""
+
+#: src/LYLocal.c:2007
+msgid "tagged items:"
+msgstr ""
+
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
+msgid "Illegal filename; request ignored."
+msgstr ""
+
+#. directory not writable
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
+msgid "Install in the selected directory not permitted."
+msgstr ""
+
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr ""
+
+#: src/LYLocal.c:2276
+msgid "Just a moment, ..."
+msgstr ""
+
+#: src/LYLocal.c:2293
+msgid "Error buiding install args"
+msgstr ""
+
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
+#, c-format
+msgid "Source and target are the same: %s"
+msgstr ""
+
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
+#, c-format
+msgid "Already in target directory: %s"
+msgstr ""
+
+#: src/LYLocal.c:2362
+msgid "Installation complete"
+msgstr ""
+
+#: src/LYLocal.c:2551
+msgid "Temporary URL or list would be too long."
+msgstr ""
+
+#: src/LYMail.c:534
+msgid "Sending"
+msgstr ""
+
+#: src/LYMail.c:1024
+#, c-format
+msgid "The link   %s :?: %s \n"
+msgstr ""
+
+#: src/LYMail.c:1026
+#, c-format
+msgid "called \"%s\"\n"
+msgstr ""
+
+#: src/LYMail.c:1027
+#, c-format
+msgid "in the file \"%s\" called \"%s\"\n"
+msgstr ""
+
+#: src/LYMail.c:1028
+msgid "was requested but was not available."
+msgstr ""
+
+#: src/LYMail.c:1029
+msgid "Thought you might want to know."
+msgstr ""
+
+#: src/LYMail.c:1031
+msgid "This message was automatically generated by"
+msgstr ""
+
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:969
+msgid "No Winsock found, sorry."
+msgstr ""
+
+#: src/LYMain.c:1170
+msgid "You MUST define a valid TMP or TEMP area!\n"
+msgstr ""
+
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
+msgid "No such directory"
+msgstr ""
+
+#: src/LYMain.c:1436
+#, c-format
+msgid ""
+"\n"
+"Configuration file %s is not available.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:1446
+msgid ""
+"\n"
+"Lynx character sets not declared.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:1475
+msgid ""
+"\n"
+"Lynx edit map not declared.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:1504
+#, c-format
+msgid ""
+"\n"
+"Lynx file %s is not available.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:1743
+msgid "Warning:"
+msgstr ""
+
+#: src/LYMain.c:2293
+msgid "persistent cookies state will be changed in next session only."
+msgstr ""
+
+#: src/LYMain.c:2540 src/LYMain.c:2588
+#, c-format
+msgid "Lynx: ignoring unrecognized charset=%s\n"
+msgstr ""
+
+#: src/LYMain.c:3120
+#, c-format
+msgid "%s Version %s (%s)"
+msgstr ""
+
+#: src/LYMain.c:3143
+#, c-format
+msgid "Built on %s %s %s\n"
+msgstr ""
+
+#: src/LYMain.c:3166
+msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+msgstr ""
+
+#: src/LYMain.c:3168
+msgid "Distributed under the GNU General Public License.\n"
+msgstr ""
+
+#: src/LYMain.c:3170
+msgid ""
+"See http://lynx.isc.org/ and the online help for more information.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:3919
+#, c-format
+msgid "USAGE: %s [options] [file]\n"
+msgstr ""
+
+#: src/LYMain.c:3920
+msgid "Options are:\n"
+msgstr ""
+
+#: src/LYMain.c:4191
+#, c-format
+msgid "%s: Invalid Option: %s\n"
+msgstr ""
+
+#: src/LYMainLoop.c:539
+#, c-format
+msgid "Internal error: Invalid mouse link %d!"
+msgstr ""
+
+#.
+#. * Make a name for this new URL.
+#.
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
+msgid "A URL specified by the user"
+msgstr ""
+
+#: src/LYMainLoop.c:1110
+msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
+msgstr ""
+
+#.
+#. *  Make a name for this help file.
+#.
+#: src/LYMainLoop.c:3053
+msgid "Help Screen"
+msgstr ""
+
+#: src/LYMainLoop.c:3177
+msgid "System Index"
+msgstr ""
+
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
+msgid "Entry into main screen"
+msgstr ""
+
+#: src/LYMainLoop.c:3824
+msgid "No next document present"
+msgstr ""
+
+#: src/LYMainLoop.c:4131
+msgid "charset for this document specified explicitly, sorry..."
+msgstr ""
+
+#: src/LYMainLoop.c:5004
+msgid "cd to:"
+msgstr ""
+
+#: src/LYMainLoop.c:5031
+msgid "A component of path is not a directory"
+msgstr ""
+
+#: src/LYMainLoop.c:5034
+msgid "failed to change directory"
+msgstr ""
+
+#: src/LYMainLoop.c:6204
+msgid "Reparsing document under current settings..."
+msgstr ""
+
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
+#, c-format
+msgid "Fatal error - could not open output file %s\n"
+msgstr ""
+
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6914
+msgid "Current URL is empty."
+msgstr ""
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr ""
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
+msgid "-index-"
+msgstr ""
+
+#: src/LYMainLoop.c:7731
+msgid "lynx: Can't access startfile"
+msgstr ""
+
+#: src/LYMainLoop.c:7744
+msgid "lynx: Start file could not be found or is not text/html or text/plain"
+msgstr ""
+
+#: src/LYMainLoop.c:7745
+msgid "      Exiting..."
+msgstr ""
+
+#: src/LYMainLoop.c:7788
+msgid "-more-"
+msgstr ""
+
+#. Enable scrolling.
+#: src/LYNews.c:187
+msgid "You will be posting to:"
+msgstr ""
+
+#.
+#. *  Get the mail address for the From header,
+#. *  offering personal_mail_address as default.
+#.
+#: src/LYNews.c:196
+msgid ""
+"\n"
+"\n"
+" Please provide your mail address for the From: header\n"
+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:214
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Subject: header\n"
+msgstr ""
+
+#: src/LYNews.c:303
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Organization: header\n"
+msgstr ""
+
+#.
+#. *  Use the built in line editior.
+#.
+#: src/LYNews.c:360
+msgid ""
+"\n"
+"\n"
+" Please enter your message below."
+msgstr ""
+
+#: src/LYNews.c:406
+msgid "Message has no original text!"
+msgstr ""
+
+#: src/LYOptions.c:746
+msgid "review/edit B)ookmarks files"
+msgstr ""
+
+#: src/LYOptions.c:748
+msgid "B)ookmark file: "
+msgstr ""
+
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
+#, c-format
+msgid "Use %s to invoke the Options menu!"
+msgstr ""
+
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr ""
+
+#: src/LYOptions.c:3261
+msgid "General Preferences"
+msgstr ""
+
+#. ***************************************************************
+#. User Mode: SELECT
+#: src/LYOptions.c:3265
+msgid "User mode"
+msgstr ""
+
+#. Editor: INPUT
+#: src/LYOptions.c:3271
+msgid "Editor"
+msgstr ""
+
+#. Search Type: SELECT
+#: src/LYOptions.c:3276
+msgid "Type of Search"
+msgstr ""
+
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
+#. Cookies: SELECT
+#: src/LYOptions.c:3285
+msgid "Cookies"
+msgstr ""
+
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
+msgid "Keyboard Input"
+msgstr ""
+
+#. ***************************************************************
+#. Keypad Mode: SELECT
+#: src/LYOptions.c:3316
+msgid "Keypad mode"
+msgstr ""
+
+#. Emacs keys: ON/OFF
+#: src/LYOptions.c:3322
+msgid "Emacs keys"
+msgstr ""
+
+#. VI Keys: ON/OFF
+#: src/LYOptions.c:3328
+msgid "VI keys"
+msgstr ""
+
+#. Line edit style: SELECT
+#. well, at least 2 line edit styles available
+#: src/LYOptions.c:3335
+msgid "Line edit style"
+msgstr ""
+
+#. Keyboard layout: SELECT
+#: src/LYOptions.c:3347
+msgid "Keyboard layout"
+msgstr ""
+
+#.
+#. * Display and Character Set
+#.
+#: src/LYOptions.c:3360
+msgid "Display and Character Set"
+msgstr ""
+
+#. ***************************************************************
+#. Display Character Set: SELECT
+#: src/LYOptions.c:3364
+msgid "Display character set"
+msgstr ""
+
+#: src/LYOptions.c:3393
+msgid "Assumed document character set"
+msgstr ""
+
+#.
+#. * 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:3413
+msgid "CJK mode"
+msgstr ""
+
+#: src/LYOptions.c:3415
+msgid "Raw 8-bit"
+msgstr ""
+
+#. X Display: INPUT
+#: src/LYOptions.c:3423
+msgid "X Display"
+msgstr ""
+
+#.
+#. * Document Appearance
+#.
+#: src/LYOptions.c:3429
+msgid "Document Appearance"
+msgstr ""
+
+#: src/LYOptions.c:3435
+msgid "Show color"
+msgstr ""
+
+#. Show cursor: ON/OFF
+#: src/LYOptions.c:3459
+msgid "Show cursor"
+msgstr ""
+
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr ""
+
+#. Select Popups: ON/OFF
+#: src/LYOptions.c:3473
+msgid "Popups for select fields"
+msgstr ""
+
+#. HTML error recovery: SELECT
+#: src/LYOptions.c:3479
+msgid "HTML error recovery"
+msgstr ""
+
+#. Show Images: SELECT
+#: src/LYOptions.c:3485
+msgid "Show images"
+msgstr ""
+
+#. Verbose Images: ON/OFF
+#: src/LYOptions.c:3499
+msgid "Verbose images"
+msgstr ""
+
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3507
+msgid "Headers Transferred to Remote Servers"
+msgstr ""
+
+#. ***************************************************************
+#. Mail Address: INPUT
+#: src/LYOptions.c:3511
+msgid "Personal mail address"
+msgstr ""
+
+#. Preferred Document Character Set: INPUT
+#: src/LYOptions.c:3516
+msgid "Preferred document character set"
+msgstr ""
+
+#. Preferred Document Language: INPUT
+#: src/LYOptions.c:3521
+msgid "Preferred document language"
+msgstr ""
+
+#: src/LYOptions.c:3527
+msgid "User-Agent header"
+msgstr ""
+
+#.
+#. * Listing and Accessing Files
+#.
+#: src/LYOptions.c:3535
+msgid "Listing and Accessing Files"
+msgstr ""
+
+#. ***************************************************************
+#. FTP sort: SELECT
+#: src/LYOptions.c:3539
+msgid "FTP sort criteria"
+msgstr ""
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3546
+msgid "Local directory sort criteria"
+msgstr ""
+
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+msgid "Local directory sort order"
+msgstr ""
+
+#: src/LYOptions.c:3561
+msgid "Show dot files"
+msgstr ""
+
+#: src/LYOptions.c:3569
+msgid "Execution links"
+msgstr ""
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3589
+msgid "Show transfer rate"
+msgstr ""
+
+#.
+#. * Special Files and Screens
+#.
+#: src/LYOptions.c:3598
+msgid "Special Files and Screens"
+msgstr ""
+
+#: src/LYOptions.c:3603
+msgid "Multi-bookmarks"
+msgstr ""
+
+#: src/LYOptions.c:3611
+msgid "Review/edit Bookmarks files"
+msgstr ""
+
+#: src/LYOptions.c:3613
+msgid "Goto multi-bookmark menu"
+msgstr ""
+
+#: src/LYOptions.c:3615
+msgid "Bookmarks file"
+msgstr ""
+
+#. Visited Pages: SELECT
+#: src/LYOptions.c:3621
+msgid "Visited Pages"
+msgstr ""
+
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr ""
+
+#: src/LYPrint.c:952
+msgid " Print job complete.\n"
+msgstr ""
+
+#: src/LYPrint.c:1281
+msgid "Document:"
+msgstr ""
+
+#: src/LYPrint.c:1282
+msgid "Number of lines:"
+msgstr ""
+
+#: src/LYPrint.c:1283
+msgid "Number of pages:"
+msgstr ""
+
+#: src/LYPrint.c:1284
+msgid "pages"
+msgstr ""
+
+#: src/LYPrint.c:1284
+msgid "page"
+msgstr ""
+
+#: src/LYPrint.c:1285
+msgid "(approximately)"
+msgstr ""
+
+#: src/LYPrint.c:1290
+msgid "Some print functions have been disabled!"
+msgstr ""
+
+#: src/LYPrint.c:1294
+msgid "Standard print options:"
+msgstr ""
+
+#: src/LYPrint.c:1295
+msgid "Print options:"
+msgstr ""
+
+#: src/LYPrint.c:1302
+msgid "Save to a local file"
+msgstr ""
+
+#: src/LYPrint.c:1304
+msgid "Save to disk disabled"
+msgstr ""
+
+#: src/LYPrint.c:1311
+msgid "Mail the file"
+msgstr ""
+
+#: src/LYPrint.c:1318
+msgid "Print to the screen"
+msgstr ""
+
+#: src/LYPrint.c:1323
+msgid "Print out on a printer attached to your vt100 terminal"
+msgstr ""
+
+#: src/LYReadCFG.c:339
+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 ""
+
+#: src/LYReadCFG.c:352
+msgid "Offending line:"
+msgstr ""
+
+#: src/LYReadCFG.c:638
+#, c-format
+msgid "key remapping of %s to %s for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:645
+#, c-format
+msgid "key remapping of %s to %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:666
+#, c-format
+msgid "invalid line-editor selection %s for key %s, selecting all\n"
+msgstr ""
+
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:711
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:816
+#, c-format
+msgid "Lynx: cannot start, CERN rules file %s is not available\n"
+msgstr ""
+
+#: src/LYReadCFG.c:818
+msgid "(no name)"
+msgstr ""
+
+#: src/LYReadCFG.c:1782
+#, c-format
+msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
+msgstr ""
+
+#: src/LYReadCFG.c:1784
+#, c-format
+msgid "Last attempted include was '%s',\n"
+msgstr ""
+
+#: src/LYReadCFG.c:1785
+#, c-format
+msgid "included from '%s'.\n"
+msgstr ""
+
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
+msgid "The following is read from your lynx.cfg file."
+msgstr ""
+
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
+msgid "Please read the distribution"
+msgstr ""
+
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
+msgid "for more comments."
+msgstr ""
+
+#: src/LYReadCFG.c:2244
+msgid "RELOAD THE CHANGES"
+msgstr ""
+
+#: src/LYReadCFG.c:2253
+msgid "Your primary configuration"
+msgstr ""
+
+#: src/LYShowInfo.c:129
+msgid "Directory that you are currently viewing"
+msgstr ""
+
+#: src/LYShowInfo.c:132
+msgid "Name:"
+msgstr ""
+
+#: src/LYShowInfo.c:135
+msgid "URL:"
+msgstr ""
+
+#: src/LYShowInfo.c:146
+msgid "Directory that you have currently selected"
+msgstr ""
+
+#: src/LYShowInfo.c:149
+msgid "File that you have currently selected"
+msgstr ""
+
+#: src/LYShowInfo.c:153
+msgid "Symbolic link that you have currently selected"
+msgstr ""
+
+#: src/LYShowInfo.c:157
+msgid "Item that you have currently selected"
+msgstr ""
+
+#: src/LYShowInfo.c:159
+msgid "Full name:"
+msgstr ""
+
+#: src/LYShowInfo.c:168
+msgid "Unable to follow link"
+msgstr ""
+
+#: src/LYShowInfo.c:170
+msgid "Points to file:"
+msgstr ""
+
+#: src/LYShowInfo.c:175
+msgid "Name of owner:"
+msgstr ""
+
+#: src/LYShowInfo.c:178
+msgid "Group name:"
+msgstr ""
+
+#: src/LYShowInfo.c:181
+msgid "File size:"
+msgstr ""
+
+#: src/LYShowInfo.c:187
+msgid "Creation date:"
+msgstr ""
+
+#: src/LYShowInfo.c:190
+msgid "Last modified:"
+msgstr ""
+
+#: src/LYShowInfo.c:193
+msgid "Last accessed:"
+msgstr ""
+
+#: src/LYShowInfo.c:195
+msgid "Access Permissions"
+msgstr ""
+
+#: src/LYShowInfo.c:261
+msgid "File that you are currently viewing"
+msgstr ""
+
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
+msgid "Linkname:"
+msgstr ""
+
+#: src/LYShowInfo.c:279 src/LYShowInfo.c:291
+msgid "Charset:"
+msgstr ""
+
+#: src/LYShowInfo.c:297
+msgid "Server:"
+msgstr ""
+
+#: src/LYShowInfo.c:300
+msgid "Date:"
+msgstr ""
+
+#: src/LYShowInfo.c:303
+msgid "Last Mod:"
+msgstr ""
+
+#: src/LYShowInfo.c:309
+msgid "&nbsp;Expires:"
+msgstr ""
+
+#: src/LYShowInfo.c:313
+msgid "Cache-Control:"
+msgstr ""
+
+#: src/LYShowInfo.c:317
+msgid "Content-Length:"
+msgstr ""
+
+#: src/LYShowInfo.c:322
+msgid "Language:"
+msgstr ""
+
+#: src/LYShowInfo.c:329
+msgid "Post Data:"
+msgstr ""
+
+#: src/LYShowInfo.c:333
+msgid "Post Content Type:"
+msgstr ""
+
+#: src/LYShowInfo.c:342
+msgid "Owner(s):"
+msgstr ""
+
+#: src/LYShowInfo.c:345
+msgid "size:"
+msgstr ""
+
+#: src/LYShowInfo.c:345
+msgid "lines"
+msgstr ""
+
+#: src/LYShowInfo.c:348
+msgid "mode:"
+msgstr ""
+
+#: src/LYShowInfo.c:350
+msgid "forms mode"
+msgstr ""
+
+#: src/LYShowInfo.c:352
+msgid "source"
+msgstr ""
+
+#: src/LYShowInfo.c:352
+msgid "normal"
+msgstr ""
+
+#: src/LYShowInfo.c:353
+msgid ", safe"
+msgstr ""
+
+#: src/LYShowInfo.c:354
+msgid ", via internal link"
+msgstr ""
+
+#: src/LYShowInfo.c:360
+msgid ", no-cache"
+msgstr ""
+
+#: src/LYShowInfo.c:362
+msgid ", ISMAP script"
+msgstr ""
+
+#: src/LYShowInfo.c:364
+msgid ", bookmark file"
+msgstr ""
+
+#: src/LYShowInfo.c:373
+msgid "Link that you currently have selected"
+msgstr ""
+
+#: src/LYShowInfo.c:386
+msgid "Method:"
+msgstr ""
+
+#: src/LYShowInfo.c:391
+msgid "Enctype:"
+msgstr ""
+
+#: src/LYShowInfo.c:403
+msgid "(Form field)"
+msgstr ""
+
+#: src/LYShowInfo.c:418
+msgid "No Links on the current page"
+msgstr ""
+
+#: src/LYStyle.c:278
+#, 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 ""
+
+#: src/LYTraversal.c:107
+msgid "here is a list of the history stack so that you may rebuild"
+msgstr ""
+
+#: src/LYUpload.c:78
+msgid "ERROR! - upload command is misconfigured"
+msgstr ""
+
+#: src/LYUpload.c:100
+msgid "Illegal redirection \"../\" found! Request ignored."
+msgstr ""
+
+#: src/LYUpload.c:103
+msgid "Illegal character \"/\" found! Request ignored."
+msgstr ""
+
+#: src/LYUpload.c:106
+msgid "Illegal redirection using \"~\" found! Request ignored."
+msgstr ""
+
+#: src/LYUpload.c:163
+msgid "Unable to upload file."
+msgstr ""
+
+#: src/LYUpload.c:206
+msgid "Upload To:"
+msgstr ""
+
+#: src/LYUpload.c:207
+msgid "Upload options:"
+msgstr ""
+
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2468
+msgid "Unexpected access protocol for this URL scheme."
+msgstr ""
+
+#: src/LYUtils.c:3294
+msgid "Too many tempfiles"
+msgstr ""
+
+#: src/LYUtils.c:3595
+msgid "unknown restriction"
+msgstr ""
+
+#: src/LYUtils.c:3626
+msgid "No restrictions set.\n"
+msgstr ""
+
+#: src/LYUtils.c:3629
+msgid "Restrictions set:\n"
+msgstr ""
+
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr ""
+
+#: src/LYrcFile.c:21
+msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
+msgstr ""
+
+#: src/LYrcFile.c:295
+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 ""
+
+#: src/LYrcFile.c:302
+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 ""
+
+#: src/LYrcFile.c:307
+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 ""
+
+#: src/LYrcFile.c:312
+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 ""
+
+#: src/LYrcFile.c:319
+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 ""
+
+#: src/LYrcFile.c:327
+msgid ""
+"cookie_file specifies the file from which to read persistent cookies.\n"
+"The default is ~/.lynx_cookies.\n"
+msgstr ""
+
+#: src/LYrcFile.c:332
+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 ""
+
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:351
+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 ""
+
+#: src/LYrcFile.c:359
+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 ""
+
+#: src/LYrcFile.c:365
+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 ""
+
+#: src/LYrcFile.c:371
+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 ""
+
+#: src/LYrcFile.c:389
+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 ""
+
+#: src/LYrcFile.c:404
+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 ""
+
+#: src/LYrcFile.c:410
+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 ""
+
+#: src/LYrcFile.c:419
+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 ""
+
+#: src/LYrcFile.c:433
+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 ""
+
+#: src/LYrcFile.c:442
+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 ""
+
+#: src/LYrcFile.c:453
+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 ""
+
+#: src/LYrcFile.c:471
+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 ""
+
+#: src/LYrcFile.c:481
+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 ""
+
+#: src/LYrcFile.c:498
+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 ""
+
+#: src/LYrcFile.c:509
+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 ""
+
+#: src/LYrcFile.c:520
+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 ""
+
+#: src/LYrcFile.c:533
+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 ""
+
+#: src/LYrcFile.c:542
+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 ""
+
+#: src/LYrcFile.c:547
+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 ""
+
+#: src/LYrcFile.c:555
+msgid ""
+"The visited_links setting controls how Lynx organizes the information\n"
+"in the Visited Links Page.\n"
+msgstr ""
+
+#: src/LYrcFile.c:772
+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 ""
+
+#: src/LYrcFile.c:781
+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 ""
+
+#: src/LYrcFile.c:785
+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 ""
+
+#: src/LYrcFile.c:794
+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 ""
+
+#: src/LYrcFile.c:827
+msgid ""
+"Lynx User Defaults File\n"
+"\n"
+"This file contains options saved from the Lynx Options Screen (normally\n"
+"with the '>' key).  There is normally no need to edit this file manually,\n"
+"since the defaults here can be controlled from the Options Screen, and the\n"
+"next time options are saved from the Options Screen this file will be\n"
+"completely rewritten.  You have been warned...\n"
+"If you are looking for the general configuration file - it is normally\n"
+"called lynx.cfg, and it has different content and a different format.\n"
+"It is not this file.\n"
+msgstr ""
diff --git a/gnu/usr.bin/lynx/po/zh_TW.po b/gnu/usr.bin/lynx/po/zh_TW.po
new file mode 100644
index 00000000000..7894082b143
--- /dev/null
+++ b/gnu/usr.bin/lynx/po/zh_TW.po
@@ -0,0 +1,5394 @@
+# traditional Chinese translation of lynx.
+# Copyright (C) 2002, 03 Free Software Foundation, Inc.
+# Abel Cheung <maddog@linux.org.hk>, 2002,03.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lynx 2.8.5pre9\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-03 12:18-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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=Big5\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:29
+#, c-format
+msgid "Alert!: %s"
+msgstr "ĵ§i¡I¡G%s"
+
+#: LYMessages.c:30
+msgid "Welcome"
+msgstr "Åwªï"
+
+#: LYMessages.c:31
+msgid "Are you sure you want to quit?"
+msgstr "¬O§_½T©w­nÂ÷¶}¡H"
+
+#: LYMessages.c:33
+msgid "Really exit from Lynx?"
+msgstr "¬O§_½T©w­nÂ÷¶} Lynx?"
+
+#: LYMessages.c:35
+msgid "Connection interrupted."
+msgstr "³s½u¤¤Â_¡C"
+
+#: LYMessages.c:36
+msgid "Data transfer interrupted."
+msgstr "¸ê®Æ¶Ç¿é¤¤Â_¡C"
+
+#: LYMessages.c:37
+msgid "Cancelled!!!"
+msgstr "¨ú®ø!!!"
+
+#: LYMessages.c:38
+msgid "Cancelling!"
+msgstr "¨ú®ø¡I"
+
+#: LYMessages.c:39
+msgid "Excellent!!!"
+msgstr "¦n·¥!!!"
+
+#: LYMessages.c:40
+msgid "OK"
+msgstr "OK"
+
+#: LYMessages.c:41
+msgid "Done!"
+msgstr "§¹¦¨¡I"
+
+#: LYMessages.c:42
+msgid "Bad request!"
+msgstr ""
+
+#: LYMessages.c:43
+msgid "previous"
+msgstr "¤W¤@­¶"
+
+#: LYMessages.c:44
+msgid "next screen"
+msgstr "¤U¤@­¶"
+
+#: LYMessages.c:45
+msgid "HELP!"
+msgstr "¨D§U¡I"
+
+#: LYMessages.c:46
+msgid ", help on "
+msgstr ""
+
+#. #define HELP
+#: LYMessages.c:48
+msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
+msgstr "«ü¥O¡G¨Ï¥Î¤è¦VÁä²¾°Ê¡A'?' ¨D§U¡A'q' µ²§ô¡A'¡ö' ¦^«e¤@­¶¡C"
+
+#. #define MOREHELP
+#: LYMessages.c:50
+msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
+msgstr "¢w «öªÅ¥ÕÁä¬Ý¤U¤@­¶¡A¨Ï¥Î¤è¦VÁä²¾°Ê¡A'?' ¨D§U¡A'q' µ²§ô¡C"
+
+#: LYMessages.c:51
+msgid "-- press space for next page --"
+msgstr "¢w ½Ð«öªÅ¥ÕÁä¬Ý¤U¤@­¶ ¢w"
+
+#: LYMessages.c:52
+msgid "URL too long"
+msgstr "URL ¹Lªø"
+
+#. Inactive input fields, messages used with -tna option - kw
+#. #define FORM_LINK_TEXT_MESSAGE_INA
+#: LYMessages.c:58
+msgid "(Text entry field) Inactive.  Press <return> to activate."
+msgstr "(¤å¦r¿é¤JÄæ¦ì) ¼È°±¨Ï¥Î¡C½Ð«ö <return> ¶}©l¿é¤J¡C"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
+#: LYMessages.c:60
+msgid "(Textarea) Inactive.  Press <return> to activate."
+msgstr "(¤å¦r°Ï°ì) ¼È°±¨Ï¥Î¡C½Ð«ö <return> ¶}©l¿é¤J¡C"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
+#: LYMessages.c:62
+#, c-format
+msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
+msgstr "(¤å¦r°Ï°ì) ¼È°±¨Ï¥Î¡C½Ð«ö <return> ¶}©l¿é¤J («ö %s ±Ò°Ê½s¿è¾¹)¡C"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
+#: LYMessages.c:64
+msgid "(Form field) Inactive.  Use <return> to edit."
+msgstr ""
+
+#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
+#: LYMessages.c:66
+#, c-format
+msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
+msgstr ""
+
+#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
+#: LYMessages.c:68
+msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
+msgstr ""
+
+#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
+#: LYMessages.c:70
+msgid "(mailto form field) Inactive.  Press <return> to change."
+msgstr "(mailto ªí®æÄæ¦ì) ¼È°±¨Ï¥Î¡C½Ð«ö <return> ¶}©l¿é¤J¡C"
+
+#. #define FORM_LINK_PASSWORD_MESSAGE_INA
+#: LYMessages.c:72
+msgid "(Password entry field) Inactive.  Press <return> to activate."
+msgstr "(±K½X¿é¤JÄæ¦ì) ¼È°±¨Ï¥Î¡C½Ð«ö <return> ¶}©l¿é¤J¡C"
+
+#. #define FORM_LINK_FILE_UNM_MSG
+#: LYMessages.c:75
+msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
+msgstr "*¤£¥i­×§ïªº* Àɮ׿é¤JÄæ¦ì¡C¨Ï¥Î ¡ô¡B¡õ ©Î tab ÁäÂ÷¶}Äæ¦ì¡C"
+
+#. #define FORM_LINK_FILE_MESSAGE
+#: LYMessages.c:77
+msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Àɮ׿é¤JÄæ¦ì) ½Ð¿é¤JÀɮצWºÙ¡C¨Ï¥Î ¡ô¡B¡õ ©Î tab ÁäÂ÷¶}Äæ¦ì¡C"
+
+#. #define FORM_LINK_TEXT_MESSAGE
+#: LYMessages.c:79
+msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(¤å¦r¿é¤JÄæ¦ì) ½Ð¿é¤J¤å¦r¡C¨Ï¥Î ¡ô¡B¡õ ©Î tab ÁäÂ÷¶}Äæ¦ì¡C"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE
+#: LYMessages.c:81
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
+msgstr "(¤å¦r¿é¤J°Ï°ì) ½Ð¿é¤J¤å¦r¡C¨Ï¥Î ¡ô¡B¡õ ©Î tab ÁäÂ÷¶}°Ï°ì¡C"
+
+#. #define FORM_LINK_TEXTAREA_MESSAGE_E
+#: LYMessages.c:83
+#, c-format
+msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
+msgstr "(¤å¦r¿é¤J°Ï°ì) ½Ð¿é¤J¤å¦r¡C¨Ï¥Î ¡ô¡B¡õ ©Î tab ÁäÂ÷¶}°Ï°ì (%s ±Ò°Ê½s¿è¾¹)¡C"
+
+#. #define FORM_LINK_TEXT_UNM_MSG
+#: LYMessages.c:85
+msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
+msgstr "*¤£¥i­×§ïªº* ¤å¦r¿é¤JÄæ¦ì¡C¨Ï¥Î ¡ô¡B¡õ ©Î tab ÁäÂ÷¶}Äæ¦ì¡C"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
+#: LYMessages.c:87
+msgid "(Form field) Enter text.  Use <return> to submit."
+msgstr ""
+
+#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
+#: LYMessages.c:89
+#, c-format
+msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
+msgstr ""
+
+#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
+#: LYMessages.c:91
+msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
+msgstr ""
+
+#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
+#: LYMessages.c:93
+msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
+msgstr "*¤£¥i­×§ïªº* ªí®æ¿é¤JÄæ¦ì¡C¨Ï¥Î ¡ô¡B¡õ ©Î tab ÁäÂ÷¶}Äæ¦ì¡C"
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
+#: LYMessages.c:95
+msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
+msgstr ""
+
+#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:97
+msgid "(mailto form field) Mail is disallowed so you cannot submit."
+msgstr ""
+
+#. #define FORM_LINK_PASSWORD_MESSAGE
+#: LYMessages.c:99
+msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(±K½X¿é¤JÄæ¦ì) ½Ð¿é¤J¤å¦r¡C¨Ï¥Î ¡ô¡B¡õ ©Î tab ÁäÂ÷¶}Äæ¦ì¡C"
+
+#. #define FORM_LINK_PASSWORD_UNM_MSG
+#: LYMessages.c:101
+msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
+msgstr "*¤£¥i­×§ïªº* ±K½X¿é¤JÄæ¦ì¡C¨Ï¥Î ¡ô¡B¡õ ©Î tab ÁäÂ÷¶}Äæ¦ì¡C"
+
+#. #define FORM_LINK_CHECKBOX_MESSAGE
+#: LYMessages.c:103
+msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
+msgstr ""
+
+#. #define FORM_LINK_CHECKBOX_UNM_MSG
+#: LYMessages.c:105
+msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
+msgstr ""
+
+#. #define FORM_LINK_RADIO_MESSAGE
+#: LYMessages.c:107
+msgid "(Radio Button)   Use right-arrow or <return> to toggle."
+msgstr ""
+
+#. #define FORM_LINK_RADIO_UNM_MSG
+#: LYMessages.c:109
+msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
+msgstr ""
+
+#. #define FORM_LINK_SUBMIT_PREFIX
+#: LYMessages.c:111
+msgid "Submit ('x' for no cache) to "
+msgstr ""
+
+#. #define FORM_LINK_RESUBMIT_PREFIX
+#: LYMessages.c:113
+msgid "Submit to "
+msgstr ""
+
+#. #define FORM_LINK_SUBMIT_MESSAGE
+#: LYMessages.c:115
+msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
+msgstr ""
+
+#. #define FORM_LINK_RESUBMIT_MESSAGE
+#: LYMessages.c:117
+msgid "(Form submit button) Use right-arrow or <return> to submit."
+msgstr ""
+
+#. #define FORM_LINK_SUBMIT_DIS_MSG
+#: LYMessages.c:119
+msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
+msgstr ""
+
+#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
+#: LYMessages.c:121
+msgid "Submit mailto form to "
+msgstr ""
+
+#. #define FORM_LINK_SUBMIT_MAILTO_MSG
+#: LYMessages.c:123
+msgid "(mailto form submit button) Use right-arrow or <return> to submit."
+msgstr ""
+
+#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
+#: LYMessages.c:125
+msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
+msgstr ""
+
+#. #define FORM_LINK_RESET_MESSAGE
+#: LYMessages.c:127
+msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
+msgstr "(­«³]ªí®æ«ö¶s) ½Ð«ö ¡÷ ©Î <return> ±Nªí®æÄæ¦ì­«³]¬°¹w³]­È¡C"
+
+#. #define FORM_LINK_RESET_DIS_MSG
+#: LYMessages.c:129
+msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
+msgstr "*¼È°±¨Ï¥Îªº* ­«³]ªí®æ«ö¶s¡C¨Ï¥Î ¡ô¡B¡õ ©Î tab ÁäÂ÷¶}Äæ¦ì¡C"
+
+#. #define FORM_LINK_OPTION_LIST_MESSAGE
+#: LYMessages.c:131
+msgid "(Option list) Hit return and use arrow keys and return to select option."
+msgstr "(¿ï¶µ²M³æ) «ö return¡AµM«á¨Ï¥Î¤è¦VÁä©M return ¿ï¾Ü©Ò»Ýªº¿ï¶µ¡C"
+
+#. #define CHOICE_LIST_MESSAGE
+#: LYMessages.c:133
+msgid "(Choice list) Hit return and use arrow keys and return to select option."
+msgstr "(¿ï¾Ü²M³æ) «ö return¡AµM«á¨Ï¥Î¤è¦VÁä©M return ¿ï¾Ü©Ò»Ýªº¿ï¶µ¡C"
+
+#. #define FORM_LINK_OPTION_LIST_UNM_MSG
+#: LYMessages.c:135
+msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
+msgstr ""
+
+#. #define CHOICE_LIST_UNM_MSG
+#: LYMessages.c:137
+msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
+msgstr ""
+
+#: LYMessages.c:138
+msgid "Submitting form..."
+msgstr ""
+
+#: LYMessages.c:139
+msgid "Resetting form..."
+msgstr "­«³]ªí®æ..."
+
+#. #define RELOADING_FORM
+#: LYMessages.c:141
+msgid "Reloading document.  Any form entries will be lost!"
+msgstr "­«·s¸ü¤Jºô­¶¡C±N·|¥¢¥h©Ò¦³­×§ï¹Lªºªí®æÄæ¦ì¤º®e¡I"
+
+#: LYMessages.c:142
+#, c-format
+msgid "Warning: Cannot transcode form data to charset %s!"
+msgstr ""
+
+#. #define NORMAL_LINK_MESSAGE
+#: LYMessages.c:145
+msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
+msgstr "(´¶³qÃìµ²) ½Ð«ö ¡÷ ©Î <return> ÂsÄý¡C"
+
+#: LYMessages.c:146
+msgid "The resource requested is not available at this time."
+msgstr ""
+
+#: LYMessages.c:147
+msgid "Enter Lynx keystroke command: "
+msgstr ""
+
+#: LYMessages.c:148
+msgid "Looking up "
+msgstr "·Ç³ÆÀ˯Á "
+
+#: LYMessages.c:149
+#, c-format
+msgid "Getting %s"
+msgstr ""
+
+#: LYMessages.c:150
+#, c-format
+msgid "Skipping %s"
+msgstr "²¤¹L %s"
+
+#: LYMessages.c:151
+#, c-format
+msgid "Using %s"
+msgstr "¨Ï¥Î %s"
+
+#: LYMessages.c:152
+#, c-format
+msgid "Illegal URL: %s"
+msgstr "¤£¦Xªkªº URL¡G%s"
+
+#: LYMessages.c:153
+#, c-format
+msgid "Badly formed address %s"
+msgstr "¦a§} %s ®æ¦¡¿ù»~"
+
+#: LYMessages.c:154
+#, c-format
+msgid "URL: %s"
+msgstr "URL¡G%s"
+
+#: LYMessages.c:155
+msgid "Unable to access WWW file!!!"
+msgstr "µLªk¦s¨ú WWW ÀÉ®×!!!"
+
+#: LYMessages.c:156
+#, c-format
+msgid "This is a searchable index.  Use %s to search."
+msgstr ""
+
+#. #define WWW_INDEX_MORE_MESSAGE
+#: LYMessages.c:158
+#, c-format
+msgid "--More--  This is a searchable index.  Use %s to search."
+msgstr ""
+
+#: LYMessages.c:159
+msgid "You have entered an invalid link number."
+msgstr ""
+
+#. #define SOURCE_HELP
+#: LYMessages.c:161
+msgid "Currently viewing document source.  Press '\\' to return to rendered version."
+msgstr ""
+
+#. #define NOVICE_LINE_ONE
+#: LYMessages.c:163
+msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
+msgstr "  ¤è¦VÁä¡G ¡ô/¡õ ²¾°Ê   ¡÷ ¶i¤JÃìµ²   ¡ö ¦^«e¤@­¶\n"
+
+#. #define NOVICE_LINE_TWO
+#: LYMessages.c:165
+msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
+msgstr " H)¨D§U  O)¿ï¶µ  P)¦C¦L  G)²¾¦Ü  M)¥Dµe­±  Q)Â÷¶}  /)·j´M  [delete])ÂsÄý¬ö¿ý\n"
+
+#. #define NOVICE_LINE_TWO_A
+#: LYMessages.c:167
+msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
+msgstr "  O)¨ä¥¦«ü¥O  H)¨D§U  K)«öÁä³]©w  G)²¾¦Ü  P)¦C¦L  M)¥Dµe­±  o)¿ï¶µ  Q)Â÷¶}\n"
+
+#. #define NOVICE_LINE_TWO_B
+#: LYMessages.c:169
+msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
+msgstr ""
+
+#. #define NOVICE_LINE_TWO_C
+#: LYMessages.c:171
+msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
+msgstr ""
+
+#. #define FORM_NOVICELINE_ONE
+#: LYMessages.c:173
+msgid "            Enter text into the field by typing on the keyboard              "
+msgstr "                        ½Ð¨Ï¥ÎÁä½L¦bÄæ¦ì¤¤¿é¤J¤å¦r"
+
+#. #define FORM_NOVICELINE_TWO
+#: LYMessages.c:175
+msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
+msgstr "    Ctrl-U ·|§R°£Äæ¦ì¤¤ªº©Ò¦³¤å¦r¡A[Backspace] ·|¦V«á§R°£¤@­Ó¦r¤¸"
+
+#. #define FORM_NOVICELINE_TWO_DELBL
+#: LYMessages.c:177
+msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
+msgstr "      Ctrl-U ·|§R°£Äæ¦ì¤¤ªº¤å¦r¡A[Backspace] ·|¦V«á§R°£¤@­Ó¦r¤¸"
+
+#. #define FORM_NOVICELINE_TWO_VAR
+#: LYMessages.c:179
+#, c-format
+msgid "    %s to delete all text in field, [Backspace] to delete a character    "
+msgstr "        %s ·|§R°£Äæ¦ì¤¤ªº©Ò¦³¤å¦r¡A[Backspace] ·|¦V«á§R°£¤@­Ó¦r¤¸"
+
+#. #define FORM_NOVICELINE_TWO_DELBL_VAR
+#: LYMessages.c:181
+#, c-format
+msgid "      %s to delete text in field, [Backspace] to delete a character    "
+msgstr "        %s ·|§R°£Äæ¦ì¤¤ªº¤å¦r¡A[Backspace] ·|¦V«á§R°£¤@­Ó¦r¤¸"
+
+#. mailto
+#: LYMessages.c:184
+msgid "Malformed mailto form submission!  Cancelled!"
+msgstr ""
+
+#: LYMessages.c:185
+msgid "Warning!  Control codes in mail address replaced by ?"
+msgstr "ĵ§i¡I ¹q¶l¦a§}¤¤ªº±±¨î¦r¤¸¤w¥Î '?' ¦r¤¸¨ú¥N"
+
+#: LYMessages.c:186
+msgid "Mail disallowed!  Cannot submit."
+msgstr ""
+
+#: LYMessages.c:187
+msgid "Mailto form submission failed!"
+msgstr ""
+
+#: LYMessages.c:188
+msgid "Mailto form submission Cancelled!!!"
+msgstr ""
+
+#: LYMessages.c:189
+msgid "Sending form content..."
+msgstr "¥¿¦b°e¥Xªí®æ¤º®e..."
+
+#: LYMessages.c:190
+msgid "No email address is present in mailto URL!"
+msgstr "mailto URL ¤¤¨S¦³¹q¶l¦a§}¡I"
+
+#. #define MAILTO_URL_TEMPOPEN_FAILED
+#: LYMessages.c:192
+msgid "Unable to open temporary file for mailto URL!"
+msgstr "µLªk¶}±Ò mailto URL ©Ò»Ýªº¼È¦sÀÉ¡I"
+
+#. #define INC_ORIG_MSG_PROMPT
+#: LYMessages.c:194
+msgid "Do you wish to include the original message?"
+msgstr ""
+
+#. #define INC_PREPARSED_MSG_PROMPT
+#: LYMessages.c:196
+msgid "Do you wish to include the preparsed source?"
+msgstr ""
+
+#. #define SPAWNING_EDITOR_FOR_MAIL
+#: LYMessages.c:198
+msgid "Spawning your selected editor to edit mail message"
+msgstr "·Ç³Æ±Ò°Ê«ü©wªº½s¿è¾¹¨Ó­×§ï¶l¥ó¤º®e"
+
+#. #define ERROR_SPAWNING_EDITOR
+#: LYMessages.c:200
+msgid "Error spawning editor, check your editor definition in the options menu"
+msgstr "±Ò°Ê½s¿è¾¹®É¥X²{¿ù»~¡A½ÐÀˬd¿ï¶µ³]©w¤¤¦³Ãö½s¿è¾¹ªº³¡¥÷"
+
+#: LYMessages.c:201
+msgid "Send this comment?"
+msgstr ""
+
+#: LYMessages.c:202
+msgid "Send this message?"
+msgstr "¬O§_¶Ç°e¦¹°T®§¡H"
+
+#: LYMessages.c:203
+msgid "Sending your message..."
+msgstr "·Ç³Æ¶Ç°e»Õ¤Uªº°T®§..."
+
+#: LYMessages.c:204
+msgid "Sending your comment:"
+msgstr ""
+
+#. textarea
+#: LYMessages.c:207
+msgid "Not in a TEXTAREA; cannot use external editor."
+msgstr "¥Ø«e¤£¬O¦b¤å¦r½s¿è°Ï°ì¤¤¡FµLªk¨Ï¥Î¥~³¡ªº½s¿è¾¹¡C"
+
+#: LYMessages.c:208
+msgid "Not in a TEXTAREA; cannot use command."
+msgstr "¥Ø«e¤£¬O¦b¤å¦r½s¿è°Ï°ì¤¤¡FµLªk¨Ï¥Î«ü¥O¡C"
+
+#: LYMessages.c:211
+msgid "file: ACTIONs are disallowed!"
+msgstr ""
+
+#. #define FILE_SERVED_LINKS_DISALLOWED
+#: LYMessages.c:213
+msgid "file: URLs via served links are disallowed!"
+msgstr ""
+
+#: LYMessages.c:214
+msgid "Access to local files denied."
+msgstr "©Úµ´¦s¨ú¥»¾÷ÀɮסC"
+
+#: LYMessages.c:215
+msgid "file: URLs via bookmarks are disallowed!"
+msgstr ""
+
+#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
+#: LYMessages.c:217
+msgid "This special URL is not allowed in external documents!"
+msgstr ""
+
+#: LYMessages.c:218
+msgid "Press <return> to return to Lynx."
+msgstr "½Ð«ö <return> ªð¦^ Lynx¡C"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:221
+msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
+msgstr ""
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:225
+msgid "Type EXIT to return to Lynx.\n"
+msgstr "½Ð¿é¤J EXIT ªð¦^ Lynx¡C\n"
+
+#. #define SPAWNING_MSG
+#: LYMessages.c:228
+msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
+msgstr ""
+
+#: LYMessages.c:231
+msgid "Spawning is currently disabled."
+msgstr ""
+
+#: LYMessages.c:232
+msgid "The 'd'ownload command is currently disabled."
+msgstr "¥Ø«eµLªk´£¨Ñ¡u¤U¸ü¡v('d') «ü¥O¡C"
+
+#: LYMessages.c:233
+msgid "You cannot download an input field."
+msgstr "¤£¥i¤U¸ü¿é¤JÄæ¦ì¡C"
+
+#: LYMessages.c:234
+msgid "Form has a mailto action!  Cannot download."
+msgstr ""
+
+#: LYMessages.c:235
+msgid "You cannot download a mailto: link."
+msgstr "¤£¥i¤U¸ü mailto: Ãìµ²¡C"
+
+#: LYMessages.c:236
+msgid "You cannot download cookies."
+msgstr "¤£¥i¤U¸ü cookie¡C"
+
+#: LYMessages.c:237
+msgid "You cannot download a printing option."
+msgstr "¤£¥i¤U¸ü¦³Ãö¦C¦Lªº¿ï¶µ"
+
+#: LYMessages.c:238
+msgid "You cannot download an upload option."
+msgstr "¤£¥i¤U¸ü¦³Ãö¤W¶Çªº¿ï¶µ"
+
+#: LYMessages.c:239
+msgid "You cannot download an permit option."
+msgstr ""
+
+#: LYMessages.c:240
+msgid "This special URL cannot be downloaded!"
+msgstr "¤£¥i¤U¸ü¦¹¯S®í URL¡I"
+
+#: LYMessages.c:241
+msgid "Nothing to download."
+msgstr "¨S¦³¥i¤U¸üªº¸ê®Æ¡C"
+
+#: LYMessages.c:242
+msgid "Trace ON!"
+msgstr ""
+
+#: LYMessages.c:243
+msgid "Trace OFF!"
+msgstr ""
+
+#. #define CLICKABLE_IMAGES_ON
+#: LYMessages.c:245
+msgid "Links will be included for all images!  Reloading..."
+msgstr ""
+
+#. #define CLICKABLE_IMAGES_OFF
+#: LYMessages.c:247
+msgid "Standard image handling restored!  Reloading..."
+msgstr ""
+
+#. #define PSEUDO_INLINE_ALTS_ON
+#: LYMessages.c:249
+msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
+msgstr ""
+
+#. #define PSEUDO_INLINE_ALTS_OFF
+#: LYMessages.c:251
+msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
+msgstr ""
+
+#: LYMessages.c:252
+msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
+msgstr "¤wÃö³¬ 8-bit ­ì©l¼Ò¦¡©Î¬O CJK ¼Ò¦¡¡I·Ç³Æ­«·s¸ü¤J..."
+
+#: LYMessages.c:253
+msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
+msgstr "¤w±Ò¥Î 8-bit ­ì©l¼Ò¦¡©Î¬O CJK ¼Ò¦¡¡I·Ç³Æ­«·s¸ü¤J..."
+
+#. #define HEAD_D_L_OR_CANCEL
+#: LYMessages.c:255
+msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
+msgstr ""
+
+#. #define HEAD_D_OR_CANCEL
+#: LYMessages.c:257
+msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
+msgstr ""
+
+#: LYMessages.c:258
+msgid "Sorry, the document is not an http URL."
+msgstr "©êºp¡A¸Ó¤å¥ó¤£¬O http URL¡C"
+
+#: LYMessages.c:259
+msgid "Sorry, the link is not an http URL."
+msgstr "©êºp¡A¸ÓÃìµ²¤£¬O http URL¡C"
+
+#: LYMessages.c:260
+msgid "Sorry, the ACTION for this form is disabled."
+msgstr ""
+
+#. #define FORM_ACTION_NOT_HTTP_URL
+#: LYMessages.c:262
+msgid "Sorry, the ACTION for this form is not an http URL."
+msgstr ""
+
+#: LYMessages.c:263
+msgid "Not an http URL or form ACTION!"
+msgstr ""
+
+#: LYMessages.c:264
+msgid "This special URL cannot be a form ACTION!"
+msgstr ""
+
+#: LYMessages.c:265
+msgid "URL is not in starting realm!"
+msgstr ""
+
+#: LYMessages.c:266
+msgid "News posting is disabled!"
+msgstr "¼È°±¨Ï¥Î±N°T®§¶K¤W·s»D²Õªº¥\¯à¡I"
+
+#: LYMessages.c:267
+msgid "File management support is disabled!"
+msgstr "¼È°±¨Ï¥ÎÀɮ׺޲zªº¥\¯à¡I"
+
+#: LYMessages.c:268
+msgid "No jump file is currently available."
+msgstr ""
+
+#: LYMessages.c:269
+msgid "Jump to (use '?' for list): "
+msgstr ""
+
+#: LYMessages.c:270
+msgid "Jumping to a shortcut URL is disallowed!"
+msgstr ""
+
+#: LYMessages.c:271
+msgid "Random URL is disallowed!  Use a shortcut."
+msgstr ""
+
+#: LYMessages.c:272
+msgid "No random URLs have been used thus far."
+msgstr ""
+
+#: LYMessages.c:273
+msgid "Bookmark features are currently disabled."
+msgstr "¥Ø«eµLªk´£¨Ñ®ÑÅÒ¥\¯à¡C"
+
+#: LYMessages.c:274
+msgid "Execution via bookmarks is disabled."
+msgstr ""
+
+#. #define BOOKMARK_FILE_NOT_DEFINED
+#: LYMessages.c:276
+#, c-format
+msgid "Bookmark file is not defined. Use %s to see options."
+msgstr ""
+
+#. #define NO_TEMP_FOR_HOTLIST
+#: LYMessages.c:278
+msgid "Unable to open tempfile for X Mosaic hotlist conversion."
+msgstr "·íÂà´« X Mosaic hotlist ®ÉµLªk¶}±Ò¼È¦sÀÉ¡C"
+
+#: LYMessages.c:279
+msgid "ERROR - unable to open bookmark file."
+msgstr "¿ù»~ ¢w µLªk¶}±Ò®ÑÅÒÀÉ¡C"
+
+#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:281
+msgid "Unable to open bookmark file for deletion of link."
+msgstr "µLªk¶}±Ò®ÑÅÒÀɨӧR°£Ãìµ²¡C"
+
+#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
+#: LYMessages.c:283
+msgid "Unable to open scratch file for deletion of link."
+msgstr ""
+
+#: LYMessages.c:285
+msgid "Error renaming scratch file."
+msgstr ""
+
+#: LYMessages.c:287
+msgid "Error renaming temporary file."
+msgstr "§ó§ï¼È¦sÀɦWºÙ®É¥X²{¿ù»~¡C"
+
+#. #define BOOKTEMP_COPY_FAIL
+#: LYMessages.c:289
+msgid "Unable to copy temporary file for deletion of link."
+msgstr "·í§R°£Ãìµ²®ÉµLªk½Æ»s¼È¦sÀÉ¡C"
+
+#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
+#: LYMessages.c:291
+msgid "Unable to reopen temporary file for deletion of link."
+msgstr "·í§R°£Ãìµ²®ÉµLªk­«·s¶}±Ò¼È¦sÀÉ¡C"
+
+#. #define BOOKMARK_LINK_NOT_ONE_LINE
+#: LYMessages.c:294
+msgid "Link is not by itself all on one line in bookmark file."
+msgstr ""
+
+#: LYMessages.c:295
+msgid "Bookmark deletion failed."
+msgstr "§R°£®ÑÅÒ¥¢±Ñ¡C"
+
+#. #define BOOKMARKS_NOT_TRAVERSED
+#: LYMessages.c:297
+msgid "Bookmark files cannot be traversed (only http URLs)."
+msgstr ""
+
+#. #define BOOKMARKS_NOT_OPEN
+#: LYMessages.c:299
+msgid "Unable to open bookmark file, use 'a' to save a link first"
+msgstr "µLªk¶}±Ò®ÑÅÒÀÉ¡A½Ð¥ý«ö¡¥a¡¦Àx¦sÃìµ²"
+
+#: LYMessages.c:300
+msgid "There are no links in this bookmark file!"
+msgstr "¥»®ÑÅÒÀɤ¤¨Ã¨S¦³Ãìµ²¡I"
+
+#. #define BOOK_D_L_OR_CANCEL
+#: LYMessages.c:302
+msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
+msgstr "¦b®ÑÅÒÀɤ¤Àx¦s D)¤å¥ó ©Î¬O L)Ãìµ²¡AÁÙ¬O C)¨ú®ø¡H (d,l,c)¡G"
+
+#: LYMessages.c:303
+msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
+msgstr "¦b®ÑÅÒÀɤ¤Àx¦s D)¤å¥ó¡AÁÙ¬O C)¨ú®ø¡H (d,c)¡G"
+
+#: LYMessages.c:304
+msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
+msgstr "¦b®ÑÅÒÀɤ¤Àx¦s L)Ãìµ²¡AÁÙ¬O C)¨ú®ø¡H (l,c)¡G"
+
+#. #define NOBOOK_POST_FORM
+#: LYMessages.c:306
+msgid "Documents from forms with POST content cannot be saved as bookmarks."
+msgstr ""
+
+#: LYMessages.c:307
+msgid "Cannot save form fields/links"
+msgstr "¤£¥i¯àÀx¦sªí®æÄæ¦ì/Ãìµ²"
+
+#. #define NOBOOK_HSML
+#: LYMessages.c:309
+msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
+msgstr ""
+
+#. #define CONFIRM_BOOKMARK_DELETE
+#: LYMessages.c:311
+msgid "Do you really want to delete this link from your bookmark file?"
+msgstr "¬O§_½T©w­n±q®ÑÅÒÀɤ¤§R°£¥»Ãìµ²¡H"
+
+#: LYMessages.c:312
+msgid "Malformed address."
+msgstr "¦a§}®æ¦¡¤£¥¿½T¡C"
+
+#. #define HISTORICAL_ON_MINIMAL_OFF
+#: LYMessages.c:314
+msgid "Historical comment parsing ON (Minimal is overridden)!"
+msgstr ""
+
+#. #define HISTORICAL_OFF_MINIMAL_ON
+#: LYMessages.c:316
+msgid "Historical comment parsing OFF (Minimal is in effect)!"
+msgstr ""
+
+#. #define HISTORICAL_ON_VALID_OFF
+#: LYMessages.c:318
+msgid "Historical comment parsing ON (Valid is overridden)!"
+msgstr ""
+
+#. #define HISTORICAL_OFF_VALID_ON
+#: LYMessages.c:320
+msgid "Historical comment parsing OFF (Valid is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_ON_IN_EFFECT
+#: LYMessages.c:322
+msgid "Minimal comment parsing ON (and in effect)!"
+msgstr ""
+
+#. #define MINIMAL_OFF_VALID_ON
+#: LYMessages.c:324
+msgid "Minimal comment parsing OFF (Valid is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_ON_BUT_HISTORICAL
+#: LYMessages.c:326
+msgid "Minimal comment parsing ON (but Historical is in effect)!"
+msgstr ""
+
+#. #define MINIMAL_OFF_HISTORICAL_ON
+#: LYMessages.c:328
+msgid "Minimal comment parsing OFF (Historical is in effect)!"
+msgstr ""
+
+#: LYMessages.c:329
+msgid "Soft double-quote parsing ON!"
+msgstr ""
+
+#: LYMessages.c:330
+msgid "Soft double-quote parsing OFF!"
+msgstr ""
+
+#: LYMessages.c:331
+msgid "Now using TagSoup parsing of HTML."
+msgstr "²{¦b¨Ï¥Î TagSoup ¤è¦¡¤ÀªR HTML ¤å¥ó¡C"
+
+#: LYMessages.c:332
+msgid "Now using SortaSGML parsing of HTML!"
+msgstr "²{¦b¨Ï¥Î SortaSGML ¤è¦¡¤ÀªR HTML ¤å¥ó¡C"
+
+#: LYMessages.c:333
+msgid "You are already at the end of this document."
+msgstr "¤w¸g¦b¤å¥óªº¥½ºÝ¤F¡C"
+
+#: LYMessages.c:334
+msgid "You are already at the beginning of this document."
+msgstr "¤w¸g¦b¤å¥óªº¶}©l¦ì¸m¤F¡C"
+
+#: LYMessages.c:335
+#, c-format
+msgid "You are already at page %d of this document."
+msgstr "¤w¸g¦b¤å¥óªº²Ä %d ­¶¤F¡C"
+
+#: LYMessages.c:336
+#, c-format
+msgid "Link number %d already is current."
+msgstr "Ãìµ²½s¸¹ %d ¤w¸g¬O¥Ø«e¿ï¨úªºÃìµ²¡C"
+
+#: LYMessages.c:337
+msgid "You are already at the first document"
+msgstr "¥»¤å¥ó¤w¸g¬O²Ä¤@¥÷¤å¥ó"
+
+#: LYMessages.c:338
+msgid "There are no links above this line of the document."
+msgstr "¥»¦æ¥H¤W¤w¸g¨S¦³Ãìµ²¡C"
+
+#: LYMessages.c:339
+msgid "There are no links below this line of the document."
+msgstr "¥»¦æ¥H¤U¤w¸g¨S¦³Ãìµ²¡C"
+
+#. #define MAXLEN_REACHED_DEL_OR_MOV
+#: LYMessages.c:341
+msgid "Maximum length reached!  Delete text or move off field."
+msgstr "¤w¨ì¹F¤å¦rªø«×ªº¤W­­¡I½Ð§R°£¤å¦r©Î¬OÂ÷¶}¥»Äæ¦ì¡C"
+
+#. #define NOT_ON_SUBMIT_OR_LINK
+#: LYMessages.c:343
+msgid "You are not on a form submission button or normal link."
+msgstr ""
+
+#. #define NEED_CHECKED_RADIO_BUTTON
+#: LYMessages.c:345
+msgid "One radio button must be checked at all times!"
+msgstr ""
+
+#: LYMessages.c:346
+msgid "No submit button for this form, submit single text field?"
+msgstr ""
+
+#: LYMessages.c:347
+msgid "Do you want to go back to the previous document?"
+msgstr "¬O§_ªð¦^¤w¸gÂsÄý¹Lªº¤å¥ó¡H"
+
+#: LYMessages.c:348
+msgid "Use arrows or tab to move off of field."
+msgstr ""
+
+#. #define ENTER_TEXT_ARROWS_OR_TAB
+#: LYMessages.c:350
+msgid "Enter text.  Use arrows or tab to move off of field."
+msgstr "½Ð¿é¤J¤å¦r¡C¨Ï¥Î¤è¦VÁä©Î tab ÁäÂ÷¶}Äæ¦ì¡C"
+
+#: LYMessages.c:351
+msgid "** Bad HTML!!  No form action defined. **"
+msgstr ""
+
+#: LYMessages.c:352
+msgid "Bad HTML!!  Unable to create popup window!"
+msgstr ""
+
+#: LYMessages.c:353
+msgid "Unable to create popup window!"
+msgstr ""
+
+#: LYMessages.c:354
+msgid "Goto a random URL is disallowed!"
+msgstr "¤£¤¹³\¶i¤JÀH¾÷ªº URL¡I"
+
+#: LYMessages.c:355
+msgid "Goto a non-http URL is disallowed!"
+msgstr "¤£¤¹³\ÂsÄý«D http ªº URL¡I"
+
+#: LYMessages.c:356
+#, c-format
+msgid "You are not allowed to goto \"%s\" URLs"
+msgstr "»Õ¤U¤£¤¹³\¶i¤J¡§%s¡¨Ãþ«¬ªº URL"
+
+#: LYMessages.c:357
+msgid "URL to open: "
+msgstr "·Ç³Æ¶}±Òªº URL¡G"
+
+#: LYMessages.c:358
+msgid "Edit the current Goto URL: "
+msgstr "­×§ï¥Ø«eªº URL¡G"
+
+#: LYMessages.c:359
+msgid "Edit the previous Goto URL: "
+msgstr "­×§ï´¿¸gÂsÄýªº URL¡G"
+
+#: LYMessages.c:360
+msgid "Edit a previous Goto URL: "
+msgstr "­×§ï´¿¸gÂsÄýªº URL¡G"
+
+#: LYMessages.c:361
+msgid "Current document has POST data."
+msgstr "¥Ø«eªº¤å¥ó¸ü¦³ POST ¸ê®Æ¡C"
+
+#: LYMessages.c:362
+msgid "Edit this document's URL: "
+msgstr "­×§ï¥»¤å¥óªº URL¡G"
+
+#: LYMessages.c:363
+msgid "Edit the current link's URL: "
+msgstr "­×§ï¥Ø«e¿ï¨úªºÃìµ²ªº URL¡G"
+
+#: LYMessages.c:364
+msgid "You cannot edit File Management URLs"
+msgstr "¤£¥i­×§ï¦³ÃöÀɮ׺޲zªº URL"
+
+#: LYMessages.c:365
+msgid "Enter a database query: "
+msgstr ""
+
+#: LYMessages.c:366
+msgid "Enter a whereis query: "
+msgstr "¿é¤J·Ç³Æ·j´Mªº¦r¦ê¡G"
+
+#: LYMessages.c:367
+msgid "Edit the current query: "
+msgstr "­×§ï¥Ø«e·Ç³Æ·j´Mªº¦r¦ê¡G"
+
+#: LYMessages.c:368
+msgid "Edit the previous query: "
+msgstr "­×§ï¤§«e·Ç³Æ·j´Mªº¦r¦ê¡G"
+
+#: LYMessages.c:369
+msgid "Edit a previous query: "
+msgstr "­×§ï¤§«e·Ç³Æ·j´Mªº¦r¦ê¡G"
+
+#. #define USE_C_R_TO_RESUB_CUR_QUERY
+#: LYMessages.c:371
+msgid "Use Control-R to resubmit the current query."
+msgstr ""
+
+#: LYMessages.c:372
+msgid "Edit the current shortcut: "
+msgstr ""
+
+#: LYMessages.c:373
+msgid "Edit the previous shortcut: "
+msgstr ""
+
+#: LYMessages.c:374
+msgid "Edit a previous shortcut: "
+msgstr ""
+
+#: LYMessages.c:375
+#, c-format
+msgid "Key '%c' is not mapped to a jump file!"
+msgstr ""
+
+#: LYMessages.c:376
+msgid "Cannot locate jump file!"
+msgstr ""
+
+#: LYMessages.c:377
+msgid "Cannot open jump file!"
+msgstr ""
+
+#: LYMessages.c:378
+msgid "Error reading jump file!"
+msgstr ""
+
+#: LYMessages.c:379
+msgid "Out of memory reading jump file!"
+msgstr ""
+
+#: LYMessages.c:380
+msgid "Out of memory reading jump table!"
+msgstr ""
+
+#: LYMessages.c:381
+msgid "No index is currently available."
+msgstr ""
+
+#. #define CONFIRM_MAIN_SCREEN
+#: LYMessages.c:383
+msgid "Do you really want to go to the Main screen?"
+msgstr "¬O§_½T©w­nÂsÄý¥Dµe­±¡H"
+
+#: LYMessages.c:384
+msgid "You are already at main screen!"
+msgstr "¤w¸g¦b¥Dµe­±¤F¡I"
+
+#. #define NOT_ISINDEX
+#: LYMessages.c:386
+msgid "Not a searchable indexed document -- press '/' to search for a text string"
+msgstr "¤£¬O¥i¶i¦æ·j´Mªº¯Á¤Þ¤å¥ó ¢w ½Ð«ö¡¥/¡¦·j´M¦r¦ê"
+
+#. #define NO_OWNER
+#: LYMessages.c:388
+msgid "No owner is defined for this file so you cannot send a comment"
+msgstr ""
+
+#: LYMessages.c:389
+#, c-format
+msgid "No owner is defined. Use %s?"
+msgstr ""
+
+#: LYMessages.c:390
+msgid "Do you wish to send a comment?"
+msgstr ""
+
+#: LYMessages.c:391
+msgid "Mail is disallowed so you cannot send a comment"
+msgstr ""
+
+#: LYMessages.c:392
+msgid "The 'e'dit command is currently disabled."
+msgstr "¼È°±¨Ï¥Î¡u½s¿è¡v('e') «ü¥O¡C"
+
+#: LYMessages.c:393
+msgid "External editing is currently disabled."
+msgstr "¼È°±¨Ï¥Î¥~³¡ªº½s¿è¾¹¡C"
+
+#: LYMessages.c:394
+msgid "System error - failure to get status."
+msgstr "¨t²Î¿ù»~ ¢w µLªk±oª¾ª¬ºA¡C"
+
+#: LYMessages.c:395
+msgid "No editor is defined!"
+msgstr "¥¼«ü©w½s¿è¾¹¡I"
+
+#: LYMessages.c:396
+msgid "The 'p'rint command is currently disabled."
+msgstr "¼È°±¨Ï¥Î¡u¦C¦L¡v('p') «ü¥O¡C"
+
+#: LYMessages.c:397
+msgid "Document has no Toolbar links or Banner."
+msgstr ""
+
+#: LYMessages.c:398
+msgid "Unable to open traversal file."
+msgstr ""
+
+#: LYMessages.c:399
+msgid "Unable to open traversal found file."
+msgstr ""
+
+#: LYMessages.c:400
+msgid "Unable to open reject file."
+msgstr ""
+
+#: LYMessages.c:401
+msgid "Unable to open traversal errors output file"
+msgstr ""
+
+#: LYMessages.c:402
+msgid "TRAVERSAL WAS INTERRUPTED"
+msgstr ""
+
+#: LYMessages.c:403
+msgid "Follow link (or goto link or page) number: "
+msgstr ""
+
+#: LYMessages.c:404
+msgid "Select option (or page) number: "
+msgstr "½Ð¿ï¨ú¿ï¶µ½s¸¹(©Î­¶¼Æ)¡G"
+
+#: LYMessages.c:405
+#, c-format
+msgid "Option number %d already is current."
+msgstr "¿ï¶µ½s¸¹ %d ¤w¸g¬O¥Ø«eªº¿ï¶µ¡C"
+
+#. #define ALREADY_AT_OPTION_END
+#: LYMessages.c:407
+msgid "You are already at the end of this option list."
+msgstr "¤w¸g¦b¿ï¶µ²M³æªºµ²§ô³¡¥÷¤F¡C"
+
+#. #define ALREADY_AT_OPTION_BEGIN
+#: LYMessages.c:409
+msgid "You are already at the beginning of this option list."
+msgstr "¤w¸g¦b¿ï¶µ²M³æªº¶}©l³¡¥÷¤F¡C"
+
+#. #define ALREADY_AT_OPTION_PAGE
+#: LYMessages.c:411
+#, c-format
+msgid "You are already at page %d of this option list."
+msgstr "¤w¸g¦b¿ï¶µ²M³æªº²Ä %d ­¶¤F¡C"
+
+#: LYMessages.c:412
+msgid "You have entered an invalid option number."
+msgstr "»Õ¤U¿é¤J¤FµL®Äªº¿ï¶µ½s¸¹¡C"
+
+#: LYMessages.c:413
+msgid "** Bad HTML!!  Use -trace to diagnose. **"
+msgstr ""
+
+#: LYMessages.c:414
+msgid "Give name of file to save in"
+msgstr ""
+
+#: LYMessages.c:415
+msgid "Can't save data to file -- please run WWW locally"
+msgstr ""
+
+#: LYMessages.c:416
+msgid "Can't open temporary file!"
+msgstr "µLªk¶}±Ò¼È¦sÀÉ¡I"
+
+#: LYMessages.c:417
+msgid "Can't open output file!  Cancelling!"
+msgstr "µLªk¶}±Ò¿é¥XÀÉ¡I¨ú®ø¿é¥X¡I"
+
+#: LYMessages.c:418
+msgid "Execution is disabled."
+msgstr ""
+
+#. #define EXECUTION_DISABLED_FOR_FILE
+#: LYMessages.c:420
+#, c-format
+msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
+msgstr ""
+
+#. #define EXECUTION_NOT_COMPILED
+#: LYMessages.c:422
+msgid "Execution capabilities are not compiled into this version."
+msgstr ""
+
+#: LYMessages.c:423
+msgid "This file cannot be displayed on this terminal."
+msgstr "µLªk¦b¥»²×ºÝ¾÷Åã¥Ü¸ÓÀɮסC"
+
+#. #define CANNOT_DISPLAY_FILE_D_OR_C
+#: LYMessages.c:425
+msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
+msgstr "µLªk¦b¥»²×ºÝ¾÷Åã¥Ü¸ÓÀɮסG D)¤U¸ü  C)¨ú®ø"
+
+#: LYMessages.c:426
+#, c-format
+msgid "%s  D)ownload, or C)ancel"
+msgstr "%s  D)¤U¸ü  C)¨ú®ø"
+
+#: LYMessages.c:427
+msgid "Cancelling file."
+msgstr "¨ú®ø±µ¦¬ÀɮסC"
+
+#: LYMessages.c:428
+msgid "Retrieving file.  - PLEASE WAIT -"
+msgstr "¥¿¦b±µ¦¬ÀɮסC¢w ½Ðµyµ¥ ¢w"
+
+#: LYMessages.c:429
+msgid "Enter a filename: "
+msgstr "½Ð¿é¤JÀɮצWºÙ¡G"
+
+#: LYMessages.c:430
+msgid "Edit the previous filename: "
+msgstr "­×§ï¥H©¹¨Ï¥ÎªºÀɮצWºÙ¡G"
+
+#: LYMessages.c:431
+msgid "Edit a previous filename: "
+msgstr "­×§ï¥H©¹¨Ï¥ÎªºÀɮצWºÙ¡G"
+
+#: LYMessages.c:432
+msgid "Enter a new filename: "
+msgstr "½Ð¿é¤J·sªºÀɮצWºÙ¡G"
+
+#: LYMessages.c:433
+msgid "File name may not begin with a dot."
+msgstr ""
+
+#: LYMessages.c:435
+msgid "File exists.  Create higher version?"
+msgstr ""
+
+#: LYMessages.c:437
+msgid "File exists.  Overwrite?"
+msgstr "Àɮפw¦s¦b¡C¬O§_Âмg¡H"
+
+#: LYMessages.c:439
+msgid "Cannot write to file."
+msgstr "µLªk¼g¤JÀɮסC"
+
+#: LYMessages.c:440
+msgid "ERROR! - download command is misconfigured."
+msgstr "¿ù»~¡I¢w ¦³Ãö¤U¸üªº«ü¥O¤´¥¼³]©w¦n¡C"
+
+#: LYMessages.c:441
+msgid "Unable to download file."
+msgstr "µLªk¤U¸üÀɮסC"
+
+#: LYMessages.c:442
+msgid "Reading directory..."
+msgstr "¥¿¦bŪ¨ú¥Ø¿ý..."
+
+#: LYMessages.c:443
+msgid "Building directory listing..."
+msgstr "¥¿¦b»s§@¥Ø¿ý²M³æ..."
+
+#: LYMessages.c:444
+msgid "Saving..."
+msgstr "Àx¦s¤¤..."
+
+#: LYMessages.c:445
+#, c-format
+msgid "Could not edit file '%s'."
+msgstr "µLªk½s¿èÀɮס¥%s¡¦¡C"
+
+#: LYMessages.c:446
+msgid "Unable to access document!"
+msgstr "µLªk¦s¨ú¤å¥ó¡I"
+
+#: LYMessages.c:447
+msgid "Could not access file."
+msgstr "µLªk¦s¨úÀɮסC"
+
+#: LYMessages.c:448
+msgid "Could not access directory."
+msgstr "µLªk¦s¨ú¥Ø¿ý¡C"
+
+#: LYMessages.c:449
+msgid "Could not load data."
+msgstr "µLªk¸ü¤J¸ê®Æ¡C"
+
+#. #define CANNOT_EDIT_REMOTE_FILES
+#: LYMessages.c:451
+msgid "Lynx cannot currently (e)dit remote WWW files."
+msgstr "¥Ø«e Lynx µLªk½s¿è»·ºÝªº WWW ÀɮסC"
+
+#. #define CANNOT_EDIT_FIELD
+#: LYMessages.c:453
+msgid "This field cannot be (e)dited with an external editor."
+msgstr "¥»Äæ¦ìµLªk¨Ï¥Î¥~³¡ªº½s¿è¾¹¨Ó½s¿è¡C"
+
+#: LYMessages.c:454
+msgid "Bad rule"
+msgstr ""
+
+#: LYMessages.c:455
+msgid "Insufficient operands:"
+msgstr ""
+
+#: LYMessages.c:456
+msgid "You are not authorized to edit this file."
+msgstr "»Õ¤U¥¼Àò±ÂÅv­×§ï¥»ÀɮסC"
+
+#: LYMessages.c:457
+msgid "Title: "
+msgstr "¼ÐÃD¡G"
+
+#: LYMessages.c:458
+msgid "Subject: "
+msgstr "¥DÃD¡G"
+
+#: LYMessages.c:459
+msgid "Username: "
+msgstr "±b¤á¦WºÙ¡G"
+
+#: LYMessages.c:460
+msgid "Password: "
+msgstr "±K½X¡G"
+
+#: LYMessages.c:461
+msgid "lynx: Username and Password required!!!"
+msgstr "lynx¡G»Ý­n±b¤á¦WºÙ¤Î±K½X!!!"
+
+#: LYMessages.c:462
+msgid "lynx: Password required!!!"
+msgstr "lynx¡G»Ý­n±K½X!!!"
+
+#: LYMessages.c:463
+msgid "Clear all authorization info for this session?"
+msgstr ""
+
+#: LYMessages.c:464
+msgid "Authorization info cleared."
+msgstr "¤w²M°£»{ÃÒ¸ê°T¡C"
+
+#: LYMessages.c:465
+msgid "Authorization failed.  Retry?"
+msgstr "»{ÃÒ¥¢±Ñ¡C¬O§_­«¸Õ¡H"
+
+#: LYMessages.c:466
+msgid "cgi support has been disabled."
+msgstr "¼È°±¤ä´© cgi ¥\¯à¡C"
+
+#. #define CGI_NOT_COMPILED
+#: LYMessages.c:468
+msgid "Lynxcgi capabilities are not compiled into this version."
+msgstr "½sĶ®É¨Ã¨S¦³¥[¤J lynxcgi ¥\¯à¡C"
+
+#: LYMessages.c:469
+#, c-format
+msgid "Sorry, no known way of converting %s to %s."
+msgstr "©êºp¡A¨S¦³¤wª¾ªº¤èªk¥i¥H±N %s Âà´«¦Ü %s¡C"
+
+#: LYMessages.c:470
+msgid "Unable to set up connection."
+msgstr "µLªk«Ø¥ß³s½u¡C"
+
+#: LYMessages.c:471
+msgid "Unable to make connection"
+msgstr "µLªk«Ø¥ß³s½u¡C"
+
+#. #define MALFORMED_EXEC_REQUEST
+#: LYMessages.c:473
+msgid "Executable link rejected due to malformed request."
+msgstr ""
+
+#. #define BADCHAR_IN_EXEC_LINK
+#: LYMessages.c:475
+#, c-format
+msgid "Executable link rejected due to `%c' character."
+msgstr ""
+
+#. #define RELPATH_IN_EXEC_LINK
+#: LYMessages.c:477
+msgid "Executable link rejected due to relative path string ('../')."
+msgstr ""
+
+#. #define BADLOCPATH_IN_EXEC_LINK
+#: LYMessages.c:479
+msgid "Executable link rejected due to location or path."
+msgstr ""
+
+#: LYMessages.c:480
+msgid "Mail access is disabled!"
+msgstr ""
+
+#. #define ACCESS_ONLY_LOCALHOST
+#: LYMessages.c:482
+msgid "Only files and servers on the local host can be accessed."
+msgstr ""
+
+#: LYMessages.c:483
+msgid "Telnet access is disabled!"
+msgstr ""
+
+#. #define TELNET_PORT_SPECS_DISABLED
+#: LYMessages.c:485
+msgid "Telnet port specifications are disabled."
+msgstr ""
+
+#: LYMessages.c:486
+msgid "USENET news access is disabled!"
+msgstr ""
+
+#: LYMessages.c:487
+msgid "Rlogin access is disabled!"
+msgstr ""
+
+#: LYMessages.c:488
+msgid "Ftp access is disabled!"
+msgstr ""
+
+#: LYMessages.c:489
+msgid "There are no references from this document."
+msgstr ""
+
+#: LYMessages.c:490
+msgid "There are only hidden links from this document."
+msgstr ""
+
+#: LYMessages.c:492
+msgid "Unable to open command file."
+msgstr ""
+
+#: LYMessages.c:494
+msgid "News Post Cancelled!!!"
+msgstr ""
+
+#. #define SPAWNING_EDITOR_FOR_NEWS
+#: LYMessages.c:496
+msgid "Spawning your selected editor to edit news message"
+msgstr ""
+
+#: LYMessages.c:497
+msgid "Post this message?"
+msgstr ""
+
+#: LYMessages.c:498
+#, c-format
+msgid "Append '%s'?"
+msgstr ""
+
+#: LYMessages.c:499
+msgid "Posting to newsgroup(s)..."
+msgstr ""
+
+#: LYMessages.c:501
+msgid "*** You have unread mail. ***"
+msgstr "*** ¦³¥¼Åªªº¶l¥ó¡C ***"
+
+#: LYMessages.c:503
+msgid "*** You have mail. ***"
+msgstr "*** ¦³¶l¥ó¡C ***"
+
+#: LYMessages.c:505
+msgid "*** You have new mail. ***"
+msgstr "*** ¦³·s¶l¥ó¡C ***"
+
+#: LYMessages.c:506
+msgid "File insert cancelled!!!"
+msgstr ""
+
+#: LYMessages.c:507
+msgid "Not enough memory for file!"
+msgstr "°O¾ÐÅ餣¨¬¥H¸ü¤JÀɮסI"
+
+#: LYMessages.c:508
+msgid "Can't open file for reading."
+msgstr "µLªk¶}±Ò·Ç³ÆŪ¤JªºÀɮסC"
+
+#: LYMessages.c:509
+msgid "File does not exist."
+msgstr "Àɮפ£¦s¦b¡C"
+
+#: LYMessages.c:510
+msgid "File does not exist - reenter or cancel:"
+msgstr "Àɮפ£¦s¦b ¢w ½Ð­«·s¿é¤J©Î¨ú®ø¡G"
+
+#: LYMessages.c:511
+msgid "File is not readable."
+msgstr ""
+
+#: LYMessages.c:512
+msgid "File is not readable - reenter or cancel:"
+msgstr ""
+
+#: LYMessages.c:513
+msgid "Nothing to insert - file is 0-length."
+msgstr ""
+
+#: LYMessages.c:514
+msgid "Save request cancelled!!!"
+msgstr "¤w¨ú®øÀx¦sªº­n¨D!!!"
+
+#: LYMessages.c:515
+msgid "Mail request cancelled!!!"
+msgstr ""
+
+#. #define CONFIRM_MAIL_SOURCE_PREPARSED
+#: LYMessages.c:517
+msgid "Viewing preparsed source.  Are you sure you want to mail it?"
+msgstr ""
+
+#: LYMessages.c:518
+msgid "Please wait..."
+msgstr "½Ðµyµ¥..."
+
+#: LYMessages.c:519
+msgid "Mailing file.  Please wait..."
+msgstr "¥¿¦b±H¥XÀɮסC½Ðµyµ¥..."
+
+#: LYMessages.c:520
+msgid "ERROR - Unable to mail file"
+msgstr "¿ù»~ ¢w µLªk±H¥XÀÉ®×"
+
+#. #define CONFIRM_LONG_SCREEN_PRINT
+#: LYMessages.c:522
+#, c-format
+msgid "File is %d screens long.  Are you sure you want to print?"
+msgstr "Àɮתø«×¬° %d ­Óµe­±¡C¬O§_½T©w­n¦C¦L¡H"
+
+#: LYMessages.c:523
+msgid "Print request cancelled!!!"
+msgstr "¤w¨ú®ø¦C¦Lªº­n¨D!!!"
+
+#: LYMessages.c:524
+msgid "Press <return> to begin: "
+msgstr "½Ð«ö <return> ¶}©l¡G"
+
+#: LYMessages.c:525
+msgid "Press <return> to finish: "
+msgstr "½Ð«ö <return> µ²§ô¡G"
+
+#. #define CONFIRM_LONG_PAGE_PRINT
+#: LYMessages.c:527
+#, c-format
+msgid "File is %d pages long.  Are you sure you want to print?"
+msgstr "Àɮתø«×¬° %d ­¶¡C¬O§_½T©w­n¦C¦L¡H"
+
+#. #define CHECK_PRINTER
+#: LYMessages.c:529
+msgid "Be sure your printer is on-line.  Press <return> to start printing:"
+msgstr ""
+
+#: LYMessages.c:530
+msgid "ERROR - Unable to allocate file space!!!"
+msgstr "¿ù»~ ¢w µLªk¤À°tÀɮתŶ¡!!!"
+
+#: LYMessages.c:531
+msgid "Unable to open tempfile"
+msgstr "µLªk¶}±Ò¼È¦sÀÉ"
+
+#: LYMessages.c:532
+msgid "Unable to open print options file"
+msgstr ""
+
+#: LYMessages.c:533
+msgid "Printing file.  Please wait..."
+msgstr "¥¿¦b¦C¦LÀɮסC½Ðµyµ¥..."
+
+#: LYMessages.c:534
+msgid "Please enter a valid internet mail address: "
+msgstr "½Ð¿é¤J¦³®Äªº¹q¶l¦a§}¡G"
+
+#: LYMessages.c:535
+msgid "ERROR! - printer is misconfigured!"
+msgstr "¿ù»~¡I - ¦Lªí¾÷³]©w¿ù»~¡I"
+
+#: LYMessages.c:536
+msgid "Image map from POST response not available!"
+msgstr ""
+
+#: LYMessages.c:537
+msgid "Misdirected client-side image MAP request!"
+msgstr ""
+
+#: LYMessages.c:538
+msgid "Client-side image MAP is not accessible!"
+msgstr ""
+
+#: LYMessages.c:539
+msgid "No client-side image MAPs are available!"
+msgstr ""
+
+#: LYMessages.c:540
+msgid "Client-side image MAP is not available!"
+msgstr ""
+
+#. #define OPTION_SCREEN_NEEDS_24
+#: LYMessages.c:543
+msgid "Screen height must be at least 24 lines for the Options menu!"
+msgstr "¦b¿ï¶µ³]©w¤¤¡Aµe­±°ª«×¥²¶·³Ì¤Ö¦³ 24 ¦æ¡I"
+
+#. #define OPTION_SCREEN_NEEDS_23
+#: LYMessages.c:545
+msgid "Screen height must be at least 23 lines for the Options menu!"
+msgstr "¦b¿ï¶µ³]©w¤¤¡Aµe­±°ª«×¥²¶·³Ì¤Ö¦³ 23 ¦æ¡I"
+
+#. #define OPTION_SCREEN_NEEDS_22
+#: LYMessages.c:547
+msgid "Screen height must be at least 22 lines for the Options menu!"
+msgstr "¦b¿ï¶µ³]©w¤¤¡Aµe­±°ª«×¥²¶·³Ì¤Ö¦³ 22 ¦æ¡I"
+
+#: LYMessages.c:549
+msgid "That key requires Advanced User mode."
+msgstr ""
+
+#: LYMessages.c:550
+#, c-format
+msgid "Content-type: %s"
+msgstr "Content-type¡G%s"
+
+#: LYMessages.c:551
+msgid "Command: "
+msgstr "«ü¥O¡G"
+
+#: LYMessages.c:552
+msgid "Unknown or ambiguous command"
+msgstr "¤£©ú©Î·N¸q§t½kªº«ü¥O"
+
+#: LYMessages.c:553
+msgid " Version "
+msgstr " ª©¥» "
+
+#: LYMessages.c:554
+msgid " first"
+msgstr " (­º¥ý´ú¸Õ)"
+
+#: LYMessages.c:555
+msgid ", guessing..."
+msgstr "¡A¥¿¦b¦ô­p..."
+
+#: LYMessages.c:556
+msgid "Permissions for "
+msgstr ""
+
+#: LYMessages.c:557
+msgid "Select "
+msgstr ""
+
+#: LYMessages.c:558
+msgid "capital letter"
+msgstr ""
+
+#: LYMessages.c:559
+msgid " of option line,"
+msgstr ""
+
+#: LYMessages.c:560
+msgid " to save,"
+msgstr " Àx¦s  "
+
+#: LYMessages.c:561
+msgid " to "
+msgstr ""
+
+#: LYMessages.c:562
+msgid " or "
+msgstr " ©Î¬O "
+
+#: LYMessages.c:563
+msgid " index"
+msgstr ""
+
+#: LYMessages.c:564
+msgid " to return to Lynx."
+msgstr " ªð¦^ Lynx¡C"
+
+#: LYMessages.c:565
+msgid "Accept Changes"
+msgstr "±µ¨ü§ó§ï"
+
+#: LYMessages.c:566
+msgid "Reset Changes"
+msgstr "­«³]¿ï¶µ"
+
+#: LYMessages.c:567
+msgid "Left Arrow cancels changes"
+msgstr "¥ª½b©CÁä¨ú®ø§ó§ï¿ï¶µ"
+
+#: LYMessages.c:568
+msgid "Save options to disk"
+msgstr "±N¿ï¶µÀx¦s©óºÏºÐ¤¤"
+
+#: LYMessages.c:569
+msgid "Hit RETURN to accept entered data."
+msgstr "«ö RETURN ±µ¨ü¿é¤Jªº¸ê®Æ¡C"
+
+#. #define ACCEPT_DATA_OR_DEFAULT
+#: LYMessages.c:571
+msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
+msgstr ""
+
+#: LYMessages.c:572
+msgid "Value accepted!"
+msgstr "¤w±µ¨ü³]©w­È¡I"
+
+#. #define VALUE_ACCEPTED_WARNING_X
+#: LYMessages.c:574
+msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
+msgstr "¤w±µ¨ü³]©w­È¡I¢w ĵ§i¡GLynx ³]©w¤F¥u¦b XWINDOW ¾A¥Î¡I"
+
+#. #define VALUE_ACCEPTED_WARNING_NONX
+#: LYMessages.c:576
+msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
+msgstr "¤w±µ¨ü³]©w­È¡I¢w ĵ§i¡GLynx ³]©w¤F¤£¾A¥Î©ó XWINDOW¡I"
+
+#: LYMessages.c:577
+msgid "You are not allowed to change which editor to use!"
+msgstr "¤£¤¹³\¦Û¦æ«ü©w¨Ï¥Îªº½s¿è¾¹¡I"
+
+#: LYMessages.c:578
+msgid "Failed to set DISPLAY variable!"
+msgstr "µLªk³]©w DISPLAY Àô¹ÒÅܼơI"
+
+#: LYMessages.c:579
+msgid "Failed to clear DISPLAY variable!"
+msgstr "µLªk²M°£ DISPLAY Àô¹ÒÅܼơI"
+
+#. #define BOOKMARK_CHANGE_DISALLOWED
+#: LYMessages.c:581
+msgid "You are not allowed to change the bookmark file!"
+msgstr "¤£¤¹³\§ó§ï®ÑÅÒÀÉ¡I"
+
+#: LYMessages.c:582
+msgid "Terminal does not support color"
+msgstr "²×ºÝ¾÷¤£¤ä´©¦â±m"
+
+#: LYMessages.c:583
+#, c-format
+msgid "Your '%s' terminal does not support color."
+msgstr "¡¥%s¡¦²×ºÝ¾÷¤£¤ä´©¦â±m"
+
+#: LYMessages.c:584
+msgid "Access to dot files is disabled!"
+msgstr ""
+
+#. #define UA_NO_LYNX_WARNING
+#: LYMessages.c:586
+msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
+msgstr "User-Agent ¦r¦ê¤£¥]¬A¡§Lynx¡¨©Î¡§L_y_n_x¡¨"
+
+#. #define UA_PLEASE_USE_LYNX
+#: LYMessages.c:588
+msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
+msgstr ""
+
+#. #define UA_CHANGE_DISABLED
+#: LYMessages.c:590
+msgid "Changing of the User-Agent string is disabled!"
+msgstr "¤£¤¹³\§ó§ï User-Agent ¦r¦ê¡I"
+
+#. #define CHANGE_OF_SETTING_DISALLOWED
+#: LYMessages.c:592
+msgid "You are not allowed to change this setting."
+msgstr "¤£¤¹³\§ó§ï¦¹¶µ³]©w¡C"
+
+#: LYMessages.c:593
+msgid "Saving Options..."
+msgstr "¥¿¦bÀx¦s¿ï¶µ..."
+
+#: LYMessages.c:594
+msgid "Options saved!"
+msgstr "¤wÀx¦s¿ï¶µ¡I"
+
+#: LYMessages.c:595
+msgid "Unable to save Options!"
+msgstr "µLªkÀx¦s¿ï¶µ¡I"
+
+#: LYMessages.c:596
+msgid " 'r' to return to Lynx "
+msgstr "½Ð«ö¡¥r¡¦ªð¦^ Lynx "
+
+#: LYMessages.c:597
+msgid " '>' to save, or 'r' to return to Lynx "
+msgstr "«ö¡¥>¡¦Àx¦s¡A©Î¬O«ö¡¥r¡¦ªð¦^ Lynx "
+
+#. #define ANY_KEY_CHANGE_RET_ACCEPT
+#: LYMessages.c:599
+msgid "Hit any key to change value; RETURN to accept."
+msgstr ""
+
+#: LYMessages.c:600
+msgid "Error uncompressing temporary file!"
+msgstr "±N¼È¦sÀɸÑÀ£®Éµo¥Í¿ù»~¡I"
+
+#: LYMessages.c:601
+msgid "Unsupported URL scheme!"
+msgstr ""
+
+#: LYMessages.c:602
+msgid "Unsupported data: URL!  Use SHOWINFO, for now."
+msgstr ""
+
+#: LYMessages.c:603
+msgid "Redirection limit of 10 URL's reached."
+msgstr "¤w¹F¨ì URL ­«·s¾É¦V¦¸¼Æªº­­¨î (10 ¦¸)¡C"
+
+#: LYMessages.c:604
+msgid "Illegal redirection URL received from server!"
+msgstr ""
+
+#. #define SERVER_ASKED_FOR_REDIRECTION
+#: LYMessages.c:606
+#, c-format
+msgid "Server asked for %d redirection of POST content to"
+msgstr ""
+
+#: LYMessages.c:609
+msgid "P)roceed, use G)ET or C)ancel "
+msgstr ""
+
+#: LYMessages.c:610
+msgid "P)roceed, or C)ancel "
+msgstr "P)Ä~Äò  C)¨ú®ø"
+
+#. #define ADVANCED_POST_GET_REDIRECT
+#: LYMessages.c:612
+msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
+msgstr ""
+
+#. #define ADVANCED_POST_REDIRECT
+#: LYMessages.c:614
+msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
+msgstr ""
+
+#. #define CONFIRM_POST_RESUBMISSION
+#: LYMessages.c:616
+msgid "Document from Form with POST content.  Resubmit?"
+msgstr ""
+
+#. #define CONFIRM_POST_RESUBMISSION_TO
+#: LYMessages.c:618
+#, c-format
+msgid "Resubmit POST content to %s ?"
+msgstr ""
+
+#. #define CONFIRM_POST_LIST_RELOAD
+#: LYMessages.c:620
+#, c-format
+msgid "List from document with POST data.  Reload %s ?"
+msgstr ""
+
+#. #define CONFIRM_POST_DOC_HEAD
+#: LYMessages.c:622
+msgid "Document from POST action, HEAD may not be understood.  Proceed?"
+msgstr ""
+
+#. #define CONFIRM_POST_LINK_HEAD
+#: LYMessages.c:624
+msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
+msgstr ""
+
+#: LYMessages.c:625
+msgid "Proceed without a username and password?"
+msgstr ""
+
+#: LYMessages.c:626
+#, c-format
+msgid "Proceed (%s)?"
+msgstr "¬O§_Ä~Äò (%s)?"
+
+#: LYMessages.c:627
+msgid "Cannot POST to this host."
+msgstr "µLªk¶Ç°e POST ¸ê®Æ¦Ü¸Ó¥D¾÷¡C"
+
+#: LYMessages.c:628
+msgid "POST not supported for this URL - ignoring POST data!"
+msgstr ""
+
+#: LYMessages.c:629
+msgid "Discarding POST data..."
+msgstr "±Ë±ó POST ¸ê®Æ..."
+
+#: LYMessages.c:630
+msgid "Document will not be reloaded!"
+msgstr "¤£·|­«·s¸ü¤J¤å¥ó¡I"
+
+#: LYMessages.c:631
+msgid "Location: "
+msgstr "¦ì¸m¡G"
+
+#: LYMessages.c:632
+#, c-format
+msgid "'%s' not found!"
+msgstr "§ä¤£¨ì¡¥%s¡¦¡I"
+
+#: LYMessages.c:633
+msgid "Default Bookmark File"
+msgstr "¹w³]®ÑÅÒÀÉ"
+
+#: LYMessages.c:634
+msgid "Screen too small! (8x35 min)"
+msgstr "µe­±¤Ó¤p¡I(³Ì¤p 8x35)"
+
+#: LYMessages.c:635
+msgid "Select destination or ^G to Cancel: "
+msgstr "½Ð¿ï¾Ü¥Øªº¦a©Î«ö ^G ¨ú®ø¡G"
+
+#. #define MULTIBOOKMARKS_SELECT
+#: LYMessages.c:637
+msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
+msgstr ""
+
+#. #define MULTIBOOKMARKS_SELF
+#: LYMessages.c:639
+msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
+msgstr ""
+
+#: LYMessages.c:640
+msgid "Multiple bookmark support is not available."
+msgstr "µLªk´£¨Ñ¦h®ÑÅÒÀɪº¤ä´©¡C"
+
+#: LYMessages.c:641
+#, c-format
+msgid " Select Bookmark (screen %d of %d)"
+msgstr ""
+
+#: LYMessages.c:642
+msgid "       Select Bookmark"
+msgstr "       ¿ï¾Ü®ÑÅÒ"
+
+#. #define MULTIBOOKMARKS_EHEAD_MASK
+#: LYMessages.c:644
+#, c-format
+msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
+msgstr ""
+
+#. #define MULTIBOOKMARKS_EHEAD
+#: LYMessages.c:646
+msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
+msgstr "         ­×§ï¦³Ãö®ÑÅÒªº»¡©ú¤ÎÀɮ׸ô®|"
+
+#: LYMessages.c:647
+msgid "Letter: "
+msgstr "¦r¥À¡G"
+
+#. #define USE_PATH_OFF_HOME
+#: LYMessages.c:650
+msgid "Use a filepath off your login directory in SHELL syntax!"
+msgstr ""
+
+#: LYMessages.c:652
+msgid "Use a filepath off your home directory!"
+msgstr ""
+
+#. #define MAXLINKS_REACHED
+#: LYMessages.c:655
+msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
+msgstr ""
+
+#. #define MAXHIST_REACHED
+#: LYMessages.c:657
+msgid "History List maximum reached!  Document not pushed."
+msgstr ""
+
+#: LYMessages.c:658
+msgid "No previously visited links available!"
+msgstr "µLªk´£¨Ñ¤§«eÂsÄý¹LªºÃìµ²¡I"
+
+#: LYMessages.c:659
+msgid "Memory exhausted!  Program aborted!"
+msgstr "°O¾ÐÅé¯ÓºÉ¡Iµ{¦¡¥²¶·¤¤¤î¡I"
+
+#: LYMessages.c:660
+msgid "Memory exhausted!  Aborting..."
+msgstr "°O¾ÐÅé¯ÓºÉ¡Iµ{¦¡¤¤¤î..."
+
+#: LYMessages.c:661
+msgid "Not enough memory!"
+msgstr "°O¾ÐÅ餣¨¬¡I"
+
+#: LYMessages.c:662
+msgid "Directory/File Manager not available"
+msgstr "µLªk´£¨Ñ¥Ø¿ý/Àɮ׺޲z¥\¯à"
+
+#: LYMessages.c:663
+msgid "HREF in BASE tag is not an absolute URL."
+msgstr "BASE ¼ÐÅÒªº HREF ¤£¬O¦³µ´¹ï¸ô®|ªº URL¡C"
+
+#: LYMessages.c:664
+msgid "Location URL is not absolute."
+msgstr ""
+
+#: LYMessages.c:665
+msgid "Refresh URL is not absolute."
+msgstr "·Ç³Æ§ó·sªº URL ¤¤¨S¦³µ´¹ï¸ô®|¡C"
+
+#. #define SENDING_MESSAGE_WITH_BODY_TO
+#: LYMessages.c:667
+msgid ""
+"You are sending a message with body to:\n"
+"  "
+msgstr ""
+
+#: LYMessages.c:668
+msgid ""
+"You are sending a comment to:\n"
+"  "
+msgstr ""
+
+#: LYMessages.c:669
+msgid ""
+"\n"
+" With copy to:\n"
+"  "
+msgstr ""
+
+#: LYMessages.c:670
+msgid ""
+"\n"
+" With copies to:\n"
+"  "
+msgstr ""
+
+#. #define CTRL_G_TO_CANCEL_SEND
+#: LYMessages.c:672
+msgid ""
+"\n"
+"\n"
+"Use Ctrl-G to cancel if you do not want to send a message\n"
+msgstr ""
+"\n"
+"\n"
+"¦pªG¤£·Q°e¥X°T®§¡A½Ð«ö Ctrl-G ¨ú®ø\n"
+
+#. #define ENTER_NAME_OR_BLANK
+#: LYMessages.c:674
+msgid ""
+"\n"
+" Please enter your name, or leave it blank to remain anonymous\n"
+msgstr ""
+"\n"
+" ½Ð¿é¤J»Õ¤Uªº©m¦W¡A©Î¬O±N¦WºÙ¯dªÅ¥NªíµL¦W¤ó\n"
+
+#. #define ENTER_MAIL_ADDRESS_OR_OTHER
+#: LYMessages.c:676
+msgid ""
+"\n"
+" Please enter a mail address or some other\n"
+msgstr ""
+"\n"
+" ¦pªG»Ý­n¹ï¤è¦^ÂСA½Ð¶ñ¤W¹q¶l\n"
+
+#. #define MEANS_TO_CONTACT_FOR_RESPONSE
+#: LYMessages.c:678
+msgid " means to contact you, if you desire a response.\n"
+msgstr " ¦a§}©Î¨ä¥¦Ápµ¸¤èªk¡C\n"
+
+#: LYMessages.c:679
+msgid ""
+"\n"
+" Please enter a subject line.\n"
+msgstr ""
+"\n"
+" ½Ð¿é¤J¼ÐÃD¡C\n"
+
+#. #define ENTER_ADDRESS_FOR_CC
+#: LYMessages.c:681
+msgid ""
+"\n"
+" Enter a mail address for a CC of your message.\n"
+msgstr ""
+
+#: LYMessages.c:682
+msgid " (Leave blank if you don't want a copy.)\n"
+msgstr " (¦pªG¤£·Q¦¬¨ì°Æ¥»½Ð±N¦¹Äæ¯dªÅ¡C)\n"
+
+#: LYMessages.c:683
+msgid ""
+"\n"
+" Please review the message body:\n"
+"\n"
+msgstr ""
+"\n"
+" ½ÐÀˬd°T®§¤º®e¡G\n"
+"\n"
+
+#: LYMessages.c:684
+msgid ""
+"\n"
+"Press RETURN to continue: "
+msgstr ""
+"\n"
+"½Ð«ö RETURN Ä~Äò¡G"
+
+#: LYMessages.c:685
+msgid ""
+"\n"
+"Press RETURN to clean up: "
+msgstr ""
+
+#: LYMessages.c:686
+msgid " Use Control-U to erase the default.\n"
+msgstr " ½Ð«ö Control-U ²M°£¹w³]­È¡C\n"
+
+#: LYMessages.c:687
+msgid ""
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+" ½Ð¦b¥H¤Uªº¦a¤è¿é¤J°T®§¡C"
+
+#. #define ENTER_PERIOD_WHEN_DONE_A
+#: LYMessages.c:689 src/LYNews.c:361
+msgid ""
+"\n"
+" When you are done, press enter and put a single period (.)"
+msgstr ""
+"\n"
+" §¹¦¨«á½Ð«ö enter¡AµM«á¦b¤U¤@¦æ"
+
+#. #define ENTER_PERIOD_WHEN_DONE_B
+#: LYMessages.c:691 src/LYNews.c:362
+msgid ""
+"\n"
+" on a line and press enter again."
+msgstr ""
+"\n"
+" ¥u¿é¤J¤@ÂI (.) ¨Ã¥B¦A«ö enter¡C"
+
+#. Cookies messages
+#. #define ADVANCED_COOKIE_CONFIRMATION
+#: LYMessages.c:695
+#, c-format
+msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
+msgstr "%s cookie¡G%.*s=%.*s  ¬O§_±µ¨ü¡H (Y/N/Always/neVer)"
+
+#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
+#: LYMessages.c:697
+#, c-format
+msgid "Accept invalid cookie domain=%s for '%s'?"
+msgstr "¬O§_±µ¨ü domain=%s¡A¤@­Ó¥Ñ¡¥%s¡¦µo¥XªºµL®Ä cookie¡H"
+
+#. #define INVALID_COOKIE_PATH_CONFIRMATION
+#: LYMessages.c:699
+#, c-format
+msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
+msgstr ""
+
+#: LYMessages.c:700
+msgid "Allowing this cookie."
+msgstr "±µ¨ü¦¹ cookie¡C"
+
+#: LYMessages.c:701
+msgid "Rejecting this cookie."
+msgstr "©Úµ´¦¹ cookie¡C"
+
+#: LYMessages.c:702
+msgid "The Cookie Jar is empty."
+msgstr "¨S¦³Àx¦s¥ô¦ó cookie¡C"
+
+#. #define ACTIVATE_TO_GOBBLE
+#: LYMessages.c:704
+msgid "Activate links to gobble up cookies or entire domains,"
+msgstr ""
+
+#: LYMessages.c:705
+msgid "or to change a domain's 'allow' setting."
+msgstr ""
+
+#: LYMessages.c:706
+msgid "(Cookies never allowed.)"
+msgstr "(¥Ã¤£±µ¨ü cookie¡C)"
+
+#: LYMessages.c:707
+msgid "(Cookies always allowed.)"
+msgstr "(¤@©w±µ¨ü cookie¡C)"
+
+#: LYMessages.c:708
+msgid "(Cookies allowed via prompt.)"
+msgstr "(¨C¦¸³£¸ß°Ý¨Ï¥ÎªÌ¬O§_±µ¨ü cookie¡C)"
+
+#: LYMessages.c:709
+msgid "(Persistent Cookies.)"
+msgstr ""
+
+#: LYMessages.c:710
+msgid "(No title.)"
+msgstr ""
+
+#: LYMessages.c:711
+msgid "(No name.)"
+msgstr ""
+
+#: LYMessages.c:712
+msgid "(No value.)"
+msgstr ""
+
+#: LYMessages.c:713
+msgid "None"
+msgstr ""
+
+#: LYMessages.c:714
+msgid "(End of session.)"
+msgstr ""
+
+#: LYMessages.c:715
+msgid "Delete this cookie?"
+msgstr "¬O§_§R°£¸Ó cookie¡H"
+
+#: LYMessages.c:716
+msgid "The cookie has been eaten!"
+msgstr "¸Ó cookie ¤w¸g³Q§R°£¤F¡I"
+
+#: LYMessages.c:717
+msgid "Delete this empty domain?"
+msgstr "¬O§_§R°£¸ÓªÅ¥Õªººô°ì¡H"
+
+#: LYMessages.c:718
+msgid "The domain has been eaten!"
+msgstr "¤w¸g§R°£¸Óºô°ì¡I"
+
+#. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:720
+msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "D)§R°£ºô°ìªº cookie  A)¤@©w±µ¨ü cookie  P)¸ß°Ý¬O§_±µ¨ü  V)¥Ã¤£±µ¨ü  C)¨ú®ø"
+
+#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
+#: LYMessages.c:722
+msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
+msgstr "D)§R°£ºô°ì  A)¤@©w±µ¨ü cookie  P)¸ß°Ý¬O§_±µ¨ü  V)¥Ã¤£±µ¨ü  C)¨ú®ø"
+
+#: LYMessages.c:723
+msgid "All cookies in the domain have been eaten!"
+msgstr "¤w¸g§R°£©Ò¦³¨Ó¦Û¸Óºô°ìªº cookie¡I"
+
+#: LYMessages.c:724
+#, c-format
+msgid "'A'lways allowing from domain '%s'."
+msgstr "¤@©w±µ¨ü¨Ó¦Ûºô°ì¡¥%s¡¦ªº cookie¡C"
+
+#: LYMessages.c:725
+#, c-format
+msgid "ne'V'er allowing from domain '%s'."
+msgstr "¥Ã»·¤£±µ¨ü¨Ó¦Ûºô°ì¡¥%s¡¦ªº cookie¡C"
+
+#: LYMessages.c:726
+#, c-format
+msgid "'P'rompting to allow from domain '%s'."
+msgstr "(¨C¦¸³£¸ß°Ý¬O§_±µ¨ü¨Ó¦Ûºô°ì¡¥%s¡¦ªº cookie¡C)"
+
+#: LYMessages.c:727
+msgid "Delete all cookies in this domain?"
+msgstr "¬O§_§R°£©Ò¦³¨Ó¦Û¸Óºô°ìªº cookie¡H"
+
+#: LYMessages.c:728
+msgid "All of the cookies in the jar have been eaten!"
+msgstr "¤w¸g§R°£©Ò¦³ cookie¡I"
+
+#: LYMessages.c:730
+msgid "Port 19 not permitted in URLs."
+msgstr "URL ¸Ì¤£¤¹³\¨Ï¥Î³s±µ°ð¸¹½X 19¡C"
+
+#: LYMessages.c:731
+msgid "Port 25 not permitted in URLs."
+msgstr "URL ¸Ì¤£¤¹³\¨Ï¥Î³s±µ°ð¸¹½X 25¡C"
+
+#: LYMessages.c:732
+#, c-format
+msgid "Port %lu not permitted in URLs."
+msgstr "URL ¸Ì¤£¤¹³\¨Ï¥Î³s±µ°ð¸¹½X %lu¡C"
+
+#: LYMessages.c:733
+msgid "URL has a bad port field."
+msgstr ""
+
+#: LYMessages.c:734
+msgid "Maximum nesting of HTML elements exceeded."
+msgstr ""
+
+#: LYMessages.c:735
+msgid "Bad partial reference!  Stripping lead dots."
+msgstr ""
+
+#: LYMessages.c:736
+msgid "Trace Log open failed.  Trace off!"
+msgstr ""
+
+#: LYMessages.c:737
+msgid "Lynx Trace Log"
+msgstr ""
+
+#: LYMessages.c:738
+msgid "No trace log has been started for this session."
+msgstr ""
+
+#. #define MAX_TEMPCOUNT_REACHED
+#: LYMessages.c:740
+msgid "The maximum temporary file count has been reached!"
+msgstr "¤v¹F¨ì¥i±µ¨üªº¼È¦sÀɼƥؤW­­¡I"
+
+#. #define FORM_VALUE_TOO_LONG
+#: LYMessages.c:742
+msgid "Form field value exceeds buffer length!  Trim the tail."
+msgstr ""
+
+#. #define FORM_TAIL_COMBINED_WITH_HEAD
+#: LYMessages.c:744
+msgid "Modified tail combined with head of form field value."
+msgstr ""
+
+#. HTFile.c
+#: LYMessages.c:747
+msgid "Directory"
+msgstr "¥Ø¿ý"
+
+#: LYMessages.c:748
+msgid "Directory browsing is not allowed."
+msgstr "¤£¤¹³\ÂsÄý¥Ø¿ý¡C"
+
+#: LYMessages.c:749
+msgid "Selective access is not enabled for this directory"
+msgstr ""
+
+#: LYMessages.c:750
+msgid "Multiformat: directory scan failed."
+msgstr ""
+
+#: LYMessages.c:751
+msgid "This directory is not readable."
+msgstr "¨S¦³Åª¨ú¸Ó¥Ø¿ýªºÅv­­¡C"
+
+#: LYMessages.c:752
+msgid "Can't access requested file."
+msgstr "µLªk¦s¨ú©Ò­n¨DªºÀɮסC"
+
+#: LYMessages.c:753
+msgid "Could not find suitable representation for transmission."
+msgstr ""
+
+#: LYMessages.c:754
+msgid "Could not open file for decompression!"
+msgstr "µLªk¶}±Ò·Ç³Æ¸ÑÀ£ªºÀɮסI"
+
+#: LYMessages.c:755
+msgid "Files:"
+msgstr "ÀɮסG"
+
+#: LYMessages.c:756
+msgid "Subdirectories:"
+msgstr "°Æ¥Ø¿ý¡G"
+
+#: LYMessages.c:757
+msgid " directory"
+msgstr " ¥Ø¿ý"
+
+#: LYMessages.c:758
+msgid "Up to "
+msgstr ""
+
+#: LYMessages.c:759
+msgid "Current directory is "
+msgstr "¥Ø«eªº¥Ø¿ý¬O "
+
+#. HTGopher.c
+#: LYMessages.c:762
+msgid "No response from server!"
+msgstr "¦øªA¾¹¨S¦³¦^À³¡I"
+
+#: LYMessages.c:763
+msgid "CSO index"
+msgstr "CSO ¯Á¤Þ"
+
+#: LYMessages.c:764
+msgid ""
+"\n"
+"This is a searchable index of a CSO database.\n"
+msgstr ""
+
+#: LYMessages.c:765
+msgid "CSO Search Results"
+msgstr "CSO ·j´Mµ²ªG"
+
+#: LYMessages.c:766
+#, c-format
+msgid "Seek fail on %s\n"
+msgstr ""
+
+#: LYMessages.c:767
+msgid ""
+"\n"
+"Press the 's' key and enter search keywords.\n"
+msgstr ""
+"\n"
+"½Ð«ö¡¥s¡¦¨Ã¿é¤J·Ç³Æ·j´MªºÃöÁä¦r¡C\n"
+
+#: LYMessages.c:768
+msgid ""
+"\n"
+"This is a searchable Gopher index.\n"
+msgstr ""
+"\n"
+"³o¬O¤@­Ó¥i¥H¶i¦æ·j´Mªº Gopher ¯Á¤Þ¡C\n"
+
+#: LYMessages.c:769
+msgid "Gopher index"
+msgstr "Gopher ¯Á¤Þ"
+
+#: LYMessages.c:770
+msgid "Gopher Menu"
+msgstr "Gopher ¿ï³æ"
+
+#: LYMessages.c:771
+msgid " Search Results"
+msgstr " ·j´Mµ²ªG"
+
+#: LYMessages.c:772
+msgid "Sending CSO/PH request."
+msgstr "¥¿¦b°e¥X CSO/PH ­n¨D¡C"
+
+#: LYMessages.c:773
+msgid "Sending Gopher request."
+msgstr "¥¿¦b°e¥X Gopher ­n¨D¡C"
+
+#: LYMessages.c:774
+msgid "CSO/PH request sent; waiting for response."
+msgstr "¤w¶i¥X CSO/PH ­n¨D¡F¥¿¦bµ¥«Ý¦^À³¡C"
+
+#: LYMessages.c:775
+msgid "Gopher request sent; waiting for response."
+msgstr "¤w¶i¥X Gopher ­n¨D¡F¥¿¦bµ¥«Ý¦^À³¡C"
+
+#: LYMessages.c:776
+msgid ""
+"\n"
+"Please enter search keywords.\n"
+msgstr ""
+"\n"
+"½Ð¿é¤J·Ç³Æ·j´MªºÃöÁä¦r¡C\n"
+
+#: LYMessages.c:777
+msgid ""
+"\n"
+"The keywords that you enter will allow you to search on a"
+msgstr ""
+
+#: LYMessages.c:778
+msgid " person's name in the database.\n"
+msgstr ""
+
+#. HTNews.c
+#: LYMessages.c:781
+msgid "Connection closed ???"
+msgstr "³s½uÃö³¬¤F???"
+
+#: LYMessages.c:782
+msgid "Cannot open temporary file for news POST."
+msgstr ""
+
+#: LYMessages.c:783
+msgid "This client does not contain support for posting to news with SSL."
+msgstr ""
+
+#. HTStyle.c
+#: LYMessages.c:786
+#, c-format
+msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
+msgstr ""
+
+#: LYMessages.c:787
+#, c-format
+msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
+msgstr ""
+
+#: LYMessages.c:788
+#, c-format
+msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
+msgstr ""
+
+#: LYMessages.c:789
+#, c-format
+msgid "\t\tTab kind=%d at %.0f\n"
+msgstr ""
+
+#. HTTP.c
+#: LYMessages.c:792
+msgid "Can't proceed without a username and password."
+msgstr "µLªkÄ~Äò¡A¦]¬°¨S¦³±b¤á¦WºÙ¤Î±K½X¡C"
+
+#: LYMessages.c:793
+msgid "Can't retry with authorization!  Contact the server's WebMaster."
+msgstr ""
+
+#: LYMessages.c:794
+msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
+msgstr ""
+
+#: LYMessages.c:795
+msgid "Retrying with proxy authorization information."
+msgstr "¥H¥N²z¦øªAµ{¦¡ªº»{ÃÒ¸ê°T­«·s¹Á¸Õ¡C"
+
+#. HTWAIS.c
+#: LYMessages.c:798
+msgid "HTWAIS: Return message too large."
+msgstr "HTWAIS¡G¦^¶Çªº°T®§¹Lªø¡C"
+
+#: LYMessages.c:799
+msgid "Enter WAIS query: "
+msgstr ""
+
+#. Miscellaneous status
+#: LYMessages.c:802
+msgid "Retrying as HTTP0 request."
+msgstr "¥H HTTP0 ®æ¦¡­«¸Õ¡C"
+
+#: LYMessages.c:803
+#, c-format
+msgid "Transferred %d bytes"
+msgstr "¤w¶Ç¿é %d ¦ì¤¸²Õ"
+
+#: LYMessages.c:804
+msgid "Data transfer complete"
+msgstr "¸ê®Æ¶Ç¿é¤w§¹¦¨"
+
+#: LYMessages.c:805
+#, c-format
+msgid "Error processing line %d of %s\n"
+msgstr ""
+
+#. Lynx internal page titles
+#: LYMessages.c:808
+msgid "Address List Page"
+msgstr ""
+
+#: LYMessages.c:809
+msgid "Bookmark file"
+msgstr "®ÑÅÒÀÉ"
+
+#: LYMessages.c:810
+msgid "Configuration Definitions"
+msgstr ""
+
+#: LYMessages.c:811
+msgid "Cookie Jar"
+msgstr ""
+
+#: LYMessages.c:812
+msgid "Current Key Map"
+msgstr "¥Ø«eªº«öÁä³]©w"
+
+#: LYMessages.c:813
+msgid "File Management Options"
+msgstr "Àɮ׺޲z¿ï¶µ"
+
+#: LYMessages.c:814
+msgid "Download Options"
+msgstr "¤U¸ü¿ï¶µ"
+
+#: LYMessages.c:815
+msgid "History Page"
+msgstr "ÂsÄý¬ö¿ý"
+
+#: LYMessages.c:816
+msgid "List Page"
+msgstr "Ãìµ²²M³æ"
+
+#: LYMessages.c:817
+msgid "Lynx.cfg Information"
+msgstr "Lynx.cfg ¸ê°T"
+
+#: LYMessages.c:818
+msgid "Converted Mosaic Hotlist"
+msgstr ""
+
+#: LYMessages.c:819
+msgid "Options Menu"
+msgstr "¿ï¶µ³]©w"
+
+#: LYMessages.c:820
+msgid "File Permission Options"
+msgstr "ÀÉ®×Åv­­¿ï¶µ"
+
+#: LYMessages.c:821
+msgid "Printing Options"
+msgstr "¦C¦L¿ï¶µ"
+
+#: LYMessages.c:822
+msgid "Information about the current document"
+msgstr "¦³Ãö¥Ø«eªº¤å¥óªº¸ê®Æ"
+
+#: LYMessages.c:823
+msgid "Your recent statusline messages"
+msgstr "ª¬ºA¦C³Ìªñ¥X²{ªº°T®§"
+
+#: LYMessages.c:824
+msgid "Upload Options"
+msgstr "¤W¶Ç¿ï¶µ"
+
+#: LYMessages.c:825
+msgid "Visited Links Page"
+msgstr ""
+
+#. CONFIG_DEF_TITLE subtitles
+#: LYMessages.c:828
+msgid "See also"
+msgstr ""
+
+#: LYMessages.c:829
+msgid "your"
+msgstr ""
+
+#: LYMessages.c:830
+msgid "for runtime options"
+msgstr ""
+
+#: LYMessages.c:831
+msgid "compile time options"
+msgstr "½sĶ¿ï¶µ"
+
+#: LYMessages.c:832
+#, fuzzy
+msgid "color-style configuration"
+msgstr "¥D­n²ÕºA"
+
+#: LYMessages.c:833
+msgid "latest release"
+msgstr "³Ì·sª©¥»"
+
+#: LYMessages.c:834
+msgid "pre-release version"
+msgstr "¹wÄýª©¥»"
+
+#: LYMessages.c:835
+msgid "development version"
+msgstr "¶}µo¤¤ª©¥»"
+
+#. #define AUTOCONF_CONFIG_CACHE
+#: LYMessages.c:837
+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 ""
+
+#. #define AUTOCONF_LYNXCFG_H
+#: LYMessages.c:841
+msgid ""
+"The following data were used as automatically-configured compile-time\n"
+"definitions when this copy of Lynx was built."
+msgstr ""
+
+#. #define DIRED_NOVICELINE
+#: LYMessages.c:846
+msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
+msgstr "  C)«Ø¥ß  D)¤U¸ü  E)½s¿è  F)§¹¾ã¿ï³æ  M)­×§ï  R)²¾°£  T)¼Ð°O  U)¤W¶Ç\n"
+
+#: LYMessages.c:847
+msgid "Failed to obtain status of current link!"
+msgstr "µLªkÀò¨ú¥Ø«eªºÃìµ²ªºª¬ºA¡I"
+
+#. #define INVALID_PERMIT_URL
+#: LYMessages.c:850
+msgid "Special URL only valid from current File Permission menu!"
+msgstr ""
+
+#: LYMessages.c:854
+msgid "External support is currently disabled."
+msgstr ""
+
+#. new with 2.8.4dev.21
+#: LYMessages.c:858
+msgid "Changing working-directory is currently disabled."
+msgstr ""
+
+#: LYMessages.c:859
+msgid "Linewrap OFF!"
+msgstr "¤wÃö³¬¦Û°Ê´«¦æ¥\¯à¡I"
+
+#: LYMessages.c:860
+msgid "Linewrap ON!"
+msgstr "¤w¶}±Ò¦Û°Ê´«¦æ¥\¯à¡I"
+
+#: LYMessages.c:861
+msgid "Parsing nested-tables toggled OFF!  Reloading..."
+msgstr ""
+
+#: LYMessages.c:862
+msgid "Parsing nested-tables toggled ON!  Reloading..."
+msgstr ""
+
+#: LYMessages.c:863
+msgid "Shifting is disabled while line-wrap is in effect"
+msgstr ""
+
+#: LYMessages.c:864
+msgid "Trace not supported"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:647
+#, c-format
+msgid "Username for '%s' at %s '%s%s':"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:913
+msgid "This client doesn't know how to compose proxy authorization information for scheme"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:988
+msgid "This client doesn't know how to compose authorization information for scheme"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAABrow.c:1096
+#, c-format
+msgid "Invalid header '%s%s%s%s%s'"
+msgstr "µL®Äªº¼ÐÀY¤º®e¡¥%s%s%s%s%s¡¦"
+
+#: WWW/Library/Implementation/HTAABrow.c:1200
+msgid "Proxy authorization required -- retrying"
+msgstr "¨Ï¥Î¥N²z¦øªA¾¹«e»Ý­n»{ÃÒ ¢w ­«·s¹Á¸Õ"
+
+#: WWW/Library/Implementation/HTAABrow.c:1259
+msgid "Access without authorization denied -- retrying"
+msgstr "¤´¥¼»{ÃÒ¡AµLªk¦s¨ú¤º®e ¢w ­«·s¹Á¸Õ"
+
+#: WWW/Library/Implementation/HTAccess.c:677
+msgid "Access forbidden by rule"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:779
+msgid "Document with POST content not found in cache.  Resubmit?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:939
+msgid "Loading failed, use a previous copy."
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8312
+msgid "Loading incomplete."
+msgstr "¥¼§¹¦¨¸ü¤J¤º®e¡C"
+
+#: WWW/Library/Implementation/HTAccess.c:1077
+msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTAccess.c:1079
+msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@sig.net!\n"
+msgstr "**** HTAccess¡G¤º³¡µ{¦¡¿ù»~¡C½Ð±H¹q¶l¦Ü lynx-dev@sig.net¡I\n"
+
+#: WWW/Library/Implementation/HTAccess.c:1080
+#, c-format
+msgid "**** HTAccess: Status returned was: %d\n"
+msgstr "**** HTAccess¡G¦^¶Çªºª¬ºA¬°¡G%d\n"
+
+#.
+#. * hack: if we fail in HTAccess.c
+#. * avoid duplicating URL, oh.
+#.
+#: WWW/Library/Implementation/HTAccess.c:1086 src/LYMainLoop.c:7736
+msgid "Can't Access"
+msgstr "µLªk¦s¨ú"
+
+#: WWW/Library/Implementation/HTAccess.c:1094
+msgid "Unable to access document."
+msgstr "µLªk¦s¨ú¤å¥ó¡C"
+
+#: WWW/Library/Implementation/HTFTP.c:766
+#, c-format
+msgid "Enter password for user %s@%s:"
+msgstr "½Ð¿é¤J¨Ï¥ÎªÌ %s@%s ªº±K½X¡G"
+
+#: WWW/Library/Implementation/HTFTP.c:794
+msgid "Unable to connect to FTP host."
+msgstr "µLªkÁpµ¸ FTP ¥D¾÷¡C"
+
+#: WWW/Library/Implementation/HTFTP.c:1064
+msgid "close master socket"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:1126
+msgid "socket for master socket"
+msgstr ""
+
+#.
+#. **  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:1640 WWW/Library/Implementation/HTFTP.c:2261
+msgid "Symbolic Link"
+msgstr "²Å¸¹³sµ²"
+
+#: WWW/Library/Implementation/HTFTP.c:2622
+msgid "Receiving FTP directory."
+msgstr "¥¿¦b±µ¦¬ FTP ¥Ø¿ý¤º®e¡C"
+
+#: WWW/Library/Implementation/HTFTP.c:2762
+#, c-format
+msgid "Transferred %d bytes (%5d)"
+msgstr "¤w¶Ç°e %d ¦ì¤¸²Õ (%5d)"
+
+#: WWW/Library/Implementation/HTFTP.c:3083
+msgid "connect for data"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFTP.c:3731
+msgid "Receiving FTP file."
+msgstr "¥¿¦b±µ¦¬ FTP ¥Ø¿ý¡C"
+
+#: WWW/Library/Implementation/HTFinger.c:278
+msgid "Could not set up finger connection."
+msgstr "µLªk«Ø¥ß finger ³s½u¡C"
+
+#: WWW/Library/Implementation/HTFinger.c:325
+msgid "Could not load data (no sitename in finger URL)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTFinger.c:331
+msgid "Invalid port number - will only use port 79!"
+msgstr "µL®Äªº³s±µ°ð¸¹½X ¢w ¥u·|¨Ï¥Î³s±µ°ð¸¹ 79¡I"
+
+#: WWW/Library/Implementation/HTFinger.c:396
+msgid "Could not access finger host."
+msgstr "µLªk¦s¨ú finger ¥D¾÷¤Wªº¸ê®Æ¡C"
+
+#: WWW/Library/Implementation/HTFinger.c:404
+msgid "No response from finger server."
+msgstr "finger ¦øªA¾¹¨S¦³¦^À³¡C"
+
+#: WWW/Library/Implementation/HTNews.c:372
+#, c-format
+msgid "Username for news host '%s':"
+msgstr "·s»D²Õ¥D¾÷¡¥%s¡¦ªº±b¤á¦WºÙ¡G"
+
+#: WWW/Library/Implementation/HTNews.c:425
+msgid "Change username?"
+msgstr "¬O§_§ó§ï±b¤á¦WºÙ¡H"
+
+#: WWW/Library/Implementation/HTNews.c:429
+msgid "Username:"
+msgstr "±b¤á¦WºÙ¡G"
+
+#: WWW/Library/Implementation/HTNews.c:453
+#, c-format
+msgid "Password for news host '%s':"
+msgstr "·s»D²Õ¥D¾÷¡¥%s¡¦ªº±K½X¡G"
+
+#: WWW/Library/Implementation/HTNews.c:536
+msgid "Change password?"
+msgstr "¬O§_§ó§ï±K½X¡H"
+
+#: WWW/Library/Implementation/HTNews.c:1690
+#, c-format
+msgid "No matches for: %s"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1743
+msgid ""
+"\n"
+"No articles in this group.\n"
+msgstr ""
+"\n"
+"¦¹·s»D²Õ¨S¦³¥ô¦ó¤å³¹¡C\n"
+
+#: WWW/Library/Implementation/HTNews.c:1756
+msgid ""
+"\n"
+"No articles in this range.\n"
+msgstr ""
+
+#.
+#. **	Set window title.
+#.
+#: WWW/Library/Implementation/HTNews.c:1769
+#, c-format
+msgid "%s,  Articles %d-%d"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1791
+msgid "Earlier articles"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1804
+#, c-format
+msgid ""
+"\n"
+"There are about %d articles currently available in %s, IDs as follows:\n"
+"\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:1864
+msgid "All available articles in "
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2080
+msgid "Later articles"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2104
+msgid "Post to "
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2322
+msgid "This client does not contain support for SNEWS URLs."
+msgstr "¦¹ª©¥»ªºµ{¦¡¤£¤ä´© SNEWS URL¡C"
+
+#: WWW/Library/Implementation/HTNews.c:2530
+msgid "No target for raw text!"
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2560
+msgid "Connecting to NewsHost ..."
+msgstr "¥¿¦bÁpµ¸·s»D²Õ¥D¾÷ ..."
+
+#: WWW/Library/Implementation/HTNews.c:2611
+#, c-format
+msgid "Could not access %s."
+msgstr "µLªk¦s¨ú %s¡C"
+
+#: WWW/Library/Implementation/HTNews.c:2711
+#, c-format
+msgid "Can't read news info.  News host %.20s responded: %.200s"
+msgstr "µLªkŪ¨ú·s»D²Õ¸ê°T¡C·s»D²Õ¦øªA¾¹ %.20s ¦^À³¡G%.200s"
+
+#: WWW/Library/Implementation/HTNews.c:2715
+#, c-format
+msgid "Can't read news info, empty response from host %s"
+msgstr ""
+
+#.
+#. **	List available newsgroups. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2919
+msgid "Reading list of available newsgroups."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2941
+msgid "Reading list of articles in newsgroup."
+msgstr "¥¿¦bŪ¨ú·s»D²Õ¤¤ªº¤å³¹²M³æ¡C"
+
+#.
+#. **	Get an article from a news group. - FM
+#.
+#: WWW/Library/Implementation/HTNews.c:2947
+msgid "Reading news article."
+msgstr ""
+
+#: WWW/Library/Implementation/HTNews.c:2977
+msgid "Sorry, could not load requested news."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1239
+msgid "Address has invalid port"
+msgstr "¦a§}¤¤ªº³s±µ°ðµL®Ä"
+
+#: WWW/Library/Implementation/HTTCP.c:1327
+msgid "Address length looks invalid"
+msgstr "¦a§}ªø«×¦ü¥GµL®Ä"
+
+#: WWW/Library/Implementation/HTTCP.c:1560 WWW/Library/Implementation/HTTCP.c:1578
+#, c-format
+msgid "Unable to locate remote host %s."
+msgstr "§ä¤£¨ì»·ºÝ¥D¾÷ %s¡C"
+
+#. 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:1575 WWW/Library/Implementation/HTTelnet.c:103
+#, c-format
+msgid "Invalid hostname %s"
+msgstr "µL®Äªº¥D¾÷¦WºÙ %s"
+
+#: WWW/Library/Implementation/HTTCP.c:1589
+#, c-format
+msgid "Making %s connection to %s"
+msgstr "¥¿¦b«Ø¥ß %s ³s½u¡A³s¦Ü %s"
+
+#: WWW/Library/Implementation/HTTCP.c:1605
+#, c-format
+msgid "socket failed: family %d addr %s port %s."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1614
+msgid "socket failed."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1634
+msgid "Could not make connection non-blocking."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1703
+msgid "Connection failed (too many retries)."
+msgstr "³s½u¥¢±Ñ (­«¸Õ¦¸¼Æ¤Ó¦h)¡C"
+
+#: WWW/Library/Implementation/HTTCP.c:1896
+msgid "Could not restore socket to blocking."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTCP.c:1962
+msgid "Socket read failed for 180,000 tries."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:350
+#, c-format
+msgid "Address contains a username: %s"
+msgstr "¦a¤î¤¤§t¦³±b¤á¦WºÙ¡G%s"
+
+#: WWW/Library/Implementation/HTTP.c:503
+msgid "This client does not contain support for HTTPS URLs."
+msgstr "¦¹ÂsÄý¾¹¤£¤ä´© HTTPS URL¡C"
+
+#: WWW/Library/Implementation/HTTP.c:528
+msgid "Unable to connect to remote host."
+msgstr "µLªkÁpµ¸»·ºÝ¥D¾÷¡C"
+
+#: WWW/Library/Implementation/HTTP.c:557
+msgid "Retrying connection without TLS."
+msgstr "¹Á¸Õ¥H¤£¥Î TLS ªº¤è¦¡³s½u¡C"
+
+#: WWW/Library/Implementation/HTTP.c:598
+msgid "SSL error:Can't find common name in certificate-Continue?"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:615
+#, c-format
+msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+msgstr "SSL ¿ù»~¡G¥D¾÷(%s)¤£²Å¦XÃÒ®Ñ(%s)¡C¬O§_Ä~Äò¡H"
+
+#: WWW/Library/Implementation/HTTP.c:627
+#, c-format
+msgid "Secure %d-bit %s (%s) HTTP connection"
+msgstr "%d ¦ì¤¸ %s (%s) ¦w¥þ HTTP ³s½u"
+
+#: WWW/Library/Implementation/HTTP.c:1091
+msgid "Sending HTTP request."
+msgstr "¥¿¦b°e¥X HTTP ­n¨D¡C"
+
+#: WWW/Library/Implementation/HTTP.c:1125
+msgid "Unexpected network write error; connection aborted."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1131
+msgid "HTTP request sent; waiting for response."
+msgstr "¤w¶i¥X HTTP ­n¨D¡F¥¿¦bµ¥«Ý¦^À³¡C"
+
+#: WWW/Library/Implementation/HTTP.c:1195
+msgid "Unexpected network read error; connection aborted."
+msgstr ""
+
+#.
+#. **	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:1391
+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:1426
+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:1545
+msgid "Got unexpected 304 Not Modified status."
+msgstr "¥X²{¹w®Æ¤§¥~ªº 304 Not Modified ª¬ºA¡C"
+
+#: WWW/Library/Implementation/HTTP.c:1612
+msgid "Redirection of POST content requires user approval."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1627
+msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1672
+msgid "Retrying with access authorization information."
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1684
+msgid "Show the 401 message body?"
+msgstr "¬O§_Åã¥Ü 401 ¿ù»~°T®§ªººô­¶¤º®e¡H"
+
+#: WWW/Library/Implementation/HTTP.c:1729
+msgid "Show the 407 message body?"
+msgstr "¬O§_Åã¥Ü 407 ¿ù»~°T®§ªººô­¶¤º®e¡H"
+
+#.
+#. **	Bad or unknown server_status number.
+#. **	Take a chance and hope there is
+#. **	something to display. - FM
+#.
+#: WWW/Library/Implementation/HTTP.c:1834
+msgid "Unknown status reply from server!"
+msgstr "¦øªA¾¹µo¥X¤£©úªºª¬ºA¦^À³°T®§¡I"
+
+#: WWW/Library/Implementation/HTTelnet.c:101
+#, c-format
+msgid "remote %s session:"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:161
+msgid "Could not connect to WAIS server."
+msgstr "µLªkÁpµ¸ WAIS ¦øªA¾¹¡C"
+
+#: WWW/Library/Implementation/HTWAIS.c:170
+msgid "Could not open WAIS connection for reading."
+msgstr "µLªk¶}±Ò WAIS ³s½u¨ÓŪ¨ú¸ê®Æ¡C"
+
+#: WWW/Library/Implementation/HTWAIS.c:194
+msgid "Diagnostic code is "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:463
+msgid "Index "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:467
+#, c-format
+msgid " contains the following %d item%s relevant to \""
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:475
+msgid "The first figure after each entry is its relative score, "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:476
+msgid "the second is the number of lines in the item."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:517
+msgid " (bad file name)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:542
+msgid "(bad doc id)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:558
+msgid "(Short Header record, can't display)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:565
+msgid ""
+"\n"
+"Long Header record, can't display\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:572
+msgid ""
+"\n"
+"Text record\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:581
+msgid ""
+"\n"
+"Headline record, can't display\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:589
+msgid ""
+"\n"
+"Code record, can't display\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:689
+msgid "Syntax error in WAIS URL"
+msgstr "WAIS URL ¤¤¥X²{»yªk¿ù»~"
+
+#: WWW/Library/Implementation/HTWAIS.c:759
+msgid " (WAIS Index)"
+msgstr " (WAIS ¯Á¤Þ)"
+
+#: WWW/Library/Implementation/HTWAIS.c:766
+msgid "WAIS Index: "
+msgstr "WAIS ¯Á¤Þ¡G"
+
+#: WWW/Library/Implementation/HTWAIS.c:772
+msgid "This is a link for searching the "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:776
+msgid " WAIS Index.\n"
+msgstr " WAIS ¯Á¤Þ¡C\n"
+
+#: WWW/Library/Implementation/HTWAIS.c:803
+msgid ""
+"\n"
+"Enter the 's'earch command and then specify search words.\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:825
+msgid " (in "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:834
+msgid "WAIS Search of \""
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:838
+msgid "\" in: "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:853
+msgid "HTWAIS: Request too large."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:862
+msgid "Searching WAIS database..."
+msgstr "¥¿¦b·j´M WAIS ¸ê®Æ®w..."
+
+#: WWW/Library/Implementation/HTWAIS.c:872
+msgid "Search interrupted."
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:922
+msgid "Can't convert format of WAIS document"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWAIS.c:966
+msgid "HTWAIS: Request too long."
+msgstr ""
+
+#.
+#. **	Actually do the transaction given by request_message.
+#.
+#: WWW/Library/Implementation/HTWAIS.c:980
+msgid "Fetching WAIS document..."
+msgstr ""
+
+#. display_search_response(target, retrieval_response,
+#. wais_database, keywords);
+#: WWW/Library/Implementation/HTWAIS.c:1019
+msgid "No text was returned!\n"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:287
+msgid " NOT GIVEN in source file; "
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:311
+msgid " WAIS source file"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:318
+msgid " description"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:328
+msgid "Access links"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:346
+msgid "Direct access"
+msgstr ""
+
+#. * Proxy will be used if defined, so let user know that - FM *
+#: WWW/Library/Implementation/HTWSRC.c:349
+msgid " (or via proxy server, if defined)"
+msgstr ""
+
+#: WWW/Library/Implementation/HTWSRC.c:364
+msgid "Maintainer"
+msgstr "ºûÅ@ªÌ"
+
+#: WWW/Library/Implementation/HTWSRC.c:372
+msgid "Host"
+msgstr "¥D¾÷"
+
+#: src/GridText.c:688
+msgid "Memory exhausted, display interrupted!"
+msgstr "°O¾ÐÅé¯ÓºÉ¡A¥²¶·¤¤Â_Åã¥Ü¡I"
+
+#: src/GridText.c:693
+msgid "Memory exhausted, will interrupt transfer!"
+msgstr "°O¾ÐÅé¯ÓºÉ¡A¥²¶·¤¤Â_¶Ç¿é¡I"
+
+#: src/GridText.c:3578
+msgid " *** MEMORY EXHAUSTED ***"
+msgstr "*** °O¾ÐÅé¯ÓºÉ ***"
+
+#: src/GridText.c:6007 src/GridText.c:6014 src/LYList.c:252
+msgid "unknown field or link"
+msgstr "¤£©úªºÄæ¦ì©ÎÃìµ²"
+
+#: src/GridText.c:6023
+msgid "text entry field"
+msgstr "¤å¦r¿é¤JÄæ¦ì"
+
+#: src/GridText.c:6026
+msgid "password entry field"
+msgstr "±K½X¿é¤JÄæ¦ì"
+
+#: src/GridText.c:6029
+msgid "checkbox"
+msgstr ""
+
+#: src/GridText.c:6032
+msgid "radio button"
+msgstr ""
+
+#: src/GridText.c:6035
+msgid "submit button"
+msgstr ""
+
+#: src/GridText.c:6038
+msgid "reset button"
+msgstr ""
+
+#: src/GridText.c:6041
+msgid "popup menu"
+msgstr ""
+
+#: src/GridText.c:6044
+msgid "hidden form field"
+msgstr ""
+
+#: src/GridText.c:6047
+msgid "text entry area"
+msgstr "¤å¦r¿é¤J°Ï°ì"
+
+#: src/GridText.c:6050
+msgid "range entry field"
+msgstr ""
+
+#: src/GridText.c:6053
+msgid "file entry field"
+msgstr "ÀɮצWºÙ¿é¤JÄæ¦ì"
+
+#: src/GridText.c:6056
+msgid "text-submit field"
+msgstr ""
+
+#: src/GridText.c:6059
+msgid "image-submit button"
+msgstr ""
+
+#: src/GridText.c:6062
+msgid "keygen field"
+msgstr ""
+
+#: src/GridText.c:6065
+msgid "unknown form field"
+msgstr ""
+
+#: src/GridText.c:10066
+msgid "Can't open file for uploading"
+msgstr "µLªk¶}±Ò·Ç³Æ¤W¶ÇªºÀÉ®×"
+
+#: src/GridText.c:11218
+#, c-format
+msgid "Submitting %s"
+msgstr ""
+
+#. ugliness has happened; inform user and do the best we can
+#: src/GridText.c:12375
+msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
+msgstr ""
+
+#. don't show previous state
+#: src/GridText.c:12581
+msgid "Wrap lines to fit displayed area?"
+msgstr "¬O§_¶i¦æ¦Û°Ê´«¦æ¨Ó²Å¦Xµe­±¤Ø¤o¡H"
+
+#: src/GridText.c:12633
+msgid "Very long lines have been wrapped!"
+msgstr ""
+
+#: src/GridText.c:13079
+msgid "Very long lines have been truncated!"
+msgstr ""
+
+#: src/HTAlert.c:154 src/LYShowInfo.c:318
+msgid "bytes"
+msgstr "¦ì¤¸²Õ"
+
+#: src/HTAlert.c:155
+msgid "KB"
+msgstr "KB"
+
+#: src/HTAlert.c:274
+#, c-format
+msgid "Read %s of %s of data"
+msgstr "¤wŪ¨ú %s (Á`¼Æ %s) ¸ê®Æ"
+
+#: src/HTAlert.c:276
+#, c-format
+msgid "Read %s of data"
+msgstr "¤wŪ¨ú %s ¸ê®Æ"
+
+#: src/HTAlert.c:281
+#, c-format
+msgid ", %s/sec"
+msgstr "¡A¨C¬í %s"
+
+#: src/HTAlert.c:290
+#, c-format
+msgid " (stalled for %s)"
+msgstr " (°±¤î¤F %s)"
+
+#: src/HTAlert.c:294
+#, c-format
+msgid ", ETA %s"
+msgstr "¡A¦ô­p %s «á§¹¦¨"
+
+#: src/HTAlert.c:301
+msgid " (Press 'z' to abort)"
+msgstr " (½Ð«ö¡¥z¡¦¤¤¤î)"
+
+#. 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:342 src/HTAlert.c:390
+msgid "yes"
+msgstr "yes"
+
+#: src/HTAlert.c:345 src/HTAlert.c:391
+msgid "no"
+msgstr "no"
+
+# Lynx is very bad, have to use space for indentation..... -- Abel
+#: src/HTML.c:5985
+msgid "Description:"
+msgstr "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;´y­z¡G"
+
+#: src/HTML.c:5990
+msgid "(none)"
+msgstr "(µL)"
+
+#: src/HTML.c:5994
+msgid "Filepath:"
+msgstr "Àɮ׸ô®|¡G"
+
+#: src/HTML.c:5999
+msgid "(unknown)"
+msgstr "(¤£©ú)"
+
+#: src/HTML.c:7452
+msgid "Document has only hidden links.  Use the 'l'ist command."
+msgstr ""
+
+#: src/HTML.c:7958
+msgid "Source cache error - disk full?"
+msgstr ""
+
+#: src/HTML.c:7971
+msgid "Source cache error - not enough memory!"
+msgstr ""
+
+#: src/LYBookmark.c:167
+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 ""
+
+#: src/LYBookmark.c:379
+msgid ""
+"     You can delete links by the 'R' key<br>\n"
+"<ol>\n"
+msgstr ""
+"     ¥i¥H¥Î¡¥R¡¦Áä§R°£Ãìµ²<br>\n"
+"<ol>\n"
+
+#: src/LYBookmark.c:382
+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 ""
+"     »Õ¤U¥i¥H¨Ï¥Î²¾°£®ÑÅÒªº«ü¥O¨Ó§R°£Ãìµ²¡C³q±`¬O¥Î¡¥R¡¦Áä¡A¦ý»Õ¤U©ÎºÞ²z­û¤]\n"
+"     ¦³¥i¯à·|±N¤§­«·s©w¸q¬°¨ä¥¦«öÁä¡C"
+
+#: src/LYBookmark.c:386
+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 ""
+"     ¦¹Àɮפ]¥i¥H¨Ï¥Î¤@¯ëªº¤å¦r½s¿è¾¹½s¿è¡A§R°£¹L®É©ÎµL®ÄªºÃìµ²¡A©Î§ó§ï\n"
+"     ¥¦­Ìªº¦¸§Ç¡C"
+
+#: src/LYBookmark.c:389
+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 ""
+
+#: src/LYBookmark.c:681
+#, c-format
+msgid "File may be recoverable from %s during this session"
+msgstr ""
+
+#.
+#. *  Neither the path as given nor any components examined by
+#. *  backing up were stat()able. - kw
+#.
+#: src/LYCgi.c:231
+msgid "Unable to access cgi script"
+msgstr "µLªk¦s¨ú cgi script¡C"
+
+#: src/LYCgi.c:654 src/LYCgi.c:657
+msgid "Good Advice"
+msgstr "«Øij"
+
+#: src/LYCgi.c:660
+msgid "An excellent http server for VMS is available via"
+msgstr ""
+
+#: src/LYCgi.c:667
+msgid "this link"
+msgstr ""
+
+#: src/LYCgi.c:671
+msgid "It provides state of the art CGI script support.\n"
+msgstr ""
+
+#: src/LYClean.c:122
+msgid "Exiting via interrupt:"
+msgstr "¦]¥H¤Uªº¤¤Â_°T¸¹¦ÓÂ÷¶}µ{¦¡¡G"
+
+#: src/LYCookie.c:2462
+msgid "(from a previous session)"
+msgstr ""
+
+#: src/LYCookie.c:2522
+msgid "Maximum Gobble Date:"
+msgstr ""
+
+#: src/LYCookie.c:2564
+msgid "Internal"
+msgstr "¤º³¡"
+
+#: src/LYCookie.c:2565
+msgid "cookie_domain_flag_set error, aborting program"
+msgstr "cookie_domain_flag_set ¿ù»~¡A¤¤¤îµ{¦¡"
+
+#: src/LYCurses.c:1004
+msgid "Terminal initialisation failed - unknown terminal type?"
+msgstr "µLªkªì©l¤Æ²×ºÝ¾÷ ¢w ²×ºÝ¾÷Ãþ«¬¤£¸Ô¡H"
+
+#: src/LYCurses.c:1426
+msgid "Terminal ="
+msgstr "²×ºÝ¾÷Ãþ«¬ ="
+
+#: src/LYCurses.c:1430
+msgid "You must use a vt100, 200, etc. terminal with this program."
+msgstr "¨Ï¥Î¥»µ{¦¡®É²×ºÝ¾÷ªºÃþ«¬¥²¶·¬O vt100¡B200 µ¥µ¥¡C"
+
+#: src/LYCurses.c:1480
+msgid "Your Terminal type is unknown!"
+msgstr "²×ºÝ¾÷Ãþ«¬¤£©ú¡I"
+
+#: src/LYCurses.c:1481
+msgid "Enter a terminal type:"
+msgstr "½Ð¿é¤J²×ºÝ¾÷Ãþ«¬¡G"
+
+#: src/LYCurses.c:1495
+msgid "TERMINAL TYPE IS SET TO"
+msgstr "²×ºÝ¾÷Ãþ«¬¤w³]©w¬°"
+
+#: src/LYCurses.c:1994
+#, c-format
+msgid ""
+"\n"
+"A Fatal error has occurred in %s Ver. %s\n"
+msgstr ""
+"\n"
+"¦b %s ª©¥» %s ¥X²{ÄY­«¿ù»~\n"
+
+#: src/LYCurses.c:1996
+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"
+"½Ð³qª¾¨t²ÎºÞ²z­û½T»{µ{¦¡¬O§_¥X²{¿ù»~¡A¦pªGµª®×¬OªÖ©wªº¡A½Ð±N³ø§i\n"
+"±Hµ¹ lynx-dev ¹q¶l½×¾Â¡C¿ù»~³ø§i¤¤À³¸Óªþ¤W¤Þ­P°ÝÃD¥X²{ªº«ü¥O¤Î/©Î\n"
+"URL ªº·Ç½T´y­z¡B§@·~¨t²Î¤Î¨äª©¥»¡BTCPIP ª©¥»¡B¿ù»~ªº°lÂܬö¿ý (¦pªG\n"
+"¥i¥HÀò¨úªº¸Ü)¡A¤Î¨ä¥¦¬ÛÃö¸ê°T¡C\n"
+
+#: src/LYEdit.c:249
+msgid "Editor killed by signal"
+msgstr "½s¿è¾¹¦]°T¸¹¦Ó¤¤¤î"
+
+#: src/LYEdit.c:251
+#, c-format
+msgid "Editor returned with error status, %s"
+msgstr "½s¿è¾¹ªº¦^¶Ç¿ù»~ª¬ºA¡A%s"
+
+#: src/LYEdit.c:252
+msgid "reason unknown."
+msgstr "­ì¦]¤£¸Ô¡C"
+
+#: src/LYDownload.c:517
+msgid "Downloaded link:"
+msgstr "¤w¤U¸üªºÃìµ²¡G"
+
+#: src/LYDownload.c:522
+msgid "Suggested file name:"
+msgstr "«ØijªºÀɮצWºÙ¡G"
+
+#: src/LYDownload.c:527
+msgid "Standard download options:"
+msgstr "¼Ð·Çªº¤U¸ü³B²z¤è¦¡¡G"
+
+#: src/LYDownload.c:528
+msgid "Download options:"
+msgstr "¤U¸ü¿ï¶µ¡G"
+
+#: src/LYDownload.c:544
+msgid "Save to disk"
+msgstr "Àx¦s¦ÜºÏºÐ"
+
+#: src/LYDownload.c:558
+#, fuzzy
+msgid "View temporary file"
+msgstr "µLªk¶}±Ò¼È¦sÀÉ¡I"
+
+#: src/LYDownload.c:565
+msgid "Save to disk disabled."
+msgstr "¸T¤î±N¤º®eÀx¦s¦ÜºÏºÐ¡C"
+
+#: src/LYDownload.c:569 src/LYPrint.c:1327
+msgid "Local additions:"
+msgstr "ÃB¥~ªº³B²z¤è¦¡¡G"
+
+#: src/LYDownload.c:578 src/LYUpload.c:216
+msgid "No Name Given"
+msgstr "¥¼«ü©w¦WºÙ"
+
+#: src/LYHistory.c:657
+msgid "You selected:"
+msgstr "½Ð¿ï¾Ü¡G"
+
+#: src/LYHistory.c:681 src/LYHistory.c:921
+msgid "(no address)"
+msgstr ""
+
+#: src/LYHistory.c:685
+msgid " (internal)"
+msgstr ""
+
+#: src/LYHistory.c:687
+msgid " (was internal)"
+msgstr ""
+
+#: src/LYHistory.c:785
+msgid " (From History)"
+msgstr ""
+
+#: src/LYHistory.c:841
+msgid "You visited (POSTs, bookmark, menu and list files excluded):"
+msgstr ""
+
+#: src/LYHistory.c:1137
+msgid "(No messages yet)"
+msgstr ""
+
+#: src/LYLeaks.c:209
+msgid "Invalid pointer detected."
+msgstr ""
+
+#: src/LYLeaks.c:211 src/LYLeaks.c:251
+msgid "Sequence:"
+msgstr ""
+
+#: src/LYLeaks.c:214 src/LYLeaks.c:254
+msgid "Pointer:"
+msgstr "Pointer¡G"
+
+#: src/LYLeaks.c:225 src/LYLeaks.c:232 src/LYLeaks.c:273
+msgid "FileName:"
+msgstr "ÀɮצWºÙ¡G"
+
+#: src/LYLeaks.c:228 src/LYLeaks.c:235 src/LYLeaks.c:276 src/LYLeaks.c:287
+msgid "LineCount:"
+msgstr "¦æ¼Æ¡G"
+
+#: src/LYLeaks.c:249
+msgid "Memory leak detected."
+msgstr ""
+
+#: src/LYLeaks.c:257
+msgid "Contains:"
+msgstr ""
+
+#: src/LYLeaks.c:270
+msgid "ByteSize:"
+msgstr ""
+
+#: src/LYLeaks.c:284
+msgid "realloced:"
+msgstr ""
+
+#: src/LYLeaks.c:307
+msgid "Total memory leakage this run:"
+msgstr ""
+
+#: src/LYLeaks.c:310
+msgid "Peak allocation"
+msgstr ""
+
+#: src/LYLeaks.c:311
+msgid "Bytes allocated"
+msgstr ""
+
+#: src/LYLeaks.c:312
+msgid "Total mallocs"
+msgstr ""
+
+#: src/LYLeaks.c:313
+msgid "Total frees"
+msgstr ""
+
+#: src/LYList.c:85
+msgid "References in "
+msgstr "¥H¤UªºÃìµ²ÄÝ©óºô­¶¡G"
+
+#: src/LYList.c:86
+msgid "this document:"
+msgstr "(¦a§}¤£©ú)"
+
+#: src/LYList.c:92
+msgid "Visible links:"
+msgstr "¤£ÁôÂêºÃìµ²¡G"
+
+#: src/LYList.c:194 src/LYList.c:315
+msgid "Hidden links:"
+msgstr "ÁôÂêºÃìµ²¡G"
+
+#: src/LYList.c:262
+msgid "References"
+msgstr ""
+
+#: src/LYList.c:264
+msgid "Visible links"
+msgstr "¤£ÁôÂêºÃìµ²"
+
+#: src/LYLocal.c:267
+#, c-format
+msgid "Unable to get status of '%s'."
+msgstr "µLªkÀò¨ú¡¥%s¡¦ªºª¬ºA¡C"
+
+#: src/LYLocal.c:301
+msgid "The selected item is not a file or a directory!  Request ignored."
+msgstr "¿ï¨úªº¶µ¥Ø¤£¬OÀɮשΥؿý¡I©¿²¤¸Ó­n¨D¡C"
+
+#: src/LYLocal.c:366
+#, c-format
+msgid "Unable to %s due to system error!"
+msgstr "¦]¬°¨t²Î¿ù»~¦ÓµLªk%s¡I"
+
+#. error return
+#: src/LYLocal.c:400
+#, c-format
+msgid "Probable failure to %s due to system error!"
+msgstr "¥i¯à¦]¬°¨t²Î¿ù»~¦ÓµLªk%s¡I"
+
+#: src/LYLocal.c:463
+#, c-format
+msgid "remove %s"
+msgstr "²¾°£ %s"
+
+#: src/LYLocal.c:481
+#, c-format
+msgid "touch %s"
+msgstr ""
+
+#: src/LYLocal.c:508
+#, c-format
+msgid "move %s to %s"
+msgstr "±N %s ²¾°Ê¦Ü %s"
+
+#: src/LYLocal.c:548
+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:550
+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:552
+msgid "The specified name is already in use!  Request ignored."
+msgstr "«ü©wªºÀɮפw¦b¨Ï¥Î¤¤¡I©¿²¤¸Ó­n¨D¡C"
+
+#: src/LYLocal.c:563
+msgid "Destination has different owner!  Request denied."
+msgstr "¥Øªº¦aªº¾Ö¦³ªÌ¤£¦P¡I©Úµ´¸Ó­n¨D¡C"
+
+#: src/LYLocal.c:566
+msgid "Destination is not a valid directory!  Request denied."
+msgstr "¥Øªº¦a¤£¬O¦³®Äªº¥Ø¿ý¡I©Úµ´¸Ó­n¨D¡C"
+
+#: src/LYLocal.c:588
+msgid "Remove all tagged files and directories?"
+msgstr "½T©w²¾°£©Ò¦³¥[¤W¼Ð°OªºÀɮפΥؿý¡H"
+
+#: src/LYLocal.c:647
+msgid "Enter new location for tagged items: "
+msgstr "¿é¤J¥[¤W¼Ð°Oªº¶µ¥Øªº·s¦ì¸m¡G"
+
+#: src/LYLocal.c:716
+msgid "Path too long"
+msgstr "¸ô®|¹Lªø"
+
+#: src/LYLocal.c:747
+msgid "Source and destination are the same location - request ignored!"
+msgstr "¨Ó·½¤Î¥Øªº¦a¦ì¸m¬Û¦P ¢w ©¿²¤¸Ó­n¨D¡I"
+
+#: src/LYLocal.c:805
+msgid "Enter new name for directory: "
+msgstr "¿é¤J¥Ø¿ýªº·s¦WºÙ¡G"
+
+#: src/LYLocal.c:807
+msgid "Enter new name for file: "
+msgstr "¿é¤JÀɮתº·s¦WºÙ¡G"
+
+#: src/LYLocal.c:819
+msgid "Illegal character (path-separator) found! Request ignored."
+msgstr "¥X²{¤£¦Xªkªº¦r¤¸ (¸ô®|¤À¹j¦r¤¸)¡I©¿²¤¸Ó­n¨D¡C"
+
+#: src/LYLocal.c:868
+msgid "Enter new location for directory: "
+msgstr "¿é¤J¥Ø¿ýªº·s¦ì¸m¡G"
+
+#: src/LYLocal.c:874
+msgid "Enter new location for file: "
+msgstr "¿é¤JÀɮתº·s¦ì¸m¡G"
+
+#: src/LYLocal.c:901
+msgid "Unexpected failure - unable to find trailing path separator"
+msgstr ""
+
+#: src/LYLocal.c:921
+msgid "Source and destination are the same location!  Request ignored!"
+msgstr "¨Ó·½¤Î¥Øªº¦a¦ì¸m¬Û¦P¡I©¿²¤¸Ó­n¨D¡I"
+
+#: src/LYLocal.c:970
+msgid "Modify name, location, or permission (n, l, or p): "
+msgstr "­×§ï¦WºÙ¡B¦ì¸m©ÎÅv­­ (n¡Bl ©Î p)¡G"
+
+#: src/LYLocal.c:972
+msgid "Modify name or location (n or l): "
+msgstr "­×§ï¦WºÙ©Î¦ì¸m (n ©Î l)¡G"
+
+#.
+#. *	Code for changing ownership needed here.
+#.
+#: src/LYLocal.c:1001
+msgid "This feature not yet implemented!"
+msgstr "¦¹¥\¯à¤´¥¼§¹¦¨¡I"
+
+#: src/LYLocal.c:1019
+msgid "Enter name of file to create: "
+msgstr "¿é¤J·Ç³Æ«Ø¥ßªºÀɮצWºÙ¡G"
+
+#: src/LYLocal.c:1027 src/LYLocal.c:1069
+msgid "Illegal redirection \"//\" found! Request ignored."
+msgstr "¥X²{¤£¦Xªkªº­«·s¾É¦V \"//\"¡I©¿²¤¸Ó­n¨D¡C"
+
+#: src/LYLocal.c:1061
+msgid "Enter name for new directory: "
+msgstr "¿é¤J·s¥Ø¿ýªº¦WºÙ¡G"
+
+#: src/LYLocal.c:1106
+msgid "Create file or directory (f or d): "
+msgstr "«Ø¥ßÀɮשΥؿý (f ©Î d)¡G"
+
+#: src/LYLocal.c:1146
+#, c-format
+msgid "Remove '%s' and all of its contents?"
+msgstr "²¾°£¡¥%s¡¦¤Î¨ä¤¤©Ò¦³ªº¤º®e¡H"
+
+#: src/LYLocal.c:1149
+msgid "Remove directory and all of its contents?"
+msgstr "²¾°£¸Ó¥Ø¿ý¤Î¨ä¤¤©Ò¦³ªº¤º®e¡H"
+
+#: src/LYLocal.c:1153
+#, c-format
+msgid "Remove file '%s'?"
+msgstr "¬O§_²¾°£Àɮס¥%s¡¦¡H"
+
+#: src/LYLocal.c:1155
+msgid "Remove file?"
+msgstr "¬O§_²¾°£ÀɮסH"
+
+#: src/LYLocal.c:1160
+#, c-format
+msgid "Remove symbolic link '%s'?"
+msgstr "¬O§_²¾°£²Å¸¹³sµ²¡¥%s¡¦¡H"
+
+#: src/LYLocal.c:1162
+msgid "Remove symbolic link?"
+msgstr "¬O§_²¾°£²Å¸¹³sµ²¡H"
+
+#: src/LYLocal.c:1248
+msgid "Sorry, don't know how to permit non-UNIX files yet."
+msgstr ""
+
+#: src/LYLocal.c:1278
+msgid "Unable to open permit options file"
+msgstr ""
+
+#: src/LYLocal.c:1305
+msgid "Specify permissions below:"
+msgstr "½Ð«ü©w¥H¤UªºÅv­­¡G"
+
+#: src/LYLocal.c:1306 src/LYShowInfo.c:196
+msgid "Owner:"
+msgstr "¾Ö¦³ªÌ¡G"
+
+#: src/LYLocal.c:1322
+msgid "Group"
+msgstr "©ÒÄݸs²Õ"
+
+#: src/LYLocal.c:1338
+msgid "Others:"
+msgstr "¨ä¥¦¡G"
+
+#: src/LYLocal.c:1356
+msgid "form to permit"
+msgstr ""
+
+#: src/LYLocal.c:1452
+msgid "Invalid mode format."
+msgstr ""
+
+#: src/LYLocal.c:1456
+msgid "Invalid syntax format."
+msgstr "µL®Äªº»yªk®æ¦¡¡C"
+
+#: src/LYLocal.c:1645
+msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
+msgstr "ĵ§i¡I¤w¸g UUDecode ªºÀÉ®×·|©ñ¦b°õ¦æ Lynx ®Éªº¥Ø¿ý¡C"
+
+#: src/LYLocal.c:1825
+msgid "NULL URL pointer"
+msgstr ""
+
+#: src/LYLocal.c:1908
+#, c-format
+msgid "Executing %s "
+msgstr "¥¿¦b°õ¦æ %s "
+
+#: src/LYLocal.c:1911
+msgid "Executing system command. This might take a while."
+msgstr "¥¿¦b°õ¦æ¨t²Î«ü¥O¡C¥i¯à»Ý­nµyµ¥¤@¬q®É¶¡¡C"
+
+#: src/LYLocal.c:1985
+msgid "Current directory:"
+msgstr "¥Ø«eªº¥Ø¿ý¡G"
+
+#: src/LYLocal.c:1988 src/LYLocal.c:2006
+msgid "Current selection:"
+msgstr "¥Ø«e¿ï¾Üªº¶µ¥Ø¡G"
+
+#: src/LYLocal.c:1992
+msgid "Nothing currently selected."
+msgstr "¥¼¿ï¨ú¥ô¦ó¶µ¥Ø¡C"
+
+#: src/LYLocal.c:2007
+msgid "tagged item:"
+msgstr "­Ó¥[¤W¼Ð°Oªº¶µ¥Ø¡G"
+
+#: src/LYLocal.c:2007
+msgid "tagged items:"
+msgstr "­Ó¥[¤W¼Ð°Oªº¶µ¥Ø¡G"
+
+#: src/LYLocal.c:2105 src/LYLocal.c:2116
+msgid "Illegal filename; request ignored."
+msgstr "¤£¦XªkªºÀɮצWºÙ¡F©¿²¤¸Ó­n¨D¡C"
+
+#. directory not writable
+#: src/LYLocal.c:2213 src/LYLocal.c:2271
+msgid "Install in the selected directory not permitted."
+msgstr ""
+
+#: src/LYLocal.c:2267
+msgid "The selected item is not a directory!  Request ignored."
+msgstr "¿ï¨úªº¶µ¥Ø¤£¬O¥Ø¿ý¡I©¿²¤¸Ó­n¨D¡C"
+
+#: src/LYLocal.c:2276
+msgid "Just a moment, ..."
+msgstr "½Ðµyµ¥¡A..."
+
+#: src/LYLocal.c:2293
+msgid "Error buiding install args"
+msgstr ""
+
+#: src/LYLocal.c:2308 src/LYLocal.c:2337
+#, c-format
+msgid "Source and target are the same: %s"
+msgstr "¨Ó·½¤Î¥Øªº¦a¬Û¦P¡G%s"
+
+#: src/LYLocal.c:2315 src/LYLocal.c:2344
+#, c-format
+msgid "Already in target directory: %s"
+msgstr ""
+
+#: src/LYLocal.c:2362
+msgid "Installation complete"
+msgstr "¦w¸Ë§¹¦¨"
+
+#: src/LYLocal.c:2551
+msgid "Temporary URL or list would be too long."
+msgstr ""
+
+#: src/LYMail.c:534
+msgid "Sending"
+msgstr ""
+
+#: src/LYMail.c:1024
+#, c-format
+msgid "The link   %s :?: %s \n"
+msgstr ""
+
+#: src/LYMail.c:1026
+#, c-format
+msgid "called \"%s\"\n"
+msgstr ""
+
+#: src/LYMail.c:1027
+#, c-format
+msgid "in the file \"%s\" called \"%s\"\n"
+msgstr ""
+
+#: src/LYMail.c:1028
+msgid "was requested but was not available."
+msgstr ""
+
+#: src/LYMail.c:1029
+msgid "Thought you might want to know."
+msgstr ""
+
+#: src/LYMail.c:1031
+msgid "This message was automatically generated by"
+msgstr ""
+
+#: src/LYMail.c:1753
+msgid "No system mailer configured"
+msgstr ""
+
+#: src/LYMain.c:969
+msgid "No Winsock found, sorry."
+msgstr "§ä¤£¨ì Winsock¡A©êºp¡C"
+
+#: src/LYMain.c:1170
+msgid "You MUST define a valid TMP or TEMP area!\n"
+msgstr "»Õ¤U *¥²¶·* «ü©w¦³®Äªº TMP ©Î TEMP ¦ì¸m¡I\n"
+
+#: src/LYMain.c:1224 src/LYMainLoop.c:5028
+msgid "No such directory"
+msgstr "¸Ó¥Ø¿ý¤£¦s¦b"
+
+#: src/LYMain.c:1436
+#, c-format
+msgid ""
+"\n"
+"Configuration file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"³]©wÀÉ %s ¤£¦s¦b¡C\n"
+"\n"
+
+#: src/LYMain.c:1446
+msgid ""
+"\n"
+"Lynx character sets not declared.\n"
+"\n"
+msgstr ""
+"\n"
+"¥¼«Å§i Lynx ©Ò¥Îªº¦r¤¸¶°¡C\n"
+"\n"
+
+#: src/LYMain.c:1475
+msgid ""
+"\n"
+"Lynx edit map not declared.\n"
+"\n"
+msgstr ""
+
+#: src/LYMain.c:1504
+#, c-format
+msgid ""
+"\n"
+"Lynx file %s is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"Lynx ÀÉ®× %s ¤£¦s¦b¡C\n"
+"\n"
+
+#: src/LYMain.c:1743
+msgid "Warning:"
+msgstr "ĵ§i¡G"
+
+#: src/LYMain.c:2293
+msgid "persistent cookies state will be changed in next session only."
+msgstr ""
+
+#: src/LYMain.c:2540 src/LYMain.c:2588
+#, c-format
+msgid "Lynx: ignoring unrecognized charset=%s\n"
+msgstr "Lynx¡G©¿²¤µLªkÃѧOªº¦r¤¸¶° %s\n"
+
+#: src/LYMain.c:3120
+#, fuzzy, c-format
+msgid "%s Version %s (%s)"
+msgstr "%s ª©¥» %s (%s)\n"
+
+#: src/LYMain.c:3143
+#, c-format
+msgid "Built on %s %s %s\n"
+msgstr "½sĶ©ó %s %s %s\n"
+
+#: src/LYMain.c:3166
+msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+msgstr "ª©Åv©Ò¦³¡GUniversity of Kansas¡BCERN ¤Î¨ä¥¦¦³°^ÄmªÌ¡C\n"
+
+#: src/LYMain.c:3168
+msgid "Distributed under the GNU General Public License.\n"
+msgstr "¨Ï¥Î GNU General Public License µo§G¡C\n"
+
+#: src/LYMain.c:3170
+msgid ""
+"See http://lynx.isc.org/ and the online help for more information.\n"
+"\n"
+msgstr ""
+"­Y»Ý­n§ó¦h¸ê®Æ¡A½ÐÂsÄý http://lynx.isc.org/ ¤Îºô¤Wªº»¡©ú¤å¥ó¡C\n"
+"\n"
+
+#: src/LYMain.c:3919
+#, c-format
+msgid "USAGE: %s [options] [file]\n"
+msgstr "¥Îªk¡G%s [¿ï¶µ] [ÀÉ®×]\n"
+
+#: src/LYMain.c:3920
+msgid "Options are:\n"
+msgstr "¿ï¶µ¥]¬A¡G\n"
+
+#: src/LYMain.c:4191
+#, c-format
+msgid "%s: Invalid Option: %s\n"
+msgstr "%s¡GµL®Äªº¿ï¶µ¡G%s\n"
+
+#: src/LYMainLoop.c:539
+#, c-format
+msgid "Internal error: Invalid mouse link %d!"
+msgstr ""
+
+#.
+#. * Make a name for this new URL.
+#.
+#: src/LYMainLoop.c:653 src/LYMainLoop.c:5050
+msgid "A URL specified by the user"
+msgstr "¥Ñ¨Ï¥ÎªÌ«ü©wªº URL"
+
+#: src/LYMainLoop.c:1110
+msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
+msgstr ""
+
+#.
+#. *  Make a name for this help file.
+#.
+#: src/LYMainLoop.c:3053
+msgid "Help Screen"
+msgstr "¨D§U»¡©úµe­±"
+
+#: src/LYMainLoop.c:3177
+msgid "System Index"
+msgstr ""
+
+#: src/LYMainLoop.c:3549 src/LYMainLoop.c:5270
+msgid "Entry into main screen"
+msgstr ""
+
+#: src/LYMainLoop.c:3824
+msgid "No next document present"
+msgstr ""
+
+#: src/LYMainLoop.c:4131
+msgid "charset for this document specified explicitly, sorry..."
+msgstr "©êºp¡A¸Ó¤å¥ó¤w¸g¯S¦a«ü©w¤F¦r¤¸¶°..."
+
+#: src/LYMainLoop.c:5004
+msgid "cd to:"
+msgstr "·Ç³Æ¶i¤Jªº¥Ø¿ý¡G"
+
+#: src/LYMainLoop.c:5031
+msgid "A component of path is not a directory"
+msgstr "¸ô®|¤¤ªº¤@³¡¥÷¤£¬O¥Ø¿ý"
+
+#: src/LYMainLoop.c:5034
+msgid "failed to change directory"
+msgstr "µLªk¶i¤J¥Ø¿ý"
+
+#: src/LYMainLoop.c:6204
+msgid "Reparsing document under current settings..."
+msgstr "®Ú¾Ú¥Ø«eªº³]©w­«·s¤ÀªR¤å¥ó..."
+
+#: src/LYMainLoop.c:6489 src/LYMainLoop.c:6493
+#, c-format
+msgid "Fatal error - could not open output file %s\n"
+msgstr "ÄY­«¿ù»~ ¢w µLªk¶}±Ò¿é¥XÀÉ %s\n"
+
+#: src/LYMainLoop.c:6834
+msgid "TABLE center enable."
+msgstr ""
+
+#: src/LYMainLoop.c:6837
+msgid "TABLE center disable."
+msgstr ""
+
+#: src/LYMainLoop.c:6914
+#, fuzzy
+msgid "Current URL is empty."
+msgstr "¥Ø«eªº¥Ø¿ý¡G"
+
+#: src/LYMainLoop.c:6916 src/LYUtils.c:1688
+msgid "Copy to clipboard failed."
+msgstr ""
+
+#: src/LYMainLoop.c:6918
+msgid "Document URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6920
+msgid "Link URL put to clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:6946
+msgid "No URL in the clipboard."
+msgstr ""
+
+#: src/LYMainLoop.c:7621 src/LYMainLoop.c:7794
+msgid "-index-"
+msgstr "¢w¯Á¤Þ¢w"
+
+#: src/LYMainLoop.c:7731
+msgid "lynx: Can't access startfile"
+msgstr "lynx¡GµLªk¦s¨ú¶}©lªººô­¶"
+
+#: src/LYMainLoop.c:7744
+msgid "lynx: Start file could not be found or is not text/html or text/plain"
+msgstr ""
+
+#: src/LYMainLoop.c:7745
+msgid "      Exiting..."
+msgstr "      ·Ç³ÆÂ÷¶}..."
+
+#: src/LYMainLoop.c:7788
+msgid "-more-"
+msgstr "¢wÁÙ¦³¤º®e¢w"
+
+#. Enable scrolling.
+#: src/LYNews.c:187
+msgid "You will be posting to:"
+msgstr ""
+
+#.
+#. *  Get the mail address for the From header,
+#. *  offering personal_mail_address as default.
+#.
+#: src/LYNews.c:196
+msgid ""
+"\n"
+"\n"
+" Please provide your mail address for the From: header\n"
+msgstr ""
+"\n"
+"\n"
+" ½Ð¦b From: ¼ÐÀY¤¤´£¨Ñ»Õ¤Uªº¹q¶l¦a§}\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:214
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Subject: header\n"
+msgstr ""
+"\n"
+"\n"
+" ½Ð´£¨Ñ©Î­×§ï Subject: ¼ÐÀY\n"
+
+#: src/LYNews.c:303
+msgid ""
+"\n"
+"\n"
+" Please provide or edit the Organization: header\n"
+msgstr ""
+"\n"
+"\n"
+" ½Ð´£¨Ñ©Î­×§ï Organization: ¼ÐÀY\n"
+
+#.
+#. *  Use the built in line editior.
+#.
+#: src/LYNews.c:360
+msgid ""
+"\n"
+"\n"
+" Please enter your message below."
+msgstr ""
+"\n"
+"\n"
+" ½Ð¦b¥H¤Uªº¦ì¸m¿é¤J°T®§¡C"
+
+#: src/LYNews.c:406
+msgid "Message has no original text!"
+msgstr ""
+
+#: src/LYOptions.c:746
+msgid "review/edit B)ookmarks files"
+msgstr ""
+
+#: src/LYOptions.c:748
+msgid "B)ookmark file: "
+msgstr "B)®ÑÅÒÀÉ¡G"
+
+#: src/LYOptions.c:2547 src/LYOptions.c:2571
+#, c-format
+msgid "Use %s to invoke the Options menu!"
+msgstr ""
+
+#: src/LYOptions.c:3253
+msgid "(options marked with (!) will not be saved)"
+msgstr ""
+
+#: src/LYOptions.c:3261
+msgid "General Preferences"
+msgstr "¤@¯ë°¾¦n³]©w"
+
+#. ***************************************************************
+#. User Mode: SELECT
+#: src/LYOptions.c:3265
+msgid "User mode"
+msgstr "¨Ï¥ÎªÌ¼Ò¦¡"
+
+#. Editor: INPUT
+#: src/LYOptions.c:3271
+msgid "Editor"
+msgstr "½s¿è¾¹"
+
+#. Search Type: SELECT
+#: src/LYOptions.c:3276
+msgid "Type of Search"
+msgstr "·j´M¤è¦¡"
+
+#: src/LYOptions.c:3281
+msgid "Security and Privacy"
+msgstr ""
+
+#. ***************************************************************
+#. Cookies: SELECT
+#: src/LYOptions.c:3285
+msgid "Cookies"
+msgstr "Cookie"
+
+#. Cookie Prompting: SELECT
+#: src/LYOptions.c:3299
+msgid "Invalid-Cookie Prompting"
+msgstr ""
+
+#. SSL Prompting: SELECT
+#: src/LYOptions.c:3306
+msgid "SSL Prompting"
+msgstr ""
+
+#: src/LYOptions.c:3312
+msgid "Keyboard Input"
+msgstr "Áä½L¿é¤J"
+
+#. ***************************************************************
+#. Keypad Mode: SELECT
+#: src/LYOptions.c:3316
+msgid "Keypad mode"
+msgstr "¼Æ¦rÁä½L¼Ò¦¡"
+
+#. Emacs keys: ON/OFF
+#: src/LYOptions.c:3322
+msgid "Emacs keys"
+msgstr "Emacs ²Õ¦XÁä"
+
+#. VI Keys: ON/OFF
+#: src/LYOptions.c:3328
+msgid "VI keys"
+msgstr "VI ²Õ¦XÁä"
+
+#. Line edit style: SELECT
+#. well, at least 2 line edit styles available
+#: src/LYOptions.c:3335
+msgid "Line edit style"
+msgstr "¤å¦r½s¿è¼Ò¦¡"
+
+#. Keyboard layout: SELECT
+#: src/LYOptions.c:3347
+msgid "Keyboard layout"
+msgstr "Áä½L°t¸m"
+
+#.
+#. * Display and Character Set
+#.
+#: src/LYOptions.c:3360
+msgid "Display and Character Set"
+msgstr "Åã¥Ü¤Î¦r¤¸¶°"
+
+#. ***************************************************************
+#. Display Character Set: SELECT
+#: src/LYOptions.c:3364
+msgid "Display character set"
+msgstr "¹w³]Åã¥Üªº¦r¤¸¶°"
+
+#: src/LYOptions.c:3393
+msgid "Assumed document character set"
+msgstr "«á³Æªº¦r¤¸¶°"
+
+#.
+#. * 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:3413
+msgid "CJK mode"
+msgstr "CJK ¼Ò¦¡"
+
+#: src/LYOptions.c:3415
+msgid "Raw 8-bit"
+msgstr "8-bit ­ì©l¼Ò¦¡"
+
+#. X Display: INPUT
+#: src/LYOptions.c:3423
+msgid "X Display"
+msgstr "X µe­±"
+
+#.
+#. * Document Appearance
+#.
+#: src/LYOptions.c:3429
+msgid "Document Appearance"
+msgstr "¤å¥ó¥~Æ["
+
+#: src/LYOptions.c:3435
+msgid "Show color"
+msgstr "Åã¥Ü¦â±m"
+
+#. Show cursor: ON/OFF
+#: src/LYOptions.c:3459
+msgid "Show cursor"
+msgstr "Åã¥Ü´å¼Ð"
+
+#. Show scrollbar: ON/OFF
+#: src/LYOptions.c:3466
+msgid "Show scrollbar"
+msgstr "Åã¥Ü±²°Ê¦C"
+
+#. Select Popups: ON/OFF
+#: src/LYOptions.c:3473
+msgid "Popups for select fields"
+msgstr ""
+
+#. HTML error recovery: SELECT
+#: src/LYOptions.c:3479
+msgid "HTML error recovery"
+msgstr ""
+
+#. Show Images: SELECT
+#: src/LYOptions.c:3485
+msgid "Show images"
+msgstr "Åã¥Ü¹Ï¹³"
+
+#. Verbose Images: ON/OFF
+#: src/LYOptions.c:3499
+msgid "Verbose images"
+msgstr "¹Ï¹³¸Ô²Ó¸ê®Æ"
+
+#.
+#. * Headers Transferred to Remote Servers
+#.
+#: src/LYOptions.c:3507
+msgid "Headers Transferred to Remote Servers"
+msgstr "¶Ç°e¦Ü»·ºÝ¦øªA¾¹ªº¼ÐÀY¸ê®Æ"
+
+#. ***************************************************************
+#. Mail Address: INPUT
+#: src/LYOptions.c:3511
+msgid "Personal mail address"
+msgstr "­Ó¤H¹q¶l¦a§}"
+
+#. Preferred Document Character Set: INPUT
+#: src/LYOptions.c:3516
+msgid "Preferred document character set"
+msgstr "Àu¥ý¨Ï¥Îªº¦r¤¸¶°"
+
+#. Preferred Document Language: INPUT
+#: src/LYOptions.c:3521
+msgid "Preferred document language"
+msgstr "Àu¥ý¨Ï¥Îªº»y¨¥"
+
+#: src/LYOptions.c:3527
+msgid "User-Agent header"
+msgstr "User-Agent ¼ÐÀY"
+
+#.
+#. * Listing and Accessing Files
+#.
+#: src/LYOptions.c:3535
+msgid "Listing and Accessing Files"
+msgstr "¦C¥X¤Î¦s¨úÀÉ®×"
+
+#. ***************************************************************
+#. FTP sort: SELECT
+#: src/LYOptions.c:3539
+msgid "FTP sort criteria"
+msgstr "FTP ¶µ¥Ø±Æ§Ç±ø¥ó"
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3546
+msgid "Local directory sort criteria"
+msgstr "¥»¦aºÝ¥Ø¿ý±Æ§Ç±ø¥ó"
+
+#. Local Directory Order: SELECT
+#: src/LYOptions.c:3552
+msgid "Local directory sort order"
+msgstr "¥»¦aºÝ¥Ø¿ý±Æ¦C¦¸§Ç"
+
+#: src/LYOptions.c:3561
+msgid "Show dot files"
+msgstr "Åã¥ÜÁôÂÃÀÉ"
+
+#: src/LYOptions.c:3569
+msgid "Execution links"
+msgstr ""
+
+#. Local Directory Sort: SELECT
+#: src/LYOptions.c:3589
+msgid "Show transfer rate"
+msgstr "Åã¥Ü¶Ç¿é³t²v"
+
+#.
+#. * Special Files and Screens
+#.
+#: src/LYOptions.c:3598
+msgid "Special Files and Screens"
+msgstr "¯S®íÀɮפεe­±"
+
+#: src/LYOptions.c:3603
+msgid "Multi-bookmarks"
+msgstr "¦h®ÑÅÒÀɼҦ¡"
+
+#: src/LYOptions.c:3611
+msgid "Review/edit Bookmarks files"
+msgstr "¥iÂsÄý©Î½s¿è®ÑÅÒÀÉ"
+
+#: src/LYOptions.c:3613
+msgid "Goto multi-bookmark menu"
+msgstr "¶i¤J¦h®ÑÅÒÀɼҦ¡¿ï³æ"
+
+#: src/LYOptions.c:3615
+msgid "Bookmarks file"
+msgstr "®ÑÅÒÀÉ"
+
+#. Visited Pages: SELECT
+#: src/LYOptions.c:3621
+msgid "Visited Pages"
+msgstr "´¿¸gÂsÄýªººô­¶"
+
+#: src/LYOptions.c:3628
+msgid "View the file "
+msgstr ""
+
+#: src/LYPrint.c:952
+msgid " Print job complete.\n"
+msgstr " §¹¦¨¦C¦Lµ{§Ç¡C\n"
+
+#: src/LYPrint.c:1281
+msgid "Document:"
+msgstr "¤å¥ó¡G"
+
+#: src/LYPrint.c:1282
+msgid "Number of lines:"
+msgstr "¦æ¼Æ¡G"
+
+#: src/LYPrint.c:1283
+msgid "Number of pages:"
+msgstr "­¶¼Æ¡G"
+
+#: src/LYPrint.c:1284
+msgid "pages"
+msgstr "­¶"
+
+#: src/LYPrint.c:1284
+msgid "page"
+msgstr "­¶"
+
+#: src/LYPrint.c:1285
+msgid "(approximately)"
+msgstr "(²Ê²¤¦ô­p)"
+
+#: src/LYPrint.c:1290
+msgid "Some print functions have been disabled!"
+msgstr "¤w¸T¤î¨Ï¥Î¬Y³¡¥÷ªº¦C¦L¥\¯à¡I"
+
+#: src/LYPrint.c:1294
+msgid "Standard print options:"
+msgstr "¼Ð·Çªº¦C¦L³B²z¤è¦¡¡G"
+
+#: src/LYPrint.c:1295
+msgid "Print options:"
+msgstr "¦C¦L¿ï¶µ¡G"
+
+#: src/LYPrint.c:1302
+msgid "Save to a local file"
+msgstr "Àx¦s¦Ü¥»¾÷ªºÀÉ®×"
+
+#: src/LYPrint.c:1304
+msgid "Save to disk disabled"
+msgstr "¸T¤î±N¤º®eÀx¦s¦ÜºÏºÐ"
+
+#: src/LYPrint.c:1311
+msgid "Mail the file"
+msgstr "¶l±HÀÉ®×"
+
+#: src/LYPrint.c:1318
+msgid "Print to the screen"
+msgstr "¦bµe­±¦L¥X¸ê®Æ"
+
+#: src/LYPrint.c:1323
+msgid "Print out on a printer attached to your vt100 terminal"
+msgstr "¦b³s±µ vt100 ²×ºÝ¾÷ªº¦Lªí¾÷¦C¦L¸ê®Æ"
+
+#: src/LYReadCFG.c:339
+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 ""
+
+#: src/LYReadCFG.c:352
+msgid "Offending line:"
+msgstr ""
+
+#: src/LYReadCFG.c:638
+#, c-format
+msgid "key remapping of %s to %s for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:645
+#, c-format
+msgid "key remapping of %s to %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:666
+#, c-format
+msgid "invalid line-editor selection %s for key %s, selecting all\n"
+msgstr ""
+
+#: src/LYReadCFG.c:693 src/LYReadCFG.c:706
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:711
+#, c-format
+msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
+msgstr ""
+
+#: src/LYReadCFG.c:816
+#, c-format
+msgid "Lynx: cannot start, CERN rules file %s is not available\n"
+msgstr ""
+
+#: src/LYReadCFG.c:818
+msgid "(no name)"
+msgstr ""
+
+#: src/LYReadCFG.c:1782
+#, c-format
+msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
+msgstr ""
+
+#: src/LYReadCFG.c:1784
+#, c-format
+msgid "Last attempted include was '%s',\n"
+msgstr ""
+
+#: src/LYReadCFG.c:1785
+#, c-format
+msgid "included from '%s'.\n"
+msgstr ""
+
+#: src/LYReadCFG.c:2191 src/LYReadCFG.c:2204 src/LYReadCFG.c:2262
+msgid "The following is read from your lynx.cfg file."
+msgstr "¥H¤U¬O±q»Õ¤Uªº lynx.cfg ÀÉ®×Ū¨úªº³]©w¡C"
+
+#: src/LYReadCFG.c:2192 src/LYReadCFG.c:2205
+msgid "Please read the distribution"
+msgstr ""
+
+#: src/LYReadCFG.c:2198 src/LYReadCFG.c:2208
+msgid "for more comments."
+msgstr ""
+
+#: src/LYReadCFG.c:2244
+msgid "RELOAD THE CHANGES"
+msgstr "­«·s¸ü¤J§ó§ï«áªº³]©w"
+
+#: src/LYReadCFG.c:2253
+msgid "Your primary configuration"
+msgstr "¥D­n²ÕºA"
+
+#: src/LYShowInfo.c:129
+msgid "Directory that you are currently viewing"
+msgstr "¥Ø«eÂsÄýªº¥Ø¿ý"
+
+#: src/LYShowInfo.c:132
+msgid "Name:"
+msgstr "¦WºÙ¡G"
+
+#: src/LYShowInfo.c:135
+msgid "URL:"
+msgstr "&nbsp;URL¡G"
+
+#: src/LYShowInfo.c:146
+msgid "Directory that you have currently selected"
+msgstr "¥Ø«e¿ï¨úªº¥Ø¿ý"
+
+#: src/LYShowInfo.c:149
+msgid "File that you have currently selected"
+msgstr "¥Ø«e¿ï¨úªºÀÉ®×"
+
+#: src/LYShowInfo.c:153
+msgid "Symbolic link that you have currently selected"
+msgstr "¥Ø«e¿ï¨úªº²Å¸¹³sµ²"
+
+#: src/LYShowInfo.c:157
+msgid "Item that you have currently selected"
+msgstr "¥Ø«e¿ï¨úªº¶µ¥Ø"
+
+#: src/LYShowInfo.c:159
+msgid "Full name:"
+msgstr "§¹¾ã¦WºÙ¡G"
+
+#: src/LYShowInfo.c:168
+msgid "Unable to follow link"
+msgstr ""
+
+#: src/LYShowInfo.c:170
+msgid "Points to file:"
+msgstr ""
+
+#: src/LYShowInfo.c:175
+msgid "Name of owner:"
+msgstr "&nbsp;&nbsp;¾Ö¦³ªÌ¦WºÙ¡G"
+
+#: src/LYShowInfo.c:178
+msgid "Group name:"
+msgstr "&nbsp;¸s²Õ¦WºÙ¡G"
+
+#: src/LYShowInfo.c:181
+msgid "File size:"
+msgstr "Àɮפj¤p¡G"
+
+#: src/LYShowInfo.c:187
+msgid "Creation date:"
+msgstr "&nbsp;&nbsp;&nbsp;&nbsp;»s§@¤é´Á¡G"
+
+#: src/LYShowInfo.c:190
+msgid "Last modified:"
+msgstr "³Ì«á­×§ï®É¶¡¡G"
+
+#: src/LYShowInfo.c:193
+msgid "Last accessed:"
+msgstr "³Ì«á¦s¨ú®É¶¡¡G"
+
+#: src/LYShowInfo.c:195
+msgid "Access Permissions"
+msgstr "¦s¨úªºÅv­­"
+
+#: src/LYShowInfo.c:261
+msgid "File that you are currently viewing"
+msgstr "¥Ø«e¥¿¦bÂsÄýªºÀÉ®×"
+
+#: src/LYShowInfo.c:266 src/LYShowInfo.c:377
+msgid "Linkname:"
+msgstr "Ãìµ²¦WºÙ¡G"
+
+#: src/LYShowInfo.c:279 src/LYShowInfo.c:291
+msgid "Charset:"
+msgstr "&nbsp;¦r¤¸¶°¡G"
+
+#: src/LYShowInfo.c:297
+msgid "Server:"
+msgstr "¦øªA¾¹¡G"
+
+#: src/LYShowInfo.c:300
+msgid "Date:"
+msgstr "¤é´Á¡G"
+
+#: src/LYShowInfo.c:303
+msgid "Last Mod:"
+msgstr "³Ì«á­×§ï¡G"
+
+#: src/LYShowInfo.c:309
+msgid "&nbsp;Expires:"
+msgstr ""
+
+#: src/LYShowInfo.c:313
+msgid "Cache-Control:"
+msgstr ""
+
+#: src/LYShowInfo.c:317
+msgid "Content-Length:"
+msgstr ""
+
+#: src/LYShowInfo.c:322
+msgid "Language:"
+msgstr "»y¨¥¡G"
+
+#: src/LYShowInfo.c:329
+msgid "Post Data:"
+msgstr ""
+
+#: src/LYShowInfo.c:333
+msgid "Post Content Type:"
+msgstr ""
+
+#: src/LYShowInfo.c:342
+msgid "Owner(s):"
+msgstr "&nbsp;&nbsp;¾Ö¦³ªÌ¡G"
+
+#: src/LYShowInfo.c:345
+msgid "size:"
+msgstr "¤j¤p¡G"
+
+#: src/LYShowInfo.c:345
+msgid "lines"
+msgstr "¦æ"
+
+#: src/LYShowInfo.c:348
+msgid "mode:"
+msgstr "¼Ò¦¡¡G"
+
+#: src/LYShowInfo.c:350
+msgid "forms mode"
+msgstr ""
+
+#: src/LYShowInfo.c:352
+msgid "source"
+msgstr ""
+
+#: src/LYShowInfo.c:352
+msgid "normal"
+msgstr ""
+
+#: src/LYShowInfo.c:353
+msgid ", safe"
+msgstr ""
+
+#: src/LYShowInfo.c:354
+msgid ", via internal link"
+msgstr ""
+
+#: src/LYShowInfo.c:360
+msgid ", no-cache"
+msgstr ""
+
+#: src/LYShowInfo.c:362
+msgid ", ISMAP script"
+msgstr ""
+
+#: src/LYShowInfo.c:364
+msgid ", bookmark file"
+msgstr ""
+
+#: src/LYShowInfo.c:373
+msgid "Link that you currently have selected"
+msgstr "¥Ø«e¤w¿ï¨úªºÃìµ²"
+
+#: src/LYShowInfo.c:386
+msgid "Method:"
+msgstr ""
+
+#: src/LYShowInfo.c:391
+msgid "Enctype:"
+msgstr "½s½X¤è¦¡¡G"
+
+#: src/LYShowInfo.c:403
+msgid "(Form field)"
+msgstr ""
+
+#: src/LYShowInfo.c:418
+msgid "No Links on the current page"
+msgstr "¸Ó­¶­±¨S¦³¥ô¦óÃìµ²"
+
+#: src/LYStyle.c:278
+#, 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 ""
+
+#: src/LYTraversal.c:107
+msgid "here is a list of the history stack so that you may rebuild"
+msgstr ""
+
+#: src/LYUpload.c:78
+msgid "ERROR! - upload command is misconfigured"
+msgstr "¿ù»~¡I¢w ¥¼¦³¥¿½T¦a³]©w¥Î¨Ó¤W¶ÇÀɮתº«ü¥O"
+
+#: src/LYUpload.c:100
+msgid "Illegal redirection \"../\" found! Request ignored."
+msgstr "¥X²{¤£¦Xªkªº­«·s¾É¦V¡§../¡¨¡I©¿²¤¸Ó­n¨D¡C"
+
+#: src/LYUpload.c:103
+msgid "Illegal character \"/\" found! Request ignored."
+msgstr "¥X²{¤£¦Xªkªº¦r¤¸¡§/¡¨¡I©¿²¤¸Ó­n¨D¡C"
+
+#: src/LYUpload.c:106
+msgid "Illegal redirection using \"~\" found! Request ignored."
+msgstr "¥X²{¤£¦Xªk¦Ó¥B¨Ï¥Î¡§~¡¨ªº­«·s¾É¦V­n¨D¡I©¿²¤¸Ó­n¨D¡C"
+
+#: src/LYUpload.c:163
+msgid "Unable to upload file."
+msgstr "µLªk¤W¶ÇÀɮסC"
+
+#: src/LYUpload.c:206
+msgid "Upload To:"
+msgstr "¤W¶Ç¦Ü¡G"
+
+#: src/LYUpload.c:207
+msgid "Upload options:"
+msgstr "¤W¶Ç¿ï¶µ¡G"
+
+#: src/LYUtils.c:1690
+msgid "Download document URL put to clipboard."
+msgstr ""
+
+#: src/LYUtils.c:2468
+msgid "Unexpected access protocol for this URL scheme."
+msgstr ""
+
+#: src/LYUtils.c:3294
+msgid "Too many tempfiles"
+msgstr "¤Ó¦h¼È¦sÀÉ"
+
+#: src/LYUtils.c:3595
+msgid "unknown restriction"
+msgstr ""
+
+#: src/LYUtils.c:3626
+msgid "No restrictions set.\n"
+msgstr ""
+
+#: src/LYUtils.c:3629
+msgid "Restrictions set:\n"
+msgstr ""
+
+#: src/LYUtils.c:5034
+msgid "Cannot find HOME directory"
+msgstr "§ä¤£¨ì­Ó¤H¥Ø¿ý"
+
+#: src/LYrcFile.c:21
+msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
+msgstr "¤@¯ë¤£·|±Ò¥Î¡C½Ð°Ñ¦Ò lynx.cfg ¤¤ªº ENABLE_LYNXRC\n"
+
+#: src/LYrcFile.c:295
+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 ""
+
+#: src/LYrcFile.c:302
+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 ""
+
+#: src/LYrcFile.c:307
+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 ""
+
+#: src/LYrcFile.c:312
+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 ""
+
+#: src/LYrcFile.c:319
+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 ""
+
+#: src/LYrcFile.c:327
+msgid ""
+"cookie_file specifies the file from which to read persistent cookies.\n"
+"The default is ~/.lynx_cookies.\n"
+msgstr ""
+
+#: src/LYrcFile.c:332
+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 ""
+
+#: src/LYrcFile.c:346
+msgid ""
+"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
+"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
+msgstr ""
+
+#: src/LYrcFile.c:351
+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 ""
+
+#: src/LYrcFile.c:359
+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 ""
+"¦pªG±N emacs_keys ³]©w¬°¡§on¡¨¡A«h·|±Ò¥Î¤@¯ëªº EMACS ¤è¦V«öÁä¡G\n"
+"  ^N = ¤U²¾    ^P = ¤W²¾\n"
+"  ^B = ¥ª²¾    ^F = ¥k²¾\n"
+
+#: src/LYrcFile.c:365
+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 ""
+
+#: src/LYrcFile.c:371
+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 ""
+
+#: src/LYrcFile.c:389
+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 ""
+
+#: src/LYrcFile.c:404
+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 ""
+
+#: src/LYrcFile.c:410
+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 ""
+
+#: src/LYrcFile.c:419
+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 ""
+
+#: src/LYrcFile.c:433
+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 ""
+
+#: src/LYrcFile.c:442
+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 ""
+
+#: src/LYrcFile.c:453
+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 ""
+
+#: src/LYrcFile.c:471
+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 ""
+
+#: src/LYrcFile.c:481
+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 ""
+
+#: src/LYrcFile.c:498
+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 ""
+
+#: src/LYrcFile.c:509
+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 ""
+
+#: src/LYrcFile.c:520
+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 ""
+
+#: src/LYrcFile.c:533
+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 ""
+
+#: src/LYrcFile.c:542
+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 ""
+
+#: src/LYrcFile.c:547
+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 ""
+
+#: src/LYrcFile.c:555
+msgid ""
+"The visited_links setting controls how Lynx organizes the information\n"
+"in the Visited Links Page.\n"
+msgstr ""
+
+#: src/LYrcFile.c:772
+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 ""
+
+#: src/LYrcFile.c:781
+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 ""
+
+#: src/LYrcFile.c:785
+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 ""
+
+#: src/LYrcFile.c:794
+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 ""
+
+#: src/LYrcFile.c:827
+msgid ""
+"Lynx User Defaults File\n"
+"\n"
+"This file contains options saved from the Lynx Options Screen (normally\n"
+"with the '>' key).  There is normally no need to edit this file manually,\n"
+"since the defaults here can be controlled from the Options Screen, and the\n"
+"next time options are saved from the Options Screen this file will be\n"
+"completely rewritten.  You have been warned...\n"
+"If you are looking for the general configuration file - it is normally\n"
+"called lynx.cfg, and it has different content and a different format.\n"
+"It is not this file.\n"
+msgstr ""
+
+#~ msgid "Unable to open file management menu file."
+#~ msgstr "µLªk¶}±ÒÀɮ׺޲z¿ï³æÀɮסC"
diff --git a/gnu/usr.bin/lynx/samples/keepviewer b/gnu/usr.bin/lynx/samples/keepviewer
new file mode 100644
index 00000000000..f5c0b2c1703
--- /dev/null
+++ b/gnu/usr.bin/lynx/samples/keepviewer
@@ -0,0 +1,20 @@
+#!/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/gnu/usr.bin/lynx/samples/lynx.cfg b/gnu/usr.bin/lynx/samples/lynx.cfg
deleted file mode 100644
index cb4ab72378e..00000000000
--- a/gnu/usr.bin/lynx/samples/lynx.cfg
+++ /dev/null
@@ -1,2097 +0,0 @@
-# lynx.cfg file.
-# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
-#                                     or Lynx_Dir:lynx.cfg (VMS)
-#
-#
-# Definition pairs are of the form  VARIABLE:DEFINITION
-# NO spaces are allowed between the pair items.
-#
-#  If you do not have write access to /usr/local/bin you may change
-#  the default location of this file in the userdefs.h file and recompile,
-#  or specify its location on the command line with the "-cfg"
-#  command line option.
-#
-# Items may be commented out by putting a '#' as the FIRST char of the line
-#
-# All definitions must be flush left and have NO spaces.!!!
-
-# An HTML'ized description of all settings (based on comments in this file,
-# with alphabetical table of settings and with table of settings by category)
-# is available at http://www.hippo.ru/~hvv/lynxcfg_toc.html
-
-# Starting with Lynx 2.8.1, the lynx.cfg file has a crude "include"
-# facility.  This means that you can take advantage of the global lynx.cfg
-# while also supplying your own tweaks.
-#
-# You can use a command-line argument (-cfg /where/is/lynx.cfg) or an
-# environment variable (LYNX_CFG=/where/is/lynx.cfg).
-# For instance, put in your .profile or .login:
-#
-#   LYNX_CFG=~/lynx.cfg; export LYNX_CFG   # in .profile for sh/ksh/bash/etc.
-#   setenv LYNX_CFG ~/lynx.cfg             # in .login for [t]csh
-#
-# Then in ~/lynx.cfg:
-#
-#   INCLUDE:/usr/local/lib/lynx.cfg
-#           ^^^^^^^^^^^^^^^^^^^^^^^ or whatever is appropriate on your system
-# and now your own tweaks.
-#
-# Starting with Lynx 2.8.2, the INCLUDE facility is yet more powerful.  You can
-# suppress all but specific settings that will be read from included files. 
-# This allows sysadmins to provide users the ability to customize lynx with
-# options that normally do not affect security, such as COLOR, VIEWER, KEYMAP.
-#
-# The syntax is
-#
-#   INCLUDE:filename for <space-separated-list-of-allowed-settings>
-#
-# sample:
-#INCLUDE:~/lynx.cfg for COLOR VIEWER KEYMAP
-# only one space character should surround the word 'for'.  On Unix systems ':'
-# is also accepted as separator.  In that case, the example can be written as
-#INCLUDE:~/lynx.cfg:COLOR VIEWER KEYMAP
-# In the example, only the settings COLOR, VIEWER and KEYMAP are accepted by
-# lynx.  Other settings are ignored.  Note:  INCLUDE is also treated as a
-# setting, so to allow an included file to include other files, put INCLUDE in
-# the list of allowed settings.
-#
-# If you allow an included file to include other files, and if a list of
-# allowed settings is specified for that file with the INCLUDE command, nested
-# files are only allowed to include the list of settings that is the set AND of
-# settings allowed for the included file and settings allowed by nested INCLUDE
-# commands.  In short, there is no security hole introduced by including a
-# user-defined configuration file if the original list of allowed settings is
-# secure.
-
-# STARTFILE is the default starting URL if none is specified
-#   on the command line or via a WWW_HOME environment variable;
-#   Lynx will refuse to start without a starting URL of some kind.
-# STARTFILE can be remote, e.g. http://www.w3.org/default.html ,
-#                or local, e.g. file://localhost/PATH_TO/FILENAME ,
-#           where PATH_TO is replaced with the complete path to FILENAME
-#           using Unix shell syntax and including the device on VMS.
-#
-# Normally we expect you will connect to a remote site, e.g., the Lynx starting
-# site:
-STARTFILE:http://lynx.browser.org/
-#
-# As an alternative, you may want to use a local URL.  A good choice for this is
-# the user's home directory:
-#STARTFILE:file://localhost/~/
-#
-# Your choice of STARTFILE should reflect your site's needs, and be a URL that
-# you can connect to reliably.  Otherwise users will become confused and think
-# that they cannot run Lynx.
-
-# HELPFILE must be defined as a URL and must have a
-# complete path if local:
-# file://localhost/PATH_TO/lynx_help/lynx_help_main.html
-#   Replace PATH_TO with the path to the lynx_help subdirectory
-#   for this distribution (use SHELL syntax including the device
-#   on VMS systems).
-# The default HELPFILE is:
-# http://www.crl.com/~subir/lynx/lynx_help/lynx_help_main.html
-#   This should be changed to the local path.
-#
-HELPFILE:http://www.crl.com/~subir/lynx/lynx_help/lynx_help_main.html
-#HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
-
-# DEFAULT_INDEX_FILE is the default file retrieved when the
-# user presses the 'I' key when viewing any document.
-# An index to your CWIS can be placed here or a document containing
-# pointers to lots of interesting places on the web.
-#
-DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html
-
-# Set GOTOBUFFER to TRUE if you want to have the previous goto URL,
-# if any, offered for reuse or editing when using the 'g'oto command.
-# The default is defined in userdefs.h.  If left FALSE, the circular
-# buffer of previously entered goto URLs can still be invoked via the
-# Up-Arrow or Down-Arrow keys after entering the 'g'oto command.
-#
-#GOTOBUFFER:FALSE
-
-# JUMP_PROMPT is the default statusline prompt for selecting a jumps file
-# shortcut.  (see below).
-# You can change the prompt here from that defined in userdefs.h.  Any
-# trailing white space will be trimmed, and a single space is added by Lynx
-# following the last non-white character.  You must set the default prompt
-# before setting the default jumps file (below).  If a default jumps file
-# was set via userdefs.h, and you change the prompt here, you must set the
-# default jumps file again (below) for the change to be implemented.
-#
-#JUMP_PROMPT:Jump to (use '?' for list):
-
-# JUMPFILE is the local file checked for short-cut names for URLs
-# when the user presses the 'j' (JUMP) key.  The user will be prompted
-# to enter a short-cut name for an URL, which Lynx will then follow
-# in a similar manner to 'g'oto; alternatively, s/he can enter '?'
-# to view the full JUMPFILE list of short-cuts with associated URLs.
-# There is an example jumps file in the samples subdirectory.
-# If not defined here or in  userdefs.h , the JUMP command will invoke
-# the NO_JUMPFILE statusline message (cp  LYMessages_en.h ).
-#
-# To allow '?' to work, include in the JUMPFILE
-# a short-cut to the JUMPFILE itself, e.g.
-# <dt>?<dd><a href="file://localhost/path/jumps.html">This Shortcut List</a>
-#
-# On VMS, use Unix SHELL syntax (including a lead slash) to define it.
-#
-# Additional jumps files can be defined and mapped to keystrokes
-# in  lynx.cfg , but you should first define the default jumps file,
-# which is mapped by default to 'j' (or 'J' when VI keys are ON).
-#
-# In the following line, include the actual full local path to JUMPFILE,
-# but do not include 'file://localhost' in the line.
-#JUMPFILE:/FULL_LOCAL_PATH/jumps.html
-
-# Set JUMPBUFFER to TRUE if you want to have the previous jump target,
-# if any, offered for reuse or editing when using the 'J'ump command.
-# The default is defined in userdefs.h.  If left FALSE, the circular
-# buffer of previously entered targets (shortcuts) can still be invoked
-# via the Up-Arrow or Down-Arrow keys after entering the 'J'ump command.
-# If multiple jumps files are installed, the recalls of shortcuts will
-# be specific to each file.  If Lynx was built with PERMIT_GOTO_FROM_JUMP
-# defined, any random URLs used instead of shortcuts will be stored in the
-# goto URL buffer, not in the shortcuts buffer(s), and the single character
-# ':' can be used as a target to invoke the goto URL buffer (as if 'g'oto
-# followed by Up-Arrow had been entered).
-#
-#JUMPBUFFER:FALSE
-
-# If SAVE_SPACE is defined, it will be used as a path prefix for the
-# suggested filename in "Save to Disk" operations from the 'p'rint or
-# 'd'ownload menus.  On VMS, you can use either VMS (e.g., "SYS$LOGIN:")
-# or Unix syntax (including '~' for the HOME directory).  On Unix, you
-# must use Unix syntax.  If the symbol is not defined, or is zero-length
-# (""), no prefix will be used, and only a filename for saving in the
-# current default directory will be suggested.
-# This definition will be overridden if a "LYNX_SAVE_SPACE" environment
-# variable has been set on Unix, or logical has been defined on VMS.
-#
-#SAVE_SPACE:~/foo/
-
-# If LYNX_HOST_NAME is defined here or in userdefs.h, it will be
-# treated as an alias for the local host name in checks for URLs on
-# the local host (e.g., when the -localhost switch is set), and this
-# host name, "localhost", and HTHostName (the fully qualified domain
-# name of the system on which Lynx is running) will all be passed as
-# local.  A different definition here will override that in userdefs.h.
-#
-#LYNX_HOST_NAME:www.cc.ukans.edu
-
-# localhost aliases
-# Any LOCALHOST_ALIAS definitions also will be accepted as local when
-# the -localhost switch is set.  These need not actually be local, i.e.,
-# in contrast to LYNX_HOST_NAME, you can define them to trusted hosts at
-# other Internet sites.
-#
-#LOCALHOST_ALIAS:gopher.server.domain
-#LOCALHOST_ALIAS:news.server.domain
-
-# LOCAL_DOMAIN is used for a tail match with the ut_host element of
-# the utmp or utmpx structure on systems with utmp capabilities, to
-# determine if a user is local to your campus or organization when
-# handling -restrictions=inside_foo or outside_foo settings for ftp,
-# news, telnet/tn3270 and rlogin URLs.  An "inside" user is assumed
-# if your system does not have utmp capabilities.  CHANGE THIS here
-# if it was not changed in userdefs.h at compilation time.
-#
-#LOCAL_DOMAIN:ukans.edu
-
-# CHARACTER_SET defines the display character set, i.e., assumed to be
-# installed on the user's terminal.  It determines which characters or strings
-# will be used to represent 8-bit character entities within HTML.  New
-# character sets may be defined as explained in the README files of the
-# src/chrtrans directory in the Lynx source code distribution.  For Asian (CJK)
-# character sets, it also determines how Kanji code will be handled.  The
-# default is defined in userdefs.h and can be changed here or via the
-# 'o'ptions menu.  The 'o'ptions menu setting will be stored in the user's RC
-# file whenever those settings are saved, and thereafter will be used as the
-# default.  For Lynx a "character set" has two names:  a MIME name (for
-# recognizing properly labeled charset parameters in HTTP headers etc.), and a
-# human-readable string for the 'O'ptions Menu (so you may find info about
-# language or group of languages besides MIME name).  Not all 'human-readable'
-# names correspond to exactly one valid MIME charset (example is "Chinese");
-# in that case an appropriate valid (and more specific) MIME name should be
-# used where required.  Well-known synonyms are also processed in the code.
-#
-# Raw (CJK) mode
-#
-# Lynx normally translates characters from a document's charset to display
-# charset, using ASSUME_CHARSET value (see below) if the document's charset
-# is not specified explicitly.  Raw (CJK) mode is OFF for this case.
-# When the document charset is specified explicitly, that charset
-# overrides any assumption like ASSUME_CHARSET or raw (CJK) mode.
-#
-# For the Asian (CJK) display character sets, the corresponding charset is
-# assumed in documents, i.e., raw (CJK) mode is ON by default.  In raw CJK
-# mode, 8-bit characters are not reverse translated in relation to the entity
-# conversion arrays, i.e., they are assumed to be appropriate for the display
-# character set.  The mode should be toggled OFF when an Asian (CJK) display
-# character set is selected but the document is not CJK and its charset not
-# specified explicitly.
-#
-# Raw (CJK) mode may be toggled by user via '@' (LYK_RAW_TOGGLE) key,
-# the -raw command line switch or from the 'o'ptions menu.
-#
-# Raw (CJK) mode effectively changes the charset assumption about unlabeled
-# documents.  You can toggle raw mode ON if you believe the document has a
-# charset which does correspond to your Display Character Set.  On the other
-# hand, if you set ASSUME_CHARSET the same as Display Character Set you get raw
-# mode ON by default (but you get assume_charset=iso-8859-1 if you try raw mode
-# OFF after it).
-#
-# Note that "raw" does not mean that every byte will be passed to the screen.
-# HTML character entities may get expanded and translated, inappropriate
-# control characters filtered out, etc.  There is a "Transparent" pseudo
-# character set for more "rawness".
-#
-# Since Lynx now supports a wide range of platforms it may be useful to note
-# the cpXXX codepages used by IBM PC compatible computers, and windows-xxxx
-# used by native MS-Windows apps.  We also note that cpXXX pages rarely are
-# found on Internet, but are mostly for local needs on DOS.
-#
-# Recognized character sets include:
-#
-#    string for 'O'ptions Menu          MIME name
-#    ===========================        =========
-#    7 bit approximations (US-ASCII)    us-ascii
-#    Western (ISO-8859-1)               iso-8859-1
-#    Western (ISO-8859-15)              iso-8859-15
-#    Western (cp850)                    cp850
-#    Western (windows-1252)             windows-1252
-#    IBM PC US codepage (cp437)         cp437
-#    DEC Multinational                  dec-mcs
-#    Macintosh (8 bit)                  macintosh
-#    NeXT character set                 next
-#    HP Roman8                          hp-roman8
-#    Chinese                            euc-cn
-#    Japanese (EUC-JP)                  euc-jp
-#    Japanese (Shift_JIS)               shift_jis
-#    Korean                             euc-kr
-#    Taipei (Big5)                      big5
-#    Vietnamese (VISCII)                viscii
-#    Eastern European (ISO-8859-2)      iso-8859-2
-#    Eastern European (cp852)           cp852
-#    Eastern European (windows-1250)    windows-1250
-#    Latin 3 (ISO-8859-3)               iso-8859-3
-#    Latin 4 (ISO-8859-4)               iso-8859-4
-#    Baltic Rim (cp775)                 cp775
-#    Baltic Rim (windows-1257)          windows-1257
-#    Cyrillic (ISO-8859-5)              iso-8859-5
-#    Cyrillic (cp866)                   cp866
-#    Cyrillic (windows-1251)            windows-1251
-#    Cyrillic (KOI8-R)                  koi8-r
-#    Arabic (ISO-8859-6)                iso-8859-6
-#    Arabic (cp864)                     cp864
-#    Arabic (windows-1256)              windows-1256
-#    Greek (ISO-8859-7)                 iso-8859-7
-#    Greek (cp737)                      cp737
-#    Greek2 (cp869)                     cp869
-#    Greek (windows-1253)               windows-1253
-#    Hebrew (ISO-8859-8)                iso-8859-8
-#    Hebrew (cp862)                     cp862
-#    Hebrew (windows-1255)              windows-1255
-#    Turkish (ISO-8859-9)               iso-8859-9
-#    ISO-8859-10                        iso-8859-10
-#    Ukrainian Cyrillic (cp866u)        cp866u
-#    Ukrainian Cyrillic (KOI8-U)        koi8-u
-#    UNICODE (UTF-8)                    utf-8
-#    RFC 1345 w/o Intro                 mnemonic+ascii+0
-#    RFC 1345 Mnemonic                  mnemonic
-#    Transparent                        x-transparent
-#
-# The value should be the MIME name of a character set recognized by
-# Lynx (case insensitive).
-# Find RFC 1345 at http://www.ics.uci.edu/pub/ietf/uri/rfc1345.txt .
-#
-#CHARACTER_SET:iso-8859-1
-
-# ASSUME_CHARSET changes the handling of documents which do not
-# explicitly specify a charset.  Normally Lynx assumes that 8-bit
-# characters in those documents are encoded according to iso-8859-1
-# (the official default for the HTTP protocol).  When ASSUME_CHARSET
-# is defined here or by an -assume_charset command line flag is in effect,
-# Lynx will treat documents as if they were encoded accordingly.
-# See above on how this interacts with "raw mode" and the Display
-# Character Set.
-# ASSUME_CHARSET can also be changed via the 'o'ptions menu but will
-# not be saved as permanent value in user's .lynxrc file to avoid more chaos.
-#
-#ASSUME_CHARSET:iso-8859-1
-
-# ASSUME_LOCAL_CHARSET is like ASSUME_CHARSET but only applies to local
-# files.  If no setting is given here or by an -assume_local_charset
-# command line option, the value for ASSUME_CHARSET or -assume_charset
-# is used.  It works for both text/plain and text/html files.
-# This option will ignore "raw mode" toggling when local files are viewed
-# (it is "stronger" than "assume_charset" or the effective change
-# of the charset assumption caused by changing "raw mode"),
-# so only use when necessary.
-#
-#ASSUME_LOCAL_CHARSET:iso-8859-1
-
-# PREPEND_CHARSET_TO_SOURCE:TRUE tells Lynx to prepend a META CHARSET line
-# to text/html source files when they are retrieved for 'd'ownloading
-# or passed to 'p'rint functions, so HTTP headers will not be lost.
-# This is necessary for resolving charset for local html files,
-# while the assume_local_charset is just an assumption.
-# For the 'd'ownload option, a META CHARSET will be added only if the HTTP
-# charset is present.  The compilation default is TRUE.
-# It is generally desirable to have charset information for every local
-# html file, but META CHARSET string potentially could cause
-# compatibility problems with other browsers, see also PREPEND_BASE_TO_SOURCE.
-# Note that the prepending is not done for -source dumps.
-#
-#PREPEND_CHARSET_TO_SOURCE:TRUE
-
-# NCR_IN_BOOKMARKS:TRUE allows you to save 8-bit characters in bookmark titles
-# in the unicode format (NCR).  This may be useful if you need to switch
-# display charsets frequently.  This is the case when you use Lynx on different
-# platforms, e.g., on UNIX and from a remote PC, and want to keep the bookmarks
-# file persistent.
-# Another aspect is compatibility:  NCR is part of I18N and HTML4.0
-# specifications supported starting with Lynx 2.7.2, Netscape 4.0 and MSIE 4.0.
-# Older browser versions will fail so keep NCR_IN_BOOKMARKS:FALSE if you
-# plan to use them.
-#
-#NCR_IN_BOOKMARKS:FALSE
-
-# FORCE_8BIT_TOUPPER overrides locale settings and uses internal 8-bit
-# case-conversion mechanism for case-insensitive searches in non-ASCII display
-# character sets.  It is FALSE by default and should not be changed unless
-# you encounter problems with case-insensitive searches.
-#
-#FORCE_8BIT_TOUPPER:FALSE
-
-# While Lynx supports different platforms and display character sets
-# we need to limit the charset in outgoing mail to reduce
-# trouble for remote recipients who may not recognize our charset.
-# You may try US-ASCII as the safest value (7 bit), any other MIME name,
-# or leave this field blank (default) to use the display character set.
-# Charset translations currently are implemented for mail "subjects= " only.
-#
-#OUTGOING_MAIL_CHARSET:
-
-# If Lynx encounters a charset parameter it doesn't recognize, it will
-# replace the value given by ASSUME_UNREC_CHARSET (or a corresponding
-# -assume_unrec_charset command line option) for it.  This can be used
-# to deal with charsets unknown to Lynx, if they are "sufficiently
-# similar" to one that Lynx does know about, by forcing the same
-# treatment.  There is no default, and you probably should leave this
-# undefined unless necessary.
-#
-#ASSUME_UNREC_CHARSET:iso-8859-1
-
-# PREFERRED_LANGUAGE is the language in MIME notation (e.g., "en",
-# "fr") which will be indicated by Lynx in its Accept-Language headers
-# as the preferred language.  If available, the document will be
-# transmitted in that language.  Users can override this setting via
-# the 'o'ptions menu and save that preference in their RC file.
-# This may be a comma-separated list of languages in decreasing preference.
-#
-#PREFERRED_LANGUAGE:en
-
-# PREFERRED_CHARSET specifies the character set in MIME notation (e.g.,
-# "ISO-8859-2", "ISO-8859-5") which Lynx will indicate you prefer in
-# requests to http servers using an Accept-Charsets header.  Users can
-# change it via the 'o'ptions menu and save that preference in their RC file.
-# The value should NOT include "ISO-8859-1" or "US-ASCII",
-# since those values are always assumed by default.
-# If a file in that character set is available, the server will send it.
-# If no Accept-Charset header is present, the default is that any
-# character set is acceptable.  If an Accept-Charset header is present,
-# and if the server cannot send a response which is acceptable
-# according to the Accept-Charset header, then the server SHOULD send
-# an error response with the 406 (not acceptable) status code, though
-# the sending of an unacceptable response is also allowed.  See RFC 2068
-# (http://www.ics.uci.edu/pub/ietf/uri/rfc2068.txt).
-#
-#PREFERRED_CHARSET:
-
-# URL_DOMAIN_PREFIXES and URL_DOMAIN_SUFFIXES are strings which will be
-# prepended (together with a scheme://) and appended to the first element
-# of command line or 'g'oto arguments which are not complete URLs and
-# cannot be opened as a local file (file://localhost/string).  Both
-# can be comma-separated lists.  Each prefix must end with a dot, each
-# suffix must begin with a dot, and either may contain other dots (e.g.,
-# .com.jp).  The default lists are defined in userdefs.h and can be
-# replaced here.  Each prefix will be used with each suffix, in order,
-# until a valid Internet host is created, based on a successful DNS
-# lookup (e.g., foo will be tested as www.foo.com and then www.foo.edu
-# etc.).  The first element can include a :port and/or /path which will
-# be restored with the expanded host (e.g., wfbr:8002/dir/lynx will
-# become http://www.wfbr.edu:8002/dir/lynx).  The prefixes will not be
-# used if the first element ends in a dot (or has a dot before the
-# :port or /path), and similarly the suffixes will not be used if the
-# the first element begins with a dot (e.g., .nyu.edu will become
-# http://www.nyu.edu without testing www.nyu.com).  Lynx will try to
-# guess the scheme based on the first field of the expanded host name,
-# and use "http://" as the default (e.g., gopher.wfbr.edu or gopher.wfbr.
-# will be made gopher://gopher.wfbr.edu).
-#
-#URL_DOMAIN_PREFIXES:www.
-#URL_DOMAIN_SUFFIXES:.com,.edu,.net,.org
-
-# Lynx Options Menu style toggle:  forms-based or old-style.
-# Works if old-style menu is compiled in as well as the forms-based menu.
-#FORMS_OPTIONS:TRUE
-
-# Display partial pages while downloading
-#PARTIAL:TRUE
-
-# Set the threshold # of lines Lynx must render before it
-# redraws the screen in PARTIAL mode.  Anything < 0 implies
-# use of the screen size.
-#PARTIAL_THRES:-1
-
-# While getting large files, Lynx shows the approximate rate of transfer.
-# Set this to change the units shown:
-# TRUE for KB/sec or FALSE for bytes/sec:  default is TRUE.
-#SHOW_KB_RATE:TRUE
-
-# The following three definitions set the number of seconds for
-# pauses following statusline messages that would otherwise be
-# replaced immediately, and are more important than the unpaused
-# progress messages.  Those set by INFOSECS are also basically
-# progress messages (e.g., that a prompted input has been canceled)
-# and should have the shortest pause.  Those set by MESSAGESECS are
-# informational (e.g., that a function is disabled) and should have
-# a pause of intermediate duration.  Those set by ALERTSECS typically
-# report a serious problem and should be paused long enough to read
-# whenever they appear (typically unexpectedly).  The default values
-# are defined in userdefs.h, and can be modified here should longer
-# pauses be desired for braille-based access to Lynx.
-#
-#INFOSECS:1
-#MESSAGESECS:2
-#ALERTSECS:3
-
-# If USE_SELECT_POPUPS is set FALSE, Lynx will present a vertical list of
-# radio buttons for the OPTIONs in SELECT blocks which lack the MULTIPLE
-# attribute, instead of using a popup menu.  Note that if the MULTIPLE
-# attribute is present in the SELECT start tag, Lynx always will create a
-# vertical list of checkboxes for the OPTIONs.
-# The default defined here or in userdefs.h can be changed via the 'o'ptions
-# menu and saved in the RC file, and always can be toggled via the -popup
-# command line switch.
-#
-#USE_SELECT_POPUPS:TRUE
-
-# SHOW_CURSOR controls whether or not the cursor is hidden or appears
-# over the current link in documents or the current option in popups.
-# Showing the cursor is handy if you are a sighted user with a poor
-# terminal that can't do bold and reverse video at the same time or
-# at all.  It also can be useful to blind users, as an alternative
-# or supplement to setting LINKS_AND_FORM_FIELDS_ARE_NUMBERED or
-# LINKS_ARE_NUMBERED.
-# The default defined here or in userdefs.h can be changed via the
-# 'o'ptions menu and saved in the RC file, and always can be toggled
-# via the -show_cursor command line switch.
-#
-#SHOW_CURSOR:FALSE
-
-# VERBOSE_IMAGES controls whether or not Lynx replaces the [LINK], [INLINE] and
-# [IMAGE] comments (for images without ALT) with filenames of these images.
-# This can be useful in determining what images are decorations
-# (button.gif, line.gif) and what images are important (if the page writer
-# bothers to use useful names).
-#
-# If this option is set here, it will override the setting in userdefs.h.
-#VERBOSE_IMAGES:TRUE
-
-# If BOLD_HEADERS is set to TRUE the HT_BOLD default style will be acted
-# upon for <H1> through <H6> headers.  The compilation default is FALSE
-# (only the indentation styles are acted upon, but see BOLD_H1, below).
-# On Unix, compilation with -DUNDERLINE_LINKS also will apply to the
-# HT_BOLD style for headers when BOLD_HEADERS is TRUE.
-#
-#BOLD_HEADERS:FALSE
-
-# If BOLD_H1 is set to TRUE the HT_BOLD default style will be acted
-# upon for <H1> headers even if BOLD_HEADERS is FALSE.  The compilation
-# default is FALSE.  On Unix, compilation with -DUNDERLINE_LINKS also
-# will apply to the HT_BOLD style for headers when BOLD_H1 is TRUE.
-#
-#BOLD_H1:FALSE
-
-# If BOLD_NAME_ANCHORS is set to TRUE the content of anchors without
-# an HREF attribute, (i.e., anchors with a NAME or ID attribute) will
-# have the HT_BOLD default style.  The compilation default is FALSE.
-# On Unix, compilation with -DUNDERLINE_LINKS also will apply to the
-# HT_BOLD style for NAME (ID) anchors when BOLD_NAME_ANCHORS is TRUE.
-#
-#BOLD_NAME_ANCHORS:FALSE
-
-# The DEFAULT_CACHE_SIZE specifies the number of WWW documents to be
-# cached in memory at one time.
-#
-# This so-called cache size (actually, number) is defined in userdefs.h and
-# may be modified here and/or with the command line argument -cache=NUMBER
-# The minimum allowed value is 2, for the current document and at least one
-# to fetch, and there is no absolute maximum number of cached documents.
-# On Unix, and VMS not compiled with VAXC, whenever the number is exceeded
-# the least recently displayed document will be removed from memory.
-#
-# On VMS compiled with VAXC, the DEFAULT_VIRTUAL_MEMORY_SIZE specifies the
-# amount (bytes) of virtual memory that can be allocated and not yet be freed
-# before previous documents are removed from memory.  If the values for both
-# the DEFAULT_CACHE_SIZE and DEFAULT_VIRTUAL_MEMORY_SIZE are exceeded, then
-# the least recently displayed documents will be freed until one or the other
-# value is no longer exceeded.  The default value is defined in userdefs.h.
-#
-# The Unix and VMS (but not VAXC) implementations use the C library malloc's
-# and calloc's for memory allocation, but procedures for taking the actual
-# amount of cache into account still need to be developed.  They use only
-# the DEFAULT_CACHE_SIZE value, and that specifies the absolute maximum
-# number of documents to cache (rather than the maximum number only if
-# DEFAULT_VIRTUAL_MEMORY_SIZE has been exceeded, as with VAXC/VAX).
-#
-#DEFAULT_CACHE_SIZE:10
-#DEFAULT_VIRTUAL_MEMORY_SIZE:512000
-
-# SOURCE_CACHE sets the source caching behavior for Lynx:
-# FILE causes Lynx to keep a temporary file for each cached document
-#   containing the HTML source of the document, which it uses to regenerate
-#   the document when certain settings are changed (for instance,
-#   historical vs. minimal vs. valid comment parsing) instead of reloading
-#   the source from the network.
-# MEMORY is like FILE, except the document source is kept in memory.  You
-#   may wish to adjust DEFAULT_CACHE_SIZE and DEFAULT_VIRTUAL_MEMORY_SIZE
-#   accordingly.
-# NONE is the default; the document source is not cached, and is reloaded
-#   from the network when needed.
-#
-#SOURCE_CACHE:NONE
-
-# If ALWAYS_RESUBMIT_POSTS is set TRUE, Lynx always will resubmit forms
-# with method POST, dumping any cache from a previous submission of the
-# form, including when the document returned by that form is sought with
-# the PREV_DOC command or via the history list.  Lynx always resubmits
-# forms with method POST when a submit button or a submitting text input
-# is activated, but normally retrieves the previously returned document
-# if it had links which you activated, and then go back with the PREV_DOC
-# command or via the history list.
-#
-# The default defined here or in userdefs.h can be toggled via
-# the -resubmit_forms command line switch.
-#
-#ALWAYS_RESUBMIT_POSTS:FALSE
-
-# If NO_ISMAP_IF_USEMAP is set TRUE, Lynx will not include a link to the
-# server-side image map if both a server-side and client-side map for the
-# same image is indicated in the HTML markup.  The compilation default is
-# FALSE, such that a link with "[ISMAP]" as the link name, followed by a
-# hyphen, will be prepended to the ALT string or "[USEMAP]" pseudo-ALT for
-# accessing Lynx's text-based rendition of the client-side map (based on
-# the content of the associated MAP element).  If the "[ISMAP]" link is
-# activated, Lynx will send a 0,0 coordinate pair to the server, which
-# Lynx-friendly sites can map to a for-text-client document, homologous
-# to what is intended for the content of a FIG element.
-#
-# The compilation default, or default defined here, can be toggled via
-# the "-ismap" command line switch.
-#
-#NO_ISMAP_IF_USEMAP:FALSE
-
-# If SEEK_FRAG_MAP_IN_CUR is set FALSE, then USEMAP attribute values
-# (in IMG or OBJECT tags) consisting of only a fragment (USEMAP="#foo")
-# will be resolved with respect to the current document's base, which
-# might not be the same as the current document's URL.
-# The compilation default is to use the current document's URL in all
-# cases (i.e., assume the MAP is present below, if it wasn't present
-# above the point in the HTML stream where the USEMAP attribute was
-# detected).  Lynx's present "single pass" rendering engine precludes
-# checking below before making the decision on how to resolve a USEMAP
-# reference consisting solely of a fragment.
-#
-#SEEK_FRAG_MAP_IN_CUR:TRUE
-
-# If SEEK_FRAG_AREA_IN_CUR is set FALSE, then HREF attribute values
-# in AREA tags consisting of only a fragment (HREF="#foo") will be
-# resolved with respect to the current document's base, which might
-# not be the same as the current document's URL.  The compilation
-# default is to use the current document's URL, as is done for the
-# HREF attribute values of Anchors and LINKs that consist solely of
-# a fragment.
-#
-#SEEK_FRAG_AREA_IN_CUR:TRUE
-
-# Local execution links and scripts are by default completely disabled
-# unless a change is made to the userdefs.h file to enabled them.
-# See the Lynx source code distribution and the userdefs.h
-# file for more detail on enabling execution links and scripts.
-#
-# If you have enabled execution links or scripts the following
-# two variables control Lynx's action when an execution link
-# or script is encountered.
-#
-# If LOCAL_EXECUTION_LINKS_ALWAYS_ON is set to TRUE any execution
-# link or script will be executed no matter where it came from.
-# This is EXTREMELY dangerous.  Since Lynx can access files from
-# anywhere in the world, you may encounter links or scripts that
-# will cause damage or compromise the security of your system.
-#
-# If LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE is set to TRUE only
-# links or scripts that reside on the local machine and are
-# referenced with a URL beginning with "file://localhost/" or meet
-# TRUSTED_EXEC or ALWAYS_TRUSTED_EXEC rules (see below) will be
-# executed.  This is much less dangerous than enabling all execution
-# links, but can still be dangerous.
-#
-#LOCAL_EXECUTION_LINKS_ALWAYS_ON:FALSE
-#LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE:FALSE
-
-# If LOCAL_EXECUTION_LINK_ON_BUT_NOT_REMOTE is TRUE, and no TRUSTED_EXEC
-# rule is defined, it defaults to "file://localhost/" and any lynxexec
-# or lynxprog command will be permitted if it was referenced with a URL
-# beginning with that string.  If you wish to restrict the referencing URLs
-# further, you can extend the string to include a trusted path.  You also can
-# specify a trusted directory for http URLs, which will then be treated as
-# if they were local rather than remote.  For example:
-#
-#	TRUSTED_EXEC:file://localhost/trusted/
-#	TRUSTED_EXEC:http://www.wfbr.edu/trusted/
-#
-# If you also wish to restrict the commands which can be executed, create
-# a series of rules with the path (Unix) or command name (VMS) following
-# the string, separated by a tab.  For example:
-#
-# Unix:
-#	TRUSTED_EXEC:file://localhost/<tab>/bin/cp
-#	TRUSTED_EXEC:file://localhost/<tab>/bin/rm
-# VMS:
-#	TRUSTED_EXEC:file://localhost/<tab>copy
-#	TRUSTED_EXEC:file://localhost/<tab>delete
-#
-# Once you specify a TRUSTED_EXEC referencing string, the default is
-# replaced, and all the referencing strings you desire must be specified
-# as a series.  Similarly, if you associate a command with the referencing
-# string, you must specify all of the allowable commands as a series of
-# TRUSTED_EXEC rules for that string.  If you specify ALWAYS_TRUSTED_EXEC
-# rules below, you need not repeat them as TRUSTED_EXEC rules.
-#
-# If EXEC_LINKS and JUMPFILE have been defined, any lynxexec or lynxprog
-# URLs in that file will be permitted, regardless of other settings.  If
-# you also set LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE:TRUE and a single
-# TRUSTED_EXEC rule that will always fail (e.g., "none"), then *ONLY* the
-# lynxexec or lynxprog URLs in JUMPFILE (and any ALWAYS_TRUSTED_EXEC rules,
-# see below) will be allowed.  Note, however, that if Lynx was compiled with
-# CAN_ANONYMOUS_JUMP set to FALSE (default is TRUE), or -restrictions=jump
-# is included with the -anonymous switch at run time, then users of an
-# anonymous account will not be able to access the jumps file or enter
-# 'j'ump shortcuts, and this selective execution feature will be overridden
-# as well (i.e., they will only be able to access lynxexec or lynxprog
-# URLs which meet any ALWAYS_TRUSTED_EXEC rules).
-#
-#TRUSTED_EXEC:none
-
-# If EXEC_LINKS was defined, any lynxexec or lynxprog URL can be made
-# always enabled by an ALWAYS_TRUSTED_EXEC rule for it.  This is useful for
-# anonymous accounts in which you have disabled execution links generally,
-# and may also have disabled jumps file links, but still want to allow
-# execution of particular utility scripts or programs.  The format is
-# like that for TRUSTED_EXEC.  For example:
-#
-# Unix:
-#   ALWAYS_TRUSTED_EXEC:file://localhost/<tab>/usr/local/kinetic/bin/usertime
-#   ALWAYS_TRUSTED_EXEC:http://www.more.net/<tab>/usr/local/kinetic/bin/who.sh
-# VMS:
-#   ALWAYS_TRUSTED_EXEC:file://localhost/<tab>usertime
-#   ALWAYS_TRUSTED_EXEC:http://www.more.net/<tab>show users
-#
-# The default ALWAYS_TRUSTED_EXEC rule is "none".
-#
-#ALWAYS_TRUSTED_EXEC:none
-
-# Unix:
-# =====
-# TRUSTED_LYNXCGI rules define the permitted sources and/or paths for
-# lynxcgi links (if LYNXCGI_LINKS is defined in userdefs.h).  The format
-# is the same as for TRUSTED_EXEC rules (see above), but no defaults are
-# defined, i.e., if no TRUSTED_LYNXCGI rules are defined here, any source
-# and path for lynxcgi links will be permitted.  Example rules:
-#
-#	TRUSTED_LYNXCGI:file://localhost/
-# 	TRUSTED_LYNXCGI:<tab>/usr/local/etc/httpd/cgi-bin/
-# 	TRUSTED_LYNXCGI:file://localhost/<tab>/usr/local/www/cgi-bin/
-#
-# VMS:
-# ====
-# Do not define this.
-#
-#TRUSTED_LYNXCGI:none
-
-# Unix:
-# =====
-# LYNXCGI_ENVIRONMENT adds the current value of the specified
-# environment variable to the list of environment variables passed on to the
-# lynxcgi script.  Useful variables are HOME, USER, EDITOR, etc...
-#
-# VMS:
-# ====
-# Do not define this.
-#
-#LYNXCGI_ENVIRONMENT:
-
-# Unix:
-# =====
-# LYNXCGI_DOCUMENT_ROOT is the value of DOCUMENT_ROOT that will be passed
-# to lynxcgi scripts.  If set and the URL has PATH_INFO data, then
-# PATH_TRANSLATED will also be generated.  Examples:
-#	LYNXCGI_DOCUMENT_ROOT:/usr/local/etc/httpd/htdocs
-#	LYNXCGI_DOCUMENT_ROOT:/data/htdocs/
-#
-# VMS:
-# ====
-# Do not define this.
-#
-#LYNXCGI_DOCUMENT_ROOT:
-
-# If FORCE_SSL_COOKIES_SECURE is set to TRUE, then SSL encrypted cookies
-# received from https servers never will be sent unencrypted to http
-# servers.  The compilation default is to impose this block only if the
-# https server included a secure attribute for the cookie.  The normal
-# default or that defined here can be toggled via the -force_secure
-# command line switch.
-#
-#FORCE_SSL_COOKIES_SECURE:FALSE
-
-#  MAIL_SYSTEM_ERROR_LOGGING will send a message to the owner of
-#  the information, or ALERTMAIL if there is no owner, every time
-#  that a document cannot be accessed!
-#
-#  NOTE:  This can generate A LOT of mail, be warned.
-#
-#MAIL_SYSTEM_ERROR_LOGGING:FALSE
-
-# If CHECKMAIL is set to TRUE, the user will be informed (via a statusline
-# message) about the existence of any unread mail at startup of Lynx, and
-# will get statusline messages if subsequent new mail arrives.  If a jumps
-# file with a lynxprog URL for invoking mail is available, or your html
-# pages include an mail launch file URL, the user thereby can access mail
-# and read the messages.  The checks and statusline reports will not be
-# performed if Lynx has been invoked with the -restrictions=mail switch.
-#
-#  VMS USERS !!!
-# New mail is normally broadcast as it arrives, via "unsolicited screen
-# broadcasts", which can be "wiped" from the Lynx display via the Ctrl-W
-# command.  You may prefer to disable the broadcasts and use CHECKMAIL
-# instead (e.g., in a public account which will be used by people who
-# are ignorant about VMS).
-#
-#CHECKMAIL:FALSE
-
-# To enable news reading ability via Lynx, the environment variable NNTPSERVER
-# must be set so that it points to your site's NNTP server
-# (see Lynx Users Guide on environment variables).
-# Lynx respects RFC 1738 (http://www.ics.uci.edu/pub/ietf/uri/rfc1738.txt)
-# and does not accept a host field in news URLs (use nntp: instead of news: for
-# the scheme if you wish to specify an NNTP host in a URL, as explained in the
-# RFC).  If you have not set the variable externally, you can set it at run
-# time via this configuration file.  It will not override an external setting.
-# Note that on VMS it is set as a process logical rather than symbol, and will
-# outlive the Lynx image.
-# The news reading facility in Lynx is quite limited.  Lynx does not provide a
-# full featured news reader with elaborate error checking and safety features.
-#
-#NNTPSERVER:news.server.dom
-
-# If LIST_NEWS_NUMBERS is set TRUE, Lynx will use an ordered list and include
-# the numbers of articles in news listings, instead of using an unordered
-# list.  The default is defined in userdefs.h, and can be overridden here.
-#
-#LIST_NEWS_NUMBERS:FALSE
-
-# If LIST_NEWS_DATES is set TRUE, Lynx will include the dates of articles in
-# news listings.  The dates always are included in the articles, themselves.
-# The default is defined in userdefs.h, and can be overridden here.
-#
-#LIST_NEWS_DATES:FALSE
-
-# NEWS_CHUNK_SIZE and NEWS_MAX_CHUNK regulate the chunking of news article
-# listings with inclusion of links for listing earlier and/or later articles.
-# The defaults are defined in HTNews.c as 30 and 40, respectively.  If the
-# news group contains more than NEWS_MAX_CHUNK articles, they will be listed
-# in NEWS_CHUNK_SIZE chunks.  You can change the defaults here, and/or on
-# the command line via -newschunksize=NUMBER and/or -newsmaxchunk=NUMBER
-# switches.  Note that if the chunk size is increased, here or on the command
-# line, to a value greater than the current maximum, the maximum will be
-# increased to that number.  Conversely, if the maximum is set to a number
-# less than the current chunk size, the chunk size will be reduced to that
-# number.  Thus, you need use only one of the two switches on the command
-# line, based on the direction of intended change relative to the compilation
-# or configuration defaults.  The compilation defaults ensure that there will
-# be at least 10 earlier articles before bothering to chunk and create a link
-# for earlier articles.
-#
-#NEWS_CHUNK_SIZE:30
-#NEWS_MAX_CHUNK:40
-
-# Set NEWS_POSTING to FALSE if you do not want to support posting to
-# news groups via Lynx.  If left TRUE, Lynx will use its news gateway to
-# post new messages or followups to news groups, using the URL schemes
-# described in the "Supported URLs" section of the online 'h'elp.  The
-# posts will be attempted via the nntp server specified in the URL, or
-# if none was specified, via the NNTPSERVER configuration or environment
-# variable.  Links with these URLs for posting or sending followups are
-# created by the news gateway when reading group listings or articles
-# from nntp servers if the server indicates that it permits posting.
-# The compilation default set in userdefs.h can be changed here.  If
-# the default is TRUE, posting can still be disallowed via the
-# -restrictions command line switch.
-# The posting facility in Lynx is quite limited.  Lynx does not provide a
-# full featured news poster with elaborate error checking and safety features.
-#
-#NEWS_POSTING:TRUE
-
-# LYNX_SIG_FILE defines the name of a file containing a signature which
-# can be appended to email messages and news postings or followups.  The
-# user will be prompted whether to append it.  It is sought in the home
-# directory.  If it is in a subdirectory, begin it with a dot-slash
-# (e.g., ./lynx/.lynxsig).  The definition is set in userdefs.h and can
-# be changed here.
-#
-#LYNX_SIG_FILE:.lynxsig
-
-# If USE_MOUSE is set TRUE, Lynx (when configured with ncurses) will allow
-# the user to click with button-1 on links to select them.
-#USE_MOUSE:FALSE
-
-# If COLLAPSE_BR_TAGS is set FALSE, Lynx will not collapse serial BR tags.
-# If set TRUE, two or more concurrent BRs will be collapsed into a single
-# line break.  Note that the valid way to insert extra blank lines in HTML
-# is via a PRE block with only newlines in the block.
-#
-#COLLAPSE_BR_TAGS:TRUE
-
-# If TAGSOUP is set, Lynx uses the "Tag Soup DTD" rather than "SortaSGML".
-# The two approaches differ by the style of error detection and recovery.
-# Tag Soup DTD allows for improperly nested tags; SortaSGML is stricter.
-#TAGSOUP:FALSE
-
-# If SET_COOKIES is set FALSE, Lynx will ignore Set-Cookie headers
-# in http server replies.
-# The default is defined in userdefs.h, and can be overridden here,
-# and/or toggled via the -cookies command line switch.
-#
-#SET_COOKIES:TRUE
-
-# If ACCEPT_ALL_COOKIES is set TRUE, Lynx will accept cookies from all
-# domains with no user interaction.
-# The default is defined in userdefs.h and can be overridden here, or
-# in the .lynxrc file via an o(ptions) screen setting.  It may also be
-# toggled via the -accept_all_cookies command line switch.
-#
-#ACCEPT_ALL_COOKIES:FALSE
-
-# COOKIE_ACCEPT_DOMAINS and COOKIE_REJECT_DOMAINS are comma-delimited lists
-# of domains from which Lynx should automatically accept or reject all
-# cookies.  If a domain is specified in both options, rejection will take
-# precedence.  The ACCEPT_ALL_COOKIES parameter will override any settings
-# made here.
-#
-#COOKIE_ACCEPT_DOMAINS:
-#COOKIE_REJECT_DOMAINS:
-
-# COOKIE_LOOSE_INVALID_DOMAINS, COOKIE_STRICT_INVALID_DOMAINS, and
-# COOKIE_QUERY_INVALID_DOMAINS are comma-delimited lists of which domains
-# should be subjected to varying degrees of validity checking.  If a
-# domain is set to strict checking, strict conformance to RFC2109 will
-# be applied.  A domain with loose checking will be allowed to set cookies
-# with an invalid path or domain attribute.  All domains will default to
-# querying the user for an invalid path or domain.
-#
-#COOKIE_LOOSE_INVALID_DOMAINS:
-#COOKIE_STRICT_INVALID_DOMAINS:
-#COOKIE_QUERY_INVALID_DOMAINS:
-
-# COOKIE_FILE is the default file to store persistent downloaded cookies
-# in, if Lynx was compiled with EXP_PERSISTENT_COOKIES.  The cookie file
-# can also be specified in .lynxrc or on the commandline.
-#COOKIE_FILE:~/.lynx_cookies
-
-# PERSISTENT_COOKIES indicates that cookies should be stored for use between
-# Lynx sessions.  It is only used if Lynx was compiled with
-# EXP_PERSISTENT_COOKIES.  Use this flag to disable the feature.
-#PERSISTENT_COOKIES:TRUE
-
-# VMS:
-#=====
-# The mail command and qualifiers are defined in userdefs.h.  Lynx
-# will spawn a subprocess to send replies and error messages.  The
-# command, and qualifiers (if any), can be re-defined here.  If
-# you use PMDF then headers will we passed via a header file.
-# If you use "generic" VMS MAIL, the subject will be passed on the
-# command line via a /subject="SUBJECT" qualifier, and inclusion
-# of other relevant headers may not be possible.
-# If your mailer uses another syntax, some hacking of the mailform()
-# mailmsg() and reply_by_mail() functions in LYMail.c, and printfile()
-# function in LYPrint.c, may be required.
-#
-#SYSTEM_MAIL:PMDF SEND
-#SYSTEM_MAIL_FLAGS:/headers
-#
-#SYSTEM_MAIL:MAIL
-#SYSTEM_MAIL_FLAGS:
-
-# Unix:
-#======
-# The mail path and flags normally are defined for sendmail (or submit
-# with MMDF) in userdefs.h.  You can change them here, but should first
-# read the zillions of CERT advisories about security problems with Unix
-# mailers.
-#
-#SYSTEM_MAIL:/usr/mmdf/bin/submit
-#SYSTEM_MAIL_FLAGS:-mlruxto,cc\*
-#
-#SYSTEM_MAIL:/usr/sbin/sendmail
-#SYSTEM_MAIL_FLAGS:-t -oi
-#
-#SYSTEM_MAIL:/usr/lib/sendmail
-#SYSTEM_MAIL_FLAGS:-t -oi
-
-# Win32:
-#=======
-# Please read sendmail.txt in the LYNX_W32.ZIP distribution
-#
-#SYSTEM_MAIL:sendmail -f me@my.host -h my.host -r my.smtp.mailer -m SMTP
-
-# VMS ONLY:
-#==========
-# MAIL_ADRS is defined in userdefs.h and normally is structured for PMDF's
-# IN%"INTERNET_ADDRESS" scheme.  The %s is replaced with the address given
-# by the user.  If you are using a different Internet mail transport, change
-# the IN appropriately (e.g., to SMTP, MX, or WINS).
-#
-#MAIL_ADRS:"IN%%""%s"""
-
-# VMS ONLY:
-#==========
-# If USE_FIXED_RECORDS is set to TRUE here or in userdefs.h, Lynx will
-# convert 'd'ownloaded binary files to FIXED 512 record format before saving
-# them to disk or acting on a DOWNLOADER option.  If set to FALSE, the
-# headers of such files will indicate that they are Stream_LF with Implied
-# Carriage Control, which is incorrect, and can cause downloading software
-# to get confused and unhappy.  If you do set it FALSE, you can use the
-# FIXED512.COM command file, which is included in this distribution, to do
-# the conversion externally.
-#
-#USE_FIXED_RECORDS:TRUE
-
-# VI_KEYS can be turned on by the user in the options
-# screen or the .lynxrc file.  This is just the default.
-#
-#VI_KEYS_ALWAYS_ON:FALSE
-
-# EMACS_KEYS can be turned on by the user in the options
-# screen or the .lynxrc file.  This is just the default.
-#
-#EMACS_KEYS_ALWAYS_ON:FALSE
-
-# DEFAULT_KEYPAD_MODE specifies whether numbers work like arrows or
-# numbered links.
-# DEFAULT_KEYPAD_MODE set to TRUE indicates numbers act as arrows,
-# and set to FALSE indicates numbers refer to numbered links on the page.
-# LINKS_AND_FORM_FIELDS_ARE_NUMBERED cannot currently be set by this option.
-#
-#DEFAULT_KEYPAD_MODE_IS_NUMBERS_AS_ARROWS:TRUE
-
-# The default search type.
-# This is a default that can be overridden by the user!
-#
-#CASE_SENSITIVE_ALWAYS_ON:FALSE
-
-# DEFAULT_BOOKMARK_FILE is the filename used for storing personal bookmarks.
-# It will be prepended by the user's home directory.
-# NOTE that a file ending in .html or other suffix mapped to text/html
-# should be used to ensure its treatment as HTML.  The built-in default
-# is lynx_bookmarks.html.  On both Unix and VMS, if a subdirectory off of
-# the HOME directory is desired, the path should begin with "./" (e.g.,
-# ./BM/lynx_bookmarks.html), but the subdirectory must already exist.
-# Lynx will create the bookmark file, if it does not already exist, on
-# the first ADD_BOOKMARK attempt if the HOME directory is indicated
-# (i.e., if the definition is just filename.html without any slashes),
-# but requires a pre-existing subdirectory to create the file there.
-# The user can re-define the default bookmark file, as well as a set
-# of sub-bookmark files if multiple bookmark file support is enabled
-# (see below), via the 'o'ptions menu, and can save those definitions
-# in the .lynxrc file.
-#
-#DEFAULT_BOOKMARK_FILE:lynx_bookmarks.html
-
-# If MULTI_BOOKMARK_SUPPORT is set TRUE, and BLOCK_MULTI_BOOKMARKS (see
-# below) is FALSE, and sub-bookmarks exist, all bookmark operations will
-# first prompt the user to select an active sub-bookmark file or the
-# default bookmark file.  FALSE is the default so that one (the default)
-# bookmark file will be available initially.  The definition here will
-# override that in userdefs.h.  The user can turn on multiple bookmark
-# support via the 'o'ptions menu, and can save that choice as the startup
-# default via the .lynxrc file.  When on, the setting can be STANDARD or
-# ADVANCED.  If SUPPORT is set to the latter, and the user mode also is
-# ADVANCED, the VIEW_BOOKMARK command will invoke a statusline prompt at
-# which the user can enter the letter token (A - Z) of the desired bookmark,
-# or '=' to get a menu of available bookmark files.  The menu always is
-# presented in NOVICE or INTERMEDIATE mode, or if the SUPPORT is set to
-# STANDARD.  No prompting or menu display occurs if only one (the startup
-# default) bookmark file has been defined (define additional ones via the
-# 'o'ptions menu).  The startup default, however set, can be overridden on
-# the command line via the -restrictions=multibook or the -anonymous or
-# -validate switches.
-#
-#MULTI_BOOKMARK_SUPPORT:FALSE
-
-# If BLOCK_MULTI_BOOKMARKS is set TRUE, multiple bookmark support will
-# be forced off, and cannot to toggled on via the 'o'ptions menu.  The
-# compilation setting is normally FALSE, and can be overridden here.
-# It can also be set via the -restrictions=multibook or the -anonymous
-# or -validate command line switches.
-#
-#BLOCK_MULTI_BOOKMARKS:FALSE
-
-# DEFAULT_USER_MODE sets the default user mode for Lynx users.
-# NOVICE shows a three line help message at the bottom of the screen.
-# INTERMEDIATE shows normal amount of help (one line).
-# ADVANCED help is replaced by the URL of the current link.
-#
-#DEFAULT_USER_MODE:NOVICE
-
-# DEFAULT_EDITOR sets the default editor for Lynx users.
-# If an editor is defined then the user may edit local documents
-# using that editor.  The editor will also be used for sending
-# mail messages.  If no editor is defined here or by the user
-# the user will not be able to edit local documents and a primitive
-# line oriented mail input mode will be used.
-# NOTE: Do not define an editor unless you know that every user will
-#       know how to use it.  Most users do not enjoy getting stuck in
-#       an unknown editor that they can't exit.  Users can
-#       easily define an editor of their own using the options menu,
-#       so it is not always desirable to set the DEFAULT_EDITOR.
-#
-#DEFAULT_EDITOR:
-
-# SYSTEM_EDITOR behaves the same as DEFAULT_EDITOR except that it can't be
-# changed.
-#
-#SYSTEM_EDITOR:
-
-# Proxy variables
-# Lynx version 2.2 and beyond supports the use of proxy servers that can act as
-# firewall gateways and caching servers.  They are preferable to the older
-# gateway servers.  Each protocol used by Lynx can be mapped separately using
-# PROTOCOL_proxy environment variables (see Lynx Users Guide).  If you have not set
-# them externally, you can set them at run time via this configuration file.
-# They will not override external settings.  The no_proxy variable can be used
-# to inhibit proxying to selected regions of the Web (see below).  Note that on
-# VMS these proxy variables are set as process logicals rather than symbols, to
-# preserve lowercasing, and will outlive the Lynx image.
-#
-#http_proxy:http://some.server.dom:port/
-#https_proxy:http://some.server.dom:port/
-#ftp_proxy:http://some.server.dom:port/
-#gopher_proxy:http://some.server.dom:port/
-#news_proxy:http://some.server.dom:port/
-#newspost_proxy:http://some.server.dom:port/
-#newsreply_proxy:http://some.server.dom:port/
-#snews_proxy:http://some.server.dom:port/
-#snewspost_proxy:http://some.server.dom:port/
-#snewsreply_proxy:http://some.server.dom:port/
-#nntp_proxy:http://some.server.dom:port/
-#wais_proxy:http://some.server.dom:port/
-#finger_proxy:http://some.server.dom:port/
-#cso_proxy:http://some.server.dom:port/
-#no_proxy:host.domain.dom
-
-# The no_proxy variable can be a comma-separated list of strings defining
-# no-proxy zones in the DNS domain name space.  If a tail substring of the
-# domain-path for a host matches one of these strings, transactions with that
-# node will not be proxied.
-#no_proxy:domain.path1,path2
-#
-# A single asterisk as an entry will override all proxy variables and no
-# transactions will be proxied.
-#no_proxy:*
-# This is the only allowed use of * in no_proxy.
-#
-# Warning:  Note that setting 'il' as an entry in this list will block proxying
-# for the .mil domain as well as the .il domain.  If the entry is '.il' this
-# will not happen.
-
-# PRINTER & DOWNLOADER DEFINITIONS:
-# Lynx has 4 pre-defined print options & 1 pre-defined download option,
-# which are called up on-screen when `p' or `d' are entered;
-# any number of options can be added by the user, as explained below.
-#
-# For `p' pre-defined options are: `Save to local file', `E-mail the file',
-# `Print to screen' and `Print to local printer attached to vt100'.
-# `Print to screen' allows file transfers in the absence of alternatives
-# and is often the only option allowed here for anonymous users;
-# the 3rd & 4th options are not pre-defined for DOS/WINDOWS versions of Lynx.
-# For `d' the pre-defined option is: `Download to local file'.
-#
-# To define your own print or download option use the following formats:
-# PRINTER:<name>:<command>:<option>:<lines/page>
-# DOWNLOADER:<name>:<command>:<option>
-#
-# <name>       is what you will see on the print/download screen.
-# <command>    is the command your system will execute:
-#              the 1st %s in the command will be replaced
-#              by the temporary filename used by Lynx;
-#              a 2nd %s will be replaced by a filename of your choice,
-#              for which Lynx will prompt, offering a suggestion;
-#              if the command format of your printer/downloader requires
-#              a different layout, you will need to use a script
-#              (see the last 2 download examples below).
-# <option>     TRUE : the printer/downloader will always be ENABLED,
-#              except that downloading is disabled when -validate is used;
-#              FALSE : both will be DISABLED for anonymous users
-#              and printing will be disabled when -noprint is used.
-# <lines/page> (printers: optional) the number of lines/page (default 66):
-#              used to compute the approximate output size
-#              and prompt if the document is > 4 printer pages;
-#              it uses current screen length for the computation
-#              when `Print to screen' is selected.
-#
-# You must put the whole definition on one line;
-# if you use a colon, precede it with a backslash.
-#
-# `Printer' can be any file-handling program you find useful,
-# even if it does not physically print anything.
-#
-# Usually, downloading involves the use of (e.g.) Ckermit or ZModem
-# to transfer files to a user's local machine over a serial link,
-# but download options do not have to be download-protocol programs.
-#
-# Printer examples:
-#PRINTER:Computer Center printer:lpr -Pccprt %s:FALSE
-#PRINTER:Office printer:lpr -POffprt %s:TRUE
-#PRINTER:VMS printer:print /queue=cc$print %s:FALSE:58
-# If you have a very busy VMS print queue
-# and Lynx deletes the temporary files before they have been queued,
-# use the VMSPrint.com included in the distribution:
-#PRINTER:Busy VMS printer:@Lynx_Dir\:VMSPrint sys$print %s:FALSE:58
-# To specify a print option at run-time:
-# NBB if you have ANONYMOUS users, DO NOT allow this option!
-#PRINTER:Specify at run-time:echo -n "Enter a print command\: "; read word; sh -c "$word %s":FALSE
-# To pass to a sophisticated file viewer: -k suppresses invocation
-# of hex display mode if 8-bit or control characters are present;
-# +s invokes secure mode (see ftp://space.mit.edu/pub/davis/most):
-#PRINTER:Use Most to view:most -k +s %s:TRUE:23
-#
-# Downloader examples:
-# in Kermit, -s %s is the filename sent, -a %s the filename on arrival
-# (if they are given in reverse order here, the command will fail):
-#DOWNLOADER:Use Kermit to download to the terminal:kermit -i -s %s -a %s:TRUE
-# NB don't use -k with Most, so that binaries will invoke hexadecimal mode:
-#DOWNLOADER:Use Most to view:most +s %s:TRUE
-# The following example gives wrong filenames
-# (`sz' doesn't support a suggested filename parameter):
-#DOWNLOADER:Use Zmodem to download to the local terminal:sz %s:TRUE
-# The following example returns correct filenames
-# by using a script to make a subdirectory in /tmp,
-# but may conflict with very strong security or permissions restrictions:
-#DOWNLOADER:Use Zmodem to download to the local terminal:set %s %s;td=/tmp/Lsz$$;mkdir $td;ln -s $1 $td/"$2";sz $td/"$2";rm -r $td:TRUE
-
-# Note for OS/390: The following is strongly recommended  /* S/390 -- gil -- 1464 */
-# to undo ASCII->EBCDIC conversion.
-#
-#DOWNLOADER:Save OS/390 binary file: iconv -f IBM-1047 -t ISO8859-1 %s >%s:FALSE
-
-# Unix ONLY:
-#===========
-# Uploader definitions (implemented only with Unix DIRED_SUPPORT;
-#                       see the Makefile in the top directory,
-#			and the header of ./src/LYUpload.c)
-# any number of uploaders may be defined by using multiple
-# uploader definition sets.  Uploaders may be any programs
-# that could be useful to your users; they do not necessarily
-# have to be upload protocol programs.  The most common use
-# of an uploader is to use Ckermit or some other transfer
-# program so that the user may easily transfer files from
-# their local machine over a serial link.
-#
-# the definition of an uploader is of the same form as a downloader
-# UPLOADER:<uploadername>:<uploader command>:<uploader option>
-#
-#  You must put the whole definition on one line.
-#
-#  If you must use a colon, precede it with a backslash!
-#
-#  If you do not include a %s, you will not be prompted for an
-#  output filename.
-#
-#    example
-#UPLOADER:Use Kermit to upload from your computer: kermit -i -r -a %s:TRUE
-#UPLOADER:Use Zmodem to upload from your computer: rz %s:TRUE
-
-# If NO_DOT_FILES is TRUE (normal default via userdefs.h), the user will not
-# be allowed to specify files beginning with a dot in reply to output filename
-# prompts, and files beginning with a dot (e.g., file://localhost/path/.lynxrc)
-# will not be included in the directory browser's listings.  If set FALSE, you
-# can force it to be treated as TRUE via -restrictions=dotfiles.  If set FALSE
-# and not forced TRUE, the user can regulate it via the 'o'ptions menu (and
-# may save the preference in the RC file).
-#
-#NO_DOT_FILES:TRUE
-
-# If NO_FROM_HEADER is set FALSE, From headers will be sent in transmissions
-# to http or https servers if the personal_mail_address has been defined via
-# the 'o'ptions menu.  The compilation default is TRUE (no From header is
-# sent) and the default can be changed here.  The default can be toggled at
-# run time via the -from switch.  Note that transmissions of From headers
-# have become widely considered to create an invasion of privacy risk.
-#
-#NO_FROM_HEADER:TRUE
-
-# If NO_REFERER_HEADER is TRUE, Referer headers never will be sent in
-# transmissions to servers.  Lynx normally sends the URL of the document
-# from which the link was derived, but not for startfile URLs, 'g'oto
-# URLs, 'j'ump shortcuts, bookmark file links, history list links, or
-# URLs that include the content from form submissions with method GET.
-# If left FALSE here, it can be set TRUE at run time via the -noreferer
-# switch.
-#
-#NO_REFERER_HEADER:FALSE
-
-# If NO_FILE_REFERER is TRUE, Referer headers never will be sent in
-# transmissions to servers for links or actions derived from documents
-# or forms with file URLs.  This would ensure that paths associated
-# with the local file system are never indicated to servers, even if
-# NO_REFERER_HEADER is FALSE.  If left FALSE here, it can be set TRUE
-# at run time via the -nofilereferer switch.
-#
-#NO_FILE_REFERER:FALSE
-
-# If MAKE_LINKS_FOR_ALL_IMAGES is TRUE, all images will be given links
-# which can be ACTIVATEd.  For inlines, the ALT or pseudo-ALT ("[INLINE]")
-# strings will be links for the resolved SRC rather than just text.  For
-# ISMAP or other graphic links, the ALT or pseudo-ALT ("[ISMAP]" or "[LINK]")
-# strings will have '-' and a link labeled "[IMAGE]" for the resolved SRC
-# appended.  See also VERBOSE_IMAGES flag.
-#
-# The default defined here will override that in userdefs.h, and the user
-# can use LYK_IMAGE_TOGGLE to toggle the feature on or off at run time.
-#
-# The default also can be toggled via an "-image_links" command line switch.
-#
-#MAKE_LINKS_FOR_ALL_IMAGES:FALSE
-
-# If MAKE_PSEUDO_ALTS_FOR_INLINES is FALSE, inline images which do not
-# specify an ALT string will not have "[INLINE]" inserted as a pseudo-ALT,
-# i.e., they'll be treated as having ALT="".  If MAKE_LINKS_FOR_ALL_IMAGES
-# is defined or toggled to TRUE, however, the pseudo-ALTs will be created
-# for inlines, so that they can be used as links to the SRCs.
-# See also VERBOSE_IMAGES flag.
-#
-# The default defined here will override that in userdefs.h, and the user
-# can use LYK_INLINE_TOGGLE to toggle the feature on or off at run time.
-#
-# The default also can be toggled via a "-pseudo_inlines" command line
-# switch.
-#
-#MAKE_PSEUDO_ALTS_FOR_INLINES:TRUE
-
-# If SUBSTITUTE_UNDERSCORES is TRUE, the _underline_ format will be used
-# for emphasis tags in dumps.
-#
-# The default defined here will override that in userdefs.h, and the user
-# can toggle the default via a "-underscore" command line switch.
-#
-#SUBSTITUTE_UNDERSCORES:FALSE
-
-# If QUIT_DEFAULT_YES is TRUE then when the QUIT command is entered, any
-# response other than n or N will confirm.  It should be FALSE if you
-# prefer the more conservative action of requiring an explicit Y or y to
-# confirm.  The default defined here will override that in userdefs.h.
-#
-#QUIT_DEFAULT_YES:TRUE
-
-# If HISTORICAL_COMMENTS is TRUE, Lynx will revert to the "Historical"
-# behavior of treating any '>' as a terminator for comments, instead of
-# seeking a valid '-->' terminator (note that white space can be present
-# between the '--' and '>' in valid terminators).  The compilation default
-# is FALSE.
-#
-# The compilation default, or default defined here, can be toggled via a
-# "-historical" command line switch, and via the LYK_HISTORICAL command key.
-#
-#HISTORICAL_COMMENTS:FALSE
-
-# If MINIMAL_COMMENTS is TRUE, Lynx will not use Valid comment parsing
-# of '--' pairs as serial comments within an overall comment element,
-# and instead will seek only a '-->' terminator for the overall comment
-# element.  This emulates the Netscape v2.0 comment parsing bug, and
-# will help Lynx cope with the use of dashes as "decorations", which
-# consequently has become common in so-called "Enhanced for Netscape"
-# pages.  Note that setting Historical comments on will override the
-# Minimal or Valid setting.
-#
-# The compilation default for MINIMAL_COMMENTS is FALSE, but we'll
-# set it TRUE here, until Netscape gets its comment parsing right,
-# and "decorative" dashes cease to be so common.
-#
-# The compilation default, or default defined here, can be toggled via a
-# "-minimal" command line switch, and via the LYK_MINIMAL command key.
-#
-MINIMAL_COMMENTS:TRUE
-
-# If SOFT_DQUOTES is TRUE, Lynx will emulate the invalid behavior of
-# treating '>' as a co-terminator of a double-quoted attribute value
-# and the tag which contains it, as was done in old versions of Netscape
-# and Mosaic.  The compilation default is FALSE.
-#
-# The compilation default, or default defined here, can be toggled via
-# a "-soft_dquotes" command line switch.
-#
-#SOFT_DQUOTES:FALSE
-
-# If STRIP_DOTDOT_URLS is TRUE, Lynx emulates the invalid behavior of many
-# browsers to strip a leading "../" segment from relative URLs in HTML
-# documents with a http or https base URL, if this would otherwise lead to
-# an absolute URLs with those characters still in it.  Such URLs are normally
-# erroneous and not what is intended by page authors.  Lynx will issue
-# a warning message when this occurs.
-#
-# If STRIP_DOTDOT_URLS is FALSE, Lynx will use those URLs for requests
-# without taking any special actions or issuing Warnings, in most cases
-# this will result in an error response from the server.
-#
-# Note that Lynx never tries to fix similar URLs for protocols other than
-# http and https, since they are less common and may actually be valid in
-# some cases.
-#
-#STRIP_DOTDOT_URLS:TRUE
-
-# If ENABLE_SCROLLBACK is TRUE, Lynx will clear the entire screen before
-# displaying each new screenful of text.  Though less efficient for normal
-# use, this allows programs that maintain a buffer of previously-displayed
-# text to recognize the continuity of what has been displayed, so that
-# previous screenfuls can be reviewed by whatever method the program uses
-# to scroll back through previous text.  For example, the PC comm program
-# QModem has a key that can be pressed to scroll back; if ENABLE_SCROLLBACK
-# is TRUE, pressing the scrollback key will access previous screenfuls which
-# will have been stored on the local PC and will therefore be displayed
-# instantaneously, instead of needing to be retransmitted by Lynx at the
-# speed of the comm connection (but Lynx will not know about the change,
-# so you must restore the last screen before resuming with Lynx commands).
-#
-# The compilation default is FALSE (if REVERSE_CLEAR_SCREEN_PROBLEM was not
-# defined in the Unix Makefile to invoke this behavior as a workaround for
-# some poor curses implementations).
-#
-# The default compilation or configuration setting can be toggled via an
-# "-enable_scrollback" command line switch.
-#
-#ENABLE_SCROLLBACK:FALSE
-
-# If SCAN_FOR_BURIED_NEWS_REFS is set to TRUE, Lynx will scan the bodies
-# of news articles for buried article and URL references and convert them
-# to links.  The compilation default is TRUE, but some email addresses
-# enclosed in angle brackets ("<user@address>") might be converted to false
-# news links, and uuencoded messages might be corrupted.  The conversion is
-# not done when the display is toggled to source or when 'd'ownloading, so
-# uuencoded articles can be saved intact regardless of these settings.
-#
-# The default setting can be toggled via a "-buried_news" command line
-# switch.
-#
-#SCAN_FOR_BURIED_NEWS_REFS:TRUE
-
-# If PREPEND_BASE_TO_SOURCE is set to FALSE, Lynx will not prepend a
-# Request URL comment and BASE element to text/html source files when
-# they are retrieved for 'd'ownloading or passed to 'p'rint functions.
-# The compilation default is TRUE.  Note that this prepending is not
-# done for -source dumps, unless the -base switch also was included on
-# the command line, and the latter switch overrides the setting of the
-# PREPEND_BASE_TO_SOURCE configuration variable.
-#
-#PREPEND_BASE_TO_SOURCE:TRUE
-
-# MIME types and viewers!
-#
-# file extensions may be assigned to MIME types using
-# the SUFFIX: definition.
-#
-# NOTE: It is normally preferable to define new extension mappings in
-#       EXTENSION_MAP files (see below) instead of here:  Definitions
-#       here are overriden by those in EXTENSION_MAP files and even by
-#       some built-in defaults in src/HTInit.c.
-#       Extension mappings have an effect mostly for ftp and local files,
-#       they are NOT used to determine the type of content for URLs with
-#       the http protocol.  This is because HTTP servers already specify
-#       the MIME type in the Content-Type header.  [It may still be
-#       necessary to set up an appropriate suffix for some MIME types,
-#       even if they are accessed only via the HTTP protocol, if the viewer
-#       (see below) for those MIME types requires a certain suffix for the
-#       temporary file passed to it.]
-#
-# The SUFFIX definition takes the form of:
-#    SUFFIX:<file extension>:<mime type>
-# for instance the following definition maps the
-# extension ".gif" to the mime type "image/gif"
-#    SUFFIX:.gif:image/gif
-#
-# file suffixes are case INsensitive!
-#
-# The suffix definitions listed here in the default lynx.cfg file are
-# among those established via src/HTInit.c.  You can change any of the
-# defaults by editing that file, or via the global or personal mime.types
-# files at run time.  Assignments made here will be overridden by entries
-# in those files.
-#
-#SUFFIX:.ps:application/postscript
-#SUFFIX:.eps:application/postscript
-#SUFFIX:.ai:application/postscript
-#SUFFIX:.rtf:application/x-rtf
-#SUFFIX:.snd:audio/basic
-#SUFFIX:.gif:image/gif
-#SUFFIX:.rgb:image/x-rgb
-#SUFFIX:.pict:image/x-pict
-#SUFFIX:.xbm:image/x-xbitmap
-#SUFFIX:.tiff:image/x-tiff
-#SUFFIX:.jpg:image/jpeg
-#SUFFIX:.jpeg:image/jpeg
-#SUFFIX:.mpg:video/mpeg
-#SUFFIX:.mpeg:video/mpeg
-#SUFFIX:.mov:video/quicktime
-#SUFFIX:.hqx:application/octet-stream
-#SUFFIX:.bin:application/octet-stream
-#SUFFIX:.exe:application/octet-stream
-#SUFFIX:.tar:application/octet-stream
-#SUFFIX:.Z:application/octet-stream
-#SUFFIX:.gz:application/octet-stream
-#SUFFIX:.bz2:application/octet-stream
-#SUFFIX:.zip:application/octet-stream
-#SUFFIX:.lzh:application/octet-stream
-#SUFFIX:.lha:application/octet-stream
-#SUFFIX:.dms:application/octet-stream
-
-# The global and personal EXTENSION_MAP files allow you to assign extensions
-# to MIME types which will override any of the suffix maps in this (lynx.cfg)
-# configuration file, or in src/HTInit.c.  See the example mime.types file
-# in the samples subdirectory.
-#
-# 	Unix:
-#GLOBAL_EXTENSION_MAP:/usr/local/lib/mosaic/mime.types
-# 	VMS:
-#GLOBAL_EXTENSION_MAP:Lynx_Dir:mime.types
-#
-#	Unix (sought in user's home directory):
-#PERSONAL_EXTENSION_MAP:.mime.types
-#	VMS (sought in user's sys$login directory):
-#PERSONAL_EXTENSION_MAP:mime.types
-
-# VMS:
-# ====
-# XLOADIMAGE_COMMAND will be used as a default in src/HTInit.c
-# for viewing image content types when the DECW$DISPLAY logical
-# is set.  Make it the foreign command for your system's X image
-# viewer (commonly, "xv").  Make it "exit" or something like that
-# if you don't have one.  It can be anything that will handle GIF,
-# TIFF and other popular image formats.  Freeware ports of xv for
-# VMS are available in the ftp://ftp.wku.edu/vms/unsupported and
-# http://www.openvms.digital.com/cd/XV310A/ subdirectories.  You
-# must also have a "%s" for the filename.  The default is defined
-# in userdefs.h and can be overridden here, or via the global or
-# personal mailcap files (see below).
-#
-#XLOADIMAGE_COMMAND:xv %s
-
-# Unix:
-# =====
-# XLOADIMAGE_COMMAND will be used as a default in src/HTInit.c for
-# viewing image content types when the DISPLAY environment variable
-# is set.  Make it the full path and name of the xli (also know as
-# xloadimage or xview) command, or other image viewer.  Put 'echo' or
-# something like it here if you don't have a suitable viewer.  It can
-# be anything that will handle GIF, TIFF and other popular image formats
-# (xli does).  The freeware distribution of xli is available in the
-# ftp://ftp.x.org/contrib subdirectory.  The shareware, xv, also is
-# suitable.  You must also have a "%s" for the filename; "&" for
-# background is optional.  The default is defined in userdefs.h and can be
-# overridden here, or via the global or personal mailcap files (see below).
-# Note that open is used as the default for NeXT, instead of the
-# XLOADIMAGE_COMMAND definition.
-# If you use xli, you may want to add the -quiet flag.
-#
-#XLOADIMAGE_COMMAND:xli %s &
-
-# MIME types may be assigned to external viewers using
-# the VIEWER definition.
-#
-# NOTE: if you do not define a viewer to a new MIME type
-#       that you assigned above then it will be saved to
-#       disk by default.
-#       It is normally preferable to define new viewers in
-#       MAILCAP files (see below) instead of here:  Definitions
-#       here are overridden by those in MAILCAP files and even
-#       by some built-in defaults in src/HTInit.c.
-#
-# The VIEWER definition takes the form of:
-#    VIEWER:<mime type>:<viewer command>[:environment]
-#      where -mime type is the MIME content type of the file
-#	     -viewer command is a system command that can be
-#             used to display the file where %s is replaced
-#             within the command with the physical filename
-#             (e.g., "ghostview %s" becomes "ghostview /tmp/temppsfile")
-#            -environment is optional.  The only valid keywords
-#             are currently XWINDOWS and NON_XWINDOWS.  If the XWINDOWS
-#             environment is specified then the viewer will only be
-#             defined when the user has the environment variable DISPLAY
-#             (DECW$DISPLAY on VMS) defined.  If the NON_XWINDOWS environment
-#             is specified the specified viewer will only be defined when the
-#             user DOES NOT have the environment variable DISPLAY defined.
-#  examples:
-#		VIEWER:image/gif:xli %s:XWINDOWS
-#               VIEWER:image/gif:ascii-view %s:NON_XWINDOWS
-#               VIEWER:application/start-elm:elm
-#
-# You must put the whole definition on one line.
-#
-# If you must use a colon in the viewer command, precede it with a backslash!
-#
-# The MIME_type:viewer:XWINDOWS definitions listed here in the lynx.cfg
-# file are among those established via src/HTInit.c.  For the image types,
-# HTInit.c uses the XLOADIMAGE_COMMAND definition in userdefs.h or above
-# (open is used for NeXT).  You can change any of these defaults via the
-# global or personal mailcap files.  Assignments made here will be overridden
-# by entries in those files.
-#
-#VIEWER:application/postscript:ghostview %s&:XWINDOWS
-#VIEWER:image/gif:xli %s&:XWINDOWS
-#VIEWER:image/x-xbm:xli %s&:XWINDOWS
-#VIEWER:image/x-rgb:xli %s&:XWINDOWS
-#VIEWER:image/x-tiff:xli %s&:XWINDOWS
-#VIEWER:image/jpeg:xli %s&:XWINDOWS
-#VIEWER:video/mpeg:mpeg_play %s &:XWINDOWS
-
-# The global and personal MAILCAP files allow you to specify external
-# viewers to be spawned when Lynx encounters different MIME types, which
-# will override any of the suffix maps in this (lynx.cfg) configuration
-# file, or in src/HTInit.c.  See http://www.internic.net/rfc/rfc1524.txt
-# and the example mailcap file in the samples subdirectory.
-#
-#	Unix:
-#GLOBAL_MAILCAP:/usr/local/lib/mosaic/mailcap
-#	VMS:
-#GLOBAL_MAILCAP:Lynx_Dir:mailcap
-#
-# 	Sought in user's home (Unix) or sys$login (VMS) directory.
-#PERSONAL_MAILCAP:.mailcap
-
-# If your terminal (or terminal emulator, or operating system) does not
-# support 8-bit input (at all or in easy way), you can use Lynx to
-# generate 8-bit characters from 7-bit ones output by terminal.
-#
-# Currently available keyboard layouts:
-#	ROT13'd keyboard layout
-#	JCUKEN Cyrillic, for AT 101-key kbd
-#	YAWERTY Cyrillic, for DEC LK201 kbd
-#
-# This feature is ifdef'd with EXP_KEYBOARD_LAYOUT.
-#KEYBOARD_LAYOUT:JCUKEN Cyrillic, for AT 101-key kbd
-
-# Key remapping definitions!
-#
-# You may redefine the keymapping of any function in Lynx by
-# using the KEYMAP variable.  The form of KEYMAP is:
-#  KEYMAP:<KEYSTROKE>:<LYNX FUNCTION>
-#
-# You must map upper and lowercase keys separately.
-#
-# A representative list of functions mapped to their default keys is
-# provided below.  All of the mappings are commented out by default
-# since they just repeat the default mappings, except for TOGGLE_HELP
-# (see below).  See LYKeymap.c for the complete key mapping.  Use the
-# 'K'eymap command when running Lynx for a list of the _current_ keymappings.
-#
-# (However, in contrast to the output of 'K' command,
-# 'H'elp (lynx_help/*.html and lynx_help/keystrokes/*.html files) shows
-# the default mapping unless you change that files manually,
-# so you are responsible for possible deviations
-# when you are changing any KEYMAP below).
-#
-#
-# Keystrokes for special keys are represented by the following codes:
-#         Up Arrow: 0x100
-#       Down Arrow: 0x101
-#      Right Arrow: 0x102
-#       Left Arrow: 0x103
-#        Page Down: 0x104
-#          Page Up: 0x105
-#      Keypad Home: 0x106
-#       Keypad End: 0x107
-#   Function key 1: 0x108
-# vt100   Help Key: 0x108
-# vt100     Do Key: 0x109
-# vt100   Find Key: 0x10A
-# vt100 Select Key: 0x10B
-#       Insert Key: 0x10C
-# Remove (Del) Key: 0x10D
-#      ignored key  0x10E (reserved for internal use, DO_NOTHING)
-# Back (Shift) Tab: 0x10F
-#    reserved code  0x11D (reserved for internal use with -use_mouse)
-#    reserved code  0x290 (reserved for internal use with -use_mouse)
-#
-# Other codes not listed above may be available for additional keys,
-# depending on operating system and libraries used to compile Lynx.
-
-#KEYMAP:0x2F:SOURCE	# Toggle source viewing mode (show HTML source)
-#KEYMAP:^R:RELOAD	# Reload the current document and redisplay
-#KEYMAP:q:QUIT		# Ask the user to quit
-#KEYMAP:Q:ABORT		# Quit without verification
-#KEYMAP:0x20:NEXT_PAGE	# Move down to next page
-#KEYMAP:-:PREV_PAGE	# Move up to previous page
-#KEYMAP:^P:UP_TWO	# Move display up two lines
-#KEYMAP:0x10C:UP_TWO	# Function key Insert - Move display up two lines
-#KEYMAP:^N:DOWN_TWO	# Move display down two lines
-#KEYMAP:0x10D:DOWN_TWO	# Function key Remove - Move display down two lines
-#KEYMAP:(:UP_HALF	# Move display up half a page
-#KEYMAP:):DOWN_HALF	# Move display down half a page
-#KEYMAP:^W:REFRESH	# Refresh the screen
-#KEYMAP:^A:HOME		# Go to top of current document
-#KEYMAP:0x106:HOME	# Keypad Home - Go to top of current document
-#KEYMAP:0x10A:HOME	# Function key Find - Go to top of current document
-#KEYMAP:^E:END		# Go to bottom of current document
-#KEYMAP:0x107:END	# Keypad End - Go to bottom of current document
-#KEYMAP:0x10B:END	# Function key Select - Go to bottom of current document
-#KEYMAP:0x100:PREV_LINK	# Move to the previous link or page
-#KEYMAP:0x101:NEXT_LINK	# Move to the next link or page
-#KEYMAP:0x10F:FASTBACKW_LINK	# Move always to previous link or text area
-#KEYMAP:^I:FASTFORW_LINK	# Move always to next link or text area
-#KEYMAP:<:UP_LINK       # Move to the link above
-#KEYMAP:>:DOWN_LINK	# Move to the link below
-#KEYMAP:0x7F:HISTORY	# Show the history list
-#KEYMAP:0x08:HISTORY    # Show the history list
-#KEYMAP:0x103:PREV_DOC	# Return to the previous document in history stack
-#KEYMAP:0x102:ACTIVATE	# Select the current link
-#KEYMAP:0x109:ACTIVATE	# Function key Do - Select the current link
-#KEYMAP:g:GOTO		# Goto a random URL
-#KEYMAP:G:ECGOTO	# Edit the current document's URL and go to it
-#KEYMAP:H:HELP		# Show default help screen
-#KEYMAP:0x108:HELP	# Function key Help - Show default help screen
-#KEYMAP:i:INDEX		# Show default index
-#*** Edit FORM_LINK_SUBMIT_MESSAGE in userdefs.h if you change NOCACHE ***
-#KEYMAP:x:NOCACHE	# Force submission of form or link with no-cache
-#*** Do not change INTERRUPT from 'z' & 'Z' ***
-#KEYMAP:z:INTERRUPT	# Interrupt network transmission
-#KEYMAP:m:MAIN_MENU	# Return to the main menu
-#KEYMAP:o:OPTIONS	# Show the options menu
-#KEYMAP:i:INDEX_SEARCH	# Search a server based index
-#KEYMAP:/:WHEREIS	# Find a string within the current document
-#KEYMAP:n:NEXT		# Find next occurrence of string within document
-#KEYMAP:c:COMMENT	# Comment to the author of the current document
-#KEYMAP:e:EDIT		# Edit current document or form's textarea (call: ^Ve)
-#KEYMAP:E:ELGOTO	# Edit the current link's URL or ACTION and go to it
-#KEYMAP:=:INFO		# Show info about current document
-#KEYMAP:p:PRINT		# Show print options
-#KEYMAP:a:ADD_BOOKMARK	# Add current document to bookmark list
-#KEYMAP:v:VIEW_BOOKMARK	# View the bookmark list
-#KEYMAP:V:VLINKS	# List links visited during the current Lynx session
-#KEYMAP:!:SHELL		# Spawn default shell
-#KEYMAP:d:DOWNLOAD	# Download current link
-#KEYMAP:j:JUMP		# Jump to a predefined target
-#KEYMAP:k:KEYMAP	# Display the current key map
-#KEYMAP:l:LIST		# List the references (links) in the current document
-#KEYMAP:#:TOOLBAR	# Go to the Toolbar or Banner in the current document
-#KEYMAP:^T:TRACE_TOGGLE	# Toggle detailed tracing for debugging
-#KEYMAP:;:TRACE_LOG	# View trace log if available for the current session
-#KEYMAP:*:IMAGE_TOGGLE	# Toggle inclusion of links for all images
-#KEYMAP:[:INLINE_TOGGLE	# Toggle pseudo-ALTs for inlines with no ALT string
-#KEYMAP:]:HEAD		# Send a HEAD request for current document or link
-#*** Must be compiled with USE_EXTERNALS to enable EXTERN ***
-#KEYMAP:.:EXTERN	# Run external program with url
-#*** Escaping from text input fields with ^V is independent from this: ***
-#KEYMAP:^V:SWITCH_DTD	# Toggle between SortaSGML and TagSoup HTML parsing
-#KEYMAP:0x00:DO_NOTHING	# Does nothing (ignore this key)
-#KEYMAP:0x10E:DO_NOTHING # Does nothing (ignore this key)
-#
-# In addition, the following functions are not mapped to any keys by default:
-#
-#KEYMAP:???:RIGHT_LINK	# Move to the link to the right
-#KEYMAP:???:LEFT_LINK	# Move to the link to the left
-
-# If TOGGLE_HELP is mapped, in novice mode the second help menu line
-# can be toggled among NOVICE_LINE_TWO_A, _B, and _C, as defined in
-# LYMessages_en.h  Otherwise, it will be NOVICE_LINE_TWO.
-#
-#KEYMAP:O:TOGGLE_HELP	# Show other commands in the novice help menu
-
-# Alternate jumps files can be defined and mapped to keys here.  If the
-# keys have already been mapped, then those mappings will be replaced,
-# but you should leave at least one key mapped to the default jumps
-# file.  You optionally may include a statusline prompt string for the
-# mapping.  You must map upper and lowercase keys separately (beware of
-# mappings to keys which the user can further remap via the 'o'ptions
-# menu).  The format is:
-#
-#	JUMPFILE:path:key[:prompt]
-#
-# where path should begin with a '/' (i.e., not include file://localhost).
-# Any white space following a prompt string will be trimmed, and a single
-# space will be added by Lynx.
-#
-#JUMPFILE:/Lynx_Dir/ips.html:i:IP or Interest group (? for list):
-
-# VMS ONLY:
-#==========
-# On VMS, CSwing (an XTree emulation for VTxxx terminals) is intended for
-# use as the Directory/File Manager (sources, objects, or executables are
-# available from ftp://narnia.memst.edu/).  CSWING_PATH should be defined
-# here or in userdefs.h to your foreign command for CSwing, with any
-# regulatory switches you want included.  If not defined, or defined as
-# a zero-length string ("") or "none" (case-insensitive), the support
-# will be disabled.  It will also be disabled if the -nobrowse or
-# -selective switches are used, or if the file_url restriction is set.
-#
-# When enabled, the DIRED_MENU command (normally 'f' or 'F') will invoke
-# CSwing, normally with the current default directory as an argument to
-# position the user on that node of the directory tree.  However, if the
-# current document is a local directory listing, or a local file and not
-# one of the temporary menu or list files, the associated directory will
-# be passed as an argument, to position the user on that node of the tree.
-#
-#CSWING_PATH:swing
-
-# Unix ONLY:
-#===========
-# LIST_FORMAT defines the display for local files when Lynx has been
-# compiled with LONG_LIST defined in the Makefile.  The default is set
-# in userdefs.h, normally to "ls -l" format, and can be changed here
-# by uncommenting the indicated lines, or adding a definition with a
-# modified parameter list.
-#
-# The percent items in the list are interpreted as follows:
-#
-#	%p	Unix-style permission bits
-#	%l	link count
-#	%o	owner of file
-#	%g	group of file
-#	%d	date of last modification
-#	%a	anchor pointing to file or directory
-#	%A	as above but don't show symbolic links
-#	%t	type of file (description derived from MIME type)
-#	%T	MIME type as known by Lynx (from mime.types or default)
-#	%k	size of file in Kilobytes
-#	%K	as above but omit size for directories
-#	%s	size of file in bytes
-#
-# Anything between the percent and the letter is passed on to sprintf.
-# A double percent yields a literal percent on output.  Other characters
-# are passed through literally.
-#
-# If you want only the filename:
-#
-#LIST_FORMAT:    %a
-#
-# If you want a brief output:
-#
-#LIST_FORMAT:   %4K %-12.12d %a
-#
-# If you want the Unix "ls -l" format:
-#
-#LIST_FORMAT:    %p %4l %-8.8o %-8.8g %7s %-12.12d %a
-
-# Unix ONLY:
-#===========
-# DIRED_MENU items are used to compose the F)ull menu list in DIRED mode
-# The behavior of the default configuration given here is much the same
-# as it was when this menu was hard-coded but these items can now be adjusted
-# to suit local needs.  In particular, many of the LYNXDIRED actions can be
-# replaced with lynxexec, lynxprog and lynxcgi script references.
-#
-# NOTE that defining even one DIRED_MENU line overrides all the built-in
-# definitions, so a complete set must then be defined here.
-#
-# Each line consists of the following fields:
-#
-#	DIRED_MENU:type:suffix:link text:extra text:action
-#
-#	type: TAG:   list only when one or more files are tagged
-#	      FILE:  list only when the current selection is a regular file
-#	      DIR:   list only when the current selection is a directory
-#	      LINK:  list only when the current selection is a symbolic link
-#
-#	suffix:  list only if the current selection ends in this pattern
-#
-#	link text:  the displayed text of the link
-#
-#	extra text:  the text displayed following the link
-#
-#	action:  the URL to be followed upon selection
-#
-#	link text and action are scanned for % sequences that are expanded
-#	at display time as follows:
-#
-#			%p  path of current selection
-#			%f  filename (last component) of current selection
-#			%t  tagged list (full paths)
-#			%l  list of tagged file names
-#			%d  the current directory
-#
-#DIRED_MENU:::New File:(in current directory):LYNXDIRED://NEW_FILE%d
-#DIRED_MENU:::New Directory:(in current directory):LYNXDIRED://NEW_FOLDER%d
-
-#DIRED_MENU:FILE::Install:(of current selection):LYNXDIRED://INSTALL_SRC%p
-#DIRED_MENU:DIR::Install:(of current selection):LYNXDIRED://INSTALL_SRC%p
-#DIRED_MENU:FILE::Modify File Name:(of current selection):LYNXDIRED://MODIFY_NAME%p
-#DIRED_MENU:DIR::Modify Directory Name:(of current selection):LYNXDIRED://MODIFY_NAME%p
-#DIRED_MENU:LINK::Modify Name:(of selected symbolic link):LYNXDIRED://MODIFY_NAME%p
-
-# Following depends on OK_PERMIT
-#DIRED_MENU:FILE::Modify File Permissions:(of current selection):LYNXDIRED://PERMIT_SRC%p
-#DIRED_MENU:DIR::Modify Directory Permissions:(of current selection):LYNXDIRED://PERMIT_SRC%p
-
-#DIRED_MENU:FILE::Change Location:(of selected file):LYNXDIRED://MODIFY_LOCATION%p
-#DIRED_MENU:DIR::Change Location:(of selected directory):LYNXDIRED://MODIFY_LOCATION%p
-#DIRED_MENU:LINK::Change Location:(of selected symbolic link):LYNXDIRED://MODIFY_LOCATION%p
-#DIRED_MENU:FILE::Remove File:(current selection):LYNXDIRED://REMOVE_SINGLE%p
-#DIRED_MENU:DIR::Remove Directory:(current selection):LYNXDIRED://REMOVE_SINGLE%p
-#DIRED_MENU:LINK::Remove Symbolic Link:(current selection):LYNXDIRED://REMOVE_SINGLE%p
-
-# Following depends on OK_UUDECODE and !ARCHIVE_ONLY
-#DIRED_MENU:FILE::UUDecode:(current selection):LYNXDIRED://UUDECODE%p
-
-# Following depends on OK_TAR and !ARCHIVE_ONLY
-#DIRED_MENU:FILE:.tar.Z:Expand:(current selection):LYNXDIRED://UNTAR_Z%p
-
-# Following depend on OK_TAR and OK_GZIP and !ARCHIVE_ONLY
-#DIRED_MENU:FILE:.tar.gz:Expand:(current selection):LYNXDIRED://UNTAR_GZ%p
-#DIRED_MENU:FILE:.tgz:Expand:(current selection):LYNXDIRED://UNTAR_GZ%p
-
-# Following depends on !ARCHIVE_ONLY
-#DIRED_MENU:FILE:.Z:Uncompress:(current selection):LYNXDIRED://DECOMPRESS%p
-
-# Following depends on OK_GZIP and !ARCHIVE_ONLY
-#DIRED_MENU:FILE:.gz:Uncompress:(current selection):LYNXDIRED://UNGZIP%p
-
-# Following depends on OK_ZIP and !ARCHIVE_ONLY
-#DIRED_MENU:FILE:.zip:Uncompress:(current selection):LYNXDIRED://UNZIP%p
-
-# Following depends on OK_TAR and !ARCHIVE_ONLY
-#DIRED_MENU:FILE:.tar:UnTar:(current selection):LYNXDIRED://UNTAR%p
-
-# Following depends on OK_TAR
-#DIRED_MENU:DIR::Tar:(current selection):LYNXDIRED://TAR%p
-
-# Following depends on OK_TAR and OK_GZIP
-#DIRED_MENU:DIR::Tar and compress:(using GNU gzip):LYNXDIRED://TAR_GZ%p
-
-# Following depends on OK_ZIP
-#DIRED_MENU:DIR::Package and compress:(using zip):LYNXDIRED://ZIP%p
-
-#DIRED_MENU:FILE::Compress:(using Unix compress):LYNXDIRED://COMPRESS%p
-
-# Following depends on OK_GZIP
-#DIRED_MENU:FILE::Compress:(using gzip):LYNXDIRED://GZIP%p
-
-# Following depends on OK_ZIP
-#DIRED_MENU:FILE::Compress:(using zip):LYNXDIRED://ZIP%p
-
-#DIRED_MENU:TAG::Move all tagged items to another location.::LYNXDIRED://MOVE_TAGGED%d
-#DIRED_MENU:TAG::Remove all tagged files and directories.::LYNXDIRED://REMOVE_TAGGED
-#DIRED_MENU:TAG::Untag all tagged items.::LYNXDIRED://CLEAR_TAGGED
-
-# Unix ONLY:
-#===========
-# If NO_FORCED_CORE_DUMP is set to TRUE, Lynx will not force
-# core dumps via abort() calls on fatal errors or assert()
-# calls to check potentially fatal errors.  The compilation
-# default normally is FALSE, and can be changed here.  The
-# compilation or configuration default can be toggled via
-# the -core command line switch.
-# Note that this setting cannot be used to prevent core dumps
-# with certainty.  If this is important, means provided by the
-# operating system or kernel should be used.
-#
-#NO_FORCED_CORE_DUMP:FALSE
-
-# COLORS (only available if compiled with SVr4 curses or slang)
-#
-# The line must be of the form:
-# COLOR:Integer:Foreground:Background
-#
-# The Integer value is interpreted as follows:
-#     0 - normal               - normal text
-#     1 - bold                 - hyperlinks, see also BOLD_* options above
-#     2 - reverse              - statusline
-#     3 - bold + reverse		(not used)
-#     4 - underline                   - text emphasis (EM, I, B tags etc.)
-#     5 - bold + underline            - hyperlinks within text emphasis
-#     6 - reverse + underline         - currently selected hyperlink
-#     7 - reverse + underline + bold  - WHEREIS search hits
-#
-# Each Foreground and Background value must be one of:
-#      black              red            green            brown
-#       blue          magenta             cyan        lightgray
-#       gray        brightred      brightgreen           yellow
-# brightblue    brightmagenta       brightcyan            white
-#
-# or (if you have configured using --enable-default-colors with ncurses or
-# slang), "default" may be used for foreground and background.
-#
-# Uncomment and change any of the compilation defaults.
-#
-#COLOR:0:black:white
-#COLOR:1:blue:white
-#COLOR:2:yellow:blue
-#COLOR:3:green:white
-#COLOR:4:magenta:white
-#COLOR:5:blue:white
-#COLOR:6:red:white
-#COLOR:7:magenta:cyan
-
-# External application support.  This feature allows Lynx to pass a given
-# URL to an external program.  It was written for three reasons.
-#
-# 1) To overcome the deficiency	of Lynx_386 not supporting ftp and news.
-#    External programs can be used instead by passing the URL.
-#
-# 2) To allow for background	transfers in multitasking systems.
-#    I use wget for http and ftp transfers via the external command.
-#
-# 3) To allow for new URLs to be used through Lynx.
-#	  URLs can be made up such as mymail: to spawn desired applications
-#	  via the external command.
-#
-# Restrictions can be imposed using -restrictions=externals at the Lynx
-# command line.  This will disallow all EXTERNAL lines in lynx.cfg that
-# end in FALSE.  TRUE lines will still function.
-#
-# The lynx.cfg line is as follows:
-#
-# EXTERNAL:<url>:<command> %s:<norestriction>
-#
-# <url> Any given URL.  This can be normal ones like ftp or http or it
-# can be one made up like mymail.
-#
-# <command> The command to run with %s being the URL that will be passed.
-# In Linux I use "wget -q %s &" (no quotes) to spawn a copy of wget for
-# downloading http and ftp files in the background.  In Win95 I use
-# "start ncftp %s" to spawn ncftp in a new window.
-#
-# <norestriction> This complements the -restrictions=externals feature to allow
-# for certain externals to be enabled while restricting others.  TRUE means
-# a command will still function while Lynx is restricted.  WB
-#
-# EXTERNAL:ftp:wget %s &:TRUE
-
-# CERN-style rules, EXPERIMENTAL  -  URL-specific rules
-#
-# A CERN-style rules file can be given with RULESFILE.  Use the system's
-# native format for filenames, on Unix '~' is also recognized.  If a filename
-# is given, the file must exist.
-#
-# Single CERN-style rules can be specified with RULES.
-#
-# Both options can be repeated, rules accumulate in the order
-# given, they will be applied in first-to-last order.  See cernrules.txt
-# in the samples subdirectory for further explanation.
-#
-# Examples:
-#	RULESFILE:/etc/lynx/cernrules
-#	RULE:Fail	gopher:*		     # reject by scheme
-#	RULE:Pass	finger://*@localhost/	     # allow this,
-#	RULE:Fail	finger:*		     # but not others
-#	RULE:Map	http://old.server/*	http://new.server/*
-
-
-# Pretty source view settings. These settings are in effect when -prettysrc
-# was specified.
-# The following lexical elements (lexems) are recognised:
-# comment, tag, attribute, attribute value, generalized angle brackets (
-# '<' '>' '</' ), entity, hyperlink destination , entire file,bad sequence,
-# bad tag, bad attribute, sgml special.
-#  The following group of option tells which styles will surround each
-# lexem. The syntax of option in this group is:
-#HTMLSRC_<LEXEMNAME>:<TAGSPEC>:<TAGSPEC>
-# The first <TAGSPEC> specifies what tags will precede lexems of that class
-# in the internal html markup. The second - what will be placed (internally)
-# after it.
-# TAGSPEC has the following syntax:
-# <TAGSPEC>:= [ (<TAGOPEN> | <TAGCLOSE>) <SPACE>+ ]*
-# <TAGOPEN>:= tagname[.classname]
-# <TAGCLOSE>:= !tagname
-#
-# The following table gives correspondence between lexem and lexem name
-#  Lexem                     LEXEMNAME FURTHER EXPLANATION
-# ------------------------------------
-# comment                    COMM
-# tag                        TAG       everything in gen. brackets
-# attribute                  ATTRIB
-# attribute value            ATTRVAL
-# generalized brackets       ABRACKET  <  >  </
-# entity                     ENTITY
-# hyperlink destination      HREF
-# entire file                ENTIRE
-# bad sequence               BADSEQ    bad entity or invalid construct at text
-#                                      level.
-# bad tag                    BADTAG    Unrecognized contruct in generalized
-#                                      brackets.
-# bad attribute              BADATTR   The name of the attribute unknown to lynx
-#                                      of the tag known to lynx. (ie
-#                                      attributes of unknown tags will have
-#                                      markup of  ATTRIB)
-# sgml special               SGMLSPECIAL doctype, sgmlelt, sgmlele,
-#                                      sgmlattlist, marked section, identifier
-#
-#                 Notes:
-# 1) The markup for HTML_ENTIRE will be emitted only once - it will surround
-# entire file source.
-# 2) The tagnames specified by TAGPEC should be valid html tag names.
-# 3) If the tag/class combination given by TAGOPEN is not assigned a color
-#    style in lss file (for lynx compiled with lss support), that tag/class
-#    combination will be anyway emitted during internal html markup. Such
-#    combinations will be also reported to the trace log.
-# 4) Lexeme 'tag' means everything contained in generalized angle brackets
-# 5) Angle brackets of html specials won't be surrounded by markup for ABRACKET
-#
-#         Examples:
-# HTMLSRC_COMM:B I:!I !B
-#         - html comments will be surrounded by <b><i> and </i></b> in the
-#           internal html markup
-# HTMLSRC_ATTRVAL: span.attrval : !span
-#         - values of the attributes will be surrounded by the
-#           <SPAN class=attrval> </SPAN>
-# HTMLSRC_HREF::
-#         - no special html markup will surround hyperlink destinations (
-#           this means that only default color style for hrefs will be applied
-#           to them)
-#
-# For lynx compiled with lss support, the following settings are the default:
-#HTMLSRC_COMM:span.htmlsrc_comment:!span
-#HTMLSRC_TAG:span.htmlsrc_tag:!span
-#HTMLSRC_ATTRIB:span.htmlsrc_attrib:!span
-#HTMLSRC_ATTRVAL:span.htmlsrc_attrval:!span
-#HTMLSRC_ABRACKET:span.htmlsrc_abracket:!span
-#HTMLSRC_ENTITY:span.htmlsrc_entity:!span
-#HTMLSRC_HREF:span.htmlsrc_href:!span
-#HTMLSRC_ENTIRE:span.htmlsrc_entire:!span
-#HTMLSRC_BADSEQ:span.htmlsrc_badseq:!span
-#HTMLSRC_BADTAG:span.htmlsrc_badtag:!span
-#HTMLSRC_BADATTR:span.htmlsrc_badattr:!span
-#HTMLSRC_SGMLSPECIAL:span.htmlsrc_sgmlspecial:!span
-# the styles corresponding to them are present in sample .lss file.
-# For lynx compiled without lss support, the following settings are the default:
-#HTMLSRC_COMM:b:!b
-#HTMLSRC_TAG:b:!b
-#HTMLSRC_ATTRIB::
-#HTMLSRC_ATTRVAL:!b:b
-#HTMLSRC_ABRACKET:b:!b
-#HTMLSRC_ENTITY:b:!b
-#HTMLSRC_HREF::
-#HTMLSRC_ENTIRE::
-#HTMLSRC_BADSEQ:b:!b
-#HTMLSRC_BADTAG::
-#HTMLSRC_BADATTR:!b:b
-#HTMLSRC_SGMLSPECIAL:b:!b
-#
-# Other source-view related options:
-#
-# Options HTMLSRC_TAGNAME_XFORM and HTMLSRC_ATTRNAME_XFORM control the way the
-# names of tags and names of attributes are transformed correspondingly.
-# Possible values: 0 - lowercase, 1 - leave as is, 2 - uppercase.
-#HTMLSRC_TAGNAME_XFORM:2
-#HTMLSRC_ATTRNAME_XFORM:2
-
diff --git a/gnu/usr.bin/lynx/samples/lynxdump b/gnu/usr.bin/lynx/samples/lynxdump
new file mode 100644
index 00000000000..f79be2fae1d
--- /dev/null
+++ b/gnu/usr.bin/lynx/samples/lynxdump
@@ -0,0 +1,15 @@
+#!/bin/sh
+# lynx -dump w/o numbers
+: ${TMPDIR-/tmp}
+: ${HOME-`pwd`}
+oldmask=`umask`
+umask 077
+MYTMP=$TMPDIR/mytmp$$
+mkdir $MYTMP || exit 1
+trap 'cd /; rm -rf $MYTMP' 0 1 2 5 15
+if test $HOME/.lynxrc ; then
+  cp $HOME/.lynxrc $MYTMP/.lynxrc
+fi
+echo 'keypad_mode=NUMBERS_AS_ARROWS' >> $MYTMP/.lynxrc
+HOME=$MYTMP; export HOME
+lynx -justify -dump -force_html -with_backspaces -nolist $*
diff --git a/gnu/usr.bin/lynx/samples/mailcap b/gnu/usr.bin/lynx/samples/mailcap
index 9dd36ccf8ac..8f473381247 100644
--- a/gnu/usr.bin/lynx/samples/mailcap
+++ b/gnu/usr.bin/lynx/samples/mailcap
@@ -26,8 +26,8 @@
 #        configuration file for Lynx
 
 # In the samples given   test=test -n "$DISPLAY"   is used to
-# determine if the current session is X capible by checking
-# for the existance of a DISPLAY environment variable.
+# determine if the current session is X capable by checking
+# for the existence of a DISPLAY environment variable.
 # Lynx actually uses a getenv() call for DISPLAY (DECW$DISPLAY
 # on VMS) when it encounters   test=test -n "$DISPLAY"  or
 # test=test -z "$DISPLAY"  in a viewer assignment, instead of
diff --git a/gnu/usr.bin/lynx/samples/mailto-form.pl b/gnu/usr.bin/lynx/samples/mailto-form.pl
index 41174d9388e..5afffc8629b 100644
--- a/gnu/usr.bin/lynx/samples/mailto-form.pl
+++ b/gnu/usr.bin/lynx/samples/mailto-form.pl
@@ -105,7 +105,7 @@ $|=1;
 ##    s/^./\U$1/;
 ##}
 
-# If there are mutiple occurrences of the same thing, how to join them
+# If there are multiple occurrences of the same thing, how to join them
 # into one string
 %joiner = (from => ', ',
 	   to => ', ',
diff --git a/gnu/usr.bin/lynx/scripts/install-cfg.sh b/gnu/usr.bin/lynx/scripts/install-cfg.sh
new file mode 100644
index 00000000000..a3734a00a1b
--- /dev/null
+++ b/gnu/usr.bin/lynx/scripts/install-cfg.sh
@@ -0,0 +1,72 @@
+#!/bin/sh
+# install lynx.cfg, ensuring the old config-file is saved to a unique file,
+# and prepending customizations to the newly-installed file.
+#
+# $1 = install program
+# $2 = file to install
+# $3 = where to install it
+PRG="$1"
+SRC=$2
+DST=$3
+
+if test -f "$DST" ; then
+	echo "** checking if you have customized $DST"
+	OLD=lynx-cfg.old
+	NEW=lynx-cfg.new
+	TST=lynx-cfg.tst
+	TMP=lynx-cfg.tmp
+	trap "rm -f $OLD $NEW $TST $TMP; exit 9" 1 2 5 15
+	rm -f $OLD $NEW $TST $TMP
+
+	# Make a list of the settings which are in the original lynx.cfg
+	# Do not keep the user's HELPFILE setting since we modify that in
+	# a different makefile rule.
+	egrep '^[ 	]*[A-Za-z]' $SRC |sed -e 's/^[ 	]*HELPFILE:.*/HELPFILE:/' >$TMP
+	egrep '^[ 	]*[A-Za-z]' $SRC |fgrep -v -f $TMP >$OLD
+	egrep '^[ 	]*[A-Za-z]' $DST |fgrep -v -f $TMP >$TST
+
+	if test -s $TST ; then
+		cat >$TMP <<EOF
+## The following lines were saved from your previous configuration.
+
+EOF
+		cat $TST >>$TMP
+		cat $SRC >$NEW
+		cat $TMP >>$NEW
+
+		# See if we have saved this information before (ignoring the
+		# HELPFILE line).
+		if cmp -s $NEW $OLD
+		then
+			echo "... installed $DST would not be changed"
+		else
+			NUM=1
+			while test -f ${DST}-${NUM}
+			do
+				if cmp -s $NEW ${DST}-${NUM}
+				then
+					break
+				fi
+				NUM=`expr $NUM + 1`
+			done
+			if test ! -f ${DST}-${NUM}
+			then
+				echo "... saving old config as ${DST}-${NUM}"
+				mv $DST ${DST}-${NUM} || exit 1
+			fi
+			echo "** installing $NEW as $DST"
+			eval $PRG $NEW $DST || exit 1
+		fi
+	else
+		echo "... no customizations found"
+		echo "** installing $SRC as $DST"
+		eval $PRG $SRC $DST || exit 1
+	fi
+	rm -f $SKIP $OLD $NEW $TST $TMP
+elif cmp -s $SRC $DST
+then
+	echo "... installed $DST would not be changed"
+else
+	echo "** installing $SRC as $DST"
+	eval $PRG $SRC $DST || exit 1
+fi
diff --git a/gnu/usr.bin/lynx/src/DefaultStyle.c b/gnu/usr.bin/lynx/src/DefaultStyle.c
index 8549a3bfc1f..8a0745d965c 100644
--- a/gnu/usr.bin/lynx/src/DefaultStyle.c
+++ b/gnu/usr.bin/lynx/src/DefaultStyle.c
@@ -21,331 +21,331 @@ PRIVATE CONST HTTabStop tabs_8[] = {
 };
 
 /* Template:
-**	link to next, name, tag,
-**	font, size, colour, 		superscript, anchor id,
+**	link to next, name, name id (enum), tag,
+**	font, size, colour, superscript, anchor id,
 **	indents: 1st, left, right, alignment	lineheight, descent,	tabs,
 **	word wrap, free format, space: before, after, flags.
 */
 
 PRIVATE HTStyle HTStyleNormal = {
-	0,  "Normal", "P",
+	0,  "Normal", ST_Normal, "P",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 3, 6, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleDivCenter = {
-	&HTStyleNormal,  "DivCenter", "DCENTER",
+	&HTStyleNormal,  "DivCenter", ST_DivCenter, "DCENTER",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 3, 6, HT_CENTER,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleDivLeft = {
-	&HTStyleDivCenter,  "DivLeft", "DLEFT",
+	&HTStyleDivCenter,  "DivLeft", ST_DivLeft, "DLEFT",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 3, 6, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleDivRight = {
-	&HTStyleDivLeft,  "DivRight", "DRIGHT",
+	&HTStyleDivLeft,  "DivRight", ST_DivRight, "DRIGHT",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 3, 6, HT_RIGHT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleBanner = {
-	&HTStyleDivRight,  "Banner", "BANNER",
+	&HTStyleDivRight,  "Banner", ST_Banner, "BANNER",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 3, 6, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleBlockquote = {
-	&HTStyleBanner,  "Blockquote", "BLOCKQUOTE",
+	&HTStyleBanner,  "Blockquote", ST_Blockquote, "BLOCKQUOTE",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	5, 5, 7, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleBq = { /* HTML 3.0 BLOCKQUOTE - FM */
-	&HTStyleBlockquote,  "Bq", "BQ",
+	&HTStyleBlockquote,  "Bq", ST_Bq, "BQ",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	5, 5, 7, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleFootnote = { /* HTML 3.0 FN - FM */
-	&HTStyleBq,  "Footnote", "FN",
+	&HTStyleBq,  "Footnote", ST_Footnote, "FN",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	5, 5, 7, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleList = {
-	&HTStyleFootnote,  "List", "UL",
+	&HTStyleFootnote,  "List", ST_List, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 7, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
 PRIVATE HTStyle HTStyleList1 = {
-	&HTStyleList,  "List1", "UL",
+	&HTStyleList,  "List1", ST_List1, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	8, 12, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
 PRIVATE HTStyle HTStyleList2 = {
-	&HTStyleList1,  "List2", "UL",
+	&HTStyleList1,  "List2", ST_List2, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	13, 17, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
 PRIVATE HTStyle HTStyleList3 = {
-	&HTStyleList2,  "List3", "UL",
+	&HTStyleList2,  "List3", ST_List3, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	18, 22, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
 PRIVATE HTStyle HTStyleList4 = {
-	&HTStyleList3,  "List4", "UL",
+	&HTStyleList3,  "List4", ST_List4, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	23, 27, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
 PRIVATE HTStyle HTStyleList5 = {
-	&HTStyleList4,  "List5", "UL",
+	&HTStyleList4,  "List5", ST_List5, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	28, 32, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
 PRIVATE HTStyle HTStyleList6 = {
-	&HTStyleList5,  "List6", "UL",
+	&HTStyleList5,  "List6", ST_List6, "UL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	33, 37, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0 };
 
 PRIVATE HTStyle HTStyleMenu = {
-	&HTStyleList6,  "Menu", "MENU",
+	&HTStyleList6,  "Menu", ST_Menu, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 7, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleMenu1 = {
-	&HTStyleMenu,  "Menu1", "MENU",
+	&HTStyleMenu,  "Menu1", ST_Menu1, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	8, 12, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleMenu2= {
-	&HTStyleMenu1,  "Menu2", "MENU",
+	&HTStyleMenu1,  "Menu2", ST_Menu2, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	13, 17, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleMenu3= {
-	&HTStyleMenu2,  "Menu3", "MENU",
+	&HTStyleMenu2,  "Menu3", ST_Menu3, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	18, 22, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleMenu4= {
-	&HTStyleMenu3,  "Menu4", "MENU",
+	&HTStyleMenu3,  "Menu4", ST_Menu4, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	23, 27, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleMenu5= {
-	&HTStyleMenu4,  "Menu5", "MENU",
+	&HTStyleMenu4,  "Menu5", ST_Menu5, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	28, 33, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleMenu6= {
-	&HTStyleMenu5,  "Menu6", "MENU",
+	&HTStyleMenu5,  "Menu6", ST_Menu6, "MENU",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	33, 38, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleGlossary = {
-	&HTStyleMenu6,  "Glossary", "DL",
+	&HTStyleMenu6,  "Glossary", ST_Glossary, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 10, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
 PRIVATE HTStyle HTStyleGlossary1 = {
-	&HTStyleGlossary,  "Glossary1", "DL",
+	&HTStyleGlossary,  "Glossary1", ST_Glossary1, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	8, 16, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
 PRIVATE HTStyle HTStyleGlossary2 = {
-	&HTStyleGlossary1,  "Glossary2", "DL",
+	&HTStyleGlossary1,  "Glossary2", ST_Glossary2, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	14, 22, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
 PRIVATE HTStyle HTStyleGlossary3 = {
-	&HTStyleGlossary2,  "Glossary3", "DL",
+	&HTStyleGlossary2,  "Glossary3", ST_Glossary3, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	20, 28, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
 PRIVATE HTStyle HTStyleGlossary4 = {
-	&HTStyleGlossary3,  "Glossary4", "DL",
+	&HTStyleGlossary3,  "Glossary4", ST_Glossary4, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	26, 34, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
 PRIVATE HTStyle HTStyleGlossary5 = {
-	&HTStyleGlossary4,  "Glossary5", "DL",
+	&HTStyleGlossary4,  "Glossary5", ST_Glossary5, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	32, 40, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
 PRIVATE HTStyle HTStyleGlossary6 = {
-	&HTStyleGlossary5,  "Glossary6", "DL",
+	&HTStyleGlossary5,  "Glossary6", ST_Glossary6, "DL",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	38, 46, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0
 };
 
 PRIVATE HTStyle HTStyleGlossaryCompact = {
-	&HTStyleGlossary6,  "GlossaryCompact", "DLC",
+	&HTStyleGlossary6,  "GlossaryCompact", ST_GlossaryCompact, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	3, 10, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleGlossaryCompact1 = {
-	&HTStyleGlossaryCompact,  "GlossaryCompact1", "DLC",
+	&HTStyleGlossaryCompact,  "GlossaryCompact1", ST_GlossaryCompact1, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	8, 15, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleGlossaryCompact2 = {
-	&HTStyleGlossaryCompact1,  "GlossaryCompact2", "DLC",
+	&HTStyleGlossaryCompact1,  "GlossaryCompact2", ST_GlossaryCompact2, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	13, 20, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleGlossaryCompact3 = {
-	&HTStyleGlossaryCompact2,  "GlossaryCompact3", "DLC",
+	&HTStyleGlossaryCompact2,  "GlossaryCompact3", ST_GlossaryCompact3, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	18, 25, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleGlossaryCompact4 = {
-	&HTStyleGlossaryCompact3,  "GlossaryCompact4", "DLC",
+	&HTStyleGlossaryCompact3,  "GlossaryCompact4", ST_GlossaryCompact4, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	23, 30, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleGlossaryCompact5 = {
-	&HTStyleGlossaryCompact4,  "GlossaryCompact5", "DLC",
+	&HTStyleGlossaryCompact4,  "GlossaryCompact5", ST_GlossaryCompact5, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	28, 35, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleGlossaryCompact6 = {
-	&HTStyleGlossaryCompact5,  "GlossaryCompact6", "DLC",
+	&HTStyleGlossaryCompact5,  "GlossaryCompact6", ST_GlossaryCompact6, "DLC",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	33, 40, 6, HT_LEFT,		1, 0,	0,
 	YES, YES, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleExample = {
-	&HTStyleGlossaryCompact6,  "Example", "XMP",
+	&HTStyleGlossaryCompact6,  "Example", ST_Example, "XMP",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	0, 0, 0, HT_LEFT,		1, 0,	tabs_8,
 	NO, NO, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStylePreformatted = {
-	&HTStyleExample,  	"Preformatted", "PRE",
+	&HTStyleExample,	"Preformatted", ST_Preformatted, "PRE",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	0, 0, 0, HT_LEFT,		1, 0,	tabs_8,
 	NO, NO, 0, 0,			0
 };
 
 PRIVATE HTStyle HTStyleListing = {
-	&HTStylePreformatted,  "Listing", "LISTING",
+	&HTStylePreformatted,  "Listing", ST_Listing, "LISTING",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	0, 0, 0, HT_LEFT,		1, 0,	tabs_8,
 	NO, NO, 0, 0,			0 };
 
 PRIVATE HTStyle HTStyleAddress = {
-	&HTStyleListing,  "Address", "ADDRESS",
+	&HTStyleListing,  "Address", ST_Address, "ADDRESS",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	4, 4, 7, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 2, 0,			0 };
 
 PRIVATE HTStyle HTStyleNote = { /* HTML 3.0 NOTE - FM */
-	&HTStyleAddress,  "Note", "NOTE",
+	&HTStyleAddress,  "Note", ST_Note, "NOTE",
 	HT_FONT, 1, HT_BLACK,		0, 0,
 	5, 5, 7, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleHeading1 = {
-	&HTStyleNote,  "Heading1", "H1",
+	&HTStyleNote,  "Heading1", ST_Heading1, "H1",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	0, 0, 0, HT_CENTER,		1, 0,	0,
 	YES, YES, 1, 1,			0 };
 
 PRIVATE HTStyle HTStyleHeading2 = {
-	&HTStyleHeading1,  "Heading2", "H2",
+	&HTStyleHeading1,  "Heading2", ST_Heading2, "H2",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	0, 0, 0, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 1,			0 };
 
 PRIVATE HTStyle HTStyleHeading3 = {
-	&HTStyleHeading2,  "Heading3", "H3",
+	&HTStyleHeading2,  "Heading3", ST_Heading3, "H3",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	2, 2, 0, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleHeading4 = {
-	&HTStyleHeading3,  "Heading4", "H4",
+	&HTStyleHeading3,  "Heading4", ST_Heading4, "H4",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	4, 4, 0, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleHeading5 = {
-	&HTStyleHeading4,  "Heading5", "H5",
+	&HTStyleHeading4,  "Heading5", ST_Heading5, "H5",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	6, 6, 0, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleHeading6 = {
-	&HTStyleHeading5,  "Heading6", "H6",
+	&HTStyleHeading5,  "Heading6", ST_Heading6, "H6",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	8, 8, 0, HT_LEFT,		1, 0,	0,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleHeadingCenter = {
-	&HTStyleHeading6,  "HeadingCenter", "HCENTER",
+	&HTStyleHeading6,  "HeadingCenter", ST_HeadingCenter, "HCENTER",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	0, 0, 3, HT_CENTER,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleHeadingLeft = {
-	&HTStyleHeadingCenter,  "HeadingLeft", "HLEFT",
+	&HTStyleHeadingCenter,  "HeadingLeft", ST_HeadingLeft, "HLEFT",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	0, 0, 3, HT_LEFT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
 
 PRIVATE HTStyle HTStyleHeadingRight = {
-	&HTStyleHeadingLeft,  "HeadingRight", "HRIGHT",
+	&HTStyleHeadingLeft,  "HeadingRight", ST_HeadingRight, "HRIGHT",
 	HT_FONT+HT_BOLD, 1, HT_BLACK,	0, 0,
 	0, 0, 3, HT_RIGHT,		1, 0,	tabs_8,
 	YES, YES, 1, 0,			0 };
@@ -355,6 +355,7 @@ PRIVATE HTStyle HTStyleHeadingRight = {
 PRIVATE HTStyleSheet sheet = { "default.style",
 				&HTStyleHeadingRight }; /* sheet */
 
+PRIVATE HTStyle * st_array[ST_HeadingRight + 1] = { NULL };
 
 PRIVATE HTStyleSheet *result = NULL;
 
@@ -370,7 +371,7 @@ PRIVATE void FreeDefaultStyle NOARGS
 }
 #endif /* LY_FIND_LEAKS */
 
-PUBLIC HTStyleSheet * DefaultStyle NOARGS
+PUBLIC HTStyleSheet * DefaultStyle ARGS1 (HTStyle ***, result_array)
 {
     HTStyle *p, *q;
 
@@ -381,7 +382,7 @@ PUBLIC HTStyleSheet * DefaultStyle NOARGS
      * parameters of a style that might be altered while processing a page.
      */
     if (result == 0) {	/* allocate & copy */
-    	result = HTStyleSheetNew ();
+	result = HTStyleSheetNew ();
 	*result = sheet;
 	result->styles = 0;
 #ifdef LY_FIND_LEAKS
@@ -390,17 +391,20 @@ PUBLIC HTStyleSheet * DefaultStyle NOARGS
 	for (p = sheet.styles; p != 0; p = p->next) {
 	    q = HTStyleNew ();
 	    *q = *p;
+	    st_array[q->id] = q;
 	    q->next = result->styles;
 	    result->styles = q;
 	}
     } else {		/* recopy the data */
-    	for (p = result->styles, q = sheet.styles;
+	for (q = result->styles, p = sheet.styles;
 		p != 0 && q != 0;
 		p = p->next, q = q->next) {
-    	    HTStyle *r = p->next;
-	    *p = *q;
-	    p->next = r;
+	    HTStyle *r = q->next;
+	    *q = *p;
+	    st_array[q->id] = q;
+	    q->next = r;
 	}
     }
+    *result_array = st_array;
     return result;
 }
diff --git a/gnu/usr.bin/lynx/src/GridText.c b/gnu/usr.bin/lynx/src/GridText.c
index 8b12dd33bc2..a9a073e199d 100644
--- a/gnu/usr.bin/lynx/src/GridText.c
+++ b/gnu/usr.bin/lynx/src/GridText.c
@@ -41,15 +41,7 @@
 #include <LYexit.h>
 #include <LYLeaks.h>
 
-#ifdef SH_EX	/* for DEBUG (1997/10/10 (Fri) 07:58:47) */
-#define NOTUSED_BAD_FOR_SCREEN
-#endif
-
-#undef DEBUG_APPCH
-
-#ifdef SOURCE_CACHE
-#include <HTFile.h>
-#endif
+/*#define DEBUG_APPCH 1*/
 
 #ifdef USE_COLOR_STYLE
 #include <AttrList.h>
@@ -98,14 +90,18 @@ struct _HTStream {			/* only know it as object */
 };
 
 #define TITLE_LINES  1
+
 #define IS_UTF_EXTRA(ch) (text->T.output_utf8 && \
 			  (UCH((ch))&0xc0) == 0x80)
+
+#define IS_UTF8_EXTRA(ch) (!(text && text->T.output_utf8) || \
+			  !is8bits(ch) || \
+			  (UCH(line->data[i] & 0xc0) == 0xc0))
+
 /* a test in compact form: how many extra UTF-8 chars after initial? - kw */
 #define UTF8_XNEGLEN(c) (c&0xC0? 0 :c&32? 1 :c&16? 2 :c&8? 3 :c&4? 4 :c&2? 5:0)
 #define UTF_XLEN(c) UTF8_XNEGLEN(((char)~(c)))
 
-extern BOOL HTPassHighCtrlRaw;
-
 #ifdef KANJI_CODE_OVERRIDE
 PUBLIC HTkcode last_kcode = NOKANJI;	/* 1997/11/14 (Fri) 09:09:26 */
 #endif
@@ -139,71 +135,84 @@ PUBLIC char * unchecked_radio = "( )";
 PRIVATE BOOLEAN underline_on = OFF;
 PRIVATE BOOLEAN bold_on      = OFF;
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 PUBLIC int LYCacheSource = SOURCE_CACHE_NONE;
 PUBLIC int LYCacheSourceForAborted = SOURCE_CACHE_FOR_ABORTED_DROP;
 #endif
 
 #ifdef USE_SCROLLBAR
-PUBLIC BOOLEAN LYsb = FALSE;
+PUBLIC BOOLEAN LYShowScrollbar = FALSE;
 PUBLIC BOOLEAN LYsb_arrow = TRUE;
 PUBLIC int LYsb_begin = -1;
 PUBLIC int LYsb_end = -1;
 #endif
 
-#if defined(USE_COLOR_STYLE)
-#define MAX_STYLES_ON_LINE 64
-
-    /*try to fit in 2 shorts*/
-typedef struct _stylechange {
-	unsigned int	direction:2;	/* on or off */
-	unsigned int	horizpos: (sizeof(short)*CHAR_BIT-2);
-	    /* horizontal position of this change */
-	unsigned short	style;		/* which style to change to */
-} HTStyleChange;
+#ifndef VMS			/* VMS has a better way - right? - kw */
+#define CHECK_FREE_MEM
 #endif
 
-typedef struct _line {
-	struct _line	*next;
-	struct _line	*prev;
-	unsigned	offset;		/* Implicit initial spaces */
-	unsigned	size;		/* Number of characters */
-#if defined(USE_COLOR_STYLE)
-	HTStyleChange* styles;
-	int	numstyles;
+#ifdef CHECK_FREE_MEM
+PRIVATE void * LY_check_calloc PARAMS((size_t nmemb, size_t size));
+#define LY_CALLOC LY_check_calloc
+#else
+  /* using the regular calloc */
+#define LY_CALLOC calloc
 #endif
-	char	data[1];		/* Space for terminator at least! */
-} HTLine;
+
+/*
+ * The HTPool.data[] array has to align the same as malloc() would, to make the
+ * ALLOC_POOL scheme portable.  For many platforms, that is the same as the
+ * number of bytes in a pointer.  It may be larger, e.g., on machines which
+ * have more stringent requirements for floating point.  32-bits are plenty for
+ * representing styles, but we may need 64-bit or 128-bit alignment.
+ *
+ * The real issue is that performance is degraded if the alignment is not met,
+ * and some platforms such as Tru64 generate lots of warning messages.
+ */
+#ifndef ALIGN_SIZE
+#define ALIGN_SIZE      sizeof(double)
+#endif
+
+typedef struct {
+	unsigned int	direction:2;   /* on or off */
+	unsigned int	horizpos:14;   /* horizontal position of this change */
+	unsigned int	style:16;      /* which style to change to */
+} HTStyleChange;
 
 #if defined(USE_COLOR_STYLE)
-typedef struct _HTStyleChangePool {
-	HTStyleChange	data[4092];
-	struct _HTStyleChangePool* next;
-	int free_items;
-} HTStyleChangePool;
-
-/*these are used when current line is being aggregated. */
-HTStyleChange stylechanges_buffers[2][MAX_STYLES_ON_LINE];
-int stylechanges_buffers_free;/*this is an index of the free buffer.
-    Can be 0 or 1*/
-
-/* These are generic macors for any pools (provided those structures have the
-same members as HTStyleChangePool).  Pools are used for allocation of groups of
+#define MAX_STYLES_ON_LINE   64
+  /* buffers used when current line is being aggregated, in split_line() */
+static HTStyleChange stylechanges_buffers[2][MAX_STYLES_ON_LINE];
+#endif
+
+typedef HTStyleChange pool_data;
+
+enum { POOL_SIZE = (8192 - 4*sizeof(void*) - sizeof(struct _HTPool*) - sizeof(int)) / sizeof(pool_data) };
+
+typedef struct _HTPool {
+    pool_data  data[POOL_SIZE];
+    struct _HTPool* prev;
+    int used;
+} HTPool;
+
+/************************************************************************
+These are generic macros for any pools (provided those structures have the
+same members as HTPool).  Pools are used for allocation of groups of
 objects of the same type T.  Pools are represented as a list of structures of
 type P (called pool chunks here).  Structure P has an array of N objects of
 type T named 'data' (the number N in the array can be chosen arbitrary),
-pointer to the next pool chunk named 'pool', and the number of free items in
-that pool chunk named 'free_items'.  Here is a definition of the structure P:
+pointer to the previous pool chunk named 'prev', and the number of used items
+in that pool chunk named 'used'.  Here is a definition of the structure P:
 	struct P
 	{
 	    T data[N];
-	    struct P* next;
-	    int free_items;
+	    struct P* prev;
+	    int used;
 	};
  It's recommended that sizeof(P) be memory page size minus 32 in order malloc'd
 chunks to fit in machine page size.
- Allocation of 'n' items in the pool is implemented by decrementing member
-'free_items' by 'n' if 'free_items' >= 'n', or allocating a new pool chunk and
+ Allocation of 'n' items in the pool is implemented by incrementing member
+'used' by 'n' if (used+n <= N), or malloc a new pool chunk and
 allocating 'n' items in that new chunk.  It's the task of the programmer to
 assert that 'n' is <= N.  Only entire pool may be freed - this limitation makes
 allocation algorithms trivial and fast - so the use of pools is limited to
@@ -214,107 +223,158 @@ speed due to the simple algorithms used.  Due to the fact that memory is
 'allocated' in array, alignment overhead is minimal.  Allocating strings in a
 pool provided their length will never exceed N and is much smaller than N seems
 to be very efficient.
+ [Several types of memory-hungry objects are stored in the pool now:  styles,
+lines, anchors, and FormInfo. Arrays of HTStyleChange are stored as is,
+other objects are stored using a cast.]
 
- Pool are referenced by pointer to the chunk that contains free slots. Macros
-that allocate memory in pools update that pointer if needed.
- There are 3 macros that deal with pools - POOL_NEW, POOL_FREE and
-ALLOC_IN_POOL.
- Here is a description of those macros as C++ functions (with names mentioned
-above and with use of C++ references)
-
-void ALLOC_IN_POOL( P*& pool, pool_type, int toalloc, T*& ptr)
-    - allocates 'toalloc' items in the pool of type 'pool_type' pointed by
-    'pool', sets the pointer 'ptr' to the "allocated" memory and updates 'pool'
-    if necessary. Sets 'ptr' to NULL if fails.
+ Pool is referenced by the pointer to the last chunk that contains free slots.
+Functions that allocate memory in the pool update that pointer if needed.
+There are 3 functions - POOL_NEW, POOL_FREE, and ALLOC_IN_POOL.
 
-void POOL_NEW( pool_type  , P*& ptr)
-    Initializes a pool of type 'pool_type' pointed by 'ptr', updating 'ptr'.
-    Sets 'ptr' to NULL if fails.
+      - VH
 
-void POOL_FREE( pool_type , P* ptr)
-    Frees a pool of type 'pool_type' pointed by ptr.
+*************************************************************************/
 
-      - VH */
+#define POOLallocstyles(ptr, n)     ptr = ALLOC_IN_POOL(&HTMainText->pool, n * sizeof(pool_data))
+#define POOLallocHTLine(ptr, size)  ptr = (HTLine*) ALLOC_IN_POOL(&HTMainText->pool, LINE_SIZE(size))
+#define POOLallocstring(ptr, len)   ptr = (char*) ALLOC_IN_POOL(&HTMainText->pool, len + 1)
+#define POOLtypecalloc(T, ptr)      ptr = (T*) ALLOC_IN_POOL(&HTMainText->pool, sizeof(T))
 
+/**************************************************************************/
 /*
-void ALLOC_IN_POOL( P*& pool, pool_type, int toalloc, T*& ptr)
-    - allocates 'toalloc' items in the pool of type 'pool_type' pointed by
-    'pool', sets the pointer 'ptr' to the "allocated" memory and updates 'pool'
-    if necessary. Sets 'ptr' to NULL if fails.
-*/
-#define ALLOC_IN_POOL(pool,pool_type,toalloc,ptr)     \
-if (!pool)  \
-    ptr = NULL; \
-else { \
-    if ((pool)->free_items > toalloc) { \
-	(pool)->free_items -= toalloc; \
-	ptr = (pool)->data + (pool)->free_items; \
-    } else { \
-	pool_type* newpool = (pool_type*)malloc(sizeof(pool_type)); \
-	if (!newpool) { \
-	    ptr = NULL; \
-	} else { \
-	    newpool->next = pool; \
-	    newpool->free_items = sizeof newpool->data/ \
-		    sizeof newpool->data[0] - toalloc; \
-	    pool = newpool; \
-	    ptr = newpool->data + sizeof newpool->data/sizeof newpool->data[0] - toalloc; \
-	} \
-    } \
+ *   Allocates 'n' items in the pool of type 'HTPool' pointed by 'poolptr'.
+ *   Returns a pointer to the "allocated" memory or NULL if fails.
+ *   Updates 'poolptr' if necessary.
+ */
+PRIVATE pool_data* ALLOC_IN_POOL ARGS2(
+	HTPool**,	ppoolptr,
+	unsigned,	request)
+{
+    HTPool* pool = *ppoolptr;
+    pool_data* ptr;
+    unsigned n;
+    unsigned j;
+
+    if (!pool) {
+	ptr = NULL;
+    } else {
+	n = request;
+	if (n == 0)
+	    n = 1;
+	j = (n % ALIGN_SIZE);
+	if (j != 0)
+	    n += (ALIGN_SIZE - j);
+	n /= sizeof(pool_data);
+
+	if (POOL_SIZE >= (pool->used + n)) {
+	    ptr = pool->data + pool->used;
+	    pool->used += n;
+	} else {
+	    HTPool* newpool = (HTPool*)LY_CALLOC(1, sizeof(HTPool));
+	    if (!newpool) {
+		ptr = NULL;
+	    } else {
+		newpool->prev = pool;
+		newpool->used = n;
+		ptr = newpool->data;
+		*ppoolptr = newpool;
+	   }
+	}
+    }
+    return ptr;
 }
+
 /*
-void POOL_NEW( pool_type  , P*& ptr)
-    Initializes a pool of type 'pool_type' pointed by 'ptr', updating 'ptr'.
-    Sets 'ptr' to NULL if fails.
-*/
-#define POOL_NEW(pool_type,ptr) \
-    { \
-	pool_type* newpool = (pool_type*)malloc(sizeof(pool_type)); \
-	if (!newpool) { \
-	    ptr = NULL; \
-	} else { \
-	    newpool->next = NULL; \
-	    newpool->free_items = sizeof newpool->data/sizeof newpool->data[0]; \
-	    ptr = newpool; \
-	} \
+ *   Returns a pointer to initialized pool of type 'HTPool', or NULL if fails.
+ */
+PRIVATE HTPool* POOL_NEW NOARGS
+{
+    HTPool* poolptr = (HTPool*)LY_CALLOC(1, sizeof(HTPool));
+    if (poolptr) {
+	poolptr->prev = NULL;
+	poolptr->used = 0;
     }
+    return poolptr;
+}
+
 /*
-void POOL_FREE( pool_type , P* ptr)
-    Frees a pool of type 'pool_type' pointed by ptr.
-*/
-#define POOL_FREE(pool_type,xptr) \
-    { \
-	pool_type* ptr = xptr; \
-	do { \
-	    pool_type* prevpool = ptr; \
-	    ptr = ptr->next; \
-	    FREE(prevpool); \
-	} while (ptr); \
+ *   Frees a pool of type 'HTPool' pointed by poolptr.
+ */
+PRIVATE void POOL_FREE ARGS1(
+	HTPool*,	poolptr)
+{
+    HTPool* cur = poolptr;
+    HTPool* prev;
+    while (cur) {
+	prev = cur->prev;
+	free(cur);
+	cur = prev;
+    }
+}
+
+/**************************************************************************/
+/**************************************************************************/
+
+typedef struct _line {
+	struct _line    *next;
+	struct _line    *prev;
+	unsigned short	offset;	/* Implicit initial spaces */
+	unsigned short	size;	/* Number of characters */
+#if defined(USE_COLOR_STYLE)
+	HTStyleChange*  styles;
+	unsigned short  numstyles;
+#endif
+	char	data[1];	/* Space for terminator at least! */
+} HTLine;
+
+
+#define LINE_SIZE(size) (sizeof(HTLine)+(size))   /* Allow for terminator */
+
+#define HTLINE_NOT_IN_POOL 0	/* debug with this set to 1 */
+
+#if HTLINE_NOT_IN_POOL
+#define allocHTLine(ptr, size)  { ptr = (HTLine *)calloc(1, LINE_SIZE(size)); }
+#define freeHTLine(self, ptr)   { \
+	if (ptr && ptr != TEMP_LINE(self, 0) && ptr != TEMP_LINE(self, 1)) \
+	    FREE(ptr); \
     }
+#else
+#define allocHTLine(ptr, size)  POOLallocHTLine(ptr, size)
+#define freeHTLine(self, ptr)   {}
 #endif
 
-#define LINE_SIZE(l) (sizeof(HTLine)+(l))	/* Allow for terminator */
-#define allocHTLine(l) (HTLine *)calloc(1, LINE_SIZE(l))
+/*
+ * Last line buffer; the second is used in split_line(). Not in pool!
+ * We cannot wrap in middle of multibyte sequences, so allocate 2 extra
+ * for a workspace.  This is stored in the HText, to prevent confusion
+ * between different documents.  Note also that it is declared with an
+ * HTLine at the beginning so pointers will be properly aligned.
+ */
+typedef struct {
+	HTLine	base;
+	char    data[MAX_LINE+2];
+} HTLineTemp;
+
+#define TEMP_LINE(p,n) ((HTLine *)&(p->temp_line[n]))
 
 typedef struct _TextAnchor {
 	struct _TextAnchor *	next;
 	struct _TextAnchor *	prev;		/* www_user_search only! */
 	int			number;		/* For user interface */
-	int			line_pos;	/* Bytes/chars - extent too */
-	int			extent;		/* (see HText_trimHightext) */
 	int			line_num;	/* Place in document */
-	char *			hightext;	/* The link text */
-	char *			hightext2;	/* A second line*/
-	int			hightext2offset;/* offset from left */
-	int			link_type;	/* Normal, internal, or form? */
-	FormInfo *		input_field;	/* Info for form links */
+	short			line_pos;	/* Bytes/chars - extent too */
+	short			extent;		/* (see HText_trimHightext) */
 	BOOL			show_anchor;	/* Show the anchor? */
 	BOOL			inUnderline;	/* context is underlined */
 	BOOL			expansion_anch; /* TEXTAREA edit new anchor */
+	char			link_type;	/* Normal, internal, or form? */
+	FormInfo *		input_field;	/* Info for form links */
+	HiliteList		lites;
+
 	HTChildAnchor *		anchor;
 } TextAnchor;
 
-typedef struct _HTTabID {
+typedef struct {
 	char *			name;		/* ID value of TAB */
 	int			column;		/* Zero-based column value */
 } HTTabID;
@@ -327,27 +387,14 @@ typedef struct _HTTabID {
 */
 struct _HText {
 	HTParentAnchor *	node_anchor;
-#ifdef SOURCE_CACHE
-	/*
-	 * Parse settings when this HText was generated.
-	 */
-	BOOLEAN			clickable_images;
-	BOOLEAN			pseudo_inline_alts;
-	BOOLEAN			verbose_img;
-	BOOLEAN			raw_mode;
-	BOOLEAN			historical_comments;
-	BOOLEAN			minimal_comments;
-	BOOLEAN			soft_dquotes;
-	int			old_dtd;
-	int			keypad_mode;
-	int			disp_lines;	/* Screen size */
-	int			disp_cols;	/* Used for reports only */
-#endif
+
 	HTLine *		last_line;
+	HTLineTemp		temp_line[2];
 	int			Lines;		/* Number of them */
-	TextAnchor *		first_anchor;	/* Singly linked list */
+	TextAnchor *		first_anchor;	/* double-linked on demand */
 	TextAnchor *		last_anchor;
 	TextAnchor *		last_anchor_before_stbl;
+	TextAnchor *		last_anchor_before_split;
 	HTList *		forms;		/* also linked internally */
 	int			last_anchor_number;	/* user number */
 	BOOL			source;		/* Is the text source? */
@@ -376,6 +423,7 @@ struct _HText {
 	int			last_lineno_last_disp_partial;
 #endif
 	STable_info *		stbl;
+	HTList *		enclosed_stbl;
 
 	HTkcode			kcode;			/* Kanji code? */
 	HTkcode			specified_kcode;	/* Specified Kanji code */
@@ -391,23 +439,47 @@ struct _HText {
 	enum grid_state       { S_text, S_esc, S_dollar, S_paren,
 				S_nonascii_text, S_dollar_paren,
 				S_jisx0201_text }
-				state;			/* Escape sequence? */
-	int			kanji_buf;		/* Lead multibyte */
-	int			in_sjis;		/* SJIS flag */
-	int			halted;			/* emergency halt */
-
-	BOOL			have_8bit_chars;   /* Any non-ASCII chars? */
-	LYUCcharset *		UCI;		   /* node_anchor UCInfo */
-	int			UCLYhndl;	   /* charset we are fed */
+				state;		/* Escape sequence? */
+	int			kanji_buf;	/* Lead multibyte */
+	int			in_sjis;	/* SJIS flag */
+	int			halted;		/* emergency halt */
+
+	BOOL			have_8bit_chars; /* Any non-ASCII chars? */
+	LYUCcharset *		UCI;		/* node_anchor UCInfo */
+	int			UCLYhndl;	/* charset we are fed */
 	UCTransParams		T;
 
-	HTStream *		target;			/* Output stream */
-	HTStreamClass		targetClass;		/* Output routines */
-#if defined(USE_COLOR_STYLE)
-	HTStyleChangePool*	styles_pool;
+	HTStream *		target;		/* Output stream */
+	HTStreamClass		targetClass;	/* Output routines */
+
+	HTPool*			pool;		/* this HText memory pool */
+
+#ifdef USE_SOURCE_CACHE
+	/*
+	* Parse settings when this HText was generated.
+	*/
+	BOOL			clickable_images;
+	BOOL			pseudo_inline_alts;
+	BOOL			verbose_img;
+	BOOL			raw_mode;
+	BOOL			historical_comments;
+	BOOL			minimal_comments;
+	BOOL			soft_dquotes;
+	short			old_dtd;
+	short			keypad_mode;
+	short			disp_lines;	/* Screen size */
+	short			disp_cols;	/* Used for reports only */
 #endif
 };
 
+/* exported */
+PUBLIC void* HText_pool_calloc ARGS2(
+	HText *,	text,
+	unsigned,	size)
+{
+    return (void*) ALLOC_IN_POOL(&text->pool, size);
+}
+
 PRIVATE void HText_AddHiddenLink PARAMS((HText *text, TextAnchor *textanchor));
 
 #ifdef EXP_JUSTIFY_ELTS
@@ -427,7 +499,7 @@ PUBLIC BOOL can_justify_stack_depth;/* can be 0 or 1 if all code is correct*/
 #endif
 
 
-typedef struct ht_run_info_ {
+typedef struct {
     int byte_len;		/*length in bytes*/
     int cell_len;		/*length in cells*/
 } ht_run_info;
@@ -471,8 +543,6 @@ PUBLIC void mark_justify_start_position ARGS1(void*,text)
 	HTCJK == NOCJK && !in_DT && \
 	can_justify_here && can_justify_this_line && !form_in_htext )
 
-#else
-#define last_anchor_of_previous_line (TextAnchor*)0
 #endif /* EXP_JUSTIFY_ELTS */
 
 
@@ -494,9 +564,14 @@ PUBLIC char star_string[MAX_LINE + 1];
 PRIVATE int ctrl_chars_on_this_line = 0; /* num of ctrl chars in current line */
 PRIVATE int utfxtra_on_this_line = 0; /* num of UTF-8 extra bytes in line,
 				       they *also* count as ctrl chars. */
+#ifdef WIDEC_CURSES
+#define UTFXTRA_ON_THIS_LINE 0
+#else
+#define UTFXTRA_ON_THIS_LINE utfxtra_on_this_line
+#endif
 
 PRIVATE HTStyle default_style =
-	{ 0,  "(Unstyled)", "",
+	{ 0,  "(Unstyled)", 0, "",
 	(HTFont)0, 1, HT_BLACK,		0, 0,
 	0, 0, 0, HT_LEFT,		1, 0,	0,
 	NO, NO, 0, 0,			0 };
@@ -508,15 +583,16 @@ PUBLIC  HTList * search_queries = NULL;  /* isindex and whereis queries   */
 #ifdef LY_FIND_LEAKS
 PRIVATE void free_all_texts NOARGS;
 #endif
-PRIVATE int HText_TrueLineSize PARAMS((
+
+PRIVATE BOOL HText_TrueEmptyLine PARAMS((
 	HTLine *	line,
 	HText *		text,
 	BOOL		IgnoreSpaces));
 
-#ifndef VMS			/* VMS has a better way - right? - kw */
-#define CHECK_FREE_MEM
-#endif
-
+PRIVATE int HText_TrueLineSize PARAMS((
+	HTLine *	line,
+	HText *		text,
+	BOOL		IgnoreSpaces));
 
 #ifdef CHECK_FREE_MEM
 
@@ -585,10 +661,7 @@ PRIVATE void * LY_check_calloc ARGS2(
     }
     n = HTList_count(loaded_texts);
     for (i = n - 1; i > 0; i--) {
-	HText * t = HTList_objectAt(loaded_texts, i);
-	if (t == HTMainText)
-	    t = NULL;		/* shouldn't happen */
-	{
+	HText * t = (HText *) HTList_objectAt(loaded_texts, i);
 	CTRACE((tfp, "\nBUG *** Emergency freeing document %d/%d for '%s'%s!\n",
 		    i + 1, n,
 		    ((t && t->node_anchor &&
@@ -597,7 +670,6 @@ PRIVATE void * LY_check_calloc ARGS2(
 		    ((t && t->node_anchor &&
 		      t->node_anchor->post_data) ?
 		     " with POST data" : "")));
-	}
 	HTList_removeObjectAt(loaded_texts, i);
 	HText_free(t);
 	if (mem_is_avail(4, nmemb * size)) {
@@ -623,14 +695,146 @@ PRIVATE void * LY_check_calloc ARGS2(
     return (calloc(nmemb, size));
 }
 
-#define LY_CALLOC LY_check_calloc
+#endif /* CHECK_FREE_MEM */
 
-#else  /* CHECK_FREE_MEM */
+/*
+ * Clear highlight information for a given anchor
+ * (text was allocated in the pool).
+ */
+PRIVATE void LYClearHiText ARGS1(
+	TextAnchor *,	a)
+{
+    FREE(a->lites.hl_info);
 
-  /* using the regular calloc */
-#define LY_CALLOC calloc
+    a->lites.hl_base.hl_text = NULL;
+    a->lites.hl_len = 0;
+}
+#define LYFreeHiText(a)     FREE((a)->lites.hl_info)
 
-#endif /* CHECK_FREE_MEM */
+/*
+ * Set the initial highlight information for a given anchor.
+ */
+PRIVATE void LYSetHiText ARGS3(
+	TextAnchor *,	a,
+	char *,		text,
+	int,		len)
+{
+    if (text != NULL) {
+	POOLallocstring(a->lites.hl_base.hl_text, len + 1);
+	memcpy(a->lites.hl_base.hl_text, text, len);
+	*(a->lites.hl_base.hl_text + len) = '\0';
+
+	a->lites.hl_len = 1;
+    }
+}
+
+/*
+ * Add highlight information for the next line of a anchor.
+ */
+PRIVATE void LYAddHiText ARGS3(
+	TextAnchor *,	a,
+	char *,		text,
+	int,		x)
+{
+    HiliteInfo *have = a->lites.hl_info;
+    unsigned need = (a->lites.hl_len - 1);
+    unsigned want = (a->lites.hl_len += 1) * sizeof(HiliteInfo);
+
+    if (have != NULL) {
+	have = (HiliteInfo *) realloc(have, want);
+    } else {
+	have = (HiliteInfo *) malloc(want);
+    }
+    a->lites.hl_info = have;
+
+    POOLallocstring(have[need].hl_text, strlen(text) + 1);
+    strcpy(have[need].hl_text, text);
+    have[need].hl_x = x;
+}
+
+/*
+ * Return an offset to skip leading blanks in the highlighted link.  That is
+ * needed to avoid having the color-style paint the leading blanks.
+ */
+#ifdef USE_COLOR_STYLE
+PRIVATE int LYAdjHiTextPos ARGS2(
+	TextAnchor *,	a,
+	int,		count)
+{
+    char *result;
+
+    if (count >= a->lites.hl_len)
+	result = NULL;
+    else if (count > 0)
+	result = a->lites.hl_info[count - 1].hl_text;
+    else
+	result = a->lites.hl_base.hl_text;
+
+    return (result != 0) ? (LYSkipBlanks(result) - result) : 0;
+}
+#else
+#define LYAdjHiTextPos(a,count) 0
+#endif
+
+/*
+ * Get the highlight text, counting from zero.
+ */
+PRIVATE char *LYGetHiTextStr ARGS2(
+	TextAnchor *,	a,
+	int,		count)
+{
+    char *result;
+
+    if (count >= a->lites.hl_len)
+	result = NULL;
+    else if (count > 0)
+	result = a->lites.hl_info[count - 1].hl_text;
+    else
+	result = a->lites.hl_base.hl_text;
+    result += LYAdjHiTextPos(a, count);
+    return result;
+}
+
+/*
+ * Get the X-ordinate at which to draw the corresponding highlight-text
+ */
+PRIVATE int LYGetHiTextPos ARGS2(
+	TextAnchor *,	a,
+	int,		count)
+{
+    int result;
+
+    if (count >= a->lites.hl_len)
+	result = -1;
+    else if (count > 0)
+	result = a->lites.hl_info[count - 1].hl_x;
+    else
+	result = a->line_pos;
+    result += LYAdjHiTextPos(a, count);
+    return result;
+}
+
+/*
+ * Copy highlighting information from anchor 'b' to 'a'.
+ */
+PRIVATE void LYCopyHiText ARGS2(
+	TextAnchor *,	a,
+	TextAnchor *,	b)
+{
+    int count;
+    char *s;
+
+    LYClearHiText(a);
+    for (count = 0; ; ++count) {
+	if ((s = LYGetHiTextStr(b, count)) == NULL)
+	    break;
+	if (count == 0) {
+	    LYSetHiText(a, s, strlen(s));
+	} else {
+	    LYAddHiText(a, s, LYGetHiTextPos(b, count));
+	}
+    }
+}
 
 PRIVATE void HText_getChartransInfo ARGS1(
 	HText *,	me)
@@ -656,6 +860,54 @@ PRIVATE void PerFormInfo_free ARGS1(
     }
 }
 
+PRIVATE void free_form_fields ARGS1(
+	FormInfo *,	input_field)
+{
+    /*
+     *  Free form fields.
+     */
+    if (input_field->type == F_OPTION_LIST_TYPE &&
+	input_field->select_list != NULL) {
+	/*
+	 *  Free off option lists if present.
+	 *  It should always be present for F_OPTION_LIST_TYPE
+	 *  unless we had invalid markup which prevented
+	 *  HText_setLastOptionValue from finishing its job
+	 *  and left the input field in an insane state. - kw
+	 */
+	OptionType *optptr = input_field->select_list;
+	OptionType *tmp;
+	while (optptr) {
+	    tmp = optptr;
+	    optptr = tmp->next;
+	    FREE(tmp->name);
+	    FREE(tmp->cp_submit_value);
+	    FREE(tmp);
+	}
+	input_field->select_list = NULL;
+	/*
+	 *  Don't free the value field on option
+	 *  lists since it points to a option value
+	 *  same for orig value.
+	 */
+	input_field->value = NULL;
+	input_field->orig_value = NULL;
+	input_field->cp_submit_value = NULL;
+	input_field->orig_submit_value = NULL;
+    } else {
+	FREE(input_field->value);
+	FREE(input_field->orig_value);
+	FREE(input_field->cp_submit_value);
+	FREE(input_field->orig_submit_value);
+    }
+    FREE(input_field->name);
+    FREE(input_field->submit_action);
+    FREE(input_field->submit_enctype);
+    FREE(input_field->submit_title);
+
+    FREE(input_field->accept_cs);
+}
+
 PRIVATE void FormList_delete ARGS1(
     HTList *,		forms)
 {
@@ -714,13 +966,14 @@ PUBLIC HText *	HText_new ARGS1(
     /*
      *  Links between anchors & documents are a 1-1 relationship.  If
      *  an anchor is already linked to a document we didn't call
-     *  HTuncache_current_document(), e.g., for the showinfo, options,
-     *  download, print, etc., temporary file URLs, so we'll check now
+     *  HTuncache_current_document(),  so we'll check now
      *  and free it before reloading. - Dick Wesseling (ftu@fi.ruu.nl)
      */
     if (anchor->document) {
 	HTList_removeObject(loaded_texts, anchor->document);
 	CTRACE((tfp, "GridText: Auto-uncaching\n")) ;
+
+	HTAnchor_delete_links(anchor);
 	((HText *)anchor->document)->node_anchor = NULL;
 	HText_free((HText *)anchor->document);
 	anchor->document = NULL;
@@ -742,21 +995,21 @@ PUBLIC HText *	HText_new ARGS1(
 #endif /* VMS && VAXC && !__DECC */
     }
 
-    line = self->last_line = allocHTLine(MAX_LINE);
-    if (line == NULL)
+    self->pool = POOL_NEW();
+    if (!self->pool)
 	outofmem(__FILE__, "HText_New");
+
+    line = self->last_line = TEMP_LINE(self, 0);
     line->next = line->prev = line;
     line->offset = line->size = 0;
+    line->data[line->size] = '\0';
 #ifdef USE_COLOR_STYLE
     line->numstyles = 0;
-    POOL_NEW(HTStyleChangePool,self->styles_pool);
-    if (!self->styles_pool)
-	outofmem(__FILE__, "HText_New");
-    stylechanges_buffers_free = 0;
     line->styles = stylechanges_buffers[0];
 #endif
     self->Lines = 0;
     self->first_anchor = self->last_anchor = NULL;
+    self->last_anchor_before_split = NULL;
     self->style = &default_style;
     self->top_of_screen = 0;
     self->node_anchor = anchor;
@@ -764,7 +1017,7 @@ PUBLIC HText *	HText_new ARGS1(
     self->stale = YES;
     self->toolbar = NO;
     self->tabs = NULL;
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     /*
      * Remember the parse settings.
      */
@@ -796,8 +1049,10 @@ PUBLIC HText *	HText_new ARGS1(
     else
 	self->hiddenlinkflag = LYHiddenLinks;
     self->hidden_links = NULL;
-    self->no_cache = ((anchor->no_cache || anchor->post_data) ?
-							  YES : NO);
+    self->no_cache = ((anchor->no_cache ||
+		      anchor->post_data)
+		      ? YES
+		      : NO);
     self->LastChar = '\0';
     self->IgnoreExcess = FALSE;
 
@@ -838,7 +1093,7 @@ PUBLIC HText *	HText_new ARGS1(
 		     &LYCharSet_UC[current_char_set]);
 
     /*
-     *  Check the kcode setting if the anchor has a charset element. - FM
+     *  Check the kcode setting if the anchor has a charset element. -FM
      */
     HText_setKcode(self, anchor->charset,
 		   HTAnchor_getUCInfoStage(anchor, UCT_STAGE_HTEXT));
@@ -851,13 +1106,13 @@ PUBLIC HText *	HText_new ARGS1(
      */
     if (underscore_string[0] != '.') {
 	/*
-	 *  Create an array of dots for the UNDERSCORES macro. - FM
+	 *  Create an array of dots for the UNDERSCORES macro. -FM
 	 */
 	memset(underscore_string, '.', (MAX_LINE-1));
 	underscore_string[(MAX_LINE-1)] = '\0';
 	underscore_string[MAX_LINE] = '\0';
 	/*
-	 *  Create an array of underscores for the STARS macro. - FM
+	 *  Create an array of underscores for the STARS macro. -FM
 	 */
 	memset(star_string, '_', (MAX_LINE-1));
 	star_string[(MAX_LINE-1)] = '\0';
@@ -921,89 +1176,34 @@ PUBLIC void HText_free ARGS1(
     if (!self)
 	return;
 
-    HTAnchor_setDocument(self->node_anchor, (HyperDoc *)0);
-#if defined(USE_COLOR_STYLE)
-    POOL_FREE(HTStyleChangePool,self->styles_pool);
-#endif
-    while (YES) {	/* Free off line array */
-	HTLine * l = self->last_line;
-	if (l) {
-	    l->next->prev = l->prev;
-	    l->prev->next = l->next;	/* Unlink l */
+#if HTLINE_NOT_IN_POOL
+    {
+	HTLine *f = FirstHTLine(self);
+	HTLine *l = self->last_line;
+
+	while (l != f) {	/* Free off line array */
 	    self->last_line = l->prev;
-	    if (l != self->last_line) {
-		FREE(l);
-	    } else {
-		free(l);
-	    }
-	}
-	if (l == self->last_line) {	/* empty */
-	    l = self->last_line = NULL;
-	    break;
+	    freeHTLine(self, l);
+	    l = self->last_line;
 	}
+	freeHTLine(self, f);
     }
+#endif
 
     while (self->first_anchor) {		/* Free off anchor array */
 	TextAnchor * l = self->first_anchor;
 	self->first_anchor = l->next;
 
 	if (l->link_type == INPUT_ANCHOR && l->input_field) {
-	    /*
-	     *  Free form fields.
-	     */
-	    if (l->input_field->type == F_OPTION_LIST_TYPE &&
-		l->input_field->select_list != NULL) {
-		/*
-		 *  Free off option lists if present.
-		 *  It should always be present for F_OPTION_LIST_TYPE
-		 *  unless we had invalid markup which prevented
-		 *  HText_setLastOptionValue from finishing its job
-		 *  and left the input field in an insane state. - kw
-		 */
-		OptionType *optptr = l->input_field->select_list;
-		OptionType *tmp;
-		while (optptr) {
-		    tmp = optptr;
-		    optptr = tmp->next;
-		    FREE(tmp->name);
-		    FREE(tmp->cp_submit_value);
-		    FREE(tmp);
-		}
-		l->input_field->select_list = NULL;
-		/*
-		 *  Don't free the value field on option
-		 *  lists since it points to a option value
-		 *  same for orig value.
-		 */
-		l->input_field->value = NULL;
-		l->input_field->orig_value = NULL;
-		l->input_field->cp_submit_value = NULL;
-		l->input_field->orig_submit_value = NULL;
-	    } else {
-		FREE(l->input_field->value);
-		FREE(l->input_field->orig_value);
-		FREE(l->input_field->cp_submit_value);
-		FREE(l->input_field->orig_submit_value);
-	    }
-	    FREE(l->input_field->name);
-	    FREE(l->input_field->submit_action);
-	    FREE(l->input_field->submit_enctype);
-	    FREE(l->input_field->submit_title);
-
-	    FREE(l->input_field->accept_cs);
-
-	    FREE(l->input_field);
+	    free_form_fields(l->input_field);
 	}
 
-	FREE(l->hightext);
-	FREE(l->hightext2);
-
-	FREE(l);
+	LYFreeHiText(l);
     }
     FormList_delete(self->forms);
 
     /*
-     *  Free the tabs list. - FM
+     *  Free the tabs list. -FM
      */
     if (self->tabs) {
 	HTTabID * Tab = NULL;
@@ -1018,7 +1218,7 @@ PUBLIC void HText_free ARGS1(
     }
 
     /*
-     *  Free the hidden links list. - FM
+     *  Free the hidden links list. -FM
      */
     if (self->hidden_links) {
 	char * href = NULL;
@@ -1032,14 +1232,14 @@ PUBLIC void HText_free ARGS1(
 
     /*
      *  Invoke HTAnchor_delete() to free the node_anchor
-     *  if it is not a destination of other links. - FM
+     *  if it is not a destination of other links. -FM
      */
     if (self->node_anchor) {
 	HTAnchor_resetUCInfoStage(self->node_anchor, -1, UCT_STAGE_STRUCTURED,
 				  UCT_SETBY_NONE);
 	HTAnchor_resetUCInfoStage(self->node_anchor, -1, UCT_STAGE_HTEXT,
 				  UCT_SETBY_NONE);
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 	/* Remove source cache files and chunks always, even if the
 	 * HTAnchor_delete call does not actually remove the anchor.
 	 * Keeping them would just be a waste of space - they won't
@@ -1048,7 +1248,12 @@ PUBLIC void HText_free ARGS1(
 	 */
 	HTAnchor_clearSourceCache(self->node_anchor);
 #endif
-	if (HTAnchor_delete(self->node_anchor))
+
+	HTAnchor_delete_links(self->node_anchor);
+
+	HTAnchor_setDocument(self->node_anchor, (HyperDoc *)0);
+
+	if (HTAnchor_delete(self->node_anchor->parent))
 	    /*
 	     *  Make sure HTMainAnchor won't point
 	     *  to an invalid structure. - KW
@@ -1056,6 +1261,7 @@ PUBLIC void HText_free ARGS1(
 	    HTMainAnchor = NULL;
     }
 
+    POOL_FREE(self->pool);
     FREE(self);
 }
 
@@ -1094,7 +1300,7 @@ PRIVATE int display_line ARGS4(
 #define intarget NO
 #endif /* SHOW_WHEREIS_TARGETS && !USE_COLOR_STYLE */
 
-#ifndef NCURSES_VERSION
+#if !(defined(NCURSES_VERSION) || defined(WIDEC_CURSES))
     text->has_utf8 = NO; /* use as per-line flag, except with ncurses */
 #endif
 
@@ -1178,8 +1384,8 @@ PRIVATE int display_line ARGS4(
 		if (!cp_tgt || i_start_tgt != i) {
 		    LYstopTargetEmphasis();
 		    intarget = NO;
-		    if (inbold)		start_bold();
-		    if (inunderline)	start_underline();
+		    if (inbold)		lynx_start_bold();
+		    if (inunderline)	lynx_start_underline();
 		}
 	    }
 	}
@@ -1194,7 +1400,7 @@ PRIVATE int display_line ARGS4(
 	while (current_style < line->numstyles &&
 	       i >= (int) (CStyle.horizpos + line->offset + 1))
 	{
-	    LynxChangeStyle (CStyle.style,CStyle.direction);
+	    LynxChangeStyle (CStyle.style, CStyle.direction);
 	    current_style++;
 	}
 #endif
@@ -1208,14 +1414,14 @@ PRIVATE int display_line ARGS4(
 		} else {
 		    inunderline = YES;
 		    if (!intarget) {
-#if (defined(DOSPATH) || defined(WIN_EX)) && !defined(USE_SLANG)
+#if defined(PDCURSES)
 			if (LYShowColor == SHOW_COLOR_NEVER)
-			    start_bold();
+			    lynx_start_bold();
 			else
-			    start_underline();
+			    lynx_start_underline();
 #else
-			start_underline();
-#endif	/* DOSPATH ... */
+			lynx_start_underline();
+#endif	/* PDCURSES */
 		    }
 		}
 		break;
@@ -1227,14 +1433,14 @@ PRIVATE int display_line ARGS4(
 		} else {
 		    inunderline = NO;
 		    if (!intarget) {
-#if (defined(DOSPATH) || defined(WIN_EX)) && !defined(USE_SLANG)
+#if defined(PDCURSES)
 		    if (LYShowColor == SHOW_COLOR_NEVER)
-			stop_bold();
+			lynx_stop_bold();
 		    else
-			stop_underline();
+			lynx_stop_underline();
 #else
-		    stop_underline();
-#endif	/* DOSPATH ... */
+		    lynx_stop_underline();
+#endif	/* PDCURSES */
 		    }
 		}
 		break;
@@ -1242,13 +1448,13 @@ PRIVATE int display_line ARGS4(
 	    case LY_BOLD_START_CHAR:
 		inbold = YES;
 		if (!intarget)
-		    start_bold();
+		    lynx_start_bold();
 		break;
 
 	    case LY_BOLD_END_CHAR:
 		inbold = NO;
 		if (!intarget)
-		    stop_bold();
+		    lynx_stop_bold();
 		break;
 
 #endif
@@ -1256,6 +1462,9 @@ PRIVATE int display_line ARGS4(
 		if (!dump_output_immediately) {
 		    LYaddch('+');
 		    i++;
+#if defined(SHOW_WHEREIS_TARGETS) && !defined(USE_COLOR_STYLE)
+		    i_after_tgt++;
+#endif
 		}
 		break;
 
@@ -1271,12 +1480,12 @@ PRIVATE int display_line ARGS4(
 		     *  into LastDisplayChar if it was a multibyte
 		     *  character) or hyphen, though it should have
 		     *  been excluded by HText_appendCharacter() or by
-		     *  split_line() in those cases. - FM
+		     *  split_line() in those cases. -FM
 		     */
 		    break;
 		} else {
 		    /*
-		     *  Make it a hard hyphen and fall through. - FM
+		     *  Make it a hard hyphen and fall through. -FM
 		     */
 		    buffer[0] = '-';
 		}
@@ -1297,30 +1506,9 @@ PRIVATE int display_line ARGS4(
 #endif /* SHOW_WHEREIS_TARGETS */
 #endif /* USE_COLOR_STYLE */
 		i++;
-		if (text->T.output_utf8 && !isascii(UCH(buffer[0]))) {
+		if (text->T.output_utf8 && is8bits(buffer[0])) {
 		    text->has_utf8 = YES;
-		    if ((*buffer & 0xe0) == 0xc0) {
-			utf_extra = 1;
-		    } else if ((*buffer & 0xf0) == 0xe0) {
-			utf_extra = 2;
-		    } else if ((*buffer & 0xf8) == 0xf0) {
-			utf_extra = 3;
-		    } else if ((*buffer & 0xfc) == 0xf8) {
-			utf_extra = 4;
-		    } else if ((*buffer & 0xfe) == 0xfc) {
-			utf_extra = 5;
-		    } else {
-			 /*
-			  *  Garbage.
-			  */
-			utf_extra = 0;
-		    }
-		    if (strlen(data) < utf_extra) {
-			/*
-			 *  Shouldn't happen.
-			 */
-			utf_extra = 0;
-		    }
+		    utf_extra = utf8_length(text->T.output_utf8, data-1);
 		    LastDisplayChar = 'M';
 		}
 		if (utf_extra) {
@@ -1330,7 +1518,7 @@ PRIVATE int display_line ARGS4(
 		    buffer[1] = '\0';
 		    data += utf_extra;
 		    utf_extra = 0;
-		} else if (HTCJK != NOCJK && !isascii(UCH(buffer[0]))
+		} else if (HTCJK != NOCJK && is8bits(buffer[0])
 #ifndef CONV_JISX0201KANA_JISX0208KANA
 		    && kanji_code != SJIS
 #endif
@@ -1355,7 +1543,7 @@ PRIVATE int display_line ARGS4(
 		     *  spacing characters in this code set,
 		     *  but this will become an issue when
 		     *  the development code set's multibyte
-		     *  character handling is used. - FM
+		     *  character handling is used. -FM
 		     */
 		    LastDisplayChar = 'M';
 		} else {
@@ -1366,7 +1554,7 @@ PRIVATE int display_line ARGS4(
     } /* end of while */
 
 after_while:
-#if !defined(NCURSES_VERSION)
+#if !(defined(NCURSES_VERSION) || defined(WIDEC_CURSES))
     if (text->has_utf8) {
 	LYtouchline(scrline);
 	text->has_utf8 = NO;	/* we had some, but have dealt with it. */
@@ -1384,8 +1572,8 @@ after_while:
 #undef intarget
 #endif /* SHOW_WHEREIS_TARGETS && !USE_COLOR_STYLE */
 #ifndef USE_COLOR_STYLE
-    stop_underline();
-    stop_bold();
+    lynx_stop_underline();
+    lynx_stop_bold();
 #else
     while (current_style < line->numstyles)
     {
@@ -1411,7 +1599,7 @@ PRIVATE void display_title ARGS1(
     int limit;
 
     /*
-     *  Make sure we have a text structure. - FM
+     *  Make sure we have a text structure. -FM
      */
     if (!text)
 	return;
@@ -1427,7 +1615,7 @@ PRIVATE void display_title ARGS1(
 #endif /* USE_COLOR_STYLE */
 
     /*
-     *  Load the title field. - FM
+     *  Load the title field. -FM
      */
     StrAllocCopy(title,
 		 (HTAnchor_title(text->node_anchor) ?
@@ -1436,7 +1624,7 @@ PRIVATE void display_title ARGS1(
     /*
      *  There shouldn't be any \n in the title field,
      *  but if there is, lets kill it now.  Also trim
-     *  any trailing spaces. - FM
+     *  any trailing spaces. -FM
      */
     if ((cp = strchr(title,'\n')) != NULL)
 	*cp = '\0';
@@ -1481,7 +1669,7 @@ PRIVATE void display_title ARGS1(
     /*
      *  Generate and display the title string, with page indicator
      *  if appropriate, preceded by the toolbar token if appropriate,
-     *  and truncated if necessary. - FM & KW
+     *  and truncated if necessary. -FM & KW
      */
     if (HTCJK != NOCJK) {
 	if (*title &&
@@ -1532,11 +1720,9 @@ PRIVATE void display_title ARGS1(
 	LYmove(0, i);
     } else {
 	/*
-	 *  Note that this truncation is not taking into
-	 *  account the possibility that multibyte
-	 *  characters might be present. - FM
+	 *  Truncation takes into account the possibility that
+	 *  multibyte characters might be present. -HS (H. Senshu)
 	 */
-#ifdef SH_EX	/* 1999/06/15 (Tue) 10:17:28 */
 	int last;
 	last = (int)strlen(percent) + CHAR_WIDTH;
 	if (limit - 3 >= last) {
@@ -1546,10 +1732,6 @@ PRIVATE void display_title ARGS1(
 	} else {
 	    title[(limit - 1) - last] = '\0';
 	}
-#else
-	if ((i = ((limit - 2) - strlen(percent)) - CHAR_WIDTH) >= 0)
-	    title[i] = '\0';
-#endif
 	LYmove(0, CHAR_WIDTH);
     }
     LYaddstr(title);
@@ -1558,6 +1740,16 @@ PRIVATE void display_title ARGS1(
     LYaddch('\n');
     FREE(title);
 
+#if defined(USE_COLOR_STYLE) && defined(CAN_CUT_AND_PASTE)
+    if (s_hot_paste != NOSTYLE) {	/* Only if the user set the style */
+	LYmove(0, LYcols - 1);
+	LynxChangeStyle(s_hot_paste, STACK_ON);
+	LYaddch(ACS_RARROW);
+	LynxChangeStyle(s_hot_paste, STACK_OFF);
+	LYmove(1, 0);			/* As after \n */
+    }
+#endif /* USE_COLOR_STYLE */
+
 #ifdef USE_COLOR_STYLE
 /* turn the TITLE style off */
     LynxChangeStyle(s_title, STACK_OFF);
@@ -1580,7 +1772,7 @@ PRIVATE void display_scrollbar ARGS1(
     int top_skip, bot_skip, sh, shown;
 
     LYsb_begin = LYsb_end = -1;
-    if (!LYsb || !text || h <= 2
+    if (!LYShowScrollbar || !text || h <= 2
 	|| (text->Lines + 1) <= display_lines)
 	return;
 
@@ -1651,10 +1843,11 @@ PRIVATE void display_scrollbar ARGS1(
 	    LynxChangeStyle(s_sb_bar, STACK_OFF);
 #endif /* USE_COLOR_STYLE */
 	LYmove(i + off, LYcols + LYshiftWin - 1);
-	if (i > top_skip && i <= h - bot_skip)
+	if (i > top_skip && i <= h - bot_skip) {
 	    LYaddch(ACS_BLOCK);
-	else
+	} else {
 	    LYaddch(ACS_CKBOARD);
+	}
     }
 #ifdef USE_COLOR_STYLE
     LynxChangeStyle(s_sb_bg, STACK_OFF);
@@ -1682,6 +1875,7 @@ PRIVATE void display_scrollbar ARGS1(
 #define display_scrollbar(text) /*nothing*/
 #endif /* USE_SCROLLBAR */
 
+
 /*	Output a page
 **	-------------
 */
@@ -1745,6 +1939,7 @@ PRIVATE void display_page ARGS3(
 	 *  an xterm is temporarily made very small. - kw */
 	return;
     }
+
     last_screen = text->Lines - (display_lines - 2);
     line = text->last_line->prev;
 
@@ -1895,11 +2090,11 @@ PRIVATE void display_page ARGS3(
 #ifdef USE_COLOR_STYLE		/* otherwise done in display_line - kw */
 	    /*
 	     *  If the target is on this line, recursively
-	     *  seek and emphasize it. - FM
+	     *  seek and emphasize it. -FM
 	     */
 	    data = (char *)line->data;
 	    offset = (int)line->offset;
-	    while ((target && *target) &&
+	    while (non_empty(target) &&
 		    (cp = LYno_attr_mb_strstr(data,
 					      target,
 					      text->T.output_utf8, YES,
@@ -1942,30 +2137,7 @@ PRIVATE void display_page ARGS3(
 			/*
 			 *  Output all the printable target chars.
 			 */
-			if (text->T.output_utf8 && !isascii(UCH(tmp[0]))) {
-			    if ((*tmp & 0xe0) == 0xc0) {
-				utf_extra = 1;
-			    } else if ((*tmp & 0xf0) == 0xe0) {
-				utf_extra = 2;
-			    } else if ((*tmp & 0xf8) == 0xf0) {
-				utf_extra = 3;
-			    } else if ((*tmp & 0xfc) == 0xf8) {
-				utf_extra = 4;
-			    } else if ((*tmp & 0xfe) == 0xfc) {
-				utf_extra = 5;
-			    } else {
-				/*
-				 *  Garbage.
-				 */
-				utf_extra = 0;
-			    }
-			    if (strlen(&line->data[itmp+1]) < utf_extra) {
-				/*
-				 *  Shouldn't happen.
-				 */
-				utf_extra = 0;
-			    }
-			}
+			utf_extra = utf8_length(text->T.output_utf8, data + itmp);
 			if (utf_extra) {
 			    strncpy(&tmp[1], &line->data[itmp+1], utf_extra);
 			    tmp[utf_extra+1] = '\0';
@@ -1974,7 +2146,7 @@ PRIVATE void display_page ARGS3(
 			    tmp[1] = '\0';
 			    written += (utf_extra + 1);
 			    utf_extra = 0;
-			} else if (HTCJK != NOCJK && !isascii(UCH(tmp[0]))) {
+			} else if (HTCJK != NOCJK && is8bits(tmp[0])) {
 			    /*
 			     *  For CJK strings, by Masanobu Kimura.
 			     */
@@ -1992,7 +2164,7 @@ PRIVATE void display_page ARGS3(
 		/*
 		 *  Stop the emphasis, and reset the offset and
 		 *  data pointer for our current position in the
-		 *  line. - FM
+		 *  line. -FM
 		 */
 		LYstopTargetEmphasis();
 		LYGetYX(y, offset);
@@ -2001,7 +2173,7 @@ PRIVATE void display_page ARGS3(
 		/*
 		 *  Adjust the cursor position, should we be at
 		 *  the end of the line, or not have another hit
-		 *  in it. - FM
+		 *  in it. -FM
 		 */
 		LYmove((i + 2), 0);
 	    } /* end while */
@@ -2010,7 +2182,7 @@ PRIVATE void display_page ARGS3(
 
 	    /*
 	     *  Stop if this is the last line.  Otherwise, make sure
-	     *  display_flag is set and process the next line. - FM
+	     *  display_flag is set and process the next line. -FM
 	     */
 	    if (line == text->last_line) {
 		/*
@@ -2043,29 +2215,39 @@ PRIVATE void display_page ARGS3(
      *  Add the anchors to Lynx structures.
      */
     nlinks = 0;
-    for (Anchor_ptr=text->first_anchor;  Anchor_ptr != NULL &&
-		Anchor_ptr->line_num <= stop_before_for_anchors;
-					    Anchor_ptr = Anchor_ptr->next) {
+    for (Anchor_ptr = text->first_anchor;
+	 Anchor_ptr != NULL && Anchor_ptr->line_num <= stop_before_for_anchors;
+	 Anchor_ptr = Anchor_ptr->next) {
+
+	if (Anchor_ptr->line_num >= line_number
+	 && Anchor_ptr->line_num < stop_before_for_anchors) {
+	    char *hi_string = LYGetHiTextStr(Anchor_ptr, 0);
 
-	if (Anchor_ptr->line_num >= line_number &&
-		Anchor_ptr->line_num < stop_before_for_anchors) {
 	    /*
 	     *  Load normal hypertext anchors.
 	     */
-	    if (Anchor_ptr->show_anchor && Anchor_ptr->hightext &&
-			strlen(Anchor_ptr->hightext) > 0 &&
-			(Anchor_ptr->link_type & HYPERTEXT_ANCHOR)) {
+	    if (Anchor_ptr->show_anchor
+	     && non_empty(hi_string)
+	     && (Anchor_ptr->link_type & HYPERTEXT_ANCHOR)) {
+		int count;
+		char *s;
+
+		for (count = 0; ; ++count) {
+		    s = LYGetHiTextStr(Anchor_ptr, count);
+		    if (count == 0)
+			LYSetHilite(nlinks, s);
+		    if (s == NULL)
+			break;
+		    if (count != 0)
+			LYAddHilite(nlinks, s, LYGetHiTextPos(Anchor_ptr, count));
+		}
 
-		links[nlinks].hightext	= Anchor_ptr->hightext;
-		links[nlinks].hightext2 = Anchor_ptr->hightext2;
-		links[nlinks].hightext2_offset = Anchor_ptr->hightext2offset;
 		links[nlinks].inUnderline = Anchor_ptr->inUnderline;
 
 		links[nlinks].anchor_number = Anchor_ptr->number;
 		links[nlinks].anchor_line_num = Anchor_ptr->line_num;
 
-		link_dest = HTAnchor_followMainLink(
-					     (HTAnchor *)Anchor_ptr->anchor);
+		link_dest = HTAnchor_followLink(Anchor_ptr->anchor);
 		{
 		    /*
 		     *	Memory leak fixed 05-27-94
@@ -2078,7 +2260,7 @@ PRIVATE void display_page ARGS3(
 #ifndef DONT_TRACK_INTERNAL_LINKS
 			if (Anchor_ptr->link_type == INTERNAL_LINK_ANCHOR) {
 			    link_dest_intl = HTAnchor_followTypedLink(
-				(HTAnchor *)Anchor_ptr->anchor, LINK_INTERNAL);
+				Anchor_ptr->anchor, HTInternalLink);
 			    if (link_dest_intl && link_dest_intl != link_dest) {
 
 				CTRACE((tfp,
@@ -2110,13 +2292,13 @@ PRIVATE void display_page ARGS3(
 		else
 		    links[nlinks].type = WWW_LINK_TYPE;
 		links[nlinks].target = empty_string;
-		links[nlinks].form = NULL;
+		links[nlinks].l_form = NULL;
 
 		nlinks++;
 		display_flag = TRUE;
 
 	    } else if (Anchor_ptr->link_type == INPUT_ANCHOR
-			&& Anchor_ptr->input_field->type != F_HIDDEN_TYPE) {
+		    && Anchor_ptr->input_field->type != F_HIDDEN_TYPE) {
 		/*
 		 *  Handle form fields.
 		 */
@@ -2127,7 +2309,7 @@ PRIVATE void display_page ARGS3(
 		links[nlinks].anchor_number = Anchor_ptr->number;
 		links[nlinks].anchor_line_num = Anchor_ptr->line_num;
 
-		links[nlinks].form = FormInfo_ptr;
+		links[nlinks].l_form = FormInfo_ptr;
 		links[nlinks].lx = Anchor_ptr->line_pos;
 		links[nlinks].ly = ((Anchor_ptr->line_num + 1) - line_number);
 		links[nlinks].type = WWW_FORM_LINK_TYPE;
@@ -2136,35 +2318,28 @@ PRIVATE void display_page ARGS3(
 		StrAllocCopy(links[nlinks].lname, empty_string);
 
 		if (FormInfo_ptr->type == F_RADIO_TYPE) {
-		    if (FormInfo_ptr->num_value)
-			links[nlinks].hightext = checked_radio;
-		    else
-			links[nlinks].hightext = unchecked_radio;
-
+		    LYSetHilite(nlinks,
+				FormInfo_ptr->num_value
+				? checked_radio
+				: unchecked_radio);
 		} else if (FormInfo_ptr->type == F_CHECKBOX_TYPE) {
-		    if (FormInfo_ptr->num_value)
-			links[nlinks].hightext = checked_box;
-		    else
-			links[nlinks].hightext = unchecked_box;
-
+		    LYSetHilite(nlinks,
+				FormInfo_ptr->num_value
+				? checked_box
+				: unchecked_box);
 		} else if (FormInfo_ptr->type == F_PASSWORD_TYPE) {
-		    links[nlinks].hightext = STARS(strlen(FormInfo_ptr->value));
-
+		    LYSetHilite(nlinks,
+				STARS(strlen(FormInfo_ptr->value)));
 		} else {  /* TEXT type */
-		    links[nlinks].hightext = FormInfo_ptr->value;
+		    LYSetHilite(nlinks,
+				FormInfo_ptr->value);
 		}
 
-		/*
-		 *  Never a second line on form types.
-		 */
-		links[nlinks].hightext2 = NULL;
-		links[nlinks].hightext2_offset = 0;
-
 		nlinks++;
 		/*
 		 *  Bold the link after incrementing nlinks.
 		 */
-		highlight(OFF, (nlinks - 1), target);
+		LYhighlight(OFF, (nlinks - 1), target);
 
 		display_flag = TRUE;
 
@@ -2172,23 +2347,17 @@ PRIVATE void display_page ARGS3(
 		/*
 		 *  Not showing anchor.
 		 */
-		if (Anchor_ptr->hightext && *Anchor_ptr->hightext)
+		if (non_empty(hi_string))
 		    CTRACE((tfp,
 			    "\nGridText: Not showing link, hightext=%s\n",
-			    Anchor_ptr->hightext));
+			    hi_string));
 	    }
 	}
 
-	if (Anchor_ptr == text->last_anchor)
-	    /*
-	     *  No more links in document. - FM
-	     */
-	    break;
-
 	if (nlinks == MAXLINKS) {
 	    /*
 	     *  Links array is full.  If interactive, tell user
-	     *  to use half-page or two-line scrolling. - FM
+	     *  to use half-page or two-line scrolling. -FM
 	     */
 	    if (LYCursesON) {
 		HTAlert(MAXLINKS_REACHED);
@@ -2200,10 +2369,12 @@ PRIVATE void display_page ARGS3(
 
     /*
      *  Free any un-reallocated links[] entries
-     *  from the previous page draw. - FM
+     *  from the previous page draw. -FM
      */
-    for (i = nlinks; i < last_nlinks; i++)
+    for (i = nlinks; i < last_nlinks; i++) {
+	LYSetHilite(i, NULL);
 	FREE(links[i].lname);
+    }
     last_nlinks = nlinks;
 
     /*
@@ -2238,6 +2409,7 @@ PRIVATE void display_page ARGS3(
     }
 #endif /* DISP_PARTIAL */
 
+#if !defined(WIDEC_CURSES)
     if (text->has_utf8 || text->had_utf8) {
 	/*
 	 *  For other than ncurses, repainting is taken care of
@@ -2255,6 +2427,8 @@ PRIVATE void display_page ARGS3(
 	 */
 	clearok(curscr, TRUE);
     }
+#endif /* WIDEC_CURSES */
+
     LYrefresh();
 }
 
@@ -2284,9 +2458,13 @@ PUBLIC void HText_beginAppend ARGS1(
    as any other large value.  (But don't use INT_MAX or something close
    to it to, avoid over/underflow.) - kw */
 #ifdef USE_SLANG
-#define LYcols_cu (dump_output_immediately ? MAX_COLS : SLtt_Screen_Cols)
+#define LYcols_cu(text) (dump_output_immediately ? MAX_COLS : SLtt_Screen_Cols)
+#else
+#ifdef WIDEC_CURSES
+#define LYcols_cu(text) WRAP_COLS(text)
 #else
-#define LYcols_cu (dump_output_immediately ? MAX_COLS : DISPLAY_COLS)
+#define LYcols_cu(text) (dump_output_immediately ? MAX_COLS : DISPLAY_COLS)
+#endif
 #endif
 
 /*	Add a new line of text
@@ -2338,27 +2516,26 @@ PRIVATE int set_style_by_embedded_chars ARGS4(
 PRIVATE void move_anchors_in_region ARGS7(
     HTLine *,		line,
     int,		line_number,
-    TextAnchor **,	prev_anchor,
+    TextAnchor **,	prev_anchor,	/*updates++*/
     int *,		prev_head_processed,
     int,		sbyte,
     int,		ebyte,
     int,		shift)		/* Likewise */
 {
     /*
-     *  Update anchor positions for anchors that start on this line.
-     *  Note: we rely on a->line_pos counting bytes, not
-     *  characters.  That's one reason why HText_trimHightext
-     *  has to be prevented from acting on these anchors in
-     *  partial display mode before we get a chance to
-     *  deal with them here.
+     * Update anchor positions for anchors that start on this line.  Note:  we
+     * rely on a->line_pos counting bytes, not characters.  That's one reason
+     * why HText_trimHightext has to be prevented from acting on these anchors
+     * in partial display mode before we get a chance to deal with them here.
      */
     TextAnchor *a;
     int head_processed = *prev_head_processed;
 
-    /* We need to know whether (*prev_anchor)->line_pos is "in new
-       coordinates" or in old ones.  If prev_anchor' head was touched
-       on the previous iteraction, we set head_processed.  The tail
-       may need to be treated now. */
+    /*
+     * We need to know whether (*prev_anchor)->line_pos is "in new coordinates"
+     * or in old ones.  If prev_anchor' head was touched on the previous
+     * iteration, we set head_processed.  The tail may need to be treated now.
+     */
     for (a = *prev_anchor;
 	 a && a->line_num <= line_number;
 	 a = a->next, head_processed = 0) {
@@ -2405,7 +2582,7 @@ PRIVATE void move_anchors_in_region ARGS7(
  *  in appropriate places - so that characters at/after the old
  *  position end up at/after the new position, for each pair, if possible.
  *  Some necessary changes for anchors starting on this line are also done
- *  here if needed.
+ *  here if needed. Updates 'prev_anchor' internally.
  *  Returns a newly allocated HTLine* if changes were made
  *    (caller has to free the old one).
  *  Returns NULL if no changes needed.  (Remove-spaces code may be buggy...)
@@ -2415,7 +2592,7 @@ PRIVATE HTLine * insert_blanks_in_line ARGS7(
     HTLine *,		line,
     int,		line_number,
     HText *,		text,
-    TextAnchor *,	prev_anchor,
+    TextAnchor **,	prev_anchor,	/*updates++*/
     int,		ninserts,
     int *,		oldpos,		/* Measured in cells */
     int *,		newpos)		/* Likewise */
@@ -2442,16 +2619,20 @@ PRIVATE HTLine * insert_blanks_in_line ARGS7(
 	    added_chars = newpos[ip] - oldpos[ip];
     if (line->size + added_chars > MAX_LINE - 2)
 	return NULL;
-    if (line == text->last_line)
-	mod_line = allocHTLine(MAX_LINE);
-    else
-	mod_line = allocHTLine(line->size + added_chars);
+    if (line == text->last_line) {
+	if (line == TEMP_LINE(text, 0))
+	   mod_line = TEMP_LINE(text, 1);
+	else
+	   mod_line = TEMP_LINE(text, 0);
+    } else {
+	allocHTLine(mod_line, line->size + added_chars);
+    }
     if (!mod_line)
 	return NULL;
-    if (!prev_anchor)
-	prev_anchor = text->first_anchor;
-    head_processed = (prev_anchor && prev_anchor->line_num < line_number);
-    memcpy(mod_line, line, LINE_SIZE(1));
+    if (!*prev_anchor)
+	*prev_anchor = text->first_anchor;
+    head_processed = (*prev_anchor && (*prev_anchor)->line_num < line_number);
+    memcpy(mod_line, line, LINE_SIZE(0));
     t = newdata = mod_line->data;
     ip = 0;
     while (ip <= ninserts) {
@@ -2459,7 +2640,9 @@ PRIVATE HTLine * insert_blanks_in_line ARGS7(
 	int curlim = (ip < ninserts
 		      ? oldpos[ip]
 		      /* Include'em all! */
-		      : (line->size <= MAX_LINE ? MAX_LINE+1 : line->size+1));
+		      : ((int)line->size <= MAX_LINE
+			  ? MAX_LINE+1
+			  : (int)line->size+1));
 	pre = s;
 
 	/* Fast forward to char==curlim or EOL.  Stop *before* the
@@ -2479,7 +2662,7 @@ PRIVATE HTLine * insert_blanks_in_line ARGS7(
 
 	/* Now s is at the "displayed" char, pre is before the style change */
 	if (ip)				/* Fix anchor positions */
-	    move_anchors_in_region(line, line_number, &prev_anchor,
+	    move_anchors_in_region(line, line_number, prev_anchor /*updates++*/,
 				   &head_processed,
 				   copied - line->data, pre - line->data,
 				   shift);
@@ -2507,8 +2690,8 @@ PRIVATE HTLine * insert_blanks_in_line ARGS7(
     while (pre < s)	/* Copy remaining style-codes */
 	*t++ = *pre++;
     /* Check whether the last anchor continues on the next line */
-    if (head_processed && prev_anchor && prev_anchor->line_num == line_number)
-	prev_anchor->extent += shift;
+    if (head_processed && *prev_anchor && (*prev_anchor)->line_num == line_number)
+	(*prev_anchor)->extent += shift;
     *t = '\0';
     mod_line->size = t - newdata;
     return mod_line;
@@ -2550,7 +2733,6 @@ PRIVATE void split_line ARGS2(
 	unsigned,	split)
 {
     HTStyle * style = text->style;
-    HTLine * temp;
     int spare;
     int indent = text->in_line_1 ?
 	  text->style->indent1st : text->style->leftIndent;
@@ -2562,18 +2744,24 @@ PRIVATE void split_line ARGS2(
     int TailTrim = 0;
     int s, s_post, s_pre, t_underline = underline_on, t_bold = bold_on;
     char *p;
-    HTLine * previous = text->last_line;
     int ctrl_chars_on_previous_line = 0;
-    int utfxtra_on_previous_line = utfxtra_on_this_line;
+    int utfxtra_on_previous_line = UTFXTRA_ON_THIS_LINE;
     char * cp;
-    /* can't wrap in middle of multibyte sequences, so allocate 2 extra */
-    HTLine * line = (HTLine *)LY_CALLOC(1, LINE_SIZE(MAX_LINE)+2);
+
+    HTLine * previous = text->last_line;
+    HTLine * line;
 
     /*
-     *  Make new line.
+     *  Set new line.
      */
+    if (previous == TEMP_LINE(text, 0))
+	line = TEMP_LINE(text, 1);
+    else
+	line = TEMP_LINE(text, 0);
     if (line == NULL)
-	outofmem(__FILE__, "split_line_1");
+	return;
+    memset(line, 0, LINE_SIZE(0));
+
     ctrl_chars_on_this_line = 0; /*reset since we are going to a new line*/
     utfxtra_on_this_line = 0;	/*reset too, we'll count them*/
     text->LastChar = ' ';
@@ -2662,13 +2850,13 @@ PRIVATE void split_line ARGS2(
 	unsigned plen;
 	int i;
 
-	/* Split the line. - FM */
+	/* Split the line. -FM */
 	prevdata[previous->size] = '\0';
 	previous->size = split;
 
 	/*
 	 *  Trim any spaces or soft hyphens from the beginning
-	 *  of our new line. - FM
+	 *  of our new line. -FM
 	 */
 	p = prevdata + split;
 	while ((
@@ -2698,16 +2886,17 @@ PRIVATE void split_line ARGS2(
 		    p[i] == LY_UNDERLINE_END_CHAR ||
 		    p[i] == LY_BOLD_START_CHAR ||
 		    p[i] == LY_BOLD_END_CHAR ||
-		    p[i] == LY_SOFT_HYPHEN)
+		    p[i] == LY_SOFT_HYPHEN) {
 		    ctrl_chars_on_this_line++;
-		else if (IS_UTF_EXTRA(p[i]))
+		} else if (IS_UTF_EXTRA(p[i])) {
 		    utfxtra_on_this_line++;
+		}
 		if (p[i] == LY_SOFT_HYPHEN && (int)text->permissible_split < i)
 		    text->permissible_split = i + 1;
 	    }
 	    ctrl_chars_on_this_line += utfxtra_on_this_line;
 
-	    /* Add the data to the new line. - FM */
+	    /* Add the data to the new line. -FM */
 	    strcat(linedata, p);
 	    line->size += plen;
 	}
@@ -2764,7 +2953,10 @@ PRIVATE void split_line ARGS2(
 #endif
 
 #if defined(USE_COLOR_STYLE)
-    line->styles = stylechanges_buffers[stylechanges_buffers_free = (stylechanges_buffers_free + 1) &1];
+    if (previous->styles == stylechanges_buffers[0])
+	line->styles = stylechanges_buffers[1];
+    else
+	line->styles = stylechanges_buffers[0];
     line->numstyles = 0;
     {
 	HTStyleChange *from = previous->styles + previous->numstyles - 1;
@@ -2828,7 +3020,7 @@ PRIVATE void split_line ARGS2(
 		}
 		if ( to < line->styles + MAX_STYLES_ON_LINE - 1
 		     && to[1].direction == STACK_OFF
-		     && to[1].horizpos <= SpecialAttrChars
+		     && to[1].horizpos <= (unsigned) SpecialAttrChars
 		     && to[1].style == scan->style )
 		    to++;
 		else if (to >= line->styles) {
@@ -2858,18 +3050,20 @@ PRIVATE void split_line ARGS2(
     }
 #endif /*USE_COLOR_STYLE*/
 
-    temp = (HTLine *)LY_CALLOC(1, LINE_SIZE(previous->size));
-    if (temp == NULL)
+    {
+    HTLine* temp;
+    allocHTLine(temp, previous->size);
+    if (!temp)
 	outofmem(__FILE__, "split_line_2");
     memcpy(temp, previous, LINE_SIZE(previous->size));
 #if defined(USE_COLOR_STYLE)
-    ALLOC_IN_POOL((text->styles_pool),HTStyleChangePool,previous->numstyles,temp->styles);
-    memcpy(temp->styles, previous->styles, sizeof(HTStyleChange)*previous->numstyles);
+    POOLallocstyles(temp->styles, previous->numstyles);
     if (!temp->styles)
 	outofmem(__FILE__, "split_line_2");
+    memcpy(temp->styles, previous->styles, sizeof(HTStyleChange)*previous->numstyles);
 #endif
-    FREE(previous);
     previous = temp;
+    }
 
     previous->prev->next = previous;	/* Link in new line */
     previous->next->prev = previous;	/* Could be same node of course */
@@ -2896,8 +3090,9 @@ PRIVATE void split_line ARGS2(
 		*cp == LY_BOLD_START_CHAR ||
 		*cp == LY_BOLD_END_CHAR ||
 		IS_UTF_EXTRA(*cp) ||
-		*cp == LY_SOFT_HYPHEN)
+		*cp == LY_SOFT_HYPHEN) {
 		ctrl_chars_on_previous_line++;
+	    }
 	}
 	if ((previous->size > 0) &&
 		(int)(previous->data[previous->size-1] == LY_SOFT_HYPHEN))
@@ -2912,9 +3107,9 @@ PRIVATE void split_line ARGS2(
 
 	if (spare > 0 && !dump_output_immediately &&
 	    text->T.output_utf8 && ctrl_chars_on_previous_line) {
-	    utfxtra_on_previous_line -= utfxtra_on_this_line;
+	    utfxtra_on_previous_line -= UTFXTRA_ON_THIS_LINE;
 	    if (utfxtra_on_previous_line) {
-		int spare_cu = (LYcols_cu-1) -
+		int spare_cu = (LYcols_cu(text)-1) -
 		    utfxtra_on_previous_line - indent +
 		    ctrl_chars_on_previous_line - previous->size;
 		    /*
@@ -2933,7 +3128,7 @@ PRIVATE void split_line ARGS2(
 			    (int)(previous->offset + indent + spare/2 +
 				  previous->size)
 			    - ctrl_chars_on_previous_line
-			    + utfxtra_on_previous_line <= (LYcols_cu - 1))
+			    + utfxtra_on_previous_line <= (LYcols_cu(text) - 1))
 			    /* do nothing - it still fits - kw */;
 			else {
 			    spare = spare_cu;
@@ -2992,11 +3187,10 @@ PRIVATE void split_line ARGS2(
 
     /*
      *  If we split the line, adjust the anchor
-     *  structure values for the new line. - FM
+     *  structure values for the new line. -FM
      */
 
     if (s > 0) {			/* if not completely empty */
-	TextAnchor * prev_a = NULL;
 	int moved = 0;
 
 	/* In the algorithm below we move or not move anchors between
@@ -3008,11 +3202,16 @@ PRIVATE void split_line ARGS2(
 	 */
 	/* Our operations can make a non-empty all-whitespace link
 	   empty.  So what? */
-	for (a = text->first_anchor; a; prev_a = a, a = a->next) {
+	if ((a = text->last_anchor_before_split) == 0)
+	    a = text->first_anchor;
+
+	for ( ; a; a = a->next) {
 	    if (a->line_num == CurLine) {
 		int len = a->extent, n = a->number, start = a->line_pos;
 		int end = start + len;
 
+		text->last_anchor_before_split = a;
+
 		/* Which anchors do we leave on the previous line?
 		   a) empty finished (We need a cut-off value.
 		      "Just because": those before s;
@@ -3026,7 +3225,7 @@ PRIVATE void split_line ARGS2(
 		    CTRACE_SPLITLINE((tfp, "anchor %d: no relocation", n));
 		    if (end > s_post) {
 			CTRACE_SPLITLINE((tfp, " of the start.\n"));
-			a->extent += -(TailTrim + HeadTrim) - SpecialAttrChars;
+			a->extent += -(TailTrim + HeadTrim) + SpecialAttrChars;
 		    } else {
 			CTRACE_SPLITLINE((tfp, ", cut the end.\n"));
 			a->extent = s_pre - start;
@@ -3107,22 +3306,8 @@ PRIVATE void split_line ARGS2(
 		*jp = ' ';	/* substitute it */
 		continue;
 	    }
-	    if (text->T.output_utf8 && !isascii(UCH(c))) {
-		int utf_extra = 0;
-		if ((c & 0xe0) == 0xc0) {
-		    utf_extra = 1;
-		} else if ((c & 0xf0) == 0xe0) {
-		    utf_extra = 2;
-		} else if ((c & 0xf8) == 0xf0) {
-		    utf_extra = 3;
-		} else if ((c & 0xfc) == 0xf8) {
-		    utf_extra = 4;
-		} else if ((c & 0xfe) == 0xfc) {
-		    utf_extra = 5;
-		} else
-		    utf_extra = 0;
-		if ( (int) strlen(jp+1) < utf_extra)
-		    utf_extra = 0;
+	    if (text->T.output_utf8 && is8bits(c)) {
+		int utf_extra = utf8_length(text->T.output_utf8, jp);
 		r->byte_len += utf_extra;
 		jp += utf_extra;
 	    }
@@ -3153,7 +3338,7 @@ PRIVATE void split_line ARGS2(
 		i++;
 	    }
 	    jline = insert_blanks_in_line(previous, CurLine, text,
-					  last_anchor_of_previous_line,
+					  &last_anchor_of_previous_line /*updates++*/,
 					  ht_num_runs - 1, oldpos, newpos);
 	    free((char*)oldpos);
 	    if (jline == NULL)
@@ -3161,29 +3346,16 @@ PRIVATE void split_line ARGS2(
 	    previous->next->prev = jline;
 	    previous->prev->next = jline;
 
-	    FREE(previous);
+	    freeHTLine(text, previous);
 
 	    previous = jline;
 	}
 	{ /* (ht_num_runs==1) */
-	    /* keep maintaining 'last_anchor_of_previous_line' */
-	    TextAnchor* a2 = last_anchor_of_previous_line;
 	    if (justify_start_position) {
 		char* p2 = previous->data;
 		for( ; p2 < previous->data + justify_start_position; ++p2)
 		    *p2 = (*p2 == HT_NON_BREAK_SPACE ? ' ' : *p2);
 	    }
-
-	    if (!a2)
-		a2 = text->first_anchor;
-	    else if (a2 == text->last_anchor)
-		a2 = NULL;
-	    else
-		a2 = a2->next; /* 1st anchor on line we justify */
-
-	    if (a2)
-		for (; a2 && a2->line_num <= text->Lines-1;
-		    last_anchor_of_previous_line = a2, a2 = a2->next);
 	}
     } else {
 	if (REALLY_CAN_JUSTIFY(text) ) {
@@ -3235,9 +3407,7 @@ PRIVATE void blank_lines ARGS2(
 	HText *,	text,
 	int,		newlines)
 {
-    BOOL IgnoreSpaces = FALSE;
-
-    if (!HText_LastLineSize(text, IgnoreSpaces)) { /* No text on current line */
+    if (HText_LastLineEmpty(text, FALSE)) { /* No text on current line */
 	HTLine * line = text->last_line->prev;
 
 #ifdef USE_COLOR_STYLE
@@ -3246,8 +3416,9 @@ PRIVATE void blank_lines ARGS2(
 	    return;			/* Do not add a blank line at start */
 #endif
 
-	while ((line != text->last_line) &&
-	       (HText_TrueLineSize(line, text, IgnoreSpaces) == 0)) {
+	while (line != NULL &&
+	       line != text->last_line &&
+	       HText_TrueEmptyLine(line, text, FALSE)) {
 	    if (newlines == 0)
 		break;
 	    newlines--;		/* Don't bother: already blank */
@@ -3309,7 +3480,9 @@ PUBLIC void HText_appendCharacter ARGS2(
 {
     HTLine * line;
     HTStyle * style;
-    int indent, utfx;
+    int indent;
+    int limit = 0;
+    int actual;
 
 #ifdef DEBUG_APPCH
 #ifdef CJK_EX
@@ -3366,12 +3539,12 @@ PUBLIC void HText_appendCharacter ARGS2(
 		save_ch = 0;
 	    }
 #else
-	    if (ch < 0x80) {
-		CTRACE((tfp, "add(%c) %d/%d\n", ch,
-		    HTisDocumentSource(), HTOutputFormat != WWW_SOURCE));
+	    if (UCH(ch) < 0x80) {
+		CTRACE((tfp, "add(%c) %d/%d\n", UCH(ch),
+			HTisDocumentSource(), HTOutputFormat != WWW_SOURCE));
 	    } else {
-		CTRACE((tfp, "add(%02x) %d/%d\n", ch,
-		    HTisDocumentSource(), HTOutputFormat != WWW_SOURCE));
+		CTRACE((tfp, "add(%02x) %d/%d\n", UCH(ch),
+			HTisDocumentSource(), HTOutputFormat != WWW_SOURCE));
 	    }
 #endif	/* CJK_EX */
 	}
@@ -3516,10 +3689,11 @@ PUBLIC void HText_appendCharacter ARGS2(
      *  processing stage anyway. - kw
      */
 #ifndef   EBCDIC  /* S/390 -- gil -- 1514 */
-    if (UCH(ch) >= 128 && HTCJK == NOCJK &&
+    if (is8bits(ch) && HTCJK == NOCJK &&
 	!text->T.transp && !text->T.output_utf8 &&
-	UCH(ch) < LYlowest_eightbit[current_char_set])
+	UCH(ch) < LYlowest_eightbit[current_char_set]) {
 	return;
+    }
 #endif /* EBCDIC */
 #endif /* !USE_SLANG */
     if (UCH(ch) == 155 && HTCJK == NOCJK) {	/* octal 233 */
@@ -3534,7 +3708,6 @@ PUBLIC void HText_appendCharacter ARGS2(
     style = text->style;
 
     indent = text->in_line_1 ? (int)style->indent1st : (int)style->leftIndent;
-    utfx = utfxtra_on_this_line;
 
     if (HTCJK != NOCJK) {
 	switch(text->state) {
@@ -3542,7 +3715,7 @@ PUBLIC void HText_appendCharacter ARGS2(
 		if (ch == CH_ESC) {  /* S/390 -- gil -- 1536 */
 		    /*
 		    **  Setting up for CJK escape sequence handling (based on
-		    **  Takuya ASADA's (asada@three-a.co.jp) CJK Lynx). - FM
+		    **  Takuya ASADA's (asada@three-a.co.jp) CJK Lynx). -FM
 		    */
 		    text->state = S_esc;
 		    text->kanji_buf = '\0';
@@ -3600,7 +3773,7 @@ PUBLIC void HText_appendCharacter ARGS2(
 		 */
 		if (ch == 'B' || ch == 'J' || ch == 'T')  {
 		    /*
-		     *  Can split here. - FM
+		     *  Can split here. -FM
 		     */
 		    text->permissible_split = text->last_line->size;
 		    text->state = S_text;
@@ -3608,7 +3781,7 @@ PUBLIC void HText_appendCharacter ARGS2(
 		} else if (ch == 'I')  {
 		    text->state = S_jisx0201_text;
 		    /*
-		     *  Can split here. - FM
+		     *  Can split here. -FM
 		     */
 		    text->permissible_split = text->last_line->size;
 		    text->kcode = JIS;
@@ -3694,7 +3867,7 @@ PUBLIC void HText_appendCharacter ARGS2(
 		} else {
 		    text->kanji_buf = ch;
 		    /*
-		     *  Can split here. - FM
+		     *  Can split here. -FM
 		     */
 		    text->permissible_split = text->last_line->size;
 		    return;
@@ -3718,8 +3891,9 @@ PUBLIC void HText_appendCharacter ARGS2(
 
     if (IsSpecialAttrChar(ch) && ch != LY_SOFT_NEWLINE) {
 #if !defined(USE_COLOR_STYLE) || !defined(NO_DUMP_WITH_BACKSPACES)
-	if (line->size >= (MAX_LINE-1))
+	if (line->size >= (MAX_LINE-1)) {
 	    return;
+	}
 #if defined(USE_COLOR_STYLE) && !defined(NO_DUMP_WITH_BACKSPACES)
 	if (with_backspaces && HTCJK==NOCJK && !text->T.output_utf8) {
 #endif
@@ -3755,10 +3929,11 @@ PUBLIC void HText_appendCharacter ARGS2(
 	    /*
 	     *  Ignore the soft hyphen if it is the first character
 	     *  on the line, or if it is preceded by a space or
-	     *  hyphen. - FM
+	     *  hyphen. -FM
 	     */
-	    if (line->size < 1 || text->permissible_split >= line->size)
+	    if (line->size < 1 || text->permissible_split >= line->size) {
 		return;
+	    }
 
 	    for (i = (text->permissible_split + 1); line->data[i]; i++) {
 		if (!IsSpecialAttrChar(UCH(line->data[i])) &&
@@ -3775,8 +3950,9 @@ PUBLIC void HText_appendCharacter ARGS2(
 	}
 #if defined(USE_COLOR_STYLE) && !defined(NO_DUMP_WITH_BACKSPACES)
 	} /* if (with_backspaces && HTCJK==HTNOCJK && !text->T.output_utf8) */
-	 else
-	     return;
+	 else {
+	    return;
+	 }
 #endif
 
 #else
@@ -3796,12 +3972,13 @@ PUBLIC void HText_appendCharacter ARGS2(
 	 */
 	if (IS_UTF_EXTRA(ch)) {
 	    if ((line->size > (MAX_LINE-1))
-		|| (indent + (int)(line->offset + line->size) +
-		    utfxtra_on_this_line - ctrl_chars_on_this_line +
-		    ((line->size > 0) &&
-		     (int)(line->data[line->size-1] ==
+		|| (indent + (int)(line->offset + line->size)
+		    + UTFXTRA_ON_THIS_LINE
+		    - ctrl_chars_on_this_line
+		    + ((line->size > 0) &&
+		       (int)(line->data[line->size-1] ==
 				LY_SOFT_HYPHEN ?
-					     1 : 0)) >= (LYcols_cu-1))
+					     1 : 0)) >= (LYcols_cu(text)-1))
 		) {
 		if (!text->permissible_split || text->source) {
 		    text->permissible_split = line->size;
@@ -3817,7 +3994,7 @@ PUBLIC void HText_appendCharacter ARGS2(
 		split_line(text, text->permissible_split);
 		line = text->last_line;
 		if (text->source && line->size - ctrl_chars_on_this_line
-		    + utfxtra_on_this_line == 0)
+		    + UTFXTRA_ON_THIS_LINE == 0)
 		    HText_appendCharacter (text, LY_SOFT_NEWLINE);
 	    }
 	    line->data[line->size++] = (char) ch;
@@ -3840,7 +4017,7 @@ PUBLIC void HText_appendCharacter ARGS2(
 		split_line(text, text->permissible_split);
 		line = text->last_line;
 		if (text->source && line->size - ctrl_chars_on_this_line
-		    + utfxtra_on_this_line == 0)
+		    + UTFXTRA_ON_THIS_LINE == 0)
 		    HText_appendCharacter (text, LY_SOFT_NEWLINE);
 	    }
 	}
@@ -3850,15 +4027,15 @@ PUBLIC void HText_appendCharacter ARGS2(
      *  New Line.
      */
     if (ch == '\n') {
-	    new_line(text);
-	    text->in_line_1 = YES;	/* First line of new paragraph */
-	    /*
-	     *  There are some pages written in
-	     *  different kanji codes. - TA & kw
-	     */
-	    if (HTCJK == JAPANESE)
-		text->kcode = NOKANJI;
-	    return;
+	new_line(text);
+	text->in_line_1 = YES;	/* First line of new paragraph */
+	/*
+	 *  There are some pages written in
+	 *  different kanji codes. - TA & kw
+	 */
+	if (HTCJK == JAPANESE)
+	    text->kcode = NOKANJI;
+	return;
     }
 
     /*
@@ -3894,7 +4071,6 @@ PUBLIC void HText_appendCharacter ARGS2(
 	return;
     }
 
-
     /*
      *  Tabs.
      */
@@ -3906,14 +4082,14 @@ PUBLIC void HText_appendCharacter ARGS2(
 	if (line->size > 0 && line->data[line->size-1] == LY_SOFT_HYPHEN) {
 	    /*
 	     *  A tab shouldn't follow a soft hyphen, so
-	     *  if one does, we'll dump the soft hyphen. - FM
+	     *  if one does, we'll dump the soft hyphen. -FM
 	     */
 	    line->data[--line->size] = '\0';
 	    ctrl_chars_on_this_line--;
 	}
 	here = ((int)(line->size + line->offset) + indent)
 		- ctrl_chars_on_this_line; /* Consider special chars GAB */
-	here_cu = here + utfxtra_on_this_line;
+	here_cu = here + UTFXTRA_ON_THIS_LINE;
 	if (style->tabs) {	/* Use tab table */
 	    for (Tab = style->tabs;
 		Tab->position <= here;
@@ -3951,7 +4127,7 @@ PUBLIC void HText_appendCharacter ARGS2(
 	    new_line(text);
 	} else {
 	    /*
-	     *  Can split here. - FM
+	     *  Can split here. -FM
 	     */
 	    text->permissible_split = line->size;
 	    if (target_cu > (WRAP_COLS(text)-1))
@@ -3976,12 +4152,11 @@ check_WrapSource:
 	 * the source visible.
 	 */
 	int target = (int)(line->offset + line->size) - ctrl_chars_on_this_line;
-	int target_cu = target + utfxtra_on_this_line;
+	int target_cu = target + UTFXTRA_ON_THIS_LINE;
 	if (target >= (WRAP_COLS(text)-1) - style->rightIndent -
 	    (((HTCJK != NOCJK) && text->kanji_buf) ? 1 : 0) ||
 	    (text->T.output_utf8 &&
-	     target_cu + UTF_XLEN(ch) >= (LYcols_cu-1))
-	    ) {
+	     target_cu + UTF_XLEN(ch) >= (LYcols_cu(text)-1))) {
 	    int saved_kanji_buf;
 	    int saved_state;
 
@@ -4000,7 +4175,7 @@ check_WrapSource:
 
     if (ch == ' ') {
 	/*
-	 *  Can split here. - FM
+	 *  Can split here. -FM
 	 */
 	text->permissible_split = text->last_line->size;
 	/*
@@ -4014,31 +4189,51 @@ check_WrapSource:
     /*
      *  Check if we should ignore characters at the wrap point.
      */
-    if (text->IgnoreExcess &&
-	(((indent + (int)line->offset + (int)line->size) +
-	  (int)style->rightIndent - ctrl_chars_on_this_line) >= (WRAP_COLS(text)-1) ||
-	 ((indent + (int)line->offset + (int)line->size) +
-	  utfxtra_on_this_line - ctrl_chars_on_this_line) >= (LYcols_cu-1)))
-	return;
+    if (text->IgnoreExcess) {
+	int nominal = (indent + (int)(line->offset + line->size) - ctrl_chars_on_this_line);
+	int number;
+
+	limit = (WRAP_COLS(text) - 1);
+	if (fields_are_numbered()
+	 && !number_fields_on_left
+	 && text->last_anchor != 0
+	 && (number = text->last_anchor->number) > 0) {
+	    limit -= (number > 99999
+			? 6
+			: (number > 9999
+			    ? 5
+			    : (number > 999
+				? 4
+				: (number > 99
+				    ? 3
+				    : (number > 9
+					? 2
+					: 1))))) + 2;
+	}
+	if ((nominal + (int)style->rightIndent) >= limit
+	 || (nominal + UTFXTRA_ON_THIS_LINE) >= (LYcols_cu(text) - 1)) {
+	    return;
+	}
+    }
 
     /*
      *  Check for end of line.
      */
-    if (((indent + (int)line->offset + (int)line->size) +
+    actual = ((indent + (int)line->offset + (int)line->size) +
+	      ((line->size > 0) &&
+	       (int)(line->data[line->size-1] == LY_SOFT_HYPHEN ? 1 : 0)));
+
+    if (text->T.output_utf8) {
+	actual += (UTFXTRA_ON_THIS_LINE - ctrl_chars_on_this_line + UTF_XLEN(ch));
+	limit = (LYcols_cu(text) - 1);
+    } else {
+	actual +=
 	 (int)style->rightIndent - ctrl_chars_on_this_line +
-	 (((HTCJK != NOCJK) && text->kanji_buf) ? 1 : 0) +
-	 ((line->size > 0) &&
-	  (int)(line->data[line->size-1] ==
-				LY_SOFT_HYPHEN ?
-					     1 : 0))) >= (WRAP_COLS(text) - 1) ||
-	(text->T.output_utf8 &&
-	 (((indent + (int)line->offset + (int)line->size) +
-	   utfxtra_on_this_line - ctrl_chars_on_this_line +
-	   UTF_XLEN(ch) +
-	   ((line->size > 0) &&
-	    (int)(line->data[line->size-1] ==
-				LY_SOFT_HYPHEN ?
-					     1 : 0))) >= (LYcols_cu - 1)))) {
+	 (((HTCJK != NOCJK) && text->kanji_buf) ? 1 : 0);
+	limit = (WRAP_COLS(text) - 1);
+    }
+
+    if (actual >= limit) {
 
 	if (style->wordWrap && HTOutputFormat != WWW_SOURCE) {
 #ifdef EXP_JUSTIFY_ELTS
@@ -4046,33 +4241,34 @@ check_WrapSource:
 		this_line_was_split = TRUE;
 #endif
 	    split_line(text, text->permissible_split);
-	    if (ch == ' ') return;	/* Ignore space causing split */
-
-	}  else if (HTOutputFormat == WWW_SOURCE) {
-		 /*
-		  *  For source output we don't want to wrap this stuff
-		  *  unless absolutely necessary. - LJM
-		  *  !
-		  *  If we don't wrap here we might get a segmentation fault.
-		  *  but let's see what happens
-		  */
-		if ((int)line->size >= (int)(MAX_LINE-1)) {
-		   new_line(text);  /* try not to linewrap */
-		}
-	} else {
-		/*
-		 *  For normal stuff like pre let's go ahead and
-		 *  wrap so the user can see all of the text.
-		 */
+	    if (ch == ' ') {
+		return;	/* Ignore space causing split */
+	    }
 
-		if ( (dump_output_immediately|| (crawl && traversal) )
-		     && dont_wrap_pre) {
-		    if ((int)line->size >= (int)(MAX_LINE-1))
-			new_line(text);
-		} else {
+	} else if (HTOutputFormat == WWW_SOURCE) {
+	    /*
+	     *  For source output we don't want to wrap this stuff
+	     *  unless absolutely necessary. - LJM
+	     *  !
+	     *  If we don't wrap here we might get a segmentation fault.
+	     *  but let's see what happens
+	     */
+	    if ((int)line->size >= (int)(MAX_LINE-1)) {
+		new_line(text);  /* try not to linewrap */
+	    }
+	} else {
+	    /*
+	     *  For normal stuff like pre let's go ahead and
+	     *  wrap so the user can see all of the text.
+	     */
+	    if ( (dump_output_immediately|| (crawl && traversal) )
+		 && dont_wrap_pre) {
+		if ((int)line->size >= (int)(MAX_LINE-1)) {
 		    new_line(text);
 		}
-
+	    } else {
+		new_line(text);
+	    }
 	}
     } else if ((int)line->size >= (int)(MAX_LINE-1)) {
 	/*
@@ -4218,7 +4414,7 @@ check_WrapSource:
 	if (ch == LY_SOFT_HYPHEN) {
 	    ctrl_chars_on_this_line++;
 	    /*
-	     *  Can split here. - FM
+	     *  Can split here. -FM
 	     */
 	    text->permissible_split = text->last_line->size;
 	}
@@ -4244,7 +4440,7 @@ PUBLIC void _internal_HTC ARGS3(HText *,text, int,style, int,dir)
 
 	if (line->numstyles > 0 && dir == 0 &&
 	    line->styles[line->numstyles-1].direction &&
-	    line->styles[line->numstyles-1].style == style &&
+	    line->styles[line->numstyles-1].style == (unsigned) style &&
 	    (int) line->styles[line->numstyles-1].horizpos
 	    == (int)line->size - ctrl_chars_on_this_line) {
 	    /*
@@ -4376,7 +4572,7 @@ PRIVATE int HText_insertBlanksInStblLines ARGS2(
 	    }
 	}
 	if (line == me->last_line) {
-	    if (line->size == 0 || !HText_TrueLineSize(line, me, FALSE))
+	    if (line->size == 0 || HText_TrueEmptyLine(line, me, FALSE))
 		continue;
 	    /*
 	     *  Last ditch effort to end the table with a line break,
@@ -4405,7 +4601,7 @@ PRIVATE int HText_insertBlanksInStblLines ARGS2(
 	    continue;
 	}
 	mod_line = insert_blanks_in_line(line, lineno, me,
-					 me->last_anchor_before_stbl,
+					 &me->last_anchor_before_stbl /*updates++*/,
 					 ninserts, oldpos, newpos);
 	if (mod_line) {
 	    if (line == me->last_line) {
@@ -4418,7 +4614,7 @@ PRIVATE int HText_insertBlanksInStblLines ARGS2(
 	    lines_changed++;
 	    if (line == first_line)
 		first_line = mod_line;
-	    free(line);
+	    freeHTLine(me, line);
 	    line = mod_line;
 #ifdef DISP_PARTIAL
 	    /*
@@ -4621,6 +4817,25 @@ PUBLIC void HText_startStblTABLE ARGS2(
     }
 }
 
+#ifdef EXP_NESTED_TABLES
+PRIVATE void free_enclosed_stbl ARGS1(
+	HText *,	me)
+{
+    if (me->enclosed_stbl != NULL) {
+	HTList *list = me->enclosed_stbl;
+	STable_info *stbl;
+	while (NULL != (stbl = (STable_info *)HTList_nextObject(list))) {
+	    CTRACE((tfp, "endStblTABLE: finally free %p\n", me->stbl));
+	    Stbl_free(stbl);
+	}
+	HTList_delete(me->enclosed_stbl);
+	me->enclosed_stbl = NULL;
+    }
+}
+#else
+#define free_enclosed_stbl(me) /* nothing */
+#endif
+
 /*	Finish simple table handling
  *	Return TRUE if the table is nested inside another table.
  */
@@ -4632,11 +4847,14 @@ PUBLIC int HText_endStblTABLE ARGS1(
 
     if (!me || !me->stbl) {
 	CTRACE((tfp, "endStblTABLE: ignored.\n"));
+	free_enclosed_stbl(me);
 	return FALSE;
     }
     CTRACE((tfp, "endStblTABLE: ok, will try.\n"));
+
     ncols = Stbl_finishTABLE(me->stbl);
     CTRACE((tfp, "endStblTABLE: ncols = %d.\n", ncols));
+
     if (ncols > 0) {
 	lines_changed = HText_insertBlanksInStblLines(me, ncols);
 	CTRACE((tfp, "endStblTABLE: changed %d lines, done.\n", lines_changed));
@@ -4647,19 +4865,33 @@ PUBLIC int HText_endStblTABLE ARGS1(
 	NumOfLines_partial -= lines_changed;  /* fake */
 #endif  /* DISP_PARTIAL */
     }
+
 #ifdef EXP_NESTED_TABLES
     if (nested_tables) {
 	enclosing = Stbl_get_enclosing(me->stbl);
 	me->last_anchor_before_stbl = Stbl_get_last_anchor_before(me->stbl);
-    } else
-#endif
-    Stbl_free(me->stbl);
-#ifdef EXP_NESTED_TABLES
-    if (nested_tables)
+	if (enclosing == NULL) {
+	    Stbl_free(me->stbl);
+	    free_enclosed_stbl(me);
+	} else {
+	    if (me->enclosed_stbl == NULL)
+		me->enclosed_stbl = HTList_new();
+	    HTList_addObject(me->enclosed_stbl, me->stbl);
+	    CTRACE((tfp, "endStblTABLE: postpone free %p\n", me->stbl));
+	}
 	me->stbl = enclosing;
-    else
-#endif
+    } else {
+	Stbl_free(me->stbl);
+	me->stbl = NULL;
+    }
+#else
+    Stbl_free(me->stbl);
     me->stbl = NULL;
+#endif
+
+    CTRACE((tfp, "endStblTABLE: have%s enclosing table (%p)\n",
+	    enclosing == 0 ? " NO" : "", enclosing));
+
     return enclosing != 0;
 }
 
@@ -4769,6 +5001,33 @@ PUBLIC void HText_startStblRowGroup ARGS2(
 /*		Anchor handling
 **		---------------
 */
+PRIVATE void add_link_number ARGS3(
+    HText *,		text,
+    TextAnchor *,	a,
+    BOOL,		save_position)
+{
+    char marker[32];
+
+    /*
+     *  If we are doing link_numbering add the link number.
+     */
+    if ((a->number > 0)
+#ifdef USE_PRETTYSRC
+     && (text->source ? !psrcview_no_anchor_numbering : 1 )
+#endif
+     && links_are_numbered()) {
+	char saved_lastchar = text->LastChar;
+	int saved_linenum = text->Lines;
+	sprintf(marker,"[%d]", a->number);
+	HText_appendText(text, marker);
+	if (saved_linenum && text->Lines && saved_lastchar != ' ')
+	    text->LastChar = ']'; /* if marker not after space caused split */
+	if (save_position) {
+	    a->line_num = text->Lines;
+	    a->line_pos = text->last_line->size;
+	}
+    }
+}
 
 /*	Start an anchor field
 */
@@ -4777,14 +5036,11 @@ PUBLIC int HText_beginAnchor ARGS3(
 	BOOL,			underline,
 	HTChildAnchor *,	anc)
 {
-    char marker[32];
-
-    TextAnchor * a = typecalloc(TextAnchor);
+    TextAnchor * a;
 
+    POOLtypecalloc(TextAnchor, a);
     if (a == NULL)
 	outofmem(__FILE__, "HText_beginAnchor");
-    a->hightext  = NULL;
-    a->hightext2 = NULL;
     a->inUnderline = underline;
 
     a->line_num = text->Lines;
@@ -4801,36 +5057,19 @@ PUBLIC int HText_beginAnchor ARGS3(
     text->last_anchor = a;
 
 #ifndef DONT_TRACK_INTERNAL_LINKS
-    if (HTAnchor_followTypedLink((HTAnchor*)anc, LINK_INTERNAL)) {
+    if (HTAnchor_followTypedLink(anc, HTInternalLink)) {
 	a->number = ++(text->last_anchor_number);
 	a->link_type = INTERNAL_LINK_ANCHOR;
     } else
 #endif
-    if (HTAnchor_followMainLink((HTAnchor*)anc)) {
+    if (HTAnchor_followLink(anc)) {
 	a->number = ++(text->last_anchor_number);
     } else {
 	a->number = 0;
     }
 
-    /*
-     *  If we are doing link_numbering add the link number.
-     */
-    if ((a->number > 0) &&
-#ifdef USE_PRETTYSRC
-	(text->source ? !psrcview_no_anchor_numbering : 1 ) &&
-#endif
-	(keypad_mode == LINKS_ARE_NUMBERED ||
-	 keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED)) {
-	char saved_lastchar = text->LastChar;
-	int saved_linenum = text->Lines;
-	sprintf(marker,"[%d]", a->number);
-	HText_appendText(text, marker);
-	if (saved_linenum && text->Lines && saved_lastchar != ' ')
-	    text->LastChar = ']'; /* if marker not after space caused split */
-	a->line_num = text->Lines;
-	a->line_pos = text->last_line->size;
-    }
-
+    if (number_links_on_left)
+	add_link_number(text, a, TRUE);
     return(a->number);
 }
 
@@ -4850,7 +5089,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
      *  a particular anchor.  This allows us to set links
      *  for positions indicated by NAME or ID attributes,
      *  without needing to close any anchor with an HREF
-     *  within which that link might be embedded. - FM
+     *  within which that link might be embedded. -FM
      */
     if (number <= 0 || number == text->last_anchor->number) {
 	a = text->last_anchor;
@@ -4864,7 +5103,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 	    /*
 	     *  There's no anchor with that number,
 	     *  so we'll default to the last anchor,
-	     *  and cross our fingers. - FM
+	     *  and cross our fingers. -FM
 	     */
 	    a = text->last_anchor;
 	}
@@ -4881,19 +5120,19 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 	   "BUG: HText_endAnchor0: internal error: last anchor was input field!\n"));
 	return FALSE;
     }
+
     if (a->number) {
 	/*
 	 *  If it goes somewhere...
 	 */
 	int i, j, k, l;
 	BOOL remove_numbers_on_empty = (BOOL) (
-	    ((keypad_mode == LINKS_ARE_NUMBERED ||
-	      keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) &&
+	    (links_are_numbered() &&
 	     (text->hiddenlinkflag != HIDDENLINKS_MERGE ||
 	      (LYNoISMAPifUSEMAP &&
 	       !(text->node_anchor && text->node_anchor->bookmark) &&
 	       HTAnchor_isISMAPScript(
-		   HTAnchor_followMainLink((HTAnchor *)a->anchor))))));
+		   HTAnchor_followLink(a->anchor))))));
 	HTLine *last = text->last_line;
 	HTLine *prev = text->last_line->prev;
 	HTLine *start = last;
@@ -4915,19 +5154,19 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 	/*
 	 *  Check if the anchor content has only
 	 *  white and special characters, starting
-	 *  with the content on the last line. - FM
+	 *  with the content on the last line. -FM
 	 */
 	a->extent += extent_adjust;
 	if (a->extent > (int)last->size) {
 	    /*
 	     *  The anchor extends over more than one line,
-	     *  so set up to check the entire last line. - FM
+	     *  so set up to check the entire last line. -FM
 	     */
 	    i = last->size;
 	} else {
 	    /*
 	     *  The anchor is restricted to the last line,
-	     *  so check from the start of the anchor. - FM
+	     *  so check from the start of the anchor. -FM
 	     */
 	    i = a->extent;
 	}
@@ -4947,14 +5186,14 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 		 *  The anchor starts on a preceding line, and
 		 *  the last line has only white and special
 		 *  characters, so declare the entire extent
-		 *  of the last line as blank. - FM
+		 *  of the last line as blank. -FM
 		 */
 		CurBlankExtent = BlankExtent = last->size;
 	    } else {
 		/*
 		 *  The anchor starts on the last line, and
 		 *  has only white or special characters, so
-		 *  declare the anchor's extent as blank. - FM
+		 *  declare the anchor's extent as blank. -FM
 		 */
 		CurBlankExtent = BlankExtent = a->extent;
 	    }
@@ -4965,7 +5204,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 	 *  checked has only white and special characters,
 	 *  check whether the anchor's content on the
 	 *  immediately preceding line also has only
-	 *  white and special characters. - FM
+	 *  white and special characters. -FM
 	 */
 	while (i == 0 &&
 	       (a->extent > CurBlankExtent ||
@@ -4979,13 +5218,13 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 	    if (j < 0) {
 		/*
 		 *  The anchor starts on a preceding line,
-		 *  so check all of this line. - FM
+		 *  so check all of this line. -FM
 		 */
 		j = 0;
 		i = prev->size;
 	    } else {
 		/*
-		 *  The anchor starts on this line. - FM
+		 *  The anchor starts on this line. -FM
 		 */
 		i = a->extent - CurBlankExtent;
 	    }
@@ -5009,7 +5248,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 		     *  This line has only white and special
 		     *  characters, so treat its entire extent
 		     *  as blank, and decrement the pointer for
-		     *  the line to be analyzed. - FM
+		     *  the line to be analyzed. -FM
 		     */
 		    CurBlankExtent += prev->size;
 		    BlankExtent = CurBlankExtent;
@@ -5018,7 +5257,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 		    /*
 		     *  The anchor starts on this line, and it
 		     *  has only white or special characters, so
-		     *  declare the anchor's extent as blank. - FM
+		     *  declare the anchor's extent as blank. -FM
 		     */
 		    BlankExtent = a->extent;
 		    break;
@@ -5033,7 +5272,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 	    /*
 	     *  It's an invisible anchor probably from an ALT=""
 	     *  or an ignored ISMAP attribute due to a companion
-	     *  USEMAP. - FM
+	     *  USEMAP. -FM
 	     */
 	    a->show_anchor = NO;
 
@@ -5044,7 +5283,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 
 	    /*
 	     *  If links are numbered, then try to get rid of the
-	     *  numbered bracket and adjust the anchor count. - FM
+	     *  numbered bracket and adjust the anchor count. -FM
 	     *
 	     * Well, let's do this only if -hiddenlinks=merged is not in
 	     * effect, or if we can be reasonably sure that
@@ -5061,16 +5300,16 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 		/*
 		 *  Set start->data[j] to the close-square-bracket,
 		 *  or to the beginning of the line on which the
-		 *  anchor start. - FM
+		 *  anchor start. -FM
 		 */
 		if (start == last) {
 		    /*
-		     *  The anchor starts on the last line. - FM
+		     *  The anchor starts on the last line. -FM
 		     */
 		    j = (last->size - a->extent - 1);
 		} else {
 		    /*
-		     *  The anchor starts on a previous line. - FM
+		     *  The anchor starts on a previous line. -FM
 		     */
 		    prev = start->prev;
 		    j = (start->size - a->extent + CurBlankExtent - 1);
@@ -5086,7 +5325,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 		 *  a close-square-bracket, check whether we had a wrap
 		 *  and the close-square-bracket is at the end of the
 		 *  previous line.  If so, strip the numbered bracket
-		 *  from that line. - FM
+		 *  from that line. -FM
 		 */
 		if (start->data[j] == ']') {
 		    j--;
@@ -5102,7 +5341,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 		    if (start->data[j] == '[') {
 			/*
 			 *  The numbered bracket is entirely
-			 *  on this line. - FM
+			 *  on this line. -FM
 			 */
 			NumSize++;
 			if (start==last && (int)text->permissible_split > j) {
@@ -5117,7 +5356,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 			for (anc = a; anc; anc = anc->next) {
 			    if (anc->line_num == a->line_num &&
 				anc->line_pos >= NumSize) {
-			    anc->line_pos -= NumSize;
+				anc->line_pos -= NumSize;
 			    }
 			}
 			start->size = j;
@@ -5143,7 +5382,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 			    /*
 			     *  The numbered bracket started on the
 			     *  previous line, and part of it was
-			     *  wrapped to this line. - FM
+			     *  wrapped to this line. -FM
 			     */
 			    NumSize++;
 			    l = (i - j);
@@ -5176,14 +5415,14 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 			} else {
 			    /*
 			     *  Shucks!  We didn't find the
-			     *  numbered bracket. - FM
+			     *  numbered bracket. -FM
 			     */
 			    a->show_anchor = YES;
 			}
 		    } else {
 			/*
 			 *  Shucks!  We didn't find the
-			 *  numbered bracket. - FM
+			 *  numbered bracket. -FM
 			 */
 			a->show_anchor = YES;
 		    }
@@ -5213,7 +5452,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 			    /*
 			     *  The numbered bracket is all on the
 			     *  previous line, and the anchor content
-			     *  was wrapped to the last line. - FM
+			     *  was wrapped to the last line. -FM
 			     */
 			    NumSize++;
 			    k = j + NumSize;
@@ -5226,30 +5465,32 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 			} else {
 			    /*
 			     *  Shucks!  We didn't find the
-			     *  numbered bracket. - FM
+			     *  numbered bracket. -FM
 			     */
 			    a->show_anchor = YES;
 			}
 		    } else {
 			/*
 			 *  Shucks!  We didn't find the
-			 *  numbered bracket. - FM
+			 *  numbered bracket. -FM
 			 */
 			a->show_anchor = YES;
 		    }
 		} else {
 		    /*
 		     *  Shucks!  We didn't find the
-		     *  numbered bracket. - FM
+		     *  numbered bracket. -FM
 		     */
 		    a->show_anchor = YES;
 		}
 	    }
 	} else {
+	    if (!number_links_on_left)
+		add_link_number(text, a, FALSE);
 	    /*
 	     *  The anchor's content is not restricted to only
 	     *  white and special characters, so we'll show it
-	     *  as a link. - FM
+	     *  as a link. -FM
 	     */
 	    a->show_anchor = YES;
 	    if (BlankExtent) {
@@ -5265,7 +5506,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 	     *  and special characters, so set its number
 	     *  and extent to zero, decrement the visible
 	     *  anchor number counter, and add this anchor
-	     *  to the hidden links list. - FM
+	     *  to the hidden links list. -FM
 	     */
 	    a->extent = 0;
 	    if (text->hiddenlinkflag != HIDDENLINKS_MERGE) {
@@ -5278,7 +5519,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 	     *  The anchor's content is not restricted to white
 	     *  and special characters, so we'll display the
 	     *  content, but shorten its extent by any trailing
-	     *  blank lines we've detected. - FM
+	     *  blank lines we've detected. -FM
 	     */
 	    a->extent -= ((BlankExtent < a->extent) ?
 					BlankExtent : 0);
@@ -5296,7 +5537,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3(
 	/*
 	 *  It's a named anchor without an HREF, so it
 	 *  should be registered but not shown as a
-	 *  link. - FM
+	 *  link. -FM
 	 */
 	a->show_anchor = NO;
 	a->extent = 0;
@@ -5355,8 +5596,7 @@ PRIVATE int remove_special_attr_chars ARGS1(
 	 */
 	soft_newline_count += (*cp == LY_SOFT_NEWLINE);
 	if (!IsSpecialAttrChar(*cp)) {
-	   *buf = *cp,
-	   buf++;
+	   *buf++ = *cp;
 	}
     }
     *buf = '\0';
@@ -5421,7 +5661,7 @@ PUBLIC void HText_endAppend ARGS1(
 	 */
 	next_to_the_last_line->next = line_ptr;
 	line_ptr->prev = next_to_the_last_line;
-	FREE(text->last_line);
+	freeHTLine(text, text->last_line);
 	text->last_line = next_to_the_last_line;
 	text->Lines--;
 	CTRACE((tfp, "GridText: New bottom line: `%s'\n",
@@ -5430,7 +5670,7 @@ PUBLIC void HText_endAppend ARGS1(
 
     /*
      *  Fix up the anchor structure values and
-     *  create the hightext strings. - FM
+     *  create the hightext strings. -FM
      */
     HText_trimHightext(text, TRUE, -1);
 }
@@ -5451,12 +5691,13 @@ PUBLIC void HText_endAppend ARGS1(
 **  extent fields are counting bytes in the HTLine data, including
 **  invisible special attribute chars and counting UTF-8 multibyte
 **  characters as multiple bytes.
-**  AFTER the adjustment, the anchor line_pos (and hightext2offset
-**  if applicable) fields indicate x positions in terms of displayed
-**  character cells, and the extent field apparently is unimportant;
-**  the anchor text has been copied to the hightext (and possibly
-**  hightext2) fields (which should have been NULL up to that point),
-**  with special attribute chars removed.
+**
+**  AFTER the adjustment, the anchor line_pos (and hightext offset if
+**  applicable) fields indicate x positions in terms of displayed character
+**  cells, and the extent field apparently is unimportant; the anchor text has
+**  been copied to the hightext fields (which should have been NULL up to that
+**  point), with special attribute chars removed.
+**
 **  This needs to be done so that display_page finds the anchors in the
 **  form it expects when it sets the links[] elements.
 */
@@ -5469,7 +5710,12 @@ PRIVATE void HText_trimHightext ARGS3(
     TextAnchor *anchor_ptr;
     TextAnchor *prev_a = NULL;
     HTLine *line_ptr;
+    HTLine *line_ptr2;
     unsigned char ch;
+    char *hilite_str;
+    int hilite_len;
+    int actual_len;
+    int count_line;
 
     if (!text)
 	return;
@@ -5492,11 +5738,11 @@ PRIVATE void HText_trimHightext ARGS3(
 
     /*
      *  Fix up the anchor structure values and
-     *  create the hightext strings. - FM
+     *  create the hightext strings. -FM
      */
     for (anchor_ptr = text->first_anchor;
-	anchor_ptr;
-	prev_a = anchor_ptr, anchor_ptr=anchor_ptr->next) {
+	anchor_ptr != NULL;
+	prev_a = anchor_ptr, anchor_ptr = anchor_ptr->next) {
 	int have_soft_newline_in_1st_line = 0;
 re_parse:
 	/*
@@ -5534,7 +5780,7 @@ re_parse:
 	 *  done the trimming & adjusting for this anchor, so avoid
 	 *  doing it a second time. - kw
 	 */
-	if (anchor_ptr->hightext)
+	if (LYGetHiTextStr(anchor_ptr, 0) != NULL)
 	    continue;
 
 	if (anchor_ptr->line_pos > (int) line_ptr->size) {
@@ -5570,11 +5816,12 @@ re_parse:
 
 	CTRACE((tfp, "anchor text: '%s'\n", line_ptr->data));
 	/*
-	 *  If the link begins with an end of line and we have more
-	 *  lines, then start the highlighting on the next line. - FM
-	 *  But if an empty anchor is at the end of line and empty,
-	 *  keep it where it is, unless the previous anchor in the list
-	 *  (if any) already starts later. - kw
+	 * If the link begins with an end of line and we have more lines, then
+	 * start the highlighting on the next line.  -FM.
+	 *
+	 * But if an empty anchor is at the end of line and empty, keep it
+	 * where it is, unless the previous anchor in the list (if any) already
+	 * starts later.  - kw
 	 */
 	if ((unsigned)anchor_ptr->line_pos >= strlen(line_ptr->data)) {
 	    if (cur_line < text->Lines &&
@@ -5592,61 +5839,86 @@ re_parse:
 	}
 
 	/*
-	 *  Copy the link name into the data structure.
+	 * Copy the link name into the data structure.
 	 */
-	if (line_ptr->data &&
-	    anchor_ptr->extent > 0 && anchor_ptr->line_pos >= 0) {
-	    StrnAllocCopy(anchor_ptr->hightext,
-			  &line_ptr->data[anchor_ptr->line_pos],
-			  anchor_ptr->extent);
+	if (line_ptr->data
+	 && anchor_ptr->extent > 0
+	 && anchor_ptr->line_pos >= 0) {
+	    int size = (int) line_ptr->size - anchor_ptr->line_pos;
+	    if (size > anchor_ptr->extent)
+		size = anchor_ptr->extent;
+	    LYClearHiText(anchor_ptr);
+	    LYSetHiText(anchor_ptr,
+			&line_ptr->data[anchor_ptr->line_pos],
+			size);
 	} else {
-	    StrAllocCopy(anchor_ptr->hightext, "");
+	    LYClearHiText(anchor_ptr);
+	    LYSetHiText(anchor_ptr, "", 0);
 	}
 
 	/*
-	 *  If true the anchor extends over two lines,
-	 *  copy that into the data structure.
+	 * If the anchor extends over more than one line, copy that into the
+	 * data structure.
 	 */
-	if ((unsigned)anchor_ptr->extent > strlen(anchor_ptr->hightext)) {
-	    HTLine *line_ptr2 = line_ptr->next;
+	hilite_str = LYGetHiTextStr(anchor_ptr, 0);
+	hilite_len = strlen(hilite_str);
+	actual_len = anchor_ptr->extent;
 
-	    if (!final) {
-		if (cur_line + 1 >= stop_before) {
-		    FREE(anchor_ptr->hightext); /* bail out */
-		    break;
-		}
+	line_ptr2 = line_ptr;
+	count_line = cur_line;
+	while (actual_len > hilite_len) {
+	    HTLine *old_line_ptr2 = line_ptr2;
+
+	    count_line++;
+	    line_ptr2 = line_ptr2->next;
+
+	    if (!final
+	     && count_line >= stop_before) {
+		LYClearHiText(anchor_ptr);
+		break;
+	    } else if (old_line_ptr2 == text->last_line) {
+		break;
 	    }
+
 	    /*
-	     *  Double check that we have a line pointer,
-	     *  and if so, copy into hightext2.
+	     * Double check that we have a line pointer, and if so, copy into
+	     * highlight text.
 	     */
-	    if (line_ptr2) {
-		StrnAllocCopy(anchor_ptr->hightext2,
+	    if (line_ptr2
+	     && line_ptr2->size) {
+		char *hi_string = NULL;
+		int hi_offset = line_ptr2->offset;
+
+		StrnAllocCopy(hi_string,
 			      line_ptr2->data,
-			      (anchor_ptr->extent -
-			       strlen(anchor_ptr->hightext)));
-		anchor_ptr->hightext2offset = line_ptr2->offset;
+			      (actual_len - hilite_len));
+		actual_len -= strlen(hi_string);
 		/*handle LY_SOFT_NEWLINEs -VH */
-		anchor_ptr->hightext2offset +=
-			remove_special_attr_chars(anchor_ptr->hightext2);
+		hi_offset += remove_special_attr_chars(hi_string);
 
 		if (anchor_ptr->link_type & HYPERTEXT_ANCHOR) {
-		    LYTrimTrailing(anchor_ptr->hightext2);
-		    if (anchor_ptr->hightext2[0] == '\0') {
-			FREE(anchor_ptr->hightext2);
-			anchor_ptr->hightext2offset = 0;
-		    }
+		    LYTrimTrailing(hi_string);
+		}
+		if (non_empty(hi_string)) {
+		    LYAddHiText(anchor_ptr, hi_string, hi_offset);
 		}
+		FREE(hi_string);
 	    }
 	}
-	remove_special_attr_chars(anchor_ptr->hightext);
+
+	if (!final
+	 && count_line >= stop_before) {
+	    break;
+	}
+
+	hilite_str = LYGetHiTextStr(anchor_ptr, 0);
+	remove_special_attr_chars(hilite_str);
 	if (anchor_ptr->link_type & HYPERTEXT_ANCHOR) {
-	    LYTrimTrailing(anchor_ptr->hightext);
+	    LYTrimTrailing(hilite_str);
 	}
 
 	/*
-	 *  Subtract any formatting characters from the x position
-	 *  of the link.
+	 * Subtract any formatting characters from the x position of the link.
 	 */
 	if (anchor_ptr->line_pos > 0) {
 	    register int offset = 0, i = 0;
@@ -5672,12 +5944,6 @@ re_parse:
 	CTRACE((tfp, "GridText:     add link on line %d col %d [%d] %s\n",
 	       cur_line, anchor_ptr->line_pos,
 	       anchor_ptr->number, "in HText_trimHightext"));
-
-	/*
-	 *  If this is the last anchor, we're done!
-	 */
-	if (anchor_ptr == text->last_anchor)
-	    break;
     }
 }
 
@@ -5693,29 +5959,39 @@ PUBLIC HTParentAnchor * HText_nodeAnchor ARGS1(
 /*				GridText specials
 **				=================
 */
+
 /*
- *  HTChildAnchor() returns the anchor with index N.
- *  The index corresponds to the [number] we print for the anchor.
+ *  HText_childNextNumber() returns the anchor with index [number],
+ *  using a pointer from the previous number (=optimization) or NULL.
  */
-PUBLIC HTChildAnchor * HText_childNumber ARGS1(
-	int,		number)
+PUBLIC HTChildAnchor * HText_childNextNumber ARGS2(
+	int,		number,
+	void**,		prev)
 {
-    TextAnchor * a;
+    /* Sorry, TextAnchor is not declared outside this file, use a cast. */
+    TextAnchor * a = *prev;
 
-    if (!(HTMainText && HTMainText->first_anchor) || number <= 0)
+    if (!HTMainText || number <= 0)
 	return (HTChildAnchor *)0;	/* Fail */
+    if (number == 1 || !a)
+	a = HTMainText->first_anchor;
 
-    for (a = HTMainText->first_anchor; a; a = a->next) {
-	if (a->number == number)
-	    return(a->anchor);
-    }
-    return (HTChildAnchor *)0;	/* Fail */
+    /* a strange thing:  positive a->number's are sorted,
+     * and between them several a->number's may be 0 -- skip them
+     */
+    for( ; a && a->number != number; a = a->next)
+	;
+
+    if (!a)
+	return (HTChildAnchor *)0;	/* Fail */
+    *prev = (void*)a;
+    return a->anchor;
 }
 
 /*
  *  HText_FormDescNumber() returns a description of the form field
  *  with index N.  The index corresponds to the [number] we print
- *  for the field. - FM & LE
+ *  for the field. -FM & LE
  */
 PUBLIC void HText_FormDescNumber ARGS2(
 	int,		number,
@@ -5988,8 +6264,8 @@ PUBLIC int HTGetLinkInfo ARGS6(
 		}
 		return(LINK_LINE_FOUND);
 	    } else {
-		*hightext= a->hightext;
-		link_dest = HTAnchor_followMainLink((HTAnchor *)a->anchor);
+		*hightext = LYGetHiTextStr(a, 0);
+		link_dest = HTAnchor_followLink(a->anchor);
 		{
 		    char *cp_freeme = NULL;
 		    if (traversal) {
@@ -5998,7 +6274,7 @@ PUBLIC int HTGetLinkInfo ARGS6(
 #ifndef DONT_TRACK_INTERNAL_LINKS
 			if (a->link_type == INTERNAL_LINK_ANCHOR) {
 			    link_dest_intl = HTAnchor_followTypedLink(
-				(HTAnchor *)a->anchor, LINK_INTERNAL);
+				a->anchor, HTInternalLink);
 			    if (link_dest_intl && link_dest_intl != link_dest) {
 
 				CTRACE((tfp, "HTGetLinkInfo: unexpected typed link to %s!\n",
@@ -6063,7 +6339,7 @@ PRIVATE BOOLEAN same_anchor_or_field ARGS5(
 
 #define same_anchor_as_link(i,a,ta_same) (i >= 0 && a &&\
 		same_anchor_or_field(links[i].anchor_number,\
-		(links[i].type == WWW_FORM_LINK_TYPE) ? links[i].form : NULL,\
+		(links[i].type == WWW_FORM_LINK_TYPE) ? links[i].l_form : NULL,\
 		a->number,\
 		(a->link_type == INPUT_ANCHOR) ? a->input_field : NULL,\
 		ta_same))
@@ -6091,7 +6367,7 @@ PUBLIC BOOL HText_TAHasMoreLines ARGS2(
     if (direction < 0) {
 	for (a = HTMainText->first_anchor; a; prev_a = a, a = a->next) {
 	    if (a->link_type == INPUT_ANCHOR &&
-		links[curlink].form == a->input_field) {
+		links[curlink].l_form == a->input_field) {
 		return same_anchors(a, prev_a, TRUE);
 	    }
 	    if (links[curlink].anchor_number &&
@@ -6101,10 +6377,8 @@ PUBLIC BOOL HText_TAHasMoreLines ARGS2(
 	return NO;
     } else {
 	for (a = HTMainText->first_anchor; a; a = a->next) {
-	    if (a == HTMainText->last_anchor)
-		break;
 	    if (a->link_type == INPUT_ANCHOR &&
-		links[curlink].form == a->input_field) {
+		links[curlink].l_form == a->input_field) {
 		return same_anchors(a, a->next, TRUE);
 	    }
 	    if (links[curlink].anchor_number &&
@@ -6327,7 +6601,7 @@ PUBLIC int HTGetLinkOrFieldStart ARGS5(
  *  *data with all IsSpecial characters stripped, its offset and
  *  the printable target length (without IsSpecial, or extra CJK
  *  or utf8 characters) are loaded into *offset and *tLen, and
- *  TRUE is returned. - FM
+ *  TRUE is returned. -FM
  */
 PUBLIC BOOL HText_getFirstTargetInLine ARGS7(
 	HText *,	text,
@@ -6345,14 +6619,17 @@ PUBLIC BOOL HText_getFirstTargetInLine ARGS7(
 
     /*
      *  Make sure we have an HText structure, that line_num is
-     *  in its range, and that we have a target string. - FM
+     *  in its range, and that we have a target string. -FM
      */
-    if (!(text && line_num >= 0 && line_num <= text->Lines &&
-	  target && *target))
+    if (!(text &&
+	line_num >= 0 &&
+	line_num <= text->Lines &&
+	non_empty(target))) {
 	return(FALSE);
+    }
 
     /*
-     *  Find the line and set up its data and offset - FM
+     *  Find the line and set up its data and offset -FM
      */
     for (i = 0, line = FirstHTLine(text);
 	 i < line_num && (line != text->last_line);
@@ -6370,7 +6647,7 @@ PUBLIC BOOL HText_getFirstTargetInLine ARGS7(
      *  If the target is on the line, load the offset of
      *  its first character and the subsequent line data,
      *  strip any special characters from the loaded line
-     *  data, and return TRUE. - FM
+     *  data, and return TRUE. -FM
      */
     if (((cp = LYno_attr_mb_strstr(LineData,
 				   target,
@@ -6382,7 +6659,7 @@ PUBLIC BOOL HText_getFirstTargetInLine ARGS7(
 	 *  We had a hit so load the results,
 	 *  remove IsSpecial characters from
 	 *  the allocated data string, and
-	 *  return TRUE. - FM
+	 *  return TRUE. -FM
 	 */
 	*offset = (LineOffset + HitOffset);
 	*tLen = (LenNeeded - HitOffset);
@@ -6392,7 +6669,7 @@ PUBLIC BOOL HText_getFirstTargetInLine ARGS7(
     }
 
     /*
-     *  The line does not contain the target. - FM
+     *  The line does not contain the target. -FM
      */
     return(FALSE);
 }
@@ -6427,7 +6704,7 @@ PUBLIC CONST char *HText_getStyle NOARGS
 /*
  *  HText_getSugFname returns the suggested filename of the current
  *  document (normally derived from a Content-Disposition header with
- *  attachment; filename=name.suffix). - FM
+ *  attachment; filename=name.suffix). -FM
  */
 PUBLIC CONST char * HText_getSugFname NOARGS
 {
@@ -6441,7 +6718,7 @@ PUBLIC CONST char * HText_getSugFname NOARGS
  *  or truncates the string's suffix if appropriate, based on whether
  *  the anchor indicates that the file is compressed.  We assume
  *  that the file was not uncompressed (as when downloading), and
- *  believe the headers about whether it's compressed or not. - FM
+ *  believe the headers about whether it's compressed or not. -FM
  *
  *  Added third arg - if strip_ok is FALSE, we don't trust the anchor
  *  info enough to remove a compression suffix if the anchor object
@@ -6461,7 +6738,7 @@ PUBLIC void HTCheckFnameForCompression ARGS3(
     CompressFileType second;
 
     /*
-     *  Make sure we have a string and anchor. - FM
+     *  Make sure we have a string and anchor. -FM
      */
     if (!(fn && anchor))
 	return;
@@ -6474,14 +6751,14 @@ PUBLIC void HTCheckFnameForCompression ARGS3(
 
     /*
      *  Check the anchor's content_type and content_encoding
-     *  elements for a gzip or Unix compressed file. - FM
+     *  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
+	 *  the Content-Type. -FM
 	 */
 	if (!strncasecomp(ct, "application/gzip", 16) ||
 	    !strncasecomp(ct, "application/x-gzip", 18)) {
@@ -6527,7 +6804,7 @@ PUBLIC void HTCheckFnameForCompression ARGS3(
 
     /*
      *  Seek the last dot, and check whether
-     *  we have a gzip or compress suffix. - FM
+     *  we have a gzip or compress suffix. -FM
      */
     if ((dot = strrchr(fn, '.')) != NULL) {
 	if (HTCompressFileType(fn, ".", &cp) != cftNone) {
@@ -6535,7 +6812,7 @@ PUBLIC void HTCheckFnameForCompression ARGS3(
 		/*
 		 *  It has a suffix which signifies a gzipped
 		 *  or compressed file for us, but the anchor
-		 *  claims otherwise, so tweak the suffix. - FM
+		 *  claims otherwise, so tweak the suffix. -FM
 		 */
 		*dot = '\0';
 	    }
@@ -6546,7 +6823,7 @@ PUBLIC void HTCheckFnameForCompression ARGS3(
 		/*
 		 *  It has a tail which signifies a gzipped
 		 *  file for us, but the anchor claims otherwise,
-		 *  so tweak the suffix. - FM
+		 *  so tweak the suffix. -FM
 		 */
 		if (cp == dot+1)
 		    cp--;
@@ -6555,7 +6832,7 @@ PUBLIC void HTCheckFnameForCompression ARGS3(
 		/*
 		 *  The anchor claims it's gzipped, and we
 		 *  believe it, so force this tail to the
-		 *  conventional suffix. - FM
+		 *  conventional suffix. -FM
 		 */
 #ifdef VMS
 		*cp = '-';
@@ -6587,7 +6864,7 @@ PUBLIC void HTCheckFnameForCompression ARGS3(
     }
 
     /*
-     *  Add the appropriate suffix. - FM
+     *  Add the appropriate suffix. -FM
      */
     if (*suffix) {
 	if (!dot) {
@@ -6605,7 +6882,7 @@ PUBLIC void HTCheckFnameForCompression ARGS3(
 
 /*
  *  HText_getLastModified returns the Last-Modified header
- *  if available, for the current document. - FM
+ *  if available, for the current document. -FM
  */
 PUBLIC CONST char * HText_getLastModified NOARGS
 {
@@ -6615,7 +6892,7 @@ PUBLIC CONST char * HText_getLastModified NOARGS
 
 /*
  *  HText_getDate returns the Date header
- *  if available, for the current document. - FM
+ *  if available, for the current document. -FM
  */
 PUBLIC CONST char * HText_getDate NOARGS
 {
@@ -6625,7 +6902,7 @@ PUBLIC CONST char * HText_getDate NOARGS
 
 /*
  *  HText_getServer returns the Server header
- *  if available, for the current document. - FM
+ *  if available, for the current document. -FM
  */
 PUBLIC CONST char * HText_getServer NOARGS
 {
@@ -6694,7 +6971,7 @@ PUBLIC BOOL HText_pageHasPrevTarget NOARGS
 
 /*
  *  HText_LinksInLines returns the number of links in the
- *  'Lines' number of lines beginning with 'line_num'-1. - FM
+ *  'Lines' number of lines beginning with 'line_num'-1. -FM
  */
 PUBLIC int HText_LinksInLines ARGS3(
 	HText *,	text,
@@ -6710,16 +6987,14 @@ PUBLIC int HText_LinksInLines ARGS3(
 	return total;
 
     for (Anchor_ptr = text->first_anchor;
-		Anchor_ptr != NULL && Anchor_ptr->line_num <= end;
-			Anchor_ptr = Anchor_ptr->next) {
+	 Anchor_ptr != NULL && Anchor_ptr->line_num <= end;
+	 Anchor_ptr = Anchor_ptr->next) {
 	if (Anchor_ptr->line_num >= start &&
 	    Anchor_ptr->line_num < end &&
 	    Anchor_ptr->show_anchor &&
 	    !(Anchor_ptr->link_type == INPUT_ANCHOR
 	      && Anchor_ptr->input_field->type == F_HIDDEN_TYPE))
 	    ++total;
-	if (Anchor_ptr == text->last_anchor)
-	    break;
     }
 
     return total;
@@ -6834,7 +7109,7 @@ PUBLIC BOOL HText_select ARGS1(
 	HTMainAnchor = text->node_anchor;
 
 	/*
-	 *  Make this text the most current in the loaded texts list. - FM
+	 *  Make this text the most current in the loaded texts list. -FM
 	 */
 	if (loaded_texts && HTList_removeObject(loaded_texts, text))
 	    HTList_addObject(loaded_texts, text);
@@ -6847,24 +7122,25 @@ PUBLIC BOOL HText_select ARGS1(
 /*
  *  This function returns TRUE if doc's post_data, address
  *  and isHEAD elements are identical to those of a loaded
- *  (memory cached) text. - FM
+ *  (memory cached) text. -FM
  */
 PUBLIC BOOL HText_POSTReplyLoaded ARGS1(
-	document *,	doc)
+	DocInfo *,	doc)
 {
     HText *text = NULL;
     HTList *cur = loaded_texts;
-    char *post_data, *address;
+    bstring *post_data;
+    char *address;
     BOOL is_head;
 
     /*
-     *  Make sure we have the structures. - FM
+     *  Make sure we have the structures. -FM
      */
     if (!cur || !doc)
 	return(FALSE);
 
     /*
-     *  Make sure doc is for a POST reply. - FM
+     *  Make sure doc is for a POST reply. -FM
      */
     if ((post_data = doc->post_data) == NULL ||
 	(address = doc->address) == NULL)
@@ -6873,12 +7149,12 @@ PUBLIC BOOL HText_POSTReplyLoaded ARGS1(
 
     /*
      *  Loop through the loaded texts looking for a
-     *  POST reply match. - FM
+     *  POST reply match. -FM
      */
     while (NULL != (text = (HText *)HTList_nextObject(cur))) {
 	if (text->node_anchor &&
 	    text->node_anchor->post_data &&
-	    !strcmp(post_data, text->node_anchor->post_data) &&
+	    BINEQ(post_data, text->node_anchor->post_data) &&
 	    text->node_anchor->address &&
 	    !strcmp(address, text->node_anchor->address) &&
 	    is_head == text->node_anchor->isHEAD) {
@@ -6890,25 +7166,25 @@ PUBLIC BOOL HText_POSTReplyLoaded ARGS1(
 }
 
 PUBLIC BOOL HTFindPoundSelector ARGS1(
-	char *,		selector)
+	CONST char *,		selector)
 {
     TextAnchor * a;
 
-    for (a=HTMainText->first_anchor; a; a=a->next) {
+    for (a = HTMainText->first_anchor; a != 0; a = a->next) {
 
-	if (a->anchor && a->anchor->tag)
+	if (a->anchor && a->anchor->tag) {
 	    if (!strcmp(a->anchor->tag, selector)) {
 
 		www_search_result = a->line_num+1;
 
-		CTRACE((tfp,
-		       "HText: Selecting anchor [%d] at line %d\n",
-				     a->number, www_search_result));
+		CTRACE((tfp, "FindPound: Selecting anchor [%d] at line %d\n",
+			     a->number, www_search_result));
 		if (!strcmp(selector, LYToolbarName)) {
 		    --www_search_result;
 		}
 		return(YES);
 	    }
+	}
     }
 
     return(NO);
@@ -6943,9 +7219,8 @@ PUBLIC BOOL HText_selectAnchor ARGS2(
 
     {
 	 int l = a->line_num;
-	 CTRACE((tfp,
-	    "HText: Selecting anchor [%d] at line %d\n",
-	    a->number, l));
+	 CTRACE((tfp, "HText: Selecting anchor [%d] at line %d\n",
+		      a->number, l));
 
 	if ( !text->stale &&
 	     (l >= text->top_of_screen) &&
@@ -7065,7 +7340,7 @@ PUBLIC HTAnchor * HText_linkSelTo ARGS2(
 }
 
 /*
- *  Utility for freeing the list of previous isindex and whereis queries. - FM
+ *  Utility for freeing the list of previous isindex and whereis queries. -FM
  */
 PUBLIC void HTSearchQueries_free NOARGS
 {
@@ -7085,7 +7360,7 @@ PUBLIC void HTSearchQueries_free NOARGS
 
 /*
  *  Utility for listing isindex and whereis queries, making
- *  any repeated queries the most current in the list. - FM
+ *  any repeated queries the most current in the list. -FM
  */
 PUBLIC void HTAddSearchQuery ARGS1(
 	char *,		query)
@@ -7094,7 +7369,7 @@ PUBLIC void HTAddSearchQuery ARGS1(
     char *old;
     HTList *cur;
 
-    if (!(query && *query))
+    if (!non_empty(query))
 	return;
 
     StrAllocCopy(new_query, query);
@@ -7122,7 +7397,7 @@ PUBLIC void HTAddSearchQuery ARGS1(
 }
 
 PUBLIC int do_www_search ARGS1(
-	document *,	doc)
+	DocInfo *,	doc)
 {
     char searchstring[256], temp[256], *cp, *tmpaddress = NULL;
     int ch, recall;
@@ -7146,7 +7421,7 @@ PUBLIC int do_www_search ARGS1(
 	HTUnEscape(searchstring);
 	strcpy(temp, searchstring);
 	/*
-	 *  Make sure it's treated as the most recent query. - FM
+	 *  Make sure it's treated as the most recent query. -FM
 	 */
 	HTAddSearchQuery(searchstring);
     } else {
@@ -7178,19 +7453,19 @@ get_query:
 	if (recall && ch == UPARROW) {
 	    if (PreviousSearch) {
 		/*
-		 *  Use the second to last query in the list. - FM
+		 *  Use the second to last query in the list. -FM
 		 */
 		QueryNum = 1;
 		PreviousSearch = FALSE;
 	    } else {
 		/*
-		 *  Go back to the previous query in the list. - FM
+		 *  Go back to the previous query in the list. -FM
 		 */
 		QueryNum++;
 	    }
 	    if (QueryNum >= QueryTotal)
 		/*
-		 *  Roll around to the last query in the list. - FM
+		 *  Roll around to the last query in the list. -FM
 		 */
 		QueryNum = 0;
 	    if ((cp=(char *)HTList_objectAt(search_queries,
@@ -7209,19 +7484,19 @@ get_query:
 	} else if (recall && ch == DNARROW) {
 	    if (PreviousSearch) {
 		/*
-		 *  Use the first query in the list. - FM
+		 *  Use the first query in the list. -FM
 		 */
 		QueryNum = QueryTotal - 1;
 		PreviousSearch = FALSE;
 	    } else {
 		/*
-		 *  Advance to the next query in the list. - FM
+		 *  Advance to the next query in the list. -FM
 		 */
 		QueryNum--;
 	    }
 	    if (QueryNum < 0)
 		/*
-		 *  Roll around to the first query in the list. - FM
+		 *  Roll around to the first query in the list. -FM
 		 */
 		QueryNum = QueryTotal - 1;
 	    if ((cp=(char *)HTList_objectAt(search_queries,
@@ -7247,7 +7522,7 @@ get_query:
     }
 
     /*
-     *  Strip leaders and trailers. - FM
+     *  Strip leaders and trailers. -FM
      */
     LYTrimLeading(searchstring);
     if (!(*searchstring)) {
@@ -7266,7 +7541,7 @@ get_query:
 
     /*
      *  Add searchstring to the query list,
-     *  or make it the most current. - FM
+     *  or make it the most current. -FM
      */
     HTAddSearchQuery(searchstring);
 
@@ -7315,7 +7590,7 @@ get_query:
      *  If it's redirection, use_this_url_instead is set, and
      *  mainloop() will deal with it such that security features
      *  and restrictions are checked before acting on the URL, or
-     *  rejecting it. - FM
+     *  rejecting it. -FM
      */
     return(NOT_FOUND);
 }
@@ -7376,17 +7651,21 @@ PUBLIC void print_wwwfile_to_fd ARGS2(
 
     line = FirstHTLine(HTMainText);
     for (;; line = line->next) {
-	if (!first && line->data[0] != LY_SOFT_NEWLINE) {
+	if (first) {
+	    first = FALSE;
+	    if (is_reply) {
+		fputc('>',fp);
+	    }
+	} else if (line->data[0] != LY_SOFT_NEWLINE) {
 	    fputc('\n',fp);
 	    /*
-	     *  Add news-style quotation if requested. - FM
+	     *  Add news-style quotation if requested. -FM
 	     */
 	    if (is_reply) {
 		fputc('>',fp);
 	    }
 	}
 
-	first = FALSE;
 	write_offset(fp, line);
 
 	/*
@@ -7506,8 +7785,7 @@ PUBLIC void print_crawl_to_fd ARGS3(
      *  Add the References list if appropriate
      */
     if ((nolist == FALSE) &&
-	(keypad_mode == LINKS_ARE_NUMBERED ||
-	 keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED)) {
+	links_are_numbered()) {
 	printlist(fp,FALSE);
     }
 
@@ -7517,7 +7795,7 @@ PUBLIC void print_crawl_to_fd ARGS3(
 }
 
 PRIVATE void adjust_search_result ARGS3(
-    document *,	doc,
+    DocInfo *,	doc,
     int,	tentative_result,
     int,	start_line)
 {
@@ -7593,26 +7871,29 @@ PRIVATE BOOL anchor_has_target ARGS2(
 {
     OptionType * option;
     char *stars = NULL, *cp;
+    int count;
 
     /*
-     *  Search the hightext string, and hightext2 if present,
-     *  taking the case_sensitive setting into account. - FM
+     * Search the hightext strings, taking the case_sensitive setting into
+     * account.  -FM
      */
-    if (LYno_attr_strstr(a->hightext, target)
-     || LYno_attr_strstr(a->hightext2, target)) {
-	return TRUE;
+    for (count = 0; ; ++count) {
+	if ((cp = LYGetHiTextStr(a, count)) == NULL)
+	    break;
+	if (LYno_attr_strstr(cp, target))
+	    return TRUE;
     }
 
     /*
      *  Search the relevant form fields, taking the
-     *  case_sensitive setting into account. - FM
+     *  case_sensitive setting into account. -FM
      */
     if ((a->input_field != NULL && a->input_field->value != NULL) &&
 	a->input_field->type != F_HIDDEN_TYPE) {
 	if (a->input_field->type == F_PASSWORD_TYPE) {
 	    /*
 	     *  Check the actual, hidden password, and then
-	     *  the displayed string. - FM
+	     *  the displayed string. -FM
 	     */
 	    if (LYno_attr_strstr(a->input_field->value, target)) {
 		return TRUE;
@@ -7625,10 +7906,10 @@ PRIVATE BOOL anchor_has_target ARGS2(
 		return TRUE;
 	    }
 	    FREE(stars);
-       } else if (a->input_field->type == F_OPTION_LIST_TYPE) {
+	} else if (a->input_field->type == F_OPTION_LIST_TYPE) {
 	    /*
 	     *  Search the option strings that are displayed
-	     *  when the popup is invoked. - FM
+	     *  when the popup is invoked. -FM
 	     */
 	    option = a->input_field->select_list;
 	    while (option != NULL) {
@@ -7639,7 +7920,7 @@ PRIVATE BOOL anchor_has_target ARGS2(
 	    }
 	} else if (a->input_field->type == F_RADIO_TYPE) {
 	    /*
-	     *  Search for checked or unchecked parens. - FM
+	     *  Search for checked or unchecked parens. -FM
 	     */
 	    if (a->input_field->num_value) {
 		cp = checked_radio;
@@ -7651,7 +7932,7 @@ PRIVATE BOOL anchor_has_target ARGS2(
 	    }
 	} else if (a->input_field->type == F_CHECKBOX_TYPE) {
 	    /*
-	     *  Search for checked or unchecked square brackets. - FM
+	     *  Search for checked or unchecked square brackets. -FM
 	     */
 	    if (a->input_field->num_value) {
 		cp = checked_box;
@@ -7663,10 +7944,9 @@ PRIVATE BOOL anchor_has_target ARGS2(
 	    }
 	} else {
 	    /*
-	     *  Check the values intended for display.
-	     *  May have been found already via the
-	     *  hightext search, but make sure here
-	     *  that the entire value is searched. - FM
+	     * Check the values intended for display.  May have been found
+	     * already via the hightext search, but make sure here that the
+	     * entire value is searched.  -FM
 	     */
 	    if (LYno_attr_strstr(a->input_field->value, target)) {
 		return TRUE;
@@ -7727,7 +8007,7 @@ PRIVATE TextAnchor *get_prev_anchor ARGS1(
 
 PRIVATE int www_search_forward ARGS5(
 	int,		start_line,
-	document *,	doc,
+	DocInfo *,	doc,
 	char *,		target,
 	HTLine *,	line,
 	int,		count)
@@ -7770,7 +8050,7 @@ PRIVATE int www_search_forward ARGS5(
 
 PRIVATE int www_search_backward ARGS5(
 	int,		start_line,
-	document *,	doc,
+	DocInfo *,	doc,
 	char *,		target,
 	HTLine *,	line,
 	int,		count)
@@ -7813,7 +8093,7 @@ PRIVATE int www_search_backward ARGS5(
 
 PUBLIC void www_user_search ARGS4(
 	int,		start_line,
-	document *,	doc,
+	DocInfo *,	doc,
 	char *,		target,
 	int,		direction)
 {
@@ -7858,7 +8138,7 @@ PUBLIC void user_message ARGS2(
 	return;
     }
 
-    HTSprintf0(&temp, message, (argument == 0) ? "" : argument);
+    HTSprintf0(&temp, message, NonNull(argument));
 
     statusline(temp);
 
@@ -7938,13 +8218,6 @@ PUBLIC void HTuncache_current_document NOARGS
     if (HTMainText) {
 	HTParentAnchor * htmain_anchor = HTMainText->node_anchor;
 
-	if (HText_HaveUserChangedForms()) {
-	    /*
-	     * Issue a warning.  User forms content will be lost.
-	     */
-	    HTAlert(RELOADING_FORM);
-	}
-
 	if (htmain_anchor) {
 	    if (!(HTOutputFormat && HTOutputFormat == WWW_SOURCE)) {
 		FREE(htmain_anchor->UCStages);
@@ -7955,8 +8228,9 @@ PUBLIC void HTuncache_current_document NOARGS
 			      htmain_anchor->address) ?
 			       htmain_anchor->address : "unknown anchor"),
 			    ((htmain_anchor &&
-			      htmain_anchor->post_data) ?
-				      " with POST data" : "")));
+			      htmain_anchor->post_data)
+			      ? " with POST data"
+			      : "")));
 	HTList_removeObject(loaded_texts, HTMainText);
 	HText_free(HTMainText);
 	HTMainText = NULL;
@@ -7965,7 +8239,7 @@ PUBLIC void HTuncache_current_document NOARGS
     }
 }
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 
 PRIVATE HTProtocol scm = { "source-cache-mem", 0, 0 }; /* dummy - kw */
 
@@ -8020,7 +8294,7 @@ PUBLIC BOOLEAN HTreparse_document NOARGS
 	    return FALSE;
 	}
 
-	if (HText_HaveUserChangedForms()) {
+	if (HText_HaveUserChangedForms(HTMainText)) {
 	    /*
 	     * Issue a warning.  Will not restore changed forms, currently.
 	     */
@@ -8073,7 +8347,7 @@ PUBLIC BOOLEAN HTreparse_document NOARGS
 	}
 	/* not UCLYhndl_HTFile_for_unspec - we are talking about remote documents... */
 
-	if (HText_HaveUserChangedForms()) {
+	if (HText_HaveUserChangedForms(HTMainText)) {
 	    /*
 	     * Issue a warning.  Will not restore changed forms, currently.
 	     */
@@ -8199,15 +8473,14 @@ PUBLIC char * HTLoadedDocumentURL NOARGS
 	return ("");
 }
 
-PUBLIC char * HTLoadedDocumentPost_data NOARGS
+PUBLIC bstring * HTLoadedDocumentPost_data NOARGS
 {
-    if (!HTMainText)
-	return ("");
-
-    if (HTMainText->node_anchor && HTMainText->node_anchor->post_data)
+    if (HTMainText
+     && HTMainText->node_anchor
+     && HTMainText->node_anchor->post_data)
 	return(HTMainText->node_anchor->post_data);
     else
-	return ("");
+	return (0);
 }
 
 PUBLIC char * HTLoadedDocumentTitle NOARGS
@@ -8292,6 +8565,15 @@ PUBLIC int HText_LastLineSize ARGS2(
     return HText_TrueLineSize(text->last_line, text, IgnoreSpaces);
 }
 
+PUBLIC BOOL HText_LastLineEmpty ARGS2(
+	HText *,	text,
+	BOOL,		IgnoreSpaces)
+{
+    if (!text || !text->last_line || !text->last_line->size)
+	return TRUE;
+    return HText_TrueEmptyLine(text->last_line, text, IgnoreSpaces);
+}
+
 PUBLIC int HText_LastLineOffset ARGS1(
 	HText *,	text)
 {
@@ -8313,6 +8595,22 @@ PUBLIC int HText_PreviousLineSize ARGS2(
     return HText_TrueLineSize(line, text, IgnoreSpaces);
 }
 
+PUBLIC BOOL HText_PreviousLineEmpty ARGS2(
+	HText *,	text,
+	BOOL,		IgnoreSpaces)
+{
+    HTLine * line;
+
+    if (!text || !text->last_line)
+	return TRUE;
+    if (!(line = text->last_line->prev))
+	return TRUE;
+    return HText_TrueEmptyLine(line, text, IgnoreSpaces);
+}
+
+/*
+ * Compute the "true" line size.
+ */
 PRIVATE int HText_TrueLineSize ARGS3(
 	HTLine *,	line,
 	HText *,	text,
@@ -8327,9 +8625,7 @@ PRIVATE int HText_TrueLineSize ARGS3(
     if (IgnoreSpaces) {
 	for (i = 0; i < line->size; i++) {
 	    if (!IsSpecialAttrChar(UCH(line->data[i])) &&
-		(!(text && text->T.output_utf8) ||
-		 UCH(line->data[i]) < 128 ||
-		 (UCH((line->data[i] & 0xc0)) == 0xc0)) &&
+		IS_UTF8_EXTRA(line->data[i]) &&
 		!isspace(UCH(line->data[i])) &&
 		UCH(line->data[i]) != HT_NON_BREAK_SPACE &&
 		UCH(line->data[i]) != HT_EN_SPACE) {
@@ -8339,9 +8635,7 @@ PRIVATE int HText_TrueLineSize ARGS3(
     } else {
 	for (i = 0; i < line->size; i++) {
 	    if (!IsSpecialAttrChar(line->data[i]) &&
-		(!(text && text->T.output_utf8) ||
-		 UCH(line->data[i]) < 128 ||
-		 (UCH(line->data[i] & 0xc0) == 0xc0))) {
+		IS_UTF8_EXTRA(line->data[i])) {
 		true_size++;
 	    }
 	}
@@ -8349,6 +8643,42 @@ PRIVATE int HText_TrueLineSize ARGS3(
     return true_size;
 }
 
+/*
+ * Tell if the line is really empty.  This is invoked much more often than
+ * HText_TrueLineSize(), and most lines are not empty.  So it is faster to
+ * do this check than to check if the line size happens to be zero.
+ */
+PRIVATE BOOL HText_TrueEmptyLine ARGS3(
+	HTLine *,	line,
+	HText *,	text,
+	BOOL,		IgnoreSpaces)
+{
+    size_t i;
+
+    if (!(line && line->size))
+	return TRUE;
+
+    if (IgnoreSpaces) {
+	for (i = 0; i < line->size; i++) {
+	    if (!IsSpecialAttrChar(UCH(line->data[i])) &&
+		IS_UTF8_EXTRA(line->data[i]) &&
+		!isspace(UCH(line->data[i])) &&
+		UCH(line->data[i]) != HT_NON_BREAK_SPACE &&
+		UCH(line->data[i]) != HT_EN_SPACE) {
+		return FALSE;
+	    }
+	}
+    } else {
+	for (i = 0; i < line->size; i++) {
+	    if (!IsSpecialAttrChar(line->data[i]) &&
+		IS_UTF8_EXTRA(line->data[i])) {
+		return FALSE;
+	    }
+	}
+    }
+    return TRUE;
+}
+
 PUBLIC void HText_NegateLineOne ARGS1(
 	HText *,	text)
 {
@@ -8375,24 +8705,22 @@ PUBLIC BOOL HText_inLineOne ARGS1(
  *  the removed line (i.e., control characters, or it
  *  wouldn't have tested blank) should have been
  *  reiterated by split_line() in the retained blank
- *  line. - FM
+ *  line. -FM
  */
 PUBLIC void HText_RemovePreviousLine ARGS1(
 	HText *,	text)
 {
     HTLine *line, *previous;
-    char *data;
 
     if (!(text && text->Lines > 1))
 	return;
 
     line = text->last_line->prev;
-    data = line->data;
     previous = line->prev;
     previous->next = text->last_line;
     text->last_line->prev = previous;
     text->Lines--;
-    FREE(line);
+    freeHTLine(text, line);
 }
 
 /*
@@ -8400,7 +8728,7 @@ PUBLIC void HText_RemovePreviousLine ARGS1(
  *	  alignment is HT_LEFT.  The offset is still zero,
  *	  because that's not determined for HT_CENTER or
  *	  HT_RIGHT until subsequent characters are received
- *	  and split_line() is called. - FM
+ *	  and split_line() is called. -FM
  */
 PUBLIC int HText_getCurrentColumn ARGS1(
 	HText *,	text)
@@ -8431,7 +8759,7 @@ PUBLIC int HText_getMaximumColumn ARGS1(
 /*
  *  NOTE: This function uses HText_getCurrentColumn() which
  *	  presently is correct only if the alignment is
- *	  HT_LEFT. - FM
+ *	  HT_LEFT. -FM
  */
 PUBLIC void HText_setTabID ARGS2(
 	HText *,	text,
@@ -8441,7 +8769,7 @@ PUBLIC void HText_setTabID ARGS2(
     HTList * cur = text->tabs;
     HTList * last = NULL;
 
-    if (!text || !name || !*name)
+    if (!text || isEmpty(name))
 	return;
 
     if (!cur) {
@@ -8474,7 +8802,7 @@ PUBLIC int HText_getTabIDColumn ARGS2(
     HTTabID * Tab;
     HTList * cur = text->tabs;
 
-    if (text && name && *name && cur) {
+    if (text && non_empty(name) && cur) {
 	while (NULL != (Tab = (HTTabID *)HTList_nextObject(cur))) {
 	    if (Tab->name && !strcmp(Tab->name, name))
 		break;
@@ -8494,7 +8822,7 @@ PUBLIC int HText_getTabIDColumn ARGS2(
  *  into text->hidden_links, whose count can be determined
  *  via HText_HiddenLinks(), below.  The addresses can be
  *  retrieved via HText_HiddenLinkAt(), below, based on
- *  count. - FM
+ *  count. -FM
  */
 PRIVATE void HText_AddHiddenLink ARGS2(
 	HText *,	text,
@@ -8503,14 +8831,14 @@ PRIVATE void HText_AddHiddenLink ARGS2(
     HTAnchor *dest;
 
     /*
-     *  Make sure we have an HText structure and anchor. - FM
+     *  Make sure we have an HText structure and anchor. -FM
      */
     if (!(text && textanchor && textanchor->anchor))
 	return;
 
     /*
      *  Create the hidden links list
-     *  if it hasn't been already. - FM
+     *  if it hasn't been already. -FM
      */
     if (text->hidden_links == NULL)
 	text->hidden_links = HTList_new();
@@ -8518,9 +8846,9 @@ PRIVATE void HText_AddHiddenLink ARGS2(
     /*
      *  Store the address, in reverse list order
      *  so that first in will be first out on
-     *  retrievals. - FM
+     *  retrievals. -FM
      */
-    if ((dest = HTAnchor_followMainLink((HTAnchor *)textanchor->anchor)) &&
+    if ((dest = HTAnchor_followLink(textanchor->anchor)) &&
 	(text->hiddenlinkflag != HIDDENLINKS_IGNORE ||
 	 HTList_isEmpty(text->hidden_links)))
 	HTList_appendObject(text->hidden_links, HTAnchor_address(dest));
@@ -8530,7 +8858,7 @@ PRIVATE void HText_AddHiddenLink ARGS2(
 
 /*
  *  This function returns the number of addresses
- *  that are loaded in text->hidden_links. - FM
+ *  that are loaded in text->hidden_links. -FM
  */
 PUBLIC int HText_HiddenLinkCount ARGS1(
 	HText *,	text)
@@ -8546,7 +8874,7 @@ PUBLIC int HText_HiddenLinkCount ARGS1(
 /*
  *  This function returns the address, corresponding to
  *  a hidden link, at the position (zero-based) in the
- *  text->hidden_links list of the number argument. - FM
+ *  text->hidden_links list of the number argument. -FM
  */
 PUBLIC char * HText_HiddenLinkAt ARGS2(
 	HText *,	text,
@@ -8588,10 +8916,10 @@ PUBLIC void HText_beginForm ARGS5(
     HTFormDisabled = FALSE;
 
     /*
-     *  Check the ACTION. - FM
+     *  Check the ACTION. -FM
      */
     if (action != NULL) {
-	if (!strncmp(action, "mailto:", 7)) {
+	if (isMAILTO_URL(action)) {
 	    HTFormMethod = URL_MAIL_METHOD;
 	}
 	StrAllocCopy(HTFormAction, action);
@@ -8600,16 +8928,16 @@ PUBLIC void HText_beginForm ARGS5(
 	StrAllocCopy(HTFormAction, HTLoadedDocumentURL());
 
     /*
-     *  Check the METHOD. - FM
+     *  Check the METHOD. -FM
      */
     if (method != NULL && HTFormMethod != URL_MAIL_METHOD)
 	if (!strcasecomp(method,"post") || !strcasecomp(method,"pget"))
 	    HTFormMethod = URL_POST_METHOD;
 
     /*
-     *  Check the ENCTYPE. - FM
+     *  Check the ENCTYPE. -FM
      */
-    if ((enctype != NULL) && *enctype) {
+    if (non_empty(enctype)) {
 	StrAllocCopy(HTFormEnctype, enctype);
 	if (HTFormMethod != URL_MAIL_METHOD &&
 	    !strncasecomp(enctype, "multipart/form-data", 19))
@@ -8619,9 +8947,9 @@ PUBLIC void HText_beginForm ARGS5(
     }
 
     /*
-     *  Check the TITLE. - FM
+     *  Check the TITLE. -FM
      */
-    if ((title != NULL) && *title)
+    if (non_empty(title))
 	StrAllocCopy(HTFormTitle, title);
     else
 	FREE(HTFormTitle);
@@ -8656,11 +8984,11 @@ PUBLIC void HText_beginForm ARGS5(
     CTRACE((tfp, "BeginForm: action:%s Method:%d%s%s%s%s%s%s\n",
 		HTFormAction, HTFormMethod,
 		(HTFormTitle ? " Title:" : ""),
-		(HTFormTitle ? HTFormTitle : ""),
+		NonNull(HTFormTitle),
 		(HTFormEnctype ? " Enctype:" : ""),
-		(HTFormEnctype ? HTFormEnctype : ""),
+		NonNull(HTFormEnctype),
 		(HTFormAcceptCharset ? " Accept-charset:" : ""),
-		(HTFormAcceptCharset ? HTFormAcceptCharset : "")));
+		NonNull(HTFormAcceptCharset)));
 }
 
 PUBLIC void HText_endForm ARGS1(
@@ -8669,18 +8997,18 @@ PUBLIC void HText_endForm ARGS1(
     if (HTFormFields == 1 && text && text->first_anchor) {
 	/*
 	 *  Support submission of a single text input field in
-	 *  the form via <return> instead of a submit button. - FM
+	 *  the form via <return> instead of a submit button. -FM
 	 */
-	TextAnchor * a = text->first_anchor;
+	TextAnchor * a;
 	/*
-	 *  Go through list of anchors and get our input field. - FM
+	 *  Go through list of anchors and get our input field. -FM
 	 */
-	while (a) {
+	for (a = text->first_anchor; a != NULL; a = a->next) {
 	    if (a->link_type == INPUT_ANCHOR &&
 		a->input_field->number == HTFormNumber &&
 		a->input_field->type == F_TEXT_TYPE) {
 		/*
-		 *  Got it.  Make it submitting. - FM
+		 *  Got it.  Make it submitting. -FM
 		 */
 		a->input_field->submit_action = NULL;
 		StrAllocCopy(a->input_field->submit_action, HTFormAction);
@@ -8695,9 +9023,6 @@ PUBLIC void HText_endForm ARGS1(
 		    a->input_field->disabled = TRUE;
 		break;
 	    }
-	    if (a == text->last_anchor)
-		break;
-	    a = a->next;
 	}
     }
     /*
@@ -8811,7 +9136,7 @@ PRIVATE char * HText_skipOptionNumPrefix ARGS1(
     /*
      *  Check if we are in the correct keypad mode.
      */
-    if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) {
+    if (fields_are_numbered()) {
 	/*
 	 *  Skip the option number embedded in the option name so the
 	 *  extra chars won't mess up cgi scripts processing the value.
@@ -8822,7 +9147,7 @@ PRIVATE char * HText_skipOptionNumPrefix ARGS1(
 	 */
 	char *cp = opname;
 
-	if ((cp && *cp && *cp++ == '(') &&
+	if ((non_empty(cp) && *cp++ == '(') &&
 	    *cp && isdigit(UCH(*cp++))) {
 	    while (*cp && isdigit(UCH(*cp)))
 		++cp;
@@ -8869,14 +9194,16 @@ PUBLIC char * HText_setLastOptionValue ARGS7(
     unsigned char *tmp = NULL;
     int number = 0, i, j;
 
-    if (!(text && text->last_anchor &&
-	  text->last_anchor->link_type == INPUT_ANCHOR)) {
+    if (!(value
+      && text
+      && text->last_anchor
+      && text->last_anchor->link_type == INPUT_ANCHOR)) {
 	CTRACE((tfp, "HText_setLastOptionValue: invalid call!  value:%s!\n",
 		    (value ? value : "<NULL>")));
 	return NULL;
     }
 
-    CTRACE((tfp, "Entering HText_setLastOptionValue: value:%s, checked:%s\n",
+    CTRACE((tfp, "Entering HText_setLastOptionValue: value:\"%s\", checked:%s\n",
 		value, (checked ? "on" : "off")));
 
     /*
@@ -8899,10 +9226,10 @@ PUBLIC char * HText_setLastOptionValue ARGS7(
 	cp++;
     if (HTCurSelectGroupType == F_RADIO_TYPE &&
 	LYSelectPopups &&
-	keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) {
+	fields_are_numbered()) {
 	/*
 	 *  Collapse any space between the popup option
-	 *  prefix and actual value. - FM
+	 *  prefix and actual value. -FM
 	 */
 	if ((cp1 = HText_skipOptionNumPrefix(cp)) > cp) {
 	    i = 0, j = (cp1 - cp);
@@ -9003,10 +9330,8 @@ PUBLIC char * HText_setLastOptionValue ARGS7(
 	if (HTCJK != NOCJK) {
 	    if (cp &&
 		(tmp = typecallocn(unsigned char, strlen(cp)+1)) != 0) {
-#ifdef SH_EX
 		if (tmp == NULL)
 		    outofmem(__FILE__, "HText_setLastOptionValue");
-#endif
 		if (kanji_code == EUC) {
 		    TO_EUC((unsigned char *)cp, tmp);
 		    val_cs = current_char_set;
@@ -9032,30 +9357,27 @@ PUBLIC char * HText_setLastOptionValue ARGS7(
 	new_ptr->value_cs = (submit_value ? submit_val_cs : val_cs);
 
 	if (first_option) {
+	    FormInfo *last_input = text->last_anchor->input_field;
+
 	    StrAllocCopy(HTCurSelectedOptionValue, new_ptr->name);
-	    text->last_anchor->input_field->num_value = 0;
+	    last_input->num_value = 0;
 	    /*
 	     *  If this is the first option in a popup select list,
 	     *  HText_beginInput may have allocated the value and
 	     *  cp_submit_value fields, so free them now to avoid
 	     *  a memory leak. - kw
 	     */
-	    FREE(text->last_anchor->input_field->value);
-	    FREE(text->last_anchor->input_field->cp_submit_value);
-
-	    text->last_anchor->input_field->value =
-		text->last_anchor->input_field->select_list->name;
-	    text->last_anchor->input_field->orig_value =
-		text->last_anchor->input_field->select_list->name;
-	    text->last_anchor->input_field->cp_submit_value =
-		text->last_anchor->input_field->select_list->cp_submit_value;
-	    text->last_anchor->input_field->orig_submit_value =
-		text->last_anchor->input_field->select_list->cp_submit_value;
-	    text->last_anchor->input_field->value_cs =
-		new_ptr->value_cs;
+	    FREE(last_input->value);
+	    FREE(last_input->cp_submit_value);
+
+	    last_input->value             = last_input->select_list->name;
+	    last_input->orig_value        = last_input->select_list->name;
+	    last_input->cp_submit_value   = last_input->select_list->cp_submit_value;
+	    last_input->orig_submit_value = last_input->select_list->cp_submit_value;
+	    last_input->value_cs          = new_ptr->value_cs;
 	} else {
 	    int newlen = strlen(new_ptr->name);
-	    int curlen = strlen(HTCurSelectedOptionValue);
+	    int curlen = HTCurSelectedOptionValue ? strlen(HTCurSelectedOptionValue) : 0;
 		/*
 		 *  Make the selected Option Value as long as
 		 *  the longest option.
@@ -9068,18 +9390,16 @@ PUBLIC char * HText_setLastOptionValue ARGS7(
 	if (checked) {
 	    int curlen = strlen(new_ptr->name);
 	    int newlen = strlen(HTCurSelectedOptionValue);
+	    FormInfo *last_input = text->last_anchor->input_field;
 	    /*
 	     *  Set the default option as this one.
 	     */
-	    text->last_anchor->input_field->num_value = number;
-	    text->last_anchor->input_field->value = new_ptr->name;
-	    text->last_anchor->input_field->orig_value = new_ptr->name;
-	    text->last_anchor->input_field->cp_submit_value =
-				   new_ptr->cp_submit_value;
-	    text->last_anchor->input_field->orig_submit_value =
-				   new_ptr->cp_submit_value;
-	    text->last_anchor->input_field->value_cs =
-		new_ptr->value_cs;
+	    last_input->num_value	  = number;
+	    last_input->value		  = new_ptr->name;
+	    last_input->orig_value	  = new_ptr->name;
+	    last_input->cp_submit_value	  = new_ptr->cp_submit_value;
+	    last_input->orig_submit_value = new_ptr->cp_submit_value;
+	    last_input->value_cs	  = new_ptr->value_cs;
 	    StrAllocCopy(HTCurSelectedOptionValue, new_ptr->name);
 	    if (newlen > curlen)
 		StrAllocCat(HTCurSelectedOptionValue,
@@ -9100,7 +9420,7 @@ PUBLIC char * HText_setLastOptionValue ARGS7(
     }
 
     if (TRACE) {
-	CTRACE((tfp, "HText_setLastOptionValue:%s value=%s",
+	CTRACE((tfp, "HText_setLastOptionValue:%s value=\"%s\"\n",
 		(order == LAST_ORDER) ? " LAST_ORDER" : "",
 		value));
 	CTRACE((tfp,"            val_cs=%d \"%s\"",
@@ -9108,7 +9428,7 @@ PUBLIC char * HText_setLastOptionValue ARGS7(
 			(val_cs >= 0 ?
 			 LYCharSet_UC[val_cs].MIMEname : "<UNKNOWN>")));
 	if (submit_value) {
-	    CTRACE((tfp, " (submit_val_cs %d \"%s\") submit_value%s=%s\n",
+	    CTRACE((tfp, " (submit_val_cs %d \"%s\") submit_value%s=\"%s\"\n",
 		    submit_val_cs,
 		    (submit_val_cs >= 0 ?
 		     LYCharSet_UC[submit_val_cs].MIMEname : "<UNKNOWN>"),
@@ -9133,15 +9453,20 @@ PUBLIC int HText_beginInput ARGS3(
 	BOOL,			underline,
 	InputFieldData *,	I)
 {
-    TextAnchor * a = typecalloc(TextAnchor);
-    FormInfo * f = typecalloc(FormInfo);
+    TextAnchor * a;
+    FormInfo * f;
     CONST char *cp_option = NULL;
     char *IValue = NULL;
     unsigned char *tmp = NULL;
     int i, j;
+    int adjust_marker = 0;
+    int MaximumSize;
+    char marker[16];
 
     CTRACE((tfp, "GridText: Entering HText_beginInput\n"));
 
+    POOLtypecalloc(TextAnchor, a);
+    POOLtypecalloc(FormInfo, f);
     if (a == NULL || f == NULL)
 	outofmem(__FILE__, "HText_beginInput");
 
@@ -9149,13 +9474,12 @@ PUBLIC int HText_beginInput ARGS3(
     a->line_num = text->Lines;
     a->line_pos = text->last_line->size;
 
-
     /*
      *  If this is a radio button, or an OPTION we're converting
      *  to a radio button, and it's the first with this name, make
      *  sure it's checked by default.  Otherwise, if it's checked,
      *  uncheck the default or any preceding radio button with this
-     *  name that was checked. - FM
+     *  name that was checked. -FM
      */
     if (I->type != NULL && !strcmp(I->type,"OPTION") &&
 	HTCurSelectGroupType == F_RADIO_TYPE && LYSelectPopups == FALSE) {
@@ -9167,9 +9491,9 @@ PUBLIC int HText_beginInput ARGS3(
 	if (!text->last_anchor) {
 	    I->checked = TRUE;
 	} else {
-	    TextAnchor * b = text->first_anchor;
+	    TextAnchor * b;
 	    int i2 = 0;
-	    while (b) {
+	    for (b = text->first_anchor; b != NULL; b = b->next) {
 		if (b->link_type == INPUT_ANCHOR &&
 		    b->input_field->type == F_RADIO_TYPE &&
 		    b->input_field->number == HTFormNumber) {
@@ -9182,13 +9506,9 @@ PUBLIC int HText_beginInput ARGS3(
 			i2++;
 		    }
 		}
-		if (b == text->last_anchor) {
-		    if (i2 == 0)
-		       I->checked = TRUE;
-		    break;
-		}
-		b = b->next;
 	    }
+	    if (i2 == 0)
+	       I->checked = TRUE;
 	}
     }
 
@@ -9197,7 +9517,7 @@ PUBLIC int HText_beginInput ARGS3(
     a->link_type = INPUT_ANCHOR;
     a->show_anchor = YES;
 
-    a->hightext = NULL;
+    LYClearHiText(a);
     a->extent = 2;
 
     a->input_field = f;
@@ -9209,9 +9529,8 @@ PUBLIC int HText_beginInput ARGS3(
 
     HTFormFields++;
 
-
     /*
-     *  Set the no_cache flag if the METHOD is POST. - FM
+     *  Set the no_cache flag if the METHOD is POST. -FM
      */
     if (HTFormMethod == URL_POST_METHOD)
 	f->no_cache = TRUE;
@@ -9333,7 +9652,7 @@ PUBLIC int HText_beginInput ARGS3(
 	    f->type = F_KEYGEN_TYPE;
 	} else {
 	    /*
-	     *  Note that TYPE="scribble" defaults to TYPE="text". - FM
+	     *  Note that TYPE="scribble" defaults to TYPE="text". -FM
 	     */
 	    f->type = F_TEXT_TYPE; /* default */
 	}
@@ -9361,8 +9680,6 @@ PUBLIC int HText_beginInput ARGS3(
 	     */
 	    CTRACE((tfp,
 		  "GridText: No name present in input field; not displaying\n"));
-	    FREE(a);
-	    FREE(f);
 	    FREE(IValue);
 	    return(0);
 	}
@@ -9379,7 +9696,7 @@ PUBLIC int HText_beginInput ARGS3(
 
     /*
      *  Set VALUE, if it exists.  Otherwise, if it's not
-     *  an option list make it a zero-length string. - FM
+     *  an option list make it a zero-length string. -FM
      */
     if (IValue != NULL) {
 	/*
@@ -9411,7 +9728,7 @@ PUBLIC int HText_beginInput ARGS3(
      *  Run checks and fill in necessary values.
      */
     if (f->type == F_RESET_TYPE) {
-	if (f->value && *f->value != '\0') {
+	if (non_empty(f->value)) {
 	    f->size = strlen(f->value);
 	} else {
 	    StrAllocCopy(f->value, "Reset");
@@ -9419,7 +9736,7 @@ PUBLIC int HText_beginInput ARGS3(
 	}
     } else if (f->type == F_IMAGE_SUBMIT_TYPE ||
 	       f->type == F_SUBMIT_TYPE) {
-	if (f->value && *f->value != '\0') {
+	if (non_empty(f->value)) {
 	    f->size = strlen(f->value);
 	} else if (f->type == F_IMAGE_SUBMIT_TYPE) {
 	    StrAllocCopy(f->value, "[IMAGE]-Submit");
@@ -9477,7 +9794,7 @@ PUBLIC int HText_beginInput ARGS3(
 	 *  for types that are not yet implemented.
 	 */
 	case F_HIDDEN_TYPE:
-#ifndef EXP_FILE_UPLOAD
+#ifndef USE_FILE_UPLOAD
 	case F_FILE_TYPE:
 #endif
 	case F_RANGE_TYPE:
@@ -9486,37 +9803,34 @@ PUBLIC int HText_beginInput ARGS3(
 	    break;
 
 	default:
-	    if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED)
+	    if (fields_are_numbered())
 		a->number = ++(text->last_anchor_number);
 	    else
 		a->number = 0;
 	    break;
     }
-    if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED && a->number > 0) {
-	char marker[16];
+    if (fields_are_numbered() && (a->number > 0)) {
+	sprintf(marker,"[%d]", a->number);
+	if (number_fields_on_left) {
+	    BOOL had_bracket = (f->type == F_OPTION_LIST_TYPE);
 
-	if (f->type != F_OPTION_LIST_TYPE)
-	    /*
-	     *  '[' was already put out for a popup menu
-	     *  designator.  See HTML.c.
-	     */
-	    HText_appendCharacter(text, '[');
-	sprintf(marker,"%d]", a->number);
-	HText_appendText(text, marker);
-	if (f->type == F_OPTION_LIST_TYPE)
-	    /*
-	     *  Add option list designation char.
-	     */
-	    HText_appendCharacter(text, '[');
+	    HText_appendText(text, had_bracket ? (marker + 1) : marker);
+	    if (had_bracket)
+		HText_appendCharacter(text, '[');
+	} else {
+	    adjust_marker = strlen(marker);
+	}
 	a->line_num = text->Lines;
 	a->line_pos = text->last_line->size;
+    } else {
+	*marker = '\0';
     }
 
     /*
      *  Restrict SIZE to maximum allowable size.
      */
+    MaximumSize = WRAP_COLS(text) - adjust_marker;
     switch (f->type) {
-	int MaximumSize;
 
 	case F_SUBMIT_TYPE:
 	case F_IMAGE_SUBMIT_TYPE:
@@ -9530,22 +9844,21 @@ PUBLIC int HText_beginInput ARGS3(
 	     *  the most we could highlight on overwrites, and/or
 	     *  handle in the line editor.  The actual values for
 	     *  text entry lines can be long, and will be scrolled
-	     *  horizontally within the editing window. - FM
+	     *  horizontally within the editing window. -FM
 	     */
-	    MaximumSize = (WRAP_COLS(text) - 1) -
-			  (int)text->style->leftIndent -
-			  (int)text->style->rightIndent;
+	    MaximumSize -= (1 +
+			  (int)text->style->leftIndent +
+			  (int)text->style->rightIndent);
 
 	    /*  If we are numbering form links, place is taken by [nn]  */
-	    if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED)
-		MaximumSize -= (a->number >= 10	/*Buggy if 1e6 links, sowhat?*/
-				? (a->number >= 100
-				   ? (a->number >= 1000
-				      ? (a->number >= 10000
-					 ? (a->number >= 100000
-					    ? 6 : 5) : 4) : 3) : 2) : 1) + 2;
-	    if (f->size > MaximumSize)
-		f->size = MaximumSize;
+	    if (fields_are_numbered()) {
+		if (!number_fields_on_left
+		 && f->type == F_TEXT_TYPE
+		 && MaximumSize > a->line_pos + 10)
+		    MaximumSize -= a->line_pos;
+		else
+		    MaximumSize -= strlen(marker);
+	    }
 
 	    /*
 	     *  Save value for submit/reset buttons so they
@@ -9554,18 +9867,18 @@ PUBLIC int HText_beginInput ARGS3(
 	    I->value = f->value;
 	    break;
 
-
 	default:
 	    /*
 	     *  For all other fields we limit the size element to
 	     *  10 less than the screen width, because either they
 	     *  are types with small placeholders, and/or are a
-	     *  type which is handled via a popup window. - FM
+	     *  type which is handled via a popup window. -FM
 	     */
-	    if (f->size > WRAP_COLS(text)-10)
-		f->size = WRAP_COLS(text)-10;  /* maximum */
+	    MaximumSize -= 10;
 	    break;
     }
+    if (f->size > MaximumSize)
+	f->size = MaximumSize;
 
     /*
      *  Add this anchor to the anchor list
@@ -9594,7 +9907,7 @@ PUBLIC int HText_beginInput ARGS3(
 
     CTRACE((tfp, "Input link: name=%s\nvalue=%s\nsize=%d\n",
 			f->name,
-			((f->value != NULL) ? f->value : ""),
+			NonNull(f->value),
 			f->size));
     CTRACE((tfp, "Input link: name_cs=%d \"%s\" (from %d \"%s\")\n",
 			f->name_cs,
@@ -9618,6 +9931,26 @@ PUBLIC int HText_beginInput ARGS3(
 }
 
 /*
+ * If we're numbering fields on the right, do it.  Note that some fields may
+ * be too long for the line - we'll lose the marker in that case rather than
+ * truncate the field.
+ */
+PUBLIC void HText_endInput ARGS1(
+	HText *,		text)
+{
+    if (fields_are_numbered()
+     && !number_fields_on_left
+     && text != NULL
+     && text->last_anchor != NULL
+     && text->last_anchor->number > 0) {
+	char marker[20];
+	HText_setIgnoreExcess(text, FALSE);
+	sprintf(marker,"[%d]", text->last_anchor->number);
+	HText_appendText(text, marker);
+    }
+}
+
+/*
  *  Get a translation (properly: transcoding) quality, factoring in
  *  our ability to translate (an UCTQ_t) and a possible q parameter
  *  on the given charset string, for cs_from -> givenmime.
@@ -9648,7 +9981,7 @@ PRIVATE double get_trans_q ARGS2(
 				  UCGetLYhndl_byMIME(givenmime));
     if (!tq)
 	return 0.0;
-    if (p && *p) {
+    if (non_empty(p)) {
 	char *pair, *field = p, *pval, *ptok;
 	/* Get all the parameters to the Charset */
 	while ((pair = HTNextTok(&field, ";", "\"", NULL)) != NULL) {
@@ -9716,6 +10049,280 @@ PRIVATE int find_best_target_cs ARGS3(
     return (-1);
 }
 
+#ifdef USE_FILE_UPLOAD
+PRIVATE void load_a_file ARGS2(
+    char *,	val_used,
+    bstring **,	result)
+{
+    FILE *fd;
+    size_t bytes;
+    char buffer[257];
+
+    CTRACE((tfp, "Ok, about to convert %s to mime/thingy\n", val_used));
+
+    if (*val_used) {		/* ignore empty form field */
+	if ((fd = fopen(val_used, BIN_R)) == 0) {
+	    HTAlert(gettext("Can't open file for uploading"));
+	} else {
+	    while ((bytes = fread(buffer, sizeof(char), 256, fd)) != 0) {
+		HTSABCat(result, buffer, bytes);
+	    }
+	    LYCloseInput(fd);
+	}
+    }
+}
+
+PRIVATE CONST char *guess_content_type ARGS1(CONST char *, filename)
+{
+    HTAtom *encoding;
+    CONST char *desc;
+    HTFormat format = HTFileFormat (filename, &encoding, &desc);
+    return (format != 0 && non_empty(format->name))
+	    ? format->name
+	    : "text/plain";
+}
+#endif /* USE_FILE_UPLOAD */
+
+
+PRIVATE void cannot_transcode ARGS2(
+    BOOL *,		had_warning,
+    CONST char *,	target_csname)
+{
+    if (*had_warning == NO) {
+	*had_warning = YES;
+	_user_message(CANNOT_TRANSCODE_FORM,
+	    target_csname ? target_csname : "UNKNOWN");
+	LYSleepAlert();
+    }
+}
+
+#define SPECIAL_8BIT 1
+#define SPECIAL_FORM 2
+
+PRIVATE unsigned check_form_specialchars ARGS1(
+    char *,	value)
+{
+    unsigned result = 0;
+    char *p;
+
+    for (p = value;
+	 non_empty(p) && (result != (SPECIAL_8BIT|SPECIAL_FORM));
+	 p++) {
+	if ((*p == HT_NON_BREAK_SPACE) ||
+	    (*p == HT_EN_SPACE) ||
+	    (*p == LY_SOFT_HYPHEN)) {
+	    result |= SPECIAL_FORM;
+	} else if ((*p & 0x80) != 0) {
+	    result |= SPECIAL_8BIT;
+	}
+    }
+    return result;
+}
+
+/*
+ * Scan the given data, adding characters to the MIME-boundary to keep it from
+ * matching any part of the data.
+ */
+PRIVATE void UpdateBoundary ARGS2(
+	char **,	Boundary,
+	bstring *,	data)
+{
+    int j;
+    int have = strlen(*Boundary);
+    int last = BStrLen(data);
+    char *text = BStrData(data);
+    char *want = *Boundary;
+
+    for (j = 0; j <= (last - have); ++j) {
+	if (want[0] == text[j]
+	 && !memcmp(want, text + j, have)) {
+	    char temp[2];
+	    temp[0] = isdigit(text[have + j]) ? 'a' : '0';
+	    temp[1] = '\0';
+	    StrAllocCat(want, temp);
+	    ++have;
+	}
+    }
+    *Boundary = want;
+}
+
+/*
+ * Convert a string to base64
+ */
+PRIVATE char * convert_to_base64 ARGS2(
+	char *,		src,
+	int,		len)
+{
+#define B64_LINE       76
+
+    static CONST char basis_64[] =
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+    char *dest;
+    int rlen;   /* length of result string */
+    unsigned char c1, c2, c3;
+    char *eol, *r, *str;
+    int eollen;
+    int chunk;
+
+    str = src;
+    eol = "\n";
+    eollen = 1;
+
+    /* calculate the length of the result */
+    rlen = (len+2) / 3 * 4;	/* encoded bytes */
+    if (rlen) {
+	/* add space for EOL */
+	rlen += ((rlen-1) / B64_LINE + 1) * eollen;
+    }
+
+    /* allocate a result buffer */
+    if ((dest = (char *) malloc(rlen + 1)) == NULL) {
+	outofmem(__FILE__, "convert_to_base64");
+    }
+    r = dest;
+
+    /* encode */
+    for (chunk=0; len > 0; len -= 3, chunk++) {
+	if (chunk == (B64_LINE/4)) {
+	    char *c = eol;
+	    char *e = eol + eollen;
+	    while (c < e)
+		*r++ = *c++;
+	    chunk = 0;
+	}
+	c1 = *str++;
+	c2 = *str++;
+	*r++ = basis_64[c1>>2];
+	*r++ = basis_64[((c1 & 0x3)<< 4) | ((c2 & 0xF0) >> 4)];
+	if (len > 2) {
+	    c3 = *str++;
+	    *r++ = basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)];
+	    *r++ = basis_64[c3 & 0x3F];
+	} else if (len == 2) {
+	    *r++ = basis_64[(c2 & 0xF) << 2];
+	    *r++ = '=';
+	} else { /* len == 1 */
+	    *r++ = '=';
+	    *r++ = '=';
+	}
+    }
+    if (rlen) {
+	/* append eol to the result string */
+	char *c = eol;
+	char *e = eol + eollen;
+	while (c < e)
+	    *r++ = *c++;
+    }
+    *r = '\0';
+
+    return dest;
+}
+
+typedef enum {
+    NO_QUOTE		/* no quoting needed */
+    , QUOTE_MULTI	/* multipart */
+    , QUOTE_BASE64	/* encode as base64 */
+    , QUOTE_SPECIAL	/* escape special characters only */
+} QuoteData;
+
+typedef struct {
+    int type;		/* the type of this field */
+    BOOL first;		/* true if this begins a submission part */
+    char *name;		/* the name of this field */
+    char *value;	/* the nominal value of this field */
+    bstring *data;	/* its data, which is usually the same as the value */
+    QuoteData quote;	/* how to quote/translate the data */
+} PostData;
+
+PRIVATE char *escape_or_quote_name ARGS3(
+	char *,		name,
+	QuoteData,	quoting,
+	char *,		MultipartContentType)
+{
+    char *escaped1 = NULL;
+
+    switch (quoting) {
+    case NO_QUOTE:
+       StrAllocCopy(escaped1, name);
+       break;
+    case QUOTE_MULTI:
+    case QUOTE_BASE64:
+	StrAllocCopy(escaped1, "Content-Disposition: form-data");
+	HTSprintf(&escaped1, "; name=\"%s\"", name);
+	if (MultipartContentType)
+	    HTSprintf(&escaped1, MultipartContentType, "text/plain");
+	if (quoting == QUOTE_BASE64)
+	    StrAllocCat(escaped1, "\r\nContent-Transfer-Encoding: base64");
+	StrAllocCat(escaped1, "\r\n\r\n");
+	break;
+    case QUOTE_SPECIAL:
+	escaped1 = HTEscapeSP(name, URL_XALPHAS);
+	break;
+    }
+    return escaped1;
+}
+
+PRIVATE char *escape_or_quote_value ARGS2(
+	char *,		value,
+	QuoteData,	quoting)
+{
+    char *escaped2 = NULL;
+
+    switch (quoting) {
+    case NO_QUOTE:
+    case QUOTE_MULTI:
+	StrAllocCopy(escaped2, NonNull(value));
+	break;
+    case QUOTE_BASE64:
+	/* FIXME: this is redundant */
+	escaped2 = convert_to_base64(value, strlen(value));
+	break;
+    case QUOTE_SPECIAL:
+	escaped2 = HTEscapeSP(value, URL_XALPHAS);
+	break;
+    }
+    return escaped2;
+}
+
+/*
+ * Check if we should encode the data in base64.  We can, only if we're using
+ * a multipart content type.  We should, if we're sending mail and the data
+ * contains long lines or nonprinting characters.
+ */
+PRIVATE int check_if_base64_needed ARGS2(
+	int,		submit_method,
+	bstring *,	data)
+{
+    int width = 0;
+    BOOL printable = TRUE;
+    char *text = BStrData(data);
+
+    if (text != 0) {
+	int col = 0;
+	int n;
+	int length = BStrLen(data);
+
+	for (n = 0; n < length; ++n) {
+	    int ch = UCH(text[n]);
+	    if (is8bits(ch) || ((ch < 32 && ch != '\n'))) {
+		CTRACE((tfp, "nonprintable %d:%#x\n", n, ch));
+		printable = FALSE;
+	    }
+	    if (ch == '\n' || ch == '\r') {
+		if (width < col)
+		    width = col;
+		col = 0;
+	    } else {
+		++col;
+	    }
+	}
+	if (width < col)
+	    width = col;
+    }
+    return !printable && ((submit_method == URL_MAIL_METHOD) && (width > 72));
+}
+
 /*
  *  HText_SubmitForm - generate submit data from form fields.
  *  For mailto forms, send the data.
@@ -9726,38 +10333,40 @@ PRIVATE int find_best_target_cs ARGS3(
  */
 PUBLIC int HText_SubmitForm ARGS4(
 	FormInfo *,	submit_item,
-	document *,	doc,
+	DocInfo *,	doc,
 	char *,		link_name,
 	char *,		link_value)
 {
-    TextAnchor *anchor_ptr;
-    int form_number = submit_item->number;
-    FormInfo *form_ptr;
-    PerFormInfo *thisform;
-    char *query = NULL;
-    char *escaped1 = NULL, *escaped2 = NULL;
-    int first_one = 1;
-    char *last_textarea_name = NULL;
-    int textarea_lineno = 0;
-    char *previous_blanks = NULL;
+    BOOL had_chartrans_warning = NO;
+    BOOL have_accept_cs = NO;
+    BOOL success;
     BOOLEAN PlainText = FALSE;
     BOOLEAN SemiColon = FALSE;
+    BOOL skip_field = FALSE;
+    CONST char *out_csname;
+    CONST char *target_csname = NULL;
+    PerFormInfo *thisform;
+    PostData *my_data = NULL;
+    TextAnchor *anchor_ptr;
+    bstring *my_query = NULL;
     char *Boundary = NULL;
     char *MultipartContentType = NULL;
     char *content_type_out = NULL;
-    int target_cs = -1;
-    CONST char *out_csname;
-    CONST char *target_csname = NULL;
+    char *copied_name_used = NULL;
+    char *copied_val_used = NULL;
+    char *escaped1 = NULL;
+    char *escaped2 = NULL;
+    char *last_textarea_name = NULL;
     char *name_used = "";
-    BOOL form_has_8bit = NO, form_has_special = NO;
-    BOOL field_has_8bit = NO, field_has_special = NO;
-    BOOL name_has_8bit = NO, name_has_special = NO;
-    BOOL have_accept_cs = NO;
-    BOOL success;
-    BOOL had_chartrans_warning = NO;
+    char *previous_blanks = NULL;
     char *val_used = "";
-    char *copied_val_used = NULL;
-    char *copied_name_used = NULL;
+    int anchor_count = 0;
+    int anchor_limit = 0;
+    int form_number = submit_item->number;
+    int result = 0;
+    int target_cs = -1;
+    int textarea_lineno = 0;
+    unsigned form_is_special = 0;
 
     CTRACE((tfp, "SubmitForm\n  link_name=%s\n  link_value=%s\n", link_name, link_value));
     if (!HTMainText)
@@ -9774,27 +10383,28 @@ PUBLIC int HText_SubmitForm ARGS4(
 	thisform = NULL;
     }
 
-    if (submit_item->submit_action) {
-	/*
-	 *  If we're mailing, make sure it's a mailto ACTION. - FM
-	 */
-	if ((submit_item->submit_method == URL_MAIL_METHOD) &&
-	    strncmp(submit_item->submit_action, "mailto:", 7)) {
-	    HTAlert(BAD_FORM_MAILTO);
-	    return 0;
-	}
-    } else {
+    if (isEmpty(submit_item->submit_action)) {
+	CTRACE((tfp, "SubmitForm: no action given\n"));
+	return 0;
+    }
+
+    /*
+     *  If we're mailing, make sure it's a mailto ACTION. -FM
+     */
+    if ((submit_item->submit_method == URL_MAIL_METHOD) &&
+	!isMAILTO_URL(submit_item->submit_action)) {
+	HTAlert(BAD_FORM_MAILTO);
 	return 0;
     }
 
     /*
-     *  Check the ENCTYPE and set up the appropriate variables. - FM
+     *  Check the ENCTYPE and set up the appropriate variables. -FM
      */
     if (submit_item->submit_enctype &&
 	!strncasecomp(submit_item->submit_enctype, "text/plain", 10)) {
 	/*
 	 *  Do not hex escape, and use physical newlines
-	 *  to separate name=value pairs. - FM
+	 *  to separate name=value pairs. -FM
 	 */
 	PlainText = TRUE;
     } else if (submit_item->submit_enctype &&
@@ -9802,17 +10412,15 @@ PUBLIC int HText_SubmitForm ARGS4(
 			     "application/sgml-form-urlencoded", 32)) {
 	/*
 	 *  Use semicolons instead of ampersands as the
-	 *  separators for name=value pairs. - FM
+	 *  separators for name=value pairs. -FM
 	 */
 	SemiColon = TRUE;
     } else if (submit_item->submit_enctype &&
 	       !strncasecomp(submit_item->submit_enctype,
 			     "multipart/form-data", 19)) {
 	/*
-	 *  Use the multipart MIME format.  We should generate
-	 *  a boundary string which we are sure doesn't occur
-	 *  in the content, but for now we'll just assume that
-	 *  this string doesn't. - FM
+	 *  Use the multipart MIME format.  Later we will ensure it does not
+	 *  occur within the content.
 	 */
 	Boundary = "xnyLAaB03X";
     }
@@ -9863,105 +10471,87 @@ PUBLIC int HText_SubmitForm ARGS4(
     }
 
     /*
-     *  Go through list of anchors and get size first.
-     */
-    /*
-     *  also get a "max." charset parameter - kw
+     * Go through list of anchors and get a "max." charset parameter - kw
      */
-    anchor_ptr = HTMainText->first_anchor;
-    while (anchor_ptr) {
-	if (anchor_ptr->link_type == INPUT_ANCHOR) {
-	    if (anchor_ptr->input_field->number == form_number &&
-			!anchor_ptr->input_field->disabled) {
-
-		char *p;
-		char * val;
-		form_ptr = anchor_ptr->input_field;
-		val = form_ptr->cp_submit_value != NULL ?
-				    form_ptr->cp_submit_value : form_ptr->value;
-		field_has_8bit = NO;
-		field_has_special = NO;
-
-		for (p = val;
-		     p && *p && !(field_has_8bit && field_has_special);
-		     p++)
-		    if ((*p == HT_NON_BREAK_SPACE) ||
-			(*p == HT_EN_SPACE) ||
-			(*p == LY_SOFT_HYPHEN)) {
-			field_has_special = YES;
-		    } else if ((*p & 0x80) != 0) {
-			field_has_8bit = YES;
-		    }
-		for (p = form_ptr->name;
-		     p && *p && !(name_has_8bit && name_has_special);
-		     p++)
-		    if ((*p == HT_NON_BREAK_SPACE) ||
-			(*p == HT_EN_SPACE) ||
-			(*p == LY_SOFT_HYPHEN)) {
-			name_has_special = YES;
-		    } else if ((*p & 0x80) != 0) {
-			name_has_8bit = YES;
-		    }
-
-		if (field_has_8bit || name_has_8bit)
-		    form_has_8bit = YES;
-		if (field_has_special || name_has_special)
-		    form_has_special = YES;
-
-		if (!field_has_8bit && !field_has_special) {
-		    /* already ok */
-		} else if (target_cs < 0) {
-		    /* already confused */
-		} else if (!field_has_8bit &&
-		    (LYCharSet_UC[target_cs].enc == UCT_ENC_8859 ||
-		     (LYCharSet_UC[target_cs].like8859 & UCT_R_8859SPECL))) {
-		    /* those specials will be trivial */
-		} else if (UCNeedNotTranslate(form_ptr->value_cs, target_cs)) {
-		    /* already ok */
-		} else if (UCCanTranslateFromTo(form_ptr->value_cs, target_cs)) {
-		    /* also ok */
-		} else if (UCCanTranslateFromTo(target_cs, form_ptr->value_cs)) {
-		    target_cs = form_ptr->value_cs;	/* try this */
-		    target_csname = NULL; /* will be set after loop */
-		} else {
-		    target_cs = -1; /* don't know what to do */
-		}
+    for (anchor_ptr = HTMainText->first_anchor;
+	 anchor_ptr != NULL;
+	 anchor_ptr = anchor_ptr->next) {
 
-		/*  Same for name */
-		if (!name_has_8bit && !name_has_special) {
-		    /* already ok */
-		} else if (target_cs < 0) {
-		    /* already confused */
-		} else if (!name_has_8bit &&
-		    (LYCharSet_UC[target_cs].enc == UCT_ENC_8859 ||
-		     (LYCharSet_UC[target_cs].like8859 & UCT_R_8859SPECL))) {
-		    /* those specials will be trivial */
-		} else if (UCNeedNotTranslate(form_ptr->name_cs, target_cs)) {
-		    /* already ok */
-		} else if (UCCanTranslateFromTo(form_ptr->name_cs, target_cs)) {
-		    /* also ok */
-		} else if (UCCanTranslateFromTo(target_cs, form_ptr->name_cs)) {
-		    target_cs = form_ptr->value_cs;	/* try this */
-		    target_csname = NULL; /* will be set after loop */
-		} else {
-		    target_cs = -1; /* don't know what to do */
-		}
+	if (anchor_ptr->link_type != INPUT_ANCHOR)
+	    continue;
 
-	    } else if (anchor_ptr->input_field->number > form_number) {
-		break;
+	if (anchor_ptr->input_field->number == form_number &&
+		    !anchor_ptr->input_field->disabled) {
+
+	    FormInfo *form_ptr = anchor_ptr->input_field;
+	    char * val = form_ptr->cp_submit_value != NULL
+			    ? form_ptr->cp_submit_value
+			    : form_ptr->value;
+
+	    unsigned field_is_special = check_form_specialchars(val);
+	    unsigned name_is_special = check_form_specialchars(form_ptr->name);
+
+	    form_is_special = (field_is_special | name_is_special);
+
+	    if (field_is_special == 0) {
+		/* already ok */
+	    } else if (target_cs < 0) {
+		/* already confused */
+	    } else if ((field_is_special & SPECIAL_8BIT) == 0
+	     && (LYCharSet_UC[target_cs].enc == UCT_ENC_8859
+	      || (LYCharSet_UC[target_cs].like8859 & UCT_R_8859SPECL))) {
+		/* those specials will be trivial */
+	    } else if (UCNeedNotTranslate(form_ptr->value_cs, target_cs)) {
+		/* already ok */
+	    } else if (UCCanTranslateFromTo(form_ptr->value_cs, target_cs)) {
+		/* also ok */
+	    } else if (UCCanTranslateFromTo(target_cs, form_ptr->value_cs)) {
+		target_cs = form_ptr->value_cs;	/* try this */
+		target_csname = NULL; /* will be set after loop */
+	    } else {
+		target_cs = -1; /* don't know what to do */
+	    }
+
+	    /*  Same for name */
+	    if (name_is_special == 0) {
+		/* already ok */
+	    } else if (target_cs < 0) {
+		/* already confused */
+	    } else if ((name_is_special & SPECIAL_8BIT) == 0
+	     && (LYCharSet_UC[target_cs].enc == UCT_ENC_8859
+	      || (LYCharSet_UC[target_cs].like8859 & UCT_R_8859SPECL))) {
+		/* those specials will be trivial */
+	    } else if (UCNeedNotTranslate(form_ptr->name_cs, target_cs)) {
+		/* already ok */
+	    } else if (UCCanTranslateFromTo(form_ptr->name_cs, target_cs)) {
+		/* also ok */
+	    } else if (UCCanTranslateFromTo(target_cs, form_ptr->name_cs)) {
+		target_cs = form_ptr->value_cs;	/* try this */
+		target_csname = NULL; /* will be set after loop */
+	    } else {
+		target_cs = -1; /* don't know what to do */
 	    }
-	}
 
-	if (anchor_ptr == HTMainText->last_anchor)
+	    ++anchor_limit;
+	} else if (anchor_ptr->input_field->number > form_number) {
 	    break;
+	}
+    }
 
-	anchor_ptr = anchor_ptr->next;
+    /*
+     * If we have input fields (we expect this), make an array of them so we
+     * can organize the data.
+     */
+    if (anchor_limit != 0) {
+	my_data = typecallocn(PostData, anchor_limit);
+	if (my_data == 0)
+	    outofmem(__FILE__, "HText_SubmitForm");
     }
 
     if (target_csname == NULL && target_cs >= 0) {
-	if (form_has_8bit) {
+	if ((form_is_special & SPECIAL_8BIT) != 0) {
 	    target_csname = LYCharSet_UC[target_cs].MIMEname;
-	} else if (form_has_special) {
+	} else if ((form_is_special & SPECIAL_FORM) != 0) {
 	    target_csname = LYCharSet_UC[target_cs].MIMEname;
 	} else {
 	    target_csname = "us-ascii";
@@ -9969,24 +10559,27 @@ PUBLIC int HText_SubmitForm ARGS4(
     }
 
     if (submit_item->submit_method == URL_GET_METHOD && Boundary == NULL) {
-	StrAllocCopy(query, submit_item->submit_action);
+	char *temp = NULL;
+
+	StrAllocCopy(temp, submit_item->submit_action);
 	/*
 	 *  Method is GET.  Clip out any anchor in the current URL.
 	 */
-	strtok (query, "#");
+	strtok (temp, "#");
 	/*
 	 *  Clip out any old query in the current URL.
 	 */
-	strtok (query, "?");
+	strtok (temp, "?");
 	/*
 	 *  Add the lead question mark for the new URL.
 	 */
-	StrAllocCat(query,"?");
+	StrAllocCat(temp,"?");
+	BStrCat0(my_query, temp);
     } else {
 	/*
 	 *  We are submitting POST content to a server,
 	 *  so load content_type_out.  This will be put in
-	 *  the post_content_type element if all goes well. - FM, kw
+	 *  the post_content_type element if all goes well. -FM, kw
 	 */
 	if (SemiColon == TRUE) {
 	    StrAllocCopy(content_type_out,
@@ -9996,8 +10589,7 @@ PUBLIC int HText_SubmitForm ARGS4(
 			 "text/plain");
 	} else if (Boundary != NULL) {
 	    StrAllocCopy(content_type_out,
-			 "multipart/form-data; boundary=");
-	    StrAllocCat(content_type_out, Boundary);
+			 "multipart/form-data");
 	} else {
 	    StrAllocCopy(content_type_out,
 			 "application/x-www-form-urlencoded");
@@ -10020,8 +10612,9 @@ PUBLIC int HText_SubmitForm ARGS4(
 	 *  For multipart/form-data the equivalent will be done later,
 	 *  separately for each form field. - kw
 	 */
-	if (have_accept_cs ||
-	    (form_has_8bit || form_has_special)) {
+	if (have_accept_cs
+	 || ((form_is_special & SPECIAL_8BIT) != 0
+	  || (form_is_special & SPECIAL_FORM) != 0)) {
 	    if (target_cs >= 0 && target_csname) {
 		if (Boundary == NULL) {
 		    if ((HTMainText->node_anchor->charset &&
@@ -10030,16 +10623,11 @@ PUBLIC int HText_SubmitForm ARGS4(
 			  strcmp(target_csname, "iso-8859-1"))) ||
 			(!HTMainText->node_anchor->charset &&
 			 target_cs != UCLYhndl_for_unspec)) {
-			StrAllocCat(content_type_out, "; charset=");
-			StrAllocCat(content_type_out, target_csname);
+			HTSprintf(&content_type_out, "; charset=%s", target_csname);
 		    }
 		}
 	    } else {
-		had_chartrans_warning = YES;
-		_user_message(
-		    CANNOT_TRANSCODE_FORM,
-		    target_csname ? target_csname : "UNKNOWN");
-		LYSleepAlert();
+		cannot_transcode(&had_chartrans_warning, target_csname);
 	    }
 	}
     }
@@ -10047,736 +10635,627 @@ PUBLIC int HText_SubmitForm ARGS4(
     out_csname = target_csname;
 
     /*
-     *  Reset anchor->ptr.
-     */
-    anchor_ptr = HTMainText->first_anchor;
-    /*
-     *  Go through list of anchors and assemble URL query.
+     * Build up a list of the input fields and their associated values.
      */
-    while (anchor_ptr) {
-	if (anchor_ptr->link_type == INPUT_ANCHOR) {
-	    if (anchor_ptr->input_field->number == form_number &&
-			!anchor_ptr->input_field->disabled) {
-		char *p;
-		int out_cs;
-		form_ptr = anchor_ptr->input_field;
+    for (anchor_ptr = HTMainText->first_anchor;
+	 anchor_ptr != NULL;
+	 anchor_ptr = anchor_ptr->next) {
 
-		if (form_ptr->type != F_TEXTAREA_TYPE)
-		    textarea_lineno = 0;
+	if (anchor_ptr->link_type != INPUT_ANCHOR)
+	    continue;
 
-		switch(form_ptr->type) {
-		case F_RESET_TYPE:
-		    break;
-		case F_SUBMIT_TYPE:
-		case F_TEXT_SUBMIT_TYPE:
-		case F_IMAGE_SUBMIT_TYPE:
-		    if (!(form_ptr->name && *form_ptr->name != '\0' &&
-			  !strcmp(form_ptr->name, link_name))) {
-			CTRACE((tfp,
-				    "SubmitForm: skipping submit field with "));
-			CTRACE((tfp, "name \"%s\" for link_name \"%s\", %s.\n",
-				    form_ptr->name ? form_ptr->name : "???",
-				    link_name ? link_name : "???",
-				    (form_ptr->name && *form_ptr->name) ?
-				    "not current link" : "no field name"));
-			break;
-		    }
-		    if (!(form_ptr->type == F_TEXT_SUBMIT_TYPE ||
-			(form_ptr->value && *form_ptr->value != '\0' &&
-			 !strcmp(form_ptr->value, link_value)))) {
-			CTRACE((tfp,
-				"SubmitForm: skipping submit field with "));
-			CTRACE((tfp,
-				"name \"%s\" for link_name \"%s\", %s!\n",
-				form_ptr->name ? form_ptr->name : "???",
-				link_name ? link_name : "???",
-				"values are different"));
-			break;
-		    }
-		    /* FALLTHRU */
+	if (anchor_ptr->input_field->number == form_number &&
+		    !anchor_ptr->input_field->disabled) {
 
-#ifdef EXP_FILE_UPLOAD
-		case F_FILE_TYPE:
-		    CTRACE((tfp, "I'd submit %s (from %s), but you've not finished it\n", form_ptr->value, form_ptr->name));
-		    name_used = (form_ptr->name ? form_ptr->name : "");
-		    val_used = (form_ptr->value ? form_ptr->value : "");
-		    break;
-#endif
+	    FormInfo *form_ptr = anchor_ptr->input_field;
+	    int out_cs;
+	    QuoteData quoting = (PlainText
+				 ? NO_QUOTE
+				 : (Boundary
+				    ? QUOTE_MULTI
+				    : QUOTE_SPECIAL));
 
-		    /*  fall through  */
-		case F_RADIO_TYPE:
-		case F_CHECKBOX_TYPE:
-		case F_TEXTAREA_TYPE:
-		case F_PASSWORD_TYPE:
-		case F_TEXT_TYPE:
-		case F_OPTION_LIST_TYPE:
-		case F_HIDDEN_TYPE:
-		    /*
-		     *	Be sure to actually look at the option submit value.
-		     */
-		    if (form_ptr->cp_submit_value != NULL) {
-			val_used = form_ptr->cp_submit_value;
-		    } else {
-			val_used = form_ptr->value;
-		    }
+	    if (form_ptr->type != F_TEXTAREA_TYPE)
+		textarea_lineno = 0;
 
-		    /*
-		     *  Charset-translate value now, because we need
-		     *  to know the charset parameter for multipart
-		     *  bodyparts. - kw
-		     */
-		    field_has_8bit = NO;
-		    field_has_special = NO;
-		    for (p = val_used;
-			 p && *p && !(field_has_8bit && field_has_special);
-			 p++) {
-			if ((*p == HT_NON_BREAK_SPACE) ||
-			    (*p == HT_EN_SPACE) ||
-			    (*p == LY_SOFT_HYPHEN)) {
-			    field_has_special = YES;
-			} else if ((*p & 0x80) != 0) {
-			    field_has_8bit = YES;
-			}
-		    }
+	    CTRACE((tfp, "SubmitForm[%d/%d]: ",
+		   anchor_count + 1, anchor_limit));
+
+	    name_used = NonNull(form_ptr->name);
+
+	    switch(form_ptr->type) {
+	    case F_RESET_TYPE:
+		CTRACE((tfp, "reset\n"));
+		break;
+#ifdef USE_FILE_UPLOAD
+	    case F_FILE_TYPE:
+		val_used = NonNull(form_ptr->value);
+		CTRACE((tfp, "I will submit %s (from %s)\n",
+			     val_used, name_used));
+		break;
+#endif
+	    case F_SUBMIT_TYPE:
+	    case F_TEXT_SUBMIT_TYPE:
+	    case F_IMAGE_SUBMIT_TYPE:
+		if (!(non_empty(form_ptr->name) &&
+		      !strcmp(form_ptr->name, link_name))) {
+		    CTRACE((tfp, "skipping submit field with "));
+		    CTRACE((tfp, "name \"%s\" for link_name \"%s\", %s.\n",
+				 form_ptr->name ? form_ptr->name : "???",
+				 link_name ? link_name : "???",
+				 non_empty(form_ptr->name) ?
+				 "not current link" : "no field name"));
+		    break;
+		}
+		if (!(form_ptr->type == F_TEXT_SUBMIT_TYPE ||
+		    (non_empty(form_ptr->value) &&
+		     !strcmp(form_ptr->value, link_value)))) {
+		    CTRACE((tfp, "skipping submit field with "));
+		    CTRACE((tfp, "name \"%s\" for link_name \"%s\", %s!\n",
+				 form_ptr->name ? form_ptr->name : "???",
+				 link_name ? link_name : "???",
+				 "values are different"));
+		    break;
+		}
+		/* FALLTHRU */
+	    case F_RADIO_TYPE:
+	    case F_CHECKBOX_TYPE:
+	    case F_TEXTAREA_TYPE:
+	    case F_PASSWORD_TYPE:
+	    case F_TEXT_TYPE:
+	    case F_OPTION_LIST_TYPE:
+	    case F_HIDDEN_TYPE:
+		/*
+		 * Be sure to actually look at the option submit value.
+		 */
+		if (form_ptr->cp_submit_value != NULL) {
+		    val_used = form_ptr->cp_submit_value;
+		} else {
+		    val_used = form_ptr->value;
+		}
 
-		    if (field_has_8bit || field_has_special) {
-			/*  We should translate back. */
-			StrAllocCopy(copied_val_used, val_used);
-			success = LYUCTranslateBackFormData(&copied_val_used,
+		/*
+		 * Charset-translate value now, because we need to know the
+		 * charset parameter for multipart bodyparts.  - kw
+		 */
+		if (check_form_specialchars(val_used) != 0) {
+		    /*  We should translate back. */
+		    StrAllocCopy(copied_val_used, val_used);
+		    success = LYUCTranslateBackFormData(&copied_val_used,
 							form_ptr->value_cs,
 							target_cs, PlainText);
-			CTRACE((tfp, "SubmitForm: field \"%s\" %d %s -> %d %s %s\n",
-				    form_ptr->name ? form_ptr->name : "",
-				    form_ptr->value_cs,
-				    form_ptr->value_cs >= 0 ?
-				    LYCharSet_UC[form_ptr->value_cs].MIMEname :
-									  "???",
-				    target_cs,
-				    target_csname ? target_csname : "???",
-				    success ? "OK" : "FAILED"));
-			if (success) {
-			    val_used = copied_val_used;
-			}
-		    } else {  /* We can use the value directly. */
-			CTRACE((tfp, "SubmitForm: field \"%s\" %d %s OK\n",
-				    form_ptr->name ? form_ptr->name : "",
-				    target_cs,
-				    target_csname ? target_csname : "???"));
-			success = YES;
+		    CTRACE((tfp, "field \"%s\" %d %s -> %d %s %s\n",
+				 NonNull(form_ptr->name),
+				 form_ptr->value_cs,
+				 form_ptr->value_cs >= 0
+				     ? LYCharSet_UC[form_ptr->value_cs].MIMEname
+				     : "???",
+				 target_cs,
+				 target_csname ? target_csname : "???",
+				 success ? "OK" : "FAILED"));
+		    if (success) {
+			val_used = copied_val_used;
 		    }
-		    if (!success) {
-			if (!had_chartrans_warning) {
-			    had_chartrans_warning = YES;
-			    _user_message(
-				CANNOT_TRANSCODE_FORM,
-				target_csname ? target_csname : "UNKNOWN");
-			    LYSleepAlert();
-			}
-			out_cs = form_ptr->value_cs;
+		} else {  /* We can use the value directly. */
+		    CTRACE((tfp, "field \"%s\" %d %s OK\n",
+				 NonNull(form_ptr->name),
+				 target_cs,
+				 target_csname ? target_csname : "???"));
+		    success = YES;
+		}
+		if (!success) {
+		    cannot_transcode(&had_chartrans_warning, target_csname);
+		    out_cs = form_ptr->value_cs;
+		} else {
+		    out_cs = target_cs;
+		}
+		if (out_cs >= 0)
+		    out_csname = LYCharSet_UC[out_cs].MIMEname;
+		if (Boundary) {
+		    StrAllocCopy(MultipartContentType,
+				 "\r\nContent-Type: %s");
+		    if (!success && form_ptr->value_cs < 0) {
+			/*  This is weird. */
+			out_csname = "UNKNOWN-8BIT";
+		    } else if (!success) {
+			target_csname = NULL;
 		    } else {
-			out_cs = target_cs;
-		    }
-		    if (out_cs >= 0)
-			out_csname = LYCharSet_UC[out_cs].MIMEname;
-		    if (Boundary) {
-			if (!success && form_ptr->value_cs < 0) {
-			    /*  This is weird. */
-			    StrAllocCopy(MultipartContentType,
-					 "\r\nContent-Type: text/plain; charset=");
-			    StrAllocCat(MultipartContentType, "UNKNOWN-8BIT");
-			} else if (!success) {
-			    StrAllocCopy(MultipartContentType,
-					 "\r\nContent-Type: text/plain; charset=");
-			    StrAllocCat(MultipartContentType, out_csname);
-			    target_csname = NULL;
-			} else {
-			    if (!target_csname) {
-				target_csname = LYCharSet_UC[target_cs].MIMEname;
-			    }
-			    StrAllocCopy(MultipartContentType,
-					 "\r\nContent-Type: text/plain; charset=");
-			    StrAllocCat(MultipartContentType, out_csname);
+			if (!target_csname) {
+			    target_csname = LYCharSet_UC[target_cs].MIMEname;
 			}
 		    }
+		    if (strcmp(out_csname, "iso-8859-1"))
+			HTSprintf(&MultipartContentType, "; charset=%s", out_csname);
+		}
 
-		    /*
-		     *  Charset-translate name now, because we need
-		     *  to know the charset parameter for multipart
-		     *  bodyparts. - kw
-		     */
-		    if (form_ptr->type == F_TEXTAREA_TYPE) {
-			textarea_lineno++;
-			if (textarea_lineno > 1 &&
-			    last_textarea_name && form_ptr->name &&
-			    !strcmp(last_textarea_name, form_ptr->name)) {
-			    break;
-			}
-		    }
-		    name_used = (form_ptr->name ?
-				 form_ptr->name : "");
-
-		    name_has_8bit = NO;
-		    name_has_special = NO;
-		    for (p = name_used;
-			 p && *p && !(name_has_8bit && name_has_special);
-			 p++) {
-			if ((*p == HT_NON_BREAK_SPACE) ||
-			    (*p == HT_EN_SPACE) ||
-			    (*p == LY_SOFT_HYPHEN)) {
-			    name_has_special = YES;
-			} else if ((*p & 0x80) != 0) {
-			    name_has_8bit = YES;
-			}
+		/*
+		 * Charset-translate name now, because we need to know the
+		 * charset parameter for multipart bodyparts.  - kw
+		 */
+		if (form_ptr->type == F_TEXTAREA_TYPE) {
+		    textarea_lineno++;
+		    if (textarea_lineno > 1 &&
+			last_textarea_name && form_ptr->name &&
+			!strcmp(last_textarea_name, form_ptr->name)) {
+			break;
 		    }
+		}
 
-		    if (name_has_8bit || name_has_special) {
-			/*  We should translate back. */
-			StrAllocCopy(copied_name_used, name_used);
-			success = LYUCTranslateBackFormData(&copied_name_used,
+		if (check_form_specialchars(name_used) != 0) {
+		    /*  We should translate back. */
+		    StrAllocCopy(copied_name_used, name_used);
+		    success = LYUCTranslateBackFormData(&copied_name_used,
 							form_ptr->name_cs,
 							target_cs, PlainText);
-			CTRACE((tfp, "SubmitForm: name \"%s\" %d %s -> %d %s %s\n",
-				    form_ptr->name ? form_ptr->name : "",
-				    form_ptr->name_cs,
-				    form_ptr->name_cs >= 0 ?
-				    LYCharSet_UC[form_ptr->name_cs].MIMEname :
-									  "???",
-				    target_cs,
-				    target_csname ? target_csname : "???",
-				    success ? "OK" : "FAILED"));
-			if (success) {
-			    name_used = copied_name_used;
-			}
-			if (Boundary) {
-			    if (!success) {
-				StrAllocCopy(MultipartContentType, "");
-				target_csname = NULL;
-			    } else {
-				if (!target_csname)
-				    target_csname = LYCharSet_UC[target_cs].MIMEname;
-			    }
-			}
-		    } else {  /* We can use the name directly. */
-			CTRACE((tfp, "SubmitForm: name \"%s\" %d %s OK\n",
-				    form_ptr->name ? form_ptr->name : "",
-				    target_cs,
-				    target_csname ? target_csname : "???"));
-			success = YES;
-			if (Boundary) {
-			    StrAllocCopy(copied_name_used, name_used);
-			}
+		    CTRACE((tfp, "name \"%s\" %d %s -> %d %s %s\n",
+				 NonNull(form_ptr->name),
+				 form_ptr->name_cs,
+				 form_ptr->name_cs >= 0
+				     ? LYCharSet_UC[form_ptr->name_cs].MIMEname
+				     : "???",
+				 target_cs,
+				 target_csname ? target_csname : "???",
+				 success ? "OK" : "FAILED"));
+		    if (success) {
+			name_used = copied_name_used;
 		    }
-		    if (!success) {
-			if (!had_chartrans_warning) {
-			    had_chartrans_warning = YES;
-			    _user_message(
-				CANNOT_TRANSCODE_FORM,
-				target_csname ? target_csname : "UNKNOWN");
-			    LYSleepAlert();
+		    if (Boundary) {
+			if (!success) {
+			    StrAllocCopy(MultipartContentType, "");
+			    target_csname = NULL;
+			} else {
+			    if (!target_csname)
+				target_csname = LYCharSet_UC[target_cs].MIMEname;
 			}
 		    }
+		} else {  /* We can use the name directly. */
+		    CTRACE((tfp, "name \"%s\" %d %s OK\n",
+				NonNull(form_ptr->name),
+				target_cs,
+				target_csname ? target_csname : "???"));
+		    success = YES;
 		    if (Boundary) {
-			/*
-			 *  According to RFC 1867, Non-ASCII field names
-			 *  "should be encoded according to the prescriptions
-			 *  of RFC 1522 [...].  I don't think RFC 1522 actually
-			 *  is meant to apply to parameters like this, and it
-			 *  is unknown whether any server would make sense of
-			 *  it, so for now just use some quoting/escaping and
-			 *  otherwise leave 8-bit values as they are.
-			 *  Non-ASCII characters in form field names submitted
-			 *  as multipart/form-data can only occur if the form
-			 *  provider specifically asked for it anyway. - kw
-			 */
-			HTMake822Word(&copied_name_used);
-			name_used = copied_name_used;
+			StrAllocCopy(copied_name_used, name_used);
 		    }
-
-		    break;
-		default:
-		    CTRACE((tfp, "SubmitForm: What type is %d?\n",
-				form_ptr->type));
-		    break;
+		}
+		if (!success) {
+		    cannot_transcode(&had_chartrans_warning, target_csname);
+		}
+		if (Boundary) {
+		    /*
+		     *  According to RFC 1867, Non-ASCII field names
+		     *  "should be encoded according to the prescriptions
+		     *  of RFC 1522 [...].  I don't think RFC 1522 actually
+		     *  is meant to apply to parameters like this, and it
+		     *  is unknown whether any server would make sense of
+		     *  it, so for now just use some quoting/escaping and
+		     *  otherwise leave 8-bit values as they are.
+		     *  Non-ASCII characters in form field names submitted
+		     *  as multipart/form-data can only occur if the form
+		     *  provider specifically asked for it anyway. - kw
+		     */
+		    HTMake822Word(&copied_name_used, FALSE);
+		    name_used = copied_name_used;
 		}
 
-		switch(form_ptr->type) {
+		break;
+	    default:
+		CTRACE((tfp, "What type is %d?\n", form_ptr->type));
+		break;
+	    }
 
-		case F_RESET_TYPE:
-		    break;
+	    skip_field = FALSE;
+	    my_data[anchor_count].first = TRUE;
+	    my_data[anchor_count].type = form_ptr->type;
 
-#ifdef EXP_FILE_UPLOAD
-		case F_FILE_TYPE:
-		{
-		    int cdisp_name_startpos = 0;
-		    FILE *fd;
-		    int bytes;
-		    char buffer[257];
+	    /*
+	     * Using the values of 'name_used' and 'val_used' computed in the
+	     * previous case-statement, compute the 'first' and 'data' values
+	     * for the current input field.
+	     */
+	    switch(form_ptr->type) {
 
-		    CTRACE((tfp, "Ok, about to convert %s to mime/thingy\n", form_ptr->value));
-		    if (first_one) {
-			if (Boundary) {
-			    HTSprintf(&query, "--%s\r\n", Boundary);
-			}
-			first_one = FALSE;
-		    } else {
-			if (PlainText) {
-			    HTSprintf(&query, "\n");
-			} else if (SemiColon) {
-			    HTSprintf(&query, ";");
-			} else if (Boundary) {
-			    HTSprintf(&query, "\r\n--%s\r\n", Boundary);
-			} else {
-			    HTSprintf(&query, "&");
-			}
-		    }
+	    default:
+		skip_field = TRUE;
+		break;
 
-		    if (PlainText) {
-			StrAllocCopy(escaped1, name_used);
-		    } else if (Boundary) {
-			StrAllocCopy(escaped1,
-				"Content-Disposition: form-data; name=");
-			cdisp_name_startpos = strlen(escaped1);
-			StrAllocCat(escaped1, name_used);
-			StrAllocCat(escaped1, "; filename=\"");
-			StrAllocCat(escaped1, val_used);
-			StrAllocCat(escaped1, "\"");
-			if (MultipartContentType) {
-			    StrAllocCat(escaped1, MultipartContentType);
-			    StrAllocCat(escaped1, "\r\nContent-Transfer-Encoding: base64");
-			}
-			StrAllocCat(escaped1, "\r\n\r\n");
-		    } else {
-			escaped1 = HTEscapeSP(name_used, URL_XALPHAS);
-		    }
+#ifdef USE_FILE_UPLOAD
+	    case F_FILE_TYPE:
+		load_a_file(val_used, &(my_data[anchor_count].data));
+		break;
+#endif /* USE_FILE_UPLOAD */
+
+	    case F_SUBMIT_TYPE:
+	    case F_TEXT_SUBMIT_TYPE:
+	    case F_IMAGE_SUBMIT_TYPE:
+		if ((non_empty(form_ptr->name) &&
+		    !strcmp(form_ptr->name, link_name)) &&
+		   (form_ptr->type == F_TEXT_SUBMIT_TYPE ||
+		    (non_empty(form_ptr->value) &&
+		     !strcmp(form_ptr->value, link_value)))) {
+		    ;
+		} else {
+		    skip_field = TRUE;
+		}
+		break;
 
-		    if ((fd = fopen(val_used, BIN_R)) == 0) {
-			/* We can't open the file, what do we do? */
-			HTAlert(gettext("Can't open file for uploading"));
-			goto exit_disgracefully;
-		    }
-		    StrAllocCopy(escaped2, "");
-		    while ((bytes = fread(buffer, sizeof(char), 45, fd)) != 0) {
-			char base64buf[128];
-			base64_encode(base64buf, buffer, bytes);
-			StrAllocCat(escaped2, base64buf);
-		    }
-		    if (ferror(fd)) {
-			/* We got an error reading the file, what do we do? */
-			HTAlert(gettext("Short read from file, problem?"));
-			LYCloseInput(fd);
-			goto exit_disgracefully;
-		    }
-		    LYCloseInput(fd);
-		    /* we need to modify the mime-type here - rp */
-		    /* Note: could use LYGetFileInfo for that and for
-		       other headers that should be transmitted - kw */
-
-		    HTSprintf(&query,
-				   "%s%s%s%s%s",
-				   escaped1,
-				   (Boundary ? "" : "="),
-				   (PlainText ? "\n" : ""),
-					escaped2,
-				   ((PlainText && *escaped2) ?
-							 "\n" : ""));
-		    FREE(escaped1);
-		    FREE(escaped2);
+	    case F_RADIO_TYPE:
+	    case F_CHECKBOX_TYPE:
+		/*
+		 *  Only add if selected.
+		 */
+		if (form_ptr->num_value) {
+		    ;
+		} else {
+		    skip_field = TRUE;
 		}
 		break;
-#endif /* EXP_FILE_UPLOAD */
 
-		case F_SUBMIT_TYPE:
-		case F_TEXT_SUBMIT_TYPE:
-		case F_IMAGE_SUBMIT_TYPE:
-		    /*
-		     *  If it has a non-zero length name (e.g., because
-		     *  its IMAGE_SUBMIT_TYPE is to be handled homologously
-		     *  to an image map, or a SUBMIT_TYPE in a set of
-		     *  multiple submit buttons, or a single type="text"
-		     *  that's been converted to a TEXT_SUBMIT_TYPE),
-		     *  include the name=value pair, or fake name.x=0 and
-		     *  name.y=0 pairs for IMAGE_SUBMIT_TYPE. - FM
-		     */
-		    if ((form_ptr->name && *form_ptr->name != '\0' &&
-			!strcmp(form_ptr->name, link_name)) &&
-		       (form_ptr->type == F_TEXT_SUBMIT_TYPE ||
-			(form_ptr->value && *form_ptr->value != '\0' &&
-			 !strcmp(form_ptr->value, link_value)))) {
-			int cdisp_name_startpos = 0;
-			if (first_one) {
-			    if (Boundary) {
-				HTSprintf(&query, "--%s\r\n", Boundary);
-			    }
-			    first_one=FALSE;
-			} else {
-			    if (PlainText) {
-				StrAllocCat(query, "\n");
-			    } else if (SemiColon) {
-				StrAllocCat(query, ";");
-			    } else if (Boundary) {
-				HTSprintf(&query, "\r\n--%s\r\n", Boundary);
-			    } else {
-				StrAllocCat(query, "&");
-			    }
-			}
+	    case F_TEXTAREA_TYPE:
+		if (!last_textarea_name ||
+		    strcmp(last_textarea_name, form_ptr->name)) {
+		    textarea_lineno = 1;
+		    last_textarea_name = form_ptr->name;
+		} else {
+		    my_data[anchor_count].first = FALSE;
+		}
+		break;
 
-			if (PlainText) {
-			    StrAllocCopy(escaped1, name_used);
-			} else if (Boundary) {
-			    StrAllocCopy(escaped1,
-				    "Content-Disposition: form-data; name=");
-			    cdisp_name_startpos = strlen(escaped1);
-			    StrAllocCat(escaped1, name_used);
-			    if (MultipartContentType)
-				StrAllocCat(escaped1, MultipartContentType);
-			    StrAllocCat(escaped1, "\r\n\r\n");
-			} else {
-			    escaped1 = HTEscapeSP(name_used, URL_XALPHAS);
-			}
+	    case F_PASSWORD_TYPE:
+	    case F_TEXT_TYPE:
+	    case F_OPTION_LIST_TYPE:
+	    case F_HIDDEN_TYPE:
+		break;
+	    }
 
-			if (PlainText || Boundary) {
-			    StrAllocCopy(escaped2,
-					 (val_used ?
-					  val_used : ""));
-			} else {
-			    escaped2 = HTEscapeSP(val_used, URL_XALPHAS);
-			}
+	    /*
+	     * If we did not decide to skip the current field, populate the
+	     * values in the array for it.
+	     */
+	    if (!skip_field) {
+		StrAllocCopy(my_data[anchor_count].name, name_used);
+		StrAllocCopy(my_data[anchor_count].value, val_used);
+		if (my_data[anchor_count].data == 0)
+		    BStrCat0(my_data[anchor_count].data, val_used);
+		my_data[anchor_count].quote = quoting;
+		if (quoting == QUOTE_MULTI
+		 && check_if_base64_needed(submit_item->submit_method,
+					   my_data[anchor_count].data)) {
+		    CTRACE((tfp, "will encode as base64\n"));
+		    my_data[anchor_count].quote = QUOTE_BASE64;
+		    escaped2 = convert_to_base64(
+				BStrData(my_data[anchor_count].data),
+				BStrLen(my_data[anchor_count].data));
+		    BStrCopy0(my_data[anchor_count].data, escaped2);
+		    FREE(escaped2);
+		}
+	    }
+	    ++anchor_count;
 
-			if (form_ptr->type == F_IMAGE_SUBMIT_TYPE) {
-			    /*
-			     *  It's a clickable image submit button.
-			     *  Fake a 0,0 coordinate pair, which
-			     *  typically returns the image's default. - FM
-			     */
-			    if (Boundary) {
-				escaped1[cdisp_name_startpos] = '\0';
-				HTSprintf(&query,
-					"%s.x\r\n\r\n0\r\n--%s\r\n%s.y\r\n\r\n0",
-					escaped1,
-					Boundary,
-					escaped1);
-			    } else {
-				HTSprintf(&query,
-					"%s.x=0%s%s.y=0%s",
-					escaped1,
-					(PlainText ?
-					      "\n" : (SemiColon ?
-							    ";" : "&")),
-					escaped1,
-					((PlainText && *escaped1) ?
-							     "\n" : ""));
-			    }
-			} else {
-			    /*
-			     *  It's a standard submit button.
-			     *  Use the name=value pair. = FM
-			     */
-			    HTSprintf(&query,
-				    "%s%s%s%s%s",
-				    escaped1,
-				    (Boundary ?
-					   "" : "="),
-				    (PlainText ?
-					  "\n" : ""),
-				    escaped2,
-				    ((PlainText && *escaped2) ?
-							 "\n" : ""));
-			}
-			FREE(escaped1);
-			FREE(escaped2);
-		    }
-		    FREE(copied_name_used);
-		    FREE(copied_val_used);
-		    break;
+	    FREE(copied_name_used);
+	    FREE(copied_val_used);
 
-		case F_RADIO_TYPE:
-		case F_CHECKBOX_TYPE:
-		    /*
-		     *  Only add if selected.
-		     */
-		    if (form_ptr->num_value) {
-			if (first_one) {
-			    if (Boundary) {
-				HTSprintf(&query,
-					"--%s\r\n", Boundary);
-			    }
-			    first_one=FALSE;
-			} else {
-			    if (PlainText) {
-				StrAllocCat(query, "\n");
-			    } else if (SemiColon) {
-				StrAllocCat(query, ";");
-			    } else if (Boundary) {
-				HTSprintf(&query, "\r\n--%s\r\n", Boundary);
-			    } else {
-				StrAllocCat(query, "&");
-			    }
-			}
+	} else if (anchor_ptr->input_field->number > form_number) {
+	    break;
+	}
+    }
 
-			if (PlainText) {
-			    StrAllocCopy(escaped1, name_used);
-			} else if (Boundary) {
-			    StrAllocCopy(escaped1,
-				     "Content-Disposition: form-data; name=");
-			    StrAllocCat(escaped1,
-					name_used);
-			    if (MultipartContentType)
-				StrAllocCat(escaped1, MultipartContentType);
-			    StrAllocCat(escaped1, "\r\n\r\n");
-			} else {
-			    escaped1 = HTEscapeSP(name_used, URL_XALPHAS);
-			}
-			if (PlainText || Boundary) {
-			    StrAllocCopy(escaped2,
-					 (val_used ?
-					  val_used : ""));
-			} else {
-			    escaped2 = HTEscapeSP(val_used, URL_XALPHAS);
-			}
+    FREE(copied_name_used);
 
-			HTSprintf(&query,
-				"%s%s%s%s%s",
-				escaped1,
-				(Boundary ?
-				       "" : "="),
-				(PlainText ?
-				      "\n" : ""),
-				escaped2,
-				((PlainText && *escaped2) ?
-						     "\n" : ""));
-			FREE(escaped1);
-			FREE(escaped2);
-		    }
-		    FREE(copied_name_used);
-		    FREE(copied_val_used);
-		    break;
+    if (my_data != 0) {
+	BOOL first_one = TRUE;
 
-		case F_TEXTAREA_TYPE:
-		    if (PlainText || Boundary) {
-			StrAllocCopy(escaped2,
-				     (val_used ?
-				      val_used : ""));
-		    } else {
-			escaped2 = HTEscapeSP(val_used, URL_XALPHAS);
-		    }
+	/*
+	 * If we're using a MIME-boundary, make it unique.
+	 */
+	if (content_type_out != 0 && Boundary != 0) {
+	    Boundary = 0;
+	    StrAllocCopy(Boundary, "LYNX");
+	    for (anchor_count = 0; anchor_count < anchor_limit; ++anchor_count) {
+		if (my_data[anchor_count].data != 0) {
+		    UpdateBoundary(&Boundary, my_data[anchor_count].data);
+		}
+	    }
+	    HTSprintf(&content_type_out, "; boundary=%s", Boundary);
+	}
 
-		    if (!last_textarea_name ||
-			strcmp(last_textarea_name, form_ptr->name)) {
-			textarea_lineno = 1;
-			/*
-			 *  Names are different so this is the first
-			 *  textarea or a different one from any before
-			 *  it.
-			 */
-			if (Boundary) {
-			    StrAllocCopy(previous_blanks, "\r\n");
-			} else {
-			    FREE(previous_blanks);
-			}
-			if (first_one) {
-			    if (Boundary) {
-				HTSprintf(&query, "--%s\r\n", Boundary);
-			    }
-			    first_one = FALSE;
-			} else {
-			    if (PlainText) {
-				StrAllocCat(query, "\n");
-			    } else if (SemiColon) {
-				StrAllocCat(query, ";");
-			    } else if (Boundary) {
-				HTSprintf(&query, "\r\n--%s\r\n", Boundary);
-			    } else {
-				StrAllocCat(query, "&");
-			    }
-			}
-			if (PlainText) {
-			    StrAllocCopy(escaped1, name_used);
-			} else if (Boundary) {
-			    StrAllocCopy(escaped1,
-				    "Content-Disposition: form-data; name=");
-			    StrAllocCat(escaped1, name_used);
-			    if (MultipartContentType)
-				StrAllocCat(escaped1, MultipartContentType);
-			    StrAllocCat(escaped1, "\r\n\r\n");
-			} else {
-			    escaped1 = HTEscapeSP(name_used, URL_XALPHAS);
-			}
-			HTSprintf(&query,
-				"%s%s%s%s%s",
-				escaped1,
-				(Boundary ?
-				       "" : "="),
-				(PlainText ?
-				      "\n" : ""),
-				escaped2,
-				((PlainText && *escaped2) ?
-						     "\n" : ""));
-			FREE(escaped1);
-			last_textarea_name = form_ptr->name;
-		    } else {
-			/*
-			 *  This is a continuation of a previous textarea
-			 *  add %0d%0a (\r\n) and the escaped string.
-			 */
-			if (escaped2[0] != '\0') {
-			    if (previous_blanks) {
-				StrAllocCat(query, previous_blanks);
-				FREE(previous_blanks);
-			    }
-			    if (PlainText) {
-				HTSprintf(&query, "%s\n", escaped2);
-			    } else if (Boundary) {
-				HTSprintf(&query, "%s\r\n", escaped2);
-			    } else {
-				HTSprintf(&query, "%%0d%%0a%s", escaped2);
-			    }
-			} else {
-			    if (PlainText) {
-				StrAllocCat(previous_blanks, "\n");
-			    } else if (Boundary) {
-				StrAllocCat(previous_blanks, "\r\n");
-			    } else {
-				StrAllocCat(previous_blanks, "%0d%0a");
-			    }
-			}
-		    }
-		    FREE(escaped2);
-		    FREE(copied_val_used);
-		    break;
+	for (anchor_count = 0; anchor_count < anchor_limit; ++anchor_count) {
+
+	    if (my_data[anchor_count].name != 0
+	     && my_data[anchor_count].value != 0) {
+
+		CTRACE((tfp, "processing [%d:%d] name=%s(first:%d, value=%s, data=%p)\n",
+			anchor_count + 1,
+			anchor_limit,
+			NonNull(my_data[anchor_count].name),
+			my_data[anchor_count].first,
+			NonNull(my_data[anchor_count].value),
+			my_data[anchor_count].data));
 
-		case F_PASSWORD_TYPE:
-		case F_TEXT_TYPE:
-		case F_OPTION_LIST_TYPE:
-		case F_HIDDEN_TYPE:
+		if (my_data[anchor_count].first) {
 		    if (first_one) {
 			if (Boundary) {
-			    HTSprintf(&query, "--%s\r\n", Boundary);
+			    HTBprintf(&my_query, "--%s\r\n", Boundary);
 			}
-			first_one=FALSE;
+			first_one = FALSE;
 		    } else {
 			if (PlainText) {
-			    StrAllocCat(query, "\n");
+			    BStrCat0(my_query, "\n");
 			} else if (SemiColon) {
-			    StrAllocCat(query, ";");
+			    BStrCat0(my_query, ";");
 			} else if (Boundary) {
-			    HTSprintf(&query, "\r\n--%s\r\n", Boundary);
+			    HTBprintf(&my_query, "\r\n--%s\r\n", Boundary);
 			} else {
-			    StrAllocCat(query, "&");
+			    BStrCat0(my_query, "&");
 			}
 		    }
+		}
 
-		    if (PlainText) {
-		       StrAllocCopy(escaped1, name_used);
-		    } else if (Boundary) {
-			StrAllocCopy(escaped1,
-				    "Content-Disposition: form-data; name=");
-			StrAllocCat(escaped1, name_used);
-			if (MultipartContentType)
-			    StrAllocCat(escaped1, MultipartContentType);
-			StrAllocCat(escaped1, "\r\n\r\n");
+		/* append a null to the string */
+		HTSABCat(&(my_data[anchor_count].data), "", 1);
+		name_used = my_data[anchor_count].name;
+		val_used = my_data[anchor_count].value;
+
+	    } else {
+		/* there is no data to send */
+		continue;
+	    }
+
+	    switch (my_data[anchor_count].type) {
+	    case F_TEXT_TYPE:
+	    case F_PASSWORD_TYPE:
+	    case F_OPTION_LIST_TYPE:
+	    case F_HIDDEN_TYPE:
+		escaped1 = escape_or_quote_name(my_data[anchor_count].name,
+						my_data[anchor_count].quote,
+						MultipartContentType);
+
+		escaped2 = escape_or_quote_value(val_used,
+						 my_data[anchor_count].quote);
+
+		HTBprintf(&my_query,
+			"%s%s%s%s%s",
+			escaped1,
+			(Boundary ? "" : "="),
+			(PlainText ? "\n" : ""),
+			escaped2,
+			((PlainText && *escaped2) ? "\n" : ""));
+		break;
+	    case F_CHECKBOX_TYPE:
+	    case F_RADIO_TYPE:
+		escaped1 = escape_or_quote_name(my_data[anchor_count].name,
+						my_data[anchor_count].quote,
+						MultipartContentType);
+
+		escaped2 = escape_or_quote_value(val_used,
+						 my_data[anchor_count].quote);
+
+		HTBprintf(&my_query,
+			"%s%s%s%s%s",
+			escaped1,
+			(Boundary ? "" : "="),
+			(PlainText ? "\n" : ""),
+			escaped2,
+			((PlainText && *escaped2) ? "\n" : ""));
+		break;
+	    case F_SUBMIT_TYPE:
+	    case F_TEXT_SUBMIT_TYPE:
+	    case F_IMAGE_SUBMIT_TYPE:
+		/*
+		 *  If it has a non-zero length name (e.g., because
+		 *  its IMAGE_SUBMIT_TYPE is to be handled homologously
+		 *  to an image map, or a SUBMIT_TYPE in a set of
+		 *  multiple submit buttons, or a single type="text"
+		 *  that's been converted to a TEXT_SUBMIT_TYPE),
+		 *  include the name=value pair, or fake name.x=0 and
+		 *  name.y=0 pairs for IMAGE_SUBMIT_TYPE. -FM
+		 */
+		escaped1 = escape_or_quote_name(my_data[anchor_count].name,
+						my_data[anchor_count].quote,
+						MultipartContentType);
+
+		escaped2 = escape_or_quote_value(val_used,
+						 my_data[anchor_count].quote);
+
+		if (my_data[anchor_count].type == F_IMAGE_SUBMIT_TYPE) {
+		    /*
+		     * It's a clickable image submit button.  Fake a 0,0
+		     * coordinate pair, which typically returns the image's
+		     * default.  -FM
+		     */
+		    if (Boundary) {
+			*(strchr(escaped1, '=') + 1) = '\0';
+			HTBprintf(&my_query,
+				  "%s\"%s.x\"\r\n\r\n0\r\n--%s\r\n%s\"%s.y\"\r\n\r\n0",
+				  escaped1,
+				  my_data[anchor_count].name,
+				  Boundary,
+				  escaped1,
+				  my_data[anchor_count].name);
 		    } else {
-			escaped1 = HTEscapeSP(name_used, URL_XALPHAS);
+			HTBprintf(&my_query,
+				"%s.x=0%s%s.y=0%s",
+				escaped1,
+				(PlainText ?
+				      "\n" : (SemiColon ?
+						    ";" : "&")),
+				escaped1,
+				((PlainText && *escaped1) ?
+						     "\n" : ""));
 		    }
+		} else {
+		    /*
+		     * It's a standard submit button.  Use the name=value
+		     * pair.  = FM
+		     */
+		    HTBprintf(&my_query,
+			    "%s%s%s%s%s",
+			    escaped1,
+			    (Boundary ? "" : "="),
+			    (PlainText ? "\n" : ""),
+			    escaped2,
+			    ((PlainText && *escaped2) ? "\n" : ""));
+		}
+		break;
+	    case F_RESET_TYPE:
+		/* ignore */
+		break;
+	    case F_TEXTAREA_TYPE:
+		escaped2 = escape_or_quote_value(val_used,
+						 my_data[anchor_count].quote);
 
-		    if (PlainText || Boundary) {
-			StrAllocCopy(escaped2,
-				     (val_used ?
-				      val_used : ""));
+		if (my_data[anchor_count].first) {
+		    textarea_lineno = 1;
+		    /*
+		     * Names are different so this is the first textarea or a
+		     * different one from any before it.
+		     */
+		    if (PlainText) {
+			FREE(previous_blanks);
+		    } else if (Boundary) {
+			StrAllocCopy(previous_blanks, "\r\n");
 		    } else {
-			escaped2 = HTEscapeSP(val_used, URL_XALPHAS);
+			StrAllocCopy(previous_blanks, "%0d%0a");
 		    }
+		    escaped1 = escape_or_quote_name(name_used,
+						    my_data[anchor_count].quote,
+						    MultipartContentType);
 
-		    HTSprintf(&query,
+		    HTBprintf(&my_query,
 			    "%s%s%s%s%s",
 			    escaped1,
-			    (Boundary ?
-				   "" : "="),
-			    (PlainText ?
-				  "\n" : ""),
+			    (Boundary ? "" : "="),
+			    (PlainText ? "\n" : ""),
 			    escaped2,
-			    ((PlainText && *escaped2) ?
-						 "\n" : ""));
-		    FREE(escaped1);
-		    FREE(escaped2);
-		    FREE(copied_name_used);
-		    FREE(copied_val_used);
-		    break;
+			    ((PlainText && *escaped2) ? "\n" : ""));
+		} else {
+		    char *marker = (PlainText
+				    ? "\n"
+				    : (Boundary
+				       ? "\r\n"
+				       : "%0d%0a"));
+		    /*
+		     * This is a continuation of a previous textarea.
+		     */
+		    if (escaped2[0] != '\0') {
+			if (previous_blanks) {
+			    BStrCat0(my_query, previous_blanks);
+			    FREE(previous_blanks);
+			}
+			BStrCat0(my_query, escaped2);
+			if (PlainText || Boundary)
+			    BStrCat0(my_query, marker);
+			else
+			    StrAllocCopy(previous_blanks, marker);
+		    } else {
+			StrAllocCat(previous_blanks, marker);
+		    }
 		}
-	    } else if (anchor_ptr->input_field->number > form_number) {
 		break;
-	    }
-	}
+	    case F_RANGE_TYPE:
+		/* not implemented */
+		break;
+#ifdef USE_FILE_UPLOAD
+	    case F_FILE_TYPE:
+		if (PlainText) {
+		    StrAllocCopy(escaped1, my_data[anchor_count].name);
+		} else if (Boundary) {
+		    CONST char *t = guess_content_type(val_used);
+
+		    StrAllocCopy(escaped1, "Content-Disposition: form-data");
+		    HTSprintf(&escaped1, "; name=\"%s\"", my_data[anchor_count].name);
+		    HTSprintf(&escaped1, "; filename=\"%s\"", val_used);
+		    /* Should we take into account the encoding? */
+		    HTSprintf(&escaped1, "\r\nContent-Type: %s", t);
+		    if (my_data[anchor_count].quote == QUOTE_BASE64)
+			StrAllocCat(escaped1, "\r\nContent-Transfer-Encoding: base64");
+		    StrAllocCat(escaped1, "\r\n\r\n");
+		} else {
+		    escaped1 = HTEscapeSP(my_data[anchor_count].name, URL_XALPHAS);
+		}
 
-	if (anchor_ptr == HTMainText->last_anchor)
-	    break;
+		HTBprintf(&my_query,
+			  "%s%s%s",
+			  escaped1,
+			  (Boundary ? "" : "="),
+			  (PlainText ? "\n" : ""));
+		/*
+		 * If we have anything more than the trailing null we added,
+		 * append the file-data to the query.
+		 */
+		if (BStrLen(my_data[anchor_count].data) > 1) {
+		    HTSABCat(&my_query,
+			     BStrData(my_data[anchor_count].data),
+			     BStrLen(my_data[anchor_count].data) - 1);
+		    if (PlainText)
+			HTBprintf(&my_query, "\n");
+		}
+		break;
+#endif /* USE_FILE_UPLOAD */
+	    case F_KEYGEN_TYPE:
+		/* not implemented */
+		break;
+	    }
 
-	anchor_ptr = anchor_ptr->next;
-    }
-    FREE(copied_name_used);
-    if (Boundary) {
-	FREE(MultipartContentType);
-	HTSprintf(&query, "\r\n--%s--\r\n", Boundary);
-    } else if (!query) {
-	StrAllocCopy(query, "");
+	    FREE(escaped1);
+	    FREE(escaped2);
+	}
+	if (Boundary) {
+	    HTBprintf(&my_query, "\r\n--%s--\r\n", Boundary);
+	}
+	/*
+	 * The data may contain a null - so we use fwrite().
+	 */
+	if (TRACE) {
+	    CTRACE((tfp, "Query %d{", BStrLen(my_query)));
+	    trace_bstring(my_query);
+	    CTRACE((tfp, "}\n"));
+	}
     }
-    FREE(previous_blanks);
-
-    CTRACE((tfp, "QUERY (%d) >> \n%s\n", strlen(query), query));
 
     if (submit_item->submit_method == URL_MAIL_METHOD) {
 	HTUserMsg2(gettext("Submitting %s"), submit_item->submit_action);
-	CTRACE((tfp, "\nGridText - mailto_address: %s\n",
-			    (submit_item->submit_action+7)));
-	CTRACE((tfp, "GridText - mailto_subject: %s\n",
-			    ((submit_item->submit_title &&
-			      *submit_item->submit_title) ?
-			      (submit_item->submit_title) :
-					(HText_getTitle() ?
-					 HText_getTitle() : ""))));
-	CTRACE((tfp,"GridText - mailto_content: %s\n",query));
+	HTSABCat(&my_query, "", 1);	/* append null */
 	mailform((submit_item->submit_action+7),
-		 ((submit_item->submit_title &&
-		   *submit_item->submit_title) ?
-		   (submit_item->submit_title) :
-			     (HText_getTitle() ?
-			      HText_getTitle() : "")),
-		 query,
+		 (isEmpty(submit_item->submit_title)
+		   ? NonNull(HText_getTitle())
+		   : submit_item->submit_title),
+		 BStrData(my_query),
 		 content_type_out);
-	FREE(query);
+	result = 0;
+	BStrFree(my_query);
 	FREE(content_type_out);
-	return 0;
     } else {
 	_statusline(SUBMITTING_FORM);
-    }
 
-    if (submit_item->submit_method == URL_POST_METHOD || Boundary) {
-	StrAllocCopy(doc->post_data, query);
-	FREE(doc->post_content_type);
-	doc->post_content_type = content_type_out; /* don't free c_t_out */
-	CTRACE((tfp,"GridText - post_data: %s\n",doc->post_data));
-	StrAllocCopy(doc->address, submit_item->submit_action);
-	FREE(query);
-	return 1;
-    } else { /* GET_METHOD */
-	StrAllocCopy(doc->address, query);
-	FREE(doc->post_data);
-	FREE(doc->post_content_type);
-	FREE(content_type_out);
-	FREE(query);
-	return 1;
+	if (submit_item->submit_method == URL_POST_METHOD || Boundary) {
+	    LYFreePostData(doc);
+	    doc->post_data = my_query;
+	    doc->post_content_type = content_type_out; /* don't free c_t_out */
+	    CTRACE((tfp, "GridText - post_data set:\n%s\n", content_type_out));
+	    StrAllocCopy(doc->address, submit_item->submit_action);
+	} else { /* GET_METHOD */
+	    HTSABCat(&my_query, "", 1);	/* append null */
+	    StrAllocCopy(doc->address, BStrData(my_query));	/* FIXME? */
+	    LYFreePostData(doc);
+	    FREE(content_type_out);
+	}
+	result = 1;
     }
-#ifdef EXP_FILE_UPLOAD
-exit_disgracefully:
-    FREE(escaped1);
-    FREE(escaped2);
-    FREE(previous_blanks);
-    FREE(copied_name_used);
-    FREE(copied_val_used);
+
     FREE(MultipartContentType);
-    FREE(query);
-    FREE(content_type_out);
-    return 0;
-#endif
+    FREE(previous_blanks);
+    FREE(Boundary);
+    if (my_data != 0) {
+	for (anchor_count = 0; anchor_count < anchor_limit; ++anchor_count) {
+	    FREE(my_data[anchor_count].name);
+	    FREE(my_data[anchor_count].value);
+	    BStrFree(my_data[anchor_count].data);
+	}
+	FREE(my_data);
+    }
+
+    return (result);
 }
 
 PUBLIC void HText_DisableCurrentForm NOARGS
@@ -10790,18 +11269,14 @@ PUBLIC void HText_DisableCurrentForm NOARGS
     /*
      *  Go through list of anchors and set the disabled flag.
      */
-    anchor_ptr = HTMainText->first_anchor;
-    while (anchor_ptr) {
+    for (anchor_ptr = HTMainText->first_anchor;
+	 anchor_ptr != NULL;
+	 anchor_ptr = anchor_ptr->next) {
 	if (anchor_ptr->link_type == INPUT_ANCHOR &&
 	    anchor_ptr->input_field->number == HTFormNumber) {
 
 	    anchor_ptr->input_field->disabled = TRUE;
 	}
-
-	if (anchor_ptr == HTMainText->last_anchor)
-	    break;
-
-	anchor_ptr = anchor_ptr->next;
     }
 
     return;
@@ -10819,8 +11294,9 @@ PUBLIC void HText_ResetForm ARGS1(
     /*
      *  Go through list of anchors and reset values.
      */
-    anchor_ptr = HTMainText->first_anchor;
-    while (anchor_ptr != 0) {
+    for (anchor_ptr = HTMainText->first_anchor;
+	 anchor_ptr != NULL;
+	 anchor_ptr = anchor_ptr->next) {
 	if (anchor_ptr->link_type == INPUT_ANCHOR) {
 	    if (anchor_ptr->input_field->number == form->number) {
 
@@ -10848,11 +11324,6 @@ PUBLIC void HText_ResetForm ARGS1(
 		break;
 	    }
 	}
-
-	if (anchor_ptr == HTMainText->last_anchor)
-	    break;
-
-	anchor_ptr = anchor_ptr->next;
     }
 }
 
@@ -10861,19 +11332,21 @@ PUBLIC void HText_ResetForm ARGS1(
  * whether any forms content was changed by user so any information will be
  * lost.
  */
-PUBLIC BOOLEAN HText_HaveUserChangedForms NOARGS
+PUBLIC BOOLEAN HText_HaveUserChangedForms ARGS1(
+	HText *,	text)
 {
     TextAnchor * anchor_ptr;
 
-    if (HTMainText == 0)
+    if (text == 0)
 	return FALSE;
 
     /*
      *  Go through list of anchors to check if any value was changed.
      *  This code based on HText_ResetForm()
      */
-    anchor_ptr = HTMainText->first_anchor;
-    while (anchor_ptr != 0) {
+    for (anchor_ptr = text->first_anchor;
+	 anchor_ptr != NULL;
+	 anchor_ptr = anchor_ptr->next) {
 	if (anchor_ptr->link_type == INPUT_ANCHOR) {
 
 	    if (anchor_ptr->input_field->type == F_RADIO_TYPE ||
@@ -10900,10 +11373,6 @@ PUBLIC BOOLEAN HText_HaveUserChangedForms NOARGS
 		    return TRUE;
 	    }
 	}
-	if (anchor_ptr == HTMainText->last_anchor)
-	   break;
-
-	anchor_ptr = anchor_ptr->next;
     }
     return FALSE;
 }
@@ -10916,8 +11385,9 @@ PUBLIC void HText_activateRadioButton ARGS1(
 
     if (!HTMainText)
 	return;
-    anchor_ptr = HTMainText->first_anchor;
-    while (anchor_ptr) {
+    for (anchor_ptr = HTMainText->first_anchor;
+	 anchor_ptr != NULL;
+	 anchor_ptr = anchor_ptr->next) {
 	if (anchor_ptr->link_type == INPUT_ANCHOR &&
 		anchor_ptr->input_field->type == F_RADIO_TYPE) {
 
@@ -10934,11 +11404,6 @@ PUBLIC void HText_activateRadioButton ARGS1(
 	    }
 
 	}
-
-	if (anchor_ptr == HTMainText->last_anchor)
-	    break;
-
-	anchor_ptr = anchor_ptr->next;
    }
 
    form->num_value = 1;
@@ -10967,8 +11432,6 @@ PRIVATE void free_all_texts NOARGS
      */
     while (loaded_texts && !HTList_isEmpty(loaded_texts)) {
 	if ((cur = (HText *)HTList_removeLastObject(loaded_texts)) != NULL) {
-	    if (cur->node_anchor && cur->node_anchor->underway)
-		cur->node_anchor->underway = FALSE;
 	    HText_free(cur);
 	}
     }
@@ -11047,7 +11510,7 @@ PUBLIC BOOL HText_hasUTF8OutputSet ARGS1(
 }
 
 /*
-**  Check charset and set the kcode element. - FM
+**  Check charset and set the kcode element. -FM
 **  Info on the input charset may be passed in in two forms,
 **  as a string (if given explicitly) and as a pointer to
 **  a LYUCcharset (from chartrans mechanism); either can be NULL.
@@ -11080,7 +11543,7 @@ PUBLIC void HText_setKcode ARGS3(
 	charset = p_in->MIMEname;
     }
     /*
-    **  Check whether we have a specified charset. - FM
+    **  Check whether we have a specified charset. -FM
     */
     if (!charset || *charset == '\0') {
 	return;
@@ -11090,7 +11553,7 @@ PUBLIC void HText_setKcode ARGS3(
     **  We've included the charset, and not forced a download offer,
     **  only if the currently selected character set can handle it,
     **  so check the charset value and set the text->kcode element
-    **  appropriately. - FM
+    **  appropriately. -FM
     */
     /*  If charset isn't specified explicitely nor assumed,
      *  p_in->MIMEname would be set as display charset.
@@ -11119,7 +11582,7 @@ PUBLIC void HText_setKcode ARGS3(
     } else {
 	/*
 	**  If we get to here, it's not CJK, so disable that if
-	**  it is enabled.  But only if we are quite sure. - FM & kw
+	**  it is enabled.  But only if we are quite sure. -FM & kw
 	*/
 	text->kcode = NOKANJI;
 	if (HTCJK != NOCJK) {
@@ -11142,7 +11605,7 @@ PUBLIC void HText_setKcode ARGS3(
 }
 
 /*
-**  Set a permissible split at the current end of the last line. - FM
+**  Set a permissible split at the current end of the last line. -FM
 */
 PUBLIC void HText_setBreakPoint ARGS1(
 	HText *,	text)
@@ -11151,7 +11614,7 @@ PUBLIC void HText_setBreakPoint ARGS1(
 	return;
 
     /*
-     *  Can split here. - FM
+     *  Can split here. -FM
      */
     text->permissible_split = text->last_line->size;
 
@@ -11169,7 +11632,7 @@ PUBLIC void HText_setBreakPoint ARGS1(
 **  command.  Otherwise, it returns TRUE, i.e, that
 **  the target document might differ from the current,
 **  based on any caching directives or analyses which
-**  claimed or suggested this. - FM
+**  claimed or suggested this. -FM
 */
 PUBLIC BOOL HText_AreDifferent ARGS2(
 	HTParentAnchor *,	anchor,
@@ -11178,7 +11641,6 @@ PUBLIC BOOL HText_AreDifferent ARGS2(
     HTParentAnchor *MTanc;
     char *MTaddress;
     char *MTpound;
-    char *TargetPound;
 
     /*
      *  Do we have a loaded document and both
@@ -11197,7 +11659,7 @@ PUBLIC BOOL HText_AreDifferent ARGS2(
     /*
      *  Do we have a fragment associated with the target?
      */
-    if ((TargetPound = strchr(full_address, '#')) == NULL)
+    if (findPoundSelector(full_address) == NULL)
 	return (TRUE);
 
     /*
@@ -11205,7 +11667,7 @@ PUBLIC BOOL HText_AreDifferent ARGS2(
      *  as potentially stale, so we'll create a
      *  fresh menu from the LynxMaps HTList.
      */
-    if (!strncasecomp(anchor->address, "LYNXIMGMAP:", 11))
+    if (isLYNXIMGMAP(anchor->address))
 	return (TRUE);
 
     /*
@@ -11219,20 +11681,15 @@ PUBLIC BOOL HText_AreDifferent ARGS2(
      *  out a "LYNXIMGMAP:" leader in the MainText URL
      *  and its fragment, if present?
      */
-    MTaddress = (strncasecomp(MTanc->address,
-			      "LYNXIMGMAP:", 11) ?
-				  MTanc->address : (MTanc->address + 11));
-    if ((MTpound = strchr(MTaddress, '#')) != NULL)
-	*MTpound = '\0';
+    MTaddress = (isLYNXIMGMAP(MTanc->address)
+		? MTanc->address + LEN_LYNXIMGMAP
+		: MTanc->address);
+    MTpound = trimPoundSelector(MTaddress);
     if (strcmp(MTaddress, anchor->address)) {
-	if (MTpound != NULL) {
-	    *MTpound = '#';
-	}
+	restorePoundSelector(MTpound);
 	return(TRUE);
     }
-    if (MTpound != NULL) {
-	*MTpound = '#';
-    }
+    restorePoundSelector(MTpound);
 
     /*
      *  If the MainText is not an image map menu,
@@ -11241,7 +11698,7 @@ PUBLIC BOOL HText_AreDifferent ARGS2(
     if (MTaddress == MTanc->address) {
 	if (MTanc->post_data) {
 	    if (anchor->post_data) {
-		if (strcmp(MTanc->post_data, anchor->post_data)) {
+		if (!BINEQ(MTanc->post_data, anchor->post_data)) {
 		    /*
 		     *  Both have contents, and they differ.
 		     */
@@ -11266,7 +11723,7 @@ PUBLIC BOOL HText_AreDifferent ARGS2(
     /*
      *  We'll assume the target is a position in the currently
      *  displayed document, and thus can ignore any header, META,
-     *  or other directives not to use a cached rendition. - FM
+     *  or other directives not to use a cached rendition. -FM
      */
     return(FALSE);
 }
@@ -11619,8 +12076,25 @@ PRIVATE int increment_tagged_htline ARGS6(
     *s = '\0';
 
     n = strlen (ht->data);
-    if (mode == CHOP)
+    if (mode == CHOP) {
 	*(buf + n) = '\0';
+    } else if (strlen(buf) > ht->size) {
+	/* we didn't allocate enough space originally - increase it */
+	HTLine* temp;
+	allocHTLine(temp, strlen(buf));
+	if (!temp)
+	    outofmem(__FILE__, "increment_tagged_htline");
+	memcpy(temp, ht, LINE_SIZE(0));
+#if defined(USE_COLOR_STYLE)
+	POOLallocstyles(temp->styles, ht->numstyles);
+	if (!temp->styles)
+	    outofmem(__FILE__, "increment_tagged_htline");
+	memcpy(temp->styles, ht->styles, sizeof(HTStyleChange)*ht->numstyles);
+#endif
+	ht = temp;
+	ht->prev->next = ht;	/* Link in new line */
+	ht->next->prev = ht;	/* Could be same node of course */
+    }
     strcpy (ht->data, buf);
 
     return (strlen (buf) - n + fixup);
@@ -11674,9 +12148,10 @@ PRIVATE void insert_new_textarea_anchor ARGS2(
      *  Clone and initialize the struct's needed to add a new TEXTAREA
      *  anchor.
      */
-    if (((a = typecalloc(TextAnchor)) == 0) ||
-	((f = typecalloc(FormInfo)) == 0) ||
-	((l = allocHTLine(MAX_LINE)) == 0))
+    allocHTLine(l, MAX_LINE);
+    POOLtypecalloc(TextAnchor, a);
+    POOLtypecalloc(FormInfo, f);
+    if (a == NULL || l == NULL || f == NULL)
 	outofmem(__FILE__, "insert_new_textarea_anchor");
 
     /*  Init all the fields in the new TextAnchor.                 */
@@ -11686,9 +12161,7 @@ PRIVATE void insert_new_textarea_anchor ARGS2(
     a->line_pos	       = anchor->line_pos;
     a->extent	       = anchor->extent;
     a->line_num	       = anchor->line_num + 1;
-    StrAllocCopy (a->hightext,  anchor->hightext);
-    StrAllocCopy (a->hightext2, anchor->hightext2);
-    a->hightext2offset = anchor->hightext2offset;
+    LYCopyHiText(a, anchor);
     a->link_type       = anchor->link_type;
     a->input_field     = f;
     a->show_anchor     = anchor->show_anchor;
@@ -11720,7 +12193,14 @@ PRIVATE void insert_new_textarea_anchor ARGS2(
     l->styles = htline->styles;
 #endif
     strcpy (l->data,     htline->data);
-    if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) {
+
+    /*
+     *  Link in the new HTLine.
+     */
+    htline->next->prev = l;
+    htline->next       = l;
+
+    if (fields_are_numbered()) {
 	a->number++;
 	increment_tagged_htline (l, a, &lx, &curr_tag, 1, CHOP);
     }
@@ -11736,13 +12216,11 @@ PRIVATE void insert_new_textarea_anchor ARGS2(
 
     /*
      *  Link in the new TextAnchor and point the entry anchor arg at it;
-     *  link in the new HTLine and point the entry htline arg at it, too.
+     *  point the entry HTLine arg at it, too.
      */
     anchor->next = a;
    *curr_anchor  = a;
 
-    htline->next->prev = l;
-    htline->next       = l;
    *exit_htline        = l->next;
 
     return;
@@ -11791,7 +12269,7 @@ PRIVATE void update_subsequent_anchors ARGS4(
      */
     anchor = start_anchor->next;   /* begin updating with the NEXT anchor */
     while (anchor) {
-	if ((keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) &&
+	if (fields_are_numbered() &&
 	    (anchor->number != 0))
 	    anchor->number += newlines;
 	anchor->line_num  += newlines;
@@ -11828,7 +12306,7 @@ PRIVATE void update_subsequent_anchors ARGS4(
      *   relocating an anchor to the following line, when [tag] digits
      *   expansion pushes things too far in that direction.]
      */
-    if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) {
+    if (fields_are_numbered()) {
 	anchor = start_anchor->next;
 	while (htline != FirstHTLine(HTMainText)) {
 
@@ -11911,7 +12389,7 @@ hang_detected:  /* ugliness has happened; inform user and do the best we can */
  *  --KED  02/01/99
  */
 PUBLIC int HText_ExtEditForm ARGS1(
-	   struct link *,  form_link)
+	   LinkInfo *,	form_link)
 {
     struct stat stat_info;
     size_t	size;
@@ -11932,7 +12410,7 @@ PUBLIC int HText_ExtEditForm ARGS1(
     int		orig_cnt      = 0;
     int		line_cnt      = 1;
 
-    FormInfo   *form	 = form_link->form;
+    FormInfo   *form	 = form_link->l_form;
     char       *areaname = form->name;
     int		form_num = form->number;
 
@@ -12249,14 +12727,14 @@ PUBLIC int HText_ExtEditForm ARGS1(
  *  --KED  02/14/99
  */
 PUBLIC void HText_ExpandTextarea ARGS2(
-	    struct link *,  form_link,
-	    int,	    newlines)
+	    LinkInfo *,	form_link,
+	    int,	newlines)
 {
     TextAnchor *anchor_ptr;
     TextAnchor *end_anchor    = NULL;
     BOOLEAN	firstanchor   = TRUE;
 
-    FormInfo *form      = form_link->form;
+    FormInfo *form      = form_link->l_form;
     char     *areaname  = form->name;
     int       form_num  = form->number;
 
@@ -12349,7 +12827,7 @@ PUBLIC void HText_ExpandTextarea ARGS2(
  *  --KED  02/21/99
  */
 PUBLIC int HText_InsertFile ARGS1(
-	   struct link *,  form_link)
+	   LinkInfo *,	form_link)
 {
     struct stat stat_info;
     size_t	size;
@@ -12363,7 +12841,7 @@ PUBLIC int HText_InsertFile ARGS1(
     BOOLEAN	firstanchor = TRUE;
     BOOLEAN truncalert = FALSE;
 
-    FormInfo   *form	 = form_link->form;
+    FormInfo   *form	 = form_link->l_form;
     char       *areaname = form->name;
     int		form_num = form->number;
 
@@ -12499,9 +12977,10 @@ PUBLIC int HText_InsertFile ARGS1(
 	    break;
     }
 
-    if (((a = typecalloc(TextAnchor)) == 0) ||
-	((f = typecalloc(FormInfo)) == 0) ||
-	((l = allocHTLine(MAX_LINE)) == 0))
+    allocHTLine(l, MAX_LINE);
+    POOLtypecalloc(TextAnchor, a);
+    POOLtypecalloc(FormInfo, f);
+    if (a == NULL || l == NULL || f == NULL)
 	outofmem(__FILE__, "HText_InsertFile");
 
     /*  Init all the fields in the new TextAnchor.                 */
@@ -12511,9 +12990,7 @@ PUBLIC int HText_InsertFile ARGS1(
     a->line_pos	       = anchor_ptr->line_pos;
     a->extent	       = anchor_ptr->extent;
     a->line_num	       = anchor_ptr->line_num;
-    StrAllocCopy (a->hightext,  anchor_ptr->hightext);
-    StrAllocCopy (a->hightext2, anchor_ptr->hightext2);
-    a->hightext2offset = anchor_ptr->hightext2offset;
+    LYCopyHiText(a, anchor_ptr);
     a->link_type       = anchor_ptr->link_type;
     a->input_field     = f;
     a->show_anchor     = anchor_ptr->show_anchor;
@@ -12668,14 +13145,12 @@ PUBLIC int HText_InsertFile ARGS1(
  * characters) of it.  It doesn't check whether the 'len' bytes crosses a
  * character boundary (if multibyte chars are in string).  Assumes that the
  * cursor is positioned in the place where the 1st char of string should be
- * drawn.  Currently used only in redraw_lines_of_link when
- *    defined(USE_COLOR_STYLE) && !defined(NO_HILIT_FIX)
+ * drawn.
+ *
  * This code is based on display_line.  This code was tested with ncurses only
- * (since no support for lss is availble for Slang) and with
- * defined(USE_COLOR_STYLE).
- * -HV.
+ * (since no support for lss is availble for Slang) -HV.
  */
-#if defined(USE_COLOR_STYLE) && !defined(NO_HILIT_FIX)
+#ifdef USE_COLOR_STYLE
 PRIVATE void redraw_part_of_line ARGS4(
 	HTLine *,	line,
 	char*,		str,
@@ -12726,7 +13201,7 @@ PRIVATE void redraw_part_of_line ARGS4(
 		    LYaddch('_');
 		    i++;
 		} else {
-		    start_underline();
+		    lynx_start_underline();
 		}
 		break;
 
@@ -12735,16 +13210,16 @@ PRIVATE void redraw_part_of_line ARGS4(
 		    LYaddch('_');
 		    i++;
 		} else {
-		    stop_underline();
+		    lynx_stop_underline();
 		}
 		break;
 
 	    case LY_BOLD_START_CHAR:
-		start_bold();
+		lynx_start_bold();
 		break;
 
 	    case LY_BOLD_END_CHAR:
-		stop_bold ();
+		lynx_stop_bold ();
 		break;
 
 #endif
@@ -12765,12 +13240,12 @@ PRIVATE void redraw_part_of_line ARGS4(
 		     *  into LastDisplayChar if it was a multibyte
 		     *  character) or hyphen, though it should have
 		     *  been excluded by HText_appendCharacter() or by
-		     *  split_line() in those cases. - FM
+		     *  split_line() in those cases. -FM
 		     */
 		    break;
 		} else {
 		    /*
-		     *  Make it a hard hyphen and fall through. - FM
+		     *  Make it a hard hyphen and fall through. -FM
 		     */
 		    buffer[0] = '-';
 		    i++;
@@ -12779,29 +13254,8 @@ PRIVATE void redraw_part_of_line ARGS4(
 
 	    default:
 		i++;
-		if (text->T.output_utf8 && !isascii(UCH(buffer[0]))) {
-		    if ((*buffer & 0xe0) == 0xc0) {
-			utf_extra = 1;
-		    } else if ((*buffer & 0xf0) == 0xe0) {
-			utf_extra = 2;
-		    } else if ((*buffer & 0xf8) == 0xf0) {
-			utf_extra = 3;
-		    } else if ((*buffer & 0xfc) == 0xf8) {
-			utf_extra = 4;
-		    } else if ((*buffer & 0xfe) == 0xfc) {
-			utf_extra = 5;
-		    } else {
-			 /*
-			  *  Garbage.
-			  */
-			utf_extra = 0;
-		    }
-		    if (strlen(data) < utf_extra) {
-			/*
-			 *  Shouldn't happen.
-			 */
-			utf_extra = 0;
-		    }
+		if (text->T.output_utf8 && is8bits(buffer[0])) {
+		    utf_extra = utf8_length(text->T.output_utf8, data-1);
 		    LastDisplayChar = 'M';
 		}
 		if (utf_extra) {
@@ -12811,7 +13265,7 @@ PRIVATE void redraw_part_of_line ARGS4(
 		    buffer[1] = '\0';
 		    data += utf_extra;
 		    utf_extra = 0;
-		} else if (HTCJK != NOCJK && !isascii(UCH(buffer[0]))) {
+		} else if (HTCJK != NOCJK && is8bits(buffer[0])) {
 		    /*
 		     *  For CJK strings, by Masanobu Kimura.
 		     */
@@ -12828,7 +13282,7 @@ PRIVATE void redraw_part_of_line ARGS4(
 		     *  spacing characters in this code set,
 		     *  but this will become an issue when
 		     *  the development code set's multibyte
-		     *  character handling is used. - FM
+		     *  character handling is used. -FM
 		     */
 		    LastDisplayChar = 'M';
 		} else {
@@ -12839,8 +13293,8 @@ PRIVATE void redraw_part_of_line ARGS4(
     } /* end of while */
 
 #ifndef USE_COLOR_STYLE
-    stop_underline();
-    stop_bold();
+    lynx_stop_underline();
+    lynx_stop_bold();
 #else
 
     while (current_style < line->numstyles)
@@ -12853,7 +13307,7 @@ PRIVATE void redraw_part_of_line ARGS4(
 #endif
     return;
 }
-#endif /* defined(USE_COLOR_STYLE) && !defined(NO_HILIT_FIX)  */
+#endif /* USE_COLOR_STYLE */
 
 #ifndef USE_COLOR_STYLE
 /*
@@ -13002,7 +13456,7 @@ PRIVATE void move_to_glyph ARGS10(
 	     *  and when to react to it should be cleaned up (here and
 	     *  further below).  For now this seems to work but isn't
 	     *  very clear.  The complications arise from reproducing
-	     *  the behavior (previously done in highlight()) for target
+	     *  the behavior (previously done in LYhighlight()) for target
 	     *  strings that fall into or overlap a link: use target
 	     *  emphasis for the target string, except for the first
 	     *  and last character of the anchor text if the anchor is
@@ -13037,8 +13491,8 @@ PRIVATE void move_to_glyph ARGS10(
 #endif /* SHOW_WHEREIS_TARGETS */
 		{
 		    if (inunderline)	inU = YES;
-		    if (inunderline)	stop_underline();
-		    if (inbold)		stop_bold();
+		    if (inunderline)	lynx_stop_underline();
+		    if (inbold)		lynx_stop_bold();
 		    lynx_start_link_color (flag, inU);
 		}
 
@@ -13094,8 +13548,8 @@ PRIVATE void move_to_glyph ARGS10(
 			    }
 			}
 			if (!incurlink) {
-			    if (inbold)		start_bold();
-			    if (inunderline)	start_underline();
+			    if (inbold)		lynx_start_bold();
+			    if (inunderline)	lynx_start_underline();
 			}
 		    }
 		}
@@ -13127,25 +13581,25 @@ PRIVATE void move_to_glyph ARGS10(
 	    case LY_UNDERLINE_START_CHAR:
 		if (!drawing || !incurlink) inunderline = YES;
 		if (drawing && !intarget && !incurlink)
-		    start_underline();
+		    lynx_start_underline();
 		break;
 
 	    case LY_UNDERLINE_END_CHAR:
 		inunderline = NO;
 		if (drawing && !intarget && !incurlink)
-		    stop_underline();
+		    lynx_stop_underline();
 		break;
 
 	    case LY_BOLD_START_CHAR:
 		if (!drawing || !incurlink) inbold = YES;
 		if (drawing && !intarget && !incurlink)
-		    start_bold();
+		    lynx_start_bold();
 		break;
 
 	    case LY_BOLD_END_CHAR:
 		inbold = NO;
 		if (drawing && !intarget && !incurlink)
-		    stop_bold();
+		    lynx_stop_bold();
 		break;
 
 	    case LY_SOFT_NEWLINE:
@@ -13167,12 +13621,12 @@ PRIVATE void move_to_glyph ARGS10(
 		     *  into LastDisplayChar if it was a multibyte
 		     *  character) or hyphen, though it should have
 		     *  been excluded by HText_appendCharacter() or by
-		     *  split_line() in those cases. - FM
+		     *  split_line() in those cases. -FM
 		     */
 		    break;
 		} else {
 		    /*
-		     *  Make it a hard hyphen and fall through. - FM
+		     *  Make it a hard hyphen and fall through. -FM
 		     */
 		    buffer[0] = '-';
 		}
@@ -13189,7 +13643,7 @@ PRIVATE void move_to_glyph ARGS10(
 		    if (i == XP - 1) {
 			i_after_tgt = i;
 		    } else if (i == XP - 2 && HTCJK != NOCJK &&
-			       !isascii(UCH(buffer[0]))) {
+			       is8bits(buffer[0])) {
 			i_after_tgt = i;
 			cp_tgt = NULL;
 			if (drawing) {
@@ -13247,30 +13701,9 @@ PRIVATE void move_to_glyph ARGS10(
 		    }
 
 		i++;
-		if (utf_flag && !isascii(UCH(buffer[0]))) {
+		if (utf_flag && is8bits(buffer[0])) {
 		    hadutf8 = YES;
-		    if ((*buffer & 0xe0) == 0xc0) {
-			utf_extra = 1;
-		    } else if ((*buffer & 0xf0) == 0xe0) {
-			utf_extra = 2;
-		    } else if ((*buffer & 0xf8) == 0xf0) {
-			utf_extra = 3;
-		    } else if ((*buffer & 0xfc) == 0xf8) {
-			utf_extra = 4;
-		    } else if ((*buffer & 0xfe) == 0xfc) {
-			utf_extra = 5;
-		    } else {
-			 /*
-			  *  Garbage.
-			  */
-			utf_extra = 0;
-		    }
-		    if (strlen(data) < utf_extra) {
-			/*
-			 *  Shouldn't happen.
-			 */
-			utf_extra = 0;
-		    }
+		    utf_extra = utf8_length(utf_flag, data-1);
 		    LastDisplayChar = 'M';
 		}
 		if (utf_extra) {
@@ -13287,16 +13720,16 @@ PRIVATE void move_to_glyph ARGS10(
 #endif /* SHOW_WHEREIS_TARGETS */
 			{
 			    if (inbold)
-				start_bold();
+				lynx_start_bold();
 			    if (inunderline)
-				start_underline();
+				lynx_start_underline();
 			}
 		    }
 		    LYaddstr(buffer);
 		    buffer[1] = '\0';
 		    sdata += utf_extra; data += utf_extra;
 		    utf_extra = 0;
-		} else if (HTCJK != NOCJK && !isascii(UCH(buffer[0]))) {
+		} else if (HTCJK != NOCJK && is8bits(buffer[0])) {
 		    /*
 		     *  For CJK strings, by Masanobu Kimura.
 		     */
@@ -13308,15 +13741,13 @@ PRIVATE void move_to_glyph ARGS10(
 		    i++;
 		    sdata++; data++;
 		    /*
-		     *  For now, load 'M' into LastDisplayChar,
-		     *  but we should check whether it's white
-		     *  and if so, use ' '.  I don't know if
-		     *  there actually are white CJK characters,
-		     *  and we're loading ' ' for multibyte
-		     *  spacing characters in this code set,
-		     *  but this will become an issue when
-		     *  the development code set's multibyte
-		     *  character handling is used. - FM
+		     * For now, load 'M' into LastDisplayChar, but we should
+		     * check whether it's white and if so, use ' '.  I don't
+		     * know if there actually are white CJK characters, and
+		     * we're loading ' ' for multibyte spacing characters in
+		     * this code set, but this will become an issue when the
+		     * development code set's multibyte character handling is
+		     * used.  -FM
 		     */
 		    LastDisplayChar = 'M';
 		} else {
@@ -13385,7 +13816,7 @@ PUBLIC void LYMoveToLink ARGS6(
 	if (links[i].ly < links[cur].ly)
 	    break;
 	if (links[i].type == WWW_FORM_LINK_TYPE) {
-	    XP_draw_min = links[i].ly + links[i].form->size;
+	    XP_draw_min = links[i].ly + links[i].l_form->size;
 	    break;
 	}
     }
@@ -13419,41 +13850,37 @@ PUBLIC void LYMoveToLink ARGS6(
 #endif /* !USE_COLOR_STYLE */
 
 /*
-  This is used only if compiled with lss support. It's called to draw
-  regular link (1st two lines of link) when it's being unhighlighted in
-  highlight:LYUtils.
-*/
-
+ * This is used only if compiled with lss support.  It's called to draw regular
+ * link (1st two lines of link) when it's being unhighlighted in LYhighlight().
+ */
 PUBLIC void redraw_lines_of_link ARGS1(
 	int,		cur GCC_UNUSED)
 {
-#if defined(USE_COLOR_STYLE) && !defined(NO_HILIT_FIX)
+#ifdef USE_COLOR_STYLE
 #define pvtTITLE_HEIGHT 1
-    HTLine* todr1, *todr2;
+    HTLine* todr1;
     int lines_back;
+    int row, col, count;
+    char *text;
 
     if (HTMainText->next_line == HTMainText->last_line) {
     /* we are at the last page - that is partially filled */
-	lines_back = HTMainText->Lines - ( links[cur].ly-pvtTITLE_HEIGHT+
+	lines_back = HTMainText->Lines - ( links[cur].ly - pvtTITLE_HEIGHT+
 	HTMainText->top_of_screen);
     } else {
-	lines_back = display_lines - (links[cur].ly-pvtTITLE_HEIGHT);
+	lines_back = display_lines - (links[cur].ly - pvtTITLE_HEIGHT);
     }
     todr1 = HTMainText->next_line;
     while (lines_back-- > 0)
 	todr1 = todr1->prev;
-    todr2 = (links[cur].hightext2 && links[cur].ly < display_lines) ?
-	    todr1->next : 0;
 
-    LYmove(links[cur].ly,  links[cur].lx);
-    redraw_part_of_line (todr1, links[cur].hightext,
-			 strlen(links[cur].hightext),  HTMainText);
-    if (todr2) {
-	LYmove(links[cur].ly+1,links[cur].hightext2_offset);
-	redraw_part_of_line (todr2, links[cur].hightext2,
-			     strlen(links[cur].hightext2),  HTMainText);
+    row = links[cur].ly;
+    for (count = 0; row <= display_lines && (text = LYGetHiliteStr(cur, count)) != NULL; ++count) {
+	col = LYGetHilitePos(cur, count);
+	LYmove(row++, col);
+	redraw_part_of_line (todr1, text, strlen(text), HTMainText);
+	todr1 = todr1->next;
     }
-
 #undef pvtTITLE_HEIGHT
 #else
     /* no dead code !*/
diff --git a/gnu/usr.bin/lynx/src/GridText.h b/gnu/usr.bin/lynx/src/GridText.h
index 24be45f6ad0..db3b034d2dd 100644
--- a/gnu/usr.bin/lynx/src/GridText.h
+++ b/gnu/usr.bin/lynx/src/GridText.h
@@ -58,13 +58,12 @@ US-ASCII control characters <32 which are not defined in Unicode standard
 
 extern int HTCurSelectGroupType;
 extern char * HTCurSelectGroupSize;
-extern HText * HTMainText;		/* Equivalent of main window */
-extern HTParentAnchor * HTMainAnchor;	/* Anchor for HTMainText */
 
 #if defined(VMS) && defined(VAXC) && !defined(__DECC)
 extern int HTVirtualMemorySize;
 #endif /* VMS && VAXC && !__DECC */
-extern HTChildAnchor * HText_childNumber PARAMS((int n));
+
+extern HTChildAnchor * HText_childNextNumber PARAMS((int n, void** prev));
 extern void HText_FormDescNumber PARAMS((int n, char **desc));
 
 /*	Is there any file left?
@@ -110,8 +109,8 @@ extern CONST char * HText_getStyle NOPARAMS;
 extern void HText_setMainTextOwner PARAMS((CONST char * owner));
 extern void print_wwwfile_to_fd PARAMS((FILE * fp, BOOLEAN is_reply));
 extern BOOL HText_select PARAMS((HText *text));
-extern BOOL HText_POSTReplyLoaded PARAMS((document *doc));
-extern BOOL HTFindPoundSelector PARAMS((char *selector));
+extern BOOL HText_POSTReplyLoaded PARAMS((DocInfo *doc));
+extern BOOL HTFindPoundSelector PARAMS((CONST char *selector));
 extern int HTGetRelLinkNum PARAMS((int num, int rel, int cur));
 extern int HTGetLinkInfo PARAMS((
 	int		number,
@@ -139,39 +138,45 @@ extern BOOL HText_getFirstTargetInLine PARAMS((
 	CONST char *	target));
 extern int HTisDocumentSource NOPARAMS;
 extern void HTuncache_current_document NOPARAMS;
-#ifdef SOURCE_CACHE
+
+#ifdef USE_SOURCE_CACHE
 extern BOOLEAN HTreparse_document NOPARAMS;
 extern BOOLEAN HTcan_reparse_document NOPARAMS;
 extern BOOLEAN HTdocument_settings_changed NOPARAMS;
 #endif
-extern int HText_getTopOfScreen NOPARAMS;
-extern int HText_getLines PARAMS((HText * text));
-extern int HText_getNumOfLines NOPARAMS;
-extern int do_www_search PARAMS((document *doc));
-extern char * HTLoadedDocumentURL NOPARAMS;
-extern char * HTLoadedDocumentPost_data NOPARAMS;
-extern char * HTLoadedDocumentTitle NOPARAMS;
+
+extern BOOL HTLoadedDocumentEightbit NOPARAMS;
+extern BOOL HText_LastLineEmpty PARAMS((HText *me, BOOL IgnoreSpaces));
+extern BOOL HText_PreviousLineEmpty PARAMS((HText *me, BOOL IgnoreSpaces));
+extern BOOL HText_inLineOne PARAMS((HText *text));
 extern BOOLEAN HTLoadedDocumentIsHEAD NOPARAMS;
 extern BOOLEAN HTLoadedDocumentIsSafe NOPARAMS;
-extern char * HTLoadedDocumentCharset NOPARAMS;
-extern BOOL HTLoadedDocumentEightbit NOPARAMS;
-extern void HText_setNodeAnchorBookmark PARAMS((CONST char *bookmark));
+extern bstring * HTLoadedDocumentPost_data NOPARAMS;
 extern char * HTLoadedDocumentBookmark NOPARAMS;
-extern int HText_LastLineSize PARAMS((HText *me, BOOL IgnoreSpaces));
+extern char * HTLoadedDocumentCharset NOPARAMS;
+extern char * HTLoadedDocumentTitle NOPARAMS;
+extern char * HTLoadedDocumentURL NOPARAMS;
+extern char * HText_HiddenLinkAt PARAMS((HText *text, int number));
+extern int HText_HiddenLinkCount PARAMS((HText *text));
 extern int HText_LastLineOffset PARAMS((HText *me));
+extern int HText_LastLineSize PARAMS((HText *me, BOOL IgnoreSpaces));
 extern int HText_PreviousLineSize PARAMS((HText *me, BOOL IgnoreSpaces));
-extern void HText_NegateLineOne PARAMS((HText *text));
-extern BOOL HText_inLineOne PARAMS((HText *text));
-extern void HText_RemovePreviousLine PARAMS((HText *text));
 extern int HText_getCurrentColumn PARAMS((HText *text));
+extern int HText_getLines PARAMS((HText * text));
 extern int HText_getMaximumColumn PARAMS((HText *text));
-extern void HText_setTabID PARAMS((HText *text, CONST char *name));
+extern int HText_getNumOfLines NOPARAMS;
 extern int HText_getTabIDColumn PARAMS((HText *text, CONST char *name));
-extern int HText_HiddenLinkCount PARAMS((HText *text));
-extern char * HText_HiddenLinkAt PARAMS((HText *text, int number));
+extern int HText_getTopOfScreen NOPARAMS;
+extern int do_www_search PARAMS((DocInfo *doc));
+extern void HText_NegateLineOne PARAMS((HText *text));
+extern void HText_RemovePreviousLine PARAMS((HText *text));
+extern void HText_setNodeAnchorBookmark PARAMS((CONST char *bookmark));
+extern void HText_setTabID PARAMS((HText *text, CONST char *name));
+extern void* HText_pool_calloc PARAMS((HText * text, unsigned size));
 
 /* "simple table" stuff */
 extern int HText_endStblTABLE PARAMS((HText *));
+extern int HText_trimCellLines PARAMS((HText * text));
 extern void HText_cancelStbl PARAMS((HText *));
 extern void HText_endStblCOLGROUP PARAMS((HText *));
 extern void HText_endStblTD PARAMS((HText *));
@@ -207,15 +212,17 @@ extern int HText_beginInput PARAMS((
 	HText *		text,
 	BOOL		underline,
 	InputFieldData *I));
+extern void HText_endInput PARAMS((
+	HText *		text));
 extern int HText_SubmitForm PARAMS((
 	FormInfo *	submit_item,
-	document *	doc,
+	DocInfo *	doc,
 	char *		link_name,
 	char *		link_value));
 extern void HText_DisableCurrentForm NOPARAMS;
 extern void HText_ResetForm PARAMS((FormInfo *form));
 extern void HText_activateRadioButton PARAMS((FormInfo *form));
-extern BOOLEAN HText_HaveUserChangedForms NOPARAMS;
+extern BOOLEAN HText_HaveUserChangedForms PARAMS((HText *text));
 
 extern HTList * search_queries; /* Previous isindex and whereis queries */
 extern void HTSearchQueries_free NOPARAMS;
@@ -229,7 +236,7 @@ extern void user_message PARAMS((
 
 extern void www_user_search PARAMS((
 	int		start_line,
-	document *	doc,
+	DocInfo *	doc,
 	char *		target,
 	int		direction));
 
@@ -258,12 +265,12 @@ extern BOOL HText_AreDifferent PARAMS((
 	CONST char *		full_address));
 
 extern int HText_ExtEditForm PARAMS((
-	struct link *	form_link));
+	LinkInfo *	form_link));
 extern void HText_ExpandTextarea PARAMS((
-	struct link *	form_link,
+	LinkInfo *	form_link,
 	int             newlines));
 extern int HText_InsertFile PARAMS((
-	struct link *	form_link));
+	LinkInfo *	form_link));
 
 extern void redraw_lines_of_link PARAMS((int cur));
 extern void LYMoveToLink PARAMS((
diff --git a/gnu/usr.bin/lynx/src/HTAlert.c b/gnu/usr.bin/lynx/src/HTAlert.c
index b32d0cbbc88..0fed7542216 100644
--- a/gnu/usr.bin/lynx/src/HTAlert.c
+++ b/gnu/usr.bin/lynx/src/HTAlert.c
@@ -69,9 +69,7 @@ PUBLIC void HTAlwaysAlert ARGS2(
 	    LYstore_message2(ALERT_FORMAT, Msg);
 	    LYSleepAlert();
 	} else {
-	    fprintf(((TRACE) ? stdout : stderr),
-		    ALERT_FORMAT,
-		    (Msg == 0) ? "" : Msg);
+	    fprintf(((TRACE) ? stdout : stderr), ALERT_FORMAT, NonNull(Msg));
 	    fflush(stdout);
 	    LYstore_message2(ALERT_FORMAT, Msg);
 	    LYSleepAlert();
@@ -92,7 +90,7 @@ PUBLIC void HTInfoMsg ARGS1(
     if (Msg && *Msg) {
 	CTRACE((tfp, "Info message: %s\n", Msg));
 	LYstore_message(Msg);
-	LYSleep(InfoSecs);
+	LYSleepInfo();
     }
 }
 
@@ -106,6 +104,12 @@ PUBLIC void HTUserMsg ARGS1(
     if (Msg && *Msg) {
 	CTRACE((tfp, "User message: %s\n", Msg));
 	LYstore_message(Msg);
+#if !(defined(USE_SLANG) || defined(WIDEC_CURSES))
+	if (HTCJK != NOCJK) {
+	    clearok(curscr, TRUE);
+	    LYrefresh();
+	}
+#endif
 	LYSleepMsg();
     }
 }
@@ -133,30 +137,34 @@ PUBLIC void HTProgress ARGS1(
     statusline(Msg);
     LYstore_message(Msg);
     CTRACE((tfp, "%s\n", Msg));
-#if defined(SH_EX) && defined(WIN_EX)	/* 1997/10/11 (Sat) 12:51:02 */
-    {
-	if (debug_delay != 0)
-	    Sleep(debug_delay);	/* XXX msec */
+    LYSleepDebug();
+}
+
+PUBLIC CONST char *HTProgressUnits ARGS1(
+	int,		rate)
+{
+    static CONST char *bunits = 0;
+    static CONST char *kbunits = 0;
+
+    if (!bunits) {
+	bunits = gettext("bytes");
+	kbunits = gettext(LYTransferName);
     }
+    return ((rate == rateKB)
+#ifdef USE_READPROGRESS
+    	    || (rate == rateEtaKB)
 #endif
+	    ) ? kbunits : bunits;
 }
 
-PRIVATE char *sprint_bytes ARGS3(
+PRIVATE CONST char *sprint_bytes ARGS3(
 	char *,		s,
 	long,		n,
-	char *, 	was_units)
+	CONST char *, 	was_units)
 {
     static long kb_units = 1024;
-    static char *bunits;
-    static char *kbunits;
-    char *u;
+    CONST char *u = HTProgressUnits(LYTransferRate);
 
-    if (!bunits) {
-	bunits = gettext("bytes");
-	kbunits = gettext("KB");
-    }
-
-    u = kbunits;
     if ( (LYTransferRate == rateKB || LYTransferRate == rateEtaKB_maybe)
 	 && (n >= 10 * kb_units) )
 	sprintf(s, "%ld", n/kb_units);
@@ -165,7 +173,6 @@ PRIVATE char *sprint_bytes ARGS3(
 	sprintf(s, "%.2g", ((double)n)/kb_units);
     else {
 	sprintf(s, "%ld", n);
-	u = bunits;
     }
 
     if (!was_units || was_units != u)
@@ -173,6 +180,22 @@ PRIVATE char *sprint_bytes ARGS3(
     return u;
 }
 
+#ifdef USE_READPROGRESS
+#define TIME_HMS_LENGTH (16)
+PRIVATE char *sprint_tbuf ARGS2(
+	char *,	       s,
+	long,	       t)
+{
+    if (t > 3600)
+	sprintf (s, "%ldh%ldm%lds", t / 3600, (t / 60) % 60, t % 60);
+    else if (t > 60)
+	sprintf (s, "%ldm%lds", t / 60, t % 60);
+    else
+	sprintf (s, "%ld sec", t);
+    return s;
+}
+#endif /* USE_READPROGRESS */
+
 /*	Issue a read-progress message.			HTReadProgress()
 **	------------------------------
 */
@@ -185,7 +208,7 @@ PUBLIC void HTReadProgress ARGS2(
     static char *line = NULL;
     char bytesp[80], totalp[80], transferp[80];
     int renew = 0;
-    char *was_units;
+    CONST char *was_units;
 
 #ifdef HAVE_GETTIMEOFDAY
     struct timeval tv;
@@ -224,15 +247,18 @@ PUBLIC void HTReadProgress ARGS2(
 	total_last = total;
 
 	/*
-	 * Optimal refresh time:  every 0.2 sec, use interpolation.  Transfer
-	 * rate is not constant when we have partial content in a proxy, so
-	 * interpolation lies - will check every second at least for sure.
+	 * Optimal refresh time:  every 0.2 sec
 	 */
-#ifdef HAVE_GETTIMEOFDAY
+#if defined(HAVE_GETTIMEOFDAY) || (defined(HAVE_FTIME) && defined(HAVE_SYS_TIMEB_H))
 	if (now >= last + 0.2)
 	    renew = 1;
 #else
-	if (((bytes - bytes_last) > (transfer_rate / 5)) || (now != last)) {
+	/*
+	 * Use interpolation.  (The transfer rate may be not constant
+	 * when we have partial content in a proxy.  We adjust transfer_rate
+	 * once a second to minimize interpolation error below.)
+	 */
+	if ((now != last) || ((bytes - bytes_last) > (transfer_rate / 5))) {
 	    renew = 1;
 	    bytes_last += (transfer_rate / 5);	/* until we got next second */
 	}
@@ -243,7 +269,7 @@ PUBLIC void HTReadProgress ARGS2(
 		if (bytes_last != bytes)
 		    last_active = now;
 		bytes_last = bytes;
-		transfer_rate = (long)(bytes / (now - first)); /* more accurate here */
+		transfer_rate = (long)(bytes / (now - first)); /* more accurate value */
 	    }
 
 	    if (total > 0)
@@ -263,13 +289,18 @@ PUBLIC void HTReadProgress ARGS2(
 		HTSprintf (&line, gettext(", %s/sec"), transferp);
 	    }
 
-#ifdef EXP_READPROGRESS
+#ifdef USE_READPROGRESS
 	    if (LYTransferRate == rateEtaBYTES
 	     || LYTransferRate == rateEtaKB) {
+		char tbuf[TIME_HMS_LENGTH];
 		if (now - last_active >= 5)
-		    HTSprintf (&line, gettext(" (stalled for %ld sec)"), (long)(now - last_active));
+		    HTSprintf (&line,
+			       gettext(" (stalled for %s)"),
+			       sprint_tbuf (tbuf, (long)(now - last_active)));
 		if (total > 0 && transfer_rate)
-		    HTSprintf (&line, gettext(", ETA %ld sec"), (long)((total - bytes)/transfer_rate));
+		    HTSprintf (&line,
+			       gettext(", ETA %s"),
+			       sprint_tbuf (tbuf, (long)((total - bytes)/transfer_rate)));
 	    }
 #endif
 
@@ -299,6 +330,38 @@ PUBLIC BOOL HTLastConfirmCancelled NOARGS
     }
 }
 
+/*
+ * Prompt for yes/no response, but let a configuration variable override
+ * the prompt entirely.
+ */
+PUBLIC int HTForcedPrompt ARGS3(
+	int,		option,
+	CONST char *,	msg,
+	int,		dft)
+{
+    int result = FALSE;
+    char *show = NULL;
+    char *msg2 = NULL;
+
+    if (option == FORCE_PROMPT_DFT) {
+	result = HTConfirmDefault(msg, dft);
+    } else {
+	if (option == FORCE_PROMPT_YES) {
+	    show = gettext("yes");
+	    result = YES;
+	} else if (option == FORCE_PROMPT_NO) {
+	    show = gettext("no");
+	    result = NO;
+	} else {
+	    return HTConfirmDefault(msg, dft);	/* bug... */
+	}
+	HTSprintf(&msg2, "%s %s", msg, show);
+	HTUserMsg(msg2);
+	free(msg2);
+    }
+    return result;
+}
+
 #define DFT_CONFIRM ~(YES|NO)
 
 /*	Seek confirmation with default answer.		HTConfirmDefault()
@@ -435,14 +498,14 @@ PUBLIC BOOL confirm_post_resub ARGS4(
     size_t maxlen = LYcols - 6;
     if (!address) {
 	return(NO);
-    } else if (!strncmp(address, "LYNXIMGMAP:", 11)) {
+    } else if (isLYNXIMGMAP(address)) {
 	if (if_imgmap <= 0)
 	    return(NO);
 	else if (if_imgmap == 1)
 	    return(YES);
 	else
 	    msg = CONFIRM_POST_LIST_RELOAD;
-    } else if (!strncmp(address, "file:", 5)) {
+    } else if (isFILE_URL(address)) {
 	if (if_file <= 0)
 	    return(NO);
 	else if (if_file == 1)
@@ -769,7 +832,7 @@ PUBLIC BOOL HTConfirmCookie ARGS4(
 	_statusline(message);
 	FREE(message);
     }
-    while (1) {
+    for (;;) {
 	if(LYAcceptAllCookies) {
 	    ch = 'A';
 	} else {
@@ -801,15 +864,17 @@ PUBLIC BOOL HTConfirmCookie ARGS4(
 		 && isalpha(ch)
 		 && (p = strrchr(prompt, L_PAREN)) != 0) {
 
+		    CTRACE((tfp, "Looking for %c in %s\n", ch, p));
 		    while (*p != R_PAREN && *p != 0 && isalpha(UCH(*s))) {
-			if (*p == ch) {
-			    ch = *s;
-			    break;
-			} else {
-			    if (isalpha(UCH(*p)) && (*p == TOUPPER(*p)))
-				s++;
-			    p++;
+			if (isalpha(UCH(*p)) && (*p == TOUPPER(*p))) {
+			    CTRACE((tfp, "...testing %c/%c\n", *p, *s));
+			    if (*p == ch) {
+				ch = *s;
+				break;
+			    }
+			    ++s;
 			}
+			++p;
 		    }
 		}
 	    }
@@ -1019,6 +1084,12 @@ PUBLIC void LYSleepAlert NOARGS
 	LYSleep(AlertSecs);
 }
 
+PUBLIC void LYSleepDebug NOARGS
+{
+    if (okToSleep())
+	LYSleep(DebugSecs);
+}
+
 PUBLIC void LYSleepInfo NOARGS
 {
     if (okToSleep())
@@ -1031,6 +1102,14 @@ PUBLIC void LYSleepMsg NOARGS
 	LYSleep(MessageSecs);
 }
 
+#ifdef EXP_CMD_LOGGING
+PUBLIC void LYSleepReplay NOARGS
+{
+    if (okToSleep())
+	LYSleep(ReplaySecs);
+}
+#endif /* EXP_CMD_LOGGING */
+
 /*
  *  LYstrerror emulates the ANSI strerror() function.
  */
diff --git a/gnu/usr.bin/lynx/src/HTAlert.h b/gnu/usr.bin/lynx/src/HTAlert.h
index 87ac615e202..49456c42867 100644
--- a/gnu/usr.bin/lynx/src/HTAlert.h
+++ b/gnu/usr.bin/lynx/src/HTAlert.h
@@ -40,6 +40,7 @@ extern void HTUserMsg2 PARAMS((CONST char * Msg, CONST char * Arg));
 **      On entry,
 **              The input is a list of parameters for printf.
 */
+extern CONST char *HTProgressUnits PARAMS((int kilobytes));
 extern void HTProgress PARAMS((CONST char * Msg));
 extern void HTReadProgress PARAMS((long bytes, long total));
 #define _HTProgress(msg)	mustshow = TRUE, HTProgress(msg)
@@ -50,6 +51,11 @@ extern void HTReadProgress PARAMS((long bytes, long total));
  */
 extern BOOL HTLastConfirmCancelled NOPARAMS;
 
+/*
+**	Supports logic for forced yes/no prompt results.
+*/
+extern int HTForcedPrompt PARAMS((int Opt, CONST char * Msg, int Dft));
+
 /*      Display a message, then wait for 'yes' or 'no', allowing default
 **	response if a return or left-arrow is used.
 **
@@ -150,8 +156,10 @@ extern int HTConfirmPostRedirect PARAMS((
 
 
 extern void LYSleepAlert NOPARAMS;
+extern void LYSleepDebug NOPARAMS;
 extern void LYSleepInfo NOPARAMS;
 extern void LYSleepMsg NOPARAMS;
+extern void LYSleepReplay NOPARAMS;
 
 #ifdef HAVE_STRERROR
 #define LYStrerror strerror
diff --git a/gnu/usr.bin/lynx/src/HTFWriter.c b/gnu/usr.bin/lynx/src/HTFWriter.c
index 629857e572d..100fb1e6bc4 100644
--- a/gnu/usr.bin/lynx/src/HTFWriter.c
+++ b/gnu/usr.bin/lynx/src/HTFWriter.c
@@ -17,7 +17,7 @@
 #include <HTParse.h>
 #endif
 
-#if _WIN_CC
+#ifdef _WIN_CC
 extern int exec_command(char * cmd, int wait_flag); /* xsystem.c */
 #endif
 
@@ -37,7 +37,7 @@ extern int exec_command(char * cmd, int wait_flag); /* xsystem.c */
 #include <LYLeaks.h>
 #include <LYKeymap.h>
 
-#ifdef EXP_PERSISTENT_COOKIES 
+#ifdef USE_PERSISTENT_COOKIES
 #include <LYCookie.h>
 #endif
 
@@ -48,7 +48,7 @@ PUBLIC BOOLEAN LYCancelDownload=FALSE;   /* exported to HTFormat.c in libWWW */
 
 #ifdef VMS
 PRIVATE char * FIXED_RECORD_COMMAND = NULL;
-#ifdef USE_COMMAND_FILE 	     /* Keep this as an option. - FM	*/
+#ifdef USE_COMMAND_FILE		     /* Keep this as an option. - FM	*/
 #define FIXED_RECORD_COMMAND_MASK "@Lynx_Dir:FIXED512 %s"
 #else
 #define FIXED_RECORD_COMMAND_MASK "%s"
@@ -136,7 +136,7 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
     char *path = NULL;
     char *addr = NULL;
     int status;
-    BOOL use_gzread = NO;
+    BOOL use_zread = NO;
     BOOLEAN found = FALSE;
 #ifdef WIN_EX
     HANDLE cur_handle;
@@ -183,23 +183,28 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 		    !strcasecomp(&path[len-2], "gz")) {
 #ifdef USE_ZLIB
 		    if (!skip_loadfile) {
-			use_gzread = YES;
+			use_zread = YES;
 		    } else
 #endif /* USE_ZLIB */
 		    {
 			path[len-3] = '\0';
 			remove(path);
 		    }
-#ifdef BZIP2_PATH
 		} else if (len > 4 && !strcasecomp(&path[len-3], "bz2")) {
-		    path[len-4] = '\0';
-		    remove(path);
-#endif /* BZIP2_PATH */
+#ifdef USE_BZLIB
+		    if (!skip_loadfile) {
+			use_zread = YES;
+		    } else
+#endif /* USE_BZLIB */
+		    {
+			path[len-4] = '\0';
+			remove(path);
+		    }
 		} else if (len > 2 && !strcasecomp(&path[len-1], "Z")) {
 		    path[len-2] = '\0';
 		    remove(path);
 		}
-		if (!use_gzread) {
+		if (!use_zread) {
 		    if (!dump_output_immediately) {
 			/*
 			 *  Tell user what's happening. - FM
@@ -257,7 +262,7 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 		    }
 #endif /* FNAMES_8_3 */
 		    LYLocalFileToURL (&addr, path);
-		    if (!use_gzread) {
+		    if (!use_zread) {
 			LYRenamedTemp(me->anchor->FileCache, path);
 			StrAllocCopy(me->anchor->FileCache, path);
 			StrAllocCopy(me->anchor->content_encoding, "binary");
@@ -291,7 +296,7 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 			/*
 			 *  Tell user what's happening. - FM
 			 */
-			_user_message(WWW_USING_MESSAGE, addr);
+			HTUserMsg2(WWW_USING_MESSAGE, addr);
 		    }
 
 		    if (skip_loadfile) {
@@ -322,7 +327,7 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 			    stop_curses();
 #endif
 			}
-#if _WIN_CC
+#ifdef _WIN_CC
 			exec_command(me->end_command, FALSE);
 #else
 			LYSystem(me->end_command);
@@ -334,7 +339,7 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 			if (!dump_output_immediately) {
 #ifdef WIN_EX
 			    if (focus_window) {
-				HTInfoMsg("Set focus1");
+				HTInfoMsg(gettext("Set focus1"));
 				status = SetForegroundWindow(cur_handle);
 			    }
 #else
@@ -378,7 +383,7 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 		stop_curses();
 #endif
 	    }
-#if _WIN_CC
+#ifdef _WIN_CC
 	    exec_command(me->end_command, FALSE);
 #else
 	    LYSystem(me->end_command);
@@ -391,7 +396,7 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 	    if (!dump_output_immediately) {
 #ifdef WIN_EX
 		if (focus_window) {
-		    HTInfoMsg("Set focus2");
+		    HTInfoMsg(gettext("Set focus2"));
 		    status = SetForegroundWindow(cur_handle);
 		}
 #else
@@ -410,11 +415,11 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 	    if (!dump_output_immediately) {
 #ifdef WIN_EX
 		if (focus_window) {
-		    HTInfoMsg("Set focus3");
+		    HTInfoMsg(gettext("Set focus3"));
 		    status = SetForegroundWindow(cur_handle);
 		}
 #else
-	        start_curses();
+		start_curses();
 #endif
 	    }
 	}
@@ -426,14 +431,14 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
 	if (me->anchor->FileCache)
 	    remove(me->anchor->FileCache);
 	FREE(me);
-#ifdef EXP_PERSISTENT_COOKIES 
-	/* 
-	 *  We want to save cookies picked up when in source 
-	 *  mode.  ... 
-	 */ 
-	if (persistent_cookies) 
-	    LYStoreCookies(LYCookieSaveFile); 
-#endif /* EXP_PERSISTENT_COOKIES */ 
+#ifdef USE_PERSISTENT_COOKIES
+	/*
+	 *  We want to save cookies picked up when in source
+	 *  mode.  ...
+	 */
+	if (persistent_cookies)
+	    LYStoreCookies(LYCookieSaveFile);
+#endif /* USE_PERSISTENT_COOKIES */
 	exit_immediately(EXIT_SUCCESS);
     }
 
@@ -441,6 +446,12 @@ PRIVATE void HTFWriter_free ARGS1(HTStream *, me)
     return;
 }
 
+#ifdef VMS
+#  define REMOVE_COMMAND "delete/noconfirm/nolog %s;"
+#else
+#  define REMOVE_COMMAND "%s"
+#endif /* VMS */
+
 /*	Abort writing
 **	-------------
 */
@@ -455,7 +466,19 @@ PRIVATE void HTFWriter_abort ARGS2(
 	CTRACE((tfp, "HTFWriter: Aborting: file not executed or saved.\n"));
 	FREE(me->end_command);
 	if (me->remove_command) {
+#ifdef VMS
 	    LYSystem(me->remove_command);
+#else
+	    chmod(me->remove_command, 0600);		/* Ignore errors */
+	    if (0 != unlink(me->remove_command)) {
+		char buf[560];
+
+		sprintf(buf, "%.60s '%.400s': %.60s",
+			gettext("Error deleting file"),
+			me->remove_command, LYStrerror(errno));
+		HTAlert(buf);
+	    }
+#endif
 	    FREE(me->remove_command);
 	}
     }
@@ -589,12 +612,6 @@ PRIVATE char *mailcap_substitute ARGS3(
     return result;
 }
 
-#ifndef VMS
-#define REMOVE_COMMAND "/bin/rm -f %s"
-#else
-#define REMOVE_COMMAND "delete/noconfirm/nolog %s;"
-#endif /* VMS */
-
 /*	Take action using a system command
 **	----------------------------------
 **
@@ -664,10 +681,10 @@ PUBLIC HTStream* HTSaveAndExecute ARGS3(
 	 *  so that the open fp gets registered in the list keeping track of
 	 *  temp files, equivalent to when LYOpenTemp() gets called below.
 	 *  This avoids a file descriptor leak caused by LYCloseTempFP()
-	 *  not being able to find the fp.  The ".bin" suffix is expected
+	 *  not being able to find the fp.  The binary suffix is expected
 	 *  to not be used, it's only for fallback in unusual error cases. - kw
 	 */
-	me->fp = LYOpenTempRewrite(fnam, ".bin", BIN_W);
+	me->fp = LYOpenTempRewrite(fnam, BIN_SUFFIX, BIN_W);
     } else {
 #if defined(WIN_EX) && !defined(__CYGWIN__)	/* 1998/01/04 (Sun) */
 	if (!strncmp(anchor->address,"file://localhost",16)) {
@@ -719,15 +736,13 @@ PUBLIC HTStream* HTSaveAndExecute ARGS3(
 	 */
 	if (!strcasecomp(pres->rep->name, "text/html")) {
 	    suffix = HTML_SUFFIX;
-	} else if (!strcasecomp(pres->rep->name, "text/plain")) {
-	    suffix = ".txt";
-	} else if (!strcasecomp(pres->rep->name,
-				"application/octet-stream")) {
-	    suffix = ".bin";
-	} else if (
-	(suffix = HTFileSuffix(pres->rep, anchor->content_encoding)) == 0
-		   || *suffix != '.')
-	{
+	} else if (!strncasecomp(pres->rep->name, "text/", 5)) {
+	    suffix = TEXT_SUFFIX;
+	} else if (!strncasecomp(pres->rep->name, "application/", 12)) {
+	    suffix = BIN_SUFFIX;
+	} else if ((suffix = HTFileSuffix(pres->rep,
+					  anchor->content_encoding)) == 0
+		    || *suffix != '.') {
 	    suffix = HTML_SUFFIX;
 	}
 	me->fp = LYOpenTemp(fnam, suffix, BIN_W);
@@ -859,10 +874,10 @@ PUBLIC HTStream* HTSaveToFile ARGS3(
 	 *  so that the open fp gets registered in the list keeping track of
 	 *  temp files, equivalent to when LYOpenTemp() gets called below.
 	 *  This avoids a file descriptor leak caused by LYCloseTempFP()
-	 *  not being able to find the fp.  The ".bin" suffix is expected
+	 *  not being able to find the fp.  The binary suffix is expected
 	 *  to not be used, it's only for fallback in unusual error cases. - kw
 	 */
-	ret_obj->fp = LYOpenTempRewrite(fnam, ".bin", BIN_W);
+	ret_obj->fp = LYOpenTempRewrite(fnam, BIN_SUFFIX, BIN_W);
     } else {
 	/*
 	 *  Check for a suffix.
@@ -870,11 +885,10 @@ PUBLIC HTStream* HTSaveToFile ARGS3(
 	 */
 	if (!strcasecomp(pres->rep->name, "text/html")) {
 	    suffix = HTML_SUFFIX;
-	} else if (!strcasecomp(pres->rep->name, "text/plain")) {
-	    suffix = ".txt";
-	} else if (!strcasecomp(pres->rep->name,
-				    "application/octet-stream")) {
-	    suffix = ".bin";
+	} else if (!strncasecomp(pres->rep->name, "text/", 5)) {
+	    suffix = TEXT_SUFFIX;
+	} else if (!strncasecomp(pres->rep->name, "application/", 12)) {
+	    suffix = BIN_SUFFIX;
 	} else if ((suffix = HTFileSuffix(pres->rep,
 					  anchor->content_encoding)) == 0
 		    || *suffix != '.') {
@@ -1020,6 +1034,7 @@ PUBLIC HTStream* HTCompressed ARGS3(
     BOOL can_present = FALSE;
     char fnam[LY_MAXPATH];
     char temp[LY_MAXPATH];	/* actually stores just a suffix */
+    CONST char *program;
     CONST char *suffix;
     char *uncompress_mask = NULL;
     char *compress_suffix = "";
@@ -1048,37 +1063,43 @@ PUBLIC HTStream* HTCompressed ARGS3(
 	     *	We have a presentation mapping for it. - FM
 	     */
 	    can_present = TRUE;
-	    if (!strcasecomp(anchor->content_encoding, "x-gzip") ||
-		!strcasecomp(anchor->content_encoding, "gzip")) {
+	    if ((!strcasecomp(anchor->content_encoding, "x-gzip") ||
+		 !strcasecomp(anchor->content_encoding, "gzip")) &&
+		 (program = HTGetProgramPath(ppGZIP)) != NULL) {
 		/*
 		 *  It's compressed with the modern gzip. - FM
 		 */
-		StrAllocCopy(uncompress_mask, GZIP_PATH);
+		StrAllocCopy(uncompress_mask, program);
 		StrAllocCat(uncompress_mask, " -d --no-name %s");
 		compress_suffix = "gz";
-#ifdef BZIP2_PATH
-	    } else if (!strcasecomp(anchor->content_encoding, "x-bzip2") ||
-		!strcasecomp(anchor->content_encoding, "bzip2")) {
-		StrAllocCopy(uncompress_mask, BZIP2_PATH);
+		break;
+	    }
+	    if ((!strcasecomp(anchor->content_encoding, "x-bzip2") ||
+		 !strcasecomp(anchor->content_encoding, "bzip2")) &&
+		(program = HTGetProgramPath(ppBZIP2)) != NULL) {
+		StrAllocCopy(uncompress_mask, program);
 		StrAllocCat(uncompress_mask, " -d %s");
 		compress_suffix = "bz2";
-#endif /* BZIP2_PATH */
-	    } else if (!strcasecomp(anchor->content_encoding, "x-compress") ||
-		       !strcasecomp(anchor->content_encoding, "compress")) {
+		break;
+	    }
+	    if ((!strcasecomp(anchor->content_encoding, "x-compress") ||
+		 !strcasecomp(anchor->content_encoding, "compress")) &&
+		(program = HTGetProgramPath(ppUNCOMPRESS)) != NULL) {
 		/*
 		 *  It's compressed the old fashioned Unix way. - FM
 		 */
-		StrAllocCopy(uncompress_mask, UNCOMPRESS_PATH);
+		StrAllocCopy(uncompress_mask, program);
 		StrAllocCat(uncompress_mask, " %s");
 		compress_suffix = "Z";
+		break;
 	    }
 	    break;
 	}
     }
-    if (can_present == FALSE || 		 /* no presentation mapping */
+    if (can_present == FALSE ||			 /* no presentation mapping */
 	uncompress_mask == NULL ||		    /* not gzip or compress */
 	strchr(anchor->content_type, ';') ||		   /* wrong charset */
-	HTOutputFormat == HTAtom_for("www/download") || 	/* download */
+	HTOutputFormat == HTAtom_for("www/download") ||		/* download */
 	!strcasecomp(pres->rep_out->name, "www/download") ||	/* download */
 	(traversal &&	   /* only handle html or plain text for traversals */
 	 strcasecomp(anchor->content_type, "text/html") &&
@@ -1139,11 +1160,10 @@ PUBLIC HTStream* HTCompressed ARGS3(
     if (!strcasecomp(anchor->content_type, "text/html")) {
 	middle = HTML_SUFFIX;
 	middle++;		/* point to 'h' of .htm(l) - kw */
-    } else if (!strcasecomp(anchor->content_type, "text/plain")) {
-	middle = "txt";
-    } else if (!strcasecomp(anchor->content_type,
-			    "application/octet-stream")) {
-	middle = "bin";
+    } else if (!strncasecomp(anchor->content_type, "text/", 5)) {
+	middle = TEXT_SUFFIX + 1;
+    } else if (!strncasecomp(anchor->content_type, "application/", 12)) {
+	middle = BIN_SUFFIX + 1;
     } else if ((suffix =
 		HTFileSuffix(HTAtom_for(anchor->content_type), NULL)) &&
 	       *suffix == '.') {
@@ -1203,12 +1223,22 @@ PUBLIC HTStream* HTCompressed ARGS3(
     /*
      *	Make command to process file. - FM
      */
+#ifdef USE_BZLIB
+    if (compress_suffix[0] == 'b'	/* must be bzip2 */
+	&& !me->viewer_command) {
+	/*
+	 * We won't call bzip2 externally, so we don't need to supply a command
+	 * for it.
+	 */
+	StrAllocCopy(me->end_command, "");
+    } else
+#endif
 #ifdef USE_ZLIB
-    if (compress_suffix[0] == 'g' && /* must be gzip */
-	!me->viewer_command) {
+    if (compress_suffix[0] == 'g'	/* must be gzip */
+	&& !me->viewer_command) {
 	/*
-	 *  We won't call gzip externally, so we don't need to supply
-	 *  a command for it. - kw
+	 * We won't call gzip or compress externally, so we don't need to
+	 * supply a command for it.
 	 */
 	StrAllocCopy(me->end_command, "");
     } else
@@ -1345,7 +1375,7 @@ PUBLIC unsigned long LYVMS_FixedLengthRecords ARGS1(char *, filename)
     attr_rqst_list[2].atr$l_addr = 0;
     /* file "record" attributes */
     memset((void *)&recattr, 0, sizeof recattr);
-    fchars = 0; 	/* file characteristics */
+    fchars = 0;		/* file characteristics */
 
     /* get current attributes */
     sts = sys$qiow(0, channel, IO$_ACCESS, iosb, (void(*)())0, 0,
diff --git a/gnu/usr.bin/lynx/src/HTForms.h b/gnu/usr.bin/lynx/src/HTForms.h
index cdfa3688d71..cf31e49e734 100644
--- a/gnu/usr.bin/lynx/src/HTForms.h
+++ b/gnu/usr.bin/lynx/src/HTForms.h
@@ -9,15 +9,15 @@
 
 /* change_form_link calls change_form_link_ex with all its args and FALSE as
   last arg */
-extern int change_form_link PARAMS((struct link *form_link,
-				    document *newdoc, BOOLEAN *refresh_screen,
-				    char *link_name, char *link_value,
+extern int change_form_link PARAMS((int cur,
+				    DocInfo *newdoc,
+				    BOOLEAN *refresh_screen,
 				    BOOLEAN use_last_tfpos,
 				    BOOLEAN immediate_submit));
 
-extern int change_form_link_ex PARAMS((struct link *form_link,
-				    document *newdoc, BOOLEAN *refresh_screen,
-				    char *link_name, char *link_value,
+extern int change_form_link_ex PARAMS((int cur,
+				    DocInfo *newdoc,
+				    BOOLEAN *refresh_screen,
 				    BOOLEAN use_last_tfpos,
 				    BOOLEAN immediate_submit,
 				    BOOLEAN draw_only));
@@ -103,7 +103,7 @@ typedef struct _FormInfo {
 typedef struct _PerFormInfo
 {
 	int			number;	   /* form number, see GridText.c */
-    /* except for the last two, the followign fields aren't actually used.. */
+    /* except for the last two, the following fields aren't actually used.. */
 	int			disabled;  /* If YES, can't change values */
 	struct _PerFormInfo *	next;	   /* pointer to next form in doc */
 	int			nfields;   /* number of fields */
@@ -132,8 +132,11 @@ typedef struct _PerFormInfo
 #define F_IMAGE_SUBMIT_TYPE 13
 #define F_KEYGEN_TYPE     14
 
-#define F_TEXTLIKE(type) ((type)==F_TEXT_TYPE || (type)==F_TEXT_SUBMIT_TYPE ||\
-			  (type)==F_PASSWORD_TYPE || (type)==F_TEXTAREA_TYPE)
+#define F_TEXTLIKE(type) ((type)==F_TEXT_TYPE ||\
+			  (type)==F_TEXT_SUBMIT_TYPE ||\
+			  (type)==F_PASSWORD_TYPE ||\
+			  (type)==F_FILE_TYPE ||\
+			  (type)==F_TEXTAREA_TYPE)
 
 #define WWW_FORM_LINK_TYPE  1
 #define WWW_LINK_TYPE   2
diff --git a/gnu/usr.bin/lynx/src/HTInit.c b/gnu/usr.bin/lynx/src/HTInit.c
index 47be396a139..8415876ca26 100644
--- a/gnu/usr.bin/lynx/src/HTInit.c
+++ b/gnu/usr.bin/lynx/src/HTInit.c
@@ -42,7 +42,7 @@ PUBLIC void HTFormatInit NOARGS
 #else
  if (LYgetXDisplay() != 0) {	/* Must have X11 */
   HTSetPresentation("application/postscript", "ghostview %s&",
-  							    1.0, 3.0, 0.0, 0);
+							    1.0, 3.0, 0.0, 0);
   if (XLoadImageCommand && *XLoadImageCommand) {
       HTSetPresentation("image/gif",	XLoadImageCommand,  1.0, 3.0, 0.0, 0);
       HTSetPresentation("image/x-xbm",	XLoadImageCommand,  1.0, 3.0, 0.0, 0);
@@ -88,25 +88,25 @@ PUBLIC void HTFormatInit NOARGS
  *  Add our compressed file handlers.
  */
  HTSetConversion("www/compressed", "www/download",
- 					      HTCompressed,   1.0, 0.0, 0.0, 0);
+					      HTCompressed,   1.0, 0.0, 0.0, 0);
  HTSetConversion("www/compressed", "www/present",
- 					      HTCompressed,   1.0, 0.0, 0.0, 0);
+					      HTCompressed,   1.0, 0.0, 0.0, 0);
  HTSetConversion("www/compressed", "www/source",
- 					      HTCompressed,   1.0, 0.0, 0.0, 0);
+					      HTCompressed,   1.0, 0.0, 0.0, 0);
  HTSetConversion("www/compressed", "www/dump",
- 					      HTCompressed,   1.0, 0.0, 0.0, 0);
+					      HTCompressed,   1.0, 0.0, 0.0, 0);
 
  /*
   * Added the following to support some content types beginning to surface.
   */
  HTSetConversion("application/html", "text/x-c",
- 					HTMLToC,	0.5, 0.0, 0.0, 0);
+					HTMLToC,	0.5, 0.0, 0.0, 0);
  HTSetConversion("application/html", "text/plain",
- 					HTMLToPlain,	0.5, 0.0, 0.0, 0);
+					HTMLToPlain,	0.5, 0.0, 0.0, 0);
  HTSetConversion("application/html", "www/present",
- 					HTMLPresent,	2.0, 0.0, 0.0, 0);
+					HTMLPresent,	2.0, 0.0, 0.0, 0);
  HTSetConversion("application/html", "www/source",
- 					HTPlainPresent,	1.0, 0.0, 0.0, 0);
+					HTPlainPresent,	1.0, 0.0, 0.0, 0);
  HTSetConversion("application/x-wais-source", "www/source",
 					HTPlainPresent,	1.0, 0.0, 0.0, 0);
  HTSetConversion("application/x-wais-source", "www/present",
@@ -120,32 +120,32 @@ PUBLIC void HTFormatInit NOARGS
   *  Save all unknown mime types to disk.
   */
  HTSetConversion("www/source",  "www/present",
- 					HTSaveToFile,	1.0, 3.0, 0.0, 0);
+					HTSaveToFile,	1.0, 3.0, 0.0, 0);
  HTSetConversion("www/source",  "www/source",
- 					HTSaveToFile,	1.0, 3.0, 0.0, 0);
+					HTSaveToFile,	1.0, 3.0, 0.0, 0);
  HTSetConversion("www/source",  "www/download",
- 					HTSaveToFile,	1.0, 3.0, 0.0, 0);
+					HTSaveToFile,	1.0, 3.0, 0.0, 0);
  HTSetConversion("www/source",  "*",	HTSaveToFile,	1.0, 3.0, 0.0, 0);
 
  /*
   *  Output all www/dump presentations to stdout.
   */
  HTSetConversion("www/source",  "www/dump",
- 					HTDumpToStdout,	1.0, 3.0, 0.0, 0);
+					HTDumpToStdout,	1.0, 3.0, 0.0, 0);
 
 /*
  *  Now add our basic conversions.
  */
  HTSetConversion("text/x-sgml",
- 			      "www/source",  HTPlainPresent, 1.0, 0.0, 0.0, 0);
+			      "www/source",  HTPlainPresent, 1.0, 0.0, 0.0, 0);
  HTSetConversion("text/x-sgml",
- 			      "www/present", HTMLPresent,    2.0, 0.0, 0.0, 0);
+			      "www/present", HTMLPresent,    2.0, 0.0, 0.0, 0);
  HTSetConversion("text/sgml", "www/source",  HTPlainPresent, 1.0, 0.0, 0.0, 0);
  HTSetConversion("text/sgml", "www/present", HTMLPresent,    1.0, 0.0, 0.0, 0);
  HTSetConversion("text/plain","www/present", HTPlainPresent, 1.0, 0.0, 0.0, 0);
  HTSetConversion("text/plain","www/source",  HTPlainPresent, 1.0, 0.0, 0.0, 0);
  HTSetConversion("text/html", "www/source",  HTPlainPresent, 1.0, 0.0, 0.0, 0);
- HTSetConversion("text/html", "text/x-c",    HTMLToC, 	     0.5, 0.0, 0.0, 0);
+ HTSetConversion("text/html", "text/x-c",    HTMLToC,	     0.5, 0.0, 0.0, 0);
  HTSetConversion("text/html", "text/plain",  HTMLToPlain,    0.5, 0.0, 0.0, 0);
  HTSetConversion("text/html", "www/present", HTMLPresent,    1.0, 0.0, 0.0, 0);
 
@@ -281,25 +281,23 @@ PRIVATE int ProcessMailcapEntry ARGS2(
 	FILE *,			fp,
 	struct MailcapEntry *,	mc)
 {
-    size_t rawentryalloc = 2000, len;
+    size_t rawentryalloc = 2000, len, need;
     char *rawentry, *s, *t;
     char *LineBuf = NULL;
 
-    rawentry = (char *)malloc(1 + rawentryalloc);
+    rawentry = (char *)malloc(rawentryalloc);
     if (!rawentry)
 	ExitWithError(MEMORY_EXHAUSTED_ABORT);
     *rawentry = '\0';
     while (LYSafeGets(&LineBuf, fp) != 0) {
-	if (LineBuf[0] == '#')
+	LYTrimNewline(LineBuf);
+	if (LineBuf[0] == '#' || LineBuf[0] == '\0')
 	    continue;
 	len = strlen(LineBuf);
-	if (len == 0)
-	    continue;
-	if (LineBuf[len-1] == '\n')
-	    LineBuf[--len] = '\0';
-	if ((len + strlen(rawentry)) > rawentryalloc) {
-	    rawentryalloc += 2000;
-	    rawentry = realloc(rawentry, rawentryalloc+1);
+	need = len + strlen(rawentry) + 1;
+	if (need > rawentryalloc) {
+	    rawentryalloc += (2000 + need);
+	    rawentry = realloc(rawentry, rawentryalloc);
 	    if (!rawentry)
 	        ExitWithError(MEMORY_EXHAUSTED_ABORT);
 	}
@@ -419,7 +417,7 @@ assign_presentation:
 }
 
 PRIVATE void BuildCommand ARGS5(
-	char **, 	pBuf,
+	char **,	pBuf,
 	size_t,		Bufsize,
 	char *,		controlstring,
 	char *,		TmpFileName,
@@ -542,7 +540,7 @@ PRIVATE int PassesTest ARGS1(
 	0 == strcasecomp(mc->testcommand, "test -n \"$DISPLAY\"")) {
 	FREE(mc->testcommand);
 	CTRACE((tfp, "PassesTest: Testing for XWINDOWS environment.\n"));
-    	if (LYgetXDisplay() != NULL) {
+	if (LYgetXDisplay() != NULL) {
 	    CTRACE((tfp, "PassesTest: Test passed!\n"));
 	    return(0 == 0);
 	} else {
@@ -553,7 +551,7 @@ PRIVATE int PassesTest ARGS1(
     if (0 == strcasecomp(mc->testcommand, "test -z \"$DISPLAY\"")) {
 	FREE(mc->testcommand);
 	CTRACE((tfp, "PassesTest: Testing for NON_XWINDOWS environment.\n"));
-    	if (LYgetXDisplay() == NULL) {
+	if (LYgetXDisplay() == NULL) {
 	    CTRACE((tfp,"PassesTest: Test passed!\n"));
 	    return(0 == 0);
 	} else {
@@ -777,7 +775,7 @@ PUBLIC void HTFileInit NOARGS
 
 #ifdef TRADITIONAL_SUFFIXES
     HTSetSuffix(".exe.Z",	"application/x-Comp. Executable",
-    							     "binary", 1.0);
+							     "binary", 1.0);
     HTSetSuffix(".Z",	        "application/UNIX Compressed", "binary", 1.0);
     HTSetSuffix(".tar_Z",	"application/UNIX Compr. Tar", "binary", 1.0);
     HTSetSuffix(".tar.Z",	"application/UNIX Compr. Tar", "binary", 1.0);
@@ -785,7 +783,7 @@ PUBLIC void HTFileInit NOARGS
     HTSetSuffix5(".Z",	        "application/x-compress", "binary", "UNIX Compressed", 1.0);
     HTSetSuffix5(".Z",	        NULL, "compress",      "UNIX Compressed", 1.0);
     HTSetSuffix5(".exe.Z",	"application/octet-stream", "compress",
-    						       "Executable", 1.0);
+						       "Executable", 1.0);
     HTSetSuffix5(".tar_Z",	"application/x-tar", "compress",
 						       "UNIX Compr. Tar", 1.0);
     HTSetSuffix5(".tar.Z",	"application/x-tar", "compress",
@@ -860,12 +858,12 @@ PUBLIC void HTFileInit NOARGS
 
 #ifdef TRADITIONAL_SUFFIXES
     HTSetSuffix(".latex",	"application/x-Latex", "8bit", 1.0);
-    HTSetSuffix(".tex",  	"application/x-Tex", "8bit", 1.0);
+    HTSetSuffix(".tex",		"application/x-Tex", "8bit", 1.0);
     HTSetSuffix(".texinfo",	"application/x-Texinfo", "8bit", 1.0);
     HTSetSuffix(".texi",	"application/x-Texinfo", "8bit", 1.0);
 #else
     HTSetSuffix5(".latex",	"application/x-latex", "8bit", "LaTeX", 1.0);
-    HTSetSuffix5(".tex",  	"text/x-tex", "8bit", "TeX", 1.0);
+    HTSetSuffix5(".tex",	"text/x-tex", "8bit", "TeX", 1.0);
     HTSetSuffix5(".texinfo",	"application/x-texinfo", "8bit", "Texinfo", 1.0);
     HTSetSuffix5(".texi",	"application/x-texinfo", "8bit", "Texinfo", 1.0);
 #endif
@@ -1013,6 +1011,8 @@ PUBLIC void HTFileInit NOARGS
     HTSetSuffix(".text",	"text/plain", "8bit", 1.0);
     HTSetSuffix(".txt",		"text/plain", "8bit", 1.0);
 
+    HTSetSuffix(".php",		"text/html", "8bit", 1.0);
+    HTSetSuffix(".php3",	"text/html", "8bit", 1.0);
     HTSetSuffix(".html3",	"text/html", "8bit", 1.0);
     HTSetSuffix(".ht3",		"text/html", "8bit", 1.0);
     HTSetSuffix(".phtml",	"text/html", "8bit", 1.0);
diff --git a/gnu/usr.bin/lynx/src/HTML.c b/gnu/usr.bin/lynx/src/HTML.c
index d27f1844f86..1f09b8772df 100644
--- a/gnu/usr.bin/lynx/src/HTML.c
+++ b/gnu/usr.bin/lynx/src/HTML.c
@@ -60,11 +60,6 @@
 #undef SELECTED_STYLES
 #define pHText_changeStyle(X,Y,Z) {}
 
-#define OPT_SCN 1
-#define OMIT_SCN_KEEPING 0 /* whether to omit keeping of Style_className
-    when lss support is on. 1 to increase performance. The value must
-    correspond to one in LYCurses.c. Should be 0 if OPT_SCN=0 */
-
 #if OMIT_SCN_KEEPING
 # define HCODE_TO_STACK_OFF(x) /*(CSHASHSIZE+1)*/ 88888  /*special value.*/
 #else
@@ -73,10 +68,11 @@
 
 #endif /* USE_COLOR_STYLE */
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 #include <HTAccess.h>
 #endif
 
+#include <LYCurses.h>
 #include <LYJustify.h>
 
 #include <LYexit.h>
@@ -84,16 +80,9 @@
 
 #define STACKLEVEL(me) ((me->stack + MAX_NESTING - 1) - me->sp)
 
-extern BOOL HTPassEightBitRaw;
-
-extern BOOLEAN HT_Is_Gopher_URL;
-
-/* from Curses.h */
-extern int LYcols;
-
 struct _HTStream {
     CONST HTStreamClass *	isa;
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     HTParentAnchor *		anchor;
     FILE *			fp;
     char *			filename;
@@ -156,7 +145,7 @@ PRIVATE char* MakeNewMapValue PARAMS((CONST char ** value, CONST char* mapstr));
 PUBLIC void strtolower ARGS1(char*, i)
 {
     if (!i) return;
-    while (*i) { *i=(char)tolower(*i); i++; }
+    while (*i) { *i = (char)TOLOWER(*i); i++; }
 }
 
 /*		Flattening the style structure
@@ -370,7 +359,7 @@ PUBLIC void HTML_put_character ARGS2(HTStructured *, me, char, c)
 	/*
 	 *  Free format text.
 	 */
-	if (!strcmp(me->sp->style->name,"Preformatted")) {
+	if (me->sp->style->id == ST_Preformatted) {
 	    if (c != '\r' &&
 		!(c == '\n' && me->inLABEL && !me->inP) &&
 		!(c == '\n' && !me->inPRE)) {
@@ -380,8 +369,8 @@ PUBLIC void HTML_put_character ARGS2(HTStructured *, me, char, c)
 	    }
 	    me->inPRE = TRUE;
 
-	} else if (!strcmp(me->sp->style->name,"Listing") ||
-		   !strcmp(me->sp->style->name,"Example")) {
+	} else if (me->sp->style->id == ST_Listing ||
+		   me->sp->style->id == ST_Example) {
 	    if (c != '\r') {
 		me->inP = TRUE;
 		me->inLABEL = FALSE;
@@ -661,7 +650,6 @@ PUBLIC void HTML_write ARGS3(HTStructured *, me, CONST char*, s, int, l)
  *  context an internal link makes no sense (e.g., IMG SRC=).
  */
 
-#ifndef DONT_TRACK_INTERNAL_LINKS
 /* A flag is used to keep track of whether an "URL reference" encountered
    had a real "URL" or not.  In the latter case, it will be marked as
    "internal".	The flag is set before we start messing around with the
@@ -672,25 +660,53 @@ PUBLIC void HTML_write ARGS3(HTStructured *, me, CONST char*, s, int, l)
 
 /* Last argument to pass to HTAnchor_findChildAndLink() calls,
    just an abbreviation. - kw */
-#define INTERN_LT (HTLinkType *)(intern_flag ? LINK_INTERNAL : NULL)
+#define INTERN_LT (HTLinkType *)(intern_flag ? HTInternalLink : NULL)
 
-#else  /* !DONT_TRACK_INTERNAL_LINKS */
 
-#define CHECK_FOR_INTERN(flag,s)  /* do nothing */ ;
-#define INTERN_LT (HTLinkType *)NULL
+#ifdef USE_COLOR_STYLE
+PRIVATE char* Style_className = 0;
+PRIVATE char* Style_className_end = 0;
+PRIVATE unsigned Style_className_len = 0;
+PRIVATE int hcode;
 
-#endif /* DONT_TRACK_INTERNAL_LINKS */
+#ifdef LY_FIND_LEAKS
+PRIVATE void free_Style_className NOARGS
+{
+    FREE(Style_className);
+}
+#endif
 
-#ifdef USE_COLOR_STYLE
-# if !OPT_SCN
-static char* Style_className = NULL;
-static char myHash[128];
-# else
-PRIVATE char Style_className[4096];/* i hope it's enough :) HV */
-PRIVATE char* Style_className_end=Style_className;/*this points to the
-		    end of string in Style_className (it points to '\0') */
-# endif
-static int hcode;
+PRIVATE void addClassName ARGS3(
+	CONST char *,	prefix,
+	CONST char *,	actual,
+	int,		length)
+{
+    int offset = strlen(prefix);
+    unsigned have = (Style_className_end - Style_className);
+    unsigned need = (offset + length + 1);
+
+    if ((have + need) >= Style_className_len) {
+	Style_className_len += 1024 + 2 * (have + need);
+	if (Style_className == 0) {
+	    Style_className = malloc(Style_className_len);
+	} else {
+	    Style_className = realloc(Style_className, Style_className_len);
+	}
+	if (Style_className == NULL)
+	    outofmem(__FILE__, "addClassName");
+	Style_className_end = Style_className + have;
+    }
+    if (offset)
+	strcpy(Style_className_end, prefix);
+    if (length)
+	memcpy(Style_className_end + offset, actual, length);
+    Style_className_end[offset + length] = '\0';
+    strtolower(Style_className_end);
+
+    Style_className_end += (offset + length);
+}
+#else
+#define addClassName(prefix, actual, length) /* nothing */
 #endif
 
 
@@ -733,7 +749,7 @@ PRIVATE void HTMLSRC_apply_markup ARGS4(
 #  define START TRUE
 #  define STOP FALSE
 
-#if defined(__STDC__) || _WIN_CC
+#if defined(__STDC__) || defined(_WIN_CC)
 #  define PSRCSTART(x)	HTMLSRC_apply_markup(me,HTL_##x,START,tag_charset)
 #  define PSRCSTOP(x)  HTMLSRC_apply_markup(me,HTL_##x,STOP,tag_charset)
 #else
@@ -812,33 +828,12 @@ PRIVATE void LYHandleFIG ARGS10(
 	me->in_word = NO;
 	me->inP = FALSE;
 
-	if (clickable_images && src && src != '\0') {
+	if (clickable_images && src && *src) {
 	    char *href = NULL;
 	    StrAllocCopy(href, src);
 	    CHECK_FOR_INTERN(*intern_flag,href);
 	    LYLegitimizeHREF(me, &href, TRUE, TRUE);
 	    if (*href) {
-		char *temp = NULL;
-		/*
-		 *  Check whether a base tag is in effect. - FM
-		 */
-		if ((me->inBASE && *href != '#') &&
-		    (temp = HTParse(href, me->base_href, PARSE_ALL)) &&
-		    *temp != '\0')
-		    /*
-		     *	Use reference related to the base.
-		     */
-		    StrAllocCopy(href, temp);
-		FREE(temp);
-
-		/*
-		 *  Check whether to fill in localhost. - FM
-		 */
-		LYFillLocalFileURL(&href,
-				   ((*href != '#' &&
-				     me->inBASE) ?
-				   me->base_href : me->node_anchor->address));
-
 		me->CurrentA = HTAnchor_findChildAndLink(
 					me->node_anchor,	/* Parent */
 					NULL,			/* Tag */
@@ -896,6 +891,12 @@ PRIVATE void clear_objectdata ARGS1(
     }
 }
 
+#define HTParseALL(pp,pconst)  \
+	{ char* free_me = *pp; \
+	  *pp = HTParse(*pp, pconst, PARSE_ALL); \
+	  FREE(free_me);       \
+	}
+
 /*	Start Element
 **	-------------
 */
@@ -917,10 +918,10 @@ PRIVATE int HTML_start_element ARGS6(
     char *I_value = NULL;
     char *I_name = NULL;
     char *temp = NULL;
+    CONST char *Base = NULL;
     int dest_char_set = -1;
     HTParentAnchor *dest = NULL;	     /* An anchor's destination */
     BOOL dest_ismap = FALSE;		     /* Is dest an image map script? */
-    BOOL UseBASE = TRUE;		     /* Resolved vs. BASE if present? */
     HTChildAnchor *ID_A = NULL;		     /* HTML_foo_ID anchor */
     int url_type = 0, i = 0;
     char *cp = NULL;
@@ -929,14 +930,8 @@ PRIVATE int HTML_start_element ARGS6(
     short stbl_align = HT_ALIGN_NONE;
     int status = HT_OK;
 #ifdef USE_COLOR_STYLE
-    char* class_name;
+    char *class_name;
     int class_used = 0;
-#  if OPT_SCN
-#    if !OMIT_SCN_KEEPING
-    char* Style_className_end_was = Style_className_end+1;
-#    endif
-    /* assume ';' will be appended*/
-#  endif
 #endif
 
 #ifdef USE_PRETTYSRC
@@ -1054,17 +1049,10 @@ PRIVATE int HTML_start_element ARGS6(
 /* this should be done differently */
 #if defined(USE_COLOR_STYLE)
 
-#if !OPT_SCN
-    HTSprintf (&Style_className, ";%s", HTML_dtd.tags[element_number].name);
-#else
-# if !OMIT_SCN_KEEPING
-    *Style_className_end=';';
-    memcpy(Style_className_end+1,
-	   HTML_dtd.tags[element_number].name,
-	   HTML_dtd.tags[element_number].name_len+1);
-    Style_className_end += HTML_dtd.tags[element_number].name_len+1;
-# endif
-#endif
+    addClassName(";", 
+	         HTML_dtd.tags[element_number].name,
+	         HTML_dtd.tags[element_number].name_len);
+
     class_name = (force_classname ? forced_classname : class_string);
     force_classname = FALSE;
 
@@ -1079,37 +1067,20 @@ PRIVATE int HTML_start_element ARGS6(
     CTRACE2(TRACE_STYLE, (tfp, "CSS.elt:<%s>\n", HTML_dtd.tags[element_number].name));
 
     if (current_tag_style == -1) {	/* Append class_name */
-#if !OPT_SCN
-	strcpy (myHash, HTML_dtd.tags[element_number].name);
-#else
 	hcode = hash_code_lowercase_on_fly(HTML_dtd.tags[element_number].name);
-#endif
-	if (class_name[0])
-	{
+	if (class_name[0]) {
 	    int ohcode = hcode;
-	    char *oend = Style_className_end;
-#if !OPT_SCN
-	    int len = strlen(myHash);
-	    sprintf(myHash, ".%.*s", (int)sizeof(myHash) - len - 2, class_name);
-	    HTSprintf (&Style_className, ".%s", class_name);
-#else
-#   if !OMIT_SCN_KEEPING
-	    int l = strlen(class_name);
-	    *Style_className_end = '.';
-	    memcpy(Style_className_end+1, class_name, l+1 );
-	    Style_className_end += l+1;
-#   endif
 
 	    hcode = hash_code_aggregate_char('.', hcode);
 	    hcode = hash_code_aggregate_lower_str(class_name, hcode);
-#endif
 	    if (!hashStyles[hcode].name) { /* None such -> classless version */
 		hcode = ohcode;
-		*oend = '\0';
 		CTRACE2(TRACE_STYLE,
 			(tfp, "STYLE.start_element: <%s> (class <%s> not configured), hcode=%d.\n",
 			HTML_dtd.tags[element_number].name, class_name, hcode));
 	    } else {
+		addClassName(".", class_name, strlen(class_name));
+
 		CTRACE2(TRACE_STYLE,
 			(tfp, "STYLE.start_element: <%s>.<%s>, hcode=%d.\n",
 			HTML_dtd.tags[element_number].name, class_name, hcode));
@@ -1117,48 +1088,11 @@ PRIVATE int HTML_start_element ARGS6(
 	    }
 	}
 
-#if !OPT_SCN
-	strtolower(myHash);
-	hcode = hash_code(myHash);
-#endif
 	class_string[0] = '\0';
 
-#if !OPT_SCN
-    if (TRACE)
-    {
-	CTRACE((tfp, "CSSTRIM:%s -> %d", myHash, hcode));
-	if (hashStyles[hcode].code != hcode) {
-	    char *rp = strrchr(myHash, '.');
-	    CTRACE((tfp, " (undefined) %s\n", myHash));
-	    if (rp) {
-		int hcd;
-		*rp = '\0'; /* trim the class */
-		hcd = hash_code(myHash);
-		CTRACE((tfp, "CSS:%s -> %d", myHash, hcd));
-		if (hashStyles[hcd].code!=hcd)
-		    CTRACE((tfp, " (undefined) %s\n", myHash));
-		else
-		    CTRACE((tfp, " ca=%d\n", hashStyles[hcd].color));
-	    }
-	} else {
-	    CTRACE((tfp, " ca=%d\n", hashStyles[hcode].color));
-	}
-    }
-#endif
     } else { /* (current_tag_style!=-1)	 */
 	if (class_name[0]) {
-#if !OPT_SCN
-	    int len = strlen(myHash);
-	    sprintf(myHash, ".%.*s", (int)sizeof(myHash) - len - 2, class_name);
-	    HTSprintf (&Style_className, ".%s", class_name);
-#else
-#     if !OMIT_SCN_KEEPING
-	    int l = strlen(class_name);
-	    *Style_className_end = '.';
-	    memcpy(Style_className_end+1,class_name, l + 1 );
-	    Style_className_end += l + 1;
-#     endif
-#endif
+	    addClassName(".", class_name, strlen(class_name));
 	    class_string[0] = '\0';
 	}
 	hcode = current_tag_style;
@@ -1168,44 +1102,30 @@ PRIVATE int HTML_start_element ARGS6(
 	current_tag_style = -1;
     }
 
-#if !OPT_SCN
-    strtolower(Style_className);
-#else
-#  if !OMIT_SCN_KEEPING
-    strtolower(Style_className_end_was);/*only the part that wasn't
-					  lowercased yet*/
-#   endif
-#endif
-
-#if OPT_SCN && !OMIT_SCN_KEEPING	/* Can be done in other cases too... */
+#if !OMIT_SCN_KEEPING		/* Can be done in other cases too... */
     if (!class_used && ElementNumber == HTML_INPUT) { /* For some other too? */
 	CONST char *type = "";
-	char *oend = Style_className_end;
-	int l, ohcode = hcode;
+	int ohcode = hcode;
 
 	if (present && present[HTML_INPUT_TYPE] && value[HTML_INPUT_TYPE])
 	    type = value[HTML_INPUT_TYPE];
-	l = strlen(type);
 
-	*Style_className_end = '.';
-	memcpy(Style_className_end+1, "type.", 5 );
-	memcpy(Style_className_end+6, type, l+1 );
-	Style_className_end += l+6;
 	hcode = hash_code_aggregate_lower_str(".type.", hcode);
 	hcode = hash_code_aggregate_lower_str(type, hcode);
 	if (!hashStyles[hcode].name) { /* None such -> classless version */
 	    hcode = ohcode;
-	    *oend = '\0';
 	    CTRACE2(TRACE_STYLE,
 		    (tfp, "STYLE.start_element: type <%s> not configured.\n",
 			   type));
 	} else {
+	    addClassName(".type.", type, strlen(type));
+
 	    CTRACE2(TRACE_STYLE,
 		    (tfp, "STYLE.start_element: <%s>.type.<%s>, hcode=%d.\n",
 			  HTML_dtd.tags[element_number].name, type, hcode));
 	}
     }
-#endif	/* OPT_SCN && !OMIT_SCN_KEEPING */
+#endif	/* !OMIT_SCN_KEEPING */
 
     HText_characterStyle(me->text, hcode, 1);
 #endif /* USE_COLOR_STYLE */
@@ -1225,12 +1145,14 @@ PRIVATE int HTML_start_element ARGS6(
 	if (present && present[HTML_BASE_HREF] && !local_host_only &&
 	    value[HTML_BASE_HREF] && *value[HTML_BASE_HREF]) {
 	    char *base = NULL;
-	    char *related = NULL;
+	    CONST char *related = NULL;
 
 	    StrAllocCopy(base, value[HTML_BASE_HREF]);
+	    CTRACE((tfp, "*HTML_BASE: initial href=`%s'\n", NonNull(base)));
+
 	    if (!(url_type = LYLegitimizeHREF(me, &base, TRUE, TRUE))) {
 		CTRACE((tfp, "HTML: BASE '%s' is not an absolute URL.\n",
-			    (base ? base : "")));
+			    NonNull(base)));
 		if (me->inBadBASE == FALSE)
 		    HTAlert(BASE_NOT_ABSOLUTE);
 		me->inBadBASE = TRUE;
@@ -1245,69 +1167,61 @@ PRIVATE int HTML_start_element ARGS6(
 		 *  resolution of relative URLs anyway.  We can
 		 *  also strip the #map part. - kw
 		 */
-		temp = HTParse(base + 11, "",
-			       PARSE_ACCESS+PARSE_HOST+PARSE_PATH
-			       +PARSE_PUNCTUATION);
-		if (temp) {
-		    FREE(base);
-		    base = temp;
-		    temp = NULL;
-		}
+		temp = base;
+		base = HTParse(base + 11, "", PARSE_ALL_WITHOUT_ANCHOR);
+		FREE(temp);
 	    }
 
 	    /*
 	     *	Get parent's address for defaulted fields.
 	     */
-	    StrAllocCopy(related, me->node_anchor->address);
+	    related = me->node_anchor->address;
 
 	    /*
 	     *	Create the access field.
 	     */
-	    if ((temp = HTParse(base, related,
-				PARSE_ACCESS+PARSE_PUNCTUATION)) &&
-		*temp != '\0') {
-		StrAllocCopy(me->base_href, temp);
-	    } else {
-		FREE(temp);
-		StrAllocCopy(me->base_href, (temp = HTParse(related, "",
-					 PARSE_ACCESS+PARSE_PUNCTUATION)));
-	    }
+	    temp = HTParse(base, related, PARSE_ACCESS+PARSE_PUNCTUATION);
+	    StrAllocCopy(me->base_href, temp);
 	    FREE(temp);
 
 	    /*
 	     *	Create the host[:port] field.
 	     */
-	    if ((temp = HTParse(base, "",
-				PARSE_HOST+PARSE_PUNCTUATION)) &&
-		!strncmp(temp, "//", 2)) {
+	    temp = HTParse(base, "", PARSE_HOST+PARSE_PUNCTUATION);
+	    if (!strncmp(temp, "//", 2)) {
 		StrAllocCat(me->base_href, temp);
 		if (!strcmp(me->base_href, "file://")) {
 		    StrAllocCat(me->base_href, "localhost");
 		}
 	    } else {
-		if (!strcmp(me->base_href, "file:")) {
+		if (isFILE_URL(me->base_href)) {
 		    StrAllocCat(me->base_href, "//localhost");
-		} else if (strcmp(me->base_href, "news:")) {
+		} else if (strcmp(me->base_href, STR_NEWS_URL)) {
 		    FREE(temp);
 		    StrAllocCat(me->base_href, (temp = HTParse(related, "",
 					    PARSE_HOST+PARSE_PUNCTUATION)));
 		}
 	    }
 	    FREE(temp);
-	    FREE(related);
 
 	    /*
 	     *	Create the path field.
 	     */
-	    if ((temp = HTParse(base, "",
-				PARSE_PATH+PARSE_PUNCTUATION)) &&
-		*temp != '\0') {
+	    temp = HTParse(base, "", PARSE_PATH+PARSE_PUNCTUATION);
+	    if (*temp != '\0') {
+		char *p = strchr(temp, '?');
+		if (p)
+		    *p = '\0';
+		p = strrchr(temp, '/');
+		if (p)
+		    *(p+1) = '\0';  /* strip after the last slash */
+
 		StrAllocCat(me->base_href, temp);
-	    } else if (!strcmp(me->base_href, "news:")) {
+	    } else if (!strcmp(me->base_href, STR_NEWS_URL)) {
 		StrAllocCat(me->base_href, "*");
-	    } else if (!strncmp(me->base_href, "news:", 5) ||
-		       !strncmp(me->base_href, "nntp:", 5) ||
-		       !strncmp(me->base_href, "snews:", 6)) {
+	    } else if (isNEWS_URL(me->base_href) ||
+		       isNNTP_URL(me->base_href) ||
+		       isSNEWS_URL(me->base_href)) {
 		StrAllocCat(me->base_href, "/*");
 	    } else {
 		StrAllocCat(me->base_href, "/");
@@ -1316,7 +1230,11 @@ PRIVATE int HTML_start_element ARGS6(
 	    FREE(base);
 
 	    me->inBASE = TRUE;
+	    me->node_anchor->inBASE = TRUE;
 	    StrAllocCopy(me->node_anchor->content_base, me->base_href);
+	    /* me->base_href is a valid URL */
+
+	    CTRACE((tfp, "*HTML_BASE: final href=`%s'\n", me->base_href));
 	}
 	break;
 
@@ -1330,44 +1248,26 @@ PRIVATE int HTML_start_element ARGS6(
 	break;
 
     case HTML_LINK:
-#ifndef DONT_TRACK_INTERNAL_LINKS
 	intern_flag = FALSE;
-#endif
 	if (present && present[HTML_LINK_HREF]) {
 	    CHECK_FOR_INTERN(intern_flag,value[HTML_LINK_HREF]);
 	    /*
 	     *	Prepare to do housekeeping on the reference. - FM
 	     */
 	    if (!value[HTML_LINK_HREF]) {
-		if (me->inBASE && me->base_href && *me->base_href) {
-		    StrAllocCopy(href, me->base_href);
-		} else {
-		    StrAllocCopy(href, me->node_anchor->address);
-		}
+		Base = (me->inBASE)
+			? me->base_href
+			: me->node_anchor->address;
+		StrAllocCopy(href, Base);
 	    } else {
 		StrAllocCopy(href, value[HTML_LINK_HREF]);
 		url_type = LYLegitimizeHREF(me, &href, TRUE, TRUE);
-	    }
 
-	    /*
-	     *	Check whether a base tag is in effect. - FM
-	     */
-	    if ((me->inBASE && *href != '\0' && *href != '#') &&
-		(temp = HTParse(href, me->base_href, PARSE_ALL)) &&
-		*temp != '\0')
-		/*
-		 *  Use reference related to the base.
-		 */
-		StrAllocCopy(href, temp);
-	    FREE(temp);
-
-	    /*
-	     *	Check whether to fill in localhost. - FM
-	     */
-	    LYFillLocalFileURL(&href,
-			       ((*href != '\0' && *href != '#' &&
-				 me->inBASE) ?
-			       me->base_href : me->node_anchor->address));
+		Base = (me->inBASE && *href != '\0' && *href != '#')
+			? me->base_href
+			: me->node_anchor->address;
+		HTParseALL(&href, Base);
+	    }
 
 	    /*
 	     *	Handle links with a REV attribute. - FM
@@ -1382,18 +1282,6 @@ PRIVATE int HTML_start_element ARGS6(
 		    /*
 		     *	Load the owner element. - FM
 		     */
-		    if (!is_url(href)) {
-			temp = HTParse(href,
-				       (me->inBASE ?
-				     me->base_href : me->node_anchor->address),
-					PARSE_ALL);
-			StrAllocCopy(href, temp);
-			FREE(temp);
-			LYFillLocalFileURL(&href,
-					   (me->inBASE ?
-					 me->base_href :
-					 me->node_anchor->address));
-		    }
 		    HTAnchor_setOwner(me->node_anchor, href);
 		    CTRACE((tfp, "HTML: DOC OWNER '%s' found\n", href));
 		    FREE(href);
@@ -1586,7 +1474,7 @@ PRIVATE int HTML_start_element ARGS6(
 				   : INTERN_LT);	/* Type */
 	    FREE(temp);
 	    if ((dest = HTAnchor_parent(
-			    HTAnchor_followMainLink((HTAnchor*)me->CurrentA)
+			    HTAnchor_followLink(me->CurrentA)
 				      )) != NULL) {
 		if (pdoctitle && !HTAnchor_title(dest))
 		    HTAnchor_setTitle(dest, *pdoctitle);
@@ -1660,9 +1548,6 @@ PRIVATE int HTML_start_element ARGS6(
 	if (((present)) &&
 	    ((present[HTML_ISINDEX_HREF] && value[HTML_ISINDEX_HREF]) ||
 	     (present[HTML_ISINDEX_ACTION] && value[HTML_ISINDEX_ACTION]))) {
-	    char * action = NULL;
-	    char * isindex_href = NULL;
-
 	    /*
 	     *	Lynx was supporting ACTION, which never made it into
 	     *	the HTML 2.0 specs.  HTML 3.0 uses HREF, so we'll
@@ -1670,39 +1555,22 @@ PRIVATE int HTML_start_element ARGS6(
 	     *	until people have fully switched over. - FM
 	     */
 	    if (present[HTML_ISINDEX_HREF] && value[HTML_ISINDEX_HREF])
-		StrAllocCopy(isindex_href, value[HTML_ISINDEX_HREF]);
+		StrAllocCopy(href, value[HTML_ISINDEX_HREF]);
 	    else
-		StrAllocCopy(isindex_href, value[HTML_ISINDEX_ACTION]);
-	    url_type = LYLegitimizeHREF(me, &isindex_href, TRUE, TRUE);
+		StrAllocCopy(href, value[HTML_ISINDEX_ACTION]);
+	    LYLegitimizeHREF(me, &href, TRUE, TRUE);
 
-	    /*
-	     *	Check whether a base tag is in effect.
-	     */
-	    if (me->inBASE && *isindex_href != '\0' && *isindex_href != '#')
-		action = HTParse(isindex_href, me->base_href, PARSE_ALL);
-	    if (!(action && *action))
-		action = HTParse(isindex_href,
-				 me->node_anchor->address, PARSE_ALL);
-	    FREE(isindex_href);
-
-	    if (action && *action) {
-		HTAnchor_setIndex(me->node_anchor, action);
-	    } else {
-		HTAnchor_setIndex(me->node_anchor, me->node_anchor->address);
-	    }
-	    FREE(action);
+	    Base = (me->inBASE && *href != '\0' && *href != '#')
+		    ? me->base_href
+		    : me->node_anchor->address;
+	    HTParseALL(&href, Base);
+	    HTAnchor_setIndex(me->node_anchor, href);
+	    FREE(href);
 
 	} else {
-	    if (me->inBASE)
-		/*
-		 *  Use base.
-		 */
-		HTAnchor_setIndex(me->node_anchor, me->base_href);
-	    else
-		/*
-		 *  Use index's address.
-		 */
-		HTAnchor_setIndex(me->node_anchor, me->node_anchor->address);
+	    Base = (me->inBASE) ?
+			me->base_href : me->node_anchor->address;
+	    HTAnchor_setIndex(me->node_anchor, Base);
 	}
 	/*
 	 *  Support HTML 3.0 PROMPT attribute. - FM
@@ -1763,30 +1631,9 @@ PRIVATE int HTML_start_element ARGS6(
 	    LYTrimTail(id_string);
 	}
 	if (present && present[HTML_FRAME_SRC] &&
-	    value[HTML_FRAME_SRC] && *value[HTML_FRAME_SRC] != '\0') {
+	    value[HTML_FRAME_SRC] && *value[HTML_FRAME_SRC]) {
 	    StrAllocCopy(href, value[HTML_FRAME_SRC]);
-	    CHECK_FOR_INTERN(intern_flag,href);
-	    url_type = LYLegitimizeHREF(me, &href, TRUE, TRUE);
-
-	    /*
-	     *	Check whether a base tag is in effect. - FM
-	     */
-	    if ((me->inBASE && *href != '\0' && *href != '#') &&
-		(temp = HTParse(href, me->base_href, PARSE_ALL)) &&
-		*temp != '\0')
-		/*
-		 *  Use reference related to the base.
-		 */
-		StrAllocCopy(href, temp);
-	    FREE(temp);
-
-	    /*
-	     *	Check whether to fill in localhost. - FM
-	     */
-	    LYFillLocalFileURL(&href,
-			       ((*href != '\0' && *href != '#' &&
-				 me->inBASE) ?
-			       me->base_href : me->node_anchor->address));
+	    LYLegitimizeHREF(me, &href, TRUE, TRUE);
 
 	    if (me->inA) {
 		SET_SKIP_STACK(HTML_A);
@@ -1796,7 +1643,7 @@ PRIVATE int HTML_start_element ARGS6(
 				me->node_anchor,	/* Parent */
 				NULL,			/* Tag */
 				href,			/* Addresss */
-				INTERN_LT);		/* Type */
+				(HTLinkType*)0);	/* Type */
 	    CAN_JUSTIFY_PUSH(FALSE);
 	    LYEnsureSingleSpace(me);
 	    if (me->inUnderline == FALSE)
@@ -1838,38 +1685,18 @@ PRIVATE int HTML_start_element ARGS6(
 	    LYTrimTail(id_string);
 	}
 	if (present && present[HTML_IFRAME_SRC] &&
-	    value[HTML_IFRAME_SRC] && *value[HTML_IFRAME_SRC] != '\0') {
+	    value[HTML_IFRAME_SRC] && *value[HTML_IFRAME_SRC]) {
 	    StrAllocCopy(href, value[HTML_IFRAME_SRC]);
-	    CHECK_FOR_INTERN(intern_flag,href);
-	    url_type = LYLegitimizeHREF(me, &href, TRUE, TRUE);
-
-	    /*
-	     *	Check whether a base tag is in effect. - FM
-	     */
-	    if ((me->inBASE && *href != '\0' && *href != '#') &&
-		(temp = HTParse(href, me->base_href, PARSE_ALL)) &&
-		*temp != '\0')
-		/*
-		 *  Use reference related to the base.
-		 */
-		StrAllocCopy(href, temp);
-	    FREE(temp);
-
-	    /*
-	     *	Check whether to fill in localhost. - FM
-	     */
-	    LYFillLocalFileURL(&href,
-			       ((*href != '\0' && *href != '#' &&
-				 me->inBASE) ?
-			       me->base_href : me->node_anchor->address));
+	    LYLegitimizeHREF(me, &href, TRUE, TRUE);
 
 	    if (me->inA)
 		HTML_end_element(me, HTML_A, include);
+
 	    me->CurrentA = HTAnchor_findChildAndLink(
 				me->node_anchor,	/* Parent */
 				NULL,			/* Tag */
 				href,			/* Addresss */
-				INTERN_LT);		/* Type */
+				(HTLinkType*)0);	/* Type */
 	    LYEnsureDoubleSpace(me);
 	    CAN_JUSTIFY_PUSH_F
 	    LYResetParagraphAlignment(me);
@@ -2093,8 +1920,8 @@ PRIVATE int HTML_start_element ARGS6(
 	   * Otherwise, don't do anything. -DH 980814, TD 980827
 	   */
 	if ((LYCollapseBRs == FALSE &&
-	     HText_PreviousLineSize(me->text, FALSE)) ||
-	    HText_LastLineSize(me->text, FALSE)) {
+	     !HText_PreviousLineEmpty(me->text, FALSE)) ||
+	    !HText_LastLineEmpty(me->text, FALSE)) {
 	    HText_setLastChar(me->text, ' ');  /* absorb white space */
 	    HText_appendCharacter(me->text, '\r');
 	}
@@ -2126,10 +1953,10 @@ PRIVATE int HTML_start_element ARGS6(
 	     *	the last line are blank. - FM
 	     */
 	    UPDATE_STYLE;
-	    if (HText_LastLineSize(me->text, FALSE)) {
+	    if (!HText_LastLineEmpty(me->text, FALSE)) {
 		HText_setLastChar(me->text, ' ');  /* absorb white space */
 		HText_appendCharacter(me->text, '\r');
-	    } else if (!HText_PreviousLineSize(me->text, FALSE)) {
+	    } else if (HText_PreviousLineEmpty(me->text, FALSE)) {
 		HText_RemovePreviousLine(me->text);
 	    }
 	    me->in_word = NO;
@@ -2195,10 +2022,10 @@ PRIVATE int HTML_start_element ARGS6(
 		me->Division_Level >= 0) {
 		me->sp->style->alignment =
 				me->DivisionAlignments[me->Division_Level];
-	    } else if (!strcmp(me->sp->style->name, "HeadingCenter") ||
-		       !strcmp(me->sp->style->name, "Heading1")) {
+	    } else if (me->sp->style->id == ST_HeadingCenter ||
+		       me->sp->style->id == ST_Heading1) {
 		me->sp->style->alignment = HT_CENTER;
-	    } else if (!strcmp(me->sp->style->name, "HeadingRight")) {
+	    } else if (me->sp->style->id == ST_HeadingRight) {
 		me->sp->style->alignment = HT_RIGHT;
 	    } else {
 		me->sp->style->alignment = HT_LEFT;
@@ -2390,9 +2217,7 @@ PRIVATE int HTML_start_element ARGS6(
 	break; /* ignore */
 
     case HTML_SUP:
-	if (isxdigit(UCH(HText_getLastChar(me->text)))) {
-	    HText_appendCharacter(me->text, '^');
-	}
+	HText_appendCharacter(me->text, '^');
 	CHECK_ID(HTML_GEN_ID);
 	break;
 
@@ -2590,7 +2415,7 @@ PRIVATE int HTML_start_element ARGS6(
 	CHECK_ID(HTML_GEN_ID);
 	HText_setLastChar(me->text, ' ');  /* absorb white space */
 	if (!me->style_change)	{
-	    if (HText_LastLineSize(me->text, FALSE)) {
+	    if (!HText_LastLineEmpty(me->text, FALSE)) {
 		HText_appendCharacter(me->text, '\r');
 	    } else {
 		HText_NegateLineOne(me->text);
@@ -3022,85 +2847,55 @@ PRIVATE int HTML_start_element ARGS6(
 		   value[HTML_A_NAME] && *value[HTML_A_NAME]) {
 	    StrAllocCopy(id_string, value[HTML_A_NAME]);
 	}
-	if (id_string) {
+	if (id_string)
 	    TRANSLATE_AND_UNESCAPE_TO_STD(&id_string);
-	    if (*id_string == '\0') {
-		FREE(id_string);
-	    }
-	}
 
 	/*
 	 *  Handle the reference. - FM
 	 */
 	if (present && present[HTML_A_HREF]) {
-#ifndef DONT_TRACK_INTERNAL_LINKS
-	    if (present[HTML_A_ISMAP])
-		intern_flag = FALSE;
-	    else
-		CHECK_FOR_INTERN(intern_flag,value[HTML_A_HREF]);
-#endif
 	    /*
-	     *	Prepare to do housekeeping on the reference. - FM
+	     * Set to know we are making the content bold.
 	     */
-	    if (!value[HTML_A_HREF] || *value[HTML_A_HREF] == '\0') {
-		StrAllocCopy(href, me->node_anchor->address);
-	    } else if (*value[HTML_A_HREF] == '#') {
-		StrAllocCopy(href, me->node_anchor->address);
-		if (strlen(value[HTML_A_HREF]) > 1) {
-		    StrAllocCat(href, value[HTML_A_HREF]);
-		}
-	    } else {
-		StrAllocCopy(href, value[HTML_A_HREF]);
-	    }
-	    url_type = LYLegitimizeHREF(me, &href, TRUE, TRUE);
+	    me->inBoldA = TRUE;
 
-	    /*
-	     *	Deal with our ftp gateway kludge. - FM
-	     */
-	    if (!url_type && !strncmp(href, "/foo/..", 7) &&
-		(!strncmp(me->node_anchor->address, "ftp:", 4) ||
-		 !strncmp(me->node_anchor->address, "file:", 5))) {
-		for (i = 0; (href[i] = href[i+7]) != 0; i++)
-		    ;
-	    }
+	    StrAllocCopy(href, value[HTML_A_HREF]);
+	    if (isEmpty(href))
+		StrAllocCopy(href, "#");
+	    CHECK_FOR_INTERN(intern_flag,href);	 /* '#'*/
 
-	    /*
-	     *	Set to know we are making the content bold.
-	     */
-	    me->inBoldA = TRUE;
+	    if (intern_flag) { /*** FAST WAY: ***/
+		TRANSLATE_AND_UNESCAPE_TO_STD(&href);
+
+	    } else {
+		url_type = LYLegitimizeHREF(me, &href, TRUE, TRUE);
 
-	    /*
-	     *	Check whether a base tag is in effect. - FM
-	     */
-	    if ((me->inBASE && *href != '\0' && *href != '#') &&
-		(temp = HTParse(href, me->base_href, PARSE_ALL)) &&
-		*temp != '\0')
 		/*
-		 *  Use reference related to the base.
+		 * Deal with our ftp gateway kludge.  - FM
 		 */
-		StrAllocCopy(href, temp);
-	    FREE(temp);
+		if (!url_type && !strncmp(href, "/foo/..", 7) &&
+		      (isFTP_URL(me->node_anchor->address) ||
+		       isFILE_URL(me->node_anchor->address))) {
+		    for (i = 0; (href[i] = href[i+7]) != 0; i++)
+			;
+		}
+	    }
 
-	    /*
-	     *	Check whether to fill in localhost. - FM
-	     */
-	    LYFillLocalFileURL(&href,
-			       ((*href != '\0' && *href != '#' &&
-				 me->inBASE) ?
-			       me->base_href : me->node_anchor->address));
+	    if (present[HTML_A_ISMAP]) /*???*/
+		intern_flag = FALSE;
 	} else {
 	    if (bold_name_anchors == TRUE) {
 		me->inBoldA = TRUE;
 	    }
 	}
-#ifndef DONT_TRACK_INTERNAL_LINKS
+
 	if (present && present[HTML_A_TYPE] && value[HTML_A_TYPE]) {
 	    StrAllocCopy(temp, value[HTML_A_TYPE]);
-	    if (!intern_flag && href &&
-		!strcasecomp(value[HTML_A_TYPE], HTAtom_name(LINK_INTERNAL)) &&
+	    if (!intern_flag &&
+		!strcasecomp(value[HTML_A_TYPE], HTAtom_name(HTInternalLink)) &&
 		!LYIsUIPage3(me->node_anchor->address, UIP_LIST_PAGE, 0) &&
 		!LYIsUIPage3(me->node_anchor->address, UIP_ADDRLIST_PAGE, 0) &&
-		0 != strncmp(me->node_anchor->address, "LYNXIMGMAP:", 11)) {
+		!isLYNXIMGMAP(me->node_anchor->address)) {
 		/* Some kind of spoof?
 		** Found TYPE="internal link" but not in a valid context
 		** where we have written it. - kw
@@ -3110,7 +2905,6 @@ PRIVATE int HTML_start_element ARGS6(
 		FREE(temp);
 	    }
 	}
-#endif /* DONT_TRACK_INTERNAL_LINKS */
 
 	me->CurrentA = HTAnchor_findChildAndLink(
 			me->node_anchor,			/* Parent */
@@ -3150,7 +2944,7 @@ PRIVATE int HTML_start_element ARGS6(
 	    }
 	    if (title != NULL || dest_ismap == TRUE || dest_char_set >= 0) {
 		dest = HTAnchor_parent(
-			HTAnchor_followMainLink((HTAnchor*)me->CurrentA)
+			HTAnchor_followLink(me->CurrentA)
 				      );
 	    }
 	    if (dest && title != NULL && HTAnchor_title(dest) == NULL)
@@ -3212,7 +3006,7 @@ PRIVATE int HTML_start_element ARGS6(
 	 */
 	if (me->inA && me->CurrentA) {
 	    if ((dest = HTAnchor_parent(
-			HTAnchor_followMainLink((HTAnchor*)me->CurrentA)
+			HTAnchor_followLink(me->CurrentA)
 				      )) != NULL) {
 		if (dest->isISMAPScript == TRUE) {
 		    dest_ismap = TRUE;
@@ -3227,9 +3021,7 @@ PRIVATE int HTML_start_element ARGS6(
 	    }
 	}
 
-#ifndef DONT_TRACK_INTERNAL_LINKS
 	intern_flag = FALSE;	/* unless set below - kw */
-#endif
 	/*
 	 *  If there's a USEMAP, resolve it. - FM
 	 */
@@ -3242,7 +3034,7 @@ PRIVATE int HTML_start_element ARGS6(
 	     *	If map_href ended up zero-length or otherwise doesn't
 	     *	have a hash, it can't be valid, so ignore it. - FM
 	     */
-	    if (strchr(map_href, '#') == NULL) {
+	    if (findPoundSelector(map_href) == NULL) {
 		FREE(map_href);
 	    }
 	}
@@ -3255,55 +3047,21 @@ PRIVATE int HTML_start_element ARGS6(
 	     *	If the MAP reference doesn't yet begin with a scheme,
 	     *	check whether a base tag is in effect. - FM
 	     */
-	    if (!url_type && me->inBASE) {
 		/*
 		 *  If the
 		 *  USEMAP value is a lone fragment and LYSeekFragMAPinCur
 		 *  is set, we'll use the current document's URL for
 		 *  resolving.	Otherwise use the BASE. - kw
 		 */
-		if ((*map_href == '#' &&
-		     LYSeekFragMAPinCur == TRUE)) {
-		    /*
-		     *	Use reference related to the current stream. - FM
-		     */
-		    temp = HTParse(map_href, me->node_anchor->address,
-				    PARSE_ALL);
-		    StrAllocCopy(map_href, temp);
-		    UseBASE = FALSE;
-		} else {
-		    /*
-		     *	Use reference related to the base. - FM
-		     */
-		    temp = HTParse(map_href, me->base_href, PARSE_ALL);
-		    StrAllocCopy(map_href, temp);
-		    UseBASE = TRUE;
-		}
-		FREE(temp);
-	    }
-
-	    /*
-	     *	Check whether to fill in localhost. - FM
-	     */
-	    LYFillLocalFileURL(&map_href,
-			       ((UseBASE && me->inBASE) ?
-			  me->base_href : me->node_anchor->address));
-	    UseBASE = TRUE;
-
-	    /*
-	     *	If it's not yet a URL, resolve versus
-	     *	the current document's address. - FM
-	     */
-	    if (!(url_type = is_url(map_href))) {
-		temp = HTParse(map_href, me->node_anchor->address, PARSE_ALL);
-		StrAllocCopy(map_href, temp);
-		FREE(temp);
-	    }
+	    Base = (me->inBASE &&
+			!(*map_href == '#' && LYSeekFragMAPinCur == TRUE)) ?
+				me->base_href : me->node_anchor->address;
+	    HTParseALL(&map_href, Base);
 
 	    /*
 	     *	Prepend our client-side MAP access field. - FM
 	     */
-	    StrAllocCopy(temp, "LYNXIMGMAP:");
+	    StrAllocCopy(temp, STR_LYNXIMGMAP);
 	    StrAllocCat(temp, map_href);
 	    StrAllocCopy(map_href, temp);
 	    FREE(temp);
@@ -3432,29 +3190,9 @@ PRIVATE int HTML_start_element ARGS6(
 	 */
 	if (clickable_images &&
 	    present && present[HTML_IMG_SRC] &&
-	    value[HTML_IMG_SRC] && *value[HTML_IMG_SRC] != '\0') {
+	    value[HTML_IMG_SRC] && *value[HTML_IMG_SRC]) {
 	    StrAllocCopy(href, value[HTML_IMG_SRC]);
-	    url_type = LYLegitimizeHREF(me, &href, TRUE, TRUE);
-
-	    /*
-	     *	Check whether a base tag is in effect. - FM
-	     */
-	    if ((me->inBASE && *href != '\0' && *href != '#') &&
-		(temp = HTParse(href, me->base_href, PARSE_ALL)) &&
-		*temp != '\0')
-		/*
-		 *  Use reference related to the base.
-		 */
-		StrAllocCopy(href, temp);
-	    FREE(temp);
-
-	    /*
-	     *	Check whether to fill in localhost. - FM
-	     */
-	    LYFillLocalFileURL(&href,
-			       ((*href != '\0' && *href != '#' &&
-				 me->inBASE) ?
-			       me->base_href : me->node_anchor->address));
+	    LYLegitimizeHREF(me, &href, TRUE, TRUE);
 
 	    /*
 	     *	If it's an ISMAP and/or USEMAP, or graphic for an
@@ -3501,7 +3239,7 @@ PRIVATE int HTML_start_element ARGS6(
 				INTERN_LT);		/* Type */
 		    if (me->CurrentA && title) {
 			if ((dest = HTAnchor_parent(
-				HTAnchor_followMainLink((HTAnchor*)me->CurrentA)
+				HTAnchor_followLink(me->CurrentA)
 						  )) != NULL) {
 			    if (!HTAnchor_title(dest))
 				HTAnchor_setTitle(dest, title);
@@ -3563,7 +3301,7 @@ PRIVATE int HTML_start_element ARGS6(
 				INTERN_LT);		/* Type */
 		if (me->CurrentA && title) {
 		    if ((dest = HTAnchor_parent(
-				HTAnchor_followMainLink((HTAnchor*)me->CurrentA)
+				HTAnchor_followLink(me->CurrentA)
 					      )) != NULL) {
 			if (!HTAnchor_title(dest))
 			    HTAnchor_setTitle(dest, title);
@@ -3667,7 +3405,7 @@ PRIVATE int HTML_start_element ARGS6(
 				INTERN_LT);		/* Type */
 	    if (me->CurrentA && title) {
 		if ((dest = HTAnchor_parent(
-				HTAnchor_followMainLink((HTAnchor*)me->CurrentA)
+				HTAnchor_followLink(me->CurrentA)
 					  )) != NULL) {
 		    if (!HTAnchor_title(dest))
 			HTAnchor_setTitle(dest, title);
@@ -3761,7 +3499,7 @@ PRIVATE int HTML_start_element ARGS6(
 	     *	set. - FM && KW
 	     */
 	    StrAllocCopy(me->map_address, me->node_anchor->address);
-	    if ((cp = strrchr(me->map_address, '#')) != NULL)
+	    if ((cp = strchr(me->map_address, '#')) != NULL)
 		*cp = '\0';
 	    StrAllocCat(me->map_address, "#");
 	    StrAllocCat(me->map_address, id_string);
@@ -3799,35 +3537,10 @@ PRIVATE int HTML_start_element ARGS6(
 	     *	HREF is a lone fragment and LYSeekFragAREAinCur
 	     *	is set. - FM
 	     */
-	    if (((me->inBASE && *href != '\0') &&
-		 !(*href == '#' && LYSeekFragAREAinCur == TRUE)) &&
-		(temp = HTParse(href, me->base_href, PARSE_ALL)) &&
-		*temp != '\0')
-		/*
-		 *  Use reference related to the base.
-		 */
-		StrAllocCopy(href, temp);
-	    FREE(temp);
-
-	    /*
-	     *	Check whether to fill in localhost. - FM
-	     */
-	    LYFillLocalFileURL(&href,
-			       ((((me->inBASE && *href != '\0') &&
-				  !(*href == '#' &&
-				    LYSeekFragAREAinCur == TRUE)))
-						?
-				  me->base_href : me->node_anchor->address));
-	    if (!(url_type = is_url(href))) {
-		temp = HTParse(href, me->node_anchor->address, PARSE_ALL);
-		if (!(temp && *temp)) {
-		   FREE(href);
-		   FREE(temp);
-		   break;
-		}
-		StrAllocCopy(href, temp);
-		FREE(temp);
-	    }
+	    Base = ((me->inBASE && *href != '\0') &&
+			!(*href == '#' && LYSeekFragAREAinCur == TRUE)) ?
+				me->base_href : me->node_anchor->address;
+	    HTParseALL(&href, Base);
 
 	    /*
 	     *	Check for an ALT. - FM
@@ -4093,30 +3806,10 @@ PRIVATE int HTML_start_element ARGS6(
     case HTML_OVERLAY:
 	if (clickable_images && me->inFIG &&
 	    present && present[HTML_OVERLAY_SRC] &&
-	    value[HTML_OVERLAY_SRC] && *value[HTML_OVERLAY_SRC] != '\0') {
+	    value[HTML_OVERLAY_SRC] && *value[HTML_OVERLAY_SRC]) {
 	    StrAllocCopy(href, value[HTML_OVERLAY_SRC]);
-	    CHECK_FOR_INTERN(intern_flag,href);
-	    url_type = LYLegitimizeHREF(me, &href, TRUE, TRUE);
+	    LYLegitimizeHREF(me, &href, TRUE, TRUE);
 	    if (*href) {
-		/*
-		 *  Check whether a base tag is in effect. - FM
-		 */
-		if ((me->inBASE && *href != '#') &&
-		    (temp = HTParse(href, me->base_href, PARSE_ALL)) &&
-		    *temp != '\0')
-		    /*
-		     *	Use reference related to the base.
-		     */
-		    StrAllocCopy(href, temp);
-		FREE(temp);
-
-		/*
-		 *  Check whether to fill in localhost. - FM
-		 */
-		LYFillLocalFileURL(&href,
-				   ((*href != '#' &&
-				     me->inBASE) ?
-				   me->base_href : me->node_anchor->address));
 
 		if (me->inA) {
 		    SET_SKIP_STACK(HTML_A);
@@ -4126,7 +3819,7 @@ PRIVATE int HTML_start_element ARGS6(
 					me->node_anchor,	/* Parent */
 					NULL,			/* Tag */
 					href,			/* Addresss */
-					INTERN_LT);		/* Type */
+					(HTLinkType*)0);	/* Type */
 		HTML_put_character(me, ' ');
 		HText_appendCharacter(me->text, '+');
 		me->CurrentANum = HText_beginAnchor(me->text,
@@ -4199,10 +3892,12 @@ PRIVATE int HTML_start_element ARGS6(
 	 *  If we're making all sources links, get the source. - FM
 	 */
 	if (clickable_images && present && present[HTML_APPLET_CODE] &&
-	    value[HTML_APPLET_CODE] && *value[HTML_APPLET_CODE] != '\0') {
+	    value[HTML_APPLET_CODE] && *value[HTML_APPLET_CODE]) {
 	    char * base = NULL;
-	    char * code = NULL;
 
+	    Base = (me->inBASE)
+		    ? me->base_href
+		    : me->node_anchor->address;
 	    /*
 	     *	Check for a CODEBASE attribute. - FM
 	     */
@@ -4217,43 +3912,17 @@ PRIVATE int HTML_start_element ARGS6(
 		if (*base == '\0')
 		    StrAllocCopy(base, "/");
 		LYAddHtmlSep(&base);
-		url_type = LYLegitimizeHREF(me, &base, TRUE, FALSE);
+		LYLegitimizeHREF(me, &base, TRUE, FALSE);
 
-		/*
-		 *  Check whether to fill in localhost. - FM
-		 */
-		LYFillLocalFileURL(&base,
-				   (me->inBASE ?
-				 me->base_href : me->node_anchor->address));
-
-		if (!(url_type = is_url(base))) {
-		    /*
-		     *	Check whether a base tag is in effect.
-		     */
-		    if (me->inBASE) {
-			temp = HTParse(base, me->base_href, PARSE_ALL);
-		    } else {
-			temp = HTParse(base, me->node_anchor->address,
-							PARSE_ALL);
-		    }
-		    StrAllocCopy(base, temp);
-		    FREE(temp);
-		}
-	    } else {
-		if (me->inBASE) {
-		    StrAllocCopy(base, me->base_href);
-		} else {
-		    StrAllocCopy(base, me->node_anchor->address);
-		}
+		HTParseALL(&base, Base);
 	    }
 
-	    StrAllocCopy(code, value[HTML_APPLET_CODE]);
-	    url_type = LYLegitimizeHREF(me, &code, TRUE, FALSE);
-	    href = HTParse(code, base, PARSE_ALL);
+	    StrAllocCopy(href, value[HTML_APPLET_CODE]);
+	    LYLegitimizeHREF(me, &href, TRUE, FALSE);
+	    HTParseALL(&href, (base ? base : Base));
 	    FREE(base);
-	    FREE(code);
 
-	    if (href && *href) {
+	    if (*href) {
 		if (me->inA) {
 		    if (me->inBoldA == TRUE && me->inBoldH == FALSE)
 			HText_appendCharacter(me->text, LY_BOLD_END_CHAR);
@@ -4298,35 +3967,14 @@ PRIVATE int HTML_start_element ARGS6(
 	 *  If we're making all sources links, get the source. - FM
 	 */
 	if (clickable_images && present && present[HTML_BGSOUND_SRC] &&
-	    value[HTML_BGSOUND_SRC] && *value[HTML_BGSOUND_SRC] != '\0') {
+	    value[HTML_BGSOUND_SRC] && *value[HTML_BGSOUND_SRC]) {
 	    StrAllocCopy(href, value[HTML_BGSOUND_SRC]);
-	    CHECK_FOR_INTERN(intern_flag,href);
-	    url_type = LYLegitimizeHREF(me, &href, TRUE, TRUE);
+	    LYLegitimizeHREF(me, &href, TRUE, TRUE);
 	    if (*href == '\0') {
 		FREE(href);
 		break;
 	    }
 
-	    /*
-	     *	Check whether a base tag is in effect. - FM
-	     */
-	    if ((me->inBASE && *href != '#') &&
-		(temp = HTParse(href, me->base_href, PARSE_ALL)) &&
-		*temp != '\0')
-		/*
-		 *  Use reference related to the base.
-		 */
-		StrAllocCopy(href, temp);
-	    FREE(temp);
-
-	    /*
-	     *	Check whether to fill in localhost. - FM
-	     */
-	    LYFillLocalFileURL(&href,
-			       ((*href != '#' &&
-				 me->inBASE) ?
-			       me->base_href : me->node_anchor->address));
-
 	    if (me->inA) {
 		if (me->inBoldA == TRUE && me->inBoldH == FALSE)
 		    HText_appendCharacter(me->text, LY_BOLD_END_CHAR);
@@ -4340,7 +3988,7 @@ PRIVATE int HTML_start_element ARGS6(
 					me->node_anchor,	/* Parent */
 					NULL,			/* Tag */
 					href,			/* Addresss */
-					INTERN_LT);		/* Type */
+					(HTLinkType*)0);	/* Type */
 	    me->CurrentANum = HText_beginAnchor(me->text,
 						me->inUnderline,
 						me->CurrentA);
@@ -4412,31 +4060,10 @@ PRIVATE int HTML_start_element ARGS6(
 	 *  If we're making all sources links, get the source. - FM
 	 */
 	if (clickable_images && present && present[HTML_EMBED_SRC] &&
-	    value[HTML_EMBED_SRC] && *value[HTML_EMBED_SRC] != '\0') {
+	    value[HTML_EMBED_SRC] && *value[HTML_EMBED_SRC]) {
 	    StrAllocCopy(href, value[HTML_EMBED_SRC]);
-	    CHECK_FOR_INTERN(intern_flag,href);
-	    url_type = LYLegitimizeHREF(me, &href, TRUE, TRUE);
-	    if (*href != '\0') {
-		/*
-		 *  Check whether a base tag is in effect. - FM
-		 */
-		if ((me->inBASE && *href != '#') &&
-		    (temp = HTParse(href, me->base_href, PARSE_ALL)) &&
-		    *temp != '\0')
-		    /*
-		     *	Use reference related to the base.
-		     */
-		    StrAllocCopy(href, temp);
-		FREE(temp);
-
-		/*
-		 *  Check whether to fill in localhost. - FM
-		 */
-		LYFillLocalFileURL(&href,
-				   ((*href != '#' &&
-				     me->inBASE) ?
-				   me->base_href : me->node_anchor->address));
-
+	    LYLegitimizeHREF(me, &href, TRUE, TRUE);
+	    if (*href) {
 		if (me->inA) {
 		    if (me->inBoldA == TRUE && me->inBoldH == FALSE)
 			HText_appendCharacter(me->text, LY_BOLD_END_CHAR);
@@ -4447,7 +4074,7 @@ PRIVATE int HTML_start_element ARGS6(
 					me->node_anchor,	/* Parent */
 					NULL,			/* Tag */
 					href,			/* Addresss */
-					INTERN_LT);		/* Type */
+					(HTLinkType*)0);	/* Type */
 		me->CurrentANum = HText_beginAnchor(me->text,
 						    me->inUnderline,
 						    me->CurrentA);
@@ -4576,63 +4203,43 @@ PRIVATE int HTML_start_element ARGS6(
 		accept_cs = value[HTML_FORM_ACCEPT_CHARSET] ?
 			    value[HTML_FORM_ACCEPT_CHARSET] : "UNKNOWN";
 	    }
+
+	    Base = (me->inBASE)
+		    ? me->base_href
+		    : me->node_anchor->address;
+
 	    if (present && present[HTML_FORM_ACTION] &&
-		value[HTML_FORM_ACTION])  {
-		/*
-		 *  Prepare to do housekeeping on the reference. - FM
-		 */
+		value[HTML_FORM_ACTION]) {
+
 		StrAllocCopy(action, value[HTML_FORM_ACTION]);
-		url_type = LYLegitimizeHREF(me, &action, TRUE, TRUE);
+		LYLegitimizeHREF(me, &action, TRUE, TRUE);
 
 		/*
 		 *  Check whether a base tag is in effect.  Note that
 		 *  actions always are resolved w.r.t. to the base,
 		 *  even if the action is empty. - FM
 		 */
-		if ((me->inBASE && me->base_href && *me->base_href) &&
-		    (temp = HTParse(action, me->base_href, PARSE_ALL)) &&
-		    *temp != '\0') {
-		    /*
-		     *	Use action related to the base.
-		     */
-		    StrAllocCopy(action, temp);
-		} else if ((temp = HTParse(action,
-					   me->node_anchor->address,
-					   PARSE_ALL)) &&
-		    *temp != '\0') {
-		    /*
-		     *	Use action related to the current document.
-		     */
-		    StrAllocCopy(action, temp);
-		} else {
-		    FREE(action);
-		}
-		FREE(temp);
-	    }
-	    if (!(action && *action)) {
-		if (me->inBASE && me->base_href && *me->base_href) {
-		     StrAllocCopy(action, me->base_href);
-		} else {
-		     StrAllocCopy(action, me->node_anchor->address);
-		}
+		HTParseALL(&action, Base);
+
+	    } else {
+		StrAllocCopy(action, Base);
 	    }
-	    if (action) {
-		source = HTAnchor_findChildAndLink(me->node_anchor,
+
+	    source = HTAnchor_findChildAndLink(me->node_anchor,
 						   NULL,
 						   action,
 						   (HTLinkType*)0);
-		if ((link_dest = HTAnchor_followMainLink((HTAnchor *)source)) != NULL) {
-		    /*
-		     *	Memory leak fixed.
-		     *	05-28-94 Lynx 2-3-1 Garrett Arch Blythe
-		     */
-		    auto char *cp_freeme = HTAnchor_address(link_dest);
-		    if (cp_freeme != NULL) {
-			StrAllocCopy(action, cp_freeme);
-			FREE(cp_freeme);
-		    } else {
-			StrAllocCopy(action, "");
-		    }
+	    if ((link_dest = HTAnchor_followLink(source)) != NULL) {
+		/*
+		 *  Memory leak fixed.
+		 *  05-28-94 Lynx 2-3-1 Garrett Arch Blythe
+		 */
+		char* cp_freeme = HTAnchor_address(link_dest);
+		if (cp_freeme != NULL) {
+		    StrAllocCopy(action, cp_freeme);
+		    FREE(cp_freeme);
+		} else {
+		    StrAllocCopy(action, "");
 		}
 	    }
 
@@ -4926,6 +4533,9 @@ PRIVATE int HTML_start_element ARGS6(
 	     */
 	    if (present && present[HTML_INPUT_TYPE] &&
 		value[HTML_INPUT_TYPE] && *value[HTML_INPUT_TYPE]) {
+		char *not_impl = NULL;
+		char *usingval = NULL;
+
 		I.type = value[HTML_INPUT_TYPE];
 
 		if (!strcasecomp(I.type, "range")) {
@@ -4936,7 +4546,7 @@ PRIVATE int HTML_start_element ARGS6(
 		    /*
 		     *	Not yet implemented.
 		     */
-		    HTML_put_string(me,"[RANGE Input] (Not yet implemented.)");
+		    not_impl = "[RANGE Input]";
 #ifdef NOTDEFINED
 		    if (me->inFORM)
 			HText_DisableCurrentForm();
@@ -4947,27 +4557,15 @@ PRIVATE int HTML_start_element ARGS6(
 		} else if (!strcasecomp(I.type, "file")) {
 		    if (present[HTML_INPUT_ACCEPT])
 			I.accept = value[HTML_INPUT_ACCEPT];
-#ifdef EXP_FILE_UPLOAD
-		    /*
-		     *	Not yet implemented.
-		     */
-		    if (me->inUnderline == FALSE) {
-			HText_appendCharacter(me->text,
-					      LY_UNDERLINE_START_CHAR);
-		    }
-		    HTML_put_string(me,"[FILE Input] (Not yet implemented.)");
-		    if (me->inUnderline == FALSE) {
-			HText_appendCharacter(me->text,
-					      LY_UNDERLINE_END_CHAR);
-		    }
-#else
+#ifndef USE_FILE_UPLOAD
+		    not_impl = "[FILE Input]";
 		    CTRACE((tfp, "Attempting to fake as: %s\n", I.type));
-#endif /* EXP_FILE_UPLOAD */
 #ifdef NOTDEFINED
 		    if (me->inFORM)
 			HText_DisableCurrentForm();
 #endif /* NOTDEFINED */
 		    CTRACE((tfp, "HTML: Ignoring TYPE=\"file\"\n"));
+#endif /* USE_FILE_UPLOAD */
 
 		} else if (!strcasecomp(I.type, "button")) {
 		    /*
@@ -4976,6 +4574,23 @@ PRIVATE int HTML_start_element ARGS6(
 		    HTML_put_string(me,"[BUTTON] ");
 		    break;
 		}
+		if (not_impl != NULL) {
+		    if (me->inUnderline == FALSE) {
+			HText_appendCharacter(me->text,
+					      LY_UNDERLINE_START_CHAR);
+		    }
+		    HTML_put_string(me, not_impl);
+		    if (usingval != NULL) {
+			HTML_put_string(me, usingval);
+			FREE(usingval);
+		    } else {
+			HTML_put_string(me, " (not implemented)");
+		    }
+		    if (me->inUnderline == FALSE) {
+			HText_appendCharacter(me->text,
+					      LY_UNDERLINE_END_CHAR);
+		    }
+		}
 	    }
 
 	    /*
@@ -5057,28 +4672,8 @@ PRIVATE int HTML_start_element ARGS6(
 		 *  SRC's value a link if it's still not zero-length
 		 *  legitimizing it. - FM
 		 */
-		url_type = LYLegitimizeHREF(me, &href, TRUE, TRUE);
+		LYLegitimizeHREF(me, &href, TRUE, TRUE);
 		if (*href) {
-		    /*
-		     *	Check whether a base tag is in effect. - FM
-		     */
-		    if ((me->inBASE && *href != '#') &&
-			(temp = HTParse(href, me->base_href, PARSE_ALL)) &&
-			*temp != '\0')
-			/*
-			 *  Use reference related to the base.
-			 */
-			StrAllocCopy(href, temp);
-		    FREE(temp);
-
-		    /*
-		     *	Check whether to fill in localhost. - FM
-		     */
-		    LYFillLocalFileURL(&href,
-				       ((*href != '#' &&
-					 me->inBASE) ?
-				       me->base_href :
-				       me->node_anchor->address));
 
 		    if (me->inA) {
 			SET_SKIP_STACK(HTML_A);
@@ -5131,7 +4726,7 @@ PRIVATE int HTML_start_element ARGS6(
 		if (!I.type)
 		    me->UsePlainSpace = TRUE;
 		else if (!strcasecomp(I.type, "text") ||
-#ifdef EXP_FILE_UPLOAD
+#ifdef USE_FILE_UPLOAD
 			 !strcasecomp(I.type, "file") ||
 #endif
 			 !strcasecomp(I.type, "submit") ||
@@ -5238,7 +4833,7 @@ PRIVATE int HTML_start_element ARGS6(
 		I.md = value[HTML_INPUT_MD];
 
 	    chars = HText_beginInput(me->text, me->inUnderline, &I);
-#ifndef EXP_FILE_UPLOAD
+#ifndef USE_FILE_UPLOAD
 	    CTRACE((tfp, "I.%s have %d chars, or something\n", NONNULL(I.type), chars));
 #endif
 	    /*
@@ -5265,6 +4860,7 @@ PRIVATE int HTML_start_element ARGS6(
 		 *  expected to follow. - FM
 		 */
 		HTML_put_string(me, "(_)");
+		HText_endInput(me->text);
 		chars = 0;
 		me->in_word = YES;
 		if (me->sp[0].tag_number != HTML_PRE &&
@@ -5280,6 +4876,7 @@ PRIVATE int HTML_start_element ARGS6(
 		 *  expected to follow. - FM
 		 */
 		HTML_put_string(me, "[_]");
+		HText_endInput(me->text);
 		chars = 0;
 		me->in_word = YES;
 		if (me->sp[0].tag_number != HTML_PRE &&
@@ -5313,7 +4910,7 @@ PRIVATE int HTML_start_element ARGS6(
 		}
 		HText_setIgnoreExcess(me->text, TRUE);
 	    }
-#ifndef EXP_FILE_UPLOAD
+#ifndef USE_FILE_UPLOAD
 	    CTRACE((tfp, "I.%s, %d\n", NONNULL(I.type), IsSubmitOrReset));
 #endif
 	    if (IsSubmitOrReset == FALSE) {
@@ -5322,8 +4919,11 @@ PRIVATE int HTML_start_element ARGS6(
 		 *  so output the rest of the underscore
 		 *  placeholders, if any more are needed. - FM
 		 */
-		for (; chars > 0; chars--)
-		    HTML_put_character(me, '_');
+		if (chars > 0) {
+		    for (; chars > 0; chars--)
+			HTML_put_character(me, '_');
+		    HText_endInput(me->text);
+		}
 	    } else {
 		if (HTCJK == JAPANESE) {
 		    kcode = HText_getKcode(me->text);
@@ -5376,6 +4976,9 @@ PRIVATE int HTML_start_element ARGS6(
 		    HText_updateSpecifiedKcode(me->text, specified_kcode);
 		}
 	    }
+	    if (chars != 0) {
+		HText_endInput(me->text);
+	    }
 	    HText_setIgnoreExcess(me->text, FALSE);
 	    FREE(ImageSrc);
 	    FREE(I_value);
@@ -5539,7 +5142,7 @@ PRIVATE int HTML_start_element ARGS6(
 	    }
 
 	    /*
-	     *	If its not a multiple option list and select popups
+	     *	If it's not a multiple option list and select popups
 	     *	are enabled, then don't use the checkbox/button method,
 	     *	and don't put anything on the screen yet.
 	     */
@@ -5655,7 +5258,6 @@ PRIVATE int HTML_start_element ARGS6(
 		me->LastOptionChecked = FALSE;
 	    me->first_option = FALSE;
 
-
 	    if (present && present[HTML_OPTION_VALUE] &&
 		value[HTML_OPTION_VALUE]) {
 		if (!I_value) {
@@ -5682,7 +5284,7 @@ PRIVATE int HTML_start_element ARGS6(
 	     */
 	    if (HTCurSelectGroupType == F_RADIO_TYPE &&
 		LYSelectPopups &&
-		keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) {
+		fields_are_numbered()) {
 		char marker[8];
 		int opnum = HText_getOptionNum(me->text);
 
@@ -5728,7 +5330,7 @@ PRIVATE int HTML_start_element ARGS6(
 	    HTML_end_element(me, HTML_U, include);
 	}
 	me->inTABLE = TRUE;
-	if (!strcmp(me->sp->style->name, "Preformatted")) {
+	if (me->sp->style->id == ST_Preformatted) {
 	    UPDATE_STYLE;
 	    CHECK_ID(HTML_TABLE_ID);
 	    break;
@@ -5743,7 +5345,6 @@ PRIVATE int HTML_start_element ARGS6(
 	if (present && present[HTML_TABLE_ALIGN] &&
 	    value[HTML_TABLE_ALIGN] && *value[HTML_TABLE_ALIGN]) {
 	    if (!strcasecomp(value[HTML_TABLE_ALIGN], "center")) {
-#ifdef SH_EX	/* 1998/10/09 (Fri) 15:20:09 */
 		if (no_table_center) {
 		    me->DivisionAlignments[me->Division_Level] = HT_LEFT;
 		    change_paragraph_style(me, styles[HTML_DLEFT]);
@@ -5757,12 +5358,7 @@ PRIVATE int HTML_start_element ARGS6(
 		    me->current_default_alignment =
 					styles[HTML_DCENTER]->alignment;
 		}
-#else
-		me->DivisionAlignments[me->Division_Level] = HT_CENTER;
-		change_paragraph_style(me, styles[HTML_DCENTER]);
-		UPDATE_STYLE;
-		me->current_default_alignment = styles[HTML_DCENTER]->alignment;
-#endif
+
 		stbl_align = HT_CENTER;
 
 	    } else if (!strcasecomp(value[HTML_TABLE_ALIGN], "right")) {
@@ -5807,13 +5403,13 @@ PRIVATE int HTML_start_element ARGS6(
 	    HTML_end_element(me, HTML_U, include);
 	}
 	UPDATE_STYLE;
-	if (HText_LastLineSize(me->text, FALSE)) {
+	if (!HText_LastLineEmpty(me->text, FALSE)) {
 	    HText_setLastChar(me->text, ' ');  /* absorb white space */
 	    HText_appendCharacter(me->text, '\r');
 	}
 	me->in_word = NO;
 
-	if (!strcmp(me->sp->style->name, "Preformatted")) {
+	if (me->sp->style->id == ST_Preformatted) {
 	    CHECK_ID(HTML_TR_ID);
 	    me->inP = FALSE;
 /*	    HText_cancelStbl(me->text);  seems unnecessary here - kw */
@@ -5823,8 +5419,8 @@ PRIVATE int HTML_start_element ARGS6(
 	    me->sp->style->alignment = styles[me->sp[0].tag_number]->alignment;
 	} else if (me->List_Nesting_Level >= 0 ||
 		   ((me->Division_Level < 0) &&
-		    (!strcmp(me->sp->style->name, "Normal") ||
-		     !strcmp(me->sp->style->name, "Preformatted")))) {
+		    (me->sp->style->id == ST_Normal ||
+		     me->sp->style->id == ST_Preformatted))) {
 		me->sp->style->alignment = HT_LEFT;
 	} else {
 	    me->sp->style->alignment = (short) me->current_default_alignment;
@@ -5832,14 +5428,10 @@ PRIVATE int HTML_start_element ARGS6(
 	if (present && present[HTML_TR_ALIGN] && value[HTML_TR_ALIGN]) {
 	    if (!strcasecomp(value[HTML_TR_ALIGN], "center") &&
 		!(me->List_Nesting_Level >= 0 && !me->inP)) {
-#ifdef SH_EX
 		if (no_table_center)
 		    me->sp->style->alignment = HT_LEFT;
 		else
 		    me->sp->style->alignment = HT_CENTER;
-#else
-		me->sp->style->alignment = HT_CENTER;
-#endif
 		stbl_align = HT_CENTER;
 	    } else if (!strcasecomp(value[HTML_TR_ALIGN], "right") &&
 		       !(me->List_Nesting_Level >= 0 && !me->inP)) {
@@ -6032,17 +5624,12 @@ PRIVATE int HTML_start_element ARGS6(
 		(tfp, "STYLE.begin_element:ending \"EMPTY\" element style\n"));
 	HText_characterStyle(me->text, HCODE_TO_STACK_OFF(hcode), STACK_OFF);
 
-#if !OPT_SCN
-	TrimColorClass(HTML_dtd.tags[element_number].name,
-		       Style_className, &hcode);
-#else
 #  if !OMIT_SCN_KEEPING
 	FastTrimColorClass(HTML_dtd.tags[element_number].name,
 			   HTML_dtd.tags[element_number].name_len,
 			   Style_className,
 			   &Style_className_end, &hcode);
 #  endif
-#endif
     }
 #endif /* USE_COLOR_STYLE */
     return status;
@@ -6461,10 +6048,10 @@ PRIVATE int HTML_end_element ARGS3(
 	if (me->Division_Level >= 0) {
 	    me->sp->style->alignment =
 				me->DivisionAlignments[me->Division_Level];
-	} else if (!strcmp(me->sp->style->name, "HeadingCenter") ||
-		   !strcmp(me->sp->style->name, "Heading1")) {
+	} else if (me->sp->style->id == ST_HeadingCenter ||
+		   me->sp->style->id == ST_Heading1) {
 	    me->sp->style->alignment = HT_CENTER;
-	} else if (!strcmp(me->sp->style->name, "HeadingRight")) {
+	} else if (me->sp->style->id == ST_HeadingRight) {
 	    me->sp->style->alignment = HT_RIGHT;
 	} else {
 	    me->sp->style->alignment = HT_LEFT;
@@ -7518,6 +7105,7 @@ End_Object:
 		 */
 		if (!me->first_option) {
 		    HText_appendCharacter(me->text, ']');
+		    HText_endInput(me->text);
 		    HText_setLastChar(me->text, ']');
 		    me->in_word = YES;
 		}
@@ -7543,7 +7131,7 @@ End_Object:
 #endif
 	me->inTABLE = FALSE;
 
-	if (!strcmp(me->sp->style->name, "Preformatted")) {
+	if (me->sp->style->id == ST_Preformatted) {
 	    break;
 	}
 	if (me->Division_Level >= 0)
@@ -7553,12 +7141,16 @@ End_Object:
 				me->DivisionAlignments[me->Division_Level];
 	change_paragraph_style(me, me->sp->style);
 	UPDATE_STYLE;
+
 #ifdef EXP_NESTED_TABLES
 	if (nested_tables) {
 	    me->inTABLE = HText_endStblTABLE(me->text);
-	} else
-#endif
+	} else {
+	    HText_endStblTABLE(me->text);
+	}
+#else
 	HText_endStblTABLE(me->text);
+#endif
 
 	me->current_default_alignment = me->sp->style->alignment;
 	if (me->List_Nesting_Level >= 0)
@@ -7568,7 +7160,7 @@ End_Object:
 /* These TABLE related elements may now not be SGML_EMPTY. - kw */
     case HTML_TR:
 	HText_endStblTR(me->text);
-	if (HText_LastLineSize(me->text, FALSE)) {
+	if (!HText_LastLineEmpty(me->text, FALSE)) {
 	    HText_setLastChar(me->text, ' ');  /* absorb next white space */
 	    HText_appendCharacter(me->text, '\r');
 	}
@@ -7641,17 +7233,12 @@ End_Object:
 
 #ifdef USE_COLOR_STYLE
     if (!skip_stack_requested) { /*don't emit stylechanges if skipped stack element - VH*/
-#if !OPT_SCN
-	TrimColorClass(HTML_dtd.tags[element_number].name,
-		       Style_className, &hcode);
-#else
 # if !OMIT_SCN_KEEPING
 	FastTrimColorClass(HTML_dtd.tags[element_number].name,
 			   HTML_dtd.tags[element_number].name_len,
 			   Style_className,
 			   &Style_className_end, &hcode);
 #  endif
-#endif
 
 	if (!ReallyEmptyTagNum(element_number))
 	{
@@ -7853,23 +7440,18 @@ PRIVATE void HTML_free ARGS1(HTStructured *, me)
 	(*me->targetClass._free)(me->target);
     }
     if (me->sp && me->sp->style && me->sp->style->name) {
-	if (!strcmp(me->sp->style->name, "DivCenter") ||
-	    !strcmp(me->sp->style->name, "HeadingCenter") ||
-	    !strcmp(me->sp->style->name, "Heading1")) {
+	if (me->sp->style->id == ST_DivCenter ||
+	    me->sp->style->id == ST_HeadingCenter ||
+	    me->sp->style->id == ST_Heading1) {
 	    me->sp->style->alignment = HT_CENTER;
-	} else if (!strcmp(me->sp->style->name, "DivRight") ||
-		   !strcmp(me->sp->style->name, "HeadingRight")) {
+	} else if (me->sp->style->id == ST_DivRight ||
+		   me->sp->style->id == ST_HeadingRight) {
 	    me->sp->style->alignment = HT_RIGHT;
 	} else	{
 	    me->sp->style->alignment = HT_LEFT;
 	}
 	styles[HTML_PRE]->alignment = HT_LEFT;
     }
-#ifdef USE_COLOR_STYLE
-# if !OPT_SCN
-    FREE(Style_className);
-# endif
-#endif
     FREE(me->base_href);
     FREE(me->map_address);
     FREE(me->LastOptionValue);
@@ -7943,23 +7525,18 @@ PRIVATE void HTML_abort ARGS2(HTStructured *, me, HTError, e)
 	(*me->targetClass._abort)(me->target, e);
     }
     if (me->sp && me->sp->style && me->sp->style->name) {
-	if (!strcmp(me->sp->style->name, "DivCenter") ||
-	    !strcmp(me->sp->style->name, "HeadingCenter") ||
-	    !strcmp(me->sp->style->name, "Heading1")) {
+	if (me->sp->style->id == ST_DivCenter ||
+	    me->sp->style->id == ST_HeadingCenter ||
+	    me->sp->style->id == ST_Heading1) {
 	    me->sp->style->alignment = HT_CENTER;
-	} else if (!strcmp(me->sp->style->name, "DivRight") ||
-		   !strcmp(me->sp->style->name, "HeadingRight")) {
+	} else if (me->sp->style->id == ST_DivRight ||
+		   me->sp->style->id == ST_HeadingRight) {
 	    me->sp->style->alignment = HT_RIGHT;
 	} else	{
 	    me->sp->style->alignment = HT_LEFT;
 	}
 	styles[HTML_PRE]->alignment = HT_LEFT;
     }
-#ifdef USE_COLOR_STYLE
-# if !OPT_SCN
-    FREE(Style_className);
-# endif
-#endif
     FREE(me->base_href);
     FREE(me->map_address);
     FREE(me->textarea_name);
@@ -7977,71 +7554,73 @@ PRIVATE void HTML_abort ARGS2(HTStructured *, me, HTError, e)
 */
 PRIVATE void get_styles NOARGS
 {
-    styleSheet = DefaultStyle();
-    default_style =		HTStyleNamed(styleSheet, "Normal");
-
-    styles[HTML_H1] =		HTStyleNamed(styleSheet, "Heading1");
-    styles[HTML_H2] =		HTStyleNamed(styleSheet, "Heading2");
-    styles[HTML_H3] =		HTStyleNamed(styleSheet, "Heading3");
-    styles[HTML_H4] =		HTStyleNamed(styleSheet, "Heading4");
-    styles[HTML_H5] =		HTStyleNamed(styleSheet, "Heading5");
-    styles[HTML_H6] =		HTStyleNamed(styleSheet, "Heading6");
-    styles[HTML_HCENTER] =	HTStyleNamed(styleSheet, "HeadingCenter");
-    styles[HTML_HLEFT] =	HTStyleNamed(styleSheet, "HeadingLeft");
-    styles[HTML_HRIGHT] =	HTStyleNamed(styleSheet, "HeadingRight");
-
-    styles[HTML_DCENTER] =	HTStyleNamed(styleSheet, "DivCenter");
-    styles[HTML_DLEFT] =	HTStyleNamed(styleSheet, "DivLeft");
-    styles[HTML_DRIGHT] =	HTStyleNamed(styleSheet, "DivRight");
-
-    styles[HTML_DL] =		HTStyleNamed(styleSheet, "Glossary");
+    HTStyle** st = NULL;
+    styleSheet = DefaultStyle(&st);  /* sets st[] array */
+
+    default_style =		st[ST_Normal];
+
+    styles[HTML_H1] =		st[ST_Heading1];
+    styles[HTML_H2] =		st[ST_Heading2];
+    styles[HTML_H3] =		st[ST_Heading3];
+    styles[HTML_H4] =		st[ST_Heading4];
+    styles[HTML_H5] =		st[ST_Heading5];
+    styles[HTML_H6] =		st[ST_Heading6];
+    styles[HTML_HCENTER] =	st[ST_HeadingCenter];
+    styles[HTML_HLEFT] =	st[ST_HeadingLeft];
+    styles[HTML_HRIGHT] =	st[ST_HeadingRight];
+
+    styles[HTML_DCENTER] =	st[ST_DivCenter];
+    styles[HTML_DLEFT] =	st[ST_DivLeft];
+    styles[HTML_DRIGHT] =	st[ST_DivRight];
+
+    styles[HTML_DL] =		st[ST_Glossary];
 	/* nested list styles */
-    styles[HTML_DL1] =		HTStyleNamed(styleSheet, "Glossary1");
-    styles[HTML_DL2] =		HTStyleNamed(styleSheet, "Glossary2");
-    styles[HTML_DL3] =		HTStyleNamed(styleSheet, "Glossary3");
-    styles[HTML_DL4] =		HTStyleNamed(styleSheet, "Glossary4");
-    styles[HTML_DL5] =		HTStyleNamed(styleSheet, "Glossary5");
-    styles[HTML_DL6] =		HTStyleNamed(styleSheet, "Glossary6");
+    styles[HTML_DL1] =		st[ST_Glossary1];
+    styles[HTML_DL2] =		st[ST_Glossary2];
+    styles[HTML_DL3] =		st[ST_Glossary3];
+    styles[HTML_DL4] =		st[ST_Glossary4];
+    styles[HTML_DL5] =		st[ST_Glossary5];
+    styles[HTML_DL6] =		st[ST_Glossary6];
 
     styles[HTML_UL] =
-    styles[HTML_OL] =		HTStyleNamed(styleSheet, "List");
+    styles[HTML_OL] =		st[ST_List];
 	/* nested list styles */
-    styles[HTML_OL1] =		HTStyleNamed(styleSheet, "List1");
-    styles[HTML_OL2] =		HTStyleNamed(styleSheet, "List2");
-    styles[HTML_OL3] =		HTStyleNamed(styleSheet, "List3");
-    styles[HTML_OL4] =		HTStyleNamed(styleSheet, "List4");
-    styles[HTML_OL5] =		HTStyleNamed(styleSheet, "List5");
-    styles[HTML_OL6] =		HTStyleNamed(styleSheet, "List6");
+    styles[HTML_OL1] =		st[ST_List1];
+    styles[HTML_OL2] =		st[ST_List2];
+    styles[HTML_OL3] =		st[ST_List3];
+    styles[HTML_OL4] =		st[ST_List4];
+    styles[HTML_OL5] =		st[ST_List5];
+    styles[HTML_OL6] =		st[ST_List6];
 
     styles[HTML_MENU] =
-    styles[HTML_DIR] =		HTStyleNamed(styleSheet, "Menu");
+    styles[HTML_DIR] =		st[ST_Menu];
 	/* nested list styles */
-    styles[HTML_MENU1] =	HTStyleNamed(styleSheet, "Menu1");
-    styles[HTML_MENU2] =	HTStyleNamed(styleSheet, "Menu2");
-    styles[HTML_MENU3] =	HTStyleNamed(styleSheet, "Menu3");
-    styles[HTML_MENU4] =	HTStyleNamed(styleSheet, "Menu4");
-    styles[HTML_MENU5] =	HTStyleNamed(styleSheet, "Menu5");
-    styles[HTML_MENU6] =	HTStyleNamed(styleSheet, "Menu6");
-
-    styles[HTML_DLC] =		HTStyleNamed(styleSheet, "GlossaryCompact");
+    styles[HTML_MENU1] =	st[ST_Menu1];
+    styles[HTML_MENU2] =	st[ST_Menu2];
+    styles[HTML_MENU3] =	st[ST_Menu3];
+    styles[HTML_MENU4] =	st[ST_Menu4];
+    styles[HTML_MENU5] =	st[ST_Menu5];
+    styles[HTML_MENU6] =	st[ST_Menu6];
+
+    styles[HTML_DLC] =		st[ST_GlossaryCompact];
 	/* nested list styles */
-    styles[HTML_DLC1] =		HTStyleNamed(styleSheet, "GlossaryCompact1");
-    styles[HTML_DLC2] =		HTStyleNamed(styleSheet, "GlossaryCompact2");
-    styles[HTML_DLC3] =		HTStyleNamed(styleSheet, "GlossaryCompact3");
-    styles[HTML_DLC4] =		HTStyleNamed(styleSheet, "GlossaryCompact4");
-    styles[HTML_DLC5] =		HTStyleNamed(styleSheet, "GlossaryCompact5");
-    styles[HTML_DLC6] =		HTStyleNamed(styleSheet, "GlossaryCompact6");
-
-    styles[HTML_ADDRESS] =	HTStyleNamed(styleSheet, "Address");
-    styles[HTML_BANNER] =	HTStyleNamed(styleSheet, "Banner");
-    styles[HTML_BLOCKQUOTE] =	HTStyleNamed(styleSheet, "Blockquote");
-    styles[HTML_BQ] =		HTStyleNamed(styleSheet, "Bq");
-    styles[HTML_FN] =		HTStyleNamed(styleSheet, "Footnote");
-    styles[HTML_NOTE] =		HTStyleNamed(styleSheet, "Note");
+    styles[HTML_DLC1] =		st[ST_GlossaryCompact1];
+    styles[HTML_DLC2] =		st[ST_GlossaryCompact2];
+    styles[HTML_DLC3] =		st[ST_GlossaryCompact3];
+    styles[HTML_DLC4] =		st[ST_GlossaryCompact4];
+    styles[HTML_DLC5] =		st[ST_GlossaryCompact5];
+    styles[HTML_DLC6] =		st[ST_GlossaryCompact6];
+
+    styles[HTML_ADDRESS] =	st[ST_Address];
+    styles[HTML_BANNER] =	st[ST_Banner];
+    styles[HTML_BLOCKQUOTE] =	st[ST_Blockquote];
+    styles[HTML_BQ] =		st[ST_Bq];
+    styles[HTML_FN] =		st[ST_Footnote];
+    styles[HTML_NOTE] =		st[ST_Note];
     styles[HTML_PLAINTEXT] =
-    styles[HTML_XMP] =		HTStyleNamed(styleSheet, "Example");
-    styles[HTML_PRE] =		HTStyleNamed(styleSheet, "Preformatted");
-    styles[HTML_LISTING] =	HTStyleNamed(styleSheet, "Listing");
+    styles[HTML_XMP] =		st[ST_Example];
+    styles[HTML_PRE] =		st[ST_Preformatted];
+    styles[HTML_LISTING] =	st[ST_Listing];
 }
 
 /*
@@ -8188,6 +7767,7 @@ PUBLIC HTStructured* HTML_new ARGS3(
     me->inBadHREF = FALSE;
     me->inBadHTML = FALSE;
     me->inBASE = FALSE;
+    me->node_anchor->inBASE = FALSE;
     me->inBoldA = FALSE;
     me->inBoldH = FALSE;
     me->inCAPTION = FALSE;
@@ -8209,11 +7789,12 @@ PUBLIC HTStructured* HTML_new ARGS3(
     me->comment_end = NULL;
 
 #ifdef USE_COLOR_STYLE
-# if !OPT_SCN
-    FREE(Style_className);
-# else
-    Style_className_end = Style_className;
-# endif
+#ifdef LY_FIND_LEAKS
+    if (Style_className == 0) {
+	atexit(free_Style_className);
+    }
+#endif
+    addClassName("", "", 0);
     class_string[0] = '\0';
 #endif
 
@@ -8261,7 +7842,7 @@ PUBLIC HTStructured* HTML_new ARGS3(
     return (HTStructured*) me;
 }
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 
 /*
  *  A flag set by a file write error.  Used for only generating an alert
@@ -8436,9 +8017,10 @@ PRIVATE HTStream* CacheThru_new ARGS2(
 	return target;
 
 #ifndef DEBUG_SOURCE_CACHE
-    /*  Only remote HTML documents may benefits from HTreparse_document(), */
+    /*  Only remote HTML documents may benefit from HTreparse_document(),  */
     /*  oh, assume http protocol:                                          */
-    if (strcmp(p->name, "http") != 0) {
+    if (strcmp(p->name, "http") != 0
+     && strcmp(p->name, "https") != 0) {
 	CTRACE((tfp, "SourceCacheWriter: Protocol is \"%s\"; not caching\n", p->name));
 	return target;
     }
diff --git a/gnu/usr.bin/lynx/src/HTML.h b/gnu/usr.bin/lynx/src/HTML.h
index 81cbfbcc08f..a324ae10de6 100644
--- a/gnu/usr.bin/lynx/src/HTML.h
+++ b/gnu/usr.bin/lynx/src/HTML.h
@@ -66,9 +66,9 @@ typedef struct _stack_element {
 #define MAX_NESTING 800		/* Should be checked by parser */
 
 struct _HTStructured {
-    CONST HTStructuredClass * 	isa;
-    HTParentAnchor * 		node_anchor;
-    HText * 			text;
+    CONST HTStructuredClass *	isa;
+    HTParentAnchor *		node_anchor;
+    HText *			text;
 
     HTStream*			target;			/* Output stream */
     HTStreamClass		targetClass;		/* Output routines */
@@ -78,7 +78,7 @@ struct _HTStructured {
     char *			base_href;	/* current HTML_BASE href */
     char *			map_address;	/* current HTML_MAP address */
 
-    HTChunk 			title;		/* Grow by 128 */
+    HTChunk			title;		/* Grow by 128 */
     HTChunk			object;		/* Grow by 128 */
     BOOL			object_started;
     BOOL			object_declare;
@@ -94,7 +94,7 @@ struct _HTStructured {
     char *			object_codetype;
     char *			object_name;
     int				objects_mixed_open,
-    				objects_figged_open;
+				objects_figged_open;
     HTChunk			option;		/* Grow by 128 */
     BOOL			first_option;	/* First OPTION in SELECT? */
     char *			LastOptionValue;
@@ -105,7 +105,7 @@ struct _HTStructured {
     int				textarea_name_cs;
     char *			textarea_accept_cs;
     char *			textarea_cols;
-    int 			textarea_rows;
+    int				textarea_rows;
     int				textarea_disabled;
     char *			textarea_id;
     HTChunk			math;		/* Grow by 128 */
@@ -116,10 +116,10 @@ struct _HTStructured {
      *  Used for nested lists. - FM
      */
     int		List_Nesting_Level;	/* counter for list nesting level */
-    int 	OL_Counter[12];		/* counter for ordered lists */
-    char 	OL_Type[12];		/* types for ordered lists */
-    int 	Last_OL_Count;		/* last count in ordered lists */
-    char 	Last_OL_Type;		/* last type in ordered lists */
+    int		OL_Counter[12];		/* counter for ordered lists */
+    char	OL_Type[12];		/* types for ordered lists */
+    int		Last_OL_Count;		/* last count in ordered lists */
+    char	Last_OL_Type;		/* last type in ordered lists */
 
     int				Division_Level;
     short			DivisionAlignments[MAX_NESTING];
@@ -139,8 +139,8 @@ struct _HTStructured {
     HTStyle *			old_style;
     int				current_default_alignment;
     BOOL			in_word;  /* Have just had a non-white char */
-    stack_element 	stack[MAX_NESTING];
-    stack_element 	*sp;		/* Style stack pointer */
+    stack_element	stack[MAX_NESTING];
+    stack_element	*sp;		/* Style stack pointer */
     BOOL		stack_overrun;	/* Was MAX_NESTING exceeded? */
     int			skip_stack; /* flag to skip next style stack operation */
 
@@ -212,7 +212,7 @@ struct _HTStructured {
     */
     UCTransParams	T;
 
-    int 		tag_charset; /* charset for attribute values etc. */
+    int			tag_charset; /* charset for attribute values etc. */
 };
 
 extern  HTStyle *LYstyles PARAMS((int style_number));
@@ -285,4 +285,3 @@ extern int HTLoadError PARAMS((
 	CONST char *	message));
 
 #endif /* HTML_H */
-
diff --git a/gnu/usr.bin/lynx/src/LYBookmark.c b/gnu/usr.bin/lynx/src/LYBookmark.c
index f5a5d911a13..6f333c767ad 100644
--- a/gnu/usr.bin/lynx/src/LYBookmark.c
+++ b/gnu/usr.bin/lynx/src/LYBookmark.c
@@ -1,5 +1,6 @@
 #include <HTUtils.h>
 #include <HTAlert.h>
+#include <HTFile.h>
 #include <LYUtils.h>
 #include <LYStrings.h>
 #include <LYBookmark.h>
@@ -118,6 +119,7 @@ PUBLIC char * get_bookmark_filename ARGS1(
 	 * Check if it is a mosaic hotlist.
 	 */
 	if (LYSafeGets(&string_buffer, fp) != 0
+	 && *LYTrimNewline(string_buffer) != '\0'
 	 && !strncmp(string_buffer, "ncsa-xmosaic-hotlist-format-1", 29)) {
 	    char *newname;
 	    /*
@@ -150,7 +152,6 @@ PRIVATE char * convert_mosaic_bookmark_file ARGS1(
     FILE *fp, *nfp;
     char *buf = NULL;
     int line = -2;
-    char *endline;
 
     LYRemoveTemp(newfile);
     if ((nfp = LYOpenTemp(newfile, HTML_SUFFIX, "w")) == NULL) {
@@ -170,16 +171,9 @@ PRIVATE char * convert_mosaic_bookmark_file ARGS1(
      been remapped by you or your system administrator."));
 
     while ((LYSafeGets(&buf, fp)) != NULL) {
-	if(line >= 0) {
-	    endline = &buf[strlen(buf)-1];
-	    if(*endline == '\n')
-		*endline = '\0';
-#ifdef DOSPATH	/* 1998/01/10 (Sat) 15:41:35 */
-	    endline = strchr(buf, '\r');
-	    if (endline == NULL)
-		*endline = '\0';
-#endif
-	    if((line % 2) == 0) { /* even lines */
+	if (line >= 0) {
+	    LYTrimNewline(buf);
+	    if ((line % 2) == 0) { /* even lines */
 		if(*buf != '\0') {
 		    strtok(buf," "); /* kill everything after the space */
 		    fprintf(nfp,"<LI><a href=\"%s\">",buf); /* the URL */
@@ -271,15 +265,18 @@ PUBLIC void save_bookmark_link ARGS2(
      *	If the link will be added to the same
      *	bookmark file, get confirmation. - FM
      */
-    if (LYMultiBookmarks != MBM_OFF &&
-	strstr(HTLoadedDocumentURL(),
-	       (*BookmarkPage == '.' ?
-		    (BookmarkPage+1) : BookmarkPage)) != NULL) {
-	LYMBM_statusline(MULTIBOOKMARKS_SELF);
-	c = LYgetch_single();
-	if (c != 'L') {
-	    FREE(bookmark_URL);
-	    return;
+    if (LYMultiBookmarks != MBM_OFF) {
+	CONST char *url = HTLoadedDocumentURL();
+	CONST char *page = (*BookmarkPage == '.')
+			    ? (BookmarkPage + 1)
+			    : BookmarkPage;
+	if (strstr(url, page) != NULL) {
+	    LYMBM_statusline(MULTIBOOKMARKS_SELF);
+	    c = LYgetch_single();
+	    if (c != 'L') {
+		FREE(bookmark_URL);
+		return;
+	    }
 	}
     }
 
@@ -420,18 +417,16 @@ Note: if you edit this file manually\n\
      */
     if (!first_time && nhist > 0 && bookmark_URL) {
 	for (i = 0; i < nhist; i++) {
-	    if (history[i].bookmark &&
-		!strcmp(history[i].address, bookmark_URL)) {
-		WWWDoc.address = history[i].address;
+	    if (HDOC(i).bookmark &&
+		!strcmp(HDOC(i).address, bookmark_URL)) {
+		WWWDoc.address = HDOC(i).address;
 		WWWDoc.post_data = NULL;
 		WWWDoc.post_content_type = NULL;
-		WWWDoc.bookmark = history[i].bookmark;
+		WWWDoc.bookmark = HDOC(i).bookmark;
 		WWWDoc.isHEAD = FALSE;
 		WWWDoc.safe = FALSE;
-		if (((tmpanchor = HTAnchor_parent(
-					HTAnchor_findAddress(&WWWDoc)
-						 )) != NULL) &&
-		    (text = (HText *)HTAnchor_document(tmpanchor)) != NULL) {
+		tmpanchor = HTAnchor_findAddress(&WWWDoc);
+		if ((text = (HText *)HTAnchor_document(tmpanchor)) != NULL) {
 		    HText_setNoCache(text);
 		}
 		break;
@@ -573,7 +568,7 @@ PUBLIC void remove_bookmark_link ARGS2(
     }
     LYCloseTempFP(nfp);
     nfp = NULL;
-#ifdef DOSPATH
+#if defined(DOSPATH) || defined(__EMX__)
     remove(filename_buffer);
 #endif /* DOSPATH */
 
@@ -612,10 +607,10 @@ PUBLIC void remove_bookmark_link ARGS2(
 #endif  /* UNIX */
 
     if (rename(newfile, filename_buffer) != -1) {
-#ifdef UNIX
+#ifdef MULTI_USER_UNIX
 	if (regular)
 	    chmod(filename_buffer, stat_buf.st_mode & 07777);
-#endif /* UNIX */
+#endif
 	HTSYS_purge(filename_buffer);
 	return;
     } else {
@@ -641,22 +636,25 @@ PUBLIC void remove_bookmark_link ARGS2(
 	if (errno == EXDEV) {
 	    static CONST char MV_FMT[] = "%s %s %s";
 	    char *buffer = 0;
-	    HTAddParam(&buffer, MV_FMT, 1, MV_PATH);
-	    HTAddParam(&buffer, MV_FMT, 2, newfile);
-	    HTAddParam(&buffer, MV_FMT, 3, filename_buffer);
-	    HTEndParam(&buffer, MV_FMT, 3);
-	    if (LYSystem(buffer) == 0) {
-#ifdef UNIX
-		if (regular)
-		    chmod(filename_buffer, stat_buf.st_mode & 07777);
-#endif /* UNIX */
-		FREE(buffer);
-		return;
-	    } else {
-		FREE(buffer);
-		keep_tempfile = TRUE;
-		goto failure;
+	    CONST char *program;
+
+	    if ((program = HTGetProgramPath(ppMV)) != NULL) {
+		HTAddParam(&buffer, MV_FMT, 1, program);
+		HTAddParam(&buffer, MV_FMT, 2, newfile);
+		HTAddParam(&buffer, MV_FMT, 3, filename_buffer);
+		HTEndParam(&buffer, MV_FMT, 3);
+		if (LYSystem(buffer) == 0) {
+#ifdef MULTI_USER_UNIX
+		    if (regular)
+			chmod(filename_buffer, stat_buf.st_mode & 07777);
+#endif
+		    FREE(buffer);
+		    return;
+		}
 	    }
+	    FREE(buffer);
+	    keep_tempfile = TRUE;
+	    goto failure;
 	}
 	CTRACE((tfp, "rename(): %s", LYStrerror(errno)));
 #endif /* _WINDOWS */
@@ -719,7 +717,7 @@ get_advanced_choice:
 	    c = LYCharINTERRUPT2;
 	}
 #endif /* VMS */
-	if (LYisNonAlnumKeyname(c, LYK_PREV_DOC) || LYCharIsINTERRUPT(c)) {
+	if (LYisNonAlnumKeyname(c, LYK_PREV_DOC) || LYCharIsINTERRUPT_HARD(c)) {
 	    /*
 	     *	Treat left-arrow, ^G, or ^C as cancel.
 	     */
@@ -871,15 +869,15 @@ PUBLIC int select_menu_multi_bookmarks NOARGS
 	if (MBM_screens > 1) {
 	    LYmove(LYlines-2, 0);
 	    LYaddstr("'");
-	    start_bold();
+	    lynx_start_bold();
 	    LYaddstr("[");
-	    stop_bold();
+	    lynx_stop_bold();
 	    LYaddstr("' ");
 	    LYaddstr(PREVIOUS);
 	    LYaddstr(", '");
-	    start_bold();
+	    lynx_start_bold();
 	    LYaddstr("]");
-	    stop_bold();
+	    lynx_stop_bold();
 	    LYaddstr("' ");
 	    LYaddstr(NEXT_SCREEN);
 	}
diff --git a/gnu/usr.bin/lynx/src/LYBookmark.h b/gnu/usr.bin/lynx/src/LYBookmark.h
index 681777e5f5d..e90a2e455f3 100644
--- a/gnu/usr.bin/lynx/src/LYBookmark.h
+++ b/gnu/usr.bin/lynx/src/LYBookmark.h
@@ -18,4 +18,3 @@ extern void save_bookmark_link PARAMS((char *address, char *title));
 extern void set_default_bookmark_page PARAMS((char * value));
 
 #endif /* LYBOOKMARK_H */
-
diff --git a/gnu/usr.bin/lynx/src/LYCgi.c b/gnu/usr.bin/lynx/src/LYCgi.c
index cbd8ed05c1e..4c819ffe2f4 100644
--- a/gnu/usr.bin/lynx/src/LYCgi.c
+++ b/gnu/usr.bin/lynx/src/LYCgi.c
@@ -130,7 +130,7 @@ PUBLIC void add_lynxcgi_environment ARGS1(
 {
     char *env_value;
 
-    env_value = getenv(variable_name);
+    env_value = LYGetEnv(variable_name);
     if (env_value != NULL) {
 	char *add_value = NULL;
 
@@ -140,6 +140,16 @@ PUBLIC void add_lynxcgi_environment ARGS1(
     }
 }
 
+#ifdef __MINGW32__
+PRIVATE int LYLoadCGI ARGS4(
+	CONST char *, 		arg,
+	HTParentAnchor *,	anAnchor,
+	HTFormat,		format_out,
+	HTStream*,		sink)
+{
+	return -1;
+}
+#else
 PRIVATE int LYLoadCGI ARGS4(
 	CONST char *, 		arg,
 	HTParentAnchor *,	anAnchor,
@@ -160,7 +170,7 @@ PRIVATE int LYLoadCGI ARGS4(
     char *pgm_buff = NULL;		/* PATH_INFO extraction buffer       */
     char *path_translated;		/* From document_root/path_info      */
 
-    if (!arg || !*arg || strlen(arg) <= 8) {
+    if (isEmpty(arg) || strlen(arg) <= 8) {
 	HTAlert(BAD_REQUEST);
 	status = -2;
 	return(status);
@@ -178,7 +188,7 @@ PRIVATE int LYLoadCGI ARGS4(
     }
 
     StrAllocCopy(orig_pgm, pgm);
-    if ((cp=strchr(pgm, '#')) != NULL) {
+    if ((cp = trimPoundSelector(pgm)) != NULL) {
 	/*
 	 *  Strip a #fragment from path.  In this case any pgm_args
 	 *  found above will also be bogus, since the '?' came after
@@ -186,7 +196,6 @@ PRIVATE int LYLoadCGI ARGS4(
 	 *  handle the case where a '#' appears after a '?' properly
 	 *  according to URL rules. - kw
 	 */
-	*cp = '\0';
 	pgm_args = NULL;
     }
     HTUnEscape(pgm);
@@ -319,7 +328,7 @@ PRIVATE int LYLoadCGI ARGS4(
 	HTStream *target  = NULL;		/* Unconverted data */
 	int fd1[2], fd2[2];
 	char buf[1024];
-	pid_t pid;
+	int pid;
 #ifdef HAVE_TYPE_UNIONWAIT
 	union wait wstatus;
 #else
@@ -389,16 +398,20 @@ PRIVATE int LYLoadCGI ARGS4(
 
 		if (anAnchor->post_data) {
 		    int written, remaining, total_written = 0;
+
 		    close(fd1[0]);
 
 		    /* We have form data to push across the pipe */
-		    CTRACE((tfp, "LYNXCGI: Doing post, content-type '%s'\n",
+		    if (TRACE) {
+			CTRACE((tfp, "LYNXCGI: Doing post, content-type '%s'\n",
 				anAnchor->post_content_type));
-		    CTRACE((tfp, "LYNXCGI: Writing:\n%s----------------------------------\n",
-				anAnchor->post_data));
-		    remaining = strlen(anAnchor->post_data);
+			CTRACE((tfp, "LYNXCGI: Writing:\n"));
+			trace_bstring(anAnchor->post_data);
+			CTRACE((tfp, "----------------------------------\n"));
+		    }
+		    remaining = BStrLen(anAnchor->post_data);
 		    while ((written = write(fd1[1],
-					    anAnchor->post_data + total_written,
+					    BStrData(anAnchor->post_data) + total_written,
 					    remaining)) != 0) {
 			if (written < 0) {
 #ifdef EINTR
@@ -515,7 +528,7 @@ PRIVATE int LYLoadCGI ARGS4(
 		    add_environment_value("REQUEST_METHOD=POST");
 
 		    HTSprintf0(&post_len, "CONTENT_LENGTH=%d",
-			    strlen(anAnchor->post_data));
+			       BStrLen(anAnchor->post_data));
 		    add_environment_value(post_len);
 		} else {
 		    close(fileno(stdin));
@@ -681,6 +694,7 @@ PRIVATE int LYLoadCGI ARGS4(
 #endif /* LYNXCGI_LINKS */
     return(status);
 }
+#endif /* __MINGW32__ */
 
 #ifdef GLOBALDEF_IS_MACRO
 #define _LYCGI_C_GLOBALDEF_1_INIT { "lynxcgi", LYLoadCGI, 0 }
diff --git a/gnu/usr.bin/lynx/src/LYCharSets.c b/gnu/usr.bin/lynx/src/LYCharSets.c
index 4e96b57641f..410d7131732 100644
--- a/gnu/usr.bin/lynx/src/LYCharSets.c
+++ b/gnu/usr.bin/lynx/src/LYCharSets.c
@@ -4,6 +4,7 @@
 
 #include <LYGlobalDefs.h>
 #include <UCMap.h>
+#include <UCdomap.h>
 #include <UCDefs.h>
 #include <LYCharSets.h>
 #include <GridText.h>
@@ -12,17 +13,11 @@
 
 #include <LYLeaks.h>
 
-extern BOOL HTPassEightBitRaw;
-extern BOOL HTPassEightBitNum;
-extern BOOL HTPassHighCtrlRaw;
-extern BOOL HTPassHighCtrlNum;
 PUBLIC HTkcode kanji_code = NOKANJI;
 PUBLIC BOOLEAN LYHaveCJKCharacterSet = FALSE;
 PUBLIC BOOLEAN DisplayCharsetMatchLocale = TRUE;
 PUBLIC BOOL force_old_UCLYhndl_on_reload = FALSE;
 PUBLIC int forced_UCLYhdnl;
-extern void UCInit NOARGS;
-extern int UCInitialized;
 PUBLIC int LYNumCharsets = 0;  /* Will be initialized later by UC_Register. */
 PUBLIC int current_char_set = -1; /* will be intitialized later in LYMain.c */
 PUBLIC CONST char** p_entity_values = NULL; /* Pointer, for HTML_put_entity()*/
@@ -383,8 +378,6 @@ PUBLIC LYUCcharset LYCharSet_UC[MAXCHARSETS]=
                        UCT_REP_SUBSETOF_LAT1,
                        UCT_CP_SUBSETOF_LAT1,   UCT_R_ASCII,UCT_R_ASCII},
 
-/*  {-1,"iso-8859-15",   UCT_ENC_8BIT,0,0,0,     UCT_R_8BIT,UCT_R_ASCII}, */
-
 };
 
 /*
@@ -692,6 +685,8 @@ PRIVATE CONST names_pairs OLD_charset_names[] = {
     {"ISO 8859-6 Arabic",   "iso-8859-6"},
     {"ISO 8859-7 Greek",    "iso-8859-7"},
     {"ISO 8859-8 Hebrew",   "iso-8859-8"},
+    {"ISO-8859-8-I",        "iso-8859-8"},
+    {"ISO-8859-8-E",        "iso-8859-8"},
     {"ISO 8859-9 (Latin 5)","iso-8859-9"},
     {"ISO 8859-10",         "iso-8859-10"},
     {"UNICODE UTF 8",       "utf-8"},
@@ -713,6 +708,8 @@ PUBLIC int UCGetLYhndl_byAnyName ARGS1 (char *, value)
     LYTrimTrailing(value);
     if (value == NULL) return -1;
 
+    CTRACE((tfp, "UCGetLYhndl_byAnyName(%s)\n", value));
+
     /* search by name */
     for (i = 0; (i < MAXCHARSETS && LYchar_set_names[i]); i++) {
 	if (!strcmp(value, LYchar_set_names[i])) {
@@ -739,17 +736,17 @@ PUBLIC int UCGetLYhndl_byAnyName ARGS1 (char *, value)
  */
 PRIVATE CONST char * LYEntityNames[] = {
 /*	 NAME		   DECIMAL VALUE */
-	"nbsp", 	/* 160, non breaking space */
+	"nbsp",		/* 160, non breaking space */
 	"iexcl",	/* 161, inverted exclamation mark */
-	"cent", 	/* 162, cent sign */
+	"cent",		/* 162, cent sign */
 	"pound",	/* 163, pound sign */
 	"curren",	/* 164, currency sign */
 	"yen",		/* 165, yen sign */
 	"brvbar",	/* 166, broken vertical bar, (brkbar) */
-	"sect", 	/* 167, section sign */
+	"sect",		/* 167, section sign */
 	"uml",		/* 168, spacing dieresis */
-	"copy", 	/* 169, copyright sign */
-	"ordf", 	/* 170, feminine ordinal indicator */
+	"copy",		/* 169, copyright sign */
+	"ordf",		/* 170, feminine ordinal indicator */
 	"laquo",	/* 171, angle quotation mark, left */
 	"not",		/* 172, negation sign */
 	"shy",		/* 173, soft hyphen */
@@ -757,15 +754,15 @@ PRIVATE CONST char * LYEntityNames[] = {
 	"hibar",	/* 175, spacing macron */
 	"deg",		/* 176, degree sign */
 	"plusmn",	/* 177, plus-or-minus sign */
-	"sup2", 	/* 178, superscript 2 */
-	"sup3", 	/* 179, superscript 3 */
+	"sup2",		/* 178, superscript 2 */
+	"sup3",		/* 179, superscript 3 */
 	"acute",	/* 180, spacing acute (96) */
 	"micro",	/* 181, micro sign */
-	"para", 	/* 182, paragraph sign */
+	"para",		/* 182, paragraph sign */
 	"middot",	/* 183, middle dot */
 	"cedil",	/* 184, spacing cedilla */
-	"sup1", 	/* 185, superscript 1 */
-	"ordm", 	/* 186, masculine ordinal indicator */
+	"sup1",		/* 185, superscript 1 */
+	"ordm",		/* 186, masculine ordinal indicator */
 	"raquo",	/* 187, angle quotation mark, right */
 	"frac14",	/* 188, fraction 1/4 */
 	"frac12",	/* 189, fraction 1/2 */
@@ -775,31 +772,31 @@ PRIVATE CONST char * LYEntityNames[] = {
 	"Aacute",	/* 193, capital A, acute accent */
 	"Acirc",	/* 194, capital A, circumflex accent */
 	"Atilde",	/* 195, capital A, tilde */
-	"Auml", 	/* 196, capital A, dieresis or umlaut mark */
+	"Auml",		/* 196, capital A, dieresis or umlaut mark */
 	"Aring",	/* 197, capital A, ring */
 	"AElig",	/* 198, capital AE diphthong (ligature) */
 	"Ccedil",	/* 199, capital C, cedilla */
 	"Egrave",	/* 200, capital E, grave accent */
 	"Eacute",	/* 201, capital E, acute accent */
 	"Ecirc",	/* 202, capital E, circumflex accent */
-	"Euml", 	/* 203, capital E, dieresis or umlaut mark */
+	"Euml",		/* 203, capital E, dieresis or umlaut mark */
 	"Igrave",	/* 204, capital I, grave accent */
 	"Iacute",	/* 205, capital I, acute accent */
 	"Icirc",	/* 206, capital I, circumflex accent */
-	"Iuml", 	/* 207, capital I, dieresis or umlaut mark */
+	"Iuml",		/* 207, capital I, dieresis or umlaut mark */
 	"ETH",		/* 208, capital Eth, Icelandic (or Latin2 Dstrok) */
 	"Ntilde",	/* 209, capital N, tilde */
 	"Ograve",	/* 210, capital O, grave accent */
 	"Oacute",	/* 211, capital O, acute accent */
 	"Ocirc",	/* 212, capital O, circumflex accent */
 	"Otilde",	/* 213, capital O, tilde */
-	"Ouml", 	/* 214, capital O, dieresis or umlaut mark */
+	"Ouml",		/* 214, capital O, dieresis or umlaut mark */
 	"times",	/* 215, multiplication sign */
 	"Oslash",	/* 216, capital O, slash */
 	"Ugrave",	/* 217, capital U, grave accent */
 	"Uacute",	/* 218, capital U, acute accent */
 	"Ucirc",	/* 219, capital U, circumflex accent */
-	"Uuml", 	/* 220, capital U, dieresis or umlaut mark */
+	"Uuml",		/* 220, capital U, dieresis or umlaut mark */
 	"Yacute",	/* 221, capital Y, acute accent */
 	"THORN",	/* 222, capital THORN, Icelandic */
 	"szlig",	/* 223, small sharp s, German (sz ligature) */
@@ -807,34 +804,34 @@ PRIVATE CONST char * LYEntityNames[] = {
 	"aacute",	/* 225, small a, acute accent */
 	"acirc",	/* 226, small a, circumflex accent */
 	"atilde",	/* 227, small a, tilde */
-	"auml", 	/* 228, small a, dieresis or umlaut mark */
+	"auml",		/* 228, small a, dieresis or umlaut mark */
 	"aring",	/* 229, small a, ring */
 	"aelig",	/* 230, small ae diphthong (ligature) */
 	"ccedil",	/* 231, small c, cedilla */
 	"egrave",	/* 232, small e, grave accent */
 	"eacute",	/* 233, small e, acute accent */
 	"ecirc",	/* 234, small e, circumflex accent */
-	"euml", 	/* 235, small e, dieresis or umlaut mark */
+	"euml",		/* 235, small e, dieresis or umlaut mark */
 	"igrave",	/* 236, small i, grave accent */
 	"iacute",	/* 237, small i, acute accent */
 	"icirc",	/* 238, small i, circumflex accent */
-	"iuml", 	/* 239, small i, dieresis or umlaut mark */
+	"iuml",		/* 239, small i, dieresis or umlaut mark */
 	"eth",		/* 240, small eth, Icelandic */
 	"ntilde",	/* 241, small n, tilde */
 	"ograve",	/* 242, small o, grave accent */
 	"oacute",	/* 243, small o, acute accent */
 	"ocirc",	/* 244, small o, circumflex accent */
 	"otilde",	/* 245, small o, tilde */
-	"ouml", 	/* 246, small o, dieresis or umlaut mark */
+	"ouml",		/* 246, small o, dieresis or umlaut mark */
 	"divide",	/* 247, division sign */
 	"oslash",	/* 248, small o, slash */
 	"ugrave",	/* 249, small u, grave accent */
 	"uacute",	/* 250, small u, acute accent */
 	"ucirc",	/* 251, small u, circumflex accent */
-	"uuml", 	/* 252, small u, dieresis or umlaut mark */
+	"uuml",		/* 252, small u, dieresis or umlaut mark */
 	"yacute",	/* 253, small y, acute accent */
 	"thorn",	/* 254, small thorn, Icelandic */
-	"yuml", 	/* 255, small y, dieresis or umlaut mark */
+	"yuml",		/* 255, small y, dieresis or umlaut mark */
 };
 
 /*
diff --git a/gnu/usr.bin/lynx/src/LYCharSets.h b/gnu/usr.bin/lynx/src/LYCharSets.h
index 709c016012d..051e9c90457 100644
--- a/gnu/usr.bin/lynx/src/LYCharSets.h
+++ b/gnu/usr.bin/lynx/src/LYCharSets.h
@@ -11,6 +11,10 @@
 #include <UCMap.h>
 #endif /* !UCMAP_H */
 
+extern BOOL HTPassEightBitRaw;
+extern BOOL HTPassEightBitNum;
+extern BOOL HTPassHighCtrlRaw;
+extern BOOL HTPassHighCtrlNum;
 extern BOOLEAN LYHaveCJKCharacterSet;
 extern BOOLEAN DisplayCharsetMatchLocale;
 
@@ -110,7 +114,7 @@ extern int auto_display_charset;
 enum switch_display_charset_t {
     SWITCH_DISPLAY_CHARSET_MAYBE,
     SWITCH_DISPLAY_CHARSET_REALLY,
-    SWITCH_DISPLAY_CHARSET_SIZECHANGE
+    SWITCH_DISPLAY_CHARSET_RESIZE
 };
 extern int Switch_Display_Charset PARAMS((int ord, enum switch_display_charset_t really));
 extern int Find_Best_Display_Charset PARAMS((int ord));
diff --git a/gnu/usr.bin/lynx/src/LYCharUtils.c b/gnu/usr.bin/lynx/src/LYCharUtils.c
index 8c5ae7df415..85a6538313c 100644
--- a/gnu/usr.bin/lynx/src/LYCharUtils.c
+++ b/gnu/usr.bin/lynx/src/LYCharUtils.c
@@ -38,11 +38,6 @@
 #include <LYexit.h>
 #include <LYLeaks.h>
 
-extern BOOL HTPassEightBitRaw;
-extern BOOL HTPassEightBitNum;
-extern BOOL HTPassHighCtrlRaw;
-extern BOOL HTPassHighCtrlNum;
-
 /*
  *  Used for nested lists. - FM
  */
@@ -69,7 +64,7 @@ PUBLIC void LYEntify ARGS2(
     int in_sjis = 0;
 #endif
 
-    if (p == NULL || *p == '\0')
+    if (isEmpty(p))
 	return;
 
     /*
@@ -232,18 +227,19 @@ PUBLIC void LYEntify ARGS2(
 PUBLIC void LYTrimHead ARGS1(
 	char *, str)
 {
-    int i = 0, j;
+    CONST char *s = str;
 
-    if (!str || *str == '\0')
+    if (isEmpty(s))
 	return;
 
-    while (str[i] != '\0' && WHITE(str[i]) && UCH(str[i]) != UCH(CH_ESC))   /* S/390 -- gil -- 1669 */
-	i++;
-    if (i > 0) {
-	for (j = 0; str[i] != '\0'; i++) {
-	    str[j++] = str[i];
+    while (*s && WHITE(*s) && UCH(*s) != UCH(CH_ESC))   /* S/390 -- gil -- 1669 */
+	s++;
+    if (s > str) {
+	char *ns = str;
+	while (*s) {
+	    *ns++ = *s++;
 	}
-	str[j] = '\0';
+	*ns = '\0';
     }
 }
 
@@ -257,10 +253,10 @@ PUBLIC void LYTrimTail ARGS1(
 {
     int i;
 
-    if (!str || *str == '\0')
+    if (isEmpty(str))
 	return;
 
-    i = (strlen(str) - 1);
+    i = strlen(str) - 1;
     while (i >= 0) {
 	if (WHITE(str[i]))
 	    str[i] = '\0';
@@ -395,17 +391,17 @@ PUBLIC void LYFillLocalFileURL ARGS2(
 {
     char * temp = NULL;
 
-    if (*href == NULL || *(*href) == '\0')
+    if (isEmpty(*href))
 	return;
 
     if (!strcmp(*href, "//") || !strncmp(*href, "///", 3)) {
-	if (base != NULL && !strncmp(base, "file:", 5)) {
-	    StrAllocCopy(temp, "file:");
+	if (base != NULL && isFILE_URL(base)) {
+	    StrAllocCopy(temp, STR_FILE_URL);
 	    StrAllocCat(temp, *href);
 	    StrAllocCopy(*href, temp);
 	}
     }
-    if (!strncmp(*href, "file:", 5)) {
+    if (isFILE_URL(*href)) {
 	if (*(*href+5) == '\0') {
 	    StrAllocCat(*href, "//localhost");
 	} else if (!strcmp(*href, "file://")) {
@@ -419,8 +415,8 @@ PUBLIC void LYFillLocalFileURL ARGS2(
 	}
     }
 
-#if defined(DOSPATH) || defined(__EMX__)
-    if (isalpha(*(*href)) && (*(*href+1) == ':'))  {
+#if defined(USE_DOS_DRIVES)
+    if (LYIsDosDrive(*href))  {
 	/*
 	 * If it's a local DOS path beginning with drive letter,
 	 * add file://localhost/ prefix and go ahead.
@@ -432,24 +428,23 @@ PUBLIC void LYFillLocalFileURL ARGS2(
     /* use below: strlen("file://localhost/") = 17 */
     if (!strncmp(*href, "file://localhost/", 17)
 	  && (strlen(*href) == 19)
-	  && isalpha(*(*href+17))
-	  && (*(*href+18) == ':')) {
+	  && LYIsDosDrive(*href+17)) {
 	/*
 	 * Terminate DOS drive letter with a slash to surf root successfully.
 	 * Here seems a proper place to do so.
 	 */
-	StrAllocCat(*href, "/");
+	LYAddPathSep(href);
     }
-#endif /* DOSPATH */
+#endif /* USE_DOS_DRIVES */
 
     /*
      * No path in a file://localhost URL means a
      * directory listing for the current default. - FM
      */
     if (!strcmp(*href, "file://localhost")) {
-	char *temp2;
+	CONST char *temp2;
 #ifdef VMS
-	temp2 = HTVMS_wwwName(getenv("PATH"));
+	temp2 = HTVMS_wwwName(LYGetEnv("PATH"));
 #else
 	char curdir[LY_MAXPATH];
 	temp2 = wwwName(Current_Dir(curdir));
@@ -1113,7 +1108,7 @@ PUBLIC char ** LYUCFullyTranslateString ARGS9(
     /*
     **	Make sure we have a non-empty string. - FM
     */
-    if (!str || *str == NULL || **str == '\0')
+    if (!str || isEmpty(*str))
 	return str;
 
     /*
@@ -1986,14 +1981,14 @@ PUBLIC char ** LYUCFullyTranslateString ARGS9(
     *q = '\0';
     if (chunk) {
 	HTChunkPutb(CHUNK, qs, q-qs + 1); /* also terminates */
-	if (stype == st_URL) {
+	if (stype == st_URL || stype == st_other) {
 	    LYTrimHead(chunk->data);
 	    LYTrimTail(chunk->data);
 	}
 	StrAllocCopy(*str, chunk->data);
 	HTChunkFree(chunk);
     } else {
-	if (stype == st_URL) {
+	if (stype == st_URL || stype == st_other) {
 	    LYTrimHead(qs);
 	    LYTrimTail(qs);
 	}
@@ -2038,6 +2033,78 @@ PUBLIC BOOL LYUCTranslateBackFormData ARGS4(
 }
 
 /*
+ * Parse a parameter from an HTML META tag, i.e., the CONTENT.
+ */
+PUBLIC char *LYParseTagParam ARGS2(
+	char *,		from,
+	char *,		name)
+{
+    size_t len = strlen(name);
+    char *result = NULL;
+    char *string = from;
+
+    do {
+	if ((string = strchr(string, ';')) == NULL)
+	    return NULL;
+	while (*string != '\0' && (*string == ';' || isspace(UCH(*string)))) {
+	    string++;
+	}
+	if (strlen(string) < len) return NULL;
+    } while (strncasecomp(string, name, len) != 0);
+    string += len;
+    while (*string != '\0' && (UCH(isspace(*string)) || *string == '=')) {
+	string++;
+    }
+
+    StrAllocCopy(result, string);
+    len = 0;
+    while (isprint(UCH(string[len])) && !isspace(UCH(string[len]))) {
+	len++;
+    }
+    result[len] = '\0';
+
+    /*
+     * Strip single quotes, just in case.
+     */
+    if (len > 2 && result[0] == '\'' && result[len-1] == result[0]) {
+	result[len-1] = '\0';
+	for (string = result; (string[0] = string[1]) != '\0'; ++string)
+	    ;
+    }
+    return result;
+}
+
+/*
+ * Given a refresh-URL content string, parses the delay time and the URL
+ * string.  Ignore the remainder of the content.
+ */
+PUBLIC void LYParseRefreshURL ARGS3(
+	char *,		content,
+	char **,	p_seconds,
+	char **,	p_address)
+{
+    char *cp;
+    char *cp1 = NULL;
+    char *Seconds = NULL;
+
+    /*
+     *  Look for the Seconds field. - FM
+     */
+    cp = LYSkipBlanks(content);
+    if (*cp && isdigit(UCH(*cp))) {
+	cp1 = cp;
+	while (*cp1 && isdigit(UCH(*cp1)))
+	    cp1++;
+	StrnAllocCopy(Seconds, cp, cp1 - cp);
+    }
+    *p_seconds = Seconds;
+    *p_address = LYParseTagParam(content, "URL");
+
+    CTRACE((tfp, "LYParseRefreshURL\n\tcontent: %s\n\tseconds: %s\n\taddress: %s\n",
+	   content, NonNull(*p_seconds), NonNull(*p_address)));
+}
+
+/*
 **  This function processes META tags in HTML streams. - FM
 */
 PUBLIC void LYHandleMETA ARGS4(
@@ -2063,8 +2130,6 @@ PUBLIC void LYHandleMETA ARGS4(
 	convert_to_spaces(http_equiv, TRUE);
 	LYUCTranslateHTMLString(&http_equiv, me->tag_charset, me->tag_charset,
 				 NO, NO, YES, st_other);
-	LYTrimHead(http_equiv);
-	LYTrimTail(http_equiv);
 	if (*http_equiv == '\0') {
 	    FREE(http_equiv);
 	}
@@ -2075,8 +2140,6 @@ PUBLIC void LYHandleMETA ARGS4(
 	convert_to_spaces(name, TRUE);
 	LYUCTranslateHTMLString(&name, me->tag_charset, me->tag_charset,
 				 NO, NO, YES, st_other);
-	LYTrimHead(name);
-	LYTrimTail(name);
 	if (*name == '\0') {
 	    FREE(name);
 	}
@@ -2117,12 +2180,10 @@ PUBLIC void LYHandleMETA ARGS4(
      * Check for a no-cache Pragma
      * or Cache-Control directive. - FM
      */
-    if (!strcasecomp((http_equiv ? http_equiv : ""), "Pragma") ||
-	!strcasecomp((http_equiv ? http_equiv : ""), "Cache-Control")) {
+    if (!strcasecomp(NonNull(http_equiv), "Pragma") ||
+	!strcasecomp(NonNull(http_equiv), "Cache-Control")) {
 	LYUCTranslateHTMLString(&content, me->tag_charset, me->tag_charset,
 				 NO, NO, YES, st_other);
-	LYTrimHead(content);
-	LYTrimTail(content);
 	if (!strcasecomp(content, "no-cache")) {
 	    me->node_anchor->no_cache = TRUE;
 	    HText_setNoCache(me->text);
@@ -2136,7 +2197,7 @@ PUBLIC void LYHandleMETA ARGS4(
 	 *  should. - FM
 	 */
 	if ((!me->node_anchor->cache_control) &&
-	    !strcasecomp((http_equiv ? http_equiv : ""), "Cache-Control")) {
+	    !strcasecomp(NonNull(http_equiv), "Cache-Control")) {
 	    LYLowerCase(content);
 	    StrAllocCopy(me->node_anchor->cache_control, content);
 	    if (me->node_anchor->no_cache == FALSE) {
@@ -2182,7 +2243,7 @@ PUBLIC void LYHandleMETA ARGS4(
     /*
      * Check for an Expires directive. - FM
      */
-    } else if (!strcasecomp((http_equiv ? http_equiv : ""), "Expires")) {
+    } else if (!strcasecomp(NonNull(http_equiv), "Expires")) {
 	/*
 	 *  If we didn't get an Expires MIME header,
 	 *  store it in the anchor element, and if we
@@ -2195,8 +2256,6 @@ PUBLIC void LYHandleMETA ARGS4(
 	 */
 	LYUCTranslateHTMLString(&content, me->tag_charset, me->tag_charset,
 				 NO, NO, YES, st_other);
-	LYTrimHead(content);
-	LYTrimTail(content);
 	StrAllocCopy(me->node_anchor->expires, content);
 	if (me->node_anchor->no_cache == FALSE) {
 	    if (!strcmp(content, "0")) {
@@ -2233,18 +2292,14 @@ PUBLIC void LYHandleMETA ARGS4(
      *	the charset via a server's header. - AAC & FM
      */
     } else if (!(me->node_anchor->charset && *me->node_anchor->charset) &&
-	       !strcasecomp((http_equiv ? http_equiv : ""), "Content-Type")) {
+	       !strcasecomp(NonNull(http_equiv), "Content-Type")) {
 	LYUCcharset * p_in = NULL;
 	LYUCcharset * p_out = NULL;
 	LYUCTranslateHTMLString(&content, me->tag_charset, me->tag_charset,
 				 NO, NO, YES, st_other);
-	LYTrimHead(content);
-	LYTrimTail(content);
 	LYLowerCase(content);
 
-	if ((cp = strstr(content, "text/html;")) != NULL &&
-	    (cp1 = strstr(content, "charset")) != NULL &&
-	    cp1 > cp) {
+	if ((cp1 = strstr(content, "charset")) != NULL) {
 	    BOOL chartrans_ok = NO;
 	    char *cp3 = NULL, *cp4;
 	    int chndl;
@@ -2419,47 +2474,17 @@ PUBLIC void LYHandleMETA ARGS4(
     /*
      *	Check for a Refresh directive. - FM
      */
-    } else if (!strcasecomp((http_equiv ? http_equiv : ""), "Refresh")) {
+    } else if (!strcasecomp(NonNull(http_equiv), "Refresh")) {
 	char *Seconds = NULL;
 
-	/*
-	 *  Look for the Seconds field. - FM
-	 */
-	cp = LYSkipBlanks(content);
-	if (*cp && isdigit(UCH(*cp))) {
-	    cp1 = cp;
-	    while (*cp1 && isdigit(UCH(*cp1)))
-		cp1++;
-	    if (*cp1)
-		*cp1++ = '\0';
-	    StrAllocCopy(Seconds, cp);
-	}
+	LYParseRefreshURL(content, &Seconds, &href);
+
 	if (Seconds) {
-	    /*
-	     *	We have the seconds field.
-	     *	Now look for a URL field - FM
-	     */
-	    while (*cp1) {
-		if (!strncasecomp(cp1, "URL", 3)) {
-		    cp = (cp1 + 3);
-		    while (*cp && (*cp == '=' || isspace(UCH(*cp))))
-			cp++;
-		    cp1 = cp;
-		    while (*cp1 && !isspace(UCH(*cp1)))
-			cp1++;
-		    *cp1 = '\0';
-		    if (*cp)
-			StrAllocCopy(href, cp);
-		    break;
-		}
-		cp1++;
-	    }
 	    if (href) {
 		/*
 		 *  We found a URL field, so check it out. - FM
 		 */
-		if (!(url_type = LYLegitimizeHREF(me, (char**)&href,
-						  TRUE, FALSE))) {
+		if (!(url_type = LYLegitimizeHREF(me, &href, TRUE, FALSE))) {
 		    /*
 		     *	The specs require a complete URL,
 		     *	but this is a Netscapism, so don't
@@ -2479,13 +2504,16 @@ PUBLIC void LYHandleMETA ARGS4(
 			StrAllocCopy(href, me->node_anchor->address);
 			HText_setNoCache(me->text);
 		    }
-		}
-		/*
-		 *  Check whether to fill in localhost. - FM
-		 */
-		LYFillLocalFileURL((char **)&href,
+
+		} else {
+		    /*
+		     *  Check whether to fill in localhost. - FM
+		     */
+		    LYFillLocalFileURL(&href,
 				   (me->inBASE ?
 				 me->base_href : me->node_anchor->address));
+		}
+
 		/*
 		 *  Set the no_cache flag if the Refresh URL
 		 *  is the same as the document's address. - FM
@@ -2505,11 +2533,12 @@ PUBLIC void LYHandleMETA ARGS4(
 	    /*
 	     *	Check for an anchor in http or https URLs. - FM
 	     */
+	    cp = NULL;
 #ifndef DONT_TRACK_INTERNAL_LINKS
 	    /* id_string seems to be used wrong below if given.
 	       not that it matters much.  avoid setting it here. - kw */
 	    if ((strncmp(href, "http", 4) == 0) &&
-		(cp = strrchr(href, '#')) != NULL) {
+		(cp = strchr(href, '#')) != NULL) {
 		StrAllocCopy(id_string, cp);
 		*cp = '\0';
 	    }
@@ -2602,7 +2631,7 @@ PUBLIC void LYHandleMETA ARGS4(
     /*
      *	Check for a Set-Cookie directive. - AK
      */
-    } else if (!strcasecomp((http_equiv ? http_equiv : ""), "Set-Cookie")) {
+    } else if (!strcasecomp(NonNull(http_equiv), "Set-Cookie")) {
 	/*
 	 *  This will need to be updated when Set-Cookie/Set-Cookie2
 	 *  handling is finalized.  For now, we'll still assume
@@ -2684,7 +2713,7 @@ PUBLIC void LYHandlePlike ARGS6(
 	     *	to start a newline, if needed, then fall through
 	     *	to handle attributes. - FM
 	     */
-	    if (HText_LastLineSize(me->text, FALSE)) {
+	    if (!HText_LastLineEmpty(me->text, FALSE)) {
 		HText_setLastChar(me->text, ' ');  /* absorb white space */
 		HText_appendCharacter(me->text, '\r');
 	    }
@@ -2705,10 +2734,12 @@ PUBLIC void LYHandlePlike ARGS6(
 	if (LYoverride_default_alignment(me)) {
 	    me->sp->style->alignment = LYstyles(me->sp[0].tag_number)->alignment;
 	} else if ((me->List_Nesting_Level >= 0 &&
-		    strncmp(me->sp->style->name, "Div", 3)) ||
+			(me->sp->style->id == ST_DivCenter ||
+			 me->sp->style->id == ST_DivLeft ||
+			 me->sp->style->id == ST_DivRight)) ||
 		   ((me->Division_Level < 0) &&
-		    (!strcmp(me->sp->style->name, "Normal") ||
-		     !strcmp(me->sp->style->name, "Preformatted")))) {
+			(me->sp->style->id == ST_Normal ||
+			 me->sp->style->id == ST_Preformatted))) {
 		me->sp->style->alignment = HT_LEFT;
 	} else {
 	    me->sp->style->alignment = (short) me->current_default_alignment;
@@ -2967,10 +2998,11 @@ PUBLIC int LYLegitimizeHREF ARGS4(
 	BOOL,			strip_dots)
 {
     int url_type = 0;
+    char *p = NULL;
     char *pound = NULL;
-    char *fragment = NULL;
+    CONST char *Base = NULL;
 
-    if (!me || !href || *href == NULL || *(*href) == '\0')
+    if (!me || !href || isEmpty(*href))
 	return(url_type);
 
     if (!LYTrimStartfile(*href)) {
@@ -2981,33 +3013,55 @@ PUBLIC int LYLegitimizeHREF ARGS4(
 	 *  with atrocities inflicted on the Web by
 	 *  authoring tools such as Frontpage. - FM
 	 */
-	if ((pound = strchr(*href, '#')) != NULL) {
-	    StrAllocCopy(fragment, pound);
-	    *pound = '\0';
-	    convert_to_spaces(fragment, FALSE);
-	}
-	/*
-	 * No blanks really belong in the HREF, but if it refers to an actual
-	 * file, it may actually have blanks in the name.  Try to accommodate.
-	 */
-	convert_to_spaces(*href, FALSE);
-	LYTrimLeading(*href);
-	LYTrimTrailing(*href);
-	if (fragment != NULL) {
-	    StrAllocCat(*href, fragment);
-	    FREE(fragment);
+
+	/*  Before working on spaces check if we have any, usually none. */
+	for (p = *href; (*p && !isspace(*p)); p++)
+	    ;
+
+	if (*p) {  /* p == first space character */
+		   /* no reallocs below, all converted in place */
+
+	    pound = findPoundSelector(*href);
+
+	    if (pound != NULL && pound < p) {
+		convert_to_spaces(p, FALSE);  /* done */
+
+	    } else {
+		if (pound != NULL)
+		    *pound = '\0';  /* mark */
+
+		/*
+		 * No blanks really belong in the HREF,
+		 * but if it refers to an actual file,
+		 * it may actually have blanks in the name.
+		 * Try to accommodate. See also HTParse().
+		 */
+		if (LYRemoveNewlines(p) || strchr(p, '\t') != 0) {
+		    LYRemoveBlanks(p);  /* a compromise... */
+		}
+
+		if (pound != NULL) {
+		    p = strchr(p, '\0');
+		    *pound = '#';  /* restore */
+		    convert_to_spaces(pound, FALSE);
+		    if (p < pound)
+			strcpy(p, pound);
+		}
+	    }
 	}
     }
-    if (*(*href) == '\0')
+    if (**href == '\0')
 	return(url_type);
-    LYUCTranslateHTMLString(href, me->tag_charset, me->tag_charset,
-			     NO, NO, YES, st_URL);
+
+    TRANSLATE_AND_UNESCAPE_TO_STD(href);
+
+    Base = me->inBASE ?
+		me->base_href : me->node_anchor->address;
+
     url_type = is_url(*href);
-    if (!url_type && force_slash &&
+    if (!url_type && force_slash && **href == '.' &&
 	(!strcmp(*href, ".") || !strcmp(*href, "..")) &&
-	 strncmp((me->inBASE ?
-	       me->base_href : me->node_anchor->address),
-		 "file:", 5)) {
+	 !isFILE_URL(Base)) {
 	/*
 	 *  The Fielding RFC/ID for resolving partial HREFs says
 	 *  that a slash should be on the end of the preceding
@@ -3018,10 +3072,8 @@ PUBLIC int LYLegitimizeHREF ARGS4(
 	 */
 	StrAllocCat(*href, "/");
     }
-    if ((!url_type && LYStripDotDotURLs && strip_dots && *(*href) == '.') &&
-	 !strncasecomp((me->inBASE ?
-		     me->base_href : me->node_anchor->address),
-		       "http", 4)) {
+    if ((!url_type && LYStripDotDotURLs && strip_dots && **href == '.') &&
+	 !strncasecomp(Base, "http", 4)) {
 	/*
 	 *  We will be resolving a partial reference versus an http
 	 *  or https URL, and it has lead dots, which may be retained
@@ -3039,18 +3091,12 @@ PUBLIC int LYLegitimizeHREF ARGS4(
 	char *temp = NULL, *path = NULL, *cp;
 	CONST char *str = "";
 
-	if (((temp = HTParse(*href,
-			     (me->inBASE ?
-			   me->base_href : me->node_anchor->address),
-			     PARSE_ALL)) != NULL && temp[0] != '\0') &&
-	    (path = HTParse(temp, "",
-			    PARSE_PATH+PARSE_PUNCTUATION)) != NULL &&
-	    !strncmp(path, "/..", 3)) {
+	temp = HTParse(*href, Base, PARSE_ALL);
+	path = HTParse(temp, "", PARSE_PATH+PARSE_PUNCTUATION);
+	if (!strncmp(path, "/..", 3)) {
 	    cp = (path + 3);
 	    if (LYIsHtmlSep(*cp) || *cp == '\0') {
-		if ((me->inBASE
-		   ? me->base_href[4]
-		   : me->node_anchor->address[4]) == 's') {
+		if (Base[4] == 's') {
 		    str = "s";
 		}
 		CTRACE((tfp, "LYLegitimizeHREF: Bad value '%s' for http%s URL.\n",
@@ -3261,11 +3307,11 @@ PUBLIC void LYEnsureDoubleSpace ARGS1(
     if (!me || !me->text)
 	return;
 
-    if (HText_LastLineSize(me->text, FALSE)) {
+    if (!HText_LastLineEmpty(me->text, FALSE)) {
 	HText_setLastChar(me->text, ' ');  /* absorb white space */
 	HText_appendCharacter(me->text, '\r');
 	HText_appendCharacter(me->text, '\r');
-    } else if (HText_PreviousLineSize(me->text, FALSE)) {
+    } else if (!HText_PreviousLineEmpty(me->text, FALSE)) {
 	HText_setLastChar(me->text, ' ');  /* absorb white space */
 	HText_appendCharacter(me->text, '\r');
     } else if (me->List_Nesting_Level >= 0) {
@@ -3286,7 +3332,7 @@ PUBLIC void LYEnsureSingleSpace ARGS1(
     if (!me || !me->text)
 	return;
 
-    if (HText_LastLineSize(me->text, FALSE)) {
+    if (!HText_LastLineEmpty(me->text, FALSE)) {
 	HText_setLastChar(me->text, ' ');  /* absorb white space */
 	HText_appendCharacter(me->text, '\r');
     } else if (me->List_Nesting_Level >= 0) {
@@ -3308,8 +3354,8 @@ PUBLIC void LYResetParagraphAlignment ARGS1(
 
     if (me->List_Nesting_Level >= 0 ||
 	((me->Division_Level < 0) &&
-	 (!strcmp(me->sp->style->name, "Normal") ||
-	  !strcmp(me->sp->style->name, "Preformatted")))) {
+	 (me->sp->style->id == ST_Normal ||
+	  me->sp->style->id == ST_Preformatted))) {
 	me->sp->style->alignment = HT_LEFT;
     } else {
 	me->sp->style->alignment = (short) me->current_default_alignment;
@@ -3341,7 +3387,7 @@ PUBLIC BOOLEAN LYCheckForCSI ARGS2(
     if (!(anchor && anchor->address))
 	return FALSE;
 
-    if (strncasecomp(anchor->address, "file:", 5))
+    if (!isFILE_URL(anchor->address))
 	return FALSE;
 
     if (!LYisLocalHost(anchor->address))
diff --git a/gnu/usr.bin/lynx/src/LYCharUtils.h b/gnu/usr.bin/lynx/src/LYCharUtils.h
index 4ca2000014e..8fad7644050 100644
--- a/gnu/usr.bin/lynx/src/LYCharUtils.h
+++ b/gnu/usr.bin/lynx/src/LYCharUtils.h
@@ -55,6 +55,13 @@ extern void LYAddMETAcharsetToFD PARAMS((
 extern void LYformTitle PARAMS((
 	char **		dst,
 	CONST char *	src));
+extern char *LYParseTagParam PARAMS((
+	char *		from,
+	char *		name));
+extern void LYParseRefreshURL PARAMS((
+	char *		content,
+	char **		p_seconds,
+	char **		p_address));
 
 #ifdef Lynx_HTML_Handler
 extern int OL_CONTINUE;		/* flag for whether CONTINUE is set */
diff --git a/gnu/usr.bin/lynx/src/LYClean.c b/gnu/usr.bin/lynx/src/LYClean.c
index 2b6d72f16db..f58df0998f1 100644
--- a/gnu/usr.bin/lynx/src/LYClean.c
+++ b/gnu/usr.bin/lynx/src/LYClean.c
@@ -6,6 +6,7 @@
 #include <LYMainLoop.h>
 #include <LYGlobalDefs.h>
 #include <LYTraversal.h>
+#include <LYHistory.h>
 #include <LYCookie.h>
 #include <UCAuto.h>
 #include <HTAlert.h>
@@ -13,6 +14,10 @@
 #include <LYexit.h>
 #include <LYLeaks.h>
 
+#ifdef DJGPP
+extern void sig_handler_watt(int);
+#endif /* DJGPP */
+
 #ifdef VMS
 BOOLEAN HadVMSInterrupt = FALSE;
 #endif /* VMS */
@@ -29,8 +34,17 @@ PUBLIC void cleanup_sig ARGS1(
 	/*
 	 * Need to rearm the signal.
 	 */
+#ifdef DJGPP
+	if (wathndlcbrk) {
+	    sig_handler_watt(sig);	/* Use WATT-32 signal handler */
+	}
+#endif /* DJGPP */
 	signal(SIGINT, cleanup_sig);
 	sigint = TRUE;
+#ifdef DJGPP
+	_eth_release();
+	_eth_init();
+#endif /* DJGPP */
 	return;
     }
 #endif /* IGNORE_CTRL_C */
@@ -56,9 +70,9 @@ PUBLIC void cleanup_sig ARGS1(
 	 *  Ask if exit is intended.
 	 */
 	if (LYQuitDefaultYes == TRUE) {
-	    c = HTConfirmDefault(REALLY_EXIT_Y, YES);
+	    c = HTConfirmDefault(REALLY_EXIT, YES);
 	} else {
-	    c = HTConfirmDefault(REALLY_EXIT_N, NO);
+	    c = HTConfirmDefault(REALLY_EXIT, NO);
 	}
 	HadVMSInterrupt = TRUE;
 	if (LYQuitDefaultYes == TRUE) {
@@ -138,16 +152,13 @@ PUBLIC void cleanup_sig ARGS1(
 PUBLIC void cleanup_files NOARGS
 {
     LYCleanupTemp();
-
     if (lynx_temp_space != NULL && rmdir(lynx_temp_space))
-        perror("Could not remove the temp-directory");
-
+	perror("Could not remove the temp-directory");
     FREE(lynx_temp_space);
 }
 
 PUBLIC void cleanup NOARGS
 {
-    int i;
 #ifdef VMS
     extern BOOLEAN DidCleanup;
 #endif /* VMS */
@@ -182,7 +193,7 @@ PUBLIC void cleanup NOARGS
     UCChangeTerminalCodepage(-1, (LYUCcharset*)0);
 #endif /* EXP_CHARTRANS_AUTOSWITCH */
 
-#ifdef EXP_PERSISTENT_COOKIES
+#ifdef USE_PERSISTENT_COOKIES
     /*
      * This can go right here for now.  We need to work up a better place
      * to save cookies for the next release, preferably whenever a new
@@ -195,18 +206,17 @@ PUBLIC void cleanup NOARGS
 #endif
 
     cleanup_files();
-    for (i = 0; i < nhist; i++) {
-	FREE(history[i].title);
-	FREE(history[i].address);
-	FREE(history[i].post_data);
-	FREE(history[i].post_content_type);
-	FREE(history[i].bookmark);
-    }
-    nhist = 0;
 #ifdef VMS
     ttclose();
     DidCleanup = TRUE;
 #endif /* VMS */
 
+    /*
+     * If we're looking at memory leaks, hang onto the trace file, since there
+     * is no memory freed in this function, and it is a nuisance to not be able
+     * to trace the cleanup activity -TD
+     */
+#ifndef LY_FIND_LEAKS
     LYCloseTracelog();
+#endif
 }
diff --git a/gnu/usr.bin/lynx/src/LYCookie.c b/gnu/usr.bin/lynx/src/LYCookie.c
index b9a77f3d2e2..5dce429fea5 100644
--- a/gnu/usr.bin/lynx/src/LYCookie.c
+++ b/gnu/usr.bin/lynx/src/LYCookie.c
@@ -175,8 +175,10 @@ PRIVATE void LYCookieJar_free NOARGS
     HTList *cl = NULL, *next = NULL;
     cookie *co = NULL;
 
+    CTRACE((tfp, "LYCookieJar_free\n"));
     while (dl) {
 	if ((de = dl->object) != NULL) {
+	    CTRACE((tfp, "...LYCookieJar_free domain %s\n", de->domain));
 	    cl = de->cookie_list;
 	    while (cl) {
 		next = cl->next;
@@ -296,6 +298,39 @@ PRIVATE BOOL is_prefix ARGS2(CONST char *, a, CONST char *, b)
 }
 
 /*
+ * Find the domain-entry for the given name.
+ */
+PRIVATE domain_entry * find_domain_entry ARGS1(
+    CONST char *,	name)
+{
+    HTList *hl;
+    domain_entry *de = NULL;
+
+    if (name != 0
+     && *name != '\0') {
+	for (hl = domain_list; hl != NULL; hl = hl->next) {
+	    de = (domain_entry *)hl->object;
+	    if (de != NULL && de->domain != NULL) {
+		CTRACE2(TRACE_CFG,
+			(tfp, "...test_domain_entry(%s) bv:%d, invcheck_bv:%d\n",
+			      de->domain,
+			      de->bv,
+			      de->invcheck_bv));
+		if (!strcasecomp(name, de->domain)) {
+		    break;
+		}
+	    }
+	    de = NULL;
+	}
+    }
+    CTRACE((tfp, "find_domain_entry(%s) bv:%d, invcheck_bv:%d\n",
+		 name,
+		 de ? (int) de->bv : -1,
+		 de ? (int) de->invcheck_bv : -1));
+    return de;
+}
+
+/*
 **  Store a cookie somewhere in the domain list. - AK & FM
 */
 PRIVATE void store_cookie ARGS3(
@@ -333,19 +368,8 @@ PRIVATE void store_cookie ARGS3(
      *	is already listed.
      */
     cookie_list = NULL;
-    for (hl = domain_list; hl != NULL; hl = hl->next) {
-	de = (domain_entry *)hl->object;
-	if ((de != NULL && de->domain != NULL) &&
-	    !strcasecomp(co->domain, de->domain)) {
-		cookie_list = de->cookie_list;
-		break;
-	}
-    }
-
-    if(hl == NULL) {
-	de = NULL;
-	cookie_list = NULL;
-    }
+    if ((de = find_domain_entry(co->domain)) != NULL)
+	cookie_list = de->cookie_list;
 
     /*
      * Apply sanity checks.
@@ -359,7 +383,7 @@ PRIVATE void store_cookie ARGS3(
      */
     if (!is_prefix(co->path, path)) {
 	invcheck_behaviour_t invcheck_bv = (de ? de->invcheck_bv
-	    				       : DEFAULT_INVCHECK_BV);
+					       : DEFAULT_INVCHECK_BV);
 	switch (invcheck_bv) {
 	case INVCHECK_LOOSE:
 	    break;		/* continue as if nothing were wrong */
@@ -375,6 +399,7 @@ PRIVATE void store_cookie ARGS3(
 	    return;
 	}
     }
+
     /*
      * The next 4 conditions do NOT apply if the domain is still
      * the default of request-host. (domains - case insensitive).
@@ -398,15 +423,13 @@ PRIVATE void store_cookie ARGS3(
 	 *  value otherwise qualified. - FM
 	 */
 	if (co->domain[0] != '.' || co->domain[1] == '\0') {
-	    CTRACE((tfp, "store_cookie: Rejecting domain '%s'.\n",
-		    co->domain));
+	    CTRACE((tfp, "store_cookie: Rejecting domain '%s'.\n", co->domain));
 	    freeCookie(co);
 	    return;
 	}
 	ptr = strchr((co->domain + 1), '.');
 	if (ptr == NULL || ptr[1] == '\0') {
-	    CTRACE((tfp, "store_cookie: Rejecting domain '%s'.\n",
-		    co->domain));
+	    CTRACE((tfp, "store_cookie: Rejecting domain '%s'.\n", co->domain));
 	    freeCookie(co);
 	    return;
 	}
@@ -466,10 +489,10 @@ PRIVATE void store_cookie ARGS3(
 		       INVALID_COOKIE_DOMAIN_CONFIRMATION,
 		       co->domain,
 		       hostname);
-	    if (!HTConfirmDefault(msg, NO)) {
+	    if (!HTForcedPrompt(cookie_noprompt, msg, NO)) {
 		CTRACE((tfp, "store_cookie: Rejecting domain '%s' for host '%s'.\n",
-					co->domain,
-					hostname));
+			co->domain,
+			hostname));
 		freeCookie(co);
 		FREE(msg);
 		return;
@@ -479,7 +502,7 @@ PRIVATE void store_cookie ARGS3(
 	    HTSprintf0(&msg,
 		       INVALID_COOKIE_PATH_CONFIRMATION,
 		       co->path, path);
-	    if (!HTConfirmDefault(msg, NO)) {
+	    if (!HTForcedPrompt(cookie_noprompt, msg, NO)) {
 		CTRACE((tfp, "store_cookie: Rejecting because '%s' is not a prefix of '%s'.\n",
 		       co->path, path));
 		freeCookie(co);
@@ -490,28 +513,14 @@ PRIVATE void store_cookie ARGS3(
 	FREE(msg);
     }
 
-    if (hl == NULL) {
+    if (de == NULL) {
 	/*
-	 *	Domain not found; add a new entry for this domain.
+	 * Domain not found; add a new entry for this domain.
 	 */
 	de = typecalloc(domain_entry);
 	if (de == NULL)
 	    outofmem(__FILE__, "store_cookie");
-#if 0	/* was: ifdef EXP_PERSISTENT_COOKIES */
-	/*
-	 * The default behavior for this new domain could be set
-	 * differently if the cookie comes from a file, as the
-	 * code had it originally, but there doesn't seem to be
-	 * a good reason for it any more; setting more permissive
-	 * behavior for individual domains is now possible via
-	 * configuration options. - kw
-	 */
-	if (persistent_cookies
-	 && (co->flags & COOKIE_FLAG_FROM_FILE))
-	    de->bv = ACCEPT_ALWAYS; /* ?? */
-	else
-#endif
-	    de->bv = QUERY_USER;
+	de->bv = QUERY_USER;
 	de->invcheck_bv = DEFAULT_INVCHECK_BV; /* should this go here? */
 	cookie_list = de->cookie_list = HTList_new();
 	StrAllocCopy(de->domain, co->domain);
@@ -651,7 +660,7 @@ PRIVATE char * scan_cookie_sublist ARGS6(
 	char *,		path,
 	int,		port,
 	HTList *,	sublist,
-	char *, 	header,
+	char *,		header,
 	BOOL,		secure)
 {
     HTList *hl = sublist, *next = NULL;
@@ -823,6 +832,261 @@ PRIVATE char * scan_cookie_sublist ARGS6(
 }
 
 /*
+ * Presence of value is needed (indicated normally by '=') to start a cookie,
+ * but it can be an empty string.  - kw 1999-06-24
+ */
+PRIVATE char *alloc_attr_value ARGS2(
+	CONST char *,	value_start,
+	CONST char *,	value_end)
+{
+    char *value = NULL;
+
+    if (value_start && value_end >= value_start) {
+	int value_len = (value_end - value_start);
+
+	if (value_len > max_cookies_buffer) {
+	    value_len = max_cookies_buffer;
+	}
+	value = typecallocn(char, value_len + 1);
+	if (value == NULL)
+	    outofmem(__FILE__, "LYProcessSetCookies");
+	LYstrncpy(value, value_start, value_len);
+    }
+    return value;
+}
+
+#define FLAGS_INVALID_PORT 1
+#define FLAGS_KNOWN_ATTR   2
+#define FLAGS_MAXAGE_ATTR  4
+
+#define is_attr(s, len) attr_len == len && !strncasecomp(attr_start, s, len)
+
+PRIVATE unsigned parse_attribute ARGS9(
+	unsigned,	flags,
+	cookie *,	cur_cookie,
+	int *,		cookie_len,
+	CONST char *,	attr_start,
+	int,		attr_len,
+	char *,		value,
+	CONST char *,	address,
+	char *,		hostname,
+	int,		port)
+{
+    BOOLEAN known_attr = NO;
+    int url_type;
+
+    flags &= ~FLAGS_KNOWN_ATTR;
+    if (is_attr("secure", 6)) {
+	if (value == NULL) {
+	    known_attr = YES;
+	    if (cur_cookie != NULL) {
+		cur_cookie->flags |= COOKIE_FLAG_SECURE;
+	    }
+	} else {
+	    /*
+	     *	If secure has a value, assume someone
+	     *	misused it as cookie name. - FM
+	     */
+	    known_attr = NO;
+	}
+    } else if (is_attr("discard", 7)) {
+	if (value == NULL) {
+	    known_attr = YES;
+	    if (cur_cookie != NULL) {
+		cur_cookie->flags |= COOKIE_FLAG_DISCARD;
+	    }
+	} else {
+	    /*
+	     *	If discard has a value, assume someone
+	     *	used it as a cookie name. - FM
+	     */
+	    known_attr = NO;
+	}
+    } else if (is_attr("comment", 7)) {
+	known_attr = YES;
+	if (cur_cookie != NULL && value &&
+	    /*
+	     *	Don't process a repeat comment. - FM
+	     */
+	    cur_cookie->comment == NULL) {
+	    StrAllocCopy(cur_cookie->comment, value);
+	    *cookie_len += strlen(cur_cookie->comment);
+	}
+    } else if (is_attr("commentURL", 10)) {
+	known_attr = YES;
+	if (cur_cookie != NULL && value &&
+	    /*
+	     *	Don't process a repeat commentURL. - FM
+	     */
+	    cur_cookie->commentURL == NULL) {
+	    /*
+	     *	We should get only absolute URLs as
+	     *	values, but will resolve versus the
+	     *	request's URL just in case. - FM
+	     */
+	    cur_cookie->commentURL = HTParse(value,
+					     address,
+					     PARSE_ALL);
+	    /*
+	     *	Accept only URLs for http or https servers. - FM
+	     */
+	    if ((url_type = is_url(cur_cookie->commentURL)) &&
+		(url_type == HTTP_URL_TYPE ||
+		 url_type == HTTPS_URL_TYPE)) {
+		*cookie_len += strlen(cur_cookie->commentURL);
+	    } else {
+		CTRACE((tfp, "LYProcessSetCookies: Rejecting commentURL value '%s'\n",
+			    cur_cookie->commentURL));
+		FREE(cur_cookie->commentURL);
+	    }
+	}
+    } else if (is_attr("domain", 6)) {
+	known_attr = YES;
+	if (cur_cookie != NULL && value &&
+	    /*
+	     *	Don't process a repeat domain. - FM
+	     */
+	    !(cur_cookie->flags & COOKIE_FLAG_DOMAIN_SET)) {
+	    *cookie_len -= strlen(cur_cookie->domain);
+	    /*
+	     *	If the value does not have a lead dot,
+	     *	but does have an embedded dot, and is
+	     *	not an exact match to the hostname, nor
+	     *	is a numeric IP address, add a lead dot.
+	     *	Otherwise, use the value as is. - FM
+	     *	(domains - case insensitive).
+	     */
+	    if (value[0] != '.' && value[0] != '\0' &&
+		value[1] != '\0' && strcasecomp(value, hostname)) {
+		char *ptr = strchr(value, '.');
+		if (ptr != NULL && ptr[1] != '\0') {
+		    ptr = value;
+		    while (*ptr == '.' ||
+			   isdigit(UCH(*ptr)))
+			ptr++;
+		    if (*ptr != '\0') {
+			CTRACE((tfp,
+       "LYProcessSetCookies: Adding lead dot for domain value '%s'\n",
+				    value));
+			StrAllocCopy(cur_cookie->domain, ".");
+			StrAllocCat(cur_cookie->domain, value);
+		    } else {
+			StrAllocCopy(cur_cookie->domain, value);
+		    }
+		} else {
+		    StrAllocCopy(cur_cookie->domain, value);
+		}
+	    } else {
+		StrAllocCopy(cur_cookie->domain, value);
+	    }
+	    *cookie_len += strlen(cur_cookie->domain);
+	    cur_cookie->flags |= COOKIE_FLAG_DOMAIN_SET;
+	}
+    } else if (is_attr("path", 4)) {
+	known_attr = YES;
+	if (cur_cookie != NULL && value &&
+	    /*
+	     *	Don't process a repeat path. - FM
+	     */
+	    !(cur_cookie->flags & COOKIE_FLAG_PATH_SET)) {
+	    *cookie_len -= strlen(cur_cookie->path);
+	    StrAllocCopy(cur_cookie->path, value);
+	    *cookie_len += (cur_cookie->pathlen = strlen(cur_cookie->path));
+	    cur_cookie->flags |= COOKIE_FLAG_PATH_SET;
+	}
+    } else if (is_attr("port", 4)) {
+	if (cur_cookie != NULL && value &&
+	    /*
+	     *	Don't process a repeat port. - FM
+	     */
+	    cur_cookie->PortList == NULL) {
+	    char *cp = value;
+	    while ((*cp != '\0') &&
+		   (isdigit(UCH(*cp)) ||
+		    *cp == ',' || *cp == ' ')) {
+		cp++;
+	    }
+	    if (*cp == '\0') {
+		if (!port_matches(port, value)) {
+		    flags |= FLAGS_INVALID_PORT;
+		} else {
+		    StrAllocCopy(cur_cookie->PortList, value);
+		    *cookie_len += strlen(cur_cookie->PortList);
+		}
+		known_attr = YES;
+	    } else {
+		known_attr = NO;
+	    }
+	} else if (cur_cookie != NULL) {
+	    /*
+	     *	Don't process a repeat port. - FM
+	     */
+	    if (cur_cookie->PortList == NULL) {
+		HTSprintf0(&(cur_cookie->PortList), "%d", port);
+		*cookie_len += strlen(cur_cookie->PortList);
+	    }
+	    known_attr = YES;
+	}
+    } else if (is_attr("version", 7)) {
+	known_attr = YES;
+	if (cur_cookie != NULL && value &&
+	    /*
+	     *	Don't process a repeat version. - FM
+	     */
+	    cur_cookie->version < 1) {
+	    int temp = strtol(value, NULL, 10);
+	    if (errno != -ERANGE) {
+		cur_cookie->version = temp;
+	    }
+	}
+    } else if (is_attr("max-age", 7)) {
+	known_attr = YES;
+	if (cur_cookie != NULL && value &&
+	    /*
+	     *	Don't process a repeat max-age. - FM
+	     */
+	    !(flags & FLAGS_MAXAGE_ATTR)) {
+	    int temp = strtol(value, NULL, 10);
+	    cur_cookie->flags |= COOKIE_FLAG_EXPIRES_SET;
+	    if (errno == -ERANGE) {
+		cur_cookie->expires = (time_t)0;
+	    } else {
+		cur_cookie->expires = (time(NULL) + temp);
+		CTRACE((tfp, "LYSetCookie: expires %ld, %s",
+			    (long) cur_cookie->expires,
+			    ctime(&cur_cookie->expires)));
+	    }
+	    flags |= FLAGS_MAXAGE_ATTR;
+	}
+    } else if (is_attr("expires", 7)) {
+	/*
+	 *  Convert an 'expires' attribute value if we haven't
+	 *  received a 'max-age'.  Note that 'expires' should not
+	 *  be used in Version 1 cookies, but it might be used for
+	 *  "backward compatibility", and, in turn, ill-informed
+	 *  people surely would start using it instead of, rather
+	 *  than in addition to, 'max-age'. - FM
+	 */
+	known_attr = YES;
+	if ((cur_cookie != NULL && !(flags & FLAGS_MAXAGE_ATTR)) &&
+	     !(cur_cookie->flags & COOKIE_FLAG_EXPIRES_SET)) {
+	    if (value) {
+		cur_cookie->flags |= COOKIE_FLAG_EXPIRES_SET;
+		cur_cookie->expires = LYmktime(value, FALSE);
+		if (cur_cookie->expires > 0) {
+		    CTRACE((tfp, "LYSetCookie: expires %ld, %s",
+				(long) cur_cookie->expires,
+				ctime(&cur_cookie->expires)));
+		}
+	    }
+	}
+    }
+    if (known_attr)
+	flags |= FLAGS_KNOWN_ATTR;
+    return flags;
+}
+
+/*
 **  Process potentially concatenated Set-Cookie2 and/or Set-Cookie
 **  headers. - FM
 */
@@ -830,18 +1094,17 @@ PRIVATE void LYProcessSetCookies ARGS6(
 	CONST char *,	SetCookie,
 	CONST char *,	SetCookie2,
 	CONST char *,	address,
-	char *, 	hostname,
-	char *, 	path,
+	char *,		hostname,
+	char *,		path,
 	int,		port)
 {
     CONST char *p, *attr_start, *attr_end, *value_start, *value_end;
     HTList *CombinedCookies = NULL, *cl = NULL;
     cookie *cur_cookie = NULL, *co = NULL;
-    int length = 0, url_type = 0;
+    int cookie_len = 0;
     int NumCookies = 0;
-    BOOL MaxAgeAttrSet = FALSE;
     BOOL Quoted = FALSE;
-    BOOLEAN invalidport = FALSE;
+    unsigned parse_flags = 0;
 
     if (!(SetCookie && *SetCookie) &&
 	!(SetCookie2 && *SetCookie2)) {
@@ -867,7 +1130,7 @@ PRIVATE void LYProcessSetCookies ARGS6(
      *	Process the Set-Cookie2 header, if present and not zero-length,
      *	adding each cookie to the CombinedCookies list. - FM
      */
-    p = (SetCookie2 ? SetCookie2 : "");
+    p = NonNull(SetCookie2);
     if (SetCookie && *p) {
 	CTRACE((tfp, "LYProcessSetCookies: Using Set-Cookie2 header.\n"));
     }
@@ -1052,257 +1315,32 @@ PRIVATE void LYProcessSetCookies ARGS6(
 	 *  Now, we can handle this attribute/value pair.
 	 */
 	if (attr_end > attr_start) {
-	    int len = (attr_end - attr_start);
-	    BOOLEAN known_attr = NO;
-	    char *value = NULL;
-
-	    if (value_start && value_end >= value_start) {
-		/*
-		 * Presence of value is now needed (indicated normally by '=')
-		 * to start a cookie, but it can now be an empty string.
-		 * - kw 1999-06-24
-		 */
-		int value_len = (value_end - value_start);
-
-		if (value_len > max_cookies_buffer) {
-		    value_len = max_cookies_buffer;
-		}
-		value = typecallocn(char, value_len + 1);
-		if (value == NULL)
-		    outofmem(__FILE__, "LYProcessSetCookies");
-		LYstrncpy(value, value_start, value_len);
-	    }
-	    if (len == 6 && !strncasecomp(attr_start, "secure", 6)) {
-		if (value == NULL) {
-		    known_attr = YES;
-		    if (cur_cookie != NULL) {
-			cur_cookie->flags |= COOKIE_FLAG_SECURE;
-		    }
-		} else {
-		    /*
-		     *	If secure has a value, assume someone
-		     *	misused it as cookie name. - FM
-		     */
-		    known_attr = NO;
-		}
-	    } else if (len == 7 && !strncasecomp(attr_start, "discard", 7)) {
-		if (value == NULL) {
-		    known_attr = YES;
-		    if (cur_cookie != NULL) {
-			cur_cookie->flags |= COOKIE_FLAG_DISCARD;
-		    }
-		} else {
-		    /*
-		     *	If discard has a value, assume someone
-		     *	used it as a cookie name. - FM
-		     */
-		    known_attr = NO;
-		}
-	    } else if (len == 7 && !strncasecomp(attr_start, "comment", 7)) {
-		known_attr = YES;
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat comment. - FM
-		     */
-		    cur_cookie->comment == NULL) {
-		    StrAllocCopy(cur_cookie->comment, value);
-		    length += strlen(cur_cookie->comment);
-		}
-	    } else if (len == 10 && !strncasecomp(attr_start,
-						  "commentURL", 10)) {
-		known_attr = YES;
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat commentURL. - FM
-		     */
-		    cur_cookie->commentURL == NULL) {
-		    /*
-		     *	We should get only absolute URLs as
-		     *	values, but will resolve versus the
-		     *	request's URL just in case. - FM
-		     */
-		    cur_cookie->commentURL = HTParse(value,
-						     address,
-						     PARSE_ALL);
-		    /*
-		     *	Accept only URLs for http or https servers. - FM
-		     */
-		    if ((url_type = is_url(cur_cookie->commentURL)) &&
-			(url_type == HTTP_URL_TYPE ||
-			 url_type == HTTPS_URL_TYPE)) {
-			length += strlen(cur_cookie->commentURL);
-		    } else {
-			CTRACE((tfp, "LYProcessSetCookies: Rejecting commentURL value '%s'\n",
-				    cur_cookie->commentURL));
-			FREE(cur_cookie->commentURL);
-		    }
-		}
-	    } else if (len == 6 && !strncasecomp(attr_start, "domain", 6)) {
-		known_attr = YES;
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat domain. - FM
-		     */
-		    !(cur_cookie->flags & COOKIE_FLAG_DOMAIN_SET)) {
-		    length -= strlen(cur_cookie->domain);
-		    /*
-		     *	If the value does not have a lead dot,
-		     *	but does have an embedded dot, and is
-		     *	not an exact match to the hostname, nor
-		     *	is a numeric IP address, add a lead dot.
-		     *	Otherwise, use the value as is. - FM
-		     *	(domains - case insensitive).
-		     */
-		    if (value[0] != '.' && value[0] != '\0' &&
-			value[1] != '\0' && strcasecomp(value, hostname)) {
-			char *ptr = strchr(value, '.');
-			if (ptr != NULL && ptr[1] != '\0') {
-			    ptr = value;
-			    while (*ptr == '.' ||
-				   isdigit(UCH(*ptr)))
-				ptr++;
-			    if (*ptr != '\0') {
-				CTRACE((tfp,
-	       "LYProcessSetCookies: Adding lead dot for domain value '%s'\n",
-					    value));
-				StrAllocCopy(cur_cookie->domain, ".");
-				StrAllocCat(cur_cookie->domain, value);
-			    } else {
-				StrAllocCopy(cur_cookie->domain, value);
-			    }
-			} else {
-			    StrAllocCopy(cur_cookie->domain, value);
-			}
-		    } else {
-			StrAllocCopy(cur_cookie->domain, value);
-		    }
-		    length += strlen(cur_cookie->domain);
-		    cur_cookie->flags |= COOKIE_FLAG_DOMAIN_SET;
-		}
-	    } else if (len == 4 && !strncasecomp(attr_start, "path", 4)) {
-		known_attr = YES;
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat path. - FM
-		     */
-		    !(cur_cookie->flags & COOKIE_FLAG_PATH_SET)) {
-		    length -= strlen(cur_cookie->path);
-		    StrAllocCopy(cur_cookie->path, value);
-		    length += (cur_cookie->pathlen = strlen(cur_cookie->path));
-		    cur_cookie->flags |= COOKIE_FLAG_PATH_SET;
-		}
-	    } else if (len == 4 && !strncasecomp(attr_start, "port", 4)) {
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat port. - FM
-		     */
-		    cur_cookie->PortList == NULL) {
-		    char *cp = value;
-		    while ((*cp != '\0') &&
-			   (isdigit(UCH(*cp)) ||
-			    *cp == ',' || *cp == ' ')) {
-			cp++;
-		    }
-		    if (*cp == '\0' && !port_matches(port, value)) {
-			invalidport = TRUE;
-			known_attr = YES;
-		    } else if (*cp == '\0') {
-			StrAllocCopy(cur_cookie->PortList, value);
-			length += strlen(cur_cookie->PortList);
-			known_attr = YES;
-		    } else {
-			known_attr = NO;
-		    }
-		} else if (cur_cookie != NULL) {
-		    /*
-		     *	Don't process a repeat port. - FM
-		     */
-		    if (cur_cookie->PortList == NULL) {
-			HTSprintf0(&(cur_cookie->PortList), "%d", port);
-			length += strlen(cur_cookie->PortList);
-		    }
-		    known_attr = YES;
-		}
-	    } else if (len == 7 && !strncasecomp(attr_start, "version", 7)) {
-		known_attr = YES;
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat version. - FM
-		     */
-		    cur_cookie->version < 1) {
-		    int temp = strtol(value, NULL, 10);
-		    if (errno != -ERANGE) {
-			cur_cookie->version = temp;
-		    }
-		}
-	    } else if (len == 7 && !strncasecomp(attr_start, "max-age", 7)) {
-		known_attr = YES;
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat max-age. - FM
-		     */
-		    !MaxAgeAttrSet) {
-		    int temp = strtol(value, NULL, 10);
-		    cur_cookie->flags |= COOKIE_FLAG_EXPIRES_SET;
-		    if (errno == -ERANGE) {
-			cur_cookie->expires = (time_t)0;
-		    } else {
-			cur_cookie->expires = (time(NULL) + temp);
-			CTRACE((tfp, "LYSetCookie: expires %ld, %s",
-				    (long) cur_cookie->expires,
-				    ctime(&cur_cookie->expires)));
-		    }
-		    MaxAgeAttrSet = TRUE;
-		}
-	    } else if (len == 7 && !strncasecomp(attr_start, "expires", 7)) {
-		/*
-		 *  Convert an 'expires' attribute value if we haven't
-		 *  received a 'max-age'.  Note that 'expires' should not
-		 *  be used in Version 1 cookies, but it might be used for
-		 *  "backward compatibility", and, in turn, ill-informed
-		 *  people surely would start using it instead of, rather
-		 *  than in addition to, 'max-age'. - FM
-		 */
-		known_attr = YES;
-		if ((cur_cookie != NULL && !MaxAgeAttrSet) &&
-		     !(cur_cookie->flags & COOKIE_FLAG_EXPIRES_SET)) {
-		    if (value) {
-			cur_cookie->flags |= COOKIE_FLAG_EXPIRES_SET;
-			cur_cookie->expires = LYmktime(value, FALSE);
-			if (cur_cookie->expires > 0) {
-			    CTRACE((tfp, "LYSetCookie: expires %ld, %s",
-					(long) cur_cookie->expires,
-					ctime(&cur_cookie->expires)));
-			}
-		    }
-		}
-	    }
+	    char *value = alloc_attr_value(value_start, value_end);
+
+	    parse_flags = parse_attribute (parse_flags,
+					   cur_cookie,
+					   &cookie_len,
+					   attr_start,
+					   (attr_end - attr_start),
+					   value,
+					   address,
+					   hostname,
+					   port);
 
 	    /*
-	     *	If none of the above comparisons succeeded, and we have
-	     *	a value, then we have an unknown pair of the form 'foo=bar',
-	     *	which means it's time to create a new cookie.  If we don't
-	     *	have a non-zero-length value, assume it's an error or a
-	     *	new, unknown attribute which doesn't take a value, and
-	     *	ignore it. - FM
+	     * Presence of value is needed (indicated normally by '='),
+	     * but it can be an empty string. - kw 1999-06-24
 	     */
-	    /* if (!known_attr && value_end > value_start) */
-
-	    /* Is there any reason we don't want to accept cookies with
-	     * no value?  This seems to be needed for sites that reset a
-	     * cookie by nulling out the value.  If this causes problems,
-	     * we can go back to the original behavior above.  - BJP
-	     *
-	     * Presence of value is now needed (indicated normally by '='),
-	     * but it can now be an empty string. - kw 1999-06-24
-	     */
-	    if (!known_attr && value && value_end >= value_start) {
+	    if (!(parse_flags & FLAGS_KNOWN_ATTR)
+	      && value
+	      && value_end >= value_start) {
 		/*
 		 *  If we've started a cookie, and it's not too big,
 		 *  save it in the CombinedCookies list. - FM
 		 */
-		if (length <= max_cookies_buffer && cur_cookie != NULL &&
-		    !invalidport) {
+		if (cookie_len <= max_cookies_buffer
+		 && cur_cookie != NULL
+		 && !(parse_flags & FLAGS_INVALID_PORT)) {
 		    /*
 		     *	Assume version 1 if not set to that or higher. - FM
 		     */
@@ -1318,10 +1356,10 @@ PRIVATE void LYProcessSetCookies ARGS6(
 				(cur_cookie->value ?
 				 cur_cookie->value : "[no value]")));
 		    CTRACE((tfp,
-			   invalidport ?
+			   (parse_flags & FLAGS_INVALID_PORT) ?
 			   "                     due to excessive length!\n"
 			 : "                     due to invalid port!\n"));
-		    if (invalidport) {
+		    if (parse_flags & FLAGS_INVALID_PORT) {
 			NumCookies --;
 		    }
 		    freeCookie(cur_cookie);
@@ -1331,19 +1369,18 @@ PRIVATE void LYProcessSetCookies ARGS6(
 		 *  Start a new cookie. - FM
 		 */
 		cur_cookie = newCookie();
-		invalidport = FALSE;
-		length = 0;
+		cookie_len = 0;
 		NumCookies++;
 		MemAllocCopy(&(cur_cookie->name), attr_start, attr_end);
-		length += strlen(cur_cookie->name);
+		cookie_len += strlen(cur_cookie->name);
 		MemAllocCopy(&(cur_cookie->value), value_start, value_end);
-		length += strlen(cur_cookie->value);
+		cookie_len += strlen(cur_cookie->value);
 		StrAllocCopy(cur_cookie->domain, hostname);
-		length += strlen(cur_cookie->domain);
+		cookie_len += strlen(cur_cookie->domain);
 		StrAllocCopy(cur_cookie->path, path);
-		length += (cur_cookie->pathlen = strlen(cur_cookie->path));
+		cookie_len += (cur_cookie->pathlen = strlen(cur_cookie->path));
 		cur_cookie->port = port;
-		MaxAgeAttrSet = FALSE;
+		parse_flags = 0;
 		cur_cookie->quoted = TRUE;
 	    }
 	    FREE(value);
@@ -1355,19 +1392,19 @@ PRIVATE void LYProcessSetCookies ARGS6(
      *	if we are within the length limit. - FM
      */
     if (NumCookies <= max_cookies_domain
-     && length <= max_cookies_buffer
-     && cur_cookie != NULL && !invalidport) {
+     && cookie_len <= max_cookies_buffer
+     && cur_cookie != NULL && !(parse_flags & FLAGS_INVALID_PORT)) {
 	if (cur_cookie->version < 1) {
 	    cur_cookie->version = 1;
 	}
 	HTList_appendObject(CombinedCookies, cur_cookie);
-    } else if (cur_cookie != NULL && !invalidport) {
+    } else if (cur_cookie != NULL && !(parse_flags & FLAGS_INVALID_PORT)) {
 	CTRACE((tfp, "LYProcessSetCookies: Rejecting Set-Cookie2: %s=%s\n",
 		    (cur_cookie->name ? cur_cookie->name : "[no name]"),
 		    (cur_cookie->value ? cur_cookie->value : "[no value]")));
 	CTRACE((tfp, "                     due to excessive %s%s%s\n",
-		    (length > max_cookies_buffer ? "length" : ""),
-		    (length > max_cookies_buffer &&
+		    (cookie_len > max_cookies_buffer ? "length" : ""),
+		    (cookie_len > max_cookies_buffer &&
 		     NumCookies > max_cookies_domain
 			? " and "
 			: ""),
@@ -1388,7 +1425,7 @@ PRIVATE void LYProcessSetCookies ARGS6(
      *	Process the Set-Cookie header, if no non-zero-length Set-Cookie2
      *	header was present. - FM
      */
-    length = 0;
+    cookie_len = 0;
     NumCookies = 0;
     cur_cookie = NULL;
     p = ((SetCookie && !(SetCookie2 && *SetCookie2)) ? SetCookie : "");
@@ -1572,241 +1609,31 @@ PRIVATE void LYProcessSetCookies ARGS6(
 	 *  Now, we can handle this attribute/value pair.
 	 */
 	if (attr_end > attr_start) {
-	    int len = (attr_end - attr_start);
-	    BOOLEAN known_attr = NO;
-	    char *value = NULL;
-
-	    if (value_start && value_end >= value_start) {
-		/*
-		 * Presence of value is now needed (indicated normally by '=')
-		 * to start a cookie, but it can now be an empty string.
-		 * - kw 1999-06-24
-		 */
-		int value_len = (value_end - value_start);
-
-		if (value_len > max_cookies_buffer) {
-		    value_len = max_cookies_buffer;
-		}
-		value = typecallocn(char, value_len + 1);
-		if (value == NULL)
-		    outofmem(__FILE__, "LYProcessSetCookies");
-		LYstrncpy(value, value_start, value_len);
-	    }
-	    if (len == 6 && !strncasecomp(attr_start, "secure", 6)) {
-		if (value == NULL) {
-		    known_attr = YES;
-		    if (cur_cookie != NULL) {
-			cur_cookie->flags |= COOKIE_FLAG_SECURE;
-		    }
-		} else {
-		    /*
-		     *	If secure has a value, assume someone
-		     *	misused it as cookie name. - FM
-		     */
-		    known_attr = NO;
-		}
-	    } else if (len == 7 && !strncasecomp(attr_start, "discard", 7)) {
-		if (value == NULL) {
-		    known_attr = YES;
-		    if (cur_cookie != NULL) {
-			cur_cookie->flags |= COOKIE_FLAG_DISCARD;
-		    }
-		} else {
-		    /*
-		     *	If discard has a value, assume someone
-		     *	used it as a cookie name. - FM
-		     */
-		    known_attr = NO;
-		}
-	    } else if (len == 7 && !strncasecomp(attr_start, "comment", 7)) {
-		known_attr = YES;
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat comment. - FM
-		     */
-		    cur_cookie->comment == NULL) {
-		    StrAllocCopy(cur_cookie->comment, value);
-		    length += strlen(cur_cookie->comment);
-		}
-	    } else if (len == 10 && !strncasecomp(attr_start,
-						  "commentURL", 10)) {
-		known_attr = YES;
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat commentURL. - FM
-		     */
-		    cur_cookie->commentURL == NULL) {
-		    /*
-		     *	We should get only absolute URLs as
-		     *	values, but will resolve versus the
-		     *	request's URL just in case. - FM
-		     */
-		    cur_cookie->commentURL = HTParse(value,
-						     address,
-						     PARSE_ALL);
-		    /*
-		     *	Accept only URLs for http or https servers. - FM
-		     */
-		    if ((url_type = is_url(cur_cookie->commentURL)) &&
-			(url_type == HTTP_URL_TYPE ||
-			 url_type == HTTPS_URL_TYPE)) {
-			length += strlen(cur_cookie->commentURL);
-		    } else {
-			CTRACE((tfp, "LYProcessSetCookies: Rejecting commentURL value '%s'\n",
-				    cur_cookie->commentURL));
-			FREE(cur_cookie->commentURL);
-		    }
-		}
-	    } else if (len == 6 && !strncasecomp(attr_start, "domain", 6)) {
-		known_attr = YES;
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat domain. - FM
-		     */
-		    !(cur_cookie->flags & COOKIE_FLAG_DOMAIN_SET)) {
-		    length -= strlen(cur_cookie->domain);
-		    /*
-		     *	If the value does not have a lead dot,
-		     *	but does have an embedded dot, and is
-		     *	not an exact match to the hostname, nor
-		     *	is a numeric IP address, add a lead dot.
-		     *	Otherwise, use the value as is. - FM
-		     *	(domains - case insensitive).
-		     */
-		    if (value[0] != '.' && value[0] != '\0' &&
-			value[1] != '\0' && strcasecomp(value, hostname)) {
-			char *ptr = strchr(value, '.');
-			if (ptr != NULL && ptr[1] != '\0') {
-			    ptr = value;
-			    while (*ptr == '.' ||
-				   isdigit(UCH(*ptr)))
-				ptr++;
-			    if (*ptr != '\0') {
-				CTRACE((tfp,
-	       "LYProcessSetCookies: Adding lead dot for domain value '%s'\n",
-					    value));
-				StrAllocCopy(cur_cookie->domain, ".");
-				StrAllocCat(cur_cookie->domain, value);
-			    } else {
-				StrAllocCopy(cur_cookie->domain, value);
-			    }
-			} else {
-			    StrAllocCopy(cur_cookie->domain, value);
-			}
-		    } else {
-			StrAllocCopy(cur_cookie->domain, value);
-		    }
-		    length += strlen(cur_cookie->domain);
-		    cur_cookie->flags |= COOKIE_FLAG_DOMAIN_SET;
-		}
-	    } else if (len == 4 && !strncasecomp(attr_start, "path", 4)) {
-		known_attr = YES;
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat path. - FM
-		     */
-		    !(cur_cookie->flags & COOKIE_FLAG_PATH_SET)) {
-		    length -= strlen(cur_cookie->path);
-		    StrAllocCopy(cur_cookie->path, value);
-		    length += (cur_cookie->pathlen = strlen(cur_cookie->path));
-		    cur_cookie->flags |= COOKIE_FLAG_PATH_SET;
-		}
-	    } else if (len == 4 && !strncasecomp(attr_start, "port", 4)) {
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat port. - FM
-		     */
-		    cur_cookie->PortList == NULL) {
-		    char *cp = value;
-		    while ((*cp != '\0') &&
-			   (isdigit(UCH(*cp)) ||
-			    *cp == ',' || *cp == ' ')) {
-			cp++;
-		    }
-		    if (*cp == '\0' && port_matches(port, value)) {
-			StrAllocCopy(cur_cookie->PortList, value);
-			length += strlen(cur_cookie->PortList);
-			known_attr = YES;
-		    } else {
-			known_attr = NO;
-		    }
-		} else if (cur_cookie != NULL) {
-		    /*
-		     *	Don't process a repeat port. - FM
-		     */
-		    if (cur_cookie->PortList == NULL) {
-			HTSprintf0(&(cur_cookie->PortList), "%d", port);
-			length += strlen(cur_cookie->PortList);
-		    }
-		    known_attr = YES;
-		}
-	    } else if (len == 7 && !strncasecomp(attr_start, "version", 7)) {
-		known_attr = YES;
-		if (cur_cookie != NULL && value &&
-		    /*
-		     *	Don't process a repeat version. - FM
-		     */
-		    cur_cookie->version < 1) {
-		    int temp = strtol(value, NULL, 10);
-		    if (errno != -ERANGE) {
-			cur_cookie->version = temp;
-		    }
-		}
-	    } else if (len == 7 && !strncasecomp(attr_start, "max-age", 7)) {
-		known_attr = YES;
-		if ((cur_cookie != NULL) && !MaxAgeAttrSet && value) {
-		    int temp = strtol(value, NULL, 10);
-		    cur_cookie->flags |= COOKIE_FLAG_EXPIRES_SET;
-		    if (errno == -ERANGE) {
-			cur_cookie->expires = (time_t)0;
-		    } else {
-			cur_cookie->expires = (time(NULL) + temp);
-		    }
-		    MaxAgeAttrSet = TRUE;
-		}
-	    } else if (len == 7 && !strncasecomp(attr_start, "expires", 7)) {
-		/*
-		 *  Convert an 'expires' attribute value if we haven't
-		 *  received a 'max-age'.  Note that 'expires' should not
-		 *  be used in Version 1 cookies, but it might be used for
-		 *  "backward compatibility", and, in turn, ill-informed
-		 *  people surely would start using it instead of, rather
-		 *  than in addition to, 'max-age'. - FM
-		 */
-		known_attr = YES;
-		if ((cur_cookie != NULL) && !(MaxAgeAttrSet) &&
-		    !(cur_cookie->flags & COOKIE_FLAG_EXPIRES_SET)) {
-		    if (value) {
-			cur_cookie->flags |= COOKIE_FLAG_EXPIRES_SET;
-			cur_cookie->expires = LYmktime(value, FALSE);
-		    }
-		}
-	    }
+	    char *value = alloc_attr_value(value_start, value_end);
+
+	    parse_flags = parse_attribute (parse_flags,
+					   cur_cookie,
+					   &cookie_len,
+					   attr_start,
+					   (attr_end - attr_start),
+					   value,
+					   address,
+					   hostname,
+					   port);
 
 	    /*
-	     *	If none of the above comparisons succeeded, and we have
-	     *	a value, then we have an unknown pair of the form 'foo=bar',
-	     *	which means it's time to create a new cookie.  If we don't
-	     *	have a non-zero-length value, assume it's an error or a
-	     *	new, unknown attribute which doesn't take a value, and
-	     *	ignore it. - FM
+	     * Presence of value is needed (indicated normally by '='),
+	     * but it can be an empty string. - kw 1999-06-24
 	     */
-	    /* if (!known_attr && value_end > value_start) */
-
-	    /* Is there any reason we don't want to accept cookies with
-	     * no value?  This seems to be needed for sites that reset a
-	     * cookie by nulling out the value.  If this causes problems,
-	     * we can go back to the original behavior above.  - BJP
-	     *
-	     * Presence of value is now needed (indicated normally by '='),
-	     * but it can now be an empty string. - kw 1999-06-24
-	     */
-	    if (!known_attr && value && value_end >= value_start) {
+	    if (!(parse_flags & FLAGS_KNOWN_ATTR)
+	      && value
+	      && value_end >= value_start) {
 		/*
 		 *  If we've started a cookie, and it's not too big,
 		 *  save it in the CombinedCookies list. - FM
 		 */
-		if (length <= max_cookies_buffer && cur_cookie != NULL) {
+		if (cookie_len <= max_cookies_buffer
+		 && cur_cookie != NULL) {
 		    /*
 		     *	If we had a Set-Cookie2 header, make sure
 		     *	the version is at least 1, and mark it for
@@ -1833,17 +1660,18 @@ PRIVATE void LYProcessSetCookies ARGS6(
 		 *  Start a new cookie. - FM
 		 */
 		cur_cookie = newCookie();
-		length = 0;
+		NumCookies++;
+		cookie_len = 0;
 		MemAllocCopy(&(cur_cookie->name), attr_start, attr_end);
-		length += strlen(cur_cookie->name);
+		cookie_len += strlen(cur_cookie->name);
 		MemAllocCopy(&(cur_cookie->value), value_start, value_end);
-		length += strlen(cur_cookie->value);
+		cookie_len += strlen(cur_cookie->value);
 		StrAllocCopy(cur_cookie->domain, hostname);
-		length += strlen(cur_cookie->domain);
+		cookie_len += strlen(cur_cookie->domain);
 		StrAllocCopy(cur_cookie->path, path);
-		length += (cur_cookie->pathlen = strlen(cur_cookie->path));
+		cookie_len += (cur_cookie->pathlen = strlen(cur_cookie->path));
 		cur_cookie->port = port;
-		MaxAgeAttrSet = FALSE;
+		parse_flags = 0;
 		cur_cookie->quoted = Quoted;
 		Quoted = FALSE;
 	    }
@@ -1854,7 +1682,7 @@ PRIVATE void LYProcessSetCookies ARGS6(
     /*
      *	Handle the final Set-Cookie cookie if within length limit. - FM
      */
-    if (NumCookies <= max_cookies_domain && length <= max_cookies_buffer && cur_cookie != NULL) {
+    if (NumCookies <= max_cookies_domain && cookie_len <= max_cookies_buffer && cur_cookie != NULL) {
 	if (SetCookie2 != NULL) {
 	    if (cur_cookie->version < 1) {
 		cur_cookie->version = 1;
@@ -1867,8 +1695,8 @@ PRIVATE void LYProcessSetCookies ARGS6(
 		    (cur_cookie->name ? cur_cookie->name : "[no name]"),
 		    (cur_cookie->value ? cur_cookie->value : "[no value]")));
 	CTRACE((tfp, "                     due to excessive %s%s%s\n",
-		    (length > max_cookies_buffer ? "length" : ""),
-		    (length > max_cookies_buffer && NumCookies > max_cookies_domain ? " and " : ""),
+		    (cookie_len > max_cookies_buffer ? "length" : ""),
+		    (cookie_len > max_cookies_buffer && NumCookies > max_cookies_domain ? " and " : ""),
 		    (NumCookies > max_cookies_domain ? "number!\n" : "!\n")));
 	freeCookie(cur_cookie);
 	cur_cookie = NULL;
@@ -1888,7 +1716,7 @@ PRIVATE void LYProcessSetCookies ARGS6(
 			    (long)co->expires,
 			    ctime(&co->expires)));
 	}
-	if (!strncasecomp(address, "https:", 6) &&
+	if (isHTTPS_URL(address) &&
 	    LYForceSSLCookiesSecure == TRUE &&
 	    !(co->flags & COOKIE_FLAG_SECURE)) {
 	    co->flags |= COOKIE_FLAG_SECURE;
@@ -1929,10 +1757,18 @@ PUBLIC void LYSetCookie ARGS3(
 	*ptr = '\0';
 	ptr++;
 	port = atoi(ptr);
-    } else if (!strncasecomp(address, "https:", 6)) {
+    } else if (isHTTPS_URL(address)) {
 	port = 443;
     }
-    path = HTParse(address, "", PARSE_PATH|PARSE_PUNCTUATION);
+    if (((path = HTParse(address, "",
+			 PARSE_PATH|PARSE_PUNCTUATION)) != NULL) &&
+	(ptr = strrchr(path, '/')) != NULL) {
+	if (ptr == path) {
+	    *(ptr+1) = '\0';	/* Leave a single '/' alone */
+	} else {
+	    *ptr = '\0';
+	}
+    }
     if (!(SetCookie && *SetCookie) &&
 	!(SetCookie2 && *SetCookie2)) {
 	/*
@@ -1943,15 +1779,13 @@ PUBLIC void LYSetCookie ARGS3(
 	BadHeaders = TRUE;
     }
     CTRACE((tfp, "LYSetCookie called with host '%s', path '%s',\n",
-		(hostname ? hostname : ""),
-		(path ? path : "")));
+		NonNull(hostname),
+		NonNull(path)));
     if (SetCookie) {
-	CTRACE((tfp, "    and Set-Cookie: '%s'\n",
-			 (SetCookie ? SetCookie : "")));
+	CTRACE((tfp, "    and Set-Cookie: '%s'\n", SetCookie));
     }
     if (SetCookie2) {
-	CTRACE((tfp, "    and Set-Cookie2: '%s'\n",
-			 (SetCookie2 ? SetCookie2 : "")));
+	CTRACE((tfp, "    and Set-Cookie2: '%s'\n", SetCookie2));
     }
     if (LYSetCookies == FALSE || BadHeaders == TRUE) {
 	CTRACE((tfp, "    Ignoring this Set-Cookie/Set-Cookie2 request.\n"));
@@ -1979,7 +1813,7 @@ PUBLIC void LYSetCookie ARGS3(
 **  Entry function from creating a Cookie: request header
 **  if needed. - AK & FM
 */
-PUBLIC char * LYCookie ARGS4(
+PUBLIC char * LYAddCookieHeader ARGS4(
 	char *,		hostname,
 	char *,		path,
 	int,		port,
@@ -2005,17 +1839,15 @@ PUBLIC char * LYCookie ARGS4(
 	if (de != NULL) {
 	    if (!HTList_isEmpty(de->cookie_list)) {
 		/*
-		 *  Scan the domain's cookie_list for
-		 *  any cookies we should include in
-		 *  our request header.
+		 * Scan the domain's cookie_list for any cookies we should
+		 * include in our request header.
 		 */
 		header = scan_cookie_sublist(hostname, path, port,
 					     de->cookie_list, header, secure);
 	    } else if (de->bv == QUERY_USER && de->invcheck_bv == DEFAULT_INVCHECK_BV) {
 		/*
-		 *  No cookies in this domain, and no default
-		 *  accept/reject choice was set by the user,
-		 *  so delete the domain. - FM
+		 * No cookies in this domain, and no default accept/reject
+		 * choice was set by the user, so delete the domain.  - FM
 		 */
 		FREE(de->domain);
 		HTList_delete(de->cookie_list);
@@ -2032,7 +1864,7 @@ PUBLIC char * LYCookie ARGS4(
     return(NULL);
 }
 
-#ifdef EXP_PERSISTENT_COOKIES
+#ifdef USE_PERSISTENT_COOKIES
 PRIVATE int number_of_file_cookies = 0;
 
 /* rjp - experiment cookie loading */
@@ -2067,28 +1899,17 @@ PUBLIC void LYLoadCookies ARGS1 (
     number_of_file_cookies = 0;
     while (LYSafeGets(&buf, cookie_handle) != 0) {
 	cookie *moo;
-	unsigned i = 0;
 	int tok_loop;
 	char *tok_out, *tok_ptr;
 
-	if ((buf[0] == '\0' || buf[0] == '\n' || buf[0] == '#')) {
+	LYTrimNewline(buf);
+	if (buf[0] == '\0' || buf[0] == '#') {
 	    continue;
 	}
 
 	number_of_file_cookies ++;
 
-	/*
-	 * Strip out the newline that fgets() puts at the end of a
-	 * cookie.
-	 */
-
-	while(buf[i] != '\n' && buf[i] != 0) {
-	    i++;
-	}
-	if (buf[i] == '\n') {
-	    buf[i++] = '\t';	/* add sep after line if enough space - kw */
-	    buf[i] = '\0';
-	}
+	strcat(buf, "\t");	/* add sep after line if enough space - kw */
 
 	/*
 	 * Tokenise the cookie line into its component parts -
@@ -2110,8 +1931,8 @@ PUBLIC void LYLoadCookies ARGS1 (
 	tok_ptr = buf;
 	tok_out = LYstrsep(&tok_ptr, "\t");
 	for (tok_loop = 0; tok_out && tok_values[tok_loop].s; tok_loop++) {
-	    CTRACE((tfp, "\t%d:%p:%p:[%s]\n",
-		tok_loop, tok_values[tok_loop].s, tok_out, tok_out));
+	    CTRACE((tfp, "\t%d:[%03d]:[%s]\n",
+		tok_loop, tok_out - buf, tok_out));
 	    LYstrncpy(tok_values[tok_loop].s, tok_out, tok_values[tok_loop].n);
 	    /*
 	     * It looks like strtok ignores a leading delimiter,
@@ -2130,8 +1951,8 @@ PUBLIC void LYLoadCookies ARGS1 (
 
 	expires = atol(expires_a);
 	CTRACE((tfp, "expires:\t%s\n", ctime(&expires)));
-/* 	CTRACE((tfp, "%s\t%s\t%s\t%s\t%ld\t%s\t%s\tREADCOOKIE\n", */
-/* 	    domain, what, path, secure, (long) expires, name, value)); */
+/*	CTRACE((tfp, "%s\t%s\t%s\t%s\t%ld\t%s\t%s\tREADCOOKIE\n", */
+/*	    domain, what, path, secure, (long) expires, name, value)); */
 	moo = newCookie();
 	StrAllocCopy(moo->domain, domain);
 	StrAllocCopy(moo->path, path);
@@ -2179,7 +2000,7 @@ PUBLIC void LYLoadCookies ARGS1 (
 	 *			     otherwise set it.
 	 */
 	moo->flags |= COOKIE_FLAG_FROM_FILE | COOKIE_FLAG_EXPIRES_SET |
-	    		COOKIE_FLAG_PATH_SET;
+			COOKIE_FLAG_PATH_SET;
 	if (domain[0] == '.')
 	    moo->flags |= COOKIE_FLAG_DOMAIN_SET;
 	if (secure[0] != 'F')
@@ -2245,7 +2066,8 @@ PUBLIC void LYStoreCookies ARGS1 (
 	    if ((co = (cookie *)cl->object) == NULL)
 		continue;
 
-	    CTRACE((tfp, "LYStoreCookies: %ld cf %ld ", (long) now, (long) co->expires));
+	    CTRACE((tfp, "LYStoreCookies: %ld cf %ld ",
+		   (long) now, (long) co->expires));
 
 	    if ((co->flags & COOKIE_FLAG_DISCARD)) {
 		CTRACE((tfp, "not stored - DISCARD\n"));
@@ -2259,13 +2081,13 @@ PUBLIC void LYStoreCookies ARGS1 (
 	    }
 
 	    fprintf(cookie_handle, "%s\t%s\t%s\t%s\t%ld\t%s\t%s%s%s\n",
-		de->domain,
+		    de->domain,
 		    (de->domain[0] == '.') ? "TRUE" : "FALSE",
 		    co->path,
-		co->flags & COOKIE_FLAG_SECURE ? "TRUE" : "FALSE",
-		(long) co->expires, co->name,
+		    co->flags & COOKIE_FLAG_SECURE ? "TRUE" : "FALSE",
+		    (long) co->expires, co->name,
 		    (co->quoted ? "\"" : ""),
-		    co->value,
+		    NonNull(co->value),
 		    (co->quoted ? "\"" : ""));
 
 	    CTRACE((tfp, "STORED\n"));
@@ -2348,203 +2170,185 @@ PRIVATE int LYHandleCookies ARGS4 (
 	/*
 	 *  Seek the domain in the domain_list structure. - FM
 	 */
-	for (dl = domain_list; dl != NULL; dl = dl->next) {
-	    de = dl->object;
-	    if (!(de && de->domain))
-		/*
-		 *  First object in the list always is empty. - FM
-		 */
-		continue;
-	    if (!strcasecomp(domain, de->domain)) {
-		FREE(domain);
+	if ((de = find_domain_entry(domain)) != NULL) {
+	    FREE(domain);
+	    /*
+	     *  We found the domain.  Check
+	     *  whether a lynxID is present. - FM
+	     */
+	    if (lynxID) {
 		/*
-		 *  We found the domain.  Check
-		 *  whether a lynxID is present. - FM
+		 *	Seek and delete the cookie with this lynxID
+		 *	in the domain's cookie list. - FM
 		 */
-		if (lynxID) {
-		    /*
-		     *	Seek and delete the cookie with this lynxID
-		     *	in the domain's cookie list. - FM
-		     */
-		    for (cl = de->cookie_list; cl != NULL; cl = cl->next) {
-			if ((co = (cookie *)cl->object) == NULL)
-			    /*
-			     *	First object is always empty. - FM
-			     */
-			    continue;
-			if (!strcmp(lynxID, co->lynxID)) {
+		for (cl = de->cookie_list; cl != NULL; cl = cl->next) {
+		    if ((co = (cookie *)cl->object) == NULL)
+			/*
+			 *	First object is always empty. - FM
+			 */
+			continue;
+		    if (!strcmp(lynxID, co->lynxID)) {
+			/*
+			 *	We found the cookie.
+			 *	Delete it if confirmed. - FM
+			 */
+			if (HTConfirm(DELETE_COOKIE_CONFIRMATION) == FALSE)
+			{
+			    FREE(lynxID);
+			    HTNoDataOK = 1;
+			    return(HT_NO_DATA);
+			}
+			HTList_removeObject(de->cookie_list, co);
+			freeCookie(co);
+			co = NULL;
+			total_cookies--;
+			if ((de->bv == QUERY_USER &&
+			     HTList_isEmpty(de->cookie_list)) &&
+			    HTConfirm(DELETE_EMPTY_DOMAIN_CONFIRMATION)) {
 			    /*
-			     *	We found the cookie.
-			     *	Delete it if confirmed. - FM
+			     *  No more cookies in this domain, no
+			     *  default accept/reject choice was set
+			     *  by the user, and got confirmation on
+			     *  deleting the domain, so do it. - FM
 			     */
-			    if (HTConfirm(DELETE_COOKIE_CONFIRMATION) == FALSE)
-			    {
-				FREE(lynxID);
-				HTNoDataOK = 1;
-				return(HT_NO_DATA);
-			    }
-			    HTList_removeObject(de->cookie_list, co);
-			    freeCookie(co);
-			    co = NULL;
-			    total_cookies--;
-			    if ((de->bv == QUERY_USER &&
-				 HTList_isEmpty(de->cookie_list)) &&
-				HTConfirm(DELETE_EMPTY_DOMAIN_CONFIRMATION)) {
-				/*
-				 *  No more cookies in this domain, no
-				 *  default accept/reject choice was set
-				 *  by the user, and got confirmation on
-				 *  deleting the domain, so do it. - FM
-				 */
-				FREE(de->domain);
-				HTList_delete(de->cookie_list);
-				de->cookie_list = NULL;
-				HTList_removeObject(domain_list, de);
-				FREE(de);
-				HTProgress(DOMAIN_EATEN);
-			    } else {
-				HTProgress(COOKIE_EATEN);
-			    }
-			    LYSleepMsg();
-			    HTNoDataOK = 1;
-			    break;
+			    FREE(de->domain);
+			    HTList_delete(de->cookie_list);
+			    de->cookie_list = NULL;
+			    HTList_removeObject(domain_list, de);
+			    FREE(de);
+			    HTProgress(DOMAIN_EATEN);
+			} else {
+			    HTProgress(COOKIE_EATEN);
 			}
+			LYSleepMsg();
+			HTNoDataOK = 1;
+			break;
 		    }
+		}
+	    } else {
+		/*
+		 * Prompt whether to delete all of the cookies in this domain,
+		 * or the domain if no cookies in it, or to change its 'allow'
+		 * setting, or to cancel, and then act on the user's response. 
+		 * - FM
+		 */
+		if (HTList_isEmpty(de->cookie_list)) {
+		    _statusline(DELETE_DOMAIN_SET_ALLOW_OR_CANCEL);
 		} else {
-		    /*
-		     *	Prompt whether to delete all of the cookies in
-		     *	this domain, or the domain if no cookies in it,
-		     *	or to change its 'allow' setting, or to cancel,
-		     *	and then act on the user's response. - FM
-		     */
-		    if (HTList_isEmpty(de->cookie_list)) {
-			_statusline(DELETE_DOMAIN_SET_ALLOW_OR_CANCEL);
-		    } else {
-			_statusline(DELETE_COOKIES_SET_ALLOW_OR_CANCEL);
-		    }
-		    HTNoDataOK = 1;
-		    while (1) {
-			ch = LYgetch_single();
+		    _statusline(DELETE_COOKIES_SET_ALLOW_OR_CANCEL);
+		}
+		HTNoDataOK = 1;
+		while (1) {
+		    ch = LYgetch_single();
 #ifdef VMS
-			if (HadVMSInterrupt) {
-			    HadVMSInterrupt = FALSE;
-			    ch = 'C';
-			}
+		    if (HadVMSInterrupt) {
+			HadVMSInterrupt = FALSE;
+			ch = 'C';
+		    }
 #endif /* VMS */
-			switch(ch) {
-			    case 'A':
-				/*
-				 *  Set to accept all cookies
-				 *  from this domain. - FM
-				 */
-				de->bv = ACCEPT_ALWAYS;
-				HTUserMsg2(ALWAYS_ALLOWING_COOKIES,
-					      de->domain);
-				return(HT_NO_DATA);
-
-			    case 'C':
-				/*
-				 *  Cancelled. - FM
-				 */
-			      reject:
-				HTUserMsg(CANCELLED);
-				return(HT_NO_DATA);
-
-			    case 'D':
-				if (HTList_isEmpty(de->cookie_list)) {
-				    /*
-				     *	We had an empty domain, so we
-				     *	were asked to delete it. - FM
-				     */
-				    FREE(de->domain);
-				    HTList_delete(de->cookie_list);
-				    de->cookie_list = NULL;
-				    HTList_removeObject(domain_list, de);
-				    FREE(de);
-				    HTProgress(DOMAIN_EATEN);
-				    LYSleepMsg();
-				    break;
-				}
+		    switch(ch) {
+		    case 'A':
+			/*
+			 * Set to accept all cookies from this domain.  - FM
+			 */
+			de->bv = ACCEPT_ALWAYS;
+			HTUserMsg2(ALWAYS_ALLOWING_COOKIES, de->domain);
+			return(HT_NO_DATA);
+
+		    case 'C':
+			/*
+			 * Cancelled.  - FM
+			 */
+		      reject:
+			HTUserMsg(CANCELLED);
+			return(HT_NO_DATA);
+
+		    case 'D':
+			if (HTList_isEmpty(de->cookie_list)) {
+			    /*
+			     * We had an empty domain, so we were asked to
+			     * delete it.  - FM
+			     */
+			    FREE(de->domain);
+			    HTList_delete(de->cookie_list);
+			    de->cookie_list = NULL;
+			    HTList_removeObject(domain_list, de);
+			    FREE(de);
+			    HTProgress(DOMAIN_EATEN);
+			    LYSleepMsg();
+			    break;
+			}
 Delete_all_cookies_in_domain:
-				/*
-				 *  Delete all cookies in this domain. - FM
-				 */
-				cl = de->cookie_list;
-				while (cl) {
-				    next = cl->next;
-				    co = cl->object;
-				    if (co) {
-					HTList_removeObject(de->cookie_list,
-							    co);
-					freeCookie(co);
-					co = NULL;
-					total_cookies--;
-				    }
-				    cl = next;
-				}
-				HTProgress(DOMAIN_COOKIES_EATEN);
-				LYSleepMsg();
-				/*
-				 *  If a default accept/reject
-				 *  choice is set, we're done. - FM
-				 */
-				if (de->bv != QUERY_USER)
-				    return(HT_NO_DATA);
-				/*
-				 *  Check whether to delete
-				 *  the empty domain. - FM
-				 */
-				if(HTConfirm(
-					DELETE_EMPTY_DOMAIN_CONFIRMATION)) {
-				    FREE(de->domain);
-				    HTList_delete(de->cookie_list);
-				    de->cookie_list = NULL;
-				    HTList_removeObject(domain_list, de);
-				    FREE(de);
-				    HTProgress(DOMAIN_EATEN);
-				    LYSleepMsg();
-				}
-				break;
-
-			    case 'P':
-				/*
-				 *  Set to prompt for cookie acceptance
-				 *  from this domain. - FM
-				 */
-				de->bv = QUERY_USER;
-				HTUserMsg2(PROMPTING_TO_ALLOW_COOKIES,
-					   de->domain);
-				return(HT_NO_DATA);
-
-			    case 'V':
-				/*
-				 *  Set to reject all cookies
-				 *  from this domain. - FM
-				 */
-				de->bv = REJECT_ALWAYS;
-				HTUserMsg2(NEVER_ALLOWING_COOKIES,
-					   de->domain);
-				if ((!HTList_isEmpty(de->cookie_list)) &&
-				    HTConfirm(DELETE_ALL_COOKIES_IN_DOMAIN))
-				    goto Delete_all_cookies_in_domain;
-				return(HT_NO_DATA);
-
-			    default:
-				if (LYCharIsINTERRUPT(ch))
-				    goto reject;
-				continue;
+			/*
+			 * Delete all cookies in this domain.  - FM
+			 */
+			cl = de->cookie_list;
+			while (cl) {
+			    next = cl->next;
+			    co = cl->object;
+			    if (co) {
+				HTList_removeObject(de->cookie_list, co);
+				freeCookie(co);
+				co = NULL;
+				total_cookies--;
+			    }
+			    cl = next;
+			}
+			HTProgress(DOMAIN_COOKIES_EATEN);
+			LYSleepMsg();
+			/*
+			 * If a default accept/reject choice is set, we're
+			 * done.  - FM
+			 */
+			if (de->bv != QUERY_USER)
+			    return(HT_NO_DATA);
+			/*
+			 * Check whether to delete the empty domain.  - FM
+			 */
+			if (HTConfirm(DELETE_EMPTY_DOMAIN_CONFIRMATION)) {
+			    FREE(de->domain);
+			    HTList_delete(de->cookie_list);
+			    de->cookie_list = NULL;
+			    HTList_removeObject(domain_list, de);
+			    FREE(de);
+			    HTProgress(DOMAIN_EATEN);
+			    LYSleepMsg();
 			}
 			break;
+
+		    case 'P':
+			/*
+			 * Set to prompt for cookie acceptance from this
+			 * domain.  - FM
+			 */
+			de->bv = QUERY_USER;
+			HTUserMsg2(PROMPTING_TO_ALLOW_COOKIES, de->domain);
+			return(HT_NO_DATA);
+
+		    case 'V':
+			/*
+			 * Set to reject all cookies from this domain.  - FM
+			 */
+			de->bv = REJECT_ALWAYS;
+			HTUserMsg2(NEVER_ALLOWING_COOKIES, de->domain);
+			if ((!HTList_isEmpty(de->cookie_list)) &&
+			    HTConfirm(DELETE_ALL_COOKIES_IN_DOMAIN))
+			    goto Delete_all_cookies_in_domain;
+			return(HT_NO_DATA);
+
+		    default:
+			if (LYCharIsINTERRUPT(ch))
+			    goto reject;
+			continue;
 		    }
+		    break;
 		}
-		break;
 	    }
 	}
 	if (HTList_isEmpty(domain_list)) {
 	    /*
-	     *	There are no more domains left.
-	     *	Don't delete the domain_list, otherwise
-	     *  atexit may be called multiple times. - kw
+	     * There are no more domains left.  Don't delete the domain_list,
+	     * otherwise atexit may be called multiple times.  - kw
 	     */
 	    HTProgress(ALL_COOKIES_EATEN);
 	    LYSleepMsg();
@@ -2555,11 +2359,10 @@ Delete_all_cookies_in_domain:
     }
 
     /*
-     *	If we get to here, it was a LYNXCOOKIE:/ URL
-     *	for creating and displaying the Cookie Jar Page,
-     *	or we didn't find the domain or cookie in a
-     *	deletion request.  Set up an HTML stream and
-     *	return an updated Cookie Jar Page. - FM
+     * If we get to here, it was a LYNXCOOKIE:/ URL for creating and displaying
+     * the Cookie Jar Page, or we didn't find the domain or cookie in a
+     * deletion request.  Set up an HTML stream and return an updated Cookie
+     * Jar Page.  - FM
      */
     target = HTStreamStack(format_in,
 			   format_out,
@@ -2573,8 +2376,8 @@ Delete_all_cookies_in_domain:
     }
 
     /*
-     *	Load HTML strings into buf and pass buf
-     *	to the target for parsing and rendering. - FM
+     * Load HTML strings into buf and pass buf to the target for parsing and
+     * rendering.  - FM
      */
 #define PUTS(buf)    (*target->isa->put_block)(target, buf, strlen(buf))
 
@@ -2606,19 +2409,19 @@ Delete_all_cookies_in_domain:
 	/*
 	 *  Show the domain link and 'allow' setting. - FM
 	 */
-	HTSprintf0(&buf, "<dt>%s<dd><a href=\"LYNXCOOKIE://%s/\">Domain=%s</a>\n",
-		      de->domain, de->domain, de->domain);
+	HTSprintf0(&buf, "<dt>%s<dd><a href=\"%s//%s/\">Domain=%s</a>\n",
+		      de->domain, STR_LYNXCOOKIE, de->domain, de->domain);
 	PUTS(buf);
 	switch (de->bv) {
-	    case (ACCEPT_ALWAYS):
-		HTSprintf0(&buf, COOKIES_ALWAYS_ALLOWED);
-		break;
-	    case (REJECT_ALWAYS):
-		HTSprintf0(&buf, COOKIES_NEVER_ALLOWED);
-		break;
-	    case (QUERY_USER):
-		HTSprintf0(&buf, COOKIES_ALLOWED_VIA_PROMPT);
-		break;
+	case (ACCEPT_ALWAYS):
+	    HTSprintf0(&buf, COOKIES_ALWAYS_ALLOWED);
+	    break;
+	case (REJECT_ALWAYS):
+	    HTSprintf0(&buf, COOKIES_NEVER_ALLOWED);
+	    break;
+	case (QUERY_USER):
+	    HTSprintf0(&buf, COOKIES_ALLOWED_VIA_PROMPT);
+	    break;
 	}
 	PUTS(buf);
 	HTSprintf0(&buf, "\n");
@@ -2649,15 +2452,15 @@ Delete_all_cookies_in_domain:
 	    } else {
 		StrAllocCopy(value, NO_VALUE);
 	    }
-	    HTSprintf0(&buf, "<dd><a href=\"LYNXCOOKIE://%s/%s\">%s=%s</a>\n",
-			 de->domain, co->lynxID, name, value);
+	    HTSprintf0(&buf, "<dd><a href=\"%s//%s/%s\">%s=%s</a>\n",
+			 STR_LYNXCOOKIE, de->domain, co->lynxID, name, value);
 	    FREE(name);
 	    FREE(value);
 	    PUTS(buf);
 
 	    if (co->flags & COOKIE_FLAG_FROM_FILE) {
 		HTSprintf0(&buf, "%s\n", gettext("(from a previous session)"));
-	        PUTS(buf);
+		PUTS(buf);
 	    }
 
 	    /*
@@ -2716,7 +2519,7 @@ Delete_all_cookies_in_domain:
 	     *	Show the Maximum Gobble Date. - FM
 	     */
 	    HTSprintf0(&buf, "<dd><em>%s</em> %s%s",
-	    		 gettext("Maximum Gobble Date:"),
+			 gettext("Maximum Gobble Date:"),
 			 ((co->flags & COOKIE_FLAG_EXPIRES_SET)
 					    ?
 			ctime(&co->expires) : END_OF_SESSION),
@@ -2748,17 +2551,14 @@ Delete_all_cookies_in_domain:
 **      invcheck behavior, as well as accept/reject behavior. - BJP
 */
 
-PUBLIC void cookie_domain_flag_set ARGS2(
-	char *, 	domainstr,
-	int, 		flag)
+PRIVATE void cookie_domain_flag_set ARGS2(
+	char *,		domainstr,
+	int,		flag)
 {
     domain_entry *de = NULL;
-    domain_entry *de2 = NULL;
-    HTList *hl = NULL;
     char **str = typecalloc(char *);
     char *dstr = NULL;
     char *strsmall = NULL;
-    int isexisting = FALSE;
 
     if (str == NULL) {
 	HTAlwaysAlert(gettext("Internal"),
@@ -2767,10 +2567,8 @@ PUBLIC void cookie_domain_flag_set ARGS2(
     }
 
     /*
-     * Is this the first domain we're handling?  If so, initialize
-     * domain_list.
+     * Is this the first domain we're handling?  If so, initialize domain_list.
      */
-
     if (domain_list == NULL) {
 #ifdef LY_FIND_LEAKS
 	atexit(LYCookieJar_free);
@@ -2792,67 +2590,53 @@ PUBLIC void cookie_domain_flag_set ARGS2(
 
 	/*
 	 * Check the list of existing domains to see if this is a
-	 * re-setting of an already existing domains -- if so, just
+	 * re-setting of an already existing domain -- if so, just
 	 * change the behavior, if not, create a new domain entry.
 	 */
 
-	for (hl = domain_list; hl != NULL; hl = hl->next) {
-	    de2 = (domain_entry *)hl->object;
-	    if ((de2 != NULL && de2->domain != NULL) &&
-		!strcasecomp(strsmall, de2->domain)) {
-			isexisting = TRUE;
-			break;
-	    } else {
-		isexisting = FALSE;
-	    }
-	}
-
-	if(!isexisting) {
+	if ((de = find_domain_entry(strsmall)) == NULL) {
 	    de = typecalloc(domain_entry);
-
 	    if (de == NULL)
 		    outofmem(__FILE__, "cookie_domain_flag_set");
 
+	    de->bv = ACCEPT_ALWAYS;
+	    de->invcheck_bv = INVCHECK_QUERY;
+
 	    switch(flag) {
-		case (FLAG_ACCEPT_ALWAYS): de->bv = ACCEPT_ALWAYS;
-					   de->invcheck_bv = DEFAULT_INVCHECK_BV;
-					   break;
-		case (FLAG_REJECT_ALWAYS): de->bv = REJECT_ALWAYS;
-					   de->invcheck_bv = DEFAULT_INVCHECK_BV;
-					   break;
-		case (FLAG_QUERY_USER):    de->bv = QUERY_USER;
-					   de->invcheck_bv = DEFAULT_INVCHECK_BV;
-					   break;
-		case (FLAG_INVCHECK_QUERY): de->invcheck_bv = INVCHECK_QUERY;
-					    de->bv = QUERY_USER;
-					    break;
-		case (FLAG_INVCHECK_STRICT): de->invcheck_bv = INVCHECK_STRICT;
-					     de->bv = QUERY_USER;
-					    break;
-		case (FLAG_INVCHECK_LOOSE): de->invcheck_bv = INVCHECK_LOOSE;
-					    de->bv = QUERY_USER;
-					    break;
+	    case (FLAG_ACCEPT_ALWAYS):	de->invcheck_bv = DEFAULT_INVCHECK_BV;
+					break;
+	    case (FLAG_REJECT_ALWAYS):	de->invcheck_bv = DEFAULT_INVCHECK_BV;
+					break;
+	    case (FLAG_QUERY_USER):	de->invcheck_bv = DEFAULT_INVCHECK_BV;
+					break;
+	    case (FLAG_INVCHECK_QUERY): de->bv = QUERY_USER;
+					break;
+	    case (FLAG_INVCHECK_STRICT): de->bv = QUERY_USER;
+					break;
+	    case (FLAG_INVCHECK_LOOSE): de->bv = QUERY_USER;
+					break;
 	    }
 
 	    StrAllocCopy(de->domain, strsmall);
 	    de->cookie_list = HTList_new();
 	    HTList_appendObject(domain_list, de);
-	} else {
-	    switch(flag) {
-		case (FLAG_ACCEPT_ALWAYS): de2->bv = ACCEPT_ALWAYS;
-					   break;
-		case (FLAG_REJECT_ALWAYS): de2->bv = REJECT_ALWAYS;
-					   break;
-		case (FLAG_QUERY_USER): de2->bv = QUERY_USER;
-					   break;
-		case (FLAG_INVCHECK_QUERY): de2->invcheck_bv = INVCHECK_QUERY;
-					   break;
-		case (FLAG_INVCHECK_STRICT): de2->invcheck_bv = INVCHECK_STRICT;
-					   break;
-		case (FLAG_INVCHECK_LOOSE): de2->invcheck_bv = INVCHECK_LOOSE;
-					   break;
-	    }
 	}
+	switch(flag) {
+	case (FLAG_ACCEPT_ALWAYS):	de->bv = ACCEPT_ALWAYS;
+					break;
+	case (FLAG_REJECT_ALWAYS):	de->bv = REJECT_ALWAYS;
+					break;
+	case (FLAG_QUERY_USER):		de->bv = QUERY_USER;
+					break;
+	case (FLAG_INVCHECK_QUERY):	de->invcheck_bv = INVCHECK_QUERY;
+					break;
+	case (FLAG_INVCHECK_STRICT):    de->invcheck_bv = INVCHECK_STRICT;
+					break;
+	case (FLAG_INVCHECK_LOOSE):	de->invcheck_bv = INVCHECK_LOOSE;
+					break;
+	}
+	CTRACE((tfp, "cookie_domain_flag_set (%s, bv=%d, invcheck_bv=%d)\n",
+		     strsmall, de->bv, de->invcheck_bv));
     }
 
     FREE(strsmall);
@@ -2861,7 +2645,7 @@ PUBLIC void cookie_domain_flag_set ARGS2(
 }
 
 /*
- * If any COOKIE_{ACCEPT,REJECT}_DOMAINS have been defined, process them. 
+ * If any COOKIE_{ACCEPT,REJECT}_DOMAINS have been defined, process them.
  * These are comma delimited lists of domains.  - BJP
  *
  * And for query/strict/loose invalid cookie checking.  - BJP
diff --git a/gnu/usr.bin/lynx/src/LYCookie.h b/gnu/usr.bin/lynx/src/LYCookie.h
index f038ed2d112..59e7ab79b52 100644
--- a/gnu/usr.bin/lynx/src/LYCookie.h
+++ b/gnu/usr.bin/lynx/src/LYCookie.h
@@ -7,17 +7,27 @@
 
 #include <HTList.h>
 
-typedef enum {ACCEPT_ALWAYS, REJECT_ALWAYS, QUERY_USER} behaviour_t;
-typedef enum {INVCHECK_QUERY,
-	      INVCHECK_STRICT,
-	      INVCHECK_LOOSE} invcheck_behaviour_t;
-typedef enum {FLAG_ACCEPT_ALWAYS,
-	      FLAG_REJECT_ALWAYS,
-	      FLAG_QUERY_USER,
-	      FLAG_FROM_FILE,
-	      FLAG_INVCHECK_QUERY,
-	      FLAG_INVCHECK_STRICT,
-	      FLAG_INVCHECK_LOOSE} cookie_domain_flags;
+typedef enum {
+    ACCEPT_ALWAYS = 0
+    , REJECT_ALWAYS
+    , QUERY_USER
+} behaviour_t;
+
+typedef enum {
+    INVCHECK_QUERY = 0
+    , INVCHECK_STRICT
+    , INVCHECK_LOOSE
+} invcheck_behaviour_t;
+
+typedef enum {
+    FLAG_ACCEPT_ALWAYS = 0
+    , FLAG_REJECT_ALWAYS
+    , FLAG_QUERY_USER
+    , FLAG_FROM_FILE
+    , FLAG_INVCHECK_QUERY
+    , FLAG_INVCHECK_STRICT
+    , FLAG_INVCHECK_LOOSE
+} cookie_domain_flags;
 
 struct _domain_entry {
     char *	domain;  /* Domain for which these cookies are valid */
@@ -31,7 +41,7 @@ extern void LYSetCookie PARAMS((
 	CONST char *	SetCookie,
 	CONST char *	SetCookie2,
 	CONST char *	address));
-extern char *LYCookie PARAMS((
+extern char *LYAddCookieHeader PARAMS((
 	char *		hostname,
 	char *		partialpath,
 	int		port,
@@ -40,9 +50,6 @@ extern void LYStoreCookies PARAMS((
 	char *		cookie_file));
 extern void LYLoadCookies PARAMS((
 	char * 		cookie_file));
-extern void cookie_domain_flag_set PARAMS((
-	char * 		domainstr,
-	int 		flag));
 extern void LYConfigCookies NOPARAMS;
 
 #endif /* LYCOOKIES_H */
diff --git a/gnu/usr.bin/lynx/src/LYCurses.c b/gnu/usr.bin/lynx/src/LYCurses.c
index 89351326de8..5ef96702856 100644
--- a/gnu/usr.bin/lynx/src/LYCurses.c
+++ b/gnu/usr.bin/lynx/src/LYCurses.c
@@ -1,5 +1,12 @@
 #include <HTUtils.h>
 #include <HTAlert.h>
+
+#ifdef __MINGW32__
+#ifdef UNIX
+#undef UNIX
+#endif /* UNIX */
+#endif /* __MINGW32__ */
+
 #include <LYCurses.h>
 #include <LYStyle.h>
 #include <LYUtils.h>
@@ -33,6 +40,10 @@ extern int _NOSHARE(COLS);
 #include <LYHash.h>
 #endif
 
+#ifdef NEED_WCHAR_H
+#include <wchar.h>
+#endif
+
 #if defined(COLOR_CURSES)
 int lynx_has_color = FALSE;
 #endif
@@ -41,17 +52,17 @@ int lynx_has_color = FALSE;
 char *XCursesProgramName = "Lynx";
 #endif
 
-#if defined(USE_COLOR_STYLE) && !USE_COLOR_TABLE
+#if defined(USE_COLOR_STYLE) && !defined(USE_COLOR_TABLE)
 #define COLOR_BKGD ((s_normal != NOSTYLE) ? hashStyles[s_normal].color : A_NORMAL)
 #else
-#define COLOR_BKGD ((COLOR_PAIRS >= 9) ? COLOR_PAIR(9) : A_NORMAL)
+#define COLOR_BKGD ((COLOR_PAIRS >= 9) ? get_color_pair(9) : A_NORMAL)
 #endif
 
 #ifdef USE_CURSES_PADS
 WINDOW *LYwin = 0;
 int LYshiftWin = 0;
 int LYwideLines = FALSE;
-int LYtableCols = 0;			/* in 1/12 of screen width */
+int LYtableCols = 0;		/* in 1/12 of screen width */
 BOOL LYuseCursesPads = TRUE;	/* use pads for left/right shifting */
 #endif
 
@@ -67,14 +78,10 @@ BOOLEAN LYCursesON = FALSE;
 PRIVATE void make_blink_boldbg NOARGS;
 #endif
 
-#if USE_COLOR_TABLE || defined(USE_SLANG)
+#if defined(USE_COLOR_TABLE) || defined(USE_SLANG)
 PUBLIC int Current_Attr, Masked_Attr;
 #endif
 
-#define OMIT_SCN_KEEPING 0 /* whether to omit keeping of Style_className
-    in HTML.c when lss support is on. 1 to increase performance. The value
-    must correspond to the value of macro OMIT_SCN_KEEPING defined in HTML.c*/
-
 #ifdef USE_SLANG
 PUBLIC unsigned int Lynx_Color_Flags = 0;
 PUBLIC BOOLEAN FullRefresh = FALSE;
@@ -401,7 +408,7 @@ PUBLIC void setHashStyle ARGS5(
 /*
  * set the curses attributes to be color or mono - RP
  */
-PRIVATE int LYAttrset ARGS3(
+PRIVATE void LYAttrset ARGS3(
     WINDOW *,	win,
     int,	color,
     int,	mono)
@@ -411,15 +418,12 @@ PRIVATE int LYAttrset ARGS3(
      && color >= 0) {
 	CTRACE2(TRACE_STYLE, (tfp, "CSS:LYAttrset color (%s)\n", attr_to_string(color)));
 	wattrset(win, color);
-	return color;
     } else if (mono >= 0) {
 	CTRACE2(TRACE_STYLE, (tfp, "CSS:LYAttrset mono (%s)\n", attr_to_string(mono)));
 	wattrset(win, mono);
-	return mono;
     } else {
 	CTRACE2(TRACE_STYLE, (tfp, "CSS:LYAttrset (A_NORMAL)\n"));
 	wattrset(win, A_NORMAL);
-	return A_NORMAL;
     }
 }
 
@@ -478,9 +482,9 @@ PUBLIC void curses_w_style ARGS3(
 			"attribute cache FULL, dropping last",
 			last_styles[last_colorattr_ptr],
 			"in LynxChangeStyle(curses_w_style)"));
-	    last_colorattr_ptr--;
+	    last_colorattr_ptr = 127;
 	}
-	last_styles[last_colorattr_ptr++] = getattrs(win);
+	last_styles[last_colorattr_ptr++] = LYgetattrs(win);
 	/* don't cache style changes for active links */
 #if OMIT_SCN_KEEPING
 	/* since we don't compute the hcode to stack off in HTML.c, we
@@ -550,7 +554,7 @@ PUBLIC void curses_style ARGS2(
 
 PRIVATE BOOL lynx_called_initscr = FALSE;
 
-#if HAVE_USE_DEFAULT_COLORS && USE_DEFAULT_COLORS
+#if defined(HAVE_USE_DEFAULT_COLORS) && defined(USE_DEFAULT_COLORS)
 /*
  * If we find a "default" color while reading the config-file, set default
  * colors on the screen.
@@ -570,7 +574,7 @@ PUBLIC int lynx_default_colors NOARGS
 }
 #endif /* HAVE_USE_DEFAULT_COLORS && USE_DEFAULT_COLORS */
 
-#if USE_COLOR_TABLE && defined(COLOR_CURSES)
+#if defined(USE_COLOR_TABLE) && defined(COLOR_CURSES)
 /*
  * This block of code is designed to produce the same color effects using SVr4
  * curses as the slang library's implementation in this module.  That maps the
@@ -582,16 +586,15 @@ PUBLIC int lynx_default_colors NOARGS
 
 PRIVATE struct {
     int fg, bg;
-    chtype attr;
 } lynx_color_cfg[] = {
-    /*0*/ { DEFAULT_FG,    DEFAULT_BG,	A_NORMAL}, /* A_NORMAL */
-    /*1*/ { COLOR_BLUE,    DEFAULT_BG,	A_NORMAL}, /* A_BOLD */
-    /*2*/ { COLOR_YELLOW,  COLOR_BLUE,	A_BOLD},   /* A_REVERSE */
-    /*3*/ { COLOR_GREEN,   DEFAULT_BG,	A_NORMAL}, /* A_REVERSE | A_BOLD */
-    /*4*/ { COLOR_MAGENTA, DEFAULT_BG,	A_NORMAL}, /* A_UNDERLINE */
-    /*5*/ { COLOR_BLUE,    DEFAULT_BG,	A_NORMAL}, /* A_UNDERLINE | A_BOLD */
-    /*6*/ { COLOR_RED,	   DEFAULT_BG,	A_NORMAL}, /* A_UNDERLINE | A_REVERSE */
-    /*7*/ { COLOR_MAGENTA, COLOR_CYAN,	A_NORMAL}  /* A_UNDERLINE | A_BOLD | A_REVERSE */
+    /*0*/ { DEFAULT_FG,    DEFAULT_BG},
+    /*1*/ { COLOR_BLUE,    DEFAULT_BG},
+    /*2*/ { COLOR_YELLOW+8,COLOR_BLUE},
+    /*3*/ { COLOR_GREEN,   DEFAULT_BG},
+    /*4*/ { COLOR_MAGENTA, DEFAULT_BG},
+    /*5*/ { COLOR_BLUE,    DEFAULT_BG},
+    /*6*/ { COLOR_RED,	   DEFAULT_BG},
+    /*7*/ { COLOR_MAGENTA, COLOR_CYAN}
 };
 
 /*
@@ -603,6 +606,47 @@ PRIVATE struct {
 } lynx_color_pairs[25];
 
 /*
+ * If we find an exact match for the given default colors, force curses to use
+ * color pair 0, which corresponds to the terminal's default colors.  Normally
+ * curses assumes white-on-black, but we can override the assumption with this
+ * function.
+ */
+PRIVATE int get_color_pair ARGS1(int, n)
+{
+#ifdef USE_CURSES_PAIR_0
+    if (lynx_color_pairs[n].fg == default_fg
+     && lynx_color_pairs[n].bg == default_bg)
+	return 0;
+#endif
+    return COLOR_PAIR(n);
+}
+
+/*
+ * Lynx "knows" about 16 colors.  ANSI colors (and most color terminal
+ * emulators) only go to 8, though some curses implementations (ncurses and
+ * PDCurses) handle 16.  If lynx's configuration calls for a color past the
+ * number of colors that the terminal handles (COLORS), map the extra value
+ * to bold.
+ */
+#define is_boldc(c) ((c) > (COLORS-1))
+#define map2bold(c) (is_boldc(c) ? ((c) & (COLORS-1)) : (c))
+
+/*
+ * Return the extra color as A_BOLD.
+ * If there is no extra color, return A_NORMAL.
+ */
+PRIVATE int lynx_color_cfg_attr ARGS1(int, code)
+{
+    int result = A_NORMAL;
+    if (code >= 0 && code < 8) {
+	int fg = lynx_color_cfg[code].fg;
+	if (is_boldc(fg) && (fg & COLORS))
+	    result = A_BOLD;
+    }
+    return result;
+}
+
+/*
  * Map the SGR attributes (0-7) into ANSI colors, modified with the actual BOLD
  * attribute we'll get 16 colors.
  */
@@ -614,15 +658,15 @@ PRIVATE void LYsetWAttr ARGS1(WINDOW *, win)
 	int offs = 1;
 
 	if (Current_Attr & A_BOLD)
-		code |= 1;
+	    code |= 1;
 	if (Current_Attr & A_REVERSE)
-		code |= 2;
+	    code |= 2;
 	if (Current_Attr & A_UNDERLINE)
-		code |= 4;
-	attr = lynx_color_cfg[code].attr;
+	    code |= 4;
+	attr = lynx_color_cfg_attr(code);
 
 	if (code+offs < COLOR_PAIRS) {
-		attr |= COLOR_PAIR(code+offs);
+	    attr |= get_color_pair(code+offs);
 	}
 
 	wattrset(win, attr & ~Masked_Attr);
@@ -631,10 +675,28 @@ PRIVATE void LYsetWAttr ARGS1(WINDOW *, win)
     }
 }
 
-PRIVATE void lynx_map_color ARGS1(int, n)
+/*
+ * Initialize a curses color-pair based on our configured color values.
+ */
+PRIVATE void lynx_init_color_pair ARGS1(int, n)
 {
     int m;
 
+    if (lynx_called_initscr) {
+	for (m = 0; m <= 16; m += 8) {
+	    int pair = n + m + 1;
+	    if (pair < COLOR_PAIRS)
+		init_pair((short)pair,
+		    (short)map2bold(lynx_color_pairs[pair].fg),
+		    (short)map2bold(lynx_color_pairs[pair].bg));
+	}
+	if (n == 0 && LYShowColor >= SHOW_COLOR_ON)
+	    wbkgd(LYwin, COLOR_BKGD | ' ');
+    }
+}
+
+PRIVATE void lynx_map_color ARGS1(int, n)
+{
     CTRACE((tfp, "lynx_map_color(%d)\n", n));
 
     lynx_color_pairs[n+1].fg = lynx_color_cfg[n].fg;
@@ -646,19 +708,13 @@ PRIVATE void lynx_map_color ARGS1(int, n)
     lynx_color_pairs[n+17].fg = lynx_color_cfg[n].bg;
     lynx_color_pairs[n+17].bg = lynx_color_cfg[n].bg;
 
-    if (lynx_called_initscr) {
-	for (m = 0; m <= 16; m += 8) {
-	    int pair = n + m + 1;
-	    if (pair < COLOR_PAIRS)
-		init_pair((short)pair,
-		    (short)lynx_color_pairs[pair].fg,
-		    (short)lynx_color_pairs[pair].bg);
-	}
-	if (n == 0 && LYShowColor >= SHOW_COLOR_ON)
-	    wbkgd(LYwin, COLOR_BKGD | ' ');
-    }
+    lynx_init_color_pair(n);
 }
 
+/*
+ * Change a configured color value.  This may be called before initscr(), so
+ * we may not be able to call init_pair() to finish the change.
+ */
 PUBLIC int lynx_chg_color ARGS3(
 	int, color,
 	int, fg,
@@ -667,9 +723,8 @@ PUBLIC int lynx_chg_color ARGS3(
 {
     if (fg == ERR_COLOR || bg == ERR_COLOR) return -1;
     if (color >= 0 && color < 8) {
-	lynx_color_cfg[color].fg = (fg > 7) ? (fg & 7) : fg;
-	lynx_color_cfg[color].bg = (bg > 7) ? (bg & 7) : bg;
-	lynx_color_cfg[color].attr = ((fg > 7) && (fg & 8)) ? A_BOLD : A_NORMAL;
+	lynx_color_cfg[color].fg = fg;
+	lynx_color_cfg[color].bg = bg;
 	lynx_map_color(color);
     } else {
 	return -1;
@@ -680,9 +735,9 @@ PUBLIC int lynx_chg_color ARGS3(
 PUBLIC void lynx_set_color ARGS1(int, a)
 {
     if (lynx_has_color && LYShowColor >= SHOW_COLOR_ON) {
-	wattrset(LYwin, lynx_color_cfg[a].attr
+	wattrset(LYwin, lynx_color_cfg_attr(a)
 		| (((a+1) < COLOR_PAIRS)
-			? COLOR_PAIR(a+1)
+			? get_color_pair(a+1)
 			: A_NORMAL));
     }
 }
@@ -698,23 +753,16 @@ PUBLIC void lynx_standout ARGS1(int, flag)
 PRIVATE void lynx_init_colors NOARGS
 {
     if (lynx_has_color) {
-	size_t n, m;
+	size_t n;
 
-	CTRACE((tfp, "lynx_init_colors\n"));
+	CTRACE((tfp, "lynx_init_colors (default %d/%d)\n",
+		     default_fg, default_bg));
 
 	lynx_color_cfg[0].fg = default_fg;
 	lynx_color_cfg[0].bg = default_bg;
 
 	for (n = 0; n < TABLESIZE(lynx_color_cfg); n++) {
-	    for (m = 0; m <= 16; m += 8) {
-		int pair = n + m + 1;
-		if (pair < COLOR_PAIRS)
-		    init_pair((short)pair,
-			(short)lynx_color_pairs[pair].fg,
-			(short)lynx_color_pairs[pair].bg);
-	    }
-	    if (n == 0 && LYShowColor >= SHOW_COLOR_ON)
-		wbkgd(LYwin, COLOR_BKGD | ' ');
+	    lynx_init_color_pair(n);
 	}
     } else if (LYShowColor != SHOW_COLOR_NEVER) {
 	LYShowColor = SHOW_COLOR_OFF;
@@ -740,7 +788,7 @@ PUBLIC void LYnoVideo ARGS1(
     if (a & 4) Masked_Attr |= SLTT_ULINE_MASK;
     lynx_setup_attrs();
 #else
-#if USE_COLOR_TABLE
+#ifdef USE_COLOR_TABLE
     if (a & 1) Masked_Attr |= A_BOLD;
     if (a & 2) Masked_Attr |= A_REVERSE;
     if (a & 4) Masked_Attr |= A_UNDERLINE;
@@ -748,6 +796,7 @@ PUBLIC void LYnoVideo ARGS1(
 #endif
 }
 
+#define NEWTERM_NAME "newterm"
 #if       !defined(VMS) && !defined(USE_SLANG)
 /*
  * If newterm is not defined, assume a curses subset which
@@ -757,6 +806,7 @@ PUBLIC void LYnoVideo ARGS1(
 static SCREEN *LYscreen = NULL;
 #define LYDELSCR() { \
 if (recent_sizechange) { \
+    CTRACE((tfp, "Screen size: delscreen()\n")); \
     delscreen(LYscreen); \
     LYscreen = NULL; } }
 /*
@@ -764,6 +814,8 @@ if (recent_sizechange) { \
  */
 #else  /* HAVE_NEWTERM   */
 static WINDOW *LYscreen = NULL;
+#undef  NEWTERM_NAME
+#define NEWTERM_NAME "initscr"
 #undef  newterm
 #define newterm(type, out, in) (initscr())
 #define LYDELSCR()  /* nothing */
@@ -778,6 +830,11 @@ static WINDOW *LYscreen = NULL;
 #define LYDELSCR()  /* nothing */
 #endif /* !defined(VMS) && !defined(USE_SLANG) */
 
+#if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
+PUBLIC int saved_scrsize_x = 0;
+PUBLIC int saved_scrsize_y = 0;
+#endif
+
 PUBLIC void start_curses NOARGS
 {
 #ifdef USE_SLANG
@@ -852,11 +909,7 @@ PUBLIC void start_curses NOARGS
 #endif /* (VMS || REAL_UNIX_SYSTEM) && !__CYGWIN__  */
     }
 #ifdef __DJGPP__
-#ifdef WATT32
     _eth_init();
-#else
-    else sock_init();
-#endif /* WATT32 */
 #endif /* __DJGPP__ */
 
     slinit = 1;
@@ -898,9 +951,23 @@ PUBLIC void start_curses NOARGS
      *	If we are VMS then do initscr() everytime start_curses()
      *	is called!
      */
+    CTRACE((tfp, "Screen size: initscr()\n"));
     initscr();	/* start curses */
 #else  /* Unix: */
 
+#ifdef __CYGWIN__
+    /*
+     * Workaround for buggy Cygwin, which breaks subprocesses of a
+     * full-screen application (tested with cygwin dll, dated
+     * 2002/6/23 -TD)
+     */
+    if (!lynx_called_initscr) {
+	FILE *fp = fopen("/dev/tty", "w");
+	if (fp != 0)
+	    stdout = fp;
+    }
+#endif
+
     if (!LYscreen) {
 	/*
 	 *  If we're not VMS then only do initscr() one time,
@@ -933,20 +1000,25 @@ PUBLIC void start_curses NOARGS
 	}
 #endif /* defined(__MVS__) */
 #endif /* !(defined(NCURSES) && defined(HAVE_RESIZETERM)) */
+	CTRACE((tfp, "Screen size: %s()\n", NEWTERM_NAME));
 	if (!(LYscreen = newterm(NULL,stdout,stdin))) {  /* start curses */
 	    fprintf(tfp, "%s\n",
 		gettext("Terminal initialisation failed - unknown terminal type?"));
 	    exit_immediately (EXIT_FAILURE);
 	}
 #else
+	CTRACE((tfp, "Screen size: initscr()\n"));
 	initscr();
 #endif /* HAVE_NEWTERM */
 	lynx_called_initscr = TRUE;
+	LYlines = LYscreenHeight();
+	LYcols = LYscreenWidth();
 
 #if defined(SIGWINCH) && defined(NCURSES_VERSION)
 	size_change(0);
 	recent_sizechange = FALSE; /* prevent mainloop drawing 1st doc twice */
 #endif /* SIGWINCH */
+	CTRACE((tfp, "Screen size is now %d x %d\n", LYlines, LYcols ));
 
 #ifdef USE_CURSES_PADS
 	if (LYuseCursesPads) {
@@ -995,8 +1067,19 @@ PUBLIC void start_curses NOARGS
 	if (has_colors()) {
 	    lynx_has_color = TRUE;
 	    start_color();
-#if USE_DEFAULT_COLORS
-#ifdef EXP_ASSUMED_COLOR
+
+#ifndef COLORS
+	    /* map2boldc() relies on COLORS being a power of 2 */
+	    if (COLORS > 16)
+		COLORS = 16;
+	    if (COLORS < 8)
+		COLORS = 2;
+	    if (COLORS > 8 && COLORS != 16)
+		COLORS = 8;
+#endif
+
+#ifdef USE_DEFAULT_COLORS
+#if defined(EXP_ASSUMED_COLOR) && defined(USE_COLOR_TABLE)
 	    /*
 	     * Adjust the color mapping table to match the ASSUMED_COLOR
 	     * setting in lynx.cfg
@@ -1005,6 +1088,8 @@ PUBLIC void start_curses NOARGS
 		default_fg = COLOR_WHITE;
 		default_bg = COLOR_BLACK;
 	    }
+	    CTRACE((tfp, "initializing default colors %d/%d\n",
+			 default_fg, default_bg));
 	    if (default_fg >= 0 || default_bg >= 0) {
 		unsigned n;
 		for (n = 0; n < TABLESIZE(lynx_color_cfg); n++) {
@@ -1019,7 +1104,9 @@ PUBLIC void start_curses NOARGS
 		lynx_setup_colors();
 	    }
 #else
+#if defined(HAVE_USE_DEFAULT_COLORS)
 	    lynx_default_colors();
+#endif /* HAVE_USE_DEFAULT_COLORS */
 #endif /* EXP_ASSUMED_COLOR */
 #endif /* USE_DEFAULT_COLORS */
 	}
@@ -1028,16 +1115,12 @@ PUBLIC void start_curses NOARGS
 #ifdef USE_COLOR_STYLE
 	parse_userstyles();
 #endif
-#if USE_COLOR_TABLE
+#ifdef USE_COLOR_TABLE
 	lynx_init_colors();
 #endif /* USE_COLOR_TABLE */
     }
 #ifdef __DJGPP__
-#ifdef WATT32
     _eth_init();
-#else
-    else sock_init();
-#endif /* WATT32 */
 #endif /* __DJGPP__ */
 #endif /* not VMS */
 
@@ -1047,7 +1130,7 @@ PUBLIC void start_curses NOARGS
     crmode();
     raw();
 #else
-#if HAVE_CBREAK
+#ifdef HAVE_CBREAK
     cbreak();
 #else
     crmode();
@@ -1057,7 +1140,7 @@ PUBLIC void start_curses NOARGS
 
     noecho();
 
-#if HAVE_KEYPAD
+#ifdef HAVE_KEYPAD
     if (!keypad_on)
 	keypad(LYwin,TRUE);
 #endif /* HAVE_KEYPAD */
@@ -1079,6 +1162,18 @@ PUBLIC void start_curses NOARGS
 #endif
 
     LYCursesON = TRUE;
+#if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
+    if ((scrsize_x != 0) && (scrsize_y != 0)) {
+	if (saved_scrsize_x == 0) {
+	    saved_scrsize_x = COLS;
+	    saved_scrsize_y = LINES;
+	}
+	CTRACE((tfp, "resize_term: x=%d, y=%d\n", scrsize_x, scrsize_y));
+	CTRACE((tfp, "saved terminal size: x=%d, y=%d\n", saved_scrsize_x, saved_scrsize_y));
+	resize_term(scrsize_y, scrsize_x);
+        LYclear();
+    }
+#endif
     CTRACE((tfp, "start_curses: done.\n"));
 }  /* end of start_curses() */
 
@@ -1090,8 +1185,7 @@ PUBLIC void lynx_enable_mouse ARGS1(int,state)
 
 #if defined(WIN_EX)
 /* modify lynx_enable_mouse() for pdcurses configuration so that mouse support
-   is disabled unless -use_mouse is specified.  This is ifdef'd with
-   __BORLANDC__ for the time being (WB).
+   is disabled unless -use_mouse is specified
 */
     HANDLE hConIn = INVALID_HANDLE_VALUE;
     hConIn = GetStdHandle(STD_INPUT_HANDLE);
@@ -1106,7 +1200,6 @@ PUBLIC void lynx_enable_mouse ARGS1(int,state)
     if (LYUseMouse == 0)
 	return;
 
-
 #if defined(USE_SLANG)
     SLtt_set_mouse_mode (state, 0);
     SLtt_flush_output ();
@@ -1229,25 +1322,32 @@ PUBLIC void stop_curses NOARGS
 {
     if (LYCursesON)
 	echo();
+#if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
+    resetty ();
+#endif
 #ifdef __DJGPP__
-#ifdef WATT32
     _eth_release();
-#else
-    sock_exit();
-#endif /* WATT32 */
 #endif /* __DJGPP__ */
-#if defined(DOSPATH) && !(defined(USE_SLANG) || _WIN_CC)
+
+#if defined(DOSPATH) && !(defined(USE_SLANG) || defined(_WIN_CC))
+#ifdef __DJGPP__
+    ScreenClear();
+#else
+#ifdef __MINGW32__
+    clear();
+#else
     clrscr();
+#endif
+#endif
 #else
 
-    /*
-     *	Fixed for better dumb terminal support.
-     *	05-28-94 Lynx 2-3-1 Garrett Arch Blythe
-     */
     if(LYCursesON == TRUE)	{
 	lynx_nl2crlf(TRUE);
 	lynx_enable_mouse (0);
-#if (!defined(WIN_EX) || defined(__CYGWIN__))	/* @@@ */
+#if 1 /* (!defined(WIN_EX) || defined(__CYGWIN__)) */	/* @@@ */
+#ifdef WIN_EX
+	if (system_is_NT)
+#endif
 	if(LYscreen || lynx_called_initscr) {
 	    endwin();	/* stop curses */
 	    LYDELSCR();
@@ -1264,7 +1364,7 @@ PUBLIC void stop_curses NOARGS
 #endif
 
     fflush(stdout);
-#endif /* defined(DOSPATH) && !(defined(USE_SLANG) || _WIN_CC) */
+#endif /* defined(DOSPATH) && !(defined(USE_SLANG) || defined(_WIN_CC)) */
     fflush(stderr);
 
     LYCursesON = FALSE;
@@ -1384,37 +1484,29 @@ PUBLIC BOOLEAN setup ARGS1(
     /*
      *	Query the terminal type.
      */
-    if (dumbterm(getenv("TERM"))) {
-	char *s;
-
+    if (dumbterm(LYGetEnv("TERM"))) {
 	printf("\n\n  %s\n\n", gettext("Your Terminal type is unknown!"));
 	printf("  %s [vt100] ", gettext("Enter a terminal type:"));
 
-	if (LYSafeGets(&buffer, stdin) != 0)
-	    if ((s = strchr(buffer, '\n')) != NULL)
-		*s = '\0';
+	if (LYSafeGets(&buffer, stdin) != 0) {
+	    LYTrimLeading(buffer);
+	    LYTrimTrailing(buffer);
+	}
 
-	if (buffer == 0 || *buffer == 0)
+	if (isEmpty(buffer))
 	    StrAllocCopy(buffer,"vt100");
 
 	HTSprintf0(&term_putenv,"TERM=%.106s", buffer);
 	FREE(buffer);
 
 	(void) putenv(term_putenv);
-	printf("\n%s %s\n", gettext("TERMINAL TYPE IS SET TO"), getenv("TERM"));
+	printf("\n%s %s\n", gettext("TERMINAL TYPE IS SET TO"), LYGetEnv("TERM"));
 	LYSleepMsg();
     }
 
     start_curses();
 
-#if HAVE_TTYTYPE
-    /*
-     *	Get terminal type (strip 'dec-' from vms style types).
-     */
-    if (strncmp((CONST char*)ttytype, "dec-vt", 6) == 0) {
-	(void) setterm(ttytype + 4);
-    }
-
+#ifdef HAVE_TTYTYPE
     /*
      *  Account for lossage on the 'sun' terminal type (80x24) Sun text
      *  console driver. It only supports reverse video, but all SGR
@@ -1456,7 +1548,7 @@ PRIVATE int dumbterm ARGS1(
 
 #ifdef FANCY_CURSES
 #ifndef USE_COLOR_STYLE
-#if USE_COLOR_TABLE
+#ifdef USE_COLOR_TABLE
 PUBLIC void LYaddWAttr ARGS2(
 	WINDOW *,	win,
 	int,		a)
@@ -1503,14 +1595,51 @@ PUBLIC void LYpaddstr ARGS3(
 	CONST char *,	the_string)
 {
     int y, x;
+    int actual = strlen(the_string);
+
     getyx(the_window, y, x);
     if (width + x >= LYcols)
 	width = LYcols - x - 1;
-    LYwaddnstr(the_window, the_string, width);
-    width -= strlen(the_string);
+    if (actual > width)
+	actual = width;
+    LYwaddnstr(the_window, the_string, actual);
+    width -= actual;
     while (width-- > 0)
 	waddstr(the_window, " ");
 }
+
+/*
+ * Workaround a bug in ncurses order-of-refresh by setting a pointer to
+ * the topmost window that should be displayed.
+ *
+ * FIXME: the associated call on 'keypad()' is not needed for Unix, but
+ * something in the OS/2 EMX port requires it.
+ */
+PRIVATE WINDOW *my_subwindow;
+
+PUBLIC void LYsubwindow ARGS1(WINDOW *, param)
+{
+    if (param != 0) {
+	my_subwindow = param;
+#if defined(NCURSES) || defined(PDCURSES)
+	keypad(my_subwindow, TRUE);
+#if defined(HAVE_GETBKGD) /* not defined in ncurses 1.8.7 */
+	wbkgd(my_subwindow, getbkgd(LYwin));
+	wbkgdset(my_subwindow, getbkgd(LYwin));
+#endif
+#endif
+	scrollok(my_subwindow, TRUE);
+    } else {
+	touchwin(LYwin);
+	delwin(my_subwindow);
+	my_subwindow = 0;
+    }
+}
+
+PUBLIC WINDOW *LYtopwindow NOARGS
+{
+    return (my_subwindow ? my_subwindow : LYwin);
+}
 #endif
 
 PUBLIC WINDOW *LYstartPopup ARGS4(
@@ -1540,7 +1669,7 @@ PUBLIC WINDOW *LYstartPopup ARGS4(
 
 	    /* Get a proper value for the attribute */
 	    LynxWChangeStyle(form_window, s_menu_bg, STACK_ON);
-	    b = getattrs(form_window);
+	    b = LYgetattrs(form_window);
 	    LynxWChangeStyle(form_window, s_menu_bg, STACK_OFF);
 	    wbkgd(form_window, b | ' ');
 	    /* wbkgdset does not make a lot of sense with USE_COLOR_STYLE
@@ -1564,10 +1693,10 @@ PUBLIC void LYstartTargetEmphasis NOARGS
     }
 #endif
 #if defined(FANCY_CURSES) || defined(USE_SLANG)
-    start_bold();
-    start_reverse();
+    lynx_start_bold();
+    lynx_start_reverse();
 #endif /* FANCY_CURSES || USE_SLANG */
-    start_underline();
+    lynx_start_underline();
 }
 
 PUBLIC void LYstopTargetEmphasis NOARGS
@@ -1578,10 +1707,10 @@ PUBLIC void LYstopTargetEmphasis NOARGS
 	return;
     }
 #endif
-    stop_underline();
+    lynx_stop_underline();
 #if defined(FANCY_CURSES) || defined(USE_SLANG)
-    stop_reverse();
-    stop_bold();
+    lynx_stop_reverse();
+    lynx_stop_bold();
 #endif /* FANCY_CURSES || USE_SLANG */
 }
 
@@ -1615,29 +1744,147 @@ PUBLIC void LYtouchline ARGS1(
 }
 
 /*
- * There's no guarantee that a library won't temporarily write on its input.
- * Be safe and copy it when we have const-data.
+ * Wrapper for waddnstr().
  */
 PUBLIC void LYwaddnstr ARGS3(
 	WINDOW *,	w,
-	CONST char *,	s,
+	CONST char *,	src,
 	size_t,		len)
 {
+    /*
+     * We only want to trace this function for the color-style code.  It would
+     * be too much logging if not needed.
+     */
 #ifdef USE_COLOR_STYLE
     if (TRACE) {
 	int y, x;
 	LYGetYX(y, x);
-	CTRACE2(TRACE_STYLE, (tfp, "[%2d,%2d] LYwaddnstr(%.*s)\n", y, x, (int) len, s));
+	CTRACE2(TRACE_STYLE, (tfp, "[%2d,%2d] LYwaddnstr(%.*s)\n", y, x, (int) len, src));
     }
 #endif
+    /*
+     * Wide (multibyte) characters are always written as part of a string.  So
+     * we can handle the conversion in one place.
+     *
+     * X/Open curses documents addstr() as able to handle multibyte sequences
+     * directly, but that is not (2001/11/5) yet implemented in ncurses.  Two
+     * alternatives are possible:  translating the string to an array of
+     * wchar_t's or to an array of cchar_t's.  The former is more direct.  Both
+     * have problems with combining-characters in this version of ncurses
+     * (successive calls are not merged), so I'm using them for testing -TD
+     */
+#if 0	/* defined(WIDEC_CURSES) && defined(HAVE_MBSTATE_T) */
+#if 1	/* array of wchar_t's */
+    {
+	static wchar_t *temp = 0;
+	static size_t used = 0;
+
+	wchar_t wch;
+	int l = 0;
+	mbstate_t state;
+	size_t rc;
+	int width;
+	unsigned j;
+	size_t need;
+
+	memset(&state, 0, sizeof(state));
+	need = 1 + len;
+	if (need > used) {
+	    used = 2 * need;
+	    CTRACE((tfp, "allocated %d (%d)\n", used, len));
+	    FREE(temp);
+	    temp = typecallocn(wchar_t, used);
+	}
+	for (j = 0; j < len; j++) {
+	    rc = mbrtowc(&wch, src + j, len - j, &state);
+	    if (rc == 0 || rc == (size_t)(-1) || rc == (size_t)(-2))
+		break;
+	    j += rc - 1;
+	    if ((width = wcwidth(wch)) < 0)
+		break;
+	    temp[l++] = wch;
+	}
+	temp[l] = L'\0';
+	waddnwstr(w, temp, l);
+#ifdef LY_FIND_LEAKS
+	FREE(temp);
+	used = 0;
+#endif
+    }
+#else	/* array of cchar_t's */
+    {
+	static cchar_t *temp = 0;
+	static size_t used = 0;
+
+	wchar_t wch;
+	wchar_t wstr[CCHARW_MAX + 1];
+	int l = 0;
+	mbstate_t state;
+	size_t rc;
+	int width;
+	int y, x;
+	unsigned j, k;
+	size_t need;
+	attr_t attr;
+	short pair;
+
+	wattr_get(w, &attr, &pair, (void *)0);
+
+	memset(&state, 0, sizeof(state));
+	need = 1 + len;
+	if (need > used) {
+	    used = 2 * need;
+	    CTRACE((tfp, "allocated %d (%d)\n", used, len));
+	    FREE(temp);
+	    temp = typecallocn(cchar_t, used);
+	}
+	for (j = k = 0; j < len; j++) {
+	    rc = mbrtowc(&wch, src + j, len - j, &state);
+	    if (rc == 0 || rc == (size_t)(-1) || rc == (size_t)(-2))
+		break;
+	    j += rc - 1;
+	    if ((width = wcwidth(wch)) < 0)
+		break;
+	    if ((width > 0 && l > 0) || l == CCHARW_MAX) {
+		wstr[l] = L'\0';
+		l = 0;
+		if (setcchar(temp + k, wstr, attr, 0, NULL) != OK)
+		    break;
+		++k;
+	    }
+	    if (width == 0 && l == 0)
+		wstr[l++] = L' ';
+	    wstr[l++] = wch;
+	}
+	if (l > 0) {
+	    wstr[l] = L'\0';
+	    if (setcchar(temp + k, wstr, attr, 0, NULL) == OK)
+		++k;
+	}
+	setcchar(temp + k, L"", 0, 0, NULL);
+	wadd_wchnstr (w, temp, k);
+	getyx(w, y, x);		/* we didn't move - do it now */
+	wmove(w, y, x + k);
+#ifdef LY_FIND_LEAKS
+	FREE(temp);
+	used = 0;
+#endif
+    }
+#endif
+#else
+    /*
+     * There's no guarantee that a library won't temporarily write on its input.
+     * Be safe and copy it when we have const-data.
+     */
     while (len > 0) {
 	char temp[MAX_LINE];
 	size_t use = (len >= MAX_LINE) ? MAX_LINE - 1 : len;
-	memcpy(temp, s, use);
+	memcpy(temp, src, use);
 	temp[use] = 0;
 	waddstr(w, temp);
 	len -= use;
     }
+#endif
 }
 
 #ifdef VMS
@@ -1786,7 +2033,6 @@ TRACEBACK if it can be captured, and any other relevant information.\n"));
  */
 PUBLIC int ttopen NOARGS
 {
-	extern	void cleanup_sig();
 	int	iosb[2];
 	int	status;
 	static unsigned long condition;
@@ -2104,7 +2350,6 @@ PUBLIC int DCLsystem ARGS1(
 	char *,		command)
 {
      int status;
-     extern void controlc();
 
      VMSsignal(SIGINT, SIG_IGN);
      status = spawn_DCLprocess(command);
@@ -2202,6 +2447,15 @@ PUBLIC void LYrefresh NOARGS
 
 	wnoutrefresh(stdscr);
 	pnoutrefresh(LYwin, 0, LYshiftWin, 0, 0, LYlines, LYscreenWidth()-1);
+
+	/*
+	 * Keep a popup window visible.  This can happen if the user presses
+	 * '/' to do a search within a popup.
+	 */
+	if (my_subwindow != 0) {
+	    touchwin(my_subwindow);
+	    wnoutrefresh(my_subwindow);
+	}
 	doupdate();
     } else {
 	refresh();
@@ -2219,14 +2473,14 @@ PUBLIC void lynx_force_repaint NOARGS
 PUBLIC void lynx_start_title_color NOARGS
 {
 #ifdef SH_EX
-    start_reverse();
+    lynx_start_reverse();
 #endif
 }
 
 PUBLIC void lynx_stop_title_color NOARGS
 {
 #ifdef SH_EX
-    stop_reverse();
+    lynx_stop_reverse();
 #endif
 }
 
@@ -2239,26 +2493,26 @@ PUBLIC void lynx_start_link_color ARGS2(
 	 * they can't handle two attributes at the
 	 * same time
 	 */
-	/* start_bold();  */
-	start_reverse();
+	/* lynx_start_bold();  */
+	lynx_start_reverse();
 #if defined(USE_SLANG)
 #ifndef __DJGPP__
 	if (SLtt_Use_Ansi_Colors)
 #endif /* !__DJGPP__ */
-	    start_underline ();
+	    lynx_start_underline ();
 #endif /* USE_SLANG */
 #if defined(FANCY_CURSES) && defined(COLOR_CURSES)
 	if (lynx_has_color && LYShowColor >= SHOW_COLOR_ON)
-	    start_underline ();
+	    lynx_start_underline ();
 #endif /* USE_SLANG */
      } else {
-	start_bold();
+	lynx_start_bold();
 	/*
 	 *  Make sure when flag is OFF that "unhighlighted" links
 	 *  will be underlined if appropriate. - LE & FM
 	 */
 	if (pending)
-	    start_underline();
+	    lynx_start_underline();
      }
 }
 
@@ -2270,101 +2524,135 @@ PUBLIC void lynx_stop_link_color ARGS2(
     LynxChangeStyle(flag == ON ? s_alink : s_a, ABS_OFF);
 #else
     if (flag) {
-	stop_reverse();
+	lynx_stop_reverse();
 #if defined(USE_SLANG)
 #ifndef __DJGPP__
 	if (SLtt_Use_Ansi_Colors)
 #endif /* !__DJGPP__ */
-	stop_underline ();
+	lynx_stop_underline ();
 #endif /* USE_SLANG */
 #if defined(FANCY_CURSES) && defined(COLOR_CURSES)
 	if (lynx_has_color && LYShowColor >= SHOW_COLOR_ON)
-	    stop_underline ();
+	    lynx_stop_underline ();
 #endif /* FANCY_CURSES && COLOR_CURSES */
     } else {
-	stop_bold();
+	lynx_stop_bold();
 	/*
 	 *  If underlining was turned on above, turn it off. - LE & FM
 	 */
 	if (pending)
-	    stop_underline();
+	    lynx_stop_underline();
     }
 #endif
 }
 
+/* FIXME: consider inlining these */
 
 PUBLIC void lynx_stop_target_color NOARGS
 {
-    stop_underline();
-    stop_reverse();
-    stop_bold();
+    lynx_stop_underline();
+    lynx_stop_reverse();
+    lynx_stop_bold();
 }
 
 PUBLIC void lynx_start_target_color NOARGS
 {
-    start_bold();
-    start_reverse();
-    start_underline();
+    lynx_start_bold();
+    lynx_start_reverse();
+    lynx_start_underline();
 }
 
 
 PUBLIC void lynx_start_status_color NOARGS
 {
-#if USE_COLOR_TABLE && defined(COLOR_CURSES)
+#if defined(USE_COLOR_TABLE) && defined(COLOR_CURSES)
     if (lynx_has_color && LYShowColor >= SHOW_COLOR_ON)
 	lynx_set_color (2);
     else
 #endif
-	start_reverse ();
+	lynx_start_reverse ();
 }
 
 PUBLIC void lynx_stop_status_color NOARGS
 {
-#if USE_COLOR_TABLE && defined(COLOR_CURSES)
+#if defined(USE_COLOR_TABLE) && defined(COLOR_CURSES)
     if (lynx_has_color && LYShowColor >= SHOW_COLOR_ON)
 	lynx_set_color (0);
     else
 #endif
-	stop_reverse ();
+	lynx_stop_reverse ();
 }
 
 PUBLIC void lynx_start_h1_color NOARGS
 {
     if (bold_H1 || bold_headers)
-	start_bold();
+	lynx_start_bold();
 }
 
 PUBLIC void lynx_stop_h1_color NOARGS
 {
     if (bold_H1 || bold_headers)
-	stop_bold();
+	lynx_stop_bold();
 }
 
 PUBLIC void lynx_start_prompt_color NOARGS
 {
-    start_reverse ();
+    lynx_start_reverse ();
 }
 
 PUBLIC void lynx_stop_prompt_color NOARGS
 {
-    stop_reverse ();
+    lynx_stop_reverse ();
 }
 
 PUBLIC void lynx_start_radio_color NOARGS
 {
-    start_bold ();
+    lynx_start_bold ();
 }
 
 PUBLIC void lynx_stop_radio_color NOARGS
 {
-    stop_bold ();
+    lynx_stop_bold ();
 }
 
 PUBLIC void lynx_stop_all_colors NOARGS
 {
-    stop_underline ();
-    stop_reverse ();
-    stop_bold ();
+    lynx_stop_underline ();
+    lynx_stop_reverse ();
+    lynx_stop_bold ();
+}
+
+/*
+ * Wrappers for LYUnderlineLinks flag.
+ */
+PUBLIC void lynx_start_bold NOARGS
+{
+    start_bold();
+}
+
+PUBLIC void lynx_start_reverse NOARGS
+{
+    start_reverse();
+}
+
+PUBLIC void lynx_start_underline NOARGS
+{
+    start_underline();
+}
+
+PUBLIC void lynx_stop_bold NOARGS
+{
+    stop_bold();
+}
+
+PUBLIC void lynx_stop_reverse NOARGS
+{
+    stop_reverse();
+}
+
+PUBLIC void lynx_stop_underline NOARGS
+{
+    stop_underline();
 }
 
 /*
@@ -2381,17 +2669,13 @@ PUBLIC void LYstowCursor ARGS3(
     int,	row,
     int,	col)
 {
-#ifdef USE_SLANG
     if (LYShowCursor)
-	SLsmg_gotorc(win->top_y + row, win->left_x + col);
+	wmove(win, row, col);
     else
 	LYHideCursor();
+#ifdef USE_SLANG
     SLsmg_refresh();
 #else
-    if (LYShowCursor)
-	wmove(win, row, col);
-    else
-	LYHideCursor();
     wrefresh(win);
 #endif /* USE_SLANG  */
 }
@@ -2410,3 +2694,22 @@ PRIVATE void make_blink_boldbg NOARGS
     VioSetState(&buf,0);
 }
 #endif
+
+#if defined(HAVE_WATTR_GET)
+/*
+ * getattrs() is not in X/Open curses, but it is more convenient than this.
+ */
+PUBLIC long LYgetattrs ARGS1(WINDOW *, win)
+{
+#if (defined(NCURSES_VERSION_MAJOR) && NCURSES_VERSION_MAJOR < 5) || !defined(NCURSES_MAJOR_VERSION)
+    long result = 0;
+    result = getattrs(win);
+#else
+    attr_t result = 0;
+    short pair = 0;
+
+    wattr_get(win, &result, &pair, NULL);
+#endif
+    return result;
+}
+#endif /* HAVE_WATTR_GET */
diff --git a/gnu/usr.bin/lynx/src/LYCurses.h b/gnu/usr.bin/lynx/src/LYCurses.h
index 7a0390cea29..6168667d141 100644
--- a/gnu/usr.bin/lynx/src/LYCurses.h
+++ b/gnu/usr.bin/lynx/src/LYCurses.h
@@ -59,7 +59,7 @@ typedef struct {
 /* slang doesn't really do windows... */
 #define waddch(w,c)  LYaddch(c)
 #define waddstr(w,s) addstr(s)
-#define wmove(win, row, col) SLsmg_gotorc((win)->top_y + (row), (win)->left_x + (col));
+#define wmove(win, row, col) SLsmg_gotorc(((win)?(win)->top_y:0) + (row), ((win)?(win)->left_x:0) + (col))
 
 #ifndef SLSMG_UARROW_CHAR
 #define SLSMG_UARROW_CHAR '^'
@@ -85,7 +85,7 @@ typedef struct {
 #define SLSMG_BLOCK_CHAR '#'
 #endif
 
-#ifndef ACS_UARROW  
+#ifndef ACS_UARROW
 #define ACS_UARROW  SLSMG_UARROW_CHAR
 #endif
 
@@ -170,23 +170,33 @@ typedef struct {
 #undef ERR			/* all versions of curses define this */
 #endif
 
+#ifdef MOUSE_MOVED
+#undef MOUSE_MOVED		/* wincon.h or MINGW32's copy of it */
+#endif
+
 #ifdef HAVE_CONFIG_H
-# ifdef HAVE_NCURSES_NCURSES_H
-#   include <ncurses/ncurses.h>
+# ifdef HAVE_NCURSESW_NCURSES_H
+#  undef GCC_PRINTFLIKE		/* <libutf8.h> may define 'printf' */
+#  include <ncursesw/ncurses.h>
+#  undef printf			/* but we don't want that... */
 # else
-#  ifdef HAVE_NCURSES_H
-#   include <ncurses.h>
+#  ifdef HAVE_NCURSES_NCURSES_H
+#   include <ncurses/ncurses.h>
 #  else
-#   ifdef HAVE_CURSESX_H
-#    include <cursesX.h>	/* Ultrix */
+#   ifdef HAVE_NCURSES_H
+#    include <ncurses.h>
 #   else
-#    ifdef HAVE_JCURSES_H
-#     include <jcurses.h>	/* sony_news */
+#    ifdef HAVE_CURSESX_H
+#     include <cursesX.h>	/* Ultrix */
 #    else
-#     ifdef HAVE_XCURSES
-#      include <xcurses.h>	/* PDCurses' UNIX port */
+#     ifdef HAVE_JCURSES_H
+#      include <jcurses.h>	/* sony_news */
 #     else
-#      include <curses.h>	/* default */
+#      ifdef HAVE_XCURSES
+#       include <xcurses.h>	/* PDCurses' UNIX port */
+#      else
+#       include <curses.h>	/* default */
+#      endif
 #     endif
 #    endif
 #   endif
@@ -198,11 +208,18 @@ typedef struct {
 # endif
 
 # ifdef FANCY_CURSES
-#  if defined(NCURSES) && defined(HAVE_NCURSES_TERM_H)
-#    include <ncurses/term.h>
+#  if defined(NCURSES) && defined(HAVE_NCURSESW_TERM_H)
+#    include <ncursesw/term.h>
 #  else
-#   if defined(HAVE_TERM_H)
-#    include <term.h>
+#    if defined(NCURSES) && defined(HAVE_NCURSES_TERM_H)
+#      include <ncurses/term.h>
+#    else
+#     if defined(HAVE_NCURSESW_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H) || defined(HAVE_XCURSES)
+#       undef HAVE_TERM_H			/* only use one in comparable path! */
+#     endif
+#     if defined(HAVE_TERM_H)
+#      include <term.h>
+#     endif
 #   endif
 #  endif
 # endif
@@ -236,7 +253,7 @@ typedef struct {
 /*
  * If we have pads, use them to implement left/right scrolling.
  */
-#if defined(HAVE_NEWPAD) && defined(HAVE_PNOUTREFRESH)
+#if defined(HAVE_NEWPAD) && defined(HAVE_PNOUTREFRESH) && !defined(PDCURSES)
 #define USE_CURSES_PADS 1
 #endif
 
@@ -248,12 +265,31 @@ typedef struct {
 #undef USE_CURSES_PADS
 #endif
 
+/*
+ * Most implementations of curses treat pair 0 specially, as the default
+ * foreground and background color.  Also, the COLORS variable corresponds to
+ * the total number of colors.
+ *
+ * PDCurses does not follow these rules.  Its COLORS variable claims it has
+ * 8 colors, but it actually implements 16.  That makes it hard to optimize
+ * color settings against color pair 0 in a portable fashion.
+ */
+#if defined(COLOR_CURSES)
+#if defined(PDCURSES) || defined(HAVE_XCURSES)
+#define COLORS 16		/* should be a variable... */
+#else
+#define USE_CURSES_PAIR_0
+#endif
+#endif
+
 #endif /* USE_SLANG */
 
 #ifdef USE_SLANG
 #define LYstopPopup() /* nothing */
+#define LYtopwindow() LYwin
 #else
 extern void LYsubwindow PARAMS((WINDOW * param));
+extern WINDOW * LYtopwindow NOPARAMS;
 #define LYstopPopup() LYsubwindow(0)
 #endif /* NCURSES */
 
@@ -263,9 +299,6 @@ extern WINDOW *LYstartPopup PARAMS((int top_y, int left_x, int height, int width
 /*
  * Useful macros not in PDCurses or very old ncurses headers.
  */
-#if !defined(HAVE_GETATTRS) && !defined(getattrs)
-#define getattrs(win) ((win)->_attrs)
-#endif
 #if !defined(HAVE_GETBEGX) && !defined(getbegx)
 #define getbegx(win) ((win)->_begx)
 #endif
@@ -276,8 +309,29 @@ extern WINDOW *LYstartPopup PARAMS((int top_y, int left_x, int height, int width
 #define getbkgd(win) ((win)->_bkgd)
 #endif
 
+#if defined(HAVE_WATTR_GET)
+extern long LYgetattrs PARAMS((WINDOW *win));
+#else
+#if defined(HAVE_GETATTRS) || defined(getattrs)
+#define LYgetattrs(win) getattrs(win)
+#else
+#define LYgetattrs(win) ((win)->_attrs)
+#endif
+#endif /* HAVE_WATTR_GET */
+
 #if defined(PDCURSES)
 #define HAVE_GETBKGD 1	/* can use fallback definition */
+#define HAVE_NAPMS 1	/* can use millisecond-delays */
+#endif
+
+#ifdef HAVE_NAPMS
+#define SECS2Secs(n) (1000 * (n))
+#define Secs2SECS(n) ((n) / 1000.0)
+#define SECS_FMT "%.3f"
+#else
+#define SECS2Secs(n) (n)
+#define Secs2SECS(n) (n)
+#define SECS_FMT "%.0f"
 #endif
 
 /* Both slang and curses: */
@@ -372,7 +426,7 @@ extern void curses_w_style PARAMS((WINDOW* win, int style, int	dir));
 #  define LynxWChangeStyle(win,style,dir)	(void)1
 #endif /* USE_COLOR_STYLE */
 
-#if USE_COLOR_TABLE
+#ifdef USE_COLOR_TABLE
 extern void LYaddAttr PARAMS((int a));
 extern void LYsubAttr PARAMS((int a));
 extern void lynx_setup_colors NOPARAMS;
@@ -393,12 +447,12 @@ extern unsigned int Lynx_Color_Flags;
 #define SL_LYNX_USE_COLOR	1
 #define SL_LYNX_OVERRIDE_COLOR	2
 
-#define start_bold()      	LYaddAttr(1)
+#define start_bold()      	LYaddAttr(LYUnderlineLinks ? 4 : 1)
 #define start_reverse()   	LYaddAttr(2)
-#define start_underline() 	LYaddAttr(4)
-#define stop_bold()       	LYsubAttr(1)
+#define start_underline() 	LYaddAttr(LYUnderlineLinks ? 1 : 4)
+#define stop_bold()       	LYsubAttr(LYUnderlineLinks ? 4 : 1)
 #define stop_reverse()    	LYsubAttr(2)
-#define stop_underline()  	LYsubAttr(4)
+#define stop_underline()  	LYsubAttr(LYUnderlineLinks ? 1 : 4)
 
 #ifdef FANCY_CURSES
 #undef FANCY_CURSES
@@ -407,7 +461,7 @@ extern unsigned int Lynx_Color_Flags;
 /*
  *  Map some curses functions to slang functions.
  */
-#define stdscr NULL
+#define stdscr ((WINDOW *)0)
 #ifdef SLANG_MBCS_HACK
 extern int PHYSICAL_SLtt_Screen_Cols;
 #define COLS PHYSICAL_SLtt_Screen_Cols
@@ -470,17 +524,10 @@ extern void VTHome NOPARAMS;
  *  add and subtract, respectively, the attributes
  *  _UNDERLINE, _BOLD, _REVERSE, and _BLINK. - FM
  */
-#ifdef UNDERLINE_LINKS
-#define start_bold()		setattr(_UNDERLINE)
-#define stop_bold()		clrattr(_UNDERLINE)
-#define start_underline()	setattr(_BOLD)
-#define stop_underline()	clrattr(_BOLD)
-#else /* not UNDERLINE_LINKS */
-#define start_bold()		setattr(_BOLD)
-#define stop_bold()		clrattr(_BOLD)
-#define start_underline()	setattr(_UNDERLINE)
-#define stop_underline()	clrattr(_UNDERLINE)
-#endif /* UNDERLINE_LINKS */
+#define start_bold()		setattr(LYUnderlineLinks ? _UNDERLINE : _BOLD)
+#define stop_bold()		clrattr(LYUnderlineLinks ? _UNDERLINE : _BOLD)
+#define start_underline()	setattr(LYUnderlineLinks ? _BOLD : _UNDERLINE)
+#define stop_underline()	clrattr(LYUnderlineLinks ? _BOLD : _UNDERLINE)
 #define start_reverse()		setattr(_REVERSE)
 #define wstart_reverse(w)	wsetattr(w, _REVERSE)
 #define stop_reverse()		clrattr(_REVERSE)
@@ -495,7 +542,7 @@ extern int string_to_attr PARAMS((char *name));
  *  our own functions to add or subtract the
  *  A_foo attributes. - FM
  */
-#if USE_COLOR_TABLE
+#ifdef USE_COLOR_TABLE
 extern void LYaddWAttr PARAMS((WINDOW *win, int a));
 extern void LYsubWAttr PARAMS((WINDOW *win, int a));
 extern void LYaddWAttr PARAMS((WINDOW *win, int a));
@@ -514,26 +561,10 @@ extern int  lynx_chg_color PARAMS((int, int, int));
 #define LYsubWAttr(win,attr)	wattroff(win,attr)
 #endif
 
-#ifdef UNDERLINE_LINKS
-#define start_bold()		LYaddAttr(A_UNDERLINE)
-#define stop_bold()		LYsubAttr(A_UNDERLINE)
-#ifdef __CYGWIN__	/* 1999/02/25 (Thu) 01:09:45 */
-#define start_underline()	/* LYaddAttr(A_BOLD) */
-#define stop_underline()	/* LYsubAttr(A_BOLD) */
-#else
-#define start_underline()	LYaddAttr(A_BOLD)
-#define stop_underline()	LYsubAttr(A_BOLD)
-#endif /* __CYGWIN__ */
-#else /* not UNDERLINE_LINKS: */
-#define start_bold()		LYaddAttr(A_BOLD)
-#define stop_bold()		LYsubAttr(A_BOLD)
-#ifdef USE_COLOR_STYLE
-#define start_underline()	attron(A_UNDERLINE) /* allow combining - kw */
-#else
-#define start_underline()	LYaddAttr(A_UNDERLINE)
-#endif /* USE_COLOR_STYLE */
-#define stop_underline()	LYsubAttr(A_UNDERLINE)
-#endif /* UNDERLINE_LINKS */
+#define start_bold()		LYaddAttr(LYUnderlineLinks ? A_UNDERLINE : A_BOLD)
+#define stop_bold()		LYsubAttr(LYUnderlineLinks ? A_UNDERLINE : A_BOLD)
+#define start_underline()	LYaddAttr(LYUnderlineLinks ? A_BOLD : A_UNDERLINE)
+#define stop_underline()	LYsubAttr(LYUnderlineLinks ? A_BOLD : A_UNDERLINE)
 
 #if defined(SNAKE) && defined(HP_TERMINAL)
 #define start_reverse()		LYaddWAttr(LYwin, A_DIM)
@@ -575,7 +606,16 @@ FANCY_CURSES.  Check your config.log to see why the FANCY_CURSES test failed.
 
 #endif /* FANCY_CURSES */
 
-#ifndef ACS_UARROW  
+#ifdef __hpux			/* FIXME: configure check */
+#undef ACS_UARROW
+#undef ACS_DARROW
+#undef ACS_LARROW
+#undef ACS_RARROW
+#undef ACS_BLOCK
+#undef ACS_CKBOARD
+#endif
+
+#ifndef ACS_UARROW
 #define ACS_UARROW  '^'
 #endif
 
@@ -591,6 +631,14 @@ FANCY_CURSES.  Check your config.log to see why the FANCY_CURSES test failed.
 #define ACS_RARROW '}'
 #endif
 
+#ifndef ACS_BLOCK
+#define ACS_BLOCK  '}'
+#endif
+
+#ifndef ACS_CKBOARD
+#define ACS_CKBOARD '}'
+#endif
+
 #define LYaddch(ch)		waddch(LYwin, ch)
 
 #define addch_raw(ch)           LYaddch(ch)
@@ -608,11 +656,11 @@ FANCY_CURSES.  Check your config.log to see why the FANCY_CURSES test failed.
 #endif /* USE_SLANG */
 
 /*
- * If the screen library allows us to specify "default" color, allow user to 
+ * If the screen library allows us to specify "default" color, allow user to
  * control it.
  */
-#if USE_DEFAULT_COLORS
-#if USE_SLANG || (HAVE_ASSUME_DEFAULT_COLORS && !defined(USE_COLOR_STYLE))
+#ifdef USE_DEFAULT_COLORS
+#if defined(USE_SLANG) || defined(HAVE_ASSUME_DEFAULT_COLORS)
 #define EXP_ASSUMED_COLOR 1
 #endif
 #endif
@@ -636,6 +684,13 @@ extern void lynx_start_radio_color NOPARAMS;
 extern void lynx_stop_radio_color NOPARAMS;
 extern void lynx_stop_all_colors NOPARAMS;
 
+extern void lynx_start_bold NOPARAMS;
+extern void lynx_start_reverse NOPARAMS;
+extern void lynx_start_underline NOPARAMS;
+extern void lynx_stop_bold NOPARAMS;
+extern void lynx_stop_reverse NOPARAMS;
+extern void lynx_stop_underline NOPARAMS;
+
 /*
  * To prevent corrupting binary data on DOS, MS-WINDOWS or OS/2 we open files
  * and stdout in BINARY mode by default.  Where necessary we should open and
diff --git a/gnu/usr.bin/lynx/src/LYDownload.c b/gnu/usr.bin/lynx/src/LYDownload.c
index f211652e689..7f9383740d1 100644
--- a/gnu/usr.bin/lynx/src/LYDownload.c
+++ b/gnu/usr.bin/lynx/src/LYDownload.c
@@ -91,14 +91,18 @@ PUBLIC void LYDownload ARGS1(
     /* FIXME: use HTLocalName */
     if (!strncmp(file, "file://localhost", 16)) {
 #ifdef __DJGPP__
-	file += 17;
-	file = HTDOS_name(file);
+	if (!strncmp(file + 16, "/dev/", 5))
+	    file += 16;
+	else {
+	    file += 17;
+	    file = HTDOS_name(file);
+	}
 #else
 	file += 16;
 #endif /* __DJGPP__ */
     }
-    else if (!strncmp(file, "file:", 5))
-	file += 5;
+    else if (isFILE_URL(file))
+	file += LEN_FILE_URL;
     HTUnEscape(file);
 #else
 #if defined(_WINDOWS)	/* 1997/10/15 (Wed) 16:27:38 */
@@ -216,7 +220,7 @@ check_recall:
 	strcpy(command, buffer);
 	if (!LYValidateFilename(buffer, command))
 	    goto cancelled;
-#if HAVE_POPEN
+#ifdef HAVE_POPEN
 	else if (LYIsPipeCommand(buffer)) {
 	    /* I don't know how to download to a pipe */
 	    HTAlert(CANNOT_WRITE_TO_FILE);
@@ -279,10 +283,7 @@ check_recall:
 #else /* Unix: */
 
 	LYCopyFile(file, buffer);
-
-#if defined(UNIX)
 	LYRelaxFilePermissions(buffer);
-#endif /* defined(UNIX) */
 #endif /* VMS */
 
     } else {
@@ -398,19 +399,9 @@ check_recall:
 		}
 		/*
 		 *  Cancel if the user entered "/dev/null" on Unix,
-		 *  or an "nl:" path (case-insensitive) on VMS. - FM
+		 *  or an "nl:" path on VMS. - FM
 		 */
-#ifdef VMS
-		if (!strncasecomp(buffer, "nl:", 3) ||
-		    !strncasecomp(buffer, "/nl/", 4))
-#else
-#if defined(DOSPATH)	/* 1997/10/15 (Wed) 16:41:30 */
-		if (!strcmp(buffer, "nul"))
-#else
-		if (!strcmp(buffer, "/dev/null"))
-#endif /* DOSPATH */
-#endif /* VMS */
-		{
+		if (LYIsNullDevice(buffer)) {
 		    goto cancelled;
 		}
 		SecondS = TRUE;
@@ -472,6 +463,19 @@ cancelled:
 }
 
 /*
+ * Compare a filename with a given suffix, which we have set to give a rough
+ * idea of its content.
+ */
+PRIVATE int SuffixIs ARGS2(
+	char *,		filename,
+	char *,		suffix)
+{
+    size_t have = strlen(filename);
+    size_t need = strlen(suffix);
+    return have > need && !strcmp(filename + have - need, suffix);
+}
+
+/*
  *  LYdownload_options writes out the current download choices to
  *  a file so that the user can select downloaders in the same way that
  *  they select all other links.  Download links look like:
@@ -494,16 +498,9 @@ PUBLIC int LYdownload_options ARGS2(
     StrAllocCopy(sug_filename, *newfile);
     change_sug_filename(sug_filename);
 
-    if (LYReuseTempfiles) {
-	fp0 = LYOpenTempRewrite(tempfile, HTML_SUFFIX, BIN_W);
-    } else {
-	LYRemoveTemp(tempfile);
-	fp0 = LYOpenTemp(tempfile, HTML_SUFFIX, BIN_W);
-    }
-    if (fp0 == NULL) {
-	HTAlert(CANNOT_OPEN_TEMP);
+    if ((fp0 = InternalPageFP(tempfile, TRUE)) == 0)
 	return(-1);
-    }
+
     StrAllocCopy(downloaded_url, *newfile);
     LYLocalFileToURL(newfile, tempfile);
 
@@ -537,12 +534,33 @@ PUBLIC int LYdownload_options ARGS2(
 	 */
 	if (!lynx_edit_mode)
 #endif /* DIRED_SUPPORT */
-	fprintf(fp0,
-		"   <a href=\"LYNXDOWNLOAD://Method=-1/File=%s/SugFile=%s%s\">%s</a>\n",
-		data_file,
-		(lynx_save_space ? lynx_save_space : ""),
-		sug_filename,
-		gettext("Save to disk"));
+	{
+	    fprintf(fp0,
+		    "   <a href=\"%s//Method=-1/File=%s/SugFile=%s%s\">%s</a>\n",
+		    STR_LYNXDOWNLOAD,
+		    data_file,
+		    NonNull(lynx_save_space),
+		    sug_filename,
+		    gettext("Save to disk"));
+	    /*
+	     * If it is not a binary file, offer the opportunity to view the
+	     * downloaded temporary file (see HTSaveToFile).
+	     */
+	    if (SuffixIs(data_file, HTML_SUFFIX)
+	     || SuffixIs(data_file, TEXT_SUFFIX)) {
+		char *target = NULL;
+		char *source = LYAddPathToSave(data_file);
+
+		LYLocalFileToURL(&target, source);
+		fprintf(fp0,
+			"   <a href=\"%s\">%s</a>\n",
+			target,
+			gettext("View temporary file"));
+
+		FREE(source);
+		FREE(target);
+	    }
+	}
     } else {
 	fprintf(fp0, "   <em>%s</em>\n", gettext("Save to disk disabled."));
     }
@@ -554,8 +572,8 @@ PUBLIC int LYdownload_options ARGS2(
 	for (count = 0, cur_download = downloaders; cur_download != NULL;
 			cur_download = cur_download->next, count++) {
 	    if (!no_download || cur_download->always_enabled) {
-		fprintf(fp0, "   <a href=\"LYNXDOWNLOAD://Method=%d/File=%s/SugFile=%s\">",
-			count,data_file, sug_filename);
+		fprintf(fp0, "   <a href=\"%s//Method=%d/File=%s/SugFile=%s\">",
+			STR_LYNXDOWNLOAD, count,data_file, sug_filename);
 		fprintf(fp0, "%s", (cur_download->name ?
 			cur_download->name : gettext("No Name Given")));
 		fprintf(fp0,"</a>\n");
diff --git a/gnu/usr.bin/lynx/src/LYDownload.h b/gnu/usr.bin/lynx/src/LYDownload.h
index aeed2b1980b..b7d75ae793d 100644
--- a/gnu/usr.bin/lynx/src/LYDownload.h
+++ b/gnu/usr.bin/lynx/src/LYDownload.h
@@ -1,4 +1,3 @@
-
 #ifndef LYDOWNLOAD_H
 #define LYDOWNLOAD_H
 
@@ -9,5 +8,8 @@
 extern void LYDownload PARAMS((char *line));
 extern int LYdownload_options PARAMS((char **newfile, char *data_file));
 
-#endif /* LYDOWNLOAD_H */
+#ifdef VMS
+extern BOOLEAN LYDidRename;
+#endif
 
+#endif /* LYDOWNLOAD_H */
diff --git a/gnu/usr.bin/lynx/src/LYEdit.c b/gnu/usr.bin/lynx/src/LYEdit.c
index 3c7a725ce01..3f06242d91f 100644
--- a/gnu/usr.bin/lynx/src/LYEdit.c
+++ b/gnu/usr.bin/lynx/src/LYEdit.c
@@ -54,7 +54,7 @@ PUBLIC int edit_current_file ARGS3(
 {
     int result = FALSE;
     char *filename = NULL;
-#if !(defined(VMS) || defined(DOSPATH) || defined(__EMX__))
+#if !(defined(VMS) || defined(USE_DOS_DRIVES))
     char *colon;
 #endif
     char *number_sign;
@@ -62,9 +62,6 @@ PUBLIC int edit_current_file ARGS3(
 #if defined(VMS) || defined(CANT_EDIT_UNWRITABLE_FILES)
     FILE *fp;
 #endif
-#if defined(__CYGWIN__) && defined(DOSPATH)
-    unsigned char temp_buff[LY_MAXPATH];
-#endif
 
     CTRACE((tfp, "edit_current_file(newfile=%s, cur=%d, lineno=%d)\n",
 		 newfile, cur, lineno));
@@ -80,9 +77,7 @@ PUBLIC int edit_current_file ARGS3(
     /*
      *  If there's a fragment, trim it. - FM
      */
-    number_sign = strchr(newfile, '#');
-    if (number_sign)
-	*number_sign = '\0';
+    number_sign = trimPoundSelector(newfile);
 
     /*
      *  On Unix, first try to open it as a completely referenced file,
@@ -90,7 +85,7 @@ PUBLIC int edit_current_file ARGS3(
      *
      * On VMS, only try the path.
      */
-#if defined (VMS) || defined (DOSPATH) || defined (__EMX__)
+#if defined (VMS) || defined (USE_DOS_DRIVES)
     filename = HTParse(newfile, "", PARSE_PATH+PARSE_PUNCTUATION);
     HTUnEscape(filename);
     StrAllocCopy(filename, HTSYS_name(filename));
@@ -103,15 +98,11 @@ PUBLIC int edit_current_file ARGS3(
 	CTRACE((tfp, "filename: '%s'\n", filename));
 	goto done;
     }
-#else	/* !(VMS || !DOSPATH || !__EMX__) == UNIX */
-#ifdef SH_EX	/* Speed Up! */
+#else	/* something like UNIX */
     if (strncmp(newfile, "file://localhost/", 16) == 0)
 	colon = newfile + 16;
     else
 	colon = strchr(newfile, ':');
-#else
-    colon = strchr(newfile, ':');
-#endif
     StrAllocCopy(filename, (colon + 1));
     HTUnEscape(filename);
     if (!LYCanReadFile(filename)) {
@@ -123,7 +114,7 @@ PUBLIC int edit_current_file ARGS3(
 	    goto done;
 	}
     }
-#endif /* !(VMS || !DOSPATH || !__EMX__) */
+#endif
 
 #if defined(VMS) || defined(CANT_EDIT_UNWRITABLE_FILES)
     /*
@@ -162,8 +153,7 @@ done:
     /*
      *  Restore the fragment if there was one. - FM
      */
-    if (number_sign)
-	*number_sign = '#';
+    restorePoundSelector(number_sign);
 
     FREE(filename);
     CTRACE((tfp, "edit_current_file returns %d\n", result));
@@ -226,16 +216,7 @@ PUBLIC void edit_temporary_file ARGS3(
 	else
 	    HTAddXpand(&command, format, params++, editor);
 #else
-#if defined(__CYGWIN__) && defined(DOSPATH)
-	if (strchr(editor, ' ')) {
-	    cygwin_conv_to_full_posix_path(HTDOS_short_name(editor), temp_buff);
-	    HTAddXpand(&command, format, params++, temp_buff);
-	} else {
-	    HTAddXpand(&command, format, params++, editor);
-	}
-#else
 	HTAddXpand(&command, format, params++, editor);
-#endif /* __CYGWIN__ */
 #endif
 	HTAddParam(&command, format, params++, filename);
 	HTEndParam(&command, format, params);
diff --git a/gnu/usr.bin/lynx/src/LYExtern.c b/gnu/usr.bin/lynx/src/LYExtern.c
index 47476faf910..2ea87a0c45b 100644
--- a/gnu/usr.bin/lynx/src/LYExtern.c
+++ b/gnu/usr.bin/lynx/src/LYExtern.c
@@ -68,10 +68,6 @@ static char *decode_string(char *s)
 #ifdef WIN_EX
 /*
  *  Quote the path to make it safe for shell command processing.
- *
- *  We use a simple technique which involves quoting the entire
- *  string using single quotes, escaping the real single quotes
- *  with double quotes. This may be gross but it seems to work.
  */
 PUBLIC char * quote_pathname ARGS1(
 	char *, 	pathname)
@@ -102,7 +98,7 @@ PRIVATE void format ARGS3(
  * Format the given command into a buffer, returning the resulting string.
  *
  * It is too dangerous to leave any URL that may come along unquoted.  They
- * often contain '&', ';', and '?' chars, and who knows what else may occur. 
+ * often contain '&', ';', and '?' chars, and who knows what else may occur.
  * Prevent spoofing of the shell.  Dunno how this needs to be modified for VMS
  * or DOS.  - kw
  */
@@ -110,25 +106,21 @@ PRIVATE char *format_command ARGS2(
     char *,	command,
     char *,	param)
 {
-#ifdef WIN_EX
-    char pram_string[LY_MAXPATH];
-#endif
     char *cmdbuf = NULL;
 
-#if (defined(VMS) || defined(DOSPATH) || defined(__EMX__)) && !defined(WIN_EX)
-    format(&cmdbuf, command, param);
-#else	/* Unix or DOS/Win: */
 #if defined(WIN_EX)
     if (*param != '\"' && strchr(param, ' ') != NULL) {
 	char *cp = quote_pathname(param);
 	format(&cmdbuf, command, cp);
 	FREE(cp);
     } else {
+	char pram_string[LY_MAXPATH];
+
 	LYstrncpy(pram_string, param, sizeof(pram_string)-1);
 	decode_string(pram_string);
 	param = pram_string;
 
-	if (strnicmp("mailto:", param, 7) == 0) {
+	if (isMAILTO_URL(param)) {
 	    format(&cmdbuf, command, param + 7);
 	} else if (strnicmp("telnet://", param, 9) == 0) {
 	    char host[sizeof(pram_string)];
@@ -151,36 +143,30 @@ PRIVATE char *format_command ARGS2(
 	    strncat(e_buff, p, sizeof(e_buff) - strlen(e_buff) - 1);
 	    p = strrchr(e_buff, '.');
 	    if (p) {
-		p = strchr(p, '#');
-		if (p) {
-		    *p = '\0';
-		}
-	    }
-	    if (*e_buff != '\"' && strchr(e_buff, ' ') != NULL) {
-		p = quote_pathname(e_buff);
-		LYstrncpy(e_buff, p, sizeof(e_buff)-1);
-		FREE(p);
+		trimPoundSelector(p);
 	    }
 
-	    /* Less ==> short filename,
-	     * less ==> long filename
+	    /* Less ==> short filename with backslashes,
+	     * less ==> long filename with forward slashes, may be quoted
 	     */
-	    if (isupper(command[0])) {
+	    if (ISUPPER(command[0])) {
 		format(&cmdbuf,
 			command, HTDOS_short_name(e_buff));
 	    } else {
+		if (*e_buff != '\"' && strchr(e_buff, ' ') != NULL) {
+		    p = quote_pathname(e_buff);
+		    LYstrncpy(e_buff, p, sizeof(e_buff)-1);
+		    FREE(p);
+		}
 		format(&cmdbuf, command, e_buff);
 	    }
 	} else {
 	    format(&cmdbuf, command, param);
 	}
     }
-#else	/* Unix */
-    {
-	format(&cmdbuf, command, param);
-    }
+#else
+    format(&cmdbuf, command, param);
 #endif
-#endif	/* VMS */
     return cmdbuf;
 }
 
@@ -236,12 +222,8 @@ PRIVATE char *lookup_external ARGS2(
 	HTUserMsg(EXTERNALS_DISABLED);
     } else if (num_choices > 1) {
 	int old_y, old_x;
-#ifdef USE_SLANG
-	old_y = SLsmg_get_row();
-	old_x = SLsmg_get_column();
-#else
-	getyx(LYwin, old_y, old_x);
-#endif
+
+	LYGetYX(old_y, old_x);
 	cur_choice = LYhandlePopupList(
 			-1,
 			0,
@@ -252,11 +234,7 @@ PRIVATE char *lookup_external ARGS2(
 			FALSE,
 			TRUE,
 			FALSE);
-#ifdef USE_SLANG
-	SLsmg_gotorc(old_y, old_x);
-#else
 	wmove(LYwin, old_y, old_x);
-#endif
 	CTRACE((tfp, "selected choice %d of %d\n", cur_choice, num_choices));
 	if (cur_choice < 0) {
 	    HTInfoMsg(CANCELLED);
@@ -280,7 +258,6 @@ BOOL run_external ARGS2(
 {
 #ifdef WIN_EX
     int status;
-    extern int xsystem(char *cmd);
 #endif
     int redraw_flag = TRUE;
     char *cmdbuf = NULL;
@@ -292,7 +269,7 @@ BOOL run_external ARGS2(
 
 #ifdef WIN_EX			/* 1998/01/26 (Mon) 09:16:13 */
     if (param == NULL) {
-	HTInfoMsg("External command is null");
+	HTInfoMsg(gettext("External command is null"));
 	return 0;
     }
 #endif
@@ -346,7 +323,7 @@ BOOL run_external ARGS2(
 
 	    /* command running. */
 #ifdef WIN_EX			/* 1997/10/17 (Fri) 14:07:50 */
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(__MINGW32__)
 	    status = system(cmdbuf);
 #else
 	    status = xsystem(cmdbuf);
diff --git a/gnu/usr.bin/lynx/src/LYForms.c b/gnu/usr.bin/lynx/src/LYForms.c
index 928b16633db..a959a7623ef 100644
--- a/gnu/usr.bin/lynx/src/LYForms.c
+++ b/gnu/usr.bin/lynx/src/LYForms.c
@@ -26,7 +26,7 @@
 #endif /* VMS && !USE_SLANG */
 
 PRIVATE int form_getstr PARAMS((
-	struct link *	form_link,
+	int		cur,
 	BOOLEAN		use_last_tfpos,
 	BOOLEAN		redraw_only));
 
@@ -58,17 +58,17 @@ PRIVATE char ** options_list ARGS1(
     return result;
 }
 
-PUBLIC int change_form_link_ex ARGS8(
-	struct link *,	form_link,
-	document *,	newdoc,
+PUBLIC int change_form_link_ex ARGS6(
+	int,		cur,
+	DocInfo *,	newdoc,
 	BOOLEAN *,	refresh_screen,
-	char *,		link_name,
-	char *,		link_value,
 	BOOLEAN,	use_last_tfpos,
 	BOOLEAN,	immediate_submit,
 	BOOLEAN,	redraw_only)
 {
-    FormInfo *form = form_link->form;
+    FormInfo *form = links[cur].l_form;
+    char *link_name = form->name;
+    char *link_value = form->value;
     int newdoc_changed = 0;
     int c = DO_NOTHING;
     int OrigNumValue;
@@ -85,19 +85,14 @@ PUBLIC int change_form_link_ex ARGS8(
     /*
      *  Move to the link position.
      */
-    LYmove(form_link->ly, form_link->lx);
+    LYmove(links[cur].ly, links[cur].lx);
 
     switch(form->type) {
 	case F_CHECKBOX_TYPE:
 	    if (form->disabled == YES)
 		break;
-	    if (form->num_value) {
-		form_link->hightext = unchecked_box;
-		form->num_value = 0;
-	    } else {
-		form_link->hightext = checked_box;
-		form->num_value = 1;
-	    }
+	    LYSetHilite(cur, form->num_value ? unchecked_box : checked_box);
+	    form->num_value = ! form->num_value;
 	    break;
 
 	case F_OPTION_LIST_TYPE:
@@ -110,8 +105,8 @@ PUBLIC int change_form_link_ex ARGS8(
 	    if (form->disabled == YES) {
 		int dummy;
 		dummy = LYhandlePopupList(form->num_value,
-					  form_link->ly,
-					  form_link->lx,
+					  links[cur].ly,
+					  links[cur].lx,
 					  (CONST char **)my_data,
 					  form->size,
 					  form->size_l,
@@ -128,8 +123,8 @@ PUBLIC int change_form_link_ex ARGS8(
 	    }
 	    OrigNumValue = form->num_value;
 	    form->num_value = LYhandlePopupList(form->num_value,
-						form_link->ly,
-						form_link->lx,
+						links[cur].ly,
+						links[cur].lx,
 						(CONST char **)my_data,
 						form->size,
 						form->size_l,
@@ -179,17 +174,17 @@ PUBLIC int change_form_link_ex ARGS8(
 		 */
 		lynx_start_radio_color ();
 		for (i = 0; i < nlinks; i++) {
-		    if (links[i].type == WWW_FORM_LINK_TYPE &&
-			links[i].form->type == F_RADIO_TYPE &&
-			links[i].form->number == form->number &&
+		    if (links[i].type == WWW_FORM_LINK_TYPE
+		     && links[i].l_form->type == F_RADIO_TYPE
+		     && links[i].l_form->number == form->number
 			/*
 			 *  If it has the same name and its on...
 			 */
-			!strcmp(links[i].form->name, form->name) &&
-			links[i].form->num_value) {
+		     && !strcmp(links[i].l_form->name, form->name)
+		     && links[i].l_form->num_value) {
 			LYmove(links[i].ly, links[i].lx);
 			LYaddstr(unchecked_radio);
-			links[i].hightext = unchecked_radio;
+			LYSetHilite(i, unchecked_radio);
 		    }
 		}
 		lynx_stop_radio_color ();
@@ -200,7 +195,7 @@ PUBLIC int change_form_link_ex ARGS8(
 		/*
 		 *  Now highlight this one.
 		 */
-		form_link->hightext = checked_radio;
+		LYSetHilite(cur, checked_radio);
 	    }
 	    break;
 
@@ -208,11 +203,10 @@ PUBLIC int change_form_link_ex ARGS8(
 	case F_TEXT_TYPE:
 	case F_TEXTAREA_TYPE:
 	case F_PASSWORD_TYPE:
-	    c = form_getstr(form_link, use_last_tfpos, redraw_only);
-	    if (form->type == F_PASSWORD_TYPE)
-		form_link->hightext = STARS(strlen(form->value));
-	    else
-		form_link->hightext = form->value;
+	    c = form_getstr(cur, use_last_tfpos, redraw_only);
+	    LYSetHilite(cur, (form->type == F_PASSWORD_TYPE)
+			? STARS(strlen(form->value))
+			: form->value);
 	    break;
 
 	case F_RESET_TYPE:
@@ -224,11 +218,11 @@ PUBLIC int change_form_link_ex ARGS8(
 
 	case F_TEXT_SUBMIT_TYPE:
 	    if (redraw_only) {
-		c = form_getstr(form_link, use_last_tfpos, TRUE);
+		c = form_getstr(cur, use_last_tfpos, TRUE);
 		break;
 	    }
 	    if (!immediate_submit)
-		c = form_getstr(form_link, use_last_tfpos, FALSE);
+		c = form_getstr(cur, use_last_tfpos, FALSE);
 	    if (form->disabled == YES &&
 		(c == '\r' || c == '\n' || immediate_submit)) {
 		if (peek_mouse_link() >= 0)
@@ -257,7 +251,7 @@ PUBLIC int change_form_link_ex ARGS8(
 	    if (immediate_submit ||
 		((c == '\r' || c == '\n' || c == LAC_TO_LKC0(LYK_SUBMIT)) &&
 		 peek_mouse_link() == -1)) {
-		form_link->hightext = form->value;
+		LYSetHilite(cur, form->value);
 #ifdef TEXT_SUBMIT_CONFIRM_WANTED
 		if (!immediate_submit && (c == '\r' || c == '\n') &&
 		    !HTConfirmDefault(NO_SUBMIT_BUTTON_QUERY), YES) {
@@ -282,7 +276,7 @@ PUBLIC int change_form_link_ex ARGS8(
 		    break;
 		} else if (!immediate_submit &&
 			   ((no_file_url &&
-			     !strncasecomp(form->submit_action, "file:", 5)) ||
+			     isFILE_URL(form->submit_action)) ||
 			    !strncasecomp(form->submit_action, "lynx", 4))) {
 		    c = LAC_TO_LKC0(LYK_SUBMIT);
 		    break;
@@ -307,7 +301,7 @@ PUBLIC int change_form_link_ex ARGS8(
 		c = DO_NOTHING;
 		break;
 	    } else {
-		form_link->hightext = form->value;
+		LYSetHilite(cur, form->value);
 	    }
 	    break;
 
@@ -348,18 +342,20 @@ PUBLIC int change_form_link_ex ARGS8(
     return(c);
 }
 
-PUBLIC int change_form_link ARGS7(
-	struct link *,	form_link,
-	document *,	newdoc,
+PUBLIC int change_form_link ARGS5(
+	int,		cur,
+	DocInfo *,	newdoc,
 	BOOLEAN *,	refresh_screen,
-	char *,		link_name,
-	char *,		link_value,
 	BOOLEAN,	use_last_tfpos,
 	BOOLEAN,	immediate_submit)
 {
     /*pass all our args and FALSE as last arg*/
-    return change_form_link_ex(form_link,newdoc,refresh_screen,link_name,
-	link_value,use_last_tfpos,immediate_submit, FALSE /*redraw_only*/ );
+    return change_form_link_ex(cur,
+			       newdoc,
+			       refresh_screen,
+			       use_last_tfpos,
+			       immediate_submit,
+			       FALSE /*redraw_only*/ );
 }
 
 PRIVATE int LastTFPos = -1;	/* remember last text field position */
@@ -371,11 +367,11 @@ PRIVATE void LYSetLastTFPos ARGS1(
 }
 
 PRIVATE int form_getstr ARGS3(
-	struct link *,	form_link,
+	int,		cur,
 	BOOLEAN,	use_last_tfpos,
 	BOOLEAN,	redraw_only)
 {
-    FormInfo *form = form_link->form;
+    FormInfo *form = links[cur].l_form;
     char *value = form->value;
     int ch;
     int far_col;
@@ -603,13 +599,13 @@ again:
 
 #ifdef CAN_CUT_AND_PASTE	/* 1998/10/01 (Thu) 19:19:22 */
 	if (action == LYE_PASTE) {
-	    unsigned char *s = get_clip_grab(), *e;
+	    unsigned char *s = (unsigned char *) get_clip_grab(), *e;
 	    char *buf = NULL;
 	    int len;
 
 	    if (!s)
 		break;
-	    len = strlen(s);
+	    len = strlen((const char *) s);
 	    e = s + len;
 
 	    if (len > 0) {
@@ -621,7 +617,7 @@ again:
 			    LYEditInsert(&MyEdit, s, e1 - s, -1, TRUE);
 			s = e1;
 			if (*e1 == '\t') { /* Replace by space */
-			    LYEditInsert(&MyEdit, " ", 1, -1, TRUE);
+			    LYEditInsert(&MyEdit, (unsigned char *) " ", 1, -1, TRUE);
 			    s = ++e1;
 			} else
 			    break;
@@ -633,7 +629,7 @@ again:
 		while (e1 < e && *e1 == '\r')
 		    e1++;
 		if (e1 + 1 < e && *e1 == '\n')
-		    StrAllocCopy(buf, e1 + 1);	/* Survive _release() */
+		    StrAllocCopy(buf, (char *) e1 + 1);	/* Survive _release() */
 		get_clip_release();
 		if (MyEdit.strlen >= max_length) {
 		    HaveMaxlength = TRUE;
@@ -653,7 +649,7 @@ again:
 		}
 		LYRefreshEdit(&MyEdit);
 	    } else {
-		HTInfoMsg("Clipboard empty or Not text data.");
+		HTInfoMsg(gettext("Clipboard empty or Not text data."));
 		continue;
 	    }
 	}
@@ -760,13 +756,15 @@ again:
 			   to do it inside LYLineEdit().
 			   This should work for prompts too.  */
 			if ( (action != LYE_BACK_LL && action != LYE_FORW_RL)
-			     || ((form_link - links) >= 0
-				&& (form_link - links) < nlinks
+			     || (cur >= 0
+				&& cur < nlinks
 				&& (action==LYE_FORW_RL
-				    ? (form_link - links) < nlinks - 1
-				    : (form_link - links) > 0)
-				&& form_link[action==LYE_FORW_RL ? 1 : -1].ly
-				   == form_link->ly))
+				    ? cur < nlinks - 1
+				    : cur > 0)
+				&& links[cur + ((action==LYE_FORW_RL)
+						? 1
+						: -1)].ly
+				   == links[cur].ly))
 			    goto breakfor;
 		    }
 #ifdef SUPPORT_MULTIBYTE_EDIT
diff --git a/gnu/usr.bin/lynx/src/LYGetFile.c b/gnu/usr.bin/lynx/src/LYGetFile.c
index 3ea3e2b9f34..008ee5c65e3 100644
--- a/gnu/usr.bin/lynx/src/LYGetFile.c
+++ b/gnu/usr.bin/lynx/src/LYGetFile.c
@@ -33,11 +33,7 @@
 #include <LYexit.h>
 #include <LYLeaks.h>
 
-PRIVATE int fix_httplike_urls PARAMS((document *doc, UrlTypes type));
-
-#ifdef VMS
-extern BOOLEAN LYDidRename;
-#endif /* VMS */
+PRIVATE int fix_httplike_urls PARAMS((DocInfo *doc, UrlTypes type));
 
 #ifdef VMS
 #define STRNADDRCOMP strncasecomp
@@ -71,1037 +67,1027 @@ PUBLIC int HTNoDataOK = 0;
  *  bogus error mail with MAIL_SYSTEM_ERROR_LOGGING:TRUE. - kw
  */
 PUBLIC int getfile ARGS1(
-	document *,	doc)
+	DocInfo *,	doc)
 {
-	int url_type = 0;
-	char *cp = NULL;
-	char *temp = NULL;
-	DocAddress WWWDoc;  /* a WWW absolute doc address struct */
+    int url_type = 0;
+    char *cp = NULL;
+    char *temp = NULL;
+    DocAddress WWWDoc;  /* a WWW absolute doc address struct */
 
-	/*
-	 *  Reset LYCancelDownload to prevent unwanted delayed effect. - KW
-	 */
-	if (LYCancelDownload) {
-	    CTRACE((tfp, "getfile:    resetting LYCancelDownload to FALSE\n"));
-	    LYCancelDownload = FALSE;
-	}
+    /*
+     *  Reset LYCancelDownload to prevent unwanted delayed effect. - KW
+     */
+    if (LYCancelDownload) {
+	CTRACE((tfp, "getfile:    resetting LYCancelDownload to FALSE\n"));
+	LYCancelDownload = FALSE;
+    }
 
-	/*
-	 *  Reset fake 'Z' to prevent unwanted delayed effect. - kw
-	 */
-	LYFakeZap(NO);
+    /*
+     *  Reset fake 'Z' to prevent unwanted delayed effect. - kw
+     */
+    LYFakeZap(NO);
 
-	/*
-	 *  Reset redirection counter to prevent bogus TOO_MANY_REDIRECTIONS
-	 *  in rare situations if the previous cycle got to the limit, but
-	 *  did not fail for that reason because the URL of the final location
-	 *  was handled specially, not via HTLoadAbsolute. - kw
-	 */
-	redirection_attempts = 0;
+    /*
+     *  Reset redirection counter to prevent bogus TOO_MANY_REDIRECTIONS
+     *  in rare situations if the previous cycle got to the limit, but
+     *  did not fail for that reason because the URL of the final location
+     *  was handled specially, not via HTLoadAbsolute. - kw
+     */
+    redirection_attempts = 0;
 
 Try_Redirected_URL:
-	/*
-	 *  Load the WWWDoc struct in case we need to use it.
-	 */
-	WWWDoc.address = doc->address;
-	WWWDoc.post_data = doc->post_data;
-	WWWDoc.post_content_type = doc->post_content_type;
-	WWWDoc.bookmark = doc->bookmark;
-	WWWDoc.isHEAD = doc->isHEAD;
-	WWWDoc.safe = doc->safe;
+    /*
+     *  Load the WWWDoc struct in case we need to use it.
+     */
+    WWWDoc.address = doc->address;
+    WWWDoc.post_data = doc->post_data;
+    WWWDoc.post_content_type = doc->post_content_type;
+    WWWDoc.bookmark = doc->bookmark;
+    WWWDoc.isHEAD = doc->isHEAD;
+    WWWDoc.safe = doc->safe;
 
-	/*
-	 *  Reset HTPermitRedir, it has done its job if it was set. - kw
-	 */
-	HTPermitRedir = FALSE;
+    /*
+     *  Reset HTPermitRedir, it has done its job if it was set. - kw
+     */
+    HTPermitRedir = FALSE;
 
-	/*
-	 *  Reset WWW_Download_File just in case.
-	 */
-	FREE(WWW_Download_File);
+    /*
+     *  Reset WWW_Download_File just in case.
+     */
+    FREE(WWW_Download_File);
 
-	/*
-	 *  Reset redirect_post_content just in case.
-	 */
-	redirect_post_content = FALSE;
+    /*
+     *  Reset redirect_post_content just in case.
+     */
+    redirect_post_content = FALSE;
 
-	/*
-	 *  This flag is a hack to allow us to pass on the fact
-	 *  that 'no data' may not really be an error although
-	 *  HTLoadAbsolute returned NO.  There should be a better
-	 *  way...  HT_NO_DATA should always mean 'not data but
-	 *  not an error', and be passed on to us as that, but
-	 *  current usage if HT_NO_DATA vs HT_NOT_LOADED has
-	 *  to be reviewed everywhere.
-	 *  Anyway, some protocol module can set it to say
-	 *  'I really mean it', we have to reset it here. - kw
-	 */
-	HTNoDataOK = 0;
+    /*
+     *  This flag is a hack to allow us to pass on the fact
+     *  that 'no data' may not really be an error although
+     *  HTLoadAbsolute returned NO.  There should be a better
+     *  way...  HT_NO_DATA should always mean 'not data but
+     *  not an error', and be passed on to us as that, but
+     *  current usage if HT_NO_DATA vs HT_NOT_LOADED has
+     *  to be reviewed everywhere.
+     *  Anyway, some protocol module can set it to say
+     *  'I really mean it', we have to reset it here. - kw
+     */
+    HTNoDataOK = 0;
 
-	CTRACE((tfp,"getfile: getting %s\n\n",doc->address));
+    CTRACE((tfp,"getfile: getting %s\n\n",doc->address));
 
-	/*
-	 *  Protect against denial of service attacks
-	 *  via the port 19 CHARGEN service, and block
-	 *  connections to the port 25 ESMTP service.
-	 *  Also reject any likely spoof attempts via
-	 *  wrap arounds at 65536. - FM
-	 */
-	if ((temp = HTParse(doc->address, "", PARSE_HOST)) != NULL &&
-	    strlen(temp) > 3) {
-	    char *cp1;
-
-	    if ((cp1 = strchr(temp, '@')) == NULL)
-		cp1 = temp;
-	    if ((cp = strrchr(cp1, ':')) != NULL) {
-		long int value;
-
-		cp++;
-		if (sscanf(cp, "%ld", &value) == 1) {
-		    if (value == 19 || value == 65555) {
-			HTAlert(PORT_NINETEEN_INVALID);
-			FREE(temp);
-			return(NULLFILE);
-		    }
-		    if (value == 25 || value == 65561) {
-			HTAlert(PORT_TWENTYFIVE_INVALID);
-			FREE(temp);
-			return(NULLFILE);
-		    }
-		    if (value > 65535 || value < 0) {
-			char *msg = 0;
-			HTSprintf0(&msg, PORT_INVALID, (unsigned long)value);
-			HTAlert(msg);
-			FREE(msg);
-			FREE(temp);
-			return(NULLFILE);
-		    }
-		} else if (isdigit(UCH(*cp))) {
-		    HTAlert(URL_PORT_BAD);
+    /*
+     *  Protect against denial of service attacks
+     *  via the port 19 CHARGEN service, and block
+     *  connections to the port 25 ESMTP service.
+     *  Also reject any likely spoof attempts via
+     *  wrap arounds at 65536. - FM
+     */
+    if ((temp = HTParse(doc->address, "", PARSE_HOST)) != NULL &&
+	strlen(temp) > 3) {
+	char *cp1;
+
+	if ((cp1 = strchr(temp, '@')) == NULL)
+	    cp1 = temp;
+	if ((cp = strrchr(cp1, ':')) != NULL) {
+	    long int value;
+
+	    cp++;
+	    if (sscanf(cp, "%ld", &value) == 1) {
+		if (value == 19 || value == 65555) {
+		    HTAlert(PORT_NINETEEN_INVALID);
+		    FREE(temp);
+		    return(NULLFILE);
+		}
+		if (value == 25 || value == 65561) {
+		    HTAlert(PORT_TWENTYFIVE_INVALID);
+		    FREE(temp);
+		    return(NULLFILE);
+		}
+		if (value > 65535 || value < 0) {
+		    char *msg = 0;
+		    HTSprintf0(&msg, PORT_INVALID, (unsigned long)value);
+		    HTAlert(msg);
+		    FREE(msg);
 		    FREE(temp);
 		    return(NULLFILE);
 		}
+	    } else if (isdigit(UCH(*cp))) {
+		HTAlert(URL_PORT_BAD);
+		FREE(temp);
+		return(NULLFILE);
 	    }
 	}
-	cp = NULL;
-	FREE(temp);
+    }
+    cp = NULL;
+    FREE(temp);
 
-	/*
-	 *  Check to see if this is a universal document ID
-	 *  that lib WWW wants to handle.
-	 *
-	 *  Some special URL's we handle ourselves. :)
-	 */
-	if ((url_type = is_url(doc->address)) != 0) {
-		if (LYValidate && !LYPermitURL) {
-		    if (!(url_type == HTTP_URL_TYPE ||
-			  url_type == HTTPS_URL_TYPE ||
-			  url_type == LYNXHIST_URL_TYPE ||
-			  url_type == LYNXKEYMAP_URL_TYPE ||
-			  url_type == LYNXIMGMAP_URL_TYPE ||
-			  url_type == LYNXCOOKIE_URL_TYPE ||
-			  url_type == LYNXMESSAGES_URL_TYPE ||
-			  (url_type == LYNXOPTIONS_URL_TYPE &&
-			   WWWDoc.post_data) ||
-			  0==STRNADDRCOMP(WWWDoc.address, helpfilepath,
-					  strlen(helpfilepath)) ||
-			  (lynxlistfile != NULL &&
-			   0==STRNADDRCOMP(WWWDoc.address, lynxlistfile,
-					  strlen(lynxlistfile))) ||
-			  (lynxlinksfile != NULL &&
-			   0==STRNADDRCOMP(WWWDoc.address, lynxlinksfile,
-					  strlen(lynxlinksfile))) ||
-			  (lynxjumpfile != NULL &&
-			   0==STRNADDRCOMP(WWWDoc.address, lynxjumpfile,
-					  strlen(lynxjumpfile))))) {
-			HTUserMsg(NOT_HTTP_URL_OR_ACTION);
-			return(NULLFILE);
-		    }
-		}
-		if (traversal) {
-		    /*
-		     *	Only traverse http URLs.
-		     */
-		    if (url_type != HTTP_URL_TYPE &&
-			url_type != LYNXIMGMAP_URL_TYPE)
-			return(NULLFILE);
-		} else if (check_realm && !LYPermitURL && !LYJumpFileURL) {
-		    if (!(0==strncmp(startrealm, WWWDoc.address,
-				     strlen(startrealm)) ||
-			  url_type == LYNXHIST_URL_TYPE ||
-			  url_type == LYNXKEYMAP_URL_TYPE ||
-			  url_type == LYNXIMGMAP_URL_TYPE ||
-			  url_type == LYNXCOOKIE_URL_TYPE ||
-			  url_type == LYNXPRINT_URL_TYPE ||
-			  url_type == LYNXOPTIONS_URL_TYPE ||
-			  url_type == LYNXCFG_URL_TYPE ||
-			  url_type == LYNXCOMPILE_OPTS_URL_TYPE ||
-			  url_type == LYNXMESSAGES_URL_TYPE ||
-			  url_type == LYNXDOWNLOAD_URL_TYPE ||
-			  url_type == MAILTO_URL_TYPE ||
-			  url_type == NEWSPOST_URL_TYPE ||
-			  url_type == NEWSREPLY_URL_TYPE ||
-			  url_type == SNEWSPOST_URL_TYPE ||
-			  url_type == SNEWSREPLY_URL_TYPE ||
-			  (!LYUserSpecifiedURL &&
-			   (url_type == LYNXEXEC_URL_TYPE ||
-			    url_type == LYNXPROG_URL_TYPE ||
-			    url_type == LYNXCGI_URL_TYPE)) ||
-			  (WWWDoc.bookmark != NULL &&
-			   *WWWDoc.bookmark != '\0') ||
-			  0==STRNADDRCOMP(WWWDoc.address, helpfilepath,
-					  strlen(helpfilepath)) ||
-			  (lynxlistfile != NULL &&
-			   0==STRNADDRCOMP(WWWDoc.address, lynxlistfile,
-					  strlen(lynxlistfile))) ||
-			  (lynxjumpfile != NULL &&
-			   0==STRNADDRCOMP(WWWDoc.address, lynxjumpfile,
-					  strlen(lynxjumpfile))))) {
-			HTUserMsg(NOT_IN_STARTING_REALM);
-			return(NULLFILE);
-		    }
-		}
-		if (WWWDoc.post_data &&
-		    url_type != HTTP_URL_TYPE &&
-		    url_type != HTTPS_URL_TYPE &&
-		    url_type != LYNXCGI_URL_TYPE &&
-		    url_type != LYNXIMGMAP_URL_TYPE &&
-		    url_type != GOPHER_URL_TYPE &&
-		    url_type != CSO_URL_TYPE &&
-		    url_type != PROXY_URL_TYPE &&
-		    url_type != LYNXOPTIONS_URL_TYPE &&
-		    !(url_type == FILE_URL_TYPE &&
-		      (LYIsUIPage(WWWDoc.address, UIP_LIST_PAGE) ||
-		       LYIsUIPage(WWWDoc.address, UIP_ADDRLIST_PAGE)))) {
-		    CTRACE((tfp, "getfile: dropping post_data!\n"));
-		    HTAlert(IGNORED_POST);
-		    FREE(doc->post_data);
-		    FREE(doc->post_content_type);
-		    WWWDoc.post_data = NULL;
-		    WWWDoc.post_content_type = NULL;
-		}
+    /*
+     *  Check to see if this is a universal document ID
+     *  that lib WWW wants to handle.
+     *
+     *  Some special URL's we handle ourselves. :)
+     */
+    if ((url_type = is_url(doc->address)) != 0) {
+	if (LYValidate && !LYPermitURL) {
+	    if (!(url_type == HTTP_URL_TYPE ||
+		  url_type == HTTPS_URL_TYPE ||
+		  url_type == LYNXHIST_URL_TYPE ||
+		  url_type == LYNXKEYMAP_URL_TYPE ||
+		  url_type == LYNXIMGMAP_URL_TYPE ||
+		  url_type == LYNXCOOKIE_URL_TYPE ||
+		  url_type == LYNXMESSAGES_URL_TYPE ||
+		  (url_type == LYNXOPTIONS_URL_TYPE &&
+		   WWWDoc.post_data) ||
+		  0==STRNADDRCOMP(WWWDoc.address, helpfilepath,
+				  strlen(helpfilepath)) ||
+		  (lynxlistfile != NULL &&
+		   0==STRNADDRCOMP(WWWDoc.address, lynxlistfile,
+				  strlen(lynxlistfile))) ||
+		  (lynxlinksfile != NULL &&
+		   0==STRNADDRCOMP(WWWDoc.address, lynxlinksfile,
+				  strlen(lynxlinksfile))) ||
+		  (lynxjumpfile != NULL &&
+		   0==STRNADDRCOMP(WWWDoc.address, lynxjumpfile,
+				  strlen(lynxjumpfile))))) {
+		HTUserMsg(NOT_HTTP_URL_OR_ACTION);
+		return(NULLFILE);
+	    }
+	}
+	if (traversal) {
+	    /*
+	     *	Only traverse http URLs.
+	     */
+	    if (url_type != HTTP_URL_TYPE &&
+		url_type != LYNXIMGMAP_URL_TYPE) {
+		return(NULLFILE);
+	    }
+	} else if (check_realm && !LYPermitURL && !LYJumpFileURL) {
+	    if (!(0==strncmp(startrealm, WWWDoc.address,
+			     strlen(startrealm)) ||
+		  url_type == LYNXHIST_URL_TYPE ||
+		  url_type == LYNXKEYMAP_URL_TYPE ||
+		  url_type == LYNXIMGMAP_URL_TYPE ||
+		  url_type == LYNXCOOKIE_URL_TYPE ||
+		  url_type == LYNXPRINT_URL_TYPE ||
+		  url_type == LYNXOPTIONS_URL_TYPE ||
+		  url_type == LYNXCFG_URL_TYPE ||
+		  url_type == LYNXCOMPILE_OPTS_URL_TYPE ||
+		  url_type == LYNXMESSAGES_URL_TYPE ||
+		  url_type == LYNXDOWNLOAD_URL_TYPE ||
+		  url_type == MAILTO_URL_TYPE ||
+		  url_type == NEWSPOST_URL_TYPE ||
+		  url_type == NEWSREPLY_URL_TYPE ||
+		  url_type == SNEWSPOST_URL_TYPE ||
+		  url_type == SNEWSREPLY_URL_TYPE ||
+		  (!LYUserSpecifiedURL &&
+		   (url_type == LYNXEXEC_URL_TYPE ||
+		    url_type == LYNXPROG_URL_TYPE ||
+		    url_type == LYNXCGI_URL_TYPE)) ||
+		  (WWWDoc.bookmark != NULL &&
+		   *WWWDoc.bookmark != '\0') ||
+		  0==STRNADDRCOMP(WWWDoc.address, helpfilepath,
+				  strlen(helpfilepath)) ||
+		  (lynxlistfile != NULL &&
+		   0==STRNADDRCOMP(WWWDoc.address, lynxlistfile,
+				  strlen(lynxlistfile))) ||
+		  (lynxjumpfile != NULL &&
+		   0==STRNADDRCOMP(WWWDoc.address, lynxjumpfile,
+				  strlen(lynxjumpfile))))) {
+		HTUserMsg(NOT_IN_STARTING_REALM);
+		return(NULLFILE);
+	    }
+	}
+	if (WWWDoc.post_data &&
+	    url_type != HTTP_URL_TYPE &&
+	    url_type != HTTPS_URL_TYPE &&
+	    url_type != LYNXCGI_URL_TYPE &&
+	    url_type != LYNXIMGMAP_URL_TYPE &&
+	    url_type != GOPHER_URL_TYPE &&
+	    url_type != CSO_URL_TYPE &&
+	    url_type != PROXY_URL_TYPE &&
+	    url_type != LYNXOPTIONS_URL_TYPE &&
+	    !(url_type == FILE_URL_TYPE &&
+	      (LYIsUIPage(WWWDoc.address, UIP_LIST_PAGE) ||
+	       LYIsUIPage(WWWDoc.address, UIP_ADDRLIST_PAGE)))) {
+	    CTRACE((tfp, "getfile: dropping post_data!\n"));
+	    HTAlert(IGNORED_POST);
+	    LYFreePostData(doc);
+	    WWWDoc.post_data = NULL;
+	    WWWDoc.post_content_type = NULL;
+	}
 #if !defined(VMS) && defined(SYSLOG_REQUESTED_URLS)
-		LYSyslog (doc->address);
+	LYSyslog (doc->address);
 #endif
-		if (url_type == UNKNOWN_URL_TYPE ||
-		    url_type == AFS_URL_TYPE ||
-		    url_type == PROSPERO_URL_TYPE) {
-		    HTAlert(UNSUPPORTED_URL_SCHEME);
-		    return(NULLFILE);
+	if (url_type == UNKNOWN_URL_TYPE ||
+	    url_type == AFS_URL_TYPE ||
+	    url_type == PROSPERO_URL_TYPE) {
+	    HTAlert(UNSUPPORTED_URL_SCHEME);
+	    return(NULLFILE);
 
-		} else if (url_type == DATA_URL_TYPE) {
-		    HTAlert(UNSUPPORTED_DATA_URL);
-		    return(NULLFILE);
+	} else if (url_type == DATA_URL_TYPE) {
+	    HTAlert(UNSUPPORTED_DATA_URL);
+	    return(NULLFILE);
 
-		} else if (url_type == LYNXPRINT_URL_TYPE) {
-		    return(printfile(doc));
+	} else if (url_type == LYNXPRINT_URL_TYPE) {
+	    return(printfile(doc));
 
 #ifndef NO_OPTION_FORMS
-		} else if (url_type == LYNXOPTIONS_URL_TYPE) {
-		    /* proceed forms-based options menu */
-		    return(postoptions(doc));
+	} else if (url_type == LYNXOPTIONS_URL_TYPE) {
+	    /* proceed forms-based options menu */
+	    return(postoptions(doc));
 #endif
 
-		} else if (url_type == LYNXCFG_URL_TYPE &&
-		    !no_lynxcfg_info) {
-		    /* @@@ maybe we should generate a specific error message
-		       if attempted but restricted. - kw */
-		    /* show/change/reload lynx.cfg settings */
-		    return(lynx_cfg_infopage(doc));
+	} else if (url_type == LYNXCFG_URL_TYPE &&
+	    !no_lynxcfg_info) {
+	    /* @@@ maybe we should generate a specific error message
+	       if attempted but restricted. - kw */
+	    /* show/change/reload lynx.cfg settings */
+	    return(lynx_cfg_infopage(doc));
 
 #if defined(HAVE_CONFIG_H) && !defined(NO_CONFIG_INFO)
-		} else if (url_type == LYNXCOMPILE_OPTS_URL_TYPE &&
-		    !no_compileopts_info) {
-		    /* @@@ maybe we should generate a specific error message
-		       if attempted but restricted or not supported. - kw */
-		    /* show compile-time settings */
-		    return(lynx_compile_opts(doc));
+	} else if (url_type == LYNXCOMPILE_OPTS_URL_TYPE &&
+	    !no_compileopts_info) {
+	    /* @@@ maybe we should generate a specific error message
+	       if attempted but restricted or not supported. - kw */
+	    /* show compile-time settings */
+	    return(lynx_compile_opts(doc));
 #endif
 
 #ifndef DISABLE_NEWS
-		} else if (url_type == NEWSPOST_URL_TYPE ||
-			   url_type == NEWSREPLY_URL_TYPE ||
-			   url_type == SNEWSPOST_URL_TYPE ||
-			   url_type == SNEWSREPLY_URL_TYPE) {
-
-		    if (no_newspost) {
-			HTUserMsg(NEWSPOSTING_DISABLED);
-			return(NULLFILE);
-		    } else if (!news_ok && (
-			url_type == NEWSPOST_URL_TYPE ||
-			url_type == NEWSREPLY_URL_TYPE)) {
-			HTUserMsg(NEWS_DISABLED);
-			return(NULLFILE);
-		    } else {
-			HTLoadAbsolute(&WWWDoc);
-			return(NULLFILE);
-		    }
+	} else if (url_type == NEWSPOST_URL_TYPE ||
+		   url_type == NEWSREPLY_URL_TYPE ||
+		   url_type == SNEWSPOST_URL_TYPE ||
+		   url_type == SNEWSREPLY_URL_TYPE) {
+
+	    if (no_newspost) {
+		HTUserMsg(NEWSPOSTING_DISABLED);
+		return(NULLFILE);
+	    } else if (!news_ok && (
+		url_type == NEWSPOST_URL_TYPE ||
+		url_type == NEWSREPLY_URL_TYPE)) {
+		HTUserMsg(NEWS_DISABLED);
+		return(NULLFILE);
+	    } else {
+		HTLoadAbsolute(&WWWDoc);
+		return(NULLFILE);
+	    }
 #endif
 
-		} else if (url_type == LYNXDOWNLOAD_URL_TYPE) {
-		    LYDownload(doc->address);
+	} else if (url_type == LYNXDOWNLOAD_URL_TYPE) {
+	    LYDownload(doc->address);
 #ifdef VMS
-		    if (LYDidRename) {
-			/*
-			 *  The temporary file was saved to disk via a
-			 *  rename(), so we can't access the temporary
-			 *  file again via the download menu.  Clear the
-			 *  flag, and return NULLFILE to pop. - FM
-			 */
-			LYDidRename = FALSE;
-			return(NULLFILE);
-		    }
+	    if (LYDidRename) {
+		/*
+		 *  The temporary file was saved to disk via a
+		 *  rename(), so we can't access the temporary
+		 *  file again via the download menu.  Clear the
+		 *  flag, and return NULLFILE to pop. - FM
+		 */
+		LYDidRename = FALSE;
+		return(NULLFILE);
+	    }
 #endif /* VMS */
-		    return(NORMAL);
-		} else if (url_type == LYNXDIRED_URL_TYPE) {
+	    return(NORMAL);
+	} else if (url_type == LYNXDIRED_URL_TYPE) {
 #ifdef DIRED_SUPPORT
-		    if (!no_dired_support) {
-		       local_dired(doc);
-		       WWWDoc.address = doc->address;
-		       WWWDoc.post_data = doc->post_data;
-		       WWWDoc.post_content_type = doc->post_content_type;
-		       WWWDoc.bookmark = doc->bookmark;
-		       WWWDoc.isHEAD = doc->isHEAD;
-		       WWWDoc.safe = doc->safe;
-
-		       if (!HTLoadAbsolute(&WWWDoc))
-			   return(NOT_FOUND);
-		       return(NORMAL);
-		    }
+	    if (!no_dired_support) {
+	       local_dired(doc);
+	       WWWDoc.address = doc->address;
+	       WWWDoc.post_data = doc->post_data;
+	       WWWDoc.post_content_type = doc->post_content_type;
+	       WWWDoc.bookmark = doc->bookmark;
+	       WWWDoc.isHEAD = doc->isHEAD;
+	       WWWDoc.safe = doc->safe;
+
+	       if (!HTLoadAbsolute(&WWWDoc)) {
+		   return(NOT_FOUND);
+	       }
+	       return(NORMAL);
+	    }
 #endif /* DIRED_SUPPORT */
-		    HTUserMsg(DIRED_DISABLED);
-		    return(NULLFILE);
-		}
+	    HTUserMsg(DIRED_DISABLED);
+	    return(NULLFILE);
+	}
 
-		if (LYNoRefererHeader == FALSE &&
-		    LYNoRefererForThis == FALSE) {
-		    char *ref_url = HTLoadedDocumentURL();
-		    if (!strncmp(ref_url, "LYNXIMGMAP:", 11))
-			ref_url += 11;
-		    if (no_filereferer == TRUE &&
-			!strncmp(ref_url, "file:", 5)) {
-			LYNoRefererForThis = TRUE;
-		    }
-		    if (LYNoRefererForThis == FALSE &&
-			(cp = strchr(ref_url, '?')) != NULL &&
-			strchr(cp, '=') != NULL) {
-			/*
-			 *  Don't send a Referer header if the URL is
-			 *  the reply from a form with method GET, in
-			 *  case the content has personal data (e.g.,
-			 *  a password or credit card number) which
-			 *  would become visible in logs. - FM
-			 *
-			 *  Changed 1999-11-01 to be controlled by
-			 *  REFERER_WITH_QUERY option. - kw
-			 */
-			if (LYRefererWithQuery == 'S') { /* SEND */
-			    StrAllocCopy(LYRequestReferer, ref_url);
-			} else if (LYRefererWithQuery == 'P') { /* PARTIAL */
-			    FREE(LYRequestReferer); /* just to be sure */
-			    LYRequestReferer = HTParse(ref_url, "",
-		PARSE_ACCESS|PARSE_HOST|PARSE_STRICTPATH|PARSE_PUNCTUATION);
-			} else { /* Everyhting else - don't send Referer */
-			    LYNoRefererForThis = TRUE;
-			}
-			cp = NULL;
-		    } else if (LYNoRefererForThis == FALSE) {
-			StrAllocCopy(LYRequestReferer, ref_url);
-		    }
-		} else {
-		    StrAllocCopy(LYRequestReferer, HTLoadedDocumentURL());
+	if (LYNoRefererHeader == FALSE &&
+	    LYNoRefererForThis == FALSE) {
+	    char *ref_url = HTLoadedDocumentURL();
+	    if (isLYNXIMGMAP(ref_url))
+		ref_url += LEN_LYNXIMGMAP;
+	    if (no_filereferer == TRUE && isFILE_URL(ref_url)) {
+		LYNoRefererForThis = TRUE;
+	    }
+	    if (LYNoRefererForThis == FALSE &&
+		(cp = strchr(ref_url, '?')) != NULL &&
+		strchr(cp, '=') != NULL) {
+		/*
+		 *  Don't send a Referer header if the URL is
+		 *  the reply from a form with method GET, in
+		 *  case the content has personal data (e.g.,
+		 *  a password or credit card number) which
+		 *  would become visible in logs. - FM
+		 *
+		 *  Changed 1999-11-01 to be controlled by
+		 *  REFERER_WITH_QUERY option. - kw
+		 */
+		if (LYRefererWithQuery == 'S') { /* SEND */
+		    StrAllocCopy(LYRequestReferer, ref_url);
+		} else if (LYRefererWithQuery == 'P') { /* PARTIAL */
+		    FREE(LYRequestReferer); /* just to be sure */
+		    LYRequestReferer = HTParse(ref_url, "",
+					       PARSE_ACCESS|PARSE_HOST|PARSE_STRICTPATH|PARSE_PUNCTUATION);
+		} else { /* Everything else - don't send Referer */
+		    LYNoRefererForThis = TRUE;
 		}
-		if (url_type == LYNXHIST_URL_TYPE) {
-		    /*
-		     *	'doc' will change to the new file
-		     *	if we had a successful LYpop_num(),
-		     *	and the return value will be FALSE
-		     *	if we had a cancel. - FM
-		     */
-		    if ((historytarget(doc) == FALSE) ||
-			!doc || !doc->address) {
-			return(NOT_FOUND);
-		    }
+		cp = NULL;
+	    } else if (LYNoRefererForThis == FALSE) {
+		StrAllocCopy(LYRequestReferer, ref_url);
+	    }
+	} else {
+	    StrAllocCopy(LYRequestReferer, HTLoadedDocumentURL());
+	}
+	if (url_type == LYNXHIST_URL_TYPE) {
+	    /*
+	     *	'doc' will change to the new file
+	     *	if we had a successful LYpop_num(),
+	     *	and the return value will be FALSE
+	     *	if we had a cancel. - FM
+	     */
+	    if ((historytarget(doc) == FALSE) ||
+		!doc || !doc->address) {
+		return(NOT_FOUND);
+	    }
 
-		    /*
-		     *	We changed it so reload.
-		     */
-		    WWWDoc.address = doc->address;
-		    WWWDoc.post_data = doc->post_data;
-		    WWWDoc.post_content_type = doc->post_content_type;
-		    WWWDoc.bookmark = doc->bookmark;
-		    WWWDoc.isHEAD = doc->isHEAD;
-		    WWWDoc.safe = doc->safe;
+	    /*
+	     *	We changed it so reload.
+	     */
+	    WWWDoc.address = doc->address;
+	    WWWDoc.post_data = doc->post_data;
+	    WWWDoc.post_content_type = doc->post_content_type;
+	    WWWDoc.bookmark = doc->bookmark;
+	    WWWDoc.isHEAD = doc->isHEAD;
+	    WWWDoc.safe = doc->safe;
 #ifndef DONT_TRACK_INTERNAL_LINKS
-		    if (doc->internal_link && !reloading) {
-			LYinternal_flag = TRUE;
-		    }
+	    if (doc->internal_link && !reloading) {
+		LYinternal_flag = TRUE;
+	    }
 #endif
 
 #ifdef DIRED_SUPPORT
-		    lynx_edit_mode = FALSE;
+	    lynx_edit_mode = FALSE;
 #endif /* DIRED_SUPPORT */
-		    if (!HTLoadAbsolute(&WWWDoc)) {
-			return(NOT_FOUND);
-		    }
-		    return(NORMAL);
+	    if (!HTLoadAbsolute(&WWWDoc)) {
+		return(NOT_FOUND);
+	    }
+	    return(NORMAL);
 
-		} else if (url_type == LYNXEXEC_URL_TYPE ||
-			   url_type == LYNXPROG_URL_TYPE) {
+	} else if (url_type == LYNXEXEC_URL_TYPE ||
+		   url_type == LYNXPROG_URL_TYPE) {
 #ifdef EXEC_LINKS
-		    if (no_exec &&
-			!exec_ok(HTLoadedDocumentURL(),
-				 doc->address+9, ALWAYS_EXEC_PATH)) {
-			HTUserMsg(EXECUTION_DISABLED);
-		    } else if (no_bookmark_exec &&
-			       HTLoadedDocumentBookmark()) {
-			HTUserMsg(BOOKMARK_EXEC_DISABLED);
-		    } else if (local_exec || (local_exec_on_local_files &&
-			       exec_ok(HTLoadedDocumentURL(),
-				       doc->address+9, EXEC_PATH))) {
-
-			char *p = NULL;
+	    if (no_exec &&
+		!exec_ok(HTLoadedDocumentURL(),
+			 doc->address+9, ALWAYS_EXEC_PATH)) {
+		HTUserMsg(EXECUTION_DISABLED);
+	    } else if (no_bookmark_exec &&
+		       HTLoadedDocumentBookmark()) {
+		HTUserMsg(BOOKMARK_EXEC_DISABLED);
+	    } else if (local_exec || (local_exec_on_local_files &&
+		       exec_ok(HTLoadedDocumentURL(),
+			       doc->address+9, EXEC_PATH))) {
+
+		char *p = NULL;
 
-			/*
-			 *  Bug puts slash on end if none is in the string.
-			 */
-			char *last_slash = strrchr(doc->address,'/');
-			if (last_slash - doc->address
-			 == (int)strlen(doc->address) - 1)
-			    doc->address[strlen(doc->address)-1] = '\0';
+		/*
+		 *  Bug puts slash on end if none is in the string.
+		 */
+		char *last_slash = strrchr(doc->address,'/');
+		if (last_slash - doc->address
+		 == (int)strlen(doc->address) - 1)
+		    doc->address[strlen(doc->address)-1] = '\0';
 
-			/*
-			 *  Convert '~' to $HOME.
-			 */
-			if ((cp = strchr(doc->address, '~'))) {
-			    HTSprintf0(&p, "%.*s%s%s",
-					   cp - doc->address,
-					   doc->address,
-					   wwwName(Home_Dir()),
-					   cp + 1);
-			} else {
-			    StrAllocCopy(p, doc->address);
-			}
-			/*
-			 *  Show URL before executing it.
-			 */
-			HTInfoMsg(doc->address);
-			stop_curses();
-			/*
-			 *  Run the command.
-			 */
-			if (strstr(p,"//") == p+9)
-			    LYSystem(p+11);
-			else
-			    LYSystem(p+9);
-			FREE(p);
-
-			if (url_type != LYNXPROG_URL_TYPE) {
-			    /*
-			     *	Make sure user gets to see screen output.
-			     */
+		/*
+		 *  Convert '~' to $HOME.
+		 */
+		if ((cp = strchr(doc->address, '~'))) {
+		    HTSprintf0(&p, "%.*s%s%s",
+				   cp - doc->address,
+				   doc->address,
+				   wwwName(Home_Dir()),
+				   cp + 1);
+		} else {
+		    StrAllocCopy(p, doc->address);
+		}
+		/*
+		 *  Show URL before executing it.
+		 */
+		HTInfoMsg(doc->address);
+		stop_curses();
+		/*
+		 *  Run the command.
+		 */
+		if (strstr(p,"//") == p+9)
+		    LYSystem(p+11);
+		else
+		    LYSystem(p+9);
+		FREE(p);
+
+		if (url_type != LYNXPROG_URL_TYPE) {
+		    /*
+		     *	Make sure user gets to see screen output.
+		     */
 #ifndef VMS
-			    signal(SIGINT, SIG_IGN);
+		    signal(SIGINT, SIG_IGN);
 #endif /* !VMS */
-			    printf("\n%s", RETURN_TO_LYNX);
-			    fflush(stdout);
-			    (void) LYgetch();
+		    printf("\n%s", RETURN_TO_LYNX);
+		    fflush(stdout);
+		    (void) LYgetch();
 #ifdef VMS
-			    HadVMSInterrupt = FALSE;
+		    HadVMSInterrupt = FALSE;
 #endif /* VMS */
-			}
-			if (!dump_output_immediately) {
-			    start_curses();
-			    LYAddVisitedLink(doc);
-			}
+		}
+		if (!dump_output_immediately) {
+		    start_curses();
+		    LYAddVisitedLink(doc);
+		}
 
-		     } else {
-			char *buf = 0;
+	     } else {
+		char *buf = 0;
 
-			HTSprintf0(&buf,
-				EXECUTION_DISABLED_FOR_FILE,
-				key_for_func(LYK_OPTIONS));
-			HTAlert(buf);
-			FREE(buf);
-		     }
+		HTSprintf0(&buf,
+			EXECUTION_DISABLED_FOR_FILE,
+			key_for_func(LYK_OPTIONS));
+		HTAlert(buf);
+		FREE(buf);
+	     }
 #else /* no exec_links */
-		     HTUserMsg(EXECUTION_NOT_COMPILED);
+	     HTUserMsg(EXECUTION_NOT_COMPILED);
 #endif /* EXEC_LINKS */
-		     return(NULLFILE);
-
-		} else if (url_type == MAILTO_URL_TYPE) {
-		    if (no_mail) {
-			HTUserMsg(MAIL_DISABLED);
+	     return(NULLFILE);
+
+	} else if (url_type == MAILTO_URL_TYPE) {
+	    if (no_mail) {
+		HTUserMsg(MAIL_DISABLED);
+	    } else {
+		HTParentAnchor *tmpanchor = HTAnchor_findAddress(&WWWDoc);
+		CONST char *title;
+		char *tmptitle = NULL;
+
+		title = "";
+		if (HTAnchor_title(tmpanchor)) {
+			title = HTAnchor_title(tmpanchor);
+		} else if (HTMainAnchor && !LYUserSpecifiedURL) {
+		    title = HTAnchor_subject(HTMainAnchor);
+		    if (title && *title) {
+			if (strncasecomp(title, "Re:", 3)) {
+			    StrAllocCopy(tmptitle, "Re: ");
+			    StrAllocCat(tmptitle, title);
+			    title = tmptitle;
+			}
 		    } else {
-			HTParentAnchor *tmpanchor;
-			CONST char *title;
-			char *tmptitle = NULL;
-
 			title = "";
-			if ((tmpanchor = HTAnchor_parent(
-						HTAnchor_findAddress(&WWWDoc)
-							)) != NULL &&
-			    HTAnchor_title(tmpanchor)) {
-				title = HTAnchor_title(tmpanchor);
-			} else if (HTMainAnchor && !LYUserSpecifiedURL) {
-			    title = HTAnchor_subject(HTMainAnchor);
-			    if (title && *title) {
-				if (strncasecomp(title, "Re:", 3)) {
-				    StrAllocCopy(tmptitle, "Re: ");
-				    StrAllocCat(tmptitle, title);
-				    title = tmptitle;
-				}
-			    } else {
-				title = "";
-			    }
-			}
-			cp = (char *)strchr(doc->address,':')+1;
-			reply_by_mail(cp,
-				      ((HTMainAnchor && !LYUserSpecifiedURL) ?
-				       (char *)HTMainAnchor->address :
-				       (char *)doc->address),
-				      title,
-				      (HTMainAnchor && !LYUserSpecifiedURL) ?
-				       HTMainAnchor->message_id : NULL);
-			FREE(tmptitle);
 		    }
-		    return(NULLFILE);
+		}
+		cp = strchr(doc->address,':')+1;
+		reply_by_mail(cp,
+			      ((HTMainAnchor && !LYUserSpecifiedURL) ?
+			       (char *)HTMainAnchor->address :
+			       (char *)doc->address),
+			      title,
+			      (HTMainAnchor && !LYUserSpecifiedURL) ?
+			       HTMainAnchor->message_id : NULL);
+		FREE(tmptitle);
+	    }
+	    return(NULLFILE);
 
-		/*
-		 *  From here on we could have a remote host,
-		 *  so check if that's allowed.
-		 */
-		} else if (local_host_only &&
-			   url_type != LYNXKEYMAP_URL_TYPE &&
-			   url_type != LYNXIMGMAP_URL_TYPE &&
-			   url_type != LYNXCOOKIE_URL_TYPE &&
-			   url_type != LYNXMESSAGES_URL_TYPE &&
-			   url_type != LYNXCGI_URL_TYPE &&
-			   !(url_type == NEWS_URL_TYPE &&
-			     strncmp(doc->address, "news://", 7)) &&
-			   !(LYisLocalHost(doc->address) ||
-			     LYisLocalAlias(doc->address))) {
-		    HTUserMsg(ACCESS_ONLY_LOCALHOST);
-		    return(NULLFILE);
+	/*
+	 *  From here on we could have a remote host,
+	 *  so check if that's allowed.
+	 */
+	} else if (local_host_only &&
+		   url_type != LYNXKEYMAP_URL_TYPE &&
+		   url_type != LYNXIMGMAP_URL_TYPE &&
+		   url_type != LYNXCOOKIE_URL_TYPE &&
+		   url_type != LYNXMESSAGES_URL_TYPE &&
+		   url_type != LYNXCGI_URL_TYPE &&
+		   !(url_type == NEWS_URL_TYPE &&
+		     strncmp(doc->address, "news://", 7)) &&
+		   !(LYisLocalHost(doc->address) ||
+		     LYisLocalAlias(doc->address))) {
+	    HTUserMsg(ACCESS_ONLY_LOCALHOST);
+	    return(NULLFILE);
 
-		/*
-		 *  Disable www telnet access if not telnet_ok.
-		 */
-		} else if (url_type == TELNET_URL_TYPE ||
-			   url_type == TN3270_URL_TYPE ||
-			   url_type == TELNET_GOPHER_URL_TYPE) {
-		    char * proxy;
-		    if (!telnet_ok) {
-			HTUserMsg(TELNET_DISABLED);
-			return(NULLFILE);
-		    } else if (no_telnet_port && strchr(doc->address+7, ':')) {
-			HTUserMsg(TELNET_PORT_SPECS_DISABLED);
-			return(NULLFILE);
-		    /*
-		     *  Detect weird case where interactive protocol would
-		     *  be proxied, and to a non-interactive protocol at that.
-		     */
-		    } else if ((proxy = (char *)getenv(
-			(url_type==TN3270_URL_TYPE) ? "tn3270_proxy" :
-			(url_type==TELNET_GOPHER_URL_TYPE) ? "gopher_proxy" :
-			"telnet_proxy")) != NULL &&
-			       *proxy != '\0' &&
-			       !override_proxy(doc->address) &&
-			       (strncmp(proxy, "telnet:", 7) &&
-				strncmp(proxy, "tn3270:", 7) &&
-				strncmp(proxy, "rlogin:", 7))) {
-			/* Do nothing, fall through to generic code - kw */
-		    } else {
-			stop_curses();
-			HTLoadAbsolute(&WWWDoc);
-			if (!dump_output_immediately) {
-			    start_curses();
-			    fflush(stdout);
-			    LYAddVisitedLink(doc);
-			}
-			return(NULLFILE);
-		    }
+	/*
+	 *  Disable www telnet access if not telnet_ok.
+	 */
+	} else if (url_type == TELNET_URL_TYPE ||
+		   url_type == TN3270_URL_TYPE ||
+		   url_type == TELNET_GOPHER_URL_TYPE) {
+	    char * proxy;
+	    if (!telnet_ok) {
+		HTUserMsg(TELNET_DISABLED);
+		return(NULLFILE);
+	    } else if (no_telnet_port && strchr(doc->address+7, ':')) {
+		HTUserMsg(TELNET_PORT_SPECS_DISABLED);
+		return(NULLFILE);
+	    /*
+	     *  Detect weird case where interactive protocol would
+	     *  be proxied, and to a non-interactive protocol at that.
+	     */
+	    } else if ((proxy = LYGetEnv(
+		(url_type==TN3270_URL_TYPE) ? "tn3270_proxy" :
+		(url_type==TELNET_GOPHER_URL_TYPE) ? "gopher_proxy" :
+		"telnet_proxy")) != NULL &&
+		       !override_proxy(doc->address) &&
+		       (!isTELNET_URL(proxy) &&
+			!isTN3270_URL(proxy) &&
+			!isRLOGIN_URL(proxy))) {
+		/* Do nothing, fall through to generic code - kw */
+	    } else {
+		stop_curses();
+		HTLoadAbsolute(&WWWDoc);
+		if (!dump_output_immediately) {
+		    start_curses();
+		    fflush(stdout);
+		    LYAddVisitedLink(doc);
+		}
+		return(NULLFILE);
+	    }
 
-		/*
-		 *  Disable www news access if not news_ok.
-		 */
+	/*
+	 *  Disable www news access if not news_ok.
+	 */
 #ifndef DISABLE_NEWS
-		} else if (!news_ok && (
-		    url_type == NEWS_URL_TYPE ||
-		    url_type == NNTP_URL_TYPE)) {
-		    HTUserMsg(NEWS_DISABLED);
-		    return(NULLFILE);
+	} else if (!news_ok && (
+	    url_type == NEWS_URL_TYPE ||
+	    url_type == NNTP_URL_TYPE)) {
+	    HTUserMsg(NEWS_DISABLED);
+	    return(NULLFILE);
 #endif
 
-		} else if (url_type == RLOGIN_URL_TYPE) {
-		    char * proxy;
-		    if (!rlogin_ok) {
-			HTUserMsg(RLOGIN_DISABLED);
-			return(NULLFILE);
-		    /*
-		     *  Detect weird case where interactive protocol would
-		     *  be proxied, and to a non-interactive protocol at that.
-		     */
-		    } else if ((proxy = (char *)getenv(
-			"rlogin_proxy")) != NULL &&
-			       *proxy != '\0' &&
-			       !override_proxy(doc->address) &&
-			       (strncmp(proxy, "telnet:", 7) &&
-				strncmp(proxy, "tn3270:", 7) &&
-				strncmp(proxy, "rlogin:", 7))) {
-			/* Do nothing, fall through to generic code - kw */
-		    } else {
-			stop_curses();
-			HTLoadAbsolute(&WWWDoc);
-			fflush(stdout);
-			if (!dump_output_immediately) {
-			    start_curses();
-			    LYAddVisitedLink(doc);
-			}
-			return(NULLFILE);
-		    }
+	} else if (url_type == RLOGIN_URL_TYPE) {
+	    char * proxy;
+	    if (!rlogin_ok) {
+		HTUserMsg(RLOGIN_DISABLED);
+		return(NULLFILE);
+	    /*
+	     *  Detect weird case where interactive protocol would
+	     *  be proxied, and to a non-interactive protocol at that.
+	     */
+	    } else if ((proxy = LYGetEnv(
+		"rlogin_proxy")) != NULL &&
+		       !override_proxy(doc->address) &&
+		       (!isTELNET_URL(proxy) &&
+			!isTN3270_URL(proxy) &&
+			!isRLOGIN_URL(proxy))) {
+		/* Do nothing, fall through to generic code - kw */
+	    } else {
+		stop_curses();
+		HTLoadAbsolute(&WWWDoc);
+		fflush(stdout);
+		if (!dump_output_immediately) {
+		    start_curses();
+		    LYAddVisitedLink(doc);
+		}
+		return(NULLFILE);
+	    }
 
-		/*
-		 *  If its a gopher index type and there isn't a search
-		 *  term already attached then do this.  Otherwise
-		 *  just load it!
-		 */
-		} else if (url_type == INDEX_GOPHER_URL_TYPE &&
-					strchr(doc->address,'?') == NULL) {
-		    int status;
-		    /*
-		     *	Make sure we don't have a gopher+ escaped tab
-		     *	instead of a gopher0 question mark delimiting
-		     *	the search term. - FM
-		     */
-		    if ((cp = strstr(doc->address, "%09")) != NULL) {
+	/*
+	 *  If it's a gopher index type and there isn't a search
+	 *  term already attached then do this.  Otherwise
+	 *  just load it!
+	 */
+	} else if (url_type == INDEX_GOPHER_URL_TYPE &&
+		   strchr(doc->address,'?') == NULL) {
+	    int status;
+	    /*
+	     *	Make sure we don't have a gopher+ escaped tab
+	     *	instead of a gopher0 question mark delimiting
+	     *	the search term. - FM
+	     */
+	    if ((cp = strstr(doc->address, "%09")) != NULL) {
+		*cp = '\0';
+		StrAllocCopy(temp, doc->address);
+		cp += 3;
+		if (*cp && strncmp(cp, "%09", 3)) {
+		    StrAllocCat(temp, "?");
+		    StrAllocCat(temp, cp);
+		    if ((cp = strstr(temp, "%09")) != NULL) {
 			*cp = '\0';
-			StrAllocCopy(temp, doc->address);
-			cp += 3;
-			if (*cp && strncmp(cp, "%09", 3)) {
-			    StrAllocCat(temp, "?");
-			    StrAllocCat(temp, cp);
-			    if ((cp = strstr(temp, "%09")) != NULL) {
-				*cp = '\0';
-			    }
-			}
-			StrAllocCopy(doc->address, temp);
-			FREE(temp);
-			goto Try_Redirected_URL;
 		    }
-		    /*
-		     *	Load it because the do_www_search routine
-		     *	uses the base url of the currently loaded
-		     *	document :(
-		     */
-		    if (!HTLoadAbsolute(&WWWDoc))
-			return(NOT_FOUND);
-		    status = do_www_search(doc);
-		    if (status == NULLFILE) {
-			LYpop(doc);
-			WWWDoc.address = doc->address;
-			WWWDoc.post_data = doc->post_data;
-			WWWDoc.post_content_type = doc->post_content_type;
-			WWWDoc.bookmark = doc->bookmark;
-			WWWDoc.isHEAD = doc->isHEAD;
-			WWWDoc.safe = doc->safe;
-			status = HTLoadAbsolute(&WWWDoc);
+		}
+		StrAllocCopy(doc->address, temp);
+		FREE(temp);
+		goto Try_Redirected_URL;
+	    }
+	    /*
+	     *	Load it because the do_www_search routine
+	     *	uses the base url of the currently loaded
+	     *	document :(
+	     */
+	    if (!HTLoadAbsolute(&WWWDoc)) {
+		return(NOT_FOUND);
+	    }
+	    status = do_www_search(doc);
+	    if (status == NULLFILE) {
+		LYpop(doc);
+		WWWDoc.address = doc->address;
+		WWWDoc.post_data = doc->post_data;
+		WWWDoc.post_content_type = doc->post_content_type;
+		WWWDoc.bookmark = doc->bookmark;
+		WWWDoc.isHEAD = doc->isHEAD;
+		WWWDoc.safe = doc->safe;
+		status = HTLoadAbsolute(&WWWDoc);
 #ifdef DIRED_SUPPORT
-		    } else {
-			lynx_edit_mode = FALSE;
+	    } else {
+		lynx_edit_mode = FALSE;
 #endif /* DIRED_SUPPORT */
-		    }
-		    return(status);
-
-		}
-		{
+	    }
+	    return(status);
 
-		    if (url_type == FTP_URL_TYPE && !ftp_ok) {
-			HTUserMsg(FTP_DISABLED);
-			return(NULLFILE);
-		    }
+	}
+	{
+	    if (!ftp_ok
+	     && (url_type == FTP_URL_TYPE
+	      || url_type == NCFTP_URL_TYPE)) {
+		HTUserMsg(FTP_DISABLED);
+		return(NULLFILE);
+	    }
 
-		    if (url_type == HTML_GOPHER_URL_TYPE) {
-			char *tmp=NULL;
-		       /*
-			*  If tuple's Path=GET%20/... convert to an http URL.
-			*/
-			if ((cp=strchr(doc->address+9, '/')) != NULL &&
-			   0==strncmp(++cp, "hGET%20/", 8)) {
-			    StrAllocCopy(tmp, "http://");
-			    CTRACE((tfp, "getfile: URL '%s'\n",
-					doc->address));
-			    *cp = '\0';
-			    StrAllocCat(tmp, doc->address+9);
-			   /*
-			    *  If the port is defaulted, it should stay 70.
-			    */
-			    if (strchr(tmp+6, ':') == NULL) {
-				StrAllocCat(tmp, "70/");
-				tmp[strlen(tmp)-4] = ':';
-			    }
-			    if (strlen(cp+7) > 1)
-				StrAllocCat(tmp, cp+8);
-			    StrAllocCopy(doc->address, tmp);
-			    CTRACE((tfp, "  changed to '%s'\n",
-					doc->address));
-			    FREE(tmp);
-			    url_type = HTTP_URL_TYPE;
-			}
+	    if (url_type == HTML_GOPHER_URL_TYPE) {
+		char *tmp=NULL;
+	       /*
+		*  If tuple's Path=GET%20/... convert to an http URL.
+		*/
+		if ((cp=strchr(doc->address+9, '/')) != NULL &&
+		   0==strncmp(++cp, "hGET%20/", 8)) {
+		    StrAllocCopy(tmp, "http://");
+		    CTRACE((tfp, "getfile: URL '%s'\n",
+				doc->address));
+		    *cp = '\0';
+		    StrAllocCat(tmp, doc->address+9);
+		   /*
+		    *  If the port is defaulted, it should stay 70.
+		    */
+		    if (strchr(tmp+6, ':') == NULL) {
+			StrAllocCat(tmp, "70/");
+			tmp[strlen(tmp)-4] = ':';
 		    }
-		    if (url_type == HTTP_URL_TYPE ||
-			url_type == HTTPS_URL_TYPE ||
-			url_type == FTP_URL_TYPE ||
-			url_type == CSO_URL_TYPE)
-			fix_httplike_urls(doc, url_type);
-		    WWWDoc.address = doc->address;  /* possible reload */
+		    if (strlen(cp+7) > 1)
+			StrAllocCat(tmp, cp+8);
+		    StrAllocCopy(doc->address, tmp);
+		    CTRACE((tfp, "  changed to '%s'\n",
+				doc->address));
+		    FREE(tmp);
+		    url_type = HTTP_URL_TYPE;
+		}
+	    }
+	    if (url_type == HTTP_URL_TYPE ||
+		url_type == HTTPS_URL_TYPE ||
+		url_type == FTP_URL_TYPE ||
+		url_type == NCFTP_URL_TYPE ||
+		url_type == CSO_URL_TYPE)
+		fix_httplike_urls(doc, url_type);
+	    WWWDoc.address = doc->address;  /* possible reload */
 #ifdef DIRED_SUPPORT
-		    lynx_edit_mode = FALSE;
+	    lynx_edit_mode = FALSE;
 #endif /* DIRED_SUPPORT */
 #ifndef DISABLE_BIBP
-		    if (url_type == BIBP_URL_TYPE) {
-			char *bibpTmp = NULL;
-			if (!BibP_bibhost_checked)
-			    LYCheckBibHost();
-			if (BibP_bibhost_available) {
-			    StrAllocCopy(bibpTmp, BibP_bibhost);
-			} else if (HTMainAnchor && HTAnchor_citehost(HTMainAnchor)) {
-			    StrAllocCopy(bibpTmp, HTAnchor_citehost(HTMainAnchor));
-			} else {
-			    StrAllocCopy(bibpTmp, BibP_globalserver);
-			}
-			if (HTMainAnchor && HTAnchor_citehost(HTMainAnchor)) {
-			    StrAllocCat(bibpTmp, "bibp1.0/resolve?citehost=");
-			    StrAllocCat(bibpTmp, HTAnchor_citehost(HTMainAnchor));
-			    StrAllocCat(bibpTmp, "&usin=");
-			} else {
-			    StrAllocCat(bibpTmp, "bibp1.0/resolve?usin=");
-			}
-			StrAllocCat(bibpTmp, doc->address+5); /* USIN after bibp: */
-			StrAllocCopy(doc->address, bibpTmp);
-			WWWDoc.address = doc->address;
-			FREE(bibpTmp);
-		    }
+	    if (url_type == BIBP_URL_TYPE) {
+		char *bibpTmp = NULL;
+		if (!BibP_bibhost_checked)
+		    LYCheckBibHost();
+		if (BibP_bibhost_available) {
+		    StrAllocCopy(bibpTmp, BibP_bibhost);
+		} else if (HTMainAnchor && HTAnchor_citehost(HTMainAnchor)) {
+		    StrAllocCopy(bibpTmp, HTAnchor_citehost(HTMainAnchor));
+		} else {
+		    StrAllocCopy(bibpTmp, BibP_globalserver);
+		}
+		if (HTMainAnchor && HTAnchor_citehost(HTMainAnchor)) {
+		    StrAllocCat(bibpTmp, "bibp1.0/resolve?citehost=");
+		    StrAllocCat(bibpTmp, HTAnchor_citehost(HTMainAnchor));
+		    StrAllocCat(bibpTmp, "&usin=");
+		} else {
+		    StrAllocCat(bibpTmp, "bibp1.0/resolve?usin=");
+		}
+		StrAllocCat(bibpTmp, doc->address+5); /* USIN after bibp: */
+		StrAllocCopy(doc->address, bibpTmp);
+		WWWDoc.address = doc->address;
+		FREE(bibpTmp);
+	    }
 #endif /* !DISABLE_BIBP */
 
-		    if (url_type == FILE_URL_TYPE) {
-			/*
-			 *  If a file URL has a '~' as the lead character
-			 *  of its first symbolic element, convert the '~'
-			 *  to Home_Dir(), then append the rest of of path,
-			 *  if present, skipping "user" if "~user" was
-			 *  entered, simplifying, and eliminating any
-			 *  residual relative elements. - FM
-			 */
-			if (((cp = HTParse(doc->address, "",
-				   PARSE_PATH+PARSE_ANCHOR+PARSE_PUNCTUATION))
-			      != NULL) &&
-			    !strncmp(cp, "/~", 2)) {
-			    char *cp1 = strstr(doc->address, "/~");
-			    char *cp2;
-
-			    CTRACE((tfp, "getfile: URL '%s'\n",
-					doc->address));
-			    *cp1 = '\0';
-			    cp1 += 2;
-			    StrAllocCopy(temp, doc->address);
-			    StrAllocCopy(cp, wwwName(Home_Dir()));
-			    if (!LYIsHtmlSep(*cp))
-				LYAddHtmlSep(&temp);
-			    StrAllocCat(temp, cp);
-			    if ((cp2 = strchr(cp1, '/')) != NULL) {
-				LYTrimRelFromAbsPath(cp2);
-				StrAllocCat(temp, cp2);
-			    }
-			    StrAllocCopy(doc->address, temp);
-			    FREE(temp);
-			    CTRACE((tfp, "  changed to '%s'\n",
-					doc->address));
-			    WWWDoc.address = doc->address;
-			}
-			FREE(cp);
+	    if (url_type == FILE_URL_TYPE) {
+		/*
+		 *  If a file URL has a '~' as the lead character
+		 *  of its first symbolic element, convert the '~'
+		 *  to Home_Dir(), then append the rest of of path,
+		 *  if present, skipping "user" if "~user" was
+		 *  entered, simplifying, and eliminating any
+		 *  residual relative elements. - FM
+		 */
+		if (((cp = HTParse(doc->address, "",
+			   PARSE_PATH+PARSE_ANCHOR+PARSE_PUNCTUATION))
+		      != NULL) &&
+		    !strncmp(cp, "/~", 2)) {
+		    char *cp1 = strstr(doc->address, "/~");
+		    char *cp2;
+
+		    CTRACE((tfp, "getfile: URL '%s'\n",
+				doc->address));
+		    *cp1 = '\0';
+		    cp1 += 2;
+		    StrAllocCopy(temp, doc->address);
+		    StrAllocCopy(cp, wwwName(Home_Dir()));
+		    if (!LYIsHtmlSep(*cp))
+			LYAddHtmlSep(&temp);
+		    StrAllocCat(temp, cp);
+		    if ((cp2 = strchr(cp1, '/')) != NULL) {
+			LYTrimRelFromAbsPath(cp2);
+			StrAllocCat(temp, cp2);
 		    }
-		    CTRACE_SLEEP(MessageSecs);
-		    user_message(WWW_WAIT_MESSAGE, doc->address);
+		    StrAllocCopy(doc->address, temp);
+		    FREE(temp);
+		    CTRACE((tfp, "  changed to '%s'\n",
+				doc->address));
+		    WWWDoc.address = doc->address;
+		}
+		FREE(cp);
+	    }
+	    CTRACE_SLEEP(MessageSecs);
+	    user_message(WWW_WAIT_MESSAGE, doc->address);
 
-		    if (TRACE) {
+	    if (TRACE) {
 #ifdef USE_SLANG
-			if (LYCursesON) {
-			    LYaddstr("*\n");
-			    LYrefresh();
-			}
+		if (LYCursesON) {
+		    LYaddstr("*\n");
+		    LYrefresh();
+		}
 #endif /* USE_SLANG */
-			CTRACE((tfp, "\n"));
-		    }
-		    if (!HTLoadAbsolute(&WWWDoc)) {
+		CTRACE((tfp, "\n"));
+	    }
+	    if (!HTLoadAbsolute(&WWWDoc)) {
+		/*
+		 *  Check for redirection.
+		 */
+		if (use_this_url_instead != NULL) {
+		    char *pound;
+
+		    if (!is_url(use_this_url_instead)) {
 			/*
-			 *  Check for redirection.
+			 *  The server did not return a complete
+			 *  URL in its Location: header, probably
+			 *  due to a FORM or other CGI script written
+			 *  by someone who doesn't know that the http
+			 *  protocol requires that it be a complete
+			 *  URL, or using a server which does not treat
+			 *  such a redirect string from the script as
+			 *  an instruction to resolve it versus the
+			 *  initial request, check authentication with
+			 *  that URL, and then act on it without
+			 *  returning redirection to us.  We'll
+			 *  violate the http protocol and resolve it
+			 *  ourselves using the URL of the original
+			 *  request as the BASE, rather than doing
+			 *  the RIGHT thing and returning an invalid
+			 *  address message. - FM
 			 */
-			if (use_this_url_instead != NULL) {
-			    char *pound;
-
-			    if (!is_url(use_this_url_instead)) {
-				/*
-				 *  The server did not return a complete
-				 *  URL in its Location: header, probably
-				 *  due to a FORM or other CGI script written
-				 *  by someone who doesn't know that the http
-				 *  protocol requires that it be a complete
-				 *  URL, or using a server which does not treat
-				 *  such a redirect string from the script as
-				 *  an instruction to resolve it versus the
-				 *  initial request, check authentication with
-				 *  that URL, and then act on it without
-				 *  returning redirection to us.  We'll
-				 *  violate the http protocol and resolve it
-				 *  ourselves using the URL of the original
-				 *  request as the BASE, rather than doing
-				 *  the RIGHT thing and returning an invalid
-				 *  address message. - FM
-				 */
-				HTUserMsg(LOCATION_NOT_ABSOLUTE);
-				temp = HTParse(use_this_url_instead,
-					       WWWDoc.address,
-					       PARSE_ALL);
-				if (temp && *temp) {
-				    StrAllocCopy(use_this_url_instead, temp);
-				}
-				FREE(temp);
-			    }
-			    url_type = is_url(use_this_url_instead);
-			    if (!HTPermitRedir &&
-			       (url_type == LYNXDOWNLOAD_URL_TYPE ||
-				url_type == LYNXEXEC_URL_TYPE ||
-				url_type == LYNXPROG_URL_TYPE ||
+			HTUserMsg(LOCATION_NOT_ABSOLUTE);
+			temp = HTParse(use_this_url_instead,
+				       WWWDoc.address,
+				       PARSE_ALL);
+			if (temp && *temp) {
+			    StrAllocCopy(use_this_url_instead, temp);
+			}
+			FREE(temp);
+		    }
+		    url_type = is_url(use_this_url_instead);
+		    if (!HTPermitRedir &&
+		       (url_type == LYNXDOWNLOAD_URL_TYPE ||
+			url_type == LYNXEXEC_URL_TYPE ||
+			url_type == LYNXPROG_URL_TYPE ||
 #ifdef DIRED_SUPPORT
-				url_type == LYNXDIRED_URL_TYPE ||
+			url_type == LYNXDIRED_URL_TYPE ||
 #endif /* DIRED_SUPPORT */
-				url_type == LYNXPRINT_URL_TYPE ||
-				url_type == LYNXOPTIONS_URL_TYPE ||
-				url_type == LYNXCFG_URL_TYPE ||
-				url_type == LYNXCOMPILE_OPTS_URL_TYPE ||
-				url_type == LYNXHIST_URL_TYPE ||
-				url_type == LYNXCOOKIE_URL_TYPE ||
-				url_type == LYNXMESSAGES_URL_TYPE ||
-				(LYValidate &&
-				 url_type != HTTP_URL_TYPE &&
-				 url_type != HTTPS_URL_TYPE) ||
-				((no_file_url || no_goto_file) &&
-				 url_type == FILE_URL_TYPE) ||
-				(no_goto_lynxcgi &&
-				 url_type == LYNXCGI_URL_TYPE) ||
+			url_type == LYNXPRINT_URL_TYPE ||
+			url_type == LYNXOPTIONS_URL_TYPE ||
+			url_type == LYNXCFG_URL_TYPE ||
+			url_type == LYNXCOMPILE_OPTS_URL_TYPE ||
+			url_type == LYNXHIST_URL_TYPE ||
+			url_type == LYNXCOOKIE_URL_TYPE ||
+			url_type == LYNXMESSAGES_URL_TYPE ||
+			(LYValidate &&
+			 url_type != HTTP_URL_TYPE &&
+			 url_type != HTTPS_URL_TYPE) ||
+			((no_file_url || no_goto_file) &&
+			 url_type == FILE_URL_TYPE) ||
+			(no_goto_lynxcgi &&
+			 url_type == LYNXCGI_URL_TYPE) ||
 #ifndef DISABLE_BIBP
-				(no_goto_bibp &&
-				 url_type == BIBP_URL_TYPE) ||
+			(no_goto_bibp &&
+			 url_type == BIBP_URL_TYPE) ||
 #endif
-				(no_goto_cso &&
-				 url_type == CSO_URL_TYPE) ||
-				(no_goto_finger &&
-				 url_type == FINGER_URL_TYPE) ||
-				(no_goto_ftp &&
-				 url_type == FTP_URL_TYPE) ||
-				(no_goto_gopher &&
-				 url_type == GOPHER_URL_TYPE) ||
-				(no_goto_http &&
-				 url_type == HTTP_URL_TYPE) ||
-				(no_goto_https &&
-				 url_type == HTTPS_URL_TYPE) ||
-				(no_goto_mailto &&
-				 url_type == MAILTO_URL_TYPE) ||
+			(no_goto_cso &&
+			 url_type == CSO_URL_TYPE) ||
+			(no_goto_finger &&
+			 url_type == FINGER_URL_TYPE) ||
+			(no_goto_ftp &&
+			 (url_type == FTP_URL_TYPE ||
+			  url_type == NCFTP_URL_TYPE)) ||
+			(no_goto_gopher &&
+			 url_type == GOPHER_URL_TYPE) ||
+			(no_goto_http &&
+			 url_type == HTTP_URL_TYPE) ||
+			(no_goto_https &&
+			 url_type == HTTPS_URL_TYPE) ||
+			(no_goto_mailto &&
+			 url_type == MAILTO_URL_TYPE) ||
 #ifndef DISABLE_NEWS
-				(no_goto_news &&
-				 url_type == NEWS_URL_TYPE) ||
-				(no_goto_nntp &&
-				 url_type == NNTP_URL_TYPE) ||
+			(no_goto_news &&
+			 url_type == NEWS_URL_TYPE) ||
+			(no_goto_nntp &&
+			 url_type == NNTP_URL_TYPE) ||
 #endif
-				(no_goto_rlogin &&
-				 url_type == RLOGIN_URL_TYPE) ||
+			(no_goto_rlogin &&
+			 url_type == RLOGIN_URL_TYPE) ||
 #ifndef DISABLE_NEWS
-				(no_goto_snews &&
-				 url_type == SNEWS_URL_TYPE) ||
+			(no_goto_snews &&
+			 url_type == SNEWS_URL_TYPE) ||
 #endif
-				(no_goto_telnet &&
-				 url_type == TELNET_URL_TYPE) ||
-				(no_goto_tn3270 &&
-				 url_type == TN3270_URL_TYPE) ||
-				(no_goto_wais &&
-				 url_type == WAIS_URL_TYPE))) {
-				/*
-				 *  Some schemes are not acceptable from
-				 *  server redirections. - KW & FM
-				 */
-				HTAlert(ILLEGAL_REDIRECTION_URL);
-				if (LYCursesON) {
-				    _user_message(WWW_ILLEGAL_URL_MESSAGE,
-						  use_this_url_instead);
-				    LYSleepAlert();
-				} else {
-				    fprintf(stderr,
-					    WWW_ILLEGAL_URL_MESSAGE,
-					    use_this_url_instead);
-				}
-				FREE(use_this_url_instead);
-				return(NULLFILE);
-			    }
-			    if ((pound = strchr(doc->address, '#')) != NULL &&
-				strchr(use_this_url_instead, '#') == NULL) {
-				/*
-				 *  Our requested URL had a fragment
-				 *  associated with it, and the redirection
-				 *  URL doesn't, so we'll append the fragment
-				 *  associated with the original request.  If
-				 *  it's bogus for the redirection URL, we'll
-				 *  be positioned at the top of that document,
-				 *  so there's no harm done. - FM
-				 */
-				CTRACE((tfp,
-			"getfile: Adding fragment '%s' to redirection URL.\n",
-				    pound));
-				StrAllocCat(use_this_url_instead, pound);
-			    }
-			    CTRACE_SLEEP(MessageSecs);
-			    _user_message(WWW_USING_MESSAGE,
-					  use_this_url_instead);
-			    LYSleepInfo();
-			    CTRACE((tfp, "\n"));
-			    StrAllocCopy(doc->address,
-					use_this_url_instead);
-			    FREE(use_this_url_instead);
-			    if (redirect_post_content == FALSE) {
-				/*
-				 *  Freeing the content also yields
-				 *  a GET request. - FM
-				 */
-				FREE(doc->post_data);
-				FREE(doc->post_content_type);
-			    }
-			    /*
-			     *	Go to top to check for URL's which get
-			     *	special handling and/or security checks
-			     *	in Lynx. - FM
-			     */
-			    goto Try_Redirected_URL;
+			(no_goto_telnet &&
+			 url_type == TELNET_URL_TYPE) ||
+			(no_goto_tn3270 &&
+			 url_type == TN3270_URL_TYPE) ||
+			(no_goto_wais &&
+			 url_type == WAIS_URL_TYPE))) {
+			/*
+			 *  Some schemes are not acceptable from
+			 *  server redirections. - KW & FM
+			 */
+			HTAlert(ILLEGAL_REDIRECTION_URL);
+			if (LYCursesON) {
+			    HTUserMsg2(WWW_ILLEGAL_URL_MESSAGE,
+				       use_this_url_instead);
+			} else {
+			    fprintf(stderr,
+				    WWW_ILLEGAL_URL_MESSAGE,
+				    use_this_url_instead);
 			}
-			if (HTNoDataOK)
-			    return(NULLFILE);
-			return(NOT_FOUND);
+			FREE(use_this_url_instead);
+			return(NULLFILE);
 		    }
+		    if ((pound = findPoundSelector(doc->address)) != NULL
+		     && findPoundSelector(use_this_url_instead) == NULL) {
+			/*
+			 *  Our requested URL had a fragment
+			 *  associated with it, and the redirection
+			 *  URL doesn't, so we'll append the fragment
+			 *  associated with the original request.  If
+			 *  it's bogus for the redirection URL, we'll
+			 *  be positioned at the top of that document,
+			 *  so there's no harm done. - FM
+			 */
+			CTRACE((tfp,
+		"getfile: Adding fragment '%s' to redirection URL.\n",
+			    pound));
+			StrAllocCat(use_this_url_instead, pound);
+		    }
+		    CTRACE_SLEEP(MessageSecs);
+		    HTUserMsg2(WWW_USING_MESSAGE, use_this_url_instead);
+		    CTRACE((tfp, "\n"));
+		    StrAllocCopy(doc->address,
+				use_this_url_instead);
+		    FREE(use_this_url_instead);
+		    if (redirect_post_content == FALSE) {
+			/*
+			 *  Freeing the content also yields
+			 *  a GET request. - FM
+			 */
+			LYFreePostData(doc);
+		    }
+		    /*
+		     *	Go to top to check for URL's which get
+		     *	special handling and/or security checks
+		     *	in Lynx. - FM
+		     */
+		    goto Try_Redirected_URL;
+		}
+		if (HTNoDataOK) {
+		    return(NULLFILE);
+		}
+		return(NOT_FOUND);
+	    }
 
-		    lynx_mode = NORMAL_LYNX_MODE;
+	    lynx_mode = NORMAL_LYNX_MODE;
+
+	    /*
+	     *	Some URL's don't actually return a document;
+	     *	compare doc->address with the document that is
+	     *	actually loaded and return NULLFILE if not
+	     *	loaded.  If www_search_result is not -1
+	     *	then this is a reference to a named anchor
+	     *	within the same document; do NOT return
+	     *	NULLFILE in that case.
+	     */
+	    {
+		char *pound;
+		/*
+		 *  Check for a #fragment selector.
+		 */
+		pound = findPoundSelector(doc->address);
+
+		/*
+		 *  Check to see if there is a temp
+		 *  file waiting for us to download.
+		 */
+		if (WWW_Download_File) {
+		    HTParentAnchor *tmpanchor = HTAnchor_findAddress(&WWWDoc);
+		    char *fname = NULL;
 
 		    /*
-		     *	Some URL's don't actually return a document;
-		     *	compare doc->address with the document that is
-		     *	actually loaded and return NULLFILE if not
-		     *	loaded.  If www_search_result is not -1
-		     *	then this is a reference to a named anchor
-		     *	within the same document; do NOT return
-		     *	NULLFILE in that case.
+		     *	Check for a suggested filename from
+		     *	the Content-Disposition header. - FM
 		     */
-		    {
-			char *pound;
-			/*
-			 *  Check for a #fragment selector.
-			 */
-			pound = (char *)strchr(doc->address, '#');
+		    if (HTAnchor_SugFname(tmpanchor) != NULL) {
+			StrAllocCopy(fname, HTAnchor_SugFname(tmpanchor));
+		    } else {
+			StrAllocCopy(fname, doc->address);
+		    }
+		    /*
+		     *	Check whether this is a compressed file,
+		     *	which we don't uncompress for downloads,
+		     *	and adjust any suffix appropriately. - FM
+		     */
+		    HTCheckFnameForCompression(&fname, tmpanchor, FALSE);
 
-			/*
-			 *  Check to see if there is a temp
-			 *  file waiting for us to download.
-			 */
-			if (WWW_Download_File) {
-			    HTParentAnchor *tmpanchor;
-			    char *fname = NULL;
-
-			    /*
-			     *	Check for a suggested filename from
-			     *	the Content-Disposition header. - FM
-			     */
-			    if (((tmpanchor = HTAnchor_parent(
-						HTAnchor_findAddress(&WWWDoc)
-							     )) != NULL) &&
-				HTAnchor_SugFname(tmpanchor) != NULL) {
-				StrAllocCopy(fname,
-					     HTAnchor_SugFname(tmpanchor));
-			    } else {
-				StrAllocCopy(fname, doc->address);
-			    }
-			    /*
-			     *	Check whether this is a compressed file,
-			     *	which we don't uncompress for downloads,
-			     *	and adjust any suffix appropriately. - FM
-			     */
-			    if (tmpanchor != NULL) {
-				HTCheckFnameForCompression(&fname, tmpanchor,
-							   FALSE);
-			    }
-			    if (LYdownload_options(&fname,
-						   WWW_Download_File) < 0) {
-				FREE(fname);
-				return(NOT_FOUND);
-			    }
-			    LYAddVisitedLink(doc);
-			    StrAllocCopy(doc->address, fname);
-			    FREE(fname);
-			    doc->internal_link = FALSE;
-			    WWWDoc.address = doc->address;
-			    FREE(doc->post_data);
-			    WWWDoc.post_data = NULL;
-			    FREE(doc->post_content_type);
-			    WWWDoc.post_content_type = NULL;
-			    WWWDoc.bookmark = doc->bookmark = FALSE;
-			    WWWDoc.isHEAD = doc->isHEAD = FALSE;
-			    WWWDoc.safe = doc->safe = FALSE;
-			    HTOutputFormat = WWW_PRESENT;
-			    if (!HTLoadAbsolute(&WWWDoc))
-				return(NOT_FOUND);
-			    else
-				return(NORMAL);
-
-			} else if (pound == NULL &&
-				   /*
-				    *  HTAnchor hash-table searches are now
-				    *  case-sensitive (hopefully, without
-				    *  anchor deletion problems), so this
-				    *  is too. - FM
-				    */
-				   (strcmp(doc->address,
-					   HTLoadedDocumentURL()) ||
-				   /*
-				    *  Also check the post_data elements. - FM
-				    */
-				   strcmp((doc->post_data ?
-					   doc->post_data : ""),
-					  HTLoadedDocumentPost_data()) ||
-				   /*
-				    *  Also check the isHEAD element. - FM
-				    */
-				   doc->isHEAD != HTLoadedDocumentIsHEAD())) {
-			    /*
-			     *	Nothing needed to be shown.
-			     */
-			    LYAddVisitedLink(doc);
-			    return(NULLFILE);
+		    if (LYdownload_options(&fname,
+					   WWW_Download_File) < 0) {
+			FREE(fname);
+			return(NOT_FOUND);
+		    }
+		    LYAddVisitedLink(doc);
+		    StrAllocCopy(doc->address, fname);
+		    FREE(fname);
+		    doc->internal_link = FALSE;
+		    WWWDoc.address = doc->address;
+		    LYFreePostData(doc);
+		    WWWDoc.post_data = NULL;
+		    WWWDoc.post_content_type = NULL;
+		    WWWDoc.bookmark = doc->bookmark = FALSE;
+		    WWWDoc.isHEAD = doc->isHEAD = FALSE;
+		    WWWDoc.safe = doc->safe = FALSE;
+		    HTOutputFormat = WWW_PRESENT;
+		    if (!HTLoadAbsolute(&WWWDoc)) {
+			return(NOT_FOUND);
+		    } else {
+			return(NORMAL);
+		    }
 
-			} else {
-			    if (pound != NULL) {
-				if (!HTMainText) /* this should not happen... */
-				    return(NULLFILE); /* but it can. - kw */
-				/*
-				 *  May set www_search_result.
-				 */
-				HTFindPoundSelector(pound+1);
-			    }
-			    return(NORMAL);
+		} else if (pound == NULL &&
+			   /*
+			    *  HTAnchor hash-table searches are now
+			    *  case-sensitive (hopefully, without
+			    *  anchor deletion problems), so this
+			    *  is too. - FM
+			    */
+			   (strcmp(doc->address,
+				   HTLoadedDocumentURL()) ||
+			   /*
+			    *  Also check the post_data elements. - FM
+			    */
+			   !BINEQ(doc->post_data,
+				  HTLoadedDocumentPost_data()) ||
+			   /*
+			    *  Also check the isHEAD element. - FM
+			    */
+			   doc->isHEAD != HTLoadedDocumentIsHEAD())) {
+		    /*
+		     *	Nothing needed to be shown.
+		     */
+		    LYAddVisitedLink(doc);
+		    return(NULLFILE);
+
+		} else {
+		    if (pound != NULL) {
+			if (!HTMainText) { /* this should not happen... */
+			    return(NULLFILE); /* but it can. - kw */
 			}
+			/*
+			 *  May set www_search_result.
+			 */
+			HTFindPoundSelector(pound+1);
 		    }
+		    return(NORMAL);
 		}
-	  } else {
-	      CTRACE_SLEEP(MessageSecs);
-	      HTUserMsg2(WWW_BAD_ADDR_MESSAGE, doc->address);
-	      CTRACE((tfp,"\n"));
-	      return(NULLFILE);
-	  }
+	    }
+	}
+    } else {
+	CTRACE_SLEEP(MessageSecs);
+	HTUserMsg2(WWW_BAD_ADDR_MESSAGE, doc->address);
+	CTRACE((tfp,"\n"));
+	return(NULLFILE);
+    }
 }
 
 /*
@@ -1159,7 +1145,7 @@ PUBLIC void srcmode_for_next_retrieval ARGS1(
 PUBLIC int follow_link_number ARGS4(
 	int,		c,
 	int,		cur,
-	document *,	doc,
+	DocInfo *,	doc,
 	int *,		num)
 {
     char temp[120];
@@ -1246,6 +1232,8 @@ PUBLIC int follow_link_number ARGS4(
     */
    if (*num > 0) {
 	int info;
+	char *text = NULL;
+
 	/*
 	 *  Get the lname, and hightext, directly from www
 	 *  structures and add it to the cur link so that
@@ -1256,12 +1244,15 @@ PUBLIC int follow_link_number ARGS4(
 	 *  in the current document, whether it is displayed
 	 *  on the screen or not!
 	 */
-	if ((info = HTGetLinkInfo(*num,
-				  want_go,
-				  &new_top,
-				  &new_link,
-				  &links[cur].hightext,
-			  &links[cur].lname)) == WWW_INTERN_LINK_TYPE) {
+	info = HTGetLinkInfo(*num,
+			     want_go,
+			     &new_top,
+			     &new_link,
+			     &text,
+			     &links[cur].lname);
+	if (text != NULL)
+	    LYSetHilite(cur, text);
+	if (info == WWW_INTERN_LINK_TYPE) {
 	    links[cur].type = WWW_INTERN_LINK_TYPE;
 	    return(DO_LINK_STUFF);
 	} else if (info == LINK_LINE_FOUND) {
@@ -1506,7 +1497,7 @@ check_tp_for_entry:
 #endif /* EXEC_LINKS || LYNXCGI_LINKS */
 
 PRIVATE int fix_httplike_urls ARGS2(
-	document *,	doc,
+	DocInfo *,	doc,
 	UrlTypes,	type)
 {
     char *slash;
@@ -1515,7 +1506,7 @@ PRIVATE int fix_httplike_urls ARGS2(
      *  If there's a fragment present, our simplistic methods won't
      *  work.  - kw
      */
-    if (strchr(doc->address, '#'))
+    if (findPoundSelector(doc->address) != NULL)
 	return 0;
 
 #ifndef DISABLE_FTP
@@ -1541,8 +1532,8 @@ PRIVATE int fix_httplike_urls ARGS2(
 	/*
 	 *  If we're proxying ftp, don't trim anything. - KW
 	 */
-	if (((proxy = (char *)getenv("ftp_proxy")) != NULL) &&
-	    *proxy != '\0' && !override_proxy(doc->address))
+	if (((proxy = LYGetEnv("ftp_proxy")) != NULL) &&
+	    !override_proxy(doc->address))
 	    return 0;
 
 	/*
@@ -1552,6 +1543,20 @@ PRIVATE int fix_httplike_urls ARGS2(
 	LYTrimHtmlSep(doc->address);
 	CTRACE((tfp, "            changed to '%s'\n", doc->address));
 	CTRACE_SLEEP(MessageSecs);
+    } else if (type == NCFTP_URL_TYPE) {
+	char *path = NULL;
+	char *first = doc->address;
+	char *second = strchr(first, ':');
+
+	CTRACE((tfp, "fix_httplike_urls: URL '%s'\n", doc->address));
+
+	*second++ = '\0';
+	HTSprintf0(&path, "%s//%s%s", STR_FTP_URL, first, second);
+	FREE(doc->address);
+	doc->address = path;
+
+	CTRACE((tfp, "            changed to '%s'\n", doc->address));
+	CTRACE_SLEEP(MessageSecs);
     }
 #endif /* DISABLE_FTP */
 
@@ -1564,13 +1569,13 @@ PRIVATE int fix_httplike_urls ARGS2(
 	}
 	if (type == HTTP_URL_TYPE ||
 	    type == HTTPS_URL_TYPE) {
-	    if ((slash-2) - strchr(doc->address, ':')) {
-	    /*
-	     *  Turns out we were not looking at the right slash after all,
-	     *  there must have been more than one "://" which is valid
-	     *  at least for http URLs (later occurrences can be part of
-	     *  a query string, for example), so leave this alone, too. - kw
-	     */
+	    if ((slash-2) != strchr(doc->address, ':')) {
+		/*
+		 *  Turns out we were not looking at the right slash after all,
+		 *  there must have been more than one "://" which is valid
+		 *  at least for http URLs (later occurrences can be part of
+		 *  a query string, for example), so leave this alone, too. - kw
+		 */
 		return(0);
 	    }
 	    if (strchr(doc->address, '?')) {
diff --git a/gnu/usr.bin/lynx/src/LYGetFile.h b/gnu/usr.bin/lynx/src/LYGetFile.h
index 4acd0c4a515..7dbc7b5b111 100644
--- a/gnu/usr.bin/lynx/src/LYGetFile.h
+++ b/gnu/usr.bin/lynx/src/LYGetFile.h
@@ -7,12 +7,12 @@
 #define NORMAL 1
 #define NULLFILE 3
 
-extern int getfile PARAMS((document *doc));
+extern int getfile PARAMS((DocInfo *doc));
 extern void srcmode_for_next_retrieval PARAMS((int));
 extern int follow_link_number PARAMS((
 	int		c,
 	int		cur,
-	document *	doc,
+	DocInfo *	doc,
 	int *		num));
 extern void add_trusted PARAMS((char *str, int type));
 extern BOOLEAN exec_ok PARAMS((CONST char *source, CONST char *linkpath, int type));
diff --git a/gnu/usr.bin/lynx/src/LYGlobalDefs.h b/gnu/usr.bin/lynx/src/LYGlobalDefs.h
index f5377472040..e8cdcb5bed1 100644
--- a/gnu/usr.bin/lynx/src/LYGlobalDefs.h
+++ b/gnu/usr.bin/lynx/src/LYGlobalDefs.h
@@ -34,7 +34,7 @@
 #define VISITED_LINKS_HELP	"keystrokes/visited_help.html"
 #endif /* LYHELP_H */
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 #include <HTChunk.h>
 #endif
 
@@ -42,6 +42,7 @@
 
 #ifdef SOCKS
 extern BOOLEAN socks_flag;
+extern unsigned long socks_bind_remoteAddr;
 #endif /* SOCKS */
 
 #ifdef IGNORE_CTRL_C
@@ -57,24 +58,39 @@ extern BOOLEAN UseFixedRecords; /* convert binary files to FIXED 512 records */
 extern char *list_format;
 #endif /* !VMS */
 
-#ifdef VMS
-extern char *LYCSwingPath;
-#endif /* VMS */
-
 #ifdef DIRED_SUPPORT
+
+typedef enum {
+    DIRS_FIRST = 0
+    , FILES_FIRST
+    , MIXED_STYLE
+} enumDirListStyle;
+
+typedef enum {
+    ORDER_BY_NAME
+    , ORDER_BY_SIZE
+    , ORDER_BY_DATE
+    , ORDER_BY_MODE
+    , ORDER_BY_TYPE
+    , ORDER_BY_USER
+    , ORDER_BY_GROUP
+} enumDirListOrder;
+
 extern BOOLEAN lynx_edit_mode;
 extern BOOLEAN no_dired_support;
-extern int dir_list_style;
 extern HTList *tagged;
-#define FILES_FIRST 1
-#define MIXED_STYLE 2
+extern int LYAutoUncacheDirLists;
+extern int dir_list_style;	/* enumDirListStyle */
+extern int dir_list_order;	/* enumDirListOrder */
+
 #ifdef OK_OVERRIDE
 extern BOOLEAN prev_lynx_edit_mode;
 #endif /* OK_OVERRIDE */
+
 #ifdef OK_PERMIT
 extern BOOLEAN no_change_exec_perms;
 #endif /* OK_PERMIT */
-extern int LYAutoUncacheDirLists;
+
 #endif /* DIRED_SUPPORT */
 
 extern int HTCacheSize;  /* the number of documents cached in memory */
@@ -96,6 +112,15 @@ extern char *LYCgiDocumentRoot;  /* DOCUMENT_ROOT in the lynxcgi env */
 #define NUMBERS_AS_ARROWS 0
 #define LINKS_ARE_NUMBERED 1
 #define LINKS_AND_FIELDS_ARE_NUMBERED 2
+#define FIELDS_ARE_NUMBERED 3
+
+#define links_are_numbered() \
+	    (keypad_mode == LINKS_ARE_NUMBERED || \
+	     keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED)
+
+#define fields_are_numbered() \
+	    (keypad_mode == FIELDS_ARE_NUMBERED || \
+	     keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED)
 
 #define HIDDENLINKS_MERGE	0
 #define HIDDENLINKS_SEPARATE	1
@@ -116,8 +141,8 @@ extern char star_string[MAX_LINE + 1]; /* from GridText.c */
  ((n) >= MAX_LINE ? star_string : &star_string[(MAX_LINE-1)] - (n))
 
 typedef enum {
-    SHOW_COLOR_UNKNOWN = 0
-    , SHOW_COLOR_NEVER
+    SHOW_COLOR_UNKNOWN = -1
+    , SHOW_COLOR_NEVER = 0	/* positive numbers are index in LYOptions.c */
     , SHOW_COLOR_OFF
     , SHOW_COLOR_ON
     , SHOW_COLOR_ALWAYS
@@ -142,13 +167,13 @@ typedef enum {
     rateOFF = 0
     , rateBYTES = 1
     , rateKB
-#ifdef EXP_READPROGRESS
+#ifdef USE_READPROGRESS
     , rateEtaBYTES
     , rateEtaKB
 #endif
 } TransferRate;
 
-#ifdef EXP_READPROGRESS
+#ifdef USE_READPROGRESS
 #  define rateEtaKB_maybe	rateEtaKB
 #else
 #  define rateEtaKB_maybe	rateKB
@@ -159,8 +184,10 @@ extern BOOLEAN LYJumpFileURL;   /* URL from the jump file shortcuts? */
 extern BOOLEAN LYNewsPosting;	/* News posting supported if TRUE */
 extern BOOLEAN LYShowCursor;	/* Show the cursor or hide it?	    */
 extern BOOLEAN LYShowTransferRate;
+extern BOOLEAN LYUnderlineLinks; /* Show the links underlined vs bold */
 extern BOOLEAN LYUseDefShoCur;	/* Command line -show_cursor toggle */
 extern BOOLEAN LYUserSpecifiedURL;  /* URL from a goto or document? */
+extern BOOLEAN LYfind_leaks;
 extern BOOLEAN LYforce_HTML_mode;
 extern BOOLEAN LYforce_no_cache;
 extern BOOLEAN LYinternal_flag; /* don't need fresh copy, was internal link */
@@ -187,6 +214,8 @@ extern BOOLEAN long_url_ok;
 extern BOOLEAN lynx_mode;
 extern BOOLEAN more;		/* is there more document to display? */
 extern BOOLEAN news_ok;
+extern BOOLEAN number_fields_on_left;
+extern BOOLEAN number_links_on_left;
 extern BOOLEAN recent_sizechange;
 extern BOOLEAN rlogin_ok;
 extern BOOLEAN system_editor;	  /* True if locked-down editor */
@@ -195,6 +224,7 @@ extern BOOLEAN verbose_img;	/* display filenames of images?     */
 extern BOOLEAN vi_keys;		/* TRUE to turn on vi-like key movement */
 extern char *LYRequestReferer;	/* Referer, may be set in getfile() */
 extern char *LYRequestTitle;	/* newdoc.title in calls to getfile() */
+extern char *LYTransferName;	/* abbreviation for Kilobytes */
 extern char *LynxHome;
 extern char *LynxSigFile;	/* Signature file, in or off home */
 extern char *checked_box;	/* form boxes */
@@ -309,7 +339,7 @@ extern BOOLEAN historical_comments;
 extern BOOLEAN minimal_comments;
 extern BOOLEAN soft_dquotes;
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 extern BOOLEAN source_cache_file_error;
 extern int LYCacheSource;
 #define SOURCE_CACHE_NONE	0
@@ -355,9 +385,13 @@ extern BOOLEAN more_links;
 extern int     ccount;
 extern BOOLEAN LYCancelledFetch;
 extern char * LYToolbarName;
+
+extern int AlertSecs;
 extern int InfoSecs;
 extern int MessageSecs;
-extern int AlertSecs;
+extern int DebugSecs;
+extern int ReplaySecs;
+
 extern char * LYUserAgent;		/* Lynx User-Agent header */
 extern char * LYUserAgentDefault;	/* Lynx default User-Agent header */
 extern BOOLEAN LYNoRefererHeader;	/* Never send Referer header? */
@@ -406,11 +440,11 @@ extern BOOLEAN BibP_bibhost_checked;    /* bibhost has been checked      */
 extern BOOLEAN BibP_bibhost_available;  /* bibhost is responding         */
 #endif
 
-#ifdef EXP_PERSISTENT_COOKIES
+#ifdef USE_PERSISTENT_COOKIES
 extern BOOLEAN persistent_cookies;
 extern char *LYCookieFile;              /* cookie read file              */
 extern char *LYCookieSaveFile;          /* cookie save file              */
-#endif /* EXP_PERSISTENT_COOKIES */
+#endif /* USE_PERSISTENT_COOKIES */
 
 extern char *XLoadImageCommand;		/* Default image viewer for X	 */
 
@@ -424,10 +458,14 @@ extern int LYHiddenLinks;
 extern int Old_DTD;
 
 #define MBM_V_MAXFILES  25		/* Max number of sub-bookmark files */
+
 /*
  *  Arrays that holds the names of sub-bookmark files
  *  and their descriptions.
  */
+extern char *MBM_A_subbookmark[MBM_V_MAXFILES+1];
+extern char *MBM_A_subdescript[MBM_V_MAXFILES+1];
+
 extern BOOLEAN LYForceSSLCookiesSecure;
 extern BOOLEAN LYNoCc;
 extern BOOLEAN LYNonRestartingSIGWINCH;
@@ -441,8 +479,18 @@ extern BOOLEAN LYSeekFragMAPinCur;
 extern BOOLEAN LYStripDotDotURLs;	/* Try to fix ../ in some URLs?  */
 extern BOOLEAN LYUseBuiltinSuffixes;
 extern BOOLEAN dont_wrap_pre;
-extern char *MBM_A_subbookmark[MBM_V_MAXFILES+1];
-extern char *MBM_A_subdescript[MBM_V_MAXFILES+1];
+
+extern int cookie_noprompt;
+
+typedef enum {
+    FORCE_PROMPT_DFT		/* force a prompt, use the result */
+    ,FORCE_PROMPT_YES		/* assume "yes" where a prompt would be used */
+    ,FORCE_PROMPT_NO		/* assume "no" where a prompt would be used */
+} FORCE_PROMPT;
+
+#ifdef USE_SSL
+extern int ssl_noprompt;
+#endif
 
 #ifdef MISC_EXP
 extern int LYNoZapKey;  /* 0: off (do 'z' checking), 1: full, 2: initially */
@@ -453,10 +501,19 @@ extern BOOL ok_justify;
 extern int justify_max_void_percent;
 #endif
 
+#ifdef EXP_LOCALE_CHARSET
+extern BOOLEAN LYLocaleCharset;
+#endif
+
 #ifndef NO_DUMP_WITH_BACKSPACES
 extern BOOLEAN with_backspaces;
 #endif
 
+#if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
+extern int scrsize_x;
+extern int scrsize_y;
+#endif
+
 #ifndef NO_LYNX_TRACE
 extern FILE *LYTraceLogFP;		/* Pointer for TRACE log	 */
 extern char *LYTraceLogPath;		/* Path for TRACE log		 */
@@ -484,9 +541,18 @@ extern BOOLEAN LYNoCore;
 extern BOOLEAN restore_sigpipe_for_children;
 #endif /* !VMS */
 
+#if defined(USE_COLOR_STYLE)
+extern char *lynx_lss_file;
+#endif
+
 extern int HTNoDataOK;		/* HT_NO_DATA-is-ok hack */
 extern BOOLEAN FileInitAlreadyDone;
 
+#ifdef __DJGPP__
+extern BOOLEAN watt_debug;
+extern BOOLEAN dj_is_bash;
+#endif /* __DJGPP__ */
+
 #ifdef WIN_EX
 /* LYMain.c */
 extern BOOLEAN focus_window;
@@ -497,11 +563,9 @@ extern int lynx_timeout;
 
 #ifdef SH_EX
 extern BOOLEAN show_cfg;
-#ifdef WIN_EX
-extern int     debug_delay;
 #endif
+
 extern BOOLEAN no_table_center;
-#endif
 
 #if USE_BLAT_MAILER
 extern BOOLEAN mail_is_blat;
@@ -525,7 +589,7 @@ extern int setmode(int handle, int amode);
 
 #ifdef USE_SCROLLBAR
 /* GridText.c */
-extern BOOLEAN LYsb;
+extern BOOLEAN LYShowScrollbar;
 extern BOOLEAN LYsb_arrow;
 extern int LYsb_begin;
 extern int LYsb_end;
diff --git a/gnu/usr.bin/lynx/src/LYHash.c b/gnu/usr.bin/lynx/src/LYHash.c
index 13d2e6a152c..93bc93f3dbb 100644
--- a/gnu/usr.bin/lynx/src/LYHash.c
+++ b/gnu/usr.bin/lynx/src/LYHash.c
@@ -30,7 +30,7 @@ PUBLIC int hash_code_lowercase_on_fly ARGS1 (CONST char*, string)
     CONST char *p;
 
     for (p = string, hash = 0; *p; p++)
-	hash = HASH_OF(hash,tolower(*p));
+	hash = HASH_OF(hash, TOLOWER(*p));
 
     return hash;
 }
@@ -46,7 +46,7 @@ PUBLIC int hash_code_aggregate_lower_str ARGS2 (CONST char*, string,int,hash_was
     CONST char *p;
 
     for (p = string, hash = hash_was ; *p; p++)
-	hash = HASH_OF(hash,tolower(*p));
+	hash = HASH_OF(hash, TOLOWER(*p));
 
     return hash;
 }
diff --git a/gnu/usr.bin/lynx/src/LYHash.h b/gnu/usr.bin/lynx/src/LYHash.h
index 80ecbece76d..ebeabf41ce4 100644
--- a/gnu/usr.bin/lynx/src/LYHash.h
+++ b/gnu/usr.bin/lynx/src/LYHash.h
@@ -5,6 +5,9 @@
 #include <HTUtils.h>
 #endif
 
+#define OMIT_SCN_KEEPING 0 /* whether to omit keeping of Style_className
+    in HTML.c when lss support is on. 1 to increase performance. */
+
 struct _hashbucket {
 	char *name; /* name of this item */
 	int	code; /* code of this item */
@@ -24,8 +27,6 @@ typedef struct _hashbucket bucket;
 
 extern bucket hashStyles[CSHASHSIZE];
 extern int hash_code PARAMS((CONST char* string));
-extern bucket special_bucket;/*it's used when OMIT_SCN_KEEPING is 1 in HTML.c
-    and LYCurses.c. */
 extern bucket nostyle_bucket;/*initialized properly - to be used in CTRACE when
             NOSTYLE is passed as 'style' to curses_w_style */
 
@@ -42,6 +43,13 @@ extern int	s_alert;
 extern int	s_alink;
 extern int	s_curedit;
 extern int	s_forw_backw;
+extern int	s_hot_paste;
+extern int	s_menu_active;
+extern int	s_menu_bg;
+extern int	s_menu_entry;
+extern int	s_menu_frame;
+extern int	s_menu_number;
+extern int	s_menu_sb;
 extern int	s_normal;
 extern int	s_prompt_edit;
 extern int	s_prompt_edit_arr;
@@ -50,12 +58,6 @@ extern int	s_prompt_sel;
 extern int	s_status;
 extern int	s_title;
 extern int	s_whereis;
-extern int	s_menu_frame;
-extern int	s_menu_bg;
-extern int	s_menu_number;
-extern int	s_menu_entry;
-extern int	s_menu_active;
-extern int	s_menu_sb;
 
 #ifdef USE_SCROLLBAR
 extern int	s_sb_aa;
@@ -64,6 +66,10 @@ extern int	s_sb_bg;
 extern int	s_sb_naa;
 #endif
 
+#if OMIT_SCN_KEEPING
+extern bucket special_bucket;
+#endif
+
 #define CACHEW 128
 #define CACHEH 64
 
diff --git a/gnu/usr.bin/lynx/src/LYHistory.c b/gnu/usr.bin/lynx/src/LYHistory.c
index b012e230387..6713e777259 100644
--- a/gnu/usr.bin/lynx/src/LYHistory.c
+++ b/gnu/usr.bin/lynx/src/LYHistory.c
@@ -15,6 +15,7 @@
 #include <LYStrings.h>
 #include <LYCharUtils.h>
 #include <LYCharSets.h>
+#include <LYrcFile.h>
 #ifdef DISP_PARTIAL
 #include <LYMainLoop.h>
 #endif
@@ -41,6 +42,11 @@ PRIVATE VisitedLink *Last_by_first;
 int nhist_extra;
 
 #ifdef LY_FIND_LEAKS
+PRIVATE int already_registered_free_messages_stack = 0;
+PRIVATE int already_registered_clean_all_history = 0;
+#endif
+
+#ifdef LY_FIND_LEAKS
 /*
  *  Utility for freeing the list of visited links. - FM
  */
@@ -87,7 +93,7 @@ PRIVATE void trace_history ARGS1(
  *  links the most current in the list. - FM
  */
 PUBLIC void LYAddVisitedLink ARGS1(
-	document *,	doc)
+	DocInfo *,	doc)
 {
     VisitedLink *new;
     HTList *cur;
@@ -111,7 +117,7 @@ PUBLIC void LYAddVisitedLink ARGS1(
 	if (	LYIsUIPage(doc->address, UIP_HISTORY) ||
 		LYIsUIPage(doc->address, UIP_VLINKS) ||
 		LYIsUIPage(doc->address, UIP_SHOWINFO) ||
-		!strncmp(doc->address, "LYNXMESSAGES:", 13) ||
+		isLYNXMESSAGES(doc->address) ||
 			(related = 0)	||
 #ifdef DIRED_SUPPORT
 		LYIsUIPage(doc->address, UIP_DIRED_MENU) ||
@@ -121,14 +127,14 @@ PUBLIC void LYAddVisitedLink ARGS1(
 		LYIsUIPage(doc->address, UIP_PRINT_OPTIONS) ||
 		LYIsUIPage(doc->address, UIP_DOWNLOAD_OPTIONS) ||
 		LYIsUIPage(doc->address, UIP_OPTIONS_MENU) ||
-		!strncmp(doc->address, "LYNXKEYMAP:", 11) ||
+		isLYNXKEYMAP(doc->address) ||
 		LYIsUIPage(doc->address, UIP_LIST_PAGE) ||
 #ifdef EXP_ADDRLIST_PAGE
 		LYIsUIPage(doc->address, UIP_ADDRLIST_PAGE) ||
 #endif
 		LYIsUIPage(doc->address, UIP_CONFIG_DEF) ||
 		LYIsUIPage(doc->address, UIP_LYNXCFG) ||
-		!strncmp(doc->address, "LYNXCOOKIE:", 11) ||
+		isLYNXCOOKIE(doc->address) ||
 		LYIsUIPage(doc->address, UIP_TRACELOG)	) {
 	    if (!related)
 		PrevVisitedLink = NULL;
@@ -150,8 +156,8 @@ PUBLIC void LYAddVisitedLink ARGS1(
 
     cur = Visited_Links;
     while (NULL != (new = (VisitedLink *)HTList_nextObject(cur))) {
-	if (!strcmp((new->address ? new->address : ""),
-		    (doc->address ? doc->address : ""))) {
+	if (!strcmp(NonNull(new->address),
+		    NonNull(doc->address))) {
 	    PrevVisitedLink = PrevActiveVisitedLink = new;
 	    /* Already visited.  Update the last-visited info. */
 	    if (new->next_latest == &Latest_last)	/* optimization */
@@ -249,7 +255,6 @@ PUBLIC BOOLEAN LYwouldPush ARGS2(
 	rc = (BOOLEAN)
 		! (LYIsUIPage(docurl, UIP_HISTORY)
 		|| LYIsUIPage(docurl, UIP_PRINT_OPTIONS)
-		|| LYIsUIPage(docurl, UIP_DOWNLOAD_OPTIONS)
 #ifdef DIRED_SUPPORT
 		|| LYIsUIPage(docurl, UIP_DIRED_MENU)
 		|| LYIsUIPage(docurl, UIP_UPLOAD_OPTIONS)
@@ -260,7 +265,6 @@ PUBLIC BOOLEAN LYwouldPush ARGS2(
 	rc = (BOOLEAN)
 		! (!strcmp(title, HISTORY_PAGE_TITLE)
 		|| !strcmp(title, PRINT_OPTIONS_TITLE)
-		|| !strcmp(title, DOWNLOAD_OPTIONS_TITLE)
 #ifdef DIRED_SUPPORT
 		|| !strcmp(title, DIRED_MENU_TITLE)
 		|| !strcmp(title, UPLOAD_OPTIONS_TITLE)
@@ -272,42 +276,75 @@ PUBLIC BOOLEAN LYwouldPush ARGS2(
 }
 
 /*
+ * Free post-data for 'DocInfo'
+ */
+PUBLIC void LYFreePostData ARGS1(
+    DocInfo *,		doc)
+{
+    BStrFree(doc->post_data);
+    FREE(doc->post_content_type);
+}
+
+/*
+ * Free strings associated with a 'DocInfo' struct.
+ */
+PUBLIC void LYFreeDocInfo ARGS1(
+    DocInfo *,		doc)
+{
+    FREE(doc->title);
+    FREE(doc->address);
+    FREE(doc->bookmark);
+    LYFreePostData(doc);
+}
+
+/*
  *  Free the information in the last history entry.
  */
-PRIVATE void clean_extra NOARGS
+PRIVATE void clean_extra_history NOARGS
 {
-    trace_history("clean_extra");
+    trace_history("clean_extra_history");
     nhist += nhist_extra;
     while (nhist_extra > 0) {
 	nhist--;
-	FREE(history[nhist].title);
-	FREE(history[nhist].address);
-	FREE(history[nhist].post_data);
-	FREE(history[nhist].post_content_type);
-	FREE(history[nhist].bookmark);
+	LYFreeDocInfo(&HDOC(nhist));
 	nhist_extra--;
     }
-    trace_history("...clean_extra");
+    trace_history("...clean_extra_history");
 }
 
-/* What is the relationship to are_different() from the mainloop?! */
+/*
+ * Free the entire history stack, for auditing memory leaks.
+ */
+#ifdef LY_FIND_LEAKS
+PRIVATE void clean_all_history NOARGS
+{
+    trace_history("clean_all_history");
+    clean_extra_history();
+    while (nhist > 0) {
+	nhist--;
+	LYFreeDocInfo(&HDOC(nhist));
+    }
+    trace_history("...clean_all_history");
+}
+#endif
+
+/* FIXME What is the relationship to are_different() from the mainloop?! */
 PRIVATE int are_identical ARGS2(
-	histstruct *,	doc,
-	document *,	doc1)
+	HistInfo *,	doc,
+	DocInfo *,	doc1)
 {
-     return (	STREQ(doc1->address, doc->address)
-		&& !strcmp(doc1->post_data ? doc1->post_data : "",
-			   doc->post_data ?  doc->post_data : "")
-		&& !strcmp(doc1->bookmark ? doc1->bookmark : "",
-			   doc->bookmark ?  doc->bookmark : "")
-		&& doc1->isHEAD == doc->isHEAD );
+     return (	STREQ(doc1->address, doc->hdoc.address)
+		&& BINEQ(doc1->post_data, doc->hdoc.post_data)
+		&& !strcmp(NonNull(doc1->bookmark),
+			   NonNull(doc->hdoc.bookmark))
+		&& doc1->isHEAD == doc->hdoc.isHEAD );
 }
 
 /*
  *  Push the current filename, link and line number onto the history list.
  */
 PUBLIC int LYpush ARGS2(
-	document *,	doc,
+	DocInfo *,	doc,
 	BOOLEAN,	force_push)
 {
     /*
@@ -335,11 +372,11 @@ PUBLIC int LYpush ARGS2(
      *	If file is identical to one before it, don't push it.
      */
     if ( nhist > 1 && are_identical(&(history[nhist-1]), doc)) {
-	if (history[nhist-1].internal_link == doc->internal_link) {
+	if (HDOC(nhist-1).internal_link == doc->internal_link) {
 	    /* But it is nice to have the last position remembered!
 	       - kw */
-	    history[nhist-1].link = doc->link;
-	    history[nhist-1].line = doc->line;
+	    HDOC(nhist-1).link = doc->link;
+	    HDOC(nhist-1).line = doc->line;
 	    return 0;
 	}
     }
@@ -348,42 +385,48 @@ PUBLIC int LYpush ARGS2(
      *	If file is identical to the current document, just move the pointer.
      */
     if ( nhist_extra >= 1 && are_identical(&(history[nhist]), doc)) {
-	history[nhist].link = doc->link;
-	history[nhist].line = doc->line;
+	HDOC(nhist).link = doc->link;
+	HDOC(nhist).line = doc->line;
 	nhist_extra--;
 	nhist++;
 	trace_history("LYpush: just move the cursor");
 	return 1;
     }
 
-    clean_extra();
+    clean_extra_history();
+#ifdef LY_FIND_LEAKS
+    if (!already_registered_clean_all_history) {
+	already_registered_clean_all_history = 1;
+	atexit(clean_all_history);
+    }
+#endif
 
     /*
      *	OK, push it if we have stack space.
      */
     if (nhist < MAXHIST)  {
-	history[nhist].link = doc->link;
-	history[nhist].line = doc->line;
+	HDOC(nhist).link = doc->link;
+	HDOC(nhist).line = doc->line;
 
-	history[nhist].title = NULL;
-	LYformTitle(&(history[nhist].title), doc->title);
+	HDOC(nhist).title = NULL;
+	LYformTitle(&(HDOC(nhist).title), doc->title);
 
-	history[nhist].address = NULL;
-	StrAllocCopy(history[nhist].address, doc->address);
+	HDOC(nhist).address = NULL;
+	StrAllocCopy(HDOC(nhist).address, doc->address);
 
-	history[nhist].post_data = NULL;
-	StrAllocCopy(history[nhist].post_data, doc->post_data);
+	HDOC(nhist).post_data = NULL;
+	BStrCopy(HDOC(nhist).post_data, doc->post_data);
 
-	history[nhist].post_content_type = NULL;
-	StrAllocCopy(history[nhist].post_content_type, doc->post_content_type);
+	HDOC(nhist).post_content_type = NULL;
+	StrAllocCopy(HDOC(nhist).post_content_type, doc->post_content_type);
 
-	history[nhist].bookmark = NULL;
-	StrAllocCopy(history[nhist].bookmark, doc->bookmark);
+	HDOC(nhist).bookmark = NULL;
+	StrAllocCopy(HDOC(nhist).bookmark, doc->bookmark);
 
-	history[nhist].isHEAD = doc->isHEAD;
-	history[nhist].safe = doc->safe;
+	HDOC(nhist).isHEAD = doc->isHEAD;
+	HDOC(nhist).safe = doc->safe;
 
-	history[nhist].internal_link = FALSE; /* by default */
+	HDOC(nhist).internal_link = FALSE; /* by default */
 	history[nhist].intern_seq_start = -1; /* by default */
 	if (doc->internal_link) {
 	    /* Now some tricky stuff: if the caller thinks that the doc
@@ -405,7 +448,7 @@ PUBLIC int LYpush ARGS2(
 		WWWDoc.isHEAD = doc->isHEAD;
 		WWWDoc.safe = doc->safe;
 		thisparent =
-		    HTAnchor_parent(HTAnchor_findAddress(&WWWDoc));
+		    HTAnchor_findAddress(&WWWDoc);
 		/* Now find the ParentAnchor for the previous history
 		** item - kw
 		*/
@@ -413,49 +456,49 @@ PUBLIC int LYpush ARGS2(
 		    /* If the last-pushed item is a LYNXIMGMAP but THIS one
 		    ** isn't, compare the physical URLs instead. - kw
 		    */
-		    if (0==strncmp(history[nhist-1].address,"LYNXIMGMAP:",11) &&
-			0!=strncmp(doc->address,"LYNXIMGMAP:",11)) {
-			WWWDoc.address = history[nhist-1].address + 11;
+		    if (isLYNXIMGMAP(HDOC(nhist-1).address) &&
+			!isLYNXIMGMAP(doc->address)) {
+			WWWDoc.address = HDOC(nhist-1).address + LEN_LYNXIMGMAP;
 		    /*
 		    ** If THIS item is a LYNXIMGMAP but the last-pushed one
 		    ** isn't, fake it by using THIS item's address for
 		    ** thatparent... - kw
 		    */
-		    } else if ((0==strncmp(doc->address,"LYNXIMGMAP:",11) &&
-		       0!=strncmp(history[nhist-1].address,"LYNXIMGMAP:",11))) {
+		    } else if (isLYNXIMGMAP(doc->address) &&
+		       !isLYNXIMGMAP(HDOC(nhist-1).address)) {
 			char *temp = NULL;
-			StrAllocCopy(temp, "LYNXIMGMAP:");
-			StrAllocCat(temp, doc->address+11);
+			StrAllocCopy(temp, STR_LYNXIMGMAP);
+			StrAllocCat(temp, doc->address + LEN_LYNXIMGMAP);
 			WWWDoc.address = temp;
-			WWWDoc.post_content_type = history[nhist-1].post_content_type;
-			WWWDoc.bookmark = history[nhist-1].bookmark;
-			WWWDoc.isHEAD = history[nhist-1].isHEAD;
-			WWWDoc.safe = history[nhist-1].safe;
+			WWWDoc.post_content_type = HDOC(nhist-1).post_content_type;
+			WWWDoc.bookmark = HDOC(nhist-1).bookmark;
+			WWWDoc.isHEAD = HDOC(nhist-1).isHEAD;
+			WWWDoc.safe = HDOC(nhist-1).safe;
 			thatparent =
-			    HTAnchor_parent(HTAnchor_findAddress(&WWWDoc));
+			    HTAnchor_findAddress(&WWWDoc);
 			FREE(temp);
 		    } else {
-			WWWDoc.address = history[nhist-1].address;
+			WWWDoc.address = HDOC(nhist-1).address;
 		    }
 		    if (!thatparent) { /* if not yet done */
-			WWWDoc.post_data = history[nhist-1].post_data;
-			WWWDoc.post_content_type = history[nhist-1].post_content_type;
-			WWWDoc.bookmark = history[nhist-1].bookmark;
-			WWWDoc.isHEAD = history[nhist-1].isHEAD;
-			WWWDoc.safe = history[nhist-1].safe;
+			WWWDoc.post_data = HDOC(nhist-1).post_data;
+			WWWDoc.post_content_type = HDOC(nhist-1).post_content_type;
+			WWWDoc.bookmark = HDOC(nhist-1).bookmark;
+			WWWDoc.isHEAD = HDOC(nhist-1).isHEAD;
+			WWWDoc.safe = HDOC(nhist-1).safe;
 			thatparent =
-			    HTAnchor_parent(HTAnchor_findAddress(&WWWDoc));
+			    HTAnchor_findAddress(&WWWDoc);
 		    }
-		/* In addition to equality of the ParentAnchors, require
-		** that IF we have a HTMainText (i.e., it wasn't just
-		** HTuncache'd by mainloop), THEN it has to be consistent
-		** with what we are trying to push.
-		**   This may be overkill... - kw
-		*/
+		    /* In addition to equality of the ParentAnchors, require
+		    ** that IF we have a HTMainText (i.e., it wasn't just
+		    ** HTuncache'd by mainloop), THEN it has to be consistent
+		    ** with what we are trying to push.
+		    **   This may be overkill... - kw
+		    */
 		    if (thatparent == thisparent &&
 			(!HTMainText || HTMainAnchor == thisparent)
 			) {
-			history[nhist].internal_link = TRUE;
+			HDOC(nhist).internal_link = TRUE;
 			history[nhist].intern_seq_start =
 			    history[nhist-1].intern_seq_start >= 0 ?
 			    history[nhist-1].intern_seq_start : nhist-1;
@@ -463,7 +506,7 @@ PUBLIC int LYpush ARGS2(
 		    }
 		}
 	    }
-	    if (!history[nhist].internal_link) {
+	    if (!HDOC(nhist).internal_link) {
 		CTRACE((tfp, "\nLYpush: push as internal link requested, %s\n",
 			    "but didn't check out!"));
 	    }
@@ -485,26 +528,16 @@ PUBLIC int LYpush ARGS2(
  *  Pop the previous filename, link and line number from the history list.
  */
 PUBLIC void LYpop ARGS1(
-	document *,	doc)
+	DocInfo *,	doc)
 {
     if (nhist > 0) {
-	clean_extra();
+	clean_extra_history();
 	nhist--;
-	doc->link = history[nhist].link;
-	doc->line = history[nhist].line;
-	FREE(doc->title);
-	doc->title = history[nhist].title;	 /* will be freed later */
-	FREE(doc->address);
-	doc->address = history[nhist].address;	 /* will be freed later */
-	FREE(doc->post_data);
-	doc->post_data = history[nhist].post_data;
-	FREE(doc->post_content_type);
-	doc->post_content_type = history[nhist].post_content_type;
-	FREE(doc->bookmark);
-	doc->bookmark = history[nhist].bookmark; /* will be freed later */
-	doc->isHEAD = history[nhist].isHEAD;
-	doc->safe = history[nhist].safe;
-	doc->internal_link = history[nhist].internal_link;
+
+	LYFreeDocInfo(doc);
+
+	*doc = HDOC(nhist);
+
 #ifdef DISP_PARTIAL
 	/* assume we pop the 'doc' to show it soon... */
 	LYSetNewline(doc->line);	/* reinitialize */
@@ -518,7 +551,7 @@ PUBLIC void LYpop ARGS1(
  *  Move to the previous filename, link and line number from the history list.
  */
 PUBLIC void LYhist_prev ARGS1(
-	document *,	doc)
+	DocInfo *,	doc)
 {
     trace_history("LYhist_prev");
     if (nhist > 0 && (nhist_extra || nhist < MAXHIST)) {
@@ -533,14 +566,14 @@ PUBLIC void LYhist_prev ARGS1(
  *  Called before calling LYhist_prev().
  */
 PUBLIC void LYhist_prev_register ARGS1(
-	document *,	doc)
+	DocInfo *,	doc)
 {
     trace_history("LYhist_prev_register");
     if (nhist > 1) {
 	if (nhist_extra) {	/* Make something to return back */
 	    /* Store the new position */
-	    history[nhist].link = doc->link;
-	    history[nhist].line = doc->line;
+	    HDOC(nhist).link = doc->link;
+	    HDOC(nhist).line = doc->line;
 	} else if (nhist < MAXHIST) { /* push will fail */
 	    if (LYpush(doc, 0)) {
 		nhist--;
@@ -552,17 +585,17 @@ PUBLIC void LYhist_prev_register ARGS1(
 }
 
 /*
- *  Move to the next filename, link and line number from the history list.
+ *  Move to the next filename, link and line number from the history.
  */
 PUBLIC int LYhist_next ARGS2(
-	document *,	doc,
-	document *,	newdoc)
+	DocInfo *,	doc,
+	DocInfo *,	newdoc)
 {
     if (nhist_extra <= 1)	/* == 1 when we are the last one */
 	return 0;
     /* Store the new position */
-    history[nhist].link = doc->link;
-    history[nhist].line = doc->line;
+    HDOC(nhist).link = doc->link;
+    HDOC(nhist).line = doc->line;
     nhist++;
     nhist_extra--;
     LYpop_num(nhist, newdoc);
@@ -576,19 +609,19 @@ PUBLIC int LYhist_next ARGS2(
  */
 PUBLIC void LYpop_num ARGS2(
 	int,		number,
-	document *,	doc)
+	DocInfo *,	doc)
 {
     if (number >= 0 && nhist + nhist_extra > number) {
-	doc->link = history[number].link;
-	doc->line = history[number].line;
-	StrAllocCopy(doc->title, history[number].title);
-	StrAllocCopy(doc->address, history[number].address);
-	StrAllocCopy(doc->post_data, history[number].post_data);
-	StrAllocCopy(doc->post_content_type, history[number].post_content_type);
-	StrAllocCopy(doc->bookmark, history[number].bookmark);
-	doc->isHEAD = history[number].isHEAD;
-	doc->safe = history[number].safe;
-	doc->internal_link = history[number].internal_link; /* ?? */
+	doc->link = HDOC(number).link;
+	doc->line = HDOC(number).line;
+	StrAllocCopy(doc->title, HDOC(number).title);
+	StrAllocCopy(doc->address, HDOC(number).address);
+	BStrCopy(doc->post_data, HDOC(number).post_data);
+	StrAllocCopy(doc->post_content_type, HDOC(number).post_content_type);
+	StrAllocCopy(doc->bookmark, HDOC(number).bookmark);
+	doc->isHEAD = HDOC(number).isHEAD;
+	doc->safe = HDOC(number).safe;
+	doc->internal_link = HDOC(number).internal_link; /* ?? */
 #ifdef DISP_PARTIAL
 	/* assume we pop the 'doc' to show it soon... */
 	LYSetNewline(doc->line);	/* reinitialize */
@@ -607,16 +640,8 @@ PUBLIC int showhistory ARGS1(
     int x = 0;
     FILE *fp0;
 
-    if (LYReuseTempfiles) {
-	fp0 = LYOpenTempRewrite(tempfile, HTML_SUFFIX, "w");
-    } else {
-	LYRemoveTemp(tempfile);
-	fp0 = LYOpenTemp(tempfile, HTML_SUFFIX, "w");
-    }
-    if (fp0 == NULL) {
-	HTAlert(CANNOT_OPEN_TEMP);
+    if ((fp0 = InternalPageFP(tempfile, TRUE)) == 0)
 	return(-1);
-    }
 
     LYLocalFileToURL(newfile, tempfile);
 
@@ -625,8 +650,8 @@ PUBLIC int showhistory ARGS1(
 
     BeginInternalPage(fp0, HISTORY_PAGE_TITLE, HISTORY_PAGE_HELP);
 
-    fprintf(fp0, "<p align=right> <a href=\"LYNXMESSAGES:\">[%s]</a>\n",
-		 STATUSLINES_TITLE);
+    fprintf(fp0, "<p align=right> <a href=\"%s\">[%s]</a>\n",
+		 STR_LYNXMESSAGES, STATUSLINES_TITLE);
 
     fprintf(fp0, "<pre>\n");
 
@@ -636,8 +661,8 @@ PUBLIC int showhistory ARGS1(
 	 *  The number of the document in the hist stack,
 	 *  its title in a link, and its address. - FM
 	 */
-	if (history[x].title != NULL) {
-	    StrAllocCopy(Title, history[x].title);
+	if (HDOC(x).title != NULL) {
+	    StrAllocCopy(Title, HDOC(x).title);
 	    LYEntify(&Title, TRUE);
 	    LYTrimLeading(Title);
 	    LYTrimTrailing(Title);
@@ -647,16 +672,16 @@ PUBLIC int showhistory ARGS1(
 	    StrAllocCopy(Title, NO_TITLE);
 	}
 	fprintf(fp0,
-		"%s<em>%d</em>. <tab id=t%d><a href=\"LYNXHIST:%d\">%s</a>\n",
+		"%s<em>%d</em>. <tab id=t%d><a href=\"%s%d\">%s</a>\n",
 		(x > 99 ? "" : x < 10 ? "  " : " "),
-		x, x, x, Title);
-	if (history[x].address != NULL) {
-	    StrAllocCopy(Title, history[x].address);
+		x, x, STR_LYNXHIST, x, Title);
+	if (HDOC(x).address != NULL) {
+	    StrAllocCopy(Title, HDOC(x).address);
 	    LYEntify(&Title, TRUE);
 	} else {
 	    StrAllocCopy(Title, gettext("(no address)"));
 	}
-	if (history[x].internal_link) {
+	if (HDOC(x).internal_link) {
 	    if (history[x].intern_seq_start == history[nhist-1].intern_seq_start)
 		StrAllocCat(Title, gettext(" (internal)"));
 	    else
@@ -679,7 +704,7 @@ PUBLIC int showhistory ARGS1(
  *  The info looks like:  LYNXHIST:#
  */
 PUBLIC BOOLEAN historytarget ARGS1(
-	document *,	newdoc)
+	DocInfo *,	newdoc)
 {
     int number;
     DocAddress WWWDoc;
@@ -705,7 +730,7 @@ PUBLIC BOOLEAN historytarget ARGS1(
     if (HTMainText && nhist > 0 &&
 	!strcmp(HTLoadedDocumentTitle(), HISTORY_PAGE_TITLE) &&
 	LYIsUIPage3(HTLoadedDocumentURL(), UIP_HISTORY, 0) &&
-	strcmp(HTLoadedDocumentURL(), history[nhist-1].address)) {
+	strcmp(HTLoadedDocumentURL(), HDOC(nhist-1).address)) {
 	HTuncache_current_document();  /* don't waste the cache */
     }
 
@@ -713,7 +738,7 @@ PUBLIC BOOLEAN historytarget ARGS1(
     if (((newdoc->internal_link &&
 	  history[number].intern_seq_start == history[nhist-1].intern_seq_start) ||
 	 (number < nhist-1 &&
-	  history[nhist-1].internal_link &&
+	  HDOC(nhist-1).internal_link &&
 	  number == history[nhist-1].intern_seq_start))
 	&& !(LYforce_no_cache == TRUE && LYoverride_no_cache == FALSE)) {
 #ifndef DONT_TRACK_INTERNAL_LINKS
@@ -737,14 +762,14 @@ PUBLIC BOOLEAN historytarget ARGS1(
 	WWWDoc.bookmark = newdoc->bookmark;
 	WWWDoc.isHEAD = newdoc->isHEAD;
 	WWWDoc.safe = newdoc->safe;
-	tmpanchor = HTAnchor_parent(HTAnchor_findAddress(&WWWDoc));
+	tmpanchor = HTAnchor_findAddress(&WWWDoc);
 	text = (HText *)HTAnchor_document(tmpanchor);
 	if (((((LYresubmit_posts == TRUE) ||
 	       (LYforce_no_cache == TRUE &&
 		LYoverride_no_cache == FALSE)) &&
 	      !(treat_as_intern && !reloading)) ||
 	     text == NULL) &&
-	    (!strncmp(newdoc->address, "LYNXIMGMAP:", 11) ||
+	    (isLYNXIMGMAP(newdoc->address) ||
 	     HTConfirm(CONFIRM_POST_RESUBMISSION) == TRUE)) {
 	    LYforce_no_cache = TRUE;
 	    LYoverride_no_cache = FALSE;
@@ -783,16 +808,8 @@ PUBLIC int LYShowVisitedLinks ARGS1(
     if (!cur)
 	return(-1);
 
-    if (LYReuseTempfiles) {
-	fp0 = LYOpenTempRewrite(tempfile, HTML_SUFFIX, "w");
-    } else {
-	LYRemoveTemp(tempfile);
-	fp0 = LYOpenTemp(tempfile, HTML_SUFFIX, "w");
-    }
-    if (fp0 == NULL) {
-	HTAlert(CANNOT_OPEN_TEMP);
+    if ((fp0 = InternalPageFP(tempfile, TRUE)) == 0)
 	return(-1);
-    }
 
     LYLocalFileToURL(newfile, tempfile);
     LYRegisterUIPage(*newfile, UIP_VLINKS);
@@ -802,23 +819,13 @@ PUBLIC int LYShowVisitedLinks ARGS1(
 
     BeginInternalPage(fp0, VISITED_LINKS_TITLE, VISITED_LINKS_HELP);
 
-    fprintf(fp0, "<form action=\"LYNXOPTIONS:\" method=\"post\">\n");
-    fprintf(fp0, "<select name=\"visited_pages_type\">\n");
-    fprintf(fp0, " <option value=\"first_visited\" %s>Sort By First Visited\n",
-		 (Visited_Links_As == VISITED_LINKS_AS_FIRST_V ? "selected" : ""));
-    fprintf(fp0, " <option value=\"first_visited_reversed\" %s>Reverse Sort By First Visited\n",
-		 (Visited_Links_As == (VISITED_LINKS_AS_FIRST_V|VISITED_LINKS_REVERSE) ? "selected" : ""));
-    fprintf(fp0, " <option value=\"visit_tree\" %s>View As Visit Tree\n",
-		 (Visited_Links_As == VISITED_LINKS_AS_TREE ? "selected" : ""));
-    fprintf(fp0, " <option value=\"last_visited\" %s>Sort By Last Visited\n",
-		 (Visited_Links_As == VISITED_LINKS_AS_LATEST ? "selected" : ""));
-    fprintf(fp0, " <option value=\"last_visited_reversed\" %s>Reverse Sort By Last Visited\n",
-		 (Visited_Links_As == (VISITED_LINKS_AS_LATEST|VISITED_LINKS_REVERSE)
-		   ? "selected" : ""));
-    fprintf(fp0, "</select>\n");
+#ifndef NO_OPTION_FORMS
+    fprintf(fp0, "<form action=\"%s\" method=\"post\">\n", STR_LYNXOPTIONS);
+    LYMenuVisitedLinks (fp0, FALSE);
     fprintf(fp0, "<input type=\"submit\" value=\"Accept Changes\">\n");
     fprintf(fp0, "</form>\n");
     fprintf(fp0, "<P>\n");
+#endif
 
     fprintf(fp0, "<pre>\n");
     fprintf(fp0, "<em>%s</em>\n",
@@ -935,9 +942,6 @@ PUBLIC int LYShowVisitedLinks ARGS1(
 #define STATUSBUFSIZE   40
 PRIVATE char * buffstack[STATUSBUFSIZE];
 PRIVATE int topOfStack = 0;
-#ifdef LY_FIND_LEAKS
-PRIVATE int already_registered_free_messages_stack = 0;
-#endif
 
 #ifdef LY_FIND_LEAKS
 PRIVATE void free_messages_stack NOARGS
@@ -1017,7 +1021,7 @@ PUBLIC void LYstore_message2 ARGS2(
 
     if (message != NULL) {
 	char *temp = NULL;
-	HTSprintf0(&temp, message, (argument == 0) ? "" : argument);
+	HTSprintf0(&temp, message, NonNull(argument));
 	to_stack(temp);
     }
 }
diff --git a/gnu/usr.bin/lynx/src/LYHistory.h b/gnu/usr.bin/lynx/src/LYHistory.h
index 5d061a24b2d..fe12c1a3b64 100644
--- a/gnu/usr.bin/lynx/src/LYHistory.h
+++ b/gnu/usr.bin/lynx/src/LYHistory.h
@@ -6,16 +6,18 @@
 #endif /* LYSTRUCTS_H */
 
 extern BOOLEAN LYwouldPush PARAMS((CONST char *title, CONST char *docurl));
-extern BOOLEAN historytarget PARAMS((document *newdoc));
+extern BOOLEAN historytarget PARAMS((DocInfo *newdoc));
 extern int LYShowVisitedLinks PARAMS((char **newfile));
-extern int LYhist_next PARAMS((document *doc, document *newdoc));
-extern int LYpush PARAMS((document *doc, BOOLEAN force_push));
+extern int LYhist_next PARAMS((DocInfo *doc, DocInfo *newdoc));
+extern int LYpush PARAMS((DocInfo *doc, BOOLEAN force_push));
 extern int showhistory PARAMS((char **newfile));
-extern void LYAddVisitedLink PARAMS((document *doc));
-extern void LYhist_prev PARAMS((document *doc));
-extern void LYhist_prev_register PARAMS((document *doc));
-extern void LYpop PARAMS((document *doc));
-extern void LYpop_num PARAMS((int number, document *doc));
+extern void LYAddVisitedLink PARAMS((DocInfo *doc));
+extern void LYFreePostData PARAMS((DocInfo * data));
+extern void LYFreeDocInfo PARAMS((DocInfo * data));
+extern void LYhist_prev PARAMS((DocInfo *doc));
+extern void LYhist_prev_register PARAMS((DocInfo *doc));
+extern void LYpop PARAMS((DocInfo *doc));
+extern void LYpop_num PARAMS((int number, DocInfo *doc));
 extern void LYstatusline_messages_on_exit PARAMS((char **buf));
 extern void LYstore_message PARAMS((CONST char *message));
 extern void LYstore_message2 PARAMS((CONST char *message, CONST char *argument));
diff --git a/gnu/usr.bin/lynx/src/LYJump.c b/gnu/usr.bin/lynx/src/LYJump.c
index 478ddfc9f4a..bed7133eefd 100644
--- a/gnu/usr.bin/lynx/src/LYJump.c
+++ b/gnu/usr.bin/lynx/src/LYJump.c
@@ -10,7 +10,7 @@
 #include <LYLeaks.h>
 
 #ifdef _WINDOWS
-#include <stdlib.h>	/* bsearch() */
+#include <stdlib.h>		/* bsearch() */
 #endif
 
 #ifdef VMS
@@ -19,8 +19,8 @@
 
 struct JumpTable *JThead = NULL;
 
-PRIVATE int LYCompare PARAMS ((CONST void *e1, CONST void *e2));
-PRIVATE unsigned LYRead_Jumpfile PARAMS ((struct JumpTable *jtp));
+PRIVATE int LYCompare PARAMS((CONST void *e1, CONST void *e2));
+PRIVATE unsigned LYRead_Jumpfile PARAMS((struct JumpTable * jtp));
 
 PUBLIC void LYJumpTable_free NOARGS
 {
@@ -36,9 +36,10 @@ PUBLIC void LYJumpTable_free NOARGS
 	    char *shortcut;
 	    HTList *current = cur->history;
 
-	    while (NULL != (shortcut = (char *)HTList_nextObject(current))) {
+	    while (NULL != (shortcut = (char *) HTList_nextObject(current))) {
 		FREE(shortcut);
-	    }
+	    };
+
 	    HTList_delete(cur->history);
 	    cur->history = NULL;
 	}
@@ -55,18 +56,18 @@ PUBLIC void LYJumpTable_free NOARGS
  * Utility for listing shortcuts, making any repeated
  * shortcut the most current in the list. - FM
  */
-PUBLIC void LYAddJumpShortcut ARGS2(HTList *, historyp, char *,shortcut)
+PUBLIC void LYAddJumpShortcut ARGS2(HTList *, historyp, char *, shortcut)
 {
     char *new = NULL;
     char *old;
-    HTList *cur =  historyp;
+    HTList *cur = historyp;
 
     if (!historyp || !(shortcut && *shortcut))
 	return;
 
     StrAllocCopy(new, shortcut);
 
-    while (NULL != (old = (char *)HTList_nextObject(cur))) {
+    while (NULL != (old = (char *) HTList_nextObject(cur))) {
 	if (!strcmp(old, new)) {
 	    HTList_removeObject(historyp, old);
 	    FREE(old);
@@ -78,7 +79,7 @@ PUBLIC void LYAddJumpShortcut ARGS2(HTList *, historyp, char *,shortcut)
     return;
 }
 
-PUBLIC BOOL LYJumpInit ARGS1 (char *, config)
+PUBLIC BOOL LYJumpInit ARGS1(char *, config)
 {
     struct JumpTable *jtp;
     char *cp;
@@ -87,6 +88,7 @@ PUBLIC BOOL LYJumpInit ARGS1 (char *, config)
      * Create a JumpTable structure.
      */
     jtp = typecalloc(struct JumpTable);
+
     if (jtp == NULL) {
 	outofmem(__FILE__, "LYJumpInit");
     }
@@ -126,6 +128,7 @@ PUBLIC BOOL LYJumpInit ARGS1 (char *, config)
      */
     if (!cp && JThead) {
 	struct JumpTable *jtptmp = JThead;
+
 	jumpfile = jtp->file;
 	FREE(jtp);
 	while (jtptmp && jtptmp->key)
@@ -147,6 +150,7 @@ PUBLIC BOOL LYJumpInit ARGS1 (char *, config)
 	if (!jumpfile)
 	    StrAllocCopy(jumpfile, JThead->file);
 	jtp = typecalloc(struct JumpTable);
+
 	if (jtp == NULL) {
 	    outofmem(__FILE__, "LYJumpInit");
 	}
@@ -157,16 +161,16 @@ PUBLIC BOOL LYJumpInit ARGS1 (char *, config)
      * Complete the initialization of config.
      */
     if (cp) {
-	jtp->key = remap(cp, "JUMP", FALSE);  /* key is present, (re)map it */
-	cp = strtok(NULL, "\n");	    /* get prompt, if present */
+	jtp->key = remap(cp, "JUMP", FALSE);	/* key is present, (re)map it */
+	cp = strtok(NULL, "\n");	/* get prompt, if present */
 	if (cp && *cp)
-	    StrAllocCopy(jtp->msg, cp);     /* prompt is present, load it */
+	    StrAllocCopy(jtp->msg, cp);	/* prompt is present, load it */
 	else
 	    cp = NULL;
     }
-    if (!cp)				     /* no prompt, use default */
+    if (!cp)			/* no prompt, use default */
 	StrAllocCopy(jtp->msg, jumpprompt);
-    if (jtp->msg[strlen(jtp->msg)-1] != ' ') /* ensure a trailing space */
+    if (jtp->msg[strlen(jtp->msg) - 1] != ' ')	/* ensure a trailing space */
 	StrAllocCat(jtp->msg, " ");
     jtp->history = HTList_new();
     jtp->next = JThead;
@@ -193,6 +197,7 @@ PUBLIC char *LYJump ARGS1(int, key)
 	jtp = jtp->next;
     if (!jtp) {
 	char *msg = 0;
+
 	HTSprintf0(&msg, KEY_NOT_MAPPED_TO_JUMP_FILE, key);
 	HTAlert(msg);
 	FREE(msg);
@@ -223,7 +228,7 @@ PUBLIC char *LYJump ARGS1(int, key)
     }
 
     statusline(jtp->msg);
-    if ((ch=LYgetstr(buf, VISIBLE, (sizeof(buf) - 4), recall)) < 0) {
+    if ((ch = LYgetstr(buf, VISIBLE, (sizeof(buf) - 4), recall)) < 0) {
 	/*
 	 * User cancelled the Jump via ^G. - FM
 	 */
@@ -231,9 +236,9 @@ PUBLIC char *LYJump ARGS1(int, key)
 	return NULL;
     }
 
-check_recall:
+  check_recall:
     bp = buf;
-    if (toupper(key) == 'G' && strncmp(buf, "o ", 2) == 0)
+    if (TOUPPER(key) == 'G' && strncmp(buf, "o ", 2) == 0)
 	bp++;
     bp = LYSkipBlanks(bp);
     if (*bp == '\0' &&
@@ -248,7 +253,7 @@ check_recall:
     }
 #ifdef PERMIT_GOTO_FROM_JUMP
     if (strchr(bp, ':') || strchr(bp, '/')) {
-	char *temp=NULL;
+	char *temp = NULL;
 
 	LYJumpFileURL = FALSE;
 	if (no_goto) {
@@ -257,7 +262,7 @@ check_recall:
 	    HTUserMsg(RANDOM_URL_DISALLOWED);
 	    return NULL;
 	}
-	sprintf(buf, "Go %.*s", (int)sizeof(buf) - 4, bp);
+	sprintf(buf, "Go %.*s", (int) sizeof(buf) - 4, bp);
 	return (bp = buf);
     }
 #endif /* PERMIT_GOTO_FROM_JUMP */
@@ -280,9 +285,9 @@ check_recall:
 	     * Roll around to the last Shortcut in the list. - FM
 	     */
 	    ShortcutNum = 0;
-	if ((cp=(char *)HTList_objectAt(jtp->history,
-					ShortcutNum)) != NULL) {
-	    LYstrncpy(buf, cp, sizeof(buf)-1);
+	if ((cp = (char *) HTList_objectAt(jtp->history,
+					   ShortcutNum)) != NULL) {
+	    LYstrncpy(buf, cp, sizeof(buf) - 1);
 	    if (jump_buffer && jtp->shortcut &&
 		!strcmp(buf, jtp->shortcut)) {
 		_statusline(EDIT_CURRENT_SHORTCUT);
@@ -292,8 +297,8 @@ check_recall:
 	    } else {
 		_statusline(EDIT_A_PREV_SHORTCUT);
 	    }
-	    if ((ch=LYgetstr(buf, VISIBLE,
-			     sizeof(buf), recall)) < 0) {
+	    if ((ch = LYgetstr(buf, VISIBLE,
+			       sizeof(buf), recall)) < 0) {
 		/*
 		 * User cancelled the jump via ^G.
 		 */
@@ -320,9 +325,9 @@ check_recall:
 	     * Roll around to the first Shortcut in the list. - FM
 	     */
 	    ShortcutNum = ShortcutTotal - 1;
-	if ((cp=(char *)HTList_objectAt(jtp->history,
-					ShortcutNum)) != NULL) {
-	    LYstrncpy(buf, cp, sizeof(buf)-1);
+	if ((cp = (char *) HTList_objectAt(jtp->history,
+					   ShortcutNum)) != NULL) {
+	    LYstrncpy(buf, cp, sizeof(buf) - 1);
 	    if (jump_buffer && jtp->shortcut &&
 		!strcmp(buf, jtp->shortcut)) {
 		_statusline(EDIT_CURRENT_SHORTCUT);
@@ -330,10 +335,9 @@ check_recall:
 		       (!jump_buffer && ShortcutTotal == 1)) {
 		_statusline(EDIT_THE_PREV_SHORTCUT);
 	    } else {
-		_statusline(EDIT_THE_PREV_SHORTCUT);
+		_statusline(EDIT_A_PREV_SHORTCUT);
 	    }
-	    if ((ch=LYgetstr(buf, VISIBLE,
-			     sizeof(buf), recall)) < 0) {
+	    if ((ch = LYgetstr(buf, VISIBLE, sizeof(buf), recall)) < 0) {
 		/*
 		 * User cancelled the jump via ^G.
 		 */
@@ -345,8 +349,8 @@ check_recall:
     }
 
     seeking.key = bp;
-    found = (JumpDatum *)bsearch((char *)&seeking, (char *)jtp->table,
-				 jtp->nel, sizeof(JumpDatum), LYCompare);
+    found = (JumpDatum *) bsearch((char *) &seeking, (char *) jtp->table,
+				  jtp->nel, sizeof(JumpDatum), LYCompare);
     if (!found) {
 	user_message("Unknown target '%s'", buf);
 	LYSleepAlert();
@@ -357,12 +361,13 @@ check_recall:
     return found ? found->url : NULL;
 }
 
-PRIVATE unsigned LYRead_Jumpfile ARGS1(struct JumpTable *,jtp)
+PRIVATE unsigned LYRead_Jumpfile ARGS1(struct JumpTable *, jtp)
 {
     struct stat st;
     unsigned int nel;
     char *mp;
     int fd;
+
 #ifdef VMS
     FILE *fp;
     BOOL IsStream_LF = TRUE;
@@ -370,21 +375,22 @@ PRIVATE unsigned LYRead_Jumpfile ARGS1(struct JumpTable *,jtp)
     char *cp;
     unsigned i;
 
-    if (jtp->file == NULL || *(jtp->file) == '\0')
+    if (isEmpty(jtp->file))
 	return 0;
+
+    CTRACE((tfp, "Read Jumpfile %s\n", jtp->file));
     if (stat(jtp->file, &st) < 0) {
 	HTAlert(CANNOT_LOCATE_JUMP_FILE);
 	return 0;
     }
 
     /* allocate storage to read entire file */
-    if ((mp= typecallocn(char, st.st_size + 1)) == NULL) {
+    if ((mp = typecallocn(char, st.st_size + 1)) == NULL) {
 	HTAlert(OUTOF_MEM_FOR_JUMP_FILE);
 	return 0;
     }
-
 #ifdef VMS
-    if (st.st_fab_rfm != (char)FAB$C_STMLF) {
+    if (st.st_fab_rfm != (char) FAB$C_STMLF) {
 	/** It's a record-oriented file. **/
 	IsStream_LF = FALSE;
 	if ((fp = fopen(jtp->file, "r", "mbc=32")) == NULL) {
@@ -392,38 +398,37 @@ PRIVATE unsigned LYRead_Jumpfile ARGS1(struct JumpTable *,jtp)
 	    FREE(mp);
 	    return 0;
 	}
-    } else
-    if ((fd=open(jtp->file, O_RDONLY, "mbc=32")) < 0)
+    } else if ((fd = open(jtp->file, O_RDONLY, "mbc=32")) < 0)
 #else
-    if ((fd=open(jtp->file, O_RDONLY)) < 0)
+    if ((fd = open(jtp->file, O_RDONLY)) < 0)
 #endif /* VMS */
     {
 	HTAlert(CANNOT_OPEN_JUMP_FILE);
 	FREE(mp);
 	return 0;
     }
-
 #ifdef VMS
     if (IsStream_LF) {
     /** Handle as a stream. **/
 #endif /* VMS */
-    if (read(fd, mp, st.st_size) < st.st_size) {
-	HTAlert(ERROR_READING_JUMP_FILE);
-	FREE(mp);
-	return 0;
-    }
-    mp[st.st_size] = '\0';
-    close(fd);
+	if (read(fd, mp, st.st_size) < st.st_size) {
+	    HTAlert(ERROR_READING_JUMP_FILE);
+	    FREE(mp);
+	    return 0;
+	}
+	mp[st.st_size] = '\0';
+	close(fd);
 #ifdef VMS
     } else {
-    /** Handle as a series of records. **/
-    if(fgets(mp, 1024, fp) == NULL) {
-	HTAlert(ERROR_READING_JUMP_FILE);
-	FREE(mp);
-	return 0;
-    } else
-	while(fgets(mp+strlen(mp), 1024, fp) != NULL)
-	    ;
+	/** Handle as a series of records. **/
+	if (fgets(mp, 1024, fp) == NULL) {
+	    HTAlert(ERROR_READING_JUMP_FILE);
+	    FREE(mp);
+	    return 0;
+	} else
+	    while (fgets(mp + strlen(mp), 1024, fp) != NULL) {
+		;
+	    }
 	LYCloseInput(fp);
     }
 #endif /* VMS */
@@ -431,12 +436,12 @@ PRIVATE unsigned LYRead_Jumpfile ARGS1(struct JumpTable *,jtp)
     /* quick scan for approximate number of entries */
     nel = 0;
     cp = mp;
-    while((cp = strchr(cp, '\n')) != NULL) {
+    while ((cp = strchr(cp, '\n')) != NULL) {
 	nel++;
 	cp++;
     }
 
-    jtp->table = (JumpDatum *)malloc(nel * sizeof(JumpDatum));
+    jtp->table = (JumpDatum *) malloc(nel * sizeof(JumpDatum));
     if (jtp->table == NULL) {
 	HTAlert(OUTOF_MEM_FOR_JUMP_TABLE);
 	FREE(mp);
@@ -476,6 +481,8 @@ PRIVATE unsigned LYRead_Jumpfile ARGS1(struct JumpTable *,jtp)
 	if (cp == NULL)
 	    break;
 	cp++;
+	CTRACE((tfp, "Read jumpfile[%d] key='%s', url='%s'\n",
+		i, jtp->table[i].key, jtp->table[i].url));
 	i++;
 	if (!cp)
 	    break;
@@ -484,7 +491,8 @@ PRIVATE unsigned LYRead_Jumpfile ARGS1(struct JumpTable *,jtp)
     return i;
 }
 
-PRIVATE int LYCompare ARGS2 (CONST void *, e1, CONST void *, e2)
+PRIVATE int LYCompare ARGS2(CONST void *, e1, CONST void *, e2)
 {
-    return strcasecomp(((CONST JumpDatum *)e1)->key, ((CONST JumpDatum *)e2)->key);
+    return strcasecomp(((CONST JumpDatum *) e1)->key,
+		       ((CONST JumpDatum *) e2)->key);
 }
diff --git a/gnu/usr.bin/lynx/src/LYJump.h b/gnu/usr.bin/lynx/src/LYJump.h
index 3a82b075744..25e8d16b09e 100644
--- a/gnu/usr.bin/lynx/src/LYJump.h
+++ b/gnu/usr.bin/lynx/src/LYJump.h
@@ -27,4 +27,3 @@ extern BOOL LYJumpInit PARAMS((char *config));
 extern char *LYJump PARAMS((int key));
 
 #endif /* LYJUMP_H */
-
diff --git a/gnu/usr.bin/lynx/src/LYKeymap.c b/gnu/usr.bin/lynx/src/LYKeymap.c
index 708f0e6330f..b0f6dce1835 100644
--- a/gnu/usr.bin/lynx/src/LYKeymap.c
+++ b/gnu/usr.bin/lynx/src/LYKeymap.c
@@ -77,15 +77,9 @@ LYK_REFRESH,      LYK_ACTIVATE,     LYK_DOWN_TWO,      0,
 /* ^L */            /* cr */        /* ^N */       /* ^O */
 #endif
 
-#ifdef SH_EX	/* 1998/10/02 (Fri) 08:48:44 */
 LYK_UP_TWO,       LYK_CHG_CENTER,   LYK_RELOAD,    LYK_TO_CLIPBOARD,
 /* ^P */            /* XON */       /* ^R */       /* ^S */
 
-#else
-LYK_UP_TWO,             0,          LYK_RELOAD,        0,
-/* ^P */            /* XON */       /* ^R */       /* XOFF */
-#endif
-
 LYK_TRACE_TOGGLE,       0,        LYK_SWITCH_DTD,  LYK_REFRESH,
 /* ^T */            /* ^U */        /* ^V */       /* ^W */
 
@@ -216,7 +210,7 @@ LYK_PREV_LINK,    LYK_NEXT_LINK,    LYK_ACTIVATE,   LYK_PREV_DOC,
 LYK_NEXT_PAGE,    LYK_PREV_PAGE,    LYK_HOME,       LYK_END,
 /* PGDOWN */      /* PGUP */        /* HOME */      /* END */
 
-#if (defined(_WINDOWS) || defined(__DJGPP__) || defined(__CYGWIN__))
+#if (defined(_WINDOWS) || defined(__DJGPP__))
 
 LYK_DWIMHELP,          0,              0,             0,
 /* F1*/
@@ -225,7 +219,7 @@ LYK_DWIMHELP,          0,              0,             0,
 LYK_DWIMHELP,     LYK_ACTIVATE,     LYK_HOME,       LYK_END,
 /* F1*/ 	  /* Do key */      /* Find key */  /* Select key */
 
-#endif /* _WINDOWS || __DJGPP__ || __CYGWIN__ */
+#endif /* _WINDOWS || __DJGPP__ */
 
 LYK_UP_TWO,       LYK_DOWN_TWO,     LYK_DO_NOTHING, LYK_FASTBACKW_LINK,
 /* Insert key */  /* Remove key */  /* DO_NOTHING*/ /* Back tab */
@@ -935,11 +929,9 @@ PRIVATE Kcmd revmap[] = {
 	LYK_INSTALL, "INSTALL",
 	"install file or tagged files into a system area" ),
 #endif /* DIRED_SUPPORT */
-#ifdef SH_EX /* 1999/01/01 (Fri) 01:18:12 */
     DATA(
 	LYK_CHG_CENTER, "CHANGE_CENTER",
 	"toggle center alignment in HTML TABLE" ),
-#endif
 #ifdef KANJI_CODE_OVERRIDE
     DATA(
 	LYK_CHG_KCODE, "CHANGE_KCODE",
@@ -991,7 +983,7 @@ PRIVATE CONST struct {
     { ' ',		"<space>" },
     { '<',		"<" },
     { '>',		">" },
-    { 0177,		"<delete>" },
+    { CH_DEL,		"<delete>" },
     { UPARROW,		"Up Arrow" },
     { DNARROW,		"Down Arrow" },
     { RTARROW,		"Right Arrow" },
@@ -1172,9 +1164,9 @@ PUBLIC char *LYKeycodeToString ARGS2 (
 	else if (c < ' ')
 	    sprintf(buf, "^%c", c|0100);
 	else if (c >= 0400)
-	    sprintf(buf, "key-%#x", c);
+	    sprintf(buf, "key-0x%x", c);
 	else
-	    return 0;
+	    sprintf(buf, "0x%x", c);
     }
     return buf;
 }
@@ -1186,14 +1178,19 @@ PUBLIC int LYStringToKeycode ARGS1 (
     int key = -1;
     int len = strlen(src);
 
-    if (len == 1)
+    if (len == 1) {
 	key = *src;
-    else if (len == 2 && *src == '^')
+    } else if (len == 2 && *src == '^') {
 	key = src[1] & 0x1f;
-    else if (len > 6 && !strncasecomp(src, "key-", 4)) {
+    } else if (len > 2 && !strncasecomp(src, "0x", 2)) {
+	char *dst = 0;
+	key = strtol(src, &dst, 0);
+	if (isEmpty(dst))
+	    key = -1;
+    } else if (len > 6 && !strncasecomp(src, "key-", 4)) {
 	char *dst = 0;
 	key = strtol(src + 4, &dst, 0);
-	if (dst == 0 || *dst != 0)
+	if (isEmpty(dst))
 	    key = -1;
     }
     if (key < 0) {
@@ -1504,125 +1501,129 @@ PUBLIC int remap ARGS3(
     return 0;
 }
 
+typedef struct {
+    int	code;
+    LYKeymap_t map;
+    LYKeymap_t save;
+} ANY_KEYS;
+
+/*
+ * Save the given keys in the table, setting them to the map'd value.
+ */
+PRIVATE void set_any_keys ARGS2(
+	ANY_KEYS *,	table,
+	int,		size)
+{
+    int j, k;
+
+    for (j = 0; j < size; ++j) {
+	k = table[j].code + 1;
+	table[j].save = keymap[k];
+	keymap[k] = table[j].map;
+    }
+}
+
+/*
+ * Restore the given keys from the table.
+ */
+PRIVATE void reset_any_keys ARGS2(
+	ANY_KEYS *,	table,
+	int,		size)
+{
+    int j, k;
+
+    for (j = 0; j < size; ++j) {
+	k = table[j].code + 1;
+	keymap[k] = table[j].save;
+    }
+}
+
+static ANY_KEYS vms_keys_table[] = {
+    { 26,   LYK_ABORT,   0 },	/* control-Z */
+    { '$',  LYK_SHELL,   0 },
+};
 
 PUBLIC void set_vms_keys NOARGS
 {
-      keymap[26+1] = LYK_ABORT;  /* control-Z */
-      keymap['$'+1] = LYK_SHELL;
+    set_any_keys(vms_keys_table, TABLESIZE(vms_keys_table));
 }
 
-static LYKeymap_t saved_vi_keys[4];
+static ANY_KEYS vi_keys_table[] = {
+    { 'h', LYK_PREV_DOC,  0 },
+    { 'j', LYK_NEXT_LINK, 0 },
+    { 'k', LYK_PREV_LINK, 0 },
+    { 'l', LYK_ACTIVATE,  0 },
+};
+
 static BOOLEAN did_vi_keys;
 
 PUBLIC void set_vi_keys NOARGS
 {
-      saved_vi_keys[0] = keymap['h'+1];
-      keymap['h'+1] = LYK_PREV_DOC;
-      saved_vi_keys[1] = keymap['j'+1];
-      keymap['j'+1] = LYK_NEXT_LINK;
-      saved_vi_keys[2] = keymap['k'+1];
-      keymap['k'+1] = LYK_PREV_LINK;
-      saved_vi_keys[3] = keymap['l'+1];
-      keymap['l'+1] = LYK_ACTIVATE;
-
-      did_vi_keys = TRUE;
+    set_any_keys(vi_keys_table, TABLESIZE(vi_keys_table));
+    did_vi_keys = TRUE;
 }
 
 PUBLIC void reset_vi_keys NOARGS
 {
-      if (!did_vi_keys)
-              return;
-
-      keymap['h'+1] = saved_vi_keys[0];
-      keymap['j'+1] = saved_vi_keys[1];
-      keymap['k'+1] = saved_vi_keys[2];
-      keymap['l'+1] = saved_vi_keys[3];
-
-      did_vi_keys = FALSE;
+    if (did_vi_keys) {
+	reset_any_keys(vi_keys_table, TABLESIZE(vi_keys_table));
+	did_vi_keys = FALSE;
+    }
 }
 
-static LYKeymap_t saved_emacs_keys[4];
+static ANY_KEYS emacs_keys_table[] = {
+    { 2,  LYK_PREV_DOC,  0 },	/* ^B */
+    { 14, LYK_NEXT_LINK, 0 },	/* ^N */
+    { 16, LYK_PREV_LINK, 0 },	/* ^P */
+    { 6,  LYK_ACTIVATE,  0 },	/* ^F */
+};
+
 static BOOLEAN did_emacs_keys;
 
 PUBLIC void set_emacs_keys NOARGS
 {
-      saved_emacs_keys[0] = keymap[2+1];
-      keymap[2+1] = LYK_PREV_DOC;       /* ^B */
-      saved_emacs_keys[1] = keymap[14+1];
-      keymap[14+1] = LYK_NEXT_LINK;     /* ^N */
-      saved_emacs_keys[2] = keymap[16+1];
-      keymap[16+1] = LYK_PREV_LINK;     /* ^P */
-      saved_emacs_keys[3] = keymap[6+1];
-      keymap[6+1] = LYK_ACTIVATE;         /* ^F */
-
-      did_emacs_keys = TRUE;
+    set_any_keys(emacs_keys_table, TABLESIZE(emacs_keys_table));
+    did_emacs_keys = TRUE;
 }
 
 PUBLIC void reset_emacs_keys NOARGS
 {
-      if (!did_emacs_keys)
-              return;
-
-      keymap[2+1] = saved_emacs_keys[0];
-      keymap[14+1] = saved_emacs_keys[1];
-      keymap[16+1] = saved_emacs_keys[2];
-      keymap[6+1] = saved_emacs_keys[3];
-
-      did_emacs_keys = FALSE;
+    if (did_emacs_keys) {
+	reset_any_keys(emacs_keys_table, TABLESIZE(emacs_keys_table));
+	did_emacs_keys = FALSE;
+    }
 }
 
-static LYKeymap_t saved_number_keys[9];
+/*
+ * Map numbers to functions as labeled on the IBM Enhanced keypad, and save
+ * their original mapping for reset_numbers_as_arrows().  - FM
+ */
+static ANY_KEYS number_keys_table[] = {
+    { '1', LYK_END,        0 },
+    { '2', LYK_NEXT_LINK,  0 },
+    { '3', LYK_NEXT_PAGE,  0 },
+    { '4', LYK_PREV_DOC,   0 },
+    { '5', LYK_DO_NOTHING, 0 },
+    { '6', LYK_ACTIVATE,   0 },
+    { '7', LYK_HOME,       0 },
+    { '8', LYK_PREV_LINK,  0 },
+    { '9', LYK_PREV_PAGE,  0 },
+};
+
 static BOOLEAN did_number_keys;
 
 PUBLIC void set_numbers_as_arrows NOARGS
 {
-    /*
-     *  Map numbers to functions as labeled on the
-     *  IBM Enhanced keypad, and save their original
-     *  mapping for reset_numbers_as_arrows(). - FM
-     */
-    saved_number_keys[0] = keymap['4'+1];
-    keymap['4'+1] = LYK_PREV_DOC;
-    saved_number_keys[1] = keymap['2'+1];
-    keymap['2'+1] = LYK_NEXT_LINK;
-    saved_number_keys[2] = keymap['8'+1];
-    keymap['8'+1] = LYK_PREV_LINK;
-    saved_number_keys[3] = keymap['6'+1];
-    keymap['6'+1] = LYK_ACTIVATE;
-    saved_number_keys[4] = keymap['7'+1];
-    keymap['7'+1] = LYK_HOME;
-    saved_number_keys[5] = keymap['1'+1];
-    keymap['1'+1] = LYK_END;
-    saved_number_keys[6] = keymap['9'+1];
-    keymap['9'+1] = LYK_PREV_PAGE;
-    saved_number_keys[7] = keymap['3'+1];
-    keymap['3'+1] = LYK_NEXT_PAGE;
-
-    /*
-     *  Disable the 5.
-     */
-    saved_number_keys[8] = keymap['5'+1];
-    keymap['5'+1] = LYK_DO_NOTHING;
-
+    set_any_keys(number_keys_table, TABLESIZE(number_keys_table));
     did_number_keys = TRUE;
 }
 
 PUBLIC void reset_numbers_as_arrows NOARGS
 {
-    if (!did_number_keys)
-	return;
-
-    keymap['4'+1] = saved_number_keys[0];
-    keymap['2'+1] = saved_number_keys[1];
-    keymap['8'+1] = saved_number_keys[2];
-    keymap['6'+1] = saved_number_keys[3];
-    keymap['7'+1] = saved_number_keys[4];
-    keymap['1'+1] = saved_number_keys[5];
-    keymap['9'+1] = saved_number_keys[6];
-    keymap['3'+1] = saved_number_keys[7];
-    keymap['5'+1] = saved_number_keys[8];
-
-    did_number_keys = FALSE;
+    if (did_number_keys) {
+	reset_any_keys(number_keys_table, TABLESIZE(number_keys_table));
+	did_number_keys = FALSE;
+    }
 }
 
 PUBLIC char *key_for_func ARGS1 (
@@ -1655,6 +1656,7 @@ PUBLIC char *fmt_keys ARGS2(
     BOOLEAN quotes = FALSE;
     char *fmt_first;
     char *fmt_second;
+
     if (lkc_first < 0)
 	return NULL;
     fmt_first = LYKeycodeToString(lkc_first, TRUE);
diff --git a/gnu/usr.bin/lynx/src/LYKeymap.h b/gnu/usr.bin/lynx/src/LYKeymap.h
index 18db17c0dbc..c159530e53b 100644
--- a/gnu/usr.bin/lynx/src/LYKeymap.h
+++ b/gnu/usr.bin/lynx/src/LYKeymap.h
@@ -229,9 +229,7 @@ typedef enum {
 #define LYK_TAG_LINK      LYK_UNKNOWN
 #endif /* DIRED_SUPPORT */
 
-#ifdef SH_EX
   , LYK_CHG_CENTER
-#endif /* SH_EX */
 
 #ifdef KANJI_CODE_OVERRIDE
   , LYK_CHG_KCODE
diff --git a/gnu/usr.bin/lynx/src/LYLeaks.c b/gnu/usr.bin/lynx/src/LYLeaks.c
index 6f188ebeeb6..84ef77f3e72 100644
--- a/gnu/usr.bin/lynx/src/LYLeaks.c
+++ b/gnu/usr.bin/lynx/src/LYLeaks.c
@@ -2,6 +2,11 @@
 **	Copyright (c) 1994, University of Kansas, All Rights Reserved
 **
 **	This code will be used only if LY_FIND_LEAKS is defined.
+**
+**  Revision History:
+**	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
+**	10-30-97	modified to handle StrAllocCopy() and
+**			  StrAllocCat(). - KW & FM
 */
 
 /*
@@ -13,15 +18,142 @@
 #include <LYexit.h>
 #include <LYLeaks.h>
 #include <LYUtils.h>
+#include <LYGlobalDefs.h>
+
+#ifdef LY_FIND_LEAKS
 
 PRIVATE AllocationList *ALp_RunTimeAllocations = NULL;
 
-PRIVATE void AddToList PARAMS((
-	AllocationList *	ALp_new));
-PRIVATE AllocationList *FindInList PARAMS((
-	void *			vp_find));
-PRIVATE void RemoveFromList PARAMS((
-	AllocationList *	ALp_del));
+#define LEAK_SUMMARY
+
+#ifdef LEAK_SUMMARY
+
+PRIVATE long now_allocated = 0;
+PRIVATE long peak_alloced = 0;
+
+PRIVATE long total_alloced = 0;
+PRIVATE long total_freed = 0;
+
+PRIVATE long count_mallocs = 0;
+PRIVATE long count_frees = 0;
+
+PRIVATE void CountMallocs ARGS1(long, size)
+{
+    ++count_mallocs;
+    total_alloced += size;
+    now_allocated += size;
+    if (peak_alloced < now_allocated)
+	peak_alloced = now_allocated;
+}
+
+PRIVATE void CountFrees ARGS1(long, size)
+{
+    ++count_frees;
+    total_freed += size;
+    now_allocated -= size;
+}
+#else
+#define CountMallocs() ++count_mallocs
+#define CountFrees() /* nothing */
+#endif
+
+/*
+**  Purpose:	Add a new allocation item to the list.
+**  Arguments:		ALp_new The new item to add.
+**  Return Value:	void
+**  Remarks/Portability/Dependencies/Restrictions:
+**		Static function made to make code reusable in projects beyond
+**		Lynx (some might ask why not use HTList).
+**  Revision History:
+**	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
+*/
+PRIVATE void AddToList ARGS1(
+	AllocationList *,	ALp_new)
+{
+    /*
+     *	Just make this the first item in the list.
+     */
+    ALp_new->ALp_Next = ALp_RunTimeAllocations;
+    ALp_RunTimeAllocations = ALp_new;
+}
+
+/*
+**  Purpose:	Find the place in the list where vp_find is currently
+**		tracked.
+**  Arguments:		vp_find A pointer to look for in the list.
+**  Return Value:	AllocationList *	Either vp_find's place in the
+**						list or NULL if not found.
+**  Remarks/Portability/Dependencies/Restrictions:
+**		Static function made to make code reusable in projects outside
+**		of Lynx (some might ask why not use HTList).
+**  Revision History:
+**	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
+*/
+PRIVATE AllocationList *FindInList ARGS1(
+	void *,		vp_find)
+{
+    AllocationList *ALp_find = ALp_RunTimeAllocations;
+
+    /*
+     *	Go through the list of allocated pointers until end of list
+     *		or vp_find is found.
+     */
+    while (ALp_find != NULL) {
+	if (ALp_find->vp_Alloced == vp_find) {
+	    break;
+	}
+	ALp_find = ALp_find->ALp_Next;
+    }
+
+    return(ALp_find);
+}
+
+/*
+**  Purpose:	Remove the specified item from the list.
+**  Arguments:		ALp_del The item to remove from the list.
+**  Return Value:	void
+**  Remarks/Portability/Dependencies/Restrictions:
+**		Static function made to make code reusable in projects outside
+**		of Lynx (some might ask why not use HTList).
+**  Revision History:
+**	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
+*/
+PRIVATE void RemoveFromList ARGS1(
+	AllocationList *,	ALp_del)
+{
+    AllocationList *ALp_findbefore = ALp_RunTimeAllocations;
+
+    /*
+     *	There is one special case, where the item to remove is the
+     *		first in the list.
+     */
+    if (ALp_del == ALp_findbefore) {
+	ALp_RunTimeAllocations = ALp_del->ALp_Next;
+	return;
+    }
+
+    /*
+     *	Loop through checking all of the next values, if a match
+     *	don't continue.  Always assume the item will be found.
+     */
+    while (ALp_findbefore->ALp_Next != ALp_del) {
+	ALp_findbefore = ALp_findbefore->ALp_Next;
+    }
+
+    /*
+     *	We are one item before the one to get rid of.
+     *	Get rid of it.
+     */
+    ALp_findbefore->ALp_Next = ALp_del->ALp_Next;
+}
+
+/*
+ *  Make the malloc-sequence available for debugging/tracing.
+ */
+PUBLIC long LYLeakSequence NOARGS
+{
+    return count_mallocs;
+}
 
 /*
 **  Purpose:	Print a report of all memory left unallocated by
@@ -36,10 +168,6 @@ PRIVATE void RemoveFromList PARAMS((
 **		in main.
 **		All output of this function is sent to the file defined in
 **		the header LYLeaks.h (LEAKAGE_SINK).
-**  Revision History:
-**	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
-**	10-30-97	modified to handle StrAllocCopy() and
-**			  StrAllocCat(). - KW & FM
 */
 PUBLIC void LYLeaks NOARGS
 {
@@ -47,6 +175,9 @@ PUBLIC void LYLeaks NOARGS
     size_t st_total = (size_t)0;
     FILE *Fp_leakagesink;
 
+    if (LYfind_leaks == FALSE)
+	return;
+
     /*
      *	Open the leakage sink to take all the output.
      *	Recreate the file each time.
@@ -76,6 +207,9 @@ PUBLIC void LYLeaks NOARGS
 	     */
 	    fprintf(Fp_leakagesink, "%s.\n",
 		    gettext("Invalid pointer detected."));
+	    fprintf(Fp_leakagesink, "%s\t%ld\n",
+		    gettext("Sequence:"),
+		    ALp_head->st_Sequence);
 	    fprintf(Fp_leakagesink, "%s\t%p\n",
 		    gettext("Pointer:"), ALp_head->vp_BadRequest);
 
@@ -113,6 +247,9 @@ PUBLIC void LYLeaks NOARGS
 
 	    fprintf(Fp_leakagesink, "%s\n",
 		    gettext("Memory leak detected."));
+	    fprintf(Fp_leakagesink, "%s\t%ld\n",
+		    gettext("Sequence:"),
+		    ALp_head->st_Sequence);
 	    fprintf(Fp_leakagesink, "%s\t%p\n",
 		    gettext("Pointer:"),
 		    ALp_head->vp_Alloced);
@@ -166,12 +303,21 @@ PUBLIC void LYLeaks NOARGS
      *	Give a grand total of the leakage.
      *	Close the output file.
      */
-    fprintf(Fp_leakagesink, "\n%s\t%u\n",
+    fprintf(Fp_leakagesink, "%s\t%u\n",
 	    gettext("Total memory leakage this run:"),
 	    (unsigned)st_total);
+#ifdef LEAK_SUMMARY
+    fprintf(Fp_leakagesink, "%s\t%ld\n", gettext("Peak allocation"), peak_alloced);
+    fprintf(Fp_leakagesink, "%s\t%ld\n", gettext("Bytes allocated"), total_alloced);
+    fprintf(Fp_leakagesink, "%s\t%ld\n", gettext("Total mallocs"), count_mallocs);
+    fprintf(Fp_leakagesink, "%s\t%ld\n", gettext("Total frees"), count_frees);
+#endif
     fclose(Fp_leakagesink);
 
     HTSYS_purge(LEAKAGE_SINK);
+#if defined(NCURSES) && defined(HAVE__NC_FREEALL)
+    _nc_freeall();
+#endif
 }
 
 /*
@@ -196,10 +342,16 @@ PUBLIC void *LYLeakMalloc ARGS3(
 	CONST char *,	cp_File,
 	CONST short,	ssi_Line)
 {
+    void *vp_malloc;
+
+    if (LYfind_leaks == FALSE)
+	return (void *)malloc(st_bytes);
+
     /*
      *	Do the actual allocation.
      */
-    void *vp_malloc = (void *)malloc(st_bytes);
+    vp_malloc = (void *)malloc(st_bytes);
+    CountMallocs(st_bytes);
 
     /*
      *	Only on successful allocation do we track any information.
@@ -219,6 +371,7 @@ PUBLIC void *LYLeakMalloc ARGS3(
 	 *  There is no need to allocate more memory for the
 	 *  file name as it is a static string anyhow.
 	 */
+	ALp_new->st_Sequence = count_mallocs;
 	ALp_new->vp_Alloced = vp_malloc;
 	ALp_new->st_Bytes = st_bytes;
 	ALp_new->SL_memory.cp_FileName = cp_File;
@@ -238,7 +391,7 @@ PUBLIC void *LYLeakMalloc ARGS3(
 **		after a call to malloc or calloc or an equivalent
 **		function which may or may not have already created
 **		a list entry.
-**  Arguments:	vp_malloc	The pointer to newly allocate memory.
+**  Arguments:	vp_malloc	The pointer to newly allocated memory.
 **  Arguments:	st_bytes	The size of the allocation requested
 **				in bytes.
 **		cp_File		The file from which the request for
@@ -260,6 +413,10 @@ PUBLIC AllocationList *LYLeak_mark_malloced ARGS4(
 	CONST short,	ssi_Line)
 {
     AllocationList *ALp_new = NULL;
+
+    if (LYfind_leaks == FALSE)
+	return NULL;
+
     /*
      *	The actual allocation has already been done!
      *
@@ -324,10 +481,16 @@ PUBLIC void *LYLeakCalloc ARGS4(
 	CONST char *,	cp_File,
 	CONST short,	ssi_Line)
 {
+    void *vp_calloc;
+
+    if (LYfind_leaks == FALSE)
+	return (void *)calloc(st_number, st_bytes);
+
     /*
      *	Allocate the requested memory.
      */
-    void *vp_calloc = (void *)calloc(st_number, st_bytes);
+    vp_calloc = (void *)calloc(st_number, st_bytes);
+    CountMallocs(st_bytes);
 
     /*
      *	Only if the allocation was a success do we track information.
@@ -348,6 +511,7 @@ PUBLIC void *LYLeakCalloc ARGS4(
 	 *  There is no need to allocate memory for the file
 	 *  name as it is a static string anyway.
 	 */
+	ALp_new->st_Sequence = count_mallocs;
 	ALp_new->vp_Alloced = vp_calloc;
 	ALp_new->st_Bytes = (st_number * st_bytes);
 	ALp_new->SL_memory.cp_FileName = cp_File;
@@ -393,6 +557,9 @@ PUBLIC void *LYLeakRealloc ARGS4(
     void *vp_realloc;
     AllocationList *ALp_renew;
 
+    if (LYfind_leaks == FALSE)
+	return (void *)realloc(vp_Alloced, st_newBytes);
+
     /*
      *	If we are asked to resize a NULL pointer, this is just a
      *	malloc call.
@@ -439,7 +606,11 @@ PUBLIC void *LYLeakRealloc ARGS4(
      *	If not NULL, record the information.
      */
     vp_realloc = (void *)realloc(vp_Alloced, st_newBytes);
+    CountMallocs(st_newBytes);
+    CountFrees(ALp_renew->st_Bytes);
+
     if (vp_realloc != NULL) {
+	ALp_renew->st_Sequence = count_mallocs;
 	ALp_renew->vp_Alloced = vp_realloc;
 	ALp_renew->st_Bytes = st_newBytes;
 
@@ -531,6 +702,11 @@ PUBLIC void LYLeakFree ARGS3(
 {
     AllocationList *ALp_free;
 
+    if (LYfind_leaks == FALSE) {
+	free(vp_Alloced);
+	return;
+    }
+
     /*
      *	Find the pointer in the allocated list.
      *	If not found, bad pointer.
@@ -567,6 +743,7 @@ PUBLIC void LYLeakFree ARGS3(
 	 *  Free off the memory.
 	 *  Take entry out of allocation list.
 	 */
+	CountFrees(ALp_free->st_Bytes);
 	RemoveFromList(ALp_free);
 	FREE(ALp_free);
 	FREE(vp_Alloced);
@@ -643,6 +820,7 @@ PUBLIC char * LYLeakSACat ARGS4(
 }
 
 #if defined(LY_FIND_LEAKS) && defined(LY_FIND_LEAKS_EXTENDED)
+
 PUBLIC CONST char * leak_cp_File_hack = __FILE__;
 PUBLIC short leak_ssi_Line_hack = __LINE__;
 
@@ -702,6 +880,11 @@ PRIVATE char * LYLeakSAVsprintf ARGS6(
     if (!dest)
 	return NULL;
 
+    if (LYfind_leaks == FALSE) {
+	StrAllocVsprintf(dest, inuse, fmt, ap);
+	return (*dest);
+    }
+
     vp_oldAlloced = *dest;
     if (!vp_oldAlloced) {
 	StrAllocVsprintf(dest, inuse, fmt, ap);
@@ -785,7 +968,7 @@ PRIVATE char * LYLeakSAVsprintf ARGS6(
 
 /* Note: the following may need updating if HTSprintf in HTString.c
  * is changed. - kw */
-#if ANSI_VARARGS
+#ifdef ANSI_VARARGS
 PRIVATE char * LYLeakHTSprintf (char **pstr, CONST char *fmt, ...)
 #else
 PRIVATE char * LYLeakHTSprintf (va_alist)
@@ -797,7 +980,7 @@ PRIVATE char * LYLeakHTSprintf (va_alist)
     va_list ap;
     LYva_start(ap,fmt);
     {
-#if !ANSI_VARARGS
+#ifndef ANSI_VARARGS
 	char **		pstr = va_arg(ap, char **);
 	CONST char *	fmt  = va_arg(ap, CONST char *);
 #endif
@@ -812,7 +995,7 @@ PRIVATE char * LYLeakHTSprintf (va_alist)
 
 /* Note: the following may need updating if HTSprintf0 in HTString.c
  * is changed. - kw */
-#if ANSI_VARARGS
+#ifdef ANSI_VARARGS
 PRIVATE char * LYLeakHTSprintf0 (char **pstr, CONST char *fmt, ...)
 #else
 PRIVATE char * LYLeakHTSprintf0 (va_alist)
@@ -823,7 +1006,7 @@ PRIVATE char * LYLeakHTSprintf0 (va_alist)
     va_list ap;
     LYva_start(ap,fmt);
     {
-#if !ANSI_VARARGS
+#ifndef ANSI_VARARGS
 	char **		pstr = va_arg(ap, char **);
 	CONST char *	fmt  = va_arg(ap, CONST char *);
 #endif
@@ -862,94 +1045,9 @@ PUBLIC HTSprintflike *Get_htsprintf0_fn ARGS2(
     return &LYLeakHTSprintf0;
 }
 
-#endif /* not LY_FIND_LEAKS and LY_FIND_LEAKS_EXTENDED */
-
-/*
-**  Purpose:	Add a new allocation item to the list.
-**  Arguments:		ALp_new The new item to add.
-**  Return Value:	void
-**  Remarks/Portability/Dependencies/Restrictions:
-**		Static function made to make code reusable in projects beyond
-**		Lynx (some might ask why not use HTList).
-**  Revision History:
-**	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
-*/
-PRIVATE void AddToList ARGS1(
-	AllocationList *,	ALp_new)
-{
-    /*
-     *	Just make this the first item in the list.
-     */
-    ALp_new->ALp_Next = ALp_RunTimeAllocations;
-    ALp_RunTimeAllocations = ALp_new;
-}
-
-/*
-**  Purpose:	Find the place in the list where vp_find is currently
-**		tracked.
-**  Arguments:		vp_find A pointer to look for in the list.
-**  Return Value:	AllocationList *	Either vp_find's place in the
-**						list or NULL if not found.
-**  Remarks/Portability/Dependencies/Restrictions:
-**		Static function made to make code reusable in projects outside
-**		of Lynx (some might ask why not use HTList).
-**  Revision History:
-**	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
-*/
-PRIVATE AllocationList *FindInList ARGS1(
-	void *,		vp_find)
-{
-    AllocationList *ALp_find = ALp_RunTimeAllocations;
-
-    /*
-     *	Go through the list of allocated pointers until end of list
-     *		or vp_find is found.
-     */
-    while (ALp_find != NULL) {
-	if (ALp_find->vp_Alloced == vp_find) {
-	    break;
-	}
-	ALp_find = ALp_find->ALp_Next;
-    }
-
-    return(ALp_find);
-}
-
-/*
-**  Purpose:	Remove the specified item from the list.
-**  Arguments:		ALp_del The item to remove from the list.
-**  Return Value:	void
-**  Remarks/Portability/Dependencies/Restrictions:
-**		Static function made to make code reusable in projects outside
-**		of Lynx (some might ask why not use HTList).
-**  Revision History:
-**	05-26-94	created Lynx 2-3-1 Garrett Arch Blythe
-*/
-PRIVATE void RemoveFromList ARGS1(
-	AllocationList *,	ALp_del)
-{
-    AllocationList *ALp_findbefore = ALp_RunTimeAllocations;
-
-    /*
-     *	There is one special case, where the item to remove is the
-     *		first in the list.
-     */
-    if (ALp_del == ALp_findbefore) {
-	ALp_RunTimeAllocations = ALp_del->ALp_Next;
-	return;
-    }
-
-    /*
-     *	Loop through checking all of the next values, if a match
-     *	don't continue.  Always assume the item will be found.
-     */
-    while (ALp_findbefore->ALp_Next != ALp_del) {
-	ALp_findbefore = ALp_findbefore->ALp_Next;
-    }
-
-    /*
-     *	We are one item before the one to get rid of.
-     *	Get rid of it.
-     */
-    ALp_findbefore->ALp_Next = ALp_del->ALp_Next;
-}
+#endif /* LY_FIND_LEAKS and LY_FIND_LEAKS_EXTENDED */
+#else
+/* Standard C forbids an empty file */
+void no_leak_checking NOPARAMS;
+void no_leak_checking NOARGS { }
+#endif /* LY_FIND_LEAKS */
diff --git a/gnu/usr.bin/lynx/src/LYList.c b/gnu/usr.bin/lynx/src/LYList.c
index fcc1ad7441a..4fe9a117ac9 100644
--- a/gnu/usr.bin/lynx/src/LYList.c
+++ b/gnu/usr.bin/lynx/src/LYList.c
@@ -14,6 +14,7 @@
 #include <LYGlobalDefs.h>
 #include <LYCharUtils.h>
 #include <LYCharSets.h>
+#include <LYHistory.h>
 
 #ifdef DIRED_SUPPORT
 #include <LYUpload.h>
@@ -35,7 +36,7 @@
 
 
 PUBLIC int showlist ARGS2(
-	document *,	newdoc,
+	DocInfo *,	newdoc,
 	BOOLEAN,	titles)
 {
     int cnt;
@@ -47,6 +48,7 @@ PUBLIC int showlist ARGS2(
     char *LinkTitle = NULL;  /* Rel stored as property of link, not of dest */
     BOOLEAN intern_w_post = FALSE;
     char *desc = "unknown field or link";
+    void* helper;
 
     refs = HText_sourceAnchors(HTMainText);
     hidden_links = HText_HiddenLinkCount(HTMainText);
@@ -60,16 +62,8 @@ PUBLIC int showlist ARGS2(
 	return(-1);
     }
 
-    if (LYReuseTempfiles && titles == last_titles) {
-	fp0 = LYOpenTempRewrite(tempfile, HTML_SUFFIX, "w");
-    } else {
-	LYRemoveTemp(tempfile);
-	fp0 = LYOpenTemp(tempfile, HTML_SUFFIX, "w");
-    }
-    if (fp0 == NULL) {
-	HTUserMsg(CANNOT_OPEN_TEMP);
+    if ((fp0 = InternalPageFP(tempfile, titles == last_titles)) == 0)
 	return(-1);
-    }
 
     LYLocalFileToURL(&(newdoc->address), tempfile);
 
@@ -101,8 +95,9 @@ PUBLIC int showlist ARGS2(
 	if (LYHiddenLinks == HIDDENLINKS_IGNORE)
 	    hidden_links = 0;
     }
+    helper = NULL; /* init */
     for (cnt = 1; cnt <= refs; cnt++) {
-	HTChildAnchor *child = HText_childNumber(cnt);
+	HTChildAnchor *child = HText_childNextNumber(cnt, &helper);
 	HTAnchor *dest_intl = NULL;
 	HTAnchor *dest;
 	HTParentAnchor *parent;
@@ -123,7 +118,7 @@ PUBLIC int showlist ARGS2(
 	     *	right in connection with always treating this file as
 	     *	HIDDENLINKS_MERGE in GridText.c - kw
 	     */
-	    if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) {
+	    if (fields_are_numbered()) {
 		HText_FormDescNumber(cnt, (char **)&desc);
 		fprintf(fp0,
 		"<li><a id=%d href=\"#%d\">form field</a> = <em>%s</em>\n",
@@ -132,16 +127,16 @@ PUBLIC int showlist ARGS2(
 	    continue;
 	}
 #ifndef DONT_TRACK_INTERNAL_LINKS
-	dest_intl = HTAnchor_followTypedLink((HTAnchor *)child,
-						       LINK_INTERNAL);
+	dest_intl = HTAnchor_followTypedLink(child, HTInternalLink);
 #endif
 	dest = dest_intl ?
-	    dest_intl : HTAnchor_followMainLink((HTAnchor *)child);
+	    dest_intl : HTAnchor_followLink(child);
 	parent = HTAnchor_parent(dest);
 	if (!intern_w_post && dest_intl &&
-	    HTMainAnchor && HTMainAnchor->post_data &&
+	    HTMainAnchor &&
+	    HTMainAnchor->post_data &&
 	    parent->post_data &&
-	    !strcmp(HTMainAnchor->post_data, parent->post_data)) {
+	    BINEQ(HTMainAnchor->post_data, parent->post_data)) {
 	    /*
 	     *	Set flag to note that we had at least one internal link,
 	     *	if the document from which we are generating the list
@@ -155,11 +150,11 @@ PUBLIC int showlist ARGS2(
 	title = titles ? HTAnchor_title(parent) : NULL;
 	if (dest_intl) {
 	    HTSprintf0(&LinkTitle, "(internal)");
-	} else if (titles && child->mainLink.type &&
-		   dest == child->mainLink.dest &&
-		   !strncmp(HTAtom_name(child->mainLink.type),
+	} else if (titles && child->type &&
+		   dest == child->dest &&
+		   !strncmp(HTAtom_name(child->type),
 			    "RelTitle: ", 10)) {
-	    HTSprintf0(&LinkTitle, "(%s)", HTAtom_name(child->mainLink.type)+10);
+	    HTSprintf0(&LinkTitle, "(%s)", HTAtom_name(child->type)+10);
 	} else {
 	    FREE(LinkTitle);
 	}
@@ -170,7 +165,7 @@ PUBLIC int showlist ARGS2(
 	    LYformTitle(&Title, title);
 	    LYEntify(&Title, TRUE);
 	    if (*Title) {
-		cp = strchr(Address, '#');
+		cp = findPoundSelector(Address);
 	    } else {
 		FREE(Title);
 	    }
@@ -178,7 +173,7 @@ PUBLIC int showlist ARGS2(
 
 	fprintf(fp0, "<li><a href=\"%s\"%s>%s%s%s%s%s</a>\n", Address,
 			dest_intl ? " TYPE=\"internal link\"" : "",
-			LinkTitle ? LinkTitle : "",
+			NonNull(LinkTitle),
 			((HTAnchor*)parent != dest) && Title ? "in " : "",
 			(char *)(Title ? Title : Address),
 			(Title && cp) ? " - " : "",
@@ -230,8 +225,7 @@ PUBLIC int showlist ARGS2(
     if (intern_w_post) {
 	newdoc->internal_link = TRUE;
     } else {
-	FREE(newdoc->post_data);
-	FREE(newdoc->post_content_type);
+	LYFreePostData(newdoc);
 	newdoc->internal_link = FALSE;
     }
     newdoc->isHEAD = FALSE;
@@ -256,6 +250,7 @@ PUBLIC void printlist ARGS2(
     int refs, hidden_links;
     char *address = NULL;
     char *desc = gettext("unknown field or link");
+    void* helper;
 
     refs = HText_sourceAnchors(HTMainText);
     if (refs <= 0 && LYHiddenLinks != HIDDENLINKS_SEPARATE)
@@ -270,8 +265,9 @@ PUBLIC void printlist ARGS2(
 	    if (LYHiddenLinks == HIDDENLINKS_IGNORE)
 		hidden_links = 0;
 	}
+       helper = NULL; /* init */
 	for (cnt = 1; cnt <= refs; cnt++) {
-	    HTChildAnchor *child = HText_childNumber(cnt);
+	    HTChildAnchor *child = HText_childNextNumber(cnt, &helper);
 	    HTAnchor *dest;
 	    HTParentAnchor *parent;
 	    CONST char *title;
@@ -286,13 +282,13 @@ PUBLIC void printlist ARGS2(
 		 *  the list page match the numbering in the original document,
 		 *  but won't create a forward link to the form. - FM && LE
 		 */
-		if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) {
+		if (fields_are_numbered()) {
 		    HText_FormDescNumber(cnt, (char **)&desc);
 		    fprintf(fp, "%4d. form field = %s\n", cnt, desc);
 		}
 		continue;
 	    }
-	    dest = HTAnchor_followMainLink((HTAnchor *)child);
+	    dest = HTAnchor_followLink(child);
 	    /*
 	     *	Ignore if child anchor points to itself, i.e., we had
 	     *	something like <A NAME=xyz HREF="#xyz"> and it is not
diff --git a/gnu/usr.bin/lynx/src/LYList.h b/gnu/usr.bin/lynx/src/LYList.h
index 3c8e4c4e58b..dd0dee9f87f 100644
--- a/gnu/usr.bin/lynx/src/LYList.h
+++ b/gnu/usr.bin/lynx/src/LYList.h
@@ -3,7 +3,7 @@
 
 #include <LYStructs.h>
 
-extern int showlist PARAMS((document *newdoc, BOOLEAN titles));
+extern int showlist PARAMS((DocInfo *newdoc, BOOLEAN titles));
 extern void printlist PARAMS((FILE *fp, BOOLEAN titles));
 
 #endif /* LYLIST_H */
diff --git a/gnu/usr.bin/lynx/src/LYLocal.c b/gnu/usr.bin/lynx/src/LYLocal.c
index 4ef06fa24ae..65c20190b3e 100644
--- a/gnu/usr.bin/lynx/src/LYLocal.c
+++ b/gnu/usr.bin/lynx/src/LYLocal.c
@@ -110,6 +110,7 @@ struct dired_menu {
     char *href;
     struct dired_menu *next;
 } defmenu[] = {
+
 /*
  *  The following initializations determine the contents of the f)ull menu
  *  selection when in dired mode.  If any menu entries are defined in the
@@ -326,30 +327,13 @@ PRIVATE BOOLEAN ok_localname ARGS2(char*, dst, CONST char*, src)
  *  Execute DIRED command, return -1 or 0 on failure, 1 success.
  */
 PRIVATE int LYExecv ARGS3(
-	char *,		path,
+	CONST char *,	path,
 	char **,	argv,
 	char *,		msg)
 {
     int rc = 0;
-#if defined(VMS)
-    CTRACE((tfp, "LYExecv:  Called inappropriately!\n"));
-#else
-#if defined(_WINDOWS)
-    if (!strcmp(path, TOUCH_PATH)) {
-#if defined(__BORLANDC__) || defined(__MINGW32__)
-	int fd = _creat(argv[1], S_IREAD | S_IWRITE);
-#else /* Visual C++ */
-	int fd = _creat(argv[1], _S_IREAD | _S_IWRITE);
-#endif
-	if (fd >= 0) {
-	    close(fd);
-	    return(1);
-	}
-    } else if (!strcmp(path, RM_PATH)) {
-	rc = remove(argv[2]);
-    } else {
-	CTRACE((tfp, "LYExecv:  Called inappropriately! (path=%s)\n", path));
-    }
+#if defined(VMS) || defined(_WINDOWS)
+    CTRACE((tfp, "LYExecv:  Called inappropriately! (path=%s)\n", path));
 #else
     int n;
     char *tmpbuf = 0;
@@ -361,7 +345,7 @@ PRIVATE int LYExecv ARGS3(
     HTSprintf(&tmpbuf, "\n");
     rc = LYSystem(tmpbuf) ? 0 : 1;
 #else
-    pid_t pid;
+    int pid;
 #ifdef HAVE_TYPE_UNIONWAIT
     union wait wstatus;
 #else
@@ -410,8 +394,10 @@ PRIVATE int LYExecv ARGS3(
 		break;
 	    }
 #endif /* !HAVE_WAITPID */
-	    if (WEXITSTATUS(wstatus) != 0 ||
-		WTERMSIG(wstatus) > 0)	{ /* error return */
+	    if ((WIFEXITED(wstatus)
+	      && (WEXITSTATUS(wstatus) != 0))
+	     || (WIFSIGNALED(wstatus)
+	      && (WTERMSIG(wstatus) > 0)))	{ /* error return */
 		HTSprintf0(&tmpbuf, gettext("Probable failure to %s due to system error!"),
 				   msg);
 		rc = 0;
@@ -433,31 +419,140 @@ PRIVATE int LYExecv ARGS3(
 	FREE(tmpbuf);
     }
 
-#endif /* _WINDOWS */
-#endif /* VMS */
+#endif /* VMS || _WINDOWS */
     return(rc);
 }
-PRIVATE int move_file ARGS2(char *, source, char *, target)
+
+PRIVATE int make_directory ARGS1(char *, path)
 {
     int code;
-#ifdef WIN_EX	/* 1999/01/02 (Sat) 23:24:20 */
-    if ((code = rename(source, target)) != 0)
-	if ((code = LYCopyFile(source, target)) >= 0)
-	    code = remove(source);
-    if (code == 0)
-	code = 1;
+    CONST char *program;
+
+    if ((program = HTGetProgramPath(ppMKDIR)) != NULL) {
+	char *args[5];
+	char *msg = 0;
+
+	HTSprintf0(&msg,"make directory %s", path);
+	args[0] = "mkdir";
+	args[1] = path;
+	args[2] = (char *) 0;
+	code = (LYExecv(program, args, msg) <= 0) ? -1 : 1;
+	FREE(msg);
+    } else {
+#ifdef _WINDOWS
+	code = mkdir(path) ? -1 : 1;
 #else
-    char *msg = 0;
-    char *args[5];
-
-    HTSprintf0(&msg, gettext("move %s to %s"), source, target);
-    args[0] = "mv";
-    args[1] = source;
-    args[2] = target;
-    args[3] = (char *) 0;
-    code = (LYExecv(MV_PATH, args, msg) <= 0) ? -1 : 1;
-    FREE(msg);
+	code = mkdir(path, 0777) ? -1 : 1;
 #endif
+    }
+    return (code);
+}
+
+PRIVATE int remove_file ARGS1(char *, path)
+{
+    int code;
+    CONST char *program;
+
+    if ((program = HTGetProgramPath(ppRM)) != NULL) {
+	char *args[5];
+	char *tmpbuf = NULL;
+
+	args[0] = "rm";
+	args[1] = "-f";
+	args[2] = path;
+	args[3] = (char *) 0;
+	HTSprintf0(&tmpbuf, gettext("remove %s"), path);
+	code = LYExecv(program, args, tmpbuf);
+	FREE(tmpbuf);
+    } else {
+	code = remove(path) ? -1 : 1;
+    }
+    return (code);
+}
+
+PRIVATE int remove_directory ARGS1(char *, path)
+{
+    int code;
+    CONST char *program;
+
+    if ((program = HTGetProgramPath(ppRMDIR)) != NULL) {
+	char *args[5];
+	char *tmpbuf = NULL;
+
+	args[0] = "rmdir";
+	args[1] = path;
+	args[2] = (char *) 0;
+	HTSprintf0(&tmpbuf, gettext("remove %s"), path);
+	code = LYExecv(program, args, tmpbuf);
+	FREE(tmpbuf);
+    } else {
+	code = rmdir(path) ? -1 : 1;
+    }
+    return (code);
+}
+
+PRIVATE int touch_file ARGS1(char *, path)
+{
+    int code;
+    CONST char *program;
+
+    if ((program = HTGetProgramPath(ppTOUCH)) != NULL) {
+	char *args[5];
+	char *msg = NULL;
+
+	HTSprintf0(&msg, gettext("touch %s"), path);
+	args[0] = "touch";
+	args[1] = path;
+	args[2] = (char *) 0;
+	code = (LYExecv(program, args, msg) <= 0) ? -1 : 1;
+	FREE(msg);
+    } else {
+	FILE *fp;
+	if ((fp = fopen(path, "w")) != 0) {
+	    fclose(fp);
+	    code = 1;
+	} else {
+	    code = -1;
+	}
+    }
+    return (code);
+}
+
+PRIVATE int move_file ARGS2(char *, source, char *, target)
+{
+    int code;
+    CONST char *program;
+
+    if ((program = HTGetProgramPath(ppMV)) != NULL) {
+	char *msg = 0;
+	char *args[5];
+
+	HTSprintf0(&msg, gettext("move %s to %s"), source, target);
+	args[0] = "mv";
+	args[1] = source;
+	args[2] = target;
+	args[3] = (char *) 0;
+	code = (LYExecv(program, args, msg) <= 0) ? -1 : 1;
+	FREE(msg);
+    } else {
+	struct stat sb;
+	char *actual = 0;
+	/* the caller sets up a target directory; we need a file path */
+	if (stat(target, &sb) == 0
+	 && S_ISDIR(sb.st_mode)) {
+	    HTSprintf0(&actual, "%s/%s", target, LYPathLeaf(source));
+	    CTRACE((tfp, "move_file source=%s, target=%s\n", source, target));
+	    target = actual;
+	}
+	if ((code = rename(source, target)) != 0)
+	    if ((code = LYCopyFile(source, target)) >= 0)
+		code = remove(source);
+	if (code == 0)
+	    code = 1;
+	if (actual != target) {
+	    FREE(actual);
+	}
+    }
     return code;
 }
 
@@ -508,7 +603,6 @@ PRIVATE int remove_tagged NOARGS
     struct stat dir_info;
     int count;
     HTList *tag;
-    char *args[5];
 
     if (HTList_isEmpty(tagged))  /* should never happen */
 	return 0;
@@ -530,12 +624,7 @@ PRIVATE int remove_tagged NOARGS
 		will_clear = FALSE;
 		break;
 	    } else {
-		args[0] = "rm";
-		args[1] = "-rf";
-		args[2] = testpath;
-		args[3] = (char *) 0;
-		HTSprintf0(&tmpbuf, gettext("remove %s"), testpath);
-		if (LYExecv(RM_PATH, args, tmpbuf) <= 0) {
+		if (remove_file(testpath) <= 0) {
 		    if (count == 0) count = -1;
 		    will_clear = FALSE;
 		    break;
@@ -611,18 +700,18 @@ PRIVATE int modify_tagged ARGS1(
 	    if (cp) {
 		cp = strip_trailing_slash(cp);
 		cp = HTParse(".", cp, PARSE_PATH+PARSE_PUNCTUATION);
-		savepath = HTURLPath_toFile(cp, TRUE);
+		savepath = HTURLPath_toFile(cp, TRUE, FALSE);
 		FREE(cp);
 	    } else {	/* Last resort, should never happen. */
-		savepath = HTURLPath_toFile(".", TRUE);
+		savepath = HTURLPath_toFile(".", TRUE, FALSE);
 	    }
 	} else {
 	    if (!strncmp(cp, "file://localhost", 16)) {
 		cp += 16;
-	    } else if (!strncmp(cp, "file:", 5)) {
-		cp += 5;
+	    } else if (isFILE_URL(cp)) {
+		cp += LEN_FILE_URL;
 	    }
-	    savepath = HTURLPath_toFile(cp, TRUE);
+	    savepath = HTURLPath_toFile(cp, TRUE, FALSE);
 	}
 
 	if (!ok_stat(savepath, &dir_info)) {
@@ -684,7 +773,7 @@ PRIVATE int modify_tagged ARGS1(
 
 	/*
 	 *  Make sure the target location is a directory which is owned
-	 * by the same uid as the owner of the current location.
+	 *  by the same uid as the owner of the current location.
 	 */
 	if (dir_has_same_owner(&dir_info, owner)) {
 	    count = 0;
@@ -741,6 +830,7 @@ PRIVATE int modify_name ARGS1(
 	} else {
 	     return ok_file_or_dir(&dir_info);
 	}
+	LYstrncpy(tmpbuf, LYPathLeaf(testpath), sizeof(tmpbuf)-1);
 	if (get_filename(cp, tmpbuf, sizeof(tmpbuf)) == NULL)
 	    return 0;
 
@@ -788,7 +878,6 @@ PRIVATE int modify_location ARGS1(
      *	Determine the status of the selected item.
      */
     testpath = strip_trailing_slash(testpath);
-
     if (!ok_stat(testpath, &dir_info)) {
 	return 0;
     }
@@ -797,12 +886,19 @@ PRIVATE int modify_location ARGS1(
      *	Change the location of the file or directory.
      */
     if (S_ISDIR(dir_info.st_mode)) {
-	cp = gettext("Enter new location for directory: ");
+	if (HTGetProgramPath(ppMV) != NULL) {
+	    cp = gettext("Enter new location for directory: ");
+	} else {
+	    HTAlert(COULD_NOT_ACCESS_DIR);
+	    return 0;
+	}
     } else if (S_ISREG(dir_info.st_mode)) {
 	cp = gettext("Enter new location for file: ");
     } else {
 	return ok_file_or_dir(&dir_info);
     }
+    LYstrncpy(tmpbuf, testpath, sizeof(tmpbuf)-1);
+    *LYPathLeaf(tmpbuf) = '\0';
     if (get_filename(cp, tmpbuf, sizeof(tmpbuf)) == NULL)
 	return 0;
     if (strlen(tmpbuf)) {
@@ -839,14 +935,16 @@ PRIVATE int modify_location ARGS1(
 	if (!ok_stat(newpath, &dir_info)) {
 	    code = 0;
 	}
-
+#ifdef UNIX
 	/*
 	 *  Make sure the source and target are not the same location.
 	 */
 	else if (dev == dir_info.st_dev && inode == dir_info.st_ino) {
 	    HTAlert(gettext("Source and destination are the same location!  Request ignored!"));
 	    code = 0;
-	} else if (dir_has_same_owner(&dir_info, owner)) {
+	}
+#endif
+	else if (dir_has_same_owner(&dir_info, owner)) {
 	    code = move_file(savepath,newpath);
 	}
 	FREE(newpath);
@@ -859,7 +957,7 @@ PRIVATE int modify_location ARGS1(
  *  Modify name or location of a file or directory on localhost.
  */
 PUBLIC int local_modify ARGS2(
-	document *,	doc,
+	DocInfo *,	doc,
 	char **,	newpath)
 {
     int ans;
@@ -937,9 +1035,9 @@ PRIVATE int create_file ARGS1(
     int code = FALSE;
     char tmpbuf[DIRED_MAXBUF];
     char *testpath = NULL;
-    char *args[5];
     char *bad_chars = ".~/";
 
+    tmpbuf[0] = '\0';
     if (get_filename(gettext("Enter name of file to create: "),
 		     tmpbuf, sizeof(tmpbuf)) != NULL) {
 
@@ -962,13 +1060,7 @@ PRIVATE int create_file ARGS1(
 	     *  Make sure the target does not already exist
 	     */
 	    if (not_already_exists(testpath)) {
-		char *msg = 0;
-		HTSprintf0(&msg,gettext("create %s"),testpath);
-		args[0] = "touch";
-		args[1] = testpath;
-		args[2] = (char *) 0;
-		code = (LYExecv(TOUCH_PATH, args, msg) <= 0) ? -1 : 1;
-		FREE(msg);
+		code = touch_file(testpath);
 	    }
 	    FREE(testpath);
 	}
@@ -985,9 +1077,9 @@ PRIVATE int create_directory ARGS1(
     int code = FALSE;
     char tmpbuf[DIRED_MAXBUF];
     char *testpath = NULL;
-    char *args[5];
     char *bad_chars = ".~/";
 
+    tmpbuf[0] = '\0';
     if (get_filename(gettext("Enter name for new directory: "),
 		     tmpbuf, sizeof(tmpbuf)) != NULL) {
 
@@ -1007,13 +1099,7 @@ PRIVATE int create_directory ARGS1(
 	     *  Make sure the target does not already exist.
 	     */
 	    if (not_already_exists(testpath)) {
-		char *msg = 0;
-		HTSprintf0(&msg,"make directory %s",testpath);
-		args[0] = "mkdir";
-		args[1] = testpath;
-		args[2] = (char *) 0;
-		code = (LYExecv(MKDIR_PATH, args, msg) <= 0) ? -1 : 1;
-		FREE(msg);
+		code = make_directory(testpath);
 	    }
 	    FREE(testpath);
 	}
@@ -1025,7 +1111,7 @@ PRIVATE int create_directory ARGS1(
  *  Create a file or a directory at the current location.
  */
 PUBLIC int local_create ARGS1(
-	document *,	doc)
+	DocInfo *,	doc)
 {
     int ans;
     char *cp;
@@ -1061,7 +1147,7 @@ PRIVATE int remove_single ARGS1(
     char *cp;
     char *tmpbuf = 0;
     struct stat dir_info;
-    char *args[5];
+    BOOL is_directory = FALSE;
 
     if (!ok_lstat(testpath, &dir_info)) {
 	return 0;
@@ -1080,11 +1166,12 @@ PRIVATE int remove_single ARGS1(
 	/*** Course, it's probably broken for screen sizes other 80, too     ***/
 	if (strlen(cp) < 37) {
 	    HTSprintf0(&tmpbuf,
-		       gettext("Remove '%s' and all of its contents?"), cp);
+		       gettext("Remove directory '%s'?"), cp);
 	} else {
 	    HTSprintf0(&tmpbuf,
-		       gettext("Remove directory and all of its contents?"));
+		       gettext("Remove directory?"));
 	}
+	is_directory = TRUE;
     } else if (S_ISREG(dir_info.st_mode)) {
 	if (strlen(cp) < 60) {
 	    HTSprintf0(&tmpbuf, gettext("Remove file '%s'?"), cp);
@@ -1106,12 +1193,9 @@ PRIVATE int remove_single ARGS1(
     }
 
     if (HTConfirm(tmpbuf) == YES) {
-	HTSprintf0(&tmpbuf,"remove %s",testpath);
-	args[0] = "rm";
-	args[1] = "-rf";
-	args[2] = testpath;
-	args[3] = (char *) 0;
-	code = (LYExecv(RM_PATH, args, tmpbuf) <= 0) ? -1 : 1;
+	code = is_directory
+	     ? remove_directory(testpath)
+	     : remove_file(testpath);
     }
     FREE(tmpbuf);
     return code;
@@ -1121,7 +1205,7 @@ PRIVATE int remove_single ARGS1(
  *  Remove a file or a directory.
  */
 PUBLIC int local_remove ARGS1(
-	document *,	doc)
+	DocInfo *,	doc)
 {
     char *cp, *tp;
     char testpath[DIRED_MAXBUF];
@@ -1192,9 +1276,9 @@ PRIVATE int permit_location ARGS3(
 #else
     static char tempfile[LY_MAXPATH] = "\0";
     char *cp;
-    char *tmpbuf = NULL;
     char tmpdst[LY_MAXPATH];
     struct stat dir_info;
+    CONST char *program;
 
     if (srcpath) {
 	/*
@@ -1239,8 +1323,8 @@ PRIVATE int permit_location ARGS3(
 	     *	Prevent filenames which include '#' or '?' from messing it up.
 	     */
 	    char * srcpath_url = HTEscape(srcpath, URL_PATH);
-	    fprintf(fp0, "<Form Action=\"LYNXDIRED://PERMIT_LOCATION%s\">\n",
-		    srcpath_url);
+	    fprintf(fp0, "<Form Action=\"%s//PERMIT_LOCATION%s\">\n",
+		    STR_LYNXDIRED, srcpath_url);
 	    FREE(srcpath_url);
 	}
 
@@ -1306,8 +1390,6 @@ PRIVATE int permit_location ARGS3(
 
     } else {				 /* The form being activated. */
 	mode_t new_mode = 0;
-	char *args[5];
-	char amode[10];
 
 	/*
 	 *  Make sure we have a valid set-permission
@@ -1335,7 +1417,7 @@ PRIVATE int permit_location ARGS3(
 			   start working on the masks. */
 
 	/* Will now operate only on filename part. */
-	if ((destpath = HTURLPath_toFile(destpath, TRUE)) == 0)
+	if ((destpath = HTURLPath_toFile(destpath, TRUE, FALSE)) == 0)
 		return(0);
 	if (strlen(destpath) >= LY_MAXPATH) {
 	    FREE(destpath);
@@ -1404,22 +1486,29 @@ PRIVATE int permit_location ARGS3(
 	    cp = cr;
 	}
 
-#ifdef UNIX
 	/*
 	 *  Call chmod().
 	 */
-	HTSprintf0(&tmpbuf, "chmod %.4o %s", (unsigned int)new_mode, destpath);
-	sprintf(amode, "%.4o", (unsigned int)new_mode);
-	args[0] = "chmod";
-	args[1] = amode;
-	args[2] = destpath;
-	args[3] = (char *) 0;
-	if (LYExecv(CHMOD_PATH, args, tmpbuf) <= 0) {
+	if ((program = HTGetProgramPath(ppCHMOD)) != NULL) {
+	    char *args[5];
+	    char amode[10];
+	    char *tmpbuf = NULL;
+
+	    HTSprintf0(&tmpbuf, "chmod %.4o %s", (unsigned int)new_mode, destpath);
+	    sprintf(amode, "%.4o", (unsigned int)new_mode);
+	    args[0] = "chmod";
+	    args[1] = amode;
+	    args[2] = destpath;
+	    args[3] = (char *) 0;
+	    if (LYExecv(program, args, tmpbuf) <= 0) {
+		FREE(tmpbuf);
+		return (-1);
+	    }
 	    FREE(tmpbuf);
-	    return (-1);
+	} else {
+	    if (chmod(destpath, new_mode) < 0)
+		return (-1);
 	}
-	FREE(tmpbuf);
-#endif /* UNIX */
 	LYforce_no_cache = TRUE;	/* Force update of dired listing. */
 	return 1;
     }
@@ -1436,7 +1525,7 @@ PUBLIC void tagflag ARGS2(
 {
     if (nlinks > 0) {
 	LYmove(links[cur].ly, 2);
-	stop_reverse();
+	lynx_stop_reverse();
 	if (flag == ON) {
 	    LYaddch('+');
 	} else {
@@ -1482,12 +1571,14 @@ PRIVATE char * DirectoryOf ARGS1(
 	char *,		pathname)
 {
     char *result = 0;
-    char *result1 = 0;
     char *leaf;
 
     StrAllocCopy(result, pathname);
     leaf = LYPathLeaf(result);
+
     if (leaf != result) {
+	CONST char *result1 = 0;
+
 	*leaf = '\0';
 	if (!LYisRootPath(result))
 	    LYTrimPathSep(result);
@@ -1537,7 +1628,7 @@ PRIVATE char * match_op ARGS2(
     if (!strncmp("LYNXDIRED://", data, 12)
      && !strncmp(prefix, data + 12, (unsigned)len)) {
 	len += 12;
-#if defined(DOSPATH) || defined(__EMX__)
+#if defined(USE_DOS_DRIVES)
 	if (data[len] == '/') {	/* this is normal */
 	    len++;
 	}
@@ -1548,6 +1639,202 @@ PRIVATE char * match_op ARGS2(
 }
 
 /*
+ *  Construct the appropriate system command taking care to
+ *  escape all path references to avoid spoofing the shell.
+ */
+PRIVATE char *build_command ARGS3(
+	char *,		line,
+	char *,		dirname,
+	char *,		arg)
+{
+    char *buffer = NULL;
+    CONST char *program;
+    CONST char *tar_path = HTGetProgramPath(ppTAR);
+
+    if ((arg = match_op("DECOMPRESS", line)) != 0) {
+#define FMT_UNCOMPRESS "%s %s"
+	if ((program = HTGetProgramPath(ppUNCOMPRESS)) != NULL) {
+	    HTAddParam(&buffer, FMT_UNCOMPRESS, 1, program);
+	    HTAddParam(&buffer, FMT_UNCOMPRESS, 2, arg);
+	    HTEndParam(&buffer, FMT_UNCOMPRESS, 2);
+	}
+	return buffer;
+    }
+
+#if defined(OK_UUDECODE) && !defined(ARCHIVE_ONLY)
+    if ((arg = match_op("UUDECODE", line)) != 0) {
+#define FMT_UUDECODE "%s %s"
+	if ((program = HTGetProgramPath(ppUUDECODE)) != NULL) {
+	    HTAddParam(&buffer, FMT_UUDECODE, 1, program);
+	    HTAddParam(&buffer, FMT_UUDECODE, 2, arg);
+	    HTEndParam(&buffer, FMT_UUDECODE, 2);
+	    HTAlert(gettext("Warning!  UUDecoded file will exist in the directory you started Lynx."));
+	}
+	return buffer;
+    }
+#endif /* OK_UUDECODE && !ARCHIVE_ONLY */
+
+#ifdef OK_TAR
+    if (tar_path != NULL) {
+# ifndef ARCHIVE_ONLY
+#  ifdef OK_GZIP
+	if ((arg = match_op("UNTAR_GZ", line)) != 0) {
+#define FMT_UNTAR_GZ "cd %s; %s -qdc %s |  %s %s %s"
+	    if ((program = HTGetProgramPath(ppGZIP)) != NULL) {
+		dirname = DirectoryOf(arg);
+		HTAddParam(&buffer, FMT_UNTAR_GZ, 1, dirname);
+		HTAddParam(&buffer, FMT_UNTAR_GZ, 2, program);
+		HTAddParam(&buffer, FMT_UNTAR_GZ, 3, arg);
+		HTAddParam(&buffer, FMT_UNTAR_GZ, 4, tar_path);
+		HTAddToCmd(&buffer, FMT_UNTAR_GZ, 5, TAR_DOWN_OPTIONS);
+		HTAddToCmd(&buffer, FMT_UNTAR_GZ, 6, TAR_PIPE_OPTIONS);
+		HTEndParam(&buffer, FMT_UNTAR_GZ, 6);
+	    }
+	    return buffer;
+	}
+#  endif /* OK_GZIP */
+	if ((arg = match_op("UNTAR_Z", line)) != 0) {
+#define FMT_UNTAR_Z "cd %s; %s %s |  %s %s %s"
+	    if ((program = HTGetProgramPath(ppZCAT)) != NULL) {
+		dirname = DirectoryOf(arg);
+		HTAddParam(&buffer, FMT_UNTAR_Z, 1, dirname);
+		HTAddParam(&buffer, FMT_UNTAR_Z, 2, program);
+		HTAddParam(&buffer, FMT_UNTAR_Z, 3, arg);
+		HTAddParam(&buffer, FMT_UNTAR_Z, 4, tar_path);
+		HTAddToCmd(&buffer, FMT_UNTAR_Z, 5, TAR_DOWN_OPTIONS);
+		HTAddToCmd(&buffer, FMT_UNTAR_Z, 6, TAR_PIPE_OPTIONS);
+		HTEndParam(&buffer, FMT_UNTAR_Z, 6);
+	    }
+	    return buffer;
+	}
+	if ((arg = match_op("UNTAR", line)) != 0) {
+#define FMT_UNTAR "cd %s; %s %s %s"
+	    dirname = DirectoryOf(arg);
+	    HTAddParam(&buffer, FMT_UNTAR, 1, dirname);
+	    HTAddParam(&buffer, FMT_UNTAR, 2, tar_path);
+	    HTAddToCmd(&buffer, FMT_UNTAR, 3, TAR_DOWN_OPTIONS);
+	    HTAddParam(&buffer, FMT_UNTAR, 4, arg);
+	    HTEndParam(&buffer, FMT_UNTAR, 4);
+	    return buffer;
+	}
+# endif /* !ARCHIVE_ONLY */
+
+# ifdef OK_GZIP
+	if ((arg = match_op("TAR_GZ", line)) != 0) {
+#define FMT_TAR_GZ "cd %s; %s %s %s %s | %s -qc >%s%s"
+	    if ((program = HTGetProgramPath(ppGZIP)) != NULL) {
+		dirname = DirectoryOf(arg);
+		HTAddParam(&buffer, FMT_TAR_GZ, 1, dirname);
+		HTAddParam(&buffer, FMT_TAR_GZ, 2, tar_path);
+		HTAddToCmd(&buffer, FMT_TAR_GZ, 3, TAR_UP_OPTIONS);
+		HTAddToCmd(&buffer, FMT_TAR_GZ, 4, TAR_PIPE_OPTIONS);
+		HTAddParam(&buffer, FMT_TAR_GZ, 5, LYPathLeaf(arg));
+		HTAddParam(&buffer, FMT_TAR_GZ, 6, program);
+		HTAddParam(&buffer, FMT_TAR_GZ, 7, LYonedot(LYPathLeaf(arg)));
+		HTAddParam(&buffer, FMT_TAR_GZ, 8, EXT_TAR_GZ);
+		HTEndParam(&buffer, FMT_TAR_GZ, 8);
+	    }
+	    return buffer;
+	}
+# endif /* OK_GZIP */
+
+	if ((arg = match_op("TAR_Z", line)) != 0) {
+#define FMT_TAR_Z "cd %s; %s %s %s %s | %s >%s%s"
+	    if ((program = HTGetProgramPath(ppCOMPRESS)) != NULL) {
+		dirname = DirectoryOf(arg);
+		HTAddParam(&buffer, FMT_TAR_Z, 1, dirname);
+		HTAddParam(&buffer, FMT_TAR_Z, 2, tar_path);
+		HTAddToCmd(&buffer, FMT_TAR_Z, 3, TAR_UP_OPTIONS);
+		HTAddToCmd(&buffer, FMT_TAR_Z, 4, TAR_PIPE_OPTIONS);
+		HTAddParam(&buffer, FMT_TAR_Z, 5, LYPathLeaf(arg));
+		HTAddParam(&buffer, FMT_TAR_Z, 6, program);
+		HTAddParam(&buffer, FMT_TAR_Z, 7, LYonedot(LYPathLeaf(arg)));
+		HTAddParam(&buffer, FMT_TAR_Z, 8, EXT_TAR_Z);
+		HTEndParam(&buffer, FMT_TAR_Z, 8);
+	    }
+	    return buffer;
+	}
+
+	if ((arg = match_op("TAR", line)) != 0) {
+#define FMT_TAR "cd %s; %s %s %s %s.tar %s"
+	    dirname = DirectoryOf(arg);
+	    HTAddParam(&buffer, FMT_TAR, 1, dirname);
+	    HTAddParam(&buffer, FMT_TAR, 2, tar_path);
+	    HTAddToCmd(&buffer, FMT_TAR, 3, TAR_UP_OPTIONS);
+	    HTAddToCmd(&buffer, FMT_TAR, 4, TAR_FILE_OPTIONS);
+	    HTAddParam(&buffer, FMT_TAR, 5, LYonedot(LYPathLeaf(arg)));
+	    HTAddParam(&buffer, FMT_TAR, 6, LYPathLeaf(arg));
+	    HTEndParam(&buffer, FMT_TAR, 6);
+	    return buffer;
+	}
+    }
+#endif /* OK_TAR */
+
+#ifdef OK_GZIP
+    if ((arg = match_op("GZIP", line)) != 0) {
+#define FMT_GZIP "%s -q %s"
+	if ((program = HTGetProgramPath(ppGZIP)) != NULL) {
+	    HTAddParam(&buffer, FMT_GZIP, 1, program);
+	    HTAddParam(&buffer, FMT_GZIP, 2, arg);
+	    HTEndParam(&buffer, FMT_GZIP, 2);
+	}
+	return buffer;
+    }
+#ifndef ARCHIVE_ONLY
+    if ((arg = match_op("UNGZIP", line)) != 0) {
+#define FMT_UNGZIP "%s -d %s"
+	if ((program = HTGetProgramPath(ppGZIP)) != NULL) {
+	    HTAddParam(&buffer, FMT_UNGZIP, 1, program);
+	    HTAddParam(&buffer, FMT_UNGZIP, 2, arg);
+	    HTEndParam(&buffer, FMT_UNGZIP, 2);
+	}
+	return buffer;
+    }
+#endif /* !ARCHIVE_ONLY */
+#endif /* OK_GZIP */
+
+#ifdef OK_ZIP
+    if ((arg = match_op("ZIP", line)) != 0) {
+#define FMT_ZIP "cd %s; %s -rq %s.zip %s"
+	if ((program = HTGetProgramPath(ppZIP)) != NULL) {
+	    dirname = DirectoryOf(arg);
+	    HTAddParam(&buffer, FMT_ZIP, 1, dirname);
+	    HTAddParam(&buffer, FMT_ZIP, 2, program);
+	    HTAddParam(&buffer, FMT_ZIP, 3, LYonedot(LYPathLeaf(arg)));
+	    HTAddParam(&buffer, FMT_ZIP, 4, LYPathLeaf(arg));
+	    HTEndParam(&buffer, FMT_ZIP, 4);
+	}
+	return buffer;
+    }
+#if !defined(ARCHIVE_ONLY)
+    if ((arg = match_op("UNZIP", line)) != 0) {
+#define FMT_UNZIP "cd %s; %s -q %s"
+	if ((program = HTGetProgramPath(ppUNZIP)) != NULL) {
+	    dirname = DirectoryOf(arg);
+	    HTAddParam(&buffer, FMT_UNZIP, 1, dirname);
+	    HTAddParam(&buffer, FMT_UNZIP, 2, program);
+	    HTAddParam(&buffer, FMT_UNZIP, 3, arg);
+	    HTEndParam(&buffer, FMT_UNZIP, 3);
+	}
+	return buffer;
+    }
+# endif /* !ARCHIVE_ONLY */
+#endif /* OK_ZIP */
+
+    if ((arg = match_op("COMPRESS", line)) != 0) {
+#define FMT_COMPRESS "%s %s"
+	if ((program = HTGetProgramPath(ppCOMPRESS)) != NULL) {
+	    HTAddParam(&buffer, FMT_COMPRESS, 1, program);
+	    HTAddParam(&buffer, FMT_COMPRESS, 2, arg);
+	    HTEndParam(&buffer, FMT_COMPRESS, 2);
+	}
+	return buffer;
+    }
+
+    return NULL;
+}
+
+/*
  *  Perform file management operations for LYNXDIRED URL's.
  *  Attempt to be consistent.  These are (pseudo) URLs - i.e., they should
  *  be in URL syntax: some bytes will be URL-escaped with '%'.	This is
@@ -1558,7 +1845,7 @@ PRIVATE char * match_op ARGS2(
  *  doesn't look like a clean way.)
  */
 PUBLIC int local_dired ARGS1(
-	document *,	doc)
+	DocInfo *,	doc)
 {
     char *line_url;    /* will point to doc's address, which is a URL */
     char *line = NULL; /* same as line_url, but HTUnEscaped, will be alloced */
@@ -1651,131 +1938,7 @@ PUBLIC int local_dired ARGS1(
 	    return 0;
 	}
 
-	/*
-	 *  Construct the appropriate system command taking care to
-	 *  escape all path references to avoid spoofing the shell.
-	 */
-	if ((arg = match_op("DECOMPRESS", line)) != 0) {
-#define FMT_UNCOMPRESS "%s %s"
-	    HTAddParam(&buffer, FMT_UNCOMPRESS, 1, UNCOMPRESS_PATH);
-	    HTAddParam(&buffer, FMT_UNCOMPRESS, 2, arg);
-	    HTEndParam(&buffer, FMT_UNCOMPRESS, 2);
-
-#if defined(OK_UUDECODE) && !defined(ARCHIVE_ONLY)
-	} else if ((arg = match_op("UUDECODE", line)) != 0) {
-#define FMT_UUDECODE "%s %s"
-	    HTAddParam(&buffer, FMT_UUDECODE, 1, UUDECODE_PATH);
-	    HTAddParam(&buffer, FMT_UUDECODE, 2, arg);
-	    HTEndParam(&buffer, FMT_UUDECODE, 2);
-	    HTAlert(gettext("Warning!  UUDecoded file will exist in the directory you started Lynx."));
-#endif /* OK_UUDECODE && !ARCHIVE_ONLY */
-
-#ifdef OK_TAR
-# ifndef ARCHIVE_ONLY
-#  ifdef OK_GZIP
-	} else if ((arg = match_op("UNTAR_GZ", line)) != 0) {
-#define FMT_UNTAR_GZ "cd %s; %s -qdc %s |  %s -xf -"
-	    dirname = DirectoryOf(arg);
-	    HTAddParam(&buffer, FMT_UNTAR_GZ, 1, dirname);
-	    HTAddParam(&buffer, FMT_UNTAR_GZ, 2, GZIP_PATH);
-	    HTAddParam(&buffer, FMT_UNTAR_GZ, 3, arg);
-	    HTAddParam(&buffer, FMT_UNTAR_GZ, 4, TAR_PATH);
-	    HTEndParam(&buffer, FMT_UNTAR_GZ, 4);
-#  endif /* OK_GZIP */
-
-	} else if ((arg = match_op("UNTAR_Z", line)) != 0) {
-#define FMT_UNTAR_Z "cd %s; %s %s |  %s -xf -"
-	    dirname = DirectoryOf(arg);
-	    HTAddParam(&buffer, FMT_UNTAR_Z, 1, dirname);
-	    HTAddParam(&buffer, FMT_UNTAR_Z, 2, ZCAT_PATH);
-	    HTAddParam(&buffer, FMT_UNTAR_Z, 3, arg);
-	    HTAddParam(&buffer, FMT_UNTAR_Z, 4, TAR_PATH);
-	    HTEndParam(&buffer, FMT_UNTAR_Z, 4);
-
-	} else if ((arg = match_op("UNTAR", line)) != 0) {
-#define FMT_UNTAR "cd %s; %s -xf %s"
-	    dirname = DirectoryOf(arg);
-	    HTAddParam(&buffer, FMT_UNTAR, 1, dirname);
-	    HTAddParam(&buffer, FMT_UNTAR, 2, TAR_PATH);
-	    HTAddParam(&buffer, FMT_UNTAR, 3, arg);
-	    HTEndParam(&buffer, FMT_UNTAR, 3);
-# endif /* !ARCHIVE_ONLY */
-
-# ifdef OK_GZIP
-	} else if ((arg = match_op("TAR_GZ", line)) != 0) {
-#define FMT_TAR_GZ "cd %s; %s -cf - %s | %s -qc >%s%s"
-	    dirname = DirectoryOf(arg);
-	    HTAddParam(&buffer, FMT_TAR_GZ, 1, dirname);
-	    HTAddParam(&buffer, FMT_TAR_GZ, 2, TAR_PATH);
-	    HTAddParam(&buffer, FMT_TAR_GZ, 3, LYPathLeaf(arg));
-	    HTAddParam(&buffer, FMT_TAR_GZ, 4, GZIP_PATH);
-	    HTAddParam(&buffer, FMT_TAR_GZ, 5, LYonedot(LYPathLeaf(arg)));
-	    HTAddParam(&buffer, FMT_TAR_GZ, 6, EXT_TAR_GZ);
-	    HTEndParam(&buffer, FMT_TAR_GZ, 6);
-# endif /* OK_GZIP */
-
-	} else if ((arg = match_op("TAR_Z", line)) != 0) {
-#define FMT_TAR_Z "cd %s; %s -cf - %s | %s >%s%s"
-	    dirname = DirectoryOf(arg);
-	    HTAddParam(&buffer, FMT_TAR_Z, 1, dirname);
-	    HTAddParam(&buffer, FMT_TAR_Z, 2, TAR_PATH);
-	    HTAddParam(&buffer, FMT_TAR_Z, 3, LYPathLeaf(arg));
-	    HTAddParam(&buffer, FMT_TAR_Z, 4, COMPRESS_PATH);
-	    HTAddParam(&buffer, FMT_TAR_Z, 5, LYonedot(LYPathLeaf(arg)));
-	    HTAddParam(&buffer, FMT_TAR_Z, 6, EXT_TAR_Z);
-	    HTEndParam(&buffer, FMT_TAR_Z, 6);
-
-	} else if ((arg = match_op("TAR", line)) != 0) {
-#define FMT_TAR "cd %s; %s -cf %s.tar %s"
-	    dirname = DirectoryOf(arg);
-	    HTAddParam(&buffer, FMT_TAR, 1, dirname);
-	    HTAddParam(&buffer, FMT_TAR, 2, TAR_PATH);
-	    HTAddParam(&buffer, FMT_TAR, 3, LYonedot(LYPathLeaf(arg)));
-	    HTAddParam(&buffer, FMT_TAR, 4, LYPathLeaf(arg));
-	    HTEndParam(&buffer, FMT_TAR, 4);
-#endif /* OK_TAR */
-
-#ifdef OK_GZIP
-	} else if ((arg = match_op("GZIP", line)) != 0) {
-#define FMT_GZIP "%s -q %s"
-	    HTAddParam(&buffer, FMT_GZIP, 1, GZIP_PATH);
-	    HTAddParam(&buffer, FMT_GZIP, 2, arg);
-	    HTEndParam(&buffer, FMT_GZIP, 2);
-#ifndef ARCHIVE_ONLY
-	} else if ((arg = match_op("UNGZIP", line)) != 0) {
-#define FMT_UNGZIP "%s -d %s"
-	    HTAddParam(&buffer, FMT_UNGZIP, 1, GZIP_PATH);
-	    HTAddParam(&buffer, FMT_UNGZIP, 2, arg);
-	    HTEndParam(&buffer, FMT_UNGZIP, 2);
-#endif /* !ARCHIVE_ONLY */
-#endif /* OK_GZIP */
-
-#ifdef OK_ZIP
-	} else if ((arg = match_op("ZIP", line)) != 0) {
-#define FMT_ZIP "cd %s; %s -rq %s.zip %s"
-	    dirname = DirectoryOf(arg);
-	    HTAddParam(&buffer, FMT_ZIP, 1, dirname);
-	    HTAddParam(&buffer, FMT_ZIP, 2, ZIP_PATH);
-	    HTAddParam(&buffer, FMT_ZIP, 3, LYonedot(LYPathLeaf(arg)));
-	    HTAddParam(&buffer, FMT_ZIP, 4, LYPathLeaf(arg));
-	    HTEndParam(&buffer, FMT_ZIP, 4);
-#ifndef ARCHIVE_ONLY
-	} else if ((arg = match_op("UNZIP", line)) != 0) {
-#define FMT_UNZIP "cd %s; %s -q %s"
-	    dirname = DirectoryOf(arg);
-	    HTAddParam(&buffer, FMT_UNZIP, 1, dirname);
-	    HTAddParam(&buffer, FMT_UNZIP, 2, UNZIP_PATH);
-	    HTAddParam(&buffer, FMT_UNZIP, 3, arg);
-	    HTEndParam(&buffer, FMT_UNZIP, 3);
-# endif /* !ARCHIVE_ONLY */
-#endif /* OK_ZIP */
-
-	} else if ((arg = match_op("COMPRESS", line)) != 0) {
-#define FMT_COMPRESS "%s %s"
-	    HTAddParam(&buffer, FMT_COMPRESS, 1, COMPRESS_PATH);
-	    HTAddParam(&buffer, FMT_COMPRESS, 2, arg);
-	    HTEndParam(&buffer, FMT_COMPRESS, 2);
-	}
+	buffer = build_command(line, dirname, arg);
 
 	if (buffer != 0) {
 	    if ((int) strlen(buffer) < LYcols - 15) {
@@ -1810,7 +1973,7 @@ PUBLIC int local_dired ARGS1(
  *  Provide a menu of file management options.
  */
 PUBLIC int dired_options ARGS2(
-	document *,	doc,
+	DocInfo *,	doc,
 	char **,	newfile)
 {
     static char tempfile[LY_MAXPATH];
@@ -1826,11 +1989,8 @@ PUBLIC int dired_options ARGS2(
     struct dired_menu *mp;
     char buf[2048];
 
-    LYRemoveTemp(tempfile);
-    if ((fp0 = LYOpenTemp(tempfile, HTML_SUFFIX, "w")) == NULL) {
-	HTAlert(gettext("Unable to open file management menu file."));
+    if ((fp0 = InternalPageFP(tempfile, FALSE)) == 0)
 	return(0);
-    }
 
     /*
      *  Make the tempfile a URL.
@@ -1977,7 +2137,6 @@ PRIVATE char *get_filename ARGS3(
 
     _statusline(prompt);
 
-    *buf = '\0';
     LYgetstr(buf, VISIBLE, bufsize, NORECALL);
     if (strstr(buf, "../") != NULL) {
 	HTAlert(gettext("Illegal filename; request ignored."));
@@ -2011,6 +2170,7 @@ PRIVATE void clear_install_path NOARGS
     FREE(install_path);
 }
 #endif /* LY_FIND_LEAKS */
+
 /*
  *  Fill in args array for execv (or execvp etc.) call, after first
  *  allocating it if necessary.  No fancy parsing, cmd_args is just
@@ -2064,6 +2224,7 @@ PRIVATE int fill_argv_for_execv ARGS5(
     args[n] = (char *)0;
     return(n);
 }
+
 /*
  *  Install the specified file or directory.
  */
@@ -2083,6 +2244,12 @@ PUBLIC BOOLEAN local_install ARGS3(
     int count = 0;
     int n = 0;		/* indices into 'args[]' */
     static int src = -1;
+    CONST char *program;
+
+    if ((program = HTGetProgramPath(ppINSTALL)) == NULL) {
+	HTAlert(gettext("Install in the selected directory not permitted."));
+	return 0;
+    }
 
     /*
      *	Determine the status of the selected item.
@@ -2181,10 +2348,7 @@ PUBLIC BOOLEAN local_install ARGS3(
 	    return(-1);		/* don't do it */
 	} else if (!strncmp(savepath, destpath, strlen(destpath)) &&
 		   LYIsPathSep(savepath[strlen(destpath)]) &&
-#ifdef DOSPATH
-		   !strchr(savepath + strlen(destpath) + 1, '\\') &&
-#endif
-		   !strchr(savepath + strlen(destpath) + 1, '/')) {
+		   LYLastPathSep(savepath + strlen(destpath) + 1) == 0) {
 	    HTUserMsg2(gettext("Already in target directory: %s"),
 		       savepath);
 	    FREE(tmpdest);
@@ -2192,7 +2356,7 @@ PUBLIC BOOLEAN local_install ARGS3(
 	}
 	args[src] = savepath;
 	HTSprintf0(&tmpbuf, "install %s in %s", savepath, destpath);
-	if (LYExecv(INSTALL_PATH, args, tmpbuf) <= 0) {
+	if (LYExecv(program, args, tmpbuf) <= 0) {
 	    FREE(tmpbuf);
 	    FREE(tmpdest);
 	    return (-1);
@@ -2213,16 +2377,13 @@ PUBLIC BOOLEAN local_install ARGS3(
 		continue;	/* skip this source file */
 	    } else if (!strncmp(args[src], destpath, strlen(destpath)) &&
 		       LYIsPathSep(args[src][strlen(destpath)]) &&
-#ifdef DOSPATH
-		       !strchr(args[src] + strlen(destpath) + 1, '\\') &&
-#endif
-		       !strchr(args[src] + strlen(destpath) + 1, '/')) {
+		       LYLastPathSep(args[src] + strlen(destpath) + 1) == 0) {
 		HTUserMsg2(gettext("Already in target directory: %s"),
 			   args[src]);
 		FREE(args[src]);
 		continue;	/* skip this source file */
 	    }
-	    err = (LYExecv(INSTALL_PATH, args, tmpbuf) <= 0);
+	    err = (LYExecv(program, args, tmpbuf) <= 0);
 	    FREE(args[src]);
 	    if (err) {
 		FREE(tmpbuf);
diff --git a/gnu/usr.bin/lynx/src/LYLocal.h b/gnu/usr.bin/lynx/src/LYLocal.h
index 4a9f563698f..02044ee2a35 100644
--- a/gnu/usr.bin/lynx/src/LYLocal.h
+++ b/gnu/usr.bin/lynx/src/LYLocal.h
@@ -8,9 +8,9 @@
 /* Special return code for LYMainLoop.c */
 #define PERMIT_FORM_RESULT (-99)
 
-extern int local_create PARAMS((document *doc));
-extern int local_modify PARAMS((document *doc, char **newpath));
-extern int local_remove PARAMS((document *doc));
+extern int local_create PARAMS((DocInfo *doc));
+extern int local_modify PARAMS((DocInfo *doc, char **newpath));
+extern int local_remove PARAMS((DocInfo *doc));
 #ifdef OK_INSTALL
 extern BOOLEAN local_install PARAMS((char *destpath, char *srcpath, char **newpath));
 #endif
@@ -18,8 +18,8 @@ extern BOOLEAN local_install PARAMS((char *destpath, char *srcpath, char **newpa
 /* MainLoop needs to know about this one for atexit cleanup */
 extern void clear_tags NOPARAMS;
 
-extern int dired_options PARAMS ((document *doc, char ** newfile));
-extern int local_dired PARAMS((document *doc));
+extern int dired_options PARAMS ((DocInfo *doc, char ** newfile));
+extern int local_dired PARAMS((DocInfo *doc));
 extern void add_menu_item PARAMS((char *str));
 extern void reset_dired_menu NOPARAMS;
 extern void showtags PARAMS((HTList *tag));
diff --git a/gnu/usr.bin/lynx/src/LYMail.c b/gnu/usr.bin/lynx/src/LYMail.c
index d5432c7f194..805357ee1de 100644
--- a/gnu/usr.bin/lynx/src/LYMail.c
+++ b/gnu/usr.bin/lynx/src/LYMail.c
@@ -15,8 +15,6 @@
 #include <LYLeaks.h>
 
 #define MAX_SUBJECT 70
-#define EMPTY(s) ((s) == 0 || *(s) == 0)
-#define NIL_OK(s) (((s) != 0) ? (s) : "<nil>")
 
 BOOLEAN term_letter;	/* Global variable for async i/o. */
 
@@ -25,7 +23,7 @@ PRIVATE void terminate_letter ARGS1(int,sig GCC_UNUSED)
     term_letter = TRUE;
     /* Reassert the AST */
     signal(SIGINT, terminate_letter);
-#if USE_VMS_MAILER || defined(DOSPATH) || defined(WIN_EX)
+#if USE_VMS_MAILER || defined(PDCURSES)
     /*
      *	Refresh the screen to get rid of the "interrupt" message.
      */
@@ -76,7 +74,7 @@ PRIVATE void comma_append ARGS2(
 	while (*src == ',' || isspace(UCH(*src)))
 	    src++;
 	if (*src) {
-	    if (EMPTY(*dst)) {
+	    if (isEmpty(*dst)) {
 		StrAllocCopy(*dst, src);
 	    } else {
 		StrAllocCat(*dst, ",");
@@ -113,7 +111,7 @@ PRIVATE void extract_field ARGS3(
 	}
 	cp++;
     }
-    CTRACE((tfp, "extract_field(%s) = '%s'\n", keyword, NIL_OK(*dst)));
+    CTRACE((tfp, "extract_field(%s) = '%s'\n", keyword, NONNULL(*dst)));
 }
 
 /*
@@ -149,7 +147,7 @@ PRIVATE void extract_subject ARGS2(
 	    cp1 = NULL;
 	}
     }
-    CTRACE((tfp, "extract_subject(%s) = '%s'\n", keyword, NIL_OK(dst)));
+    CTRACE((tfp, "extract_subject(%s) = '%s'\n", keyword, NONNULL(dst)));
 }
 
 /*
@@ -219,7 +217,7 @@ PRIVATE void extract_body ARGS2(
 	}
 	cp++;
     }
-    CTRACE((tfp, "extract_body(%s) = '%s'\n", keyword, NIL_OK(*dst)));
+    CTRACE((tfp, "extract_body(%s) = '%s'\n", keyword, NONNULL(*dst)));
 }
 
 /*
@@ -350,7 +348,7 @@ PRIVATE char *blat_cmd(
 		subject,
 		system_mail_flags,
 		ccaddr? " -c \"" : "",
-		ccaddr? ccaddr : "",
+		NonNull(ccaddr),
 		ccaddr? "\"" : "");
 
 #else /* !USE_ALT_BLAT_MAILER */
@@ -376,10 +374,10 @@ PRIVATE char *blat_cmd(
     fprintf(fp, "-t\n%s\n", address);
     if (subject)
 	fprintf(fp, "-s\n%s\n", subject);
-    if (!EMPTY(mail_addr)) {
+    if (!isEmpty(mail_addr)) {
 	fprintf(fp, "-f\n%s\n", mail_addr);
     }
-    if (!EMPTY(ccaddr)) {
+    if (!isEmpty(ccaddr)) {
 	fprintf(fp, "-c\n%s\n", ccaddr);
     }
     LYCloseOutput(fp);
@@ -401,7 +399,9 @@ PRIVATE char *blat_cmd(
 #if USE_VMS_MAILER
 PUBLIC BOOLEAN LYMailPMDF(void)
 {
-    return !strncasecomp(system_mail, "PMDF SEND", 9);
+    return (system_mail != 0)
+	    ? !strncasecomp(system_mail, "PMDF SEND", 9)
+	    : FALSE;
 }
 
 /*
@@ -458,12 +458,14 @@ PRIVATE void remove_quotes (char * string)
 PUBLIC FILE *LYPipeToMailer NOARGS
 {
     char *buffer = NULL;
-    FILE *fp;
+    FILE *fp = NULL;
 
-    HTSprintf0(&buffer, "%s %s", system_mail, system_mail_flags);
-    fp = popen(buffer, "w");
-    CTRACE((tfp, "popen(%s) %s\n", buffer, fp != 0 ? "OK" : "FAIL"));
-    FREE(buffer);
+    if (LYSystemMail()) {
+	HTSprintf0(&buffer, "%s %s", system_mail, system_mail_flags);
+	fp = popen(buffer, "w");
+	CTRACE((tfp, "popen(%s) %s\n", buffer, fp != 0 ? "OK" : "FAIL"));
+	FREE(buffer);
+    }
     return fp;
 }
 #else	/* DOS, Win32, etc. */
@@ -476,8 +478,14 @@ PUBLIC int LYSendMailFile ARGS5(
     char *,	message)
 {
     char *cmd = NULL;
+#ifdef __DJGPP__
+    char *shell;
+#endif /* __DJGPP__ */
     int code;
 
+    if (!LYSystemMail())
+	return 0;
+
 #if USE_BLAT_MAILER
     if (mail_is_blat)
 	StrAllocCopy(cmd,
@@ -492,10 +500,33 @@ PUBLIC int LYSendMailFile ARGS5(
 	);
     else
 #endif
+#ifdef __DJGPP__
+	if ((shell = LYGetEnv("SHELL")) != NULL) {
+	    if (strstr(shell, "sh") != NULL) {
+		HTSprintf0(&cmd, "%s -c %s -t \"%s\" -F %s",
+			   shell,
+			   system_mail,
+			   the_address,
+			   the_filename);
+	    } else {
+		HTSprintf0(&cmd, "%s /c %s -t \"%s\" -F %s",
+			   shell,
+			   system_mail,
+			   the_address,
+			   the_filename);
+	    }
+	} else {
+	    HTSprintf0(&cmd, "%s -t \"%s\" -F %s",
+		       system_mail,
+		       the_address,
+		       the_filename);
+	}
+#else
 	HTSprintf0(&cmd, "%s -t \"%s\" -F %s",
 		   system_mail,
 		   the_address,
 		   the_filename);
+#endif /* __DJGPP__ */
 
     stop_curses();
     SetOutputMode(O_TEXT);
@@ -518,10 +549,10 @@ PUBLIC int LYSendMailFile ARGS5(
 **  mailform() sends form content to the mailto address(es). - FM
 */
 PUBLIC void mailform ARGS4(
-    CONST char *, 	mailto_address,
-    CONST char *, 	mailto_subject,
-    CONST char *, 	mailto_content,
-    CONST char *, 	mailto_type)
+    CONST char *,	mailto_address,
+    CONST char *,	mailto_subject,
+    CONST char *,	mailto_content,
+    CONST char *,	mailto_type)
 {
     FILE *fd;
     char *address = NULL;
@@ -543,11 +574,13 @@ PUBLIC void mailform ARGS4(
     char my_tmpfile[LY_MAXPATH];
 #endif
 
-    CTRACE((tfp, "mailform(\"%s\", \"%s\", \"%s\", \"%s\")\n",
-	NIL_OK(mailto_address),
-	NIL_OK(mailto_subject),
-	NIL_OK(mailto_content),
-	NIL_OK(mailto_type)));
+    CTRACE((tfp, "mailto_address: \"%s\"\n", NONNULL(mailto_address)));
+    CTRACE((tfp, "mailto_subject: \"%s\"\n", NONNULL(mailto_subject)));
+    CTRACE((tfp, "mailto_content: \"%s\"\n", NONNULL(mailto_content)));
+    CTRACE((tfp, "mailto_type:    \"%s\"\n", NONNULL(mailto_type)));
+
+    if (!LYSystemMail())
+	return;
 
     if (!mailto_address || !mailto_content) {
 	HTAlert(BAD_FORM_MAILTO);
@@ -624,8 +657,8 @@ PUBLIC void mailform ARGS4(
     /*
      *	Allow user to edit the default Subject - FM
      */
-    if (EMPTY(subject)) {
-	if (!EMPTY(mailto_subject)) {
+    if (isEmpty(subject)) {
+	if (!isEmpty(mailto_subject)) {
 	    LYstrncpy(subject, mailto_subject, MAX_SUBJECT);
 	} else {
 	    sprintf(subject, "mailto:%.63s", address);
@@ -646,7 +679,7 @@ PUBLIC void mailform ARGS4(
      */
     if (!LYNoCc) {
 	sprintf(self, "%.*s", MAX_SUBJECT,
-		EMPTY(personal_mail_address) ? "" : personal_mail_address);
+		isEmpty(personal_mail_address) ? "" : personal_mail_address);
 	_statusline("Cc: ");
 	if ((ch = LYgetstr(self, VISIBLE, MAX_SUBJECT, NORECALL)) < 0) {
 	    /*
@@ -670,20 +703,20 @@ PUBLIC void mailform ARGS4(
 	goto cleanup;
     }
 
-    if (!EMPTY(mailto_type)) {
+    if (!isEmpty(mailto_type)) {
 	fprintf(fd, "Mime-Version: 1.0\n");
 	fprintf(fd, "Content-Type: %s\n", mailto_type);
     }
     fprintf(fd, "To: %s\n", address);
-    if (!EMPTY(personal_mail_address))
+    if (!isEmpty(personal_mail_address))
 	fprintf(fd, "From: %s\n", personal_mail_address);
-    if (!EMPTY(ccaddr))
+    if (!isEmpty(ccaddr))
 	fprintf(fd, "Cc: %s\n", ccaddr);
     fprintf(fd, "Subject: %s\n\n", subject);
-    if (!EMPTY(keywords))
+    if (!isEmpty(keywords))
 	fprintf(fd, "Keywords: %s\n", keywords);
     _statusline(SENDING_FORM_CONTENT);
-#else	/* e.g., VMS, DOSPATH */
+#else	/* e.g., VMS, DOS */
     if ((fd = LYOpenTemp(my_tmpfile, ".txt", "w")) == NULL) {
 	HTAlert(FORM_MAILTO_FAILED);
 	goto cleanup;
@@ -696,17 +729,17 @@ PUBLIC void mailform ARGS4(
 	    LYCloseTempFP(fd);
 	    goto cleanup;
 	}
-	if (!EMPTY(mailto_type)) {
+	if (!isEmpty(mailto_type)) {
 	    fprintf(hfd, "Mime-Version: 1.0\n");
 	    fprintf(hfd, "Content-Type: %s\n", mailto_type);
-	    if (!EMPTY(personal_mail_address))
+	    if (!isEmpty(personal_mail_address))
 		fprintf(hfd, "From: %s\n", personal_mail_address);
 	}
 	/*
 	 *  For PMDF, put any keywords and the subject
 	 *  in the header file and close it. - FM
 	 */
-	if (!EMPTY(keywords)) {
+	if (!isEmpty(keywords)) {
 	    fprintf(hfd, "Keywords: %s\n", keywords);
 	}
 	fprintf(hfd, "Subject: %s\n\n", subject);
@@ -728,12 +761,12 @@ PUBLIC void mailform ARGS4(
     } else
 #endif
     {
-	if (!EMPTY(mailto_type)) {
+	if (!isEmpty(mailto_type)) {
 	    fprintf(fd, "Mime-Version: 1.0\n");
 	    fprintf(fd, "Content-Type: %s\n", mailto_type);
 	}
 	fprintf(fd,"To: %s\n", address);
-	if (!EMPTY(personal_mail_address))
+	if (!isEmpty(personal_mail_address))
 	    fprintf(fd,"From: %s\n", personal_mail_address);
 	fprintf(fd,"Subject: %.70s\n\n", subject);
     }
@@ -809,7 +842,7 @@ PUBLIC void mailform ARGS4(
     StrAllocCopy(command, cmd);
 
     vms_append_addrs(&command, address, "");
-    if (!EMPTY(ccaddr)) {
+    if (!isEmpty(ccaddr)) {
 	vms_append_addrs(&command, ccaddr, "/CC");
     }
 
@@ -822,7 +855,7 @@ PUBLIC void mailform ARGS4(
     LYRemoveTemp(my_tmpfile);
     if (isPMDF)
 	LYRemoveTemp(hdrfile);
-#else /* DOSPATH */
+#else /* DOS */
     LYSendMailFile (
 	address,
 	my_tmpfile,
@@ -846,9 +879,9 @@ cleanup:
 */
 PUBLIC void mailmsg ARGS4(
 	int,		cur,
-	char *, 	owner_address,
-	char *, 	filename,
-	char *, 	linkname)
+	char *,		owner_address,
+	char *,		filename,
+	char *,		linkname)
 {
     FILE *fd, *fp;
     char *address = NULL;
@@ -868,12 +901,15 @@ PUBLIC void mailmsg ARGS4(
     char *command = NULL;
 
     CTRACE((tfp, "mailmsg(%d, \"%s\", \"%s\", \"%s\")\n", cur,
-	NIL_OK(owner_address),
-	NIL_OK(filename),
-	NIL_OK(linkname)));
+	NONNULL(owner_address),
+	NONNULL(filename),
+	NONNULL(linkname)));
 
 #endif /* VMS */
 
+    if (!LYSystemMail())
+	return;
+
 #ifdef ALERTMAIL
     if (owner_address == NULL) {
 	owner_address = ALERTMAIL;
@@ -881,9 +917,8 @@ PUBLIC void mailmsg ARGS4(
     }
 #endif
 
-    if (owner_address == NULL || *owner_address == '\0') {
+    if (isEmpty(owner_address))
 	return;
-    }
     if ((cp = (char *)strchr(owner_address,'\n')) != NULL) {
 #ifdef ALERTMAIL
 	if (skip_parsing)
@@ -949,7 +984,7 @@ PUBLIC void mailmsg ARGS4(
 
     fprintf(fd, "To: %s\n", address);
     fprintf(fd, "Subject: Lynx Error in %s\n", filename);
-    if (!EMPTY(personal_mail_address)) {
+    if (!isEmpty(personal_mail_address)) {
 	fprintf(fd, "Cc: %s\n", personal_mail_address);
     }
     fprintf(fd, "X-URL: %s\n", filename);
@@ -971,7 +1006,7 @@ PUBLIC void mailmsg ARGS4(
 	    return;
 	}
 
-	if (!EMPTY(personal_mail_address)) {
+	if (!isEmpty(personal_mail_address)) {
 	    fprintf(fd, "Cc: %s\n", personal_mail_address);
 	}
 	fprintf(fd, "X-URL: %s\n", filename);
@@ -988,7 +1023,7 @@ PUBLIC void mailmsg ARGS4(
 
     fprintf(fd, gettext("The link   %s :?: %s \n"),
 		links[cur].lname, links[cur].target);
-    fprintf(fd, gettext("called \"%s\"\n"), links[cur].hightext);
+    fprintf(fd, gettext("called \"%s\"\n"), LYGetHiliteStr(cur, 0));
     fprintf(fd, gettext("in the file \"%s\" called \"%s\"\n"), filename, linkname);
     fprintf(fd, "%s\n\n", gettext("was requested but was not available."));
     fprintf(fd, "%s\n\n", gettext("Thought you might want to know."));
@@ -1038,7 +1073,7 @@ PUBLIC void mailmsg ARGS4(
     if (isPMDF) {
 	LYRemoveTemp(hdrfile);
     }
-#else /* DOSPATH */
+#else /* DOS */
     LYSendMailFile (
 	address,
 	my_tmpfile,
@@ -1073,8 +1108,8 @@ PUBLIC void mailmsg ARGS4(
 **  a comment from the users to the owner
 */
 PUBLIC void reply_by_mail ARGS4(
-	char *, 	mail_address,
-	char *, 	filename,
+	char *,		mail_address,
+	char *,		filename,
 	CONST char *,	title,
 	CONST char *,	refid)
 {
@@ -1096,9 +1131,9 @@ PUBLIC void reply_by_mail ARGS4(
     int i;
     int c = 0;	/* user input */
     char my_tmpfile[LY_MAXPATH];
-    char *command = NULL;
     char default_subject[MAX_SUBJECT + 10];
 #if USE_VMS_MAILER
+    char *command = NULL;
     BOOLEAN isPMDF = LYMailPMDF();
     char hdrfile[LY_MAXPATH];
     FILE *hfd = 0;
@@ -1112,14 +1147,17 @@ PUBLIC void reply_by_mail ARGS4(
 #endif /* USE_VMS_MAILER */
 
     CTRACE((tfp, "reply_by_mail(\"%s\", \"%s\", \"%s\", \"%s\")\n",
-	NIL_OK(mail_address),
-	NIL_OK(filename),
-	NIL_OK(title),
-	NIL_OK(refid)));
+	NONNULL(mail_address),
+	NONNULL(filename),
+	NONNULL(title),
+	NONNULL(refid)));
 
     term_letter = FALSE;
 
-    if (EMPTY(mail_address)) {
+    if (!LYSystemMail())
+	return;
+
+    if (isEmpty(mail_address)) {
 	HTAlert(NO_ADDRESS_IN_MAILTO_URL);
 	return;
     }
@@ -1208,7 +1246,7 @@ PUBLIC void reply_by_mail ARGS4(
     /*
      *	Set the default subject. - FM
      */
-    if (EMPTY(default_subject) && !EMPTY(title)) {
+    if (isEmpty(default_subject) && !isEmpty(title)) {
 	strncpy(default_subject, title, MAX_SUBJECT);
 	default_subject[MAX_SUBJECT] = '\0';
     }
@@ -1227,8 +1265,8 @@ PUBLIC void reply_by_mail ARGS4(
 	 */
 	fprintf((isPMDF ? hfd : fd),
 		"X-URL: %s%s\n",
-		EMPTY(filename) ? "mailto:" : filename,
-		EMPTY(filename) ? to_address : "");
+		isEmpty(filename) ? STR_MAILTO_URL : filename,
+		isEmpty(filename) ? to_address : "");
 	fprintf((isPMDF ? hfd : fd),
 		"X-Mailer: %s, Version %s\n", LYNX_NAME, LYNX_VERSION);
 #ifdef NO_ANONYMOUS_EMAIL
@@ -1242,7 +1280,11 @@ PUBLIC void reply_by_mail ARGS4(
      *	Put the To: line in the header.
      */
 #ifndef DOSPATH
-    HTSprintf(&header, "To: %s\n", to_address);
+    asprintf(&header, "To: %s\n", to_address);
+    if (!header) {
+	fprintf(stderr, "Out of memory, you lose!\n");
+	exit(1);
+    }
 #endif
 
     /*
@@ -1271,14 +1313,14 @@ PUBLIC void reply_by_mail ARGS4(
     /*
      *	Put the X-URL and X-Mailer lines in the header.
      */
-    if (!EMPTY(filename)) {
+    if (!isEmpty(filename)) {
 	HTSprintf(&header, "X-URL: %s\n", filename);
     } else {
 	HTSprintf(&header, "X-URL: mailto:%s\n", to_address);
     }
     HTSprintf(&header, "X-Mailer: %s, Version %s\n", LYNX_NAME, LYNX_VERSION);
 
-    if (!EMPTY(refid)) {
+    if (!isEmpty(refid)) {
 	HTSprintf(&header, "In-Reply-To: <%s>\n", refid);
     }
 #endif /* VMS */
@@ -1379,7 +1421,7 @@ PUBLIC void reply_by_mail ARGS4(
     label = "Subject";
     if (*default_subject) {
 	StrAllocCopy(the_subject, default_subject);
-    } else if (!EMPTY(filename)) {
+    } else if (!isEmpty(filename)) {
 	HTSprintf(&the_subject, "%s", filename);
     } else {
 	HTSprintf(&the_subject, "mailto:%s", to_address);
@@ -1413,14 +1455,14 @@ PUBLIC void reply_by_mail ARGS4(
     /*
     **	Add the Cc: header. - FM
     */
-    if (!EMPTY(ccaddr)) {
+    if (!isEmpty(ccaddr)) {
 	HTSprintf(&header, "Cc: %s\n", ccaddr);
     }
 
     /*
     **	Add the Keywords: header. - FM
     */
-    if (!EMPTY(keywords)) {
+    if (!isEmpty(keywords)) {
 	HTSprintf(&header, "Keywords: %s\n", keywords);
     }
 
@@ -1431,7 +1473,7 @@ PUBLIC void reply_by_mail ARGS4(
     CTRACE((tfp,"**header==\n%s",header));
 #endif /* !VMS */
 
-    if (!no_editor && !EMPTY(editor)) {
+    if (!no_editor && !isEmpty(editor)) {
 
 	if (body) {
 	    cp1 = body;
@@ -1447,7 +1489,7 @@ PUBLIC void reply_by_mail ARGS4(
 	    BOOLEAN is_preparsed = (BOOL) (LYPreparsedSource &&
 				    HTisDocumentSource());
 	    if (HTConfirm(is_preparsed
-	    	? INC_PREPARSED_MSG_PROMPT
+		? INC_PREPARSED_MSG_PROMPT
 		: INC_ORIG_MSG_PROMPT) == YES) {
 		print_wwwfile_to_fd(fd, (BOOL) !is_preparsed);
 	    }
@@ -1583,7 +1625,7 @@ PUBLIC void reply_by_mail ARGS4(
 	 *  For PMDF, put any keywords and the subject
 	 *  in the header file and close it. - FM
 	 */
-	if (!EMPTY(keywords)) {
+	if (!isEmpty(keywords)) {
 	    fprintf(hfd, "Keywords: %s\n", keywords);
 	}
 	fprintf(hfd, "Subject: %s\n\n", the_subject);
@@ -1612,7 +1654,7 @@ PUBLIC void reply_by_mail ARGS4(
     }
 
     vms_append_addrs(&command, to_address, "");
-    if (!EMPTY(ccaddr)) {
+    if (!isEmpty(ccaddr)) {
 	vms_append_addrs(&command, ccaddr, "/CC");
     }
 
@@ -1632,7 +1674,6 @@ PUBLIC void reply_by_mail ARGS4(
     if ((fp = LYPipeToMailer()) == 0) {
 	HTInfoMsg(CANCELLED);
     }
-    FREE(command);
 #else
     if ((fp = LYOpenTemp(tmpfile2, ".txt", "w")) == NULL) {
 	HTAlert(MAILTO_URL_TEMPOPEN_FAILED);
@@ -1681,13 +1722,12 @@ PUBLIC void reply_by_mail ARGS4(
 cancelled:
     HTInfoMsg(CANCELLED);
     LYCloseTempFP(fd);		/* Close the tmpfile.	*/
-    scrollok(LYwin,FALSE); 	/* Stop scrolling.	*/
+    scrollok(LYwin,FALSE);	/* Stop scrolling.	*/
 cleanup:
     signal(SIGINT, cleanup_sig);
     term_letter = FALSE;
 
 #if USE_VMS_MAILER
-    FREE(command);
     while (LYRemoveTemp(my_tmpfile) == 0)
 	;		 /* Delete the tmpfile(s). */
     if (isPMDF) {
@@ -1707,3 +1747,15 @@ cleanup:
     FREE(body);
     return;
 }
+
+/*
+ * Check that we have configured values for system mailer.
+ */
+PUBLIC BOOLEAN LYSystemMail NOARGS
+{
+    if (system_mail == 0 || !strcmp(system_mail, "unknown")) {
+	HTAlert(gettext("No system mailer configured"));
+	return FALSE;
+    }
+    return TRUE;
+}
diff --git a/gnu/usr.bin/lynx/src/LYMail.h b/gnu/usr.bin/lynx/src/LYMail.h
index ec88731816c..9d93d0e1c6b 100644
--- a/gnu/usr.bin/lynx/src/LYMail.h
+++ b/gnu/usr.bin/lynx/src/LYMail.h
@@ -29,6 +29,7 @@
 
 extern BOOLEAN term_letter;
 
+extern BOOLEAN LYSystemMail NOPARAMS;
 extern BOOLEAN LYMailPMDF NOPARAMS;
 extern FILE *LYPipeToMailer NOPARAMS;
 extern int LYSendMailFile PARAMS((
diff --git a/gnu/usr.bin/lynx/src/LYMain.c b/gnu/usr.bin/lynx/src/LYMain.c
index 30eadca5d99..25df183ed8f 100644
--- a/gnu/usr.bin/lynx/src/LYMain.c
+++ b/gnu/usr.bin/lynx/src/LYMain.c
@@ -40,6 +40,7 @@
 #include <dpmi.h>
 #include <io.h>
 #include <sys/stat.h>
+#include <sys/exceptn.h>
 #endif /* __DJGPP__ */
 
 #ifdef __EMX__
@@ -59,8 +60,10 @@
 
 #ifdef FNAMES_8_3
 #define COOKIE_FILE "cookies"
+#define TRACE_FILE "LY-TRACE.LOG"
 #else
 #define COOKIE_FILE ".lynx_cookies"
+#define TRACE_FILE "Lynx.trace"
 #endif /* FNAMES_8_3 */
 
 /* ahhhhhhhhhh!! Global variables :-< */
@@ -73,7 +76,7 @@ PUBLIC BOOLEAN sigint = FALSE;
 #endif /* IGNORE_CTRL_C */
 
 #ifdef __DJGPP__
-char init_ctrl_break[1];
+PRIVATE char init_ctrl_break[1];
 #endif /* __DJGPP__ */
 
 #if USE_VMS_MAILER
@@ -93,18 +96,18 @@ PUBLIC char *syslog_txt = NULL;		/* syslog arb text for session */
 #endif /* SYSLOG_REQUESTED_URLS */
 #endif /* !VMS */
 
-#ifdef VMS
-PUBLIC char *LYCSwingPath = NULL;
-#endif /* VMS */
-
 #ifdef DIRED_SUPPORT
 PUBLIC BOOLEAN lynx_edit_mode = FALSE;
 PUBLIC BOOLEAN no_dired_support = FALSE;
-PUBLIC int dir_list_style = MIXED_STYLE;
 PUBLIC HTList *tagged = NULL;
+PUBLIC int LYAutoUncacheDirLists = 2; /* default dired uncaching behavior */
+PUBLIC int dir_list_order = ORDER_BY_NAME;
+PUBLIC int dir_list_style = MIXED_STYLE;
+
 #ifdef OK_OVERRIDE
 PUBLIC BOOLEAN prev_lynx_edit_mode = FALSE;
 #endif /* OK_OVERRIDE */
+
 #ifdef OK_PERMIT
 #ifdef NO_CHANGE_EXECUTE_PERMS
 PUBLIC BOOLEAN no_change_exec_perms = TRUE;
@@ -112,7 +115,7 @@ PUBLIC BOOLEAN no_change_exec_perms = TRUE;
 PUBLIC BOOLEAN no_change_exec_perms = FALSE;
 #endif /* NO_CHANGE_EXECUTE_PERMS */
 #endif /* OK_PERMIT */
-PUBLIC int LYAutoUncacheDirLists = 2; /* default dired uncaching behavior */
+
 #endif /* DIRED_SUPPORT */
 
 	   /* Number of docs cached in memory */
@@ -154,51 +157,57 @@ PUBLIC lynx_list_item_type *downloaders = NULL;
 PUBLIC lynx_list_item_type *externals = NULL;
 			    /* linked list of external options */
 #endif
+
 PUBLIC lynx_list_item_type *uploaders = NULL;
 PUBLIC int port_syntax = 1;
 PUBLIC int LYShowColor = SHOW_COLOR_UNKNOWN; /* to show or not */
 PUBLIC int LYrcShowColor = SHOW_COLOR_UNKNOWN; /* ... last used */
+
 #if !defined(NO_OPTION_FORMS) && !defined(NO_OPTION_MENU)
 PUBLIC BOOLEAN LYUseFormsOptions = TRUE; /* use forms-based options menu */
 #endif
+
+PUBLIC BOOLEAN LYJumpFileURL = FALSE;	 /* always FALSE the first time */
+PUBLIC BOOLEAN LYPermitURL = FALSE;
+PUBLIC BOOLEAN LYRestricted = FALSE; /* whether we have -anonymous option */
 PUBLIC BOOLEAN LYShowCursor = SHOW_CURSOR; /* to show or not to show */
-PUBLIC BOOLEAN verbose_img = VERBOSE_IMAGES;  /* show filenames or not */
+PUBLIC BOOLEAN LYUnderlineLinks = UNDERLINE_LINKS; /* Show the links underlined vs bold */
 PUBLIC BOOLEAN LYUseDefShoCur = TRUE;	/* Command line -show_cursor toggle */
+PUBLIC BOOLEAN LYUserSpecifiedURL = TRUE;/* always TRUE  the first time */
+PUBLIC BOOLEAN LYValidate = FALSE;
 PUBLIC BOOLEAN LYforce_no_cache = FALSE;
-PUBLIC BOOLEAN LYoverride_no_cache = FALSE;/*override no-cache b/c history etc*/
 PUBLIC BOOLEAN LYinternal_flag = FALSE; /* override no-cache b/c internal link*/
+PUBLIC BOOLEAN LYoverride_no_cache = FALSE;/*override no-cache b/c history etc*/
 PUBLIC BOOLEAN LYresubmit_posts = ALWAYS_RESUBMIT_POSTS;
 PUBLIC BOOLEAN LYtrimInputFields = FALSE;
-PUBLIC BOOLEAN LYUserSpecifiedURL = TRUE;/* always TRUE  the first time */
-PUBLIC BOOLEAN LYJumpFileURL = FALSE;	 /* always FALSE the first time */
-PUBLIC BOOLEAN jump_buffer = JUMPBUFFER; /* TRUE if offering default shortcut */
-PUBLIC BOOLEAN goto_buffer = GOTOBUFFER; /* TRUE if offering default goto URL */
+PUBLIC BOOLEAN bold_H1 = FALSE;
+PUBLIC BOOLEAN bold_headers = FALSE;
+PUBLIC BOOLEAN bold_name_anchors = FALSE;
+PUBLIC BOOLEAN case_sensitive = CASE_SENSITIVE_ALWAYS_ON;
+PUBLIC BOOLEAN check_mail = CHECKMAIL;
+PUBLIC BOOLEAN child_lynx = FALSE;
+PUBLIC BOOLEAN dump_output_immediately = FALSE;
+PUBLIC BOOLEAN emacs_keys = EMACS_KEYS_ALWAYS_ON;
+PUBLIC BOOLEAN error_logging = MAIL_SYSTEM_ERROR_LOGGING;
 PUBLIC BOOLEAN ftp_passive = FTP_PASSIVE; /* TRUE if doing ftp in passive mode */
 PUBLIC BOOLEAN ftp_local_passive;
 PUBLIC char *ftp_lasthost;
-PUBLIC BOOLEAN recent_sizechange = FALSE;/* the window size changed recently? */
-PUBLIC int user_mode = NOVICE_MODE;
-PUBLIC BOOLEAN dump_output_immediately = FALSE;
+PUBLIC BOOLEAN goto_buffer = GOTOBUFFER; /* TRUE if offering default goto URL */
+PUBLIC BOOLEAN historical_comments = FALSE;
 PUBLIC BOOLEAN is_www_index = FALSE;
+PUBLIC BOOLEAN jump_buffer = JUMPBUFFER; /* TRUE if offering default shortcut */
 PUBLIC BOOLEAN lynx_mode = NORMAL_LYNX_MODE;
-PUBLIC BOOLEAN bold_headers = FALSE;
-PUBLIC BOOLEAN bold_H1 = FALSE;
-PUBLIC BOOLEAN bold_name_anchors = FALSE;
-PUBLIC BOOLEAN use_underscore = SUBSTITUTE_UNDERSCORES;
-PUBLIC BOOLEAN nolist = FALSE;
-PUBLIC BOOLEAN historical_comments = FALSE;
 PUBLIC BOOLEAN minimal_comments = FALSE;
+PUBLIC BOOLEAN nolist = FALSE;
+PUBLIC BOOLEAN number_fields_on_left = TRUE;
+PUBLIC BOOLEAN number_links_on_left = TRUE;
+PUBLIC BOOLEAN recent_sizechange = FALSE;/* the window size changed recently? */
 PUBLIC BOOLEAN soft_dquotes = FALSE;
-PUBLIC BOOLEAN LYRestricted = FALSE; /* whether we have -anonymous option */
-PUBLIC BOOLEAN LYValidate = FALSE;
-PUBLIC BOOLEAN LYPermitURL = FALSE;
-PUBLIC BOOLEAN child_lynx = FALSE;
-PUBLIC BOOLEAN error_logging = MAIL_SYSTEM_ERROR_LOGGING;
-PUBLIC BOOLEAN check_mail = CHECKMAIL;
+PUBLIC BOOLEAN use_underscore = SUBSTITUTE_UNDERSCORES;
+PUBLIC BOOLEAN verbose_img = VERBOSE_IMAGES;  /* show filenames or not */
 PUBLIC BOOLEAN vi_keys = VI_KEYS_ALWAYS_ON;
-PUBLIC BOOLEAN emacs_keys = EMACS_KEYS_ALWAYS_ON;
 PUBLIC int keypad_mode = DEFAULT_KEYPAD_MODE;
-PUBLIC BOOLEAN case_sensitive = CASE_SENSITIVE_ALWAYS_ON;
+PUBLIC int user_mode = NOVICE_MODE;
 
 PUBLIC BOOLEAN telnet_ok = TRUE;
 #ifndef DISABLE_NEWS
@@ -284,9 +293,11 @@ PUBLIC BOOLEAN local_host_only = FALSE;
 PUBLIC BOOLEAN override_no_download = FALSE;
 PUBLIC BOOLEAN show_dotfiles = FALSE;	/* From rcfile if no_dotfiles is false */
 PUBLIC BOOLEAN LYforce_HTML_mode = FALSE;
+PUBLIC BOOLEAN LYfind_leaks = TRUE;
 
 #ifdef __DJGPP__
 PUBLIC BOOLEAN watt_debug = FALSE;	/* WATT-32 debugging */
+PUBLIC BOOLEAN dj_is_bash = FALSE;  /* Check for bash shell under DJGPP */
 #endif /* __DJGPP__ */
 
 #ifdef WIN_EX
@@ -307,11 +318,9 @@ PUBLIC BOOLEAN system_is_NT = FALSE;
 
 #ifdef SH_EX
 PUBLIC BOOLEAN show_cfg = FALSE;
-#ifdef WIN_EX
-PUBLIC int     debug_delay = 0;		/* 1998/10/06 (Tue) 08:41:20 */
 #endif
+
 PUBLIC BOOLEAN no_table_center = FALSE;	/* 1998/10/09 (Fri) 15:12:49 */
-#endif /* SH_EX */
 
 #if USE_BLAT_MAILER
 PUBLIC BOOLEAN mail_is_blat = TRUE;
@@ -413,21 +422,23 @@ PUBLIC char *startrealm = NULL;		/* the startfile realm */
 PUBLIC char *system_mail = NULL;	/* The path for sending mail */
 PUBLIC char *system_mail_flags = NULL;	/* Flags for sending mail */
 PUBLIC char *x_display = NULL;		/* display environment variable */
-PUBLIC histstruct history[MAXHIST];
+PUBLIC HistInfo history[MAXHIST];
 PUBLIC int AlertSecs;			/* time-delay for HTAlert() messages   */
+PUBLIC int DebugSecs;			/* time-delay for HTProgress messages */
 PUBLIC int InfoSecs;			/* time-delay for Information messages */
 PUBLIC int LYMultiBookmarks = MULTI_BOOKMARK_SUPPORT;
 PUBLIC int LYStatusLine = -1;		/* Line for statusline() if > -1 */
 PUBLIC int LYcols = DFT_COLS;
 PUBLIC int LYlines = DFT_ROWS;
 PUBLIC int MessageSecs;			/* time-delay for important Messages   */
+PUBLIC int ReplaySecs;			/* time-delay for command-scripts */
 PUBLIC int ccount = 0;			/* Starting number for lnk#.dat files in crawls */
 PUBLIC int dump_output_width = 0;
 PUBLIC int lynx_temp_subspace = 0;	/* > 0 if we made temp-directory */
 PUBLIC int nhist = 0;			/* number of history entries */
 PUBLIC int nlinks = 0;			/* number of links in memory */
 PUBLIC int outgoing_mail_charset = -1;	/* translate mail to this charset */
-PUBLIC linkstruct links[MAXLINKS];
+PUBLIC LinkInfo links[MAXLINKS];
 
 #ifndef DISABLE_BIBP
 PUBLIC BOOLEAN BibP_bibhost_available = FALSE;  /* until check succeeds  */
@@ -437,11 +448,11 @@ PUBLIC char *BibP_bibhost = NULL;	 /* local server for bibp: links  */
 PUBLIC char *BibP_globalserver = NULL;   /* global server for bibp: links */
 #endif
 
-#ifdef EXP_PERSISTENT_COOKIES
+#ifdef USE_PERSISTENT_COOKIES
 PUBLIC BOOLEAN persistent_cookies = FALSE; /* disabled by default! */
 PUBLIC char *LYCookieFile = NULL;	/* cookie read file */
 PUBLIC char *LYCookieSaveFile = NULL;	/* cookie save file */
-#endif /* EXP_PERSISTENT_COOKIES */
+#endif /* USE_PERSISTENT_COOKIES */
 
 #ifdef EXP_NESTED_TABLES
 PUBLIC BOOLEAN nested_tables =
@@ -454,7 +465,8 @@ PUBLIC BOOLEAN nested_tables =
 #endif
 
 PUBLIC BOOLEAN LYShowTransferRate = TRUE;
-PUBLIC int LYTransferRate = rateEtaKB_maybe;
+PUBLIC int LYTransferRate = rateKB;
+PUBLIC char * LYTransferName = NULL;
 
 PUBLIC char *XLoadImageCommand = NULL;	/* Default image viewer for X */
 PUBLIC BOOLEAN LYNoISMAPifUSEMAP = FALSE; /* Omit ISMAP link if MAP present? */
@@ -480,6 +492,12 @@ PUBLIC BOOLEAN LYPrependCharsetToSource = TRUE;
 PUBLIC BOOLEAN LYQuitDefaultYes = QUIT_DEFAULT_YES;
 PUBLIC BOOLEAN dont_wrap_pre = FALSE;
 
+PUBLIC int cookie_noprompt;
+
+#ifdef USE_SSL
+PUBLIC int ssl_noprompt = FORCE_PROMPT_DFT;
+#endif
+
 PUBLIC int connect_timeout = 18000; /*=180000*0.1 - used in HTDoConnect.*/
 
 #ifdef EXP_JUSTIFY_ELTS
@@ -487,10 +505,19 @@ PUBLIC BOOL ok_justify = TRUE;
 PUBLIC int justify_max_void_percent = 35;
 #endif
 
+#ifdef EXP_LOCALE_CHARSET
+PUBLIC BOOLEAN LYLocaleCharset = FALSE;
+#endif
+
 #ifndef NO_DUMP_WITH_BACKSPACES
 PUBLIC BOOLEAN with_backspaces = FALSE;
 #endif
 
+#if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
+PUBLIC int scrsize_x = 0;
+PUBLIC int scrsize_y = 0;
+#endif
+
 PUBLIC BOOL force_empty_hrefless_a = FALSE;
 
 #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
@@ -519,8 +546,7 @@ PUBLIC int LYNoZapKey = 0; /* 0: off (do z checking), 1: full, 2: initially */
 #endif
 
 #ifndef DISABLE_NEWS
-extern int HTNewsChunkSize; /* Number of news articles per chunk (HTNews.c) */
-extern int HTNewsMaxChunk;  /* Max news articles before chunking (HTNews.c) */
+#include <HTNews.h>
 #endif
 
 PUBLIC BOOLEAN FileInitAlreadyDone = FALSE;
@@ -591,7 +617,7 @@ PRIVATE void reset_break(void)
 #endif /* __DJGPP__ */
 
 #if defined(WIN_EX)
-PUBLIC int is_windows_nt(void)
+PRIVATE int is_windows_nt(void)
 {
     DWORD version;
 
@@ -622,8 +648,10 @@ PRIVATE void free_lynx_globals NOARGS
 
 #ifdef VMS
     Define_VMSLogical("LYNX_VERSION", "");
-    FREE(LYCSwingPath);
 #endif /* VMS */
+#ifndef VMS
+    FREE(lynx_version_putenv_command);
+#endif
 
 #if USE_VMS_MAILER
     FREE(mail_adrs);
@@ -654,7 +682,7 @@ PRIVATE void free_lynx_globals NOARGS
     FREE(BibP_bibhost);
     FREE(BibP_globalserver);
 #endif
-#ifdef EXP_PERSISTENT_COOKIES
+#ifdef USE_PERSISTENT_COOKIES
     FREE(LYCookieFile);
     FREE(LYCookieSaveFile);
 #endif
@@ -685,410 +713,442 @@ PRIVATE void free_lynx_globals NOARGS
     FREE(URLDomainPrefixes);
     FREE(URLDomainSuffixes);
     FREE(XLoadImageCommand);
-#ifndef VMS
-    FREE(lynx_version_putenv_command);
+    FREE(lynx_temp_space);
+    FREE(LYTransferName);
+    FREE(LYTraceLogPath);
+    FREE(lynx_cfg_file);
+#if defined(USE_COLOR_STYLE)
+    FREE(lynx_lss_file);
 #endif
-	    FREE(lynx_temp_space);
-	    FREE(LYTraceLogPath);
-	    FREE(lynx_cfg_file);
-	#if defined(USE_COLOR_STYLE)
-	    FREE(lynx_lss_file);
-	#endif
-	    FREE(UCAssume_MIMEcharset);
-	    LYUIPages_free();
-	    for (i = 0; i < nlinks; i++) {
-		FREE(links[i].lname);
-	    }
-	    nlinks = 0;
-	    HTList_delete(LYcommandList());
+    FREE(UCAssume_MIMEcharset);
+    LYUIPages_free();
+    for (i = 0; i < nlinks; i++) {
+	FREE(links[i].lname);
+    }
+    nlinks = 0;
+    HTList_delete(LYcommandList());
 
-	    return;
-	}
-	#endif /* LY_FIND_LEAKS */
+    return;
+}
+#endif /* LY_FIND_LEAKS */
 
-	/*
-	 *  This function frees the LYStdinArgs list. - FM
-	 */
-	PRIVATE void LYStdinArgs_free NOARGS
-	{
-	    char *argument;
-	    HTList *cur = LYStdinArgs;
+/*
+ *  This function frees the LYStdinArgs list. - FM
+ */
+PRIVATE void LYStdinArgs_free NOARGS
+{
+    char *argument;
+    HTList *cur = LYStdinArgs;
 
-	    if (cur == NULL)
-		return;
+    if (cur == NULL)
+	return;
 
-	    while (NULL != (argument = (char *)HTList_nextObject(cur))) {
-		FREE(argument);
-	    }
-	    HTList_delete(LYStdinArgs);
-	    LYStdinArgs = NULL;
-	    return;
-	}
+    while (NULL != (argument = (char *)HTList_nextObject(cur))) {
+	FREE(argument);
+    }
+    HTList_delete(LYStdinArgs);
+    LYStdinArgs = NULL;
+    return;
+}
 
-	PUBLIC void exit_immediately ARGS1(
-		int,		code)
-	{
-	#ifndef NOSIGHUP
-	    (void) signal(SIGHUP, SIG_DFL);
-	#endif /* NOSIGHUP */
-	    (void) signal(SIGTERM, SIG_DFL);
-	#ifndef VMS
-	    (void) signal(SIGINT, SIG_DFL);
-	#endif /* !VMS */
-	#ifdef SIGTSTP
-	    if (no_suspend)
-		(void) signal(SIGTSTP, SIG_DFL);
-	#endif /* SIGTSTP */
-	    exit(code);
-	}
+PUBLIC void exit_immediately ARGS1(
+	int,		code)
+{
+#ifndef NOSIGHUP
+    (void) signal(SIGHUP, SIG_DFL);
+#endif /* NOSIGHUP */
+    (void) signal(SIGTERM, SIG_DFL);
+#ifndef VMS
+    (void) signal(SIGINT, SIG_DFL);
+#endif /* !VMS */
+#ifdef SIGTSTP
+    if (no_suspend)
+	(void) signal(SIGTSTP, SIG_DFL);
+#endif /* SIGTSTP */
+    exit(code);
+}
 
-	#ifdef  EBCDIC
-	      char un_IBM1047[ 256 ] = "";
-	unsigned char IBM1047[ 256 ] = /* ATOE OEMVS311 */
-	{
-	0x00,0x01,0x02,0x03,0x37,0x2d,0x2e,0x2f,0x16,0x05,0x15,0x0b,0x0c,0x0d,0x0e,0x0f,
-	0x10,0x11,0x12,0x13,0x3c,0x3d,0x32,0x26,0x18,0x19,0x3f,0x27,0x1c,0x1d,0x1e,0x1f,
-	0x40,0x5a,0x7f,0x7b,0x5b,0x6c,0x50,0x7d,0x4d,0x5d,0x5c,0x4e,0x6b,0x60,0x4b,0x61,
-	0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0x7a,0x5e,0x4c,0x7e,0x6e,0x6f,
-	0x7c,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,
-	0xd7,0xd8,0xd9,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xad,0xe0,0xbd,0x5f,0x6d,
-	0x79,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x91,0x92,0x93,0x94,0x95,0x96,
-	0x97,0x98,0x99,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xc0,0x4f,0xd0,0xa1,0x07,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x06,0x17,0x28,0x29,0x2a,0x2b,0x2c,0x09,0x0a,0x1b,
-	0x30,0x31,0x1a,0x33,0x34,0x35,0x36,0x08,0x38,0x39,0x3a,0x3b,0x04,0x14,0x3e,0xff,
-	0x41,0xaa,0x4a,0xb1,0x9f,0xb2,0x6a,0xb5,0xbb,0xb4,0x9a,0x8a,0xb0,0xca,0xaf,0xbc,
-	0x90,0x8f,0xea,0xfa,0xbe,0xa0,0xb6,0xb3,0x9d,0xda,0x9b,0x8b,0xb7,0xb8,0xb9,0xab,
-	0x64,0x65,0x62,0x66,0x63,0x67,0x9e,0x68,0x74,0x71,0x72,0x73,0x78,0x75,0x76,0x77,
-	0xac,0x69,0xed,0xee,0xeb,0xef,0xec,0xbf,0x80,0xfd,0xfe,0xfb,0xfc,0xba,0xae,0x59,
-	0x44,0x45,0x42,0x46,0x43,0x47,0x9c,0x48,0x54,0x51,0x52,0x53,0x58,0x55,0x56,0x57,
-	0x8c,0x49,0xcd,0xce,0xcb,0xcf,0xcc,0xe1,0x70,0xdd,0xde,0xdb,0xdc,0x8d,0x8e,0xdf
-	} ;
-
-	PRIVATE void FixCharacters(void)
-	{
-	    int c;
-	    int work1[256],
-		work2[256];
-
-	    for (c = 0; c < 256; c++) {
-		un_IBM1047[IBM1047[c]] = c;
-		work1[c] = keymap[c+1];
-		work2[c] = key_override[c+1];
-	    }
-	    for (c = 0; c < 256; c++) {
-		keymap      [IBM1047[c]+1] = work1[c];
-		key_override[IBM1047[c]+1] = work2[c];
-	    }
+#ifdef  EBCDIC
+      char un_IBM1047[ 256 ] = "";
+unsigned char IBM1047[ 256 ] = /* ATOE OEMVS311 */
+{
+0x00,0x01,0x02,0x03,0x37,0x2d,0x2e,0x2f,0x16,0x05,0x15,0x0b,0x0c,0x0d,0x0e,0x0f,
+0x10,0x11,0x12,0x13,0x3c,0x3d,0x32,0x26,0x18,0x19,0x3f,0x27,0x1c,0x1d,0x1e,0x1f,
+0x40,0x5a,0x7f,0x7b,0x5b,0x6c,0x50,0x7d,0x4d,0x5d,0x5c,0x4e,0x6b,0x60,0x4b,0x61,
+0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0x7a,0x5e,0x4c,0x7e,0x6e,0x6f,
+0x7c,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,
+0xd7,0xd8,0xd9,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xad,0xe0,0xbd,0x5f,0x6d,
+0x79,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x91,0x92,0x93,0x94,0x95,0x96,
+0x97,0x98,0x99,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xc0,0x4f,0xd0,0xa1,0x07,
+0x20,0x21,0x22,0x23,0x24,0x25,0x06,0x17,0x28,0x29,0x2a,0x2b,0x2c,0x09,0x0a,0x1b,
+0x30,0x31,0x1a,0x33,0x34,0x35,0x36,0x08,0x38,0x39,0x3a,0x3b,0x04,0x14,0x3e,0xff,
+0x41,0xaa,0x4a,0xb1,0x9f,0xb2,0x6a,0xb5,0xbb,0xb4,0x9a,0x8a,0xb0,0xca,0xaf,0xbc,
+0x90,0x8f,0xea,0xfa,0xbe,0xa0,0xb6,0xb3,0x9d,0xda,0x9b,0x8b,0xb7,0xb8,0xb9,0xab,
+0x64,0x65,0x62,0x66,0x63,0x67,0x9e,0x68,0x74,0x71,0x72,0x73,0x78,0x75,0x76,0x77,
+0xac,0x69,0xed,0xee,0xeb,0xef,0xec,0xbf,0x80,0xfd,0xfe,0xfb,0xfc,0xba,0xae,0x59,
+0x44,0x45,0x42,0x46,0x43,0x47,0x9c,0x48,0x54,0x51,0x52,0x53,0x58,0x55,0x56,0x57,
+0x8c,0x49,0xcd,0xce,0xcb,0xcf,0xcc,0xe1,0x70,0xdd,0xde,0xdb,0xdc,0x8d,0x8e,0xdf
+} ;
+
+PRIVATE void FixCharacters(void)
+{
+    int c;
+    int work1[256],
+	work2[256];
+
+    for (c = 0; c < 256; c++) {
+	un_IBM1047[IBM1047[c]] = c;
+	work1[c] = keymap[c+1];
+	work2[c] = key_override[c+1];
+    }
+    for (c = 0; c < 256; c++) {
+	keymap      [IBM1047[c]+1] = work1[c];
+	key_override[IBM1047[c]+1] = work2[c];
+    }
+}
+#endif /* EBCDIC */
+
+PRIVATE int argncmp ARGS2(
+	char*,		str,
+	char*,		what)
+{
+    if (str[0] == '-' && str[1] == '-' ) ++str;
+#if OPTNAME_ALLOW_DASHES
+    return strncmp(str, what, strlen(what));
+#else
+    ++str; ++what; /*skip leading dash in both strings*/
+    return !strn_dash_equ(str, what, strlen(what));
+#endif
+}
+
+PRIVATE void tildeExpand ARGS2(
+	char **,	pathname,
+	BOOLEAN,	embedded)
+{
+    char *temp = *pathname;
+
+    if (embedded) {
+	if (temp != NULL) {
+	    temp = strstr(*pathname, "/~");
+	    if (temp != 0)
+		temp++;
+	    else
+		temp = *pathname;
 	}
-	#endif /* EBCDIC */
+    }
 
-	PRIVATE int argncmp ARGS2(
-		char*,		str,
-		char*,		what)
-	{
-	    if (str[0] == '-' && str[1] == '-' ) ++str;
-	#if OPTNAME_ALLOW_DASHES
-	    return strncmp(str, what, strlen(what));
-	#else
-	    ++str; ++what; /*skip leading dash in both strings*/
-	    return !strn_dash_equ(str, what, strlen(what));
-	#endif
+    if (temp != NULL
+     && temp[0] == '~') {
+	if (temp[1] == '/'
+	 && temp[2] != '\0') {
+	    temp = NULL;
+	    StrAllocCopy(temp, *pathname + 2);
+	    StrAllocCopy(*pathname, wwwName(Home_Dir()));
+	    LYAddPathSep(pathname);
+	    StrAllocCat(*pathname, temp);
+	    FREE(temp);
+	} else if (temp[1] == '\0') {
+	    StrAllocCopy(*pathname, wwwName(Home_Dir()));
 	}
+    }
+}
 
-	PRIVATE void tildeExpand ARGS2(
-		char **,	pathname,
-		BOOLEAN,	embedded)
-	{
-	    char *temp = *pathname;
-
-	    if (embedded) {
-		if (temp != NULL) {
-		    temp = strstr(*pathname, "/~");
-		    if (temp != 0)
-			temp++;
-		    else
-			temp = *pathname;
-		}
-	    }
+PRIVATE BOOL GetStdin ARGS2(
+	char **,	buf,
+	BOOL,		marker)
+{
+    if (LYSafeGets(buf, stdin) != 0
+     && (!marker || strncmp(*buf, "---", 3) != 0)) {
+	LYTrimTrailing(*buf);
+	CTRACE((tfp, "...data: %s\n", *buf));
+	return TRUE;
+    }
+    CTRACE((tfp, "...mark: %s\n", *buf ? *buf : ""));
+    return FALSE;
+}
 
-	    if (temp != NULL
-	     && temp[0] == '~') {
-		if (temp[1] == '/'
-		 && temp[2] != '\0') {
-		    temp = NULL;
-		    StrAllocCopy(temp, *pathname + 2);
-		    StrAllocCopy(*pathname, wwwName(Home_Dir()));
-		    LYAddPathSep(pathname);
-		    StrAllocCat(*pathname, temp);
-		    FREE(temp);
-		} else if (temp[1] == '\0') {
-		    StrAllocCopy(*pathname, wwwName(Home_Dir()));
-		}
-	    }
-	}
+#ifdef WIN32
+PRIVATE BOOL cleanup_win32(DWORD fdwCtrlType)
+{
+    switch (fdwCtrlType) {
+    case CTRL_CLOSE_EVENT:
+	cleanup_sig(-1);
+	return TRUE;
+    default:
+	return FALSE;
+    }
+}
+#endif
 
-	PRIVATE BOOL GetStdin ARGS2(
-		char **,	buf,
-		BOOL,		marker)
-	{
-	    if (LYSafeGets(buf, stdin) != 0
-	     && (!marker || strncmp(*buf, "---", 3) != 0)) {
-		LYTrimTrailing(*buf);
-		CTRACE((tfp, "...data: %s\n", *buf));
-		return TRUE;
-	    }
-	    CTRACE((tfp, "...mark: %s\n", *buf ? *buf : ""));
-	    return FALSE;
+/*
+ * Append the SSL version to lynx version or user-agent string.
+ */
+#ifdef USE_SSL
+PRIVATE void append_ssl_version ARGS2(
+	char **,	target,
+	char *,		separator)
+{
+    char SSLLibraryVersion[256];
+    char *SSLcp;
+
+    HTSprintf(target, " SSL-MM%s1.4.1", separator);
+
+#undef LYNX_SSL_VERSION
+
+#if defined(SSLEAY_VERSION)
+#define LYNX_SSL_VERSION SSLeay_version(SSLEAY_VERSION)
+#else
+#if defined(OPENSSL_VERSION_TEXT)
+#define LYNX_SSL_VERSION OPENSSL_VERSION_TEXT
+#else
+#if defined(GNUTLS_VERSION)
+#define LYNX_SSL_VERSION GNUTLS_VERSION
+#endif /* GNUTLS_VERSION */
+#endif /* OPENSSL_VERSION_TEXT */
+#endif
+
+#ifdef LYNX_SSL_VERSION
+    if (*separator == ' ')
+	StrAllocCat(*target, ",");
+    LYstrncpy(SSLLibraryVersion, LYNX_SSL_VERSION, sizeof(SSLLibraryVersion)-1);
+    if ((SSLcp = strchr(SSLLibraryVersion, ' ')) != NULL) {
+	*SSLcp++ = *separator;
+	if ((SSLcp = strchr(SSLcp, ' ')) != NULL) {
+	    *SSLcp = '\0';
+	    StrAllocCat(*target, " ");
+	    StrAllocCat(*target, SSLLibraryVersion);
 	}
+    }
+#endif /* LYNX_SSL_VERSION */
+}
+#endif /* USE_SSL */
+
+/*
+ * Wow!  Someone wants to start up Lynx.
+ */
+PUBLIC int main ARGS2(
+	int,		argc,
+	char **,	argv)
+{
+    int  i;		/* indexing variable */
+    int status = 0;	/* exit status */
+    char *temp = NULL;
+    char *cp;
+    FILE *fp;
+    struct stat dir_info;
+    char filename[LY_MAXPATH];
+    BOOL LYGetStdinArgs = FALSE;
+#ifdef _WINDOWS
+    WSADATA WSAData;
+#endif /* _WINDOWS */
+
+    /*
+     * Just in case someone has the idea to install lynx set-uid, let's try
+     * to discourage it.
+     */
+#if defined(GETUID) && defined(SETUID)
+    setuid(getuid());
+#endif
+
+#ifdef    NOT_ASCII
+    FixCharacters();
+#endif /* NOT_ASCII */
 
-	#ifdef WIN32
-	PRIVATE BOOL cleanup_win32(DWORD fdwCtrlType)
+#ifndef DISABLE_FTP
+    /* malloc a sizeof(char) so 1st strcmp() won't dump in HTLoadFile() */
+    ftp_lasthost = calloc(1,sizeof(char));
+#endif
+
+#ifdef EXP_CHARSET_CHOICE
+    memset((char*)charset_subsets, 0, sizeof(charset_subset_t)*MAXCHARSETS);
+#endif
+
+#ifdef _WINDOWS
+    {
+	int err;
+	WORD wVerReq;
+
+	wVerReq = MAKEWORD(1, 1);
+
+	err = WSAStartup(wVerReq, &WSAData);
+	if (err != 0)
 	{
-	    switch (fdwCtrlType) {
-	    case CTRL_CLOSE_EVENT:
-		cleanup_sig(-1);
-		return TRUE;
-	    default:
-		return FALSE;
-	    }
+	    printf(gettext("No Winsock found, sorry."));
+	    sleep(5);
+	    return 1;
 	}
-	#endif
+    }
 
-	/*
-	 * Wow!  Someone wants to start up Lynx.
-	 */
-	PUBLIC int main ARGS2(
-		int,		argc,
-		char **,	argv)
-	{
-	    int  i;		/* indexing variable */
-	    int status = 0;	/* exit status */
-	    char *temp = NULL;
-	    char *cp;
-	    FILE *fp;
-	    struct stat dir_info;
-	    char filename[LY_MAXPATH];
-	    BOOL LYGetStdinArgs = FALSE;
-	#ifdef _WINDOWS
-	    WSADATA WSAData;
-	#endif /* _WINDOWS */
-	#ifdef USE_SSL
-	    char SSLLibraryVersion[256];
-	    char *SSLcp;
-	#endif /* USE_SSL */
-
-	    /*
-	     * Just in case someone has the idea to install lynx set-uid, let's try
-	     * to discourage it.
-	     */
-	#if defined(GETUID) && defined(SETUID)
-	    setuid(getuid());
-	#endif
-
-	#ifdef    NOT_ASCII
-	    FixCharacters();
-	#endif /* NOT_ASCII */
-
-	#ifndef DISABLE_FTP
-	    /* malloc a sizeof(char) so 1st strcmp() won't dump in HTLoadFile() */
-	    ftp_lasthost = (char *)malloc(sizeof(char));
-	    *ftp_lasthost = NULL;
-	#endif
-
-	#ifdef EXP_CHARSET_CHOICE
-	    memset((char*)charset_subsets, 0, sizeof(charset_subset_t)*MAXCHARSETS);
-	#endif
-
-	#ifdef _WINDOWS
-	    {
-		int err;
-		WORD wVerReq;
-
-		wVerReq = MAKEWORD(1, 1);
-
-		err = WSAStartup(wVerReq, &WSAData);
-		if (err != 0)
-		{
-		    printf(gettext("No Winsock found, sorry."));
-		    sleep(5);
-		    return 1;
-		}
-	    }
+    /* 1998/09/03 (Thu) 22:02:32 */
+    InitializeCriticalSection(&critSec_DNS);
+    InitializeCriticalSection(&critSec_READ);
 
-	    /* 1998/09/03 (Thu) 22:02:32 */
-	    InitializeCriticalSection(&critSec_DNS);
-	    InitializeCriticalSection(&critSec_READ);
+#endif /* _WINDOWS */
 
-	#endif /* _WINDOWS */
+#if 0 /* defined(__CYGWIN__) - does not work with screen */
+    if (strcmp(ttyname(fileno(stdout)), "/dev/conout") != 0) {
+	printf("please \"$CYGWIN=notty\"\n");
+	exit(EXIT_SUCCESS);
+    }
+#endif
 
-	#if defined(__CYGWIN__) && defined(DOSPATH)
-	    if (strcmp(ttyname(fileno(stdout)), "/dev/conout") != 0) {
-		printf("please \"$CYGWIN=notty\"\n");
-		exit(EXIT_SUCCESS);
-	    }
-	#endif
+#if defined(WIN_EX)
+    /* 1997/10/19 (Sun) 21:40:54 */
+    system_is_NT = (BOOL) is_windows_nt();
 
-	#if defined(WIN_EX)
-	    /* 1997/10/19 (Sun) 21:40:54 */
-	    system_is_NT = (BOOL) is_windows_nt();
+    /* 1998/01/13 (Tue) 21:13:47 */
+    GetWindowsDirectory(filename, sizeof filename);
+    windows_drive[0] = filename[0];
+    windows_drive[1] = filename[1];
+    windows_drive[2] = '\0';
+#endif
 
-	    /* 1998/01/13 (Tue) 21:13:47 */
-	    GetWindowsDirectory(filename, sizeof filename);
-	    windows_drive[0] = filename[0];
-	    windows_drive[1] = filename[1];
-	    windows_drive[2] = '\0';
-	#endif
 
+#ifdef __DJGPP__
+    if (LY_get_ctrl_break() == 0) {
+	LY_set_ctrl_break(TRUE);
+	init_ctrl_break[0] = 0;
+    } else {
+	init_ctrl_break[0] = 1;
+    }
+    __djgpp_set_sigquit_key(0x082D); /* Bind ALT-X to SIGQUIT */
+    signal(SIGQUIT, cleanup_sig);
+    atexit(reset_break);
 
-	#ifdef __DJGPP__
-	    if (LY_get_ctrl_break() == 0) {
-		LY_set_ctrl_break(TRUE);
-		init_ctrl_break[0] = 0;
-	    } else {
-		init_ctrl_break[0] = 1;
-	    }
-	    atexit(reset_break);
-	#endif /* __DJGPP__ */
-
-	    /*
-	     * To prevent corrupting binary data on DOS, MS-WINDOWS or OS/2
-	     * we open files and stdout in BINARY mode by default.
-	     * Where necessary we should open and (close!) TEXT mode.
-	     * (use LYNewTxtFile/LYAppendToTxtFile to open text files for writing)
-	     */
-	    SetDefaultMode(O_BINARY);
-	    SetOutputMode(O_BINARY);
-
-	#ifdef DOSPATH
-	    if (getenv("TERM")==NULL) putenv("TERM=vt100");
-	#endif
-
-	    LYShowColor = (SHOW_COLOR ? SHOW_COLOR_ON : SHOW_COLOR_OFF);
-	    /*
-	     *	Set up the argument list.
-	     */
-	    pgm = argv[0];
-	    cp = NULL;
-	#ifdef DOSPATH
-	    if ((cp = strrchr(pgm, '\\')) != NULL) {
-		pgm = cp + 1;
-	    } else if (cp == NULL)
-	#endif
-	    if ((cp = strrchr(pgm, '/')) != NULL) {
-		pgm = cp + 1;
-	    }
+    if (((cp = LYGetEnv("SHELL")) != NULL)
+      && (strstr(LYPathLeaf(cp), "sh") != NULL))
+	dj_is_bash = TRUE;
+#endif /* __DJGPP__ */
 
-	    /*
-	     *	Act on -help NOW, so we only output the help and exit. - FM
-	     */
-	    for (i = 1; i < argc; i++) {
-		if (argncmp(argv[i], "-help") == 0) {
-		    parse_arg(&argv[i], 1, &i);
-		}
-	#ifdef SH_EX
-		if (strncmp(argv[i], "-show_cfg", 9) == 0) {
-		    show_cfg = TRUE;
-		}
-	#endif
-	    }
+    /*
+     * To prevent corrupting binary data on DOS, MS-WINDOWS or OS/2
+     * we open files and stdout in BINARY mode by default.
+     * Where necessary we should open and (close!) TEXT mode.
+     * (use LYNewTxtFile/LYAppendToTxtFile to open text files for writing)
+     */
+    SetDefaultMode(O_BINARY);
+    SetOutputMode(O_BINARY);
 
-	#ifdef LY_FIND_LEAKS
-	    /*
-	     *	Register the final function to be executed when being exited.
-	     *	Will display memory leaks if LY_FIND_LEAKS is defined.
-	     */
-	    atexit(LYLeaks);
-	    /*
-	     *	Register the function which will free our allocated globals.
-	     */
-	    atexit(free_lynx_globals);
-	#endif /* LY_FIND_LEAKS */
-
-
-	#ifdef LOCALE
-	    /*
-	     *	LOCALE support for international characters.
-	     */
-	    setlocale(LC_ALL, "");
-	#endif /* LOCALE */
-	    /* Set the text message domain.  */
-	#ifdef HAVE_LIBINTL_H
-	#ifndef __DJGPP__
-	    bindtextdomain ("lynx", LOCALEDIR);
-	#endif /* !__DJGPP__ */
-	    textdomain ("lynx");
-	#endif /* HAVE_LIBINTL_H */
-
-	    /*
-	     *	Initialize our startup and global variables.
-	     */
-	#ifdef ULTRIX
-	    /*
-	     *	Need this for Ultrix.
-	     */
-	    terminal = getenv("TERM");
-	    if ((terminal == NULL) || !strncasecomp(terminal, "xterm", 5))
-		terminal = "vt100";
-	#endif /* ULTRIX */
-	    /*
-	     *	Zero the links and history struct arrays.
-	     */
-	    memset((void *)links, 0, sizeof(linkstruct)*MAXLINKS);
-	    memset((void *)history, 0, sizeof(histstruct)*MAXHIST);
-	    /*
-	     *	Zero the MultiBookmark arrays.
-	     */
-	    memset((void *)MBM_A_subbookmark, 0, sizeof(char)*(MBM_V_MAXFILES+1));
-	    memset((void *)MBM_A_subdescript, 0, sizeof(char)*(MBM_V_MAXFILES+1));
-	#ifndef VMS
-	    StrAllocCopy(list_format, LIST_FORMAT);
-	#endif /* !VMS */
-
-	#ifdef HAVE_NAPMS
-	#define SECS2Secs(n) (1000 * (n))
-	#else
-	#define SECS2Secs(n) (n)
-	#endif
-	    InfoSecs	= SECS2Secs(INFOSECS);
-	    MessageSecs = SECS2Secs(MESSAGESECS);
-	    AlertSecs	= SECS2Secs(ALERTSECS);
-
-	    StrAllocCopy(helpfile, HELPFILE);
-	    StrAllocCopy(startfile, STARTFILE);
-	    LYEscapeStartfile(&startfile);
-	    StrAllocCopy(indexfile, DEFAULT_INDEX_FILE);
-	    StrAllocCopy(global_type_map, GLOBAL_MAILCAP);
-	    StrAllocCopy(personal_type_map, PERSONAL_MAILCAP);
-	    StrAllocCopy(global_extension_map, GLOBAL_EXTENSION_MAP);
-	    StrAllocCopy(personal_extension_map, PERSONAL_EXTENSION_MAP);
-	    StrAllocCopy(language, PREFERRED_LANGUAGE);
-	    StrAllocCopy(pref_charset, PREFERRED_CHARSET);
-	    StrAllocCopy(system_mail, SYSTEM_MAIL);
-	    StrAllocCopy(system_mail_flags, SYSTEM_MAIL_FLAGS);
-	    StrAllocCopy(LYUserAgent, LYNX_NAME);
-	    StrAllocCat(LYUserAgent, "/");
-	    StrAllocCat(LYUserAgent, LYNX_VERSION);
-	    if (HTLibraryVersion) {
-		StrAllocCat(LYUserAgent, " libwww-FM/");
-		StrAllocCat(LYUserAgent, HTLibraryVersion);
-	    }
-	#ifdef USE_SSL
-	    StrAllocCat(LYUserAgent, " SSL-MM/1.4.1");
-	#ifdef OPENSSL_VERSION_TEXT
-	    LYstrncpy(SSLLibraryVersion, OPENSSL_VERSION_TEXT, sizeof(SSLLibraryVersion)-1);
-	    if ((SSLcp = strchr(SSLLibraryVersion, ' ')) != NULL) {
-		*SSLcp++ = '/';
-		if ((SSLcp = strchr(SSLcp, ' ')) != NULL) {
-		    *SSLcp = '\0';
-		    StrAllocCat(LYUserAgent, " ");
-		    StrAllocCat(LYUserAgent, SSLLibraryVersion);
-		}
-	    }
-	#endif /* OPENSSL_VERSION_TEXT */
-	#endif /* USE_SSL */
-	    StrAllocCopy(LYUserAgentDefault, LYUserAgent);
-	#ifdef VMS
-	    Define_VMSLogical("LYNX_VERSION", LYNX_VERSION);
+#ifdef DOSPATH
+    if (LYGetEnv("TERM")==NULL) putenv("TERM=vt100");
+#endif
+
+    LYShowColor = (SHOW_COLOR ? SHOW_COLOR_ON : SHOW_COLOR_OFF);
+    /*
+     *	Set up the argument list.
+     */
+    pgm = argv[0];
+    cp = NULL;
+    if ((cp = LYLastPathSep(pgm)) != NULL) {
+	pgm = cp + 1;
+    }
+
+    /*
+     *	Act on -help NOW, so we only output the help and exit. - FM
+     */
+    for (i = 1; i < argc; i++) {
+	if (argncmp(argv[i], "-help") == 0) {
+	    parse_arg(&argv[i], 1, &i);
+	}
+#ifdef SH_EX
+	if (strncmp(argv[i], "-show_cfg", 9) == 0) {
+	    show_cfg = TRUE;
+	}
+#endif
+    }
+
+#ifdef LY_FIND_LEAKS
+    /*
+     *	Register the final function to be executed when being exited.
+     *	Will display memory leaks if LY_FIND_LEAKS is defined.
+     */
+    atexit(LYLeaks);
+    /*
+     *	Register the function which will free our allocated globals.
+     */
+    atexit(free_lynx_globals);
+#endif /* LY_FIND_LEAKS */
+
+
+#ifdef LOCALE
+    /*
+     *	LOCALE support for international characters.
+     */
+    setlocale(LC_ALL, "");
+#endif /* LOCALE */
+    /* Set the text message domain.  */
+#if defined(HAVE_LIBINTL_H) || defined(HAVE_LIBGETTEXT_H)
+#ifndef __DJGPP__
+    if ((cp = LYGetEnv("LYNX_LOCALEDIR")) == 0)
+	cp = LOCALEDIR;
+    bindtextdomain ("lynx", cp);
+#endif /* !__DJGPP__ */
+    textdomain ("lynx");
+#endif /* HAVE_LIBINTL_H */
+
+    /*
+     *	Initialize our startup and global variables.
+     */
+#ifdef ULTRIX
+    /*
+     *	Need this for Ultrix.
+     */
+    terminal = LYGetEnv("TERM");
+    if ((terminal == NULL) || !strncasecomp(terminal, "xterm", 5))
+	terminal = "vt100";
+#endif /* ULTRIX */
+    /*
+     *	Zero the links and history struct arrays.
+     */
+    memset((void *)links, 0, sizeof(LinkInfo)*MAXLINKS);
+    memset((void *)history, 0, sizeof(HistInfo)*MAXHIST);
+    /*
+     *	Zero the MultiBookmark arrays.
+     */
+    memset((void *)MBM_A_subbookmark, 0, sizeof(char)*(MBM_V_MAXFILES+1));
+    memset((void *)MBM_A_subdescript, 0, sizeof(char)*(MBM_V_MAXFILES+1));
+#ifndef VMS
+    StrAllocCopy(list_format, LIST_FORMAT);
+#endif /* !VMS */
+
+    AlertSecs	= SECS2Secs(ALERTSECS);
+    DebugSecs	= SECS2Secs(DEBUGSECS);
+    InfoSecs	= SECS2Secs(INFOSECS);
+    MessageSecs	= SECS2Secs(MESSAGESECS);
+    ReplaySecs	= SECS2Secs(REPLAYSECS);
+
+    StrAllocCopy(LYTransferName, "KiB");
+    StrAllocCopy(helpfile, HELPFILE);
+    StrAllocCopy(startfile, STARTFILE);
+    LYEscapeStartfile(&startfile);
+    StrAllocCopy(indexfile, DEFAULT_INDEX_FILE);
+    StrAllocCopy(global_type_map, GLOBAL_MAILCAP);
+    StrAllocCopy(personal_type_map, PERSONAL_MAILCAP);
+    StrAllocCopy(global_extension_map, GLOBAL_EXTENSION_MAP);
+    StrAllocCopy(personal_extension_map, PERSONAL_EXTENSION_MAP);
+    StrAllocCopy(language, PREFERRED_LANGUAGE);
+    StrAllocCopy(pref_charset, PREFERRED_CHARSET);
+    StrAllocCopy(system_mail, SYSTEM_MAIL);
+#ifdef SYSTEM_MAIL_FLAGS
+    StrAllocCopy(system_mail_flags, SYSTEM_MAIL_FLAGS);
+#else
+    StrAllocCopy(system_mail_flags, "");
+#endif
+
+    StrAllocCopy(LYUserAgent, LYNX_NAME);
+    StrAllocCat(LYUserAgent, "/");
+    StrAllocCat(LYUserAgent, LYNX_VERSION);
+    if (HTLibraryVersion) {
+	StrAllocCat(LYUserAgent, " libwww-FM/");
+	StrAllocCat(LYUserAgent, HTLibraryVersion);
+    }
+#ifdef USE_SSL
+    append_ssl_version(&LYUserAgent, "/");
+#endif /* USE_SSL */
+    StrAllocCopy(LYUserAgentDefault, LYUserAgent);
+
+#ifdef VMS
+    Define_VMSLogical("LYNX_VERSION", LYNX_VERSION);
 #else
     StrAllocCopy(lynx_version_putenv_command, "LYNX_VERSION=");
     StrAllocCat(lynx_version_putenv_command, LYNX_VERSION);
@@ -1098,17 +1158,17 @@ PRIVATE void free_lynx_globals NOARGS
      */
 #endif /* VMS */
 
-    if ((cp = getenv("LYNX_TEMP_SPACE")) != NULL)
+    if ((cp = LYGetEnv("LYNX_TEMP_SPACE")) != NULL)
 	StrAllocCopy(lynx_temp_space, cp);
-#if defined (UNIX)
-    else if ((cp = getenv("TMPDIR")) != NULL)
+#if defined (UNIX) || defined (__DJGPP__)
+    else if ((cp = LYGetEnv("TMPDIR")) != NULL)
 	StrAllocCopy(lynx_temp_space, cp);
 #endif
 #if defined (DOSPATH) || defined (__EMX__)
-    else if ((cp = getenv("TEMP")) != NULL)
-	StrAllocCopy(lynx_temp_space, HTSYS_name(cp));
-    else if ((cp = getenv("TMP")) != NULL)
-	StrAllocCopy(lynx_temp_space, HTSYS_name(cp));
+    else if ((cp = LYGetEnv("TEMP")) != NULL)
+	StrAllocCopy(lynx_temp_space, cp);
+    else if ((cp = LYGetEnv("TMP")) != NULL)
+	StrAllocCopy(lynx_temp_space, cp);
 #endif
     else
 #ifdef TEMP_SPACE
@@ -1128,7 +1188,7 @@ PRIVATE void free_lynx_globals NOARGS
     if ((cp = strstr(lynx_temp_space, "$USER")) != NULL) {
 	char *cp1;
 
-	if ((cp1 = getenv("USER")) != NULL) {
+	if ((cp1 = LYGetEnv("USER")) != NULL) {
 	    *cp = '\0';
 	    StrAllocCopy(temp, lynx_temp_space);
 	    *cp = '$';
@@ -1141,7 +1201,6 @@ PRIVATE void free_lynx_globals NOARGS
     }
     StrAllocCat(lynx_temp_space, "/lynx-XXXXXXXXXX");
     lynx_temp_space = mkdtemp(lynx_temp_space);
-
 #ifdef VMS
     LYLowerCase(lynx_temp_space);
     if (strchr(lynx_temp_space, '/') != NULL) {
@@ -1160,10 +1219,11 @@ PRIVATE void free_lynx_globals NOARGS
     }
 #else
     LYAddPathSep(&lynx_temp_space);
+    StrAllocCopy(lynx_temp_space, HTSYS_name(lynx_temp_space));
 #endif /* VMS */
 
     if ((HTStat(lynx_temp_space, &dir_info) < 0
-#ifdef UNIX
+#if defined(MULTI_USER_UNIX)
 	&& mkdir(lynx_temp_space, 0700) < 0
 #endif
 	)
@@ -1174,12 +1234,6 @@ PRIVATE void free_lynx_globals NOARGS
 	exit_immediately(EXIT_FAILURE);
     }
 
-#ifdef VMS
-#ifdef CSWING_PATH
-    StrAllocCopy(LYCSwingPath, CSWING_PATH);
-#endif /* CSWING_PATH */
-#endif /* VMS */
-
 #if USE_VMS_MAILER
 #ifndef MAIL_ADRS
 #define MAIL_ADRS "\"IN%%\"\"%s\"\"\""
@@ -1221,7 +1275,7 @@ PRIVATE void free_lynx_globals NOARGS
      *	the help menu, output that and exit. - FM
      */
 #ifndef NO_LYNX_TRACE
-    if (getenv("LYNX_TRACE") != 0) {
+    if (LYGetEnv("LYNX_TRACE") != 0) {
 	WWW_TraceFlag = TRUE;
     }
 #endif
@@ -1305,10 +1359,10 @@ PRIVATE void free_lynx_globals NOARGS
     if (!LYValidate && !LYRestricted &&
 	strlen(ANONYMOUS_USER) > 0 &&
 #if defined (VMS) || defined (NOUSERS)
-	!strcasecomp((getenv("USER")==NULL ? " " : getenv("USER")),
+	!strcasecomp((LYGetEnv("USER")==NULL ? " " : LYGetEnv("USER")),
 		     ANONYMOUS_USER)
 #else
-#if HAVE_CUSERID
+#ifdef HAVE_CUSERID
 	STREQ((char *)cuserid((char *) NULL), ANONYMOUS_USER)
 #else
 	STREQ(((char *)getlogin()==NULL ? " " : getlogin()), ANONYMOUS_USER)
@@ -1323,13 +1377,9 @@ PRIVATE void free_lynx_globals NOARGS
     /*
      *	Set up the TRACE log path, and logging if appropriate. - FM
      */
-#ifdef FNAMES_8_3
-    LYAddPathToHome(LYTraceLogPath =
-		malloc(LY_MAXPATH), LY_MAXPATH, "LY-TRACE.LOG");
-#else
-    LYAddPathToHome(LYTraceLogPath =
-		malloc(LY_MAXPATH), LY_MAXPATH, "Lynx.trace");
-#endif
+    if ((cp = LYGetEnv("LYNX_TRACE_FILE")) == 0)
+	cp = TRACE_FILE;
+    LYAddPathToHome(LYTraceLogPath = malloc(LY_MAXPATH), LY_MAXPATH, cp);
 
     LYOpenTraceLog();
 
@@ -1371,8 +1421,8 @@ PRIVATE void free_lynx_globals NOARGS
      *	the command line, see if it's in the environment.
      */
     if (!lynx_cfg_file) {
-	if (((cp=getenv("LYNX_CFG")) != NULL) ||
-	    (cp=getenv("lynx_cfg")) != NULL)
+	if (((cp=LYGetEnv("LYNX_CFG")) != NULL) ||
+	    (cp=LYGetEnv("lynx_cfg")) != NULL)
 	    StrAllocCopy(lynx_cfg_file, cp);
     }
 
@@ -1441,8 +1491,8 @@ PRIVATE void free_lynx_globals NOARGS
      *	the command line, see if it's in the environment.
      */
     if (!lynx_lss_file) {
-	if (((cp=getenv("LYNX_LSS")) != NULL) ||
-	    (cp=getenv("lynx_lss")) != NULL)
+	if (((cp=LYGetEnv("LYNX_LSS")) != NULL) ||
+	    (cp=LYGetEnv("lynx_lss")) != NULL)
 	    StrAllocCopy(lynx_lss_file, cp);
     }
 
@@ -1480,7 +1530,7 @@ PRIVATE void free_lynx_globals NOARGS
      *  Set the original directory, used for default download
      */
     if (!strcmp(Current_Dir(filename), ".")) {
-	if ((cp = getenv("PWD")) != 0)
+	if ((cp = LYGetEnv("PWD")) != 0)
 	    StrAllocCopy(original_dir, cp);
     } else {
 	StrAllocCopy(original_dir, filename);
@@ -1514,10 +1564,14 @@ PRIVATE void free_lynx_globals NOARGS
      */
     read_rc(NULL);
 
+#ifdef EXP_LOCALE_CHARSET
+    LYFindLocaleCharset();
+#endif
+
     /*
      * Get WWW_HOME environment variable if it exists.
      */
-    if ((cp = getenv("WWW_HOME")) != NULL) {
+    if ((cp = LYGetEnv("WWW_HOME")) != NULL) {
 	StrAllocCopy(startfile, cp);
 	LYEscapeStartfile(&startfile);
     }
@@ -1528,7 +1582,6 @@ PRIVATE void free_lynx_globals NOARGS
      * it's not an absolute URL, make it one. - FM
      */
     StrAllocCopy(LynxHome, startfile);
-    LYFillLocalFileURL((char **)&LynxHome, "file://localhost");
     LYEnsureAbsoluteURL((char **)&LynxHome, "LynxHome", FALSE);
 
     /*
@@ -1557,24 +1610,6 @@ PRIVATE void free_lynx_globals NOARGS
 	switch_display_charsets = 1;
 #endif
 
-#undef TTY_DEVICE
-#undef NUL_DEVICE
-
-#ifdef VMS
-#define TTY_DEVICE "tt:"
-#define NUL_DEVICE "nl:"
-#endif
-
-#ifdef _WINDOWS
-#define TTY_DEVICE "con"
-#define NUL_DEVICE "nul"
-#endif
-
-#ifndef TTY_DEVICE
-#define TTY_DEVICE "/dev/tty"
-#define NUL_DEVICE "/dev/null"
-#endif
-
 #if defined (TTY_DEVICE) || defined(HAVE_TTYNAME)
     /*
      *	If we are told to read the startfile from standard input, do it now,
@@ -1626,7 +1661,7 @@ PRIVATE void free_lynx_globals NOARGS
      */
     HTMLUseCharacterSet(current_char_set);
 
-#ifdef EXP_PERSISTENT_COOKIES
+#ifdef USE_PERSISTENT_COOKIES
     /*
      * Sod it, this looks like a reasonable place to load the
      * cookies file, probably.  - RP
@@ -1654,9 +1689,9 @@ PRIVATE void free_lynx_globals NOARGS
 
     if (LYCookieSaveFile == NULL) {
 	if (dump_output_immediately) {
-		StrAllocCopy(LYCookieSaveFile, "/dev/null");
+	    StrAllocCopy(LYCookieSaveFile, "/dev/null");
 	} else {
-		StrAllocCopy(LYCookieSaveFile, LYCookieFile);
+	    StrAllocCopy(LYCookieSaveFile, LYCookieFile);
 	}
     }
 #endif
@@ -1674,7 +1709,7 @@ PRIVATE void free_lynx_globals NOARGS
      *	If one was set in the configuration file, that
      *	one will be overridden. - FM
      */
-    if ((cp=getenv("LYNX_SAVE_SPACE")) != NULL)
+    if ((cp = LYGetEnv("LYNX_SAVE_SPACE")) != NULL)
 	StrAllocCopy(lynx_save_space, cp);
 
     /*
@@ -1732,7 +1767,7 @@ PRIVATE void free_lynx_globals NOARGS
 	!(Lynx_Color_Flags & SL_LYNX_USE_COLOR)) {
 	Lynx_Color_Flags |= SL_LYNX_USE_COLOR;
     } else if ((Lynx_Color_Flags & SL_LYNX_USE_COLOR) ||
-	       getenv("COLORTERM") != NULL) {
+	       LYGetEnv("COLORTERM") != NULL) {
 	if (LYShowColor != SHOW_COLOR_NEVER &&
 	    LYShowColor != SHOW_COLOR_ALWAYS) {
 	    LYShowColor = SHOW_COLOR_ON;
@@ -1767,7 +1802,7 @@ PRIVATE void free_lynx_globals NOARGS
 	}
     }
 
-    if (keypad_mode == NUMBERS_AS_ARROWS) {
+    if (!links_are_numbered()) {
 	if (number_fields)
 	    keypad_mode = LINKS_AND_FIELDS_ARE_NUMBERED;
 	if (number_links)
@@ -1810,7 +1845,7 @@ PRIVATE void free_lynx_globals NOARGS
 	no_multibook = TRUE;
     }
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     /*
      * Disable source caching if not interactive.
      */
@@ -1850,8 +1885,9 @@ PRIVATE void free_lynx_globals NOARGS
 #ifdef WIN32
     SetConsoleCtrlHandler((PHANDLER_ROUTINE) cleanup_win32, TRUE);
 #endif
-    if (!dump_output_immediately)
+
 #ifndef NOSIGHUP
+    if (!dump_output_immediately)
 	(void) signal(SIGHUP, cleanup_sig);
 #endif /* NOSIGHUP */
 
@@ -1945,7 +1981,6 @@ PRIVATE void free_lynx_globals NOARGS
      *	force in "//localhost", and if it's not an absolute URL,
      *	make it one. - FM
      */
-    LYFillLocalFileURL((char **)&startfile, "file://localhost");
     LYEnsureAbsoluteURL((char **)&startfile, "STARTFILE", FALSE);
 
     /*
@@ -1954,7 +1989,6 @@ PRIVATE void free_lynx_globals NOARGS
      *	not an absolute URL, make it one. - FM
      */
     if (homepage) {
-	LYFillLocalFileURL((char **)&homepage, "file://localhost");
 	LYEnsureAbsoluteURL((char **)&homepage, "HOMEPAGE", FALSE);
     }
 
@@ -2028,7 +2062,7 @@ PRIVATE void free_lynx_globals NOARGS
 	if (crawl && !number_links && !number_fields) {
 	    keypad_mode = NUMBERS_AS_ARROWS;
 	} else if (!nolist) {
-	    if (keypad_mode == NUMBERS_AS_ARROWS) {
+	    if (!links_are_numbered()) {
 		if (number_fields)
 		    keypad_mode = LINKS_AND_FIELDS_ARE_NUMBERED;
 		else
@@ -2045,10 +2079,9 @@ PRIVATE void free_lynx_globals NOARGS
 	status = mainloop();
 	if (!nolist &&
 	    !crawl &&		/* For -crawl it has already been done! */
-	    (keypad_mode == LINKS_ARE_NUMBERED ||
-	     keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED))
+	    links_are_numbered())
 	    printlist(stdout, FALSE);
-#ifdef EXP_PERSISTENT_COOKIES
+#ifdef USE_PERSISTENT_COOKIES
 	/*
 	 *  We want to save cookies picked up when in immediate dump
 	 *  mode.  Instead of calling cleanup() here, let's only call
@@ -2056,7 +2089,7 @@ PRIVATE void free_lynx_globals NOARGS
 	 */
 	if (persistent_cookies)
 	    LYStoreCookies(LYCookieSaveFile);
-#endif /* EXP_PERSISTENT_COOKIES */
+#endif /* USE_PERSISTENT_COOKIES */
 	exit_immediately(status);
     } else {
 	/*
@@ -2084,6 +2117,15 @@ PRIVATE void free_lynx_globals NOARGS
 	status = mainloop();
 	LYCloseCloset(RECALL_URL);
 	LYCloseCloset(RECALL_MAIL);
+#if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
+	if (! isendwin()) {
+	    extern int saved_scrsize_x;
+	    extern int saved_scrsize_y;
+	    if ((saved_scrsize_x != 0) && (saved_scrsize_y != 0)) {
+	        resize_term(saved_scrsize_y, saved_scrsize_x);
+	    }
+	}
+#endif
 	cleanup();
 	exit(status);
     }
@@ -2189,7 +2231,7 @@ PUBLIC void reload_read_cfg NOARGS
 
     {
 	/* set few safe flags: */
-#ifdef EXP_PERSISTENT_COOKIES
+#ifdef USE_PERSISTENT_COOKIES
 	BOOLEAN persistent_cookies_flag = persistent_cookies;
 	char * LYCookieFile_flag = NULL;
 	char * LYCookieSaveFile_flag = NULL;
@@ -2210,7 +2252,7 @@ PUBLIC void reload_read_cfg NOARGS
 #endif
 	/* free downloaders, printers, environments, dired menu */
 	free_lynx_cfg();
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 	source_cache_file_error = FALSE; /* reset flag */
 #endif
 
@@ -2257,7 +2299,7 @@ PUBLIC void reload_read_cfg NOARGS
 		 * a major problem: file paths
 		 * like lynx_save_space, LYCookieFile etc.
 		 */
-#ifdef EXP_PERSISTENT_COOKIES
+#ifdef USE_PERSISTENT_COOKIES
 	/* restore old settings */
 	if (persistent_cookies != persistent_cookies_flag) {
 	    persistent_cookies = persistent_cookies_flag;
@@ -2281,6 +2323,21 @@ PUBLIC void reload_read_cfg NOARGS
 }
 #endif /* !NO_CONFIG_INFO */
 
+PRIVATE void disable_pausing NOARGS
+{
+    AlertSecs = 0;
+    DebugSecs = 0;
+    InfoSecs = 0;
+    MessageSecs = 0;
+    ReplaySecs = 0;
+}
+
+PRIVATE void force_dump_mode NOARGS
+{
+    dump_output_immediately = TRUE;
+    disable_pausing();
+    LYcols = DFT_COLS;
+}
 
 /* There are different ways of setting arguments on the command line, and
  * there are different types of arguments.  These include:
@@ -2310,10 +2367,12 @@ typedef struct parse_args_type
 #define LYSTRING_ARG		0x0050
 #define INT_ARG			0x0060
 #define STRING_ARG		0x0070
+#define TIME_ARG		0x0080
 #define ARG_TYPE_MASK		0x0FF0
 #define NEED_NEXT_ARG		0x1000
 
 #define NEED_INT_ARG		(NEED_NEXT_ARG | INT_ARG)
+#define NEED_TIME_ARG		(NEED_NEXT_ARG | TIME_ARG)
 #define NEED_LYSTRING_ARG	(NEED_NEXT_ARG | LYSTRING_ARG)
 #define NEED_STRING_ARG		(NEED_NEXT_ARG | STRING_ARG)
 #define NEED_FUNCTION_ARG	(NEED_NEXT_ARG | FUNCTION_ARG)
@@ -2550,8 +2609,7 @@ PRIVATE int display_charset_fun ARGS1(
 PRIVATE int dump_output_fun ARGS1(
 	char *,			next_arg GCC_UNUSED)
 {
-    dump_output_immediately = TRUE;
-    LYcols = DFT_COLS;
+    force_dump_mode();
     return 0;
 }
 
@@ -2610,8 +2668,7 @@ PRIVATE int get_data_fun ARGS1(
      *  potential conflicts, so don't force the dump here. - FM
      */
 #ifndef VMS
-    dump_output_immediately = TRUE;
-    LYcols = DFT_COLS;
+    force_dump_mode();
 #endif /* VMS */
 
     StrAllocCopy(form_get_data, "?");   /* Prime the pump */
@@ -2640,14 +2697,15 @@ PRIVATE int help_fun ARGS1(
 PRIVATE int hiddenlinks_fun ARGS1(
 	char *,			next_arg)
 {
+    static Config_Enum table[] = {
+	{ "merge",	HIDDENLINKS_MERGE },
+	{ "listonly",	HIDDENLINKS_SEPARATE },
+	{ "ignore",	HIDDENLINKS_IGNORE },
+	{ NULL,		-1 },
+    };
+
     if (next_arg != 0) {
-	if (strncasecomp(next_arg, "merge", 1) == 0)
-	    LYHiddenLinks = HIDDENLINKS_MERGE;
-	else if (strncasecomp(next_arg, "listonly", 1) == 0)
-	    LYHiddenLinks = HIDDENLINKS_SEPARATE;
-	else if (strncasecomp(next_arg, "ignore", 1) == 0)
-	    LYHiddenLinks = HIDDENLINKS_IGNORE;
-	else
+	if (!LYgetEnum(table, next_arg, &LYHiddenLinks))
 	    print_help_and_exit (-1);
     } else {
 	LYHiddenLinks = HIDDENLINKS_MERGE;
@@ -2675,7 +2733,7 @@ PRIVATE int mime_header_fun ARGS1(
      *  Include mime headers and force source dump.
      */
     keep_mime_headers = TRUE;
-    dump_output_immediately = TRUE;
+    force_dump_mode();
     HTOutputFormat = (LYPrependBase ?
 		      HTAtom_for("www/download") : HTAtom_for("www/dump"));
     LYcols = MAX_COLS;
@@ -2748,9 +2806,7 @@ PRIVATE int nocolor_fun ARGS1(
 PRIVATE int nopause_fun ARGS1(
 	char *,			next_arg GCC_UNUSED)
 {
-    InfoSecs = 0;
-    MessageSecs = 0;
-    AlertSecs = 0;
+    disable_pausing();
     return 0;
 }
 
@@ -2811,8 +2867,7 @@ PRIVATE int post_data_fun ARGS1(
      * conflicts, so don't force a dump here.  - FM
      */
 #ifndef VMS
-    dump_output_immediately = TRUE;
-    LYcols = DFT_COLS;
+    force_dump_mode();
 #endif /* VMS */
 
     post_data = &form_post_data;
@@ -2827,6 +2882,25 @@ PRIVATE int post_data_fun ARGS1(
     return 0;
 }
 
+PRIVATE char *show_restriction ARGS1(
+	CONST char *,		name)
+{
+    char *value = 0;
+
+    switch (find_restriction(name, -1)) {
+    case TRUE:
+	value = "on";
+	break;
+    case FALSE:
+	value = "off";
+	break;
+    default:
+	value = "?";
+	break;
+    }
+    return value;
+}
+
 /* -restrictions */
 PRIVATE int restrictions_fun ARGS1(
 	char *,			next_arg)
@@ -2844,11 +2918,16 @@ disallow changing the eXecute permission on files\n\
 (but still allow it for directories) when local file\n\
 management is enabled." },
 #endif /* DIRED_SUPPORT && OK_PERMIT */
+#ifdef SUPPORT_CHDIR
+	{ "chdir", "\
+disallow changing the working directory of lynx, e.g.,\n\
+to affect the behavior of download command" },
+#endif
 #if defined(HAVE_CONFIG_H) && !defined(NO_CONFIG_INFO)
 	{ "compileopts_info", "\
 disable info on options used to compile the binary" },
 #endif
-{ "default", "\
+	{ "default", "\
 same as commandline option -anonymous.  Sets the\n\
 default service restrictions for anonymous users.  Set to\n\
 all restricted, except for: inside_telnet, outside_telnet,\n\
@@ -2905,6 +2984,8 @@ disable viewing of lynx.cfg configuration file info" },
 	{ "lynxcfg_xinfo", "\
 disable extended lynx.cfg viewing and reloading" },
 #endif
+	{ "lynxcgi", "\
+disallow execution of Lynx CGI URLs" },
 	{ "mail", "disallow mail" },
 	{ "multibook", "disallow multiple bookmark files" },
 	{ "news_post", "disallow USENET News posting." },
@@ -2953,7 +3034,7 @@ G)oto's" },
     CONST char *value;
     BOOLEAN found, first;
 
-    if (next_arg == 0 || *next_arg == '\0') {
+    if (isEmpty(next_arg)) {
 	SetOutputMode( O_TEXT );
 	for (j = 0; j < TABLESIZE(Usage); j++) {
 	    printf("%s\n", Usage[j]);
@@ -2963,17 +3044,7 @@ G)oto's" },
 	     || !strcmp(table[j].name, "default")) {
 		value = NULL;
 	    } else {
-		switch (find_restriction(table[j].name, -1)) {
-		case TRUE:
-		    value = "on";
-		    break;
-		case FALSE:
-		    value = "off";
-		    break;
-		default:
-		    value = "?";
-		    break;
-		}
+		value = show_restriction(table[j].name);
 	    }
 	    print_help_strings (
 		table[j].name, table[j].help, value, FALSE);
@@ -2993,8 +3064,9 @@ G)oto's" },
 		if (first) {
 		    printf("Other restrictions (see the user's guide):\n");
 		}
-		printf("%s%s", column ? ", " : "  ", name);
-		column += 2 + strlen(name);
+		value = show_restriction(table[j].name);
+		printf("%s%s (%s)", column ? ", " : "  ", name, value);
+		column += 5 + strlen(name) + strlen(value);
 		if (column > 50) {
 		    column = 0;
 		    printf("\n");
@@ -3029,7 +3101,7 @@ PRIVATE int selective_fun ARGS1(
 PRIVATE int source_fun ARGS1(
 	char *,			next_arg GCC_UNUSED)
 {
-    dump_output_immediately = TRUE;
+    force_dump_mode();
     HTOutputFormat = (LYPrependBase ?
 		      HTAtom_for("www/download") : HTAtom_for("www/dump"));
     LYcols = MAX_COLS;
@@ -3054,58 +3126,35 @@ PRIVATE int traversal_fun ARGS1(
 PRIVATE int version_fun ARGS1(
 	char *,			next_arg GCC_UNUSED)
 {
-#ifdef USE_SSL
-    char SSLLibraryVersion[256];
-    char *SSLcp;
-#endif
+    char *result = NULL;
 
     SetOutputMode( O_TEXT );
 
-    printf(gettext("%s Version %s (%s)\n"),
-	  LYNX_NAME, LYNX_VERSION,
-	  LYVersionDate());
+    HTSprintf0(&result, gettext("%s Version %s (%s)"),
+	       LYNX_NAME, LYNX_VERSION,
+	       LYVersionDate());
 #ifdef USE_SSL
-    printf("libwww-FM %s, SSL-MM 1.4.1", HTLibraryVersion);
-#ifdef OPENSSL_VERSION_TEXT
-    LYstrncpy(SSLLibraryVersion, OPENSSL_VERSION_TEXT, sizeof(SSLLibraryVersion)-1);
-    if ((SSLcp = strchr(SSLLibraryVersion, ' ')) != NULL) {
-	*SSLcp++ = ' ';
-	if ((SSLcp = strchr(SSLcp, ' ')) != NULL) {
-	    *SSLcp = '\0';
-	    printf(", %s", SSLLibraryVersion);
-	}
-    }
-#endif /* OPENSSL_VERSION_TEXT */
-    printf("\n");
+    StrAllocCat(result, "\n");
+    HTSprintf(&result, "libwww-FM %s,", HTLibraryVersion);
+    append_ssl_version(&result, " ");
 #endif /* USE_SSL */
+    printf("%s\n", result);
+    free(result);
 
-#ifdef SYSTEM_NAME
 #ifndef __DATE__
 #define __DATE__ ""
 #endif
 #ifndef __TIME__
 #define __TIME__ ""
 #endif
-    printf(gettext("Built on %s %s %s\n"), SYSTEM_NAME, __DATE__, __TIME__);
-#endif
-
-    printf("\n");
-    printf(gettext(
-	  "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
-	  ));
-    printf(gettext("Distributed under the GNU General Public License.\n"));
-    printf(gettext(
-	  "See http://lynx.browser.org/ and the online help for more information.\n\n"
-	  ));
-#ifdef USE_SSL
-    printf("See http://www.moxienet.com/lynx/ for information about SSL for Lynx.\n");
-#ifdef OPENSSL_VERSION_TEXT
-    printf("See http://www.openssl.org/ for information about OpenSSL.\n");
-#endif /* OPENSSL_VERSION_TEXT */
-    printf("\n");
-#endif /* USE_SSL */
 
-#ifdef SH_EX
+/*
+ * SYSTEM_NAME is set by the configure script.  Show build date/time for other
+ * systems, according to predefined compiler symbols.
+ */
+#ifdef SYSTEM_NAME
+    printf(gettext("Built on %s %s %s\n"), SYSTEM_NAME, __DATE__, __TIME__);
+#else
 #ifdef __CYGWIN__
     printf("Compiled by CYGWIN (%s %s).\n", __DATE__, __TIME__);
 #else
@@ -3123,7 +3172,23 @@ PRIVATE int version_fun ARGS1(
 #endif /* _MSC_VER */
 #endif /* __BORLANDC__ */
 #endif /* __CYGWIN__ */
-#endif /* SH_EX */
+#endif
+
+    printf("\n");
+    printf(gettext(
+	  "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+	  ));
+    printf(gettext("Distributed under the GNU General Public License.\n"));
+    printf(gettext(
+	  "See http://lynx.isc.org/ and the online help for more information.\n\n"
+	  ));
+#ifdef USE_SSL
+    printf("See http://www.moxienet.com/lynx/ for information about SSL for Lynx.\n");
+#ifdef OPENSSL_VERSION_TEXT
+    printf("See http://www.openssl.org/ for information about OpenSSL.\n");
+#endif /* OPENSSL_VERSION_TEXT */
+    printf("\n");
+#endif /* USE_SSL */
 
     SetOutputMode( O_BINARY );
 
@@ -3145,6 +3210,34 @@ PRIVATE int width_fun ARGS1(
     return 0;
 }
 
+#if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
+/* -scrsize */
+PRIVATE int scrsize_fun ARGS1(
+	char *,			next_arg)
+{
+    if (next_arg != 0) {
+	char *cp;
+
+	if ((cp = strchr(next_arg, ',')) != 0) {
+	    *cp++ = '\0';	/* Terminate ID */
+	    scrsize_x = atoi(next_arg);
+	    scrsize_y = atoi(cp);
+	    if ((scrsize_x <= 1) || (scrsize_y <= 1)) {
+		scrsize_x = scrsize_y = 0;
+	    }
+	    if ((scrsize_x > 0) && (scrsize_x < 80)) {
+		scrsize_x = 80;
+	    }
+	    if ((scrsize_y > 0) && (scrsize_y < 4)) {
+		scrsize_y = 4;
+	    }
+	    CTRACE((tfp, "scrsize: x=%d, y=%d\n", scrsize_x, scrsize_y));
+	}
+    }
+    return 0;
+}
+#endif
+
 /* NOTE: This table is sorted by name to make the help message useful */
 PRIVATE Config_Type Arg_Table [] =
 {
@@ -3204,12 +3297,10 @@ PRIVATE Config_Type Arg_Table [] =
       "case",		4|SET_ARG,		case_sensitive,
       "enable case sensitive user searching"
    ),
-#ifdef SH_EX
    PARSE_SET(
       "center",		4|TOGGLE_ARG,		no_table_center,
-      "Toggle center alignment in HTML TABLE"
+      "toggle center alignment in HTML TABLE"
    ),
-#endif
    PARSE_STR(
       "cfg",		2|NEED_LYSTRING_ARG,	lynx_cfg_file,
       "=FILENAME\nspecifies a lynx.cfg file other than the default"
@@ -3234,19 +3325,17 @@ PRIVATE Config_Type Arg_Table [] =
       "force color mode on with standard bg colors"
    ),
 #endif
-#ifndef __DJGPP__
    PARSE_INT(
       "connect_timeout", 4|NEED_INT_ARG,	connect_timeout,
       "=N\nset the N-second connection timeout"
    ),
-#endif
 #ifdef MISC_EXP
    PARSE_FUN(
       "convert_to",	4|FUNCTION_ARG,		convert_to_fun,
       "=FORMAT\nconvert input, FORMAT is in MIME type notation\n(experimental)"
    ),
 #endif
-#ifdef EXP_PERSISTENT_COOKIES
+#ifdef USE_PERSISTENT_COOKIES
    PARSE_STR(
       "cookie_file",	4|LYSTRING_ARG,		LYCookieFile,
       "=FILENAME\nspecifies a file to use to read cookies"
@@ -3255,7 +3344,7 @@ PRIVATE Config_Type Arg_Table [] =
       "cookie_save_file",	4|LYSTRING_ARG,	LYCookieSaveFile,
       "=FILENAME\nspecifies a file to use to store cookies"
    ),
-#endif /* EXP_PERSISTENT_COOKIES */
+#endif /* USE_PERSISTENT_COOKIES */
    PARSE_SET(
       "cookies",	4|TOGGLE_ARG,		LYSetCookies,
       "toggles handling of Set-Cookie headers"
@@ -3283,12 +3372,10 @@ with -dump, format output as with -traversal, but to stdout"
       "incremental display stages with MessageSecs delay"
    ),
 #endif
-#if defined(SH_EX) && defined(WIN_EX)
    PARSE_INT(
-      "delay",		4|NEED_INT_ARG,		debug_delay,
-      "=NNN\nset the NNN msec delay at statusline message"
+      "delay",		4|NEED_TIME_ARG,	DebugSecs,
+      "=NNN\nset NNN-second delay at statusline message"
    ),
-#endif
    PARSE_FUN(
       "display",	4|NEED_FUNCTION_ARG,	display_fun,
       "=DISPLAY\nset the display variable for X exec'ed programs"
@@ -3337,6 +3424,12 @@ keys (may be incompatible with some curses packages)"
       "include all versions of files in local VMS directory\nlistings"
    ),
 #endif
+#ifdef LY_FIND_LEAKS
+   PARSE_SET(
+      "find_leaks",	4|TOGGLE_ARG,		LYfind_leaks,
+      "toggles memory-leak checking"
+   ),
+#endif
    PARSE_SET(
       "force_empty_hrefless_a",	4|SET_ARG,	force_empty_hrefless_a,
       "\nforce HREF-less 'A' elements to be empty (close them as\nsoon as they are seen)"
@@ -3433,6 +3526,12 @@ keys (may be incompatible with some curses packages)"
       "minimal",	4|TOGGLE_ARG,		minimal_comments,
       "toggles minimal versus valid comment parsing"
    ),
+#ifdef EXP_NESTED_TABLES
+   PARSE_SET(
+      "nested_tables",	4|TOGGLE_ARG,		nested_tables,
+      "toggles nested-tables logic"
+   ),
+#endif
 #ifndef DISABLE_NEWS
    PARSE_FUN(
       "newschunksize",	4|NEED_FUNCTION_ARG,	newschunksize_fun,
@@ -3483,7 +3582,7 @@ keys (may be incompatible with some curses packages)"
       "nolog",		4|UNSET_ARG,		error_logging,
       "disable mailing of error messages to document owners"
    ),
-#if HAVE_SIGACTION && defined(SIGWINCH)
+#if defined(HAVE_SIGACTION) && defined(SIGWINCH)
    PARSE_SET(
       "nonrestarting_sigwinch", 4|SET_ARG,	LYNonRestartingSIGWINCH,
       "\nmake window size change handler non-restarting"
@@ -3606,9 +3705,15 @@ with the PREV_DOC command or from the History List"
       "rlogin",		4|UNSET_ARG,		rlogin_ok,
       "disable rlogins"
    ),
+#if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
+   PARSE_FUN(
+      "scrsize",	4|NEED_FUNCTION_ARG,	scrsize_fun,
+      "=width,height\nsize of window"
+   ),
+#endif
 #ifdef USE_SCROLLBAR
    PARSE_SET(
-      "scrollbar",	4|TOGGLE_ARG,		LYsb,
+      "scrollbar",	4|TOGGLE_ARG,		LYShowScrollbar,
       "toggles showing scrollbar"
    ),
    PARSE_SET(
@@ -3634,7 +3739,7 @@ with the PREV_DOC command or from the History List"
       "show_cursor",	4|TOGGLE_ARG,		LYUseDefShoCur,
       "toggles hiding of the cursor in the lower right corner"
    ),
-#ifdef EXP_READPROGRESS
+#ifdef USE_READPROGRESS
    PARSE_SET(
       "show_rate",	4|TOGGLE_ARG,		LYShowTransferRate,
       "toggles display of transfer rate"
@@ -3716,6 +3821,10 @@ treated '>' as a co-terminator for double-quotes and tags"
       "trim input text/textarea fields in forms"
    ),
    PARSE_SET(
+      "underline_links",4|TOGGLE_ARG,		LYUnderlineLinks,
+      "toggles use of underline/bold attribute for links"
+   ),
+   PARSE_SET(
       "underscore",	4|TOGGLE_ARG,		use_underscore,
       "toggles use of _underline_ format in dumps"
    ),
@@ -3849,6 +3958,9 @@ in double-quotes (\"-\") on VMS)", NULL, TRUE);
 	    case INT_ARG:
 		sprintf(temp, "%d", *(q->int_value));
 		break;
+	    case TIME_ARG:
+		sprintf(temp, SECS_FMT, (double) Secs2SECS(*(q->int_value)));
+		break;
 	    case STRING_ARG:
 		if ((value = *(q->str_value)) != 0
 		 && !*value)
@@ -4072,10 +4184,19 @@ PRIVATE BOOL parse_arg ARGS3(
 		 *(q->int_value) = strtol (next_arg, &temp_ptr, 0);
 	     break;
 
+	case TIME_ARG:
+	    if ((q->int_value != 0) && (next_arg != 0)) {
+		float ival;
+		if (1 == sscanf (next_arg, "%f", &ival)) {
+		    *(q->int_value) = (int) SECS2Secs(ival);
+		}
+	    }
+	    break;
+
 	case STRING_ARG:
-	     if ((q->str_value != 0) && (next_arg != 0))
+	    if ((q->str_value != 0) && (next_arg != 0))
 		*(q->str_value) = next_arg;
-	     break;
+	    break;
 	}
 
 	Old_DTD = DTD_recovery;	/* BOOL != int */
diff --git a/gnu/usr.bin/lynx/src/LYMainLoop.c b/gnu/usr.bin/lynx/src/LYMainLoop.c
index 0be71bfcbe8..c8c759e04de 100644
--- a/gnu/usr.bin/lynx/src/LYMainLoop.c
+++ b/gnu/usr.bin/lynx/src/LYMainLoop.c
@@ -38,7 +38,6 @@
 #include <LYCookie.h>
 #include <LYMainLoop.h>
 #include <LYPrettySrc.h>
-#include <GridText.h>
 
 #ifdef KANJI_CODE_OVERRIDE
 #include <HTCJK.h>
@@ -78,16 +77,12 @@ PUBLIC char *str_kcode(HTkcode code)
 	}
     }
 
-#ifdef SH_EX	/* 1999/05/25 (Tue) 11:12:05 */
     if (no_table_center) {
 	buff[0] = '!';
 	strcpy(buff + 1, p);
     } else {
 	strcpy(buff, p);
     }
-#else
-    strcpy(buff, p);
-#endif
 
     return buff;
 }
@@ -158,6 +153,9 @@ PRIVATE int str_n_cmp(const char *p, const char *q, int n)
 #include <LYexit.h>
 #include <LYLeaks.h>
 
+/* two constants: */
+PUBLIC HTLinkType * HTInternalLink = 0;
+PUBLIC HTAtom * WWW_SOURCE = 0;
 
 #ifndef DONT_TRACK_INTERNAL_LINKS
 #define NO_INTERNAL_OR_DIFFERENT(c,n) TRUE
@@ -171,12 +169,12 @@ PRIVATE int str_n_cmp(const char *p, const char *q, int n)
 
 PRIVATE void exit_immediately_with_error_message PARAMS((int state, BOOLEAN first_file));
 PRIVATE void status_link PARAMS((char *curlink_name, BOOLEAN show_more, BOOLEAN show_indx));
-PRIVATE void show_main_statusline PARAMS((CONST linkstruct curlink, int for_what));
+PRIVATE void show_main_statusline PARAMS((CONST LinkInfo curlink, int for_what));
 PRIVATE void form_noviceline PARAMS((int));
-PRIVATE int are_different PARAMS((document *doc1, document *doc2));
+PRIVATE int are_different PARAMS((DocInfo *doc1, DocInfo *doc2));
 
 #ifndef DONT_TRACK_INTERNAL_LINKS
-PRIVATE int are_phys_different PARAMS((document *doc1, document *doc2));
+PRIVATE int are_phys_different PARAMS((DocInfo *doc1, DocInfo *doc2));
 #endif
 
 #define FASTTAB
@@ -203,8 +201,8 @@ PUBLIC int NumOfLines_partial = 0;  /* number of lines displayed in partial mode
 #endif
 
 PRIVATE int Newline = 0;
-PRIVATE document newdoc;
-PRIVATE document curdoc;
+PRIVATE DocInfo newdoc;
+PRIVATE DocInfo curdoc;
 PRIVATE char *traversal_host = NULL;
 PRIVATE char *traversal_link_to_add = NULL;
 PRIVATE char *owner_address = NULL;  /* Holds the responsible owner's address     */
@@ -217,7 +215,7 @@ PRIVATE BOOL textinput_activated = FALSE;
 #endif
 #ifdef INACTIVE_INPUT_STYLE_VH
 PUBLIC BOOL textinput_redrawn = FALSE;
-    /*must be public since used in highlight(..)*/
+    /*must be public since used in LYhighlight(..)*/
 #endif
 
 #ifdef LY_FIND_LEAKS
@@ -226,16 +224,9 @@ PUBLIC BOOL textinput_redrawn = FALSE;
  */
 PRIVATE void free_mainloop_variables NOARGS
 {
-    FREE(newdoc.title);
-    FREE(newdoc.address);
-    FREE(newdoc.post_data);
-    FREE(newdoc.post_content_type);
-    FREE(newdoc.bookmark);
-    FREE(curdoc.title);
-    FREE(curdoc.address);
-    FREE(curdoc.post_data);
-    FREE(curdoc.post_content_type);
-    FREE(curdoc.bookmark);
+    LYFreeDocInfo(&newdoc);
+    LYFreeDocInfo(&curdoc);
+
 #ifdef USE_COLOR_STYLE
     FREE(curdoc.style);
     FREE(newdoc.style);
@@ -401,19 +392,12 @@ PUBLIC int LYGetNewline NOARGS
     return Newline;
 }
 
-#ifdef SOURCE_CACHE
-/*
- * To reparse current html document under the different settings we call
- * reparse_document() within mainloop refresh cycle, it relies upon 'curdoc'.
- *
- * From the other hand, regular requests for new document go to getfile()
- * and rely upon 'newdoc'.
- *
- * To work around newdoc.line/curdoc.line/www_search_target/Newline message
- * the following flag is introduced:
- */
+#ifdef USE_SOURCE_CACHE
 PRIVATE BOOLEAN from_source_cache = FALSE;
 
+/*
+ * Like HTreparse_document(), but also set the flag.
+ */
 PRIVATE BOOLEAN reparse_document NOARGS
 {
     BOOLEAN ok;
@@ -425,7 +409,7 @@ PRIVATE BOOLEAN reparse_document NOARGS
     from_source_cache = FALSE;
     return ok;
 }
-#endif /* SOURCE_CACHE */
+#endif /* USE_SOURCE_CACHE */
 
 /*
  * Prefer reparsing if we can, but reload if we must - to force regeneration
@@ -434,9 +418,8 @@ PRIVATE BOOLEAN reparse_document NOARGS
 PRIVATE BOOLEAN reparse_or_reload ARGS1(
     int *,	cmd)
 {
-#ifdef SOURCE_CACHE
-    if (HTcan_reparse_document()) {
-	reparse_document();
+#ifdef USE_SOURCE_CACHE
+    if (reparse_document()) {
 	return FALSE;
     }
 #endif
@@ -445,16 +428,56 @@ PRIVATE BOOLEAN reparse_or_reload ARGS1(
 }
 
 /*
+ * Functions for setting the current address
+ */
+PRIVATE void set_address ARGS2(
+	DocInfo *,	doc,
+	CONST char *,	address)
+{
+    StrAllocCopy(doc->address, address);
+}
+
+PRIVATE void copy_address ARGS2(
+	DocInfo *,	dst,
+	DocInfo *,	src)
+{
+    StrAllocCopy(dst->address, src->address);
+}
+
+PRIVATE void free_address ARGS1(
+	DocInfo *,	doc)
+{
+    FREE(doc->address);
+}
+
+PRIVATE void move_address ARGS2(
+	DocInfo *,	dst,
+	DocInfo *,	src)
+{
+    copy_address(dst, src);
+    free_address(src);
+}
+
+#ifdef DISP_PARTIAL
+/*
  * This is for traversal call from within partial mode in LYUtils.c
  * and HTFormat.c  It simply calls HText_pageDisplay() but utilizes
- * LYMainLoop.c PRIVATE variables.
- * Perhaps, this could adhere more logic from mainloop(), in the future.
+ * LYMainLoop.c PRIVATE variables to manage proper newline position
+ * in case of #fragment
  */
-PUBLIC void LYMainLoop_pageDisplay ARGS1(
+PUBLIC BOOL LYMainLoop_pageDisplay ARGS1(
 	int,		line_num)
 {
-#ifdef DISP_PARTIAL
-#ifdef SOURCE_CACHE
+    CONST char * pound;
+    int prev_newline = Newline;
+
+    /*
+     *  Override Newline with a new value if user
+     *  scrolled the document while loading (in LYUtils.c).
+     */
+    Newline = line_num;
+
+#ifdef USE_SOURCE_CACHE
     /*
      * reparse_document() acts on 'curdoc' which always on top of the
      * history stack: no need to resolve #fragment position since
@@ -463,28 +486,31 @@ PUBLIC void LYMainLoop_pageDisplay ARGS1(
      */
     if (!from_source_cache)
 #endif
-    /*
-     * Disable display_partial if requested URL has #fragment and we are not
-     * popped from the history stack so can't calculate correct newline
-     * position for fragment.  Otherwise user got the new document from the
-     * first page and was moved to #fragment later after download completed,
-     * but only if s/he did not mess screen up by scrolling before...  So fall
-     * down to old behavior here ... until we rewrite HTFindPoundSelector()
-     */
-    if (display_partial && newdoc.line == 1 && strchr(newdoc.address, '#')) {
-	display_partial = FALSE; /* restrict for this document */
-	return;			/* no repaint */
-    }
-
-    /*
-     *  Override Newline with a new value if user
-     *  scrolled the document while loading (in LYUtils.c).
-     */
-#endif /* DISP_PARTIAL */
-    Newline = line_num;
+	/*
+	 * If the requested URL has the #fragment, and we are not popped
+	 * from the history stack, and have not scrolled the document yet -
+	 * we should calculate correct newline position for the fragment.
+	 * (This is a bit suboptimal since HTFindPoundSelector() traverse
+	 * anchors list each time, so we have a quadratic complexity
+	 * and may load CPU in a worst case).
+	 */
+	if (display_partial
+	    && newdoc.line == 1 && line_num == 1 && prev_newline == 1
+	    && (pound = findPoundSelector(newdoc.address))
+	    && *pound && *(pound+1)) {
+	    if (HTFindPoundSelector(pound+1)) {
+		/* HTFindPoundSelector will initialize www_search_result */
+		Newline = www_search_result;
+	    } else {
+		Newline = prev_newline; /* restore ??? */
+		return NO;	/* no repaint */
+	    }
+	}
 
     HText_pageDisplay(Newline, prev_target);
+    return YES;
 }
+#endif /* DISP_PARTIAL */
 
 
 PRIVATE void set_curdoc_link ARGS1(
@@ -494,7 +520,7 @@ PRIVATE void set_curdoc_link ARGS1(
      && nextlink >= 0
      && nextlink < nlinks) {
 	if (curdoc.link >= 0 && curdoc.link < nlinks)
-	    highlight(OFF, curdoc.link, prev_target);
+	    LYhighlight(OFF, curdoc.link, prev_target);
 	curdoc.link = nextlink;
     }
 }
@@ -538,41 +564,41 @@ PRIVATE void do_check_goto_URL ARGS3(
 	CONST char *name;
 	BOOLEAN *flag;
     } table[] = {
-	{ "file:",		&no_file_url },
-	{ "file:",		&no_goto_file },
-	{ "lynxexec:",		&no_goto_lynxexec },
-	{ "lynxprog:",		&no_goto_lynxprog },
-	{ "lynxcgi:",		&no_goto_lynxcgi },
-	{ "cso:",		&no_goto_cso },
-	{ "finger:",		&no_goto_finger },
-	{ "ftp:",		&no_goto_ftp },
-	{ "gopher:",		&no_goto_gopher },
-	{ "http:",		&no_goto_http },
-	{ "https:",		&no_goto_https },
-	{ "mailto:",		&no_goto_mailto },
-	{ "rlogin:",		&no_goto_rlogin },
-	{ "telnet:",		&no_goto_telnet },
-	{ "tn3270:",		&no_goto_tn3270 },
-	{ "wais:",		&no_goto_wais },
+	{ STR_FILE_URL,		&no_file_url },
+	{ STR_FILE_URL,		&no_goto_file },
+	{ STR_LYNXEXEC,		&no_goto_lynxexec },
+	{ STR_LYNXPROG,		&no_goto_lynxprog },
+	{ STR_LYNXCGI,		&no_goto_lynxcgi },
+	{ STR_CSO_URL,		&no_goto_cso },
+	{ STR_FINGER_URL,	&no_goto_finger },
+	{ STR_FTP_URL,		&no_goto_ftp },
+	{ STR_GOPHER_URL,	&no_goto_gopher },
+	{ STR_HTTP_URL,		&no_goto_http },
+	{ STR_HTTPS_URL,	&no_goto_https },
+	{ STR_MAILTO_URL,	&no_goto_mailto },
+	{ STR_RLOGIN_URL,	&no_goto_rlogin },
+	{ STR_TELNET_URL,	&no_goto_telnet },
+	{ STR_TN3270_URL,	&no_goto_tn3270 },
+	{ STR_WAIS_URL,		&no_goto_wais },
 #ifndef DISABLE_BIBP
-	{ "bibp:",		&no_goto_bibp },
+	{ STR_BIBP_URL,		&no_goto_bibp },
 #endif
 #ifndef DISABLE_NEWS
-	{ "news:",		&no_goto_news },
-	{ "nntp:",		&no_goto_nntp },
-	{ "snews:",		&no_goto_snews },
+	{ STR_NEWS_URL,		&no_goto_news },
+	{ STR_NNTP_URL,		&no_goto_nntp },
+	{ STR_SNEWS_URL,	&no_goto_snews },
 #endif
 #ifdef EXEC_LINKS
-	{ "lynxexec:",		&local_exec_on_local_files },
-	{ "lynxprog:",		&local_exec_on_local_files },
+	{ STR_LYNXEXEC,		&local_exec_on_local_files },
+	{ STR_LYNXPROG,		&local_exec_on_local_files },
 #endif /* EXEC_LINKS */
-	{ "LYNXCFG:",		&no_goto_configinfo },
-	{ "LYNXCOMPILEOPTS:",	&no_goto_configinfo },
-	{ "LYNXCOOKIE:",	&always },
-	{ "LYNXDIRED:",		&always },
-	{ "LYNXDOWNLOAD:",	&always },
-	{ "LYNXOPTIONS:",	&always },
-	{ "LYNXPRINT:",		&always },
+	{ STR_LYNXCFG,		&no_goto_configinfo },
+	{ STR_LYNXCFLAGS,	&no_goto_configinfo },
+	{ STR_LYNXCOOKIE,	&always },
+	{ STR_LYNXDIRED,	&always },
+	{ STR_LYNXDOWNLOAD,	&always },
+	{ STR_LYNXOPTIONS,	&always },
+	{ STR_LYNXPRINT,	&always },
     };
     unsigned n;
     BOOLEAN found = FALSE;
@@ -584,13 +610,14 @@ PRIVATE void do_check_goto_URL ARGS3(
 	     /* HTFindPoundSelector will initialize www_search_result,
 		so we do nothing else. */
 	    HTAddGotoURL(user_input_buffer);
+	    trimPoundSelector(curdoc.address);
+	    StrAllocCat(curdoc.address, user_input_buffer);
 	}
     } else {
 	/*
 	 * If it's not a URL then make it one.
 	 */
 	StrAllocCopy(*old_user_input, user_input_buffer);
-	LYFillLocalFileURL(old_user_input, "file://localhost");
 	LYEnsureAbsoluteURL(old_user_input, "", TRUE);
 	sprintf(user_input_buffer, "%.*s",
 		(int)(MAX_LINE - 1), *old_user_input);
@@ -607,12 +634,12 @@ PRIVATE void do_check_goto_URL ARGS3(
 	if (found) {
 	    ;
 	} else if (LYValidate &&
-		   strncmp(user_input_buffer, "http:", 5) &&
-		   strncmp(user_input_buffer, "https:", 6)) {
+		   !isHTTP_URL(user_input_buffer) &&
+		   !isHTTPS_URL(user_input_buffer)) {
 	    HTUserMsg(GOTO_NON_HTTP_DISALLOWED);
 
 	} else {
-	    StrAllocCopy(newdoc.address, user_input_buffer);
+	    set_address(&newdoc, user_input_buffer);
 	    newdoc.isHEAD = FALSE;
 	    /*
 	     *  Might be an anchor in the same doc from a POST
@@ -623,8 +650,7 @@ PRIVATE void do_check_goto_URL ARGS3(
 		 * Make a name for this new URL.
 		 */
 		StrAllocCopy(newdoc.title, gettext("A URL specified by the user"));
-		FREE(newdoc.post_data);
-		FREE(newdoc.post_content_type);
+		LYFreePostData(&newdoc);
 		FREE(newdoc.bookmark);
 		newdoc.safe = FALSE;
 		newdoc.internal_link = FALSE;
@@ -660,30 +686,23 @@ PRIVATE BOOL do_check_recall ARGS7(
     for (;;) {
 #ifdef WIN_EX	/* 1998/10/11 (Sun) 10:41:05 */
 	int len = strlen(user_input_buffer);
-	char last_2, last_1, last;
 
 	if (len >= 3) {
-
-	    last_2 = user_input_buffer[len - 3];
-	    last_1 = user_input_buffer[len - 2];
-	    last = user_input_buffer[len - 1];
-
 	    if (len < MAX_LINE - 1
-	     && last_2 == '/'
-	     && isalpha(last_1)
-	     && last == ':')
-		LYAddHtmlSep0(user_input_buffer);
+	     && LYIsHtmlSep(user_input_buffer[len - 3])
+	     && LYIsDosDrive(user_input_buffer + len - 2))
+		LYAddPathSep0(user_input_buffer);
 
 	} else if (len == 2 && user_input_buffer[1] == ':') {
-	    if (isalpha(UCH(user_input_buffer[0]))) {
-		LYAddHtmlSep0(user_input_buffer);
-	    } else {
-		HTUserMsg2(WWW_ILLEGAL_URL_MESSAGE, user_input_buffer);
-		LYstrncpy(user_input_buffer, *old_user_input, MAX_LINE - 1);
-		FREE(*old_user_input);
-		ret = FALSE;
-		break;
-	    }
+		if (LYIsDosDrive(user_input_buffer)) {
+			LYAddPathSep0(user_input_buffer);
+		} else {
+			HTUserMsg2(WWW_ILLEGAL_URL_MESSAGE, user_input_buffer);
+			LYstrncpy(user_input_buffer, *old_user_input, MAX_LINE - 1);
+			FREE(*old_user_input);
+			ret = FALSE;
+			break;
+		}
 	}
 #endif
 	/*
@@ -799,8 +818,7 @@ PRIVATE BOOL do_check_recall ARGS7(
 PRIVATE void do_cleanup_after_delete NOARGS
 {
     HTuncache_current_document();
-    StrAllocCopy(newdoc.address, curdoc.address);
-    FREE(curdoc.address);
+    move_address(&newdoc, &curdoc);
     newdoc.line = curdoc.line;
     if (curdoc.link == nlinks-1) {
 	/*
@@ -824,9 +842,10 @@ PRIVATE int find_link_near_col ARGS2(
 
 	    while ((delta > 0 ? (i < nlinks) : (i >= 0)) && cy == links[i].ly) {
 		int cx = links[i].lx;
+		char *text = LYGetHiliteStr(i, 0);
 
-		if (links[i].hightext)
-		    cx += strlen(links[i].hightext)/2;
+		if (text != NULL)
+		    cx += strlen(text) / 2;
 		cx -= col;
 		if (cx < 0)
 		    cx = -cx;
@@ -865,13 +884,13 @@ PRIVATE int DoTraversal ARGS2(
 	if (!rlink_rejected &&
 	     traversal_host &&
 	     links[curdoc.link].lname) {
-	    if (strncmp(links[curdoc.link].lname, "LYNXIMGMAP:", 11)) {
+	    if (!isLYNXIMGMAP(links[curdoc.link].lname)) {
 		rlink_allowed = (BOOL) !strncmp(traversal_host,
 					 links[curdoc.link].lname,
 					 strlen(traversal_host));
 	    } else {
 		rlink_allowed = (BOOL) !strncmp(traversal_host,
-					 links[curdoc.link].lname + 11,
+					 links[curdoc.link].lname + LEN_LYNXIMGMAP,
 					 strlen(traversal_host));
 	    }
 	} else {
@@ -899,7 +918,7 @@ PRIVATE int DoTraversal ARGS2(
 	} else {
 	    StrAllocCopy(traversal_link_to_add,
 			 links[curdoc.link].lname);
-	    if (strncmp(traversal_link_to_add, "LYNXIMGMAP:", 11))
+	    if (!isLYNXIMGMAP(traversal_link_to_add))
 		*crawl_ok = TRUE;
 	    c = RTARROW;
 	}
@@ -943,13 +962,12 @@ PRIVATE BOOLEAN check_history NOARGS
 
     if (nhist > 0
      && !LYresubmit_posts
-     && curdoc.post_data
-     && history[nhist - 1].post_data
-     && !strcmp(curdoc.post_data, history[nhist - 1].post_data)
+     && HDOC(nhist - 1).post_data
+     && BINEQ(curdoc.post_data, HDOC(nhist - 1).post_data)
      && (base = HText_getContentBase()) != 0) {
-	 char *text = strncmp(history[nhist - 1].address, "LYNXIMGMAP:", 11)
-		     ? history[nhist - 1].address
-		     : history[nhist - 1].address + 11;
+	 char *text = !isLYNXIMGMAP(HDOC(nhist - 1).address)
+		     ? HDOC(nhist - 1).address
+		     : HDOC(nhist - 1).address + LEN_LYNXIMGMAP;
 	if (!strncmp(base, text, strlen(base))) {
 	    /*
 	     * Normal case - as best as we can check, the document at the top
@@ -984,7 +1002,7 @@ PRIVATE int handle_LYK_ACTIVATE ARGS6(
 	if (links[curdoc.link].type == WWW_FORM_LINK_TYPE) {
 #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
 	    if (real_cmd == LYK_ACTIVATE && textfields_need_activation &&
-		F_TEXTLIKE(links[curdoc.link].form->type)) {
+		F_TEXTLIKE(links[curdoc.link].l_form->type)) {
 
 		textinput_activated = TRUE;
 		show_main_statusline(links[curdoc.link], FOR_INPUT);
@@ -996,14 +1014,14 @@ PRIVATE int handle_LYK_ACTIVATE ARGS6(
 	    /*
 	     *	Don't try to submit forms with bad actions. - FM
 	     */
-	    if (links[curdoc.link].form->type == F_SUBMIT_TYPE ||
-		links[curdoc.link].form->type == F_IMAGE_SUBMIT_TYPE ||
-		links[curdoc.link].form->type ==
+	    if (links[curdoc.link].l_form->type == F_SUBMIT_TYPE ||
+		links[curdoc.link].l_form->type == F_IMAGE_SUBMIT_TYPE ||
+		links[curdoc.link].l_form->type ==
 					    F_TEXT_SUBMIT_TYPE) {
 		/*
 		 *  Do nothing if it's disabled. - FM
 		 */
-		if (links[curdoc.link].form->disabled == YES) {
+		if (links[curdoc.link].l_form->disabled == YES) {
 		    HTOutputFormat = WWW_PRESENT;
 		    LYforce_no_cache = FALSE;
 		    reloading = FALSE;
@@ -1012,8 +1030,8 @@ PRIVATE int handle_LYK_ACTIVATE ARGS6(
 		/*
 		 *  Make sure we have an action. - FM
 		 */
-		if (!links[curdoc.link].form->submit_action ||
-		    *links[curdoc.link].form->submit_action
+		if (!links[curdoc.link].l_form->submit_action ||
+		    *links[curdoc.link].l_form->submit_action
 							== '\0') {
 		    HTUserMsg(NO_FORM_ACTION);
 		    HTOutputFormat = WWW_PRESENT;
@@ -1025,7 +1043,7 @@ PRIVATE int handle_LYK_ACTIVATE ARGS6(
 		 *  Check for no_mail if the form action
 		 *  is a mailto URL. - FM
 		 */
-		if (links[curdoc.link].form->submit_method
+		if (links[curdoc.link].l_form->submit_method
 			     == URL_MAIL_METHOD && no_mail) {
 		    HTAlert(FORM_MAILTO_DISALLOWED);
 		    HTOutputFormat = WWW_PRESENT;
@@ -1038,9 +1056,7 @@ PRIVATE int handle_LYK_ACTIVATE ARGS6(
 		 *  with restrictions on file URLs. - FM
 		 */
 		if (no_file_url &&
-		    !strncasecomp(
-			    links[curdoc.link].form->submit_action,
-				  "file:", 5)) {
+		    isFILE_URL(links[curdoc.link].l_form->submit_action)) {
 		    HTAlert(FILE_ACTIONS_DISALLOWED);
 		    HTOutputFormat = WWW_PRESENT;
 		    LYforce_no_cache = FALSE;
@@ -1051,49 +1067,30 @@ PRIVATE int handle_LYK_ACTIVATE ARGS6(
 		 *  Make sure this isn't a spoof attempt
 		 *  via an internal URL. - FM
 		 */
-		if (!strncasecomp(
-			    links[curdoc.link].form->submit_action,
-				  "LYNXCOOKIE:", 11) ||
+		if (isLYNXCOOKIE(links[curdoc.link].l_form->submit_action) ||
 #ifdef DIRED_SUPPORT
 #ifdef OK_PERMIT
-		    (!(strncasecomp(
-			    links[curdoc.link].form->submit_action,
-				   "LYNXDIRED:", 10)) &&
+		    (isLYNXDIRED(links[curdoc.link].l_form->submit_action) &&
 		     (no_dired_support ||
 		      strncasecomp(
-			(links[curdoc.link].form->submit_action + 10),
+			(links[curdoc.link].l_form->submit_action + 10),
 				   "//PERMIT_LOCATION", 17) ||
 		      !LYIsUIPage(curdoc.address, UIP_PERMIT_OPTIONS))) ||
 #else
-		    !strncasecomp(
-			    links[curdoc.link].form->submit_action,
-				  "LYNXDIRED:", 10) ||
+		    isLYNXDIRED(links[curdoc.link].l_form->submit_action) ||
 #endif /* OK_PERMIT */
 #endif /* DIRED_SUPPORT */
-		    !strncasecomp(
-			    links[curdoc.link].form->submit_action,
-				  "LYNXDOWNLOAD:", 13) ||
-		    !strncasecomp(
-			    links[curdoc.link].form->submit_action,
-				  "LYNXHIST:", 9) ||
-		    !strncasecomp(
-			    links[curdoc.link].form->submit_action,
-				  "LYNXKEYMAP:", 11) ||
-		    !strncasecomp(
-			    links[curdoc.link].form->submit_action,
-				  "LYNXIMGMAP:", 11) ||
-		    !strncasecomp(
-			    links[curdoc.link].form->submit_action,
-				  "LYNXPRINT:", 10) ||
-		    !strncasecomp(
-			    links[curdoc.link].form->submit_action,
-				  "lynxexec:", 9) ||
-		    !strncasecomp(
-			    links[curdoc.link].form->submit_action,
-				  "lynxprog:", 9)) {
+		    isLYNXDOWNLOAD(links[curdoc.link].l_form->submit_action) ||
+		    isLYNXHIST(links[curdoc.link].l_form->submit_action) ||
+		    isLYNXKEYMAP(links[curdoc.link].l_form->submit_action) ||
+		    isLYNXIMGMAP(links[curdoc.link].l_form->submit_action) ||
+		    isLYNXPRINT(links[curdoc.link].l_form->submit_action) ||
+		    isLYNXEXEC(links[curdoc.link].l_form->submit_action) ||
+		    isLYNXPROG(links[curdoc.link].l_form->submit_action)) {
+
 		    HTAlert(SPECIAL_ACTION_DISALLOWED);
 		    CTRACE((tfp, "LYMainLoop: Rejected '%s'\n",
-				links[curdoc.link].form->submit_action));
+				links[curdoc.link].l_form->submit_action));
 		    HTOutputFormat = WWW_PRESENT;
 		    LYforce_no_cache = FALSE;
 		    reloading = FALSE;
@@ -1104,9 +1101,9 @@ PRIVATE int handle_LYK_ACTIVATE ARGS6(
 		 *  Check for enctype and let user know we
 		 *  don't yet support multipart/form-data - FM
 		 */
-		if (links[curdoc.link].form->submit_enctype) {
+		if (links[curdoc.link].l_form->submit_enctype) {
 		    if (!strcmp(
-			     links[curdoc.link].form->submit_enctype,
+			     links[curdoc.link].l_form->submit_enctype,
 				"multipart/form-data")) {
 			HTAlert(
 gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
@@ -1120,56 +1117,52 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 		if (check_realm) {
 		    LYPermitURL = TRUE;
 		}
-		if (no_filereferer == TRUE &&
-		    !strncmp(curdoc.address, "file:", 5)) {
+		if (no_filereferer == TRUE && isFILE_URL(curdoc.address)) {
 		    LYNoRefererForThis = TRUE;
 		}
-		if (links[curdoc.link].form->submit_method
-			     != URL_MAIL_METHOD) {
+		if (links[curdoc.link].l_form->submit_method != URL_MAIL_METHOD) {
 		    StrAllocCopy(newdoc.title,
-				 links[curdoc.link].hightext);
+				 LYGetHiliteStr(curdoc.link, 0));
 		}
 	    }
+
 	    /*
 	     *	Normally we don't get here for text input fields,
 	     *  but it can happen as a result of mouse positioning.
 	     *  In that case the statusline will not have updated
 	     *  info, so update it now. - kw
 	     */
-
-	    if (F_TEXTLIKE(links[curdoc.link].form->type)) {
-		show_formlink_statusline(links[curdoc.link].form,
-					 (real_cmd==LYK_NOCACHE ||
-					  real_cmd==LYK_DOWNLOAD ||
-					  real_cmd==LYK_HEAD ||
-					  (real_cmd==LYK_SUBMIT &&
+	    if (F_TEXTLIKE(links[curdoc.link].l_form->type)) {
+		show_formlink_statusline(links[curdoc.link].l_form,
+					 (real_cmd == LYK_NOCACHE ||
+					  real_cmd == LYK_DOWNLOAD ||
+					  real_cmd == LYK_HEAD ||
+					  (real_cmd == LYK_SUBMIT &&
 					   !textinput_activated)) ?
 					 FOR_PANEL : FOR_INPUT);
-		if (user_mode==NOVICE_MODE &&
+		if (user_mode == NOVICE_MODE &&
 		    textinput_activated &&
-		    (real_cmd==LYK_ACTIVATE || real_cmd==LYK_SUBMIT)) {
-			form_noviceline(links[curdoc.link].form->disabled);
+		    (real_cmd == LYK_ACTIVATE || real_cmd == LYK_SUBMIT)) {
+			form_noviceline(links[curdoc.link].l_form->disabled);
 		}
 	    }
 
-	    *c = change_form_link(&links[curdoc.link],
+	    *c = change_form_link(curdoc.link,
 				 &newdoc, refresh_screen,
-				 links[curdoc.link].form->name,
-				 links[curdoc.link].form->value,
 				 FALSE,
-				 (BOOLEAN)(real_cmd==LYK_SUBMIT ||
-				  real_cmd==LYK_NOCACHE ||
-				  real_cmd==LYK_DOWNLOAD ||
-				  real_cmd==LYK_HEAD));
+				 (BOOLEAN)(real_cmd == LYK_SUBMIT ||
+				  real_cmd == LYK_NOCACHE ||
+				  real_cmd == LYK_DOWNLOAD ||
+				  real_cmd == LYK_HEAD));
 	    if (*c != LKC_DONE || *refresh_screen) {
 		/*
 		 *  Cannot have been a submit field for which
 		 *  newdoc was filled in. - kw
 		 */
-		if ((links[curdoc.link].form->type == F_SUBMIT_TYPE ||
-		     links[curdoc.link].form->type == F_IMAGE_SUBMIT_TYPE ||
-		     links[curdoc.link].form->type == F_TEXT_SUBMIT_TYPE) &&
-		    links[curdoc.link].form->submit_method
+		if ((links[curdoc.link].l_form->type == F_SUBMIT_TYPE ||
+		     links[curdoc.link].l_form->type == F_IMAGE_SUBMIT_TYPE ||
+		     links[curdoc.link].l_form->type == F_TEXT_SUBMIT_TYPE) &&
+		    links[curdoc.link].l_form->submit_method
 			     != URL_MAIL_METHOD) {
 		    /*
 		     *  Try to undo change of newdoc.title done above.
@@ -1182,16 +1175,17 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 		}
 	    } else {
 		if (HTOutputFormat == HTAtom_for("www/download") &&
-		newdoc.post_data != NULL &&
-		newdoc.safe == FALSE) {
+		    newdoc.post_data != NULL &&
+		    newdoc.safe == FALSE) {
+
 		    if ((HText_POSTReplyLoaded(&newdoc) == TRUE) &&
 			HTConfirm(CONFIRM_POST_RESUBMISSION) == FALSE) {
 			HTInfoMsg(CANCELLED);
 			HTOutputFormat = WWW_PRESENT;
 			LYforce_no_cache = FALSE;
-			StrAllocCopy(newdoc.address, curdoc.address);
+			copy_address(&newdoc, &curdoc);
 			StrAllocCopy(newdoc.title, curdoc.title);
-			StrAllocCopy(newdoc.post_data, curdoc.post_data);
+			BStrCopy(newdoc.post_data, curdoc.post_data);
 			StrAllocCopy(newdoc.post_content_type,
 				     curdoc.post_content_type);
 			StrAllocCopy(newdoc.bookmark, curdoc.bookmark);
@@ -1231,7 +1225,7 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 		case '\r':
 		default:
 		    if ((real_cmd == LYK_ACTIVATE || real_cmd == LYK_SUBMIT) &&
-			F_TEXTLIKE(links[curdoc.link].form->type) &&
+			F_TEXTLIKE(links[curdoc.link].l_form->type) &&
 			textinput_activated)
 			return 3;
 		    break;
@@ -1245,11 +1239,10 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 	     *	Make sure this isn't a spoof in an account
 	     *	with restrictions on file URLs. - FM
 	     */
-	    if (no_file_url &&
-		!strncmp(links[curdoc.link].lname, "file:", 5)) {
-		if (strncmp(curdoc.address, "file:", 5) &&
-		    !((!strncmp(curdoc.address, "LYNXKEYMAP:", 11) ||
-		       !strncmp(curdoc.address, "LYNXCOOKIE:", 11)) &&
+	    if (no_file_url && isFILE_URL(links[curdoc.link].lname)) {
+		if (!isFILE_URL(curdoc.address) &&
+		    !((isLYNXKEYMAP(curdoc.address) ||
+		       isLYNXCOOKIE(curdoc.address)) &&
 		      !strncmp(links[curdoc.link].lname,
 			       helpfilepath,
 			       strlen(helpfilepath)))) {
@@ -1267,14 +1260,11 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 	     *	via an internal URL in a non-internal
 	     *	document. - FM
 	     */
-	    if ((!strncmp(links[curdoc.link].lname,
-			  "LYNXCOOKIE:", 11) &&
-		 (strcmp((curdoc.title ? curdoc.title : ""),
-			 COOKIE_JAR_TITLE) ||
-		  strncmp(curdoc.address, "LYNXCOOKIE:", 11))) ||
+	    if ((isLYNXCOOKIE(links[curdoc.link].lname) &&
+		 (strcmp(NonNull(curdoc.title), COOKIE_JAR_TITLE) ||
+		  !isLYNXCOOKIE(curdoc.address))) ||
 #ifdef DIRED_SUPPORT
-		(!strncmp(links[curdoc.link].lname,
-			  "LYNXDIRED:", 10) &&
+		(isLYNXDIRED(links[curdoc.link].lname) &&
 		 !LYIsUIPage(curdoc.address, UIP_DIRED_MENU) &&
 		 !LYIsUIPage(curdoc.address, UIP_PERMIT_OPTIONS) &&
 #ifdef OK_INSTALL
@@ -1282,16 +1272,13 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 #endif /* OK_INSTALL */
 		 !LYIsUIPage(curdoc.address, UIP_UPLOAD_OPTIONS)) ||
 #endif /* DIRED_SUPPORT */
-		(!strncmp(links[curdoc.link].lname,
-			 "LYNXDOWNLOAD:", 13) &&
+		(isLYNXDOWNLOAD(links[curdoc.link].lname) &&
 		 !LYIsUIPage(curdoc.address, UIP_DOWNLOAD_OPTIONS)) ||
-		(!strncmp(links[curdoc.link].lname,
-			  "LYNXHIST:", 9) &&
+		(isLYNXHIST(links[curdoc.link].lname) &&
 		 !LYIsUIPage(curdoc.address, UIP_HISTORY) &&
 		 !LYIsUIPage(curdoc.address, UIP_LIST_PAGE) &&
 		 !LYIsUIPage(curdoc.address, UIP_ADDRLIST_PAGE)) ||
-		(!strncmp(links[curdoc.link].lname,
-			  "LYNXPRINT:", 10) &&
+		(isLYNXPRINT(links[curdoc.link].lname) &&
 		 !LYIsUIPage(curdoc.address, UIP_PRINT_OPTIONS))) {
 		    HTAlert(SPECIAL_VIA_EXTERNAL_DISALLOWED);
 		    HTOutputFormat = WWW_PRESENT;
@@ -1311,8 +1298,8 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 	    /*
 	     *	Follow a normal link or anchor.
 	     */
-	    StrAllocCopy(newdoc.address, links[curdoc.link].lname);
-	    StrAllocCopy(newdoc.title, links[curdoc.link].hightext);
+	    set_address(&newdoc, links[curdoc.link].lname);
+	    StrAllocCopy(newdoc.title, LYGetHiliteStr(curdoc.link, 0));
 #ifndef DONT_TRACK_INTERNAL_LINKS
 	/*
 	 *  For internal links, retain POST content if present.
@@ -1335,7 +1322,7 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 		 *  for an internal link within the document the
 		 *  List Page is about. - kw
 		 */
-		if (LYIsListpageTitle(curdoc.title ? curdoc.title : "") &&
+		if (LYIsListpageTitle(NonNull(curdoc.title)) &&
 		    (LYIsUIPage(curdoc.address, UIP_LIST_PAGE) ||
 		     LYIsUIPage(curdoc.address, UIP_ADDRLIST_PAGE))) {
 		    if (check_history()) {
@@ -1354,7 +1341,7 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 				/* cancel the whole thing */
 				LYforce_no_cache = FALSE;
 				reloading = FALSE;
-				StrAllocCopy(newdoc.address, curdoc.address);
+				copy_address(&newdoc, &curdoc);
 				StrAllocCopy(newdoc.title, curdoc.title);
 				newdoc.internal_link = curdoc.internal_link;
 				HTInfoMsg(CANCELLED);
@@ -1372,8 +1359,7 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 				 * wasn't meant to be internal after
 				 * all, here we can recover from that
 				 * assumption. - kw */
-				FREE(newdoc.post_data);
-				FREE(newdoc.post_content_type);
+				LYFreePostData(&newdoc);
 				newdoc.internal_link = FALSE;
 				HTAlert(DISCARDING_POST_DATA);
 			    }
@@ -1383,7 +1369,7 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 		     *	Don't push the List Page if we follow an
 		     *	internal link given by it. - kw
 		     */
-		    FREE(curdoc.address);
+		    free_address(&curdoc);
 		} else if (cmd != LYK_NOCACHE) {
 		    *try_internal = TRUE;
 		}
@@ -1397,8 +1383,7 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 		/*
 		 *  Free POST content if not an internal link. - kw
 		 */
-		FREE(newdoc.post_data);
-		FREE(newdoc.post_content_type);
+		LYFreePostData(&newdoc);
 	    }
 #endif /* TRACK_INTERNAL_LINKS */
 	    /*
@@ -1406,10 +1391,9 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 	     *	form.  If so, don't free the content. -- FM
 	     */
 	    if (are_different(&curdoc, &newdoc)) {
-		FREE(newdoc.post_data);
-		FREE(newdoc.post_content_type);
+		LYFreePostData(&newdoc);
 		FREE(newdoc.bookmark);
-		if (!strncmp(newdoc.address, "LYNXMESSAGES:", 13))
+		if (isLYNXMESSAGES(newdoc.address))
 		    LYforce_no_cache = TRUE;
 	    }
 	    if (!no_jump && lynxjumpfile && curdoc.address &&
@@ -1423,8 +1407,7 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 		       (lynxjumpfile &&
 			!strcmp(lynxjumpfile, curdoc.address))) {
 		LYUserSpecifiedURL = TRUE;
-	    } else if (no_filereferer == TRUE &&
-		       !strncmp(curdoc.address, "file:", 5)) {
+	    } else if (no_filereferer == TRUE && isFILE_URL(curdoc.address)) {
 		LYNoRefererForThis = TRUE;
 	    }
 	    newdoc.link = 0;
@@ -1447,7 +1430,7 @@ gettext("Enctype multipart/form-data not yet supported!  Cannot submit."));
 		      strip_trailing_slash(newdoc.address);
 	    }
 #endif /* DIRED_SUPPORT  && !__DJGPP__ */
-	    if (!strncmp(curdoc.address, "LYNXCOOKIE:", 11)) {
+	    if (isLYNXCOOKIE(curdoc.address)) {
 		HTuncache_current_document();
 	    }
 	}
@@ -1515,16 +1498,16 @@ PRIVATE void handle_LYK_ADD_BOOKMARK ARGS3(
 	!LYIsUIPage(curdoc.address, UIP_UPLOAD_OPTIONS) &&
 #endif /* DIRED_SUPPORT */
 	!LYIsUIPage(curdoc.address, UIP_DOWNLOAD_OPTIONS) &&
-	strncmp(curdoc.address, "LYNXCOOKIE:", 11) &&
+	!isLYNXCOOKIE(curdoc.address) &&
 	!LYIsUIPage(curdoc.address, UIP_OPTIONS_MENU) &&
 	((nlinks <= 0) ||
 	 (links[curdoc.link].lname != NULL &&
-	  strncmp(links[curdoc.link].lname, "LYNXHIST:", 9) &&
-	  strncmp(links[curdoc.link].lname, "LYNXPRINT:", 10) &&
-	  strncmp(links[curdoc.link].lname, "LYNXDIRED:", 10) &&
-	  strncmp(links[curdoc.link].lname, "LYNXDOWNLOAD:", 13) &&
-	  strncmp(links[curdoc.link].lname, "LYNXCOOKIE:", 11) &&
-	  strncmp(links[curdoc.link].lname, "LYNXOPTIONS:", 12)))) {
+	  !isLYNXHIST(links[curdoc.link].lname) &&
+	  !isLYNXPRINT(links[curdoc.link].lname) &&
+	  !isLYNXDIRED(links[curdoc.link].lname) &&
+	  !isLYNXDOWNLOAD(links[curdoc.link].lname) &&
+	  !isLYNXCOOKIE(links[curdoc.link].lname) &&
+	  !isLYNXPRINT(links[curdoc.link].lname)))) {
 	if (nlinks > 0) {
 	    if (curdoc.post_data == NULL &&
 		curdoc.bookmark == NULL &&
@@ -1548,8 +1531,8 @@ PRIVATE void handle_LYK_ADD_BOOKMARK ARGS3(
 		    curdoc.bookmark != NULL &&
 		    strstr(curdoc.address,
 			   (*bookmark_page == '.'
-					  ?
-			(bookmark_page+1) : bookmark_page)) != NULL) {
+					  ? (bookmark_page+1)
+					  : bookmark_page)) != NULL) {
 		    /*
 		     *	If multiple bookmarks are disabled, offer
 		     *	the L)ink or C)ancel, but with wording
@@ -1589,7 +1572,7 @@ PRIVATE void handle_LYK_ADD_BOOKMARK ARGS3(
 		 */
 		if (links[curdoc.link].type != WWW_FORM_LINK_TYPE) {
 		    save_bookmark_link(links[curdoc.link].lname,
-				       links[curdoc.link].hightext);
+				       LYGetHiliteStr(curdoc.link, 0));
 		    *refresh_screen = TRUE; /* MultiBookmark support */
 		} else {
 		    HTUserMsg(NOBOOK_FORM_FIELD);
@@ -1624,9 +1607,8 @@ check_add_bookmark_to_self:
 	if (curdoc.bookmark && BookmarkPage &&
 	    !strcmp(curdoc.bookmark, BookmarkPage)) {
 	    HTuncache_current_document();
-	    StrAllocCopy(newdoc.address, curdoc.address);
+	    move_address(&newdoc, &curdoc);
 	    StrAllocCopy(newdoc.bookmark, curdoc.bookmark);
-	    FREE(curdoc.address);
 	    newdoc.line = curdoc.line;
 	    newdoc.link = curdoc.link;
 	    newdoc.internal_link = FALSE;
@@ -1726,7 +1708,7 @@ PRIVATE void handle_LYK_COMMENT ARGS4(
 			 */
 			if ((cp = strchr((temp+1), '/')) != NULL)
 			    *cp = '\0';
-			StrAllocCopy(address, "mailto:");
+			StrAllocCopy(address, STR_MAILTO_URL);
 			StrAllocCat(address, (temp+1));
 			StrAllocCat(address, "@");
 		    }
@@ -1754,7 +1736,7 @@ PRIVATE void handle_LYK_COMMENT ARGS4(
 		/*
 		 *  The address is a URL.  Just follow the link.
 		 */
-		StrAllocCopy(newdoc.address, *owner_address_p);
+		set_address(&newdoc, *owner_address_p);
 		newdoc.internal_link = FALSE;
 	    } else {
 		/*
@@ -1774,16 +1756,16 @@ PRIVATE void handle_LYK_COMMENT ARGS4(
 		    }
 		}
 
-		if (strchr(*owner_address_p,':')!=NULL)
+		if (strchr(*owner_address_p, ':') != NULL)
 		     /*
 		      *  Send a reply.	The address is after the colon.
 		      */
-		     reply_by_mail(strchr(*owner_address_p,':')+1,
+		     reply_by_mail(strchr(*owner_address_p, ':') + 1,
 				   curdoc.address,
-				   (kp ? kp : ""), id);
+				   NonNull(kp), id);
 		else
 		    reply_by_mail(*owner_address_p, curdoc.address,
-				  (kp ? kp : ""), id);
+				  NonNull(kp), id);
 
 		FREE(tmptitle);
 		*refresh_screen = TRUE;	/* to force a showpage */
@@ -1798,10 +1780,9 @@ PRIVATE BOOLEAN handle_LYK_COOKIE_JAR ARGS1(
     /*
      *	Don't do if already viewing the cookie jar.
      */
-    if (strncmp(curdoc.address, "LYNXCOOKIE:", 11)) {
-	StrAllocCopy(newdoc.address, "LYNXCOOKIE:/");
-	FREE(newdoc.post_data);
-	FREE(newdoc.post_content_type);
+    if (!isLYNXCOOKIE(curdoc.address)) {
+	set_address(&newdoc, "LYNXCOOKIE:/");
+	LYFreePostData(&newdoc);
 	FREE(newdoc.bookmark);
 	newdoc.isHEAD = FALSE;
 	newdoc.safe = FALSE;
@@ -1826,10 +1807,8 @@ PRIVATE void handle_LYK_CREATE NOARGS
     if (lynx_edit_mode && !no_dired_support) {
 	if (local_create(&curdoc) > 0) {
 	    DIRED_UNCACHE_1;
-	    StrAllocCopy(newdoc.address, curdoc.address);
-	    FREE(curdoc.address);
-	    FREE(newdoc.post_data);
-	    FREE(newdoc.post_content_type);
+	    move_address(&newdoc, &curdoc);
+	    LYFreePostData(&newdoc);
 	    FREE(newdoc.bookmark);
 	    newdoc.isHEAD = FALSE;
 	    newdoc.safe = FALSE;
@@ -1870,18 +1849,19 @@ PRIVATE void handle_LYK_DIRED_MENU ARGS3(
 {
 #ifdef VMS
     char *cp, *temp = 0;
+    const char *test = HTGetProgramPath(ppCSWING);
 
     /*
      *	Check if the CSwing Directory/File Manager is available.
-     *	Will be disabled if LYCSwingPath is NULL, zero-length,
+     *	Will be disabled if CSWING path is NULL, zero-length,
      *	or "none" (case insensitive), if no_file_url was set via
      *	the file_url restriction, if no_goto_file was set for
      *	the anonymous account, or if HTDirAccess was set to
      *	HT_DIR_FORBID or HT_DIR_SELECTIVE via the -nobrowse
      *	or -selective switches. - FM
      */
-    if (!(LYCSwingPath && *LYCSwingPath) ||
-	!strcasecomp(LYCSwingPath, "none") ||
+    if (isEmpty(test) ||
+	!strcasecomp(test, "none") ||
 	no_file_url || no_goto_file ||
 	HTDirAccess == HT_DIR_FORBID ||
 	HTDirAccess == HT_DIR_SELECTIVE) {
@@ -1915,7 +1895,7 @@ PRIVATE void handle_LYK_DIRED_MENU ARGS3(
 	if (HTStat(cp, &stat_info) == -1) {
 	    CTRACE((tfp, "mainloop: Can't stat %s\n", cp));
 	    FREE(cp);
-	    HTSprintf0(&temp, "%s []", LYCSwingPath);
+	    HTSprintf0(&temp, "%s []", HTGetProgramPath(ppCSWING));
 	    *refresh_screen = TRUE;  /* redisplay */
 	} else {
 	    char *VMSdir = NULL;
@@ -1943,7 +1923,7 @@ PRIVATE void handle_LYK_DIRED_MENU ARGS3(
 		    cp == NULL;
 		}
 	    }
-	    HTSprintf0(&temp, "%s %s", LYCSwingPath, VMSdir);
+	    HTSprintf0(&temp, "%s %s", HTGetProgramPath(ppCSWING), VMSdir);
 	    FREE(VMSdir);
 	    /*
 	     *	Uncache the current document in case we
@@ -1953,11 +1933,9 @@ PRIVATE void handle_LYK_DIRED_MENU ARGS3(
 	    /* could use DIRED_UNCACHE_1 but it's currently only defined
 	       for dired - kw */
 	    HTuncache_current_document();
-	    StrAllocCopy(newdoc.address, curdoc.address);
-	    StrAllocCopy(newdoc.title,
-			 curdoc.title ? curdoc.title : "");
+	    move_address(&newdoc, &curdoc);
+	    StrAllocCopy(newdoc.title, NonNull(curdoc.title));
 	    StrAllocCopy(newdoc.bookmark, curdoc.bookmark);
-	    FREE(curdoc.address);
 	    newdoc.line = curdoc.line;
 	    newdoc.link = curdoc.link;
 	}
@@ -1968,7 +1946,7 @@ PRIVATE void handle_LYK_DIRED_MENU ARGS3(
 	 *  an argument and don't uncache the current
 	 *  document. - FM
 	 */
-	HTSprintf0(&temp, "%s []", LYCSwingPath);
+	HTSprintf0(&temp, "%s []", HTGetProgramPath(ppCSWING));
 	*refresh_screen = TRUE;	/* redisplay */
     }
     stop_curses();
@@ -1981,8 +1959,7 @@ PRIVATE void handle_LYK_DIRED_MENU ARGS3(
      */
     if (lynx_edit_mode && !no_dired_support &&
 	!LYIsUIPage(curdoc.address, UIP_DIRED_MENU) &&
-	strcmp((curdoc.title ? curdoc.title : ""),
-	       DIRED_MENU_TITLE)) {
+	strcmp(NonNull(curdoc.title), DIRED_MENU_TITLE)) {
 	dired_options(&curdoc,&newdoc.address);
 	*refresh_screen = TRUE;	/* redisplay */
     }
@@ -2018,10 +1995,10 @@ PRIVATE int handle_LYK_DOWNLOAD ARGS3(
 	return 1;	/* mouse stuff was confused, ignore - kw */
     if (nlinks > 0) {
 	if (links[curdoc.link].type == WWW_FORM_LINK_TYPE) {
-	    if (links[curdoc.link].form->type == F_SUBMIT_TYPE ||
-		links[curdoc.link].form->type == F_IMAGE_SUBMIT_TYPE ||
-		links[curdoc.link].form->type == F_TEXT_SUBMIT_TYPE) {
-		if (links[curdoc.link].form->submit_method ==
+	    if (links[curdoc.link].l_form->type == F_SUBMIT_TYPE ||
+		links[curdoc.link].l_form->type == F_IMAGE_SUBMIT_TYPE ||
+		links[curdoc.link].l_form->type == F_TEXT_SUBMIT_TYPE) {
+		if (links[curdoc.link].l_form->submit_method ==
 			 URL_MAIL_METHOD) {
 		    if (*old_c != real_c) {
 			*old_c = real_c;
@@ -2029,8 +2006,7 @@ PRIVATE int handle_LYK_DOWNLOAD ARGS3(
 		    }
 		    return 0;
 		}
-		if (!strncmp(links[curdoc.link].form->submit_action,
-			"LYNXOPTIONS:", 12)) {
+		if (isLYNXOPTIONS(links[curdoc.link].l_form->submit_action)) {
 		    if (*old_c != real_c) {
 			*old_c = real_c;
 			HTUserMsg(NO_DOWNLOAD_SPECIAL);
@@ -2047,7 +2023,7 @@ PRIVATE int handle_LYK_DOWNLOAD ARGS3(
 		HTUserMsg(NO_DOWNLOAD_INPUT);
 	    }
 
-	} else if (!strncmp(curdoc.address, "LYNXCOOKIE:", 11)) {
+	} else if (isLYNXCOOKIE(curdoc.address)) {
 	    if (*old_c != real_c)	{
 		*old_c = real_c;
 		HTUserMsg(NO_DOWNLOAD_COOKIES);
@@ -2077,26 +2053,26 @@ PRIVATE int handle_LYK_DOWNLOAD ARGS3(
 	    /*
 	     *	Don't bother making a /tmp copy of the local file.
 	     */
-	    char *temp = NULL;
-	    StrAllocCopy(temp, newdoc.address);
-	    StrAllocCopy(newdoc.address, links[curdoc.link].lname);
+	    static DocInfo temp;
+	    copy_address(&temp, &newdoc);
+	    set_address(&newdoc, links[curdoc.link].lname);
 	    if (LYdownload_options(&newdoc.address,
 				   links[curdoc.link].lname) < 0)
-		StrAllocCopy(newdoc.address, temp);
+		copy_address(&newdoc, &temp);
 	    else
 		newdoc.internal_link = FALSE;
-	    FREE(temp);
+	    LYFreeDocInfo(&temp);
 #endif /* DIRED_SUPPORT */
 
 	} else if (LYIsUIPage(curdoc.address, UIP_HISTORY) &&
-	    !strncmp(links[curdoc.link].lname, "LYNXHIST:", 9)) {
-	    int number = atoi(links[curdoc.link].lname+9);
+	    isLYNXHIST(links[curdoc.link].lname)) {
+	    int number = atoi(links[curdoc.link].lname + LEN_LYNXHIST);
 	    if (number >= nhist || number < 0) {
 		HTUserMsg(NO_DOWNLOAD_SPECIAL);
 		return 0;
 	    }
-	    if ((history[number].post_data != NULL &&
-		 history[number].safe != TRUE) &&
+	    if ((HDOC(number).post_data != NULL &&
+		 HDOC(number).safe != TRUE) &&
 		HTConfirm(CONFIRM_POST_RESUBMISSION) == FALSE) {
 		HTInfoMsg(CANCELLED);
 		return 0;
@@ -2104,19 +2080,18 @@ PRIVATE int handle_LYK_DOWNLOAD ARGS3(
 	    /*
 	     *  OK, we download from history page, restore URL from stack.
 	     */
-	    StrAllocCopy(newdoc.address, history[number].address);
-	    StrAllocCopy(newdoc.title, links[curdoc.link].hightext);
-	    StrAllocCopy(newdoc.bookmark, history[number].bookmark);
-	    FREE(newdoc.post_data);
-	    FREE(newdoc.post_content_type);
-	    if (history[number].post_data)
-		StrAllocCopy(newdoc.post_data,
-			     history[number].post_data);
-	    if (history[number].post_content_type)
+	    copy_address(&newdoc, &HDOC(number));
+	    StrAllocCopy(newdoc.title, LYGetHiliteStr(curdoc.link, 0));
+	    StrAllocCopy(newdoc.bookmark, HDOC(number).bookmark);
+	    LYFreePostData(&newdoc);
+	    if (HDOC(number).post_data)
+		BStrCopy(newdoc.post_data,
+			 HDOC(number).post_data);
+	    if (HDOC(number).post_content_type)
 		StrAllocCopy(newdoc.post_content_type,
-			     history[number].post_content_type);
-	    newdoc.isHEAD = history[number].isHEAD;
-	    newdoc.safe = history[number].safe;
+			     HDOC(number).post_content_type);
+	    newdoc.isHEAD = HDOC(number).isHEAD;
+	    newdoc.safe = HDOC(number).safe;
 	    newdoc.internal_link = FALSE;
 	    newdoc.link = 0;
 	    HTOutputFormat = HTAtom_for("www/download");
@@ -2132,31 +2107,21 @@ PRIVATE int handle_LYK_DOWNLOAD ARGS3(
 		HTAlert(UNSUPPORTED_DATA_URL);
 	    }
 
-	} else if (!strncmp(links[curdoc.link].lname,
-			    "LYNXCOOKIE:", 11) ||
-		   !strncmp(links[curdoc.link].lname,
-			    "LYNXDIRED:", 10) ||
-		   !strncmp(links[curdoc.link].lname,
-			    "LYNXDOWNLOAD:", 13) ||
-		   !strncmp(links[curdoc.link].lname,
-			    "LYNXPRINT:", 10) ||
-		   !strncmp(links[curdoc.link].lname,
-			    "LYNXOPTIONS:", 12) ||
-		   !strncmp(links[curdoc.link].lname,
-			    "LYNXHIST:", 9) || /* handled above if valid - kw */
+	} else if (isLYNXCOOKIE(links[curdoc.link].lname) ||
+		   isLYNXDIRED(links[curdoc.link].lname) ||
+		   isLYNXDOWNLOAD(links[curdoc.link].lname) ||
+		   isLYNXPRINT(links[curdoc.link].lname) ||
+		   isLYNXOPTIONS(links[curdoc.link].lname) ||
+		   isLYNXHIST(links[curdoc.link].lname) ||
+		   /* handled above if valid - kw */
 /* @@@ should next two be downloadable? - kw */
-		   !strncmp(links[curdoc.link].lname,
-			    "LYNXCFG:", 8) ||
-		   !strncmp(links[curdoc.link].lname,
-			    "LYNXCOMPILEOPTS:", 16) ||
-		   !strncmp(links[curdoc.link].lname,
-			    "lynxexec:", 9) ||
-		   !strncmp(links[curdoc.link].lname,
-			    "lynxprog:", 9)) {
+		   isLYNXHIST(links[curdoc.link].lname) ||
+		   isLYNXCFLAGS(links[curdoc.link].lname) ||
+		   isLYNXEXEC(links[curdoc.link].lname) ||
+		   isLYNXPROG(links[curdoc.link].lname)) {
 	    HTUserMsg(NO_DOWNLOAD_SPECIAL);
 
-	} else if (!strncmp(links[curdoc.link].lname,
-			    "mailto:", 7)) {
+	} else if (isMAILTO_URL(links[curdoc.link].lname)) {
 	    HTUserMsg(NO_DOWNLOAD_MAILTO_LINK);
 
 	/*
@@ -2178,8 +2143,8 @@ PRIVATE int handle_LYK_DOWNLOAD ARGS3(
 	     *	if it's an anchor within the same document,
 	     *	entire document will be downloaded.
 	     */
-	    StrAllocCopy(newdoc.address, links[curdoc.link].lname);
-	    StrAllocCopy(newdoc.title, links[curdoc.link].hightext);
+	    set_address(&newdoc, links[curdoc.link].lname);
+	    StrAllocCopy(newdoc.title, LYGetHiliteStr(curdoc.link, 0));
 #ifndef DONT_TRACK_INTERNAL_LINKS
 	    /*
 	     *	Might be an internal link in the same doc from a
@@ -2194,8 +2159,7 @@ PRIVATE int handle_LYK_DOWNLOAD ARGS3(
 	    if (are_different(&curdoc, &newdoc))
 #endif /* TRACK_INTERNAL_LINKS */
 	    {
-		FREE(newdoc.post_data);
-		FREE(newdoc.post_content_type);
+		LYFreePostData(&newdoc);
 		FREE(newdoc.bookmark);
 		newdoc.isHEAD = FALSE;
 		newdoc.safe = FALSE;
@@ -2244,10 +2208,11 @@ PRIVATE void handle_LYK_DOWN_LINK ARGS3(
 	int newlink;
 
 	if (*follow_col == -1) {
+	    char *text = LYGetHiliteStr(curdoc.link, 0);
 	    *follow_col = links[curdoc.link].lx;
 
-	    if (links[curdoc.link].hightext)
-		*follow_col += strlen(links[curdoc.link].hightext)/2;
+	    if (text != NULL)
+		*follow_col += strlen(text) / 2;
 	}
 
 	newlink = find_link_near_col(*follow_col, 1);
@@ -2301,8 +2266,8 @@ PRIVATE int handle_LYK_DWIMEDIT ARGS3(
      *  document.  KED
      */
     if (nlinks > 0  &&
-	links[curdoc.link].type       == WWW_FORM_LINK_TYPE &&
-	links[curdoc.link].form->type == F_TEXTAREA_TYPE)   {
+	links[curdoc.link].type         == WWW_FORM_LINK_TYPE &&
+	links[curdoc.link].l_form->type == F_TEXTAREA_TYPE)   {
 	*cmd = LYK_EDIT_TEXTAREA;
 	return 2;
     }
@@ -2319,8 +2284,8 @@ PRIVATE int handle_LYK_DWIMEDIT ARGS3(
      *   via the above if() statement.]
      */
     if (nlinks > 0 &&
-	links[curdoc.link].type       == WWW_FORM_LINK_TYPE &&
-	links[curdoc.link].form->type == F_TEXT_TYPE)       {
+	links[curdoc.link].type         == WWW_FORM_LINK_TYPE &&
+	links[curdoc.link].l_form->type == F_TEXT_TYPE)       {
 	HTUserMsg (CANNOT_EDIT_FIELD);
 	return 1;
     }
@@ -2446,9 +2411,7 @@ PRIVATE void handle_LYK_EDIT ARGS2(
 			HTUnEscapeSome(tp, "/");
 			if (edit_current_file(tp, curdoc.link, Newline)) {
 			    DIRED_UNCACHE_1;
-			    StrAllocCopy(newdoc.address,
-					 curdoc.address);
-			    FREE(curdoc.address);
+			    move_address(&newdoc, &curdoc);
 #ifdef NO_SEEK_OLD_POSITION
 			    /*
 			     *	Go to top of file.
@@ -2476,7 +2439,7 @@ PRIVATE void handle_LYK_EDIT ARGS2(
 	if (edit_current_file(newdoc.address, curdoc.link, Newline)) {
 	    HTuncache_current_document();
 	    LYforce_no_cache = TRUE;  /*force reload of document */
-	    FREE(curdoc.address); /* so it doesn't get pushed */
+	    free_address(&curdoc); /* so it doesn't get pushed */
 #ifdef NO_SEEK_OLD_POSITION
 	    /*
 	     *	Go to top of file.
@@ -2511,11 +2474,8 @@ PRIVATE void handle_LYK_DWIMHELP ARGS1(
      */
     if (curdoc.link >= 0 && curdoc.link < nlinks &&
 	links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-	!links[curdoc.link].form->disabled &&
-	(links[curdoc.link].form->type == F_TEXT_TYPE ||
-	 links[curdoc.link].form->type == F_TEXT_SUBMIT_TYPE ||
-	 links[curdoc.link].form->type == F_PASSWORD_TYPE ||
-	 links[curdoc.link].form->type == F_TEXTAREA_TYPE)) {
+	!links[curdoc.link].l_form->disabled &&
+	F_TEXTLIKE(links[curdoc.link].l_form->type)) {
 	*cshelpfile = LYLineeditHelpURL();
     }
 }
@@ -2541,8 +2501,8 @@ PRIVATE void handle_LYK_EDIT_TEXTAREA ARGS3(
     /*
      *  See if the current link is in a form TEXTAREA.
      */
-    else if (links[curdoc.link].type       == WWW_FORM_LINK_TYPE &&
-	links[curdoc.link].form->type == F_TEXTAREA_TYPE)   {
+    else if (links[curdoc.link].type         == WWW_FORM_LINK_TYPE &&
+	     links[curdoc.link].l_form->type == F_TEXTAREA_TYPE)   {
 
 	/* stop screen */
 	stop_curses();
@@ -2590,9 +2550,9 @@ PRIVATE int handle_LYK_ELGOTO ARGS5(
     }
     if (!(nlinks > 0 && curdoc.link > -1) ||
 	(links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-	 links[curdoc.link].form->type != F_SUBMIT_TYPE &&
-	 links[curdoc.link].form->type != F_IMAGE_SUBMIT_TYPE &&
-	 links[curdoc.link].form->type != F_TEXT_SUBMIT_TYPE)) {
+	 links[curdoc.link].l_form->type != F_SUBMIT_TYPE &&
+	 links[curdoc.link].l_form->type != F_IMAGE_SUBMIT_TYPE &&
+	 links[curdoc.link].l_form->type != F_TEXT_SUBMIT_TYPE)) {
 	/*
 	 *  No links on page, or not a normal link
 	 *  or form submit button. - FM
@@ -2604,8 +2564,8 @@ PRIVATE int handle_LYK_ELGOTO ARGS5(
 	return 0;
     }
     if ((links[curdoc.link].type == WWW_FORM_LINK_TYPE) &&
-	(!links[curdoc.link].form->submit_action ||
-	 *links[curdoc.link].form->submit_action == '\0')) {
+	(!links[curdoc.link].l_form->submit_action ||
+	 *links[curdoc.link].l_form->submit_action == '\0')) {
 	/*
 	 *  Form submit button with no ACTION defined. - FM
 	 */
@@ -2616,7 +2576,7 @@ PRIVATE int handle_LYK_ELGOTO ARGS5(
 	return 0;
     }
 #ifdef DIRED_SUPPORT
-    if (!strncmp(links[curdoc.link].lname, "LYNXDIRED:", 10) ||
+    if (isLYNXDIRED(links[curdoc.link].lname) ||
 	LYIsUIPage(curdoc.address, UIP_DIRED_MENU) ||
 	LYIsUIPage(curdoc.address, UIP_PERMIT_OPTIONS) ||
 	LYIsUIPage(curdoc.address, UIP_UPLOAD_OPTIONS)) {
@@ -2639,7 +2599,7 @@ PRIVATE int handle_LYK_ELGOTO ARGS5(
     LYstrncpy(user_input_buffer,
 	      ((links[curdoc.link].type == WWW_FORM_LINK_TYPE)
 					?
-    links[curdoc.link].form->submit_action : links[curdoc.link].lname),
+    links[curdoc.link].l_form->submit_action : links[curdoc.link].lname),
 	      (MAX_LINE - 1));
 
     /*
@@ -2651,7 +2611,7 @@ PRIVATE int handle_LYK_ELGOTO ARGS5(
 	user_input_buffer[0] != '\0' &&
 	strcmp(user_input_buffer,
 	       ((links[curdoc.link].type == WWW_FORM_LINK_TYPE)
-			? links[curdoc.link].form->submit_action
+			? links[curdoc.link].l_form->submit_action
 			: links[curdoc.link].lname))) {
 	LYTrimAllStartfile(user_input_buffer);
 	if (user_input_buffer[0] != '\0') {
@@ -2705,32 +2665,32 @@ PRIVATE BOOLEAN handle_LYK_FASTBACKW_LINK ARGS3(
 	 *  before it if there is one on this screen. - kw
 	 */
 	if (links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-	    links[curdoc.link].form->type == F_TEXTAREA_TYPE) {
-	    int thisgroup = links[curdoc.link].form->number;
-	    char *thisname = links[curdoc.link].form->name;
+	    links[curdoc.link].l_form->type == F_TEXTAREA_TYPE) {
+	    int thisgroup = links[curdoc.link].l_form->number;
+	    char *thisname = links[curdoc.link].l_form->name;
 
 	    if (curdoc.link > 0 &&
 		!(links[0].type == WWW_FORM_LINK_TYPE &&
-		  links[0].form->type == F_TEXTAREA_TYPE &&
-		  links[0].form->number == thisgroup &&
-		  sametext(links[0].form->name, thisname))) {
+		  links[0].l_form->type == F_TEXTAREA_TYPE &&
+		  links[0].l_form->number == thisgroup &&
+		  sametext(links[0].l_form->name, thisname))) {
 		do nextlink--;
 		while
 		    (links[nextlink].type == WWW_FORM_LINK_TYPE &&
-		     links[nextlink].form->type == F_TEXTAREA_TYPE &&
-		     links[nextlink].form->number == thisgroup &&
-		     sametext(links[nextlink].form->name, thisname));
+		     links[nextlink].l_form->type == F_TEXTAREA_TYPE &&
+		     links[nextlink].l_form->number == thisgroup &&
+		     sametext(links[nextlink].l_form->name, thisname));
 		samepage = 1;
 
 	    } else if (!more && Newline == 1 &&
 		       (links[0].type == WWW_FORM_LINK_TYPE &&
-			links[0].form->type == F_TEXTAREA_TYPE &&
-			links[0].form->number == thisgroup &&
-			sametext(links[0].form->name, thisname)) &&
+			links[0].l_form->type == F_TEXTAREA_TYPE &&
+			links[0].l_form->number == thisgroup &&
+			sametext(links[0].l_form->name, thisname)) &&
 		       !(links[nlinks-1].type == WWW_FORM_LINK_TYPE &&
-			 links[nlinks-1].form->type == F_TEXTAREA_TYPE &&
-			 links[nlinks-1].form->number == thisgroup &&
-			 sametext(links[nlinks-1].form->name, thisname))) {
+			 links[nlinks-1].l_form->type == F_TEXTAREA_TYPE &&
+			 links[nlinks-1].l_form->number == thisgroup &&
+			 sametext(links[nlinks-1].l_form->name, thisname))) {
 		nextlink = nlinks - 1;
 		samepage = 1;
 
@@ -2754,21 +2714,21 @@ PRIVATE BOOLEAN handle_LYK_FASTBACKW_LINK ARGS3(
 	 */
 	if (nextlink > 0 &&
 	    links[nextlink].type == WWW_FORM_LINK_TYPE &&
-	    links[nextlink].form->type == F_TEXTAREA_TYPE) {
-	    int thisgroup = links[nextlink].form->number;
-	    char *thisname = links[nextlink].form->name;
+	    links[nextlink].l_form->type == F_TEXTAREA_TYPE) {
+	    int thisgroup = links[nextlink].l_form->number;
+	    char *thisname = links[nextlink].l_form->name;
 	    if (links[0].type == WWW_FORM_LINK_TYPE &&
-		links[0].form->type == F_TEXTAREA_TYPE &&
-		links[0].form->number == thisgroup &&
-		sametext(links[0].form->name, thisname)) {
+		links[0].l_form->type == F_TEXTAREA_TYPE &&
+		links[0].l_form->number == thisgroup &&
+		sametext(links[0].l_form->name, thisname)) {
 		nextlink = 0;
 	    } else
 		while
 		    (nextlink > 1 &&
 		     links[nextlink-1].type == WWW_FORM_LINK_TYPE &&
-		     links[nextlink-1].form->type == F_TEXTAREA_TYPE &&
-		     links[nextlink-1].form->number == thisgroup &&
-		     sametext(links[nextlink-1].form->name, thisname)) {
+		     links[nextlink-1].l_form->type == F_TEXTAREA_TYPE &&
+		     links[nextlink-1].l_form->number == thisgroup &&
+		     sametext(links[nextlink-1].l_form->name, thisname)) {
 		    nextlink--;
 		}
 	}
@@ -2812,21 +2772,21 @@ PRIVATE void handle_LYK_FASTFORW_LINK ARGS2(
 	 *  after it if there is one on this screen. - kw
 	 */
 	if (links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-	    links[curdoc.link].form->type == F_TEXTAREA_TYPE) {
-	    int thisgroup = links[curdoc.link].form->number;
-	    char *thisname = links[curdoc.link].form->name;
+	    links[curdoc.link].l_form->type == F_TEXTAREA_TYPE) {
+	    int thisgroup = links[curdoc.link].l_form->number;
+	    char *thisname = links[curdoc.link].l_form->name;
 
 	    if (curdoc.link < nlinks-1 &&
 		!(links[nlinks-1].type == WWW_FORM_LINK_TYPE &&
-		  links[nlinks-1].form->type == F_TEXTAREA_TYPE &&
-		  links[nlinks-1].form->number == thisgroup &&
-		  sametext(links[nlinks-1].form->name, thisname))) {
+		  links[nlinks-1].l_form->type == F_TEXTAREA_TYPE &&
+		  links[nlinks-1].l_form->number == thisgroup &&
+		  sametext(links[nlinks-1].l_form->name, thisname))) {
 		do nextlink++;
 		while
 		    (links[nextlink].type == WWW_FORM_LINK_TYPE &&
-		     links[nextlink].form->type == F_TEXTAREA_TYPE &&
-		     links[nextlink].form->number == thisgroup &&
-		     sametext(links[nextlink].form->name, thisname));
+		     links[nextlink].l_form->type == F_TEXTAREA_TYPE &&
+		     links[nextlink].l_form->number == thisgroup &&
+		     sametext(links[nextlink].l_form->name, thisname));
 		samepage = 1;
 	    } else if (!more && Newline == 1 && curdoc.link > 0) {
 		nextlink = 0;
@@ -2937,8 +2897,8 @@ PRIVATE void handle_LYK_GROW_TEXTAREA ARGS1(
     /*
      *  See if the current link is in a form TEXTAREA.
      */
-    if (links[curdoc.link].type       == WWW_FORM_LINK_TYPE &&
-	links[curdoc.link].form->type == F_TEXTAREA_TYPE)   {
+    if (links[curdoc.link].type         == WWW_FORM_LINK_TYPE &&
+	links[curdoc.link].l_form->type == F_TEXTAREA_TYPE)   {
 
 	HText_ExpandTextarea (&links[curdoc.link], TEXTAREA_EXPAND_SIZE);
 
@@ -2956,10 +2916,10 @@ PRIVATE BOOLEAN handle_LYK_HEAD ARGS1(
     int c;
 
     if (nlinks > 0 &&
-	(links[curdoc.link].type != WWW_FORM_LINK_TYPE ||
-	 links[curdoc.link].form->type == F_SUBMIT_TYPE ||
-	 links[curdoc.link].form->type == F_IMAGE_SUBMIT_TYPE ||
-	 links[curdoc.link].form->type == F_TEXT_SUBMIT_TYPE)) {
+	(links[curdoc.link].type         != WWW_FORM_LINK_TYPE ||
+	 links[curdoc.link].l_form->type == F_SUBMIT_TYPE ||
+	 links[curdoc.link].l_form->type == F_IMAGE_SUBMIT_TYPE ||
+	 links[curdoc.link].l_form->type == F_TEXT_SUBMIT_TYPE)) {
 	/*
 	 * We have links, and the current link is a normal link or a form's
 	 * submit button.  - FM
@@ -2967,8 +2927,9 @@ PRIVATE BOOLEAN handle_LYK_HEAD ARGS1(
 	_statusline(HEAD_D_L_OR_CANCEL);
 	c = LYgetch_single();
 	if (c == 'D') {
-	    char *scheme = strncmp(curdoc.address, "LYNXIMGMAP:", 11) ?
-		curdoc.address : curdoc.address + 11;
+	    char *scheme = !isLYNXIMGMAP(curdoc.address)
+			 ? curdoc.address
+			 : curdoc.address + LEN_LYNXIMGMAP;
 	    if (LYCanDoHEAD(scheme) != TRUE) {
 		HTUserMsg(DOC_NOT_HTTP_URL);
 	    } else {
@@ -2985,8 +2946,8 @@ PRIVATE BOOLEAN handle_LYK_HEAD ARGS1(
 		    LYforce_no_cache = TRUE;
 		    StrAllocCopy(newdoc.title, curdoc.title);
 		    if (HTLoadedDocumentIsHEAD()) {
-			HTuncache_current_document();
-			FREE(curdoc.address);
+			HText_setNoCache(HTMainText);
+			free_address(&curdoc);
 		    } else {
 			StrAllocCat(newdoc.title, " - HEAD");
 		    }
@@ -3003,16 +2964,15 @@ PRIVATE BOOLEAN handle_LYK_HEAD ARGS1(
 		 strncmp(curdoc.address, "http", 4))) {
 		HTUserMsg(LINK_NOT_HTTP_URL);
 	    } else if (links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-		       links[curdoc.link].form->disabled) {
+		       links[curdoc.link].l_form->disabled) {
 		HTUserMsg(FORM_ACTION_DISABLED);
 	    } else if (links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-		       strncmp(links[curdoc.link].form->submit_action,
-						      "lynxcgi:", 8) &&
-		       strncmp(links[curdoc.link].form->submit_action,
+		       !isLYNXCGI(links[curdoc.link].l_form->submit_action) &&
+		       strncmp(links[curdoc.link].l_form->submit_action,
 							 "http", 4)) {
 		HTUserMsg(FORM_ACTION_NOT_HTTP_URL);
 	    } else if (links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-		       links[curdoc.link].form->submit_method ==
+		       links[curdoc.link].l_form->submit_method ==
 						  URL_POST_METHOD &&
 		       HTConfirm(CONFIRM_POST_LINK_HEAD) == FALSE) {
 		HTInfoMsg(CANCELLED);
@@ -3050,8 +3010,9 @@ PRIVATE BOOLEAN handle_LYK_HEAD ARGS1(
 		c = 'D';
 	    }
 	    if (c == 'D') {
-		char *scheme = strncmp(curdoc.address, "LYNXIMGMAP:", 11) ?
-		    curdoc.address : curdoc.address + 11;
+		char *scheme = !isLYNXIMGMAP(curdoc.address)
+			     ? curdoc.address
+			     : curdoc.address + LEN_LYNXIMGMAP;
 		/*
 		 * The user didn't cancel, so check if a HEAD request is
 		 * appropriate for the current document.  - FM
@@ -3063,8 +3024,8 @@ PRIVATE BOOLEAN handle_LYK_HEAD ARGS1(
 		    LYforce_no_cache = TRUE;
 		    StrAllocCopy(newdoc.title, curdoc.title);
 		    if (HTLoadedDocumentIsHEAD()) {
-			HTuncache_current_document();
-			FREE(curdoc.address);
+			HText_setNoCache(HTMainText);
+			free_address(&curdoc);
 		    } else {
 			StrAllocCat(newdoc.title, " - HEAD");
 		    }
@@ -3084,13 +3045,12 @@ PRIVATE void handle_LYK_HELP ARGS1(
 	/*
 	 *  Set the filename.
 	 */
-	StrAllocCopy(newdoc.address, *cshelpfile);
+	set_address(&newdoc, *cshelpfile);
 	/*
 	 *  Make a name for this help file.
 	 */
 	StrAllocCopy(newdoc.title, gettext("Help Screen"));
-	FREE(newdoc.post_data);
-	FREE(newdoc.post_content_type);
+	LYFreePostData(&newdoc);
 	FREE(newdoc.bookmark);
 	newdoc.isHEAD = FALSE;
 	newdoc.safe = FALSE;
@@ -3101,7 +3061,7 @@ PRIVATE void handle_LYK_HELP ARGS1(
 
 PRIVATE void handle_LYK_HISTORICAL NOARGS
 {
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     if (!HTcan_reparse_document()) {
 #endif
     /*
@@ -3111,23 +3071,18 @@ PRIVATE void handle_LYK_HISTORICAL NOARGS
      */
     if ((curdoc.post_data != NULL &&
 	 curdoc.safe != TRUE) &&
-	confirm_post_resub(curdoc.address, NULL,
-			   0, 0) == FALSE) {
+	confirm_post_resub(curdoc.address, NULL, 0, 0) == FALSE) {
 	HTInfoMsg(WILL_NOT_RELOAD_DOC);
     } else {
-	HTuncache_current_document();
-	StrAllocCopy(newdoc.address, curdoc.address);
-	FREE(curdoc.address);
+	HText_setNoCache(HTMainText);
+	move_address(&newdoc, &curdoc);
 	newdoc.line = curdoc.line;
 	newdoc.link = curdoc.link;
     }
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     } /* end if no bypass */
 #endif
-    if (historical_comments)
-	historical_comments = FALSE;
-    else
-	historical_comments = TRUE;
+    historical_comments = !historical_comments;
     if (minimal_comments) {
 	HTAlert(historical_comments ?
 		HISTORICAL_ON_MINIMAL_OFF : HISTORICAL_OFF_MINIMAL_ON);
@@ -3135,7 +3090,7 @@ PRIVATE void handle_LYK_HISTORICAL NOARGS
 	HTAlert(historical_comments ?
 		HISTORICAL_ON_VALID_OFF : HISTORICAL_OFF_VALID_ON);
     }
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     (void) reparse_document();
 #endif
     return;
@@ -3170,14 +3125,13 @@ PRIVATE BOOLEAN handle_LYK_HISTORY ARGS1(
 	}
 	LYRegisterUIPage(newdoc.address, UIP_HISTORY);
 	StrAllocCopy(newdoc.title, HISTORY_PAGE_TITLE);
-	FREE(newdoc.post_data);
-	FREE(newdoc.post_content_type);
+	LYFreePostData(&newdoc);
 	FREE(newdoc.bookmark);
 	newdoc.isHEAD = FALSE;
 	newdoc.safe = FALSE;
 	newdoc.internal_link = FALSE;
 	newdoc.link = 1; /*@@@ bypass "recent statusline messages" link */
-	FREE(curdoc.address);  /* so it doesn't get pushed */
+	free_address(&curdoc);  /* so it doesn't get pushed */
 
 	if (LYValidate || check_realm) {
 	    LYPermitURL = TRUE;
@@ -3190,10 +3144,7 @@ PRIVATE BOOLEAN handle_LYK_HISTORY ARGS1(
 PRIVATE BOOLEAN handle_LYK_IMAGE_TOGGLE ARGS1(
     int *,	cmd)
 {
-    if (clickable_images)
-	clickable_images = FALSE;
-    else
-	clickable_images = TRUE;
+    clickable_images = !clickable_images;
 
     HTUserMsg(clickable_images ?
 	     CLICKABLE_IMAGES_ON : CLICKABLE_IMAGES_OFF);
@@ -3221,10 +3172,9 @@ PRIVATE void handle_LYK_INDEX ARGS2(
 		last_kcode = NOKANJI;	/* AUTO */
 	    }
 #endif
-	    StrAllocCopy(newdoc.address, indexfile);
+	    set_address(&newdoc, indexfile);
 	    StrAllocCopy(newdoc.title, gettext("System Index")); /* name it */
-	    FREE(newdoc.post_data);
-	    FREE(newdoc.post_content_type);
+	    LYFreePostData(&newdoc);
 	    FREE(newdoc.bookmark);
 	    newdoc.isHEAD = FALSE;
 	    newdoc.safe = FALSE;
@@ -3269,8 +3219,8 @@ PRIVATE void handle_LYK_INDEX_SEARCH ARGS4(
 	     *	getfile doesn't try to get the newdoc.address.
 	     *	Since we have already gotten it.
 	     */
-	    StrAllocCopy(curdoc.address, newdoc.address);
-	    StrAllocCopy(newdoc.post_data, curdoc.post_data);
+	    copy_address(&curdoc, &newdoc);
+	    BStrCopy(newdoc.post_data, curdoc.post_data);
 	    StrAllocCopy(newdoc.post_content_type, curdoc.post_content_type);
 	    newdoc.internal_link = FALSE;
 	    curdoc.line = -1;
@@ -3279,15 +3229,15 @@ PRIVATE void handle_LYK_INDEX_SEARCH ARGS4(
 	    /*
 	     *	Got back a redirecting URL.  Check it out.
 	     */
-	    _user_message("Using %s", use_this_url_instead);
+	    HTUserMsg2 (WWW_USING_MESSAGE, use_this_url_instead);
+
 	    /*
 	     *	Make a name for this URL.
 	     */
 	    StrAllocCopy(newdoc.title,
 			 "A URL specified by redirection");
-	    StrAllocCopy(newdoc.address, use_this_url_instead);
-	    FREE(newdoc.post_data);
-	    FREE(newdoc.post_content_type);
+	    set_address(&newdoc, use_this_url_instead);
+	    LYFreePostData(&newdoc);
 	    FREE(newdoc.bookmark);
 	    newdoc.isHEAD = FALSE;
 	    newdoc.safe = FALSE;
@@ -3298,8 +3248,8 @@ PRIVATE void handle_LYK_INDEX_SEARCH ARGS4(
 	    /*
 	     *	Yuk, the search failed.  Restore the old file.
 	     */
-	    StrAllocCopy(newdoc.address, curdoc.address);
-	    StrAllocCopy(newdoc.post_data, curdoc.post_data);
+	    copy_address(&newdoc, &curdoc);
+	    BStrCopy(newdoc.post_data, curdoc.post_data);
 	    StrAllocCopy(newdoc.post_content_type,
 			 curdoc.post_content_type);
 	    StrAllocCopy(newdoc.bookmark, curdoc.bookmark);
@@ -3325,8 +3275,7 @@ PRIVATE BOOLEAN handle_LYK_INFO ARGS1(
 		       &newdoc, owner_address) >= 0) {
 	    LYRegisterUIPage(newdoc.address, UIP_SHOWINFO);
 	    StrAllocCopy(newdoc.title, SHOWINFO_TITLE);
-	    FREE(newdoc.post_data);
-	    FREE(newdoc.post_content_type);
+	    LYFreePostData(&newdoc);
 	    FREE(newdoc.bookmark);
 	    newdoc.isHEAD = FALSE;
 	    newdoc.safe = FALSE;
@@ -3348,10 +3297,7 @@ PRIVATE BOOLEAN handle_LYK_INFO ARGS1(
 PRIVATE BOOLEAN handle_LYK_INLINE_TOGGLE ARGS1(
     int *,	cmd)
 {
-    if (pseudo_inline_alts)
-	pseudo_inline_alts = FALSE;
-    else
-	pseudo_inline_alts = TRUE;
+    pseudo_inline_alts = !pseudo_inline_alts;
 
     HTUserMsg(pseudo_inline_alts ?
 	      PSEUDO_INLINE_ALTS_ON : PSEUDO_INLINE_ALTS_OFF);
@@ -3368,8 +3314,8 @@ PRIVATE void handle_LYK_INSERT_FILE ARGS3(
     /*
      *  See if the current link is in a form TEXTAREA.
      */
-    if (links[curdoc.link].type       == WWW_FORM_LINK_TYPE &&
-	links[curdoc.link].form->type == F_TEXTAREA_TYPE)   {
+    if (links[curdoc.link].type         == WWW_FORM_LINK_TYPE &&
+	links[curdoc.link].l_form->type == F_TEXTAREA_TYPE)   {
 
 	/*
 	 *  Reject attempts to use this for gaining access to
@@ -3387,7 +3333,7 @@ PRIVATE void handle_LYK_INSERT_FILE ARGS3(
 	    if (*old_c != real_c) {
 		*old_c = real_c;
 		if (no_goto_file)
-		    HTUserMsg2(GOTO_XXXX_DISALLOWED, "file:");
+		    HTUserMsg2(GOTO_XXXX_DISALLOWED, STR_FILE_URL);
 		else
 		    HTUserMsg(NOAUTH_TO_ACCESS_FILES);
 		HTInfoMsg(FILE_INSERT_CANCELLED);
@@ -3478,10 +3424,9 @@ PRIVATE BOOLEAN handle_LYK_JUMP ARGS10(
 	    if (!LYTrimStartfile(ret)) {
 		LYRemoveBlanks(user_input_buffer);
 	    }
-	    StrAllocCopy(newdoc.address, ret);
+	    set_address(&newdoc, ret);
 	    StrAllocCopy(lynxjumpfile, ret);
-	    FREE(newdoc.post_data);
-	    FREE(newdoc.post_content_type);
+	    LYFreePostData(&newdoc);
 	    FREE(newdoc.bookmark);
 	    newdoc.isHEAD = FALSE;
 	    newdoc.safe = FALSE;
@@ -3503,10 +3448,9 @@ PRIVATE void handle_LYK_KEYMAP ARGS4(
 {
     if (*old_c != real_c) {
 	*old_c = real_c;
-	StrAllocCopy(newdoc.address, "LYNXKEYMAP:");
+	set_address(&newdoc, STR_LYNXKEYMAP);
 	StrAllocCopy(newdoc.title, CURRENT_KEYMAP_TITLE);
-	FREE(newdoc.post_data);
-	FREE(newdoc.post_content_type);
+	LYFreePostData(&newdoc);
 	FREE(newdoc.bookmark);
 	newdoc.isHEAD = FALSE;
 	newdoc.safe = FALSE;
@@ -3561,8 +3505,7 @@ PRIVATE BOOLEAN handle_LYK_LIST ARGS1(
     /*
      *	Don't do if already viewing list page.
      */
-    if (!strcmp((curdoc.title ? curdoc.title : ""),
-		LIST_PAGE_TITLE) &&
+    if (!strcmp(NonNull(curdoc.title), LIST_PAGE_TITLE) &&
 	LYIsUIPage(curdoc.address, UIP_LIST_PAGE)) {
 	/*
 	 *  Already viewing list page, so get out.
@@ -3601,15 +3544,14 @@ PRIVATE void handle_LYK_MAIN_MENU ARGS2(
     if (!STREQ(curdoc.address,homepage)) {
 
 	if (HTConfirmDefault(CONFIRM_MAIN_SCREEN, NO) == YES) {
-	    StrAllocCopy(newdoc.address, homepage);
+	    set_address(&newdoc, homepage);
 	    StrAllocCopy(newdoc.title, gettext("Entry into main screen"));
-	    FREE(newdoc.post_data);
-	    FREE(newdoc.post_content_type);
+	    LYFreePostData(&newdoc);
 	    FREE(newdoc.bookmark);
 	    newdoc.isHEAD = FALSE;
 	    newdoc.safe = FALSE;
 	    newdoc.internal_link = FALSE;
-	    highlight(OFF, curdoc.link, prev_target);
+	    LYhighlight(OFF, curdoc.link, prev_target);
 #ifdef DIRED_SUPPORT
 	    if (lynx_edit_mode) {
 		DIRED_UNCACHE_2;
@@ -3627,7 +3569,7 @@ PRIVATE void handle_LYK_MAIN_MENU ARGS2(
 PRIVATE void handle_LYK_MINIMAL NOARGS
 {
     if (!historical_comments) {
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     if (!HTcan_reparse_document()) {
 #endif
 	/*
@@ -3637,34 +3579,29 @@ PRIVATE void handle_LYK_MINIMAL NOARGS
 	 */
 	if ((curdoc.post_data != NULL &&
 	     curdoc.safe != TRUE) &&
-	    confirm_post_resub(curdoc.address, NULL,
-			       0, 0) == FALSE) {
+	    confirm_post_resub(curdoc.address, NULL, 0, 0) == FALSE) {
 	    HTInfoMsg(WILL_NOT_RELOAD_DOC);
 	} else {
-	    HTuncache_current_document();
-	    StrAllocCopy(newdoc.address, curdoc.address);
-	    FREE(curdoc.address);
+	    HText_setNoCache(HTMainText);
+	    move_address(&newdoc, &curdoc);
 	    newdoc.line = curdoc.line;
 	    newdoc.link = curdoc.link;
 	}
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     } /* end if no bypass */
 #endif
     }
-    if (minimal_comments)
-	minimal_comments = FALSE;
-    else
-	minimal_comments = TRUE;
+    minimal_comments = !minimal_comments;
     if (!historical_comments) {
 	HTAlert(minimal_comments ?
 		MINIMAL_ON_IN_EFFECT : MINIMAL_OFF_VALID_ON);
-#ifdef SOURCE_CACHE
-	(void)reparse_document();
-#endif
     } else {
 	HTAlert(minimal_comments ?
 		MINIMAL_ON_BUT_HISTORICAL : MINIMAL_OFF_HISTORICAL_ON);
     }
+#ifdef USE_SOURCE_CACHE
+    (void)reparse_document();
+#endif
     return;
 }
 
@@ -3680,10 +3617,8 @@ PRIVATE void handle_LYK_MODIFY ARGS1(
 	    *refresh_screen = TRUE;
 	} else if (ret) {
 	    DIRED_UNCACHE_1;
-	    StrAllocCopy(newdoc.address, curdoc.address);
-	    FREE(curdoc.address);
-	    FREE(newdoc.post_data);
-	    FREE(newdoc.post_content_type);
+	    move_address(&newdoc, &curdoc);
+	    LYFreePostData(&newdoc);
 	    FREE(newdoc.bookmark);
 	    newdoc.isHEAD = FALSE;
 	    newdoc.safe = FALSE;
@@ -3739,8 +3674,8 @@ PRIVATE BOOLEAN handle_LYK_OPTIONS ARGS2(
 	      user_mode == NOVICE_MODE)) ||
 	    (((HTfileSortMethod_flag != HTfileSortMethod) ||
 	      (show_dotfiles_flag != show_dotfiles)) &&
-	     (!strncmp(curdoc.address, "file:", 5) ||
-	      !strncmp(curdoc.address, "ftp:", 4))) ||
+	     (isFILE_URL(curdoc.address) ||
+	      isFTP_URL(curdoc.address))) ||
 	    CurrentCharSet_flag != current_char_set ||
 	    CurrentAssumeCharSet_flag != UCLYhndl_for_unspec ||
 	    verbose_img_flag != verbose_img ||
@@ -3753,7 +3688,7 @@ PRIVATE BOOLEAN handle_LYK_OPTIONS ARGS2(
 	      strcmp(CurrentNegoCharset, (pref_charset ?
 					  pref_charset : ""))) &&
 	     (!strncmp(curdoc.address, "http", 4) ||
-	      !strncmp(curdoc.address, "lynxcgi:", 8)))) {
+	      isLYNXCGI(curdoc.address)))) {
 
 	    BOOLEAN canreparse_post = FALSE;
 
@@ -3764,22 +3699,20 @@ PRIVATE BOOLEAN handle_LYK_OPTIONS ARGS2(
 	     */
 	    if ((curdoc.post_data != NULL &&
 		 curdoc.safe != TRUE) &&
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 		(!(canreparse_post = HTcan_reparse_document())) &&
 #endif
 		confirm_post_resub(curdoc.address, curdoc.title,
 				   2, 1) == FALSE) {
 		HTInfoMsg(WILL_NOT_RELOAD_DOC);
 	    } else {
-		StrAllocCopy(newdoc.address, curdoc.address);
+		copy_address(&newdoc, &curdoc);
 		if (((strcmp(CurrentUserAgent, (LYUserAgent ?
 					LYUserAgent : "")) ||
-		      strcmp(CurrentNegoLanguage,
-			     (language ? language : "")) ||
-		      strcmp(CurrentNegoCharset,
-			     (pref_charset ? pref_charset : ""))) &&
+		      strcmp(CurrentNegoLanguage, NonNull(language)) ||
+		      strcmp(CurrentNegoCharset, NonNull(pref_charset))) &&
 		     (strncmp(curdoc.address, "http", 4) == 0 ||
-		      strncmp(curdoc.address, "lynxcgi:", 8) == 0))) {
+		      !isLYNXCGI(curdoc.address) == 0))) {
 		    /*
 		     *  An option has changed which may influence
 		     *  content negotiation, and the resource is from
@@ -3796,7 +3729,7 @@ PRIVATE BOOLEAN handle_LYK_OPTIONS ARGS2(
 		if (HTisDocumentSource()) {
 		    srcmode_for_next_retrieval(1);
 		}
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 		if (reloading == FALSE) {
 		    /* one more attempt to be smart enough: */
 		    if (reparse_document()) {
@@ -3820,7 +3753,7 @@ PRIVATE BOOLEAN handle_LYK_OPTIONS ARGS2(
 		}
 
 		HEAD_request = HTLoadedDocumentIsHEAD();
-		HTuncache_current_document();
+		HText_setNoCache(HTMainText);
 #ifdef NO_ASSUME_SAME_DOC
 		newdoc.line = 1;
 		newdoc.link = 0;
@@ -3829,7 +3762,7 @@ PRIVATE BOOLEAN handle_LYK_OPTIONS ARGS2(
 		newdoc.link = curdoc.link;
 #endif /* NO_ASSUME_SAME_DOC */
 		LYforce_no_cache = TRUE;
-		FREE(curdoc.address); /* So it doesn't get pushed. */
+		free_address(&curdoc); /* So it doesn't get pushed. */
 	    }
 	}
 	FREE(CurrentUserAgent);
@@ -3857,9 +3790,8 @@ PRIVATE BOOLEAN handle_LYK_OPTIONS ARGS2(
      */
     if (!LYIsUIPage(curdoc.address, UIP_OPTIONS_MENU)) {
 
-	StrAllocCopy(newdoc.address, "LYNXOPTIONS:/");
-	FREE(newdoc.post_data);
-	FREE(newdoc.post_content_type);
+	set_address(&newdoc, "LYNXOPTIONS:/");
+	LYFreePostData(&newdoc);
 	FREE(newdoc.bookmark);
 	newdoc.isHEAD = FALSE;
 	newdoc.safe = FALSE;
@@ -3885,7 +3817,7 @@ PRIVATE BOOLEAN handle_LYK_OPTIONS ARGS2(
 PRIVATE void handle_NEXT_DOC NOARGS
 {
     if (LYhist_next(&curdoc, &newdoc)) {
-	FREE(curdoc.address);		/* avoid push */
+	free_address(&curdoc);	/* avoid push */
 	return;
     }
     HTUserMsg(gettext("No next document present"));
@@ -3897,23 +3829,23 @@ PRIVATE void handle_LYK_NEXT_LINK ARGS3(
     int,	real_c)
 {
     if (curdoc.link < nlinks-1) {	/* next link */
-	highlight(OFF, curdoc.link, prev_target);
+	LYhighlight(OFF, curdoc.link, prev_target);
 #ifdef FASTTAB
 	/*
 	 *  Move to different textarea if TAB in textarea.
 	 */
-	if (links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-	    links[curdoc.link].form->type == F_TEXTAREA_TYPE &&
+	if (links[curdoc.link].type         == WWW_FORM_LINK_TYPE &&
+	    links[curdoc.link].l_form->type == F_TEXTAREA_TYPE &&
 	    c=='\t') {
-	    int thisgroup = links[curdoc.link].form->number;
-	    char *thisname = links[curdoc.link].form->name;
+	    int thisgroup = links[curdoc.link].l_form->number;
+	    char *thisname = links[curdoc.link].l_form->name;
 
 	    do curdoc.link++;
 	    while ((curdoc.link < nlinks-1) &&
 		   links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-		   links[curdoc.link].form->type == F_TEXTAREA_TYPE &&
-		   links[curdoc.link].form->number == thisgroup &&
-		   sametext(links[curdoc.link].form->name, thisname));
+		   links[curdoc.link].l_form->type == F_TEXTAREA_TYPE &&
+		   links[curdoc.link].l_form->number == thisgroup &&
+		   sametext(links[curdoc.link].l_form->name, thisname));
 	} else {
 	    curdoc.link++;
 	}
@@ -3956,9 +3888,9 @@ PRIVATE BOOLEAN handle_LYK_NOCACHE ARGS2(
 {
     if (nlinks > 0) {
 	if (links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-	    links[curdoc.link].form->type != F_SUBMIT_TYPE &&
-	    links[curdoc.link].form->type != F_IMAGE_SUBMIT_TYPE &&
-	    links[curdoc.link].form->type != F_TEXT_SUBMIT_TYPE) {
+	    links[curdoc.link].l_form->type != F_SUBMIT_TYPE &&
+	    links[curdoc.link].l_form->type != F_IMAGE_SUBMIT_TYPE &&
+	    links[curdoc.link].l_form->type != F_TEXT_SUBMIT_TYPE) {
 	    if (*old_c != real_c) {
 		*old_c = real_c;
 		HTUserMsg(NOT_ON_SUBMIT_OR_LINK);
@@ -4036,40 +3968,39 @@ PRIVATE int handle_PREV_DOC ARGS3(
 	HTLastConfirmCancelled(); /* reset flag */
 	while (nhist > 0) {
 	    conf = FALSE;
-	    if (history[(nhist - 1)].post_data == NULL) {
+	    if (HDOC(nhist - 1).post_data == NULL) {
 		break;
 	    }
-	    WWWDoc.address = history[(nhist - 1)].address;
-	    WWWDoc.post_data = history[(nhist - 1)].post_data;
+	    WWWDoc.address = HDOC(nhist - 1).address;
+	    WWWDoc.post_data = HDOC(nhist - 1).post_data;
 	    WWWDoc.post_content_type =
-			       history[(nhist - 1)].post_content_type;
-	    WWWDoc.bookmark = history[(nhist - 1)].bookmark;
-	    WWWDoc.isHEAD = history[(nhist - 1)].isHEAD;
-	    WWWDoc.safe = history[(nhist - 1)].safe;
-	    tmpanchor = HTAnchor_parent(HTAnchor_findAddress(&WWWDoc));
+			       HDOC(nhist - 1).post_content_type;
+	    WWWDoc.bookmark = HDOC(nhist - 1).bookmark;
+	    WWWDoc.isHEAD = HDOC(nhist - 1).isHEAD;
+	    WWWDoc.safe = HDOC(nhist - 1).safe;
+	    tmpanchor = HTAnchor_findAddress(&WWWDoc);
 	    if (HTAnchor_safe(tmpanchor)) {
 		break;
 	    }
-	    if (((text =
-		  (HText *)HTAnchor_document(tmpanchor)) == NULL &&
-		 (!strncmp(WWWDoc.address, "LYNXIMGMAP:", 11) ||
+	    if (((text = (HText *)HTAnchor_document(tmpanchor)) == NULL &&
+		 (isLYNXIMGMAP(WWWDoc.address) ||
 		 (conf = confirm_post_resub(WWWDoc.address,
-					    history[(nhist - 1)].title,
+					    HDOC(nhist - 1).title,
 					    0, 0))
 		  == FALSE)) ||
 		((LYresubmit_posts && !conf &&
 		  (NONINTERNAL_OR_PHYS_DIFFERENT(
-		      (document *)&history[(nhist - 1)],
+		      (DocInfo *)&history[(nhist - 1)],
 		      &curdoc) ||
 		   NONINTERNAL_OR_PHYS_DIFFERENT(
-		       (document *)&history[(nhist - 1)],
+		       (DocInfo *)&history[(nhist - 1)],
 		       &newdoc))) &&
 		 !confirm_post_resub(WWWDoc.address,
-				     history[(nhist - 1)].title,
+				     HDOC(nhist - 1).title,
 				     2, 2))) {
 		if (HTLastConfirmCancelled()) {
 		    if (!first && curdoc.internal_link)
-			FREE(curdoc.address);
+			free_address(&curdoc);
 		    *cmd = LYK_DO_NOTHING;
 		    return 2;
 		}
@@ -4083,7 +4014,7 @@ PRIVATE int handle_PREV_DOC ARGS3(
 		    do {	/* Should be LYhist_prev when _next supports */
 			LYpop(&curdoc);		/* skipping of forms */
 		    } while (nhist > 1 && !are_different(
-			(document *)&history[(nhist - 1)],
+			(DocInfo *)&history[(nhist - 1)],
 			&curdoc));
 		    first = FALSE; /* have popped at least one */
 		    continue;
@@ -4108,7 +4039,7 @@ PRIVATE int handle_PREV_DOC ARGS3(
 	 *  Set newdoc.address to empty to pop a file.
 	 */
 	LYhist_prev_register(&curdoc);	/* Why not call _prev instead of zeroing address?  */
-	FREE(newdoc.address);
+	free_address(&newdoc);
 #ifdef DIRED_SUPPORT
 	if (lynx_edit_mode) {
 	    DIRED_UNCACHE_2;
@@ -4159,8 +4090,7 @@ PRIVATE void handle_LYK_PRINT ARGS3(
 		      curdoc.address, HText_getNumOfLines()) >= 0) {
 	LYRegisterUIPage(newdoc.address, UIP_PRINT_OPTIONS);
 	StrAllocCopy(newdoc.title, PRINT_OPTIONS_TITLE);
-	FREE(newdoc.post_data);
-	FREE(newdoc.post_content_type);
+	LYFreePostData(&newdoc);
 	FREE(newdoc.bookmark);
 	newdoc.isHEAD = FALSE;
 	newdoc.safe = FALSE;
@@ -4175,9 +4105,9 @@ PRIVATE BOOLEAN handle_LYK_QUIT NOARGS
     int c;
 
     if (LYQuitDefaultYes == TRUE) {
-	c = HTConfirmDefault(REALLY_QUIT_Y, YES);
+	c = HTConfirmDefault(REALLY_QUIT, YES);
     } else {
-	c = HTConfirmDefault(REALLY_QUIT_N, NO);
+	c = HTConfirmDefault(REALLY_QUIT, NO);
     }
     if (LYQuitDefaultYes == TRUE) {
 	if (c != NO) {
@@ -4207,13 +4137,13 @@ PRIVATE BOOLEAN handle_LYK_RAW_TOGGLE ARGS1(
     }
 }
 
-/*
- * Check if this is a reply from a POST, and if so,
- * seek confirmation if the safe element is not set.  - FM
- */
 PRIVATE void handle_LYK_RELOAD ARGS1(
     int,	real_cmd)
 {
+    /*
+     * Check if this is a reply from a POST, and if so,
+     * seek confirmation if the safe element is not set.  - FM
+     */
     if ((curdoc.post_data != NULL &&
 	 curdoc.safe != TRUE) &&
 	HTConfirm(CONFIRM_POST_RESUBMISSION) == FALSE) {
@@ -4232,7 +4162,7 @@ PRIVATE void handle_LYK_RELOAD ARGS1(
     }
 
     HEAD_request = HTLoadedDocumentIsHEAD();
-    HTuncache_current_document();
+    HText_setNoCache(HTMainText);
 #ifdef NO_ASSUME_SAME_DOC
     /*
      *	Don't assume the reloaded document will be the same. - FM
@@ -4249,7 +4179,7 @@ PRIVATE void handle_LYK_RELOAD ARGS1(
     newdoc.line = curdoc.line;
     newdoc.link = curdoc.link;
 #endif /* NO_ASSUME_SAME_DOC */
-    FREE(curdoc.address); /* so it doesn't get pushed */
+    free_address(&curdoc); /* so it doesn't get pushed */
 #ifdef VMS
     lynx_force_repaint();
 #endif /* VMS */
@@ -4299,10 +4229,12 @@ PRIVATE void handle_LYK_SHELL ARGS3(
 	stop_curses();
 	printf("%s\r\n", SPAWNING_MSG);
 #if defined(__CYGWIN__)
-	Cygwin_Shell();
-#else
-	LYSystem(LYSysShell());
+	/* handling "exec $SHELL" does not work if $SHELL is null */
+	if (LYGetEnv("SHELL") == NULL) {
+	    Cygwin_Shell();
+	} else
 #endif
+	LYSystem(LYSysShell());
 	start_curses();
 	*refresh_screen = TRUE;	/* for an HText_pageDisplay() */
     } else {
@@ -4315,7 +4247,7 @@ PRIVATE void handle_LYK_SHELL ARGS3(
 
 PRIVATE void handle_LYK_SOFT_DQUOTES NOARGS
 {
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     if (!HTcan_reparse_document()) {
 #endif
     /*
@@ -4328,45 +4260,40 @@ PRIVATE void handle_LYK_SOFT_DQUOTES NOARGS
 	confirm_post_resub(curdoc.address, NULL, 1, 1) == FALSE) {
 	HTInfoMsg(WILL_NOT_RELOAD_DOC);
     } else {
-	HTuncache_current_document();
-	StrAllocCopy(newdoc.address, curdoc.address);
-	FREE(curdoc.address);
+	HText_setNoCache(HTMainText);
+	move_address(&newdoc, &curdoc);
 	newdoc.line = curdoc.line;
 	newdoc.link = curdoc.link;
     }
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     } /* end if no bypass */
 #endif
-    if (soft_dquotes)
-	soft_dquotes = FALSE;
-    else
-	soft_dquotes = TRUE;
+    soft_dquotes = !soft_dquotes;
     HTUserMsg(soft_dquotes ?
 	      SOFT_DOUBLE_QUOTE_ON : SOFT_DOUBLE_QUOTE_OFF);
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     (void)reparse_document();
 #endif
     return;
 }
 
-/*
- * Check if this is a reply from a POST, and if so,
- * seek confirmation if the safe element is not set.  - FM
- */
 PRIVATE void handle_LYK_SOURCE ARGS1(
     char **,	ownerS_address_p)
 {
-#ifdef SOURCE_CACHE
+    /*
+     * Check if this is a reply from a POST, and if so,
+     * seek confirmation if the safe element is not set.  - FM
+     */
+#ifdef USE_SOURCE_CACHE
     BOOLEAN canreparse_post = FALSE;
 #endif
     if ((curdoc.post_data != NULL &&
 	 curdoc.safe != TRUE) &&
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 	(!(canreparse_post = HTcan_reparse_document())) &&
 #endif
 	(curdoc.isHEAD ? HTConfirm(CONFIRM_POST_RESUBMISSION) :
-	 confirm_post_resub(curdoc.address, curdoc.title,
-			    1, 1)) == FALSE) {
+	 confirm_post_resub(curdoc.address, curdoc.title, 1, 1)) == FALSE) {
 	HTInfoMsg(CANCELLED);
 	return;
     }
@@ -4380,7 +4307,7 @@ PRIVATE void handle_LYK_SOURCE ARGS1(
 	srcmode_for_next_retrieval(1);
     }
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     if (reparse_document()) {
 	/*
 	 * These normally get cleaned up after getfile() returns;
@@ -4407,13 +4334,13 @@ PRIVATE void handle_LYK_SOURCE ARGS1(
 
     if (curdoc.title)
 	StrAllocCopy(newdoc.title, curdoc.title);
-    FREE(curdoc.address); /* so it doesn't get pushed */
+    free_address(&curdoc); /* so it doesn't get pushed */
     LYforce_no_cache = TRUE;
 }
 
 PRIVATE void handle_LYK_SWITCH_DTD NOARGS
 {
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     BOOLEAN canreparse = FALSE;
     if (!(canreparse = HTcan_reparse_document())) {
 #endif
@@ -4441,9 +4368,8 @@ PRIVATE void handle_LYK_SWITCH_DTD NOARGS
 	    if (HTisDocumentSource() && LYPreparsedSource) {
 		srcmode_for_next_retrieval(1);
 	    }
-	    HTuncache_current_document();
-	    StrAllocCopy(newdoc.address, curdoc.address);
-	    FREE(curdoc.address);
+	    HText_setNoCache(HTMainText);
+	    move_address(&newdoc, &curdoc);
 #ifdef NO_ASSUME_SAME_DOC
 	    newdoc.line = 1;
 	    newdoc.link = 0;
@@ -4452,13 +4378,13 @@ PRIVATE void handle_LYK_SWITCH_DTD NOARGS
 	    newdoc.link = curdoc.link;
 #endif /* NO_ASSUME_SAME_DOC */
 	}
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     } /* end if no bypass */
 #endif
     Old_DTD = !Old_DTD;
     HTSwitchDTD(!Old_DTD);
     HTUserMsg(Old_DTD ? USING_DTD_0 : USING_DTD_1);
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
     if (canreparse) {
 	if (HTisDocumentSource() && LYPreparsedSource) {
 	    srcmode_for_next_retrieval(1);
@@ -4475,12 +4401,12 @@ PRIVATE void handle_LYK_SWITCH_DTD NOARGS
 PRIVATE void handle_LYK_TAG_LINK NOARGS
 {
     if (lynx_edit_mode && nlinks > 0 && !no_dired_support) {
-	if (!strcmp(links[curdoc.link].hightext, ".."))
+	if (!strcmp(LYGetHiliteStr(curdoc.link, 0), ".."))
 	    return;	/* Never tag the parent directory */
 	if (dir_list_style == MIXED_STYLE) {
-	    if (!strcmp(links[curdoc.link].hightext, "../"))
+	    if (!strcmp(LYGetHiliteStr(curdoc.link, 0), "../"))
 		return;
-	} else if (!strncmp(links[curdoc.link].hightext, "Up to ", 6))
+	} else if (!strncmp(LYGetHiliteStr(curdoc.link, 0), "Up to ", 6))
 	    return;
 	{
 	    /*
@@ -4543,13 +4469,10 @@ PRIVATE void handle_LYK_TOOLBAR ARGS4(
 	}
     } else if (*old_c != real_c) {
 	*old_c = real_c;
-	if ((cp = strchr(curdoc.address, '#')) != NULL)
-	    *cp = '\0';
-
+	cp = trimPoundSelector(curdoc.address);
 	HTSprintf0(&toolbar, "%s#%s", curdoc.address, LYToolbarName);
-	if (cp)
-	    *cp = '#';
-	StrAllocCopy(newdoc.address, toolbar);
+	restorePoundSelector(cp);
+	set_address(&newdoc, toolbar);
 	FREE(toolbar);
 	*try_internal = TRUE;
 	*force_load = TRUE;  /* force MainLoop to reload */
@@ -4592,8 +4515,7 @@ PRIVATE void handle_LYK_TRACE_LOG ARGS1(
     LYLocalFileToURL (&(newdoc.address), LYTraceLogPath);
     LYRegisterUIPage(newdoc.address, UIP_TRACELOG);
     StrAllocCopy(newdoc.title, LYNX_TRACELOG_TITLE);
-    FREE(newdoc.post_data);
-    FREE(newdoc.post_content_type);
+    LYFreePostData(&newdoc);
     FREE(newdoc.bookmark);
     newdoc.isHEAD = FALSE;
     newdoc.safe = FALSE;
@@ -4617,11 +4539,9 @@ PRIVATE void handle_LYK_UPLOAD NOARGS
 	return;
 
     if (lynx_edit_mode && !no_dired_support) {
-	LYUpload_options((char **)&newdoc.address,
-			 (char *)curdoc.address);
+	LYUpload_options(&(newdoc.address), curdoc.address);
 	StrAllocCopy(newdoc.title, UPLOAD_OPTIONS_TITLE);
-	FREE(newdoc.post_data);
-	FREE(newdoc.post_content_type);
+	LYFreePostData(&newdoc);
 	FREE(newdoc.bookmark);
 	newdoc.isHEAD = FALSE;
 	newdoc.safe = FALSE;
@@ -4676,10 +4596,11 @@ PRIVATE void handle_LYK_UP_LINK ARGS4(
 	int newlink;
 
 	if (*follow_col == -1) {
+	    char *text = LYGetHiliteStr(curdoc.link, 0);
 	    *follow_col = links[curdoc.link].lx;
 
-	    if (links[curdoc.link].hightext)
-		*follow_col += strlen(links[curdoc.link].hightext)/2;
+	    if (text != NULL)
+		*follow_col += strlen(text) / 2;
 	}
 
 	newlink = find_link_near_col(*follow_col, -1);
@@ -4767,8 +4688,7 @@ PRIVATE void handle_LYK_VIEW_BOOKMARK ARGS3(
 	LYforce_no_cache = TRUE;  /*force the document to be reloaded*/
 	StrAllocCopy(newdoc.title, BOOKMARK_TITLE);
 	StrAllocCopy(newdoc.bookmark, BookmarkPage);
-	FREE(newdoc.post_data);
-	FREE(newdoc.post_content_type);
+	LYFreePostData(&newdoc);
 	newdoc.isHEAD = FALSE;
 	newdoc.safe = FALSE;
 	newdoc.internal_link = FALSE;
@@ -4807,8 +4727,7 @@ PRIVATE BOOLEAN handle_LYK_VLINKS ARGS2(
 	return FALSE;
     }
     StrAllocCopy(newdoc.title, VISITED_LINKS_TITLE);
-    FREE(newdoc.post_data);
-    FREE(newdoc.post_content_type);
+    LYFreePostData(&newdoc);
     FREE(newdoc.bookmark);
     newdoc.isHEAD = FALSE;
     newdoc.safe = FALSE;
@@ -4909,8 +4828,8 @@ PRIVATE void handle_LYK_digit ARGS6(
 	/*
 	 *  Follow a normal link.
 	 */
-	StrAllocCopy(newdoc.address, links[lindx].lname);
-	StrAllocCopy(newdoc.title, links[lindx].hightext);
+	set_address(&newdoc, links[lindx].lname);
+	StrAllocCopy(newdoc.title, LYGetHiliteStr(lindx, 0));
 #ifndef DONT_TRACK_INTERNAL_LINKS
 	/*
 	 *  For internal links, retain POST content if present.
@@ -4922,7 +4841,7 @@ PRIVATE void handle_LYK_digit ARGS6(
 	if (links[lindx].type == WWW_INTERN_LINK_TYPE) {
 	    LYinternal_flag = TRUE;
 	    newdoc.internal_link = TRUE;
-	    if (LYIsListpageTitle(curdoc.title ? curdoc.title : "") &&
+	    if (LYIsListpageTitle(NonNull(curdoc.title)) &&
 		(LYIsUIPage(curdoc.address, UIP_LIST_PAGE) ||
 		 LYIsUIPage(curdoc.address, UIP_ADDRLIST_PAGE))) {
 		if (check_history()) {
@@ -4940,7 +4859,7 @@ PRIVATE void handle_LYK_digit ARGS6(
 			    /* cancel the whole thing */
 			    LYforce_no_cache = FALSE;
 			    reloading = FALSE;
-			    StrAllocCopy(newdoc.address, curdoc.address);
+			    copy_address(&newdoc, &curdoc);
 			    StrAllocCopy(newdoc.title, curdoc.title);
 			    newdoc.internal_link = curdoc.internal_link;
 			    HTInfoMsg(CANCELLED);
@@ -4958,8 +4877,7 @@ PRIVATE void handle_LYK_digit ARGS6(
 			     * wasn't meant to be internal after
 			     * all, here we can recover from that
 			     * assumption. - kw */
-			    FREE(newdoc.post_data);
-			    FREE(newdoc.post_content_type);
+			    LYFreePostData(&newdoc);
 			    newdoc.internal_link = FALSE;
 			    HTAlert(DISCARDING_POST_DATA);
 			}
@@ -4969,7 +4887,7 @@ PRIVATE void handle_LYK_digit ARGS6(
 		 *  Don't push the List Page if we follow an
 		 *  internal link given by it. - kw
 		 */
-		FREE(curdoc.address);
+		free_address(&curdoc);
 	    } else
 		*try_internal = TRUE;
 	    if (!(LYresubmit_posts && newdoc.post_data))
@@ -4980,8 +4898,7 @@ PRIVATE void handle_LYK_digit ARGS6(
 	    /*
 	     *	Free POST content if not an internal link. - kw
 	     */
-	    FREE(newdoc.post_data);
-	    FREE(newdoc.post_content_type);
+	    LYFreePostData(&newdoc);
 	}
 #endif /* DONT_TRACK_INTERNAL_LINKS */
 	/*
@@ -4989,12 +4906,11 @@ PRIVATE void handle_LYK_digit ARGS6(
 	 *  form.  If so, don't free the content. -- FM
 	 */
 	if (are_different(&curdoc, &newdoc)) {
-	    FREE(newdoc.post_data);
-	    FREE(newdoc.post_content_type);
+	    LYFreePostData(&newdoc);
 	    FREE(newdoc.bookmark);
 	    newdoc.isHEAD = FALSE;
 	    newdoc.safe = FALSE;
-	    if (!strncmp(newdoc.address, "LYNXMESSAGES:", 13))
+	    if (isLYNXMESSAGES(newdoc.address))
 		LYforce_no_cache = TRUE;
 	}
 	newdoc.internal_link = FALSE;
@@ -5131,8 +5047,7 @@ PUBLIC void handle_LYK_CHDIR NOARGS
 	    newdoc.address = addr;
 	    newdoc.isHEAD = FALSE;
 	    StrAllocCopy(newdoc.title, gettext("A URL specified by the user"));
-	    FREE(newdoc.post_data);
-	    FREE(newdoc.post_content_type);
+	    LYFreePostData(&newdoc);
 	    FREE(newdoc.bookmark);
 	    newdoc.safe = FALSE;
 	    newdoc.internal_link = FALSE;
@@ -5155,7 +5070,7 @@ PUBLIC void handle_LYK_CHDIR NOARGS
  * would scroll 3-4 extra full screens.  When going back, the "accumulation"
  * logic would again start moving in full screens, so one would overshoot
  * again, etc.
- * 
+ *
  * Going back, one can fix it in 28 keypresses. The relevant text will appear
  * on the screen soon enough for the key-repeat to become not that important,
  * and we are still moving in smaller steps than when we overshot.  Since key
@@ -5306,6 +5221,16 @@ int mainloop NOARGS
     int i;
     int follow_col = -1, key_count = 0, last_key = 0;
 
+/*  "internal" means "within the same document, with certainty".
+ *  It includes a space so it cannot conflict with any (valid) "TYPE"
+ *  attributes on A elements. [According to which DTD, anyway??] - kw
+ */
+    HTInternalLink = HTAtom_for("internal link");  /* init, used as const */
+
+#ifndef WWW_SOURCE
+    WWW_SOURCE = HTAtom_for("www/source");  /* init, used as const */
+#endif
+
 /*
  *  curdoc.address contains the name of the file that is currently open.
  *  newdoc.address contains the name of the file that will soon be
@@ -5339,7 +5264,7 @@ int mainloop NOARGS
     atexit(free_mainloop_variables);
 #endif
 initialize:
-    StrAllocCopy(newdoc.address, startfile);
+    set_address(&newdoc, startfile);
     StrAllocCopy(startrealm, startfile);
     StrAllocCopy(newdoc.title, gettext("Entry into main screen"));
     newdoc.isHEAD = FALSE;
@@ -5356,7 +5281,7 @@ initialize:
     CTRACE((tfp, "Entering mainloop, startfile=%s\n", startfile));
 
     if (form_post_data) {
-	StrAllocCopy(newdoc.post_data, form_post_data);
+	BStrCopy0(newdoc.post_data, form_post_data);
 	StrAllocCopy(newdoc.post_content_type,
 		     "application/x-www-form-urlencoded");
     } else if (form_get_data) {
@@ -5384,8 +5309,7 @@ initialize:
 		StrAllocCopy(newdoc.title, BOOKMARK_TITLE);
 		StrAllocCopy(newdoc.bookmark, BookmarkPage);
 		StrAllocCopy(startrealm, newdoc.address);
-		FREE(newdoc.post_data);
-		FREE(newdoc.post_content_type);
+		LYFreePostData(&newdoc);
 		newdoc.isHEAD = FALSE;
 		newdoc.safe = FALSE;
 		CTRACE((tfp, "Using bookmarks=%s\n", newdoc.address));
@@ -5438,7 +5362,7 @@ try_again:
 		     *	elements to the curdoc structure elements
 		     *	under case NORMAL.  - FM
 		     */
-		    if (strncmp(newdoc.address, "LYNXDOWNLOAD:", 13))
+		    if (!isLYNXDOWNLOAD(newdoc.address))
 		    {
 			LYpush(&curdoc, ForcePush);
 		    }
@@ -5498,10 +5422,10 @@ try_again:
 		    if (newdoc.address) {
 			if (LYCanDoHEAD(newdoc.address) == TRUE) {
 			    newdoc.isHEAD = TRUE;
-			} else if (!strncmp(newdoc.address, "LYNXIMGMAP:", 11)) {
-			    if (LYCanDoHEAD(newdoc.address + 11) == TRUE) {
-				StrAllocCopy(temp, newdoc.address + 11);
-				FREE(newdoc.address);
+			} else if (isLYNXIMGMAP(newdoc.address)) {
+			    if (LYCanDoHEAD(newdoc.address + LEN_LYNXIMGMAP) == TRUE) {
+				StrAllocCopy(temp, newdoc.address + LEN_LYNXIMGMAP);
+				free_address(&newdoc);
 				newdoc.address = temp;
 				newdoc.isHEAD = TRUE;
 				temp = NULL;
@@ -5531,7 +5455,7 @@ try_again:
 		    WWWDoc.bookmark = newdoc.bookmark;
 		    WWWDoc.isHEAD = newdoc.isHEAD;
 		    WWWDoc.safe = newdoc.safe;
-		    tmpanchor = HTAnchor_parent(HTAnchor_findAddress(&WWWDoc));
+		    tmpanchor = HTAnchor_findAddress(&WWWDoc);
 		    if ((HText *)HTAnchor_document(tmpanchor) == NULL) {
 			if (!LYReopenTracelog(&trace_mode_flag)) {
 			    old_c = 0;
@@ -5579,15 +5503,15 @@ try_again:
 #ifndef DONT_TRACK_INTERNAL_LINKS
 		if (try_internal) {
 		    if (newdoc.address &&
-			0==strncmp(newdoc.address, "LYNXIMGMAP:", 11)) {
+			isLYNXIMGMAP(newdoc.address)) {
 			try_internal = FALSE;
 		    } else if (curdoc.address &&
-			0==strncmp(curdoc.address, "LYNXIMGMAP:", 11)) {
+			isLYNXIMGMAP(curdoc.address)) {
 			try_internal = FALSE;
 		    }
 		}
 		if (try_internal) {
-		    char *hashp = strchr(newdoc.address,'#');
+		    char *hashp = findPoundSelector(newdoc.address);
 		    if (hashp) {
 			HTFindPoundSelector(hashp+1);
 		    }
@@ -5596,11 +5520,11 @@ try_again:
 		    /* fix up newdoc.address which may have been fragment-only */
 		    if (getresult == NORMAL && (!hashp || hashp == newdoc.address)) {
 			if (!hashp) {
-			    StrAllocCopy(newdoc.address, HTLoadedDocumentURL());
+			    set_address(&newdoc, HTLoadedDocumentURL());
 			} else {
 			    StrAllocCopy(temp, HTLoadedDocumentURL());
 			    StrAllocCat(temp, hashp); /* append fragment */
-			    StrAllocCopy(newdoc.address, temp);
+			    set_address(&newdoc, temp);
 			    FREE(temp);
 			}
 		    }
@@ -5608,16 +5532,14 @@ try_again:
 		    if (newdoc.internal_link && newdoc.address &&
 			*newdoc.address == '#' && nhist > 0) {
 			char *cp0;
-			if (0==strncmp(history[nhist-1].address, "LYNXIMGMAP:", 11))
-			    cp0 = history[nhist-1].address + 11;
+			if (isLYNXIMGMAP(HDOC(nhist-1).address))
+			    cp0 = HDOC(nhist-1).address + LEN_LYNXIMGMAP;
 			else
-			    cp0 = history[nhist-1].address;
+			    cp0 = HDOC(nhist-1).address;
 			StrAllocCopy(temp, cp0);
-			cp0 = strchr(temp, '#');
-			if (cp0)
-			    *cp0 = '\0';
+			(void) trimPoundSelector(temp);
 			StrAllocCat(temp, newdoc.address);
-			FREE(newdoc.address);
+			free_address(&newdoc);
 			newdoc.address = temp;
 			temp = NULL;
 		    }
@@ -5655,14 +5577,11 @@ try_again:
 			    !LYUserSpecifiedURL &&
 			    HTMainText &&
 			    nlinks > 0 && curdoc.link < nlinks &&
-			    strncmp(newdoc.address ? newdoc.address : "",
-				    "LYNXHIST:", 9) &&
-			    strncmp(newdoc.address ? newdoc.address : "",
-				    "LYNXCOOKIE:", 11)) {
+			    !isLYNXHIST(NonNull(newdoc.address)) &&
+			    !isLYNXCOOKIE(NonNull(newdoc.address))) {
 			    char *mail_owner = NULL;
-			    if (owner_address &&
-				strncasecomp(owner_address, "mailto:", 7)) {
-				mail_owner = owner_address + 7;
+			    if (owner_address && isMAILTO_URL(owner_address)) {
+				mail_owner = owner_address + LEN_MAILTO_URL;
 			    }
 			    /*
 			     *  Email a bad link message to the owner of
@@ -5675,8 +5594,8 @@ try_again:
 #endif
 				mailmsg(curdoc.link,
 					mail_owner,
-					history[nhist-1].address,
-					history[nhist-1].title);
+					HDOC(nhist-1).address,
+					HDOC(nhist-1).title);
 			}
 			if (traversal) {
 			    FILE *ofp;
@@ -5693,7 +5612,7 @@ try_again:
 					popped_doc ?
 					newdoc.address : links[curdoc.link].lname,
 					links[curdoc.link].target,
-					history[nhist-1].address);
+					HDOC(nhist-1).address);
 			    } else {
 				fprintf(ofp,
 					"%s %s\t\n",
@@ -5727,7 +5646,7 @@ try_again:
 		    popped_doc = FALSE;		 /* Was TRUE if popped. - FM */
 		    LYinternal_flag = FALSE;	 /* Reset to default. - kw */
 		    turn_trace_back_on(&trace_mode_flag);
-		    FREE(newdoc.address); /* to pop last doc */
+		    free_address(&newdoc); /* to pop last doc */
 		    FREE(newdoc.bookmark);
 		    LYJumpFileURL = FALSE;
 		    reloading = FALSE;
@@ -5759,12 +5678,7 @@ try_again:
 			 *  If nhist = 0 then it must be the first file.
 			 */
 			if (first_file && homepage &&
-#ifdef VMS
-			   strcasecomp(homepage, startfile) != 0
-#else
-			   strcmp(homepage, startfile) != 0
-#endif /* VMS */
-			   ) {
+			   !LYSameFilename(homepage, startfile)) {
 			   /*
 			    *  Couldn't return to the first file but there is a
 			    *  homepage we can use instead. Useful for when the
@@ -5775,9 +5689,8 @@ try_again:
 			    *  so we don't enter an infinite getfile() loop on
 			    *  on failures to find the files. - FM
 			    */
-			   StrAllocCopy(newdoc.address, homepage);
-			   FREE(newdoc.post_data);
-			   FREE(newdoc.post_content_type);
+			   set_address(&newdoc, homepage);
+			   LYFreePostData(&newdoc);
 			   FREE(newdoc.bookmark);
 			   StrAllocCopy(startfile, homepage);
 			   newdoc.isHEAD = FALSE;
@@ -5809,32 +5722,33 @@ try_again:
 		    *  affect the traversal logic, since with traversal
 		    *  POST data can never occur. - kw
 		    */
-		   if (history[nhist - 1].post_data &&
-		       !history[nhist - 1].safe) {
-		       if (HText_POSTReplyLoaded((document *)&history[(nhist - 1)])) {
+		   if (HDOC(nhist - 1).post_data &&
+		       !HDOC(nhist - 1).safe) {
+		       if (HText_POSTReplyLoaded((DocInfo *)&history[(nhist - 1)])) {
 			   override_LYresubmit_posts = TRUE;
 			   goto try_again;
 		       }
 		       /*  Set newdoc fields, just in case the PREV_DOC
 			*  gets cancelled. - kw */
 		       if (!curdoc.address) {
-			   StrAllocCopy(newdoc.address, HTLoadedDocumentURL());
+			   set_address(&newdoc, HTLoadedDocumentURL());
 			   StrAllocCopy(newdoc.title, HTLoadedDocumentTitle());
-			   if (HTMainAnchor && HTMainAnchor->post_data) {
-			       StrAllocCopy(newdoc.post_data,
-					    HTMainAnchor->post_data);
+			   if (HTMainAnchor
+			    && HTMainAnchor->post_data) {
+			       BStrCopy(newdoc.post_data,
+					HTMainAnchor->post_data);
 			       StrAllocCopy(newdoc.post_content_type,
 					    HTMainAnchor->post_content_type);
 			   } else {
-			       FREE(newdoc.post_data);
+			       BStrFree(newdoc.post_data);
 			   }
 			   newdoc.isHEAD = HTLoadedDocumentIsHEAD();
 			   newdoc.safe = HTLoadedDocumentIsSafe();
 			   newdoc.internal_link = FALSE;
 		       } else {
-			   StrAllocCopy(newdoc.address, curdoc.address);
+			   copy_address(&newdoc, &curdoc);
 			   StrAllocCopy(newdoc.title, curdoc.title);
-			   StrAllocCopy(newdoc.post_data, curdoc.post_data);
+			   BStrCopy(newdoc.post_data, curdoc.post_data);
 			   StrAllocCopy(newdoc.post_content_type,
 					curdoc.post_content_type);
 			   newdoc.isHEAD = curdoc.isHEAD;
@@ -5866,17 +5780,17 @@ try_again:
 			 (dump_output_immediately == FALSE) &&
 			 !(newdoc.bookmark && *newdoc.bookmark)) &&
 			((LYisLocalFile(newdoc.address) == TRUE) &&
-			 !(strcmp((HText_getTitle() ? HText_getTitle() : ""),
+			 !(strcmp(NonNull(HText_getTitle()),
 				  BOOKMARK_TITLE))) &&
 			(temp = HTParse(newdoc.address, "",
 				     PARSE_PATH+PARSE_PUNCTUATION)) != NULL) {
-			cp = wwwName(Home_Dir());
-			len = strlen(cp);
+			CONST char *name = wwwName(Home_Dir());
+			len = strlen(name);
 #ifdef VMS
-			if (!strncasecomp(temp, cp, len) &&
+			if (!strncasecomp(temp, name, len) &&
 			    strlen(temp) > len)
 #else
-			if (!strncmp(temp, cp, len) &&
+			if (!strncmp(temp, name, len) &&
 			    strlen(temp) > len)
 #endif /* VMS */
 			{
@@ -5898,14 +5812,9 @@ try_again:
 			    } else {
 				StrAllocCopy(cp, &temp[len]);
 			    }
-#ifdef VMS
-#define CompareBookmark(a,b) strcasecomp(a, b)
-#else
-#define CompareBookmark(a,b) strcmp(a, b)
-#endif /* VMS */
 			    for (i = 0; i <= MBM_V_MAXFILES; i++) {
 				if (MBM_A_subbookmark[i] &&
-				    !CompareBookmark(cp, MBM_A_subbookmark[i])) {
+				    LYSameFilename(cp, MBM_A_subbookmark[i])) {
 				    StrAllocCopy(BookmarkPage,
 						 MBM_A_subbookmark[i]);
 				    break;
@@ -5920,9 +5829,9 @@ try_again:
 				}
 				if ((temp = HTParse(newdoc.address, "",
 				 PARSE_ACCESS+PARSE_HOST+PARSE_PUNCTUATION))) {
-				    StrAllocCopy(newdoc.address, temp);
+				    set_address(&newdoc, temp);
 				    HTuncache_current_document();
-				    FREE(curdoc.address);
+				    free_address(&curdoc);
 				    StrAllocCat(newdoc.address,
 					    wwwName(Home_Dir()));
 				    StrAllocCat(newdoc.address, "/");
@@ -5937,8 +5846,7 @@ try_again:
 					StrAllocCopy(newdoc.style, curdoc.style);
 #endif
 				    StrAllocCopy(startrealm, newdoc.address);
-				    FREE(newdoc.post_data);
-				    FREE(newdoc.post_content_type);
+				    LYFreePostData(&newdoc);
 				    newdoc.isHEAD = FALSE;
 				    newdoc.safe = FALSE;
 				    FREE(temp);
@@ -5970,7 +5878,7 @@ try_again:
 			    FREE(traversal_link_to_add);
 			}
 			if (curdoc.address && curdoc.title &&
-			    strncmp(curdoc.address, "LYNXIMGMAP:", 11))
+			    !isLYNXIMGMAP(curdoc.address))
 			    /*
 			     *	Add the address we got to TRAVERSE_FOUND_FILE.
 			     */
@@ -5983,8 +5891,8 @@ try_again:
 		     *	positioning elements. - FM
 		     */
 		    if (newdoc.address && curdoc.address &&
-			!strncmp(newdoc.address, "LYNXDOWNLOAD:", 13)) {
-			StrAllocCopy(newdoc.address, curdoc.address);
+			isLYNXDOWNLOAD(newdoc.address)) {
+			copy_address(&newdoc, &curdoc);
 			StrAllocCopy(newdoc.title, (curdoc.title ?
 						    curdoc.title : ""));
 			StrAllocCopy(newdoc.bookmark, curdoc.bookmark);
@@ -6043,8 +5951,8 @@ try_again:
 	    /*
 	     *	Set the files the same.
 	     */
-	    StrAllocCopy(curdoc.address, newdoc.address);
-	    StrAllocCopy(curdoc.post_data, newdoc.post_data);
+	    copy_address(&curdoc, &newdoc);
+	    BStrCopy(curdoc.post_data, newdoc.post_data);
 	    StrAllocCopy(curdoc.post_content_type, newdoc.post_content_type);
 	    StrAllocCopy(curdoc.bookmark, newdoc.bookmark);
 #ifdef USE_COLOR_STYLE
@@ -6141,10 +6049,17 @@ try_again:
 	    resizeterm(LYlines, LYcols);
 	    wresize(LYwin, LYlines, LYcols);
 #else
+#if 0 /* defined(PDCURSES) && defined(HAVE_XCURSES) */
+	    resize_term(LYlines, LYcols);
+	    if (LYwin != 0)
+		LYwin = resize_window(LYwin, LYlines, LYcols);
+	    refresh();
+#else
 	    stop_curses();
 	    start_curses();
 	    LYclear();
 #endif
+#endif
 	    refresh_screen = TRUE; /* to force a redraw */
 	    if (HTMainText)	/* to REALLY force it... - kw */
 		HText_setStale(HTMainText);
@@ -6190,7 +6105,7 @@ try_again:
 		    if (forced_HTML_mode &&
 			!dump_output_immediately &&
 			!curdoc.bookmark &&
-			!strncasecomp(curdoc.address, "file:", 5) &&
+			isFILE_URL(curdoc.address) &&
 			strlen(temp) > 1) {
 			/*
 			 *  We forced HTML for a local startfile which
@@ -6224,7 +6139,7 @@ try_again:
 		 *  Set up the crawl output stuff.
 		 */
 		if (curdoc.address && !lookup(curdoc.address)) {
-		    if (strncmp(curdoc.address, "LYNXIMGMAP:", 11))
+		    if (!isLYNXIMGMAP(curdoc.address))
 			crawl_ok = TRUE;
 		    add_to_table(curdoc.address);
 		}
@@ -6275,7 +6190,7 @@ try_again:
 	    }
 	}
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 	/*
 	 * If the parse settings have changed since this HText was
 	 * generated, we need to reparse and redraw it.  -dsb
@@ -6435,10 +6350,7 @@ try_again:
 	curlink_is_editable =
 	    (nlinks > 0 &&
 	     links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-	     (links[curdoc.link].form->type == F_TEXT_TYPE ||
-	      links[curdoc.link].form->type == F_TEXT_SUBMIT_TYPE ||
-	      links[curdoc.link].form->type == F_PASSWORD_TYPE ||
-	      links[curdoc.link].form->type == F_TEXTAREA_TYPE));
+	     F_TEXTLIKE(links[curdoc.link].l_form->type));
 
 	use_last_tfpos = (curlink_is_editable &&
 			  (real_cmd == LYK_LPOS_PREV_LINK ||
@@ -6458,7 +6370,7 @@ try_again:
 
 	       if (links[curdoc.link].type == WWW_FORM_LINK_TYPE) {
 
-		    switch(links[curdoc.link].form->type) {
+		    switch(links[curdoc.link].l_form->type) {
 		    case F_TEXT_SUBMIT_TYPE:
 		    case F_SUBMIT_TYPE:
 		    case F_IMAGE_SUBMIT_TYPE:
@@ -6543,10 +6455,10 @@ try_again:
 	      *  text input field.
 	      */
 	    if (!curlink_is_editable) {
-		highlight(ON, curdoc.link, prev_target);
+		LYhighlight(ON, curdoc.link, prev_target);
 #ifndef INACTIVE_INPUT_STYLE_VH
 	    } else if (!textinput_activated) {
-		highlight(ON, curdoc.link, prev_target);
+		LYhighlight(ON, curdoc.link, prev_target);
 #endif
 	    }
 	}
@@ -6599,13 +6511,11 @@ try_again:
 		     *  Replace novice lines if in NOVICE_MODE.
 		     */
 		    if (user_mode==NOVICE_MODE) {
-			form_noviceline(links[curdoc.link].form->disabled);
+			form_noviceline(links[curdoc.link].l_form->disabled);
 		    }
-		    real_c = change_form_link(&links[curdoc.link],
+		    real_c = change_form_link(curdoc.link,
 				     &newdoc, &refresh_screen,
-				     links[curdoc.link].form->name,
-					  links[curdoc.link].form->value,
-					  use_last_tfpos, FALSE);
+				     use_last_tfpos, FALSE);
 		}
 #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
 		if (textfields_need_activation)
@@ -6624,15 +6534,15 @@ try_again:
 		    do_change_link();
 		    if ((c == '\n' || c == '\r') &&
 			links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-			F_TEXTLIKE(links[curdoc.link].form->type) &&
+			F_TEXTLIKE(links[curdoc.link].l_form->type) &&
 			!textfields_need_activation) {
 			c = DO_NOTHING;
 		    }
 #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
 		} else if ((links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-			    links[curdoc.link].form->type == F_TEXTAREA_TYPE)
+			    links[curdoc.link].l_form->type == F_TEXTAREA_TYPE)
 			   && textfields_need_activation
-			   && !links[curdoc.link].form->disabled
+			   && !links[curdoc.link].l_form->disabled
 			   && peek_mouse_link() < 0 &&
 			   (((LKC_TO_LAC(keymap,real_c) == LYK_NEXT_LINK ||
 #ifdef TEXTAREA_AUTOGROW
@@ -6642,11 +6552,11 @@ try_again:
 			      LKC_TO_LAC(keymap,real_c) == LYK_DOWN_LINK) &&
 			     ((curdoc.link < nlinks-1 &&
 			       links[curdoc.link+1].type == WWW_FORM_LINK_TYPE  &&
-			       links[curdoc.link+1].form->type == F_TEXTAREA_TYPE
-			       && (links[curdoc.link].form->number ==
-				   links[curdoc.link+1].form->number) &&
-			       strcmp(links[curdoc.link].form->name,
-				      links[curdoc.link+1].form->name) == 0) ||
+			       links[curdoc.link+1].l_form->type == F_TEXTAREA_TYPE
+			       && (links[curdoc.link].l_form->number ==
+				   links[curdoc.link+1].l_form->number) &&
+			       strcmp(links[curdoc.link].l_form->name,
+				      links[curdoc.link+1].l_form->name) == 0) ||
 			      (curdoc.link == nlinks-1 && more &&
 			       HText_TAHasMoreLines(curdoc.link, 1)))) ||
 			    ((LKC_TO_LAC(keymap,real_c) == LYK_PREV_LINK ||
@@ -6654,11 +6564,11 @@ try_again:
 			      LKC_TO_LAC(keymap,real_c) == LYK_UP_LINK) &&
 			     ((curdoc.link > 0 &&
 			       links[curdoc.link-1].type == WWW_FORM_LINK_TYPE  &&
-			       links[curdoc.link-1].form->type == F_TEXTAREA_TYPE
-			       && (links[curdoc.link].form->number ==
-				   links[curdoc.link-1].form->number) &&
-			       strcmp(links[curdoc.link].form->name,
-				      links[curdoc.link-1].form->name) == 0) ||
+			       links[curdoc.link-1].l_form->type == F_TEXTAREA_TYPE
+			       && (links[curdoc.link].l_form->number ==
+				   links[curdoc.link-1].l_form->number) &&
+			       strcmp(links[curdoc.link].l_form->name,
+				      links[curdoc.link-1].l_form->name) == 0) ||
 			      (curdoc.link == 0 && curdoc.line > 1 &&
 			       HText_TAHasMoreLines(curdoc.link, -1)))))) {
 		    textinput_activated = TRUE;
@@ -6687,23 +6597,23 @@ try_again:
 		     *   try and improve the "readability" (such as it is).
 		     *   Caveat emptor to anyone trying to change it.]
 		     */
-		    if ((links[curdoc.link].type       == WWW_FORM_LINK_TYPE &&
-			 links[curdoc.link].form->type == F_TEXTAREA_TYPE) &&
+		    if ((links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
+			 links[curdoc.link].l_form->type == F_TEXTAREA_TYPE) &&
 			((curdoc.link == nlinks-1 &&
 			  !(more && HText_TAHasMoreLines(curdoc.link, 1)))
 			 ||
 			 ((curdoc.link <  nlinks-1) &&
 			  !(links[curdoc.link+1].type == WWW_FORM_LINK_TYPE  &&
-			    links[curdoc.link+1].form->type == F_TEXTAREA_TYPE))
+			    links[curdoc.link+1].l_form->type == F_TEXTAREA_TYPE))
 			 ||
 			 ((curdoc.link <  nlinks-1) &&
 			  ((links[curdoc.link+1].type == WWW_FORM_LINK_TYPE  &&
-			    links[curdoc.link+1].form->type == F_TEXTAREA_TYPE)
+			    links[curdoc.link+1].l_form->type == F_TEXTAREA_TYPE)
 			    &&
-			    ((links[curdoc.link].form->number	       !=
-				      links[curdoc.link+1].form->number)     ||
-			     (strcmp (links[curdoc.link].form->name,
-				      links[curdoc.link+1].form->name) != 0)))))) {
+			    ((links[curdoc.link].l_form->number	       !=
+				      links[curdoc.link+1].l_form->number) ||
+			     (strcmp (links[curdoc.link].l_form->name,
+				      links[curdoc.link+1].l_form->name) != 0)))))) {
 
 			HText_ExpandTextarea (&links[curdoc.link], 1);
 
@@ -6752,10 +6662,8 @@ try_again:
 		if (curlink_is_editable && !textinput_redrawn) {
 		/*draw the text entry, but don't activate it*/
 		    textinput_redrawn = TRUE;
-		    change_form_link_ex(&links[curdoc.link],
+		    change_form_link_ex(curdoc.link,
 				    &newdoc, &refresh_screen,
-				    links[curdoc.link].form->name,
-				    links[curdoc.link].form->value,
 				    use_last_tfpos, FALSE, TRUE);
 		    if (LYShowCursor) {
 			LYmove(links[curdoc.link].ly,
@@ -6863,7 +6771,7 @@ new_cmd:  /*
 	default:
 	    if (curdoc.link >= 0 && curdoc.link < nlinks &&
 		links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
-		F_TEXTLIKE(links[curdoc.link].form->type)) {
+		F_TEXTLIKE(links[curdoc.link].l_form->type)) {
 
 #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
 		if (textfields_need_activation) {
@@ -6918,18 +6826,17 @@ new_cmd:  /*
 	    handle_LYK_SOURCE(&ownerS_address);
 	    break;
 
-#ifdef SH_EX		/* 1999/01/01 (Fri) */
 	case LYK_CHG_CENTER:	/* ^Q */
 
 	    if (no_table_center) {
 		no_table_center = FALSE;
-		HTInfoMsg("TABLE center enable.");
+		HTInfoMsg(gettext("TABLE center enable."));
 	    } else {
 		no_table_center = TRUE;
-		HTInfoMsg("TABLE center disable.");
+		HTInfoMsg(gettext("TABLE center disable."));
 	    }
-#endif
 	    /* FALLTHRU */
+
 	case LYK_RELOAD:  /* control-R to reload and refresh */
 	    handle_LYK_RELOAD(real_cmd);
 	    break;
@@ -6986,30 +6893,30 @@ new_cmd:  /*
 	case LYK_TO_CLIPBOARD:	/* ^S */
 	    {
 		char *s;
-		int c;
+		int ch2;
 
 		/* The logic resembles one of ADD_BOOKMARK */
 		if (nlinks > 0 && links[curdoc.link].lname
 		    && links[curdoc.link].type != WWW_FORM_LINK_TYPE) {
 		    /* Makes sense to copy a link */
 		    _statusline("Copy D)ocument's or L)ink's URL to clipboard or C)ancel?");
-		    c = LYgetch_single();
-		    if (c == 'D')
+		    ch2 = LYgetch_single();
+		    if (ch2 == 'D')
 			s = curdoc.address;
-		    else if (c == 'C')
+		    else if (ch2 == 'C')
 			break;
 		    else
 			s = links[curdoc.link].lname;
 		} else
 		    s = curdoc.address;
-		if (!s && !*s)
-		    HTInfoMsg("Current URL is empty.");
+		if (isEmpty(s))
+		    HTInfoMsg(gettext("Current URL is empty."));
 		if (put_clip(s))
-		    HTInfoMsg("Copy to clipboard failed.");
+		    HTInfoMsg(gettext("Copy to clipboard failed."));
 		else if (s == curdoc.address)
-		    HTInfoMsg("Document URL put to clipboard.");
+		    HTInfoMsg(gettext("Document URL put to clipboard."));
 		else
-		    HTInfoMsg("Link URL put to clipboard.");
+		    HTInfoMsg(gettext("Link URL put to clipboard."));
 	    }
 	    break;
 
@@ -7017,38 +6924,46 @@ new_cmd:  /*
 	    if (no_goto && !LYValidate) { /*  Go to not allowed. - FM */
 		HTUserMsg(GOTO_DISALLOWED);
 	    } else {
-		unsigned char *s = get_clip_grab(), *e, *t;
+		unsigned char *s = (unsigned char *) get_clip_grab(), *e, *t;
 		char *buf;
-		int len;
+		int len2;
 
 		if (!s)
 		    break;
-		len = strlen(s);
-		e = s + len;
+		len2 = strlen((const char *) s);
+		e = s + len2;
 		while (s < e && strchr(" \t\n\r", *s))
 		    s++;
 		while (s < e && strchr(" \t\n\r", e[-1]))
 		    e--;
+		if (s[0] == '<' && e > s && e[-1] == '>') {
+		    s++; e--;
+		    if (!strncasecomp((const char *) s,"URL:", 4))
+			s += 4;
+		}
 		if (s >= e) {
-		    HTInfoMsg("No URL in the clipboard.");
+		    HTInfoMsg(gettext("No URL in the clipboard."));
 		    break;
 		}
-		buf = (char*)malloc(e - s + 1);
-		strncpy(buf, s, e - s);
+		len = e - s + 1;
+		if (len < MAX_LINE)
+		    len = MAX_LINE;	/* Required for do_check_goto_URL() */
+		buf = (char*)malloc(len);
+		strncpy(buf, (const char *) s, e - s);
 		buf[e - s] = '\0';
-		t = buf;
+		t = (unsigned char *) buf;
 
 		while (s < e) {
 		    if (strchr(" \t\n\r", *s)) {
-			int nl = 0;	/* Keep whitespace without NL - file names! */
+			int nl2 = 0;	/* Keep whitespace without NL - file names! */
 			unsigned char *s1 = s;
 
 			while (strchr(" \t\n\r", *s)) {
-			    if (!nl && *s == '\n')
-				nl = 1;
+			    if (!nl2 && *s == '\n')
+				nl2 = 1;
 			    s++;
 			}
-			if (!nl) {
+			if (!nl2) {
 			    while (s1 < s) {
 				if (*s1 != '\r' && *s1 != '\r')
 				    *t = *s1;
@@ -7469,8 +7384,8 @@ new_cmd:  /*
 }
 
 PRIVATE int are_different ARGS2(
-	document *,	doc1,
-	document *,	doc2)
+	DocInfo *,	doc1,
+	DocInfo *,	doc2)
 {
     char *cp1, *cp2;
 
@@ -7491,31 +7406,25 @@ PRIVATE int are_different ARGS2(
      *	we're not tripped up by multiple anchors in the
      *	the same document from a POST form. -- FM
      */
-    if ((cp1 = strchr(doc1->address, '#')) != NULL)
-	*cp1 = '\0';
-    if ((cp2 = strchr(doc2->address, '#')) != NULL)
-	*cp2 = '\0';
+    cp1 = trimPoundSelector(doc1->address);
+    cp2 = trimPoundSelector(doc2->address);
     /*
      *	Are the base addresses different?
      */
     if (strcmp(doc1->address, doc2->address)) {
-	if (cp1)
-	    *cp1 = '#';
-	if (cp2)
-	    *cp2 = '#';
+	restorePoundSelector(cp1);
+	restorePoundSelector(cp2);
 	return(TRUE);
     }
-    if (cp1)
-	*cp1 = '#';
-    if (cp2)
-	*cp2 = '#';
+    restorePoundSelector(cp1);
+    restorePoundSelector(cp2);
 
     /*
      *	Do the docs have different contents?
      */
     if (doc1->post_data) {
 	if (doc2->post_data) {
-	    if (strcmp(doc1->post_data, doc2->post_data))
+	    if (!BINEQ(doc1->post_data, doc2->post_data))
 		return(TRUE);
 	} else
 	    return(TRUE);
@@ -7533,8 +7442,8 @@ PRIVATE int are_different ARGS2(
  */
 #ifndef DONT_TRACK_INTERNAL_LINKS
 PRIVATE int are_phys_different ARGS2(
-	document *,	doc1,
-	document *,	doc2)
+	DocInfo *,	doc1,
+	DocInfo *,	doc2)
 {
     char *cp1, *cp2, *ap1 = doc1->address, *ap2 = doc2->address;
 
@@ -7553,10 +7462,10 @@ PRIVATE int are_phys_different ARGS2(
     /*
      * Skip over possible LYNXIMGMAP parts. - kw
      */
-    if (0==strncmp(doc1->address, "LYNXIMGMAP:", 11))
-	ap1 += 11;
-    if (0==strncmp(doc2->address, "LYNXIMGMAP:", 11))
-	ap2 += 11;
+    if (isLYNXIMGMAP(doc1->address))
+	ap1 += LEN_LYNXIMGMAP;
+    if (isLYNXIMGMAP(doc2->address))
+	ap2 += LEN_LYNXIMGMAP;
     /*
      * If there isn't any real URL in doc2->address, but maybe just
      * a fragment, doc2 is assumed to be an internal reference in
@@ -7570,31 +7479,25 @@ PRIVATE int are_phys_different ARGS2(
      *	we're not tripped up by multiple anchors in the
      *	the same document from a POST form. -- FM
      */
-    if ((cp1 = strchr(doc1->address, '#')) != NULL)
-	*cp1 = '\0';
-    if ((cp2 = strchr(doc2->address, '#')) != NULL)
-	*cp2 = '\0';
+    cp1 = trimPoundSelector(doc1->address);
+    cp2 = trimPoundSelector(doc2->address);
     /*
      *	Are the base addresses different?
      */
     if (strcmp(ap1, ap2)) {
-	if (cp1)
-	    *cp1 = '#';
-	if (cp2)
-	    *cp2 = '#';
+	restorePoundSelector(cp1);
+	restorePoundSelector(cp2);
 	return(TRUE);
     }
-    if (cp1)
-	*cp1 = '#';
-    if (cp2)
-	*cp2 = '#';
+    restorePoundSelector(cp1);
+    restorePoundSelector(cp2);
 
     /*
      *	Do the docs have different contents?
      */
     if (doc1->post_data) {
 	if (doc2->post_data) {
-	    if (strcmp(doc1->post_data, doc2->post_data))
+	    if (!BINEQ(doc1->post_data, doc2->post_data))
 		return(TRUE);
 	} else
 	    return(TRUE);
@@ -7641,6 +7544,7 @@ PUBLIC void HTAddGotoURL ARGS1(
     if (!(url && *url))
 	return;
 
+    CTRACE((tfp, "HTAddGotoURL %s\n", url));
     StrAllocCopy(new, url);
 
     if (!Goto_URLs) {
@@ -7671,7 +7575,7 @@ PUBLIC void HTAddGotoURL ARGS1(
  *  to tell the user other misc info.
  */
 PRIVATE void show_main_statusline ARGS2(
-    CONST linkstruct,	curlink,
+    CONST LinkInfo,	curlink,
     int,		for_what)
 {
     /*
@@ -7704,7 +7608,7 @@ PRIVATE void show_main_statusline ARGS2(
 #endif /* NORMAL_NON_FORM_LINK_STATUSLINES_FOR_ALL_USER_MODES */
 #endif /* INDICATE_FORMS_MODE_FOR_ALL_LINKS_ON_PAGE */
 	if (curlink.type == WWW_FORM_LINK_TYPE) {
-	    show_formlink_statusline(curlink.form, for_what);
+	    show_formlink_statusline(curlink.l_form, for_what);
 	} else {
 	    statusline(NORMAL_LINK_MESSAGE);
 	}
@@ -7715,9 +7619,9 @@ PRIVATE void show_main_statusline ARGS2(
 	if (is_www_index) {
 	    char *indx = gettext("-index-");
 	    LYmove(LYlines-1, LYcols - strlen(indx) - 1);
-	    start_reverse();
+	    lynx_start_reverse();
 	    LYaddstr(indx);
-	    stop_reverse();
+	    lynx_stop_reverse();
 	}
 
     } else if (user_mode == ADVANCED_MODE && nlinks > 0) {
@@ -7727,8 +7631,8 @@ PRIVATE void show_main_statusline ARGS2(
 	char *cp = NULL;
 
 	if (curlink.type == WWW_INTERN_LINK_TYPE &&
-	    strncmp(curlink.lname, "LYNXIMGMAP:", 11)) {
-	    cp = strchr(curlink.lname, '#');
+	    !isLYNXIMGMAP(curlink.lname)) {
+	    cp = findPoundSelector(curlink.lname);
 	}
 	if (!cp)
 	    cp = curlink.lname;
@@ -7822,7 +7726,7 @@ PRIVATE void exit_immediately_with_error_message ARGS2(
     if (state == NOT_FOUND)
     {
 	HTSprintf0(&buf, "%s\n%s %s\n",
-		   buf2 ? buf2 : "",
+		   NonNull(buf2),
 		   gettext("lynx: Can't access startfile"),
 		   /*
 		    * hack: if we fail in HTAccess.c
@@ -7835,7 +7739,7 @@ PRIVATE void exit_immediately_with_error_message ARGS2(
     if (state == NULLFILE)
     {
 	HTSprintf0(&buf, "%s\n%s\n%s\n",
-		   buf2 ? buf2 : "",
+		   NonNull(buf2),
 		   gettext("lynx: Start file could not be found or is not text/html or text/plain"),
 		   gettext("      Exiting..."));
     }
@@ -7938,3 +7842,10 @@ PRIVATE void status_link ARGS3(
 	}
     }
 }
+
+PUBLIC char*
+LYDownLoadAddress NOARGS
+{
+    char *s = newdoc.address ? newdoc.address : "";
+    return s;
+}
diff --git a/gnu/usr.bin/lynx/src/LYMainLoop.h b/gnu/usr.bin/lynx/src/LYMainLoop.h
index 3180431517d..798f9d77e4c 100644
--- a/gnu/usr.bin/lynx/src/LYMainLoop.h
+++ b/gnu/usr.bin/lynx/src/LYMainLoop.h
@@ -5,18 +5,22 @@
 #include <HTUtils.h>
 #endif
 
+#ifdef DISP_PARTIAL
+extern BOOL LYMainLoop_pageDisplay PARAMS((int line_num));
+#endif
 extern BOOLEAN LYOpenTraceLog NOPARAMS;
+extern char* LYDownLoadAddress NOPARAMS;
 extern int LYGetNewline NOPARAMS;
 extern int mainloop NOPARAMS;
 extern void HTAddGotoURL PARAMS((char *url));
 extern void LYCloseTracelog NOPARAMS;
-extern void LYMainLoop_pageDisplay PARAMS((int line_num));
 extern void LYSetNewline PARAMS((int value));
 extern void handle_LYK_TRACE_TOGGLE NOPARAMS;
 extern void handle_LYK_WHEREIS PARAMS((int cmd, BOOLEAN *refresh_screen));
+extern void repaint_main_statusline PARAMS((int for_what));
+
 #ifdef SUPPORT_CHDIR
 extern void handle_LYK_CHDIR NOPARAMS; 
 #endif
-extern void repaint_main_statusline PARAMS((int for_what));
 
 #endif /* LYMAINLOOP_H */
diff --git a/gnu/usr.bin/lynx/src/LYMap.c b/gnu/usr.bin/lynx/src/LYMap.c
index 9d4a7d1324e..c25898d1deb 100644
--- a/gnu/usr.bin/lynx/src/LYMap.c
+++ b/gnu/usr.bin/lynx/src/LYMap.c
@@ -216,7 +216,7 @@ PUBLIC BOOL LYAddMapElement ARGS5(
 	char *,		address,
 	char *,		title,
 	HTParentAnchor *, node_anchor,
-	BOOL,		intern_flag)
+	BOOL,		intern_flag GCC_UNUSED)
 {
     LYMapElement *new = NULL;
     LYImageMap *theMap = NULL;
@@ -341,7 +341,7 @@ PRIVATE void fill_DocAddress ARGS4(
 	wwwdoc->bookmark = NULL;
 	wwwdoc->isHEAD = FALSE;
 	wwwdoc->safe = FALSE;
-	underlying = HTAnchor_parent(HTAnchor_findAddress(wwwdoc));
+	underlying = HTAnchor_findAddress(wwwdoc);
 	if (underlying->safe)
 	    wwwdoc->safe = TRUE;
 	if (punderlying)
@@ -421,8 +421,8 @@ PRIVATE int LYLoadIMGmap ARGS4 (
     BOOL old_reloading = reloading;
     HTFormat old_format_out = HTOutputFormat;
 
-    if (!strncasecomp(arg, "LYNXIMGMAP:", 11)) {
-	address = (char * )(arg + 11);
+    if (isLYNXIMGMAP(arg)) {
+	address = (char *)(arg + LEN_LYNXIMGMAP);
     }
     if (!(address && strchr(address, ':'))) {
 	HTAlert(MISDIRECTED_MAP_REQUEST);
@@ -547,7 +547,7 @@ PRIVATE int LYLoadIMGmap ARGS4 (
     } else if (LYRequestTitle && *LYRequestTitle &&
 	       strcasecomp(LYRequestTitle, "[USEMAP]")) {
 	StrAllocCopy(MapTitle, LYRequestTitle);
-    } else if ((cp=strrchr(address, '#')) != NULL) {
+    } else if ((cp = strchr(address, '#')) != NULL) {
 	StrAllocCopy(MapTitle, (cp+1));
     }
     if (!(MapTitle && *MapTitle)) {
diff --git a/gnu/usr.bin/lynx/src/LYNews.c b/gnu/usr.bin/lynx/src/LYNews.c
index 23906a44d45..7d6111708d8 100644
--- a/gnu/usr.bin/lynx/src/LYNews.c
+++ b/gnu/usr.bin/lynx/src/LYNews.c
@@ -44,28 +44,12 @@ PRIVATE BOOLEAN message_has_content ARGS2(
     while (LYSafeGets(&buffer, fp) != NULL) {
 	char *cp = buffer;
 	char firstnonblank = '\0';
-	if (*cp == '\0') {
-	    break;
-	}
+	LYTrimNewline(cp);
 	for (; *cp; cp++) {
-	    if (*cp == '\n') {
-		break;
-	    } else if (*cp != ' ') {
-		if (!firstnonblank && isgraph(UCH(*cp))) {
-		    firstnonblank = *cp;
-		} else if (!isspace(UCH(*cp))) {
-		    *nonspaces = TRUE;
-		}
-	    }
-	}
-	if (*cp != '\n') {
-	    int c;
-	    while ((c = getc(fp)) != EOF && c != '\n') {
-		if (!firstnonblank && isgraph(UCH(c))) {
-		    firstnonblank = (char)c;
-		} else if (!isspace(UCH(*cp))) {
-		    *nonspaces = TRUE;
-		}
+	    if (!firstnonblank && isgraph(UCH(*cp))) {
+		firstnonblank = *cp;
+	    } else if (!isspace(UCH(*cp))) {
+		*nonspaces = TRUE;
 	    }
 	}
 	if (firstnonblank && firstnonblank != '>') {
@@ -211,7 +195,7 @@ PUBLIC char *LYNewsPost ARGS2(
      */
     LYaddstr(gettext("\n\n Please provide your mail address for the From: header\n"));
     sprintf(user_input, "From: %.*s", (int)sizeof(user_input) - 8,
-	    (personal_mail_address != NULL) ? personal_mail_address : "");
+	    NonNull(personal_mail_address));
     if (LYgetstr(user_input, VISIBLE,
 		 sizeof(user_input), NORECALL) < 0 ||
 	term_message) {
@@ -273,20 +257,17 @@ PUBLIC char *LYNewsPost ARGS2(
      *  Add Organization: header.
      */
     StrAllocCopy(cp, "Organization: ");
-    if (((org = getenv("ORGANIZATION")) != NULL) && *org != '\0') {
+    if ((org = LYGetEnv("ORGANIZATION")) != NULL) {
 	StrAllocCat(cp, org);
-    } else if (((org = getenv("NEWS_ORGANIZATION")) != NULL) &&
-	       *org != '\0') {
+    } else if ((org = LYGetEnv("NEWS_ORGANIZATION")) != NULL) {
 	StrAllocCat(cp, org);
     }
 #ifdef UNIX
     else if ((fp = fopen("/etc/organization", TXT_R)) != NULL) {
 	char *buffer = 0;
 	if (LYSafeGets(&buffer, fp) != NULL) {
-	    if ((org = strchr(buffer, '\n')) != NULL) {
-		*org = '\0';
-	    }
 	    if (user_input[0] != '\0') {
+		LYTrimNewline(buffer);
 		StrAllocCat(cp, buffer);
 	    }
 	}
diff --git a/gnu/usr.bin/lynx/src/LYNews.h b/gnu/usr.bin/lynx/src/LYNews.h
index 9eaa8e131a7..096062d3840 100644
--- a/gnu/usr.bin/lynx/src/LYNews.h
+++ b/gnu/usr.bin/lynx/src/LYNews.h
@@ -10,4 +10,3 @@ extern BOOLEAN term_message;
 extern char *LYNewsPost PARAMS((char *newsgroups, BOOLEAN followup));
 
 #endif /* LYNEWSPOST_H */
-
diff --git a/gnu/usr.bin/lynx/src/LYOptions.c b/gnu/usr.bin/lynx/src/LYOptions.c
index 8de61b6b32f..8749a59a1e7 100644
--- a/gnu/usr.bin/lynx/src/LYOptions.c
+++ b/gnu/usr.bin/lynx/src/LYOptions.c
@@ -21,6 +21,7 @@
 #include <LYGetFile.h>
 #include <LYReadCFG.h>
 #include <LYPrettySrc.h>
+#include <HTFile.h>
 
 #include <LYLeaks.h>
 
@@ -35,7 +36,7 @@ PRIVATE void terminate_options	PARAMS((int sig));
 #endif
 
 #if defined(USE_SLANG) || defined(COLOR_CURSES)
-PRIVATE BOOLEAN can_do_colors = 0;
+PRIVATE BOOLEAN can_do_colors = FALSE;
 #endif
 
 PUBLIC BOOLEAN LYCheckUserAgent NOARGS
@@ -54,7 +55,7 @@ PUBLIC BOOLEAN LYCheckUserAgent NOARGS
 PRIVATE void SetupChosenShowColor NOARGS
 {
 #if defined(USE_SLANG) || defined(COLOR_CURSES)
-    can_do_colors = 1;
+    can_do_colors = TRUE;
 #if defined(COLOR_CURSES)
     if (LYCursesON)	/* could crash if called before initialization */
 	can_do_colors = (BOOL) has_colors();
@@ -229,18 +230,18 @@ PRIVATE void addlbl ARGS1(CONST char *, text)
 	actual[d++] = text[s];
 	if (text[s] == LPAREN) {
 	    d = add_it(actual, d-1);
-	    start_bold();
+	    lynx_start_bold();
 	    b = TRUE;
 	    actual[d++] = text[s];
 	} else if (text[s] == RPAREN) {
 	    d = add_it(actual, d);
-	    stop_bold();
+	    lynx_stop_bold();
 	    b = FALSE;
 	}
     }
     add_it(actual, d);
     if (b)
-	stop_bold();
+	lynx_stop_bold();
 }
 
 #if !defined(VMS) || defined(USE_SLANG)
@@ -509,11 +510,13 @@ draw_options:
 
     LYmove(L_Keypad, 5);
     addlbl("(K)eypad mode                : ");
-    LYaddstr((keypad_mode == NUMBERS_AS_ARROWS) ?
-				"Numbers act as arrows             " :
-	 ((keypad_mode == LINKS_ARE_NUMBERED) ?
-				"Links are numbered                " :
-				"Links and form fields are numbered"));
+    LYaddstr(fields_are_numbered() && links_are_numbered()
+		? "Links and form fields are numbered"
+		: links_are_numbered()
+		? "Links are numbered                "
+		: fields_are_numbered()
+		? "Form fields are numbered          "
+		: "Numbers act as arrows             ");
 
     LYmove(L_Lineed, 5);
     addlbl("li(N)e edit style            : ");
@@ -561,23 +564,23 @@ draw_options:
 
     LYmove(LYlines-3, 2);
     LYaddstr(SELECT_SEGMENT);
-    start_bold();
+    lynx_start_bold();
     LYaddstr(CAP_LETT_SEGMENT);
-    stop_bold();
+    lynx_stop_bold();
     LYaddstr(OF_OPT_LINE_SEGMENT);
     if (!no_option_save) {
 	LYaddstr(" '");
-	start_bold();
+	lynx_start_bold();
 	LYaddstr(">");
-	stop_bold();
+	lynx_stop_bold();
 	LYaddstr("'");
 	LYaddstr(TO_SAVE_SEGMENT);
     }
     LYaddstr(OR_SEGMENT);
     LYaddstr("'");
-    start_bold();
+    lynx_start_bold();
     LYaddstr("r");
-    stop_bold();
+    lynx_stop_bold();
     LYaddstr("'");
     LYaddstr(TO_RETURN_SEGMENT);
 
@@ -619,10 +622,10 @@ draw_options:
 		    }
 		    _statusline(ACCEPT_DATA);
 		    LYmove(L_EDITOR, COL_OPTION_VALUES);
-		    start_bold();
+		    lynx_start_bold();
 		    ch = LYgetstr(display_option, VISIBLE,
 				  sizeof(display_option), NORECALL);
-		    stop_bold();
+		    lynx_stop_bold();
 		    LYmove(L_EDITOR, COL_OPTION_VALUES);
 		    if (term_options || ch == -1) {
 			LYaddstr((editor && *editor) ?
@@ -655,10 +658,10 @@ draw_options:
 		}
 		_statusline(ACCEPT_DATA);
 		LYmove(L_DISPLAY, COL_OPTION_VALUES);
-		start_bold();
+		lynx_start_bold();
 		ch = LYgetstr(display_option, VISIBLE,
 			      sizeof(display_option), NORECALL);
-		stop_bold();
+		lynx_stop_bold();
 		LYmove(L_DISPLAY, COL_OPTION_VALUES);
 
 #ifdef VMS
@@ -773,10 +776,10 @@ draw_options:
 		    }
 		    _statusline(ACCEPT_DATA);
 		    LYmove(L_HOME, C_DEFAULT);
-		    start_bold();
+		    lynx_start_bold();
 		    ch = LYgetstr(display_option, VISIBLE,
 				  sizeof(display_option), NORECALL);
-		    stop_bold();
+		    lynx_stop_bold();
 		    LYmove(L_HOME, C_DEFAULT);
 		    if (term_options ||
 			ch == -1 || *display_option == '\0') {
@@ -840,10 +843,10 @@ draw_options:
 		}
 		_statusline(ACCEPT_DATA);
 		LYmove(L_MAIL_ADDRESS, COL_OPTION_VALUES);
-		start_bold();
+		lynx_start_bold();
 		ch = LYgetstr(display_option, VISIBLE,
 			      sizeof(display_option), NORECALL);
-		stop_bold();
+		lynx_stop_bold();
 		LYmove(L_MAIL_ADDRESS, COL_OPTION_VALUES);
 		if (term_options || ch == -1) {
 		    LYaddstr((personal_mail_address &&
@@ -1048,10 +1051,10 @@ draw_options:
 		}
 		_statusline(ACCEPT_DATA);
 		LYmove(L_LANGUAGE, COL_OPTION_VALUES);
-		start_bold();
+		lynx_start_bold();
 		ch = LYgetstr(display_option, VISIBLE,
 			      sizeof(display_option), NORECALL);
-		stop_bold();
+		lynx_stop_bold();
 		LYmove(L_LANGUAGE, COL_OPTION_VALUES);
 		if (term_options || ch == -1) {
 		    LYaddstr((language && *language) ?
@@ -1083,10 +1086,10 @@ draw_options:
 		}
 		_statusline(ACCEPT_DATA);
 		LYmove(L_PREF_CHARSET, COL_OPTION_VALUES);
-		start_bold();
+		lynx_start_bold();
 		ch = LYgetstr(display_option, VISIBLE,
 			      sizeof(display_option), NORECALL);
-		stop_bold();
+		lynx_stop_bold();
 		LYmove(L_PREF_CHARSET, COL_OPTION_VALUES);
 		if (term_options || ch == -1) {
 		    LYaddstr((pref_charset && *pref_charset) ?
@@ -1157,7 +1160,7 @@ draw_options:
 		if (no_option_save) {
 #if defined(COLOR_CURSES)
 		    if (!has_colors()) {
-			char * terminal = getenv("TERM");
+			char * terminal = LYGetEnv("TERM");
 			if (terminal)
 			    HTUserMsg2(
 				COLOR_TOGGLE_DISABLED_FOR_TERM,
@@ -1209,9 +1212,9 @@ draw_options:
 						  choices, 4, FALSE, FALSE);
 			}
 #if defined(COLOR_CURSES)
-			again = (BOOL) (chosen == 2 && !has_colors());
+			again = (BOOL) (chosen == SHOW_COLOR_ON && !has_colors());
 			if (again) {
-			    char * terminal = getenv("TERM");
+			    char * terminal = LYGetEnv("TERM");
 			    if (terminal)
 				HTUserMsg2(
 				    COLOR_TOGGLE_DISABLED_FOR_TERM,
@@ -1243,7 +1246,7 @@ draw_options:
 		}
 		CurrentShowColor = LYShowColor;
 #ifdef USE_SLANG
-		SLtt_Use_Ansi_Colors = (LYShowColor > 1 ? 1 : 0);
+		SLtt_Use_Ansi_Colors = (LYShowColor > SHOW_COLOR_OFF ? TRUE : FALSE);
 #endif
 		response = ' ';
 		if (LYSelectPopups && !no_option_save) {
@@ -1418,10 +1421,10 @@ draw_options:
 		    }
 		    _statusline(ACCEPT_DATA_OR_DEFAULT);
 		    LYmove(L_User_Agent, COL_OPTION_VALUES);
-		    start_bold();
+		    lynx_start_bold();
 		    ch = LYgetstr(display_option, VISIBLE,
 				  sizeof(display_option), NORECALL);
-		    stop_bold();
+		    lynx_stop_bold();
 		    LYmove(L_User_Agent, COL_OPTION_VALUES);
 		    if (term_options || ch == -1) {
 			LYaddstr((LYUserAgent &&
@@ -1602,7 +1605,7 @@ PRIVATE int boolean_choice ARGS4(
      *	Highlight the current choice.
      */
     LYmove(line, col);
-    start_reverse();
+    lynx_start_reverse();
     show_choice(choices[cur_choice], width);
     if (LYShowCursor)
 	LYmove(line, (col - 1));
@@ -1701,7 +1704,7 @@ PRIVATE int boolean_choice ARGS4(
 	     *	Unhighlight choice.
 	     */
 	    LYmove(line, col);
-	    stop_reverse();
+	    lynx_stop_reverse();
 	    show_choice(choices[cur_choice], width);
 
 	    if (term_options) {
@@ -1817,15 +1820,15 @@ draw_bookmark_list:
     if (LYlines < MBM_V_MAXFILES + MULTI_OFFSET) {
 	LYmove((LYlines - 4), 0);
 	LYaddstr("'");
-	start_bold();
+	lynx_start_bold();
 	LYaddstr("[");
-	stop_bold();
+	lynx_stop_bold();
 	LYaddstr("' ");
 	LYaddstr(PREVIOUS);
 	LYaddstr(", '");
-	start_bold();
+	lynx_start_bold();
 	LYaddstr("]");
-	stop_bold();
+	lynx_stop_bold();
 	LYaddstr("' ");
 	LYaddstr(NEXT_SCREEN);
     }
@@ -1833,17 +1836,17 @@ draw_bookmark_list:
     LYmove((LYlines - 3), 0);
     if (!no_option_save) {
 	LYaddstr("'");
-	start_bold();
+	lynx_start_bold();
 	LYaddstr(">");
-	stop_bold();
+	lynx_stop_bold();
 	LYaddstr("'");
 	LYaddstr(TO_SAVE_SEGMENT);
     }
     LYaddstr(OR_SEGMENT);
     LYaddstr("'");
-    start_bold();
+    lynx_start_bold();
     LYaddstr("^G");
-    stop_bold();
+    lynx_stop_bold();
     LYaddstr("'");
     LYaddstr(TO_RETURN_SEGMENT);
 
@@ -1938,7 +1941,7 @@ draw_bookmark_list:
 		_statusline(ACCEPT_DATA);
 
 		if (a > 0) {
-		    start_bold();
+		    lynx_start_bold();
 		    if (LYlines < (MBM_V_MAXFILES + MULTI_OFFSET))
 			LYmove(
 			 (3 + a) - ((MBM_V_MAXFILES/2 + 1)*(MBM_current - 1)),
@@ -1951,7 +1954,7 @@ draw_bookmark_list:
 			      sizeof(MBM_tmp_line) - 1);
 		    ch = LYgetstr(MBM_tmp_line, VISIBLE,
 				  sizeof(MBM_tmp_line), NORECALL);
-		    stop_bold();
+		    lynx_stop_bold();
 
 		    if (strlen(MBM_tmp_line) < 1) {
 			FREE(MBM_A_subdescript[a]);
@@ -1979,13 +1982,13 @@ draw_bookmark_list:
 		    LYmove((3 + a), 35);
 		LYaddstr("| ");
 
-		start_bold();
+		lynx_start_bold();
 		LYstrncpy(MBM_tmp_line,
-			  (!MBM_A_subbookmark[a] ? "" : MBM_A_subbookmark[a]),
+			  NonNull(MBM_A_subbookmark[a]),
 			  sizeof(MBM_tmp_line) - 1);
 		ch = LYgetstr(MBM_tmp_line, VISIBLE,
 			      sizeof(MBM_tmp_line), NORECALL);
-		stop_bold();
+		lynx_stop_bold();
 
 		if (*MBM_tmp_line == '\0') {
 		    if (a == 0)
@@ -2083,7 +2086,6 @@ PUBLIC int popup_choice ARGS7(
  */
 #define SELECTED(flag) (flag) ? selected_string : ""
 #define DISABLED(flag) (flag) ? disabled_string : ""
-#define NOTEMPTY(text) (text && text[0]) ? text : ""
 
 typedef struct {
     int value;
@@ -2098,13 +2100,13 @@ typedef struct {
 
 static CONST char selected_string[] = "selected";
 static CONST char disabled_string[] = "disabled";
-static CONST char on_string[]	    = "ON";
-static CONST char off_string[]	    = "OFF";
-static CONST char never_string[]    = "NEVER";
-static CONST char always_string[]   = "ALWAYS";
+static CONST char on_string[]	    = N_("ON");
+static CONST char off_string[]	    = N_("OFF");
+static CONST char never_string[]    = N_("NEVER");
+static CONST char always_string[]   = N_("ALWAYS");
 static OptValues bool_values[] = {
-	{ FALSE,	     "OFF",		  "OFF"		},
-	{ TRUE,		     "ON",		  "ON"		},
+	{ FALSE,	     N_("OFF"),		  "OFF"		},
+	{ TRUE,		     N_("ON"),		  "ON"		},
 	{ 0, 0, 0 }};
 
 static char * secure_string		= "secure";
@@ -2114,48 +2116,54 @@ static char * save_options_string	= "save_options";
 /*
  * Personal Preferences
  */
-static char * cookies_string		= "set_cookies";
-static char * cookies_ignore_all_string = "ignore";
-static char * cookies_up_to_user_string = "ask user";
-static char * cookies_accept_all_string = "accept all";
-static char * x_display_string		= "display";
-static char * editor_string		= "file_editor";
-static char * emacs_keys_string		= "emacs_keys";
+static char * cookies_string		= RC_SET_COOKIES;
+static char * cookies_ignore_all_string = N_("ignore");
+static char * cookies_up_to_user_string = N_("ask user");
+static char * cookies_accept_all_string = N_("accept all");
+static char * x_display_string		= RC_DISPLAY;
+static char * editor_string		= RC_FILE_EDITOR;
+static char * emacs_keys_string		= RC_EMACS_KEYS;
 
 #if defined(ENABLE_OPTS_CHANGE_EXEC) && (defined(EXEC_LINKS) || defined(EXEC_SCRIPTS))
 #define EXEC_ALWAYS 2
 #define EXEC_LOCAL  1
 #define EXEC_NEVER  0
-static char * exec_links_string		= "exec_options";
+static char * exec_links_string		= RC_RUN_ALL_EXECUTION_LINKS;
 static OptValues exec_links_values[]	= {
-	{ EXEC_NEVER,	"ALWAYS OFF",		"ALWAYS OFF" },
-	{ EXEC_LOCAL,	"FOR LOCAL FILES ONLY",	"FOR LOCAL FILES ONLY" },
+	{ EXEC_NEVER,	N_("ALWAYS OFF"),		"ALWAYS OFF" },
+	{ EXEC_LOCAL,	N_("FOR LOCAL FILES ONLY"),	"FOR LOCAL FILES ONLY" },
 #ifndef NEVER_ALLOW_REMOTE_EXEC
-	{ EXEC_ALWAYS,	"ALWAYS ON",		"ALWAYS ON" },
+	{ EXEC_ALWAYS,	N_("ALWAYS ON"),		"ALWAYS ON" },
 #endif
 	{ 0, 0, 0 }};
 #endif /* ENABLE_OPTS_CHANGE_EXEC */
 
 #ifdef EXP_KEYBOARD_LAYOUT
-static char * kblayout_string		= "kblayout";
+static char * kblayout_string		= RC_KBLAYOUT;
 #endif
-static char * keypad_mode_string	= "keypad_mode";
+static char * keypad_mode_string	= RC_KEYPAD_MODE;
 static OptValues keypad_mode_values[]	= {
-	{ NUMBERS_AS_ARROWS,  "Numbers act as arrows", "number_arrows" },
-	{ LINKS_ARE_NUMBERED, "Links are numbered",    "links_numbered" },
+	{ NUMBERS_AS_ARROWS,  N_("Numbers act as arrows"),
+			      "number_arrows" },
+	{ LINKS_ARE_NUMBERED, N_("Links are numbered"),
+			      "links_numbered" },
 	{ LINKS_AND_FIELDS_ARE_NUMBERED,
-			      "Links and form fields are numbered",
+			      N_("Links and form fields are numbered"),
 			      "links_and_forms" },
+	{ FIELDS_ARE_NUMBERED,
+			      N_("Form fields are numbered"),
+			      "forms_numbered" },
 	{ 0, 0, 0 }};
-static char * lineedit_mode_string	= "lineedit_mode";
-static char * mail_address_string	= "personal_mail_address";
-static char * search_type_string	= "case_sensitive_searching";
+static char * lineedit_mode_string	= RC_LINEEDIT_MODE;
+static char * mail_address_string	= RC_PERSONAL_MAIL_ADDRESS;
+static char * search_type_string	= RC_CASE_SENSITIVE_SEARCHING;
 static OptValues search_type_values[] = {
-	{ FALSE,	    "Case insensitive",  "case_insensitive" },
-	{ TRUE,		    "Case sensitive",	 "case_sensitive" },
+	{ FALSE,	    N_("Case insensitive"),  "case_insensitive" },
+	{ TRUE,		    N_("Case sensitive"),	 "case_sensitive" },
 	{ 0, 0, 0 }};
+
 #if defined(USE_SLANG) || defined(COLOR_CURSES)
-static char * show_color_string		= "show_color";
+static char * show_color_string		= RC_SHOW_COLOR;
 static OptValues show_color_values[] = {
 	{ SHOW_COLOR_NEVER,	never_string,	never_string },
 	{ SHOW_COLOR_OFF,	off_string,	off_string },
@@ -2163,109 +2171,151 @@ static OptValues show_color_values[] = {
 	{ SHOW_COLOR_ALWAYS,	always_string,	always_string },
 	{ 0, 0, 0 }};
 #endif
-static char * show_cursor_string	= "show_cursor";
-static char * user_mode_string		= "user_mode";
+
+static char * show_cursor_string	= RC_SHOW_CURSOR;
+
+static char * underline_links_string	= RC_UNDERLINE_LINKS;
+
+#ifdef USE_SCROLLBAR
+static char * show_scrollbar_string	= RC_SCROLLBAR;
+#endif
+
+static CONST char prompt_dft_string[]	= N_("prompt normally");
+static CONST char prompt_yes_string[]	= N_("force yes-response");
+static CONST char prompt_no_string[]	= N_("force no-response");
+static OptValues prompt_values[] = {
+	{ FORCE_PROMPT_DFT,	prompt_dft_string, prompt_dft_string },
+	{ FORCE_PROMPT_YES,	prompt_yes_string, prompt_yes_string },
+	{ FORCE_PROMPT_NO,	prompt_no_string,  prompt_no_string },
+	{ 0, 0, 0 }};
+
+static char * cookie_prompt_string	= RC_FORCE_COOKIE_PROMPT;
+
+#ifdef USE_SSL
+static char * ssl_prompt_string		= RC_FORCE_SSL_PROMPT;
+#endif
+
+static char * user_mode_string		= RC_USER_MODE;
 static OptValues user_mode_values[] = {
-	{ NOVICE_MODE,		"Novice",	"Novice" },
-	{ INTERMEDIATE_MODE,	"Intermediate", "Intermediate" },
-	{ ADVANCED_MODE,	"Advanced",	"Advanced" },
+	{ NOVICE_MODE,		N_("Novice"),			"Novice" },
+	{ INTERMEDIATE_MODE,	N_("Intermediate"),		"Intermediate" },
+	{ ADVANCED_MODE,	N_("Advanced"),			"Advanced" },
 	{ 0, 0, 0 }};
 
-static char * vi_keys_string		= "vi_keys";
+static char * vi_keys_string		= RC_VI_KEYS;
 
-static char * visited_links_string	= "visited_links";
+static char * visited_links_string	= RC_VISITED_LINKS;
 static OptValues visited_links_values[] = {
-	{ VISITED_LINKS_AS_FIRST_V, "By First Visit",	"first_visited" },
+	{ VISITED_LINKS_AS_FIRST_V, N_("By First Visit"),	"first_visited" },
 	{ VISITED_LINKS_AS_FIRST_V | VISITED_LINKS_REVERSE,
-		    "By First Visit Reversed",	"first_visited_reversed" },
-	{ VISITED_LINKS_AS_TREE,    "As Visit Tree",	"visit_tree" },
-	{ VISITED_LINKS_AS_LATEST,  "By Last Visit",	"last_visited" },
+		    N_("By First Visit Reversed"),		"first_visited_reversed" },
+	{ VISITED_LINKS_AS_TREE,    N_("As Visit Tree"),	"visit_tree" },
+	{ VISITED_LINKS_AS_LATEST,  N_("By Last Visit"),	"last_visited" },
 	{ VISITED_LINKS_AS_LATEST | VISITED_LINKS_REVERSE,
-		    "By Last Visit Reversed",	"last_visited_reversed" },
+		    N_("By Last Visit Reversed"),		"last_visited_reversed" },
 	{ 0, 0, 0 }};
 
 /*
  * Document Layout
  */
-#ifndef SH_EX	/* 1999/01/19 (Tue) */
-static char * DTD_recovery_string      = "DTD_recovery";
+static char * DTD_recovery_string      = RC_TAGSOUP;
 static OptValues DTD_type_values[] = {
 	/* Old_DTD variable */
-	{ TRUE,		    "relaxed (TagSoup mode)",	 "tagsoup" },
-	{ FALSE,	    "strict (SortaSGML mode)",	 "sortasgml" },
+	{ TRUE,		    N_("relaxed (TagSoup mode)"),	 "tagsoup" },
+	{ FALSE,	    N_("strict (SortaSGML mode)"),	 "sortasgml" },
 	{ 0, 0, 0 }};
-#endif
 
-static char * select_popups_string     = "select_popups";
+static char * select_popups_string     = RC_SELECT_POPUPS;
 static char * images_string            = "images";
-static char * images_ignore_all_string  = "ignore";
-static char * images_use_label_string   = "as labels";
-static char * images_use_links_string   = "as links";
-static char * verbose_images_string    = "verbose_images";
+static char * images_ignore_all_string = N_("ignore");
+static char * images_use_label_string  = N_("as labels");
+static char * images_use_links_string  = N_("as links");
+
+static char * verbose_images_string    = RC_VERBOSE_IMAGES;
 static OptValues verbose_images_type_values[] = {
 	/* verbose_img variable */
-	{ FALSE,	    "OFF",		 "OFF" },
-	{ TRUE,		    "show filename",	 "ON" },
+	{ FALSE,	    N_("OFF"),		 	"OFF" },
+	{ TRUE,		    N_("show filename"),	 "ON" },
 	{ 0, 0, 0 }};
 
 /*
  * Bookmark Options
  */
-static char * mbm_string		= "multi_bookmark";
+static char * mbm_string		= RC_MULTI_BOOKMARK;
 static OptValues mbm_values[] = {
-	{ MBM_OFF,		"OFF",			"OFF" },
-	{ MBM_STANDARD,		"STANDARD",		"STANDARD" },
-	{ MBM_ADVANCED,		"ADVANCED",		"ADVANCED" },
+	{ MBM_OFF,		N_("OFF"),		"OFF" },
+	{ MBM_STANDARD,		N_("STANDARD"),		"STANDARD" },
+	{ MBM_ADVANCED,		N_("ADVANCED"),		"ADVANCED" },
 	{ 0, 0, 0 }};
 
-static char * single_bookmark_string	= "single_bookmark_name";
+static char * single_bookmark_string	= RC_BOOKMARK_FILE;
 
 /*
  * Character Set Options
  */
-static char * assume_char_set_string	= "assume_char_set";
-static char * display_char_set_string	= "character_set";
-static char * raw_mode_string		= "raw_mode";
+static char * assume_char_set_string	= RC_ASSUME_CHARSET;
+static char * display_char_set_string	= RC_CHARACTER_SET;
+static char * raw_mode_string		= RC_RAW_MODE;
+
+#ifdef EXP_LOCALE_CHARSET
+static char * locale_charset_string	= RC_LOCALE_CHARSET;
+#endif
 
 /*
  * File Management Options
  */
-static char * show_dotfiles_string	= "show_dotfiles";
+static char * show_dotfiles_string	= RC_SHOW_DOTFILES;
 
 #ifdef DIRED_SUPPORT
-static char * dired_sort_string		= "dir_list_style";
-static OptValues dired_values[] = {
-	{ 0,			"Directories first",	"dired_dir" },
-	{ FILES_FIRST,		"Files first",		"dired_files" },
-	{ MIXED_STYLE,		"Mixed style",		"dired_mixed" },
+static char * dired_list_string		= RC_DIR_LIST_STYLE;
+static OptValues dired_list_values[] = {
+	{ DIRS_FIRST,		N_("Directories first"),	"dired_dir" },
+	{ FILES_FIRST,		N_("Files first"),		"dired_files" },
+	{ MIXED_STYLE,		N_("Mixed style"),		"dired_mixed" },
+	{ 0, 0, 0 }};
+#ifdef LONG_LIST
+static char * dired_sort_string		= RC_DIR_LIST_ORDER;
+static OptValues dired_sort_values[] = {
+	{ ORDER_BY_NAME,	N_("By Name"),		"dired_by_name" },
+	{ ORDER_BY_TYPE,	N_("By Type"),		"dired_by_type" },
+	{ ORDER_BY_SIZE,	N_("By Size"),		"dired_by_size" },
+	{ ORDER_BY_DATE,	N_("By Date"),		"dired_by_date" },
+	{ ORDER_BY_MODE,	N_("By Mode"),		"dired_by_mode" },
+#ifndef NO_GROUPS
+	{ ORDER_BY_USER,	N_("By User"),		"dired_by_user" },
+	{ ORDER_BY_GROUP,	N_("By Group"),		"dired_by_group" },
+#endif
 	{ 0, 0, 0 }};
+#endif /* LONG_LIST */
 #endif /* DIRED_SUPPORT */
 
-static char * ftp_sort_string		= "file_sorting_method";
+static char * ftp_sort_string		= RC_FILE_SORTING_METHOD;
 static OptValues ftp_sort_values[] = {
-	{ FILE_BY_NAME,		"By Name",		"ftp_by_name" },
-	{ FILE_BY_TYPE,		"By Type",		"ftp_by_type" },
-	{ FILE_BY_SIZE,		"By Size",		"ftp_by_size" },
-	{ FILE_BY_DATE,		"By Date",		"ftp_by_date" },
+	{ FILE_BY_NAME,		N_("By Name"),		"ftp_by_name" },
+	{ FILE_BY_TYPE,		N_("By Type"),		"ftp_by_type" },
+	{ FILE_BY_SIZE,		N_("By Size"),		"ftp_by_size" },
+	{ FILE_BY_DATE,		N_("By Date"),		"ftp_by_date" },
 	{ 0, 0, 0 }};
 
-static char * show_rate_string		= "show_rate";
+#ifdef USE_READPROGRESS
+static char * show_rate_string		= RC_SHOW_KB_RATE;
 static OptValues rate_values[] = {
-	{ rateOFF,		"Do not show rate",	"rate_off" },
-	{ rateBYTES,		"Show Bytes/sec rate",	"rate_bytes" },
-	{ rateKB,		"Show KB/sec rate",	"rate_kb" },
-#ifdef EXP_READPROGRESS
-	{ rateEtaBYTES,		"Show Bytes/sec, ETA",	"rate_eta_bytes" },
-	{ rateEtaKB,		"Show KB/sec, ETA",	"rate_eta_kb" },
+	{ rateOFF,		N_("Do not show rate"),	"rate_off" },
+	{ rateBYTES,		N_("Show %s/sec rate"),	"rate_bytes" },
+	{ rateKB,		N_("Show %s/sec rate"), "rate_kb" },
+#ifdef USE_READPROGRESS
+	{ rateEtaBYTES,		N_("Show %s/sec, ETA"),	"rate_eta_bytes" },
+	{ rateEtaKB,		N_("Show %s/sec, ETA"), "rate_eta_kb" },
 #endif
 	{ 0, 0, 0 }};
+#endif /* USE_READPROGRESS */
 
 /*
  * Headers transferred to remote server
  */
-static char * preferred_doc_char_string = "preferred_charset";
-static char * preferred_doc_lang_string = "preferred_language";
-static char * user_agent_string		= "user_agent";
+static char * preferred_doc_char_string = RC_PREFERRED_CHARSET;
+static char * preferred_doc_lang_string = RC_PREFERRED_LANGUAGE;
+static char * user_agent_string		= RC_USERAGENT;
 
 #define PutTextInput(fp, Name, Value, Size, disable) \
 	fprintf(fp,\
@@ -2273,7 +2323,7 @@ static char * user_agent_string		= "user_agent";
 		(int) Size, Name, Value, disable_all?disabled_string:disable)
 
 #define PutOption(fp, flag, html, name) \
-	fprintf(fp,"<option value=\"%s\" %s>%s\n", html, SELECTED(flag), name)
+	fprintf(fp,"<option value=\"%s\" %s>%s\n", html, SELECTED(flag), gettext(name))
 
 #define BeginSelect(fp, text) \
 	fprintf(fp,"<select name=\"%s\" %s>\n", text, disable_all?disabled_string:"")
@@ -2326,19 +2376,20 @@ PRIVATE BOOLEAN GetOptValues ARGS3(
  */
 
 PRIVATE PostPair * break_data ARGS1(
-    char *,	data)
+    bstring *,	data)
 {
-    char * p = data;
+    char * p;
     PostPair * q = NULL;
     int count = 0;
 
-    if (p==NULL || p[0]=='\0')
+    if (isBEmpty(data))
 	return NULL;
 
-    CTRACE((tfp, "break_data %s\n", data));
+    p = BStrData(data);
+    CTRACE((tfp, "break_data %s\n", p));
 
     q = typecalloc(PostPair);
-    if (q==NULL)
+    if (q == NULL)
 	outofmem(__FILE__, "break_data(calloc)");
 
     do {
@@ -2390,10 +2441,10 @@ PRIVATE PostPair * break_data ARGS1(
 	 * Linux ;->
 	 */
 	q = realloc(q, sizeof(PostPair)*(count+1));
-	if (q==NULL)
+	if (q == NULL)
 	    outofmem(__FILE__, "break_data(realloc)");
-	q[count].tag=NULL;
-    } while (p!=NULL && p[0]!='\0');
+	q[count].tag = NULL;
+    } while (p != NULL && p[0] != '\0');
     return q;
 }
 
@@ -2432,7 +2483,7 @@ PRIVATE int gen_options PARAMS((char **newfile));
  */
 
 PUBLIC int postoptions ARGS1(
-    document *,		newdoc)
+    DocInfo *,		newdoc)
 {
     PostPair *data = 0;
     DocAddress WWWDoc;  /* need on exit */
@@ -2638,7 +2689,6 @@ PUBLIC int postoptions ARGS1(
 	    case_sensitive = (BOOL) code;
 	}
 
-#ifndef SH_EX	/* 1999/01/19 (Tue) */
 	/* HTML error tolerance: SELECT */
 	if (!strcmp(data[i].tag, DTD_recovery_string)
 	 && GetOptValues(DTD_type_values, data[i].value, &code)) {
@@ -2648,7 +2698,6 @@ PUBLIC int postoptions ARGS1(
 		need_reload = TRUE;
 	    }
 	}
-#endif
 
 	/* Select Popups: ON/OFF */
 	if (!strcmp(data[i].tag, select_popups_string)
@@ -2668,7 +2717,7 @@ PUBLIC int postoptions ARGS1(
 	    }
 	    CurrentShowColor = LYShowColor;
 #ifdef USE_SLANG
-	    SLtt_Use_Ansi_Colors = (LYShowColor > 1 ? 1 : 0);
+	    SLtt_Use_Ansi_Colors = (LYShowColor > SHOW_COLOR_OFF ? TRUE : FALSE);
 #endif
 	}
 #endif /* USE_SLANG || COLOR_CURSES */
@@ -2679,6 +2728,30 @@ PUBLIC int postoptions ARGS1(
 	    LYShowCursor = (BOOL) code;
 	}
 
+	/* Underline links: ON/OFF */
+	if (!strcmp(data[i].tag, underline_links_string)
+	 && GetOptValues(bool_values, data[i].value, &code)) {
+	    LYUnderlineLinks = (BOOL) code;
+	}
+
+#ifdef USE_SCROLLBAR
+	/* Show Scrollbar: ON/OFF */
+	if (!strcmp(data[i].tag, show_scrollbar_string)
+	 && GetOptValues(bool_values, data[i].value, &code)) {
+	    LYShowScrollbar = (BOOL) code;
+	}
+#endif
+
+	/* Cookie Prompting: SELECT */
+	if (!strcmp(data[i].tag, cookie_prompt_string))
+	    GetOptValues(prompt_values, data[i].value, &cookie_noprompt);
+
+#ifdef USE_SSL
+	/* SSL Prompting: SELECT */
+	if (!strcmp(data[i].tag, ssl_prompt_string))
+	    GetOptValues(prompt_values, data[i].value, &ssl_noprompt);
+#endif
+
 	/* User Mode: SELECT */
 	if (!strcmp(data[i].tag, user_mode_string)
 	 && GetOptValues(user_mode_values, data[i].value, &user_mode)) {
@@ -2761,6 +2834,14 @@ PUBLIC int postoptions ARGS1(
 	    }
 	}
 
+#ifdef EXP_LOCALE_CHARSET
+	/* Use locale-based character set: ON/OFF */
+	if (!strcmp(data[i].tag, locale_charset_string)
+	 && GetOptValues(bool_values, data[i].value, &code)) {
+	    LYLocaleCharset = (BOOL) code;
+	}
+#endif
+
 	/* Display Character Set: SELECT */
 	if (!strcmp(data[i].tag, display_char_set_string)) {
 	    int newval = atoi(data[i].value);
@@ -2785,10 +2866,16 @@ PUBLIC int postoptions ARGS1(
 	}
 
 #ifdef DIRED_SUPPORT
-	/* Local Directory Sort: SELECT */
+	/* Local Directory Style: SELECT */
+	if (!strcmp(data[i].tag, dired_list_string)) {
+	    GetOptValues(dired_list_values, data[i].value, &dir_list_style);
+	}
+#ifdef LONG_LIST
+	/* Local Directory Order: SELECT */
 	if (!strcmp(data[i].tag, dired_sort_string)) {
-	    GetOptValues(dired_values, data[i].value, &dir_list_style);
+	    GetOptValues(dired_sort_values, data[i].value, &dir_list_order);
 	}
+#endif /* LONG_LIST */
 #endif /* DIRED_SUPPORT */
 
 	/* Show dot files: ON/OFF */
@@ -2797,11 +2884,13 @@ PUBLIC int postoptions ARGS1(
 	    show_dotfiles = (BOOL) code;
 	}
 
+#ifdef USE_READPROGRESS
 	/* Show Transfer Rate: enumerated value */
 	if (!strcmp(data[i].tag, show_rate_string)
 	 && GetOptValues(rate_values, data[i].value, &code)) {
 	    LYTransferRate = code;
 	}
+#endif /* USE_READPROGRESS */
 
 	/* Preferred Document Character Set: INPUT */
 	if (!strcmp(data[i].tag, preferred_doc_char_string)) {
@@ -2841,9 +2930,12 @@ PUBLIC int postoptions ARGS1(
     /*
      * Process the flags:
      */
-     if ( display_char_set_old != current_char_set ||
-	       raw_mode_old != LYRawMode ||
-	       assume_char_set_changed ) {
+#ifdef EXP_LOCALE_CHARSET
+    LYFindLocaleCharset();
+#endif
+    if ( display_char_set_old != current_char_set ||
+	 raw_mode_old != LYRawMode ||
+	 assume_char_set_changed ) {
 	/*
 	 * charset settings: the order is essential here.
 	 */
@@ -2873,13 +2965,12 @@ PUBLIC int postoptions ARGS1(
 	    HTMLSetCharacterHandling(current_char_set);
 	}
 	need_reload = TRUE;
-     } /* end of charset settings */
-
+    } /* end of charset settings */
 
     /*
      * FIXME: Golly gee, we need to write all of this out now, don't we?
      */
-    FREE(newdoc->post_data);
+    BStrFree(newdoc->post_data);
     FREE(data);
     if (save_all) {
 	HTInfoMsg(SAVING_OPTIONS);
@@ -2922,8 +3013,7 @@ PUBLIC int postoptions ARGS1(
     if (!HTLoadAbsolute(&WWWDoc))
 	return(NOT_FOUND);
 
-    /* comment out to avoid warning when removing forms content... */
-    /* HTuncache_current_document(); */ /* will never use again */
+    HTuncache_current_document(); /* will never use again */
 
     /*
      *  Return to previous doc, not to options menu!
@@ -2961,7 +3051,7 @@ PUBLIC int postoptions ARGS1(
      */
     if ((need_end_reload == TRUE &&
 	 (strncmp(newdoc->address, "http", 4) == 0 ||
-	  strncmp(newdoc->address, "lynxcgi:", 8) == 0))) {
+	  isLYNXCGI(newdoc->address) == 0))) {
 	/*
 	 *  An option has changed which may influence
 	 *  content negotiation, and the resource is from
@@ -2990,7 +3080,7 @@ PUBLIC int postoptions ARGS1(
 	if (HTisDocumentSource()) {
 	    srcmode_for_next_retrieval(1);
 	}
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 	if (reloading == FALSE) {
 	    /* one more attempt to be smart enough: */
 	    if (HTcan_reparse_document()) {
@@ -3036,6 +3126,8 @@ PRIVATE char *NewSecureValue NOARGS
     return "?";
 }
 
+#define LABEL_LEN 33
+
 /*
  * Note: the 'value' we are passing here is a local copy of the "same" string
  * as is used in LYrcFile.c to index the savable options.
@@ -3046,13 +3138,13 @@ PRIVATE void PutLabel ARGS3(
 	char *,		value)
 {
     if (will_save_rc(value) && !no_option_save) {
-	fprintf(fp, "  %-33s: ", name);
+	fprintf(fp, "  %-*s: ", LABEL_LEN, name);
     } else {
 	int l = strlen(name);
 	fprintf(fp, "  %s", name);
 	fprintf(fp, "%s%-*s: ",
-		(l < 30) ? " " : "",
-		(l < 30) ? 32 - l : 3, "(!)");
+		(l < (LABEL_LEN-3)) ? " " : "",
+		(l < (LABEL_LEN-3)) ? (LABEL_LEN-1) - l : 3, "(!)");
     }
 }
 
@@ -3083,8 +3175,8 @@ PRIVATE char *check_if_write_lynxrc ARGS1(char **, table)
 PRIVATE char *will_save_cookies NOARGS
 {
     static char *table[] = {
-	"set_cookies",			/* LYSetCookies */
-	"accept_all_cookies",		/* LYAcceptAllCookies */
+	RC_SET_COOKIES,			/* LYSetCookies */
+	RC_ACCEPT_ALL_COOKIES,		/* LYAcceptAllCookies */
 	NULL
     };
     return check_if_write_lynxrc(table);
@@ -3098,14 +3190,27 @@ PRIVATE char *will_save_cookies NOARGS
 PRIVATE char *will_save_images NOARGS
 {
     static char *table[] = {
-	"make_pseudo_alts_for_inlines",	/* pseudo_inline_alts */
-	"make_links_for_all_images",	/* clickable_images */
+	RC_MAKE_PSEUDO_ALTS_FOR_INLINES, /* pseudo_inline_alts */
+	RC_MAKE_LINKS_FOR_ALL_IMAGES,	/* clickable_images */
 	NULL
     };
     return check_if_write_lynxrc(table);
 }
 
 /*
+ * The visited-links menu is used from the visited-links page as well as the
+ * options page.
+ */
+PUBLIC void LYMenuVisitedLinks ARGS2(
+	FILE *,		fp0,
+	int,		disable_all)
+{
+    BeginSelect(fp0, visited_links_string);
+    PutOptValues(fp0, Visited_Links_As, visited_links_values);
+    EndSelect(fp0);
+}
+
+/*
  * Okay, someone wants to change options.  So, let's gen up a form for them
  * and pass it around.  Gor, this is ugly.  Be a lot easier in Bourne with
  * "here" documents.  :->
@@ -3126,16 +3231,8 @@ PRIVATE int gen_options ARGS1(
     size_t cset_len = 0;
     size_t text_len = LYscreenWidth() > 45 ? LYscreenWidth() - 38 : 7;	/* cf: PutLabel */
 
-    if (LYReuseTempfiles) {
-	fp0 = LYOpenTempRewrite(tempfile, HTML_SUFFIX, "w");
-    } else {
-	LYRemoveTemp(tempfile);
-	fp0 = LYOpenTemp(tempfile, HTML_SUFFIX, "w");
-    }
-    if (fp0 == NULL) {
-	HTAlert(UNABLE_TO_OPEN_TEMPFILE);
+    if ((fp0 = InternalPageFP(tempfile, TRUE)) == 0)
 	return(NOT_FOUND);
-    }
 
     LYLocalFileToURL(newfile, tempfile);
 
@@ -3144,8 +3241,7 @@ PRIVATE int gen_options ARGS1(
        LYReuseTempfiles==FALSE.  Even for LYReuseTempfiles=TRUE, code
        at the end of postoptions() may remove an older cached version
        from memory if that version of the page was left by submitting
-       changes. (But that code doesn't do that - HTuncache_current_document
-       is currently commented out.) - kw 1999-11-27
+       changes. - kw 1999-11-27
        If access to the actual file via getfile() later fails
        (maybe because of some restrictions), mainloop may leave
        this flag on after popping the previous doc which is then
@@ -3167,7 +3263,7 @@ PRIVATE int gen_options ARGS1(
     /*
      * I do C, not HTML.  Feel free to pretty this up.
      */
-    fprintf(fp0, "<form action=\"LYNXOPTIONS:\" method=\"post\">\n");
+    fprintf(fp0, "<form action=\"%s\" method=\"post\">\n", STR_LYNXOPTIONS);
     /*
      * use following with some sort of one shot secret key akin to NCSA
      * (or was it CUTE?) telnet one shot password to allow ftp to self.
@@ -3184,8 +3280,8 @@ PRIVATE int gen_options ARGS1(
     fprintf(fp0,"<p align=center>\n");
     if (!disable_all) {
 	fprintf(fp0,"<input type=\"submit\" value=\"%s\"> - \n", ACCEPT_CHANGES);
-	fprintf(fp0,"<input type=\"reset\" value=\"%s\">\n", RESET_CHANGES);
-	fprintf(fp0,"%s\n", CANCEL_CHANGES);
+	fprintf(fp0,"<input type=\"reset\" value=\"%s\"> - \n", RESET_CHANGES);
+	fprintf(fp0,"%s - \n", CANCEL_CHANGES);
     }
     fprintf(fp0, "<a href=\"%s%s\">%s</a>\n",
 		 helpfilepath, OPTIONS_HELP, TO_HELP);
@@ -3197,7 +3293,8 @@ PRIVATE int gen_options ARGS1(
 	    fprintf(fp0, "<input type=\"checkbox\" name=\"%s\">\n",
 			 save_options_string);
 	}
-	fprintf(fp0, "<br>(options marked with (!) will not be saved)\n");
+	fprintf(fp0, "<br>%s\n",
+			gettext("(options marked with (!) will not be saved)"));
     }
 
     /*
@@ -3216,7 +3313,7 @@ PRIVATE int gen_options ARGS1(
 
     /* Editor: INPUT */
     PutLabel(fp0, gettext("Editor"), editor_string);
-    PutTextInput(fp0, editor_string, NOTEMPTY(editor), text_len,
+    PutTextInput(fp0, editor_string, NonNull(editor), text_len,
 		      DISABLED(no_editor || system_editor));
 
     /* Search Type: SELECT */
@@ -3225,6 +3322,9 @@ PRIVATE int gen_options ARGS1(
     PutOptValues(fp0, case_sensitive, search_type_values);
     EndSelect(fp0);
 
+    fprintf(fp0,"\n  <em>%s</em>\n", gettext("Security and Privacy"));
+    /*****************************************************************/
+
     /* Cookies: SELECT */
     PutLabel(fp0, gettext("Cookies"), will_save_cookies());
     BeginSelect(fp0, cookies_string);
@@ -3239,6 +3339,19 @@ PRIVATE int gen_options ARGS1(
 		   cookies_accept_all_string);
     EndSelect(fp0);
 
+    /* Cookie Prompting: SELECT */
+    PutLabel(fp0, gettext("Invalid-Cookie Prompting"), cookie_prompt_string);
+    BeginSelect(fp0, cookie_prompt_string);
+    PutOptValues(fp0, cookie_noprompt, prompt_values);
+    EndSelect(fp0);
+
+#ifdef USE_SSL
+    /* SSL Prompting: SELECT */
+    PutLabel(fp0, gettext("SSL Prompting"), ssl_prompt_string);
+    BeginSelect(fp0, ssl_prompt_string);
+    PutOptValues(fp0, ssl_noprompt, prompt_values);
+    EndSelect(fp0);
+#endif
 
     fprintf(fp0,"\n  <em>%s</em>\n", gettext("Keyboard Input"));
     /*****************************************************************/
@@ -3291,9 +3404,19 @@ PRIVATE int gen_options ARGS1(
     fprintf(fp0,"\n  <em>%s</em>\n", gettext("Display and Character Set"));
     /*****************************************************************/
 
+#ifdef EXP_LOCALE_CHARSET
+    /* Use locale-based character set: ON/OFF */
+    PutLabel(fp0, gettext("Use locale-based character set"), locale_charset_string);
+    BeginSelect(fp0, locale_charset_string);
+    PutOptValues(fp0, LYLocaleCharset, bool_values);
+    EndSelect(fp0);
+#else
+#define LYLocaleCharset FALSE
+#endif
+
     /* Display Character Set: SELECT */
     PutLabel(fp0, gettext("Display character set"), display_char_set_string);
-    BeginSelect(fp0, display_char_set_string);
+    MaybeSelect(fp0, LYLocaleCharset, display_char_set_string);
     for (i = 0; LYchar_set_names[i]; i++) {
 	char temp[10];
 	size_t len = strlen(LYchar_set_names[i]);
@@ -3352,7 +3475,7 @@ PRIVATE int gen_options ARGS1(
 
     /* X Display: INPUT */
     PutLabel(fp0, gettext("X Display"),	x_display_string);
-    PutTextInput(fp0, x_display_string, NOTEMPTY(x_display), text_len, "");
+    PutTextInput(fp0, x_display_string, NonNull(x_display), text_len, "");
 
     /*
      * Document Appearance
@@ -3392,19 +3515,31 @@ PRIVATE int gen_options ARGS1(
     PutOptValues(fp0, LYShowCursor, bool_values);
     EndSelect(fp0);
 
+    /* Underline links: ON/OFF */
+    PutLabel(fp0, gettext("Underline links"), underline_links_string);
+    BeginSelect(fp0, underline_links_string);
+    PutOptValues(fp0, LYUnderlineLinks, bool_values);
+    EndSelect(fp0);
+
+#ifdef USE_SCROLLBAR
+    /* Show scrollbar: ON/OFF */
+    PutLabel(fp0, gettext("Show scrollbar"), show_scrollbar_string);
+    BeginSelect(fp0, show_scrollbar_string);
+    PutOptValues(fp0, LYShowScrollbar, bool_values);
+    EndSelect(fp0);
+#endif
+
     /* Select Popups: ON/OFF */
     PutLabel(fp0, gettext("Popups for select fields"), select_popups_string);
     BeginSelect(fp0, select_popups_string);
     PutOptValues(fp0, LYSelectPopups, bool_values);
     EndSelect(fp0);
 
-#ifndef SH_EX  /* 1999/01/19 (Tue) */
     /* HTML error recovery: SELECT */
     PutLabel(fp0, gettext("HTML error recovery"), DTD_recovery_string);
     BeginSelect(fp0, DTD_recovery_string);
     PutOptValues(fp0, Old_DTD, DTD_type_values);
     EndSelect(fp0);
-#endif
 
     /* Show Images: SELECT */
     PutLabel(fp0, gettext("Show images"), will_save_images());
@@ -3435,23 +3570,23 @@ PRIVATE int gen_options ARGS1(
     /* Mail Address: INPUT */
     PutLabel(fp0, gettext("Personal mail address"), mail_address_string);
     PutTextInput(fp0, mail_address_string,
-		      NOTEMPTY(personal_mail_address), text_len, "");
+		      NonNull(personal_mail_address), text_len, "");
 
     /* Preferred Document Character Set: INPUT */
     PutLabel(fp0, gettext("Preferred document character set"), preferred_doc_char_string);
     PutTextInput(fp0, preferred_doc_char_string,
-		      NOTEMPTY(pref_charset), cset_len+2, "");
+		      NonNull(pref_charset), cset_len+2, "");
 
     /* Preferred Document Language: INPUT */
     PutLabel(fp0, gettext("Preferred document language"), preferred_doc_lang_string);
     PutTextInput(fp0, preferred_doc_lang_string,
-		      NOTEMPTY(language), cset_len+2, "");
+		      NonNull(language), cset_len+2, "");
 
     /* User Agent: INPUT */
     if (!no_useragent) {
 	PutLabel(fp0, gettext("User-Agent header"), user_agent_string);
 	PutTextInput(fp0, user_agent_string,
-			  NOTEMPTY(LYUserAgent), text_len, "");
+			  NonNull(LYUserAgent), text_len, "");
     }
 
     /*
@@ -3468,10 +3603,17 @@ PRIVATE int gen_options ARGS1(
 
 #ifdef DIRED_SUPPORT
     /* Local Directory Sort: SELECT */
-    PutLabel(fp0, gettext("Local directory sort criteria"), dired_sort_string);
+    PutLabel(fp0, gettext("Local directory sort criteria"), dired_list_string);
+    BeginSelect(fp0, dired_list_string);
+    PutOptValues(fp0, dir_list_style, dired_list_values);
+    EndSelect(fp0);
+#ifdef LONG_LIST
+    /* Local Directory Order: SELECT */
+    PutLabel(fp0, gettext("Local directory sort order"), dired_sort_string);
     BeginSelect(fp0, dired_sort_string);
-    PutOptValues(fp0, dir_list_style, dired_values);
+    PutOptValues(fp0, dir_list_order, dired_sort_values);
     EndSelect(fp0);
+#endif /* LONG_LIST */
 #endif /* DIRED_SUPPORT */
 
     /* Show dot files: ON/OFF */
@@ -3502,13 +3644,23 @@ PRIVATE int gen_options ARGS1(
     EndSelect(fp0);
 #endif /* ENABLE_OPTS_CHANGE_EXEC */
 
-#ifdef EXP_READPROGRESS
-    /* Local Directory Sort: SELECT */
+#ifdef USE_READPROGRESS
+    /* Show transfer rate: SELECT */
     PutLabel(fp0, gettext("Show transfer rate"), show_rate_string);
     BeginSelect(fp0, show_rate_string);
-    PutOptValues(fp0, LYTransferRate, rate_values);
+    for (i = 0; rate_values[i].LongName != 0; ++i) {
+	char *message = NULL;
+	HTSprintf0(&message,
+		   rate_values[i].LongName,
+		   HTProgressUnits(rate_values[i].value));
+	PutOption(fp0,
+		  LYTransferRate == rate_values[i].value,
+		  rate_values[i].HtmlName,
+		  message);
+        FREE(message);
+    }
     EndSelect(fp0);
-#endif /* EXP_READPROGRESS */
+#endif /* USE_READPROGRESS */
 
     /*
      * Special Files and Screens
@@ -3527,22 +3679,22 @@ PRIVATE int gen_options ARGS1(
     /* Bookmarks File Menu: LINK/INPUT */
     if (LYMultiBookmarks) {
 	PutLabel(fp0, gettext("Review/edit Bookmarks files"), mbm_string);
-	fprintf(fp0, "<a href=\"LYNXOPTIONS://MBM_MENU\">%s</a>\n",
-		    gettext("Goto multi-bookmark menu"));
+	fprintf(fp0, "<a href=\"%s//MBM_MENU\">%s</a>\n",
+		    STR_LYNXOPTIONS, gettext("Goto multi-bookmark menu"));
     } else {
 	PutLabel(fp0, gettext("Bookmarks file"), single_bookmark_string);
 	PutTextInput(fp0, single_bookmark_string,
-			 NOTEMPTY(bookmark_page), text_len, "");
+			 NonNull(bookmark_page), text_len, "");
     }
 
     /* Visited Pages: SELECT */
     PutLabel(fp0, gettext("Visited Pages"), visited_links_string);
-    BeginSelect(fp0, visited_links_string);
-    PutOptValues(fp0, Visited_Links_As, visited_links_values);
-    EndSelect(fp0);
+    LYMenuVisitedLinks(fp0, disable_all);
 
     if (!no_lynxcfg_info) {
-	fprintf(fp0, "\n  Check your <a href=\"LYNXCFG:\">lynx.cfg</a> here\n");
+	fprintf(fp0, "\n  %s<a href=\"%s\">lynx.cfg</a>.\n",
+		     gettext("View the file "),
+		     STR_LYNXCFG);
     }
 
     fprintf(fp0,"\n</pre>\n");
@@ -3550,8 +3702,8 @@ PRIVATE int gen_options ARGS1(
     /* Submit/Reset */
     if (!disable_all) {
 	fprintf(fp0,"<p align=center>\n");
-	fprintf(fp0,"<input type=\"submit\" value=\"%s\">\n - ", ACCEPT_CHANGES);
-	fprintf(fp0,"<input type=\"reset\" value=\"%s\">\n", RESET_CHANGES);
+	fprintf(fp0,"<input type=\"submit\" value=\"%s\"> - \n", ACCEPT_CHANGES);
+	fprintf(fp0,"<input type=\"reset\" value=\"%s\"> - \n", RESET_CHANGES);
 	fprintf(fp0,"%s\n", CANCEL_CHANGES);
     }
 
diff --git a/gnu/usr.bin/lynx/src/LYOptions.h b/gnu/usr.bin/lynx/src/LYOptions.h
index a606a3820db..16b4394e71d 100644
--- a/gnu/usr.bin/lynx/src/LYOptions.h
+++ b/gnu/usr.bin/lynx/src/LYOptions.h
@@ -21,7 +21,8 @@ extern  int popup_choice PARAMS((
 	popup_choice(cur, line, column, (CONST char **)choices, length, disabled, mouse)
 
 #ifndef NO_OPTION_FORMS
-extern int postoptions PARAMS((document *newdoc));
+extern void LYMenuVisitedLinks PARAMS((FILE * fp0, int disable_all));
+extern int postoptions PARAMS((DocInfo *newdoc));
 #endif /* !NO_OPTION_FORMS */
 
 #ifndef NO_OPTION_MENU
diff --git a/gnu/usr.bin/lynx/src/LYPrint.c b/gnu/usr.bin/lynx/src/LYPrint.c
index 360330a54b4..e85706e166b 100644
--- a/gnu/usr.bin/lynx/src/LYPrint.c
+++ b/gnu/usr.bin/lynx/src/LYPrint.c
@@ -106,7 +106,7 @@ PRIVATE void set_environ ARGS3(
 }
 
 PRIVATE char *suggested_filename ARGS1(
-	document *,	newdoc)
+	DocInfo *,	newdoc)
 {
     char *cp, *sug_filename = 0;
 
@@ -157,7 +157,7 @@ PRIVATE void SetupFilename ARGS2(
 	format = HTFileFormat(filename, &encoding, NULL);
 	if (!strcasecomp(format->name, "text/html") ||
 	    !IsUnityEnc(encoding)) {
-	    strcpy(cp, ".txt");
+	    strcpy(cp, TEXT_SUFFIX);
 	}
     }
 }
@@ -302,7 +302,7 @@ PRIVATE BOOLEAN confirm_by_pages ARGS3(
 }
 
 PRIVATE void send_file_to_file ARGS3(
-	document *,	newdoc,
+	DocInfo *,	newdoc,
 	char *,		content_base,
 	char *,		sug_filename)
 {
@@ -362,7 +362,7 @@ check_recall:
      */
     CTRACE((tfp, "LYPrint: filename is %s, action is `%c'\n", buffer, c));
 
-#if HAVE_POPEN
+#ifdef HAVE_POPEN
     if (*buffer == '|') {
 	if (no_shell) {
 	    HTUserMsg(SPAWNING_DISABLED);
@@ -447,7 +447,7 @@ check_recall:
     if (keypad_mode)
 	printlist(outfile_fp,FALSE);
 
-#if HAVE_POPEN
+#ifdef HAVE_POPEN
     if (LYIsPipeCommand(buffer))
 	pclose(outfile_fp);
     else
@@ -473,7 +473,7 @@ done:
 }
 
 PRIVATE void send_file_to_mail ARGS3(
-	document *,	newdoc,
+	DocInfo *,	newdoc,
 	char *,		content_base,
 	char *,		content_location)
 {
@@ -497,6 +497,9 @@ PRIVATE void send_file_to_mail ARGS3(
     char *subject = NULL;
     char user_response[LINESIZE];
 
+    if (!LYSystemMail())
+	return;
+
     if (LYPreparsedSource && first_mail_preparsed &&
 	HTisDocumentSource()) {
 	if (HTConfirmDefault(CONFIRM_MAIL_SOURCE_PREPARSED, NO) == YES) {
@@ -561,14 +564,14 @@ PRIVATE void send_file_to_mail ARGS3(
     outfile_fp = LYOpenTemp(my_temp,
 			    (HTisDocumentSource())
 				    ? HTML_SUFFIX
-				    : ".txt",
+				    : TEXT_SUFFIX,
 			    "w");
     if (outfile_fp == NULL) {
 	CannotPrint(UNABLE_TO_OPEN_TEMPFILE);
     }
 
     if (isPMDF) {
-	if ((hfd = LYOpenTemp(hdrfile, ".txt", "w")) == NULL) {
+	if ((hfd = LYOpenTemp(hdrfile, TEXT_SUFFIX, "w")) == NULL) {
 	    CannotPrint(UNABLE_TO_OPEN_TEMPFILE);
 	}
 	if (use_type) {
@@ -675,7 +678,7 @@ PRIVATE void send_file_to_mail ARGS3(
 #if CAN_PIPE_TO_MAILER
     outfile_fp = LYPipeToMailer();
 #else
-    outfile_fp = LYOpenTemp(my_temp, ".txt", "w");
+    outfile_fp = LYOpenTemp(my_temp, TEXT_SUFFIX, "w");
 #endif
     if (outfile_fp == NULL) {
 	CannotPrint(MAIL_REQUEST_FAILED);
@@ -794,7 +797,7 @@ done:	/* send_file_to_mail() */
 }
 
 PRIVATE void send_file_to_printer ARGS4(
-	document *,	newdoc,
+	DocInfo *,	newdoc,
 	char *,		content_base,
 	char *,		sug_filename,
 	int,		printer_number)
@@ -810,7 +813,7 @@ PRIVATE void send_file_to_printer ARGS4(
     outfile_fp = LYOpenTemp(my_temp,
 			    (HTisDocumentSource())
 				    ? HTML_SUFFIX
-				    : ".txt",
+				    : TEXT_SUFFIX,
 			    "w");
     if (outfile_fp == NULL) {
 	CannotPrint(FILE_ALLOC_FAILED);
@@ -882,19 +885,9 @@ check_again:
 	}
 	/*
 	 * Cancel if the user entered "/dev/null" on Unix, or an "nl:" path
-	 * (case-insensitive) on VMS.  - FM
+	 * on VMS.  - FM
 	 */
-#ifdef VMS
-	if (!strncasecomp(my_file, "nl:", 3) ||
-	    !strncasecomp(my_file, "/nl/", 4))
-#else
-#if defined(DOSPATH)	/* 1997/10/15 (Wed) 16:41:30 */
-	if (!strcmp(my_file, "nul"))
-#else
-	if (!strcmp(my_file, "/dev/null"))
-#endif /* DOSPATH */
-#endif /* VMS */
-	{
+	if (LYIsNullDevice(my_file)) {
 	    CancelPrint(PRINT_REQUEST_CANCELLED);
 	}
 	HTAddSugFilename(my_file);
@@ -968,7 +961,7 @@ done:	/* send_file_to_printer() */
 }
 
 PRIVATE void send_file_to_screen ARGS3(
-	document *,	newdoc,
+	DocInfo *,	newdoc,
 	char *,		content_base,
 	BOOLEAN,	Lpansi)
 {
@@ -1043,7 +1036,7 @@ done:	/* send_file_to_screen() */
 }
 
 PUBLIC int printfile ARGS1(
-	document *,	newdoc)
+	DocInfo *,	newdoc)
 {
     BOOLEAN Lpansi = FALSE;
     DocAddress WWWDoc;
@@ -1211,8 +1204,8 @@ PRIVATE int remove_quotes ARGS1(
 /*
  *  Mail subject may have 8-bit characters and they are in display charset.
  *  There is no stable practice for 8-bit subject encodings:
- *  MIME define "quoted-printable" which holds charset info
- *  but most mailers still don't support it, on the other hand
+ *  MIME defines "quoted-printable" which holds charset info
+ *  but most mailers still don't support it.  On the other hand
  *  many mailers send open 8-bit subjects without charset info
  *  and use local assumption for certain countries.  Besides that,
  *  obsolete SMTP software is not 8bit clean but still in use,
@@ -1273,16 +1266,8 @@ PUBLIC int print_options ARGS3(
     FILE *fp0;
     lynx_list_item_type *cur_printer;
 
-    if (LYReuseTempfiles) {
-	fp0 = LYOpenTempRewrite(my_temp, HTML_SUFFIX, "w");
-    } else {
-	LYRemoveTemp(my_temp);
-	fp0 = LYOpenTemp(my_temp, HTML_SUFFIX, "w");
-    }
-    if (fp0 == NULL) {
-	HTAlert(UNABLE_TO_OPEN_PRINTOP_FILE);
+    if ((fp0 = InternalPageFP(my_temp, TRUE)) == 0)
 	return(-1);
-    }
 
     LYLocalFileToURL(newfile, my_temp);
 
@@ -1311,7 +1296,8 @@ PUBLIC int print_options ARGS3(
 
     if (child_lynx == FALSE && no_disk_save == FALSE && no_print == FALSE) {
 	fprintf(fp0,
-		"   <a href=\"LYNXPRINT://LOCAL_FILE/lines=%d\">%s</a>\n",
+		"   <a href=\"%s//LOCAL_FILE/lines=%d\">%s</a>\n",
+		STR_LYNXPRINT,
 		lines_in_file,
 		gettext("Save to a local file"));
     } else {
@@ -1319,17 +1305,20 @@ PUBLIC int print_options ARGS3(
     }
     if (child_lynx == FALSE && no_mail == FALSE && local_host_only == FALSE)
 	fprintf(fp0,
-		"   <a href=\"LYNXPRINT://MAIL_FILE/lines=%d\">%s</a>\n",
+		"   <a href=\"%s//MAIL_FILE/lines=%d\">%s</a>\n",
+		STR_LYNXPRINT,
 		lines_in_file,
 		gettext("Mail the file"));
 
-#ifndef DOSPATH
+#if defined(UNIX) || defined(VMS)
     fprintf(fp0,
-	    "   <a href=\"LYNXPRINT://TO_SCREEN/lines=%d\">%s</a>\n",
+	    "   <a href=\"%s//TO_SCREEN/lines=%d\">%s</a>\n",
+	    STR_LYNXPRINT,
 	    lines_in_file,
 	    gettext("Print to the screen"));
     fprintf(fp0,
-	    "   <a href=\"LYNXPRINT://LPANSI/lines=%d\">%s</a>\n",
+	    "   <a href=\"%s//LPANSI/lines=%d\">%s</a>\n",
+	    STR_LYNXPRINT,
 	    lines_in_file,
 	    gettext("Print out on a printer attached to your vt100 terminal"));
 #endif
@@ -1341,7 +1330,8 @@ PUBLIC int print_options ARGS3(
 	cur_printer = cur_printer->next, count++)
     if (no_print == FALSE || cur_printer->always_enabled) {
 	fprintf(fp0,
-		"   <a href=\"LYNXPRINT://PRINTER/number=%d/pagelen=%d/lines=%d\">",
+		"   <a href=\"%s//PRINTER/number=%d/pagelen=%d/lines=%d\">",
+		STR_LYNXPRINT,
 		count, cur_printer->pagelen, lines_in_file);
 	fprintf(fp0, (cur_printer->name ?
 		      cur_printer->name : "No Name Given"));
diff --git a/gnu/usr.bin/lynx/src/LYPrint.h b/gnu/usr.bin/lynx/src/LYPrint.h
index 0aee2a825ce..249b12b6c9c 100644
--- a/gnu/usr.bin/lynx/src/LYPrint.h
+++ b/gnu/usr.bin/lynx/src/LYPrint.h
@@ -5,10 +5,9 @@
 #include <LYStructs.h>
 #endif /* LYSTRUCTS_H */
 
-extern int printfile PARAMS((document *newdoc));
+extern int printfile PARAMS((DocInfo *newdoc));
 extern int print_options PARAMS((char **newfile,
 				 CONST char *printed_url, int lines_in_file));
 extern char * GetFileName NOPARAMS;
 
 #endif /* LYPRINT_H */
-
diff --git a/gnu/usr.bin/lynx/src/LYReadCFG.c b/gnu/usr.bin/lynx/src/LYReadCFG.c
index 7dd55482110..4a24a94070f 100644
--- a/gnu/usr.bin/lynx/src/LYReadCFG.c
+++ b/gnu/usr.bin/lynx/src/LYReadCFG.c
@@ -36,8 +36,7 @@
 #include <LYLeaks.h>
 
 #ifndef DISABLE_NEWS
-extern int HTNewsMaxChunk;  /* Max news articles before chunking (HTNews.c) */
-extern int HTNewsChunkSize; /* Number of news articles per chunk (HTNews.c) */
+#include <HTNews.h>
 #endif
 
 PUBLIC BOOLEAN have_read_cfg = FALSE;
@@ -190,7 +189,7 @@ PRIVATE void add_item_to_list ARGS3(
 	}
 	if (*next_colon++) {
 	    colon = next_colon;
-	    if ((next_colon = strchr(colon,':')) != 0)
+	    if ((next_colon = strchr(colon, ':')) != 0)
 		*next_colon++ = '\0';
 	    cur_item->always_enabled = is_true(colon);
 	    if (next_colon) {
@@ -236,7 +235,7 @@ PUBLIC int match_item_by_name ARGS3(
 #define COLOR_BLACK 0
 #endif
 
-#if USE_DEFAULT_COLORS
+#ifdef USE_DEFAULT_COLORS
 int default_fg = DEFAULT_COLOR;
 int default_bg = DEFAULT_COLOR;
 #else
@@ -294,7 +293,7 @@ PUBLIC int check_color ARGS2(
 
     CTRACE2(TRACE_STYLE, (tfp, "check_color(%s,%d)\n", color, the_default));
     if (!strcasecomp(color, "default")) {
-#if USE_DEFAULT_COLORS
+#ifdef USE_DEFAULT_COLORS
 	if (!default_color_reset)
 	    the_default = DEFAULT_COLOR;
 #endif	/* USE_DEFAULT_COLORS */
@@ -328,7 +327,7 @@ PUBLIC CONST char *lookup_color ARGS1(
 }
 #endif /* USE_COLOR_STYLE || USE_COLOR_TABLE */
 
-#if defined(USE_COLOR_TABLE)
+#if defined(USE_COLOR_TABLE) || defined(EXP_ASSUMED_COLOR)
 
 /*
  *  Exit routine for failed COLOR parsing.
@@ -353,7 +352,9 @@ The special strings 'nocolor' or 'default', or\n")
     fprintf (stderr, "%s\n%s\n", gettext("Offending line:"), error_line);
     exit_immediately(EXIT_FAILURE);
 }
+#endif /* defined(USE_COLOR_TABLE) || defined(EXP_ASSUMED_COLOR) */
 
+#if defined(USE_COLOR_TABLE)
 /*
  *  Process string buffer fields for COLOR setting.
  */
@@ -395,7 +396,7 @@ PRIVATE void parse_color ARGS1(
 }
 #endif /* USE_COLOR_TABLE */
 
-#ifdef SOURCE_CACHE
+#ifdef USE_SOURCE_CACHE
 static Config_Enum tbl_source_cache[] = {
     { "FILE",	SOURCE_CACHE_FILE },
     { "MEMORY",	SOURCE_CACHE_MEMORY },
@@ -416,6 +417,7 @@ static Config_Enum tbl_abort_source_cache[] = {
 #define PARSE_INT(n,v)   {n, CONF_INT,         UNION_INT(v), 0}
 #define PARSE_TIM(n,v)   {n, CONF_TIME,        UNION_INT(v), 0}
 #define PARSE_STR(n,v)   {n, CONF_STR,         UNION_STR(v), 0}
+#define PARSE_PRG(n,v)   {n, CONF_PRG,         UNION_DEF(v), 0}
 #define PARSE_Env(n,v)   {n, CONF_ENV,         UNION_ENV(v), 0}
 #define PARSE_ENV(n,v)   {n, CONF_ENV2,        UNION_ENV(v), 0}
 #define PARSE_FUN(n,v)   {n, CONF_FUN,         UNION_FUN(v), 0}
@@ -431,6 +433,7 @@ typedef enum {
     ,CONF_ENUM
     ,CONF_INT
     ,CONF_STR
+    ,CONF_PRG
     ,CONF_ENV			/* from environment variable */
     ,CONF_ENV2			/* from environment VARIABLE */
     ,CONF_INCLUDE		/* include file-- handle special */
@@ -447,31 +450,6 @@ typedef struct
 }
 Config_Type;
 
-PRIVATE BOOLEAN LYgetEnum ARGS3(
-    Config_Enum *,	table,
-    CONST char *,	name,
-    int *,		result)
-{
-    Config_Enum *found = 0;
-    unsigned len = strlen(name);
-
-    if (len != 0) {
-	while (table->name != 0) {
-	    if (!strncasecomp(table->name, name, len)) {
-		if (found != 0)
-		    return FALSE; /* ambiguous, don't use this */
-		found = table;
-	    }
-	    table++;
-	}
-	if (found != 0) {
-	    *result = found->value;
-	    return TRUE;
-	}
-    }
-    return FALSE;		/* no match */
-}
-
 PRIVATE int assume_charset_fun ARGS1(
 	char *,		value)
 {
@@ -554,7 +532,7 @@ PRIVATE int assumed_color_fun ARGS1(
     if (default_fg == ERR_COLOR
      || default_bg == ERR_COLOR)
 	exit_with_color_syntax(temp);
-#if USE_SLANG
+#ifdef USE_SLANG
     /*
      * Sorry - the order of initialization of slang precludes setting the
      * default colors from the lynx.cfg file, since slang is already
@@ -1140,7 +1118,7 @@ PRIVATE int parse_html_src_spec ARGS3(
     * message.
     */
     char* ts2;
-    if ( !value || !*value) return 0; /* silently ignoring*/
+    if (isEmpty(value)) return 0; /* silently ignoring*/
 
 #define BS() html_src_bad_syntax(value,option_name)
 
@@ -1185,7 +1163,7 @@ PRIVATE int psrcspec_fun ARGS1(char*,s)
     };
     int found;
 
-    e = strchr(s,':');
+    e = strchr(s, ':');
     if (!e) {
 	CTRACE((tfp,"bad format of PRETTYSRC_SPEC setting value, ignored %s\n",s));
 	return 0;
@@ -1230,267 +1208,325 @@ PRIVATE int read_htmlsrc_tagname_xform ARGS1( char*,str)
 }
 #endif
 
+#if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
+PRIVATE int screen_size_fun ARGS1(
+	char *,		value)
+{
+    char *cp;
+
+    if ((cp = strchr(value, ',')) != 0) {
+	*cp++ = '\0';       /* Terminate ID */
+	scrsize_x = atoi(value);
+	scrsize_y = atoi(cp);
+	if ((scrsize_x <= 1) || (scrsize_y <= 1)) {
+	    scrsize_x = scrsize_y = 0;
+	}
+	if ((scrsize_x > 0) && (scrsize_x < 80)) {
+	    scrsize_x = 80;
+	}
+	if ((scrsize_y > 0) && (scrsize_y < 4)) {
+	    scrsize_y = 4;
+	}
+	CTRACE((tfp, "scrsize: x=%d, y=%d\n", scrsize_x, scrsize_y));
+    }
+    return 0;
+}
+#endif
+
 /* This table is searched ignoring case */
 PRIVATE Config_Type Config_Table [] =
-{ 
-     PARSE_SET("accept_all_cookies",   LYAcceptAllCookies),
-     PARSE_TIM("alertsecs",            AlertSecs),
-     PARSE_SET("always_resubmit_posts", LYresubmit_posts),
+{
+     PARSE_SET(RC_ACCEPT_ALL_COOKIES,   LYAcceptAllCookies),
+     PARSE_TIM(RC_ALERTSECS,            AlertSecs),
+     PARSE_SET(RC_ALWAYS_RESUBMIT_POSTS, LYresubmit_posts),
 #ifdef EXEC_LINKS
-     PARSE_DEF("always_trusted_exec",  ALWAYS_EXEC_PATH),
+     PARSE_DEF(RC_ALWAYS_TRUSTED_EXEC,  ALWAYS_EXEC_PATH),
 #endif
-     PARSE_FUN("assume_charset",       assume_charset_fun),
-     PARSE_FUN("assume_local_charset", assume_local_charset_fun),
-     PARSE_FUN("assume_unrec_charset", assume_unrec_charset_fun),
+     PARSE_FUN(RC_ASSUME_CHARSET,       assume_charset_fun),
+     PARSE_FUN(RC_ASSUME_LOCAL_CHARSET, assume_local_charset_fun),
+     PARSE_FUN(RC_ASSUME_UNREC_CHARSET, assume_unrec_charset_fun),
 #ifdef EXP_ASSUMED_COLOR
-     PARSE_FUN("assumed_color",        assumed_color_fun),
+     PARSE_FUN(RC_ASSUMED_COLOR,        assumed_color_fun),
 #endif
 #ifdef EXP_CHARSET_CHOICE
-     PARSE_FUN("assumed_doc_charset_choice", parse_assumed_doc_charset_choice),
+     PARSE_FUN(RC_ASSUMED_DOC_CHARSET_CHOICE, parse_assumed_doc_charset_choice),
 #endif
 #ifdef DIRED_SUPPORT
-     PARSE_INT("auto_uncache_dirlists", LYAutoUncacheDirLists),
+     PARSE_INT(RC_AUTO_UNCACHE_DIRLISTS, LYAutoUncacheDirLists),
 #endif
 #ifndef DISABLE_BIBP
-     PARSE_STR("bibp_bibhost",         BibP_bibhost),
-     PARSE_STR("bibp_globalserver",    BibP_globalserver),
-#endif
-     PARSE_SET("block_multi_bookmarks", LYMBMBlocked),
-     PARSE_SET("bold_h1",              bold_H1),
-     PARSE_SET("bold_headers",         bold_headers),
-     PARSE_SET("bold_name_anchors",    bold_name_anchors),
-     PARSE_SET("case_sensitive_always_on", case_sensitive),
-     PARSE_FUN("character_set",        character_set_fun),
+     PARSE_STR(RC_BIBP_BIBHOST,         BibP_bibhost),
+     PARSE_STR(RC_BIBP_GLOBALSERVER,    BibP_globalserver),
+#endif
+     PARSE_SET(RC_BLOCK_MULTI_BOOKMARKS, LYMBMBlocked),
+     PARSE_SET(RC_BOLD_H1,              bold_H1),
+     PARSE_SET(RC_BOLD_HEADERS,         bold_headers),
+     PARSE_SET(RC_BOLD_NAME_ANCHORS,    bold_name_anchors),
+     PARSE_PRG(RC_BZIP2_PATH,           ppBZIP2),
+     PARSE_SET(RC_CASE_SENSITIVE_ALWAYS_ON, case_sensitive),
+     PARSE_FUN(RC_CHARACTER_SET,        character_set_fun),
 #ifdef CAN_SWITCH_DISPLAY_CHARSET
-     PARSE_STR("charset_switch_rules", charset_switch_rules),
-     PARSE_STR("charsets_directory",   charsets_directory),
+     PARSE_STR(RC_CHARSET_SWITCH_RULES, charset_switch_rules),
+     PARSE_STR(RC_CHARSETS_DIRECTORY,   charsets_directory),
 #endif
-     PARSE_SET("checkmail",            check_mail),
-     PARSE_SET("collapse_br_tags",     LYCollapseBRs),
+     PARSE_SET(RC_CHECKMAIL,            check_mail),
+     PARSE_PRG(RC_CHMOD_PATH,           ppCHMOD),
+     PARSE_SET(RC_COLLAPSE_BR_TAGS,     LYCollapseBRs),
 #ifdef USE_COLOR_TABLE
-     PARSE_FUN("color",                color_fun),
-#endif
-#ifndef __DJGPP__
-     PARSE_INT("connect_timeout",      connect_timeout),
-#endif
-     PARSE_STR("cookie_accept_domains", LYCookieSAcceptDomains),
-#ifdef EXP_PERSISTENT_COOKIES
-     PARSE_STR("cookie_file",          LYCookieFile),
-#endif /* EXP_PERSISTENT_COOKIES */
-     PARSE_STR("cookie_loose_invalid_domains", LYCookieSLooseCheckDomains),
-     PARSE_STR("cookie_query_invalid_domains", LYCookieSQueryCheckDomains),
-     PARSE_STR("cookie_reject_domains", LYCookieSRejectDomains),
-#ifdef EXP_PERSISTENT_COOKIES
-     PARSE_STR("cookie_save_file",     LYCookieSaveFile),
-#endif /* EXP_PERSISTENT_COOKIES */
-     PARSE_STR("cookie_strict_invalid_domains", LYCookieSStrictCheckDomains),
-     PARSE_Env("cso_proxy", 0 ),
+     PARSE_FUN(RC_COLOR,                color_fun),
+#endif
+     PARSE_PRG(RC_COMPRESS_PATH,        ppCOMPRESS),
+     PARSE_PRG(RC_COPY_PATH,            ppCOPY),
+     PARSE_INT(RC_CONNECT_TIMEOUT,      connect_timeout),
+     PARSE_STR(RC_COOKIE_ACCEPT_DOMAINS, LYCookieSAcceptDomains),
+#ifdef USE_PERSISTENT_COOKIES
+     PARSE_STR(RC_COOKIE_FILE,          LYCookieFile),
+#endif /* USE_PERSISTENT_COOKIES */
+     PARSE_STR(RC_COOKIE_LOOSE_INVALID_DOMAINS, LYCookieSLooseCheckDomains),
+     PARSE_STR(RC_COOKIE_QUERY_INVALID_DOMAINS, LYCookieSQueryCheckDomains),
+     PARSE_STR(RC_COOKIE_REJECT_DOMAINS, LYCookieSRejectDomains),
+#ifdef USE_PERSISTENT_COOKIES
+     PARSE_STR(RC_COOKIE_SAVE_FILE,     LYCookieSaveFile),
+#endif /* USE_PERSISTENT_COOKIES */
+     PARSE_STR(RC_COOKIE_STRICT_INVALID_DOMAIN, LYCookieSStrictCheckDomains),
+     PARSE_Env(RC_CSO_PROXY,		0),
 #ifdef VMS
-     PARSE_STR("cswing_path",          LYCSwingPath),
-#endif
-     PARSE_FUN("default_bookmark_file", default_bookmark_file_fun),
-     PARSE_FUN("default_cache_size",   default_cache_size_fun),
-     PARSE_FUN("default_editor",       default_editor_fun),
-     PARSE_STR("default_index_file",   indexfile),
-     PARSE_ENU("default_keypad_mode",  keypad_mode, tbl_keypad_mode),
-     PARSE_FUN("default_keypad_mode_is_numbers_as_arrows", numbers_as_arrows_fun),
-     PARSE_ENU("default_user_mode",    user_mode, tbl_user_mode),
+     PARSE_PRG(RC_CSWING_PATH,          ppCSWING),
+#endif
+     PARSE_TIM(RC_DELAYSECS,            DebugSecs),
+     PARSE_FUN(RC_DEFAULT_BOOKMARK_FILE, default_bookmark_file_fun),
+     PARSE_FUN(RC_DEFAULT_CACHE_SIZE,   default_cache_size_fun),
+     PARSE_FUN(RC_DEFAULT_EDITOR,       default_editor_fun),
+     PARSE_STR(RC_DEFAULT_INDEX_FILE,   indexfile),
+     PARSE_ENU(RC_DEFAULT_KEYPAD_MODE,  keypad_mode, tbl_keypad_mode),
+     PARSE_FUN(RC_DEFAULT_KEYPAD_MODE_NUMARO, numbers_as_arrows_fun),
+     PARSE_ENU(RC_DEFAULT_USER_MODE,    user_mode, tbl_user_mode),
 #if defined(VMS) && defined(VAXC) && !defined(__DECC)
-     PARSE_INT("default_virtual_memory_size", HTVirtualMemorySize),
+     PARSE_INT(RC_DEFAULT_VIRTUAL_MEMORY_SIZE, HTVirtualMemorySize),
 #endif
 #ifdef DIRED_SUPPORT
-     PARSE_FUN("dired_menu",           dired_menu_fun),
+     PARSE_FUN(RC_DIRED_MENU,           dired_menu_fun),
 #endif
 #ifdef EXP_CHARSET_CHOICE
-     PARSE_FUN("display_charset_choice", parse_display_charset_choice),
+     PARSE_FUN(RC_DISPLAY_CHARSET_CHOICE, parse_display_charset_choice),
 #endif
-     PARSE_ADD("downloader",           downloaders),
-     PARSE_SET("emacs_keys_always_on", emacs_keys),
-     PARSE_FUN("enable_lynxrc",        enable_lynxrc),
-     PARSE_SET("enable_scrollback",    enable_scrollback),
+     PARSE_ADD(RC_DOWNLOADER,           downloaders),
+     PARSE_SET(RC_EMACS_KEYS_ALWAYS_ON, emacs_keys),
+     PARSE_FUN(RC_ENABLE_LYNXRC,        enable_lynxrc),
+     PARSE_SET(RC_ENABLE_SCROLLBACK,    enable_scrollback),
 #ifdef USE_EXTERNALS
-     PARSE_ADD("external",             externals),
+     PARSE_ADD(RC_EXTERNAL,             externals),
 #endif
-     PARSE_Env("finger_proxy",         0 ),
+     PARSE_Env(RC_FINGER_PROXY,         0),
 #if defined(_WINDOWS)	/* 1998/10/05 (Mon) 17:34:15 */
-     PARSE_SET("focus_window",         focus_window),
+     PARSE_SET(RC_FOCUS_WINDOW,         focus_window),
+#endif
+     PARSE_SET(RC_FORCE_8BIT_TOUPPER,   UCForce8bitTOUPPER),
+     PARSE_ENU(RC_FORCE_COOKIE_PROMPT,  cookie_noprompt, tbl_force_prompt),
+     PARSE_SET(RC_FORCE_EMPTY_HREFLESS_A, force_empty_hrefless_a),
+     PARSE_SET(RC_FORCE_SSL_COOKIES_SECURE, LYForceSSLCookiesSecure),
+#ifdef USE_SSL
+     PARSE_ENU(RC_FORCE_SSL_PROMPT,     ssl_noprompt, tbl_force_prompt),
 #endif
-     PARSE_SET("force_8bit_toupper",   UCForce8bitTOUPPER),
-     PARSE_SET("force_empty_hrefless_a", force_empty_hrefless_a),
-     PARSE_SET("force_ssl_cookies_secure", LYForceSSLCookiesSecure),
 #if !defined(NO_OPTION_FORMS) && !defined(NO_OPTION_MENU)
-     PARSE_SET("forms_options",        LYUseFormsOptions),
-#endif
-     PARSE_SET("ftp_passive",          ftp_passive),
-     PARSE_Env("ftp_proxy",            0 ),
-     PARSE_STR("global_extension_map", global_extension_map),
-     PARSE_STR("global_mailcap",       global_type_map),
-     PARSE_Env("gopher_proxy",         0 ),
-     PARSE_SET("gotobuffer",           goto_buffer),
-     PARSE_STR("helpfile",             helpfile),
+     PARSE_SET(RC_FORMS_OPTIONS,        LYUseFormsOptions),
+#endif
+     PARSE_SET(RC_FTP_PASSIVE,          ftp_passive),
+     PARSE_Env(RC_FTP_PROXY,            0),
+     PARSE_STR(RC_GLOBAL_EXTENSION_MAP, global_extension_map),
+     PARSE_STR(RC_GLOBAL_MAILCAP,       global_type_map),
+     PARSE_Env(RC_GOPHER_PROXY,         0),
+     PARSE_SET(RC_GOTOBUFFER,           goto_buffer),
+     PARSE_PRG(RC_GZIP_PATH,            ppGZIP),
+     PARSE_STR(RC_HELPFILE,             helpfile),
 #ifdef MARK_HIDDEN_LINKS
-     PARSE_STR("hidden_link_marker",   hidden_link_marker),
+     PARSE_STR(RC_HIDDEN_LINK_MARKER,   hidden_link_marker),
 #endif
-     PARSE_SET("historical_comments",  historical_comments),
+     PARSE_SET(RC_HISTORICAL_COMMENTS,  historical_comments),
 #ifdef USE_PRETTYSRC
-     PARSE_FUN("htmlsrc_attrname_xform", read_htmlsrc_attrname_xform),
-     PARSE_FUN("htmlsrc_tagname_xform", read_htmlsrc_tagname_xform),
-#endif
-     PARSE_Env("http_proxy",           0 ),
-     PARSE_Env("https_proxy",          0 ),
-     PARSE_REQ("include",              0),
-     PARSE_TIM("infosecs",             InfoSecs),
-     PARSE_STR("jump_prompt",          jumpprompt),
-     PARSE_SET("jumpbuffer",           jump_buffer),
-     PARSE_FUN("jumpfile",             jumpfile_fun),
+     PARSE_FUN(RC_HTMLSRC_ATTRNAME_XFORM, read_htmlsrc_attrname_xform),
+     PARSE_FUN(RC_HTMLSRC_TAGNAME_XFORM, read_htmlsrc_tagname_xform),
+#endif
+     PARSE_Env(RC_HTTP_PROXY,           0),
+     PARSE_Env(RC_HTTPS_PROXY,          0),
+     PARSE_REQ(RC_INCLUDE,              0),
+     PARSE_TIM(RC_INFOSECS,             InfoSecs),
+     PARSE_PRG(RC_INSTALL_PATH,         ppINSTALL),
+     PARSE_STR(RC_JUMP_PROMPT,          jumpprompt),
+     PARSE_SET(RC_JUMPBUFFER,           jump_buffer),
+     PARSE_FUN(RC_JUMPFILE,             jumpfile_fun),
 #ifdef EXP_JUSTIFY_ELTS
-     PARSE_SET("justify",              ok_justify),
-     PARSE_INT("justify_max_void_percent", justify_max_void_percent),
+     PARSE_SET(RC_JUSTIFY,              ok_justify),
+     PARSE_INT(RC_JUSTIFY_MAX_VOID_PERCENT, justify_max_void_percent),
 #endif
 #ifdef EXP_KEYBOARD_LAYOUT
-     PARSE_FUN("keyboard_layout",      keyboard_layout_fun),
+     PARSE_FUN(RC_KEYBOARD_LAYOUT,      keyboard_layout_fun),
 #endif
-     PARSE_FUN("keymap",               keymap_fun),
-     PARSE_SET("leftarrow_in_textfield_prompt", textfield_prompt_at_left_edge),
+     PARSE_FUN(RC_KEYMAP,               keymap_fun),
+     PARSE_SET(RC_LEFTARROW_IN_TEXTFLD_PROMPT, textfield_prompt_at_left_edge),
 #ifndef VMS
-     PARSE_STR("list_format",          list_format),
+     PARSE_STR(RC_LIST_FORMAT,          list_format),
 #endif
 #ifndef DISABLE_NEWS
-     PARSE_SET("list_news_dates",      LYListNewsDates),
-     PARSE_SET("list_news_numbers",    LYListNewsNumbers),
+     PARSE_SET(RC_LIST_NEWS_DATES,      LYListNewsDates),
+     PARSE_SET(RC_LIST_NEWS_NUMBERS,    LYListNewsNumbers),
+#endif
+#ifdef EXP_LOCALE_CHARSET
+     PARSE_SET(RC_LOCALE_CHARSET,       LYLocaleCharset),
 #endif
-     PARSE_STR("local_domain",         LYLocalDomain),
+     PARSE_STR(RC_LOCAL_DOMAIN,         LYLocalDomain),
+     PARSE_FUN(RC_LOCALHOST_ALIAS,      localhost_alias_fun),
 #if defined(EXEC_LINKS) || defined(EXEC_SCRIPTS)
-     PARSE_SET("local_execution_links_always_on", local_exec),
-     PARSE_SET("local_execution_links_on_but_not_remote", local_exec_on_local_files),
+     PARSE_SET(RC_LOCAL_EXECUTION_LINKS_ALWAYS, local_exec),
+     PARSE_SET(RC_LOCAL_EXECUTION_LINKS_LOCAL, local_exec_on_local_files),
 #endif
-     PARSE_FUN("localhost_alias",      localhost_alias_fun),
-     PARSE_STR("lynx_host_name",       LYHostName),
-     PARSE_FUN("lynx_sig_file",        lynx_sig_file_fun),
+     PARSE_STR(RC_LYNX_HOST_NAME,       LYHostName),
+     PARSE_FUN(RC_LYNX_SIG_FILE,        lynx_sig_file_fun),
 #ifdef LYNXCGI_LINKS
 #ifndef VMS
-     PARSE_STR("lynxcgi_document_root", LYCgiDocumentRoot),
+     PARSE_STR(RC_LYNXCGI_DOCUMENT_ROOT, LYCgiDocumentRoot),
 #endif
-     PARSE_FUN("lynxcgi_environment",  lynxcgi_environment_fun),
+     PARSE_FUN(RC_LYNXCGI_ENVIRONMENT,  lynxcgi_environment_fun),
 #endif
 #if USE_VMS_MAILER
-     PARSE_STR("mail_adrs",            mail_adrs),
-#endif
-     PARSE_SET("mail_system_error_logging", error_logging),
-     PARSE_SET("make_links_for_all_images", clickable_images),
-     PARSE_SET("make_pseudo_alts_for_inlines", pseudo_inline_alts),
-     PARSE_TIM("messagesecs",          MessageSecs),
-     PARSE_SET("minimal_comments",     minimal_comments),
-     PARSE_ENU("multi_bookmark_support", LYMultiBookmarks, tbl_multi_bookmarks),
-     PARSE_SET("ncr_in_bookmarks",     UCSaveBookmarksInUnicode),
+     PARSE_STR(RC_MAIL_ADRS,            mail_adrs),
+#endif
+     PARSE_SET(RC_MAIL_SYSTEM_ERROR_LOGGING, error_logging),
+     PARSE_SET(RC_MAKE_LINKS_FOR_ALL_IMAGES, clickable_images),
+     PARSE_SET(RC_MAKE_PSEUDO_ALTS_FOR_INLINES, pseudo_inline_alts),
+     PARSE_TIM(RC_MESSAGESECS,          MessageSecs),
+     PARSE_SET(RC_MINIMAL_COMMENTS,     minimal_comments),
+     PARSE_PRG(RC_MKDIR_PATH,           ppMKDIR),
+     PARSE_ENU(RC_MULTI_BOOKMARK_SUPPORT, LYMultiBookmarks, tbl_multi_bookmarks),
+     PARSE_PRG(RC_MV_PATH,              ppMV),
+     PARSE_SET(RC_NCR_IN_BOOKMARKS,     UCSaveBookmarksInUnicode),
 #ifndef DISABLE_NEWS
-     PARSE_FUN("news_chunk_size",      news_chunk_size_fun),
-     PARSE_FUN("news_max_chunk",       news_max_chunk_fun),
-     PARSE_FUN("news_posting",         news_posting_fun),
-     PARSE_Env("news_proxy",           0),
-     PARSE_Env("newspost_proxy",       0),
-     PARSE_Env("newsreply_proxy",      0),
-     PARSE_Env("nntp_proxy",           0),
-     PARSE_ENV("nntpserver",           0), /* actually NNTPSERVER */
-#endif
-     PARSE_SET("no_dot_files",         no_dotfiles),
-     PARSE_SET("no_file_referer",      no_filereferer),
+     PARSE_FUN(RC_NEWS_CHUNK_SIZE,      news_chunk_size_fun),
+     PARSE_FUN(RC_NEWS_MAX_CHUNK,       news_max_chunk_fun),
+     PARSE_FUN(RC_NEWS_POSTING,         news_posting_fun),
+     PARSE_Env(RC_NEWS_PROXY,           0),
+     PARSE_Env(RC_NEWSPOST_PROXY,       0),
+     PARSE_Env(RC_NEWSREPLY_PROXY,      0),
+     PARSE_Env(RC_NNTP_PROXY,           0),
+     PARSE_ENV(RC_NNTPSERVER,           0), /* actually NNTPSERVER */
+#endif
+     PARSE_SET(RC_NUMBER_FIELDS_ON_LEFT,number_fields_on_left),
+     PARSE_SET(RC_NUMBER_LINKS_ON_LEFT, number_links_on_left),
+     PARSE_SET(RC_NO_DOT_FILES,         no_dotfiles),
+     PARSE_SET(RC_NO_FILE_REFERER,      no_filereferer),
 #ifndef VMS
-     PARSE_SET("no_forced_core_dump",  LYNoCore),
-#endif
-     PARSE_SET("no_from_header",       LYNoFromHeader),
-     PARSE_SET("no_ismap_if_usemap",   LYNoISMAPifUSEMAP),
-     PARSE_Env("no_proxy",             0 ),
-     PARSE_SET("no_referer_header",    LYNoRefererHeader),
-#ifdef SH_EX
-     PARSE_SET("no_table_center",      no_table_center),
-#endif
-     PARSE_FUN("nonrestarting_sigwinch", nonrest_sigwinch_fun),
-     PARSE_FUN("outgoing_mail_charset", outgoing_mail_charset_fun),
+     PARSE_SET(RC_NO_FORCED_CORE_DUMP,  LYNoCore),
+#endif
+     PARSE_SET(RC_NO_FROM_HEADER,       LYNoFromHeader),
+     PARSE_SET(RC_NO_ISMAP_IF_USEMAP,   LYNoISMAPifUSEMAP),
+     PARSE_Env(RC_NO_PROXY,             0),
+     PARSE_SET(RC_NO_REFERER_HEADER,    LYNoRefererHeader),
+     PARSE_SET(RC_NO_TABLE_CENTER,      no_table_center),
+     PARSE_FUN(RC_NONRESTARTING_SIGWINCH, nonrest_sigwinch_fun),
+     PARSE_FUN(RC_OUTGOING_MAIL_CHARSET, outgoing_mail_charset_fun),
 #ifdef DISP_PARTIAL
-     PARSE_SET("partial",              display_partial_flag),
-     PARSE_INT("partial_thres",        partial_threshold),
-#endif
-#ifdef EXP_PERSISTENT_COOKIES
-     PARSE_SET("persistent_cookies",   persistent_cookies),
-#endif /* EXP_PERSISTENT_COOKIES */
-     PARSE_STR("personal_extension_map", personal_extension_map),
-     PARSE_STR("personal_mailcap",     personal_type_map),
-     PARSE_STR("preferred_charset",    pref_charset),
-     PARSE_STR("preferred_language",   language),
-     PARSE_SET("prepend_base_to_source", LYPrependBaseToSource),
-     PARSE_SET("prepend_charset_to_source", LYPrependCharsetToSource),
+     PARSE_SET(RC_PARTIAL,              display_partial_flag),
+     PARSE_INT(RC_PARTIAL_THRES,        partial_threshold),
+#endif
+#ifdef USE_PERSISTENT_COOKIES
+     PARSE_SET(RC_PERSISTENT_COOKIES,   persistent_cookies),
+#endif /* USE_PERSISTENT_COOKIES */
+     PARSE_STR(RC_PERSONAL_EXTENSION_MAP, personal_extension_map),
+     PARSE_STR(RC_PERSONAL_MAILCAP,     personal_type_map),
+     PARSE_STR(RC_PREFERRED_CHARSET,    pref_charset),
+     PARSE_STR(RC_PREFERRED_LANGUAGE,   language),
+     PARSE_SET(RC_PREPEND_BASE_TO_SOURCE, LYPrependBaseToSource),
+     PARSE_SET(RC_PREPEND_CHARSET_TO_SOURCE, LYPrependCharsetToSource),
 #ifdef USE_PRETTYSRC
-     PARSE_SET("prettysrc",            LYpsrc),
-     PARSE_FUN("prettysrc_spec",       psrcspec_fun),
-     PARSE_SET("prettysrc_view_no_anchor_numbering", psrcview_no_anchor_numbering),
-#endif
-     PARSE_FUN("printer",              printer_fun),
-     PARSE_SET("quit_default_yes",     LYQuitDefaultYes),
-     PARSE_FUN("referer_with_query",   referer_with_query_fun),
-     PARSE_SET("reuse_tempfiles",      LYReuseTempfiles),
+     PARSE_SET(RC_PRETTYSRC,            LYpsrc),
+     PARSE_FUN(RC_PRETTYSRC_SPEC,       psrcspec_fun),
+     PARSE_SET(RC_PRETTYSRC_VIEW_NO_ANCHOR_NUM, psrcview_no_anchor_numbering),
+#endif
+     PARSE_FUN(RC_PRINTER,              printer_fun),
+     PARSE_SET(RC_QUIT_DEFAULT_YES,     LYQuitDefaultYes),
+     PARSE_FUN(RC_REFERER_WITH_QUERY,   referer_with_query_fun),
+#ifdef EXP_CMD_LOGGING
+     PARSE_TIM(RC_REPLAYSECS,           ReplaySecs),
+#endif
+     PARSE_SET(RC_REUSE_TEMPFILES,      LYReuseTempfiles),
+     PARSE_PRG(RC_RLOGIN_PATH,          ppRLOGIN),
+     PARSE_PRG(RC_RM_PATH,              ppRM),
 #ifndef NO_RULES
-     PARSE_FUN("rule",                 HTSetConfiguration),
-     PARSE_FUN("rulesfile",            cern_rulesfile_fun),
+     PARSE_FUN(RC_RULE,                 HTSetConfiguration),
+     PARSE_FUN(RC_RULESFILE,            cern_rulesfile_fun),
 #endif /* NO_RULES */
-     PARSE_STR("save_space",           lynx_save_space),
-     PARSE_SET("scan_for_buried_news_refs", scan_for_buried_news_references),
+     PARSE_STR(RC_SAVE_SPACE,           lynx_save_space),
+     PARSE_SET(RC_SCAN_FOR_BURIED_NEWS_REFS, scan_for_buried_news_references),
+#if defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
+     PARSE_FUN(RC_SCREEN_SIZE,          screen_size_fun),
+#endif
 #ifdef USE_SCROLLBAR
-     PARSE_SET("scrollbar",            LYsb),
-     PARSE_SET("scrollbar_arrow",      LYsb_arrow),
-#endif
-     PARSE_SET("seek_frag_area_in_cur", LYSeekFragAREAinCur),
-     PARSE_SET("seek_frag_map_in_cur", LYSeekFragMAPinCur),
-     PARSE_SET("set_cookies",          LYSetCookies),
-     PARSE_SET("show_cursor",          LYShowCursor),
-     PARSE_ENU("show_kb_rate",         LYTransferRate, tbl_transfer_rate),
-     PARSE_Env("snews_proxy",          0 ),
-     PARSE_Env("snewspost_proxy",      0 ),
-     PARSE_Env("snewsreply_proxy",     0 ),
-     PARSE_SET("soft_dquotes",         soft_dquotes),
-#ifdef SOURCE_CACHE
-     PARSE_ENU("source_cache",         LYCacheSource, tbl_source_cache),
-     PARSE_ENU("source_cache_for_aborted", LYCacheSourceForAborted, tbl_abort_source_cache),
-#endif
-     PARSE_STR("startfile",            startfile),
-     PARSE_SET("strip_dotdot_urls",    LYStripDotDotURLs),
-     PARSE_SET("substitute_underscores", use_underscore),
-     PARSE_FUN("suffix",               suffix_fun),
-     PARSE_FUN("suffix_order",         suffix_order_fun),
-     PARSE_FUN("system_editor",        system_editor_fun),
-     PARSE_STR("system_mail",          system_mail),
-     PARSE_STR("system_mail_flags",    system_mail_flags),
-     PARSE_ENU("tagsoup",              Old_DTD, tbl_DTD_recovery),
+     PARSE_SET(RC_SCROLLBAR,            LYShowScrollbar),
+     PARSE_SET(RC_SCROLLBAR_ARROW,      LYsb_arrow),
+#endif
+     PARSE_SET(RC_SEEK_FRAG_AREA_IN_CUR, LYSeekFragAREAinCur),
+     PARSE_SET(RC_SEEK_FRAG_MAP_IN_CUR, LYSeekFragMAPinCur),
+     PARSE_SET(RC_SET_COOKIES,          LYSetCookies),
+     PARSE_SET(RC_SHOW_CURSOR,          LYShowCursor),
+     PARSE_STR(RC_SHOW_KB_NAME,         LYTransferName),
+     PARSE_ENU(RC_SHOW_KB_RATE,         LYTransferRate, tbl_transfer_rate),
+     PARSE_Env(RC_SNEWS_PROXY,          0),
+     PARSE_Env(RC_SNEWSPOST_PROXY,      0),
+     PARSE_Env(RC_SNEWSREPLY_PROXY,     0),
+     PARSE_SET(RC_SOFT_DQUOTES,         soft_dquotes),
+#ifdef USE_SOURCE_CACHE
+     PARSE_ENU(RC_SOURCE_CACHE,         LYCacheSource, tbl_source_cache),
+     PARSE_ENU(RC_SOURCE_CACHE_FOR_ABORTED, LYCacheSourceForAborted, tbl_abort_source_cache),
+#endif
+     PARSE_STR(RC_STARTFILE,            startfile),
+     PARSE_SET(RC_STRIP_DOTDOT_URLS,    LYStripDotDotURLs),
+     PARSE_SET(RC_SUBSTITUTE_UNDERSCORES, use_underscore),
+     PARSE_FUN(RC_SUFFIX,               suffix_fun),
+     PARSE_FUN(RC_SUFFIX_ORDER,         suffix_order_fun),
+     PARSE_FUN(RC_SYSTEM_EDITOR,        system_editor_fun),
+     PARSE_STR(RC_SYSTEM_MAIL,          system_mail),
+     PARSE_STR(RC_SYSTEM_MAIL_FLAGS,    system_mail_flags),
+     PARSE_FUN(RC_TAGSOUP,              get_tagsoup),
+     PARSE_PRG(RC_TAR_PATH,             ppTAR),
+     PARSE_PRG(RC_TELNET_PATH,          ppTELNET),
 #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
-     PARSE_SET("textfields_need_activation", textfields_activation_option),
+     PARSE_SET(RC_TEXTFIELDS_NEED_ACTIVATION, textfields_activation_option),
 #endif
+     PARSE_PRG(RC_TN3270_PATH,          ppTN3270),
 #if defined(_WINDOWS)
-     PARSE_INT("timeout",              lynx_timeout),
+     PARSE_INT(RC_TIMEOUT,              lynx_timeout),
 #endif
-     PARSE_SET("trim_input_fields",  LYtrimInputFields),
+     PARSE_PRG(RC_TOUCH_PATH,           ppTOUCH),
+     PARSE_SET(RC_TRIM_INPUT_FIELDS,    LYtrimInputFields),
 #ifdef EXEC_LINKS
-     PARSE_DEF("trusted_exec",         EXEC_PATH),
+     PARSE_DEF(RC_TRUSTED_EXEC,         EXEC_PATH),
 #endif
 #ifdef LYNXCGI_LINKS
-     PARSE_DEF("trusted_lynxcgi",      CGI_PATH),
+     PARSE_DEF(RC_TRUSTED_LYNXCGI,      CGI_PATH),
 #endif
+     PARSE_PRG(RC_UNCOMPRESS_PATH,      ppUNCOMPRESS),
+     PARSE_SET(RC_UNDERLINE_LINKS,      LYUnderlineLinks),
+     PARSE_PRG(RC_UNZIP_PATH,           ppUNZIP),
 #ifdef DIRED_SUPPORT
-     PARSE_ADD("uploader",             uploaders),
+     PARSE_ADD(RC_UPLOADER,             uploaders),
 #endif
-     PARSE_STR("url_domain_prefixes",  URLDomainPrefixes),
-     PARSE_STR("url_domain_suffixes",  URLDomainSuffixes),
+     PARSE_STR(RC_URL_DOMAIN_PREFIXES,  URLDomainPrefixes),
+     PARSE_STR(RC_URL_DOMAIN_SUFFIXES,  URLDomainSuffixes),
 #ifdef VMS
-     PARSE_SET("use_fixed_records",    UseFixedRecords),
+     PARSE_SET(RC_USE_FIXED_RECORDS,    UseFixedRecords),
 #endif
 #if defined(USE_MOUSE)
-     PARSE_SET("use_mouse",            LYUseMouse),
-#endif
-     PARSE_SET("use_select_popups",    LYSelectPopups),
-     PARSE_SET("verbose_images",       verbose_img),
-     PARSE_SET("vi_keys_always_on",    vi_keys),
-     PARSE_FUN("viewer",               viewer_fun),
-     PARSE_Env("wais_proxy",           0 ),
-     PARSE_STR("xloadimage_command",   XLoadImageCommand),
+     PARSE_SET(RC_USE_MOUSE,            LYUseMouse),
+#endif
+     PARSE_SET(RC_USE_SELECT_POPUPS,    LYSelectPopups),
+     PARSE_PRG(RC_UUDECODE_PATH,        ppUUDECODE),
+     PARSE_SET(RC_VERBOSE_IMAGES,       verbose_img),
+     PARSE_SET(RC_VI_KEYS_ALWAYS_ON,    vi_keys),
+     PARSE_FUN(RC_VIEWER,               viewer_fun),
+     PARSE_Env(RC_WAIS_PROXY,           0),
+     PARSE_STR(RC_XLOADIMAGE_COMMAND,   XLoadImageCommand),
+     PARSE_PRG(RC_ZCAT_PATH,            ppZCAT),
+     PARSE_PRG(RC_ZIP_PATH,             ppZIP),
 
      PARSE_NIL
 };
@@ -1580,35 +1616,31 @@ PRIVATE char *actual_filename ARGS3(
     char *,	parent_filename,
     char *,	dft_filename)
 {
-    static char *my_filename;
+    char *my_filename = NULL;
 
-    if (my_filename != 0) {
-	FREE(my_filename);
-    }
     if (!LYisAbsPath(cfg_filename)
      && !(parent_filename == 0 && LYCanReadFile(cfg_filename))) {
 	if (!strncmp(cfg_filename, "~/", 2)) {
 	    HTSprintf0(&my_filename, "%s%s", Home_Dir(), cfg_filename+1);
-	    cfg_filename = my_filename;
 	} else {
 	    if (parent_filename != 0) {
 		StrAllocCopy(my_filename, parent_filename);
 		*LYPathLeaf (my_filename) = '\0';
 		StrAllocCat(my_filename, cfg_filename);
 	    }
-	    if (my_filename != 0 && LYCanReadFile(my_filename)) {
-		cfg_filename = my_filename;
-	    } else {
+	    if (my_filename == 0 || !LYCanReadFile(my_filename)) {
 		StrAllocCopy(my_filename, dft_filename);
 		*LYPathLeaf (my_filename) = '\0';
 		StrAllocCat(my_filename, cfg_filename);
-		if (LYCanReadFile(my_filename)) {
-		    cfg_filename = my_filename;
+		if (!LYCanReadFile(my_filename)) {
+		    StrAllocCopy(my_filename, cfg_filename);
 		}
 	    }
 	}
+    } else {
+	StrAllocCopy(my_filename, cfg_filename);
     }
-    return cfg_filename;
+    return my_filename;
 }
 
 PUBLIC FILE *LYOpenCFG ARGS3(
@@ -1616,9 +1648,14 @@ PUBLIC FILE *LYOpenCFG ARGS3(
     char *,	parent_filename,
     char *,	dft_filename)
 {
-    cfg_filename = actual_filename(cfg_filename, parent_filename, dft_filename);
-    CTRACE((tfp, "opening config file %s\n", cfg_filename));
-    return fopen(cfg_filename, TXT_R);
+    char *my_file = actual_filename(cfg_filename, parent_filename, dft_filename);
+    FILE *result;
+
+    CTRACE((tfp, "opening config file %s\n", my_file));
+    result = fopen(my_file, TXT_R);
+    FREE(my_file);
+
+    return result;
 }
 
 #define NOPTS_ ( TABLESIZE(Config_Table) - 1 )
@@ -1632,6 +1669,95 @@ typedef BOOL (optidx_set_t) [ NOPTS_ ];
 	    (r)[i1]= (a)[i1] || (b)[i1]; \
     }
 
+/*
+ * For simple (boolean, string, integer, time) values, set the corresponding
+ * configuration variable.
+ */
+PUBLIC void LYSetConfigValue ARGS2(
+    char *,	name,
+    char *,	value)
+{
+    Config_Type *tbl = lookup_config(name);
+    ParseUnionPtr q = ParseUnionOf(tbl);
+    char *temp;
+
+    switch (tbl->type) {
+    case CONF_BOOL:
+	if (q->set_value != 0)
+	    *(q->set_value) = is_true (value);
+	break;
+
+    case CONF_FUN:
+	if (q->fun_value != 0)
+	    (*(q->fun_value)) (value);
+	break;
+
+    case CONF_TIME:
+	if (q->int_value != 0) {
+	    float ival;
+	    if (1 == sscanf (value, "%f", &ival)) {
+		*(q->int_value) = (int) SECS2Secs(ival);
+	    }
+	}
+	break;
+
+    case CONF_ENUM:
+	if (tbl->table != 0)
+	    LYgetEnum(tbl->table, value, q->int_value);
+	break;
+
+    case CONF_INT:
+	if (q->int_value != 0) {
+	    int ival;
+	    if (1 == sscanf (value, "%d", &ival))
+		*(q->int_value) = ival;
+	}
+	break;
+
+    case CONF_STR:
+	if (q->str_value != 0)
+	    StrAllocCopy(*(q->str_value), value);
+	break;
+
+    case CONF_ENV:
+    case CONF_ENV2:
+
+	if (tbl->type == CONF_ENV)
+	    LYLowerCase(name);
+	else
+	    LYUpperCase(name);
+
+	if (LYGetEnv (name) == 0) {
+#ifdef VMS
+	    Define_VMSLogical(name, value);
+#else
+	    if (q->str_value == 0)
+		q->str_value = typecalloc(char *);
+	    HTSprintf0 (q->str_value, "%s=%s", name, value);
+	    putenv (*(q->str_value));
+#endif
+	}
+	break;
+    case CONF_ADD_ITEM:
+	if (q->add_value != 0)
+	    add_item_to_list (value, q->add_value, FALSE);
+	break;
+
+#if defined(EXEC_LINKS) || defined(LYNXCGI_LINKS)
+    case CONF_ADD_TRUSTED:
+	add_trusted (value, q->def_value);
+	break;
+#endif
+
+    case CONF_PRG:
+	if (StrAllocCopy(temp, value))
+	    HTSetProgramPath(q->def_value, temp);
+	break;
+
+    default:
+	break;
+    }
+}
 
 /*
  * Process the configuration file (lynx.cfg).
@@ -1708,6 +1834,7 @@ PRIVATE void do_read_cfg ARGS5(
 	/* Significant lines are of the form KEYWORD:WHATEVER */
 	if ((value = strchr (name, ':')) == 0) {
 	    /* fprintf (stderr, "Bad line-- no :\n"); */
+	    CTRACE((tfp, "LYReadCFG: missing ':' %s\n", name));
 	    continue;
 	}
 
@@ -1729,9 +1856,11 @@ PRIVATE void do_read_cfg ARGS5(
 		*cp = 0;
 	}
 
+	CTRACE2(TRACE_CFG, (tfp, "LYReadCFG %s:%s\n", name, value));
 	tbl = lookup_config(name);
 	if (tbl->name == 0) {
 	    /* lynx ignores unknown keywords */
+	    CTRACE((tfp, "LYReadCFG: ignored %s:%s\n", name, value));
 	    continue;
 	}
 #ifdef SH_EX
@@ -1755,63 +1884,16 @@ PRIVATE void do_read_cfg ARGS5(
 		? CONF_UNSPECIFIED
 		: tbl->type) {
 	case CONF_BOOL:
-	    if (q->set_value != 0)
-		*(q->set_value) = is_true (value);
-	    break;
-
 	case CONF_FUN:
-	    if (q->fun_value != 0)
-		(*(q->fun_value)) (value);
-	    break;
-
 	case CONF_TIME:
-	    if (q->int_value != 0) {
-		float ival;
-		if (1 == sscanf (value, "%f", &ival)) {
-#ifdef HAVE_NAPMS
-		    ival *= 1000;
-#endif
-		    *(q->int_value) = (int) ival;
-		}
-	    }
-	    break;
-
 	case CONF_ENUM:
-	    if (tbl->table != 0)
-		LYgetEnum(tbl->table, value, q->int_value);
-	    break;
-
 	case CONF_INT:
-	    if (q->int_value != 0) {
-		int ival;
-		if (1 == sscanf (value, "%d", &ival))
-		    *(q->int_value) = ival;
-	    }
-	    break;
-
 	case CONF_STR:
-	    if (q->str_value != 0)
-		StrAllocCopy(*(q->str_value), value);
-	    break;
-
 	case CONF_ENV:
 	case CONF_ENV2:
-
-	    if (tbl->type == CONF_ENV)
-		LYLowerCase(name);
-	    else
-		LYUpperCase(name);
-
-	    if (getenv (name) == 0) {
-#ifdef VMS
-		Define_VMSLogical(name, value);
-#else
-		if (q->str_value == 0)
-			q->str_value = typecalloc(char *);
-		HTSprintf0 (q->str_value, "%s=%s", name, value);
-		putenv (*(q->str_value));
-#endif
-	    }
+	case CONF_ADD_ITEM:
+	case CONF_ADD_TRUSTED:
+	    LYSetConfigValue(name, value);
 	    break;
 
 	case CONF_INCLUDE: {
@@ -1825,9 +1907,9 @@ PRIVATE void do_read_cfg ARGS5(
 	    char *cp1 = NULL;
 	    char *sep = NULL;
 
-	    if ( (p1 = strstr(value, sep=" for ")) != 0
-#if defined(UNIX) && !defined(__EMX__)
-		|| (p1 = strstr(value, sep=":")) != 0
+	    if ( (p1 = strstr(value, sep = " for ")) != 0
+#if defined(UNIX) && !defined(USE_DOS_DRIVES)
+		|| (p1 = strstr(value, sep = ":")) != 0
 #endif
 	    ) {
 		*p1 = '\0';
@@ -1836,7 +1918,10 @@ PRIVATE void do_read_cfg ARGS5(
 
 #ifndef NO_CONFIG_INFO
 	    if (fp0 != 0  &&  !no_lynxcfg_xinfo) {
-		LYLocalFileToURL(&url, actual_filename(value, cfg_filename, LYNX_CFG_FILE));
+		char *my_file = actual_filename(value, cfg_filename, LYNX_CFG_FILE);
+
+		LYLocalFileToURL(&url, my_file);
+		FREE(my_file);
 		StrAllocCopy(cp1, value);
 		if (strchr(value, '&') || strchr(value, '<')) {
 		    LYEntify(&cp1, TRUE);
@@ -1923,16 +2008,6 @@ PRIVATE void do_read_cfg ARGS5(
 	    }
 	    break;
 
-	case CONF_ADD_ITEM:
-	    if (q->add_value != 0)
-		add_item_to_list (value, q->add_value, FALSE);
-	    break;
-
-#if defined(EXEC_LINKS) || defined(LYNXCGI_LINKS)
-	case CONF_ADD_TRUSTED:
-	    add_trusted (value, q->def_value);
-	    break;
-#endif
 	default:
 	    if (fp0 != 0) {
 		if (strchr(value, '&') || strchr(value, '<')) {
@@ -1987,9 +2062,20 @@ PUBLIC void read_cfg ARGS4(
 	int,	nesting_level,
 	FILE *,	fp0)
 {
+    HTInitProgramPaths();
     do_read_cfg(cfg_filename, parent_filename, nesting_level, fp0, NULL);
 }
 
+#ifndef NO_CONFIG_INFO
+PRIVATE void extra_cfg_link ARGS3(
+	FILE *,	fp,
+	char *,	href,
+	char *,	name)
+{
+    fprintf(fp, "<a href=\"%s\">%s</a>",
+	    href, name);
+}
+#endif /* NO_CONFIG_INFO */
 
 /*
  *  Show rendered lynx.cfg data without comments, LYNXCFG:/ internal page.
@@ -1997,7 +2083,7 @@ PUBLIC void read_cfg ARGS4(
  *  we create and load the page just in place and return to mainloop().
  */
 PUBLIC int lynx_cfg_infopage ARGS1(
-    document *,		       newdoc)
+    DocInfo *,		       newdoc)
 {
     static char tempfile[LY_MAXPATH] = "\0";
     DocAddress WWWDoc;  /* need on exit */
@@ -2030,8 +2116,8 @@ PUBLIC int lynx_cfg_infopage ARGS1(
 	 */
 	if (HTMainText && nhist > 0 &&
 	    !strcmp(HTLoadedDocumentTitle(), LYNXCFG_TITLE) &&
-	    !strcmp(HTLoadedDocumentURL(), history[nhist-1].address) &&
-	    LYIsUIPage(history[nhist-1].address, UIP_LYNXCFG) &&
+	    !strcmp(HTLoadedDocumentURL(), HDOC(nhist-1).address) &&
+	    LYIsUIPage(HDOC(nhist-1).address, UIP_LYNXCFG) &&
 	    (!lynxcfginfo_url ||
 	     strcmp(HTLoadedDocumentURL(), lynxcfginfo_url))) {
 	    /*  the page was pushed, so pop-up. */
@@ -2092,17 +2178,9 @@ PUBLIC int lynx_cfg_infopage ARGS1(
     }
     if (lynxcfginfo_url == 0) {
 
-	if (LYReuseTempfiles) {
-	    fp0 = LYOpenTempRewrite(tempfile, HTML_SUFFIX, "w");
-	} else {
-	    if (tempfile[0])
-		LYRemoveTemp(tempfile);
-	    fp0 = LYOpenTemp(tempfile, HTML_SUFFIX, "w");
-	}
-	if (fp0 == NULL) {
-	    HTAlert(CANNOT_OPEN_TEMP);
+	if ((fp0 = InternalPageFP(tempfile, TRUE)) == 0)
 	    return(NOT_FOUND);
-	}
+
 	LYLocalFileToURL(&lynxcfginfo_url, tempfile);
 
 	LYforce_no_cache = TRUE;  /* don't cache this doc */
@@ -2110,7 +2188,6 @@ PUBLIC int lynx_cfg_infopage ARGS1(
 	BeginInternalPage (fp0, LYNXCFG_TITLE, NULL);
 	fprintf(fp0, "<pre>\n");
 
-
 #ifndef NO_CONFIG_INFO
 	if (!no_lynxcfg_xinfo) {
 #if defined(HAVE_CONFIG_H) || defined(VMS)
@@ -2136,17 +2213,39 @@ PUBLIC int lynx_cfg_infopage ARGS1(
 			     gettext("for more comments."));
 	    }
 
-#if defined(HAVE_CONFIG_H) && !defined(NO_CONFIG_INFO)
-	    if (!no_compileopts_info) {
-		fprintf(fp0, "%s <a href=\"LYNXCOMPILEOPTS:\">%s</a>\n\n",
-			SEE_ALSO,
-			COMPILE_OPT_SEGMENT);
-	    }
+#ifndef NO_CONFIG_INFO
+#if defined(HAVE_CONFIG_H) && defined(USE_COLOR_STYLE)
+	    if (!no_compileopts_info && !no_lynxcfg_xinfo) {
+		fprintf(fp0, "%s</pre><ul><li>", SEE_ALSO);
+		extra_cfg_link(fp0, STR_LYNXCFLAGS, COMPILE_OPT_SEGMENT);
+
+		fprintf(fp0, "<li>");
+		LYLocalFileToURL(&temp, lynx_lss_file);
+		extra_cfg_link(fp0, temp, COLOR_STYLE_SEGMENT);
+		fprintf(fp0, "</ul><pre>\n");
+	    } else
 #endif
+	    {
+		fprintf(fp0, "%s ", SEE_ALSO);
+#if defined(HAVE_CONFIG_H)
+		if (!no_compileopts_info) {
+		    extra_cfg_link(fp0, STR_LYNXCFLAGS, COMPILE_OPT_SEGMENT);
+		}
+#endif
+#if defined(USE_COLOR_STYLE)
+		if (!no_lynxcfg_xinfo) {
+		    LYLocalFileToURL(&temp, lynx_lss_file);
+		    extra_cfg_link(fp0, temp, COLOR_STYLE_SEGMENT);
+		}
+#endif
+		fprintf(fp0, "\n\n");
+	    }
+#endif /* NO_CONFIG_INFO */
 
 	    /** a new experimental link ... **/
 	    if (user_mode == ADVANCED_MODE)
-		fprintf(fp0, "  <a href=\"LYNXCFG://reload\">%s</a>\n",
+		fprintf(fp0, "  <a href=\"%s//reload\">%s</a>\n",
+			     STR_LYNXCFG,
 			     gettext("RELOAD THE CHANGES"));
 
 
@@ -2202,7 +2301,7 @@ PUBLIC int lynx_cfg_infopage ARGS1(
  *  from getfile() cycle.
  */
 PUBLIC int lynx_compile_opts ARGS1(
-    document *,		       newdoc)
+    DocInfo *,		       newdoc)
 {
     static char tempfile[LY_MAXPATH] = "\0";
 #define PutDefs(table, N) fprintf(fp0, "%-35s %s\n", table[N].name, table[N].value)
@@ -2235,16 +2334,9 @@ PUBLIC int lynx_compile_opts ARGS1(
 	}
     }
     if (configinfo_url == NULL) {
-	if (LYReuseTempfiles) {
-	    fp0 = LYOpenTempRewrite(tempfile, HTML_SUFFIX, "w");
-	} else {
-	    LYRemoveTemp(tempfile);
-	    fp0 = LYOpenTemp(tempfile, HTML_SUFFIX, "w");
-	}
-	if (fp0 == NULL) {
-	    HTAlert(CANNOT_OPEN_TEMP);
+	if ((fp0 = InternalPageFP(tempfile, TRUE)) == 0)
 	    return(NOT_FOUND);
-	}
+
 	LYLocalFileToURL(&configinfo_url, tempfile);
 
 	BeginInternalPage (fp0, CONFIG_DEF_TITLE, NULL);
diff --git a/gnu/usr.bin/lynx/src/LYReadCFG.h b/gnu/usr.bin/lynx/src/LYReadCFG.h
index b6349cc053f..87b73de95eb 100644
--- a/gnu/usr.bin/lynx/src/LYReadCFG.h
+++ b/gnu/usr.bin/lynx/src/LYReadCFG.h
@@ -41,7 +41,7 @@ extern int default_fg;
 extern int default_bg;
 extern BOOL default_color_reset;
 
-#if HAVE_USE_DEFAULT_COLORS && USE_DEFAULT_COLORS
+#if defined(HAVE_USE_DEFAULT_COLORS) && defined(USE_DEFAULT_COLORS)
 extern int lynx_default_colors NOPARAMS;
 #endif
 
@@ -54,10 +54,11 @@ extern void free_lynx_cfg NOPARAMS;
 extern BOOLEAN have_read_cfg;
 
 extern FILE *LYOpenCFG PARAMS((char *cfg_filename, char *parent_filename, char *dft_filename));
-extern int lynx_cfg_infopage PARAMS((document *newdoc));
-extern int lynx_compile_opts PARAMS((document *newdoc));
+extern int lynx_cfg_infopage PARAMS((DocInfo *newdoc));
+extern int lynx_compile_opts PARAMS((DocInfo *newdoc));
 extern int match_item_by_name PARAMS((lynx_list_item_type * ptr, char * name, BOOLEAN only_overriders));
 extern lynx_list_item_type *find_item_by_number PARAMS((lynx_list_item_type * list_ptr, char * number));
 extern void reload_read_cfg NOPARAMS; /* implemented in LYMain.c */
+extern void LYSetConfigValue PARAMS((char *name, char *value));
 
 #endif /* LYREADCFG_H */
diff --git a/gnu/usr.bin/lynx/src/LYSearch.c b/gnu/usr.bin/lynx/src/LYSearch.c
index 03961129c8b..61517cb4f3c 100644
--- a/gnu/usr.bin/lynx/src/LYSearch.c
+++ b/gnu/usr.bin/lynx/src/LYSearch.c
@@ -9,36 +9,41 @@
 #include <LYLeaks.h>
 
 PRIVATE BOOL link_has_target ARGS2(
-	linkstruct *,	a,
+	int,		cur,
 	char *,		target)
 {
+    LinkInfo *a = &links[cur];
     OptionType *option;
     char *stars = NULL, *cp;
+    int count;
 
     /*
-     *  Search the hightext string, and hightext2 if present,
-     *  taking the case_sensitive setting into account. - FM
+     * Search the hightext strings, if present, taking the case_sensitive
+     * setting into account.
      */
-    if (LYno_attr_strstr(a->hightext, target)
-     || LYno_attr_strstr(a->hightext2, target)) {
-	return TRUE;
+    for (count = 0; ; ++count) {
+	char *text = LYGetHiliteStr(cur, count);
+	if (text == NULL)
+	    break;
+	if (LYno_attr_strstr(text, target))
+	    return TRUE;
     }
 
     /*
      *  Search the relevant form fields, taking the
      *  case_sensitive setting into account. - FM
      */
-    if ((a->form != NULL && a->form->value != NULL) &&
-	a->form->type != F_HIDDEN_TYPE) {
-	if (a->form->type == F_PASSWORD_TYPE) {
+    if ((a->l_form != NULL && a->l_form->value != NULL) &&
+	a->l_form->type != F_HIDDEN_TYPE) {
+	if (a->l_form->type == F_PASSWORD_TYPE) {
 	    /*
 	     *  Check the actual, hidden password, and then
 	     *  the displayed string. - FM
 	     */
-	    if (LYno_attr_strstr(a->form->value, target)) {
+	    if (LYno_attr_strstr(a->l_form->value, target)) {
 		return TRUE;
 	    }
-	    StrAllocCopy(stars, a->form->value);
+	    StrAllocCopy(stars, a->l_form->value);
 	    for (cp = stars; *cp != '\0'; cp++)
 		*cp = '*';
 	    if (LYno_attr_strstr(stars, target)) {
@@ -46,23 +51,23 @@ PRIVATE BOOL link_has_target ARGS2(
 		return TRUE;
 	    }
 	    FREE(stars);
-	} else if (a->form->type == F_OPTION_LIST_TYPE) {
+	} else if (a->l_form->type == F_OPTION_LIST_TYPE) {
 	    /*
 	     *  Search the option strings that are displayed
 	     *  when the popup is invoked. - FM
 	     */
-	    option = a->form->select_list;
+	    option = a->l_form->select_list;
 	    while (option != NULL) {
 		if (LYno_attr_strstr(option->name, target)) {
 		    return TRUE;
 		}
 		option = option->next;
 	    }
-	} else if (a->form->type == F_RADIO_TYPE) {
+	} else if (a->l_form->type == F_RADIO_TYPE) {
 	    /*
 	     *  Search for checked or unchecked parens. - FM
 	     */
-	    if (a->form->num_value) {
+	    if (a->l_form->num_value) {
 		cp = checked_radio;
 	    } else {
 		cp = unchecked_radio;
@@ -70,11 +75,11 @@ PRIVATE BOOL link_has_target ARGS2(
 	    if (LYno_attr_strstr(cp, target)) {
 		return TRUE;
 	    }
-	} else if (a->form->type == F_CHECKBOX_TYPE) {
+	} else if (a->l_form->type == F_CHECKBOX_TYPE) {
 	    /*
 	     *  Search for checked or unchecked square brackets. - FM
 	     */
-	    if (a->form->num_value) {
+	    if (a->l_form->num_value) {
 		cp = checked_box;
 	    } else {
 		cp = unchecked_box;
@@ -89,7 +94,7 @@ PRIVATE BOOL link_has_target ARGS2(
 	     *  hightext search, but make sure here
 	     *  that the entire value is searched. - FM
 	     */
-	    if (LYno_attr_strstr(a->form->value, target)) {
+	    if (LYno_attr_strstr(a->l_form->value, target)) {
 		return TRUE;
 	    }
 	}
@@ -113,7 +118,7 @@ PRIVATE int check_next_target_in_links ARGS2(
 
     if (nlinks != 0) {
 	for (i = *cur + 1; i < nlinks; ++i) {
-	    if (link_has_target(&links[i], target)) {
+	    if (link_has_target(i, target)) {
 		*cur = i;
 		return TRUE;
 	    }
@@ -130,7 +135,7 @@ PRIVATE int check_prev_target_in_links ARGS2(
 
     if (nlinks != 0) {
 	for (i = *cur - 1; i >= 0; --i) {
-	    if (link_has_target(&links[i], target)) {
+	    if (link_has_target(i, target)) {
 		*cur = i;
 		return TRUE;
 	    }
@@ -150,7 +155,7 @@ PRIVATE int check_prev_target_in_links ARGS2(
  *  variable
  */
 PUBLIC BOOL textsearch ARGS4(
-	document *,	cur_doc,
+	DocInfo *,	cur_doc,
 	char *,		prev_target,
 	int,		target_size,
 	int,		direction)
@@ -332,7 +337,7 @@ check_recall:
 	    /*
 	     *  Found in link, changed cur, we're done.
 	     */
-	    highlight(OFF, oldcur, prev_target);
+	    LYhighlight(OFF, oldcur, prev_target);
 	    return(TRUE);
 	}
     } else {
@@ -345,7 +350,7 @@ check_recall:
 	    /*
 	     *  Found in link, changed cur, we're done.
 	     */
-	    highlight(OFF, oldcur, prev_target);
+	    LYhighlight(OFF, oldcur, prev_target);
 	    return(TRUE);
 	}
 
@@ -366,7 +371,7 @@ check_recall:
      */
     www_user_search((cur_doc->line + offset), cur_doc, prev_target, direction);
     if (cur_doc->link != oldcur) {
-	highlight(OFF, oldcur, prev_target);
+	LYhighlight(OFF, oldcur, prev_target);
 	return(TRUE);
     }
     return (BOOL) (www_search_result > 0);
diff --git a/gnu/usr.bin/lynx/src/LYSearch.h b/gnu/usr.bin/lynx/src/LYSearch.h
index f917c615035..e4dbd7a867f 100644
--- a/gnu/usr.bin/lynx/src/LYSearch.h
+++ b/gnu/usr.bin/lynx/src/LYSearch.h
@@ -6,7 +6,7 @@
 #include <LYStructs.h>
 #endif /* LYSTRUCT_H */
 
-extern BOOL textsearch PARAMS((document *cur_doc,
+extern BOOL textsearch PARAMS((DocInfo *cur_doc,
 			       char *prev_target, int target_size, int direction));
 
 #define IN_FILE 1
diff --git a/gnu/usr.bin/lynx/src/LYShowInfo.c b/gnu/usr.bin/lynx/src/LYShowInfo.c
index 9fe2b751601..1548b9b005f 100644
--- a/gnu/usr.bin/lynx/src/LYShowInfo.c
+++ b/gnu/usr.bin/lynx/src/LYShowInfo.c
@@ -61,9 +61,9 @@ PUBLIC char *LYVersionDate NOARGS
  */
 
 PUBLIC int LYShowInfo ARGS4(
-	document *,	doc,
+	DocInfo *,	doc,
 	int,		size_of_file,
-	document *,	newdoc,
+	DocInfo *,	newdoc,
 	char *, 	owner_address)
 {
     static char tempfile[LY_MAXPATH] = "\0";
@@ -281,7 +281,7 @@ PUBLIC int LYShowInfo ARGS4(
     } else {
       LYUCcharset * p_in = HTAnchor_getUCInfoStage(HTMainAnchor,
 							     UCT_STAGE_PARSER);
-      if (!p_in || !(p_in->MIMEname) || !*(p_in->MIMEname) ||
+      if (!p_in || isEmpty(p_in->MIMEname) ||
 	   HTAnchor_getUCLYhndl(HTMainAnchor, UCT_STAGE_PARSER) < 0) {
 	   p_in = HTAnchor_getUCInfoStage(HTMainAnchor, UCT_STAGE_MIME);
       }
@@ -325,8 +325,10 @@ PUBLIC int LYShowInfo ARGS4(
 #endif /* ADVANCED_INFO */
 
     if (doc->post_data) {
-	fprintf(fp0, "<dt><em>%s</em> <xmp>%s</xmp>\n",
-		gettext("Post Data:"), doc->post_data);
+	fprintf(fp0, "<dt><em>%s</em> <xmp>%.*s</xmp>\n",
+		gettext("Post Data:"),
+		BStrLen(doc->post_data),
+		BStrData(doc->post_data));
 	fprintf(fp0, "<dt><em>%s</em> %s\n",
 		gettext("Post Content Type:"), doc->post_content_type);
     }
@@ -369,16 +371,16 @@ PUBLIC int LYShowInfo ARGS4(
     if (nlinks > 0) {
 	fprintf(fp0, "<h2>%s</h2>\n<dl compact>",
 		gettext("Link that you currently have selected"));
-	StrAllocCopy(Title, links[doc->link].hightext);
+	StrAllocCopy(Title, LYGetHiliteStr(doc->link, 0));
 	LYEntify(&Title, TRUE);
 	fprintf(fp0, "<dt><em>%s</em> %s\n",
 		gettext("Linkname:"),
 		Title);
 	if (lynx_mode == FORMS_LYNX_MODE &&
 	    links[doc->link].type == WWW_FORM_LINK_TYPE) {
-	    if (links[doc->link].form->submit_method) {
-		int method = links[doc->link].form->submit_method;
-		char *enctype = links[doc->link].form->submit_enctype;
+	    if (links[doc->link].l_form->submit_method) {
+		int method = links[doc->link].l_form->submit_method;
+		char *enctype = links[doc->link].l_form->submit_enctype;
 
 		fprintf(fp0, "<dt>&nbsp;&nbsp;<em>%s</em> %s\n",
 			     gettext("Method:"),
@@ -391,13 +393,13 @@ PUBLIC int LYShowInfo ARGS4(
 			      *enctype ?
 			       enctype : "application/x-www-form-urlencoded"));
 	    }
-	    if (links[doc->link].form->submit_action) {
-		StrAllocCopy(Address, links[doc->link].form->submit_action);
+	    if (links[doc->link].l_form->submit_action) {
+		StrAllocCopy(Address, links[doc->link].l_form->submit_action);
 		LYEntify(&Address, TRUE);
 		fprintf(fp0, "<dt>&nbsp;&nbsp;<em>Action:</em> %s\n", Address);
 	    }
-	    if (!(links[doc->link].form->submit_method &&
-		  links[doc->link].form->submit_action)) {
+	    if (!(links[doc->link].l_form->submit_method &&
+		  links[doc->link].l_form->submit_action)) {
 		fprintf(fp0, "<dt>&nbsp;%s\n", gettext("(Form field)"));
 	    }
 	} else {
diff --git a/gnu/usr.bin/lynx/src/LYShowInfo.h b/gnu/usr.bin/lynx/src/LYShowInfo.h
index 58f2c533c21..623eaf44b16 100644
--- a/gnu/usr.bin/lynx/src/LYShowInfo.h
+++ b/gnu/usr.bin/lynx/src/LYShowInfo.h
@@ -8,8 +8,7 @@
 extern BOOL LYVersionIsRelease NOPARAMS;
 extern char *LYVersionStatus NOPARAMS;
 extern char *LYVersionDate NOPARAMS;
-extern int LYShowInfo PARAMS((document *doc, int size_of_file, document *newdoc,
+extern int LYShowInfo PARAMS((DocInfo *doc, int size_of_file, DocInfo *newdoc,
 							char *owner_address));
 
 #endif /* LYSHOWINFO_H */
-
diff --git a/gnu/usr.bin/lynx/src/LYSignal.h b/gnu/usr.bin/lynx/src/LYSignal.h
index e0d5ec0a1c2..9faf619b22d 100644
--- a/gnu/usr.bin/lynx/src/LYSignal.h
+++ b/gnu/usr.bin/lynx/src/LYSignal.h
@@ -12,7 +12,7 @@ extern void VMSsignal PARAMS((int sig, void (*func)()));
 #define signal(a,b) VMSsignal(a,b) /* use LYCurses.c routines for interrupts */
 #endif /* VMS */
 
-#if HAVE_SIGACTION
+#ifdef HAVE_SIGACTION
 typedef void LYSigHandlerFunc_t PARAMS((int));
 /* implementation in LYUtils.c */
 extern void LYExtSignal PARAMS((int sig, LYSigHandlerFunc_t * handler));
diff --git a/gnu/usr.bin/lynx/src/LYStrings.c b/gnu/usr.bin/lynx/src/LYStrings.c
index 1729c9ef891..58fa79ea46b 100644
--- a/gnu/usr.bin/lynx/src/LYStrings.c
+++ b/gnu/usr.bin/lynx/src/LYStrings.c
@@ -34,11 +34,13 @@
 #include <LYMainLoop.h>
 #endif
 
+#ifdef EXP_CMD_LOGGING
+#include <LYReadCFG.h>
+#endif
+
 #include <LYShowInfo.h>
 #include <LYLeaks.h>
 
-extern BOOL HTPassHighCtrlRaw;
-
 #if defined(WIN_EX)
 #undef  BUTTON_CTRL
 #define BUTTON_CTRL	0	/* Quick hack */
@@ -242,7 +244,7 @@ PUBLIC int fancy_mouse ARGS3(
 	cmd = LYK_QUIT;
     }
 #endif /* NCURSES */
-#endif	/* _WINDOWS */
+#endif /* PDCURSES */
 
 /************************************************************************/
 #endif  /* USE_MOUSE */
@@ -324,7 +326,7 @@ PRIVATE void LYAddToCloset ARGS2(RecallType, recall, char*, str)
 	LYRemoveFromCloset(list);
 }
 
-
+#ifdef USE_MOUSE
 PRIVATE int XYdist ARGS5(
     int,	x1,
     int,	y1,
@@ -386,6 +388,10 @@ PRIVATE int set_clicked_link ARGS4(
 	mouse_link = -2;
 	if (x == 0 && toolbar)		/* On '#' */
 	    c = LAC_TO_LKC0(LYK_TOOLBAR);
+#if defined(CAN_CUT_AND_PASTE) && defined(USE_COLOR_STYLE)
+	else if (y == 0 && x == LYcols - 1 && s_hot_paste != NOSTYLE)
+	    c = LAC_TO_LKC0(LYK_PASTE_URL);
+#endif
 	else if (clicks > 1) {
 	    if (x < left + toolbar)
 		c = (code==FOR_PROMPT && y)
@@ -419,7 +425,7 @@ PRIVATE int set_clicked_link ARGS4(
 		c = LAC_TO_LKC0(LYK_PREV_PAGE);
 	}
 #ifdef USE_SCROLLBAR
-    } else if (x == LYcols - 1 && LYsb && LYsb_begin >= 0) {
+    } else if (x == LYcols - 1 && LYShowScrollbar && LYsb_begin >= 0) {
 	int h = display_lines - 2*(LYsb_arrow != 0);
 
 	mouse_link = -2;
@@ -452,26 +458,28 @@ PRIVATE int set_clicked_link ARGS4(
 	/* Loop over the links and see if we can get a match */
 	for (i = 0; i < nlinks; i++) {
 	    int len, lx = links[i].lx, is_text = 0;
+	    int count = 0;
+	    char *text = LYGetHiliteStr(i, count);
 
 	    if (links[i].type == WWW_FORM_LINK_TYPE
-		&& F_TEXTLIKE(links[i].form->type))
+		&& F_TEXTLIKE(links[i].l_form->type))
 		is_text = 1;
 
-	    if (is_text)
-		len = links[i].form->size;
-	    else
-		len = strlen(links[i].hightext );
-
 	    /* Check the first line of the link */
-	    if ( links[i].hightext != NULL) {
+	    if (text != NULL) {
+		if (is_text)
+		    len = links[i].l_form->size;
+		else
+		    len = strlen(text);
 		cur_err = XYdist(x, y, links[i].lx, links[i].ly, len);
 		/* Check the second line */
-		if (cur_err > 0 && links[i].hightext2 != NULL) {
-		    /* Note that there is never hightext2 if is_text */
+		while (cur_err > 0
+		   && (text = LYGetHiliteStr(i, ++count)) != NULL) {
+		    /* Note that there is at most one hightext if is_text */
 		    int cur_err_2 = XYdist(x, y,
-					   links[i].hightext2_offset,
-					   links[i].ly+1,
-					   strlen(links[i].hightext2));
+					   LYGetHilitePos(i, count),
+					   links[i].ly + count,
+					   strlen(text));
 		    cur_err = HTMIN(cur_err, cur_err_2);
 		}
 		if (cur_err > 0 && is_text)
@@ -484,7 +492,7 @@ PRIVATE int set_clicked_link ARGS4(
 		    /* double-click, if we care:
 		       submit text submit fields. - kw */
 		    if (clicks > 1 && is_text &&
-			links[i].form->type == F_TEXT_SUBMIT_TYPE) {
+			links[i].l_form->type == F_TEXT_SUBMIT_TYPE) {
 			if (code != FOR_INPUT
 			    /* submit current input field directly */
 			    || !(cury == y && (curx >= lx) && ((curx - lx) <= len))) {
@@ -530,11 +538,23 @@ PRIVATE int set_clicked_link ARGS4(
 	    } else if (mouse_err >= 0)
 		c = LAC_TO_LKC0(LYK_CHANGE_LINK);
 	}
+	else {
+	   if (2*y > LYlines){		/* Bottom Half of the screen */
+	      if (4*y < 3*LYlines){
+		c = LAC_TO_LKC0(LYK_DOWN_TWO);	/* Third quarter */
+	      } else
+		c = LAC_TO_LKC0(LYK_DOWN_HALF);	/* Fourth quarter */
+	   } else {			/* Upper Half of the screen */
+	      if (4*y < LYlines){
+		c = LAC_TO_LKC0(LYK_UP_HALF);	/* First quarter */
+	      } else
+		c = LAC_TO_LKC0(LYK_UP_TWO);	/* Second quarter */
+	   }
+	}
     }
     return c;
 }
-
-
+#endif /* USE_MOUSE */
 
 /*
  *  LYstrncpy() terminates strings with a null byte.
@@ -649,7 +669,7 @@ PUBLIC int LYmbcsstrlen ARGS3(
 {
     int i, j, len = 0;
 
-    if (!str && *str)
+    if (!non_empty(str))
 	return(len);
 
     for (i = 0; str[i] != '\0'; i++) {
@@ -668,7 +688,7 @@ PUBLIC int LYmbcsstrlen ARGS3(
 		j++;
 	    }
 	} else if (!utf_flag && HTCJK != NOCJK && !count_gcells &&
-		   !isascii(str[i]) && str[(i + 1)] != '\0' &&
+		   is8bits(str[i]) && str[(i + 1)] != '\0' &&
 		    !IsSpecialAttrChar(str[(i + 1)])) {
 	    i++;
 	}
@@ -700,10 +720,10 @@ PUBLIC int LYmbcsstrlen ARGS3(
 #endif /* USE_SLANG */
 
 #if !defined(GetChar) && defined(NCURSES)
-#define GetChar() wgetch(my_subwindow ? my_subwindow : LYwin)
+#define GetChar() wgetch(LYtopwindow())
 #endif
 
-#if !defined(GetChar) && defined(PDCURSES)
+#if !defined(GetChar) && defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401
 /* PDCurses sends back key-modifiers that we don't use, but would waste time
  * upon, e.g., repainting the status line
  */
@@ -742,7 +762,7 @@ PRIVATE int myGetChar NOARGS
 #endif
 
 #if !defined(GetChar)
-#if HAVE_KEYPAD
+#ifdef HAVE_KEYPAD
 #define GetChar() getch()
 #else
 #ifndef USE_GETCHAR
@@ -752,37 +772,6 @@ PRIVATE int myGetChar NOARGS
 #endif /* HAVE_KEYPAD */
 #endif /* !defined(GetChar) */
 
-/*
- * Workaround a bug in ncurses order-of-refresh by setting a pointer to
- * the topmost window that should be displayed.
- *
- * FIXME: the associated call on 'keypad()' is not needed for Unix, but
- * something in the OS/2 EMX port requires it.
- */
-#ifndef USE_SLANG
-PRIVATE WINDOW *my_subwindow;
-
-PUBLIC void LYsubwindow ARGS1(WINDOW *, param)
-{
-    if (param != 0) {
-	my_subwindow = param;
-#if defined(NCURSES) || defined(PDCURSES)
-	keypad(my_subwindow, TRUE);
-#if defined(HAVE_GETBKGD) /* not defined in ncurses 1.8.7 */
-	wbkgd(my_subwindow, getbkgd(LYwin));
-	wbkgdset(my_subwindow, getbkgd(LYwin));
-#endif
-#endif
-	scrollok(my_subwindow, TRUE);
-    } else {
-	touchwin(LYwin);
-	delwin(my_subwindow);
-	my_subwindow = 0;
-    }
-}
-#endif
-
-
 #if defined(USE_SLANG) && defined(USE_MOUSE)
 PRIVATE int sl_parse_mouse_event ARGS3(int *, x, int *, y, int *, button)
 {
@@ -827,6 +816,9 @@ PRIVATE int sl_read_mouse_event ARGS1(
 	if (button == 0)  /* left */
 	  return set_clicked_link (mouse_x, mouse_y, FOR_PANEL, 1);
 
+	if (button == 1)  /* middle */
+	  return LYReverseKeymap (LYK_VIEW_BOOKMARK);
+
 	if (button == 2)   /* right */
 	  {
 	     /* Right button: go back to prev document.
@@ -1324,6 +1316,18 @@ PRIVATE void setup_vtXXX_keymap NOARGS
 	INTERN_KEY( "\033OP",	F1,		KEY_F(1) ),
 	INTERN_KEY( "\033[OP",	F1,		KEY_F(1) ),
 	INTERN_KEY( "\033[29~",	DO_KEY,		KEY_F(16) ),
+#if defined(USE_SLANG) && defined(__MINGW32__)
+	INTERN_KEY( "\xE0H",	UPARROW,	KEY_UP ),
+	INTERN_KEY( "\xE0P",	DNARROW,	KEY_DOWN ),
+	INTERN_KEY( "\xE0M",	RTARROW,	KEY_RIGHT ),
+	INTERN_KEY( "\xE0K",	LTARROW,	KEY_LEFT ),
+	INTERN_KEY( "\xE0R",	INSERT_KEY,	KEY_IC ),
+	INTERN_KEY( "\xE0S",	REMOVE_KEY,	KEY_DC ),
+	INTERN_KEY( "\xE0I",	PGUP,		KEY_PPAGE ),
+	INTERN_KEY( "\xE0Q",	PGDOWN,		KEY_NPAGE ),
+	INTERN_KEY( "\xE0G",	HOME,		KEY_HOME),
+	INTERN_KEY( "\xE0O",	END_KEY,	KEY_END ),
+#endif
 #if defined(USE_SLANG) && !defined(VMS)
 	INTERN_KEY(	"^(ku)", UPARROW,	KEY_UP ),
 	INTERN_KEY(	"^(kd)", DNARROW,	KEY_DOWN ),
@@ -1517,8 +1521,30 @@ PRIVATE int LYgetch_for ARGS1(
    current_sl_modifier = 0;
 
    key = SLang_do_key (Keymap_List, myGetChar);
-   if ((key == NULL) || (key->type != SLKEY_F_KEYSYM))
+   if ((key == NULL) || (key->type != SLKEY_F_KEYSYM)) {
+#ifdef __MINGW32__
+	   if ((key == NULL) && (current_sl_modifier == LKC_ISLKC)) {
+		   key = SLang_do_key (Keymap_List, myGetChar);
+		   keysym = key->f.keysym;
+		   switch (keysym) {
+			   case 'H': keysym = UPARROW; break;
+			   case 'P': keysym = DNARROW; break;
+			   case 'M': keysym = RTARROW; break;
+			   case 'K': keysym = LTARROW; break;
+			   case 'R': keysym = INSERT_KEY; break;
+			   case 'S': keysym = REMOVE_KEY; break;
+			   case 'I': keysym = PGUP; break;
+			   case 'Q': keysym = PGDOWN; break;
+			   case 'G': keysym = HOME; break;
+			   case 'O': keysym = END_KEY; break;
+			   case ';': keysym = F1; break;
+		   }
+		   return(keysym);
+	   }
+#endif
+
      return (current_sl_modifier ? 0 : DO_NOTHING);
+   }
 
    keysym = key->f.keysym;
 
@@ -1644,7 +1670,7 @@ re_read:
 #else
     if (c == EOF && errno == EINTR) {
 
-#if HAVE_SIZECHANGE || defined(USE_SLANG)
+#if defined(HAVE_SIZECHANGE) || defined(USE_SLANG)
 	   CTRACE((tfp, "Got EOF with EINTR, recent_sizechange so far is %d\n",
 		  recent_sizechange));
 	   if (!recent_sizechange) { /* not yet detected by ourselves */
@@ -1707,17 +1733,17 @@ re_read:
 
 	switch (a) {
 	case 'A': c = UPARROW; break;
-	case 'x': c = UPARROW; break;	/* keypad up on pc ncsa telnet */
 	case 'B': c = DNARROW; break;
-	case 'r': c = DNARROW; break;	/* keypad down on pc ncsa telnet */
 	case 'C': c = RTARROW; break;
-	case 'v': c = RTARROW; break;	/* keypad right on pc ncsa telnet */
 	case 'D': c = LTARROW; break;
-	case 't': c = LTARROW; break;	/* keypad left on pc ncsa telnet */
-	case 'y': c = PGUP;    break;	/* keypad on pc ncsa telnet */
-	case 's': c = PGDOWN;  break;	/* keypad on pc ncsa telnet */
-	case 'w': c = HOME;    break;	/* keypad on pc ncsa telnet */
-	case 'q': c = END_KEY; break;	/* keypad on pc ncsa telnet */
+	case 'q': c = END_KEY; break;	/* vt100 application keypad 1 */
+	case 'r': c = DNARROW; break;	/* vt100 application keypad 2 */
+	case 's': c = PGDOWN;  break;	/* vt100 application keypad 3 */
+	case 't': c = LTARROW; break;	/* vt100 application keypad 4 */
+	case 'v': c = RTARROW; break;	/* vt100 application keypad 6 */
+	case 'w': c = HOME;    break;	/* vt100 application keypad 7 */
+	case 'x': c = UPARROW; break;	/* vt100 application keypad 8 */
+	case 'y': c = PGUP;    break;	/* vt100 application keypad 9 */
 	case 'M':
 #if defined(USE_SLANG) && defined(USE_MOUSE)
 	   if (found_CSI(c,b))
@@ -1864,7 +1890,7 @@ re_read:
     if (done_esc) {
 	/* don't do keypad() switches below, we already got it - kw */
     } else {
-#if HAVE_KEYPAD
+#ifdef HAVE_KEYPAD
 	/*
 	 *  Convert keypad() mode keys into Lynx defined keys.
 	 */
@@ -2002,7 +2028,7 @@ re_read:
 #endif /* KEY_BTAB */
 #ifdef KEY_RESIZE
 	case KEY_RESIZE:	   /* size change detected by ncurses */
-#if HAVE_SIZECHANGE || defined(USE_SLANG)
+#if defined(HAVE_SIZECHANGE) || defined(USE_SLANG)
 	    /* Make call to detect new size, if that may be implemented.
 	     * The call may set recent_sizechange (except for USE_SLANG),
 	     * which will tell mainloop() to refresh. - kw
@@ -2134,7 +2160,7 @@ re_read:
 			else if (mouse_link >= 0 &&
 				 textfields_need_activation &&
 				 links[mouse_link].type == WWW_FORM_LINK_TYPE &&
-				 F_TEXTLIKE(links[mouse_link].form->type))
+				 F_TEXTLIKE(links[mouse_link].l_form->type))
 			    lac = LYK_ACTIVATE;
 #endif
 		    }
@@ -2156,8 +2182,6 @@ re_read:
 		}
 #else /* pdcurses version */
 
-	/* _WINDOWS 1997/10/18 (Sat) 19:41:59 */
-
 #define H_CMD_AREA	6
 #define HIST_CMD_2	12
 #define V_CMD_AREA	1
@@ -2174,39 +2198,7 @@ re_read:
 		c = -1;
 		mouse_link = -1;
 
-		if (system_is_NT) {
-		/* for Windows NT */
-		  request_mouse_pos();
-
-		  if (BUTTON_STATUS(1) & BUTTON_PRESSED) {
-			if (MOUSE_Y_POS > (LYlines - V_CMD_AREA)) {
-			    /* Screen BOTTOM */
-			    if (MOUSE_X_POS < left) {
-				c = LTARROW;		p = "<-";
-			    } else if (MOUSE_X_POS < HIST_CMD_2) {
-				c = RTARROW;		p = "->";
-			    } else if (MOUSE_X_POS > right) {
-				c = 'z';		p = "Cancel";
-			    } else {
-				c = PGDOWN;		p = "PGDOWN";
-			    }
-			} else if (MOUSE_Y_POS < V_CMD_AREA) {
-			    /* Screen TOP */
-			    if (MOUSE_X_POS < left) {
-				c = LTARROW;		p = "<-";
-			    } else if (MOUSE_X_POS < HIST_CMD_2) {
-				c = RTARROW;		p = "->";
-			    } else if (MOUSE_X_POS > right) {
-				c = 'z';		p = "Cancel";
-			    } else {
-				c = PGUP;		p = "PGUP";
-			    }
-			} else {
-			    c = set_clicked_link(MOUSE_X_POS, MOUSE_Y_POS, FOR_PANEL, 1);
-			}
-		    }
-		} else {
-		    /* for Windows 95 */
+		if (!system_is_NT) {
 		    tick_count = GetTickCount();
 
 		    /* Guard Mouse button miss click */
@@ -2216,15 +2208,18 @@ re_read:
 		    } else {
 			old_click = tick_count;
 		    }
-		    request_mouse_pos();
-		    if (MOUSE_Y_POS > (LYlines - V_CMD_AREA)) {
+		}
+		request_mouse_pos();
+
+		if (BUTTON_STATUS(1) & BUTTON_PRESSED) {
+		    if (MOUSE_Y_POS > (LYlines - V_CMD_AREA - 1)) {
 			/* Screen BOTTOM */
 			if (MOUSE_X_POS < left) {
 			    c = LTARROW;	p = "<-";
 			} else if (MOUSE_X_POS < HIST_CMD_2) {
 			    c = RTARROW;	p = "->";
 			} else if (MOUSE_X_POS > right) {
-			    c = '\b';		p = "History";
+			    c = 'z';		p = "Cancel";
 			} else {
 			    c = PGDOWN;		p = "PGDOWN";
 			}
@@ -2431,7 +2426,8 @@ PUBLIC void LYLowerCase ARGS1(
     for (i = 0; buffer[i]; i++)
 #ifdef SUPPORT_MULTIBYTE_EDIT	/* 1998/11/23 (Mon) 17:04:55 */
     {
-	if (buffer[i] & 0x80) {
+	if ((buffer[i] & 0x80) != 0
+	 && buffer[i+1] != 0) {
 	    if ((kanji_code == SJIS) && IS_SJIS_X0201KANA(UCH((buffer[i])))) {
 		continue;
 	    }
@@ -2456,7 +2452,8 @@ PUBLIC void LYUpperCase ARGS1(
     for (i = 0; buffer[i]; i++)
 #ifdef SUPPORT_MULTIBYTE_EDIT	/* 1998/11/23 (Mon) 17:05:10 */
     {
-	if (buffer[i] & 0x80) {
+	if ((buffer[i] & 0x80) != 0
+	 && buffer[i+1] != 0) {
 	    if ((kanji_code == SJIS) && IS_SJIS_X0201KANA(UCH((buffer[i])))) {
 		continue;
 	    }
@@ -2471,18 +2468,52 @@ PUBLIC void LYUpperCase ARGS1(
 }
 
 /*
- * Remove ALL whitespace from a string (including embedded blanks).
+ * Remove newlines from a string, returning true if we removed any.
+ */
+PUBLIC BOOLEAN LYRemoveNewlines ARGS1(
+	char *,		buffer)
+{
+    if (buffer != 0) {
+	register char* buf = buffer;
+	for ( ; *buf && *buf != '\n' && *buf != '\r'; buf++)
+	    ;
+	if (*buf) {
+	    /* runs very seldom */
+	    char * old = buf;
+	    for ( ; *old; old++) {
+		if (*old != '\n' && *old != '\r')
+		    *buf++ = *old;
+	    }
+	    *buf = '\0';
+	    return TRUE;
+	}
+    }
+    return FALSE;
+}
+
+/*
+ * Remove ALL whitespace from a string (including embedded blanks), and returns
+ * a pointer to the end of the trimmed string.
  */
-PUBLIC void LYRemoveBlanks ARGS1(
+PUBLIC char * LYRemoveBlanks ARGS1(
 	char *,		buffer)
 {
     if (buffer != 0) {
-	size_t i, j;
-	for (i = j = 0; buffer[i]; i++)
-	    if (!isspace(UCH((buffer[i]))))
-		buffer[j++] = buffer[i];
-	buffer[j] = 0;
+	register char* buf = buffer;
+	for ( ; *buf && !isspace(UCH(*buf)); buf++)
+	    ;
+	if (*buf) {
+	    /* runs very seldom */
+	    char * old = buf;
+	    for ( ; *old; old++) {
+		if (!isspace(UCH(*old)))
+		    *buf++ = *old;
+	    }
+	    *buf = '\0';
+	}
+	return buf;
     }
+    return NULL;
 }
 
 /*
@@ -2541,6 +2572,18 @@ PUBLIC void LYTrimLeading ARGS1(
 }
 
 /*
+ * Trim trailing newline(s) from a string
+ */
+PUBLIC char * LYTrimNewline ARGS1(
+	char *,		buffer)
+{
+    size_t i = strlen(buffer);
+    while (i != 0 && (buffer[i-1] == '\n' || buffer[i-1] == '\r'))
+	buffer[--i] = 0;
+    return buffer;
+}
+
+/*
  * Trim trailing blanks from a string
  */
 PUBLIC void LYTrimTrailing ARGS1(
@@ -2587,8 +2630,8 @@ PUBLIC BOOLEAN LYTrimStartfile ARGS1(
 	char *,		buffer)
 {
     LYTrimHead(buffer);
-    if (!strncasecomp(buffer, "lynxexec:", 9) ||
-	!strncasecomp(buffer, "lynxprog:", 9)) {
+    if (isLYNXEXEC(buffer) ||
+	isLYNXPROG(buffer)) {
 	/*
 	 *  The original implementations of these schemes expected
 	 *  white space without hex escaping, and did not check
@@ -2711,8 +2754,8 @@ PRIVATE int prev_pos ARGS2(
 	while (i < pos - 1) {
 	    int c;
 	    c = Buf[i];
-	    if (!(isascii(c) ||
-		  ((kanji_code == SJIS) && IS_SJIS_X0201KANA(UCH(c))))) {
+	    if (is8bits(c) &&
+		  !((kanji_code == SJIS) && IS_SJIS_X0201KANA(UCH(c)))) {
 		i++;
 	    }
 	    i++;
@@ -2945,19 +2988,19 @@ PUBLIC int LYEdit1 ARGS4(
 
 	    pos0 = prev_pos(edit, Pos);
 	    while (Pos &&
-		   (HTCJK == NOCJK || isascii(Buf[pos0])) &&
+		   (HTCJK == NOCJK || !is8bits(Buf[pos0])) &&
 		   !isalnum(UCH(Buf[pos0]))) {
 		Pos = pos0;
 		pos0 = prev_pos(edit, Pos);
 	    }
-	    if (HTCJK != NOCJK && !isascii(Buf[pos0])) {
-		while (Pos && !isascii(Buf[pos0])) {
+	    if (HTCJK != NOCJK && is8bits(Buf[pos0])) {
+		while (Pos && is8bits(Buf[pos0])) {
 		    Pos = pos0;
 		    pos0 = prev_pos(edit, Pos);
 		}
 	    } else {
 		while (Pos
-		 && isascii(UCH(Buf[pos0]))
+		 && !is8bits(Buf[pos0])
 		 && isalnum(UCH(Buf[pos0]))) {
 		    Pos = pos0;
 		    pos0 = prev_pos(edit, Pos);
@@ -2977,14 +3020,14 @@ PUBLIC int LYEdit1 ARGS4(
 	while (!isalnum(Buf[Pos]) && Buf[Pos])
 	    Pos++ ;
 #else /* SUPPORT_MULTIBYTE_EDIT */
-	if (HTCJK != NOCJK && !isascii(Buf[Pos])) {
-	    while (!isascii(Buf[Pos]))
+	if (HTCJK != NOCJK && is8bits(Buf[Pos])) {
+	    while (is8bits(Buf[Pos]))
 		Pos += 2;
 	} else {
-	    while (isascii(UCH(Buf[Pos])) && isalnum(UCH(Buf[Pos])))
+	    while (!is8bits(Buf[Pos]) && isalnum(Buf[Pos]))
 		Pos++;	/* '\0' is not a/n */
 	}
-	while ((HTCJK == NOCJK || isascii(UCH(Buf[Pos]))) &&
+	while ((HTCJK == NOCJK || !is8bits(Buf[Pos])) &&
 	       !isalnum(UCH(Buf[Pos])) && Buf[Pos])
 	    Pos++;
 #endif /* SUPPORT_MULTIBYTE_EDIT */
@@ -3071,7 +3114,7 @@ PUBLIC int LYEdit1 ARGS4(
 	if (Pos >= length)
 	    break;
 #ifdef SUPPORT_MULTIBYTE_EDIT
-	if (HTCJK != NOCJK && !isascii(Buf[Pos]))
+	if (HTCJK != NOCJK && is8bits(Buf[Pos]))
 	    Pos++;
 #endif
 	Pos++;
@@ -3131,7 +3174,7 @@ PUBLIC int LYEdit1 ARGS4(
 #else /* SUPPORT_MULTIBYTE_EDIT */
 	if (Pos < length) {
 	    Pos++;
-	    if (HTCJK != NOCJK && !isascii(Buf[Pos-1]))
+	    if (HTCJK != NOCJK && is8bits(Buf[Pos-1]))
 		Pos++;
 	}
 #endif /* SUPPORT_MULTIBYTE_EDIT */
@@ -3388,7 +3431,7 @@ PUBLIC void LYRefreshEdit ARGS1(
 		int tmp = (Pos - DspWdth) + Margin;
 
 		while (DspStart < tmp) {
-		    if (!isascii(Buf[DspStart]))
+		    if (is8bits(Buf[DspStart]))
 			DspStart++;
 		    DspStart++;
 		}
@@ -3410,7 +3453,7 @@ PUBLIC void LYRefreshEdit ARGS1(
 
 	    DspStart = 0;
 	    while (DspStart < tmp) {
-		if (!isascii(Buf[DspStart]))
+		if (is8bits(Buf[DspStart]))
 		    DspStart++;
 		DspStart++;
 	    }
@@ -3424,7 +3467,7 @@ PUBLIC void LYRefreshEdit ARGS1(
 
     str = &Buf[DspStart];
 #ifdef SUPPORT_MULTIBYTE_EDIT
-    if (HTCJK != NOCJK && !isascii(str[0]))
+    if (HTCJK != NOCJK && is8bits(str[0]))
 	begin_multi = 1;
 #endif /* SUPPORT_MULTIBYTE_EDIT */
 
@@ -3482,16 +3525,22 @@ PUBLIC void LYRefreshEdit ARGS1(
 #endif /* SUPPORT_MULTIBYTE_EDIT */
 	    } else {
 		/* For CJK strings, by Masanobu Kimura */
-		if (HTCJK != NOCJK && !isascii(buffer[0])) {
-#ifndef SUPPORT_MULTIBYTE_EDIT
+		if (HTCJK != NOCJK && is8bits(buffer[0])) {
 		    if (i < (nrdisplayed - 1))
 			buffer[1] = str[++i];
-#else /* SUPPORT_MULTIBYTE_EDIT */
-		    if (i < (nrdisplayed - 1)) {
-			buffer[1] = str[++i];
-			end_multi = 1;
-		    } else
-			end_multi = 0;
+#ifdef SUPPORT_MULTIBYTE_EDIT
+		    end_multi = (i < nrdisplayed);
+#if !(defined(USE_SLANG) || defined(WIDEC_CURSES))
+		    {
+			int ii, yy, xx;
+
+			LYGetYX(yy, xx);
+			for (ii = 0; buffer[ii] != '\0'; ++ii)
+			    LYaddch(' ');
+			LYrefresh();
+			LYmove(yy, xx);
+		    }
+#endif /* USE_SLANG */
 #endif /* SUPPORT_MULTIBYTE_EDIT */
 		    LYaddstr(buffer);
 		    buffer[1] = '\0';
@@ -3554,12 +3603,6 @@ PUBLIC void LYRefreshEdit ARGS1(
     }
 
     LYmove(edit->sy, edit->sx + Pos - DspStart);
-#ifdef SUPPORT_MULTIBYTE_EDIT
-#if (!USE_SLANG && !defined(USE_MULTIBYTE_CURSES))
-    if (HTCJK != NOCJK)
-	lynx_force_repaint();
-#endif /* !USE_SLANG && !defined(USE_MULTIBYTE_CURSES) */
-#endif /* SUPPORT_MULTIBYTE_EDIT */
 
 #ifdef USE_COLOR_STYLE
     if (estyle != NOSTYLE)
@@ -4419,7 +4462,7 @@ redraw:
 		     */
 		    if ((cp = (char *)HTList_objectAt(search_queries,
 						      0)) != NULL) {
-			LYstrncpy(prev_target_buffer, cp, sizeof(prev_target_buffer));
+			LYstrncpy(prev_target_buffer, cp, sizeof(prev_target_buffer) - 1);
 			QueryNum = 0;
 			FirstRecall = FALSE;
 		    }
@@ -4785,13 +4828,8 @@ again:
 		    while (cur_choice < num_options
 		     && strcasecomp(data[cur_choice], MyEdit.buffer) < 0)
 			cur_choice++;
-#ifdef USE_SLANG
-		    old_y = SLsmg_get_row();
-		    old_x = SLsmg_get_column();
-#else
-		    getyx(LYwin, old_y, old_x);
-#endif
 
+		    LYGetYX(old_y, old_x);
 		    cur_choice = LYhandlePopupList(
 			cur_choice,
 			0,
@@ -4807,11 +4845,7 @@ again:
 			    _statusline(": ");
 			reinsertEdit(&MyEdit, data[cur_choice]);
 		    }
-#ifdef USE_SLANG
-		    SLsmg_gotorc(old_y, old_x);
-#else
 		    wmove(LYwin, old_y, old_x);
-#endif
 		    FREE(data);
 		}
 	    } else {
@@ -4851,12 +4885,12 @@ again:
 
 	case LYE_PASTE:
 	    {
-		unsigned char *s = get_clip_grab(), *e;
+		unsigned char *s = (unsigned char *) get_clip_grab(), *e;
 		int len;
 
 		if (!s)
 		    break;
-		len = strlen(s);
+		len = strlen((const char *) s);
 		e = s + len;
 
 		if (len > 0) {
@@ -4868,7 +4902,7 @@ again:
 				LYEditInsert(&MyEdit, s, e1 - s, map_active, TRUE);
 			    s = e1;
 			    if (*e1 == '\t') { /* Replace by space */
-				LYEditInsert(&MyEdit, " ", 1, map_active, TRUE);
+				LYEditInsert(&MyEdit, (unsigned char * ) " ", 1, map_active, TRUE);
 				s = ++e1;
 			    } else
 				break;
@@ -4973,6 +5007,7 @@ PUBLIC CONST char * LYLineeditHelpURL NOARGS
     }
     return NULL;
 }
+
 /*
  *  A replacement for 'strsep()'
  */
@@ -4982,7 +5017,7 @@ PUBLIC char *LYstrsep ARGS2(
 {
     char *tmp, *out;
 
-    if (!stringp || !*stringp)		/* nothing to do? */
+    if (isEmpty(stringp))		/* nothing to do? */
 	return 0;			/* then don't fall on our faces */
 
     out = *stringp;			/* save the start of the string */
@@ -5172,7 +5207,7 @@ PUBLIC char * LYno_attr_mbcs_case_strstr ARGS6(
      *	Seek a first target match. - FM
      */
     for (; *chptr != '\0'; chptr++) {
-	if ((!utf_flag && HTCJK != NOCJK && !isascii(*chptr) &&
+	if ((!utf_flag && HTCJK != NOCJK && is8bits(*chptr) &&
 	     *chptr == *tarptr &&
 	     *(chptr + 1) != '\0' &&
 	     !IsSpecialAttrChar(*(chptr + 1))) ||
@@ -5195,7 +5230,7 @@ PUBLIC char * LYno_attr_mbcs_case_strstr ARGS6(
 		if (nendp)	*nendp = len;
 		return(chptr);
 	    }
-	    if (!utf_flag && HTCJK != NOCJK && !isascii(*chptr) &&
+	    if (!utf_flag && HTCJK != NOCJK && is8bits(*chptr) &&
 		 *chptr == *tarptr &&
 		 *tmpchptr != '\0' &&
 		 !IsSpecialAttrChar(*tmpchptr)) {
@@ -5232,7 +5267,7 @@ PUBLIC char * LYno_attr_mbcs_case_strstr ARGS6(
 	     */
 	    while (1) {
 		if (!IsSpecialAttrChar(*tmpchptr)) {
-		    if (!utf_flag && HTCJK != NOCJK && !isascii(*tmpchptr)) {
+		    if (!utf_flag && HTCJK != NOCJK && is8bits(*tmpchptr)) {
 			if (*tmpchptr == *tmptarptr &&
 			    *(tmpchptr + 1) == *(tmptarptr + 1) &&
 			    !IsSpecialAttrChar(*(tmpchptr + 1))) {
@@ -5266,7 +5301,7 @@ PUBLIC char * LYno_attr_mbcs_case_strstr ARGS6(
 	    }
 	} else if (!(IS_UTF_EXTRA(*chptr) ||
 		      IsSpecialAttrChar(*chptr))) {
-	    if (!utf_flag && HTCJK != NOCJK && !isascii(*chptr) &&
+	    if (!utf_flag && HTCJK != NOCJK && is8bits(*chptr) &&
 		*(chptr + 1) != '\0' &&
 		!IsSpecialAttrChar(*(chptr + 1))) {
 		chptr++;
@@ -5344,7 +5379,7 @@ PUBLIC char * LYno_attr_mbcs_strstr ARGS6(
 		if (nendp)	*nendp = len;
 		return(chptr);
 	    }
-	    if (!utf_flag && HTCJK != NOCJK && !isascii(*chptr) &&
+	    if (!utf_flag && HTCJK != NOCJK && is8bits(*chptr) &&
 		 *tmpchptr != '\0' &&
 		 !IsSpecialAttrChar(*tmpchptr)) {
 		/*
@@ -5380,7 +5415,7 @@ PUBLIC char * LYno_attr_mbcs_strstr ARGS6(
 	     */
 	    while (1) {
 		 if (!IsSpecialAttrChar(*tmpchptr)) {
-		    if (!utf_flag && HTCJK != NOCJK && !isascii(*tmpchptr)) {
+		    if (!utf_flag && HTCJK != NOCJK && is8bits(*tmpchptr)) {
 			if (*tmpchptr == *tmptarptr &&
 			    *(tmpchptr + 1) == *(tmptarptr + 1) &&
 			    !IsSpecialAttrChar(*(tmpchptr + 1))) {
@@ -5413,7 +5448,7 @@ PUBLIC char * LYno_attr_mbcs_strstr ARGS6(
 	    }
 	} else if (!(IS_UTF_EXTRA(*chptr) ||
 		      IsSpecialAttrChar(*chptr))) {
-	    if (!utf_flag && HTCJK != NOCJK && !isascii(*chptr) &&
+	    if (!utf_flag && HTCJK != NOCJK && is8bits(*chptr) &&
 		*(chptr + 1) != '\0' &&
 		!IsSpecialAttrChar(*(chptr + 1))) {
 		chptr++;
@@ -5436,9 +5471,9 @@ PUBLIC char * SNACopy ARGS3(
 {
     FREE(*dest);
     if (src) {
-	*dest = typecallocn(char, n + 1);
+	*dest = typeMallocn(char, n + 1);
 	if (*dest == NULL) {
-	    CTRACE((tfp, "Tried to calloc %d bytes\n", n));
+	    CTRACE((tfp, "Tried to malloc %d bytes\n", n));
 	    outofmem(__FILE__, "SNACopy");
 	}
 	strncpy (*dest, src, n);
@@ -5455,7 +5490,7 @@ PUBLIC char * SNACat ARGS3(
 	CONST char *,	src,
 	int,		n)
 {
-    if (src && *src) {
+    if (non_empty(src)) {
 	if (*dest) {
 	    int length = strlen(*dest);
 	    *dest = (char *)realloc(*dest, length + n + 1);
@@ -5464,7 +5499,7 @@ PUBLIC char * SNACat ARGS3(
 	    strncpy(*dest + length, src, n);
 	    *(*dest + length + n) = '\0'; /* terminate */
 	} else {
-	    *dest = typecallocn(char, n + 1);
+	    *dest = typeMallocn(char, n + 1);
 	    if (*dest == NULL)
 		outofmem(__FILE__, "SNACat");
 	    memcpy(*dest, src, n);
@@ -5598,74 +5633,6 @@ PUBLIC char *LYSafeGets ARGS2(
     return result;
 }
 
-#ifdef EXP_FILE_UPLOAD
-static char basis_64[] =
-   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-#define B64_LINE       76
-
-PUBLIC void base64_encode ARGS3(
-    char *,	dest,
-    char *,	src,
-    int,	len)
-{
-    int rlen;   /* length of result string */
-    unsigned char c1, c2, c3;
-    char *eol, *r, *str;
-    int eollen;
-    int chunk;
-
-    str = src;
-    eol = "\n";
-    eollen = 1;
-
-    /* calculate the length of the result */
-    rlen = (len+2) / 3 * 4;	/* encoded bytes */
-    if (rlen) {
-	/* add space for EOL */
-	rlen += ((rlen-1) / B64_LINE + 1) * eollen;
-    }
-
-    /* allocate a result buffer */
-    r = dest;
-
-    /* encode */
-    for (chunk=0; len > 0; len -= 3, chunk++) {
-	if (chunk == (B64_LINE/4)) {
-	    char *c = eol;
-	    char *e = eol + eollen;
-	    while (c < e)
-		*r++ = *c++;
-	    chunk = 0;
-	}
-	c1 = *str++;
-	c2 = *str++;
-	*r++ = basis_64[c1>>2];
-	*r++ = basis_64[((c1 & 0x3)<< 4) | ((c2 & 0xF0) >> 4)];
-	if (len > 2) {
-	    c3 = *str++;
-	    *r++ = basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >>6)];
-	    *r++ = basis_64[c3 & 0x3F];
-	} else if (len == 2) {
-	    *r++ = basis_64[(c2 & 0xF) << 2];
-	    *r++ = '=';
-	} else { /* len == 1 */
-	    *r++ = '=';
-	    *r++ = '=';
-	}
-    }
-    if (rlen) {
-	/* append eol to the result string */
-	char *c = eol;
-	char *e = eol + eollen;
-	while (c < e)
-	    *r++ = *c++;
-    }
-    *r = '\0';  /* every SV in perl should be NUL-terminated */
-}
-
-#endif /* EXP_FILE_UPLOAD */
-
 #ifdef EXP_CMD_LOGGING
 PRIVATE FILE *cmd_logfile;
 PRIVATE FILE *cmd_script;
@@ -5712,25 +5679,51 @@ PUBLIC int LYReadCmdKey ARGS1(
 	char *buffer = 0;
 	char *src;
 	char *tmp;
+	unsigned len;
 
-	while (LYSafeGets(&buffer, cmd_script) != 0) {
+	while ((ch < 0) && LYSafeGets(&buffer, cmd_script) != 0) {
 	    LYTrimTrailing(buffer);
 	    src = LYSkipBlanks(buffer);
 	    tmp = LYSkipNonBlanks(src);
-	    if (tmp - src != 3
-	     || strncasecomp(src, "key", 3))
-		continue;
-	    src = LYSkipBlanks(tmp);
-	    if ((ch = LYStringToKeycode(src)) >= 0) {
-		LYrefresh();
+	    switch (len = (tmp - src)) {
+	    case 4:
+		if (!strncasecomp(src, "exit", 4))
+		    exit(0);
+		break;
+	    case 3:
+		if (!strncasecomp(src, "key", 3)) {
+		    ch = LYStringToKeycode(LYSkipBlanks(tmp));
+		} else if (!strncasecomp(src, "set", 3)) {
+		    src = LYSkipBlanks(tmp);
+		    tmp = src;
+		    while (*tmp != '\0') {
+			if (isspace(UCH(*tmp)) || *tmp == '=')
+			    break;
+			++tmp;
+		    }
+		    if (*tmp != '\0') {
+			*tmp++ = '\0';
+			tmp = LYSkipBlanks(tmp);
+		    }
+		    CTRACE((tfp, "LYSetConfigValue(%s, %s)\n", src, tmp));
+		    LYSetConfigValue(src, tmp);
+		}
 		break;
 	    }
 	}
+	if (feof(cmd_script)) {
+	    fclose(cmd_script);
+	    cmd_script = 0;
+	}
+	if (ch >= 0) {
+	    LYSleepReplay();
+	    LYrefresh();
+	}
 	FREE(buffer);
     } else {
 	ch = LYgetch_for(mode);
     }
-    CTRACE((tfp, "LYReadCmdKey(%d) ->%c (%#x)\n", mode, ch, ch));
+    CTRACE((tfp, "LYReadCmdKey(%d) ->%s (%#x)\n", mode, LYKeycodeToString(ch, TRUE), ch));
     LYWriteCmdKey(ch);
     return ch;
 }
diff --git a/gnu/usr.bin/lynx/src/LYStrings.h b/gnu/usr.bin/lynx/src/LYStrings.h
index f689c2a61cd..a834a8f3f09 100644
--- a/gnu/usr.bin/lynx/src/LYStrings.h
+++ b/gnu/usr.bin/lynx/src/LYStrings.h
@@ -10,6 +10,8 @@ typedef enum {
     , RECALL_MAIL
 } RecallType;
 
+#define is8bits(ch) (UCH(ch) >= 128)	/* isascii(ch) is not POSIX */
+
 /*  UPPER8(ch1,ch2) is an extension of (TOUPPER(ch1) - TOUPPER(ch2))  */
 extern int UPPER8  PARAMS((
 	int		ch1,
@@ -76,6 +78,8 @@ extern char * LYno_attr_mbcs_case_strstr PARAMS((
 	int *		nstartp,
 	int *		nendp));
 
+#define non_empty(s) !isEmpty(s)
+
 #define LYno_attr_mb_strstr(chptr, tarptr, utf_flag, count_gcells, nstartp, nendp) \
 	(case_sensitive \
 	    ? LYno_attr_mbcs_strstr(chptr, tarptr, utf_flag, count_gcells, nstartp, nendp) \
@@ -119,10 +123,6 @@ extern void LYWriteCmdKey PARAMS((int ch));
 #define LYCloseCmdLogfile() /* nothing */
 #endif
 
-#ifdef EXP_FILE_UPLOAD
-extern void base64_encode PARAMS((char * dest, char * src, int len));
-#endif
-
 /* values for LYgetch */
 /* The following are lynxkeycodes, not to be confused with
    lynxactioncodes (LYK_*) to which they are often mapped.
@@ -300,7 +300,9 @@ extern void LYLowerCase PARAMS((
 	char *		buffer));
 extern void LYUpperCase PARAMS((
 	char *		buffer));
-extern void LYRemoveBlanks PARAMS((
+extern BOOLEAN LYRemoveNewlines PARAMS((
+	char *		buffer));
+extern char * LYRemoveBlanks PARAMS((
 	char *		buffer));
 extern char * LYSkipBlanks PARAMS((
 	char *		buffer));
@@ -312,6 +314,8 @@ extern CONST char * LYSkipCNonBlanks PARAMS((
 	CONST char *	buffer));
 extern void LYTrimLeading PARAMS((
 	char *		buffer));
+extern char * LYTrimNewline PARAMS((
+	char *		buffer));
 extern void LYTrimTrailing PARAMS((
 	char *		buffer));
 extern void LYTrimAllStartfile PARAMS((
diff --git a/gnu/usr.bin/lynx/src/LYStructs.h b/gnu/usr.bin/lynx/src/LYStructs.h
index fd95aee5460..1fe9dc66415 100644
--- a/gnu/usr.bin/lynx/src/LYStructs.h
+++ b/gnu/usr.bin/lynx/src/LYStructs.h
@@ -5,60 +5,66 @@
 #include <HTAnchor.h>
 #endif /* HTANCHOR_H */
 
-typedef struct link {
+typedef struct {
+    char *hl_text;
+    short hl_x;
+} HiliteInfo;
+
+typedef struct {
+    HiliteInfo *hl_info;
+    HiliteInfo hl_base;
+    short hl_len;              /* number of strings in this struct */
+} HiliteList;
+
+typedef struct {
     char *lname;
     char *target;
-    char *hightext;
-    char *hightext2;
-    int hightext2_offset;
+    char *l_hightext;
+    char *l_hightext2;
+    int l_hightext2_offset;
     BOOL inUnderline;	/* TRUE when this link is in underlined context. */
     int lx;
     int ly;
     int type;		/* Type of link, Forms, WWW, etc. */
     int anchor_number;	/* The anchor number within the HText structure.  */
     int anchor_line_num;/* The anchor line number in the HText structure. */
-    struct _FormInfo *form;	/* Pointer to form info. */
-} linkstruct;
-extern linkstruct links[MAXLINKS];
+    HiliteList list;
+    struct _FormInfo *l_form;	/* Pointer to form info. */
+} LinkInfo;
+extern LinkInfo links[MAXLINKS];
 extern int nlinks;
 
-typedef struct _document {
-   char * title;
-   char * address;
-   char * post_data;
-   char * post_content_type;
-   char * bookmark;
-   BOOL   safe;
-   BOOL   isHEAD;
-   int    link;
-   int    line;
-   BOOL   internal_link;	/* whether doc was reached via an internal
-				 (fragment) link. - kw */
-#ifdef USE_COLOR_STYLE
-   char * style;
-#endif
-} document;
-
-#ifndef HTFORMS_H
-#include <HTForms.h>
-#endif /* HTFORMS_H */
-
-typedef struct _histstruct {
+typedef struct {
+    /* FIXME: see DocAddress */
     char * title;
     char * address;
-    char * post_data;
+    bstring * post_data;
     char * post_content_type;
     char * bookmark;
-    BOOL   safe;
     BOOL   isHEAD;
+    BOOL   safe;
+
     int    link;
     int    line;
     BOOL   internal_link;	/* whether doc was reached via an internal
 				 (fragment) link. - kw */
+#ifdef USE_COLOR_STYLE
+    char * style;
+#endif
+} DocInfo;
+
+#ifndef HTFORMS_H
+#include <HTForms.h>
+#endif /* HTFORMS_H */
+
+typedef struct {
+    DocInfo hdoc;
     int    intern_seq_start;	/* indicates which element on the history
 				   is the start of this sequence of
 				   "internal links", otherwise -1 */
-} histstruct;
+} HistInfo;
+
+#define HDOC(n) history[n].hdoc
 
 extern int Visited_Links_As;
 
@@ -77,7 +83,7 @@ typedef struct _VisitedLink {
     struct _VisitedLink *prev_first;
 } VisitedLink;
 
-extern histstruct history[MAXHIST];
+extern HistInfo history[MAXHIST];
 extern int nhist;
 
 /******************************************************************************/
diff --git a/gnu/usr.bin/lynx/src/LYStyle.c b/gnu/usr.bin/lynx/src/LYStyle.c
index 6b31e467d9b..2fcc41be23d 100644
--- a/gnu/usr.bin/lynx/src/LYStyle.c
+++ b/gnu/usr.bin/lynx/src/LYStyle.c
@@ -1,6 +1,6 @@
 /* character level styles for Lynx
  * (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-)
- * $Id: LYStyle.c,v 1.3 2003/05/01 18:59:39 avsm Exp $
+ * $Id: LYStyle.c,v 1.4 2004/06/22 04:01:50 avsm Exp $
  */
 #include <HTUtils.h>
 #include <HTML.h>
@@ -28,7 +28,7 @@
 PRIVATE void style_initialiseHashTable NOPARAMS;
 
 /* stack of attributes during page rendering */
-PUBLIC int last_styles[128];
+PUBLIC int last_styles[128] = { 0 };
 PUBLIC int last_colorattr_ptr = 0;
 
 PUBLIC bucket hashStyles[CSHASHSIZE];
@@ -59,6 +59,13 @@ PUBLIC int s_alert		= NOSTYLE;
 PUBLIC int s_alink		= NOSTYLE;
 PUBLIC int s_curedit		= NOSTYLE;
 PUBLIC int s_forw_backw		= NOSTYLE;
+PUBLIC int s_hot_paste		= NOSTYLE;
+PUBLIC int s_menu_active	= NOSTYLE;
+PUBLIC int s_menu_bg		= NOSTYLE;
+PUBLIC int s_menu_entry		= NOSTYLE;
+PUBLIC int s_menu_frame		= NOSTYLE;
+PUBLIC int s_menu_number	= NOSTYLE;
+PUBLIC int s_menu_sb		= NOSTYLE;
 PUBLIC int s_normal		= NOSTYLE;
 PUBLIC int s_prompt_edit	= NOSTYLE;
 PUBLIC int s_prompt_edit_arr	= NOSTYLE;
@@ -67,12 +74,6 @@ PUBLIC int s_prompt_sel		= NOSTYLE;
 PUBLIC int s_status		= NOSTYLE;
 PUBLIC int s_title		= NOSTYLE;
 PUBLIC int s_whereis		= NOSTYLE;
-PUBLIC int s_menu_frame		= NOSTYLE;
-PUBLIC int s_menu_bg		= NOSTYLE;
-PUBLIC int s_menu_number	= NOSTYLE;
-PUBLIC int s_menu_entry		= NOSTYLE;
-PUBLIC int s_menu_active	= NOSTYLE;
-PUBLIC int s_menu_sb		= NOSTYLE;
 
 #ifdef USE_SCROLLBAR
 PUBLIC int s_sb_aa		= NOSTYLE;
@@ -93,7 +94,10 @@ PRIVATE int colorPairs = 0;
 #  define M_BLINK	0
 #endif
 
-PRIVATE unsigned char our_pairs[2][MAX_BLINK][MAX_COLOR][MAX_COLOR];
+PRIVATE unsigned char our_pairs[2]
+				[MAX_BLINK]
+				[MAX_COLOR + 1]
+				[MAX_COLOR + 1];
 
 /*
  * Parse a string containing a combination of video attributes and color.
@@ -180,29 +184,33 @@ PRIVATE void parse_attributes ARGS5(
      * If we have colour, and space to create a new colour attribute,
      * and we have a valid colour description, then add this style
      */
-    if (lynx_has_color && colorPairs < COLOR_PAIRS-1 && fA != NO_COLOR)
-    {
-	int curPair;
-
+    if (lynx_has_color && colorPairs < COLOR_PAIRS-1 && fA != NO_COLOR) {
+	int curPair = 0;
+	int iFg = (1 + (fA >= 0 ? fA : 0));
+	int iBg = (1 + (bA >= 0 ? bA : 0));
+	int iBold = !!(cA & A_BOLD);
+	int iBlink = !!(cA & M_BLINK);
+
+	CTRACE2(TRACE_STYLE, (tfp, "parse_attributes %d/%d %d/%d %#x\n", fA, default_fg, bA, default_bg, cA));
 	if (fA < MAX_COLOR
 	 && bA < MAX_COLOR
-	 && our_pairs[!!(cA & A_BOLD)][!!(cA & A_BLINK)][fA][bA])
-	    curPair = our_pairs[!!(cA & A_BOLD)][!!(cA & M_BLINK)][fA][bA] - 1;
-	else {
-	    curPair = ++colorPairs;
-	    init_pair((short)curPair, (short)fA, (short)bA);
-	    if (fA < MAX_COLOR
-	     && bA < MAX_COLOR
-	     && curPair < 255)
-		our_pairs[!!(cA & A_BOLD)][!!(cA & M_BLINK)][fA][bA] = curPair + 1;
+#ifdef USE_CURSES_PAIR_0
+	 && (cA != A_NORMAL || fA != default_fg || bA != default_bg)
+#endif
+	 && curPair < 255) {
+	    if (our_pairs[iBold][iBlink][iFg][iBg] != 0) {
+		curPair = our_pairs[iBold][iBlink][iFg][iBg];
+	    } else {
+		curPair = ++colorPairs;
+		init_pair((short)curPair, (short)fA, (short)bA);
+		our_pairs[iBold][iBlink][iFg][iBg] = curPair;
+	    }
 	}
 	CTRACE2(TRACE_STYLE, (tfp, "CSS(CURPAIR):%d\n", curPair));
 	if (style < DSTYLE_ELEMENTS)
 	    setStyle(style, COLOR_PAIR(curPair)|cA, cA, mA);
 	setHashStyle(newstyle, COLOR_PAIR(curPair)|cA, cA, mA, element);
-    }
-    else
-    {
+    } else {
 	if (lynx_has_color && fA != NO_COLOR) {
 	    CTRACE2(TRACE_STYLE, (tfp, "CSS(NC): maximum of %d colorpairs exhausted\n", COLOR_PAIRS - 1));
 	}
@@ -244,6 +252,7 @@ PRIVATE void parse_style ARGS1(char*, param)
 	{ "edit.prompt.marked",	DSTYLE_ELEMENTS,	&s_prompt_sel },
 	{ "edit.prompt",	DSTYLE_ELEMENTS,	&s_prompt_edit },
 	{ "forwbackw.arrow",	DSTYLE_ELEMENTS,	&s_forw_backw },
+	{ "hot.paste",		DSTYLE_ELEMENTS,	&s_hot_paste },
 	{ "menu.frame",		DSTYLE_ELEMENTS,	&s_menu_frame },
 	{ "menu.bg",		DSTYLE_ELEMENTS,	&s_menu_bg },
 	{ "menu.n",		DSTYLE_ELEMENTS,	&s_menu_number },
@@ -254,12 +263,18 @@ PRIVATE void parse_style ARGS1(char*, param)
     unsigned n;
     BOOL found = FALSE;
 
-    char *buffer = strdup(param);
-    char *tmp = strchr(buffer, ':');
+    char *buffer = 0;
+    char *tmp = 0;
     char *element, *mono, *fg, *bg;
 
-    if(!tmp)
-    {
+    if (param == 0)
+	return;
+    CTRACE2(TRACE_STYLE, (tfp, "parse_style(%s)\n", param));
+    StrAllocCopy(buffer, param);
+    if (buffer == 0)
+	return;
+
+    if ((tmp = strchr(buffer, ':')) == 0) {
 	fprintf (stderr, gettext("\
 Syntax Error parsing style in lss file:\n\
 [%s]\n\
@@ -417,7 +432,6 @@ PRIVATE HTList *lss_styles = NULL;
 
 PUBLIC void parse_userstyles NOARGS
 {
-    static BOOL first = TRUE;
     char *name;
     HTList *cur = lss_styles;
 
@@ -497,7 +511,7 @@ PRIVATE int style_readFromFileREC ARGS2(
     int len;
 
     CTRACE2(TRACE_STYLE, (tfp, "CSS:Reading styles from file: %s\n", lss_filename ? lss_filename : "?!? empty ?!?"));
-    if (lss_filename == NULL || *lss_filename == '\0')
+    if (isEmpty(lss_filename))
 	return -1;
     if ((fh = LYOpenCFG(lss_filename, parent_filename, LYNX_LSS_FILE)) == 0) {
 	/* this should probably be an alert or something */
@@ -605,7 +619,7 @@ PUBLIC void cache_tag_styles NOARGS
 
     for (i = 0; i < HTML_ELEMENTS; ++i)
     {
-	strcpy(buf, HTML_dtd.tags[i].name);
+	LYstrncpy(buf, HTML_dtd.tags[i].name, sizeof(buf)-1);
 	LYLowerCase(buf);
 	cached_tag_styles[i] = hash_code(buf);
     }
diff --git a/gnu/usr.bin/lynx/src/LYTraversal.c b/gnu/usr.bin/lynx/src/LYTraversal.c
index 6cf521b2374..3beb48d027f 100644
--- a/gnu/usr.bin/lynx/src/LYTraversal.c
+++ b/gnu/usr.bin/lynx/src/LYTraversal.c
@@ -107,7 +107,7 @@ PUBLIC void dump_traversal_history NOARGS
 	    gettext("here is a list of the history stack so that you may rebuild"));
 
     for (x = nhist-1; x >= 0; x--) {
-	fprintf(ifp,"%s\t%s\n", history[x].title, history[x].address);
+	fprintf(ifp, "%s\t%s\n", HDOC(x).title, HDOC(x).address);
     }
 
     LYCloseOutput(ifp);
@@ -151,6 +151,7 @@ PUBLIC BOOLEAN lookup_reject ARGS1(char *,target)
     HTSprintf0(&line, "%s\n", target);
 
     while (LYSafeGets(&buffer, ifp) != NULL && !result) {
+	LYTrimTrailing(buffer);
 	len = strlen(buffer);
 	if (len > 0) { 	   /* if not an empty line */
 	    if (buffer[len-1] == '*') {
diff --git a/gnu/usr.bin/lynx/src/LYUpload.c b/gnu/usr.bin/lynx/src/LYUpload.c
index a78018fa204..d8b0d10d231 100644
--- a/gnu/usr.bin/lynx/src/LYUpload.c
+++ b/gnu/usr.bin/lynx/src/LYUpload.c
@@ -108,7 +108,7 @@ retry:
 	}
 	HTSprintf0(&filename, "%s/%s", directory, tmpbuf);
 
-#if HAVE_POPEN
+#ifdef HAVE_POPEN
 	if (LYIsPipeCommand(filename)) {
 	    HTAlert(CANNOT_WRITE_TO_FILE);
 	    _statusline(NEW_FILENAME_PROMPT);
@@ -151,7 +151,7 @@ retry:
 
     FREE(the_command);
     FREE(the_upload);
-#ifdef UNIX
+#if defined(MULTI_USER_UNIX)
     if (filename != 0)
 	chmod(filename, HIDE_CHMOD);
 #endif /* UNIX */
@@ -185,16 +185,8 @@ PUBLIC int LYUpload_options ARGS2(
     static char curloc[LY_MAXPATH];
     char *cp;
 
-    if (LYReuseTempfiles) {
-	fp0 = LYOpenTempRewrite(tempfile, HTML_SUFFIX, "w");
-    } else {
-	LYRemoveTemp(tempfile);
-	fp0 = LYOpenTemp(tempfile, HTML_SUFFIX, "w");
-    }
-    if (fp0 == NULL) {
-	HTAlert(CANNOT_OPEN_TEMP);
+    if ((fp0 = InternalPageFP(tempfile, TRUE)) == 0)
 	return(-1);
-    }
 
 #ifdef VMS
     strcpy(curloc, "/sys$login");
diff --git a/gnu/usr.bin/lynx/src/LYUtils.c b/gnu/usr.bin/lynx/src/LYUtils.c
index e9a4a035844..869ebf141e6 100644
--- a/gnu/usr.bin/lynx/src/LYUtils.c
+++ b/gnu/usr.bin/lynx/src/LYUtils.c
@@ -4,6 +4,14 @@
 #include <HTAccess.h>
 #include <HTCJK.h>
 #include <HTAlert.h>
+
+#ifdef __MINGW32__
+int kbhit(void);
+#ifdef UNIX
+#undef UNIX
+#endif /* UNIX */
+#endif /* __MINGW32__ */
+
 #include <LYCurses.h>
 #include <LYHistory.h>
 #include <LYStrings.h>
@@ -27,7 +35,7 @@
 #include <HTFile.h>
 #endif
 
-#if _WIN_CC
+#ifdef _WIN_CC
 extern int exec_command(char * cmd, int wait_flag); /* xsystem.c */
 #endif
 
@@ -56,7 +64,7 @@ extern int exec_command(char * cmd, int wait_flag); /* xsystem.c */
 #include <lib$routines.h>
 #endif /* VMS */
 
-#if HAVE_UTMP
+#ifdef HAVE_UTMP
 #include <pwd.h>
 #ifdef UTMPX_FOR_UTMP
 #include <utmpx.h>
@@ -109,9 +117,9 @@ extern int BSDselect PARAMS((int nfds, fd_set * readfds, fd_set * writefds,
 #endif /* SOCKS */
 #endif /* SVR4_BSDSELECT */
 
-#ifndef FD_SETSIZE
-#define FD_SETSIZE 256
-#endif /* !FD_SETSIZE */
+#ifdef __DJGPP__
+#undef select			/* defined to select_s in www_tcp.h */
+#endif
 
 #ifndef UTMP_FILE
 #if defined(__FreeBSD__) || defined(__bsdi__)
@@ -139,10 +147,9 @@ extern int BSDselect PARAMS((int nfds, fd_set * readfds, fd_set * writefds,
 
 #define COPY_COMMAND "%s %s %s"
 
-extern BOOLEAN LYHaveCJKCharacterSet;
-
 PRIVATE HTList * localhost_aliases = NULL;	/* Hosts to treat as local */
 PRIVATE char *HomeDir = NULL;			/* HOME directory */
+
 PUBLIC	HTList * sug_filenames = NULL;		/* Suggested filenames	 */
 
 /*
@@ -185,268 +192,233 @@ PRIVATE LY_TEMP *FindTempfileByFP ARGS1(FILE *, fp)
 /*
  * Get an environment variable, rejecting empty strings
  */
-PRIVATE char *getenv_text ARGS1(char *, name)
+PUBLIC char *LYGetEnv ARGS1(CONST char *, name)
 {
     char *result = getenv(name);
-    return (result != 0 && *result != 0) ? result : 0;
+    return non_empty(result) ? result : 0;
 }
 
 /*
- *  Highlight (or unhighlight) a given link.
+ * ascii versions of locale sensitive functions needed because in
+ * Turkish locales tolower("I") is not "i". That's fatal for case
+ * sensitive operations with charset names, HTML tags etc.
  */
-PUBLIC void highlight ARGS3(
-	int,		flag,
-	int,		cur,
-	char *,		target)
+#ifdef EXP_ASCII_CTYPES
+PUBLIC int ascii_tolower ARGS1(int, i)
 {
-    char buffer[200];
-    int i;
-    char tmp[7];
-#ifdef SHOW_WHEREIS_TARGETS
-    char *cp;
-    char *theData = NULL;
-    char *Data = NULL;
-    int Offset, HitOffset, tLen;
-    int LenNeeded;
-    BOOL TargetEmphasisON = FALSE;
-    BOOL target1_drawn = NO;
-#endif
-    BOOL utf_flag = (BOOL)(LYCharSet_UC[current_char_set].enc == UCT_ENC_UTF8);
-    BOOL hl1_drawn = NO;
-#if defined(USE_COLOR_STYLE) && !defined(NO_HILIT_FIX)
-    BOOL hl2_drawn=FALSE;	/* whether links[cur].hightext2 is already drawn
-				   properly */
-#endif
-    tmp[0] = tmp[1] = tmp[2] = '\0';
-
-    /*
-     *	Bugs in the history code might cause -1 to be sent for cur, which
-     *	yields a crash when LYstrncpy() is called with a nonsense pointer.
-     *	As far as I know, such bugs have been squashed, but if they should
-     *	reappear, this works around them. - FM
-     */
-    if (cur < 0)
-	cur = 0;
-#if defined(TEXTFIELDS_MAY_NEED_ACTIVATION) && defined(INACTIVE_INPUT_STYLE_VH)
-    if (flag == OFF)
-	textinput_redrawn = FALSE;
-#endif
-
-    if (nlinks > 0) {
-#if  defined(USE_COLOR_STYLE) && !defined(NO_HILIT_FIX)
-	if (flag == ON || links[cur].type == WWW_FORM_LINK_TYPE)
-#endif
-	{
-#ifndef USE_COLOR_STYLE
-	if (links[cur].type == WWW_FORM_LINK_TYPE ||
-	    !links[cur].hightext) {
-	    LYMoveToLink(cur, target, NULL,
-			 flag, links[cur].inUnderline, utf_flag);
-	    lynx_start_link_color (flag == ON, links[cur].inUnderline);
-	} else {
-	    LYMoveToLink(cur, target, links[cur].hightext,
-			 flag, links[cur].inUnderline, utf_flag);
-	    hl1_drawn = YES;
-#ifdef SHOW_WHEREIS_TARGETS
-	    target1_drawn = YES;
-#endif
-	}
-#else	/* here USE_COLOR_STYLE defined */
-	int s = s_alink;
+    if ( 91 > i && i > 64 )
+	return (i+32);
+    else
+	return i;
+}
 
-#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
-	if ( textfields_need_activation &&
-	     links[cur].type == WWW_FORM_LINK_TYPE &&
-	     F_TEXTLIKE(links[cur].form->type) )
-	    s = s_curedit;
-#endif
+PUBLIC int ascii_toupper ARGS1(int, i)
+{
+    if ( 123 > i && i > 96 )
+	return (i-32);
+    else
+	return i;
+}
 
+PUBLIC int ascii_isupper ARGS1(int, i)
+{
+    if ( 91 > i && i > 64 )
+	return 1;
+    else
+	return 0;
+}
+#endif /* EXP_ASCII_CTYPES */
 
-#  define LXP (links[cur].lx)
-#  define LYP (links[cur].ly)
-	if (flag != ON) {
-	    int x;
-		/*
-		 *  This is where we try to restore the original style when
-		 *  a link is unhighlighted.  The purpose of cached_styles[][]
-		 *  is to save the original style just for this case.
-		 *  If it doesn't have a color change saved at just the right
-		 *  position, we look at preceding positions in the same line
-		 *  until we find one.
-		 */
-	    if (LYP >= 0 && LYP < CACHEH && LXP >= 0 && LXP < CACHEW) {
-		CTRACE2(TRACE_STYLE,
-			(tfp, "STYLE.highlight.off: cached style @(%d,%d): ",
-			      LYP, LXP));
-		s = cached_styles[LYP][LXP];
-		if (s == 0) {
-		    for (x = LXP-1; x >= 0; x--) {
-			if (cached_styles[LYP][x]) {
-			    if (cached_styles[LYP][x] > 0) {
-				s = cached_styles[LYP][x];
-				cached_styles[LYP][LXP] = s;
-			    }
-			    CTRACE((tfp, "found %d, x_offset=%d.\n",
-				    cached_styles[LYP][x], (int)x-LXP));
-			    break;
-			}
-		    }
-		    if (s == 0) {
-			CTRACE((tfp, "not found, assume <a>.\n"));
-			s = s_a;
-		    }
-		} else {
-		    CTRACE((tfp, "found %d.\n", s));
-		}
-	    } else {
-		CTRACE2(TRACE_STYLE, (tfp, "STYLE.highlight.off: can't use cache.\n"));
-		s = s_a;
-	    }
+/*
+ * Check for UTF-8 data, returning the length past the first character.
+ * Return zero if we found an ordinary character rather than UTF-8.
+ */
+PUBLIC size_t utf8_length ARGS2(
+	BOOL,		utf_flag,
+	CONST char *,	data)
+{
+    size_t utf_extra = 0;
+
+    if (utf_flag && is8bits(*data)) {
+	if ((*data & 0xe0) == 0xc0) {
+	    utf_extra = 1;
+	} else if ((*data & 0xf0) == 0xe0) {
+	    utf_extra = 2;
+	} else if ((*data & 0xf8) == 0xf0) {
+	    utf_extra = 3;
+	} else if ((*data & 0xfc) == 0xf8) {
+	    utf_extra = 4;
+	} else if ((*data & 0xfe) == 0xfc) {
+	    utf_extra = 5;
 	} else {
-	    CTRACE2(TRACE_STYLE, (tfp, "STYLE.highlight.on: @(%d,%d).\n", LYP, LXP));
+	    /*
+	     *  Garbage.
+	     */
+	    utf_extra = 0;
 	}
-	LYmove(LYP, LXP);
-	LynxChangeStyle(s, STACK_ON);
-#endif
+	if (strlen(data+1) < utf_extra) {
+	    /*
+	     *  Shouldn't happen.
+	     */
+	    utf_extra = 0;
 	}
+    }
+    return utf_extra;
+}
 
+/*
+ * Set the initial highlight information for a given link.
+ */
+PUBLIC void LYSetHilite ARGS2(
+	int,		cur,
+	char *,		text)
+{
+    links[cur].list.hl_base.hl_text = text;
+    links[cur].list.hl_len = (text != NULL) ? 1 : 0;
+    FREE(links[cur].list.hl_info);
+}
 
-	if (links[cur].type == WWW_FORM_LINK_TYPE) {
-	    int len;
-	    int avail_space = (LYcols - links[cur].lx) - 1;
+/*
+ * Add highlight information for the next line of a link.
+ */
+PUBLIC void LYAddHilite ARGS3(
+	int,		cur,
+	char *,		text,
+	int,		x)
+{
+    HiliteList *list = &(links[cur].list);
+    HiliteInfo *have = list->hl_info;
+    unsigned need = (list->hl_len - 1);
+    unsigned want = (list->hl_len += 1) * sizeof(HiliteInfo);
 
-	    LYstrncpy(buffer,
-		      (links[cur].hightext ?
-		       links[cur].hightext : ""),
-		      (avail_space > links[cur].form->size ?
-				      links[cur].form->size : avail_space));
-	    LYaddstr(buffer);
+    if (have != NULL) {
+	have = realloc(have, want);
+    } else {
+	have = malloc(want);
+    }
+    list->hl_info = have;
+    have[need].hl_text = text;
+    have[need].hl_x = x;
+}
 
-	    len = strlen(buffer);
-	    for (; len < links[cur].form->size && len < avail_space; len++)
-		LYaddch('_');
+/*
+ * Get the highlight text, counting from zero.
+ */
+PUBLIC char *LYGetHiliteStr ARGS2(
+	int,		cur,
+	int,		count)
+{
+    char *result;
 
-	} else {
-#if defined(USE_COLOR_STYLE) && !defined(NO_HILIT_FIX)
-	    if (flag == OFF) {
-		hl2_drawn = TRUE;
-		redraw_lines_of_link(cur);
-		CTRACE2(TRACE_STYLE, (tfp, "STYLE.highlight.off: NOFIX branch @(%d,%d).\n", LYP, LXP));
-	    } else
-#endif
-	    if (!hl1_drawn) {
-	    /*
-	     *	Copy into the buffer only what will fit
-	     *	within the width of the screen.
-	     */
-		LYmbcsstrncpy(buffer,
-			      (links[cur].hightext ?
-			       links[cur].hightext : ""),
-			      (sizeof(buffer) - 1),
-			      ((LYcols - 1) - links[cur].lx),
-			      utf_flag);
-		LYaddstr(buffer);
-	    }
-	}
+    if (count >= links[cur].list.hl_len)
+	result = NULL;
+    else if (count > 0)
+	result = links[cur].list.hl_info[count - 1].hl_text;
+    else
+	result = links[cur].list.hl_base.hl_text;
+    return result;
+}
 
-	/*
-	 *  Display a second line as well.
-	 */
-	if ( links[cur].hightext2 && links[cur].ly < display_lines
-#if defined(USE_COLOR_STYLE) && !defined(NO_HILIT_FIX)
-	  && hl2_drawn == FALSE
-#endif
-	) {
-	    lynx_stop_link_color (flag == ON, links[cur].inUnderline);
-	    LYmove((links[cur].ly + 1), links[cur].hightext2_offset);
-#ifndef USE_COLOR_STYLE
-	    lynx_start_link_color (flag == ON, links[cur].inUnderline);
-#else
-	    CTRACE2(TRACE_STYLE,
-		    (tfp, "STYLE.highlight.line2: @(%d,%d), style=%d.\n",
-			  links[cur].ly + 1, links[cur].hightext2_offset,
-			  flag == ON ? s_alink : s_a));
-	    LynxChangeStyle(flag == ON ? s_alink : s_a, ABS_ON);
-#endif
+/*
+ * Get the X-ordinate at which to draw the corresponding highlight-text
+ */
+PUBLIC int LYGetHilitePos ARGS2(
+	int,		cur,
+	int,		count)
+{
+    int result;
 
-	    for (i = 0; (tmp[0] = links[cur].hightext2[i]) != '\0' &&
-			i+links[cur].hightext2_offset < LYcols; i++) {
-		if (!IsSpecialAttrChar(links[cur].hightext2[i])) {
-		    /*
-		     *	For CJK strings, by Masanobu Kimura.
-		     */
-		    if (HTCJK != NOCJK && !isascii(tmp[0])) {
-			tmp[1] = links[cur].hightext2[++i];
-			LYaddstr(tmp);
-			tmp[1] = '\0';
-		    } else {
-			LYaddstr(tmp);
-		    }
-		 }
-	    }
-	}
-#if defined(USE_COLOR_STYLE) && !defined(NO_HILIT_FIX)
-	if ( hl2_drawn == FALSE )
-#endif
-	lynx_stop_link_color (flag == ON, links[cur].inUnderline);
+    if (count >= links[cur].list.hl_len)
+	result = -1;
+    else if (count > 0)
+	result = links[cur].list.hl_info[count - 1].hl_x;
+    else
+	result = links[cur].lx;
+    return result;
+}
+
+#define LXP (links[cur].lx)
+#define LYP (links[cur].ly)
 
 #ifdef SHOW_WHEREIS_TARGETS
-	if (!target1_drawn)
-	/*
-	 *  If we have an emphasized WHEREIS hit in the highlighted
-	 *  text, restore the emphasis.  Note that we never emphasize
-	 *  the first and last characters of the highlighted text when
-	 *  we are making the link current, so the link attributes for
-	 *  the current link will persist at the beginning and end,
-	 *  providing an indication to the user that it has been made
-	 *  current.   Also note that we use HText_getFirstTargetInLine()
-	 *  to determine if there's a hit in the HText structure line
-	 *  containing the link, and if so, get back a copy of the line
-	 *  starting at that first hit (which might be before or after
-	 *  our link), and with all IsSpecial characters stripped, so we
-	 *  don't need to deal with them here. - FM
-	 */
-	if (target && *target && (links[cur].type & WWW_LINK_TYPE) &&
-	    links[cur].hightext && *links[cur].hightext &&
-	    HText_getFirstTargetInLine(HTMainText,
-				       links[cur].anchor_line_num,
-				       utf_flag,
-				       (int *)&Offset,
-				       (int *)&tLen,
-				       (char **)&theData,
-				       target)) {
-	    int itmp, written, len, y, offset;
-	    char *data;
-	    int tlen = strlen(target);
-	    int hlen, hLen;
-	    int hLine = links[cur].ly, hoffset = links[cur].lx;
-	    size_t utf_extra = 0;
 
-	    /*
-	     *	Copy into the buffer only what will fit
-	     *	up to the right border of the screen. - FM
-	     */
-	    LYmbcsstrncpy(buffer,
-			  (links[cur].hightext ?
-			   links[cur].hightext : ""),
-			  (sizeof(buffer) - 1),
-			  ((LYcols - 1) - links[cur].lx),
-			  utf_flag);
-	    hlen = strlen(buffer);
-	    hLen = ((HTCJK != NOCJK || utf_flag) ?
-		  LYmbcsstrlen(buffer, utf_flag, YES) : hlen);
+#define SKIP_GLYPHS(theFlag, theData, theOffset) \
+	(theFlag \
+	    ? LYmbcs_skip_glyphs(theData, (theOffset), theFlag) \
+	    : (theData + (theOffset)))
 
-	    /*
-	     *	Break out if the first hit in the line
-	     *	starts after this link. - FM
-	     */
-	    if (Offset >= (hoffset + hLen)) {
-		goto highlight_search_hightext2;
-	    }
+/*
+ * If we have an emphasized WHEREIS hit in the highlighted text, restore the
+ * emphasis.  Note that we never emphasize the first and last characters of the
+ * highlighted text when we are making the link current, so the link attributes
+ * for the current link will persist at the beginning and end, providing an
+ * indication to the user that it has been made current.  Also note that we use
+ * HText_getFirstTargetInLine() to determine if there's a hit in the HText
+ * structure line containing the link, and if so, get back a copy of the line
+ * starting at that first hit (which might be before or after our link), and
+ * with all IsSpecial characters stripped, so we don't need to deal with them
+ * here.  -FM
+ */
+PRIVATE BOOL show_whereis_targets ARGS6(
+	int,	flag,
+	int,	cur,
+	int,	count,
+	char *,	target,
+	BOOL,	TargetEmphasisON,
+	BOOL,	utf_flag)
+{
+    char *Data = NULL;
+    char *cp;
+    char *theData = NULL;
+    char buffer[MAX_LINE];
+    char tmp[7];
+    int HitOffset;
+    int LenNeeded;
+    int Offset;
+    int tLen;
 
+    tmp[0] = tmp[1] = tmp[2] = '\0';
+
+    if (non_empty(target)
+     && (links[cur].type & WWW_LINK_TYPE)
+     && non_empty(LYGetHiliteStr(cur, count))
+     && links[cur].ly + count < display_lines
+     && HText_getFirstTargetInLine(HTMainText,
+				   links[cur].anchor_line_num + count,
+				   utf_flag,
+				   &Offset,
+				   &tLen,
+				   &theData,
+				   target)) {
+	int itmp, written, len, y, offset;
+	char *data;
+	int tlen = strlen(target);
+	int hlen, hLen;
+	int hLine = links[cur].ly + count;
+	int hoffset = LYGetHilitePos(cur, count);
+	size_t utf_extra = 0;
+
+	/*
+	 * Copy into the buffer only what will fit up to the right border of
+	 * the screen.  -FM
+	 */
+	LYmbcsstrncpy(buffer,
+		      (LYGetHiliteStr(cur, count) ?
+		       LYGetHiliteStr(cur, count) : ""),
+		      (sizeof(buffer) - 1),
+		      ((LYcols - 1) - LYGetHilitePos(cur, count)),
+		      utf_flag);
+	hlen = strlen(buffer);
+	hLen = ((HTCJK != NOCJK || utf_flag) ?
+	      LYmbcsstrlen(buffer, utf_flag, YES) : hlen);
+
+	/*
+	 * Break out if the first hit in the line starts after this link.  -FM
+	 */
+	if (Offset < (hoffset + hLen)) {
 	    /*
-	     *	Recursively skip hits that end before this link, and
-	     *	break out if there is no hit beyond those. - FM
+	     * Recursively skip hits that end before this link, and break out
+	     * if there is no hit beyond those.  -FM
 	     */
 	    Data = theData;
 	    while ((Offset < hoffset) &&
@@ -457,22 +429,22 @@ PUBLIC void highlight ARGS3(
 					       target,
 					       utf_flag, YES,
 					       &HitOffset,
-					       &LenNeeded)) != NULL) &&
-		    (offset + LenNeeded) < LYcols) {
+					       &LenNeeded)) != NULL)
+		 && (offset + LenNeeded) < LYcols) {
 		    Data = cp;
 		    Offset = (offset + HitOffset);
 		} else {
-		    goto highlight_search_hightext2;
+		    goto highlight_search_done;
 		}
 	    }
 	    data = buffer;
 	    offset = hoffset;
 
 	    /*
-	     *	If the hit starts before the hightext, and ends
-	     *	in or beyond the hightext, restore the emphasis,
-	     *	skipping the first and last characters of the
-	     *	hightext if we're making the link current. - FM
+	     * If the hit starts before the hightext, and ends in or beyond the
+	     * hightext, restore the emphasis, skipping the first and last
+	     * characters of the hightext if we're making the link current.
+	     * -FM
 	     */
 	    if ((Offset < offset) &&
 		((Offset + tLen) > offset)) {
@@ -481,41 +453,18 @@ PUBLIC void highlight ARGS3(
 		len = (tlen - (offset - Offset));
 
 		/*
-		 *  Go to the start of the hightext and
-		 *  handle its first character. - FM
+		 * Go to the start of the hightext and handle its first
+		 * character.  -FM
 		 */
 		LYmove(hLine, offset);
 		tmp[0] = data[itmp];
-		if (utf_flag && !isascii(tmp[0])) {
-		    if ((*tmp & 0xe0) == 0xc0) {
-			utf_extra = 1;
-		    } else if ((*tmp & 0xf0) == 0xe0) {
-			utf_extra = 2;
-		    } else if ((*tmp & 0xf8) == 0xf0) {
-			utf_extra = 3;
-		    } else if ((*tmp & 0xfc) == 0xf8) {
-			utf_extra = 4;
-		    } else if ((*tmp & 0xfe) == 0xfc) {
-			utf_extra = 5;
-		    } else {
-			/*
-			 *  Garbage.
-			 */
-			utf_extra = 0;
-		    }
-		    if (strlen(&data[itmp+1]) < utf_extra) {
-			/*
-			 *  Shouldn't happen.
-			 */
-			utf_extra = 0;
-		    }
-		}
+		utf_extra = utf8_length(utf_flag, data + itmp);
 		if (utf_extra) {
 		    LYstrncpy(&tmp[1], &data[itmp+1], utf_extra);
 		    itmp += utf_extra;
 		    /*
-		     *	Start emphasis immediately if we are
-		     *	making the link non-current. - FM
+		     * Start emphasis immediately if we are making the link
+		     * non-current.  -FM
 		     */
 		    if (flag != ON) {
 			LYstartTargetEmphasis();
@@ -527,14 +476,14 @@ PUBLIC void highlight ARGS3(
 		    tmp[1] = '\0';
 		    written += (utf_extra + 1);
 		    utf_extra = 0;
-		} else if (HTCJK != NOCJK && !isascii(tmp[0])) {
+		} else if (HTCJK != NOCJK && is8bits(tmp[0])) {
 		    /*
-		     *	For CJK strings, by Masanobu Kimura.
+		     * For CJK strings, by Masanobu Kimura.
 		     */
 		    tmp[1] = data[++itmp];
 		    /*
-		     *	Start emphasis immediately if we are
-		     *	making the link non-current. - FM
+		     * Start emphasis immediately if we are making the link
+		     * non-current.  -FM
 		     */
 		    if (flag != ON) {
 			LYstartTargetEmphasis();
@@ -547,8 +496,8 @@ PUBLIC void highlight ARGS3(
 		    written += 2;
 		} else {
 		    /*
-		     *	Start emphasis immediately if we are making
-		     *	the link non-current. - FM
+		     * Start emphasis immediately if we are making the link
+		     * non-current.  -FM
 		     */
 		    if (flag != ON) {
 			LYstartTargetEmphasis();
@@ -561,9 +510,8 @@ PUBLIC void highlight ARGS3(
 		}
 		itmp++;
 		/*
-		 *  Start emphasis after the first character
-		 *  if we are making the link current and this
-		 *  is not the last character. - FM
+		 * Start emphasis after the first character if we are making
+		 * the link current and this is not the last character.  -FM
 		 */
 		if (!TargetEmphasisON &&
 		    data[itmp] != '\0') {
@@ -572,48 +520,24 @@ PUBLIC void highlight ARGS3(
 		}
 
 		/*
-		 *  Handle the remaining characters. - FM
+		 * Handle the remaining characters.  -FM
 		 */
 		for (;
 		     written < len && (tmp[0] = data[itmp]) != '\0';
 		     itmp++)  {
 		    /*
-		     *	Print all the other target chars, except
-		     *	the last character if it is also the last
-		     *	character of hightext and we are making
-		     *	the link current. - FM
+		     * Print all the other target chars, except the last
+		     * character if it is also the last character of hightext
+		     * and we are making the link current.  -FM
 		     */
-		    if (utf_flag && !isascii(tmp[0])) {
-			if ((*tmp & 0xe0) == 0xc0) {
-			    utf_extra = 1;
-			} else if ((*tmp & 0xf0) == 0xe0) {
-			    utf_extra = 2;
-			} else if ((*tmp & 0xf8) == 0xf0) {
-			    utf_extra = 3;
-			} else if ((*tmp & 0xfc) == 0xf8) {
-			    utf_extra = 4;
-			} else if ((*tmp & 0xfe) == 0xfc) {
-			    utf_extra = 5;
-			} else {
-			    /*
-			     *	Garbage.
-			     */
-			    utf_extra = 0;
-			}
-			if (strlen(&data[itmp+1]) < utf_extra) {
-			    /*
-			     *	Shouldn't happen.
-			     */
-			    utf_extra = 0;
-			}
-		    }
+		    utf_extra = utf8_length(utf_flag, data + itmp);
 		    if (utf_extra) {
 			LYstrncpy(&tmp[1], &data[itmp+1], utf_extra);
 			itmp += utf_extra;
 			/*
-			 *  Make sure we don't restore emphasis to
-			 *  the last character of hightext if we
-			 *  are making the link current. - FM
+			 * Make sure we don't restore emphasis to the last
+			 * character of hightext if we are making the link
+			 * current.  -FM
 			 */
 			if (flag == ON && data[(itmp + 1)] == '\0') {
 			    LYstopTargetEmphasis();
@@ -626,15 +550,15 @@ PUBLIC void highlight ARGS3(
 			tmp[1] = '\0';
 			written += (utf_extra + 1);
 			utf_extra = 0;
-		    } else if (HTCJK != NOCJK && !isascii(tmp[0])) {
+		    } else if (HTCJK != NOCJK && is8bits(tmp[0])) {
 			/*
-			 *  For CJK strings, by Masanobu Kimura.
+			 * For CJK strings, by Masanobu Kimura.
 			 */
 			tmp[1] = data[++itmp];
 			/*
-			 *  Make sure we don't restore emphasis to
-			 *  the last character of hightext if we
-			 *  are making the link current. - FM
+			 * Make sure we don't restore emphasis to the last
+			 * character of hightext if we are making the link
+			 * current.  -FM
 			 */
 			if (flag == ON && data[(itmp + 1)] == '\0') {
 			    LYstopTargetEmphasis();
@@ -648,9 +572,9 @@ PUBLIC void highlight ARGS3(
 			written += 2;
 		    } else {
 			/*
-			 *  Make sure we don't restore emphasis to
-			 *  the last character of hightext if we
-			 *  are making the link current. - FM
+			 * Make sure we don't restore emphasis to the last
+			 * character of hightext if we are making the link
+			 * current.  -FM
 			 */
 			if (flag == ON && data[(itmp + 1)] == '\0') {
 			    LYstopTargetEmphasis();
@@ -665,56 +589,38 @@ PUBLIC void highlight ARGS3(
 		}
 
 		/*
-		 *  Stop the emphasis if we haven't already, then
-		 *  reset the offset to our current position in
-		 *  the line, and if that is beyond the link, or
-		 *  or we are making the link current and it is
-		 *  the last character of the hightext, we are
-		 *  done. - FM
+		 * Stop the emphasis if we haven't already, then reset the
+		 * offset to our current position in the line, and if that is
+		 * beyond the link, or or we are making the link current and it
+		 * is the last character of the hightext, we are done.  -FM
 		 */
 		if (TargetEmphasisON) {
 		    LYstopTargetEmphasis();
 		    TargetEmphasisON = FALSE;
 		}
 		LYGetYX(y, offset);
-		if (offset >=
-		    (hoffset +
-		     (flag == ON ? (hLen - 1) : hLen)))  {
-		    goto highlight_search_hightext2;
-		}
-
-		/*
-		 *  See if we have another hit that starts
-		 *  within the hightext. - FM
-		 */
-		data = (Data + (offset - Offset));
-		if (!utf_flag) {
-		    data = Data + (offset - Offset);
-		} else {
-		    data = LYmbcs_skip_glyphs(Data,
-					      (offset - Offset),
-					      utf_flag);
-		}
-		if (((cp = LYno_attr_mb_strstr(data,
+		if (offset < (hoffset + (flag == ON ? (hLen - 1) : hLen))
+		    /*
+		     * See if we have another hit that starts within the
+		     * hightext.  -FM
+		     */
+		 && ((cp = LYno_attr_mb_strstr(data = SKIP_GLYPHS(utf_flag, Data, offset - Offset),
 					       target,
 					       utf_flag, YES,
 					       &HitOffset,
-					       &LenNeeded)) != NULL) &&
-		    (offset + LenNeeded) < LYcols) {
+					       &LenNeeded)) != NULL)
+		 && (offset + LenNeeded) < LYcols
 		    /*
-		     *	If the hit starts after the end of the hightext,
-		     *	or we are making the link current and the hit
-		     *	starts at its last character, we are done. - FM
+		     * If the hit starts after the end of the hightext, or we
+		     * are making the link current and the hit starts at its
+		     * last character, we are done.  -FM
 		     */
-		    if ((HitOffset + offset) >=
-			(hoffset +
-			 (flag == ON ? (hLen - 1) : hLen)))  {
-			goto highlight_search_hightext2;
-		    }
-
+		 && (HitOffset + offset) <
+		     (hoffset +
+		      (flag == ON ? (hLen - 1) : hLen)))  {
 		    /*
-		     *	Set up the data and offset for the hit, and let
-		     *	the code for within hightext hits handle it. - FM
+		     * Set up the data and offset for the hit, and let the code
+		     * for within hightext hits handle it.  -FM
 		     */
 		    Data = cp;
 		    Offset = (offset + HitOffset);
@@ -722,514 +628,43 @@ PUBLIC void highlight ARGS3(
 		    offset = hoffset;
 		    goto highlight_hit_within_hightext;
 		}
-		goto highlight_search_hightext2;
-	    }
-
-highlight_hit_within_hightext:
-	    /*
-	     *	If we get to here, the hit starts within the
-	     *	hightext.  If we are making the link current
-	     *	and it's the last character in the hightext,
-	     *	we are done.  Otherwise, move there and start
-	     *	restoring the emphasis. - FM
-	     */
-	    if ((Offset - offset) >
-		(flag == ON ? (hLen - 1) : hLen))  {
-		goto highlight_search_hightext2;
-	    }
-	    if (!utf_flag) {
-		data += (Offset - offset);
-	    } else {
-		LYrefresh();
-		data = LYmbcs_skip_glyphs(data,
-					  (Offset - offset),
-					  utf_flag);
-	    }
-	    offset = Offset;
-	    itmp = 0;
-	    written = 0;
-	    len = tlen;
-
-	    /*
-	     *	Go to the start of the hit and
-	     *	handle its first character. - FM
-	     */
-	    LYmove(hLine, offset);
-	    tmp[0] = data[itmp];
-	    if (utf_flag && !isascii(tmp[0])) {
-		if ((*tmp & 0xe0) == 0xc0) {
-		    utf_extra = 1;
-		} else if ((*tmp & 0xf0) == 0xe0) {
-		    utf_extra = 2;
-		} else if ((*tmp & 0xf8) == 0xf0) {
-		    utf_extra = 3;
-		} else if ((*tmp & 0xfc) == 0xf8) {
-		    utf_extra = 4;
-		} else if ((*tmp & 0xfe) == 0xfc) {
-		    utf_extra = 5;
-		} else {
-		    /*
-		     *	Garbage.
-		     */
-		    utf_extra = 0;
-		}
-		if (strlen(&data[itmp+1]) < utf_extra) {
-		    /*
-		     *	Shouldn't happen.
-		     */
-		    utf_extra = 0;
-		}
-	    }
-	    if (utf_extra) {
-		LYstrncpy(&tmp[1], &data[itmp+1], utf_extra);
-		itmp += utf_extra;
-		/*
-		 *  Start emphasis immediately if we are making
-		 *  the link non-current, or we are making it
-		 *  current but this is not the first or last
-		 *  character of the hightext. - FM
-		 */
-		if (flag != ON ||
-		    (offset > hoffset && data[itmp+1] != '\0')) {
-		    LYstartTargetEmphasis();
-		    TargetEmphasisON = TRUE;
-		    LYaddstr(tmp);
-		} else {
-		    LYmove(hLine, (offset + 1));
-		}
-		tmp[1] = '\0';
-		written += (utf_extra + 1);
-		utf_extra = 0;
-	    } else if (HTCJK != NOCJK && !isascii(tmp[0])) {
-		/*
-		 *  For CJK strings, by Masanobu Kimura.
-		 */
-		tmp[1] = data[++itmp];
-		/*
-		 *  Start emphasis immediately if we are making
-		 *  the link non-current, or we are making it
-		 *  current but this is not the first or last
-		 *  character of the hightext. - FM
-		 */
-		if (flag != ON ||
-		    (offset > hoffset && data[itmp+1] != '\0')) {
-		    LYstartTargetEmphasis();
-		    TargetEmphasisON = TRUE;
-		    LYaddstr(tmp);
-		} else {
-		    LYmove(hLine, (offset + 1));
-		}
-		tmp[1] = '\0';
-		written += 2;
-	    } else {
-		/*
-		 *  Start emphasis immediately if we are making
-		 *  the link non-current, or we are making it
-		 *  current but this is not the first or last
-		 *  character of the hightext. - FM
-		 */
-		if (flag != ON ||
-		    (offset > hoffset && data[itmp+1] != '\0')) {
-		    LYstartTargetEmphasis();
-		    TargetEmphasisON = TRUE;
-		    LYaddstr(tmp);
-		} else {
-		    LYmove(hLine, (offset + 1));
-		}
-		written++;
-	    }
-	    itmp++;
-	    /*
-	     *	Start emphasis after the first character
-	     *	if we are making the link current and this
-	     *	is not the last character. - FM
-	     */
-	    if (!TargetEmphasisON &&
-		data[itmp] != '\0') {
-		LYstartTargetEmphasis();
-		TargetEmphasisON = TRUE;
-	    }
-
-	    for (;
-		 written < len && (tmp[0] = data[itmp]) != '\0';
-		 itmp++)  {
-		/*
-		 *  Print all the other target chars, except
-		 *  the last character if it is also the last
-		 *  character of hightext and we are making
-		 *  the link current. - FM
-		 */
-		if (utf_flag && !isascii(tmp[0])) {
-		    if ((*tmp & 0xe0) == 0xc0) {
-			utf_extra = 1;
-		    } else if ((*tmp & 0xf0) == 0xe0) {
-			utf_extra = 2;
-		    } else if ((*tmp & 0xf8) == 0xf0) {
-			utf_extra = 3;
-		    } else if ((*tmp & 0xfc) == 0xf8) {
-			utf_extra = 4;
-		    } else if ((*tmp & 0xfe) == 0xfc) {
-			utf_extra = 5;
-		    } else {
-			/*
-			 *  Garbage.
-			 */
-			utf_extra = 0;
-		    }
-		    if (strlen(&data[itmp+1]) < utf_extra) {
-			/*
-			 *  Shouldn't happen.
-			 */
-			utf_extra = 0;
-		    }
-		}
-		if (utf_extra) {
-		    LYstrncpy(&tmp[1], &data[itmp+1], utf_extra);
-		    itmp += utf_extra;
-		    /*
-		     *	Make sure we don't restore emphasis to
-		     *	the last character of hightext if we
-		     *	are making the link current. - FM
-		     */
-		    if (flag == ON && data[(itmp + 1)] == '\0') {
-			LYstopTargetEmphasis();
-			TargetEmphasisON = FALSE;
-			LYGetYX(y, offset);
-			LYmove(hLine, (offset + 1));
-		    } else {
-			LYaddstr(tmp);
-		    }
-		    tmp[1] = '\0';
-		    written += (utf_extra + 1);
-		    utf_extra = 0;
-		} else if (HTCJK != NOCJK && !isascii(tmp[0])) {
-		    /*
-		     *	For CJK strings, by Masanobu Kimura.
-		     */
-		    tmp[1] = data[++itmp];
-		    /*
-		     *	Make sure we don't restore emphasis to
-		     *	the last character of hightext if we
-		     *	are making the link current. - FM
-		     */
-		    if (flag == ON && data[(itmp + 1)] == '\0') {
-			LYstopTargetEmphasis();
-			TargetEmphasisON = FALSE;
-			LYGetYX(y, offset);
-			LYmove(hLine, (offset + 1));
-		    } else {
-			LYaddstr(tmp);
-		    }
-		    tmp[1] = '\0';
-		    written += 2;
-		} else {
-		    /*
-		     *	Make sure we don't restore emphasis to
-		     *	the last character of hightext if we
-		     *	are making the link current. - FM
-		     */
-		    if (flag == ON && data[(itmp + 1)] == '\0') {
-			LYstopTargetEmphasis();
-			TargetEmphasisON = FALSE;
-			LYGetYX(y, offset);
-			LYmove(hLine, (offset + 1));
-		    } else {
-			LYaddstr(tmp);
-		    }
-		    written++;
-		}
-	    }
-
-	    /*
-	     *	Stop the emphasis if we haven't already, then reset
-	     *	the offset to our current position in the line, and
-	     *	if that is beyond the link, or we are making the link
-	     *	current and it is the last character in the hightext,
-	     *	we are done. - FM
-	     */
-	    if (TargetEmphasisON) {
-		LYstopTargetEmphasis();
-		TargetEmphasisON = FALSE;
-	    }
-	    LYGetYX(y, offset);
-	    if (offset >=
-		(hoffset + (flag == ON ? (hLen - 1) : hLen))) {
-		goto highlight_search_hightext2;
-	    }
-
-	    /*
-	     *	See if we have another hit that starts
-	     *	within the hightext. - FM
-	     */
-	    if (!utf_flag) {
-		data = Data + (offset - Offset);
-	    } else {
-		data = LYmbcs_skip_glyphs(Data,
-					  (offset - Offset),
-					  utf_flag);
-	    }
-	    if (((cp = LYno_attr_mb_strstr(data,
-					   target,
-					   utf_flag, YES,
-					   &HitOffset,
-					   &LenNeeded)) != NULL) &&
-		(offset + LenNeeded) < LYcols) {
-		/*
-		 *  If the hit starts after the end of the hightext,
-		 *  or we are making the link current and the hit
-		 *  starts at its last character, we are done. - FM
-		 */
-		if ((HitOffset + offset) >=
-		    (hoffset +
-		     (flag == ON ? (hLen - 1) : hLen)))  {
-		    goto highlight_search_hightext2;
-		}
-
-		/*
-		 *  If the target extends beyond our buffer, emphasize
-		 *  everything in the hightext starting at this hit.
-		 *  Otherwise, set up the data and offsets, and loop
-		 *  back. - FM
-		 */
-		if ((HitOffset + (offset + tLen)) >=
-		    (hoffset + hLen)) {
-		    offset = (HitOffset + offset);
-		    if (!utf_flag) {
-			data = buffer + (offset - hoffset);
-		    } else {
-			LYrefresh();
-			data = LYmbcs_skip_glyphs(buffer,
-						  (offset - hoffset),
-						  utf_flag);
-		    }
-		    LYmove(hLine, offset);
-		    itmp = 0;
-		    written = 0;
-		    len = strlen(data);
-
-		    /*
-		     *	Turn the emphasis back on. - FM
-		     */
-		    LYstartTargetEmphasis();
-		    TargetEmphasisON = TRUE;
-		    for (;
-			 written < len && (tmp[0] = data[itmp]) != '\0';
-			 itmp++)  {
-			/*
-			 *  Print all the other target chars, except
-			 *  the last character if it is also the last
-			 *  character of hightext and we are making
-			 *  the link current. - FM
-			 */
-			if (utf_flag && !isascii(tmp[0])) {
-			    if ((*tmp & 0xe0) == 0xc0) {
-				utf_extra = 1;
-			    } else if ((*tmp & 0xf0) == 0xe0) {
-				utf_extra = 2;
-			    } else if ((*tmp & 0xf8) == 0xf0) {
-				utf_extra = 3;
-			    } else if ((*tmp & 0xfc) == 0xf8) {
-				utf_extra = 4;
-			    } else if ((*tmp & 0xfe) == 0xfc) {
-				utf_extra = 5;
-			    } else {
-				/*
-				 *  Garbage.
-				 */
-				utf_extra = 0;
-			    }
-			    if (strlen(&data[itmp+1]) < utf_extra) {
-				/*
-				 *  Shouldn't happen.
-				 */
-				utf_extra = 0;
-			    }
-			}
-			if (utf_extra) {
-			    LYstrncpy(&tmp[1], &data[itmp+1], utf_extra);
-			    itmp += utf_extra;
-			    /*
-			     *	Make sure we don't restore emphasis to
-			     *	the last character of hightext if we
-			     *	are making the link current. - FM
-			     */
-			    if (flag == ON && data[(itmp + 1)] == '\0') {
-				LYstopTargetEmphasis();
-				TargetEmphasisON = FALSE;
-				LYGetYX(y, offset);
-				LYmove(hLine, (offset + 1));
-			    } else {
-				LYaddstr(tmp);
-			    }
-			    tmp[1] = '\0';
-			    written += (utf_extra + 1);
-			    utf_extra = 0;
-			} else if (HTCJK != NOCJK && !isascii(tmp[0])) {
-			    /*
-			     *	For CJK strings, by Masanobu Kimura.
-			     */
-			    tmp[1] = data[++itmp];
-			    /*
-			     *	Make sure we don't restore emphasis to
-			     *	the last character of hightext if we
-			     *	are making the link current. - FM
-			     */
-			    if (flag == ON && data[(itmp + 1)] == '\0') {
-				LYstopTargetEmphasis();
-				TargetEmphasisON = FALSE;
-			    } else {
-				LYaddstr(tmp);
-			    }
-			    tmp[1] = '\0';
-			    written += 2;
-			} else {
-			    /*
-			     *	Make sure we don't restore emphasis to
-			     *	the last character of hightext if we
-			     *	are making the link current. - FM
-			     */
-			    if (flag == ON && data[(itmp + 1)] == '\0') {
-				LYstopTargetEmphasis();
-				TargetEmphasisON = FALSE;
-			    } else {
-				LYaddstr(tmp);
-			    }
-			    written++;
-			}
-		    }
-		    /*
-		     *	Turn off the emphasis if we haven't already,
-		     *	and then we're done. - FM
-		     */
-		    if (TargetEmphasisON) {
-			LYstopTargetEmphasis();
-		    }
-		    goto highlight_search_hightext2;
-		} else {
-		    Data = cp;
-		    Offset = (offset + HitOffset);
-		    data = buffer;
-		    offset = hoffset;
-		    goto highlight_hit_within_hightext;
-		}
-	    }
-	    goto highlight_search_hightext2;
-	}
-highlight_search_hightext2:
-	if (target && *target && (links[cur].type & WWW_LINK_TYPE) &&
-	    links[cur].hightext2 && *links[cur].hightext2 &&
-	    links[cur].ly < display_lines &&
-	    HText_getFirstTargetInLine(HTMainText,
-				       (links[cur].anchor_line_num + 1),
-				       utf_flag,
-				       (int *)&Offset,
-				       (int *)&tLen,
-				       (char **)&theData,
-				       target)) {
-	    int itmp, written, len, y, offset;
-	    char *data;
-	    int tlen = strlen(target);
-	    int hlen, hLen;
-	    int hLine = (links[cur].ly + 1);
-	    int hoffset = links[cur].hightext2_offset;
-	    size_t utf_extra = 0;
-
-	    /*
-	     *	Copy into the buffer only what will fit
-	     *	up to the right border of the screen. - FM
-	     */
-	    LYmbcsstrncpy(buffer,
-			  (links[cur].hightext2 ?
-			   links[cur].hightext2 : ""),
-			  (sizeof(buffer) - 1),
-			  ((LYcols - 1) - links[cur].hightext2_offset),
-			  utf_flag);
-	    hlen = strlen(buffer);
-	    hLen = ((HTCJK != NOCJK || utf_flag) ?
-		  LYmbcsstrlen(buffer, utf_flag, YES) : hlen);
-
-	    /*
-	     *	Break out if the first hit in the line
-	     *	starts after this link. - FM
-	     */
-	    if (Offset >= (hoffset + hLen)) {
 		goto highlight_search_done;
 	    }
 
+highlight_hit_within_hightext:
 	    /*
-	     *	Recursively skip hits that end before this link, and
-	     *	break out if there is no hit beyond those. - FM
+	     * If we get to here, the hit starts within the hightext.  If we
+	     * are making the link current and it's the last character in the
+	     * hightext, we are done.  Otherwise, move there and start
+	     * restoring the emphasis.  -FM
 	     */
-	    Data = theData;
-	    while ((Offset < hoffset) &&
-		   ((Offset + tLen) <= hoffset)) {
-		data = (Data + tlen);
-		offset = (Offset + tLen);
-		if (((cp = LYno_attr_mb_strstr(data,
-					       target,
-					       utf_flag, YES,
-					       &HitOffset,
-					       &LenNeeded)) != NULL) &&
-		    (offset + LenNeeded) < LYcols) {
-		    Data = cp;
-		    Offset = (offset + HitOffset);
-		} else {
-		    goto highlight_search_done;
+	    if ((Offset - offset) <= (flag == ON ? (hLen - 1) : hLen))  {
+		data = SKIP_GLYPHS(utf_flag, data, Offset - offset);
+		if (utf_flag) {
+		    LYrefresh();
 		}
-	    }
-	    data = buffer;
-	    offset = hoffset;
-
-	    /*
-	     *	If the hit starts before the hightext2, and ends
-	     *	in or beyond the hightext2, restore the emphasis,
-	     *	skipping the first and last characters of the
-	     *	hightext2 if we're making the link current. - FM
-	     */
-	    if ((Offset < offset) &&
-		((Offset + tLen) > offset)) {
+		offset = Offset;
 		itmp = 0;
 		written = 0;
-		len = (tlen - (offset - Offset));
+		len = tlen;
 
 		/*
-		 *  Go to the start of the hightext2 and
-		 *  handle its first character. - FM
+		 * Go to the start of the hit and handle its first character.
+		 * -FM
 		 */
 		LYmove(hLine, offset);
 		tmp[0] = data[itmp];
-		if (utf_flag && !isascii(tmp[0])) {
-		    if ((*tmp & 0xe0) == 0xc0) {
-			utf_extra = 1;
-		    } else if ((*tmp & 0xf0) == 0xe0) {
-			utf_extra = 2;
-		    } else if ((*tmp & 0xf8) == 0xf0) {
-			utf_extra = 3;
-		    } else if ((*tmp & 0xfc) == 0xf8) {
-			utf_extra = 4;
-		    } else if ((*tmp & 0xfe) == 0xfc) {
-			utf_extra = 5;
-		    } else {
-			/*
-			 *  Garbage.
-			 */
-			utf_extra = 0;
-		    }
-		    if (strlen(&data[itmp+1]) < utf_extra) {
-			/*
-			 *  Shouldn't happen.
-			 */
-			utf_extra = 0;
-		    }
-		}
+		utf_extra = utf8_length(utf_flag, data + itmp);
 		if (utf_extra) {
 		    LYstrncpy(&tmp[1], &data[itmp+1], utf_extra);
 		    itmp += utf_extra;
 		    /*
-		     *	Start emphasis immediately if we are
-		     *	making the link non-current. - FM
+		     * Start emphasis immediately if we are making the link
+		     * non-current, or we are making it current but this is not
+		     * the first or last character of the hightext.  -FM
 		     */
-		    if (flag != ON) {
+		    if (flag != ON ||
+			(offset > hoffset && data[itmp+1] != '\0')) {
 			LYstartTargetEmphasis();
 			TargetEmphasisON = TRUE;
 			LYaddstr(tmp);
@@ -1239,30 +674,34 @@ highlight_search_hightext2:
 		    tmp[1] = '\0';
 		    written += (utf_extra + 1);
 		    utf_extra = 0;
-		} else if (HTCJK != NOCJK && !isascii(tmp[0])) {
+		} else if (HTCJK != NOCJK && is8bits(tmp[0])) {
 		    /*
-		     *	For CJK strings, by Masanobu Kimura.
+		     * For CJK strings, by Masanobu Kimura.
 		     */
 		    tmp[1] = data[++itmp];
 		    /*
-		     *	Start emphasis immediately if we are
-		     *	making the link non-current. - FM
+		     * Start emphasis immediately if we are making the link
+		     * non-current, or we are making it current but this is not
+		     * the first or last character of the hightext.  -FM
 		     */
-		    if (flag != ON) {
+		    if (flag != ON ||
+			(offset > hoffset && data[itmp+1] != '\0')) {
 			LYstartTargetEmphasis();
 			TargetEmphasisON = TRUE;
 			LYaddstr(tmp);
 		    } else {
-			LYmove(hLine, (offset + 1));
+			LYmove(hLine, (offset + 2));
 		    }
 		    tmp[1] = '\0';
 		    written += 2;
 		} else {
 		    /*
-		     *	Start emphasis immediately if we are making
-		     *	the link non-current. - FM
+		     * Start emphasis immediately if we are making the link
+		     * non-current, or we are making it current but this is not
+		     * the first or last character of the hightext.  -FM
 		     */
-		    if (flag != ON) {
+		    if (flag != ON ||
+			(offset > hoffset && data[itmp+1] != '\0')) {
 			LYstartTargetEmphasis();
 			TargetEmphasisON = TRUE;
 			LYaddstr(tmp);
@@ -1273,9 +712,8 @@ highlight_search_hightext2:
 		}
 		itmp++;
 		/*
-		 *  Start emphasis after the first character
-		 *  if we are making the link current and this
-		 *  is not the last character. - FM
+		 * Start emphasis after the first character if we are making
+		 * the link current and this is not the last character.  -FM
 		 */
 		if (!TargetEmphasisON &&
 		    data[itmp] != '\0') {
@@ -1283,49 +721,22 @@ highlight_search_hightext2:
 		    TargetEmphasisON = TRUE;
 		}
 
-		/*
-		 *  Handle the remaining characters. - FM
-		 */
 		for (;
 		     written < len && (tmp[0] = data[itmp]) != '\0';
 		     itmp++)  {
 		    /*
-		     *	Print all the other target chars, except
-		     *	the last character if it is also the last
-		     *	character of hightext2 and we are making
-		     *	the link current. - FM
+		     * Print all the other target chars, except the last
+		     * character if it is also the last character of hightext
+		     * and we are making the link current.  -FM
 		     */
-		    if (utf_flag && !isascii(tmp[0])) {
-			if ((*tmp & 0xe0) == 0xc0) {
-			    utf_extra = 1;
-			} else if ((*tmp & 0xf0) == 0xe0) {
-			    utf_extra = 2;
-			} else if ((*tmp & 0xf8) == 0xf0) {
-			    utf_extra = 3;
-			} else if ((*tmp & 0xfc) == 0xf8) {
-			    utf_extra = 4;
-			} else if ((*tmp & 0xfe) == 0xfc) {
-			    utf_extra = 5;
-			} else {
-			    /*
-			     *	Garbage.
-			     */
-			    utf_extra = 0;
-			}
-			if (strlen(&data[itmp+1]) < utf_extra) {
-			    /*
-			     *	Shouldn't happen.
-			     */
-			    utf_extra = 0;
-			}
-		    }
+		    utf_extra = utf8_length(utf_flag, data + itmp);
 		    if (utf_extra) {
 			LYstrncpy(&tmp[1], &data[itmp+1], utf_extra);
 			itmp += utf_extra;
 			/*
-			 *  Make sure we don't restore emphasis to
-			 *  the last character of hightext2 if we
-			 *  are making the link current. - FM
+			 * Make sure we don't restore emphasis to the last
+			 * character of hightext if we are making the link
+			 * current.  -FM
 			 */
 			if (flag == ON && data[(itmp + 1)] == '\0') {
 			    LYstopTargetEmphasis();
@@ -1338,15 +749,15 @@ highlight_search_hightext2:
 			tmp[1] = '\0';
 			written += (utf_extra + 1);
 			utf_extra = 0;
-		    } else if (HTCJK != NOCJK && !isascii(tmp[0])) {
+		    } else if (HTCJK != NOCJK && is8bits(tmp[0])) {
 			/*
-			 *  For CJK strings, by Masanobu Kimura.
+			 * For CJK strings, by Masanobu Kimura.
 			 */
 			tmp[1] = data[++itmp];
 			/*
-			 *  Make sure we don't restore emphasis to
-			 *  the last character of hightext2 if we
-			 *  are making the link current. - FM
+			 * Make sure we don't restore emphasis to the last
+			 * character of hightext if we are making the link
+			 * current.  -FM
 			 */
 			if (flag == ON && data[(itmp + 1)] == '\0') {
 			    LYstopTargetEmphasis();
@@ -1360,9 +771,9 @@ highlight_search_hightext2:
 			written += 2;
 		    } else {
 			/*
-			 *  Make sure we don't restore emphasis to
-			 *  the last character of hightext2 if we
-			 *  are making the link current. - FM
+			 * Make sure we don't restore emphasis to the last
+			 * character of hightext if we are making the link
+			 * current.  -FM
 			 */
 			if (flag == ON && data[(itmp + 1)] == '\0') {
 			    LYstopTargetEmphasis();
@@ -1377,457 +788,353 @@ highlight_search_hightext2:
 		}
 
 		/*
-		 *  Stop the emphasis if we haven't already, then
-		 *  reset the offset to our current position in
-		 *  the line, and if that is beyond the link, or
-		 *  or we are making the link current and it is
-		 *  the last character of the hightext2, we are
-		 *  done. - FM
+		 * Stop the emphasis if we haven't already, then reset the
+		 * offset to our current position in the line, and if that is
+		 * beyond the link, or we are making the link current and it is
+		 * the last character in the hightext, we are done.  -FM
 		 */
 		if (TargetEmphasisON) {
 		    LYstopTargetEmphasis();
 		    TargetEmphasisON = FALSE;
 		}
 		LYGetYX(y, offset);
-		if (offset >=
-		    (hoffset +
-		     (flag == ON ? (hLen - 1) : hLen)))  {
-		    goto highlight_search_done;
-		}
-
-		/*
-		 *  See if we have another hit that starts
-		 *  within the hightext2. - FM
-		 */
-		if (!utf_flag) {
-		    data = Data + (offset - Offset);
-		} else {
-		    data = LYmbcs_skip_glyphs(Data,
-					      (offset - Offset),
-					      utf_flag);
-		}
-		if (((cp = LYno_attr_mb_strstr(data,
+		if (offset < (hoffset + (flag == ON ? (hLen - 1) : hLen))
+		    /*
+		     * See if we have another hit that starts within the
+		     * hightext.  -FM
+		     */
+		 && ((cp = LYno_attr_mb_strstr(data = SKIP_GLYPHS(utf_flag, Data, offset - Offset),
 					       target,
 					       utf_flag, YES,
 					       &HitOffset,
-					       &LenNeeded)) != NULL) &&
-		    (offset + LenNeeded) < LYcols) {
+					       &LenNeeded)) != NULL)
+		 && (offset + LenNeeded) < LYcols
 		    /*
-		     *	If the hit starts after the end of the hightext2,
-		     *	or we are making the link current and the hit
-		     *	starts at its last character, we are done. - FM
+		     * If the hit starts after the end of the hightext, or we
+		     * are making the link current and the hit starts at its
+		     * last character, we are done.  -FM
 		     */
-		    if ((HitOffset + offset) >=
-			(hoffset +
-			 (flag == ON ? (hLen - 1) : hLen)))  {
-			goto highlight_search_done;
-		    }
-
+		 && (HitOffset + offset) < (hoffset + (flag == ON ? (hLen - 1) : hLen))) {
 		    /*
-		     *	Set up the data and offset for the hit, and let
-		     *	the code for within hightext2 hits handle it. - FM
+		     * If the target extends beyond our buffer, emphasize
+		     * everything in the hightext starting at this hit.
+		     * Otherwise, set up the data and offsets, and loop back.
+		     * -FM
 		     */
-		    Data = cp;
-		    Offset = (offset + HitOffset);
-		    data = buffer;
-		    offset = hoffset;
-		    goto highlight_hit_within_hightext2;
-		}
-		goto highlight_search_done;
-	    }
-
-highlight_hit_within_hightext2:
-	    /*
-	     *	If we get to here, the hit starts within the
-	     *	hightext2.  If we are making the link current
-	     *	and it's the last character in the hightext2,
-	     *	we are done.  Otherwise, move there and start
-	     *	restoring the emphasis. - FM
-	     */
-	    if ((Offset - offset) >
-		(flag == ON ? (hLen - 1) : hLen))  {
-		goto highlight_search_done;
-	    }
-	    if (!utf_flag) {
-		data += (Offset - offset);
-	    } else {
-		LYrefresh();
-		data = LYmbcs_skip_glyphs(data,
-					  (Offset - offset),
-					  utf_flag);
-	    }
-	    offset = Offset;
-	    itmp = 0;
-	    written = 0;
-	    len = tlen;
-
-	    /*
-	     *	Go to the start of the hit and
-	     *	handle its first character. - FM
-	     */
-	    LYmove(hLine, offset);
-	    tmp[0] = data[itmp];
-	    if (utf_flag && !isascii(tmp[0])) {
-		if ((*tmp & 0xe0) == 0xc0) {
-		    utf_extra = 1;
-		} else if ((*tmp & 0xf0) == 0xe0) {
-		    utf_extra = 2;
-		} else if ((*tmp & 0xf8) == 0xf0) {
-		    utf_extra = 3;
-		} else if ((*tmp & 0xfc) == 0xf8) {
-		    utf_extra = 4;
-		} else if ((*tmp & 0xfe) == 0xfc) {
-		    utf_extra = 5;
-		} else {
-		    /*
-		     *	Garbage.
-		     */
-		    utf_extra = 0;
-		}
-		if (strlen(&data[itmp+1]) < utf_extra) {
-		    /*
-		     *	Shouldn't happen.
-		     */
-		    utf_extra = 0;
-		}
-	    }
-	    if (utf_extra) {
-		LYstrncpy(&tmp[1], &data[itmp+1], utf_extra);
-		itmp += utf_extra;
-		/*
-		 *  Start emphasis immediately if we are making
-		 *  the link non-current, or we are making it
-		 *  current but this is not the first or last
-		 *  character of the hightext2. - FM
-		 */
-		if (flag != ON ||
-		    (offset > hoffset && data[itmp+1] != '\0')) {
-		    LYstartTargetEmphasis();
-		    TargetEmphasisON = TRUE;
-		    LYaddstr(tmp);
-		} else {
-		    LYmove(hLine, (offset + 1));
-		}
-		tmp[1] = '\0';
-		written += (utf_extra + 1);
-		utf_extra = 0;
-	    } else if (HTCJK != NOCJK && !isascii(tmp[0])) {
-		/*
-		 *  For CJK strings, by Masanobu Kimura.
-		 */
-		tmp[1] = data[++itmp];
-		/*
-		 *  Start emphasis immediately if we are making
-		 *  the link non-current, or we are making it
-		 *  current but this is not the first or last
-		 *  character of the hightext2. - FM
-		 */
-		if (flag != ON ||
-		    (offset > hoffset && data[itmp+1] != '\0')) {
-		    LYstartTargetEmphasis();
-		    TargetEmphasisON = TRUE;
-		    LYaddstr(tmp);
-		} else {
-		    LYmove(hLine, (offset + 1));
-		}
-		tmp[1] = '\0';
-		written += 2;
-	    } else {
-		/*
-		 *  Start emphasis immediately if we are making
-		 *  the link non-current, or we are making it
-		 *  current but this is not the first or last
-		 *  character of the hightext2. - FM
-		 */
-		if (flag != ON ||
-		    (offset > hoffset && data[itmp+1] != '\0')) {
-		    LYstartTargetEmphasis();
-		    TargetEmphasisON = TRUE;
-		    LYaddstr(tmp);
-		} else {
-		    LYmove(hLine, (offset + 1));
-		}
-		written++;
-	    }
-	    itmp++;
-	    /*
-	     *	Start emphasis after the first character
-	     *	if we are making the link current and this
-	     *	is not the last character. - FM
-	     */
-	    if (!TargetEmphasisON &&
-		data[itmp] != '\0') {
-		LYstartTargetEmphasis();
-		TargetEmphasisON = TRUE;
-	    }
+		    if ((HitOffset + (offset + tLen)) >= (hoffset + hLen)) {
+			offset = (HitOffset + offset);
+			data = SKIP_GLYPHS(utf_flag, Data, offset - hoffset);
+			if (utf_flag) {
+			    LYrefresh();
+			}
+			LYmove(hLine, offset);
+			itmp = 0;
+			written = 0;
+			len = strlen(data);
 
-	    for (;
-		 written < len && (tmp[0] = data[itmp]) != '\0';
-		 itmp++)  {
-		/*
-		 *  Print all the other target chars, except
-		 *  the last character if it is also the last
-		 *  character of hightext2 and we are making
-		 *  the link current. - FM
-		 */
-		if (utf_flag && !isascii(tmp[0])) {
-		    if ((*tmp & 0xe0) == 0xc0) {
-			utf_extra = 1;
-		    } else if ((*tmp & 0xf0) == 0xe0) {
-			utf_extra = 2;
-		    } else if ((*tmp & 0xf8) == 0xf0) {
-			utf_extra = 3;
-		    } else if ((*tmp & 0xfc) == 0xf8) {
-			utf_extra = 4;
-		    } else if ((*tmp & 0xfe) == 0xfc) {
-			utf_extra = 5;
-		    } else {
 			/*
-			 *  Garbage.
+			 * Turn the emphasis back on.  -FM
 			 */
-			utf_extra = 0;
-		    }
-		    if (strlen(&data[itmp+1]) < utf_extra) {
+			LYstartTargetEmphasis();
+			TargetEmphasisON = TRUE;
+			for (;
+			     written < len && (tmp[0] = data[itmp]) != '\0';
+			     itmp++)  {
+			    /*
+			     * Print all the other target chars, except the
+			     * last character if it is also the last character
+			     * of hightext and we are making the link current.
+			     * -FM
+			     */
+			    utf_extra = utf8_length(utf_flag, data + itmp);
+			    if (utf_extra) {
+				LYstrncpy(&tmp[1], &data[itmp+1], utf_extra);
+				itmp += utf_extra;
+				/*
+				 * Make sure we don't restore emphasis to the
+				 * last character of hightext if we are making
+				 * the link current.  -FM
+				 */
+				if (flag == ON && data[(itmp + 1)] == '\0') {
+				    LYstopTargetEmphasis();
+				    TargetEmphasisON = FALSE;
+				    LYGetYX(y, offset);
+				    LYmove(hLine, (offset + 1));
+				} else {
+				    LYaddstr(tmp);
+				}
+				tmp[1] = '\0';
+				written += (utf_extra + 1);
+				utf_extra = 0;
+			    } else if (HTCJK != NOCJK && is8bits(tmp[0])) {
+				/*
+				 * For CJK strings, by Masanobu Kimura.
+				 */
+				tmp[1] = data[++itmp];
+				/*
+				 * Make sure we don't restore emphasis to the
+				 * last character of hightext if we are making
+				 * the link current.  -FM
+				 */
+				if (flag == ON && data[(itmp + 1)] == '\0') {
+				    LYstopTargetEmphasis();
+				    TargetEmphasisON = FALSE;
+				} else {
+				    LYaddstr(tmp);
+				}
+				tmp[1] = '\0';
+				written += 2;
+			    } else {
+				/*
+				 * Make sure we don't restore emphasis to the
+				 * last character of hightext if we are making
+				 * the link current.  -FM
+				 */
+				if (flag == ON && data[(itmp + 1)] == '\0') {
+				    LYstopTargetEmphasis();
+				    TargetEmphasisON = FALSE;
+				} else {
+				    LYaddstr(tmp);
+				}
+				written++;
+			    }
+			}
 			/*
-			 *  Shouldn't happen.
+			 * Turn off the emphasis if we haven't already, and
+			 * then we're done.  -FM
 			 */
-			utf_extra = 0;
-		    }
-		}
-		if (utf_extra) {
-		    LYstrncpy(&tmp[1], &data[itmp+1], utf_extra);
-		    itmp += utf_extra;
-		    /*
-		     *	Make sure we don't restore emphasis to
-		     *	the last character of hightext2 if we
-		     *	are making the link current. - FM
-		     */
-		    if (flag == ON && data[(itmp + 1)] == '\0') {
-			LYstopTargetEmphasis();
-			TargetEmphasisON = FALSE;
-			LYGetYX(y, offset);
-			LYmove(hLine, (offset + 1));
-		    } else {
-			LYaddstr(tmp);
-		    }
-		    tmp[1] = '\0';
-		    written += (utf_extra + 1);
-		    utf_extra = 0;
-		} else if (HTCJK != NOCJK && !isascii(tmp[0])) {
-		    /*
-		     *	For CJK strings, by Masanobu Kimura.
-		     */
-		    tmp[1] = data[++itmp];
-		    /*
-		     *	Make sure we don't restore emphasis to
-		     *	the last character of hightext2 if we
-		     *	are making the link current. - FM
-		     */
-		    if (flag == ON && data[(itmp + 1)] == '\0') {
-			LYstopTargetEmphasis();
-			TargetEmphasisON = FALSE;
-			LYGetYX(y, offset);
-			LYmove(hLine, (offset + 1));
-		    } else {
-			LYaddstr(tmp);
-		    }
-		    tmp[1] = '\0';
-		    written += 2;
-		} else {
-		    /*
-		     *	Make sure we don't restore emphasis to
-		     *	the last character of hightext2 if we
-		     *	are making the link current. - FM
-		     */
-		    if (flag == ON && data[(itmp + 1)] == '\0') {
-			LYstopTargetEmphasis();
-			TargetEmphasisON = FALSE;
-			LYGetYX(y, offset);
-			LYmove(hLine, (offset + 1));
+			if (TargetEmphasisON) {
+			    LYstopTargetEmphasis();
+			}
 		    } else {
-			LYaddstr(tmp);
+			Data = cp;
+			Offset = (offset + HitOffset);
+			data = buffer;
+			offset = hoffset;
+			goto highlight_hit_within_hightext;
 		    }
-		    written++;
 		}
 	    }
+	}
+    }
+highlight_search_done:
+    FREE(theData);
+    return TargetEmphasisON;
+}
+#endif /* SHOW_WHEREIS_TARGETS */
 
-	    /*
-	     *	Stop the emphasis if we haven't already, then reset
-	     *	the offset to our current position in the line, and
-	     *	if that is beyond the link, or we are making the link
-	     *	current and it is the last character in the hightext2,
-	     *	we are done. - FM
-	     */
-	    if (TargetEmphasisON) {
-		LYstopTargetEmphasis();
-		TargetEmphasisON = FALSE;
-	    }
-	    LYGetYX(y, offset);
-	    if (offset >=
-		(hoffset + (flag == ON ? (hLen - 1) : hLen))) {
-		goto highlight_search_done;
+#ifdef USE_COLOR_STYLE
+PRIVATE int find_cached_style ARGS2(
+	int,	cur,
+	int,	flag)
+{
+    int s = s_alink;
+
+#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
+    if ( textfields_need_activation
+     && links[cur].type == WWW_FORM_LINK_TYPE
+     && F_TEXTLIKE(links[cur].l_form->type) )
+	s = s_curedit;
+#endif
+
+    if (flag != ON) {
+	int x;
+	/*
+	 * This is where we try to restore the original style when a link is
+	 * unhighlighted.  The purpose of cached_styles[][] is to save the
+	 * original style just for this case.  If it doesn't have a color
+	 * change saved at just the right position, we look at preceding
+	 * positions in the same line until we find one.
+	 */
+	if (LYP >= 0 && LYP < CACHEH && LXP >= 0 && LXP < CACHEW) {
+	    CTRACE2(TRACE_STYLE,
+		    (tfp, "STYLE.highlight.off: cached style @(%d,%d): ",
+			  LYP, LXP));
+	    s = cached_styles[LYP][LXP];
+	    if (s == 0) {
+		for (x = LXP-1; x >= 0; x--) {
+		    if (cached_styles[LYP][x]) {
+			if (cached_styles[LYP][x] > 0) {
+			    s = cached_styles[LYP][x];
+			    cached_styles[LYP][LXP] = s;
+			}
+			CTRACE((tfp, "found %d, x_offset=%d.\n",
+				cached_styles[LYP][x], (int)x-LXP));
+			break;
+		    }
+		}
+		if (s == 0) {
+		    CTRACE((tfp, "not found, assume <a>.\n"));
+		    s = s_a;
+		}
+	    } else {
+		CTRACE((tfp, "found %d.\n", s));
 	    }
+	} else {
+	    CTRACE2(TRACE_STYLE, (tfp, "STYLE.highlight.off: can't use cache.\n"));
+	    s = s_a;
+	}
+    } else {
+	CTRACE2(TRACE_STYLE, (tfp, "STYLE.highlight.on: @(%d,%d).\n", LYP, LXP));
+    }
+    return s;
+}
+#endif /* USE_COLOR_STYLE */
+
+/*
+ *  Highlight (or unhighlight) a given link.
+ */
+PUBLIC void LYhighlight ARGS3(
+	int,		flag,
+	int,		cur,
+	char *,		target)
+{
+    char buffer[MAX_LINE];
+    int i;
+    int hi_count;
+    int hi_offset;
+    char tmp[7];
+    char *hi_string;
+#ifdef SHOW_WHEREIS_TARGETS
+    BOOL TargetEmphasisON = FALSE;
+    BOOL target1_drawn = NO;
+#endif
+    BOOL utf_flag = (BOOL)(LYCharSet_UC[current_char_set].enc == UCT_ENC_UTF8);
+    BOOL hl1_drawn = NO;
+#ifdef USE_COLOR_STYLE
+    BOOL hl2_drawn = FALSE;	/* whether links[cur].l_hightext2 is already drawn
+				   properly */
+#endif
+    tmp[0] = tmp[1] = tmp[2] = '\0';
+
+    /*
+     * Bugs in the history code might cause -1 to be sent for cur, which yields
+     * a crash when LYstrncpy() is called with a nonsense pointer.  As far as I
+     * know, such bugs have been squashed, but if they should reappear, this
+     * works around them.  -FM
+     */
+    if (cur < 0)
+	cur = 0;
+#if defined(TEXTFIELDS_MAY_NEED_ACTIVATION) && defined(INACTIVE_INPUT_STYLE_VH)
+    if (flag == OFF)
+	textinput_redrawn = FALSE;
+#endif
+
+    if (nlinks > 0) {
+#ifdef USE_COLOR_STYLE
+	if (flag == ON || links[cur].type == WWW_FORM_LINK_TYPE) {
+	    LYmove(LYP, LXP);
+	    LynxChangeStyle(find_cached_style(cur, flag), STACK_ON);
+	}
+#else
+	if (links[cur].type == WWW_FORM_LINK_TYPE
+	 || LYGetHiliteStr(cur, 0) == NULL) {
+	    LYMoveToLink(cur, target, NULL,
+			 flag, links[cur].inUnderline, utf_flag);
+	    lynx_start_link_color (flag == ON, links[cur].inUnderline);
+	} else {
+	    LYMoveToLink(cur, target, LYGetHiliteStr(cur, 0),
+			 flag, links[cur].inUnderline, utf_flag);
+	    hl1_drawn = YES;
+#ifdef SHOW_WHEREIS_TARGETS
+	    target1_drawn = YES;
+#endif
+	}
+#endif
+
+	if (links[cur].type == WWW_FORM_LINK_TYPE) {
+	    int len;
+	    int avail_space = (LYcols - links[cur].lx) - 1;
+	    char *text = LYGetHiliteStr(cur, 0);
+
+	    if (avail_space > links[cur].l_form->size)
+		avail_space = links[cur].l_form->size;
+	    if (avail_space > (int) sizeof(buffer) - 1)
+		avail_space = (int) sizeof(buffer) - 1;
+
+	    LYstrncpy(buffer, NonNull(text), avail_space);
+	    LYaddstr(buffer);
+
+	    len = strlen(buffer);
+	    for (; len < links[cur].l_form->size && len < avail_space; len++)
+		LYaddch('_');
 
+#ifdef USE_COLOR_STYLE
+	} else if (flag == OFF) {
+	    hl2_drawn = TRUE;
+	    redraw_lines_of_link(cur);
+	    CTRACE2(TRACE_STYLE, (tfp, "STYLE.highlight.off: NOFIX branch @(%d,%d).\n", LYP, LXP));
+#endif
+	} else if (!hl1_drawn) {
 	    /*
-	     *	See if we have another hit that starts
-	     *	within the hightext2. - FM
+	     * Copy into the buffer only what will fit within the width of the
+	     * screen.
 	     */
-	    if (!utf_flag) {
-		data = (Data + (offset - Offset));
-	    } else {
-		data = LYmbcs_skip_glyphs(Data,
-					  (offset - Offset),
-					  utf_flag);
-	    }
-	    if (((cp = LYno_attr_mb_strstr(data,
-					   target,
-					   utf_flag, YES,
-					   &HitOffset,
-					   &LenNeeded)) != NULL) &&
-		(offset + LenNeeded) < LYcols) {
-		/*
-		 *  If the hit starts after the end of the hightext2,
-		 *  or we are making the link current and the hit
-		 *  starts at its last character, we are done. - FM
-		 */
-		if ((HitOffset + offset) >=
-		    (hoffset +
-		     (flag == ON ? (hLen - 1) : hLen)))  {
-		    goto highlight_search_done;
-		}
+	    LYmbcsstrncpy(buffer,
+			  (LYGetHiliteStr(cur, 0) ?
+			   LYGetHiliteStr(cur, 0) : ""),
+			  (sizeof(buffer) - 1),
+			  ((LYcols - 1) - links[cur].lx),
+			  utf_flag);
+	    LYaddstr(buffer);
+	}
 
-		/*
-		 *  If the target extends beyond our buffer, emphasize
-		 *  everything in the hightext2 starting at this hit.
-		 *  Otherwise, set up the data and offsets, and loop
-		 *  back. - FM
-		 */
-		if ((HitOffset + (offset + tLen)) >=
-		    (hoffset + hLen)) {
-		    offset = (HitOffset + offset);
-		    if (!utf_flag) {
-			data = buffer + (offset - hoffset);
-		    } else {
-			LYrefresh();
-			data = LYmbcs_skip_glyphs(buffer,
-						  (offset - hoffset),
-						  utf_flag);
-		    }
-		    LYmove(hLine, offset);
-		    itmp = 0;
-		    written = 0;
-		    len = strlen(data);
+	/*
+	 *  Display a second line as well.
+	 */
+#ifdef USE_COLOR_STYLE
+	if (hl2_drawn == FALSE)
+#endif
+	{
+	    for (hi_count = 1;
+		    (hi_string = LYGetHiliteStr(cur, hi_count)) != NULL
+		    && links[cur].ly + hi_count <= display_lines;
+			++hi_count) {
 
-		    /*
-		     *	Turn the emphasis back on. - FM
-		     */
-		    LYstartTargetEmphasis();
-		    TargetEmphasisON = TRUE;
-		    for (;
-			 written < len && (tmp[0] = data[itmp]) != '\0';
-			 itmp++)  {
+		hi_offset = LYGetHilitePos(cur, hi_count);
+		lynx_stop_link_color (flag == ON, links[cur].inUnderline);
+		LYmove(links[cur].ly + hi_count, hi_offset);
+
+#ifdef USE_COLOR_STYLE
+		CTRACE2(TRACE_STYLE,
+			(tfp, "STYLE.highlight.line2: @(%d,%d), style=%d.\n",
+			      links[cur].ly + hi_count, hi_offset,
+			      flag == ON ? s_alink : s_a));
+		LynxChangeStyle(flag == ON ? s_alink : s_a, ABS_ON);
+#else
+		lynx_start_link_color (flag == ON, links[cur].inUnderline);
+#endif
+
+		for (i = 0; (tmp[0] = hi_string[i]) != '\0'
+			   && (i + hi_offset) < LYcols; i++) {
+		    if (!IsSpecialAttrChar(hi_string[i])) {
 			/*
-			 *  Print all the other target chars, except
-			 *  the last character if it is also the last
-			 *  character of hightext2 and we are making
-			 *  the link current. - FM
+			 * For CJK strings, by Masanobu Kimura.
 			 */
-			if (utf_flag && !isascii(tmp[0])) {
-			    if ((*tmp & 0xe0) == 0xc0) {
-				utf_extra = 1;
-			    } else if ((*tmp & 0xf0) == 0xe0) {
-				utf_extra = 2;
-			    } else if ((*tmp & 0xf8) == 0xf0) {
-				utf_extra = 3;
-			    } else if ((*tmp & 0xfc) == 0xf8) {
-				utf_extra = 4;
-			    } else if ((*tmp & 0xfe) == 0xfc) {
-				utf_extra = 5;
-			    } else {
-				/*
-				 *  Garbage.
-				 */
-				utf_extra = 0;
-			    }
-			    if (strlen(&data[itmp+1]) < utf_extra) {
-				/*
-				 *  Shouldn't happen.
-				 */
-				utf_extra = 0;
-			    }
-			}
-			if (utf_extra) {
-			    LYstrncpy(&tmp[1], &data[itmp+1], utf_extra);
-			    itmp += utf_extra;
-			    /*
-			     *	Make sure we don't restore emphasis to
-			     *	the last character of hightext2 if we
-			     *	are making the link current. - FM
-			     */
-			    if (flag == ON && data[(itmp + 1)] == '\0') {
-				LYstopTargetEmphasis();
-				TargetEmphasisON = FALSE;
-				LYGetYX(y, offset);
-				LYmove(hLine, (offset + 1));
-			    } else {
-				LYaddstr(tmp);
-			    }
-			    tmp[1] = '\0';
-			    written += (utf_extra + 1);
-			    utf_extra = 0;
-			} else if (HTCJK != NOCJK && !isascii(tmp[0])) {
-			    /*
-			     *	For CJK strings, by Masanobu Kimura.
-			     */
-			    tmp[1] = data[++itmp];
-			    /*
-			     *	Make sure we don't restore emphasis to
-			     *	the last character of hightext2 if we
-			     *	are making the link current. - FM
-			     */
-			    if (flag == ON && data[(itmp + 1)] == '\0') {
-				LYstopTargetEmphasis();
-				TargetEmphasisON = FALSE;
-			    } else {
-				LYaddstr(tmp);
-			    }
+			if (HTCJK != NOCJK && is8bits(tmp[0])) {
+			    tmp[1] = hi_string[++i];
+			    LYaddstr(tmp);
 			    tmp[1] = '\0';
-			    written += 2;
 			} else {
-			    /*
-			     *	Make sure we don't restore emphasis to
-			     *	the last character of hightext2 if we
-			     *	are making the link current. - FM
-			     */
-			    if (flag == ON && data[(itmp + 1)] == '\0') {
-				LYstopTargetEmphasis();
-				TargetEmphasisON = FALSE;
-			    } else {
-				LYaddstr(tmp);
-			    }
-			    written++;
+			    LYaddstr(tmp);
 			}
-		    }
-		    /*
-		     *	Turn off the emphasis if we haven't already,
-		     *	and then we're done. - FM
-		     */
-		    if (TargetEmphasisON) {
-			LYstopTargetEmphasis();
-		    }
-		    goto highlight_search_done;
-		} else {
-		    Data = cp;
-		    Offset = (offset + HitOffset);
-		    data = buffer;
-		    offset = hoffset;
-		    goto highlight_hit_within_hightext2;
+		     }
 		}
 	    }
-	    goto highlight_search_done;
+	    lynx_stop_link_color (flag == ON, links[cur].inUnderline);
+	}
+
+#ifdef SHOW_WHEREIS_TARGETS
+	for (hi_count = target1_drawn ? 1 : 0;
+		LYGetHiliteStr(cur, hi_count) != NULL;
+			hi_count++) {
+	    TargetEmphasisON = show_whereis_targets(flag,
+						    cur,
+						    hi_count,
+						    target,
+						    TargetEmphasisON,
+						    utf_flag);
 	}
-highlight_search_done:
-	FREE(theData);
 
 	if (!LYShowCursor)
 	    /*
@@ -1874,12 +1181,16 @@ PUBLIC void convert_to_spaces ARGS2(
 	BOOL,		condense)
 {
     char *s = string;
-    char *ns = string;
+    char *ns;
     BOOL last_is_space = FALSE;
 
-    if (!string)
+    if (!s)
 	return;
 
+    for ( ; (*s && !isspace(*s)); s++)
+	;
+    ns = s;
+
     while (*s) {
 	switch (*s) {
 	    case ' ':
@@ -2087,8 +1398,10 @@ PUBLIC void statusline ARGS1(
 #else
 	/* draw the status bar in the STATUS style */
 	{
-		int a=(strncmp(buffer, ALERT_FORMAT, ALERT_PREFIX_LEN) ||
-		       !hashStyles[s_alert].name) ? s_status : s_alert;
+		int a = (strncmp(buffer, ALERT_FORMAT, ALERT_PREFIX_LEN)
+			|| !hashStyles[s_alert].name)
+			? s_status
+			: s_alert;
 		LynxChangeStyle (a, STACK_ON);
 		LYaddstr(buffer);
 		wbkgdset(LYwin,
@@ -2144,7 +1457,7 @@ PUBLIC void noviceline ARGS1(
 	return;
 
     LYmove(LYlines-2,0);
-    /* stop_reverse(); */
+    /* lynx_stop_reverse(); */
     LYclrtoeol();
     LYaddstr(NOVICE_LINE_ONE);
     LYclrtoeol();
@@ -2240,7 +1553,7 @@ PRIVATE int DontCheck NOARGS
      * Avoid checking interrupts more than one per second, since it is a slow
      * and expensive operation - TD
      */
-#if HAVE_GETTIMEOFDAY
+#ifdef HAVE_GETTIMEOFDAY
 #undef timezone			/* U/Win defines a conflicting macro */
     {
 	struct timeval tv;
@@ -2262,7 +1575,7 @@ PUBLIC int HTCheckForInterrupt NOARGS
     int c;
     int cmd;
 #ifndef VMS /* UNIX stuff: */
-#if !defined(USE_SLANG) && (defined(UNIX) || defined(__DJGPP__))
+#if !defined(USE_SLANG)
     struct timeval socket_timeout;
     int ret = 0;
     fd_set readfds;
@@ -2296,7 +1609,7 @@ PUBLIC int HTCheckForInterrupt NOARGS
 #else /* Unix curses: */
 
     socket_timeout.tv_sec = 0;
-    socket_timeout.tv_usec = 100;
+    socket_timeout.tv_usec = 0;
     FD_ZERO(&readfds);
     FD_SET(0, &readfds);
 #ifdef SOCKS
@@ -2320,14 +1633,14 @@ PUBLIC int HTCheckForInterrupt NOARGS
 
 #if defined(PDCURSES)
     nodelay(LYwin,TRUE);
-#endif /* DOSPATH */
+#endif /* PDCURSES */
     /*
      * 'c' contains whatever character we're able to read from keyboard
      */
     c = LYgetch();
 #if defined(PDCURSES)
     nodelay(LYwin,FALSE);
-#endif /* DOSPATH */
+#endif /* PDCURSES */
 
 #else /* VMS: */
     extern int typeahead();
@@ -2342,7 +1655,7 @@ PUBLIC int HTCheckForInterrupt NOARGS
 
     /** Curses or slang setup was not invoked **/
     if (DontCheck())
-	  return((int)FALSE);
+	return((int)FALSE);
 
     /** Control-C or Control-Y and a 'N'o reply to exit query **/
     if (HadVMSInterrupt) {
@@ -2367,27 +1680,34 @@ PUBLIC int HTCheckForInterrupt NOARGS
 
 	/* There is a subset of mainloop() actions available at this stage:
 	** no new getfile() cycle is possible until the previous finished.
-	** Currently we have scrolling in partial mode and toggling of trace
-	** log. User search now in progress...
+	** Currently we have scrolling in partial mode, toggling of trace
+	** log, and pasting. User search now in progress...
 	*/
     cmd = (LKC_TO_LAC(keymap,c));
-    switch (cmd)
-    {
+    switch (cmd) {
     case LYK_TRACE_TOGGLE :	/*  Toggle TRACE mode. */
-	   handle_LYK_TRACE_TOGGLE();
-	   break;
-    default :
+	handle_LYK_TRACE_TOGGLE();
+	break;
+#ifdef CAN_CUT_AND_PASTE
+    case LYK_TO_CLIPBOARD: {	/* ^S */
+	char *s = LYDownLoadAddress();
 
+	if (!s || !*s || put_clip(s))
+	    HTInfoMsg(gettext("Copy to clipboard failed."));
+	else
+	    HTInfoMsg(gettext("Download document URL put to clipboard."));
+	break;
+    }
+#endif	/* defined CAN_CUT_AND_PASTE */
+    default :
 #ifdef DISP_PARTIAL
-	if (display_partial && (NumOfLines_partial > 2))
 	/* OK, we got several lines from new document and want to scroll... */
-	{
+	if (display_partial && (NumOfLines_partial > 2)) {
 	    BOOLEAN do_refresh;
 	    int res;
 	    int Newline_partial = LYGetNewline();
 
-	    switch (cmd)
-	    {
+	    switch (cmd) {
 	    case LYK_WHEREIS:	/* search within the document */
 	    case LYK_NEXT:	/* search for the next occurrence in the document */
 	    case LYK_PREV:	/* search for the previous occurrence in the document */
@@ -2465,8 +1785,8 @@ PUBLIC int HTCheckForInterrupt NOARGS
 	    } /* end switch */
 	    if (Newline_partial < 1)
 		Newline_partial = 1;
-	    NumOfLines_partial = HText_getNumOfLines();
-	    LYMainLoop_pageDisplay(Newline_partial);
+	    if (LYMainLoop_pageDisplay(Newline_partial))
+		NumOfLines_partial = HText_getNumOfLines();
 	}
 #endif /* DISP_PARTIAL */
 	break;
@@ -2482,32 +1802,32 @@ PUBLIC int HTCheckForInterrupt NOARGS
 PUBLIC BOOLEAN LYisAbsPath ARGS1(
 	CONST char *,	path)
 {
+    BOOLEAN result = FALSE;
+    if (non_empty(path)) {
 #ifdef VMS
-    return TRUE;
+	result = TRUE;
 #else
-    BOOLEAN result;
-#if defined(DOSPATH) || defined(__EMX__)
-    result = (BOOL) (LYIsPathSep(path[0])
-     || (isalpha(UCH(path[0]))
-      && (path[1] == ':')
-       && LYIsPathSep(path[2])));
+#if defined(USE_DOS_DRIVES)
+	result = (BOOL) (LYIsPathSep(path[0])
+	 || (LYIsDosDrive(path)
+	   && LYIsPathSep(path[2])));
 #else
-    result = (LYIsPathSep(path[0]));
-#endif /* DOSPATH */
-    return result;
+	result = (LYIsPathSep(path[0]));
+#endif /* USE_DOS_DRIVES */
 #endif
+    }
+    return result;
 }
 
 /*
  * Check if the given filename is the root path, e.g., "/" on Unix.
  */
 PUBLIC BOOLEAN LYisRootPath ARGS1(
-	char *,		path)
+	CONST char *,		path)
 {
-#if defined(DOSPATH) || defined(__EMX__)
+#if defined(USE_DOS_DRIVES)
     if (strlen(path) == 3
-     && isalpha(UCH(path[0]))
-     && path[1] == ':'
+     && LYIsDosDrive(path)
      && LYIsPathSep(path[2]))
 	return TRUE;
 #endif
@@ -2519,7 +1839,7 @@ PUBLIC BOOLEAN LYisRootPath ARGS1(
  *  Return YES only if we're certain it's a local file. - FM
  */
 PUBLIC BOOLEAN LYisLocalFile ARGS1(
-	char *,		filename)
+	CONST char *,		filename)
 {
     char *host = NULL;
     char *acc_method = NULL;
@@ -2534,19 +1854,13 @@ PUBLIC BOOLEAN LYisLocalFile ARGS1(
 	return NO;
     }
 
-    if ((cp=strchr(host, ':')) != NULL)
+    if ((cp = strchr(host, ':')) != NULL)
 	*cp = '\0';
 
     if ((acc_method = HTParse(filename, "", PARSE_ACCESS))) {
 	if (0==strcmp("file", acc_method) &&
 	    (0==strcmp(host, "localhost") ||
-#ifdef VMS
-	     0==strcasecomp(host, HTHostName())
-#else
-	     0==strcmp(host, HTHostName())
-#endif /* VMS */
-	    ))
-	{
+	     LYSameFilename(host, HTHostName()))) {
 	    FREE(host);
 	    FREE(acc_method);
 	    return YES;
@@ -2563,7 +1877,7 @@ PUBLIC BOOLEAN LYisLocalFile ARGS1(
  *  Return YES only if we're certain it's the local host. - FM
  */
 PUBLIC BOOLEAN LYisLocalHost ARGS1(
-	char *,		filename)
+	CONST char *,		filename)
 {
     char *host = NULL;
     char *cp;
@@ -2580,18 +1894,11 @@ PUBLIC BOOLEAN LYisLocalHost ARGS1(
     if ((cp = strchr(host, ':')) != NULL)
 	*cp = '\0';
 
-#ifdef VMS
-    if ((0==strcasecomp(host, "localhost") ||
-	 0==strcasecomp(host, LYHostName) ||
-	 0==strcasecomp(host, HTHostName())))
-#else
-    if ((0==strcmp(host, "localhost") ||
-	 0==strcmp(host, LYHostName) ||
-	 0==strcmp(host, HTHostName())))
-#endif /* VMS */
-    {
-	    FREE(host);
-	    return YES;
+    if ((LYSameFilename(host, "localhost") ||
+	 LYSameFilename(host, LYHostName) ||
+	 LYSameFilename(host, HTHostName()))) {
+	FREE(host);
+	return YES;
     }
 
     FREE(host);
@@ -2625,7 +1932,7 @@ PUBLIC void LYAddLocalhostAlias ARGS1(
 {
     char *LocalAlias = NULL;
 
-    if (!(alias && *alias))
+    if (!non_empty(alias))
 	return;
 
     if (!localhost_aliases) {
@@ -2646,7 +1953,7 @@ PUBLIC void LYAddLocalhostAlias ARGS1(
  *  Return YES only if we've listed the host as a local alias. - FM
  */
 PUBLIC BOOLEAN LYisLocalAlias ARGS1(
-	char *,		filename)
+	CONST char *,		filename)
 {
     char *host = NULL;
     char *alias;
@@ -2666,12 +1973,7 @@ PUBLIC BOOLEAN LYisLocalAlias ARGS1(
 	*cp = '\0';
 
     while (NULL != (alias = (char *)HTList_nextObject(cur))) {
-#ifdef VMS
-	if (0==strcasecomp(host, alias))
-#else
-	if (0==strcmp(host, alias))
-#endif /* VMS */
-	{
+	if (LYSameFilename(host, alias)) {
 	    FREE(host);
 	    return YES;
 	}
@@ -2702,7 +2004,7 @@ PUBLIC int LYCheckForProxyURL ARGS1(
     /*
      *	Don't crash on an empty argument.
      */
-    if (cp == NULL || *cp == '\0')
+    if (isEmpty(cp))
 	return(NOT_A_URL_TYPE);
 
     /* kill beginning spaces */
@@ -2717,14 +2019,14 @@ PUBLIC int LYCheckForProxyURL ARGS1(
 	StrAllocCopy(cp2, cp);
 	*cp1 = ':';
 	StrAllocCat(cp2, "_proxy");
-	if (getenv(cp2) != NULL) {
+	if (LYGetEnv(cp2) != NULL) {
 	    FREE(cp2);
 	    return(PROXY_URL_TYPE);
 	}
 	FREE(cp2);
-#if defined (DOSPATH)
-	if (cp[1] == ':')
-	    return(NOT_A_URL_TYPE);	/* could be drive letter? - kw */
+#if defined (USE_DOS_DRIVES)
+	if (LYIsDosDrive(cp))
+	    return(NOT_A_URL_TYPE);
 #endif
 	cp1++;
 	if (!*cp) {
@@ -2762,6 +2064,12 @@ static BOOLEAN compare_type ARGS3(
     return FALSE;
 }
 
+#define DoubleHtmlSep(s) (LYIsHtmlSep((s)[0]) && LYIsHtmlSep((s)[1]))
+#define compare_two(tst,cmp,len,limit) \
+	((len + 2) <= limit \
+	&& DoubleHtmlSep(tst + len) \
+	&& compare_type(tst, cmp, len))
+
 /*
 **  Must recognize a URL and return the type.
 **  If recognized, based on a case-insensitive
@@ -2779,18 +2087,21 @@ PUBLIC int is_url ARGS1(
 {
     char *cp = filename;
     char *cp1;
+    int result = NOT_A_URL_TYPE;
+    int len;
+    int limit;
 
     /*
      *	Don't crash on an empty argument.
      */
-    if (cp == NULL || *cp == '\0')
-	return(0);
+    if (isEmpty(cp))
+	return(result);
 
     /*
      *	Can't be a URL if it lacks a colon.
      */
     if (NULL == strchr(cp, ':'))
-	return(0);
+	return(result);
 
     /*
      *	Kill beginning spaces.
@@ -2804,216 +2115,305 @@ PUBLIC int is_url ARGS1(
      *	a colon later in the string.  Also can't be
      *  a URL if it starts with a colon. - KW
      */
-    if (*cp == ':' || LYIsHtmlSep(*cp))
-	return(0);
-
-    if (compare_type(cp, "news:", 5)) {
-	return(NEWS_URL_TYPE);
-
-    } else if (compare_type(cp, "nntp:", 5)) {
-	return(NNTP_URL_TYPE);
-
-    } else if (compare_type(cp, "snews:", 6)) {
-	return(SNEWS_URL_TYPE);
-
-    } else if (compare_type(cp, "newspost:", 9)) {
-	/*
-	 *  Special Lynx type to handle news posts.
-	 */
-	return(NEWSPOST_URL_TYPE);
-
-    } else if (compare_type(cp, "newsreply:", 10)) {
-	/*
-	 *  Special Lynx type to handle news replies (followups).
-	 */
-	return(NEWSREPLY_URL_TYPE);
-
-    } else if (compare_type(cp, "snewspost:", 10)) {
-	/*
-	 *  Special Lynx type to handle snews posts.
-	 */
-	return(NEWSPOST_URL_TYPE);
-
-    } else if (compare_type(cp, "snewsreply:", 11)) {
-	/*
-	 *  Special Lynx type to handle snews replies (followups).
-	 */
-	return(NEWSREPLY_URL_TYPE);
-
-    } else if (compare_type(cp, "mailto:", 7)) {
-	return(MAILTO_URL_TYPE);
+    if (*cp == ':' || LYIsHtmlSep(*cp)) {
+	result = NOT_A_URL_TYPE;
 
-#ifndef DISABLE_BIBP
-    } else if (compare_type(cp, "bibp:", 5)) {
-	return(BIBP_URL_TYPE);
-#endif
+    } else {
+	limit = strlen(cp);
+	switch (*cp) {
+	case 'L':
+	case 'l':
+	    /*
+	     *  Lynx internal pages ("LYNXfoo:" or "lynxfoo:")
+	     *  start with 'l' or 'L', other URLs aren't.
+	     */
+	    if (compare_type(cp, STR_LYNXEXEC, LEN_LYNXEXEC)) {
+		/*
+		 *  Special External Lynx type to handle execution
+		 *  of commands or scripts which require a pause to
+		 *  read the screen upon completion.
+		 */
+		result = LYNXEXEC_URL_TYPE;
 
-    } else if (compare_type(cp, "file:", 5)) {
-	if (LYisLocalFile(cp)) {
-	    return(FILE_URL_TYPE);
-	} else if (LYIsHtmlSep(cp[5]) && LYIsHtmlSep(cp[6])) {
-	    return(FTP_URL_TYPE);
-	} else {
-	    return(0);
-	}
+	    } else if (compare_type(cp, STR_LYNXPROG, LEN_LYNXPROG)) {
+		/*
+		 *  Special External Lynx type to handle execution
+		 *  of commands, scripts or programs with do not
+		 *  require a pause to read screen upon completion.
+		 */
+		result = LYNXPROG_URL_TYPE;
 
-    } else if (compare_type(cp, "data:", 5)) {
-	return(DATA_URL_TYPE);
+	    } else if (compare_type(cp, STR_LYNXCGI, LEN_LYNXCGI)) {
+		/*
+		 *  Special External Lynx type to handle cgi scripts.
+		 */
+		result = LYNXCGI_URL_TYPE;
 
-    } else if (compare_type(cp, "lynxexec:", 9)) {
-	/*
-	 *  Special External Lynx type to handle execution
-	 *  of commands or scripts which require a pause to
-	 *  read the screen upon completion.
-	 */
-	return(LYNXEXEC_URL_TYPE);
+	    } else if (compare_type(cp, STR_LYNXPRINT, LEN_LYNXPRINT)) {
+		/*
+		 *  Special Internal Lynx type.
+		 */
+		result = LYNXPRINT_URL_TYPE;
 
-    } else if (compare_type(cp, "lynxprog:", 9)) {
-	/*
-	 *  Special External Lynx type to handle execution
-	 *  of commands, scripts or programs with do not
-	 *  require a pause to read screen upon completion.
-	 */
-	return(LYNXPROG_URL_TYPE);
+	    } else if (compare_type(cp, STR_LYNXOPTIONS, LEN_LYNXOPTIONS)) {
+		/*
+		 *  Special Internal Lynx type.
+		 */
+		result = LYNXOPTIONS_URL_TYPE;
 
-    } else if (compare_type(cp, "lynxcgi:", 8)) {
-	/*
-	 *  Special External Lynx type to handle cgi scripts.
-	 */
-	return(LYNXCGI_URL_TYPE);
+	    } else if (compare_type(cp, STR_LYNXCFG, LEN_LYNXCFG)) {
+		/*
+		 *  Special Internal Lynx type.
+		 */
+		result = LYNXCFG_URL_TYPE;
 
-    } else if (compare_type(cp, "LYNXPRINT:", 10)) {
-	/*
-	 *  Special Internal Lynx type.
-	 */
-	return(LYNXPRINT_URL_TYPE);
+	    } else if (compare_type(cp, STR_LYNXMESSAGES, LEN_LYNXMESSAGES)) {
+		/*
+		 *  Special Internal Lynx type.
+		 */
+		result = LYNXMESSAGES_URL_TYPE;
 
-    } else if (compare_type(cp, "LYNXOPTIONS:", 12)) {
-	/*
-	 *  Special Internal Lynx type.
-	 */
-	return(LYNXOPTIONS_URL_TYPE);
+	    } else if (compare_type(cp, STR_LYNXCFLAGS, LEN_LYNXCFLAGS)) {
+		/*
+		 *  Special Internal Lynx type.
+		 */
+		result = LYNXCOMPILE_OPTS_URL_TYPE;
 
-    } else if (compare_type(cp, "LYNXCFG:", 8)) {
-	/*
-	 *  Special Internal Lynx type.
-	 */
-	return(LYNXCFG_URL_TYPE);
+	    } else if (compare_type(cp, STR_LYNXDOWNLOAD, LEN_LYNXDOWNLOAD)) {
+		/*
+		 *  Special Internal Lynx type.
+		 */
+		result = LYNXDOWNLOAD_URL_TYPE;
 
-    } else if (compare_type(cp, "LYNXMESSAGES:", 13)) {
-	/*
-	 *  Special Internal Lynx type.
-	 */
-	return(LYNXMESSAGES_URL_TYPE);
+	    } else if (compare_type(cp, STR_LYNXDIRED, LEN_LYNXDIRED)) {
+		/*
+		 *  Special Internal Lynx type.
+		 */
+		result = LYNXDIRED_URL_TYPE;
 
-    } else if (compare_type(cp, "LYNXCOMPILEOPTS:", 16)) {
-	/*
-	 *  Special Internal Lynx type.
-	 */
-	return(LYNXCOMPILE_OPTS_URL_TYPE);
+	    } else if (compare_type(cp, STR_LYNXHIST, LEN_LYNXHIST)) {
+		/*
+		 *  Special Internal Lynx type.
+		 */
+		result = LYNXHIST_URL_TYPE;
 
-    } else if (compare_type(cp, "LYNXDOWNLOAD:", 13)) {
-	/*
-	 *  Special Internal Lynx type.
-	 */
-	return(LYNXDOWNLOAD_URL_TYPE);
+	    } else if (compare_type(cp, STR_LYNXKEYMAP, LEN_LYNXKEYMAP)) {
+		/*
+		 *  Special Internal Lynx type.
+		 */
+		result = LYNXKEYMAP_URL_TYPE;
 
-    } else if (compare_type(cp, "LYNXDIRED:", 10)) {
-	/*
-	 *  Special Internal Lynx type.
-	 */
-	return(LYNXDIRED_URL_TYPE);
+	    } else if (compare_type(cp, STR_LYNXIMGMAP, LEN_LYNXIMGMAP)) {
+		/*
+		 *  Special Internal Lynx type.
+		 */
+		/* force lower/uppercase of next part */
+		(void)is_url(&cp[LEN_LYNXIMGMAP]);
+		result = LYNXIMGMAP_URL_TYPE;
 
-    } else if (compare_type(cp, "LYNXHIST:", 9)) {
-	/*
-	 *  Special Internal Lynx type.
-	 */
-	return(LYNXHIST_URL_TYPE);
+	    } else if (compare_type(cp, STR_LYNXCOOKIE, LEN_LYNXCOOKIE)) {
+		/*
+		 *  Special Internal Lynx type.
+		 */
+		result = LYNXCOOKIE_URL_TYPE;
+	    }
+	    break;
+#ifndef DISABLE_NEWS
+	    /*
+	     *  NEWSfoo: schemes -
+	     */
+	case 'N':
+	case 'n':
+	    if (compare_type(cp, STR_NEWS_URL, LEN_NEWS_URL)) {
+		result = NEWS_URL_TYPE;
 
-    } else if (compare_type(cp, "LYNXKEYMAP:", 11)) {
-	/*
-	 *  Special Internal Lynx type.
-	 */
-	return(LYNXKEYMAP_URL_TYPE);
+	    } else if (compare_type(cp, STR_NNTP_URL, LEN_NNTP_URL)) {
+		result = NNTP_URL_TYPE;
 
-    } else if (compare_type(cp, "LYNXIMGMAP:", 11)) {
-	/*
-	 *  Special Internal Lynx type.
-	 */
-	(void)is_url(&cp[11]);	/* forces lower/uppercase of next part */
-	return(LYNXIMGMAP_URL_TYPE);
+	    } else if (compare_type(cp, "newspost:", 9)) {
+		/*
+		 *  Special Lynx type to handle news posts.
+		 */
+		result = NEWSPOST_URL_TYPE;
 
-    } else if (compare_type(cp, "LYNXCOOKIE:", 11)) {
-	/*
-	 *  Special Internal Lynx type.
-	 */
-	return(LYNXCOOKIE_URL_TYPE);
+	    } else if (compare_type(cp, "newsreply:", 10)) {
+		/*
+		 *  Special Lynx type to handle news replies (followups).
+		 */
+		result = NEWSREPLY_URL_TYPE;
+	    }
+	    break;
 
-    } else if (strstr((cp+3), "://") == NULL) {
-	/*
-	 *  If it doesn't contain "://", and it's not one of the
-	 *  the above, it can't be a URL with a scheme we know,
-	 *  so check if it's an unknown scheme for which proxying
-	 *  has been set up. - FM
-	 */
-	return(LYCheckForProxyURL(filename));
+	    /*
+	     *  SNEWSfoo: schemes -
+	     */
+	case 'S':
+	case 's':
+	    if (compare_type(cp, STR_SNEWS_URL, LEN_SNEWS_URL)) {
+		result = SNEWS_URL_TYPE;
 
-    } else if (compare_type(cp, "http:", 5)) {
-	return(HTTP_URL_TYPE);
+	    } else if (compare_type(cp, "snewspost:", 10)) {
+		/*
+		 *  Special Lynx type to handle snews posts.
+		 */
+		result = NEWSPOST_URL_TYPE;
 
-    } else if (compare_type(cp, "https:", 6)) {
-	return(HTTPS_URL_TYPE);
+	    } else if (compare_type(cp, "snewsreply:", 11)) {
+		/*
+		 *  Special Lynx type to handle snews replies (followups).
+		 */
+		result = NEWSREPLY_URL_TYPE;
+	    }
+	    break;
+#endif
+	case 'M':
+	case 'm':
+	    if (compare_type(cp, STR_MAILTO_URL, LEN_MAILTO_URL)) {
+		result = MAILTO_URL_TYPE;
+	    }
+	    break;
 
-    } else if (compare_type(cp, "gopher:", 7)) {
-	if ((cp1 = strchr(cp+11,'/')) != NULL) {
+	case 'F':
+	case 'f':
+	    if (compare_type(cp, STR_FILE_URL, len = LEN_FILE_URL)) {
+		if (LYisLocalFile(cp)) {
+		    result = FILE_URL_TYPE;
+		} else if (DoubleHtmlSep(cp + len)) {
+		    result = FTP_URL_TYPE;
+		}
+	    }
+#ifndef DISABLE_FTP
+	    else if (compare_two(cp, STR_FTP_URL, LEN_FTP_URL, limit)) {
+		result = FTP_URL_TYPE;
+	    }
+#endif
+#ifndef DISABLE_FINGER
+	    else if (compare_two(cp, STR_FINGER_URL, LEN_FINGER_URL, limit)) {
+		result = FINGER_URL_TYPE;
+	    }
+#endif
+	    break;
 
-	    if (TOUPPER(*(cp1+1)) == 'H' || *(cp1+1) == 'w')
-		/* if this is a gopher html type */
-		return(HTML_GOPHER_URL_TYPE);
-	    else if (*(cp1+1) == 'T' || *(cp1+1) == '8')
-		return(TELNET_GOPHER_URL_TYPE);
-	    else if (*(cp1+1) == '7')
-		return(INDEX_GOPHER_URL_TYPE);
-	    else
-		return(GOPHER_URL_TYPE);
-	} else {
-	    return(GOPHER_URL_TYPE);
-	}
+	case 'B':
+	case 'b':
+#ifndef DISABLE_BIBP
+	    if (compare_type(cp, STR_BIBP_URL, LEN_BIBP_URL)) {
+		result = BIBP_URL_TYPE;
+	    }
+#endif
+	    break;
 
-    } else if (compare_type(cp, "ftp:", 4)) {
-	return(FTP_URL_TYPE);
+	case 'D':
+	case 'd':
+	    if (compare_type(cp, "data:", 5)) {
+		result = DATA_URL_TYPE;
+	    }
+	    break;
 
-    } else if (compare_type(cp, "wais:", 5)) {
-	return(WAIS_URL_TYPE);
+	default:
+	    if (limit >= 3
+	    && ((cp1 = strchr(cp + 3, ':')) == NULL
+	     || !DoubleHtmlSep(cp1 + 1))) {
+		/*
+		 * If it doesn't contain "://", and it's not one of the the
+		 * above, it can't be a URL with a scheme we know, so check if
+		 * it's an unknown scheme for which proxying has been set up.
+		 * - FM
+		 */
+		if (cp1 != NULL
+		 && (cp1 - cp) > 1	/* exclude DOS-style device:/path */
+		 && LYisAbsPath(cp1+1)) {
+		    result = NCFTP_URL_TYPE;
+		}
 
-    } else if (compare_type(cp, "telnet:", 7)) {
-	return(TELNET_URL_TYPE);
+	    } else {
+		switch (*cp) {
+		case 'H':
+		case 'h':
+		    if (compare_type(cp, STR_HTTP_URL, LEN_HTTP_URL)) {
+			result = HTTP_URL_TYPE;
+
+		    } else if (compare_type(cp, STR_HTTPS_URL, LEN_HTTPS_URL)) {
+			result = HTTPS_URL_TYPE;
+		    }
+		    break;
 
-    } else if (compare_type(cp, "tn3270:", 7)) {
-	return(TN3270_URL_TYPE);
+#ifndef DISABLE_GOPHER
+		case 'G':
+		case 'g':
+		    if (compare_type(cp, STR_GOPHER_URL, LEN_GOPHER_URL)) {
+			if (strlen(cp) >= 11
+			 && (cp1 = strchr(cp+11,'/')) != NULL) {
+
+			    if (TOUPPER(*(cp1+1)) == 'H' || *(cp1+1) == 'w')
+				/* if this is a gopher html type */
+				result = HTML_GOPHER_URL_TYPE;
+			    else if (*(cp1+1) == 'T' || *(cp1+1) == '8')
+				result = TELNET_GOPHER_URL_TYPE;
+			    else if (*(cp1+1) == '7')
+				result = INDEX_GOPHER_URL_TYPE;
+			    else
+				result = GOPHER_URL_TYPE;
+			} else {
+			    result = GOPHER_URL_TYPE;
+			}
+		    }
+		    break;
+#endif
+		case 'W':
+		case 'w':
+		    if (compare_type(cp, STR_WAIS_URL, LEN_WAIS_URL)) {
+			result = WAIS_URL_TYPE;
+		    }
+		    break;
 
-    } else if (compare_type(cp, "rlogin:", 7)) {
-	return(RLOGIN_URL_TYPE);
+		case 'T':
+		case 't':
+		    if (compare_type(cp, STR_TELNET_URL, LEN_TELNET_URL)) {
+			result = TELNET_URL_TYPE;
 
-    } else if (compare_type(cp, "cso:", 4)) {
-	return(CSO_URL_TYPE);
+		    } else if (compare_type(cp, STR_TN3270_URL, LEN_TN3270_URL)) {
+			result = TN3270_URL_TYPE;
+		    }
+		    break;
 
-    } else if (compare_type(cp, "finger:", 7)) {
-	return(FINGER_URL_TYPE);
+		case 'R':
+		case 'r':
+		    if (compare_type(cp, STR_RLOGIN_URL, LEN_RLOGIN_URL)) {
+			result = RLOGIN_URL_TYPE;
+		    }
+		    break;
 
-    } else if (compare_type(cp, "afs:", 4)) {
-	return(AFS_URL_TYPE);
+		case 'C':
+		case 'c':
+		    if (compare_type(cp, STR_CSO_URL, LEN_CSO_URL)) {
+			result = CSO_URL_TYPE;
+		    }
+		    break;
 
-    } else if (compare_type(cp, "prospero:", 9)) {
-	return(PROSPERO_URL_TYPE);
+		case 'A':
+		case 'a':
+		    if (compare_type(cp, "afs:", 4)) {
+			result = AFS_URL_TYPE;
+		    }
+		    break;
 
-    } else {
+		case 'P':
+		case 'p':
+		    if (compare_type(cp, "prospero:", 9)) {
+			result = PROSPERO_URL_TYPE;
+		    }
+		    break;
+		}
+	    }
+	}
 	/*
-	 *  Check if it's an unknown scheme for which
-	 *  proxying has been set up. - FM
+	 * Check if it is an unknown scheme for which proxying has been set up.
 	 */
-	return(LYCheckForProxyURL(filename));
+	if (result == NOT_A_URL_TYPE)
+	    result = LYCheckForProxyURL(filename);
     }
+    return result;
 }
 
 /*
@@ -3058,19 +2458,19 @@ PUBLIC BOOLEAN LYFixCursesOnForAccess ARGS2(
 	 *  getfile() would indeed have turned curses off for it...
 	 */
 	if (strstr(addr, "://") != NULL &&
-	    (!strncmp(addr, "telnet:", 7) ||
-	     !strncmp(addr, "rlogin:", 7) ||
-	     !strncmp(addr, "tn3270:", 7) ||
-	     (strncmp(addr, "gopher:", 7) &&
+	    (isTELNET_URL(addr) ||
+	     isRLOGIN_URL(addr) ||
+	     isTN3270_URL(addr) ||
+	     (!isGOPHER_URL(addr) &&
 	      (cp1 = strchr(addr+11,'/')) != NULL &&
 	      (*(cp1+1) == 'T' || *(cp1+1) == '8')))) {
 	    /*
 	     *  If actual access that will be done is ok with curses off,
 	     *  then do nothing special, else force curses on. - kw
 	     */
-	    if (strncmp(physical, "telnet:", 7) &&
-		strncmp(physical, "rlogin:", 7) &&
-		strncmp(physical, "tn3270:", 7)) {
+	    if (!isTELNET_URL(physical) &&
+		!isRLOGIN_URL(physical) &&
+		!isTN3270_URL(physical)) {
 		start_curses();
 		HTAlert(
 		    gettext("Unexpected access protocol for this URL scheme."));
@@ -3085,12 +2485,11 @@ PUBLIC BOOLEAN LYFixCursesOnForAccess ARGS2(
  *  Determine whether we allow HEAD and related flags for a URL. - kw
  */
 PUBLIC BOOLEAN LYCanDoHEAD ARGS1(
-    CONST char *,	address
-    )
+    CONST char *,	address)
 {
     char *temp0 = NULL;
     int isurl;
-    if (!(address && *address))
+    if (!non_empty(address))
 	return FALSE;
     if (!strncmp(address, "http", 4))
 	return TRUE;
@@ -3138,12 +2537,12 @@ PUBLIC BOOLEAN LYCanDoHEAD ARGS1(
 #ifdef ALLOW_PROXY_HEAD
     if (isurl != FILE_URL_TYPE) {
 	char *acc_method = HTParse(temp0, "", PARSE_ACCESS);
-	if (acc_method && *acc_method) {
+	if (non_empty(acc_method)) {
 	    char *proxy;
 	    StrAllocCat(acc_method, "_proxy");
-	    proxy = getenv(acc_method);
-	    if (proxy && (!strncmp(proxy, "http:", 5) ||
-			  !strncmp(proxy, "lynxcgi:", 8)) &&
+	    proxy = LYGetEnv(acc_method);
+	    if (proxy && (isHTTP_URL(proxy) ||
+			  isLYNXCGI(proxy)) &&
 		!override_proxy(temp0)) {
 		FREE(temp0);
 		FREE(acc_method);
@@ -3250,7 +2649,7 @@ PUBLIC void remove_backslashes ARGS1(
  */
 PUBLIC BOOLEAN inlocaldomain NOARGS
 {
-#if HAVE_UTMP
+#ifdef HAVE_UTMP
     int n;
     FILE *fp;
     struct utmp me;
@@ -3278,7 +2677,8 @@ PUBLIC BOOLEAN inlocaldomain NOARGS
 #endif /* LINUX */
 
     } else {
-	CTRACE((tfp, "Could not get ttyname or open UTMP file %s\n", UTMP_FILE));
+	CTRACE((tfp, "Could not get ttyname (returned %s) or open UTMP file %s\n",
+		      (cp != 0) ? cp : "<null>", UTMP_FILE));
     }
 
     return(FALSE);
@@ -3288,7 +2688,7 @@ PUBLIC BOOLEAN inlocaldomain NOARGS
 #endif /* HAVE_UTMP */
 }
 
-#if HAVE_SIGACTION
+#ifdef HAVE_SIGACTION
 /*
  *  An extended alternative for calling signal(), sets some flags for
  *  signal handler as we want them if that functionality is available.
@@ -3319,7 +2719,7 @@ PUBLIC void LYExtSignal ARGS2(
 #endif /* HAVE_SIGACTION */
 
 #if defined(SIGTSTP) && !defined(USE_SLANG)
-#if HAVE_SIGACTION
+#ifdef HAVE_SIGACTION
 /*
  *  For switching a signal's handling between SIG_DFL and something
  *  (possibly) different that may have been set up by lynx code or
@@ -3417,7 +2817,7 @@ PUBLIC void size_change ARGS1(
 	 */
 	return;
 #else /* Curses: */
-#if HAVE_SIZECHANGE
+#ifdef HAVE_SIZECHANGE
 #ifdef TIOCGSIZE
     struct ttysize win;
 #else
@@ -3475,7 +2875,7 @@ PUBLIC void size_change ARGS1(
 #if defined(CAN_SWITCH_DISPLAY_CHARSET) && defined(CAN_AUTODETECT_DISPLAY_CHARSET)
 	/* May need to reload the font due to different char-box size */
 	if (current_char_set != auto_display_charset)
-	    Switch_Display_Charset(current_char_set, SWITCH_DISPLAY_CHARSET_SIZECHANGE);
+	    Switch_Display_Charset(current_char_set, SWITCH_DISPLAY_CHARSET_RESIZE);
 #endif
     }
 #ifdef SIGWINCH
@@ -3515,7 +2915,7 @@ PUBLIC void HTAddSugFilename ARGS1(
     char *old;
     HTList *cur;
 
-    if (!(fname && *fname))
+    if (!non_empty(fname))
 	return;
 
     StrAllocCopy(new, fname);
@@ -3549,6 +2949,7 @@ PUBLIC void HTAddSugFilename ARGS1(
 PUBLIC void change_sug_filename ARGS1(
 	char *,		fname)
 {
+    CONST char *cp2;
     char *temp = 0, *cp, *cp1, *end;
 #ifdef VMS
     char *dot;
@@ -3568,36 +2969,36 @@ PUBLIC void change_sug_filename ARGS1(
     /*
      *	Rename any temporary files.
      */
-    cp = wwwName(lynx_temp_space);
+    cp2 = wwwName(lynx_temp_space);
 #ifdef FNAMES_8_3
-    if (LYIsHtmlSep(*cp)) {
-	HTSprintf0(&temp, "file://localhost%s%04x", cp, GETPID());
+    if (LYIsHtmlSep(*cp2)) {
+	HTSprintf0(&temp, "file://localhost%s%04x", cp2, GETPID());
     } else {
-	HTSprintf0(&temp, "file://localhost/%s%04x", cp, GETPID());
+	HTSprintf0(&temp, "file://localhost/%s%04x", cp2, GETPID());
     }
 #else
-    if (LYIsHtmlSep(*cp)) {
-	HTSprintf0(&temp, "file://localhost%s%d", cp, (int)getpid());
+    if (LYIsHtmlSep(*cp2)) {
+	HTSprintf0(&temp, "file://localhost%s%d", cp2, (int)getpid());
     } else {
-	HTSprintf0(&temp, "file://localhost/%s%d", cp, (int)getpid());
+	HTSprintf0(&temp, "file://localhost/%s%d", cp2, (int)getpid());
     }
 #endif
     if (!strncmp(fname, temp, strlen(temp))) {
 	cp = strrchr(fname, '.');
 	if (strlen(cp) > (strlen(temp) - 4))
 	    cp = NULL;
-	StrAllocCopy(temp, (cp ? cp : ""));
+	StrAllocCopy(temp, NonNull(cp));
 	sprintf(fname, "temp%.*s", LY_MAXPATH - 10, temp);
     }
     FREE(temp);
 
     if (fname[strlen(fname) - 1] == '/')
-    /*
-     *  Hmm... we have a directory name.
-     *  It is annoying to see a scheme+host+path name as a suggested one,
-     *  let's remove the last_slash and go ahead like we have a file name. - LP
-     */
-    fname[strlen(fname) - 1] = '\0';
+	/*
+	 *  Hmm... we have a directory name.
+	 *  It is annoying to see a scheme+host+path name as a suggested one,
+	 *  let's remove the last_slash and go ahead like we have a file name. - LP
+	 */
+	fname[strlen(fname) - 1] = '\0';
 
     /*
      *	Remove everything up the the last_slash if there is one.
@@ -3852,21 +3253,6 @@ PRIVATE int fmt_tempname ARGS3(
 	CONST char *,	suffix)
 {
     int code;
-#if defined(USE_MKSTEMP) && defined(HAVE_MKSTEMP)
-    int fd;
-    char interim[LY_MAXPATH];
-    sprintf(interim, "%.*sXXXXXX", LY_MAXPATH - 8, prefix);
-    if (strlen(interim) + strlen(suffix) < LY_MAXPATH - 2
-    && (fd = mkstemp(interim)) >= 0) {
-	sprintf(result, "%s%s", interim, suffix);
-	rename(interim, result);
-	chmod(result, HIDE_CHMOD); /* (yes, some mkstemps are broken ;-) */
-	close(fd);
-	code = TRUE;
-    } else {
-	code = FALSE;
-    }
-#else
 #ifdef USE_RAND_TEMPNAME
 #define SIZE_TEMPNAME ((MAX_TEMPNAME / BITS_PER_CHAR) + 1)
     static BOOL first = TRUE;
@@ -3953,7 +3339,6 @@ PRIVATE int fmt_tempname ARGS3(
 	sprintf(result, "%.*s", LY_MAXPATH-1, leaf);
 	code = FALSE;
     }
-#endif
     CTRACE((tfp, "-> '%s'\n", result));
     return (code);
 }
@@ -4215,7 +3600,7 @@ PUBLIC void parse_restrictions ARGS1(
 	    }
 	}
 	if (!found) {
-	    printf("%s: %.*s", gettext("unknown restriction"), p-word, word);
+	    printf("%s: %.*s\n", gettext("unknown restriction"), p-word, word);
 	    exit(EXIT_FAILURE);
 	}
 	if (*p)
@@ -4362,7 +3747,7 @@ PUBLIC void LYCheckMail NOARGS
     struct stat st;
 
     if (firsttime) {
-	mf = getenv("MAIL");
+	mf = LYGetEnv("MAIL");
 	firsttime = FALSE;
 	time(&lasttime);
     }
@@ -4401,8 +3786,10 @@ PUBLIC void LYCheckMail NOARGS
 **  lead tildes via LYConvertToURL() if needed,
 **  and tweaking/simplifying via HTParse().  It
 **  is used for LynxHome, startfile, homepage,
-**  an 'g'oto entries, after they have been
+**  and 'g'oto entries, after they have been
 **  passed to LYFillLocalFileURL(). - FM
+**  Such URLs have no `base' reference to which they
+**  could be resolved.  LYLegitimizeHREF could not be used.
 */
 PUBLIC void LYEnsureAbsoluteURL ARGS3(
 	char **,	href,
@@ -4411,24 +3798,31 @@ PUBLIC void LYEnsureAbsoluteURL ARGS3(
 {
     char *temp = NULL;
 
-    if (!(*href && *(*href)))
+    if (isEmpty(*href))
 	return;
 
+   /*
+    *  Check whether to fill in localhost. - FM
+    */
+    LYFillLocalFileURL(href, "file://localhost");
+
     /*
      *	If it is not a URL then make it one.
      */
-    if (!strcasecomp(*href, "news:")) {
+    if (!strcasecomp(*href, STR_NEWS_URL)) {
 	StrAllocCat(*href, "*");
-    } else if (!strcasecomp(*href, "nntp:") ||
-	       !strcasecomp(*href, "snews:")) {
+    } else if (!strcasecomp(*href, STR_SNEWS_URL)) {
 	StrAllocCat(*href, "/*");
     }
+
     if (!is_url(*href)) {
 	CTRACE((tfp, "%s%s'%s' is not a URL\n",
-		    (name ? name : ""), (name ? " " : ""), *href));
+		    NonNull(name), (name ? " " : ""), *href));
 	LYConvertToURL(href, fixit);
     }
-    if ((temp = HTParse(*href, "", PARSE_ALL)) != NULL && *temp != '\0')
+
+    temp = HTParse(*href, "", PARSE_ALL);
+    if (non_empty(temp))
 	StrAllocCopy(*href, temp);
     FREE(temp);
 }
@@ -4453,25 +3847,26 @@ PUBLIC void LYConvertToURL ARGS2(
     if (!old_string || *old_string == '\0')
 	return;
 
-#if defined(DOSPATH) || defined(__EMX__)
+#if defined(USE_DOS_DRIVES)
     {
-	 char *cp_url = *AllocatedString;
-	 for(; *cp_url != '\0'; cp_url++)
-		if(*cp_url == '\\') *cp_url = '/';
-	 cp_url--;
-	 if(*cp_url == ':')
-		 StrAllocCat(*AllocatedString,"/");
+	char *cp_url = *AllocatedString;
+	for(; *cp_url != '\0'; cp_url++)
+	    if (*cp_url == '\\')
+		*cp_url = '/';
+	cp_url--;
+	if (LYIsDosDrive(*AllocatedString) && *cp_url == ':')
+	    LYAddPathSep(AllocatedString);
     }
-#endif /* DOSPATH */
+#endif /* USE_DOS_DRIVES */
 
     *AllocatedString = NULL;  /* so StrAllocCopy doesn't free it */
     StrAllocCopy(*AllocatedString, "file://localhost");
 
     if (*old_string != '/') {
 	char *fragment = NULL;
-#if defined(DOSPATH) || defined(__EMX__)
+#if defined(USE_DOS_DRIVES)
 	StrAllocCat(*AllocatedString,"/");
-#endif /* DOSPATH */
+#endif /* USE_DOS_DRIVES */
 #ifdef VMS
 	/*
 	 *  Not a SHELL pathspec.  Get the full VMS spec and convert it.
@@ -4501,8 +3896,7 @@ PUBLIC void LYConvertToURL ARGS2(
 	    }
 	    goto have_VMS_URL;
 	} else {
-	    if ((fragment = strchr(old_string, '#')) != NULL)
-		*fragment = '\0';
+	    fragment = trimPoundSelector(old_string);
 	    LYstrncpy(url_file, old_string, sizeof(url_file)-1);
 	}
 	url_file_dsc.dsc$w_length = (short) strlen(url_file);
@@ -4520,7 +3914,7 @@ PUBLIC void LYConvertToURL ARGS2(
 		StrAllocCat(*AllocatedString, cp);
 	    }
 	    if (fragment != NULL) {
-		*fragment = '#';
+		restorePoundSelector(fragment);
 		StrAllocCat(*AllocatedString, fragment);
 		fragment = NULL;
 	    }
@@ -4530,9 +3924,7 @@ PUBLIC void LYConvertToURL ARGS2(
 	     * Probably a directory.  Try converting that.
 	     */
 	    StrAllocCopy(cur_dir, dir_name);
-	    if (fragment != NULL) {
-		*fragment = '#';
-	    }
+	    restorePoundSelector(fragment);
 	    if (NULL != getcwd(dir_name, sizeof(dir_name)-1, 0)) {
 		/*
 		 * Yup, we got it!
@@ -4584,10 +3976,9 @@ PUBLIC void LYConvertToURL ARGS2(
 	     *	with the "http://" defaulted, if we can't
 	     *	rule out a bad VMS path.
 	     */
-	    if (fragment != NULL) {
-		*fragment = '#';
-		fragment = NULL;
-	    }
+	    restorePoundSelector(fragment);
+	    fragment = NULL;
+
 	    if (strchr(old_string, '[') ||
 		((cp = strchr(old_string, ':')) != NULL &&
 		 !isdigit(UCH(cp[1]))) ||
@@ -4621,7 +4012,7 @@ PUBLIC void LYConvertToURL ARGS2(
 have_VMS_URL:
 	CTRACE((tfp, "Trying: '%s'\n", *AllocatedString));
 #else /* not VMS: */
-#if defined(DOSPATH)
+#if defined(USE_DOS_DRIVES)
 #ifdef _WINDOWS
 	if (*old_string == '.') {
 	    char fullpath[MAX_PATH + 1];
@@ -4654,7 +4045,7 @@ have_VMS_URL:
 	}
 #endif
 	else
-#endif /* DOSPATH */
+#endif /* USE_DOS_DRIVES */
 	if (*old_string == '~') {
 	    /*
 	     *	On Unix, convert '~' to Home_Dir().
@@ -4685,7 +4076,7 @@ have_VMS_URL:
 	     *	Concatenate and simplify, trimming any
 	     *	residual relative elements. - FM
 	     */
-#if defined (DOSPATH) || defined (__EMX__) || defined (WIN_EX)
+#if defined (USE_DOS_DRIVES)
 	    if (old_string[1] != ':' && old_string[1] != '|') {
 		StrAllocCopy(temp, wwwName(curdir));
 		LYAddHtmlSep(&temp);
@@ -4698,14 +4089,14 @@ have_VMS_URL:
 		    old_string[1] = ':';
 		StrAllocCopy(temp, old_string);
 
-		if (strlen(temp) == 2 && temp[1] == ':')
-		    StrAllocCat(temp, "/");
+		if (strlen(temp) == 2 && LYIsDosDrive(temp))
+		    LYAddPathSep(&temp);
 	    }
 #else
 	    StrAllocCopy(temp, curdir);
 	    StrAllocCat(temp, "/");
 	    StrAllocCat(temp, old_string);
-#endif /* DOSPATH */
+#endif /* USE_DOS_DRIVES */
 	    LYTrimRelFromAbsPath(temp);
 	    CTRACE((tfp, "Converted '%s' to '%s'\n", old_string, temp));
 	    if ((stat(temp, &st) > -1) ||
@@ -4713,7 +4104,7 @@ have_VMS_URL:
 		/*
 		 *  It is a subdirectory or file on the local system.
 		 */
-#if defined (DOSPATH) || defined (__EMX__)
+#if defined (USE_DOS_DRIVES)
 		/* Don't want to see DOS local paths like c: escaped  */
 		/* especially when we really have file://localhost/   */
 		/* at the beginning.  To avoid any confusion we allow */
@@ -4724,7 +4115,7 @@ have_VMS_URL:
 		    cp = HTEscape(temp, URL_PATH);
 #else
 		cp = HTEscape(temp, URL_PATH);
-#endif /* DOSPATH */
+#endif /* USE_DOS_DRIVES */
 		StrAllocCat(*AllocatedString, cp);
 		FREE(cp);
 		CTRACE((tfp, "Converted '%s' to '%s'\n",
@@ -4735,8 +4126,7 @@ have_VMS_URL:
 		StrAllocCopy(temp2, curdir);
 		LYAddPathSep(&temp2);
 		StrAllocCopy(cp, old_string);
-		if ((fragment = strchr(cp, '#')) != NULL)
-		    *fragment = '\0';	/* keep as pointer into cp string */
+		fragment = trimPoundSelector(cp);
 		HTUnEscape(cp);   /* unescape given path without fragment */
 		StrAllocCat(temp2, cp);		/* append to current dir  */
 		StrAllocCopy(cp2, temp2);	/* keep a copy in cp2	  */
@@ -4766,7 +4156,7 @@ have_VMS_URL:
 		    } else {
 			temp = HTEscape(temp2, URL_PATH);
 			if (fragment != NULL) {
-			    *fragment = '#';
+			    restorePoundSelector(fragment);
 			    StrAllocCat(temp, fragment);
 			}
 		    }
@@ -4796,7 +4186,7 @@ have_VMS_URL:
 		    } else {
 			temp = HTEscape(temp2, URL_PATH);
 			if (fragment != NULL) {
-			    *fragment = '#';
+			    restorePoundSelector(fragment);
 			    StrAllocCat(temp, fragment);
 			}
 		    }
@@ -4814,12 +4204,13 @@ have_VMS_URL:
 			    temp2 ? temp2 : temp));
 #ifdef WIN_EX  /* 1998/01/13 (Tue) 09:07:37 */
 		{
-		    char *p, *q, buff[LY_MAXPATH + 128];
+		    CONST char *p, *q;
+		    char buff[LY_MAXPATH + 128];
 
-		    p = (char *)Home_Dir();
+		    p = Home_Dir();
 		    q = temp2 ? temp2 : temp;
 
-		    if (strlen(q) == 3 && isalpha(UCH(q[0])) && q[1] == ':') {
+		    if (strlen(q) == 3 && LYIsDosDrive(q)) {
 			sprintf(buff,
 			    "'%s' not exist, Goto LynxHome '%s'.", q, p);
 			_statusline(buff);
@@ -4928,7 +4319,7 @@ PUBLIC int win32_check_interrupt(void)
     int c;
 
     if (kbhit()) {
-	c = wgetch(LYwin);
+	c = LYgetch();
 	/** Keyboard 'Z' or 'z', or Control-G or Control-C **/
 	if (LYCharIsINTERRUPT(c) || c == 0x1b) {
 	    return TRUE;
@@ -4946,7 +4337,7 @@ void sleep(unsigned sec)
 	for (i = 0; i < 10; i++) {
 	    Sleep(100);
 	    if (kbhit()) {
-		c = wgetch(LYwin);
+		c = LYgetch();
 		return;
 	    }
 	}
@@ -4990,11 +4381,6 @@ PUBLIC BOOLEAN LYExpandHostForURL ARGS3(
     int error;
 #endif /* INET6 */
 
-#ifdef _WINDOWS
-    int hoststat;
-    struct hostent  *phost;	/* Pointer to host - See netdb.h */
-#endif
-
     /*
      *	If it's a NULL or zero-length string,
      *	or if it begins with a slash or hash,
@@ -5027,13 +4413,13 @@ PUBLIC BOOLEAN LYExpandHostForURL ARGS3(
 	 *  already be included in Path. - FM
 	 */
 	*Path = '\0';
-    } else if ((Fragment = strchr(Str, '#')) != NULL) {
+    } else {
 	/*
 	 *  No path, so check for a fragment and
 	 *  trim that, to be restored after filling
 	 *  in the Host[:port] field. - FM
 	 */
-	*Fragment = '\0';
+	Fragment = trimPoundSelector(Str);
     }
 
     /*
@@ -5095,13 +4481,7 @@ PUBLIC BOOLEAN LYExpandHostForURL ARGS3(
 	FREE(MsgStr);
 	return GotHost;
     }
-    else if (LYCursesON &&
-#if defined(__DJGPP__) && !defined(WATT32)
-	HTCheckForInterrupt()
-#else /* normal systems */
-	(lynx_nsl_status == HT_INTERRUPTED)
-#endif
-	)
+    else if (LYCursesON && (lynx_nsl_status == HT_INTERRUPTED))
     {
 	/*
 	 *  Give the user chance to interrupt lookup cycles. - KW & FM
@@ -5206,11 +4586,7 @@ PUBLIC BOOLEAN LYExpandHostForURL ARGS3(
 		/*
 		 *  Give the user chance to interrupt lookup cycles. - KW
 		 */
-#if defined(__DJGPP__) && !defined(WATT32)
-		if (LYCursesON && HTCheckForInterrupt())
-#else /* normal systems */
 		if (LYCursesON && (lynx_nsl_status == HT_INTERRUPTED))
-#endif
 		{
 		    CTRACE((tfp,
 	"LYExpandHostForURL: Interrupted while '%s' failed to resolve.\n",
@@ -5269,7 +4645,7 @@ PUBLIC BOOLEAN LYExpandHostForURL ARGS3(
 	    StrAllocCat(Host, Path);
 	} else if (Fragment) {
 	    StrAllocCat(Host, "/");
-	    *Fragment = '#';
+	    restorePoundSelector(Fragment);
 	    StrAllocCat(Host, Fragment);
 	}
 	StrAllocCopy(*AllocatedString, Host);
@@ -5387,7 +4763,7 @@ PUBLIC BOOLEAN LYAddSchemeForURL ARGS2(
 	FREE(Str);
 	return GotScheme;
 
-    } else if (default_scheme != NULL && *default_scheme != '\0') {
+    } else if (non_empty(default_scheme)) {
 	StrAllocCopy(Str, default_scheme);
 	GotScheme = TRUE;
 	StrAllocCat(Str, *AllocatedString);
@@ -5549,7 +4925,7 @@ PUBLIC char * Current_Dir ARGS1(
 	char *,	pathname)
 {
     char *result;
-#if HAVE_GETCWD
+#ifdef HAVE_GETCWD
     result = getcwd (pathname, LY_MAXPATH);
 #else
     result = getwd (pathname);
@@ -5559,29 +4935,84 @@ PUBLIC char * Current_Dir ARGS1(
     return pathname;
 }
 
+/*
+ * Verify that the given path refers to an existing directory, returning the
+ * string if the directory exists.  If not, return null.
+ */
+PRIVATE char * CheckDir ARGS1(
+    char *,	path)
+{
+    struct stat stat_info;
+    if (!LYisAbsPath(path)
+	|| (HTStat(path, &stat_info) < 0
+	 || !S_ISDIR(stat_info.st_mode))) {
+	path = NULL;
+    }
+    return path;
+}
+
+/*
+ * Lookup various possibilities for $HOME, and check that the directory exists.
+ */
+PRIVATE char *HomeEnv NOARGS
+{
+    char *result = CheckDir(LYGetEnv("HOME"));
+
+#if defined (USE_DOS_DRIVES)
+    if (result == 0) {
+	char *head;
+	char *leaf;
+	static char *temp = NULL;
+
+	/* Windows 2000 */
+	if ((result = LYGetEnv("USERPROFILE")) != 0) {
+	    HTSprintf0(&temp, "%s%sMy Documents", result, PATHSEP_STR);
+	    result = CheckDir(temp);
+	}
+	/* NT4 */
+	if (result == 0) {
+	    if ((head = LYGetEnv("HOMEDRIVE")) != 0) {
+		if ((leaf = LYGetEnv("HOMEPATH")) != 0) {
+		    HTSprintf0(&temp, "%s%s%s", head, PATHSEP_STR, leaf);
+		    result = CheckDir(temp);
+		}
+	    }
+	}
+	/* General M$ */
+	if (result == 0)
+	    result = CheckDir(LYGetEnv("TEMP"));
+	if (result == 0)
+	    result = CheckDir(LYGetEnv("TMP"));
+	if (result == 0) {
+	    if ((head = LYGetEnv("SystemDrive")) != 0) {
+		HTSprintf0(&temp, "%s%s", head, PATHSEP_STR);
+		result = CheckDir(temp);
+	    }
+	}
+	if (result == 0)
+	    result = CheckDir("C:" PATHSEP_STR);
+    }
+#endif
+
+    return result;
+}
+
 PUBLIC CONST char * Home_Dir NOARGS
 {
     static CONST char *homedir = NULL;
     char *cp = NULL;
 
     if (homedir == NULL) {
-	if ((cp = getenv_text("HOME")) == NULL
-	 || !LYisAbsPath(cp)) {
-#if defined (DOSPATH) || defined (__EMX__) /* BAD!	WSB */
-	    if ((cp = getenv_text("TEMP")) == NULL
-	     && (cp = getenv_text("TMP")) == NULL) {
-		cp = "C:\\";
-	    }
-	    StrAllocCopy(HomeDir, cp);
-#else
+	if ((cp = HomeEnv()) == NULL) {
 #ifdef VMS
-	    if ((cp = getenv_text("SYS$LOGIN")) == NULL
-	     && (cp = getenv_text("SYS$SCRATCH")) == NULL) {
+	    if ((cp = LYGetEnv("SYS$LOGIN")) == NULL
+	     && (cp = LYGetEnv("SYS$SCRATCH")) == NULL) {
 		cp = "sys$scratch:";
 	    }
 	    StrAllocCopy(HomeDir, cp);
 #else
-#if HAVE_UTMP
+#ifdef UNIX
+#ifdef HAVE_UTMP
 	    /*
 	     *	One could use getlogin() and getpwnam() here instead.
 	     */
@@ -5597,21 +5028,9 @@ PUBLIC CONST char * Home_Dir NOARGS
 		 */
 		StrAllocCopy(HomeDir, "/tmp");
 	    }
-#ifdef UNIX
-	    if (cp && *cp)
-		HTAlwaysAlert(NULL, gettext("Ignoring invalid HOME"));
 #endif
 #endif /* VMS */
-#endif /* DOSPATH */
 	} else {
-#if defined(_WINDOWS) || defined(DOSPATH)
-	    char *hp = getenv_text("HOMEDRIVE");
-	    if (hp != 0
-	     && (LYIsPathSep(*cp) || !LYisAbsPath(cp))) {
-		StrAllocCopy(HomeDir, hp);
-		StrAllocCat(HomeDir, cp);
-	    } else
-#endif
 	    StrAllocCopy(HomeDir, cp);
 	}
 	homedir = (CONST char *)HomeDir;
@@ -5619,6 +5038,10 @@ PUBLIC CONST char * Home_Dir NOARGS
 	atexit(LYHomeDir_free);
 #endif
     }
+    if (homedir == NULL) {
+	printf("%s\n", gettext("Cannot find HOME directory"));
+	exit(EXIT_FAILURE);
+    }
     return homedir;
 }
 
@@ -5875,7 +5298,7 @@ PUBLIC void LYAddPathToHome ARGS3(
 #else
 #define NO_HOMEPATH "/error"
 #endif /* VMS */
-    if (!(home && *home))
+    if (!non_empty(home))
 	/*
 	 *  Home_Dir() has a bug if this ever happens. - FM
 	 */
@@ -5935,6 +5358,30 @@ PUBLIC void LYAddPathToHome ARGS3(
 }
 
 /*
+ * Given a filename, concatenate it to the save-space pathname, unless it is
+ * an absolute pathname.  If there is no save-space defined, use the home
+ * directory. Return a new string with the result.
+ */
+PUBLIC char * LYAddPathToSave ARGS1(
+	char *,		fname)
+{
+    char *result = NULL;
+
+    if (LYisAbsPath(fname)) {
+	StrAllocCopy(result, fname);
+    } else {
+	if (lynx_save_space != NULL) {
+	    StrAllocCopy(result, lynx_save_space);
+	} else {
+	    char temp[LY_MAXPATH];
+	    LYAddPathToHome(temp, sizeof(temp), fname);
+	    StrAllocCopy(result, temp);
+	}
+    }
+    return result;
+}
+
+/*
  *  This function takes a string in the format
  *	"Mon, 01-Jan-96 13:45:35 GMT" or
  *	"Mon,  1 Jan 1996 13:45:35 GMT"" or
@@ -5963,7 +5410,7 @@ PUBLIC time_t LYmktime ARGS2(
     /*
      *	Make sure we have a string to parse. - FM
      */
-    if (!(string && *string))
+    if (!non_empty(string))
 	return(0);
     s = string;
     CTRACE((tfp, "LYmktime: Parsing '%s'\n", s));
@@ -6192,7 +5639,7 @@ PUBLIC time_t LYmktime ARGS2(
 
 #if !defined(HAVE_PUTENV) && !defined(_WINDOWS)
 /*
- *  No putenv on the next so we use this code instead!
+ *  No putenv on the NeXT so we use this code instead!
  */
 
 /* Copyright (C) 1991 Free Software Foundation, Inc.
@@ -6287,7 +5734,17 @@ int remove ARGS1(char *, name)
 }
 #endif
 
-#if defined(UNIX)
+/*
+ * Default, for single-user systems such as Cygwin and OS/2 EMX:
+ */
+#define IsOurFile(name) TRUE
+#define OpenHiddenFile(name, mode) fopen(name, mode)
+
+#if defined(MULTI_USER_UNIX)
+
+#undef IsOurFile
+#undef OpenHiddenFile
+
 /*
  * Verify if this is really a file, not accessed by a link, except for the
  * special case of its directory being pointed to by a link from a directory
@@ -6306,7 +5763,7 @@ PRIVATE BOOL IsOurFile ARGS1(char *, name)
 	 * ( If this is not a single-user system, the other user is presumed by
 	 * some people busy trying to use a symlink attack on our files ;-)
 	 */
-#if defined(HAVE_LSTAT) && !(defined(DOSPATH) || defined(__EMX__))
+#if defined(HAVE_LSTAT)
 	char *path = 0;
 	char *leaf;
 
@@ -6408,11 +5865,7 @@ PRIVATE FILE *OpenHiddenFile ARGS2(char *, name, char *, mode)
     }
     return fp;
 }
-#else	/* !UNIX */
-# ifndef VMS
-#  define OpenHiddenFile(name, mode) fopen(name, mode)
-# endif
-#endif
+#endif /* MULTI_USER_UNIX */
 
 PUBLIC FILE *LYNewBinFile ARGS1(char *, name)
 {
@@ -6460,7 +5913,7 @@ PUBLIC FILE *LYAppendToTxtFile ARGS1(char *, name)
     return fp;
 }
 
-#ifdef UNIX
+#if defined(MULTI_USER_UNIX)
 /*
  *  Restore normal permissions to a copy of a file that we have created
  *  with temp file restricted permissions.  The normal umask should
@@ -6504,6 +5957,10 @@ PUBLIC BOOLEAN LYCachedTemp ARGS2(
     return FALSE;
 }
 
+#ifndef HAVE_MKDTEMP
+#define mkdtemp(path) ((mktemp(path) != 0) && (mkdir(path, 0700) == 0))
+#endif
+
 /*
  * Open a temp-file, ensuring that it is unique, and not readable by other
  * users.
@@ -6539,8 +5996,7 @@ PUBLIC FILE *LYOpenTemp ARGS3(
      * Verify if the given space looks secure enough.  Otherwise, make a
      * secure subdirectory of that.
      */
-#if 0
-#if defined(UNIX) && defined(HAVE_MKTEMP)
+#if defined(MULTI_USER_UNIX) && (defined(HAVE_MKTEMP) || defined(HAVE_MKDTEMP))
     if (lynx_temp_subspace == 0)
     {
 	BOOL make_it = FALSE;
@@ -6560,9 +6016,8 @@ PUBLIC FILE *LYOpenTemp ARGS3(
 	}
 	if (make_it) {
 	    int old_mask = umask(HIDE_UMASK);
-	    StrAllocCat(lynx_temp_space, "XXXXXX");
-	    if (mktemp(lynx_temp_space) == 0
-	     || mkdir(lynx_temp_space, 0700) < 0) {
+	    StrAllocCat(lynx_temp_space, "XXXXXXXXXX");
+	    if (mkdtemp(lynx_temp_space) == 0) {
 		printf("%s: %s\n", lynx_temp_space, LYStrerror(errno));
 		exit(EXIT_FAILURE);
 	    }
@@ -6575,7 +6030,6 @@ PUBLIC FILE *LYOpenTemp ARGS3(
 	}
     }
 #endif
-#endif
 
     do {
 	if (!fmt_tempname(result, lynx_temp_space, suffix))
@@ -6687,11 +6141,7 @@ PUBLIC FILE *LYOpenTempRewrite ARGS3(
 #endif
 
 	if (writable_exists) {
-#ifdef UNIX
 	    is_ours = IsOurFile(fname);
-#else
-	    is_ours = TRUE;	/* assume ok, if we get to here */
-#endif
 	}
 	CTRACE((tfp, "...%s%s\n",
 	       writable_exists ? CTRACE_EXISTS : "",
@@ -6747,7 +6197,7 @@ PUBLIC FILE *LYOpenTempRewrite ARGS3(
 	 *  Yes, it exists, is writable if we checked, and everything
 	 *  looks ok so far.  This should be the most regular case. - kw
 	 */
-#if HAVE_TRUNCATE
+#ifdef HAVE_TRUNCATE
 	if (txt == TRUE) {	/* limitation of LYReopenTemp.  shrug */
 	    /*
 	     *  We truncate and then append, this avoids having a small
@@ -6880,7 +6330,7 @@ PUBLIC int LYRemoveTemp ARGS1(
     LY_TEMP *p, *q;
     int code = -1;
 
-    if (name != 0 && *name != 0) {
+    if (non_empty(name)) {
 	CTRACE((tfp, "LYRemoveTemp(%s)\n", name));
 	for (p = ly_temp, q = 0; p != 0; q = p, p = p->next) {
 	    if (!strcmp(name, p->name)) {
@@ -6912,7 +6362,7 @@ PUBLIC void LYCleanupTemp NOARGS
     while (ly_temp != 0) {
 	LYRemoveTemp(ly_temp->name);
     }
-#ifdef UNIX
+#if defined(MULTI_USER_UNIX)
     if (lynx_temp_subspace > 0) {
 	char result[LY_MAXPATH];
 	LYstrncpy(result, lynx_temp_space, sizeof(result)-1);
@@ -7117,20 +6567,20 @@ PUBLIC void LYUIPages_free NOARGS
  *  Convert local pathname to www name
  *  (do not bother about file://localhost prefix at this point).
  */
-PUBLIC  char * wwwName ARGS1(
+PUBLIC  CONST char * wwwName ARGS1(
 	CONST char *,	pathname)
 {
-    char *cp = NULL;
+    CONST char *cp = NULL;
 
-#ifdef DOSPATH
+#if defined(USE_DOS_DRIVES)
     cp = HTDOS_wwwName(pathname);
 #else
 #ifdef VMS
     cp = HTVMS_wwwName(pathname);
 #else
-    cp = (char *)pathname;
+    cp = pathname;
 #endif /* VMS */
-#endif /* DOSPATH */
+#endif
 
     return cp;
 }
@@ -7146,23 +6596,19 @@ PUBLIC BOOLEAN LYValidateFilename ARGS2(
 	char *,		result,
 	char *,		given)
 {
-    char *cp, *cp2;
+    char *cp;
+    CONST char *cp2;
 
     /*
      *  Cancel if the user entered "/dev/null" on Unix,
-     *  or an "nl:" path (case-insensitive) on VMS. - FM
+     *  or an "nl:" path on VMS. - FM
      */
-#ifdef VMS
-    if (!strncasecomp(given, "nl:", 3) ||
-	!strncasecomp(given, "/nl/", 4))
-#else
-    if (!strcmp(given, "/dev/null"))
-#endif /* VMS */
+    if (LYIsNullDevice(given))
     {
 	/* just ignore it */
 	return FALSE;
     }
-#if HAVE_POPEN
+#ifdef HAVE_POPEN
     if (LYIsPipeCommand(given)) {
 	if (no_shell) {
 	    HTUserMsg(SPAWNING_DISABLED);
@@ -7251,7 +6697,7 @@ PUBLIC int LYValidateOutput ARGS1(
     /*
      * Assume we can write to a pipe
      */
-#if HAVE_POPEN
+#ifdef HAVE_POPEN
     if (LYIsPipeCommand(filename))
 	return 'Y';
 #endif
@@ -7289,7 +6735,7 @@ PUBLIC void LYLocalFileToURL ARGS2(
 	char **,	target,
 	CONST char *,	source)
 {
-    char *leaf;
+    CONST char *leaf;
 
     StrAllocCopy(*target, "file://localhost");
 
@@ -7298,6 +6744,8 @@ PUBLIC void LYLocalFileToURL ARGS2(
     if (!LYisAbsPath(source)) {
 	char temp[LY_MAXPATH];
 	Current_Dir(temp);
+	if (!LYIsHtmlSep(*temp))
+	    LYAddHtmlSep(target);
 	StrAllocCat(*target, temp);
     }
     if (!LYIsHtmlSep(*leaf))
@@ -7305,11 +6753,35 @@ PUBLIC void LYLocalFileToURL ARGS2(
     StrAllocCat(*target, leaf);
 }
 
+/*
+ * Open a temporary file for internal-pages, optionally reusing an existing
+ * filename.
+ */
+PUBLIC FILE *InternalPageFP ARGS2(
+	char *, filename,
+	int,	reuse_flag)
+{
+    FILE *fp;
+
+    if (LYReuseTempfiles && reuse_flag) {
+	fp = LYOpenTempRewrite(filename, HTML_SUFFIX, BIN_W);
+    } else {
+	LYRemoveTemp(filename);
+	fp = LYOpenTemp(filename, HTML_SUFFIX, BIN_W);
+    }
+    if (fp == NULL) {
+	HTAlert(CANNOT_OPEN_TEMP);
+    }
+    return fp;
+}
+
 PUBLIC void BeginInternalPage ARGS3(
 	FILE *, fp0,
 	char*, Title,
 	char*, HelpURL)
 {
+    fprintf(fp0, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n");
+
     fprintf(fp0, "<html>\n<head>\n");
     LYAddMETAcharsetToFD(fp0, -1);
     if (LYIsListpageTitle(Title)) {
@@ -7347,6 +6819,15 @@ PUBLIC void EndInternalPage ARGS1(
     fprintf(fp0, "</body>\n</html>");
 }
 
+PUBLIC char *trimPoundSelector ARGS1(
+	char *,		address)
+{
+    char *pound = findPoundSelector(address);
+    if (pound != 0)
+	*pound = '\0';
+    return pound;
+}
+
 /*
  * Trim a trailing path-separator to avoid confusing other programs when we concatenate
  * to it.  This only applies to local filesystems.
@@ -7362,14 +6843,8 @@ PUBLIC void LYTrimPathSep ARGS1(
 	path[len-1] = 0;
 }
 
-#ifdef DOSPATH
-#define PATHSEP_STR "\\"
-#else
-#define PATHSEP_STR "/"
-#endif
-
 /*
- * Add a trailing path-separator to avoid confusing other programs when we concateate
+ * Add a trailing path-separator to avoid confusing other programs when we concatenate
  * to it.  This only applies to local filesystems.
  */
 PUBLIC void LYAddPathSep ARGS1(
@@ -7410,7 +6885,7 @@ PUBLIC char * LYLastPathSep ARGS1(
 	CONST char *,	path)
 {
     char *result;
-#ifdef DOSPATH
+#if defined(USE_DOS_DRIVES)
     if ((result = strrchr(path, '\\')) == 0)
 	result = strrchr(path, '/');
 #else
@@ -7477,45 +6952,43 @@ PUBLIC int LYCopyFile ARGS2(
 	char *,		dst)
 {
     int code;
+    CONST char *program;
 
-#if defined(DOSPATH) || defined(__CYGWIN__) /* thanks to Hiroyuki Senshu */
+    if ((program = HTGetProgramPath(ppCOPY)) != NULL) {
+	char *the_command = 0;
 
-#define BUF_SIZE	1024
+	HTAddParam(&the_command, COPY_COMMAND, 1, program);
+	HTAddParam(&the_command, COPY_COMMAND, 2, src);
+	HTAddParam(&the_command, COPY_COMMAND, 3, dst);
+	HTEndParam(&the_command, COPY_COMMAND, 3);
 
-    FILE *fin, *fout;
-    unsigned char buff[BUF_SIZE];
-    int len;
+	CTRACE((tfp, "command: %s\n", the_command));
+	stop_curses();
+	code = LYSystem(the_command);
+	start_curses();
 
-    code = EOF;
-    if ((fin = fopen(src, BIN_R)) != 0) {
-	if ((fout = fopen(dst, BIN_W)) != 0) {
-	    code = 0;
-	    while ((len = fread(buff, 1, BUF_SIZE, fin)) > 0) {
-		fwrite(buff, 1, len, fout);
-		if (ferror(fout)) {
-		    code = EOF;
-		    break;
+	FREE(the_command);
+    } else {
+	FILE *fin, *fout;
+	unsigned char buff[BUFSIZ];
+	int len;
+
+	code = EOF;
+	if ((fin = fopen(src, BIN_R)) != 0) {
+	    if ((fout = fopen(dst, BIN_W)) != 0) {
+		code = 0;
+		while ((len = fread(buff, 1, sizeof(buff), fin)) > 0) {
+		    fwrite(buff, 1, len, fout);
+		    if (ferror(fout)) {
+			code = EOF;
+			break;
+		    }
 		}
+		LYCloseOutput(fout);
 	    }
-	    LYCloseOutput(fout);
+	    LYCloseInput(fin);
 	}
-	LYCloseInput(fin);
     }
-#else
-    char *the_command = 0;
-
-    HTAddParam(&the_command, COPY_COMMAND, 1, COPY_PATH);
-    HTAddParam(&the_command, COPY_COMMAND, 2, src);
-    HTAddParam(&the_command, COPY_COMMAND, 3, dst);
-    HTEndParam(&the_command, COPY_COMMAND, 3);
-
-    CTRACE((tfp, "command: %s\n", the_command));
-    stop_curses();
-    code = LYSystem(the_command);
-    start_curses();
-
-    FREE(the_command);
-#endif
 
     if (code) {
 	HTAlert(CANNOT_WRITE_TO_FILE);
@@ -7523,6 +6996,33 @@ PUBLIC int LYCopyFile ARGS2(
     return code;
 }
 
+#ifdef __DJGPP__
+PRIVATE char *escape_backslashes ARGS1(char *, source)
+{
+    char *result = 0;
+    int count = 0;
+    int n;
+
+    for (n = 0; source[n] != '\0'; ++n) {
+	if (source[n] == '\\')
+	    ++count;
+    }
+    if (count != 0) {
+	result = malloc(count + n + 1);
+	if (result != 0) {
+	    int ch;
+	    char *target = result;
+	    while ((ch = *source++) != '\0') {
+		if (ch == '\\')
+		    *target++ = ch;
+		*target++ = ch;
+	    }
+	    *target = '\0';
+	}
+    }
+    return result;
+}
+#endif /* __DJGPP__ */
 /*
  * Invoke a shell command, return nonzero on error.
  */
@@ -7531,7 +7031,7 @@ PUBLIC int LYSystem ARGS1(
 {
     int code;
     int do_free = 0;
-#if HAVE_SIGACTION && defined(SIGTSTP) && !defined(USE_SLANG)
+#if defined(HAVE_SIGACTION) && defined(SIGTSTP) && !defined(USE_SLANG)
     struct sigaction saved_sigtstp_act;
     BOOLEAN sigtstp_saved = FALSE;
 #endif
@@ -7579,6 +7079,11 @@ PUBLIC int LYSystem ARGS1(
     }
 #  endif
 
+    /*
+     * This chunk of code does not work, for two reasons:
+     * a) the Cygwin system() function edits out the backslashes
+     * b) it does not account for more than one parameter, e.g., +number
+     */
 #if defined(__CYGWIN__) && defined(DOSPATH)	/* 1999/02/26 (Fri) */
     {
 	char cmd[LY_MAXPATH];
@@ -7629,25 +7134,40 @@ PUBLIC int LYSystem ARGS1(
     }
 #endif
 
-#if _WIN_CC
+#ifdef __DJGPP__
+    if (dj_is_bash) {
+	char *new_command = escape_backslashes(command);
+	if (new_command != 0) {
+	    if (do_free)
+		free(command);
+	    command = new_command;
+	}
+    }
+#endif /* __DJGPP__ */
+
+#ifdef _WIN_CC
     code = exec_command(command, TRUE);	/* Wait exec */
-#else
+#else /* !_WIN_CC */
+#ifdef SIGPIPE
     if (restore_sigpipe_for_children)
 	signal(SIGPIPE, SIG_DFL); /* Some commands expect the default */
-#if HAVE_SIGACTION && defined(SIGTSTP) && !defined(USE_SLANG)
+#endif
+#if defined(HAVE_SIGACTION) && defined(SIGTSTP) && !defined(USE_SLANG)
     if (!dump_output_immediately && !LYCursesON && !no_suspend)
 	sigtstp_saved = LYToggleSigDfl(SIGTSTP, &saved_sigtstp_act, 1);
 #endif
     code = system(command);
     saved_errno = errno;
-#if HAVE_SIGACTION && defined(SIGTSTP) && !defined(USE_SLANG)
+#if defined(HAVE_SIGACTION) && defined(SIGTSTP) && !defined(USE_SLANG)
     if (sigtstp_saved)
 	LYToggleSigDfl(SIGTSTP, &saved_sigtstp_act, 0);
 #endif
+#ifdef SIGPIPE
     if (restore_sigpipe_for_children)
 	signal(SIGPIPE, SIG_IGN); /* Ignore it again - kw */
 #endif
 #endif
+#endif
 
 #ifdef __DJGPP__
     __djgpp_set_ctrl_c(1);
@@ -7689,7 +7209,7 @@ PUBLIC int Cygwin_Shell NOARGS
     /* Init a startup structure */
     GetStartupInfo(&startUpInfo);
 
-    shell = getenv_text("COMSPEC");
+    shell = LYGetEnv("COMSPEC");
 
     /* Create the child process, specifying
      inherited handles. Pass the value of the
@@ -7701,7 +7221,7 @@ PUBLIC int Cygwin_Shell NOARGS
 			0, 0, &startUpInfo, &procInfo);
 
 	if (!code) {
-	    printf("shell = [%s], code = %d\n", shell, GetLastError());
+	    printf("shell = [%s], code = %ld\n", shell, GetLastError());
 	}
 
 	/* wait for the child to return (this is not a requirement
@@ -7718,10 +7238,10 @@ PUBLIC char *LYSysShell NOARGS
     char *shell = 0;
 #ifdef DOSPATH
 #ifdef WIN_EX
-    shell = getenv_text("SHELL");
+    shell = LYGetEnv("SHELL");
     if (shell) {
 	if (access(shell, 0) != 0)
-	    shell = getenv_text("COMSPEC");
+	    shell = LYGetEnv("COMSPEC");
     }
     if (shell == NULL) {
 	if (system_is_NT)
@@ -7730,9 +7250,9 @@ PUBLIC char *LYSysShell NOARGS
 	    shell = "command.com";
     }
 #else
-    shell = getenv_text("SHELL");
+    shell = LYGetEnv("SHELL");
     if (shell == NULL) {
-	shell = getenv_text("COMSPEC");
+	shell = LYGetEnv("COMSPEC");
     }
     if (shell == NULL) {
 	shell = "command.com";
@@ -7740,10 +7260,10 @@ PUBLIC char *LYSysShell NOARGS
 #endif /* WIN_EX */
 #else
 #ifdef __EMX__
-    if (getenv_text("SHELL") != NULL) {
-	shell = getenv_text("SHELL");
+    if (LYGetEnv("SHELL") != NULL) {
+	shell = LYGetEnv("SHELL");
     } else {
-	shell = (getenv_text("COMSPEC") == NULL) ? "cmd.exe" : getenv_text("COMSPEC");
+	shell = (LYGetEnv("COMSPEC") == NULL) ? "cmd.exe" : LYGetEnv("COMSPEC");
     }
 #else
 #ifdef VMS
@@ -7767,10 +7287,7 @@ PUBLIC char *LYSysShell NOARGS
  */
 PUBLIC char *LYgetXDisplay NOARGS
 {
-    char *cp;
-    if ((cp = getenv_text(DISPLAY)) == NULL)
-	cp = 0;
-    return cp;
+    return LYGetEnv(DISPLAY);
 }
 
 /*
@@ -7796,12 +7313,13 @@ PUBLIC void LYsetXDisplay ARGS1(
     }
 }
 
+#ifdef CAN_CUT_AND_PASTE
 #ifdef __EMX__
 
 static int proc_type = -1;
 static PPIB pib;
-HAB hab;
-HMQ hmq;
+static HAB hab;
+static HMQ hmq;
 
 PRIVATE void morph_PM NOARGS
 {
@@ -7833,7 +7351,7 @@ PUBLIC int size_clip NOARGS
     return 8192;
 }
 
-/* Code partialy stolen from FED editor. */
+/* Code partially stolen from FED editor. */
 
 PUBLIC int put_clip ARGS1(char *, s)
 {
@@ -7919,11 +7437,90 @@ PUBLIC void get_clip_release NOARGS
     unmorph_PM();
 }
 
-#endif
+#else	/* !( defined __EMX__ ) */
 
-#if defined(WIN_EX)	/* 1997/10/16 (Thu) 20:13:28 */
+#  if !defined(WIN_EX) && defined(HAVE_POPEN)
+
+static FILE* paste_handle = 0;
+static char *paste_buf = NULL;
+
+PUBLIC void get_clip_release NOARGS
+{
+    if (paste_handle != 0)
+	pclose(paste_handle);
+    if (paste_buf)
+	FREE (paste_buf);
+}
+
+PRIVATE int clip_grab NOARGS
+{
+    char *cmd = LYGetEnv("RL_PASTE_CMD");
+
+    if (paste_handle)
+	pclose(paste_handle);
+    if (!cmd)
+	return 0;
+
+    paste_handle = popen(cmd, "rt");
+    if (!paste_handle)
+	return 0;
+    return 1;
+}
+
+#define PASTE_BUFFER 1008
+#define CF_TEXT 0			/* Not used */
+
+PUBLIC char* get_clip_grab NOARGS
+{
+    int len;
+    int size = PASTE_BUFFER;
+    int off = 0;
+
+    if (!clip_grab())
+	return NULL;
+    if (!paste_handle)
+	return NULL;
+    if (paste_buf)
+	FREE (paste_buf);
+    paste_buf = (char*)malloc (PASTE_BUFFER);
+    while (1) {
+	len = fread (paste_buf + off, 1, PASTE_BUFFER - 1, paste_handle);
+	paste_buf[off + len] = '\0';
+	if (len < PASTE_BUFFER - 1)
+	break;
+	if (strchr (paste_buf + off, '\r')
+	 || strchr (paste_buf + off, '\n'))
+	    break;
+	paste_buf = realloc (paste_buf, size += PASTE_BUFFER - 1);
+	off += len;
+    }
+    return paste_buf;
+}
+
+PUBLIC int
+put_clip ARGS1(char *, s)
+{
+    char *cmd = LYGetEnv("RL_CLCOPY_CMD");
+    FILE *fh;
+    int l = strlen(s), res;
+
+    if (!cmd)
+	return -1;
+
+    fh = popen (cmd, "wt");
+    if (!fh)
+	return -1;
+    res = fwrite (s, 1, l, fh);
+    if (pclose (fh) != 0 || res != l)
+	return -1;
+    return 0;
+}
 
-#define	MAX_DOS_PATH	128	/* exactly 80 */
+#  endif	/* !defined(WIN_EX) && defined(HAVE_POPEN) */
+
+#endif /* __EMX__ */
+
+#if defined(WIN_EX)	/* 1997/10/16 (Thu) 20:13:28 */
 
 PUBLIC int put_clip(char *szBuffer)
 {
@@ -8011,29 +7608,8 @@ PUBLIC void get_clip_release()
     CloseClipboard();
     m_locked = 0;
 }
-
-
-PUBLIC char *HTDOS_short_name(char *path)
-{
-    static char sbuf[MAX_DOS_PATH];
-    char *ret;
-    DWORD r;
-
-    r = GetShortPathName(path, sbuf, sizeof sbuf);
-    if (r >= sizeof sbuf) {
-#if 0	/* DEBUG */
-	fprintf(stderr, "bug: recompile with MAX_DOS_PATH > %d\n", r);
-#endif
-	ret = path;
-    }
-    if (r == 0) {
-	ret = path;
-    } else {
-	ret = sbuf;
-    }
-    return ret;
-}
-#endif
+#endif	/* WIN_EX */
+#endif /* CAN_CUT_AND_PASTE */
 
 #if defined(WIN_EX)
 
@@ -8111,7 +7687,7 @@ PUBLIC char * w32_strerror(DWORD ercode)
 PUBLIC void LYOpenlog ARGS1(
 	CONST char *, banner)
 {
-#if defined(WATT32)
+#if defined(DJGPP)
     openlog("lynx", LOG_PID|LOG_NDELAY, LOG_LOCAL5);
 #else
     openlog("lynx", LOG_PID, LOG_LOCAL5);
@@ -8165,7 +7741,7 @@ PUBLIC void LYSyslog ARGS1(
 	    buf[colon2 - arg + 1] = 0;
 	    StrAllocCat(buf, "******");
 	    StrAllocCat(buf, atsign);
-	    syslog (LOG_INFO|LOG_LOCAL5, buf);
+	    syslog (LOG_INFO|LOG_LOCAL5, "%s", buf);
 	    CTRACE((tfp, "...alter %s\n", buf));
 	    FREE(buf);
 	    return;
@@ -8181,4 +7757,3 @@ PUBLIC void LYCloselog NOARGS
 }
 
 #endif /* !VMS && SYSLOG_REQUESTED_URLS */
-
diff --git a/gnu/usr.bin/lynx/src/LYUtils.h b/gnu/usr.bin/lynx/src/LYUtils.h
index db0b6bbe8d2..f8d9af0f69f 100644
--- a/gnu/usr.bin/lynx/src/LYUtils.h
+++ b/gnu/usr.bin/lynx/src/LYUtils.h
@@ -16,7 +16,7 @@
 #define HTSYS_remove(path) HTVMS_remove(path)
 #endif /* VMS */
 
-#if defined(DOSPATH) || defined(__EMX__)
+#if defined(USE_DOS_DRIVES)
 #include <HTDOS.h>
 #define HTSYS_name(path) HTDOS_name(path)
 #endif
@@ -35,6 +35,36 @@
 
 #define LYIsPipeCommand(s) ((s)[0] == '|')
 
+#ifdef VMS
+#define TTY_DEVICE "tt:"
+#define NUL_DEVICE "nl:"
+#define LYIsNullDevice(s) (!strncasecomp(s, "nl:", 3) || !strncasecomp(s, "/nl/", 4))
+#define LYSameFilename(a,b) (!strcasecomp(a,b))
+#define LYSameHostname(a,b) (!strcasecomp(a,b))
+#else
+#if defined(DOSPATH) || defined(__EMX__)
+#define TTY_DEVICE "con"
+#define NUL_DEVICE "nul"
+#define LYIsNullDevice(s) LYSameFilename(s,NUL_DEVICE)
+#define LYSameFilename(a,b) (!strcasecomp(a,b))
+#define LYSameHostname(a,b) (!strcasecomp(a,b))
+#else
+#if defined(__CYGWIN__)
+#define TTY_DEVICE "/dev/tty"
+#define NUL_DEVICE "/dev/null"
+#define LYIsNullDevice(s) LYSameFilename(s,NUL_DEVICE)
+#define LYSameFilename(a,b) (!strcasecomp(a,b))
+#define LYSameHostname(a,b) (!strcasecomp(a,b))
+#else
+#define TTY_DEVICE "/dev/tty"
+#define NUL_DEVICE "/dev/null"
+#define LYIsNullDevice(s) LYSameFilename(s,NUL_DEVICE)
+#define LYSameFilename(a,b) (!strcmp(a,b))
+#define LYSameHostname(a,b) (!strcmp(a,b))
+#endif /* __CYGWIN__ */
+#endif /* DOSPATH */
+#endif /* VMS */
+
 /* See definitions in src/LYCharVals.h.  The hardcoded values...
    This prohibits binding C-c and C-g.  Maybe it is better to remove this? */
 #define LYCharIsINTERRUPT_HARD(ch)	\
@@ -46,10 +76,14 @@
 #define LYCharIsINTERRUPT_NO_letter(ch)	\
   (LYCharIsINTERRUPT(ch) && !isprint(ch))
 
-#if defined(DOSPATH) || defined(__EMX__)
+#if defined(USE_DOS_DRIVES)
+#define PATHSEP_STR "\\"
 #define LYIsPathSep(ch) ((ch) == '/' || (ch) == '\\')
+#define LYIsDosDrive(s) (isalpha(UCH((s)[0])) && (s)[1] == ':')
 #else
+#define PATHSEP_STR "/"
 #define LYIsPathSep(ch) ((ch) == '/')
+#define LYIsDosDrive(s) FALSE /* really nothing */
 #endif
 
 #ifdef EXP_ADDRLIST_PAGE
@@ -63,6 +97,9 @@
 
 #define LYIsHtmlSep(ch) ((ch) == '/')
 
+#define findPoundSelector(address) strchr(address, '#')
+#define restorePoundSelector(pound) if ((pound) != NULL) *(pound) = '#'
+
 extern BOOL strn_dash_equ PARAMS((CONST char* p1,CONST char* p2,int len));
 extern BOOLEAN LYAddSchemeForURL PARAMS((char **AllocatedString, char *default_scheme));
 extern BOOLEAN LYCachedTemp PARAMS((char *result, char **cached));
@@ -76,13 +113,15 @@ extern BOOLEAN LYFixCursesOnForAccess PARAMS((CONST char* addr, CONST char* phys
 extern BOOLEAN LYPathOffHomeOK PARAMS((char *fbuffer, size_t fbuffer_size));
 extern BOOLEAN LYValidateFilename PARAMS((char * result, char * given));
 extern BOOLEAN LYisAbsPath PARAMS((CONST char *path));
-extern BOOLEAN LYisLocalAlias PARAMS((char *filename));
-extern BOOLEAN LYisLocalFile PARAMS((char *filename));
-extern BOOLEAN LYisLocalHost PARAMS((char *filename));
-extern BOOLEAN LYisRootPath PARAMS((char *path));
+extern BOOLEAN LYisLocalAlias PARAMS((CONST char *filename));
+extern BOOLEAN LYisLocalFile PARAMS((CONST char *filename));
+extern BOOLEAN LYisLocalHost PARAMS((CONST char *filename));
+extern BOOLEAN LYisRootPath PARAMS((CONST char *path));
 extern BOOLEAN inlocaldomain NOPARAMS;
 extern CONST char *Home_Dir NOPARAMS;
-extern CONST char *index_to_restriction PARAMS(( int	inx));
+extern CONST char *index_to_restriction PARAMS((int inx));
+extern CONST char *wwwName PARAMS((CONST char *pathname));
+extern FILE *InternalPageFP PARAMS((char * filename, int reuse_flag));
 extern FILE *LYAppendToTxtFile PARAMS((char * name));
 extern FILE *LYNewBinFile PARAMS((char * name));
 extern FILE *LYNewTxtFile PARAMS((char * name));
@@ -91,27 +130,33 @@ extern FILE *LYOpenTemp PARAMS((char *result, CONST char *suffix, CONST char *mo
 extern FILE *LYOpenTempRewrite PARAMS((char *result, CONST char *suffix, CONST char *mode));
 extern FILE *LYReopenTemp PARAMS((char *name));
 extern char *Current_Dir PARAMS((char * pathname));
+extern char *LYAddPathToSave PARAMS((char *fname));
+extern char *LYGetEnv PARAMS((CONST char * name));
+extern char *LYGetHiliteStr PARAMS(( int cur, int count));
 extern char *LYLastPathSep PARAMS((CONST char *path));
 extern char *LYPathLeaf PARAMS((char * pathname));
 extern char *LYSysShell NOPARAMS;
 extern char *LYgetXDisplay NOPARAMS;
 extern char *strip_trailing_slash PARAMS((char * my_dirname));
-extern char *wwwName PARAMS((CONST char *pathname));
+extern char *trimPoundSelector PARAMS((char * address));
 extern int HTCheckForInterrupt NOPARAMS;
 extern int LYCheckForProxyURL PARAMS((char *filename));
 extern int LYConsoleInputFD PARAMS((BOOLEAN need_selectable));
 extern int LYCopyFile PARAMS((char *src, char *dst));
+extern int LYGetHilitePos PARAMS(( int cur, int count));
 extern int LYRemoveTemp PARAMS((char *name));
 extern int LYSystem PARAMS((char *command));
 extern int LYValidateOutput PARAMS((char * filename));
 extern int find_restriction PARAMS((CONST char * name, int len));
 extern int is_url PARAMS((char *filename));
 extern int number2arrows PARAMS((int number));
+extern size_t utf8_length PARAMS((BOOL utf_flag, CONST char * data));
 extern time_t LYmktime PARAMS((char *string, BOOL absolute));
 extern void BeginInternalPage PARAMS((FILE *fp0, char *Title, char *HelpURL));
 extern void EndInternalPage PARAMS((FILE *fp0));
 extern void HTAddSugFilename PARAMS((char *fname));
 extern void HTSugFilenames_free NOPARAMS;
+extern void LYAddHilite PARAMS((int cur, char *text, int x));
 extern void LYAddHtmlSep PARAMS((char **path));
 extern void LYAddHtmlSep0 PARAMS((char *path));
 extern void LYAddLocalhostAlias PARAMS((char *alias));
@@ -131,14 +176,15 @@ extern void LYFixCursesOn PARAMS((CONST char* reason));
 extern void LYLocalFileToURL PARAMS((char **target, CONST char *source));
 extern void LYLocalhostAliases_free NOPARAMS;
 extern void LYRenamedTemp PARAMS((char * oldname, char * newname));
+extern void LYSetHilite PARAMS((int cur, char *text));
 extern void LYTrimHtmlSep PARAMS((char *path));
 extern void LYTrimPathSep PARAMS((char *path));
 extern void LYTrimRelFromAbsPath PARAMS((char *path));
+extern void LYhighlight PARAMS((int flag, int cur, char *target));
 extern void LYsetXDisplay PARAMS((char *new_display));
 extern void change_sug_filename PARAMS((char *fname));
 extern void convert_to_spaces PARAMS((char *string, BOOL condense));
 extern void free_and_clear PARAMS((char **obj));
-extern void highlight PARAMS((int flag, int cur, char *target));
 extern void noviceline PARAMS((int more_flag));
 extern void parse_restrictions PARAMS((CONST char *s));
 extern void print_restrictions_to_fd PARAMS((FILE *fp));
@@ -147,6 +193,21 @@ extern void size_change PARAMS((int sig));
 extern void statusline PARAMS((CONST char *text));
 extern void toggle_novice_line NOPARAMS;
 
+#ifdef EXP_ASCII_CTYPES
+extern int ascii_tolower PARAMS((int i));
+extern int ascii_toupper PARAMS((int i));
+extern int ascii_isupper PARAMS((int i));
+#endif
+
+#ifdef __CYGWIN__
+extern int Cygwin_Shell PARAMS((void));
+#endif
+
+#ifdef _WIN_CC
+extern int exec_command(char * cmd, int wait_flag); /* xsystem.c */
+extern int xsystem(char *cmd);
+#endif
+
 /* Keeping track of User Interface Pages: */
 typedef enum {
     UIP_UNKNOWN=-1
@@ -176,15 +237,15 @@ extern void LYRegisterUIPage PARAMS((CONST char * url, UIP_t type));
 extern void LYUIPages_free NOPARAMS;
 
 #ifdef CAN_CUT_AND_PASTE
-extern int put_clip(char *szBuffer);
+extern int put_clip PARAMS((char *szBuffer));
 /* get_clip_grab() returns a pointer to the string in the system area.
    get_clip_release() should be called ASAP after this. */
-extern char* get_clip_grab(void);
-extern void  get_clip_release(void);
+extern char* get_clip_grab NOPARAMS;
+extern void  get_clip_release NOPARAMS;
 #  ifdef WIN_EX
 #    define size_clip()	8192
 #  else
-extern int size_clip();
+extern int size_clip NOPARAMS;
 #  endif
 #endif
 
@@ -201,8 +262,10 @@ extern void Define_VMSLogical PARAMS((char *LogicalName, char *LogicalValue));
 extern int putenv PARAMS((CONST char *string));
 #endif /* HAVE_PUTENV */
 
-#ifdef UNIX
+#if defined(MULTI_USER_UNIX)
 extern void LYRelaxFilePermissions PARAMS((CONST char * name));
+#else
+#define LYRelaxFilePermissions(name) /* nothing */
 #endif
 
 /*
@@ -223,6 +286,7 @@ typedef enum {
     HTTP_URL_TYPE,
     FILE_URL_TYPE,
     FTP_URL_TYPE,
+    NCFTP_URL_TYPE,
     WAIS_URL_TYPE,
     NEWS_URL_TYPE,
     NNTP_URL_TYPE,
@@ -269,6 +333,132 @@ typedef enum {
 
 } UrlTypes;
 
+/* common URLs */
+#define STR_BIBP_URL         "bibp:"
+#define LEN_BIBP_URL         5
+#define isBIBP_URL(addr)     !strncasecomp(addr, STR_BIBP_URL, LEN_BIBP_URL)
+
+#define STR_CSO_URL          "cso:"
+#define LEN_CSO_URL          4
+#define isCSO_URL(addr)      !strncasecomp(addr, STR_CSO_URL, LEN_CSO_URL)
+
+#define STR_FILE_URL         "file:"
+#define LEN_FILE_URL         5
+#define isFILE_URL(addr)     ((*addr == 'f' || *addr == 'F') &&\
+                             !strncasecomp(addr, STR_FILE_URL, LEN_FILE_URL))
+
+#define STR_FINGER_URL       "finger:"
+#define LEN_FINGER_URL       7
+#define isFINGER_URL(addr)   !strncasecomp(addr, STR_FINGER_URL, LEN_FINGER_URL)
+
+#define STR_FTP_URL          "ftp:"
+#define LEN_FTP_URL          4
+#define isFTP_URL(addr)      !strncasecomp(addr, STR_FTP_URL, LEN_FTP_URL)
+
+#define STR_GOPHER_URL       "gopher:"
+#define LEN_GOPHER_URL       7
+#define isGOPHER_URL(addr)   !strncasecomp(addr, STR_GOPHER_URL, LEN_GOPHER_URL)
+
+#define STR_HTTP_URL         "http:"
+#define LEN_HTTP_URL         5
+#define isHTTP_URL(addr)     !strncasecomp(addr, STR_HTTP_URL, LEN_HTTP_URL)
+
+#define STR_HTTPS_URL        "https:"
+#define LEN_HTTPS_URL        6
+#define isHTTPS_URL(addr)    !strncasecomp(addr, STR_HTTPS_URL, LEN_HTTPS_URL)
+
+#define STR_MAILTO_URL       "mailto:"
+#define LEN_MAILTO_URL       7
+#define isMAILTO_URL(addr)   !strncasecomp(addr, STR_MAILTO_URL, LEN_MAILTO_URL)
+
+#define STR_NEWS_URL         "news:"
+#define LEN_NEWS_URL         5
+#define isNEWS_URL(addr)     !strncasecomp(addr, STR_NEWS_URL, LEN_NEWS_URL)
+
+#define STR_NNTP_URL         "nntp:"
+#define LEN_NNTP_URL         5
+#define isNNTP_URL(addr)     !strncasecomp(addr, STR_NNTP_URL, LEN_NNTP_URL)
+
+#define STR_RLOGIN_URL       "rlogin:"
+#define LEN_RLOGIN_URL       7
+#define isRLOGIN_URL(addr)   !strncasecomp(addr, STR_RLOGIN_URL, LEN_RLOGIN_URL)
+
+#define STR_SNEWS_URL        "snews:"
+#define LEN_SNEWS_URL        6
+#define isSNEWS_URL(addr)    !strncasecomp(addr, STR_SNEWS_URL, LEN_SNEWS_URL)
+
+#define STR_TELNET_URL       "telnet:"
+#define LEN_TELNET_URL       7
+#define isTELNET_URL(addr)   !strncasecomp(addr, STR_TELNET_URL, LEN_TELNET_URL)
+
+#define STR_TN3270_URL       "tn3270:"
+#define LEN_TN3270_URL       7
+#define isTN3270_URL(addr)   !strncasecomp(addr, STR_TN3270_URL, LEN_TN3270_URL)
+
+#define STR_WAIS_URL         "wais:"
+#define LEN_WAIS_URL         5
+#define isWAIS_URL(addr)     !strncasecomp(addr, STR_WAIS_URL, LEN_WAIS_URL)
+
+/* internal URLs */
+#define STR_LYNXCFG          "LYNXCFG:"
+#define LEN_LYNXCFG          8
+#define isLYNXCFG(addr)      !strncasecomp(addr, STR_LYNXCFG, LEN_LYNXCFG)
+
+#define STR_LYNXCFLAGS       "LYNXCOMPILEOPTS:"
+#define LEN_LYNXCFLAGS       16
+#define isLYNXCFLAGS(addr)   !strncasecomp(addr, STR_LYNXCFLAGS, LEN_LYNXCFLAGS)
+
+#define STR_LYNXCGI          "lynxcgi:"
+#define LEN_LYNXCGI          8
+#define isLYNXCGI(addr)      ((*addr == 'l' || *addr == 'L') &&\
+                             !strncasecomp(addr, STR_LYNXCGI, LEN_LYNXCGI))
+
+#define STR_LYNXCOOKIE       "LYNXCOOKIE:"
+#define LEN_LYNXCOOKIE       11
+#define isLYNXCOOKIE(addr)   !strncasecomp(addr, STR_LYNXCOOKIE, LEN_LYNXCOOKIE)
+
+#define STR_LYNXDIRED        "LYNXDIRED:"
+#define LEN_LYNXDIRED        10
+#define isLYNXDIRED(addr)    !strncasecomp(addr, STR_LYNXDIRED, LEN_LYNXDIRED)
+
+#define STR_LYNXEXEC         "lynxexec:"
+#define LEN_LYNXEXEC         9
+#define isLYNXEXEC(addr)     ((*addr == 'l' || *addr == 'L') &&\
+                             !strncasecomp(addr, STR_LYNXEXEC, LEN_LYNXEXEC))
+
+#define STR_LYNXDOWNLOAD     "LYNXDOWNLOAD:"
+#define LEN_LYNXDOWNLOAD     13
+#define isLYNXDOWNLOAD(addr) !strncasecomp(addr, STR_LYNXDOWNLOAD, LEN_LYNXDOWNLOAD)
+
+#define STR_LYNXHIST         "LYNXHIST:"
+#define LEN_LYNXHIST         9
+#define isLYNXHIST(addr)     !strncasecomp(addr, STR_LYNXHIST, LEN_LYNXHIST)
+
+#define STR_LYNXKEYMAP       "LYNXKEYMAP:"
+#define LEN_LYNXKEYMAP       11
+#define isLYNXKEYMAP(addr)   !strncasecomp(addr, STR_LYNXKEYMAP, LEN_LYNXKEYMAP)
+
+#define STR_LYNXIMGMAP       "LYNXIMGMAP:"
+#define LEN_LYNXIMGMAP       11
+#define isLYNXIMGMAP(addr)   !strncasecomp(addr, STR_LYNXIMGMAP, LEN_LYNXIMGMAP)
+
+#define STR_LYNXMESSAGES     "LYNXMESSAGES:"
+#define LEN_LYNXMESSAGES     13
+#define isLYNXMESSAGES(addr) !strncasecomp(addr, STR_LYNXMESSAGES, LEN_LYNXMESSAGES)
+
+#define STR_LYNXOPTIONS      "LYNXOPTIONS:"
+#define LEN_LYNXOPTIONS      12
+#define isLYNXOPTIONS(addr)  !strncasecomp(addr, STR_LYNXOPTIONS, LEN_LYNXOPTIONS)
+
+#define STR_LYNXPRINT        "LYNXPRINT:"
+#define LEN_LYNXPRINT        10
+#define isLYNXPRINT(addr)    !strncasecomp(addr, STR_LYNXPRINT, LEN_LYNXPRINT)
+
+#define STR_LYNXPROG         "lynxprog:"
+#define LEN_LYNXPROG         9
+#define isLYNXPROG(addr)     ((*addr == 'l' || *addr == 'L') &&\
+                             !strncasecomp(addr, STR_LYNXPROG, LEN_LYNXPROG))
+
 /*
  *  For change_sug_filename().
  */
@@ -278,11 +468,7 @@ extern HTList *sug_filenames;
  * syslog() facility
  */
 #if !defined(VMS) && defined(SYSLOG_REQUESTED_URLS)
-#ifdef WATT32
-#include <sys/syslog.h>
-#else
 #include <syslog.h>
-#endif
 
 extern void LYOpenlog  PARAMS((CONST char *banner));
 extern void LYSyslog   PARAMS((char *arg));
@@ -301,7 +487,7 @@ extern void LYCloselog NOPARAMS;
 #define HIDE_CHMOD 0600
 #define HIDE_UMASK 0077
 
-#if defined(DOSPATH) || defined(WIN_EX) || defined(__CYGWIN__)
+#if defined(DOSPATH) || defined(__CYGWIN__)
 #define TXT_R	"rt"
 #define TXT_W	"wt"
 #define TXT_A	"at+"
diff --git a/gnu/usr.bin/lynx/src/LYexit.c b/gnu/usr.bin/lynx/src/LYexit.c
index fbc1316099f..87071ffcb54 100644
--- a/gnu/usr.bin/lynx/src/LYexit.c
+++ b/gnu/usr.bin/lynx/src/LYexit.c
@@ -78,7 +78,7 @@ PRIVATE void LYCompleteExit NOPARAMS
 }
 
 /*
- *  Purpose:		Terminates program.
+ *  Purpose:		Terminates program, reports memory not freed.
  *  Arguments:		status	Exit code.
  *  Return Value:	void
  *  Remarks/Portability/Dependencies/Restrictions:
@@ -140,14 +140,18 @@ PUBLIC void LYexit ARGS1(
 #endif /* !VMS */
 
     /*
-     *	Do functions registered with LYatexit. - GAB
+     * Close syslog before doing atexit-cleanup, since it may use a string
+     * that would be freed there.
      */
-    LYCompleteExit();
-
 #if !defined(VMS) && defined(SYSLOG_REQUESTED_URLS)
     LYCloselog();
 #endif /* !VMS && SYSLOG_REQUESTED_URLS */
 
+    /*
+     *	Do functions registered with LYatexit. - GAB
+     */
+    LYCompleteExit();
+
     LYCloseCmdLogfile();
 
 #ifdef exit
@@ -166,6 +170,7 @@ PUBLIC void LYexit ARGS1(
     }
     LYCloseTracelog();
 #endif /* !VMS */
+    show_alloc();
     exit(status);
 }
 
diff --git a/gnu/usr.bin/lynx/src/LYrcFile.c b/gnu/usr.bin/lynx/src/LYrcFile.c
index 710689299ec..fca9852cbf9 100644
--- a/gnu/usr.bin/lynx/src/LYrcFile.c
+++ b/gnu/usr.bin/lynx/src/LYrcFile.c
@@ -8,6 +8,7 @@
 #include <LYBookmark.h>
 #include <LYCookie.h>
 #include <LYKeymap.h>
+#include <HTMLDTD.h>
 
 #include <LYLeaks.h>
 
@@ -18,10 +19,11 @@
 #endif /* FNAMES_8_3 */
 
 #define MSG_ENABLE_LYNXRC N_("Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n")
-#define NonNull(string) ((string) != 0 ? (string) : "")
 #define putBool(value) ((value) ? "on" : "off")
 
 PUBLIC Config_Enum tbl_DTD_recovery[] = {
+    { "true",		TRUE },
+    { "false",		FALSE },
     { "on",		TRUE },
     { "off",		FALSE },
     { "sortasgml",	TRUE },
@@ -32,11 +34,25 @@ PUBLIC Config_Enum tbl_DTD_recovery[] = {
 #ifdef DIRED_SUPPORT
 PRIVATE Config_Enum tbl_dir_list_style[] = {
     { "FILES_FIRST",	FILES_FIRST },
-    { "DIRECTORIES_FIRST", 0 },
+    { "DIRECTORIES_FIRST", DIRS_FIRST },
     { "MIXED_STYLE",	MIXED_STYLE },
     { NULL,		MIXED_STYLE },
 };
+#ifdef LONG_LIST
+PRIVATE Config_Enum tbl_dir_list_order[] = {
+    { "ORDER_BY_NAME",	ORDER_BY_NAME },
+    { "ORDER_BY_TYPE",	ORDER_BY_TYPE },
+    { "ORDER_BY_SIZE",  ORDER_BY_SIZE },
+    { "ORDER_BY_DATE",	ORDER_BY_DATE },
+    { "ORDER_BY_MODE",	ORDER_BY_MODE },
+#ifndef NO_GROUPS
+    { "ORDER_BY_USER",	ORDER_BY_USER },
+    { "ORDER_BY_GROUP",	ORDER_BY_GROUP },
 #endif
+    { NULL,		ORDER_BY_NAME },
+};
+#endif /* LONG_LIST */
+#endif /* DIRED_SUPPORT */
 
 PRIVATE Config_Enum tbl_file_sort[] = {
     { "BY_FILENAME",	FILE_BY_NAME },
@@ -47,9 +63,12 @@ PRIVATE Config_Enum tbl_file_sort[] = {
 };
 
 PUBLIC Config_Enum tbl_keypad_mode[] = {
+    { "FIELDS_ARE_NUMBERED", FIELDS_ARE_NUMBERED },
     { "LINKS_AND_FIELDS_ARE_NUMBERED", LINKS_AND_FIELDS_ARE_NUMBERED },
-    { "LINKS_AND_FORM_FIELDS_ARE_NUMBERED", LINKS_AND_FIELDS_ARE_NUMBERED },
     { "LINKS_ARE_NUMBERED", LINKS_ARE_NUMBERED },
+    { "LINKS_ARE_NOT_NUMBERED", NUMBERS_AS_ARROWS },
+    /* obsolete variations: */
+    { "LINKS_AND_FORM_FIELDS_ARE_NUMBERED", LINKS_AND_FIELDS_ARE_NUMBERED },
     { "NUMBERS_AS_ARROWS", NUMBERS_AS_ARROWS },
     { NULL,		DEFAULT_KEYPAD_MODE }
 };
@@ -79,7 +98,7 @@ PUBLIC Config_Enum tbl_transfer_rate[] = {
     { "TRUE",		rateKB },
     { "BYTES",		rateBYTES },
     { "FALSE",		rateBYTES },
-#ifdef EXP_READPROGRESS
+#ifdef USE_READPROGRESS
     { "KB,ETA",		rateEtaKB },
     { "BYTES,ETA",	rateEtaBYTES },
 #endif
@@ -102,12 +121,19 @@ PRIVATE Config_Enum tbl_visited_links[] = {
     { NULL,		DEFAULT_VISITED_LINKS }
 };
 
+PUBLIC Config_Enum tbl_force_prompt[] = {
+    { "prompt",		FORCE_PROMPT_DFT	},
+    { "yes",		FORCE_PROMPT_YES	},
+    { "no",		FORCE_PROMPT_NO		},
+    { NULL,		-1			}
+};
+
 PRIVATE BOOL getBool ARGS1(char *, src)
 {
     return (BOOL) (!strncasecomp(src, "on", 2) || !strncasecomp(src, "true", 4));
 }
 
-PRIVATE CONST char *LYputEnum ARGS2(
+PUBLIC CONST char *LYputEnum ARGS2(
     Config_Enum *,	table,
     int,		value)
 {
@@ -120,21 +146,33 @@ PRIVATE CONST char *LYputEnum ARGS2(
     return "?";
 }
 
-PRIVATE BOOL LYgetEnum ARGS3(
+PUBLIC BOOL LYgetEnum ARGS3(
     Config_Enum *,	table,
-    char *,		src,
-    int *,		value)
+    char *,		name,
+    int *,		result)
 {
-    while (table->name != 0) {
-	if (!strncasecomp(table->name, src, strlen(table->name))) {
-	    *value = table->value;
+    Config_Enum *found = 0;
+    unsigned len = strlen(name);
+    int match = 0;
+
+    if (len != 0) {
+	while (table->name != 0) {
+	    if (!strncasecomp(table->name, name, len)) {
+		found = table;
+		if (!strcasecomp(table->name, name)) {
+		    match = 1;
+		    break;
+		}
+		++match;
+	    }
+	    table++;
+	}
+	if (match == 1) {	/* if unambiguous */
+	    *result = found->value;
 	    return TRUE;
 	}
-	table++;
     }
-    if (table->value >= 0) 	/* is there a default? */
-	*value = table->value;
-    return FALSE;
+    return FALSE;		/* no match */
 }
 
 /* these are for data that are normally not read/written from .lynxrc */
@@ -172,7 +210,7 @@ typedef enum {
 typedef struct config_type
 {
     CONST char *name;
-    int enabled;		/* see lynx.cfg ENABLE_LYNXRC */
+    int enabled;		/* see lynx.cfg ENABLE_LYNXRC "off" lines */
     Conf_Types type;
     ParseData;
     char **strings;
@@ -234,49 +272,64 @@ PRIVATE void put_editor ARGS2(FILE *, fp, struct config_type *, tbl)
     fprintf(fp, "%s=%s\n\n", tbl->name, NonNull(editor));
 }
 
+PUBLIC int get_tagsoup ARGS1(char *, value)
+{
+    int found = Old_DTD;
+
+    if (LYgetEnum(tbl_DTD_recovery, value, &found)
+     && Old_DTD != found) {
+	Old_DTD = found;
+	HTSwitchDTD(!Old_DTD);
+    }
+    return 0;
+}
+
+PRIVATE void put_tagsoup ARGS2(FILE *, fp, struct config_type *, tbl)
+{
+    fprintf(fp, "%s=%s\n\n", tbl->name, LYputEnum(tbl_DTD_recovery, Old_DTD));
+}
+
 /* This table is searched ignoring case */
 static Config_Type Config_Table [] =
 {
-    MAYBE_ENU("DTD_recovery",          Old_DTD,            tbl_DTD_recovery,
-              MSG_ENABLE_LYNXRC),
-    PARSE_SET("accept_all_cookies",    LYAcceptAllCookies, N_("\
+    PARSE_SET(RC_ACCEPT_ALL_COOKIES,    LYAcceptAllCookies, N_("\
 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\
 ")),
-    MAYBE_FUN("assume_char_set",       get_assume_charset, put_assume_charset, MSG_ENABLE_LYNXRC),
-    PARSE_STR("bookmark_file",         bookmark_page,     N_("\
+    MAYBE_FUN(RC_ASSUME_CHARSET,        get_assume_charset, put_assume_charset, MSG_ENABLE_LYNXRC),
+    PARSE_STR(RC_BOOKMARK_FILE,         bookmark_page,     N_("\
 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\
 ")),
-    PARSE_SET("case_sensitive_searching", case_sensitive, N_("\
+    PARSE_SET(RC_CASE_SENSITIVE_SEARCHING, case_sensitive, N_("\
 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\
 ")),
-    PARSE_FUN("character_set",         get_display_charset, put_display_charset, N_("\
+    PARSE_FUN(RC_CHARACTER_SET,         get_display_charset, put_display_charset, N_("\
 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\
 ")),
-    PARSE_LIS("cookie_accept_domains", LYCookieAcceptDomains, N_("\
+    PARSE_LIS(RC_COOKIE_ACCEPT_DOMAINS, LYCookieAcceptDomains, N_("\
 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\
 ")),
-#ifdef EXP_PERSISTENT_COOKIES
-    PARSE_STR("cookie_file",	       LYCookieFile, N_("\
+#ifdef USE_PERSISTENT_COOKIES
+    PARSE_STR(RC_COOKIE_FILE,	        LYCookieFile, N_("\
 cookie_file specifies the file from which to read persistent cookies.\n\
 The default is ~/.lynx_cookies.\n\
 ")),
 #endif
-    PARSE_STR("cookie_loose_invalid_domains", LYCookieLooseCheckDomains, N_("\
+    PARSE_STR(RC_COOKIE_LOOSE_INVALID_DOMAINS, LYCookieLooseCheckDomains, N_("\
 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\
@@ -285,31 +338,37 @@ 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\
 ")),
-    PARSE_STR("cookie_query_invalid_domains", LYCookieQueryCheckDomains, NULL),
-    PARSE_LIS("cookie_reject_domains", LYCookieRejectDomains, NULL),
-    PARSE_STR("cookie_strict_invalid_domains", LYCookieStrictCheckDomains, NULL),
+    PARSE_STR(RC_COOKIE_QUERY_INVALID_DOMAINS, LYCookieQueryCheckDomains, NULL),
+    PARSE_LIS(RC_COOKIE_REJECT_DOMAINS, LYCookieRejectDomains, NULL),
+    PARSE_STR(RC_COOKIE_STRICT_INVALID_DOMAIN, LYCookieStrictCheckDomains, NULL),
 #ifdef DIRED_SUPPORT
-    PARSE_ENU("dir_list_style",        dir_list_style,     tbl_dir_list_style, N_("\
+#ifdef LONG_LIST
+    PARSE_ENU(RC_DIR_LIST_ORDER,        dir_list_order,     tbl_dir_list_order, N_("\
+dir_list_order specifies the directory list order under DIRED_SUPPORT\n\
+(if implemented).  The default is \"ORDER_BY_NAME\"\n\
+")),
+#endif
+    PARSE_ENU(RC_DIR_LIST_STYLE,        dir_list_style,     tbl_dir_list_style, N_("\
 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\
 ")),
 #endif
-    MAYBE_STR("display",               x_display,          MSG_ENABLE_LYNXRC),
-    PARSE_SET("emacs_keys",            emacs_keys, N_("\
+    MAYBE_STR(RC_DISPLAY,               x_display,          MSG_ENABLE_LYNXRC),
+    PARSE_SET(RC_EMACS_KEYS,            emacs_keys, N_("\
 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\
 ")),
-    PARSE_FUN("file_editor",           get_editor,         put_editor, N_("\
+    PARSE_FUN(RC_FILE_EDITOR,           get_editor,         put_editor, N_("\
 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\
 ")),
-    PARSE_ENU("file_sorting_method",   HTfileSortMethod,   tbl_file_sort, N_("\
+    PARSE_ENU(RC_FILE_SORTING_METHOD,   HTfileSortMethod,   tbl_file_sort, N_("\
 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\
@@ -317,11 +376,17 @@ file lists such as FTP directories.  The options are:\n\
    BY_SIZE     -- sorts on the size of the file\n\
    BY_DATE     -- sorts on the date of the file\n\
 ")),
+    MAYBE_ENU(RC_FORCE_COOKIE_PROMPT,   cookie_noprompt,    tbl_force_prompt,
+	      MSG_ENABLE_LYNXRC),
+#ifdef USE_SSL
+    MAYBE_ENU(RC_FORCE_SSL_PROMPT,      ssl_noprompt,       tbl_force_prompt,
+	      MSG_ENABLE_LYNXRC),
+#endif
 #ifdef EXP_KEYBOARD_LAYOUT
-    PARSE_ARY("kblayout",              current_layout,     LYKbLayoutNames, NULL),
+    PARSE_ARY(RC_KBLAYOUT,              current_layout,     LYKbLayoutNames, NULL),
 #endif
-    PARSE_ENU("keypad_mode",           keypad_mode,        tbl_keypad_mode, NULL),
-    PARSE_ARY("lineedit_mode",         current_lineedit,   LYLineeditNames, N_("\
+    PARSE_ENU(RC_KEYPAD_MODE,           keypad_mode,        tbl_keypad_mode, NULL),
+    PARSE_ARY(RC_LINEEDIT_MODE,         current_lineedit,   LYLineeditNames, N_("\
 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\
@@ -334,15 +399,18 @@ the following control characters are used for moving and deleting:\n\
 \n\
 Current lineedit modes are:\n\
 ")),
-    MAYBE_SET("make_pseudo_alts_for_inlines", pseudo_inline_alts, MSG_ENABLE_LYNXRC),
-    MAYBE_SET("make_links_for_all_images", clickable_images, MSG_ENABLE_LYNXRC),
-    PARSE_MBM("multi_bookmark", N_("\
+#ifdef EXP_LOCALE_CHARSET
+    MAYBE_SET(RC_LOCALE_CHARSET,      LYLocaleCharset,        MSG_ENABLE_LYNXRC),
+#endif
+    MAYBE_SET(RC_MAKE_PSEUDO_ALTS_FOR_INLINES, pseudo_inline_alts, MSG_ENABLE_LYNXRC),
+    MAYBE_SET(RC_MAKE_LINKS_FOR_ALL_IMAGES, clickable_images, MSG_ENABLE_LYNXRC),
+    PARSE_MBM(RC_MULTI_BOOKMARK, N_("\
 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\
 ")),
-    PARSE_STR("personal_mail_address", personal_mail_address, N_("\
+    PARSE_STR(RC_PERSONAL_MAIL_ADDRESS, personal_mail_address, N_("\
 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\
@@ -351,7 +419,7 @@ 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\
 ")),
-    PARSE_STR("preferred_charset",     pref_charset, N_("\
+    PARSE_STR(RC_PREFERRED_CHARSET,     pref_charset, N_("\
 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\
@@ -365,16 +433,16 @@ 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\
 ")),
-    PARSE_STR("preferred_language",    language, N_("\
+    PARSE_STR(RC_PREFERRED_LANGUAGE,    language, N_("\
 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 it's default language.\n\
+Otherwise, the server will send the file in its default language.\n\
 ")),
-    MAYBE_SET("raw_mode",              LYRawMode,          MSG_ENABLE_LYNXRC),
+    MAYBE_SET(RC_RAW_MODE,              LYRawMode,          MSG_ENABLE_LYNXRC),
 #if defined(ENABLE_OPTS_CHANGE_EXEC) && (defined(EXEC_LINKS) || defined(EXEC_SCRIPTS))
-    PARSE_SET("run_all_execution_links", local_exec, N_("\
+    PARSE_SET(RC_RUN_ALL_EXECUTION_LINKS, local_exec, N_("\
 If run_all_execution_links is set \"on\" then all local execution links\n\
 will be executed when they are selected.\n\
 \n\
@@ -385,7 +453,7 @@ WARNING - This is potentially VERY dangerous.  Since you may view\n\
           or compromise security.  This should only be set to \"on\" if\n\
           you are viewing trusted source information.\n\
 ")),
-    PARSE_SET("run_execution_links_on_local_files", local_exec_on_local_files, N_("\
+    PARSE_SET(RC_RUN_EXECUTION_LINKS_LOCAL, local_exec_on_local_files, N_("\
 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\
@@ -400,7 +468,10 @@ WARNING - This is potentially dangerous.  Since you may view\n\
           you are viewing trusted source information.\n\
 ")),
 #endif
-    PARSE_SET("select_popups",         LYSelectPopups, N_("\
+#ifdef USE_SCROLLBAR
+    MAYBE_SET(RC_SCROLLBAR,             LYShowScrollbar, MSG_ENABLE_LYNXRC),
+#endif
+    PARSE_SET(RC_SELECT_POPUPS,         LYSelectPopups, N_("\
 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\
@@ -409,8 +480,8 @@ 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\
 ")),
-    MAYBE_SET("set_cookies",           LYSetCookies,      MSG_ENABLE_LYNXRC),
-    PARSE_ENU("show_color",            LYrcShowColor,     tbl_show_colors, N_("\
+    MAYBE_SET(RC_SET_COOKIES,           LYSetCookies,      MSG_ENABLE_LYNXRC),
+    PARSE_ENU(RC_SHOW_COLOR,            LYrcShowColor,     tbl_show_colors, N_("\
 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\
@@ -427,7 +498,7 @@ 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\
 ")),
-    PARSE_SET("show_cursor",           LYShowCursor, N_("\
+    PARSE_SET(RC_SHOW_CURSOR,           LYShowCursor, N_("\
 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\
@@ -438,18 +509,18 @@ 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\
 ")),
-    PARSE_SET("show_dotfiles",         show_dotfiles, N_("\
+    PARSE_SET(RC_SHOW_DOTFILES,         show_dotfiles, N_("\
 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\
 ")),
-#ifdef EXP_READPROGRESS
-    MAYBE_ENU("show_rate",             LYTransferRate,    tbl_transfer_rate,
+#ifdef USE_READPROGRESS
+    MAYBE_ENU(RC_SHOW_KB_RATE,          LYTransferRate,    tbl_transfer_rate,
 	      MSG_ENABLE_LYNXRC),
 #endif
-    PARSE_ENU("sub_bookmarks",         LYMultiBookmarks,  tbl_multi_bookmarks, N_("\
+    PARSE_ENU(RC_SUB_BOOKMARKS,         LYMultiBookmarks,  tbl_multi_bookmarks, N_("\
 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\
@@ -460,8 +531,10 @@ 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\
 ")),
-    MAYBE_STR("user_agent",            LYUserAgent,        MSG_ENABLE_LYNXRC),
-    PARSE_ENU("user_mode",             user_mode,          tbl_user_mode, N_("\
+    MAYBE_FUN(RC_TAGSOUP,               get_tagsoup,        put_tagsoup,
+              MSG_ENABLE_LYNXRC),
+    MAYBE_SET(RC_UNDERLINE_LINKS,       LYUnderlineLinks,   MSG_ENABLE_LYNXRC),
+    PARSE_ENU(RC_USER_MODE,             user_mode,          tbl_user_mode, N_("\
 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\
@@ -469,12 +542,13 @@ 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\
 ")),
-    PARSE_SET("verbose_images",        verbose_img, N_("\
+    MAYBE_STR(RC_USERAGENT,             LYUserAgent,        MSG_ENABLE_LYNXRC),
+    PARSE_SET(RC_VERBOSE_IMAGES,        verbose_img, N_("\
 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\
 ")),
-    PARSE_SET("vi_keys",               vi_keys, N_("\
+    PARSE_SET(RC_VI_KEYS,               vi_keys, N_("\
 If vi_keys is set to \"on\", then the normal VI movement keys:\n\
   j = down    k = up\n\
   h = left    l = right\n\
@@ -482,7 +556,7 @@ 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\
 ")),
-    PARSE_ENU("visited_links",         Visited_Links_As,   tbl_visited_links, N_("\
+    PARSE_ENU(RC_VISITED_LINKS,         Visited_Links_As,   tbl_visited_links, N_("\
 The visited_links setting controls how Lynx organizes the information\n\
 in the Visited Links Page.\n\
 ")),
@@ -530,6 +604,9 @@ PUBLIC void read_rc ARGS1(FILE *, fp)
 	if ((fp = fopen(rcfile, TXT_R)) == NULL) {
 	    return;
 	}
+	CTRACE((tfp, "read_rc opened %s\n", rcfile));
+    } else {
+	CTRACE((tfp, "read_rc used passed-in stream\n"));
     }
 
     /*
@@ -551,20 +628,26 @@ PUBLIC void read_rc ARGS1(FILE *, fp)
 	/*
 	 * Parse the "name=value" strings.
 	 */
-	if ((value = strchr(name, '=')) == 0)
+	if ((value = strchr(name, '=')) == 0) {
+	    CTRACE((tfp, "LYrcFile: missing '=' %s\n", name));
 	    continue;
+	}
 	*value++ = '\0';
 	LYTrimTrailing(name);
 	value = LYSkipBlanks(value);
+	CTRACE2(TRACE_CFG, (tfp, "LYrcFile %s:%s\n", name, value));
+
 	tbl = lookup_config(name);
 	if (tbl->name == 0) {
-	    char *special = "multi_bookmark";
+	    char *special = RC_MULTI_BOOKMARK;
 	    if (!strncasecomp(name, special, strlen(special))) {
 		tbl = lookup_config(special);
 	    }
 	    /* lynx ignores unknown keywords */
-	    if (tbl->name == 0)
+	    if (tbl->name == 0) {
+		CTRACE((tfp, "LYrcFile: ignored %s=%s\n", name, value));
 		continue;
+	    }
 	}
 
 	q = ParseUnionOf(tbl);
diff --git a/gnu/usr.bin/lynx/src/LYrcFile.h b/gnu/usr.bin/lynx/src/LYrcFile.h
index 63e88d075dd..a60e5f40670 100644
--- a/gnu/usr.bin/lynx/src/LYrcFile.h
+++ b/gnu/usr.bin/lynx/src/LYrcFile.h
@@ -5,14 +5,246 @@
 #include <LYStructs.h>
 #endif /* LYSTRUCTS_H */
 
+/* configuration-variable names to share with LYReadCFG.c and LYOptions.c */
+#define RC_ACCEPT_ALL_COOKIES           "accept_all_cookies"
+#define RC_ALERTSECS                    "alertsecs"
+#define RC_ALWAYS_RESUBMIT_POSTS        "always_resubmit_posts"
+#define RC_ALWAYS_TRUSTED_EXEC          "always_trusted_exec"
+#define RC_ASSUMED_COLOR                "assumed_color"
+#define RC_ASSUMED_DOC_CHARSET_CHOICE   "assumed_doc_charset_choice"
+#define RC_ASSUME_CHARSET               "assume_charset"
+#define RC_ASSUME_LOCAL_CHARSET         "assume_local_charset"
+#define RC_ASSUME_UNREC_CHARSET         "assume_unrec_charset"
+#define RC_AUTO_UNCACHE_DIRLISTS        "auto_uncache_dirlists"
+#define RC_BIBP_BIBHOST                 "bibp_bibhost"
+#define RC_BIBP_GLOBALSERVER            "bibp_globalserver"
+#define RC_BLOCK_MULTI_BOOKMARKS        "block_multi_bookmarks"
+#define RC_BOLD_H1                      "bold_h1"
+#define RC_BOLD_HEADERS                 "bold_headers"
+#define RC_BOLD_NAME_ANCHORS            "bold_name_anchors"
+#define RC_BOOKMARK_FILE                "bookmark_file"
+#define RC_BZIP2_PATH                   "bzip2_path"
+#define RC_CASE_SENSITIVE_ALWAYS_ON     "case_sensitive_always_on"
+#define RC_CASE_SENSITIVE_SEARCHING     "case_sensitive_searching"
+#define RC_CHARACTER_SET                "character_set"
+#define RC_CHARSETS_DIRECTORY           "charsets_directory"
+#define RC_CHARSET_SWITCH_RULES         "charset_switch_rules"
+#define RC_CHECKMAIL                    "checkmail"
+#define RC_CHMOD_PATH                   "chmod_path"
+#define RC_COLLAPSE_BR_TAGS             "collapse_br_tags"
+#define RC_COLOR                        "color"
+#define RC_COMPRESS_PATH                "compress_path"
+#define RC_CONNECT_TIMEOUT              "connect_timeout"
+#define RC_COOKIE_ACCEPT_DOMAINS        "cookie_accept_domains"
+#define RC_COOKIE_FILE                  "cookie_file"
+#define RC_COOKIE_LOOSE_INVALID_DOMAINS "cookie_loose_invalid_domains"
+#define RC_COOKIE_QUERY_INVALID_DOMAINS "cookie_query_invalid_domains"
+#define RC_COOKIE_REJECT_DOMAINS        "cookie_reject_domains"
+#define RC_COOKIE_SAVE_FILE             "cookie_save_file"
+#define RC_COOKIE_STRICT_INVALID_DOMAIN "cookie_strict_invalid_domains"
+#define RC_COPY_PATH                    "copy_path"
+#define RC_CSO_PROXY                    "cso_proxy"
+#define RC_CSWING_PATH                  "cswing_path"
+#define RC_DEFAULT_BOOKMARK_FILE        "default_bookmark_file"
+#define RC_DEFAULT_CACHE_SIZE           "default_cache_size"
+#define RC_DEFAULT_EDITOR               "default_editor"
+#define RC_DEFAULT_INDEX_FILE           "default_index_file"
+#define RC_DEFAULT_KEYPAD_MODE          "default_keypad_mode"
+#define RC_DEFAULT_KEYPAD_MODE_NUMARO   "default_keypad_mode_is_numbers_as_arrows"
+#define RC_DEFAULT_USER_MODE            "default_user_mode"
+#define RC_DEFAULT_VIRTUAL_MEMORY_SIZE  "default_virtual_memory_size"
+#define RC_DEFINE RC_XLOADIMAGE_COMMAND "XLOADIMAGE_COMMAND"
+#define RC_DELAYSECS                    "delaysecs"
+#define RC_DIRED_MENU                   "dired_menu"
+#define RC_DIR_LIST_ORDER               "dir_list_order"
+#define RC_DIR_LIST_STYLE               "dir_list_style"
+#define RC_DISPLAY                      "display"
+#define RC_DISPLAY_CHARSET_CHOICE       "display_charset_choice"
+#define RC_DOWNLOADER                   "downloader"
+#define RC_EMACS_KEYS                   "emacs_keys"
+#define RC_EMACS_KEYS_ALWAYS_ON         "emacs_keys_always_on"
+#define RC_ENABLE_LYNXRC                "enable_lynxrc"
+#define RC_ENABLE_SCROLLBACK            "enable_scrollback"
+#define RC_EXTERNAL                     "external"
+#define RC_FILE_EDITOR                  "file_editor"
+#define RC_FILE_SORTING_METHOD          "file_sorting_method"
+#define RC_FINGER_PROXY                 "finger_proxy"
+#define RC_FOCUS_WINDOW                 "focus_window"
+#define RC_FORCE_8BIT_TOUPPER           "force_8bit_toupper"
+#define RC_FORCE_COOKIE_PROMPT          "force_cookie_prompt"
+#define RC_FORCE_EMPTY_HREFLESS_A       "force_empty_hrefless_a"
+#define RC_FORCE_SSL_COOKIES_SECURE     "force_ssl_cookies_secure"
+#define RC_FORCE_SSL_PROMPT             "force_ssl_prompt"
+#define RC_FORMS_OPTIONS                "forms_options"
+#define RC_FTP_PASSIVE                  "ftp_passive"
+#define RC_FTP_PROXY                    "ftp_proxy"
+#define RC_GLOBAL_EXTENSION_MAP         "global_extension_map"
+#define RC_GLOBAL_MAILCAP               "global_mailcap"
+#define RC_GOPHER_PROXY                 "gopher_proxy"
+#define RC_GOTOBUFFER                   "gotobuffer"
+#define RC_GZIP_PATH                    "gzip_path"
+#define RC_HELPFILE                     "helpfile"
+#define RC_HIDDEN_LINK_MARKER           "hidden_link_marker"
+#define RC_HISTORICAL_COMMENTS          "historical_comments"
+#define RC_HTMLSRC_ATTRNAME_XFORM       "htmlsrc_attrname_xform"
+#define RC_HTMLSRC_TAGNAME_XFORM        "htmlsrc_tagname_xform"
+#define RC_HTTPS_PROXY                  "https_proxy"
+#define RC_HTTP_PROXY                   "http_proxy"
+#define RC_INCLUDE                      "include"
+#define RC_INFOSECS                     "infosecs"
+#define RC_INSTALL_PATH                 "install_path"
+#define RC_JUMPBUFFER                   "jumpbuffer"
+#define RC_JUMPFILE                     "jumpfile"
+#define RC_JUMP_PROMPT                  "jump_prompt"
+#define RC_JUSTIFY                      "justify"
+#define RC_JUSTIFY_MAX_VOID_PERCENT     "justify_max_void_percent"
+#define RC_KBLAYOUT                     "kblayout"
+#define RC_KEYBOARD_LAYOUT              "keyboard_layout"
+#define RC_KEYMAP                       "keymap"
+#define RC_KEYPAD_MODE                  "keypad_mode"
+#define RC_LEFTARROW_IN_TEXTFLD_PROMPT  "leftarrow_in_textfield_prompt"
+#define RC_LINEEDIT_MODE                "lineedit_mode"
+#define RC_LIST_FORMAT                  "list_format"
+#define RC_LIST_NEWS_DATES              "list_news_dates"
+#define RC_LIST_NEWS_NUMBERS            "list_news_numbers"
+#define RC_LOCALE_CHARSET               "locale_charset"
+#define RC_LOCALHOST_ALIAS              "localhost_alias"
+#define RC_LOCAL_DOMAIN                 "local_domain"
+#define RC_LOCAL_EXECUTION_LINKS_ALWAYS "local_execution_links_always_on"
+#define RC_LOCAL_EXECUTION_LINKS_LOCAL  "local_execution_links_on_but_not_remote"
+#define RC_LYNXCGI_DOCUMENT_ROOT        "lynxcgi_document_root"
+#define RC_LYNXCGI_ENVIRONMENT          "lynxcgi_environment"
+#define RC_LYNX_HOST_NAME               "lynx_host_name"
+#define RC_LYNX_SIG_FILE                "lynx_sig_file"
+#define RC_MAIL_ADRS                    "mail_adrs"
+#define RC_MAIL_SYSTEM_ERROR_LOGGING    "mail_system_error_logging"
+#define RC_MAKE_LINKS_FOR_ALL_IMAGES    "make_links_for_all_images"
+#define RC_MAKE_PSEUDO_ALTS_FOR_INLINES "make_pseudo_alts_for_inlines"
+#define RC_MESSAGESECS                  "messagesecs"
+#define RC_MINIMAL_COMMENTS             "minimal_comments"
+#define RC_MKDIR_PATH                   "mkdir_path"
+#define RC_MULTI_BOOKMARK               "multi_bookmark"
+#define RC_MULTI_BOOKMARK_SUPPORT       "multi_bookmark_support"
+#define RC_MV_PATH                      "mv_path"
+#define RC_NCR_IN_BOOKMARKS             "ncr_in_bookmarks"
+#define RC_NEWSPOST_PROXY               "newspost_proxy"
+#define RC_NEWSREPLY_PROXY              "newsreply_proxy"
+#define RC_NEWS_CHUNK_SIZE              "news_chunk_size"
+#define RC_NEWS_MAX_CHUNK               "news_max_chunk"
+#define RC_NEWS_POSTING                 "news_posting"
+#define RC_NEWS_PROXY                   "news_proxy"
+#define RC_NNTPSERVER                   "nntpserver"
+#define RC_NNTP_PROXY                   "nntp_proxy"
+#define RC_NONRESTARTING_SIGWINCH       "nonrestarting_sigwinch"
+#define RC_NO_DOT_FILES                 "no_dot_files"
+#define RC_NO_FILE_REFERER              "no_file_referer"
+#define RC_NO_FORCED_CORE_DUMP          "no_forced_core_dump"
+#define RC_NO_FROM_HEADER               "no_from_header"
+#define RC_NO_ISMAP_IF_USEMAP           "no_ismap_if_usemap"
+#define RC_NO_PROXY                     "no_proxy"
+#define RC_NO_REFERER_HEADER            "no_referer_header"
+#define RC_NO_TABLE_CENTER              "no_table_center"
+#define RC_NUMBER_FIELDS_ON_LEFT        "number_fields_on_left"
+#define RC_NUMBER_LINKS_ON_LEFT         "number_links_on_left"
+#define RC_OUTGOING_MAIL_CHARSET        "outgoing_mail_charset"
+#define RC_PARTIAL                      "partial"
+#define RC_PARTIAL_THRES                "partial_thres"
+#define RC_PERSISTENT_COOKIES           "persistent_cookies"
+#define RC_PERSONAL_EXTENSION_MAP       "personal_extension_map"
+#define RC_PERSONAL_MAILCAP             "personal_mailcap"
+#define RC_PERSONAL_MAIL_ADDRESS        "personal_mail_address"
+#define RC_PREFERRED_CHARSET            "preferred_charset"
+#define RC_PREFERRED_LANGUAGE           "preferred_language"
+#define RC_PREPEND_BASE_TO_SOURCE       "prepend_base_to_source"
+#define RC_PREPEND_CHARSET_TO_SOURCE    "prepend_charset_to_source"
+#define RC_PRETTYSRC                    "prettysrc"
+#define RC_PRETTYSRC_SPEC               "prettysrc_spec"
+#define RC_PRETTYSRC_VIEW_NO_ANCHOR_NUM "prettysrc_view_no_anchor_numbering"
+#define RC_PRINTER                      "printer"
+#define RC_QUIT_DEFAULT_YES             "quit_default_yes"
+#define RC_RAW_MODE                     "raw_mode"
+#define RC_REFERER_WITH_QUERY           "referer_with_query"
+#define RC_REPLAYSECS                   "replaysecs"
+#define RC_REUSE_TEMPFILES              "reuse_tempfiles"
+#define RC_RLOGIN_PATH                  "rlogin_path"
+#define RC_RM_PATH                      "rm_path"
+#define RC_RULE                         "rule"
+#define RC_RULESFILE                    "rulesfile"
+#define RC_RUN_ALL_EXECUTION_LINKS      "run_all_execution_links"
+#define RC_RUN_EXECUTION_LINKS_LOCAL    "run_execution_links_on_local_files"
+#define RC_SAVE_SPACE                   "save_space"
+#define RC_SCAN_FOR_BURIED_NEWS_REFS    "scan_for_buried_news_refs"
+#define RC_SCREEN_SIZE                  "screen_size"
+#define RC_SCROLLBAR                    "scrollbar"
+#define RC_SCROLLBAR_ARROW              "scrollbar_arrow"
+#define RC_SEEK_FRAG_AREA_IN_CUR        "seek_frag_area_in_cur"
+#define RC_SEEK_FRAG_MAP_IN_CUR         "seek_frag_map_in_cur"
+#define RC_SELECT_POPUPS                "select_popups"
+#define RC_SET_COOKIES                  "set_cookies"
+#define RC_SHOW_COLOR                   "show_color"
+#define RC_SHOW_CURSOR                  "show_cursor"
+#define RC_SHOW_DOTFILES                "show_dotfiles"
+#define RC_SHOW_KB_NAME                 "show_kb_name"
+#define RC_SHOW_KB_RATE                 "show_kb_rate"
+#define RC_SNEWSPOST_PROXY              "snewspost_proxy"
+#define RC_SNEWSREPLY_PROXY             "snewsreply_proxy"
+#define RC_SNEWS_PROXY                  "snews_proxy"
+#define RC_SOFT_DQUOTES                 "soft_dquotes"
+#define RC_SOURCE_CACHE                 "source_cache"
+#define RC_SOURCE_CACHE_FOR_ABORTED     "source_cache_for_aborted"
+#define RC_STARTFILE                    "startfile"
+#define RC_STRIP_DOTDOT_URLS            "strip_dotdot_urls"
+#define RC_SUBSTITUTE_UNDERSCORES       "substitute_underscores"
+#define RC_SUB_BOOKMARKS                "sub_bookmarks"
+#define RC_SUFFIX                       "suffix"
+#define RC_SUFFIX_ORDER                 "suffix_order"
+#define RC_SYSTEM_EDITOR                "system_editor"
+#define RC_SYSTEM_MAIL                  "system_mail"
+#define RC_SYSTEM_MAIL_FLAGS            "system_mail_flags"
+#define RC_TAGSOUP                      "tagsoup"
+#define RC_TAR_PATH                     "tar_path"
+#define RC_TELNET_PATH                  "telnet_path"
+#define RC_TEXTFIELDS_NEED_ACTIVATION   "textfields_need_activation"
+#define RC_TIMEOUT                      "timeout"
+#define RC_TN3270_PATH                  "tn3270_path"
+#define RC_TOUCH_PATH                   "touch_path"
+#define RC_TRIM_INPUT_FIELDS            "trim_input_fields"
+#define RC_TRUSTED_EXEC                 "trusted_exec"
+#define RC_TRUSTED_LYNXCGI              "trusted_lynxcgi"
+#define RC_UNCOMPRESS_PATH              "uncompress_path"
+#define RC_UNDERLINE_LINKS              "underline_links"
+#define RC_UNZIP_PATH                   "unzip_path"
+#define RC_UPLOADER                     "uploader"
+#define RC_URL_DOMAIN_PREFIXES          "url_domain_prefixes"
+#define RC_URL_DOMAIN_SUFFIXES          "url_domain_suffixes"
+#define RC_USERAGENT                    "useragent"
+#define RC_USER_MODE                    "user_mode"
+#define RC_USE_FIXED_RECORDS            "use_fixed_records"
+#define RC_USE_MOUSE                    "use_mouse"
+#define RC_USE_SELECT_POPUPS            "use_select_popups"
+#define RC_UUDECODE_PATH                "uudecode_path"
+#define RC_VERBOSE_IMAGES               "verbose_images"
+#define RC_VIEWER                       "viewer"
+#define RC_VISITED_LINKS                "visited_links"
+#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_ZCAT_PATH                    "zcat_path"
+#define RC_ZIP_PATH                     "zip_path"
+
 extern Config_Enum tbl_DTD_recovery[];
+extern Config_Enum tbl_force_prompt[];
 extern Config_Enum tbl_keypad_mode[];
 extern Config_Enum tbl_multi_bookmarks[];
 extern Config_Enum tbl_transfer_rate[];
 extern Config_Enum tbl_user_mode[];
 
+extern BOOL LYgetEnum PARAMS((Config_Enum * table, char * name, int * result));
 extern BOOL will_save_rc PARAMS((char * name));
+extern CONST char *LYputEnum PARAMS((Config_Enum * table, int value));
 extern int enable_lynxrc PARAMS((char * value));
+extern int get_tagsoup PARAMS((char * value));
 extern int save_rc PARAMS((FILE *));
 extern void read_rc PARAMS((FILE *));
 
diff --git a/gnu/usr.bin/lynx/src/UCAuto.c b/gnu/usr.bin/lynx/src/UCAuto.c
index 6a531adfcff..34762e35daf 100644
--- a/gnu/usr.bin/lynx/src/UCAuto.c
+++ b/gnu/usr.bin/lynx/src/UCAuto.c
@@ -507,7 +507,7 @@ PUBLIC int Find_Best_Display_Charset ARGS1 (int, ord)
     }
     /* Here r point to the replacement, s to the end of the replacement. */
     if (s >= r + sizeof(buf)) {
-	HTInfoMsg("Charset name in CHARSET_SWITCH_RULES too long");
+	HTInfoMsg(gettext("Charset name in CHARSET_SWITCH_RULES too long"));
 	return ord;
     }
     strncpy(buf, r, s-r);
@@ -548,7 +548,7 @@ PRIVATE int _Switch_Display_Charset ARGS2 (int, ord, enum switch_display_charset
 	ord = Find_Best_Display_Charset(ord);
 
     /* Ignore sizechange unless the font is loaded */
-    if (ord != font_loaded_for && really == SWITCH_DISPLAY_CHARSET_SIZECHANGE)
+    if (ord != font_loaded_for && really == SWITCH_DISPLAY_CHARSET_RESIZE)
 	return ord;
 
     if (ord == real_charsets[0] || ord == real_charsets[1]) {
diff --git a/gnu/usr.bin/lynx/src/UCAux.c b/gnu/usr.bin/lynx/src/UCAux.c
index 51d0be20219..ceb14615dd3 100644
--- a/gnu/usr.bin/lynx/src/UCAux.c
+++ b/gnu/usr.bin/lynx/src/UCAux.c
@@ -333,10 +333,13 @@ PUBLIC void UCSetBoxChars ARGS5(
     int,	vert_in,
     int,	hori_in)
 {
+#ifndef WIDEC_CURSES
     if (cset >= -1 && LYCharSet_UC[cset].enc == UCT_ENC_UTF8) {
 	*pvert_out = (vert_in ? vert_in : '|');
 	*phori_out = (hori_in ? hori_in : '-');
-    } else {
+    } else
+#endif
+    {
 	*pvert_out = vert_in;
 	*phori_out = hori_in;
     }
diff --git a/gnu/usr.bin/lynx/src/UCdomap.c b/gnu/usr.bin/lynx/src/UCdomap.c
index 4e97d837f29..887ee962cad 100644
--- a/gnu/usr.bin/lynx/src/UCdomap.c
+++ b/gnu/usr.bin/lynx/src/UCdomap.c
@@ -25,6 +25,10 @@
 #include <UCDefs.h>
 #include <LYCharSets.h>
 
+#if defined(EXP_LOCALE_CHARSET) && defined(HAVE_LANGINFO_CODESET)
+#include <langinfo.h>
+#endif
+
 #include <LYLeaks.h>
 
 /*
@@ -69,11 +73,17 @@
 #include <viscii_uni.h>		/* Vietnamese (VISCII)	*/
 #include <cp866u_uni.h>		/* Ukrainian Cyrillic (866) */
 #include <koi8u_uni.h>		/* Ukrainian Cyrillic (koi8-u */
+#include <pt154_uni.h>		/* Cyrillic-Asian (PT154) */
 
 #ifdef CAN_AUTODETECT_DISPLAY_CHARSET
 int auto_display_charset = -1;
 #endif
 
+CONST char *UC_GNsetMIMEnames[4] =
+	{"iso-8859-1", "x-dec-graphics", "cp437", "x-transparent"};
+
+int UC_GNhandles[4] = {-1, -1, -1, -1};
+
 /*
  *  Some of the code below, and some of the comments, are left in for
  *  historical reasons.  Not all those tables below are currently
@@ -643,7 +653,7 @@ PUBLIC int UCLYhndl_for_unrec = -1;
  /* easy to type, will initialize later */
 PUBLIC int LATIN1 = -1;        /* UCGetLYhndl_byMIME("iso-8859-1") */
 PUBLIC int US_ASCII = -1;      /* UCGetLYhndl_byMIME("us-ascii")   */
-PUBLIC int UTF8 = -1;          /* UCGetLYhndl_byMIME("utf-8")      */
+PUBLIC int UTF8_handle = -1;   /* UCGetLYhndl_byMIME("utf-8")      */
 PUBLIC int TRANSPARENT = -1;   /* UCGetLYhndl_byMIME("x-transparent")  */
 
 
@@ -831,6 +841,7 @@ PRIVATE int conv_uni_to_str ARGS4(
 }
 
 PUBLIC int UCInitialized = 0;
+
 /*
  *  [ original comment: - KW ]
  * This is called at sys_setup time, after memory and the console are
@@ -1633,7 +1644,7 @@ PRIVATE CONST char ** UC_setup_LYCharSets_repl ARGS2(
 	s7 = SevenBitApproximations[i];
 	s8 = ISO_Latin1[i];
 	*p = s7;
-	if (s8 && UCH(*s8) >= 160 && strlen(s8) == 1) {
+	if (s8 && UCH(*s8) >= 160 && s8[1] == '\0') {
 	    /*
 	     *	We have an entity that is mapped to
 	     *	one valid eightbit latin1 char.
@@ -2069,6 +2080,7 @@ PUBLIC void UCInit NOARGS
     UC_CHARSET_SETUP_mnemonic;		  /* RFC 1345 Mnemonic	  */
     UC_CHARSET_SETUP_cp866u;		  /* Ukrainian Cyrillic (866) */
     UC_CHARSET_SETUP_koi8_u;		  /* Ukrainian Cyrillic (koi8-u) */
+    UC_CHARSET_SETUP_ptcp154;		  /* Cyrillic-Asian (PT154) */
 
 #ifdef CAN_AUTODETECT_DISPLAY_CHARSET
 #  ifdef __EMX__
@@ -2102,7 +2114,7 @@ PUBLIC void UCInit NOARGS
 /* for coding/performance - easy to type: */
     LATIN1   = UCGetLYhndl_byMIME("iso-8859-1");
     US_ASCII = UCGetLYhndl_byMIME("us-ascii");
-    UTF8     = UCGetLYhndl_byMIME("utf-8");
+    UTF8_handle = UCGetLYhndl_byMIME("utf-8");
     TRANSPARENT = UCGetLYhndl_byMIME("x-transparent");
 }
 
@@ -2121,3 +2133,154 @@ PUBLIC int safeUCGetLYhndl_byMIME ARGS1 (CONST char *, value)
 
     return(i);
 }
+
+#ifdef EXP_LOCALE_CHARSET
+
+#if defined(EXP_LOCALE_CHARSET) && !defined(HAVE_LANGINFO_CODESET)
+/*
+ * This is a quick-and-dirty emulator of the nl_langinfo(CODESET)
+ * function defined in the Single Unix Specification for those systems
+ * (FreeBSD, etc.) that don't have one yet. It behaves as if it had
+ * been called after setlocale(LC_CTYPE, ""), that is it looks at
+ * the locale environment variables.
+ *
+ * http://www.opengroup.org/onlinepubs/7908799/xsh/langinfo.h.html
+ *
+ * Please extend it as needed and suggest improvements to the author.
+ * This emulator will hopefully become redundant soon as
+ * nl_langinfo(CODESET) becomes more widely implemented.
+ *
+ * Since the proposed Li18nux encoding name registry is still not mature,
+ * the output follows the MIME registry where possible:
+ *
+ *   http://www.iana.org/assignments/character-sets
+ *
+ * A possible autoconf test for the availability of nl_langinfo(CODESET)
+ * can be found in
+ *
+ *   http://www.cl.cam.ac.uk/~mgk25/unicode.html#activate
+ *
+ * Markus.Kuhn@cl.cam.ac.uk -- 2002-03-11
+ * Permission to use, copy, modify, and distribute this software
+ * for any purpose and without fee is hereby granted. The author
+ * disclaims all warranties with regard to this software.
+ *
+ * Latest version:
+ *
+ *   http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c
+ */
+
+/*
+#include "langinfo.h"
+*/
+typedef int nl_item;
+#define CODESET 1
+
+#define C_CODESET "US-ASCII"     /* Return this as the encoding of the
+				  * C/POSIX locale. Could as well one day
+				  * become "UTF-8". */
+
+#define digit(x) ((x) >= '0' && (x) <= '9')
+
+static char buf[16];
+
+PRIVATE char *nl_langinfo(nl_item item)
+{
+  char *l, *p;
+
+  if (item != CODESET)
+    return NULL;
+
+  if (((l = getenv("LC_ALL"))   && *l) ||
+      ((l = getenv("LC_CTYPE")) && *l) ||
+      ((l = getenv("LANG"))     && *l)) {
+    /* check standardized locales */
+    if (!strcmp(l, "C") || !strcmp(l, "POSIX"))
+      return C_CODESET;
+    /* check for encoding name fragment */
+    if (strstr(l, "UTF") || strstr(l, "utf"))
+      return "UTF-8";
+    if ((p = strstr(l, "8859-"))) {
+      memcpy(buf, "ISO-8859-\0\0", 12);
+      p += 5;
+      if (digit(*p)) {
+	buf[9] = *p++;
+	if (digit(*p)) buf[10] = *p++;
+	return buf;
+      }
+    }
+    if (strstr(l, "KOI8-R")) return "KOI8-R";
+    if (strstr(l, "KOI8-U")) return "KOI8-U";
+    if (strstr(l, "620")) return "TIS-620";
+    if (strstr(l, "2312")) return "GB2312";
+    if (strstr(l, "HKSCS")) return "Big5HKSCS";   /* no MIME charset */
+    if (strstr(l, "Big5") || strstr(l, "BIG5")) return "Big5";
+    if (strstr(l, "GBK")) return "GBK";           /* no MIME charset */
+    if (strstr(l, "18030")) return "GB18030";     /* no MIME charset */
+    if (strstr(l, "Shift_JIS") || strstr(l, "SJIS")) return "Shift_JIS";
+    /* check for conclusive modifier */
+    if (strstr(l, "euro")) return "ISO-8859-15";
+    /* check for language (and perhaps country) codes */
+    if (strstr(l, "zh_TW")) return "Big5";
+    if (strstr(l, "zh_HK")) return "Big5HKSCS";   /* no MIME charset */
+    if (strstr(l, "zh")) return "GB2312";
+    if (strstr(l, "ja")) return "EUC-JP";
+    if (strstr(l, "ko")) return "EUC-KR";
+    if (strstr(l, "ru")) return "KOI8-R";
+    if (strstr(l, "uk")) return "KOI8-U";
+    if (strstr(l, "pl") || strstr(l, "hr") ||
+	strstr(l, "hu") || strstr(l, "cs") ||
+	strstr(l, "sk") || strstr(l, "sl")) return "ISO-8859-2";
+    if (strstr(l, "eo") || strstr(l, "mt")) return "ISO-8859-3";
+    if (strstr(l, "el")) return "ISO-8859-7";
+    if (strstr(l, "he")) return "ISO-8859-8";
+    if (strstr(l, "tr")) return "ISO-8859-9";
+    if (strstr(l, "th")) return "TIS-620";      /* or ISO-8859-11 */
+    if (strstr(l, "lt")) return "ISO-8859-13";
+    if (strstr(l, "cy")) return "ISO-8859-14";
+    if (strstr(l, "ro")) return "ISO-8859-2";   /* or ISO-8859-16 */
+    if (strstr(l, "am") || strstr(l, "vi")) return "UTF-8";
+    /* Send me further rules if you like, but don't forget that we are
+     * *only* interested in locale naming conventions on platforms
+     * that do not already provide an nl_langinfo(CODESET) implementation. */
+    return "ISO-8859-1"; /* should perhaps be "UTF-8" instead */
+  }
+  return C_CODESET;
+}
+#endif /* defined(EXP_LOCALE_CHARSET) && !defined(HAVE_LANGINFO_CODESET) */
+
+/*
+ * If LYLocaleCharset is true, use the current locale to lookup a MIME name
+ * that corresponds, and use that as the display charset.  This feature is
+ * experimental because while nl_langinfo(CODESET) itself is standardized,
+ * the return values and their relationship to the locale value is not.
+ * GNU libiconv happens to give useful values, but other implementations are
+ * not guaranteed to do this.
+ *
+ * Not all Linux versions provide useful information.  GNU libc 2.2 returns
+ *	"ANSI_X3.4-1968"
+ * whether locale is POSIX or en_US.UTF-8.
+ *
+ * Another possible thing to investigate is the locale_charset() function
+ * provided in libiconv 1.5.1.
+ */
+PUBLIC void LYFindLocaleCharset NOARGS
+{
+    CTRACE((tfp, "LYFindLocaleCharset(%d)\n", LYLocaleCharset));
+    if (LYLocaleCharset) {
+	char *name = nl_langinfo(CODESET);
+	if (name != 0) {
+	    int value = UCGetLYhndl_byMIME(name);
+	    if (value >= 0) {
+		current_char_set = value;
+	    } else {
+		CTRACE((tfp, "Cannot find a handle for MIME name \"%s\"\n", name));
+		LYLocaleCharset = FALSE;
+	    }
+	} else {
+	    CTRACE((tfp, "Cannot find a MIME name for locale\n"));
+	    LYLocaleCharset = FALSE;
+	}
+    }
+}
+#endif /* EXP_LOCALE_CHARSET */
diff --git a/gnu/usr.bin/lynx/src/UCdomap.h b/gnu/usr.bin/lynx/src/UCdomap.h
index 71cbc69685b..3a49425279e 100644
--- a/gnu/usr.bin/lynx/src/UCdomap.h
+++ b/gnu/usr.bin/lynx/src/UCdomap.h
@@ -39,11 +39,6 @@ extern void UC_Charset_Setup PARAMS((
 	int			UC_rawuni,
 	int			codepage));
 
-CONST char *UC_GNsetMIMEnames[4] =
-	{"iso-8859-1", "x-dec-graphics", "cp437", "x-transparent"};
-
-int UC_GNhandles[4] = {-1, -1, -1, -1};
-
 struct UC_charset {
 	CONST char *MIMEname;
 	CONST char *LYNXname;
@@ -60,10 +55,10 @@ struct UC_charset {
 };
 
 extern int UCNumCharsets;
+extern int UCInitialized;
 
 extern void UCInit NOARGS;
 
-
 /*
  *  INSTRUCTIONS for adding new character sets which do not have
  *              Unicode tables.
diff --git a/gnu/usr.bin/lynx/src/Xsystem.c b/gnu/usr.bin/lynx/src/Xsystem.c
index f4ae61b8db3..58ee3eade5d 100644
--- a/gnu/usr.bin/lynx/src/Xsystem.c
+++ b/gnu/usr.bin/lynx/src/Xsystem.c
@@ -1,27 +1,12 @@
-/* $Id: Xsystem.c,v 1.2 2003/05/17 15:01:52 mickey Exp $
+/* $Id: Xsystem.c,v 1.3 2004/06/22 04:01:51 avsm Exp $
  *	like system("cmd") but return with exit code of "cmd"
  *	for Turbo-C/MS-C/LSI-C
  *  This code is in the public domain.
  *
  * $Log: Xsystem.c,v $
- * Revision 1.2  2003/05/17 15:01:52  mickey
- * no need for O0 on hppa anymore
- *
- * Revision 1.1  2003/05/01 18:59:40  avsm
- * Update to lynx-2.8.4-rel1, patchset d, now with IPv6 as well
- *
- * Local patches we maintain to the distribution are:
- * - replace unbounded fscanf with fgets (avsm)
- * - spelling fixes (deraadt)
- * - default to ftp passive (deraadt)
- * - work with non-exec scripts (deraadt,hin,maja)
- * - be more careful with rlogin username (art)
- * - default to our webpage (deraadt)
- * - install helpfiles locally (maja)
- * - mkdtemp temp space directory (art)
- * - install more recent config.guess (avsm)
- *
- * Tested by beck,millert,grange,fries,miod and others, deraadt@ ok
+ * Revision 1.3  2004/06/22 04:01:51  avsm
+ * update to lynx 2.8.5rel.1
+ * tested todd@,naddy@. millert@ deraadt@ ok
  *
  *
  * Revision 1.14  1997/10/17 (Fri) 16:28:24  senshu
@@ -43,6 +28,9 @@
  * NEAR for ms-c
  *
  */
+#include <LYUtils.h>
+
+#if 0
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -52,6 +40,7 @@
 #ifndef __CYGWIN__
 #include <dos.h>
 #endif
+#endif
 
 #include <LYStrings.h>
 
@@ -180,7 +169,7 @@ csystem(PRO * p, int flag)
     char SW[3];
     int rc;
 
-    if ((cmp = getenv("COMSPEC")) == 0)
+    if ((cmp = LYGetEnv("COMSPEC")) == 0)
 	return -2;
     SW[0] = (char) getswchar();
     SW[1] = 'c';
@@ -367,7 +356,7 @@ prog_go(PRO * p, int flag)
 	return csystem(p, flag);
 
     if (s < p->cmd) {		/* cmd has no PATH nor Drive */
-	ep = getenv("PATH");
+	ep = LYGetEnv("PATH");
 	LYstrncpy(cmdb, p->cmd, sizeof(cmdb) - 1);
 	for (;;) {
 	    if (extp) {		/* has extension */
@@ -417,7 +406,7 @@ tmpf(char *tp)
     char *ev;
     int i;
 
-    if ((ev = getenv("TMP")) != 0) {
+    if ((ev = LYGetEnv("TMP")) != 0) {
 	LYstrncpy(tplate, ev, sizeof(tplate) - 2 - strlen(tp));
 	i = strlen(ev);
 	if (i && ev[i - 1] != '\\' && ev[i - 1] != '/')
@@ -493,9 +482,6 @@ xsystem(char *cmd)
     int rdstdin, rdstdout;
     int rc = 0;
     static char *cmdline = 0;
-#if USECMDLINE
-    char *oldcmdline;
-#endif
 
 #ifdef SH_EX	/* 1997/11/01 (Sat) 10:04:03 add by JH7AYN */
     pif = cmd;
@@ -517,13 +503,10 @@ xsystem(char *cmd)
     psstdin = psstdout = rdstdin = rdstdout = -1;
     while (p) {
 #if USECMDLINE
-	if (!getenv("NOCMDLINE")) {
-	    oldcmdline = cmdline;
+	if (!LYGetEnv("NOCMDLINE")) {
 	    cmdline = xmalloc(strlen(p->cmd) + strlen(p->arg) + 10);
 	    sprintf(cmdline, "CMDLINE=%s %s", p->cmd, p->arg);
 	    putenv(cmdline);
-	    if (oldcmdline)
-		free(oldcmdline);
 	}
 #endif
 	if (p->next)
@@ -614,8 +597,6 @@ int exec_command(char * cmd, int wait_flag)
 
 
 #ifdef TEST
-#include <stdio.h>
-
 void
 main()
 {
diff --git a/gnu/usr.bin/lynx/src/chrtrans/MAKEFILE.W32 b/gnu/usr.bin/lynx/src/chrtrans/MAKEFILE.W32
deleted file mode 100644
index 4968995f3ab..00000000000
--- a/gnu/usr.bin/lynx/src/chrtrans/MAKEFILE.W32
+++ /dev/null
@@ -1,129 +0,0 @@
-#

-# Borland C++ IDE generated makefile

-#

-.AUTODEPEND

-

-

-#

-# Borland C++ tools

-#

-IMPLIB  = Implib

-BCC32   = Bcc32 +BccW32.cfg 

-TLINK32 = TLink32

-TLIB    = TLib

-BRC32   = Brc32

-TASM32  = Tasm32

-#

-# IDE macros

-#

-

-

-#

-# Options

-#

-IDE_LFLAGS32 =  -LD:\BC45\LIB

-LLATC32_dbmakeuctbdexe =  -LCURSES;D:\BC45\LIB -Tpe -ap -c -wdpl -wdup

-RLATC32_dbmakeuctbdexe =  -w32 -k

-BLATC32_dbmakeuctbdexe = 

-CNIEAT_dbmakeuctbdexe = -I.\;..\..\CURSES;..;..\..\WWW\LIBRARY\IMPLEMENTATION;D:\BC45\INCLUDE -DNO_UNISTD_H;_WINDOWS;NCURSES;FANCY_CURSES;XMOSAIC_HACK;ACCESS_AUTH;NO_UTMP;NO_CUSERID;NO_TTYTYPE;NOSIGHUP;DOSPATH;NOUSERS

-LNIEAT_dbmakeuctbdexe = -x

-LEAT_dbmakeuctbdexe = $(LLATC32_dbmakeuctbdexe)

-REAT_dbmakeuctbdexe = $(RLATC32_dbmakeuctbdexe)

-BEAT_dbmakeuctbdexe = $(BLATC32_dbmakeuctbdexe)

-

-#

-# Dependency List

-#

-Dep_char = \

-   .\makeuctb.exe

-

-char : BccW32.cfg $(Dep_char)

-  echo MakeNode 

-

-Dep_dbmakeuctbdexe = \

-   .\makeuctb.obj

-

-.\makeuctb.exe : $(Dep_dbmakeuctbdexe)

-  $(TLINK32) @&&|

- /v $(IDE_LFLAGS32) $(LEAT_dbmakeuctbdexe) $(LNIEAT_dbmakeuctbdexe) +

-D:\BC45\LIB\c0x32.obj+

-.\makeuctb.obj

-$<,$*

-D:\BC45\LIB\bidsf.lib+

-D:\BC45\LIB\import32.lib+

-D:\BC45\LIB\cw32.lib

-

-|

-

-.\makeuctb.obj :  makeuctb.c

-  $(BCC32) -P- -c @&&|

- $(CEAT_dbmakeuctbdexe) $(CNIEAT_dbmakeuctbdexe) -o$@ makeuctb.c

-|

-

-# Compiler configuration file

-BccW32.cfg : 

-   Copy &&|

--R

--v

--vi

--H

--H=lynx.csm

--w-

--A-

--wcpt

--wrpt

--wrng

--w-voi

--w-ret

--w-sus

--w-dup

--w-big

--w-ext

--w-zdi

--w-bei

--w-obi

--w-ofp

--w-eas

--w-hid

--w-ncf

--w-ibc

--w-dsz

--w-nst

--w-mpc

--w-mpd

--w-ntd

--w-nvf

--w-hch

--w-inl

--w-lin

--w-lvc

--w-pia

--w-def

--w-nod

--w-pro

--w-rvl

--w-ccc

--w-aus

--w-par

--w-rch

--w-eff

--w-ill

--w-ias

--w-msg

--WC

--Ot

--d-

--K

--a-

--w-stu

--wbbf

--w-dpu

--wcln

--wsig

--wucp

--g200

--H-

--v-

-| $@

-

-

diff --git a/gnu/usr.bin/lynx/src/chrtrans/MAKEW32.BAT b/gnu/usr.bin/lynx/src/chrtrans/MAKEW32.BAT
deleted file mode 100644
index 3ad8c16f68b..00000000000
--- a/gnu/usr.bin/lynx/src/chrtrans/MAKEW32.BAT
+++ /dev/null
@@ -1,44 +0,0 @@
-@echo If .tbl files are added or removed you will need to hand edit
-@echo this batch file.
-@echo .
-make -f makefile.w32
-makeuctb cp1250_uni.tbl > cp1250_uni.h
-makeuctb cp1251_uni.tbl > cp1251_uni.h
-makeuctb cp1252_uni.tbl > cp1252_uni.h
-makeuctb cp1253_uni.tbl > cp1253_uni.h
-makeuctb cp1255_uni.tbl > cp1255_uni.h
-makeuctb cp1256_uni.tbl > cp1256_uni.h
-makeuctb cp1257_uni.tbl > cp1257_uni.h
-makeuctb cp437_uni.tbl > cp437_uni.h
-makeuctb cp737_uni.tbl > cp737_uni.h
-makeuctb cp775_uni.tbl > cp775_uni.h
-makeuctb cp850_uni.tbl > cp850_uni.h
-makeuctb cp852_uni.tbl > cp852_uni.h
-makeuctb cp862_uni.tbl > cp862_uni.h
-makeuctb cp864_uni.tbl > cp864_uni.h
-makeuctb cp866_uni.tbl > cp866_uni.h
-makeuctb cp866u_uni.tbl > cp866u_uni.h
-makeuctb cp869_uni.tbl > cp869_uni.h
-makeuctb def7_uni.tbl  > def7_uni.h
-makeuctb dmcs_uni.tbl > dmcs_uni.h
-makeuctb hp_uni.tbl > hp_uni.h 
-makeuctb iso01_uni.tbl > iso01_uni.h
-makeuctb iso02_uni.tbl > iso02_uni.h
-makeuctb iso03_uni.tbl > iso03_uni.h
-makeuctb iso04_uni.tbl > iso04_uni.h
-makeuctb iso05_uni.tbl > iso05_uni.h
-makeuctb iso06_uni.tbl > iso06_uni.h
-makeuctb iso07_uni.tbl > iso07_uni.h
-makeuctb iso08_uni.tbl > iso08_uni.h
-makeuctb iso09_uni.tbl > iso09_uni.h
-makeuctb iso10_uni.tbl > iso10_uni.h
-makeuctb iso15_uni.tbl > iso15_uni.h 
-makeuctb koi8r_uni.tbl > koi8r_uni.h
-makeuctb koi8u_uni.tbl > koi8u_uni.h
-makeuctb mac_uni.tbl > mac_uni.h
-makeuctb mnem2_suni.tbl > mnem2_suni.h
-makeuctb mnem_suni.tbl > mnem_suni.h
-makeuctb next_uni.tbl > next_uni.h
-makeuctb rfc_suni.tbl > rfc_suni.h
-makeuctb utf8_uni.tbl > utf8_uni.h
-makeuctb viscii_uni.tbl > viscii_uni.h
diff --git a/gnu/usr.bin/lynx/src/chrtrans/build-chrtrans.com b/gnu/usr.bin/lynx/src/chrtrans/build-chrtrans.com
index 0ba35058dad..ac8c932d088 100644
--- a/gnu/usr.bin/lynx/src/chrtrans/build-chrtrans.com
+++ b/gnu/usr.bin/lynx/src/chrtrans/build-chrtrans.com
@@ -114,6 +114,7 @@ $ makeuctb mnem_suni.tbl
 $ makeuctb mnem2_suni.tbl
 $ makeuctb mnem_suni.tbl
 $ makeuctb next_uni.tbl
+$ makeuctb pt154_uni.tbl
 $ makeuctb rfc_suni.tbl
 $ makeuctb utf8_uni.tbl
 $ makeuctb viscii_uni.tbl
diff --git a/gnu/usr.bin/lynx/src/chrtrans/make-msc.bat b/gnu/usr.bin/lynx/src/chrtrans/make-msc.bat
new file mode 100644
index 00000000000..7d7ca0f7581
--- /dev/null
+++ b/gnu/usr.bin/lynx/src/chrtrans/make-msc.bat
@@ -0,0 +1,49 @@
+@echo If .tbl files are added or removed you will need to hand edit

+@echo this batch file.

+@echo .

+@echo off

+

+nmake -f makefile.msc

+

+makeuctb cp1250_uni.tbl

+makeuctb cp1251_uni.tbl

+makeuctb cp1252_uni.tbl

+makeuctb cp1253_uni.tbl

+makeuctb cp1255_uni.tbl

+makeuctb cp1256_uni.tbl

+makeuctb cp1257_uni.tbl

+makeuctb cp437_uni.tbl

+makeuctb cp737_uni.tbl

+makeuctb cp775_uni.tbl

+makeuctb cp850_uni.tbl

+makeuctb cp852_uni.tbl

+makeuctb cp862_uni.tbl

+makeuctb cp864_uni.tbl

+makeuctb cp866_uni.tbl

+makeuctb cp866u_uni.tbl

+makeuctb cp869_uni.tbl

+makeuctb def7_uni.tbl

+makeuctb dmcs_uni.tbl

+makeuctb hp_uni.tbl

+makeuctb iso01_uni.tbl

+makeuctb iso02_uni.tbl

+makeuctb iso03_uni.tbl

+makeuctb iso04_uni.tbl

+makeuctb iso05_uni.tbl

+makeuctb iso06_uni.tbl

+makeuctb iso07_uni.tbl

+makeuctb iso08_uni.tbl

+makeuctb iso09_uni.tbl

+makeuctb iso10_uni.tbl

+makeuctb iso15_uni.tbl

+makeuctb koi8r_uni.tbl

+makeuctb koi8u_uni.tbl

+makeuctb mac_uni.tbl

+makeuctb mnem_suni.tbl

+makeuctb mnem2_suni.tbl

+makeuctb mnem_suni.tbl

+makeuctb next_uni.tbl

+makeuctb pt154_uni.tbl

+makeuctb rfc_suni.tbl

+makeuctb utf8_uni.tbl

+makeuctb viscii_uni.tbl

diff --git a/gnu/usr.bin/lynx/src/chrtrans/makefile.bcb b/gnu/usr.bin/lynx/src/chrtrans/makefile.bcb
new file mode 100644
index 00000000000..bc70b79877e
--- /dev/null
+++ b/gnu/usr.bin/lynx/src/chrtrans/makefile.bcb
@@ -0,0 +1,122 @@
+#
+# Borland C++ IDE generated makefile
+#
+# 1997/11/09 (Sun) 14:29:50
+#
+.AUTODEPEND
+
+
+#
+# Borland C++ tools
+#
+IMPLIB  = Implib
+BCC32   = Bcc32 +BccW32.cfg
+TLINK32 = TLink32
+TLIB    = TLib
+BRC32   = Brc32
+TASM32  = Tasm32
+#
+# macros
+#
+BCB = $(MAKEDIR)/..
+BCC_INC = $(BCB)/INCLUDE
+
+#
+# Options
+#
+
+INCLUDES = -I.;../..;../../WWW/LIBRARY/IMPLEMENTATION;$(BCC_INC)
+DEFS =-DNO_FILIO_H;NO_UNISTD_H;_WINDOWS;DOSPATH
+LNIEAT_dbmakeuctbdexe = -x
+
+#
+# Dependency List
+#
+Dep_char = .\makeuctb.exe
+
+char : BccW32.cfg $(Dep_char)
+	echo MakeNode
+
+Dep_dbmakeuctbdexe = .\makeuctb.obj
+
+.\makeuctb.exe : $(Dep_dbmakeuctbdexe)
+	$(BCC32) makeuctb.obj
+
+###
+.\makeuctb.obj :  makeuctb.c
+	$(BCC32) -P- -c $(DEFS) $(INCLUDES) -o$@ makeuctb.c
+
+# Compiler configuration file
+BccW32.cfg :
+	Copy &&|
+-R
+-v
+-vi
+-H
+-H=lynx.csm
+-w-
+-A-
+-wcpt
+-wrpt
+-wrng
+-w-voi
+-w-ret
+-w-sus
+-w-dup
+-w-big
+-w-ext
+-w-zdi
+-w-bei
+-w-obi
+-w-ofp
+-w-eas
+-w-hid
+-w-ncf
+-w-ibc
+-w-dsz
+-w-nst
+-w-mpc
+-w-mpd
+-w-ntd
+-w-nvf
+-w-hch
+-w-inl
+-w-lin
+-w-lvc
+-w-pia
+-w-def
+-w-nod
+-w-pro
+-w-rvl
+-w-ccc
+-w-aus
+-w-par
+-w-rch
+-w-eff
+-w-ill
+-w-ias
+-w-msg
+-WC
+-Ot
+-d-
+-K
+-a-
+-w-stu
+-wbbf
+-w-dpu
+-wcln
+-wsig
+-wucp
+-g200
+-H-
+-v-
+| $@
+
+clean :
+	-del *_uni.h
+	-del *.exe
+	-del *.map
+	-del *.obj
+	-del *.tds
+	-del BccW32.cfg
+	-del /f/s/q *.i
diff --git a/gnu/usr.bin/lynx/src/chrtrans/makefile.dos b/gnu/usr.bin/lynx/src/chrtrans/makefile.dos
index 03bb135deac..975561d93e5 100644
--- a/gnu/usr.bin/lynx/src/chrtrans/makefile.dos
+++ b/gnu/usr.bin/lynx/src/chrtrans/makefile.dos
@@ -12,11 +12,10 @@
 CFLAGS = $(MCFLAGS)
 
 CC = gcc
-MCFLAGS = -O2 -DDOSPATH -DNO_TTYTYP \
+MCFLAGS = -O2 -DDOSPATH \
 -I. \
 -I../../WWW/Library/Implementation \
--I/djgpp/watt32/inc \
--I/djgpp/watt32/inc/sys \
+-I/djgpp/watt32/inc
 -I../..
 
 .SUFFIXES: .tbl
@@ -64,6 +63,7 @@ TABLES= \
  mnem2_suni.h \
  mnem_suni.h \
  next_uni.h \
+ pt154_uni.h \
  rfc_suni.h \
  utf8_uni.h \
  viscii_uni.h
@@ -98,7 +98,7 @@ cp866u_uni.h:		cp866u_uni.tbl		makeuctb.exe
 cp869_uni.h:		cp869_uni.tbl		makeuctb.exe
 def7_uni.h:		def7_uni.tbl		makeuctb.exe
 dmcs_uni.h:		dmcs_uni.tbl		makeuctb.exe
-hp_uni.h:               hp_uni.tbl              makeuctb.exe 
+hp_uni.h:               hp_uni.tbl              makeuctb.exe
 iso01_uni.h:		iso01_uni.tbl		makeuctb.exe
 iso02_uni.h:		iso02_uni.tbl		makeuctb.exe
 iso03_uni.h:		iso03_uni.tbl		makeuctb.exe
@@ -116,6 +116,7 @@ mac_uni.h:		mac_uni.tbl		makeuctb.exe
 mnem2_suni.h:		mnem2_suni.tbl		makeuctb.exe
 mnem_suni.h:		mnem_suni.tbl		makeuctb.exe
 next_uni.h:		next_uni.tbl		makeuctb.exe
+pt154_uni.h:		pt154_uni.tbl		makeuctb.exe
 rfc_suni.h:		rfc_suni.tbl		makeuctb.exe
 utf8_uni.h:		utf8_uni.tbl		makeuctb.exe
 viscii_uni.h:		viscii_uni.tbl		makeuctb.exe
diff --git a/gnu/usr.bin/lynx/src/chrtrans/makefile.in b/gnu/usr.bin/lynx/src/chrtrans/makefile.in
index d399a0e573c..3db427e3fb6 100644
--- a/gnu/usr.bin/lynx/src/chrtrans/makefile.in
+++ b/gnu/usr.bin/lynx/src/chrtrans/makefile.in
@@ -6,8 +6,6 @@
 #
 SHELL		= @CONFIG_SHELL@
 
-x		= @PROG_EXT@
-
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 top_srcdir	= @top_srcdir@
@@ -29,7 +27,9 @@ SITE_DEFS	= # FIXME: set in parent makefile
 CC		= @CC@
 CPP		= @CPP@
 CFLAGS		= @CFLAGS@
-_O		= .o
+
+x		= @EXEEXT@
+o		= .@OBJEXT@
 
 CPP_OPTS	= @DEFS@ @CPPFLAGS@ \
 		-I$(top_builddir) \
@@ -86,6 +86,8 @@ TABLES= \
  mnem2_suni.h \
  mnem_suni.h \
  next_uni.h \
+ next_uni.h \
+ pt154_uni.h \
  rfc_suni.h \
  utf8_uni.h \
  viscii_uni.h
@@ -94,14 +96,14 @@ default: $(FONTMAP_INC)
 
 tables: $(TABLES)
 
-makeuctb$x: makeuctb$(_O)
-	$(CC) $(CC_OPTS) $(LDFLAGS) -o $@ makeuctb$(_O) $(INTLLIB) $(LIBS)
+makeuctb$x: makeuctb$o
+	$(CC) $(CC_OPTS) $(LDFLAGS) -o $@ makeuctb$o $(INTLLIB) $(LIBS)
 
-makeuctb$(_O): $(srcdir)/UCkd.h $(srcdir)/makeuctb.c
+makeuctb$o: $(srcdir)/UCkd.h $(srcdir)/makeuctb.c
 
-.SUFFIXES : $(_O) .tbl .i
+.SUFFIXES : $o .tbl .i
 
-.c$(_O):
+.c$o:
 @RULE_CC@
 	@ECHO_CC@$(CC) $(CC_OPTS) -c $(srcdir)/$*.c
 
@@ -151,12 +153,13 @@ mac_uni.h:		$(srcdir)/mac_uni.tbl		makeuctb$x
 mnem2_suni.h:		$(srcdir)/mnem2_suni.tbl	makeuctb$x
 mnem_suni.h:		$(srcdir)/mnem_suni.tbl		makeuctb$x
 next_uni.h:		$(srcdir)/next_uni.tbl		makeuctb$x
+pt154_uni.h:		$(srcdir)/pt154_uni.tbl 	makeuctb$x
 rfc_suni.h:		$(srcdir)/rfc_suni.tbl		makeuctb$x
 utf8_uni.h:		$(srcdir)/utf8_uni.tbl		makeuctb$x
 viscii_uni.h:		$(srcdir)/viscii_uni.tbl	makeuctb$x
 
 clean:
-	rm -f makeuctb$x *$(_O) *uni.h *uni2.h
+	rm -f makeuctb$x *$o *uni.h *uni2.h *.i
 
 distclean: clean
 	-rm -rf obsolete
diff --git a/gnu/usr.bin/lynx/src/chrtrans/makefile.msc b/gnu/usr.bin/lynx/src/chrtrans/makefile.msc
new file mode 100644
index 00000000000..228af43ee3b
--- /dev/null
+++ b/gnu/usr.bin/lynx/src/chrtrans/makefile.msc
@@ -0,0 +1,130 @@
+#
+# Makefile for Microsoft Visual C++ 4.2 or later
+#
+
+CC       = cl
+LD       = link
+
+INCLUDES = /I "." /I ".." /I "..\.." /I "..\..\WWW\Library\Implementation" /I "..\..\lib"
+DEFS = /D "NDEBUG" /D "__WIN32__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "NO_FILEIO_H" /D "NO_UNISTD_H" /D "_WINDOWS" /D "DOSPATH"
+CFLAGS   = /nologo /MT /W3 /GX /O2 /c
+
+LDFLAGS  = /nologo /subsystem:console /incremental:no /machine:I386
+LIBS     = user32.lib wsock32.lib
+
+COMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(DEFS)
+LINK    = $(LD) $(LDFLAGS) /out:$@
+
+
+.SUFFIXES: .tbl
+#
+# This file contains the font map for the default (hardware) font
+#
+
+FONTMAP_INC = iso01_un.h
+
+TABLES= \
+ cp1250_uni.h \
+ cp1251_uni.h \
+ cp1252_uni.h \
+ cp1253_uni.h \
+ cp1255_uni.h \
+ cp1256_uni.h \
+ cp1257_uni.h \
+ cp437_uni.h \
+ cp737_uni.h \
+ cp775_uni.h \
+ cp850_uni.h \
+ cp852_uni.h \
+ cp862_uni.h \
+ cp864_uni.h \
+ cp866_uni.h \
+ cp866u_uni.h \
+ cp869_uni.h \
+ def7_uni.h \
+ dmcs_uni.h \
+ hp_uni.h \
+ iso01_uni.h \
+ iso02_uni.h \
+ iso03_uni.h \
+ iso04_uni.h \
+ iso05_uni.h \
+ iso06_uni.h \
+ iso07_uni.h \
+ iso08_uni.h \
+ iso09_uni.h \
+ iso10_uni.h \
+ iso15_uni.h \
+ koi8r_uni.h \
+ koi8u_uni.h \
+ mac_uni.h \
+ mnem2_suni.h \
+ mnem_suni.h \
+ next_uni.h \
+ pt154_uni.h \
+ rfc_suni.h \
+ utf8_uni.h \
+ viscii_uni.h
+
+default: $(TABLES)
+
+fontmap: $(FONTMAP_INC)
+
+makeuctb.exe : makeuctb.obj
+	$(LINK) makeuctb.obj $(LIBS)
+
+makeuctb.obj :  makeuctb.c
+	$(COMPILE) makeuctb.c
+
+.tbl.h:
+	makeuctb $*.tbl
+
+cp1250_uni.h:		cp1250_uni.tbl		makeuctb.exe
+cp1251_uni.h:		cp1251_uni.tbl		makeuctb.exe
+cp1252_uni.h:		cp1252_uni.tbl		makeuctb.exe
+cp1253_uni.h:		cp1253_uni.tbl		makeuctb.exe
+cp1255_uni.h:		cp1255_uni.tbl		makeuctb.exe
+cp1256_uni.h:		cp1256_uni.tbl		makeuctb.exe
+cp1257_uni.h:		cp1257_uni.tbl		makeuctb.exe
+cp437_uni.h:		cp437_uni.tbl		makeuctb.exe
+cp737_uni.h:		cp737_uni.tbl		makeuctb.exe
+cp775_uni.h:		cp775_uni.tbl		makeuctb.exe
+cp850_uni.h:		cp850_uni.tbl		makeuctb.exe
+cp852_uni.h:		cp852_uni.tbl		makeuctb.exe
+cp862_uni.h:		cp862_uni.tbl		makeuctb.exe
+cp864_uni.h:		cp864_uni.tbl		makeuctb.exe
+cp866_uni.h:		cp866_uni.tbl		makeuctb.exe
+cp866u_uni.h:		cp866u_uni.tbl		makeuctb.exe
+cp869_uni.h:		cp869_uni.tbl		makeuctb.exe
+def7_uni.h:		def7_uni.tbl		makeuctb.exe
+dmcs_uni.h:		dmcs_uni.tbl		makeuctb.exe
+hp_uni.h:               hp_uni.tbl              makeuctb.exe
+iso01_uni.h:		iso01_uni.tbl		makeuctb.exe
+iso02_uni.h:		iso02_uni.tbl		makeuctb.exe
+iso03_uni.h:		iso03_uni.tbl		makeuctb.exe
+iso04_uni.h:		iso04_uni.tbl		makeuctb.exe
+iso05_uni.h:		iso05_uni.tbl		makeuctb.exe
+iso06_uni.h:		iso06_uni.tbl		makeuctb.exe
+iso07_uni.h:		iso07_uni.tbl		makeuctb.exe
+iso08_uni.h:		iso08_uni.tbl		makeuctb.exe
+iso09_uni.h:		iso09_uni.tbl		makeuctb.exe
+iso10_uni.h:		iso10_uni.tbl		makeuctb.exe
+iso15_uni.h:		iso15_uni.tbl		makeuctb.exe
+koi8r_uni.h:		koi8r_uni.tbl		makeuctb.exe
+koi8u_uni.h:		koi8u_uni.tbl		makeuctb.exe
+mac_uni.h:		mac_uni.tbl		makeuctb.exe
+mnem2_suni.h:		mnem2_suni.tbl		makeuctb.exe
+mnem_suni.h:		mnem_suni.tbl		makeuctb.exe
+next_uni.h:		next_uni.tbl		makeuctb.exe
+pt154_uni.h:		pt154_uni.tbl		makeuctb.exe
+rfc_suni.h:		rfc_suni.tbl		makeuctb.exe
+utf8_uni.h:		utf8_uni.tbl		makeuctb.exe
+viscii_uni.h:		viscii_uni.tbl		makeuctb.exe
+
+clean :
+	- erase *.obj
+	- erase *.exe
+	- for %%i in ( $(TABLES) ) do erase %%i
+
+distclean : clean
+	- erase *.bak
diff --git a/gnu/usr.bin/lynx/src/chrtrans/makeuctb.c b/gnu/usr.bin/lynx/src/chrtrans/makeuctb.c
index 611e737d305..d8003cb8c19 100644
--- a/gnu/usr.bin/lynx/src/chrtrans/makeuctb.c
+++ b/gnu/usr.bin/lynx/src/chrtrans/makeuctb.c
@@ -18,6 +18,7 @@
 
 #define DONT_USE_SOCKS5
 #include <HTUtils.h>
+
 /*
  *  Don't try to use LYexit().
  */
@@ -25,14 +26,6 @@
 #undef exit
 #endif /* exit */
 
-#ifndef TOUPPER
-#define TOUPPER(c) (islower(UCH(c)) ? toupper(UCH(c)) : (c))
-#endif /* !TOLOWER */
-
-#ifndef TOLOWER
-#define TOLOWER(c) (isupper(UCH(c)) ? tolower(UCH(c)) : (c))
-#endif /* !TOLOWER */
-
 #include <UCkd.h>
 #include <UCDefs.h>
 
@@ -79,6 +72,16 @@ PRIVATE void usage NOARGS
     done(EX_USAGE);
 }
 
+#ifdef EXP_ASCII_CTYPES
+PUBLIC int ascii_tolower ARGS1(int, i)
+{
+    if ( 91 > i && i > 64 )
+	return (i+32);
+    else
+	return i;
+}
+#endif
+
 /* copied from HTString.c, not everybody has strncasecmp */
 PUBLIC int strncasecomp ARGS3(
 	CONST char*,	a,
@@ -434,7 +437,7 @@ PUBLIC int main ARGS2(
 		while (*p == ' ' || *p == '\t') {
 		    p++;
 		}
-		useDefaultMap = (*p == '1' || tolower(*p) == 'y');
+		useDefaultMap = (*p == '1' || TOLOWER(*p) == 'y');
 		continue;
 
 	    case 'M':
@@ -884,4 +887,5 @@ id_append, id_append, nuni, id_append, lowest_eight, RawOrEnc, CodePage);
     }
 
     done(EX_OK);
+    return 0;
 }
diff --git a/gnu/usr.bin/lynx/src/chrtrans/makew32.bat b/gnu/usr.bin/lynx/src/chrtrans/makew32.bat
new file mode 100644
index 00000000000..e03e1743d5e
--- /dev/null
+++ b/gnu/usr.bin/lynx/src/chrtrans/makew32.bat
@@ -0,0 +1,55 @@
+@echo If .tbl files are added or removed you will need to hand edit

+@echo this batch file.

+@echo .

+@echo off

+

+if "%1"=="" goto normal

+make -l -f makefile.bcb %1

+goto done

+

+:normal

+make -l -f makefile.bcb

+

+makeuctb cp1250_uni.tbl

+makeuctb cp1251_uni.tbl

+makeuctb cp1252_uni.tbl

+makeuctb cp1253_uni.tbl

+makeuctb cp1255_uni.tbl

+makeuctb cp1256_uni.tbl

+makeuctb cp1257_uni.tbl

+makeuctb cp437_uni.tbl

+makeuctb cp737_uni.tbl

+makeuctb cp775_uni.tbl

+makeuctb cp850_uni.tbl

+makeuctb cp852_uni.tbl

+makeuctb cp862_uni.tbl

+makeuctb cp864_uni.tbl

+makeuctb cp866_uni.tbl

+makeuctb cp866u_uni.tbl

+makeuctb cp869_uni.tbl

+makeuctb def7_uni.tbl

+makeuctb dmcs_uni.tbl

+makeuctb hp_uni.tbl

+makeuctb iso01_uni.tbl

+makeuctb iso02_uni.tbl

+makeuctb iso03_uni.tbl

+makeuctb iso04_uni.tbl

+makeuctb iso05_uni.tbl

+makeuctb iso06_uni.tbl

+makeuctb iso07_uni.tbl

+makeuctb iso08_uni.tbl

+makeuctb iso09_uni.tbl

+makeuctb iso10_uni.tbl

+makeuctb iso15_uni.tbl

+makeuctb koi8r_uni.tbl

+makeuctb koi8u_uni.tbl

+makeuctb mac_uni.tbl

+makeuctb mnem2_suni.tbl

+makeuctb mnem_suni.tbl

+makeuctb next_uni.tbl

+makeuctb pt154_uni.tbl

+makeuctb rfc_suni.tbl

+makeuctb utf8_uni.tbl

+makeuctb viscii_uni.tbl

+

+:done

diff --git a/gnu/usr.bin/lynx/src/chrtrans/pt154_uni.tbl b/gnu/usr.bin/lynx/src/chrtrans/pt154_uni.tbl
new file mode 100644
index 00000000000..a15c22e84c5
--- /dev/null
+++ b/gnu/usr.bin/lynx/src/chrtrans/pt154_uni.tbl
@@ -0,0 +1,174 @@
+Mptcp154

+#
+OCyrillic-Asian (PT154)
+#
+C1540
+
+#####
+#
+# Charset aliases:
+# csPTCP154
+# PT154
+# CP154
+# Cyrillic-Asian
+#
+# Suitability for use in MIME text:

+# Yes

+#
+# ISO 10646 equivalency table:

+#    Format: Three tab-separated columns

+#        Column #1 is the Paratype CP154 code (in hex)

+#        Column #2 is the Unicode (in hex as 0xXXXX)

+#        Column #3 is the Unicode name (follows a comment sign, '#')

+#

+#    The entries are in Paratype CP154 order

+#

+#####
+
+0x20-0x7e		 idem
+#
+0x80  U+0496     #       CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER

+0x81  U+0492     #       CYRILLIC CAPITAL LETTER GHE WITH STROKE

+0x82  U+04EE     #       CYRILLIC CAPITAL LETTER U WITH MACRON

+0x83  U+0493     #       CYRILLIC SMALL LETTER GHE WITH STROKE

+0x84  U+201E     #       DOUBLE LOW-9 QUOTATION MARK

+0x85  U+2026     #       HORIZONTAL ELLIPSIS

+0x86  U+04B6     #       CYRILLIC CAPITAL LETTER CHE WITH DESCENDER

+0x87  U+04AE     #       CYRILLIC CAPITAL LETTER STRAIGHT U

+0x88  U+04B2     #       CYRILLIC CAPITAL LETTER HA WITH DESCENDER

+0x89  U+04AF     #       CYRILLIC SMALL LETTER STRAIGHT U

+0x8a  U+04A0     #       CYRILLIC CAPITAL LETTER BASHKIR KA

+0x8b  U+04E2     #       CYRILLIC CAPITAL LETTER I WITH MACRON

+0x8c  U+04A2     #       CYRILLIC CAPITAL LETTER EN WITH DESCENDER

+0x8d  U+049A     #       CYRILLIC CAPITAL LETTER KA WITH DESCENDER

+0x8e  U+04BA     #       CYRILLIC CAPITAL LETTER SHHA

+0x8f  U+04B8     #       CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE

+0x90  U+0497     #       CYRILLIC SMALL LETTER ZHE WITH DESCENDER

+0x91  U+2018     #       LEFT SINGLE QUOTATION MARK

+0x92  U+2019     #       RIGHT SINGLE QUOTATION MARK

+0x93  U+201C     #       LEFT DOUBLE QUOTATION MARK

+0x94  U+201D     #       RIGHT DOUBLE QUOTATION MARK

+0x95  U+2022     #       BULLET

+0x96  U+2013     #       EN DASH

+0x97  U+2014     #       EM DASH

+0x98  U+04B3     #       CYRILLIC SMALL LETTER HA WITH DESCENDER

+0x99  U+04B7     #       CYRILLIC SMALL LETTER CHE WITH DESCENDER

+0x9a  U+04A1     #       CYRILLIC SMALL LETTER BASHKIR KA

+0x9b  U+04E3     #       CYRILLIC SMALL LETTER I WITH MACRON

+0x9c  U+04A3     #       CYRILLIC SMALL LETTER EN WITH DESCENDER

+0x9d  U+049B     #       CYRILLIC SMALL LETTER KA WITH DESCENDER

+0x9e  U+04BB     #       CYRILLIC SMALL LETTER SHHA

+0x9f  U+04B9     #       CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE

+0xa0  U+00A0     #       NO-BREAK SPACE

+0xa1  U+040E     #       CYRILLIC CAPITAL LETTER SHORT U (Byelorussian)

+0xa2  U+045E     #       CYRILLIC SMALL LETTER SHORT U (Byelorussian)

+0xa3  U+0408     #       CYRILLIC CAPITAL LETTER JE

+0xa4  U+04E8     #       CYRILLIC CAPITAL LETTER BARRED O

+0xa5  U+0498     #       CYRILLIC CAPITAL LETTER ZE WITH DESCENDER

+0xa6  U+04B0     #       CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE

+0xa7  U+00A7     #       SECTION SIGN

+0xa8  U+0401     #       CYRILLIC CAPITAL LETTER IO

+0xa9  U+00A9     #       COPYRIGHT SIGN

+0xaa  U+04D8     #       CYRILLIC CAPITAL LETTER SCHWA

+0xab  U+00AB     #       LEFT-POINTING DOUBLE ANGLE QUOTATION MARK

+0xac  U+00AC     #       NOT SIGN

+0xad  U+04EF     #       CYRILLIC SMALL LETTER U WITH MACRON

+0xae  U+00AE     #       REGISTERED SIGN

+0xaf  U+049C     #       CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE

+0xb0  U+00B0     #       DEGREE SIGN

+0xb1  U+04B1     #       CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE

+0xb2  U+0406     #       CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I

+0xb3  U+0456     #       CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I

+0xb4  U+0499     #       CYRILLIC SMALL LETTER ZE WITH DESCENDER

+0xb5  U+04E9     #       CYRILLIC SMALL LETTER BARRED O

+0xb6  U+00B6     #       PILCROW SIGN

+0xb7  U+00B7     #       MIDDLE DOT

+0xb8  U+0451     #       CYRILLIC SMALL LETTER IO

+0xb9  U+2116     #       NUMERO SIGN

+0xba  U+04D9     #       CYRILLIC SMALL LETTER SCHWA

+0xbb  U+00BB     #       RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK

+0xbc  U+0458     #       CYRILLIC SMALL LETTER JE

+0xbd  U+04AA     #       CYRILLIC CAPITAL LETTER ES WITH DESCENDER

+0xbe  U+04AB     #       CYRILLIC SMALL LETTER ES WITH DESCENDER

+0xbf  U+049D     #       CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE

+0xc0  U+0410     #       CYRILLIC CAPITAL LETTER A

+0xc1  U+0411     #       CYRILLIC CAPITAL LETTER BE

+0xc2  U+0412     #       CYRILLIC CAPITAL LETTER VE

+0xc3  U+0413     #       CYRILLIC CAPITAL LETTER GHE

+0xc4  U+0414     #       CYRILLIC CAPITAL LETTER DE

+0xc5  U+0415     #       CYRILLIC CAPITAL LETTER IE

+0xc6  U+0416     #       CYRILLIC CAPITAL LETTER ZHE

+0xc7  U+0417     #       CYRILLIC CAPITAL LETTER ZE

+0xc8  U+0418     #       CYRILLIC CAPITAL LETTER I

+0xc9  U+0419     #       CYRILLIC CAPITAL LETTER SHORT I

+0xca  U+041A     #       CYRILLIC CAPITAL LETTER KA

+0xcb  U+041B     #       CYRILLIC CAPITAL LETTER EL

+0xcc  U+041C     #       CYRILLIC CAPITAL LETTER EM

+0xcd  U+041D     #       CYRILLIC CAPITAL LETTER EN

+0xce  U+041E     #       CYRILLIC CAPITAL LETTER O

+0xcf  U+041F     #       CYRILLIC CAPITAL LETTER PE

+0xd0  U+0420     #       CYRILLIC CAPITAL LETTER ER

+0xd1  U+0421     #       CYRILLIC CAPITAL LETTER ES

+0xd2  U+0422     #       CYRILLIC CAPITAL LETTER TE

+0xd3  U+0423     #       CYRILLIC CAPITAL LETTER U

+0xd4  U+0424     #       CYRILLIC CAPITAL LETTER EF

+0xd5  U+0425     #       CYRILLIC CAPITAL LETTER HA

+0xd6  U+0426     #       CYRILLIC CAPITAL LETTER TSE

+0xd7  U+0427     #       CYRILLIC CAPITAL LETTER CHE

+0xd8  U+0428     #       CYRILLIC CAPITAL LETTER SHA

+0xd9  U+0429     #       CYRILLIC CAPITAL LETTER SHCHA

+0xda  U+042A     #       CYRILLIC CAPITAL LETTER HARD SIGN

+0xdb  U+042B     #       CYRILLIC CAPITAL LETTER YERU

+0xdc  U+042C     #       CYRILLIC CAPITAL LETTER SOFT SIGN

+0xdd  U+042D     #       CYRILLIC CAPITAL LETTER E

+0xde  U+042E     #       CYRILLIC CAPITAL LETTER YU

+0xdf  U+042F     #       CYRILLIC CAPITAL LETTER YA

+0xe0  U+0430     #       CYRILLIC SMALL LETTER A

+0xe1  U+0431     #       CYRILLIC SMALL LETTER BE

+0xe2  U+0432     #       CYRILLIC SMALL LETTER VE

+0xe3  U+0433     #       CYRILLIC SMALL LETTER GHE

+0xe4  U+0434     #       CYRILLIC SMALL LETTER DE

+0xe5  U+0435     #       CYRILLIC SMALL LETTER IE

+0xe6  U+0436     #       CYRILLIC SMALL LETTER ZHE

+0xe7  U+0437     #       CYRILLIC SMALL LETTER ZE

+0xe8  U+0438     #       CYRILLIC SMALL LETTER I

+0xe9  U+0439     #       CYRILLIC SMALL LETTER SHORT I

+0xea  U+043A     #       CYRILLIC SMALL LETTER KA

+0xeb  U+043B     #       CYRILLIC SMALL LETTER EL

+0xec  U+043C     #       CYRILLIC SMALL LETTER EM

+0xed  U+043D     #       CYRILLIC SMALL LETTER EN

+0xee  U+043E     #       CYRILLIC SMALL LETTER O

+0xef  U+043F     #       CYRILLIC SMALL LETTER PE

+0xf0  U+0440     #       CYRILLIC SMALL LETTER ER

+0xf1  U+0441     #       CYRILLIC SMALL LETTER ES

+0xf2  U+0442     #       CYRILLIC SMALL LETTER TE

+0xf3  U+0443     #       CYRILLIC SMALL LETTER U

+0xf4  U+0444     #       CYRILLIC SMALL LETTER EF

+0xf5  U+0445     #       CYRILLIC SMALL LETTER HA

+0xf6  U+0446     #       CYRILLIC SMALL LETTER TSE

+0xf7  U+0447     #       CYRILLIC SMALL LETTER CHE

+0xf8  U+0448     #       CYRILLIC SMALL LETTER SHA

+0xf9  U+0449     #       CYRILLIC SMALL LETTER SHCHA

+0xfa  U+044A     #       CYRILLIC SMALL LETTER HARD SIGN

+0xfb  U+044B     #       CYRILLIC SMALL LETTER YERU

+0xfc  U+044C     #       CYRILLIC SMALL LETTER SOFT SIGN

+0xfd  U+044D     #       CYRILLIC SMALL LETTER E

+0xfe  U+044E     #       CYRILLIC SMALL LETTER YU

+0xff  U+044F     #       CYRILLIC SMALL LETTER YA

+
+#####
+#
+# Additional information:

+# This charset based on CP1251 with added asian cyrillic symbols.

+#
+# Person & email address to contact for further information:

+# Alexander Uskov

+# InternetDataCenter of KazakhTelecom.

+# e-mail: auskov@idc.kz

+#
+# Intended usage:

+# COMMON

+#

+# (record created 2002-09-27)
+#
+#####
diff --git a/gnu/usr.bin/lynx/src/chrtrans/yawerty_kb.h b/gnu/usr.bin/lynx/src/chrtrans/yawerty_kb.h
index 5682bbbc3c2..d96eaa7074b 100644
--- a/gnu/usr.bin/lynx/src/chrtrans/yawerty_kb.h
+++ b/gnu/usr.bin/lynx/src/chrtrans/yawerty_kb.h
@@ -9,12 +9,12 @@ static LYKbLayout_t kb_layout_yawerty[128] = {
 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, /* 30..37 */ 
 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, /* 38..3F */ 
  
-0x042e, 0x0410, 0x0412, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 40..47 */ 
+0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 40..47 */ 
 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, /* 48..4F */ 
 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 50..57 */ 
 0x042c, 0x042b, 0x0417, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, /* 58..5F */ 
  
-0x044e, 0x0430, 0x0432, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 60..67 */ 
+0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 60..67 */ 
 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, /* 68..6F */ 
 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 70..77 */ 
 0x044c, 0x044b, 0x0437, 0x0428, 0x042d, 0x0429, 0x0427, 0x0000  /* 78..7F */ 
diff --git a/gnu/usr.bin/lynx/src/makefile.dos b/gnu/usr.bin/lynx/src/makefile.dos
index daaa5b625d7..14ded8d3bf4 100644
--- a/gnu/usr.bin/lynx/src/makefile.dos
+++ b/gnu/usr.bin/lynx/src/makefile.dos
@@ -9,7 +9,7 @@ LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o \
 LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYExtern.o \
 LYStyle.o LYHash.o LYPrettySrc.o TRSTable.o
 
-CFLAGS= -O2 $(MCFLAGS) $(INTLFLAGS) -I. -I.. $(SLANGINC)
+CFLAGS= -O2 $(MCFLAGS) $(INTLFLAGS) -I. -I..
 
 # comment this line to suppress DIRED support
 DIRED_DEFS = \
@@ -21,8 +21,7 @@ DIRED_DEFS = \
  -DOK_OVERRIDE
 
 # Use this option to enable optional and *experimental* color style.
-#ENABLE_COLOR_STYLE = \
- -DUSE_COLOR_STYLE
+#ENABLE_COLOR_STYLE = -DUSE_COLOR_STYLE
 
 CC = gcc
 
@@ -35,31 +34,29 @@ MCFLAGS = \
  -DDOSPATH \
  -DEXP_ADDRLIST_PAGE \
  -DEXP_ALT_BINDINGS \
- -DEXP_FILE_UPLOAD \
  -DEXP_NESTED_TABLES \
- -DEXP_PERSISTENT_COOKIES \
+ -DUSE_PERSISTENT_COOKIES \
  -DFANCY_CURSES \
  -DNOUSERS \
  -DNO_CUSERID \
  -DNO_TTYTYPE \
  -DNO_UTMP \
  -DPDCURSES \
- -DSOURCE_CACHE \
+ -DUSE_SOURCE_CACHE \
  -DUSE_EXTERNALS \
+ -DUSE_FILE_UPLOAD \
  -DUSE_PRETTYSRC \
  -DUSE_ZLIB \
- -DWATT32 \
  $(SSLFLAGS) \
  $(SSLINC) \
  -I./chrtrans \
  -I../WWW/Library/Implementation \
- -I/djgpp/pdcur24 \
- -I/djgpp/watt32/inc \
- -I/djgpp/watt32/inc/sys
+ -I/djgpp/pdcur26 \
+ -I/djgpp/watt32/inc
 
 WWWLIB = \
  ../WWW/Library/djgpp/libwww.a \
- /djgpp/pdcur24/lib/pdcurses.a
+ /djgpp/pdcur26/lib/pdcurses.a
 
 LIBS= -L/djgpp/watt32/lib -lwatt -lz -lwmemu
 
@@ -67,7 +64,7 @@ LIBS= -L/djgpp/watt32/lib -lwatt -lz -lwmemu
 #INTLFLAGS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H
 #INTLLIBS= -lintl -liconv
 
-# Uncomment the followint to enable SSL.
+# Uncomment the following to enable SSL.
 #SSLFLAGS = -DUSE_SSL
 #SSLLIB = -lssl -lcrypto
 #SSLINC = -I/djgpp/include/openssl
diff --git a/gnu/usr.bin/lynx/src/makefile.dsl b/gnu/usr.bin/lynx/src/makefile.dsl
index 0c6bca4231b..1af085391cb 100644
--- a/gnu/usr.bin/lynx/src/makefile.dsl
+++ b/gnu/usr.bin/lynx/src/makefile.dsl
@@ -9,7 +9,7 @@ LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o \
 LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYExtern.o \
 LYStyle.o LYHash.o LYPrettySrc.o TRSTable.o
 
-CFLAGS= -O1 $(MCFLAGS) $(INTLFLAGS) -I. -I.. $(SLANGINC)
+CFLAGS= -O2 $(MCFLAGS) $(INTLFLAGS) -I. -I.. $(SLANGINC)
 
 # comment this line to suppress DIRED support
 DIRED_DEFS = \
@@ -18,7 +18,7 @@ DIRED_DEFS = \
  -DOK_TAR \
  -DOK_GZIP \
  -DOK_ZIP \
- -DOK_OVERRIDE 
+ -DOK_OVERRIDE
 
 CC = gcc
 
@@ -28,27 +28,36 @@ MCFLAGS = \
  -DDISP_PARTIAL \
  -DDJGPP_KEYHANDLER \
  -DDOSPATH \
+ -DHAVE_POPEN \
  -DNOUSERS \
  -DNO_CUSERID \
  -DNO_TTYTYPE \
  -DNO_UTMP \
- -DSOURCE_CACHE \
  -DUSE_EXTERNALS \
  -DUSE_PRETTYSRC \
  -DUSE_SLANG \
+ -DUSE_SOURCE_CACHE \
  -DUSE_ZLIB \
- -DWATT32 \
+ $(SSLFLAGS) \
+ $(SSLINC) \
  -I./chrtrans \
  -I../WWW/Library/Implementation \
- -I../djgpp/watt32/inc \
- -I../djgpp/watt32/inc/sys
+ -I/dev/env/DJDIR/watt32/inc
 
 WWWLIB = \
  ../WWW/Library/djgpp/libwww.a \
- ../djgpp/watt32/lib/libwatt.a
+ /dev/env/DJDIR/watt32/lib/libwatt.a
 
-LIBS= $(SLANGLIB) -lslang -lz # -lintl
+LIBS= $(SLANGLIB) -lslang $(SSLLIB) -lz $(INTLLIBS)
+
+# Uncomment the following to enable Internationalization.
 #INTLFLAGS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H
+#INTLLIBS= -lintl -liconv
+
+# Uncomment the following to enable SSL.
+#SSLFLAGS = -DUSE_SSL
+#SSLLIB = -lssl -lcrypto
+#SSLINC = -I/dev/env/DJDIR/include/openssl
 
 all: lynx.exe
 
diff --git a/gnu/usr.bin/lynx/src/makefile.in b/gnu/usr.bin/lynx/src/makefile.in
index 7add67d90a6..f96df3a2e0f 100644
--- a/gnu/usr.bin/lynx/src/makefile.in
+++ b/gnu/usr.bin/lynx/src/makefile.in
@@ -3,8 +3,6 @@
 SHELL		= @CONFIG_SHELL@
 CDPATH		= .
 
-x		= @PROG_EXT@
-
 @SET_MAKE@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
@@ -24,7 +22,9 @@ CFLAGS		= @CFLAGS@
 DEFS		= @DEFS@
 CHARSET_DEFS	= @CHARSET_DEFS@
 CPPFLAGS	= @CPPFLAGS@
-_O		= .o
+
+x		= @EXEEXT@
+o		= .@OBJEXT@
 
 LIBS		= @LIBS@ $(RESOLVLIB) $(WAISLIB) $(SITE_LIBS)
 LDFLAGS		= @LDFLAGS@
@@ -38,7 +38,7 @@ WAISLIB		= # FIXME: set in parent makefile
 WWWINC		= WWW/Library/Implementation
 WWWLIB		= $(top_builddir)/WWW/Library/Implementation/libwww.a
 
-INTLLIB		= @INTLDIR_MAKE@@INTLLIBS@
+INTLLIB		= @INTLLIBS@
 INTLDIR_CPPFLAGS= @INTLDIR_CPPFLAGS@-I$(top_srcdir)/intl
 
 CPP_OPTS	= $(CPPFLAGS) $(DEFS) $(CHARSET_DEFS) \
@@ -59,26 +59,26 @@ LINTOPTS	=
 COMPRESS_PROG	=@COMPRESS_PROG@
 COMPRESS_EXT	=@COMPRESS_EXT@
 
-CHARTRANS_OBJS	= UCdomap$(_O) UCAux$(_O) UCAuto$(_O)
+CHARTRANS_OBJS	= UCdomap$o UCAux$o UCAuto$o
 OBJS	= \
-	LYClean$(_O) LYShowInfo$(_O) LYEdit$(_O) LYStrings$(_O) LYMail$(_O) \
-	HTAlert$(_O) GridText$(_O) LYGetFile$(_O) LYMain$(_O) LYMainLoop$(_O) \
-	LYCurses$(_O) LYBookmark$(_O) LYUtils$(_O) LYOptions$(_O) \
-	LYReadCFG$(_O) LYSearch$(_O) LYHistory$(_O) LYForms$(_O) LYPrint$(_O) \
-	LYrcFile$(_O) LYDownload$(_O) LYNews$(_O) LYKeymap$(_O) HTML$(_O) \
-	HTFWriter$(_O) HTInit$(_O) DefaultStyle$(_O) LYUpload$(_O) \
-	LYLeaks$(_O) LYexit$(_O) LYJump$(_O) LYList$(_O) LYCgi$(_O) \
-	LYTraversal$(_O) LYEditmap$(_O) LYCharSets$(_O) LYCharUtils$(_O) \
-	LYMap$(_O) LYCookie$(_O) LYStyle$(_O) LYHash$(_O) LYPrettySrc$(_O) \
-	TRSTable$(_O) $(CHARTRANS_OBJS) @LIBOBJS@
-
-C_SRC	= $(OBJS:$(_O)=.c)
+	LYClean$o LYShowInfo$o LYEdit$o LYStrings$o LYMail$o \
+	HTAlert$o GridText$o LYGetFile$o LYMain$o LYMainLoop$o \
+	LYCurses$o LYBookmark$o LYUtils$o LYOptions$o \
+	LYReadCFG$o LYSearch$o LYHistory$o LYForms$o LYPrint$o \
+	LYrcFile$o LYDownload$o LYNews$o LYKeymap$o HTML$o \
+	HTFWriter$o HTInit$o DefaultStyle$o LYUpload$o \
+	LYLeaks$o LYexit$o LYJump$o LYList$o LYCgi$o \
+	LYTraversal$o LYEditmap$o LYCharSets$o LYCharUtils$o \
+	LYMap$o LYCookie$o LYStyle$o LYHash$o LYPrettySrc$o \
+	TRSTable$o $(CHARTRANS_OBJS) @LIBOBJS@
+
+C_SRC	= $(OBJS:$o=.c)
 
 all: lynx$x
 
-.SUFFIXES : $(_O) .i
+.SUFFIXES : $o .i
 
-.c$(_O):
+.c$o:
 @RULE_CC@
 	@ECHO_CC@$(CC) $(CC_OPTS) -c $(srcdir)/$*.c
 
@@ -108,28 +108,28 @@ lint:
 	$(LINT) $(LINTOPTS) $(CPP_OPTS) *.c  > $(top_builddir)/lint.lynx
 
 clean:
-	rm -f lynx$x core *.core *.leaks *.[oi] *.bak tags TAGS
+	rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS
 	cd chrtrans && $(MAKE) clean
 
 distclean: clean
 
 CMN=$(top_srcdir)/WWW/Library/Implementation/
 
-HTFWriter$(_O):		$(top_srcdir)/userdefs.h
-HTInit$(_O):		$(top_srcdir)/userdefs.h
-LYCharSets$(_O):	$(top_srcdir)/userdefs.h
-LYGetFile$(_O):		$(top_srcdir)/userdefs.h
-LYKeymap$(_O):		$(top_srcdir)/userdefs.h
-LYMail$(_O):		$(top_srcdir)/userdefs.h
-LYMain$(_O):		$(top_srcdir)/userdefs.h $(top_builddir)/lynx_cfg.h
-LYMainLoop$(_O):	$(top_srcdir)/userdefs.h
-LYOptions$(_O):		$(top_srcdir)/userdefs.h
-LYReadCFG$(_O):		$(top_srcdir)/userdefs.h
-LYShowInfo$(_O):	$(top_builddir)/cfg_defs.h
-LYTraversal$(_O):	$(top_srcdir)/userdefs.h
-LYUtils$(_O):		$(top_srcdir)/userdefs.h
-LYrcFile$(_O):		$(top_srcdir)/userdefs.h
-LYLeaks$(_O):		$(CMN)LYLeaks.h $(CMN)HTString.h
+HTFWriter$o :		$(top_srcdir)/userdefs.h
+HTInit$o :		$(top_srcdir)/userdefs.h
+LYCharSets$o :		$(top_srcdir)/userdefs.h
+LYGetFile$o :		$(top_srcdir)/userdefs.h
+LYKeymap$o :		$(top_srcdir)/userdefs.h
+LYMail$o :		$(top_srcdir)/userdefs.h
+LYMain$o :		$(top_srcdir)/userdefs.h $(top_builddir)/lynx_cfg.h
+LYMainLoop$o :		$(top_srcdir)/userdefs.h
+LYOptions$o :		$(top_srcdir)/userdefs.h
+LYReadCFG$o :		$(top_srcdir)/userdefs.h
+LYShowInfo$o :		$(top_builddir)/cfg_defs.h
+LYTraversal$o :		$(top_srcdir)/userdefs.h
+LYUtils$o :		$(top_srcdir)/userdefs.h
+LYrcFile$o :		$(top_srcdir)/userdefs.h
+LYLeaks$o :		$(CMN)LYLeaks.h $(CMN)HTString.h
 
 CHRTR= chrtrans/
 
@@ -176,14 +176,14 @@ TABLES= \
 $(TABLES):
 	-cd chrtrans && $(MAKE) tables
 
-UCdomap$(_O): UCdomap.c chrtrans/UCkd.h chrtrans/makeuctb$x chrtrans/makeuctb.c \
+UCdomap$o : UCdomap.c chrtrans/UCkd.h chrtrans/makeuctb$x chrtrans/makeuctb.c \
 	UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
 
 chrtrans/makeuctb$x:
 	cd chrtrans; make makeuctb$x
 
-UCAux$(_O) : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h
-LYCookie$(_O): $(top_srcdir)/userdefs.h
+UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h
+LYCookie$o : $(top_srcdir)/userdefs.h
 
 depend : $(TABLES)
 	makedepend -fmakefile -- $(CC_OPTS) -- $(C_SRC)
diff --git a/gnu/usr.bin/lynx/src/makefile.wsl b/gnu/usr.bin/lynx/src/makefile.wsl
index 1d771a6ea17..ad594411a8e 100644
--- a/gnu/usr.bin/lynx/src/makefile.wsl
+++ b/gnu/usr.bin/lynx/src/makefile.wsl
@@ -13,7 +13,7 @@ CFLAGS= -O1 $(MCFLAGS) -I. -I.. $(SLANGINC)
 
 CC = gcc
 MCFLAGS = -DDISP_PARTIAL -DUSE_ZLIB -DUSE_EXTERNALS \
--DSOURCE_CACHE -DUSE_PRETTYSRC \
+-DUSE_SOURCE_CACHE -DUSE_PRETTYSRC \
 -DUSE_SLANG -DACCESS_AUTH -DNO_CUSERID \
 -DNOUSERS -DDOSPATH -DNO_TTYTYPE -DNO_UTMP -I../WWW/library/implement -I../djgpp/tcplib/include \
 -I./chrtrans -I../djgpp/tcplib/include/tcp
diff --git a/gnu/usr.bin/lynx/src/structdump.h b/gnu/usr.bin/lynx/src/structdump.h
index cc191ade74c..cd64e71a72e 100644
--- a/gnu/usr.bin/lynx/src/structdump.h
+++ b/gnu/usr.bin/lynx/src/structdump.h
@@ -10,15 +10,15 @@
 #define   DUMPSTRUCT_LINK(L,X) \
 if ((L)) { \
 CTRACE((tfp, "\n" \
-            "KED:     link_ptr=0x%08x  sizeof=%d  ["X"]\n" \
+            "KED:     link_ptr=%p  sizeof=%d  ["X"]\n" \
             "link       struct {\n"      \
-            "           *lname=0x%08x\n" \
+            "           *lname=%p\n"     \
             "            lname=|%s|\n"   \
-            "          *target=0x%08x\n" \
+            "          *target=%p\n"     \
             "           target=|%s|\n"   \
-            "        *hightext=0x%08x\n" \
+            "        *hightext=%p\n"     \
             "         hightext=|%s|\n"   \
-            "       *hightext2=0x%08x\n" \
+            "       *hightext2=%p\n"     \
             "        hightext2=|%s|\n"   \
             " hightext2_offset=%d\n"     \
             "      inUnderline=%1x\n"    \
@@ -27,12 +27,14 @@ CTRACE((tfp, "\n" \
             "             type=%d\n"     \
             "    anchor_number=%d\n"     \
             "  anchor_line_num=%d\n"     \
-            "            *form=0x%08x\n" \
+            "            *form=%p\n"     \
             "}\n", \
             (L), sizeof(*((L))), \
             (L)->lname, (L)->lname, (L)->target, (L)->target, \
-            (L)->hightext, (L)->hightext, (L)->hightext2, (L)->hightext2, \
-            (L)->hightext2_offset, (L)->inUnderline, (L)->lx, (L)->ly, \
+            (L)->l_hightext, (L)->l_hightext, \
+	    (L)->l_hightext2, (L)->l_hightext2, \
+            (L)->l_hightext2_offset, \
+	    (L)->inUnderline, (L)->lx, (L)->ly, \
             (L)->type, (L)->anchor_number, (L)->anchor_line_num, (L)->form)); \
 }else{ \
 CTRACE((tfp, "\n" \
@@ -45,33 +47,32 @@ CTRACE_FLUSH(tfp);
 #define   DUMPSTRUCT_ANCHOR(A,X) \
 if ((A)) { \
 CTRACE((tfp, "\n" \
-            "KED:   anchor_ptr=0x%08x  sizeof=%d  ["X"]\n" \
+            "KED:   anchor_ptr=%p  sizeof=%d  ["X"]\n" \
             "TextAnchor struct {\n"      \
-            "            *next=0x%08x\n" \
+            "            *next=%p\n"     \
             "           number=%d\n"     \
-            "            start=%d\n"     \
             "         line_pos=%d\n"     \
             "           extent=%d\n"     \
             "         line_num=%d\n"     \
-            "        *hightext=0x%08x\n" \
+            "        *hightext=%p\n"     \
             "         hightext=|%s|\n"   \
-            "       *hightext2=0x%08x\n" \
+            "       *hightext2=%p\n"     \
             "        hightext2=|%s|\n"   \
             "  hightext2offset=%d\n"     \
             "        link_type=%d\n"     \
-            "     *input_field=0x%08x\n" \
+            "     *input_field=%p\n"     \
             "      input_field=|%s|\n"   \
             "      show_anchor=%1x\n"    \
             "      inUnderline=%1x\n"    \
             "   expansion_anch=%1x\n"    \
-            "          *anchor=0x%08x\n" \
+            "          *anchor=%p\n"     \
             "}\n", \
             (A), sizeof(*((A))), \
-            (A)->next, (A)->number, (A)->start, (A)->line_pos, \
+            (A)->next, (A)->number, (A)->line_pos, \
             (A)->extent, (A)->line_num, \
             (A)->hightext, (A)->hightext, (A)->hightext2, (A)->hightext2, \
             (A)->hightext2offset, (A)->link_type, \
-            (A)->input_field, (A)->input_field, (A)->show_anchor, \
+            (A)->input_field, (A)->input_field->name, (A)->show_anchor, \
             (A)->inUnderline, (A)->expansion_anch, (A)->anchor)); \
 }else{ \
 CTRACE((tfp, "\n" \
@@ -84,15 +85,15 @@ CTRACE_FLUSH(tfp);
 #define   DUMPSTRUCT_FORMINFO(F,X) \
 if ((F)) { \
 CTRACE((tfp, "\n" \
-            "KED: forminfo_ptr=0x%08x  sizeof=%d  ["X"]\n" \
+            "KED: forminfo_ptr=%p  sizeof=%d  ["X"]\n" \
             "FormInfo   struct {\n"      \
-            "            *name=0x%08x\n" \
+            "            *name=%p\n"     \
             "             name=|%s|\n"   \
             "           number=%d\n"     \
             "             type=%d\n"     \
-            "           *value=0x%08x\n" \
+            "           *value=%p\n"     \
             "            value=|%s|\n"   \
-            "      *orig_value=0x%08x\n" \
+            "      *orig_value=%p\n"     \
             "       orig_value=|%s|\n"   \
             "             size=%d\n"     \
             "        maxlength=%d\n"     \
@@ -100,7 +101,7 @@ CTRACE((tfp, "\n" \
             "        num_value=%d\n"     \
             "           hrange=%d\n"     \
             "           lrange=%d\n"     \
-            "     *select_list=0x%08x\n" \
+            "     *select_list=%p\n"     \
             "    submit_action=|%s|\n"   \
             "    submit_method=%d\n"     \
             "   submit_enctype=|%s|\n"   \
@@ -134,17 +135,17 @@ CTRACE_FLUSH(tfp);
 #define   DUMPSTRUCT_LINE(L,X) \
 if ((L)) { \
 CTRACE((tfp, "\n" \
-            "KED: htline_ptr=0x%08x  sizeof=%d  ["X"]\n" \
+            "KED: htline_ptr=%p  sizeof=%d  ["X"]\n" \
             "HTLine  struct {\n"      \
-            "         *next=0x%08x\n" \
-            "         *prev=0x%08x\n" \
+            "         *next=%p\n"     \
+            "         *prev=%p\n"     \
             "        offset=%d\n"     \
             "          size=%d\n"     \
             "   split_after=%1x\n"    \
             "        bullet=%1x\n"    \
             "expansion_line=%1x\n"    \
             "w/o U_C_S def\n"         \
-            "        data[]=0x%08x\n" \
+            "        data[]=%p\n"     \
             "          data=|%s|\n"   \
             "}\n", \
             (L), sizeof(*((L))), \
diff --git a/gnu/usr.bin/lynx/test/koi8-r.html b/gnu/usr.bin/lynx/test/koi8-r.html
new file mode 100644
index 00000000000..d6792195afb
--- /dev/null
+++ b/gnu/usr.bin/lynx/test/koi8-r.html
@@ -0,0 +1,321 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Test of the KOI8-R symbols</TITLE>
+</HEAD>
+<BODY>
+<PRE>
+
+    This table prepared from KOI8-R.TXT available at ftp.unicode.org
+
+         ftp://ftp.unicode.org/MAPPINGS/VENDORS/MISC/KOI8-R.TXT
+         (if doing ftp, try cd Public/MAPPINGS/VENDORS/MISC)
+
+
+original comment:
+
+#
+#       Name:             KOI8-R (RFC1489) to Unicode
+#       Unicode version:  3.0
+#       Table version:    1.0
+#       Table format:     Format A
+#       Date:             18 August 1999
+#       Authors:          Helmut Richter &lt;richter@lrz.de&gt;
+#
+#       Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
+#       General notes:
+#
+#       This table contains the data the Unicode Consortium has on how
+#       KOI8-R characters map into Unicode. The underlying document is the
+#       mapping described in RFC 1489. No statements are made as to whether
+#       this mapping is the same as the mapping defined as "Code Page 878"
+#       with some vendors.
+#
+#       Format:  Three tab-separated columns
+#                Column #1 is the KOI8-R code (in hex as 0xXX)
+#                Column #2 is the Unicode (in hex as 0xXXXX)
+#                Column #3 the Unicode name (follows a comment sign, '#')
+#
+#       The entries are in KOI8-R order.
+#
+#       Version history
+#       1.0 version: created.
+#
+#       Any comments or problems, contact &lt;errata@unicode.org&gt;
+#       Please note that &lt;errata@unicode.org&gt; is an archival address;
+#       notices will be checked, but do not expect an immediate response.
+#
+0x00    0x0000 "&#x0000"	  # NULL
+0x01    0x0001 "&#x0001"	  # START OF HEADING
+0x02    0x0002 "&#x0002"	  # START OF TEXT
+0x03    0x0003 "&#x0003"	  # END OF TEXT
+0x04    0x0004 "&#x0004"	  # END OF TRANSMISSION
+0x05    0x0005 "&#x0005"	  # ENQUIRY
+0x06    0x0006 "&#x0006"	  # ACKNOWLEDGE
+0x07    0x0007 "&#x0007"	  # BELL
+0x08    0x0008 "&#x0008"	  # BACKSPACE
+0x09    0x0009 "&#x0009"	  # HORIZONTAL TABULATION
+0x0A    0x000A "&#x000A"	  # LINE FEED
+0x0B    0x000B "&#x000B"	  # VERTICAL TABULATION
+0x0C    0x000C "&#x000C"	  # FORM FEED
+0x0D    0x000D "&#x000D"	  # CARRIAGE RETURN
+0x0E    0x000E "&#x000E"	  # SHIFT OUT
+0x0F    0x000F "&#x000F"	  # SHIFT IN
+0x10    0x0010 "&#x0010"	  # DATA LINK ESCAPE
+0x11    0x0011 "&#x0011"	  # DEVICE CONTROL ONE
+0x12    0x0012 "&#x0012"	  # DEVICE CONTROL TWO
+0x13    0x0013 "&#x0013"	  # DEVICE CONTROL THREE
+0x14    0x0014 "&#x0014"	  # DEVICE CONTROL FOUR
+0x15    0x0015 "&#x0015"	  # NEGATIVE ACKNOWLEDGE
+0x16    0x0016 "&#x0016"	  # SYNCHRONOUS IDLE
+0x17    0x0017 "&#x0017"	  # END OF TRANSMISSION BLOCK
+0x18    0x0018 "&#x0018"	  # CANCEL
+0x19    0x0019 "&#x0019"	  # END OF MEDIUM
+0x1A    0x001A "&#x001A"	  # SUBSTITUTE
+0x1B    0x001B "&#x001B"	  # ESCAPE
+0x1C    0x001C "&#x001C"	  # FILE SEPARATOR
+0x1D    0x001D "&#x001D"	  # GROUP SEPARATOR
+0x1E    0x001E "&#x001E"	  # RECORD SEPARATOR
+0x1F    0x001F "&#x001F"	  # UNIT SEPARATOR
+0x20    0x0020 "&#x0020"	  # SPACE
+0x21    0x0021 "&#x0021"	  # EXCLAMATION MARK
+0x22    0x0022 "&#x0022"	  # QUOTATION MARK
+0x23    0x0023 "&#x0023"	  # NUMBER SIGN
+0x24    0x0024 "&#x0024"	  # DOLLAR SIGN
+0x25    0x0025 "&#x0025"	  # PERCENT SIGN
+0x26    0x0026 "&#x0026"	  # AMPERSAND
+0x27    0x0027 "&#x0027"	  # APOSTROPHE
+0x28    0x0028 "&#x0028"	  # LEFT PARENTHESIS
+0x29    0x0029 "&#x0029"	  # RIGHT PARENTHESIS
+0x2A    0x002A "&#x002A"	  # ASTERISK
+0x2B    0x002B "&#x002B"	  # PLUS SIGN
+0x2C    0x002C "&#x002C"	  # COMMA
+0x2D    0x002D "&#x002D"	  # HYPHEN-MINUS
+0x2E    0x002E "&#x002E"	  # FULL STOP
+0x2F    0x002F "&#x002F"	  # SOLIDUS
+0x30    0x0030 "&#x0030"	  # DIGIT ZERO
+0x31    0x0031 "&#x0031"	  # DIGIT ONE
+0x32    0x0032 "&#x0032"	  # DIGIT TWO
+0x33    0x0033 "&#x0033"	  # DIGIT THREE
+0x34    0x0034 "&#x0034"	  # DIGIT FOUR
+0x35    0x0035 "&#x0035"	  # DIGIT FIVE
+0x36    0x0036 "&#x0036"	  # DIGIT SIX
+0x37    0x0037 "&#x0037"	  # DIGIT SEVEN
+0x38    0x0038 "&#x0038"	  # DIGIT EIGHT
+0x39    0x0039 "&#x0039"	  # DIGIT NINE
+0x3A    0x003A "&#x003A"	  # COLON
+0x3B    0x003B "&#x003B"	  # SEMICOLON
+0x3C    0x003C "&#x003C"	  # LESS-THAN SIGN
+0x3D    0x003D "&#x003D"	  # EQUALS SIGN
+0x3E    0x003E "&#x003E"	  # GREATER-THAN SIGN
+0x3F    0x003F "&#x003F"	  # QUESTION MARK
+0x40    0x0040 "&#x0040"	  # COMMERCIAL AT
+0x41    0x0041 "&#x0041"	  # LATIN CAPITAL LETTER A
+0x42    0x0042 "&#x0042"	  # LATIN CAPITAL LETTER B
+0x43    0x0043 "&#x0043"	  # LATIN CAPITAL LETTER C
+0x44    0x0044 "&#x0044"	  # LATIN CAPITAL LETTER D
+0x45    0x0045 "&#x0045"	  # LATIN CAPITAL LETTER E
+0x46    0x0046 "&#x0046"	  # LATIN CAPITAL LETTER F
+0x47    0x0047 "&#x0047"	  # LATIN CAPITAL LETTER G
+0x48    0x0048 "&#x0048"	  # LATIN CAPITAL LETTER H
+0x49    0x0049 "&#x0049"	  # LATIN CAPITAL LETTER I
+0x4A    0x004A "&#x004A"	  # LATIN CAPITAL LETTER J
+0x4B    0x004B "&#x004B"	  # LATIN CAPITAL LETTER K
+0x4C    0x004C "&#x004C"	  # LATIN CAPITAL LETTER L
+0x4D    0x004D "&#x004D"	  # LATIN CAPITAL LETTER M
+0x4E    0x004E "&#x004E"	  # LATIN CAPITAL LETTER N
+0x4F    0x004F "&#x004F"	  # LATIN CAPITAL LETTER O
+0x50    0x0050 "&#x0050"	  # LATIN CAPITAL LETTER P
+0x51    0x0051 "&#x0051"	  # LATIN CAPITAL LETTER Q
+0x52    0x0052 "&#x0052"	  # LATIN CAPITAL LETTER R
+0x53    0x0053 "&#x0053"	  # LATIN CAPITAL LETTER S
+0x54    0x0054 "&#x0054"	  # LATIN CAPITAL LETTER T
+0x55    0x0055 "&#x0055"	  # LATIN CAPITAL LETTER U
+0x56    0x0056 "&#x0056"	  # LATIN CAPITAL LETTER V
+0x57    0x0057 "&#x0057"	  # LATIN CAPITAL LETTER W
+0x58    0x0058 "&#x0058"	  # LATIN CAPITAL LETTER X
+0x59    0x0059 "&#x0059"	  # LATIN CAPITAL LETTER Y
+0x5A    0x005A "&#x005A"	  # LATIN CAPITAL LETTER Z
+0x5B    0x005B "&#x005B"	  # LEFT SQUARE BRACKET
+0x5C    0x005C "&#x005C"	  # REVERSE SOLIDUS
+0x5D    0x005D "&#x005D"	  # RIGHT SQUARE BRACKET
+0x5E    0x005E "&#x005E"	  # CIRCUMFLEX ACCENT
+0x5F    0x005F "&#x005F"	  # LOW LINE
+0x60    0x0060 "&#x0060"	  # GRAVE ACCENT
+0x61    0x0061 "&#x0061"	  # LATIN SMALL LETTER A
+0x62    0x0062 "&#x0062"	  # LATIN SMALL LETTER B
+0x63    0x0063 "&#x0063"	  # LATIN SMALL LETTER C
+0x64    0x0064 "&#x0064"	  # LATIN SMALL LETTER D
+0x65    0x0065 "&#x0065"	  # LATIN SMALL LETTER E
+0x66    0x0066 "&#x0066"	  # LATIN SMALL LETTER F
+0x67    0x0067 "&#x0067"	  # LATIN SMALL LETTER G
+0x68    0x0068 "&#x0068"	  # LATIN SMALL LETTER H
+0x69    0x0069 "&#x0069"	  # LATIN SMALL LETTER I
+0x6A    0x006A "&#x006A"	  # LATIN SMALL LETTER J
+0x6B    0x006B "&#x006B"	  # LATIN SMALL LETTER K
+0x6C    0x006C "&#x006C"	  # LATIN SMALL LETTER L
+0x6D    0x006D "&#x006D"	  # LATIN SMALL LETTER M
+0x6E    0x006E "&#x006E"	  # LATIN SMALL LETTER N
+0x6F    0x006F "&#x006F"	  # LATIN SMALL LETTER O
+0x70    0x0070 "&#x0070"	  # LATIN SMALL LETTER P
+0x71    0x0071 "&#x0071"	  # LATIN SMALL LETTER Q
+0x72    0x0072 "&#x0072"	  # LATIN SMALL LETTER R
+0x73    0x0073 "&#x0073"	  # LATIN SMALL LETTER S
+0x74    0x0074 "&#x0074"	  # LATIN SMALL LETTER T
+0x75    0x0075 "&#x0075"	  # LATIN SMALL LETTER U
+0x76    0x0076 "&#x0076"	  # LATIN SMALL LETTER V
+0x77    0x0077 "&#x0077"	  # LATIN SMALL LETTER W
+0x78    0x0078 "&#x0078"	  # LATIN SMALL LETTER X
+0x79    0x0079 "&#x0079"	  # LATIN SMALL LETTER Y
+0x7A    0x007A "&#x007A"	  # LATIN SMALL LETTER Z
+0x7B    0x007B "&#x007B"	  # LEFT CURLY BRACKET
+0x7C    0x007C "&#x007C"	  # VERTICAL LINE
+0x7D    0x007D "&#x007D"	  # RIGHT CURLY BRACKET
+0x7E    0x007E "&#x007E"	  # TILDE
+0x7F    0x007F "&#x007F"	  # DELETE
+0x80    0x2500 "&#x2500"	  # BOX DRAWINGS LIGHT HORIZONTAL
+0x81    0x2502 "&#x2502"	  # BOX DRAWINGS LIGHT VERTICAL
+0x82    0x250C "&#x250C"	  # BOX DRAWINGS LIGHT DOWN AND RIGHT
+0x83    0x2510 "&#x2510"	  # BOX DRAWINGS LIGHT DOWN AND LEFT
+0x84    0x2514 "&#x2514"	  # BOX DRAWINGS LIGHT UP AND RIGHT
+0x85    0x2518 "&#x2518"	  # BOX DRAWINGS LIGHT UP AND LEFT
+0x86    0x251C "&#x251C"	  # BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+0x87    0x2524 "&#x2524"	  # BOX DRAWINGS LIGHT VERTICAL AND LEFT
+0x88    0x252C "&#x252C"	  # BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+0x89    0x2534 "&#x2534"	  # BOX DRAWINGS LIGHT UP AND HORIZONTAL
+0x8A    0x253C "&#x253C"	  # BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+0x8B    0x2580 "&#x2580"	  # UPPER HALF BLOCK
+0x8C    0x2584 "&#x2584"	  # LOWER HALF BLOCK
+0x8D    0x2588 "&#x2588"	  # FULL BLOCK
+0x8E    0x258C "&#x258C"	  # LEFT HALF BLOCK
+0x8F    0x2590 "&#x2590"	  # RIGHT HALF BLOCK
+0x90    0x2591 "&#x2591"	  # LIGHT SHADE
+0x91    0x2592 "&#x2592"	  # MEDIUM SHADE
+0x92    0x2593 "&#x2593"	  # DARK SHADE
+0x93    0x2320 "&#x2320"	  # TOP HALF INTEGRAL
+0x94    0x25A0 "&#x25A0"	  # BLACK SQUARE
+0x95    0x2219 "&#x2219"	  # BULLET OPERATOR
+0x96    0x221A "&#x221A"	  # SQUARE ROOT
+0x97    0x2248 "&#x2248"	  # ALMOST EQUAL TO
+0x98    0x2264 "&#x2264"	  # LESS-THAN OR EQUAL TO
+0x99    0x2265 "&#x2265"	  # GREATER-THAN OR EQUAL TO
+0x9A    0x00A0 "&#x00A0"	  # NO-BREAK SPACE
+0x9B    0x2321 "&#x2321"	  # BOTTOM HALF INTEGRAL
+0x9C    0x00B0 "&#x00B0"	  # DEGREE SIGN
+0x9D    0x00B2 "&#x00B2"	  # SUPERSCRIPT TWO
+0x9E    0x00B7 "&#x00B7"	  # MIDDLE DOT
+0x9F    0x00F7 "&#x00F7"	  # DIVISION SIGN
+0xA0    0x2550 "&#x2550"	  # BOX DRAWINGS DOUBLE HORIZONTAL
+0xA1    0x2551 "&#x2551"	  # BOX DRAWINGS DOUBLE VERTICAL
+0xA2    0x2552 "&#x2552"	  # BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+0xA3    0x0451 "&#x0451"	  # CYRILLIC SMALL LETTER IO
+0xA4    0x2553 "&#x2553"	  # BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
+0xA5    0x2554 "&#x2554"	  # BOX DRAWINGS DOUBLE DOWN AND RIGHT
+0xA6    0x2555 "&#x2555"	  # BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
+0xA7    0x2556 "&#x2556"	  # BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
+0xA8    0x2557 "&#x2557"	  # BOX DRAWINGS DOUBLE DOWN AND LEFT
+0xA9    0x2558 "&#x2558"	  # BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+0xAA    0x2559 "&#x2559"	  # BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+0xAB    0x255A "&#x255A"	  # BOX DRAWINGS DOUBLE UP AND RIGHT
+0xAC    0x255B "&#x255B"	  # BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+0xAD    0x255C "&#x255C"	  # BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
+0xAE    0x255D "&#x255D"	  # BOX DRAWINGS DOUBLE UP AND LEFT
+0xAF    0x255E "&#x255E"	  # BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+0xB0    0x255F "&#x255F"	  # BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+0xB1    0x2560 "&#x2560"	  # BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+0xB2    0x2561 "&#x2561"	  # BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+0xB3    0x0401 "&#x0401"	  # CYRILLIC CAPITAL LETTER IO
+0xB4    0x2562 "&#x2562"	  # BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
+0xB5    0x2563 "&#x2563"	  # BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+0xB6    0x2564 "&#x2564"	  # BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
+0xB7    0x2565 "&#x2565"	  # BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
+0xB8    0x2566 "&#x2566"	  # BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+0xB9    0x2567 "&#x2567"	  # BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+0xBA    0x2568 "&#x2568"	  # BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+0xBB    0x2569 "&#x2569"	  # BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+0xBC    0x256A "&#x256A"	  # BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+0xBD    0x256B "&#x256B"	  # BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
+0xBE    0x256C "&#x256C"	  # BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+0xBF    0x00A9 "&#x00A9"	  # COPYRIGHT SIGN
+0xC0    0x044E "&#x044E"	  # CYRILLIC SMALL LETTER YU
+0xC1    0x0430 "&#x0430"	  # CYRILLIC SMALL LETTER A
+0xC2    0x0431 "&#x0431"	  # CYRILLIC SMALL LETTER BE
+0xC3    0x0446 "&#x0446"	  # CYRILLIC SMALL LETTER TSE
+0xC4    0x0434 "&#x0434"	  # CYRILLIC SMALL LETTER DE
+0xC5    0x0435 "&#x0435"	  # CYRILLIC SMALL LETTER IE
+0xC6    0x0444 "&#x0444"	  # CYRILLIC SMALL LETTER EF
+0xC7    0x0433 "&#x0433"	  # CYRILLIC SMALL LETTER GHE
+0xC8    0x0445 "&#x0445"	  # CYRILLIC SMALL LETTER HA
+0xC9    0x0438 "&#x0438"	  # CYRILLIC SMALL LETTER I
+0xCA    0x0439 "&#x0439"	  # CYRILLIC SMALL LETTER SHORT I
+0xCB    0x043A "&#x043A"	  # CYRILLIC SMALL LETTER KA
+0xCC    0x043B "&#x043B"	  # CYRILLIC SMALL LETTER EL
+0xCD    0x043C "&#x043C"	  # CYRILLIC SMALL LETTER EM
+0xCE    0x043D "&#x043D"	  # CYRILLIC SMALL LETTER EN
+0xCF    0x043E "&#x043E"	  # CYRILLIC SMALL LETTER O
+0xD0    0x043F "&#x043F"	  # CYRILLIC SMALL LETTER PE
+0xD1    0x044F "&#x044F"	  # CYRILLIC SMALL LETTER YA
+0xD2    0x0440 "&#x0440"	  # CYRILLIC SMALL LETTER ER
+0xD3    0x0441 "&#x0441"	  # CYRILLIC SMALL LETTER ES
+0xD4    0x0442 "&#x0442"	  # CYRILLIC SMALL LETTER TE
+0xD5    0x0443 "&#x0443"	  # CYRILLIC SMALL LETTER U
+0xD6    0x0436 "&#x0436"	  # CYRILLIC SMALL LETTER ZHE
+0xD7    0x0432 "&#x0432"	  # CYRILLIC SMALL LETTER VE
+0xD8    0x044C "&#x044C"	  # CYRILLIC SMALL LETTER SOFT SIGN
+0xD9    0x044B "&#x044B"	  # CYRILLIC SMALL LETTER YERU
+0xDA    0x0437 "&#x0437"	  # CYRILLIC SMALL LETTER ZE
+0xDB    0x0448 "&#x0448"	  # CYRILLIC SMALL LETTER SHA
+0xDC    0x044D "&#x044D"	  # CYRILLIC SMALL LETTER E
+0xDD    0x0449 "&#x0449"	  # CYRILLIC SMALL LETTER SHCHA
+0xDE    0x0447 "&#x0447"	  # CYRILLIC SMALL LETTER CHE
+0xDF    0x044A "&#x044A"	  # CYRILLIC SMALL LETTER HARD SIGN
+0xE0    0x042E "&#x042E"	  # CYRILLIC CAPITAL LETTER YU
+0xE1    0x0410 "&#x0410"	  # CYRILLIC CAPITAL LETTER A
+0xE2    0x0411 "&#x0411"	  # CYRILLIC CAPITAL LETTER BE
+0xE3    0x0426 "&#x0426"	  # CYRILLIC CAPITAL LETTER TSE
+0xE4    0x0414 "&#x0414"	  # CYRILLIC CAPITAL LETTER DE
+0xE5    0x0415 "&#x0415"	  # CYRILLIC CAPITAL LETTER IE
+0xE6    0x0424 "&#x0424"	  # CYRILLIC CAPITAL LETTER EF
+0xE7    0x0413 "&#x0413"	  # CYRILLIC CAPITAL LETTER GHE
+0xE8    0x0425 "&#x0425"	  # CYRILLIC CAPITAL LETTER HA
+0xE9    0x0418 "&#x0418"	  # CYRILLIC CAPITAL LETTER I
+0xEA    0x0419 "&#x0419"	  # CYRILLIC CAPITAL LETTER SHORT I
+0xEB    0x041A "&#x041A"	  # CYRILLIC CAPITAL LETTER KA
+0xEC    0x041B "&#x041B"	  # CYRILLIC CAPITAL LETTER EL
+0xED    0x041C "&#x041C"	  # CYRILLIC CAPITAL LETTER EM
+0xEE    0x041D "&#x041D"	  # CYRILLIC CAPITAL LETTER EN
+0xEF    0x041E "&#x041E"	  # CYRILLIC CAPITAL LETTER O
+0xF0    0x041F "&#x041F"	  # CYRILLIC CAPITAL LETTER PE
+0xF1    0x042F "&#x042F"	  # CYRILLIC CAPITAL LETTER YA
+0xF2    0x0420 "&#x0420"	  # CYRILLIC CAPITAL LETTER ER
+0xF3    0x0421 "&#x0421"	  # CYRILLIC CAPITAL LETTER ES
+0xF4    0x0422 "&#x0422"	  # CYRILLIC CAPITAL LETTER TE
+0xF5    0x0423 "&#x0423"	  # CYRILLIC CAPITAL LETTER U
+0xF6    0x0416 "&#x0416"	  # CYRILLIC CAPITAL LETTER ZHE
+0xF7    0x0412 "&#x0412"	  # CYRILLIC CAPITAL LETTER VE
+0xF8    0x042C "&#x042C"	  # CYRILLIC CAPITAL LETTER SOFT SIGN
+0xF9    0x042B "&#x042B"	  # CYRILLIC CAPITAL LETTER YERU
+0xFA    0x0417 "&#x0417"	  # CYRILLIC CAPITAL LETTER ZE
+0xFB    0x0428 "&#x0428"	  # CYRILLIC CAPITAL LETTER SHA
+0xFC    0x042D "&#x042D"	  # CYRILLIC CAPITAL LETTER E
+0xFD    0x0429 "&#x0429"	  # CYRILLIC CAPITAL LETTER SHCHA
+0xFE    0x0427 "&#x0427"	  # CYRILLIC CAPITAL LETTER CHE
+0xFF    0x042A "&#x042A"	  # CYRILLIC CAPITAL LETTER HARD SIGN
+</PRE>
+</BODY>
+</HTML>
diff --git a/gnu/usr.bin/lynx/test/quickbrown.html b/gnu/usr.bin/lynx/test/quickbrown.html
new file mode 100644
index 00000000000..e3207222f42
--- /dev/null
+++ b/gnu/usr.bin/lynx/test/quickbrown.html
@@ -0,0 +1,103 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Markus Kuhn's quick-brown-fox UTF-8 demo</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<LINK REV="made" HREF="mailto:dickey@invisible-island.net">
+</HEAD>
+
+<BODY> 
+<pre>
+Sentences that contain all letters commonly used in a language
+--------------------------------------------------------------
+
+Markus Kuhn &lt;mkuhn@acm.org&gt; -- 1998-11-30
+
+This file was UTF-8 encoded.
+
+
+German (de)
+-----------
+
+  Falsches &#xdc;ben von Xylophonmusik qu&#xe4;lt jeden gr&#xf6;&#xdf;eren Zwerg
+  (= Wrongful practicing of xylophone music tortures every larger dwarf)
+
+  Zw&#xf6;lf Boxk&#xe4;mpfer jagten Eva quer &#xfc;ber den Sylter Deich
+  (= Twelve boxing fighters hunted Eva across the dike of Sylt)
+
+  Heiz&#xf6;lr&#xfc;cksto&#xdf;abd&#xe4;mpfung
+  (= fuel oil recoil absorber) (jqvwxy missing, but all non-ASCII letters in one word)
+
+English (en)
+------------
+
+  The quick brown fox jumps over the lazy dog
+
+French (fr)
+-----------
+
+  Portez ce vieux whisky au juge blond qui fume sur son &#xee;le int&#xe9;rieure, &#xe0;
+  c&#xf4;t&#xe9; de l'alc&#xf4;ve ovo&#xef;de, o&#xf9; les b&#xfb;ches se consument dans l'&#xe2;tre, ce qui lui
+  permet de penser &#xe0; la c&#xe6;nogen&#xe8;se de l'&#xea;tre dont il est question dans la
+  cause ambigu&#xeb; entendue &#xe0; Mo&#xff;, dans un capharna&#xfc;m qui, pense-t-il, diminue
+  &#xe7;&#xe0; et l&#xe0; la qualit&#xe9; de son &#x153;uvre. 
+
+  l'&#xee;le exigu&#xeb;
+  O&#xf9; l'ob&#xe8;se jury m&#xfb;r
+  F&#xea;te l'ha&#xef; volap&#xfc;k,
+  &#xc2;ne ex a&#xe9;quo au whist,
+  &#xd4;tez ce v&#x153;u d&#xe9;&#xe7;u.
+
+  Le c&#x153;ur d&#xe9;&#xe7;u mais l'&#xe2;me plut&#xf4;t na&#xef;ve, Lou&#xff;s r&#xea;va de crapa&#xfc;ter en
+  cano&#xeb; au del&#xe0; des &#xee;les, pr&#xe8;s du m&#xe4;lstr&#xf6;m o&#xf9; br&#xfb;lent les nov&#xe6;.
+
+Irish Gaelic (ga)
+-----------------
+
+  D'fhuascail &#xcd;osa, &#xda;rmhac na h&#xd3;ighe Beannaithe, p&#xf3;r &#xc9;ava agus &#xc1;dhaimh
+
+Icelandic (is)
+--------------
+
+  K&#xe6;mi n&#xfd; &#xf6;xi h&#xe9;r ykist &#xfe;j&#xf3;fum n&#xfa; b&#xe6;&#xf0;i v&#xed;l og &#xe1;drepa
+
+  S&#xe6;v&#xf6;r gr&#xe9;t &#xe1;&#xf0;an &#xfe;v&#xed; &#xfa;lpan var &#xf3;n&#xfd;t
+  (some ASCII letters missing)
+
+Hebrew (iw)
+-----------
+
+  &#x5d3;&#x5d2; &#x5e1;&#x5e7;&#x5e8;&#x5df; &#x5e9;&#x5d8; &#x5d1;&#x5d9;&#x5dd; &#x5de;&#x5d0;&#x5d5;&#x5db;&#x5d6;&#x5d1; &#x5d5;&#x5dc;&#x5e4;&#x5ea;&#x5e2; &#x5de;&#x5e6;&#x5d0; &#x5dc;&#x5d5; &#x5d7;&#x5d1;&#x5e8;&#x5d4; &#x5d0;&#x5d9;&#x5da; &#x5d4;&#x5e7;&#x5dc;&#x5d9;&#x5d8;&#x5d4;?
+
+Polish (pl)
+-----------
+
+  Pchn&#x105;&#x107; w t&#x119; &#x142;&#xf3;d&#x17a; je&#x17c;a lub o&#x15b;m skrzy&#x144; fig
+
+Russian (ru)
+------------
+
+  &#x412; &#x447;&#x430;&#x449;&#x430;&#x445; &#x44e;&#x433;&#x430; &#x436;&#x438;&#x43b; &#x431;&#x44b; &#x446;&#x438;&#x442;&#x440;&#x443;&#x441;? &#x414;&#x430;, &#x43d;&#x43e; &#x444;&#x430;&#x43b;&#x44c;&#x448;&#x438;&#x432;&#x44b;&#x439; &#x44d;&#x43a;&#x437;&#x435;&#x43c;&#x43f;&#x43b;&#x44f;&#x440;!
+  (= Would a citrus live in the bushes of south? Yes, but a only a fake!)
+
+
+Please let me know if you find others! Special thanks to the people
+from all over the world who contributed these sentences.
+
+</pre>
+See also:
+<ul>
+<li><a href="http://www.columbia.edu/kermit/utf8.html"
+            >http://www.columbia.edu/kermit/utf8.html</a>
+<li><a href="http://www.kernel.org/"
+            >http://www.kernel.org/</a>
+<li><a href="http://www.unicode.org/"
+            >http://www.unicode.org/</a>
+<br>and
+<li><a href="http://www.cl.cam.ac.uk/~mgk25/ucs/examples/TeX.txt"
+            >http://www.cl.cam.ac.uk/~mgk25/ucs/examples/TeX.txt</a>
+<li><a href="http://www.cl.cam.ac.uk/~mgk25/ucs/wgl4.txt"
+            >http://www.cl.cam.ac.uk/~mgk25/ucs/wgl4.txt</a>
+</ul>
+</BODY>
+</HTML>
diff --git a/gnu/usr.bin/lynx/test/sgml.html b/gnu/usr.bin/lynx/test/sgml.html
index da3b0277452..9442534582c 100644
--- a/gnu/usr.bin/lynx/test/sgml.html
+++ b/gnu/usr.bin/lynx/test/sgml.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML>
 <HEAD>
 <TITLE>Test of some Unicode symbols enclosed as SGML entity names</TITLE>
@@ -48,14 +49,14 @@ original comment:
 
 -->
 
-This test illuminating SGML character entities implementation in your browser.
+This test illuminates SGML character entities implementation in your browser.
 We sort the entities according to unicode numbers.
-You should see visible character if your display character set support it
+You should see visible character if your display character set supports it
 or some substitution string picked up from  src/chrtrans/def7_uni.tbl.
 If you see &amp;somename; - this name is not implemented yet,
-you may search for &amp;. (Sorry, ISOgrk4 which hold a dot in its name
+you may search for &amp;. (Sorry, ISOgrk4 which holds a dot in its name
 seems to be nonvisible for most browsers.  Keep in mind that
-this table is much wider than in HTML 4.0 draft).
+this table is much wider than in the HTML 4.0 draft).
 							Leonid Pauzner.
 
 
@@ -405,9 +406,9 @@ this table is much wider than in HTML 4.0 draft).
 0x03B3    &b.gamma;	      ISOgrk4	# GREEK SMALL LETTER GAMMA
 0x03B3    &gamma;	      ISOgrk3	# GREEK SMALL LETTER GAMMA
 0x03B3    &ggr;	      ISOgrk1	# GREEK SMALL LETTER GAMMA
+0x03B4    &b.delta;	      ISOgrk4   # GREEK SMALL LETTER DELTA
 0x03B4    &delta;	      ISOgrk3	# GREEK SMALL LETTER DELTA
 0x03B4    &dgr;	      ISOgrk1	# GREEK SMALL LETTER DELTA
-0x03B4    &b.delta;          ISOgrk4   # GREEK SMALL LETTER DELTA
 0x03B5    &b.epsi;	      ISOgrk4	# GREEK SMALL LETTER EPSILON
 0x03B5    &b.epsis;	      ISOgrk4	# GREEK SMALL LETTER EPSILON
 0x03B5    &b.epsiv;	      ISOgrk4	# GREEK SMALL LETTER EPSILON
@@ -633,7 +634,7 @@ this table is much wider than in HTML 4.0 draft).
 0x2041    &caret;	      ISOpub	# CARET INSERTION POINT
 0x2043    &hybull;	      ISOpub	# HYPHEN BULLET
 0x2044    &frasl;	      HTMLsymbol	# FRACTION SLASH
-0x20AC    &euro;             new       # EURO SIGN
+0x20AC    &euro;	      new       # EURO SIGN
 0x20DB    &tdot;	      ISOtech	# COMBINING THREE DOTS ABOVE
 0x20DC    &DotDot;	      ISOtech	# COMBINING FOUR DOTS ABOVE
 0x2105    &incare;	      ISOpub	# CARE OF
diff --git a/gnu/usr.bin/lynx/test/unicode.html b/gnu/usr.bin/lynx/test/unicode.html
index 07ca28c109f..7abcd1a2232 100644
--- a/gnu/usr.bin/lynx/test/unicode.html
+++ b/gnu/usr.bin/lynx/test/unicode.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML>
 <HEAD>
 <TITLE>Test of some Unicode symbols in numeric character reference form</TITLE>
@@ -526,7 +527,7 @@ or the internal browser's implementation is broken.
 0x2041    &#x2041;  		# CARET INSERTION POINT
 0x2043    &#x2043;  		# HYPHEN BULLET
 0x2044    &#x2044;  		# FRACTION SLASH
-0x20AC    &#x20AC;             # EURO SIGN
+0x20AC    &#x20AC;  		# EURO SIGN
 0x20DB    &#x20DB;  		# COMBINING THREE DOTS ABOVE
 0x20DC    &#x20DC;  		# COMBINING FOUR DOTS ABOVE
 0x2105    &#x2105;  		# CARE OF
diff --git a/gnu/usr.bin/lynx/test/utf-8-demo.html b/gnu/usr.bin/lynx/test/utf-8-demo.html
new file mode 100644
index 00000000000..d792903f304
--- /dev/null
+++ b/gnu/usr.bin/lynx/test/utf-8-demo.html
@@ -0,0 +1,216 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD>
+<TITLE>Markus Kuhn's UTF-8 demo</TITLE>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<LINK REV="made" HREF="mailto:dickey@invisible-island.net">
+</HEAD>
+
+<BODY> 
+<pre>
+UTF-8 encoded sample plain-text file
+&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;&#x203e;
+
+Markus Kuhn [&#x2c8;ma&#x2b3;k&#x28a;s ku&#x2d0;n] &lt;mkuhn@acm.org&gt; &#x2014; 1999-08-20
+
+
+The ASCII compatible UTF-8 encoding of ISO 10646 and Unicode
+plain-text files is defined in RFC 2279 and in ISO 10646-1 Annex R.
+
+
+Using Unicode/UTF-8, you can write in emails and source code things such as
+
+Mathematics and Sciences:
+
+  &#x222e; E&#x22c5;da = Q,  n &#x2192; &#x221e;, &#x2211; f(i) = &#x220f; g(i), &#x2200;x&#x2208;&#x211d;: &#x2308;x&#x2309; = &#x2212;&#x230a;&#x2212;x&#x230b;, &#x3b1; &#x2227; &#xac;&#x3b2; = &#xac;(&#xac;&#x3b1; &#x2228; &#x3b2;),
+
+  &#x2115; &#x2286; &#x2115;&#x2080; &#x2282; &#x2124; &#x2282; &#x211a; &#x2282; &#x211d; &#x2282; &#x2102;, &#x22a5; &lt; a &#x2260; b &#x2261; c &#x2264; d &#x226a; &#x22a4; &#x21d2; (A &#x21d4; B),
+
+  2H&#x2082; + O&#x2082; &#x21cc; 2H&#x2082;O, R = 4.7 k&#x3a9;, &#x2300; 200 mm
+
+Linguistics and dictionaries:
+
+  &#xf0;i &#x131;nt&#x259;&#x2c8;n&#xe6;&#x283;&#x259;n&#x259;l f&#x259;&#x2c8;n&#x25b;t&#x131;k &#x259;so&#x28a;si&#x2c8;e&#x131;&#x283;n
+  Y [&#x2c8;&#x28f;psil&#x254;n], Yen [j&#x25b;n], Yoga [&#x2c8;jo&#x2d0;g&#x251;]
+
+APL:
+
+  ((V&#x2373;V)=&#x2373;&#x2374;V)/V&#x2190;,V    &#x2337;&#x2190;&#x2373;&#x2192;&#x2374;&#x2206;&#x2207;&#x2283;&#x203e;&#x234e;&#x2355;&#x2308;
+
+Nicer typography in plain text files:
+
+  &#x2554;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2557;
+  &#x2551;                                          &#x2551;
+  &#x2551;   &#x2022; &#x2018;single&#x2019; and &#x201c;double&#x201d; quotes         &#x2551;
+  &#x2551;                                          &#x2551;
+  &#x2551;   &#x2022; Curly apostrophes: &#x201c;We&#x2019;ve been here&#x201d; &#x2551;
+  &#x2551;                                          &#x2551;
+  &#x2551;   &#x2022; Latin-1 apostrophe and accents: '&#xb4;`  &#x2551;
+  &#x2551;                                          &#x2551;
+  &#x2551;   &#x2022; &#x201a;deutsche&#x2018; &#x201e;Anf&#xfc;hrungszeichen&#x201c;       &#x2551;
+  &#x2551;                                          &#x2551;
+  &#x2551;   &#x2022; &#x2020;, &#x2021;, &#x2030;, &#x2022;, 3&#x2013;4, &#x2014;, &#x2212;5/+5, &#x2122;, &#x2026;      &#x2551;
+  &#x2551;                                          &#x2551;
+  &#x2551;   &#x2022; ASCII safety test: 1lI|, 0OD, 8B     &#x2551;
+  &#x2551;                      &#x256d;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x256e;         &#x2551;
+  &#x2551;   &#x2022; the euro symbol: &#x2502; &#x20ac; 14.95 &#x2502;         &#x2551;
+  &#x2551;                      &#x2570;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x2500;&#x256f;         &#x2551;
+  &#x255a;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x2550;&#x255d;
+
+Greek (in Polytonic):
+
+  The Greek anthem:
+
+  &#x3a3;&#x1f72; &#x3b3;&#x3bd;&#x3c9;&#x3c1;&#x1f77;&#x3b6;&#x3c9; &#x1f00;&#x3c0;&#x1f78; &#x3c4;&#x1f74;&#x3bd; &#x3ba;&#x1f79;&#x3c8;&#x3b7;
+  &#x3c4;&#x3bf;&#x1fe6; &#x3c3;&#x3c0;&#x3b1;&#x3b8;&#x3b9;&#x3bf;&#x1fe6; &#x3c4;&#x1f74;&#x3bd; &#x3c4;&#x3c1;&#x3bf;&#x3bc;&#x3b5;&#x3c1;&#x1f75;,
+  &#x3c3;&#x1f72; &#x3b3;&#x3bd;&#x3c9;&#x3c1;&#x1f77;&#x3b6;&#x3c9; &#x1f00;&#x3c0;&#x1f78; &#x3c4;&#x1f74;&#x3bd; &#x1f44;&#x3c8;&#x3b7;
+  &#x3c0;&#x3bf;&#x1f7a; &#x3bc;&#x1f72; &#x3b2;&#x1f77;&#x3b1; &#x3bc;&#x3b5;&#x3c4;&#x3c1;&#x1f71;&#x3b5;&#x3b9; &#x3c4;&#x1f74; &#x3b3;&#x1fc6;.
+
+  &#x1fbf;&#x391;&#x3c0;&#x1fbf; &#x3c4;&#x1f70; &#x3ba;&#x1f79;&#x3ba;&#x3ba;&#x3b1;&#x3bb;&#x3b1; &#x3b2;&#x3b3;&#x3b1;&#x3bb;&#x3bc;&#x1f73;&#x3bd;&#x3b7;
+  &#x3c4;&#x1ff6;&#x3bd; &#x1ffe;&#x395;&#x3bb;&#x3bb;&#x1f75;&#x3bd;&#x3c9;&#x3bd; &#x3c4;&#x1f70; &#x1f31;&#x3b5;&#x3c1;&#x1f71;
+  &#x3ba;&#x3b1;&#x1f76; &#x3c3;&#x1f70;&#x3bd; &#x3c0;&#x3c1;&#x1ff6;&#x3c4;&#x3b1; &#x1f00;&#x3bd;&#x3b4;&#x3c1;&#x3b5;&#x3b9;&#x3c9;&#x3bc;&#x1f73;&#x3bd;&#x3b7;
+  &#x3c7;&#x3b1;&#x1fd6;&#x3c1;&#x3b5;, &#x1f66; &#x3c7;&#x3b1;&#x1fd6;&#x3c1;&#x3b5;, &#x1fbf;&#x395;&#x3bb;&#x3b5;&#x3c5;&#x3b8;&#x3b5;&#x3c1;&#x3b9;&#x1f71;!
+
+  From a speech of Demosthenes in the 4th century BC:
+
+  &#x39f;&#x1f50;&#x3c7;&#x1f76; &#x3c4;&#x3b1;&#x1f50;&#x3c4;&#x1f70; &#x3c0;&#x3b1;&#x3c1;&#x1f77;&#x3c3;&#x3c4;&#x3b1;&#x3c4;&#x3b1;&#x1f77; &#x3bc;&#x3bf;&#x3b9; &#x3b3;&#x3b9;&#x3b3;&#x3bd;&#x1f7d;&#x3c3;&#x3ba;&#x3b5;&#x3b9;&#x3bd;, &#x1f66; &#x1f04;&#x3bd;&#x3b4;&#x3c1;&#x3b5;&#x3c2; &#x1fbf;&#x391;&#x3b8;&#x3b7;&#x3bd;&#x3b1;&#x1fd6;&#x3bf;&#x3b9;,
+  &#x1f45;&#x3c4;&#x3b1;&#x3bd; &#x3c4;&#x1fbf; &#x3b5;&#x1f30;&#x3c2; &#x3c4;&#x1f70; &#x3c0;&#x3c1;&#x1f71;&#x3b3;&#x3bc;&#x3b1;&#x3c4;&#x3b1; &#x1f00;&#x3c0;&#x3bf;&#x3b2;&#x3bb;&#x1f73;&#x3c8;&#x3c9; &#x3ba;&#x3b1;&#x1f76; &#x1f45;&#x3c4;&#x3b1;&#x3bd; &#x3c0;&#x3c1;&#x1f78;&#x3c2; &#x3c4;&#x3bf;&#x1f7a;&#x3c2;
+  &#x3bb;&#x1f79;&#x3b3;&#x3bf;&#x3c5;&#x3c2; &#x3bf;&#x1f53;&#x3c2; &#x1f00;&#x3ba;&#x3bf;&#x1f7b;&#x3c9;&#x387; &#x3c4;&#x3bf;&#x1f7a;&#x3c2; &#x3bc;&#x1f72;&#x3bd; &#x3b3;&#x1f70;&#x3c1; &#x3bb;&#x1f79;&#x3b3;&#x3bf;&#x3c5;&#x3c2; &#x3c0;&#x3b5;&#x3c1;&#x1f76; &#x3c4;&#x3bf;&#x1fe6;
+  &#x3c4;&#x3b9;&#x3bc;&#x3c9;&#x3c1;&#x1f75;&#x3c3;&#x3b1;&#x3c3;&#x3b8;&#x3b1;&#x3b9; &#x3a6;&#x1f77;&#x3bb;&#x3b9;&#x3c0;&#x3c0;&#x3bf;&#x3bd; &#x1f41;&#x3c1;&#x1ff6; &#x3b3;&#x3b9;&#x3b3;&#x3bd;&#x3bf;&#x3bc;&#x1f73;&#x3bd;&#x3bf;&#x3c5;&#x3c2;, &#x3c4;&#x1f70; &#x3b4;&#x1f72; &#x3c0;&#x3c1;&#x1f71;&#x3b3;&#x3bc;&#x3b1;&#x3c4;&#x1fbf; 
+  &#x3b5;&#x1f30;&#x3c2; &#x3c4;&#x3bf;&#x1fe6;&#x3c4;&#x3bf; &#x3c0;&#x3c1;&#x3bf;&#x1f75;&#x3ba;&#x3bf;&#x3bd;&#x3c4;&#x3b1;,  &#x1f65;&#x3c3;&#x3b8;&#x1fbf; &#x1f45;&#x3c0;&#x3c9;&#x3c2; &#x3bc;&#x1f74; &#x3c0;&#x3b5;&#x3b9;&#x3c3;&#x1f79;&#x3bc;&#x3b5;&#x3b8;&#x1fbf; &#x3b1;&#x1f50;&#x3c4;&#x3bf;&#x1f76;
+  &#x3c0;&#x3c1;&#x1f79;&#x3c4;&#x3b5;&#x3c1;&#x3bf;&#x3bd; &#x3ba;&#x3b1;&#x3ba;&#x1ff6;&#x3c2; &#x3c3;&#x3ba;&#x1f73;&#x3c8;&#x3b1;&#x3c3;&#x3b8;&#x3b1;&#x3b9; &#x3b4;&#x1f73;&#x3bf;&#x3bd;. &#x3bf;&#x1f50;&#x3b4;&#x1f73;&#x3bd; &#x3bf;&#x1f56;&#x3bd; &#x1f04;&#x3bb;&#x3bb;&#x3bf; &#x3bc;&#x3bf;&#x3b9; &#x3b4;&#x3bf;&#x3ba;&#x3bf;&#x1fe6;&#x3c3;&#x3b9;&#x3bd;
+  &#x3bf;&#x1f31; &#x3c4;&#x1f70; &#x3c4;&#x3bf;&#x3b9;&#x3b1;&#x1fe6;&#x3c4;&#x3b1; &#x3bb;&#x1f73;&#x3b3;&#x3bf;&#x3bd;&#x3c4;&#x3b5;&#x3c2; &#x1f22; &#x3c4;&#x1f74;&#x3bd; &#x1f51;&#x3c0;&#x1f79;&#x3b8;&#x3b5;&#x3c3;&#x3b9;&#x3bd;, &#x3c0;&#x3b5;&#x3c1;&#x1f76; &#x1f27;&#x3c2; &#x3b2;&#x3bf;&#x3c5;&#x3bb;&#x3b5;&#x1f7b;&#x3b5;&#x3c3;&#x3b8;&#x3b1;&#x3b9;,
+  &#x3bf;&#x1f50;&#x3c7;&#x1f76; &#x3c4;&#x1f74;&#x3bd; &#x3bf;&#x1f56;&#x3c3;&#x3b1;&#x3bd; &#x3c0;&#x3b1;&#x3c1;&#x3b9;&#x3c3;&#x3c4;&#x1f71;&#x3bd;&#x3c4;&#x3b5;&#x3c2; &#x1f51;&#x3bc;&#x1fd6;&#x3bd; &#x1f01;&#x3bc;&#x3b1;&#x3c1;&#x3c4;&#x1f71;&#x3bd;&#x3b5;&#x3b9;&#x3bd;. &#x1f10;&#x3b3;&#x1f7c; &#x3b4;&#x1f73;, &#x1f45;&#x3c4;&#x3b9; &#x3bc;&#x1f73;&#x3bd;
+  &#x3c0;&#x3bf;&#x3c4;&#x1fbf; &#x1f10;&#x3be;&#x1fc6;&#x3bd; &#x3c4;&#x1fc7; &#x3c0;&#x1f79;&#x3bb;&#x3b5;&#x3b9; &#x3ba;&#x3b1;&#x1f76; &#x3c4;&#x1f70; &#x3b1;&#x1f51;&#x3c4;&#x1fc6;&#x3c2; &#x1f14;&#x3c7;&#x3b5;&#x3b9;&#x3bd; &#x1f00;&#x3c3;&#x3c6;&#x3b1;&#x3bb;&#x1ff6;&#x3c2; &#x3ba;&#x3b1;&#x1f76; &#x3a6;&#x1f77;&#x3bb;&#x3b9;&#x3c0;&#x3c0;&#x3bf;&#x3bd;
+  &#x3c4;&#x3b9;&#x3bc;&#x3c9;&#x3c1;&#x1f75;&#x3c3;&#x3b1;&#x3c3;&#x3b8;&#x3b1;&#x3b9;, &#x3ba;&#x3b1;&#x1f76; &#x3bc;&#x1f71;&#x3bb;&#x1fbf; &#x1f00;&#x3ba;&#x3c1;&#x3b9;&#x3b2;&#x1ff6;&#x3c2; &#x3bf;&#x1f36;&#x3b4;&#x3b1;&#x387; &#x1f10;&#x3c0;&#x1fbf; &#x1f10;&#x3bc;&#x3bf;&#x1fe6; &#x3b3;&#x1f71;&#x3c1;, &#x3bf;&#x1f50; &#x3c0;&#x1f71;&#x3bb;&#x3b1;&#x3b9;
+  &#x3b3;&#x1f73;&#x3b3;&#x3bf;&#x3bd;&#x3b5;&#x3bd; &#x3c4;&#x3b1;&#x1fe6;&#x3c4;&#x1fbf; &#x1f00;&#x3bc;&#x3c6;&#x1f79;&#x3c4;&#x3b5;&#x3c1;&#x3b1;&#x387; &#x3bd;&#x1fe6;&#x3bd; &#x3bc;&#x1f73;&#x3bd;&#x3c4;&#x3bf;&#x3b9; &#x3c0;&#x1f73;&#x3c0;&#x3b5;&#x3b9;&#x3c3;&#x3bc;&#x3b1;&#x3b9; &#x3c4;&#x3bf;&#x1fe6;&#x3b8;&#x1fbf; &#x1f31;&#x3ba;&#x3b1;&#x3bd;&#x1f78;&#x3bd;
+  &#x3c0;&#x3c1;&#x3bf;&#x3bb;&#x3b1;&#x3b2;&#x3b5;&#x1fd6;&#x3bd; &#x1f21;&#x3bc;&#x1fd6;&#x3bd; &#x3b5;&#x1f36;&#x3bd;&#x3b1;&#x3b9; &#x3c4;&#x1f74;&#x3bd; &#x3c0;&#x3c1;&#x1f7d;&#x3c4;&#x3b7;&#x3bd;, &#x1f45;&#x3c0;&#x3c9;&#x3c2; &#x3c4;&#x3bf;&#x1f7a;&#x3c2; &#x3c3;&#x3c5;&#x3bc;&#x3bc;&#x1f71;&#x3c7;&#x3bf;&#x3c5;&#x3c2;
+  &#x3c3;&#x1f7d;&#x3c3;&#x3bf;&#x3bc;&#x3b5;&#x3bd;. &#x1f10;&#x1f70;&#x3bd; &#x3b3;&#x1f70;&#x3c1; &#x3c4;&#x3bf;&#x1fe6;&#x3c4;&#x3bf; &#x3b2;&#x3b5;&#x3b2;&#x3b1;&#x1f77;&#x3c9;&#x3c2; &#x1f51;&#x3c0;&#x1f71;&#x3c1;&#x3be;&#x1fc3;, &#x3c4;&#x1f79;&#x3c4;&#x3b5; &#x3ba;&#x3b1;&#x1f76; &#x3c0;&#x3b5;&#x3c1;&#x1f76; &#x3c4;&#x3bf;&#x1fe6;
+  &#x3c4;&#x1f77;&#x3bd;&#x3b1; &#x3c4;&#x3b9;&#x3bc;&#x3c9;&#x3c1;&#x1f75;&#x3c3;&#x3b5;&#x3c4;&#x3b1;&#x1f77; &#x3c4;&#x3b9;&#x3c2; &#x3ba;&#x3b1;&#x1f76; &#x1f43;&#x3bd; &#x3c4;&#x3c1;&#x1f79;&#x3c0;&#x3bf;&#x3bd; &#x1f10;&#x3be;&#x1f73;&#x3c3;&#x3c4;&#x3b1;&#x3b9; &#x3c3;&#x3ba;&#x3bf;&#x3c0;&#x3b5;&#x1fd6;&#x3bd;&#x387; &#x3c0;&#x3c1;&#x1f76;&#x3bd; &#x3b4;&#x1f72;
+  &#x3c4;&#x1f74;&#x3bd; &#x1f00;&#x3c1;&#x3c7;&#x1f74;&#x3bd; &#x1f40;&#x3c1;&#x3b8;&#x1ff6;&#x3c2; &#x1f51;&#x3c0;&#x3bf;&#x3b8;&#x1f73;&#x3c3;&#x3b8;&#x3b1;&#x3b9;, &#x3bc;&#x1f71;&#x3c4;&#x3b1;&#x3b9;&#x3bf;&#x3bd; &#x1f21;&#x3b3;&#x3bf;&#x1fe6;&#x3bc;&#x3b1;&#x3b9; &#x3c0;&#x3b5;&#x3c1;&#x1f76; &#x3c4;&#x1fc6;&#x3c2;
+  &#x3c4;&#x3b5;&#x3bb;&#x3b5;&#x3c5;&#x3c4;&#x1fc6;&#x3c2; &#x1f41;&#x3bd;&#x3c4;&#x3b9;&#x3bd;&#x3bf;&#x1fe6;&#x3bd; &#x3c0;&#x3bf;&#x3b9;&#x3b5;&#x1fd6;&#x3c3;&#x3b8;&#x3b1;&#x3b9; &#x3bb;&#x1f79;&#x3b3;&#x3bf;&#x3bd;.
+
+  &#x394;&#x3b7;&#x3bc;&#x3bf;&#x3c3;&#x3b8;&#x1f73;&#x3bd;&#x3bf;&#x3c5;&#x3c2;, &#x393;&#x1ffd; &#x1fbf;&#x39f;&#x3bb;&#x3c5;&#x3bd;&#x3b8;&#x3b9;&#x3b1;&#x3ba;&#x1f78;&#x3c2;
+
+Georgian:
+
+  From a Unicode conference invitation:
+
+  &#x10d2;&#x10d7;&#x10ee;&#x10dd;&#x10d5;&#x10d7; &#x10d0;&#x10ee;&#x10da;&#x10d0;&#x10d5;&#x10d4; &#x10d2;&#x10d0;&#x10d8;&#x10d0;&#x10e0;&#x10dd;&#x10d7; &#x10e0;&#x10d4;&#x10d2;&#x10d8;&#x10e1;&#x10e2;&#x10e0;&#x10d0;&#x10ea;&#x10d8;&#x10d0; Unicode-&#x10d8;&#x10e1; &#x10db;&#x10d4;&#x10d0;&#x10d7;&#x10d4; &#x10e1;&#x10d0;&#x10d4;&#x10e0;&#x10d7;&#x10d0;&#x10e8;&#x10dd;&#x10e0;&#x10d8;&#x10e1;&#x10dd;
+  &#x10d9;&#x10dd;&#x10dc;&#x10e4;&#x10d4;&#x10e0;&#x10d4;&#x10dc;&#x10ea;&#x10d8;&#x10d0;&#x10d6;&#x10d4; &#x10d3;&#x10d0;&#x10e1;&#x10d0;&#x10e1;&#x10ec;&#x10e0;&#x10d4;&#x10d1;&#x10d0;&#x10d3;, &#x10e0;&#x10dd;&#x10db;&#x10d4;&#x10da;&#x10d8;&#x10ea; &#x10d2;&#x10d0;&#x10d8;&#x10db;&#x10d0;&#x10e0;&#x10d7;&#x10d4;&#x10d1;&#x10d0; 10-12 &#x10db;&#x10d0;&#x10e0;&#x10e2;&#x10e1;,
+  &#x10e5;. &#x10db;&#x10d0;&#x10d8;&#x10dc;&#x10ea;&#x10e8;&#x10d8;, &#x10d2;&#x10d4;&#x10e0;&#x10db;&#x10d0;&#x10dc;&#x10d8;&#x10d0;&#x10e8;&#x10d8;. &#x10d9;&#x10dd;&#x10dc;&#x10e4;&#x10d4;&#x10e0;&#x10d4;&#x10dc;&#x10ea;&#x10d8;&#x10d0; &#x10e8;&#x10d4;&#x10f0;&#x10d9;&#x10e0;&#x10d4;&#x10d1;&#x10e1; &#x10d4;&#x10e0;&#x10d7;&#x10d0;&#x10d3; &#x10db;&#x10e1;&#x10dd;&#x10e4;&#x10da;&#x10d8;&#x10dd;&#x10e1;
+  &#x10d4;&#x10e5;&#x10e1;&#x10de;&#x10d4;&#x10e0;&#x10e2;&#x10d4;&#x10d1;&#x10e1; &#x10d8;&#x10e1;&#x10d4;&#x10d7; &#x10d3;&#x10d0;&#x10e0;&#x10d2;&#x10d4;&#x10d1;&#x10e8;&#x10d8; &#x10e0;&#x10dd;&#x10d2;&#x10dd;&#x10e0;&#x10d8;&#x10ea;&#x10d0;&#x10d0; &#x10d8;&#x10dc;&#x10e2;&#x10d4;&#x10e0;&#x10dc;&#x10d4;&#x10e2;&#x10d8; &#x10d3;&#x10d0; Unicode-&#x10d8;,
+  &#x10d8;&#x10dc;&#x10e2;&#x10d4;&#x10e0;&#x10dc;&#x10d0;&#x10ea;&#x10d8;&#x10dd;&#x10dc;&#x10d0;&#x10da;&#x10d8;&#x10d6;&#x10d0;&#x10ea;&#x10d8;&#x10d0; &#x10d3;&#x10d0; &#x10da;&#x10dd;&#x10d9;&#x10d0;&#x10da;&#x10d8;&#x10d6;&#x10d0;&#x10ea;&#x10d8;&#x10d0;, Unicode-&#x10d8;&#x10e1; &#x10d2;&#x10d0;&#x10db;&#x10dd;&#x10e7;&#x10d4;&#x10dc;&#x10d4;&#x10d1;&#x10d0;
+  &#x10dd;&#x10de;&#x10d4;&#x10e0;&#x10d0;&#x10ea;&#x10d8;&#x10e3;&#x10da; &#x10e1;&#x10d8;&#x10e1;&#x10e2;&#x10d4;&#x10db;&#x10d4;&#x10d1;&#x10e1;&#x10d0;, &#x10d3;&#x10d0; &#x10d2;&#x10d0;&#x10db;&#x10dd;&#x10e7;&#x10d4;&#x10dc;&#x10d4;&#x10d1;&#x10d8;&#x10d7; &#x10de;&#x10e0;&#x10dd;&#x10d2;&#x10e0;&#x10d0;&#x10db;&#x10d4;&#x10d1;&#x10e8;&#x10d8;, &#x10e8;&#x10e0;&#x10d8;&#x10e4;&#x10e2;&#x10d4;&#x10d1;&#x10e8;&#x10d8;,
+  &#x10e2;&#x10d4;&#x10e5;&#x10e1;&#x10e2;&#x10d4;&#x10d1;&#x10d8;&#x10e1; &#x10d3;&#x10d0;&#x10db;&#x10e3;&#x10e8;&#x10d0;&#x10d5;&#x10d4;&#x10d1;&#x10d0;&#x10e1;&#x10d0; &#x10d3;&#x10d0; &#x10db;&#x10e0;&#x10d0;&#x10d5;&#x10d0;&#x10da;&#x10d4;&#x10dc;&#x10dd;&#x10d5;&#x10d0;&#x10dc; &#x10d9;&#x10dd;&#x10db;&#x10de;&#x10d8;&#x10e3;&#x10e2;&#x10d4;&#x10e0;&#x10e3;&#x10da; &#x10e1;&#x10d8;&#x10e1;&#x10e2;&#x10d4;&#x10db;&#x10d4;&#x10d1;&#x10e8;&#x10d8;.
+
+Russian:
+
+  From a Unicode conference invitation:
+
+  &#x417;&#x430;&#x440;&#x435;&#x433;&#x438;&#x441;&#x442;&#x440;&#x438;&#x440;&#x443;&#x439;&#x442;&#x435;&#x441;&#x44c; &#x441;&#x435;&#x439;&#x447;&#x430;&#x441; &#x43d;&#x430; &#x414;&#x435;&#x441;&#x44f;&#x442;&#x443;&#x44e; &#x41c;&#x435;&#x436;&#x434;&#x443;&#x43d;&#x430;&#x440;&#x43e;&#x434;&#x43d;&#x443;&#x44e; &#x41a;&#x43e;&#x43d;&#x444;&#x435;&#x440;&#x435;&#x43d;&#x446;&#x438;&#x44e; &#x43f;&#x43e;
+  Unicode, &#x43a;&#x43e;&#x442;&#x43e;&#x440;&#x430;&#x44f; &#x441;&#x43e;&#x441;&#x442;&#x43e;&#x438;&#x442;&#x441;&#x44f; 10-12 &#x43c;&#x430;&#x440;&#x442;&#x430; 1997 &#x433;&#x43e;&#x434;&#x430; &#x432; &#x41c;&#x430;&#x439;&#x43d;&#x446;&#x435; &#x432; &#x413;&#x435;&#x440;&#x43c;&#x430;&#x43d;&#x438;&#x438;.
+  &#x41a;&#x43e;&#x43d;&#x444;&#x435;&#x440;&#x435;&#x43d;&#x446;&#x438;&#x44f; &#x441;&#x43e;&#x431;&#x435;&#x440;&#x435;&#x442; &#x448;&#x438;&#x440;&#x43e;&#x43a;&#x438;&#x439; &#x43a;&#x440;&#x443;&#x433; &#x44d;&#x43a;&#x441;&#x43f;&#x435;&#x440;&#x442;&#x43e;&#x432; &#x43f;&#x43e;  &#x432;&#x43e;&#x43f;&#x440;&#x43e;&#x441;&#x430;&#x43c; &#x433;&#x43b;&#x43e;&#x431;&#x430;&#x43b;&#x44c;&#x43d;&#x43e;&#x433;&#x43e;
+  &#x418;&#x43d;&#x442;&#x435;&#x440;&#x43d;&#x435;&#x442;&#x430; &#x438; Unicode, &#x43b;&#x43e;&#x43a;&#x430;&#x43b;&#x438;&#x437;&#x430;&#x446;&#x438;&#x438; &#x438; &#x438;&#x43d;&#x442;&#x435;&#x440;&#x43d;&#x430;&#x446;&#x438;&#x43e;&#x43d;&#x430;&#x43b;&#x438;&#x437;&#x430;&#x446;&#x438;&#x438;, &#x432;&#x43e;&#x43f;&#x43b;&#x43e;&#x449;&#x435;&#x43d;&#x438;&#x44e; &#x438;
+  &#x43f;&#x440;&#x438;&#x43c;&#x435;&#x43d;&#x435;&#x43d;&#x438;&#x44e; Unicode &#x432; &#x440;&#x430;&#x437;&#x43b;&#x438;&#x447;&#x43d;&#x44b;&#x445; &#x43e;&#x43f;&#x435;&#x440;&#x430;&#x446;&#x438;&#x43e;&#x43d;&#x43d;&#x44b;&#x445; &#x441;&#x438;&#x441;&#x442;&#x435;&#x43c;&#x430;&#x445; &#x438; &#x43f;&#x440;&#x43e;&#x433;&#x440;&#x430;&#x43c;&#x43c;&#x43d;&#x44b;&#x445;
+  &#x43f;&#x440;&#x438;&#x43b;&#x43e;&#x436;&#x435;&#x43d;&#x438;&#x44f;&#x445;, &#x448;&#x440;&#x438;&#x444;&#x442;&#x430;&#x445;, &#x432;&#x435;&#x440;&#x441;&#x442;&#x43a;&#x435; &#x438; &#x43c;&#x43d;&#x43e;&#x433;&#x43e;&#x44f;&#x437;&#x44b;&#x447;&#x43d;&#x44b;&#x445; &#x43a;&#x43e;&#x43c;&#x43f;&#x44c;&#x44e;&#x442;&#x435;&#x440;&#x43d;&#x44b;&#x445; &#x441;&#x438;&#x441;&#x442;&#x435;&#x43c;&#x430;&#x445;.
+
+Thai (UCS Level 2):
+
+  Excerpt from a poetry on The Romance of The Three Kingdoms (a Chinese
+  classic 'San Gua'):
+
+  [----------------------------|------------------------]
+    &#xe4f; &#xe41;&#xe1c;&#xe48;&#xe19;&#xe14;&#xe34;&#xe19;&#xe2e;&#xe31;&#xe48;&#xe19;&#xe40;&#xe2a;&#xe37;&#xe48;&#xe2d;&#xe21;&#xe42;&#xe17;&#xe23;&#xe21;&#xe41;&#xe2a;&#xe19;&#xe2a;&#xe31;&#xe07;&#xe40;&#xe27;&#xe0a;  &#xe1e;&#xe23;&#xe30;&#xe1b;&#xe01;&#xe40;&#xe01;&#xe28;&#xe01;&#xe2d;&#xe07;&#xe1a;&#xe39;&#xe4a;&#xe01;&#xe39;&#xe49;&#xe02;&#xe36;&#xe49;&#xe19;&#xe43;&#xe2b;&#xe21;&#xe48;
+  &#xe2a;&#xe34;&#xe1a;&#xe2a;&#xe2d;&#xe07;&#xe01;&#xe29;&#xe31;&#xe15;&#xe23;&#xe34;&#xe22;&#xe4c;&#xe01;&#xe48;&#xe2d;&#xe19;&#xe2b;&#xe19;&#xe49;&#xe32;&#xe41;&#xe25;&#xe16;&#xe31;&#xe14;&#xe44;&#xe1b;       &#xe2a;&#xe2d;&#xe07;&#xe2d;&#xe07;&#xe04;&#xe4c;&#xe44;&#xe0b;&#xe23;&#xe49;&#xe42;&#xe07;&#xe48;&#xe40;&#xe02;&#xe25;&#xe32;&#xe40;&#xe1a;&#xe32;&#xe1b;&#xe31;&#xe0d;&#xe0d;&#xe32;
+    &#xe17;&#xe23;&#xe07;&#xe19;&#xe31;&#xe1a;&#xe16;&#xe37;&#xe2d;&#xe02;&#xe31;&#xe19;&#xe17;&#xe35;&#xe40;&#xe1b;&#xe47;&#xe19;&#xe17;&#xe35;&#xe48;&#xe1e;&#xe36;&#xe48;&#xe07;           &#xe1a;&#xe49;&#xe32;&#xe19;&#xe40;&#xe21;&#xe37;&#xe2d;&#xe07;&#xe08;&#xe36;&#xe07;&#xe27;&#xe34;&#xe1b;&#xe23;&#xe34;&#xe15;&#xe40;&#xe1b;&#xe47;&#xe19;&#xe19;&#xe31;&#xe01;&#xe2b;&#xe19;&#xe32;
+  &#xe42;&#xe2e;&#xe08;&#xe34;&#xe4b;&#xe19;&#xe40;&#xe23;&#xe35;&#xe22;&#xe01;&#xe17;&#xe31;&#xe1e;&#xe17;&#xe31;&#xe48;&#xe27;&#xe2b;&#xe31;&#xe27;&#xe40;&#xe21;&#xe37;&#xe2d;&#xe07;&#xe21;&#xe32;         &#xe2b;&#xe21;&#xe32;&#xe22;&#xe08;&#xe30;&#xe06;&#xe48;&#xe32;&#xe21;&#xe14;&#xe0a;&#xe31;&#xe48;&#xe27;&#xe15;&#xe31;&#xe27;&#xe2a;&#xe33;&#xe04;&#xe31;&#xe0d;
+    &#xe40;&#xe2b;&#xe21;&#xe37;&#xe2d;&#xe19;&#xe02;&#xe31;&#xe1a;&#xe44;&#xe2a;&#xe44;&#xe25;&#xe48;&#xe40;&#xe2a;&#xe37;&#xe2d;&#xe08;&#xe32;&#xe01;&#xe40;&#xe04;&#xe2b;&#xe32;      &#xe23;&#xe31;&#xe1a;&#xe2b;&#xe21;&#xe32;&#xe1b;&#xe48;&#xe32;&#xe40;&#xe02;&#xe49;&#xe32;&#xe21;&#xe32;&#xe40;&#xe25;&#xe22;&#xe2d;&#xe32;&#xe2a;&#xe31;&#xe0d;
+  &#xe1d;&#xe48;&#xe32;&#xe22;&#xe2d;&#xe49;&#xe2d;&#xe07;&#xe2d;&#xe38;&#xe49;&#xe19;&#xe22;&#xe38;&#xe41;&#xe22;&#xe01;&#xe43;&#xe2b;&#xe49;&#xe41;&#xe15;&#xe01;&#xe01;&#xe31;&#xe19;          &#xe43;&#xe0a;&#xe49;&#xe2a;&#xe32;&#xe27;&#xe19;&#xe31;&#xe49;&#xe19;&#xe40;&#xe1b;&#xe47;&#xe19;&#xe0a;&#xe19;&#xe27;&#xe19;&#xe0a;&#xe37;&#xe48;&#xe19;&#xe0a;&#xe27;&#xe19;&#xe43;&#xe08;
+    &#xe1e;&#xe25;&#xe31;&#xe19;&#xe25;&#xe34;&#xe09;&#xe38;&#xe22;&#xe01;&#xe38;&#xe22;&#xe01;&#xe35;&#xe01;&#xe25;&#xe31;&#xe1a;&#xe01;&#xe48;&#xe2d;&#xe40;&#xe2b;&#xe15;&#xe38;          &#xe0a;&#xe48;&#xe32;&#xe07;&#xe2d;&#xe32;&#xe40;&#xe1e;&#xe28;&#xe08;&#xe23;&#xe34;&#xe07;&#xe2b;&#xe19;&#xe32;&#xe1f;&#xe49;&#xe32;&#xe23;&#xe49;&#xe2d;&#xe07;&#xe44;&#xe2b;&#xe49;
+  &#xe15;&#xe49;&#xe2d;&#xe07;&#xe23;&#xe1a;&#xe23;&#xe32;&#xe06;&#xe48;&#xe32;&#xe1f;&#xe31;&#xe19;&#xe08;&#xe19;&#xe1a;&#xe23;&#xe23;&#xe25;&#xe31;&#xe22;           &#xe24;&#xe45;&#xe2b;&#xe32;&#xe43;&#xe04;&#xe23;&#xe04;&#xe49;&#xe33;&#xe0a;&#xe39;&#xe01;&#xe39;&#xe49;&#xe1a;&#xe23;&#xe23;&#xe25;&#xe31;&#xe07;&#xe01;&#xe4c; &#xe2f;
+
+  (The above is a two-column text. If combining characters are handled
+  correctly, the lines of the second column should be aligned with the
+  | character above.)
+
+Ethiopian:
+
+  Proverbs in the Amharic language:
+
+  &#x1230;&#x121b;&#x12ed; &#x12a0;&#x12ed;&#x1273;&#x1228;&#x1235; &#x1295;&#x1309;&#x1225; &#x12a0;&#x12ed;&#x12a8;&#x1230;&#x1235;&#x1362;
+  &#x1265;&#x120b; &#x12ab;&#x1208;&#x129d; &#x12a5;&#x1295;&#x12f0;&#x12a0;&#x1263;&#x1274; &#x1260;&#x1246;&#x1218;&#x1320;&#x129d;&#x1362;
+  &#x130c;&#x1325; &#x12eb;&#x1208;&#x1264;&#x1271; &#x1241;&#x121d;&#x1325;&#x1293; &#x1290;&#x12cd;&#x1362;
+  &#x12f0;&#x1200; &#x1260;&#x1215;&#x120d;&#x1219; &#x1245;&#x1264; &#x1263;&#x12ed;&#x1320;&#x1323; &#x1295;&#x1323;&#x1275; &#x1260;&#x1308;&#x12f0;&#x1208;&#x12cd;&#x1362;
+  &#x12e8;&#x12a0;&#x134d; &#x12c8;&#x1208;&#x121d;&#x1273; &#x1260;&#x1245;&#x1264; &#x12a0;&#x12ed;&#x1273;&#x123d;&#x121d;&#x1362;
+  &#x12a0;&#x12ed;&#x1325; &#x1260;&#x1260;&#x120b; &#x12f3;&#x12cb; &#x1270;&#x1218;&#x1273;&#x1362;
+  &#x1232;&#x1270;&#x1228;&#x1309;&#x1219; &#x12ed;&#x12f0;&#x1228;&#x130d;&#x1219;&#x1362;
+  &#x1240;&#x1235; &#x1260;&#x1240;&#x1235;&#x1365; &#x12d5;&#x1295;&#x1241;&#x120b;&#x120d; &#x1260;&#x12a5;&#x130d;&#x1229; &#x12ed;&#x1204;&#x12f3;&#x120d;&#x1362;
+  &#x12f5;&#x122d; &#x1262;&#x12eb;&#x1265;&#x122d; &#x12a0;&#x1295;&#x1260;&#x1233; &#x12eb;&#x1235;&#x122d;&#x1362;
+  &#x1230;&#x12cd; &#x12a5;&#x1295;&#x12f0;&#x1264;&#x1271; &#x12a5;&#x1295;&#x1305; &#x12a5;&#x1295;&#x12f0; &#x1309;&#x1228;&#x1264;&#x1271; &#x12a0;&#x12ed;&#x1270;&#x12f3;&#x12f0;&#x122d;&#x121d;&#x1362;
+  &#x12a5;&#x130d;&#x12dc;&#x122d; &#x12e8;&#x12a8;&#x1348;&#x1270;&#x12cd;&#x1295; &#x1309;&#x122e;&#x122e; &#x1233;&#x12ed;&#x12d8;&#x130b;&#x12cd; &#x12a0;&#x12ed;&#x12f5;&#x122d;&#x121d;&#x1362;
+  &#x12e8;&#x130e;&#x1228;&#x1264;&#x1275; &#x120c;&#x1263;&#x1365; &#x1262;&#x12eb;&#x12e9;&#x1275; &#x12ed;&#x1235;&#x1245; &#x1263;&#x12eb;&#x12e9;&#x1275; &#x12eb;&#x1320;&#x120d;&#x1245;&#x1362;
+  &#x1225;&#x122b; &#x12a8;&#x1218;&#x134d;&#x1273;&#x1275; &#x120d;&#x1304;&#x1295; &#x120b;&#x134b;&#x1273;&#x1275;&#x1362;
+  &#x12d3;&#x1263;&#x12ed; &#x121b;&#x12f0;&#x122a;&#x12eb; &#x12e8;&#x1208;&#x12cd;&#x1365; &#x130d;&#x1295;&#x12f5; &#x12ed;&#x12de; &#x12ed;&#x12de;&#x122b;&#x120d;&#x1362;
+  &#x12e8;&#x12a5;&#x1235;&#x120b;&#x121d; &#x12a0;&#x1308;&#x1229; &#x1218;&#x12ab; &#x12e8;&#x12a0;&#x121e;&#x122b; &#x12a0;&#x1308;&#x1229; &#x12cb;&#x122d;&#x12ab;&#x1362;
+  &#x1270;&#x1295;&#x130b;&#x120e; &#x1262;&#x1270;&#x1349; &#x1270;&#x1218;&#x120d;&#x1236; &#x1263;&#x1349;&#x1362;
+  &#x12c8;&#x12f3;&#x1305;&#x1205; &#x121b;&#x122d; &#x1262;&#x1206;&#x1295; &#x1328;&#x122d;&#x1235;&#x1205; &#x12a0;&#x1275;&#x120b;&#x1230;&#x12cd;&#x1362;
+  &#x12a5;&#x130d;&#x122d;&#x1205;&#x1295; &#x1260;&#x134d;&#x122b;&#x123d;&#x1205; &#x120d;&#x12ad; &#x12d8;&#x122d;&#x130b;&#x1362;
+
+Runes:
+
+  &#x16bb;&#x16d6; &#x16b3;&#x16b9;&#x16ab;&#x16a6; &#x16a6;&#x16ab;&#x16cf; &#x16bb;&#x16d6; &#x16d2;&#x16a2;&#x16de;&#x16d6; &#x16a9;&#x16be; &#x16a6;&#x16ab;&#x16d7; &#x16da;&#x16aa;&#x16be;&#x16de;&#x16d6; &#x16be;&#x16a9;&#x16b1;&#x16a6;&#x16b9;&#x16d6;&#x16aa;&#x16b1;&#x16de;&#x16a2;&#x16d7; &#x16b9;&#x16c1;&#x16a6; &#x16a6;&#x16aa; &#x16b9;&#x16d6;&#x16e5;&#x16ab;
+
+  (Old English, which transcribed into Latin reads 'He cwaeth that he
+  bude thaem lande northweardum with tha Westsae.' and means 'He said
+  that he lived in the northern land near the Western Sea.')
+
+Braille:
+
+  &#x284c;&#x2801;&#x2827;&#x2811; &#x283c;&#x2801;&#x2812;  &#x284d;&#x281c;&#x2807;&#x2811;&#x2839;&#x2830;&#x280e; &#x2863;&#x2815;&#x280c;
+
+  &#x284d;&#x281c;&#x2807;&#x2811;&#x2839; &#x283a;&#x2801;&#x280e; &#x2819;&#x2811;&#x2801;&#x2819;&#x2812; &#x281e;&#x2815; &#x2803;&#x2811;&#x281b;&#x2814; &#x283a;&#x280a;&#x2839;&#x2832; &#x2879;&#x283b;&#x2811; &#x280a;&#x280e; &#x281d;&#x2815; &#x2819;&#x2833;&#x2803;&#x281e;
+  &#x2831;&#x2801;&#x281e;&#x2811;&#x2827;&#x283b; &#x2801;&#x2803;&#x2833;&#x281e; &#x2839;&#x2801;&#x281e;&#x2832; &#x2879;&#x2811; &#x2817;&#x2811;&#x281b;&#x280a;&#x280c;&#x283b; &#x2815;&#x280b; &#x2819;&#x280a;&#x280e; &#x2803;&#x2825;&#x2817;&#x280a;&#x2801;&#x2807; &#x283a;&#x2801;&#x280e;
+  &#x280e;&#x280a;&#x281b;&#x281d;&#x282b; &#x2803;&#x2839; &#x2839;&#x2811; &#x280a;&#x2807;&#x283b;&#x281b;&#x2839;&#x280d;&#x2801;&#x281d;&#x2802; &#x2839;&#x2811; &#x280a;&#x2807;&#x283b;&#x2805;&#x2802; &#x2839;&#x2811; &#x2825;&#x281d;&#x2819;&#x283b;&#x281e;&#x2801;&#x2805;&#x283b;&#x2802;
+  &#x2801;&#x281d;&#x2819; &#x2839;&#x2811; &#x2821;&#x280a;&#x2811;&#x280b; &#x280d;&#x2833;&#x2817;&#x281d;&#x283b;&#x2832; &#x284e;&#x280a;&#x2817;&#x2815;&#x2815;&#x281b;&#x2811; &#x280e;&#x280a;&#x281b;&#x281d;&#x282b; &#x280a;&#x281e;&#x2832; &#x2841;&#x281d;&#x2819;
+  &#x284e;&#x280a;&#x2817;&#x2815;&#x2815;&#x281b;&#x2811;&#x2830;&#x280e; &#x281d;&#x2801;&#x280d;&#x2811; &#x283a;&#x2801;&#x280e; &#x281b;&#x2815;&#x2815;&#x2819; &#x2825;&#x280f;&#x2815;&#x281d; &#x2830;&#x2861;&#x2801;&#x281d;&#x281b;&#x2811;&#x2802; &#x280b;&#x2815;&#x2817; &#x2801;&#x281d;&#x2839;&#x2839;&#x2814;&#x281b; &#x2819;&#x2811; 
+  &#x2821;&#x2815;&#x280e;&#x2811; &#x281e;&#x2815; &#x280f;&#x2825;&#x281e; &#x2819;&#x280a;&#x280e; &#x2819;&#x2801;&#x281d;&#x2819; &#x281e;&#x2815;&#x2832;
+
+  &#x2855;&#x2807;&#x2819; &#x284d;&#x281c;&#x2807;&#x2811;&#x2839; &#x283a;&#x2801;&#x280e; &#x2801;&#x280e; &#x2819;&#x2811;&#x2801;&#x2819; &#x2801;&#x280e; &#x2801; &#x2819;&#x2815;&#x2815;&#x2817;&#x2824;&#x281d;&#x2801;&#x280a;&#x2807;&#x2832;
+
+  &#x284d;&#x2814;&#x2819;&#x2816; &#x284a; &#x2819;&#x2815;&#x281d;&#x2830;&#x281e; &#x280d;&#x2811;&#x2801;&#x281d; &#x281e;&#x2815; &#x280e;&#x2801;&#x2839; &#x2839;&#x2801;&#x281e; &#x284a; &#x2805;&#x281d;&#x282a;&#x2802; &#x2815;&#x280b; &#x280d;&#x2839;
+  &#x282a;&#x281d; &#x2805;&#x281d;&#x282a;&#x2807;&#x282b;&#x281b;&#x2811;&#x2802; &#x2831;&#x2801;&#x281e; &#x2839;&#x283b;&#x2811; &#x280a;&#x280e; &#x280f;&#x281c;&#x281e;&#x280a;&#x280a;&#x2825;&#x2807;&#x281c;&#x2807;&#x2839; &#x2819;&#x2811;&#x2801;&#x2819; &#x2801;&#x2803;&#x2833;&#x281e;
+  &#x2801; &#x2819;&#x2815;&#x2815;&#x2817;&#x2824;&#x281d;&#x2801;&#x280a;&#x2807;&#x2832; &#x284a; &#x280d;&#x280a;&#x2823;&#x281e; &#x2819;&#x2801;&#x2827;&#x2811; &#x2803;&#x2811;&#x2832; &#x2814;&#x280a;&#x2807;&#x2814;&#x282b;&#x2802; &#x280d;&#x2839;&#x280e;&#x2811;&#x2807;&#x280b;&#x2802; &#x281e;&#x2815;
+  &#x2817;&#x2811;&#x281b;&#x281c;&#x2819; &#x2801; &#x280a;&#x2815;&#x280b;&#x280b;&#x2814;&#x2824;&#x281d;&#x2801;&#x280a;&#x2807; &#x2801;&#x280e; &#x2839;&#x2811; &#x2819;&#x2811;&#x2801;&#x2819;&#x2811;&#x280c; &#x280f;&#x280a;&#x2811;&#x280a;&#x2811; &#x2815;&#x280b; &#x280a;&#x2817;&#x2815;&#x281d;&#x280d;&#x2815;&#x281d;&#x281b;&#x283b;&#x2839; 
+  &#x2814; &#x2839;&#x2811; &#x281e;&#x2817;&#x2801;&#x2819;&#x2811;&#x2832; &#x2843;&#x2825;&#x281e; &#x2839;&#x2811; &#x283a;&#x280a;&#x280e;&#x2819;&#x2815;&#x280d; &#x2815;&#x280b; &#x2833;&#x2817; &#x2801;&#x281d;&#x280a;&#x2811;&#x280c;&#x2815;&#x2817;&#x280e; 
+  &#x280a;&#x280e; &#x2814; &#x2839;&#x2811; &#x280e;&#x280a;&#x280d;&#x280a;&#x2807;&#x2811;&#x2806; &#x2801;&#x281d;&#x2819; &#x280d;&#x2839; &#x2825;&#x281d;&#x2819;&#x2801;&#x2807;&#x2807;&#x282a;&#x282b; &#x2819;&#x2801;&#x281d;&#x2819;&#x280e;
+  &#x2829;&#x2801;&#x2807;&#x2807; &#x281d;&#x2815;&#x281e; &#x2819;&#x280a;&#x280c;&#x2825;&#x2817;&#x2803; &#x280a;&#x281e;&#x2802; &#x2815;&#x2817; &#x2839;&#x2811; &#x284a;&#x2833;&#x281d;&#x281e;&#x2817;&#x2839;&#x2830;&#x280e; &#x2819;&#x2815;&#x281d;&#x2811; &#x280b;&#x2815;&#x2817;&#x2832; &#x2879;&#x2833;
+  &#x283a;&#x280a;&#x2807;&#x2807; &#x2839;&#x283b;&#x2811;&#x280b;&#x2815;&#x2817;&#x2811; &#x280f;&#x283b;&#x280d;&#x280a;&#x281e; &#x280d;&#x2811; &#x281e;&#x2815; &#x2817;&#x2811;&#x280f;&#x2811;&#x2801;&#x281e;&#x2802; &#x2811;&#x280d;&#x280f;&#x2819;&#x2801;&#x281e;&#x280a;&#x280a;&#x2801;&#x2807;&#x2807;&#x2839;&#x2802; &#x2839;&#x2801;&#x281e;
+  &#x284d;&#x281c;&#x2807;&#x2811;&#x2839; &#x283a;&#x2801;&#x280e; &#x2801;&#x280e; &#x2819;&#x2811;&#x2801;&#x2819; &#x2801;&#x280e; &#x2801; &#x2819;&#x2815;&#x2815;&#x2817;&#x2824;&#x281d;&#x2801;&#x280a;&#x2807;&#x2832;
+
+  (The first couple of paragraphs of "A Christmas Carol" by Dickens)
+
+Compact font selection example text:
+
+  ABCDEFGHIJKLMNOPQRSTUVWXYZ /0123456789
+  abcdefghijklmnopqrstuvwxyz &#xa3;&#xa9;&#xb5;&#xc0;&#xc6;&#xd6;&#xde;&#xdf;&#xe9;&#xf6;&#xff;
+  &#x2013;&#x2014;&#x2018;&#x201c;&#x201d;&#x201e;&#x2020;&#x2022;&#x2026;&#x2030;&#x2122;&#x153;&#x160;&#x178;&#x17e;&#x20ac; &#x391;&#x392;&#x393;&#x394;&#x3a9;&#x3b1;&#x3b2;&#x3b3;&#x3b4;&#x3c9; &#x410;&#x411;&#x412;&#x413;&#x414;&#x430;&#x431;&#x432;&#x433;&#x434;
+  &#x2200;&#x2202;&#x2208;&#x211d;&#x2227;&#x222a;&#x2261;&#x221e; &#x2191;&#x2197;&#x21a8;&#x21bb;&#x21e3; &#x2510;&#x253c;&#x2554;&#x2558;&#x2591;&#x25ba;&#x263a;&#x2640; &#xfb01;&#xfffd;&#x2440;&#x2082;&#x1f20;&#x1e02;&#x4e5;&#x1e84;&#x250;&#x2d0;&#x234e;&#x5d0;&#x531;&#x10d0;
+
+Greetings in various languages:
+
+  Hello world, &#x39a;&#x3b1;&#x3bb;&#x3b7;&#x3bc;&#x1f73;&#x3c1;&#x3b1; &#x3ba;&#x1f79;&#x3c3;&#x3bc;&#x3b5;, &#x30b3;&#x30f3;&#x30cb;&#x30c1;&#x30cf;
+
+Box drawing alignment tests:                                          &#x2588;
+                                                                      &#x2589;
+  &#x2554;&#x2550;&#x2550;&#x2566;&#x2550;&#x2550;&#x2557;  &#x250c;&#x2500;&#x2500;&#x252c;&#x2500;&#x2500;&#x2510;  &#x256d;&#x2500;&#x2500;&#x252c;&#x2500;&#x2500;&#x256e;  &#x256d;&#x2500;&#x2500;&#x252c;&#x2500;&#x2500;&#x256e;  &#x250f;&#x2501;&#x2501;&#x2533;&#x2501;&#x2501;&#x2513;  &#x250e;&#x2512;&#x250f;&#x2511;   &#x2577;  &#x257b; &#x250f;&#x252f;&#x2513; &#x250c;&#x2530;&#x2510;    &#x258a; &#x2571;&#x2572;&#x2571;&#x2572;&#x2573;&#x2573;&#x2573;
+  &#x2551;&#x250c;&#x2500;&#x2568;&#x2500;&#x2510;&#x2551;  &#x2502;&#x2554;&#x2550;&#x2567;&#x2550;&#x2557;&#x2502;  &#x2502;&#x2552;&#x2550;&#x256a;&#x2550;&#x2555;&#x2502;  &#x2502;&#x2553;&#x2500;&#x2541;&#x2500;&#x2556;&#x2502;  &#x2503;&#x250c;&#x2500;&#x2542;&#x2500;&#x2510;&#x2503;  &#x2517;&#x2543;&#x2544;&#x2519;  &#x2576;&#x253c;&#x2574;&#x257a;&#x254b;&#x2578;&#x2520;&#x253c;&#x2528; &#x251d;&#x254b;&#x2525;    &#x258b; &#x2572;&#x2571;&#x2572;&#x2571;&#x2573;&#x2573;&#x2573;
+  &#x2551;&#x2502;&#x2572; &#x2571;&#x2502;&#x2551;  &#x2502;&#x2551;   &#x2551;&#x2502;  &#x2502;&#x2502; &#x2502; &#x2502;&#x2502;  &#x2502;&#x2551; &#x2503; &#x2551;&#x2502;  &#x2503;&#x2502; &#x257f; &#x2502;&#x2503;  &#x250d;&#x2545;&#x2546;&#x2513;   &#x2575;  &#x2579; &#x2517;&#x2537;&#x251b; &#x2514;&#x2538;&#x2518;    &#x258c; &#x2571;&#x2572;&#x2571;&#x2572;&#x2573;&#x2573;&#x2573;
+  &#x2560;&#x2561; &#x2573; &#x255e;&#x2563;  &#x251c;&#x2562;   &#x255f;&#x2524;  &#x251c;&#x253c;&#x2500;&#x253c;&#x2500;&#x253c;&#x2524;  &#x251c;&#x256b;&#x2500;&#x2542;&#x2500;&#x256b;&#x2524;  &#x2523;&#x253f;&#x257e;&#x253c;&#x257c;&#x253f;&#x252b;  &#x2515;&#x251b;&#x2516;&#x251a;     &#x250c;&#x2504;&#x2504;&#x2510; &#x254e; &#x250f;&#x2505;&#x2505;&#x2513; &#x250b; &#x258d; &#x2572;&#x2571;&#x2572;&#x2571;&#x2573;&#x2573;&#x2573;
+  &#x2551;&#x2502;&#x2571; &#x2572;&#x2502;&#x2551;  &#x2502;&#x2551;   &#x2551;&#x2502;  &#x2502;&#x2502; &#x2502; &#x2502;&#x2502;  &#x2502;&#x2551; &#x2503; &#x2551;&#x2502;  &#x2503;&#x2502; &#x257d; &#x2502;&#x2503;  &#x2591;&#x2591;&#x2592;&#x2592;&#x2593;&#x2593;&#x2588;&#x2588; &#x250a;  &#x2506; &#x254e; &#x254f;  &#x2507; &#x250b; &#x258e;
+  &#x2551;&#x2514;&#x2500;&#x2565;&#x2500;&#x2518;&#x2551;  &#x2502;&#x255a;&#x2550;&#x2564;&#x2550;&#x255d;&#x2502;  &#x2502;&#x2558;&#x2550;&#x256a;&#x2550;&#x255b;&#x2502;  &#x2502;&#x2559;&#x2500;&#x2540;&#x2500;&#x255c;&#x2502;  &#x2503;&#x2514;&#x2500;&#x2542;&#x2500;&#x2518;&#x2503;  &#x2591;&#x2591;&#x2592;&#x2592;&#x2593;&#x2593;&#x2588;&#x2588; &#x250a;  &#x2506; &#x254e; &#x254f;  &#x2507; &#x250b; &#x258f;
+  &#x255a;&#x2550;&#x2550;&#x2569;&#x2550;&#x2550;&#x255d;  &#x2514;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x2518;  &#x2570;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x256f;  &#x2570;&#x2500;&#x2500;&#x2534;&#x2500;&#x2500;&#x256f;  &#x2517;&#x2501;&#x2501;&#x253b;&#x2501;&#x2501;&#x251b;           &#x2514;&#x254c;&#x254c;&#x2518; &#x254e; &#x2517;&#x254d;&#x254d;&#x251b; &#x250b;  &#x2581;&#x2582;&#x2583;&#x2584;&#x2585;&#x2586;&#x2587;&#x2588;
+
+</pre>
+</BODY>
+</HTML>
diff --git a/gnu/usr.bin/lynx/userdefs.h b/gnu/usr.bin/lynx/userdefs.h
index 22522e82273..11362595140 100644
--- a/gnu/usr.bin/lynx/userdefs.h
+++ b/gnu/usr.bin/lynx/userdefs.h
@@ -30,6 +30,13 @@
 #ifndef USERDEFS_H
 #define USERDEFS_H
 
+/*******************************************************************
+ * Insure definition of NOT_ASCII, etc. precedes use below.
+ */
+#ifndef HTUTILS_H
+#include <HTUtils.h>
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include <lynx_cfg.h>
 #endif
@@ -353,17 +360,6 @@
 #define EXP_RAND_TEMPNAME 1
 
 /********************************
- * Uncomment this line to use 'mkstemp()' in preference to lynx's own code
- * in fmt_tempname().  Caution: on a few older systems, mkstemp() is less
- * secure than you would like.  For this reason, we do not auto-configure it.
- *
- * Some things to watch out for:  some broken implementations of mkstemp() may
- * not necessarily try a different filename when they are called, making it
- * impossible to rename the file.  Others make world-writable files.
- */
-#define USE_MKSTEMP 
-
-/********************************
  * Comment this line out to let the user enter his/her email address
  * when sending a message.  There should be no need to do this unless
  * your mailer agent does not put in the From: field for you.  (If your
@@ -456,7 +452,7 @@
  * Normally we expect you will connect to a remote site, e.g., the Lynx starting
  * site:
  */
-#define STARTFILE "http://www.OpenBSD.org/"
+#define STARTFILE "http://lynx.isc.org/"
 /*
  * As an alternative, you may want to use a local URL.  A good choice for this
  * is the user's home directory:
@@ -475,11 +471,11 @@
  *   for this distribution (use SHELL syntax including the device
  *   on VMS systems).
  * The default HELPFILE is:
- * http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html
+ * http://www.subir.com/lynx/lynx_help/lynx_help_main.html
  *   This should be changed here or in lynx.cfg to the local path.
  */
-/* #define HELPFILE "http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html" */
-#define HELPFILE "file://localhost/usr/share/doc/html/lynx_help/lynx_help_main.html"
+#define HELPFILE "http://www.subir.com/lynx/lynx_help/lynx_help_main.html"
+/* #define HELPFILE "file://localhost/PATH_TO/lynx_help/lynx_help_main.html" */
 
 /*****************************
  * DEFAULT_INDEX_FILE is the default file retrieved when the
@@ -521,6 +517,8 @@
 /*****************************
  * If FTP_PASSIVE is set to TRUE here or in lynx.cfg, ftp transfers will
  * be done in passive mode.
+ * Note: if passive transfers fail, lynx falls back to active mode, and
+ * vice versa if active transfers fail at first.
  */
 #define FTP_PASSIVE	  TRUE
 
@@ -910,6 +908,9 @@
 #define MESSAGESECS 2
 #define ALERTSECS 3
 
+#define DEBUGSECS 0
+#define REPLAYSECS 0
+
 /******************************
  * SHOW_COLOR controls whether the program displays in color by default.
  */
@@ -936,6 +937,14 @@
 #define SHOW_CURSOR FALSE
 
 /******************************
+* UNDERLINE_LINKS controls whether links are underlined by default, or shown
+* in bold.  Normally this default is set from the configure script.
+*/
+#ifndef HAVE_CONFIG_H
+#define UNDERLINE_LINKS FALSE
+#endif
+
+/******************************
 * VERBOSE_IMAGES controls whether or not Lynx replaces the [LINK], [INLINE]
 * and [IMAGE] comments (for images without ALT) with filenames of these
 * images.  This is extremely useful because now we can determine immediately
@@ -1351,11 +1360,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.4rel.1"
-#define LYNX_WWW_HOME "http://lynx.browser.org/"
+#define LYNX_VERSION "2.8.5rel.1"
+#define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Tue, 17 Jul 2001 14:04:37 -0700"
+#define LYNX_DATE "Wed, 04 Feb 2004 04:07:09 -0800"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
 
@@ -1383,6 +1392,9 @@
 #define HTML_SUFFIX ".html"
 #endif
 
+#define BIN_SUFFIX  ".bin"
+#define TEXT_SUFFIX ".txt"
+
 #ifdef VMS
 /*
 **  Use the VMS port of gzip for uncompressing both .Z and .gz files.
@@ -1400,6 +1412,12 @@
 #ifdef DOSPATH
 
 #ifdef _WINDOWS
+#ifdef SYSTEM_MAIL
+#undef SYSTEM_MAIL
+#endif
+#ifdef SYSTEM_MAIL_FLAGS
+#undef SYSTEM_MAIL_FLAGS
+#endif
 #ifdef USE_ALT_BLAT_MAILER
 #define SYSTEM_MAIL		"BLAT"
 #define SYSTEM_MAIL_FLAGS	""
@@ -1409,6 +1427,9 @@
 #endif
 #else
 /* have to define something... */
+#ifdef SYSTEM_MAIL
+#undef SYSTEM_MAIL
+#endif /* SYSTEM_MAIL */
 #define SYSTEM_MAIL "sendmail"
 #define SYSTEM_MAIL_FLAGS "-t -oi"
 #endif
@@ -1432,27 +1453,38 @@
 **    WINDOWS/DOS
 **    ===========
 */
+#ifndef HAVE_CONFIG_H
 #define COMPRESS_PATH   "compress"
 #define UNCOMPRESS_PATH "uncompress"
 #define UUDECODE_PATH   "uudecode"
 #define ZCAT_PATH       "zcat"
 #define GZIP_PATH       "gzip"
 #define BZIP2_PATH      "bzip2"
+#define MV_PATH         "mv"
 #define INSTALL_PATH    "install"
 #define TAR_PATH        "tar"
-#define TOUCH_PATH      "touch"
 #define ZIP_PATH        "zip"
 #define UNZIP_PATH      "unzip"
-#define MKDIR_PATH      "mkdir"
-#define MV_PATH         "mv"
 #define RM_PATH         "rm"
-/* COPY_PATH is not required for DOSPATH any more (implemented directly) */
-/* #define COPY_PATH       "cp" */
-#define CHMOD_PATH      "chmod"
 #define TELNET_PATH     "telnet"
 #define TN3270_PATH     "tn3270"
 #define RLOGIN_PATH     "rlogin"
 
+/* see src/LYLocal.c for these */
+#define TAR_UP_OPTIONS	 "-cf"
+#define TAR_DOWN_OPTIONS "-xf"
+#define TAR_PIPE_OPTIONS "-"
+#define TAR_FILE_OPTIONS ""
+
+/*
+ * These are not used:
+ * #define COPY_PATH       "cp"
+ * #define CHMOD_PATH      "chmod"
+ * #define MKDIR_PATH      "mkdir"
+ * #define TOUCH_PATH      "touch"
+ */
+#endif /* HAVE_CONFIG_H */
+
 #else	/* Unix */
 	/* Standard locations are defined via the configure script.  When
 	 * helper applications are in your home directory or other nonstandard
@@ -1464,12 +1496,18 @@
 
 
 /***************************** 
+ * I have not ported multibyte support for EBCDIC.  In fact, some multibyte
+ * code in LYLowerCase() crashes on EBCDIC strings.  -- gil
+ */
+#if       ! defined(NOT_ASCII)
+/***************************** 
  * SUPPORT_MULTIBYTE_EDIT provides better support of CJK characters to
  * Lynx's Line Editor.  JIS X0201 Kana is partially supported.  The
  * reason why I didn't support it fully is I think supporting it is not
  * required so much and I don't have an environment to test it. - TH
  */
 #define SUPPORT_MULTIBYTE_EDIT
+#endif /* ! defined(NOT_ASCII) */
 
 /***************************** 
  * SUPPORT_CHDIR provides CD command (bound to 'C' by default).  It allows