Merged revisions 878 via svnmerge from

http://proliant/svn/httrack/trunk

........
  r878 | roche | 2013-09-24 07:51:21 +0200 (mar., 24 sept. 2013) | 3 lines
  
  Do not depend anymore on automake1.9, but automake (see http://lists.debian.org/debian-devel/2013/05/msg01459.html)
........

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "src/coucal"]
-	path = src/coucal
-	url = https://github.com/xroche/coucal.git

INSTALL

@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
-Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,96 +12,97 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell command './configure && make && make install'
-should configure, build, and install this package.  The following
-more-detailed instructions are generic; see the 'README' file for
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
-'INSTALL' file but do not implement all of the features documented
+`INSTALL' file but do not implement all of the features documented
 below.  The lack of an optional feature in a given package is not
 necessarily a bug.  More recommendations for GNU packages can be found
 in *note Makefile Conventions: (standards)Makefile Conventions.
 
-   The 'configure' shell script attempts to guess correct values for
+   The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a 'Makefile' in each directory of the package.
-It may also create one or more '.h' files containing system-dependent
-definitions.  Finally, it creates a shell script 'config.status' that
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
 you can run in the future to recreate the current configuration, and a
-file 'config.log' containing compiler output (useful mainly for
-debugging 'configure').
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
 
-   It can also use an optional file (typically called 'config.cache' and
-enabled with '--cache-file=config.cache' or simply '-C') that saves the
-results of its tests to speed up reconfiguring.  Caching is disabled by
-default to prevent problems with accidental use of stale cache files.
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
 
    If you need to do unusual things to compile the package, please try
-to figure out how 'configure' could check whether to do them, and mail
-diffs or instructions to the address given in the 'README' so they can
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
 be considered for the next release.  If you are using the cache, and at
-some point 'config.cache' contains results you don't want to keep, you
+some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
-   The file 'configure.ac' (or 'configure.in') is used to create
-'configure' by a program called 'autoconf'.  You need 'configure.ac' if
-you want to change it or regenerate 'configure' using a newer version of
-'autoconf'.
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
    The simplest way to compile this package is:
 
-  1. 'cd' to the directory containing the package's source code and type
-     './configure' to configure the package for your system.
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
 
-     Running 'configure' might take a while.  While running, it prints
+     Running `configure' might take a while.  While running, it prints
      some messages telling which features it is checking for.
 
-  2. Type 'make' to compile the package.
+  2. Type `make' to compile the package.
 
-  3. Optionally, type 'make check' to run any self-tests that come with
+  3. Optionally, type `make check' to run any self-tests that come with
      the package, generally using the just-built uninstalled binaries.
 
-  4. Type 'make install' to install the programs and any data files and
+  4. Type `make install' to install the programs and any data files and
      documentation.  When installing into a prefix owned by root, it is
      recommended that the package be configured and built as a regular
-     user, and only the 'make install' phase executed with root
+     user, and only the `make install' phase executed with root
      privileges.
 
-  5. Optionally, type 'make installcheck' to repeat any self-tests, but
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
      this time using the binaries in their final installed location.
      This target does not install anything.  Running this target as a
-     regular user, particularly if the prior 'make install' required
+     regular user, particularly if the prior `make install' required
      root privileges, verifies that the installation completed
      correctly.
 
   6. You can remove the program binaries and object files from the
-     source code directory by typing 'make clean'.  To also remove the
-     files that 'configure' created (so you can compile the package for
-     a different kind of computer), type 'make distclean'.  There is
-     also a 'make maintainer-clean' target, but that is intended mainly
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  7. Often, you can also type 'make uninstall' to remove the installed
+  7. Often, you can also type `make uninstall' to remove the installed
      files again.  In practice, not all packages have tested that
      uninstallation works correctly, even though it is required by the
      GNU Coding Standards.
 
-  8. Some packages, particularly those that use Automake, provide 'make
+  8. Some packages, particularly those that use Automake, provide `make
      distcheck', which can by used by developers to test that all other
-     targets like 'make install' and 'make uninstall' work correctly.
+     targets like `make install' and `make uninstall' work correctly.
      This target is generally not run by end users.
 
 Compilers and Options
 =====================
 
    Some systems require unusual options for compilation or linking that
-the 'configure' script does not know about.  Run './configure --help'
+the `configure' script does not know about.  Run `./configure --help'
 for details on some of the pertinent environment variables.
 
-   You can give 'configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here is
-an example:
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
 
      ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
@@ -112,21 +113,21 @@ Compiling For Multiple Architectures
 
    You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU 'make'.  'cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
-the 'configure' script.  'configure' automatically checks for the source
-code in the directory that 'configure' is in and in '..'.  This is known
-as a "VPATH" build.
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
-   With a non-GNU 'make', it is safer to compile the package for one
+   With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use 'make distclean' before
+installed the package for one architecture, use `make distclean' before
 reconfiguring for another architecture.
 
    On MacOS X 10.5 and later systems, you can create libraries and
 executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple '-arch' options to the
-compiler but only a single '-arch' option to the preprocessor.  Like
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
 this:
 
      ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
@@ -135,104 +136,105 @@ this:
 
    This is not guaranteed to produce working output in all cases, you
 may have to build one architecture at a time and combine the results
-using the 'lipo' tool if you have problems.
+using the `lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-   By default, 'make install' installs the package's commands under
-'/usr/local/bin', include files under '/usr/local/include', etc.  You
-can specify an installation prefix other than '/usr/local' by giving
-'configure' the option '--prefix=PREFIX', where PREFIX must be an
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
 absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
 PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like '--bindir=DIR' to specify different values for particular
-kinds of files.  Run 'configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the default
-for these options is expressed in terms of '${prefix}', so that
-specifying just '--prefix' will affect all of the other directory
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
 specifications that were not explicitly provided.
 
    The most portable way to affect installation locations is to pass the
-correct locations to 'configure'; however, many packages provide one or
+correct locations to `configure'; however, many packages provide one or
 both of the following shortcuts of passing variable assignments to the
-'make install' command line to change installation locations without
+`make install' command line to change installation locations without
 having to reconfigure or recompile.
 
    The first method involves providing an override variable for each
-affected directory.  For example, 'make install
+affected directory.  For example, `make install
 prefix=/alternate/directory' will choose an alternate location for all
 directory configuration variables that were expressed in terms of
-'${prefix}'.  Any directories that were specified during 'configure',
-but not in terms of '${prefix}', must each be overridden at install time
-for the entire installation to be relocated.  The approach of makefile
-variable overrides for each directory variable is required by the GNU
-Coding Standards, and ideally causes no recompilation.  However, some
-platforms have known limitations with the semantics of shared libraries
-that end up requiring recompilation when using this method, particularly
-noticeable in packages that use GNU Libtool.
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
 
-   The second method involves providing the 'DESTDIR' variable.  For
-example, 'make install DESTDIR=/alternate/directory' will prepend
-'/alternate/directory' before all installation names.  The approach of
-'DESTDIR' overrides is not required by the GNU Coding Standards, and
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
 does not work on platforms that have drive letters.  On the other hand,
 it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of '${prefix}'
-at 'configure' time.
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
 
 Optional Features
 =================
 
    If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving 'configure' the
-option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-   Some packages pay attention to '--enable-FEATURE' options to
-'configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to '--with-PACKAGE' options, where PACKAGE
-is something like 'gnu-as' or 'x' (for the X Window System).  The
-'README' should mention any '--enable-' and '--with-' options that the
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
 package recognizes.
 
-   For packages that use the X Window System, 'configure' can usually
+   For packages that use the X Window System, `configure' can usually
 find the X include and library files automatically, but if it doesn't,
-you can use the 'configure' options '--x-includes=DIR' and
-'--x-libraries=DIR' to specify their locations.
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
 
    Some packages offer the ability to configure how verbose the
-execution of 'make' will be.  For these packages, running './configure
+execution of `make' will be.  For these packages, running `./configure
 --enable-silent-rules' sets the default to minimal output, which can be
-overridden with 'make V=1'; while running './configure
+overridden with `make V=1'; while running `./configure
 --disable-silent-rules' sets the default to verbose, which can be
-overridden with 'make V=0'.
+overridden with `make V=0'.
 
 Particular systems
 ==================
 
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU CC
-is not installed, it is recommended to use the following options in
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
      ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
-   HP-UX 'make' updates targets which have the same time stamps as their
-prerequisites, which makes it generally unusable when shipped generated
-files such as 'configure' are involved.  Use GNU 'make' instead.
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
 
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its '<wchar.h>' header file.  The option '-nodtk' can be used as a
-workaround.  If GNU CC is not installed, it is therefore recommended to
-try
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
 
      ./configure CC="cc"
 
@@ -240,26 +242,26 @@ and if that doesn't work, try
 
      ./configure CC="cc -nodtk"
 
-   On Solaris, don't put '/usr/ucb' early in your 'PATH'.  This
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
 directory contains several dysfunctional programs; working variants of
-these programs are available in '/usr/bin'.  So, if you need '/usr/ucb'
-in your 'PATH', put it _after_ '/usr/bin'.
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
 
-   On Haiku, software installed for all users goes in '/boot/common',
-not '/usr/local'.  It is recommended to use the following options:
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
 
      ./configure --prefix=/boot/common
 
 Specifying the System Type
 ==========================
 
-   There may be some features 'configure' cannot figure out
+   There may be some features `configure' cannot figure out
 automatically, but needs to determine by the type of machine the package
 will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, 'configure' can figure that out, but if it prints
+_same_ architectures, `configure' can figure that out, but if it prints
 a message saying it cannot guess the machine type, give it the
-'--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as 'sun4', or a canonical name which has the form:
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
 
      CPU-COMPANY-SYSTEM
 
@@ -268,101 +270,101 @@ where SYSTEM can have one of these forms:
      OS
      KERNEL-OS
 
-   See the file 'config.sub' for the possible values of each field.  If
-'config.sub' isn't included in this package, then this package doesn't
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the option '--target=TYPE' to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
 platform different from the build platform, you should specify the
 "host" platform (i.e., that on which the generated programs will
-eventually be run) with '--host=TYPE'.
+eventually be run) with `--host=TYPE'.
 
 Sharing Defaults
 ================
 
-   If you want to set default values for 'configure' scripts to share,
-you can create a site shell script called 'config.site' that gives
-default values for variables like 'CC', 'cache_file', and 'prefix'.
-'configure' looks for 'PREFIX/share/config.site' if it exists, then
-'PREFIX/etc/config.site' if it exists.  Or, you can set the
-'CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all 'configure' scripts look for a site script.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
 
 Defining Variables
 ==================
 
    Variables not defined in a site shell script can be set in the
-environment passed to 'configure'.  However, some packages may run
+environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
-them in the 'configure' command line, using 'VAR=value'.  For example:
+them in the `configure' command line, using `VAR=value'.  For example:
 
      ./configure CC=/usr/local2/bin/gcc
 
-causes the specified 'gcc' to be used as the C compiler (unless it is
+causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
-Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
-Autoconf limitation.  Until the limitation is lifted, you can use this
-workaround:
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
-'configure' Invocation
+`configure' Invocation
 ======================
 
-   'configure' recognizes the following options to control how it
+   `configure' recognizes the following options to control how it
 operates.
 
-'--help'
-'-h'
-     Print a summary of all of the options to 'configure', and exit.
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
 
-'--help=short'
-'--help=recursive'
+`--help=short'
+`--help=recursive'
      Print a summary of the options unique to this package's
-     'configure', and exit.  The 'short' variant lists options used only
-     in the top level, while the 'recursive' variant lists options also
-     present in any nested packages.
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
-'--version'
-'-V'
-     Print the version of Autoconf used to generate the 'configure'
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
      script, and exit.
 
-'--cache-file=FILE'
+`--cache-file=FILE'
      Enable the cache: use and save the results of the tests in FILE,
-     traditionally 'config.cache'.  FILE defaults to '/dev/null' to
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
      disable caching.
 
-'--config-cache'
-'-C'
-     Alias for '--cache-file=config.cache'.
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
 
-'--quiet'
-'--silent'
-'-q'
+`--quiet'
+`--silent'
+`-q'
      Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to '/dev/null' (any error
+     suppress all normal output, redirect it to `/dev/null' (any error
      messages will still be shown).
 
-'--srcdir=DIR'
+`--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
-     'configure' can determine that directory automatically.
+     `configure' can determine that directory automatically.
 
-'--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names:: for
-     more details, including other options available for fine-tuning the
-     installation locations.
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
 
-'--no-create'
-'-n'
+`--no-create'
+`-n'
      Run the configure checks, but stop before creating any output
      files.
 
-'configure' also accepts some other, not widely useful, options.  Run
-'configure --help' for more details.
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

INSTALL.Linux

@@ -1,7 +1,7 @@
 HTTrack Website Copier - Install notes
 --------------------------------------
 
-On most systems (including GNU/Linux), installing can be easily achieved using the following command:
+On most systems (including GNU/Linux), installing can be easily acheived using the following command:
 
 ./configure && make && make install
 -or- (if not compiling as root)

Makefile.am

@@ -5,4 +5,4 @@ ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = INSTALL.Linux \
 		gpl-fr.txt license.txt greetings.txt history.txt \
-		httrack-doc.html lang.def README.md
+		httrack-doc.html lang.def

Makefile.in

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,61 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
+am__make_dryrun = \
+  { \
+    am__dry=no; \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
     esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -88,6 +51,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+	config.guess config.sub depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -96,36 +63,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -133,37 +85,12 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir distdir-am dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
-	config.h.in
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
-	COPYING ChangeLog INSTALL NEWS README compile config.guess \
-	config.sub depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -173,7 +100,6 @@ am__remove_distdir = \
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -201,17 +127,12 @@ am__relativize = \
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
-# Exists only to be overridden by the user if desired.
-AM_DISTCHECK_DVI_TARGET = dvi
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -220,12 +141,14 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CFLAGS_PIE = @CFLAGS_PIE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
-DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -248,7 +171,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LDFLAGS_PIE = @LDFLAGS_PIE@
 LFS_FLAG = @LFS_FLAG@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -257,7 +179,6 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_CV_OBJDIR = @LT_CV_OBJDIR@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -296,6 +217,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -334,7 +256,6 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -347,7 +268,7 @@ SUBDIRS = src man m4 libtest templates lang html tests
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = INSTALL.Linux \
 		gpl-fr.txt license.txt greetings.txt history.txt \
-		httrack-doc.html lang.def README.md
+		httrack-doc.html lang.def
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -368,14 +289,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -388,8 +310,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@test -f $@ || rm -f stamp-h1
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -412,25 +334,22 @@ distclean-libtool:
 	-rm -f libtool config.lt
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -445,12 +364,57 @@ $(am__recursive_targets):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
 
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -466,7 +430,12 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	$(am__define_uniq_tagged_files); \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -478,11 +447,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -491,36 +464,11 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -585,47 +533,41 @@ distdir-am: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
 
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
+
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
 
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
-
-dist-zstd: distdir
-	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -633,9 +575,11 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
@@ -643,27 +587,24 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
-	*.tar.zst*) \
-	  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
 	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build/sub \
-	  && ../../configure \
+	  && $(am__cd) $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -684,7 +625,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -819,26 +760,24 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(am__recursive_targets) all install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--refresh check check-am clean clean-cscope clean-generic \
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-	dist-xz dist-zip dist-zstd distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

README

@@ -1,5 +1,5 @@
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998-2013 Xavier Roche and other contributors
 
 Welcome to HTTrack Website Copier!
 
@@ -45,7 +45,7 @@ These options may not be necessary for a normal usage. But they can solve severa
 
 - If you need more than 100,000 links: -#L1000000 (1,000,000 links)
 - If you need more than 500 filters: -#F1000 (1,000 filters)
-- If you need transfer rate statistics every minutes: -#Z
+- If you need transfer rate statictics every minutes: -#Z
 - If you need transfer operations statistics every minutes: -#T
 - If you want log files to be refreshed after every line: -#f
 

README.md

@@ -1,26 +0,0 @@
-# HTTrack Website Copier - Development Repository
-
-## About
-_Copy websites to your computer (Offline browser)_
-
-<img src="http://www.httrack.com/htsw/screenshot_w1.jpg" width="34%">
-
-*HTTrack* is an _offline browser_ utility, allowing you to download a World Wide website from the Internet to a local directory, building recursively all directories, getting html, images, and other files from the server to your computer.
- 
-*HTTrack* arranges the original site's relative link-structure. Simply open a page of the "mirrored" website in your browser, and you can browse the site from link to link, as if you were viewing it online.
-
-HTTrack can also update an existing mirrored site, and resume interrupted downloads. HTTrack is fully configurable, and has an integrated help system.
-
-*WinHTTrack* is the Windows 2000/XP/Vista/Seven release of HTTrack, and *WebHTTrack* the Linux/Unix/BSD release. 
-
-## Website
-
-*Main Website:*
-http://www.httrack.com/
-
-## Compile trunk release
-```sh
-git clone https://github.com/xroche/httrack.git --recurse
-cd httrack
-./configure --prefix=$HOME/usr && make -j8 && make install
-```

compile

@@ -1,348 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2018-03-07.03; # UTC
-
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# 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, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN* | MSYS*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin/* | msys/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      lib=$dir/$lib.lib
-      break
-    fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
-  done
-  IFS=$save_IFS
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
-  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:

config.h.in

@@ -3,15 +3,12 @@
 /* Check for dlopen in c */
 #undef DLLIB
 
-/* Define if pointers to integers require aligned access */
-#undef HAVE_ALIGNED_ACCESS_REQUIRED
+/* Check for ftime */
+#undef FTIME
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the <execinfo.h> header file. */
-#undef HAVE_EXECINFO_H
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -36,9 +33,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Check for strnlen */
-#undef HAVE_STRNLEN
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
@@ -69,7 +63,14 @@
 /* Check for libsocket */
 #undef LIBSOCKET
 
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
+/* LLint format */
+#undef LLINT_FORMAT
+
+/* LLint type */
+#undef LLINT_TYPE
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
 #undef LT_OBJDIR
 
 /* Name of package */
@@ -111,43 +112,5 @@
 /* Check for pthread in pthreads */
 #undef THREADS
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Version number of package */
 #undef VERSION
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
-/* in_port_t */
-#undef in_port_t
-
-/* sa_family_t */
-#undef sa_family_t

config.sub

@@ -1,31 +1,36 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2018-02-22'
+timestamp='2012-04-18'
 
-# 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
-# the Free Software Foundation; either version 3 of the License, or
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, 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.
+# 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, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
+# 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 GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -33,7 +38,7 @@ timestamp='2018-02-22'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,11 +58,12 @@ timestamp='2018-02-22'
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
 
 Canonicalize a configuration name.
 
-Options:
+Operation modes:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -67,7 +73,9 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -94,7 +102,7 @@ while test $# -gt 0 ; do
 
     *local*)
        # First pass through any local machine types.
-       echo "$1"
+       echo $1
        exit ;;
 
     * )
@@ -112,24 +120,24 @@ esac
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | cloudabi*-eabi* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
-    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
   android-linux)
     os=-linux-android
-    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
     ;;
   *)
-    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
-    if [ "$basic_machine" != "$1" ]
-    then os=`echo "$1" | sed 's/.*-/-/'`
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
     else os=; fi
     ;;
 esac
@@ -148,7 +156,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
@@ -178,44 +186,44 @@ case $os in
 		;;
 	-sco6)
 		os=-sco5v6
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5)
 		os=-sco3.2v5
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
 		os=-sco3.2v4
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco*)
 		os=-sco3.2v2
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-udk*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-isc)
 		os=-isc2.2
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-clix*)
 		basic_machine=clipper-intergraph
 		;;
 	-isc*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-lynx*178)
 		os=-lynxos178
@@ -227,7 +235,10 @@ case $os in
 		os=-lynxos
 		;;
 	-ptx*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
 		;;
 	-psos*)
 		os=-psos
@@ -248,25 +259,21 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| ba \
-	| be32 | be64 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
-	| c4x | c8051 | clipper \
+	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
+	| epiphany \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
-	| i370 | i860 | i960 | ia16 | ia64 \
+	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -280,30 +287,26 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pj | pjl \
+	| open8 \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pru \
 	| pyramid \
-	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -311,8 +314,7 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| wasm32 \
+	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
@@ -326,14 +328,11 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 	ms1)
 		basic_machine=mt-unknown
@@ -362,7 +361,7 @@ case $basic_machine in
 	  ;;
 	# Object if more than one company name word.
 	*-*-*)
-		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
@@ -371,29 +370,26 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
-	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
+	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -407,34 +403,28 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
-	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pru-* \
 	| pyramid-* \
-	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@@ -442,8 +432,6 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
-	| visium-* \
-	| wasm32-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -457,7 +445,7 @@ case $basic_machine in
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
-		basic_machine=i386-pc
+		basic_machine=i386-unknown
 		os=-bsd
 		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -491,7 +479,7 @@ case $basic_machine in
 		basic_machine=x86_64-pc
 		;;
 	amd64-*)
-		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	amdahl)
 		basic_machine=580-amdahl
@@ -520,9 +508,6 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -536,7 +521,7 @@ case $basic_machine in
 		os=-linux
 		;;
 	blackfin-*)
-		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	bluegene*)
@@ -544,13 +529,13 @@ case $basic_machine in
 		os=-cnk
 		;;
 	c54x-*)
-		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	c55x-*)
-		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	c6x-*)
-		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	c90)
 		basic_machine=c90-cray
@@ -639,18 +624,10 @@ case $basic_machine in
 		basic_machine=rs6000-bull
 		os=-bosx
 		;;
-	dpx2*)
+	dpx2* | dpx2*-bull)
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
-	e500v[12])
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v[12]-*)
-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=$os"spe"
-		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -740,6 +717,9 @@ case $basic_machine in
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
+	hppa-next)
+		os=-nextstep3
+		;;
 	hppaosf)
 		basic_machine=hppa1.1-hp
 		os=-osf
@@ -752,26 +732,26 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 	i*86v32)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
 	i*86v)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
 	i386mach)
 		basic_machine=i386-mach
 		os=-mach
 		;;
-	vsta)
+	i386-vsta | vsta)
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
@@ -789,17 +769,17 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
-		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
 		;;
 	m68knommu-*)
-		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
 	magnum | m3230)
 		basic_machine=mips-mips
 		os=-sysv
@@ -808,15 +788,11 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze*)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
 	mingw32)
-		basic_machine=i686-pc
+		basic_machine=i386-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -831,10 +807,10 @@ case $basic_machine in
 		os=-mint
 		;;
 	mips3*-*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
 	monitor)
 		basic_machine=m68k-rom68k
@@ -844,19 +820,15 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
 		;;
 	ms1-*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i686-pc
+		basic_machine=i386-pc
 		os=-msys
 		;;
 	mvs)
@@ -895,7 +867,7 @@ case $basic_machine in
 		basic_machine=v70-nec
 		os=-sysv
 		;;
-	next | m*-next)
+	next | m*-next )
 		basic_machine=m68k-next
 		case $os in
 		    -nextstep* )
@@ -940,12 +912,6 @@ case $basic_machine in
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
-	nsv-tandem)
-		basic_machine=nsv-tandem
-		;;
-	nsx-tandem)
-		basic_machine=nsx-tandem
-		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -978,7 +944,7 @@ case $basic_machine in
 		os=-linux
 		;;
 	parisc-*)
-		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	pbd)
@@ -994,7 +960,7 @@ case $basic_machine in
 		basic_machine=i386-pc
 		;;
 	pc98-*)
-		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
@@ -1009,16 +975,16 @@ case $basic_machine in
 		basic_machine=i786-pc
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentium4-*)
-		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
@@ -1028,23 +994,23 @@ case $basic_machine in
 	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
 	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle)
+	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little)
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ps2)
 		basic_machine=i386-ibm
@@ -1053,11 +1019,7 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
+	rdos)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1098,10 +1060,17 @@ case $basic_machine in
 	sequent)
 		basic_machine=i386-sequent
 		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
 	sh5el)
 		basic_machine=sh5le-unknown
 		;;
-	simso-wrs)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -1120,7 +1089,7 @@ case $basic_machine in
 		os=-sysv4
 		;;
 	strongarm-* | thumb-*)
-		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	sun2)
 		basic_machine=m68000-sun
@@ -1242,9 +1211,6 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	x64)
-		basic_machine=x86_64-pc
-		;;
 	xbox)
 		basic_machine=i686-pc
 		os=-mingw32
@@ -1253,12 +1219,20 @@ case $basic_machine in
 		basic_machine=xps100-honeywell
 		;;
 	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
 		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
 		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1287,6 +1261,10 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
@@ -1296,6 +1274,9 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
 	cydra)
 		basic_machine=cydra-cydrome
 		;;
@@ -1315,7 +1296,7 @@ case $basic_machine in
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
-		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
 		;;
 esac
@@ -1323,10 +1304,10 @@ esac
 # Here we canonicalize certain aliases for manufacturers.
 case $basic_machine in
 	*-digital*)
-		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
 		;;
 	*-commodore*)
-		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
 		;;
 	*)
 		;;
@@ -1337,8 +1318,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.
 	-auroraux)
 		os=-auroraux
@@ -1349,48 +1330,45 @@ case $os in
 	-solaris)
 		os=-solaris2
 		;;
+	-svr4*)
+		os=-sysv4
+		;;
 	-unixware*)
 		os=-sysv4.2uw
 		;;
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
-	# es1800 is here to avoid being matched by es* (a different OS)
-	-es1800*)
-		os=-ose
-		;;
-	# Now accept the basic system types.
+	# First accept the basic system types.
 	# The portable systems comes first.
-	# Each alternative MUST end in a * to match a version number.
+	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -windiss* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-	      | -midnightbsd*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1407,12 +1385,12 @@ case $os in
 	-nto*)
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
-	-sim | -xray | -os68k* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* \
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
-		os=`echo "$os" | sed -e 's|mac|macos|'`
+		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
 	-linux-dietlibc)
 		os=-linux-dietlibc
@@ -1421,10 +1399,10 @@ case $os in
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
 	-sunos5*)
-		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
 	-sunos6*)
-		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
 	-opened*)
 		os=-openedition
@@ -1435,6 +1413,12 @@ case $os in
 	-wince*)
 		os=-wince
 		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
 	-utek*)
 		os=-bsd
 		;;
@@ -1459,7 +1443,7 @@ case $os in
 	-nova*)
 		os=-rtmk-nova
 		;;
-	-ns2)
+	-ns2 )
 		os=-nextstep2
 		;;
 	-nsk*)
@@ -1481,7 +1465,7 @@ case $os in
 	-oss*)
 		os=-sysv3
 		;;
-	-svr4*)
+	-svr4)
 		os=-sysv4
 		;;
 	-svr3)
@@ -1496,38 +1480,35 @@ case $os in
 	-ose*)
 		os=-ose
 		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
-	-pikeos*)
-		# Until real need of OS specific support for
-		# particular features comes up, bare metal
-		# configurations are quite functional.
-		case $basic_machine in
-		    arm*)
-			os=-eabi
-			;;
-		    *)
-			os=-elf
-			;;
-		esac
-		;;
 	-nacl*)
 		;;
-	-ios)
-		;;
 	-none)
 		;;
 	*)
 		# Get rid of the `-' at the beginning of $os.
 		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
 		exit 1
 		;;
 esac
@@ -1562,9 +1543,6 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
-	c8051-*)
-		os=-elf
-		;;
 	hexagon-*)
 		os=-elf
 		;;
@@ -1617,12 +1595,12 @@ case $basic_machine in
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
-	pru-*)
-		os=-elf
-		;;
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1662,7 +1640,7 @@ case $basic_machine in
 	m88k-omron*)
 		os=-luna
 		;;
-	*-next)
+	*-next )
 		os=-nextstep
 		;;
 	*-sequent)
@@ -1677,6 +1655,9 @@ case $basic_machine in
 	i370-*)
 		os=-mvs
 		;;
+	*-next)
+		os=-nextstep3
+		;;
 	*-gould)
 		os=-sysv
 		;;
@@ -1786,15 +1767,15 @@ case $basic_machine in
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
 
-echo "$basic_machine$os"
+echo $basic_machine$os
 exit
 
 # Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

configure.ac

@@ -1,46 +1,18 @@
-AC_PREREQ(2.59)
-
-AC_INIT([httrack], [3.49.4], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
-AC_COPYRIGHT([
-HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2015 Xavier Roche and other contributors
-
-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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-
-Important notes:
-
-- We hereby ask people using this source NOT to use it in purpose of grabbing
-emails addresses, or collecting any other private information on persons.
-This would disgrace our work, and spoil the many hours we spent on it.
-
-Please visit our Website: http://www.httrack.com
-])
-
+AC_INIT([httrack], [3.47.27], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
 AC_CONFIG_SRCDIR(src/httrack.c)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([subdir-objects])
-VERSION_INFO="2:49:0"
+AM_INIT_AUTOMAKE
+VERSION_INFO="2:47:0"
 AM_MAINTAINER_MODE
-AC_USE_SYSTEM_EXTENSIONS
+
+AC_PREREQ(2.50)
 
 AC_PROG_CC
-AM_PROG_CC_C_O
+AC_PROG_CXX
 AC_STDC_HEADERS
 LT_INIT
 AC_PROG_LN_S
-AM_PROG_LIBTOOL
 
 # Export LD_LIBRARY_PATH name or equivalent.
 AC_SUBST(SHLIBPATH_VAR,$shlibpath_var)
@@ -48,55 +20,12 @@ AC_SUBST(SHLIBPATH_VAR,$shlibpath_var)
 # Export .libs or equivalent.
 AC_SUBST(LT_CV_OBJDIR,$lt_cv_objdir)
 
-# Export version info
-AC_SUBST(VERSION_INFO)
-
 ### Default CFLAGS
-DEFAULT_CFLAGS="-Wall -Wformat -Wformat-security \
--Wmultichar -Wwrite-strings -Wcast-qual -Wcast-align \
--Wstrict-prototypes -Wmissing-prototypes \
--Wmissing-declarations -Wdeclaration-after-statement \
--Wpointer-arith -Wsequence-point -Wnested-externs \
--D_REENTRANT"
+DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \
+-Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
+-Wnested-externs -D_REENTRANT"
 AC_SUBST(DEFAULT_CFLAGS)
-DEFAULT_LDFLAGS=""
-AC_SUBST(DEFAULT_LDFLAGS)
-
-### Additional flags (if supported)
-AX_CHECK_COMPILE_FLAG([-Wparentheses], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wparentheses"])
-AX_CHECK_COMPILE_FLAG([-Winit-self], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Winit-self"])
-AX_CHECK_COMPILE_FLAG([-Wunused-but-set-parameter], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wunused-but-set-parameter"])
-AX_CHECK_COMPILE_FLAG([-Waddress], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Waddress"])
-AX_CHECK_COMPILE_FLAG([-Wuninitialized], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wuninitialized"])
-AX_CHECK_COMPILE_FLAG([-Wformat=2], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wformat=2"])
-AX_CHECK_COMPILE_FLAG([-Wformat-nonliteral], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wformat-nonliteral"])
-AX_CHECK_COMPILE_FLAG([-Wmissing-parameter-type], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wmissing-parameter-type"])
-AX_CHECK_COMPILE_FLAG([-Wold-style-definition], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wold-style-definition"])
-AX_CHECK_COMPILE_FLAG([-Wignored-qualifiers], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wignored-qualifiers"])
-AX_CHECK_COMPILE_FLAG([-fstrict-aliasing -Wstrict-aliasing], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstrict-aliasing -Wstrict-aliasing"])
-AX_CHECK_COMPILE_FLAG([-fstack-protector], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-protector"])
-AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-clash-protection"])
-AX_CHECK_COMPILE_FLAG([-fcf-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fcf-protection"])
-AX_CHECK_LINK_FLAG([-Wl,--discard-all], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--discard-all"])
-AX_CHECK_LINK_FLAG([-Wl,--no-undefined], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--no-undefined"])
-AX_CHECK_LINK_FLAG([-Wl,-z,relro,-z,now], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,relro,-z,now"])
-AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,noexecstack"])
-
-### PIE
-CFLAGS_PIE=""
-LDFLAGS_PIE=""
-AX_CHECK_COMPILE_FLAG([-fpie -pie], [CFLAGS_PIE="-fpie -pie"])
-AX_CHECK_LINK_FLAG([-pie], [LDFLAGS_PIE="-pie"])
-AC_SUBST([CFLAGS_PIE])
-AC_SUBST([LDFLAGS_PIE])
-
-## Export all symbols for backtraces
-AX_CHECK_COMPILE_FLAG([-rdynamic], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -rdynamic"])
-
-### Check for -fvisibility=hidden support
-gl_VISIBILITY
-AM_CFLAGS="$AM_CFLAGS $CFLAG_VISIBILITY"
-AC_SUBST([AM_CFLAGS])
+AC_SUBST(VERSION_INFO)
 
 ### Check for platform
 #case $host in
@@ -110,31 +39,83 @@ AC_SUBST([AM_CFLAGS])
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
 
+### Check LLint format
+if test x"$ac_cv_sizeof_long" = x"8"; then
+AC_MSG_CHECKING(long printf format)
+AC_TRY_RUN([#include <stdio.h>
+main() { long int c = -1, d = -1; char* f = "%ld"; sscanf("1234", f, &c, &d); 
+         exit (c != 1234 || d != -1); }
+],
+	[AC_MSG_RESULT(found)
+	AC_DEFINE(LLINT_FORMAT,"%ld",[LLint format])
+	AC_DEFINE(LLINT_TYPE,long int,[LLint type])
+],
+[
+AC_TRY_RUN([#include <stdio.h>
+main() { long int c = -1, d = -1; char* f = "%d"; sscanf("1234", f, &c, &d); 
+         exit (c != 1234 || d != -1); }
+],
+[
+	AC_MSG_RESULT(found)
+	AC_DEFINE(LLINT_FORMAT,"%d",[LLint format])
+	AC_DEFINE(LLINT_TYPE,long int,[LLint type])
+],
+[
+	AC_MSG_RESULT(no)
+	AC_MSG_RESULT(assuming not on target machine)
+	AC_DEFINE(LLINT_FORMAT,"%d",[LLint format])
+	AC_DEFINE(LLINT_TYPE,int,[LLint type])
+])
+])
+elif test x"$ac_cv_sizeof_long_long" = x"8"; then
+AC_MSG_CHECKING(long long printf format)
+AC_TRY_RUN([#include <stdio.h>
+main() { long long int c = -1, d = -1; char* f = "%lld"; sscanf("1234", f, &c, &d); 
+         exit (c != 1234 || d != -1); }
+],
+	[AC_MSG_RESULT(found) 
+	AC_DEFINE(LLINT_FORMAT,"%lld",[LLint format])
+	AC_DEFINE(LLINT_TYPE,long long int,[LLint type])
+],
+[	
+AC_TRY_RUN([#include <stdio.h>
+main() { long long int c = -1, d = -1; char* f = "%ld"; sscanf("1234", f, &c, &d); 
+         exit (c != 1234 || d != -1); }
+],
+[
+	AC_MSG_RESULT(found)
+	AC_DEFINE(LLINT_FORMAT,"%ld",[LLint format])
+	AC_DEFINE(LLINT_TYPE,long long int,[LLint type])
+],
+[
+AC_TRY_RUN([#include <stdio.h>
+main() { long long int c = -1, d = -1; char* f = "%d"; sscanf("1234", f, &c, &d); 
+         exit (c != 1234 || d != -1); }
+],
+[
+	AC_MSG_RESULT(found)
+	AC_DEFINE(LLINT_FORMAT,"%d",[LLint format])
+	AC_DEFINE(LLINT_TYPE,long long int,[LLint type])
+],
+[
+	AC_MSG_RESULT(no)
+	AC_MSG_RESULT(assuming not on target machine)
+	AC_DEFINE(LLINT_FORMAT,"%d",[LLint format])
+	AC_DEFINE(LLINT_TYPE,int,[LLint type])
+])
+])
+])
+else
+AC_DEFINE(LLINT_FORMAT,"%d",[LLint format])
+AC_DEFINE(LLINT_TYPE,int,[LLint type])
+fi
+
 ### check for in_addr_t
 AC_CHECK_TYPE(in_addr_t,
 AC_DEFINE(HTS_DO_NOT_REDEFINE_in_addr_t,,[Check for in_addr_t]),
 AC_MSG_WARN([*** in_addr_t not found]),
 [#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>])
-
-# check for in_port_
-AC_CHECK_TYPE(in_port_t, [], [AC_DEFINE([in_port_t], [uint16_t], [in_port_t])], [
-#include <sys/types.h>
-#include <netinet/in.h>
-])
-
-# check for sa_family_t
-AC_CHECK_TYPE(sa_family_t, [], [AC_DEFINE([sa_family_t], [uint16_t], [sa_family_t])], [
-#include <sys/types.h>
-#include <netinet/in.h>
-])
-
-# check wether misaligned access is possible or not
-AX_CHECK_ALIGNED_ACCESS_REQUIRED
-
-# check for various headers
-AC_CHECK_HEADERS([execinfo.h])
+#include <netinet/in.h>])
 
 ### zlib
 CHECK_ZLIB()
@@ -166,16 +147,9 @@ if test x"$https_support" = x"no"; then
 AC_MSG_NOTICE([disabling https support])
 AC_DEFINE(HTS_USEOPENSSL, 0)
 else
-SAVE_LIBS=$LIBS
-AC_CHECK_LIB(crypto, EVP_get_digestbyname,
+AC_CHECK_LIB(ssl, SSL_library_init,
 	[
-	OPENSSL_LIBS="-lcrypto"
-	]
-	)
-LIBS="$LIBS $OPENSSL_LIBS"
-AC_CHECK_LIB(ssl, SSL_CTX_new,
-	[
-	OPENSSL_LIBS="$OPENSSL_LIBS -lssl"
+	OPENSSL_LIBS="-lcrypto -lssl"
 	AC_DEFINE(HTS_USEOPENSSL, 1, [Check for OpenSSL])
 	],
 	[
@@ -186,7 +160,6 @@ AC_CHECK_LIB(ssl, SSL_CTX_new,
 	fi
 	]
 	)
-LIBS=$SAVE_LIBS
 AC_SUBST(OPENSSL_LIBS)
 fi
 
@@ -240,6 +213,10 @@ AC_DEFINE(DLLIB, 1,[Check for dlopen in c])], AC_MSG_WARN([*** not found * this
 AC_SUBST(DL_LIBS)
 fi
 
+### Check for ftime
+AC_CHECK_LIB(c, ftime, [
+AC_DEFINE(FTIME, 1,[Check for ftime])], AC_MSG_RESULT([not found]))
+
 ### Check for setuid
 AC_CHECK_LIB(c, setuid, [
 AC_DEFINE(SETUID, 1,[Check for setuid])], AC_MSG_RESULT([not found]))
@@ -247,10 +224,6 @@ AC_DEFINE(SETUID, 1,[Check for setuid])], AC_MSG_RESULT([not found]))
 ### Check for snprintf
 AC_FUNC_SNPRINTF()
 
-### Check for strnlen
-AC_CHECK_LIB(c, strnlen, [
-AC_DEFINE(HAVE_STRNLEN, 1,[Check for strnlen])], AC_MSG_RESULT([not found]))
-
 ## Online unit tests
 AC_MSG_CHECKING(whether to enable online unit tests)
 AC_ARG_ENABLE([online-unit-tests],

debian/changelog

@@ -1,219 +1,3 @@
-httrack (3.49.4-1) unstable; urgency=low
-
-  * Updated to 3.49.4 (3.49-4)
-    closes:#1021492
-
- -- Xavier Roche <xavier@debian.org>  Sat, 14 Jan 2023 17:24:31 +0100
-
-httrack (3.49.3-1) unstable; urgency=low
-
-  * Updated to 3.49.3 (3.49-3)
-    closes:#863028
-
- -- Xavier Roche <xavier@debian.org>  Thu, 12 Jan 2023 22:10:03 +0100
-
-httrack (3.49.2-1) unstable; urgency=medium
-
-  * Fixed buffer overflow in output option commandline argument (VL-ID 2068) (Hosein Askari)
-
- -- Xavier Roche <xavier@debian.org>  Sat, 20 May 2017 10:33:35 +0200
-
-httrack (3.49.1-1) unstable; urgency=low
-
-  * Updated to 3.49.1 (3.49-1)
-
- -- Xavier Roche <xavier@debian.org>  Sat, 01 Apr 2017 22:09:48 +0200
-
-httrack (3.48.24-1) unstable; urgency=low
-
-  * Removed recommends non-existing package (libssl1.0.0)
-    closes:#835258
-
- -- Xavier Roche <xavier@debian.org>  Wed, 24 Aug 2016 09:04:28 +0200
-
-httrack (3.48.23-1) unstable; urgency=medium
-
-  * Updated to 3.48.23 (3.48-23)
-    closes:#828344
-
- -- Xavier Roche <xavier@debian.org>  Sun, 26 Jun 2016 14:15:46 +0200
-
-httrack (3.48.22-1) unstable; urgency=medium
-
-  * Updated to 3.48.22 (3.48-22)
-    closes:#804535
-
- -- Xavier Roche <xavier@debian.org>  Tue, 26 Apr 2016 18:58:27 +0200
-
-httrack (3.48.21-1) unstable; urgency=low
-
-  * Updated to 3.48.21 (3.48-21)
-
- -- Xavier Roche <xavier@debian.org>  Sat, 14 Mar 2015 15:02:53 +0100
-
-httrack (3.48.20-1) unstable; urgency=low
-
-  * Updated to 3.48.20 (3.48-20)
-    closes:#765019
-
- -- Xavier Roche <xavier@debian.org>  Wed, 15 Oct 2014 21:37:54 +0200
-
-httrack (3.48.19-1) unstable; urgency=low
-
-  * Updated to 3.48.19 (3.48-19)
-    closes:#756328
-
- -- Xavier Roche <xavier@debian.org>  Mon, 28 Jul 2014 22:52:19 +0200
-
-httrack (3.48.18-1) unstable; urgency=low
-
-  * Updated to 3.48.18 (3.48-18)
-    closes:#755107
-
- -- Xavier Roche <xavier@debian.org>  Thu, 17 Jul 2014 21:35:10 +0200
-
-httrack (3.48.17-1) unstable; urgency=low
-
-  * Updated to 3.48.17 (3.48-17)
-
- -- Xavier Roche <xavier@debian.org>  Sat, 12 Jul 2014 15:21:14 +0200
-
-httrack (3.48.16-1) unstable; urgency=low
-
-  * Updated to 3.48.16 (3.48-16)
-    fixed FTBFS on ARM/MIPS again
-
- -- Xavier Roche <xavier@debian.org>  Wed, 09 Jul 2014 07:02:08 +0200
-
-httrack (3.48.15-1) unstable; urgency=low
-
-  * Updated to 3.48.15 (3.48-15)
-    fixed FTBFS on ARM/MIPS
-
- -- Xavier Roche <xavier@debian.org>  Tue, 08 Jul 2014 22:05:14 +0200
-
-httrack (3.48.14-1) unstable; urgency=low
-
-  * Updated to 3.48.14 (3.48-14)
-
- -- Xavier Roche <xavier@debian.org>  Tue, 08 Jul 2014 20:36:55 +0200
-
-httrack (3.48.13-1) unstable; urgency=low
-
-  * Updated to 3.48.13 (3.48-13)
-    closes:#750931
-
- -- Xavier Roche <xavier@debian.org>  Sun, 08 Jun 2014 16:22:13 +0200
-
-httrack (3.48.12-1) unstable; urgency=low
-
-  * Updated to 3.48.12 (3.48-12)
-    Should fix missing/broken .h for libhttrack-dev
-
- -- Xavier Roche <xavier@debian.org>  Sun, 08 Jun 2014 13:19:49 +0200
-
-httrack (3.48.11-1) unstable; urgency=low
-
-  * Updated to 3.48.11 (3.48-11)
-
- -- Xavier Roche <xavier@debian.org>  Fri, 06 Jun 2014 17:58:12 +0200
-
-httrack (3.48.10-1) unstable; urgency=low
-
-  * Updated to 3.48.10 (3.48-10)
-
- -- Xavier Roche <xavier@debian.org>  Wed, 04 Jun 2014 19:00:07 +0200
-
-httrack (3.48.9-1) unstable; urgency=low
-
-  * Updated to 3.48.9 (3.48-9)
-
- -- Xavier Roche <xavier@debian.org>  Wed, 21 May 2014 19:22:04 +0200
-
-httrack (3.48.8-1) unstable; urgency=low
-
-  * Updated to 3.48.8 (3.48-8)
-
- -- Xavier Roche <xavier@debian.org>  Thu, 15 May 2014 19:21:21 +0200
-
-httrack (3.48.7-1) unstable; urgency=low
-
-  * Updated to 3.48.7 (3.48-7)
-
- -- Xavier Roche <xavier@debian.org>  Wed, 14 May 2014 19:51:57 +0200
-
-httrack (3.48.6-1) unstable; urgency=low
-
-  * Updated to 3.48.6 (3.48-6)
-
- -- Xavier Roche <xavier@debian.org>  Tue, 13 May 2014 21:23:02 +0200
-
-httrack (3.48.5-1) unstable; urgency=low
-
-  * Updated to 3.48.5 (3.48-5)
-
- -- Xavier Roche <xavier@debian.org>  Fri, 02 May 2014 16:37:08 +0200
-
-httrack (3.48.4-1) unstable; urgency=low
-
-  * Updated to 3.48.4 (3.48-4)
-    closes:#746173
-
- -- Xavier Roche <xavier@debian.org>  Sun, 27 Apr 2014 18:48:57 +0200
-
-httrack (3.48.3-1) unstable; urgency=low
-
-  * Updated to 3.48.3 (3.48-3)
-
- -- Xavier Roche <xavier@debian.org>  Fri, 11 Apr 2014 20:31:21 +0200
-
-httrack (3.48.2-1) unstable; urgency=low
-
-  * Updated to 3.48.2 (3.48-2)
-
- -- Xavier Roche <xavier@debian.org>  Thu, 10 Apr 2014 18:30:08 +0200
-
-httrack (3.48.1-5) unstable; urgency=low
-
-  * Really call dh_autoreconf, fix configure dependencies.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 16 Apr 2014 14:46:20 +0200
-
-httrack (3.48.1-4) unstable; urgency=low
-
-  * Cleanup in dependencies
-
- -- Xavier Roche <xavier@debian.org>  Tue, 15 Apr 2014 22:13:19 +0200
-
-httrack (3.48.1-3) unstable; urgency=low
-
-  * Fixed FTBFS due to a missing Build-Depends: dh-autoreconf
-
- -- Xavier Roche <xavier@debian.org>  Tue, 15 Apr 2014 21:32:03 +0200
-
-httrack (3.48.1-2) unstable; urgency=low
-
-  * Fixed removal of .a files even on architectures where .a are libraries
-    closes:#744594
-    Enable verosity of unit tests
-    Call dh_autoreconf_clean before dh_clean
-
- -- Xavier Roche <xavier@debian.org>  Tue, 15 Apr 2014 21:02:14 +0200
-
-httrack (3.48.1-1) unstable; urgency=low
-
-  * Updated to 3.48.1 (3.48-1)
-
- -- Xavier Roche <xavier@debian.org>  Wed, 09 Apr 2014 21:02:08 +0200
-
-httrack (3.47.27-3) unstable; urgency=low
-
-  * Do not depend on automake1.9 but on automake instead
-    see: http://lists.debian.org/debian-devel/2013/05/msg01459.html
-    closes:#724390
-
- -- Xavier Roche <xavier@debian.org>  Thu, 26 Sep 2013 20:09:12 +0200
-
 httrack (3.47.27-1) unstable; urgency=low
 
   * Updated to 3.47.27 (3.47-27)

debian/compat

@@ -1 +1 @@
-13
+8

debian/control

@@ -2,14 +2,12 @@ Source: httrack
 Section: web
 Priority: optional
 Maintainer: Xavier Roche <roche@httrack.com>
-Standards-Version: 4.6.2
-Build-Depends: debhelper (>= 12.0.0), dh-autoreconf, autotools-dev, autoconf, autoconf-archive, automake, libtool, zlib1g-dev, libssl-dev
+Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 8.0.0), zlib1g-dev, libssl-dev, autotools-dev, autoconf, automake, libtool
 Homepage: http://www.httrack.com
-Vcs-Git: https://github.com/xroche/httrack.git
 
 Package: httrack
 Architecture: any
-Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: webhttrack, httrack-doc
 Description: Copy websites to your computer (Offline browser)
@@ -27,8 +25,7 @@ Description: Copy websites to your computer (Offline browser)
 
 Package: webhttrack
 Architecture: any
-Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}, webhttrack-common, iceape-browser | iceweasel | icecat | mozilla | firefox | mozilla-firefox | www-browser | sensible-utils
+Depends: ${misc:Depends}, ${shlibs:Depends}, webhttrack-common, iceape-browser | iceweasel | icecat | mozilla | firefox | mozilla-firefox | www-browser
 Replaces: webhttrack-common (<< 3.43.9-2)
 Breaks: webhttrack-common (<< 3.43.9-2)
 Suggests: httrack, httrack-doc
@@ -50,7 +47,6 @@ Description: Copy websites to your computer, httrack with a Web interface
 
 Package: webhttrack-common
 Architecture: all
-Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: webhttrack common files
  This package is the common files of webhttrack, website copier and
@@ -58,27 +54,26 @@ Description: webhttrack common files
 
 Package: libhttrack2
 Architecture: any
-Multi-Arch: same
 Section: libs
 Replaces: libhttrack1
 Conflicts: libhttrack1
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: libssl1.0.0
 Description: Httrack website copier library
  This package is the library part of httrack, website copier and mirroring
  utility
 
 Package: libhttrack-dev
 Architecture: any
-Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends}, ${shlibs:Depends}, zlib1g-dev
+Recommends: libssl1.0.0
 Description: Httrack website copier includes and development files
  This package adds supplemental files for using the httrack website copier
  library
 
 Package: httrack-doc
 Architecture: all
-Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Description: Httrack website copier additional documentation
@@ -87,7 +82,6 @@ Description: Httrack website copier additional documentation
 
 Package: proxytrack
 Architecture: any
-Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: squid, httrack
 Description: Build HTTP Caches using archived websites copied by HTTrack

debian/copyright

@@ -5,7 +5,7 @@ The current Debian maintainer is Xavier Roche <xavier@debian.org>
 
 Upstream author: Xavier Roche <roche@httrack.com>
 
-Copyright: 1998-2014 Xavier Roche and other contributors
+Copyright: 1998-2013 Xavier Roche and other contributors
 
 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

debian/httrack-doc.files

@@ -1,3 +1,4 @@
 usr/share/httrack/html
 usr/share/doc/httrack
 usr/share/doc/httrack/httrack-doc.html
+usr/share/lintian/overrides/httrack-doc

debian/httrack-doc.lintian-overrides

@@ -1,2 +1,3 @@
-httrack-doc: extra-license-file usr/share/httrack/html/license.txt
-httrack-doc: package-contains-documentation-outside-usr-share-doc usr/share/httrack/*
+extra-license-file usr/share/httrack/html/license.txt
+duplicate-changelog-files usr/share/doc/httrack/changelog.gz usr/share/doc/httrack/history.txt.gz
+extended-description-is-probably-too-short

debian/httrack.lintian-overrides

@@ -0,0 +1 @@
+duplicate-changelog-files usr/share/doc/httrack/changelog.gz usr/share/doc/httrack/history.txt.gz

debian/libhttrack-dev.files

@@ -1,5 +1,6 @@
 usr/include/httrack
-usr/lib/*/libhttrack.{so}
-usr/lib/*/libhtsjava.{so}
+usr/lib/libhttrack.{so}
+usr/lib/libhtsjava.{so}
 usr/share/httrack/libtest
-usr/lib/*/httrack/libtest
+usr/lib/httrack/libtest
+usr/share/lintian/overrides/libhttrack-dev

debian/libhttrack-dev.lintian-overrides

@@ -1,5 +1 @@
-libhttrack-dev: breakout-link *
-libhttrack-dev: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/httrack/libtest/*
-libhttrack-dev: library-not-linked-against-libc usr/lib/*/httrack/libtest/libfilename.so.1.0.0
-libhttrack-dev: package-contains-documentation-outside-usr-share-doc usr/share/httrack/libtest/readme.txt
-libhttrack-dev: package-name-defined-in-config-h usr/include/httrack/config.h
+hardening-no-fortify-functions usr/lib/httrack/libtest/libfilenameiisbug.so.1.0.0

debian/libhttrack-swf1.files

@@ -1,2 +1,2 @@
-usr/lib/*/libhtsswf.so.1.0.0
-usr/lib/*/libhtsswf.so.1
+usr/lib/libhtsswf.so.1.0.0
+usr/lib/libhtsswf.so.1

debian/libhttrack2.files

@@ -1,5 +1,5 @@
-usr/lib/*/libhttrack.so.2.0.49
-usr/lib/*/libhttrack.so.2
-usr/lib/*/libhtsjava.so.2.0.49
-usr/lib/*/libhtsjava.so.2
+usr/lib/libhttrack.so.2.0.47
+usr/lib/libhttrack.so.2
+usr/lib/libhtsjava.so.2.0.47
+usr/lib/libhtsjava.so.2
 usr/share/httrack/templates

debian/libhttrack2.lintian-overrides

@@ -1,2 +0,0 @@
-libhttrack2: no-symbols-control-file usr/lib/*
-libhttrack2: spelling-error-in-binary usr/lib/*/libhttrack.so.* updat update

debian/rules

@@ -3,12 +3,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# *** Patch for s390, mips ..
+# *** Patch for s390, mips, hppa..
 # It seems that htscore.c can not compile on several archs, due to compiler
 # capacity limits. These lines shall be removed when gcc is upgraded.
 # See discussions on 'Assembler messages: Branch out of range'
 # Addition (04/2004): gcc-3.3 on arm fcks up with htscoremain.c and -O3 (..)
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),s390 mips mipsel m68k arm))
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),s390 mips mipsel hppa m68k arm))
 	CFLAGS += -DNOSTRDEBUG
 endif
 
@@ -23,16 +23,11 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-# as suggested by Simon McVittie
-# (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744380)
-override_dh_auto_test:
-	VERBOSE=1 dh_auto_test
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	dh_autoreconf
+	autoreconf -v -i
 	# note: dpkg-buildflags to be removed when compat=9
 	dh_auto_configure -- --enable-online-unit-tests=auto $(shell dpkg-buildflags --export=configure)
 
@@ -55,7 +50,6 @@ clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	dh_auto_clean
-	dh_autoreconf_clean
 	dh_clean
 
 install: build
@@ -81,26 +75,30 @@ install: build
 	mv $(CURDIR)/debian/httrack/usr/share/httrack/html/httrack-doc.html \
 		$(CURDIR)/debian/httrack/usr/share/doc/httrack/httrack-doc.html
 
-	# remove *.la (https://wiki.debian.org/ReleaseGoals/LAFileRemoval)
-	rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
-	rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/*.la
-	# remove *.a unless we do not have *.so files
-	# see BUG #744594
-	if ls $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/*.so >/dev/null 2>/dev/null ; then \
-		rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/*.a ; \
-	fi
-	if ls $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/*.so >/dev/null 2>/dev/null ; then \
-		rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/*.a ; \
-	fi
-	mv $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/lib* \
+	# place libraries and cleanup
+	mkdir -p $(CURDIR)/debian/httrack/usr/lib/httrack/
+	mv $(CURDIR)/debian/httrack/usr/bin/htsserver \
+		$(CURDIR)/debian/httrack/usr/lib/httrack/
+	rm -f $(CURDIR)/debian/httrack/usr/lib/*.a
+	rm -f $(CURDIR)/debian/httrack/usr/lib/*.la
+	rm -f $(CURDIR)/debian/httrack/usr/lib/httrack/*.a
+	rm -f $(CURDIR)/debian/httrack/usr/lib/httrack/*.la
+	mv $(CURDIR)/debian/httrack/usr/lib/httrack/lib* \
 		$(CURDIR)/debian/httrack/usr/share/httrack/libtest/
-	mkdir -p $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest
+	mkdir -p $(CURDIR)/debian/httrack/usr/lib/httrack/libtest
 	mv $(CURDIR)/debian/httrack/usr/share/httrack/libtest/lib* \
-		$(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest
-	ln -s /usr/share/httrack/libtest/readme.txt \
-		 $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest/readme.txt
+		$(CURDIR)/debian/httrack/usr/lib/httrack/libtest
+	ln -s ../../../share/httrack/libtest/readme.txt \
+		 $(CURDIR)/debian/httrack/usr/lib/httrack/libtest/readme.txt
 
-	dh_lintian
+	# Lintian overrides
+	mkdir -p $(CURDIR)/debian/httrack/usr/share/lintian/overrides
+	cp $(CURDIR)/debian/httrack.lintian-overrides \
+		$(CURDIR)/debian/httrack/usr/share/lintian/overrides/httrack
+	cp $(CURDIR)/debian/libhttrack-dev.lintian-overrides \
+		$(CURDIR)/debian/httrack/usr/share/lintian/overrides/libhttrack-dev
+	cp $(CURDIR)/debian/httrack-doc.lintian-overrides \
+		$(CURDIR)/debian/httrack/usr/share/lintian/overrides/httrack-doc
 
 	dh_movefiles --sourcedir=debian/httrack
 
@@ -132,10 +130,10 @@ binary-arch: build install
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -a -X/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest --version-info
+	dh_makeshlibs -a -X/usr/lib/httrack/libtest --version-info
 	dh_installdeb -a
 	# we depend on the current version (ABI may change)
-	dh_shlibdeps -a -ldebian/libhttrack2/usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_shlibdeps -a -ldebian/libhttrack2/usr/lib
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a

debian/webhttrack-common.lintian-overrides

@@ -1 +0,0 @@
-webhttrack-common: package-contains-documentation-outside-usr-share-doc *

debian/webhttrack.files

@@ -1,5 +1,5 @@
+usr/lib/httrack/htsserver
 usr/bin/webhttrack
-usr/bin/htsserver
 usr/share/man/man1/webhttrack.1
 usr/share/man/man1/htsserver.1
 usr/share/applications/WebHTTrack-Websites.desktop

debian/webhttrack.lintian-overrides

@@ -1 +0,0 @@
-webhttrack: missing-depends-on-sensible-utils sensible-browser usr/bin/webhttrack

debian/webhttrack.menu

@@ -0,0 +1,4 @@
+?package(webhttrack):needs="X11" section="Applications/Network/Web Browsing" \
+        title="WebHTTrack" command="webhttrack" hints="Offline browsers" \
+        icon16x16="/usr/share/pixmaps/httrack16x16.xpm" \
+        icon32x32="/usr/share/pixmaps/httrack32x32.xpm"

depcomp

@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2012-03-27.16; # UTC
 
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011, 2012 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
@@ -16,7 +17,7 @@ scriptversion=2018-03-07.03; # UTC
 # 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, see <https://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,9 +28,9 @@ scriptversion=2018-03-07.03; # UTC
 
 case $1 in
   '')
-    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-    exit 1;
-    ;;
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -56,65 +57,11 @@ EOF
     ;;
 esac
 
-# Get the directory component of the given path, and save it in the
-# global variables '$dir'.  Note that this directory component will
-# be either empty or ending with a '/' character.  This is deliberate.
-set_dir_from ()
-{
-  case $1 in
-    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
-      *) dir=;;
-  esac
-}
-
-# Get the suffix-stripped basename of the given path, and save it the
-# global variable '$base'.
-set_base_from ()
-{
-  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
-}
-
-# If no dependency file was actually created by the compiler invocation,
-# we still have to create a dummy depfile, to avoid errors with the
-# Makefile "include basename.Plo" scheme.
-make_dummy_depfile ()
-{
-  echo "#dummy" > "$depfile"
-}
-
-# Factor out some common post-processing of the generated depfile.
-# Requires the auxiliary global variable '$tmpdepfile' to be set.
-aix_post_process_depfile ()
-{
-  # If the compiler actually managed to produce a dependency file,
-  # post-process it.
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependency.h'.
-    # Do two passes, one to just change these to
-    #   $object: dependency.h
-    # and one to simply output
-    #   dependency.h:
-    # which is needed to avoid the deleted-header problem.
-    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
-      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
-    } > "$depfile"
-    rm -f "$tmpdepfile"
-  else
-    make_dummy_depfile
-  fi
-}
-
 # A tabulation character.
 tab='	'
 # A newline character.
 nl='
 '
-# Character ranges might be problematic outside the C locale.
-# These definitions help.
-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-lower=abcdefghijklmnopqrstuvwxyz
-digits=0123456789
-alpha=${upper}${lower}
 
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
@@ -128,9 +75,6 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
-# Avoid interferences from the environment.
-gccflag= dashmflag=
-
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -142,32 +86,32 @@ if test "$depmode" = hp; then
 fi
 
 if test "$depmode" = dashXmstdout; then
-  # This is just like dashmstdout with a different argument.
-  dashmflag=-xM
-  depmode=dashmstdout
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-  # This is just like msvisualcpp but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
-  depmode=msvisualcpp
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvisualcpp
 fi
 
 if test "$depmode" = msvc7msys; then
-  # This is just like msvc7 but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
-  depmode=msvc7
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
 fi
 
 if test "$depmode" = xlc; then
-  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
-  gccflag=-qmakedep=gcc,-MF
-  depmode=gcc
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
 fi
 
 case "$depmode" in
@@ -190,7 +134,8 @@ gcc3)
   done
   "$@"
   stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -198,17 +143,13 @@ gcc3)
   ;;
 
 gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
-## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).  Also, it might not be
-##   supported by the other compilers which use the 'gcc' depmode.
+##   -MM, not -M (despite what the docs say).
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -216,14 +157,15 @@ gcc)
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  # The second -e expression handles DOS-style file names with drive
-  # letters.
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
 ## This next piece of magic avoids the "deleted header file" problem.
@@ -232,15 +174,15 @@ gcc)
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
+  tr ' ' "$nl" < "$tmpdepfile" |
 ## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -258,7 +200,8 @@ sgi)
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -266,6 +209,7 @@ sgi)
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
+
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
@@ -273,15 +217,19 @@ sgi)
     # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
     tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
-      | tr "$nl" ' ' >> "$depfile"
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
+
     # The second pass generates a dummy entry for each header file.
     tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-      >> "$depfile"
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> "$depfile"
   else
-    make_dummy_depfile
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
   fi
   rm -f "$tmpdepfile"
   ;;
@@ -299,8 +247,9 @@ aix)
   # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  set_dir_from "$object"
-  set_base_from "$object"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -313,7 +262,9 @@ aix)
     "$@" -M
   fi
   stat=$?
-  if test $stat -ne 0; then
+
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -322,113 +273,65 @@ aix)
   do
     test -f "$tmpdepfile" && break
   done
-  aix_post_process_depfile
-  ;;
-
-tcc)
-  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
-  # FIXME: That version still under development at the moment of writing.
-  #        Make that this statement remains true also for stable, released
-  #        versions.
-  # It will wrap lines (doesn't matter whether long or short) with a
-  # trailing '\', as in:
-  #
-  #   foo.o : \
-  #    foo.c \
-  #    foo.h \
-  #
-  # It will put a trailing '\' even on the last line, and will use leading
-  # spaces rather than leading tabs (at least since its commit 0394caf7
-  # "Emit spaces for -MD").
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
   fi
-  rm -f "$depfile"
-  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
-  # We have to change lines of the first kind to '$object: \'.
-  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
-  # And for each line of the second kind, we have to emit a 'dep.h:'
-  # dummy dependency, to avoid the deleted-header problem.
-  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-## The order of this option in the case statement is important, since the
-## shell code in configure will try each of these formats in the order
-## listed in this file.  A plain '-MD' option would be understood by many
-## compilers, so we must ensure this comes after the gcc and icc options.
-pgcc)
-  # Portland's C compiler understands '-MD'.
-  # Will always output deps to 'file.d' where file is the root name of the
-  # source file under compilation, even if file resides in a subdirectory.
-  # The object file name does not affect the name of the '.d' file.
-  # pgcc 10.2 will output
+icc)
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\' :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-  set_dir_from "$object"
-  # Use the source, not the object, to determine the base name, since
-  # that's sadly what pgcc will do too.
-  set_base_from "$source"
-  tmpdepfile=$base.d
-
-  # For projects that build the same source file twice into different object
-  # files, the pgcc approach of using the *source* file root name can cause
-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
-  # the same $tmpdepfile.
-  lockdir=$base.d-lock
-  trap "
-    echo '$0: caught signal, cleaning up...' >&2
-    rmdir '$lockdir'
-    exit 1
-  " 1 2 13 15
-  numtries=100
-  i=$numtries
-  while test $i -gt 0; do
-    # mkdir is a portable test-and-set.
-    if mkdir "$lockdir" 2>/dev/null; then
-      # This process acquired the lock.
-      "$@" -MD
-      stat=$?
-      # Release the lock.
-      rmdir "$lockdir"
-      break
-    else
-      # If the lock is being held by a different process, wait
-      # until the winning process is done or we timeout.
-      while test -d "$lockdir" && test $i -gt 0; do
-        sleep 1
-        i=`expr $i - 1`
-      done
-    fi
-    i=`expr $i - 1`
-  done
-  trap - 1 2 13 15
-  if test $i -le 0; then
-    echo "$0: failed to acquire lock after $numtries attempts" >&2
-    echo "$0: check lockdir '$lockdir'" >&2
-    exit 1
-  fi
-
-  if test $stat -ne 0; then
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Each line is of the form 'foo.o: dependent.h',
+  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
-    | sed -e 's/$/ :/' >> "$depfile"
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
+    < "$tmpdepfile" > "$depfile"
+  sed '
+    s/[ '"$tab"'][ '"$tab"']*/ /g
+    s/^ *//
+    s/ *\\*$//
+    s/^[^:]*: *//
+    /^$/d
+    /:$/d
+    s/$/ :/
+  ' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -439,8 +342,9 @@ hp2)
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  set_dir_from  "$object"
-  set_base_from "$object"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -451,7 +355,8 @@ hp2)
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -ne 0; then
+  if test $stat -eq 0; then :
+  else
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -461,61 +366,76 @@ hp2)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
     # Add 'dependent.h:' lines.
     sed -ne '2,${
-               s/^ *//
-               s/ \\*$//
-               s/$/:/
-               p
-             }' "$tmpdepfile" >> "$depfile"
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
   else
-    make_dummy_depfile
+    echo "#dummy" > "$depfile"
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-  # The Tru64 compiler uses -MD to generate dependencies as a side
-  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-  # dependencies in 'foo.d' instead, so we check for that too.
-  # Subdirectories are respected.
-  set_dir_from  "$object"
-  set_base_from "$object"
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in 'foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
-  if test "$libtool" = yes; then
-    # Libtool generates 2 separate objects for the 2 libraries.  These
-    # two compilations output dependencies in $dir.libs/$base.o.d and
-    # in $dir$base.o.d.  We have to check for both files, because
-    # one of the two compilations can be disabled.  We should prefer
-    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-    # automatically cleaned when .libs/ is deleted, while ignoring
-    # the former would cause a distcleancheck panic.
-    tmpdepfile1=$dir$base.o.d          # libtool 1.5
-    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
-    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
-    "$@" -Wc,-MD
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    tmpdepfile3=$dir$base.d
-    "$@" -MD
-  fi
+   if test "$libtool" = yes; then
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mechanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
 
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      exit $stat
+   fi
 
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  # Same post-processing that is required for AIX mode.
-  aix_post_process_depfile
-  ;;
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
 
 msvc7)
   if test "$libtool" = yes; then
@@ -526,7 +446,8 @@ msvc7)
   "$@" $showIncludes > "$tmpdepfile"
   stat=$?
   grep -v '^Note: including file: ' "$tmpdepfile"
-  if test $stat -ne 0; then
+  if test "$stat" = 0; then :
+  else
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -552,7 +473,6 @@ $ {
   G
   p
 }' >> "$depfile"
-  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
   rm -f "$tmpdepfile"
   ;;
 
@@ -604,14 +524,13 @@ dashmstdout)
   # in the target name.  This is to cope with DOS-style filenames:
   # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this sed invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -664,12 +583,10 @@ makedepend)
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process the last invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed '1,2d' "$tmpdepfile" \
-    | tr ' ' "$nl" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -705,10 +622,10 @@ cpp)
     esac
   done
 
-  "$@" -E \
-    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-    | sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -740,15 +657,15 @@ msvisualcpp)
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-        set fnord "$@"
-        shift
-        shift
-        ;;
+	set fnord "$@"
+	shift
+	shift
+	;;
     *)
-        set fnord "$@" "$arg"
-        shift
-        shift
-        ;;
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
     esac
   done
   "$@" -E 2>/dev/null |
@@ -783,9 +700,9 @@ exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:

history.txt

@@ -2,82 +2,9 @@
 HTTrack Website Copier release history:
 --------------------------------------
 
-This file lists all changes and fixes that have been made for HTTrack
+This file lists all changes and fixes that have been made for HTTrack.
 
-3.49-4
-+ New: Push default bandwidth to 100kiB/s, max to 10MiB/s
-+ Fixed: Multiple packaging and build fixes, added security flags
-
-3.49-3
-+ Fixed: Corrections and updates of the Brazilian Portuguese translations (Paulo Neto)
-+ Fixed: Fixed for Android
-+ Fixed: Add mimetypes for documents (Pablo Castellano)
-+ Fixed: Add firefox-developer-edition (sickcodes)
-+ New: Support data-src and data-srcset for img (Brian 'Redbeard' Harrington)
-+ Fixed: When using the '%N' structure naming key, separate the filename and extension with a dot (Steve Mokris)
-+ Fixed: Multiple build updates
-
-3.49-2
-+ Fixed: Buffer overflow in output option commandline argument (VL-ID 2068) (Hosein Askari)
-+ Fixed: Minor fixes
-
-3.48-23
-+ Fixed: on Linux, FTBFS with openssl 1.1.0
-
-3.48-22
-+ Fixed: on Windows, fixed possible DLL local injection (Tunisian Cyber)
-+ Fixed: various typos
-
-3.48-21
-+ Fixed: Google RPMs use /usr/bin/google-chrome as program location (Cickumqt)
-+ Fixed: Fixed htsserver not dying (immediately) on quit
-+ New: Updated WIN32 OpenSSL to 1.0.1j (Evgeniy)
-+ Fixed: webhttrack incompatibility with Chrome
-+ Fixed: assertion failure at htslib.c:3458 (strlen(copyBuff) == qLen) seen on Linux
-+ Fixed: infamous crashes inside the DNS cache due to a corruption within the option structure (E.Kalinowski/karbofos)
-+ New: added minimalistic crash reporting on Windows and Linux
-+ Fixed: URL list not working anymore (tom swift)
-+ Fixed: FTBFS on ARM
-+ Fixed: buggy FFFD (replacement character) in place of leading non-ascii character such as Chinese ones (aballboy)
-+ Fixed: FTBFS when compiling with zlib versions < 1.2.70 (sammyx)
-+ Fixed: buggy SVG (Smiling Spectre)
-+ Fixed: do not uncompress .tgz advertised as "streamed" (Smiling Spectre)
-+ Fixed: NULL pointer dereferencing in back_unserialize (htsback.c:976)
-+ Fixed: library development files
-+ Fixed: --advanced-maxlinks broken (Localhost)
-+ Fixed: -devel package should now be standalone
-+ Fixed: assertion failure at htscore.c:244 (len + liensbuf->string_buffer_size < liensbuf->string_buffer_capa)
-+ Fixed: injection-proof templates
-+ Fixed: htshash.c:330 assertion failure ("error invalidating hash entry") (Sergey)
-+ Fixed: Windows 2000 regression (fantozzi.usenet)
-+ Fixed: code cleanup (aliasing issues, const correctness, safe strings)
-+ New: handle --advanced-maxlinks=0 to disable maximum link limits
-+ New: updated ZIP routines (zlib 1.2.8)
-+ Fixed: broken 32-bit version
-+ Fixed: assertion "segOutputSize < segSize assertion fails at htscharset.c:993"
-+ Fixed: new zlib version fixing CVE-2004-0797 and CVE-2005-2096
-+ Fixed: more reliable crash reporting
-+ Fixed: fixed infamous "hashtable internal error: cuckoo/stash collision" errors
-+ Fixed: safety cleanup in many strings operations
-+ Fixed: buggy option pannels
-+ New: Enforce check against CVE-2014-0160
-+ New: improved hashtables to speedup large mirrors
-+ New: added unit tests
-+ New: Added %a option, allowing to define the "Accept:" header line.
-+ New: Added %X option, to define additional request header lines.
-+ New: Added option '-%t', preserving the original file type (which may produce non-browseable file locally)
-+ Fixed: remove scope id (% character) in dotted address resolution (especially for catchurl proxy)
-+ Fixed: build fixes, including for Android, non-SSL releases
-+ Fixed: buggy keep-alive handling, leading to waste connections
-+ Fixed: removed chroot and setuid features (this is definitely not our business)
-+ Fixed: removed MMS (Microsoft Media Server) ripping code (mmsrip) (dead protocol, unmaintained code, licensing issues)
-+ Fixed: type mishandling when processing a redirect (such as a .PDF redirecting to another .PDF, with a text/html type tagged in the redirect message)
-+ Fixed: infinite loop when attempting to download a file:/// directory on Unix (gp)<br/>
-+ Fixed: removed background DNS resolution, prone to bugs
-+ Fixed: do not choke on Windows 2000 because of missing SetDllDirectory() (Andy Hewitt)
-+ Fixed: %h custom build structure parameter not taken in account (William Clark)
-
-3.47-27
+3.47-24
 + New: support for IDNA / RFC 3492 (punycode) handling
 + New: openssl is no longer dynamically probed at stratup, but dynamically linked
 + Fixed: random closing of files/sockets, leading to "zip_zipWriteInFileInZip_failed" assertion, "bogus state" messages, or random garbage in downloaded files

html/Makefile.am

@@ -7,6 +7,7 @@ HelpHtmlimagesdir = $(HelpHtmldir)/images
 HelpHtmlTxtdir = $(HelpHtmldir)
 WebHtmldir = $(HelpHtmldir)/server
 WebHtmlimagesdir = $(HelpHtmldir)/server/images
+WebHtmlsfxdir = $(HelpHtmldir)/server/sfx
 WebPixmapdir = $(datadir)/pixmaps
 WebIcon16x16dir = $(datadir)/icons/hicolor/16x16/apps
 WebIcon32x32dir = $(datadir)/icons/hicolor/32x32/apps
@@ -19,8 +20,9 @@ HelpHtmldiv_DATA = div/search.sh
 HelpHtmlimg_DATA  = img/*
 HelpHtmlimages_DATA = images/*
 HelpHtmlTxt_DATA = ../greetings.txt ../history.txt ../license.txt
-WebHtml_DATA = server/*.html server/*.js server/*.css
+WebHtml_DATA = server/*.html
 WebHtmlimages_DATA = server/images/*
+WebHtmlsfx_DATA = server/sfx/*
 # note: converted & normalized by
 # ico2xpm favicon.ico -o httrack.xpm
 # mogrify -format xpm -map /usr/share/doc/menu/examples/cmap.xpm httrack.xpm
@@ -31,7 +33,7 @@ WebIcon48x48_DATA = server/div/48x48/*.png
 VFolderEntry_DATA = server/div/*.desktop
 
 EXTRA_DIST = $(HelpHtml_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlimages_DATA) \
-	$(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) \
+	$(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) $(WebHtmlsfx_DATA) \
 	$(WebPixmap_DATA) $(WebIcon16x16_DATA) $(WebIcon32x32_DATA) $(WebIcon48x48_DATA) \
 	$(VFolderEntry_DATA) \
 	httrack.css

html/Makefile.in

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,61 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
+am__make_dryrun = \
+  { \
+    am__dry=no; \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
     esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -89,6 +52,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = html
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -97,23 +61,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -153,20 +104,17 @@ am__installdirs = "$(DESTDIR)$(HelpHtmldir)" \
 	"$(DESTDIR)$(HelpHtmlimagesdir)" "$(DESTDIR)$(HelpHtmlimgdir)" \
 	"$(DESTDIR)$(HelpHtmlrootdir)" "$(DESTDIR)$(VFolderEntrydir)" \
 	"$(DESTDIR)$(WebHtmldir)" "$(DESTDIR)$(WebHtmlimagesdir)" \
-	"$(DESTDIR)$(WebIcon16x16dir)" "$(DESTDIR)$(WebIcon32x32dir)" \
-	"$(DESTDIR)$(WebIcon48x48dir)" "$(DESTDIR)$(WebPixmapdir)"
+	"$(DESTDIR)$(WebHtmlsfxdir)" "$(DESTDIR)$(WebIcon16x16dir)" \
+	"$(DESTDIR)$(WebIcon32x32dir)" "$(DESTDIR)$(WebIcon48x48dir)" \
+	"$(DESTDIR)$(WebPixmapdir)"
 DATA = $(HelpHtml_DATA) $(HelpHtmlTxt_DATA) $(HelpHtmldiv_DATA) \
 	$(HelpHtmlimages_DATA) $(HelpHtmlimg_DATA) \
 	$(HelpHtmlroot_DATA) $(VFolderEntry_DATA) $(WebHtml_DATA) \
-	$(WebHtmlimages_DATA) $(WebIcon16x16_DATA) \
+	$(WebHtmlimages_DATA) $(WebHtmlsfx_DATA) $(WebIcon16x16_DATA) \
 	$(WebIcon32x32_DATA) $(WebIcon48x48_DATA) $(WebPixmap_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -175,12 +123,14 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CFLAGS_PIE = @CFLAGS_PIE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
-DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -203,7 +153,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LDFLAGS_PIE = @LDFLAGS_PIE@
 LFS_FLAG = @LFS_FLAG@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -212,7 +161,6 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_CV_OBJDIR = @LT_CV_OBJDIR@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -251,6 +199,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -289,7 +238,6 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -306,6 +254,7 @@ HelpHtmlimagesdir = $(HelpHtmldir)/images
 HelpHtmlTxtdir = $(HelpHtmldir)
 WebHtmldir = $(HelpHtmldir)/server
 WebHtmlimagesdir = $(HelpHtmldir)/server/images
+WebHtmlsfxdir = $(HelpHtmldir)/server/sfx
 WebPixmapdir = $(datadir)/pixmaps
 WebIcon16x16dir = $(datadir)/icons/hicolor/16x16/apps
 WebIcon32x32dir = $(datadir)/icons/hicolor/32x32/apps
@@ -317,8 +266,9 @@ HelpHtmldiv_DATA = div/search.sh
 HelpHtmlimg_DATA = img/*
 HelpHtmlimages_DATA = images/*
 HelpHtmlTxt_DATA = ../greetings.txt ../history.txt ../license.txt
-WebHtml_DATA = server/*.html server/*.js server/*.css
+WebHtml_DATA = server/*.html
 WebHtmlimages_DATA = server/images/*
+WebHtmlsfx_DATA = server/sfx/*
 # note: converted & normalized by
 # ico2xpm favicon.ico -o httrack.xpm
 # mogrify -format xpm -map /usr/share/doc/menu/examples/cmap.xpm httrack.xpm
@@ -328,7 +278,7 @@ WebIcon32x32_DATA = server/div/32x32/*.png
 WebIcon48x48_DATA = server/div/48x48/*.png
 VFolderEntry_DATA = server/div/*.desktop
 EXTRA_DIST = $(HelpHtml_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlimages_DATA) \
-	$(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) \
+	$(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) $(WebHtmlsfx_DATA) \
 	$(WebPixmap_DATA) $(WebIcon16x16_DATA) $(WebIcon32x32_DATA) $(WebIcon48x48_DATA) \
 	$(VFolderEntry_DATA) \
 	httrack.css
@@ -348,13 +298,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu html/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu html/Makefile
+.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -560,6 +511,27 @@ uninstall-WebHtmlimagesDATA:
 	@list='$(WebHtmlimages_DATA)'; test -n "$(WebHtmlimagesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(WebHtmlimagesdir)'; $(am__uninstall_files_from_dir)
+install-WebHtmlsfxDATA: $(WebHtmlsfx_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(WebHtmlsfx_DATA)'; test -n "$(WebHtmlsfxdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(WebHtmlsfxdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(WebHtmlsfxdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(WebHtmlsfxdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(WebHtmlsfxdir)" || exit $$?; \
+	done
+
+uninstall-WebHtmlsfxDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(WebHtmlsfx_DATA)'; test -n "$(WebHtmlsfxdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(WebHtmlsfxdir)'; $(am__uninstall_files_from_dir)
 install-WebIcon16x16DATA: $(WebIcon16x16_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(WebIcon16x16_DATA)'; test -n "$(WebIcon16x16dir)" || list=; \
@@ -644,17 +616,14 @@ uninstall-WebPixmapDATA:
 	@list='$(WebPixmap_DATA)'; test -n "$(WebPixmapdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(WebPixmapdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
+tags: TAGS
+TAGS:
 
-ctags CTAGS:
-
-cscope cscopelist:
+ctags: CTAGS
+CTAGS:
 
 
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -688,7 +657,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(HelpHtmldir)" "$(DESTDIR)$(HelpHtmlTxtdir)" "$(DESTDIR)$(HelpHtmldivdir)" "$(DESTDIR)$(HelpHtmlimagesdir)" "$(DESTDIR)$(HelpHtmlimgdir)" "$(DESTDIR)$(HelpHtmlrootdir)" "$(DESTDIR)$(VFolderEntrydir)" "$(DESTDIR)$(WebHtmldir)" "$(DESTDIR)$(WebHtmlimagesdir)" "$(DESTDIR)$(WebIcon16x16dir)" "$(DESTDIR)$(WebIcon32x32dir)" "$(DESTDIR)$(WebIcon48x48dir)" "$(DESTDIR)$(WebPixmapdir)"; do \
+	for dir in "$(DESTDIR)$(HelpHtmldir)" "$(DESTDIR)$(HelpHtmlTxtdir)" "$(DESTDIR)$(HelpHtmldivdir)" "$(DESTDIR)$(HelpHtmlimagesdir)" "$(DESTDIR)$(HelpHtmlimgdir)" "$(DESTDIR)$(HelpHtmlrootdir)" "$(DESTDIR)$(VFolderEntrydir)" "$(DESTDIR)$(WebHtmldir)" "$(DESTDIR)$(WebHtmlimagesdir)" "$(DESTDIR)$(WebHtmlsfxdir)" "$(DESTDIR)$(WebIcon16x16dir)" "$(DESTDIR)$(WebIcon32x32dir)" "$(DESTDIR)$(WebIcon48x48dir)" "$(DESTDIR)$(WebPixmapdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -745,9 +714,9 @@ install-data-am: install-HelpHtmlDATA install-HelpHtmlTxtDATA \
 	install-HelpHtmldivDATA install-HelpHtmlimagesDATA \
 	install-HelpHtmlimgDATA install-HelpHtmlrootDATA \
 	install-VFolderEntryDATA install-WebHtmlDATA \
-	install-WebHtmlimagesDATA install-WebIcon16x16DATA \
-	install-WebIcon32x32DATA install-WebIcon48x48DATA \
-	install-WebPixmapDATA
+	install-WebHtmlimagesDATA install-WebHtmlsfxDATA \
+	install-WebIcon16x16DATA install-WebIcon32x32DATA \
+	install-WebIcon48x48DATA install-WebPixmapDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-am
@@ -796,20 +765,20 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 	uninstall-HelpHtmldivDATA uninstall-HelpHtmlimagesDATA \
 	uninstall-HelpHtmlimgDATA uninstall-HelpHtmlrootDATA \
 	uninstall-VFolderEntryDATA uninstall-WebHtmlDATA \
-	uninstall-WebHtmlimagesDATA uninstall-WebIcon16x16DATA \
-	uninstall-WebIcon32x32DATA uninstall-WebIcon48x48DATA \
-	uninstall-WebPixmapDATA
+	uninstall-WebHtmlimagesDATA uninstall-WebHtmlsfxDATA \
+	uninstall-WebIcon16x16DATA uninstall-WebIcon32x32DATA \
+	uninstall-WebIcon48x48DATA uninstall-WebPixmapDATA
 
 .MAKE: install-am install-data-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-HelpHtmlDATA install-HelpHtmlTxtDATA \
-	install-HelpHtmldivDATA install-HelpHtmlimagesDATA \
-	install-HelpHtmlimgDATA install-HelpHtmlrootDATA \
-	install-VFolderEntryDATA install-WebHtmlDATA \
-	install-WebHtmlimagesDATA install-WebIcon16x16DATA \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-HelpHtmlDATA \
+	install-HelpHtmlTxtDATA install-HelpHtmldivDATA \
+	install-HelpHtmlimagesDATA install-HelpHtmlimgDATA \
+	install-HelpHtmlrootDATA install-VFolderEntryDATA \
+	install-WebHtmlDATA install-WebHtmlimagesDATA \
+	install-WebHtmlsfxDATA install-WebIcon16x16DATA \
 	install-WebIcon32x32DATA install-WebIcon48x48DATA \
 	install-WebPixmapDATA install-am install-data install-data-am \
 	install-data-hook install-dvi install-dvi-am install-exec \
@@ -818,16 +787,15 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall \
 	uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 	uninstall-HelpHtmldivDATA uninstall-HelpHtmlimagesDATA \
 	uninstall-HelpHtmlimgDATA uninstall-HelpHtmlrootDATA \
 	uninstall-VFolderEntryDATA uninstall-WebHtmlDATA \
-	uninstall-WebHtmlimagesDATA uninstall-WebIcon16x16DATA \
-	uninstall-WebIcon32x32DATA uninstall-WebIcon48x48DATA \
-	uninstall-WebPixmapDATA uninstall-am
-
-.PRECIOUS: Makefile
+	uninstall-WebHtmlimagesDATA uninstall-WebHtmlsfxDATA \
+	uninstall-WebIcon16x16DATA uninstall-WebIcon32x32DATA \
+	uninstall-WebIcon48x48DATA uninstall-WebPixmapDATA \
+	uninstall-am
 
 
 install-data-hook:

html/faq.html

@@ -411,7 +411,7 @@ A: <em>Yes. It is called WebHTTrack. See the download section at <a href="http:/
 
 <a NAME="Q0">Q: <strong>Some sites are captured very well, other aren't. Why?</strong><br>
 A: <em>
-There are several reasons (and solutions) for a mirror to fail. Reading the log files (ans this FAQ!) is generally a VERY good idea to figure out what occurred.
+There are several reasons (and solutions) for a mirror to fail. Reading the log files (ans this FAQ!) is generally a VERY good idea to figure out what occured.
 
 <ul>
  <li>Links within the site refers to external links, or links located in another (or upper) directories, not captured by default - the use of filters is generally THE solution, as this is one of the powerful option in HTTrack. <u>See the above questions/answers</u>.</li>

html/fcguide.html

@@ -121,7 +121,7 @@ that it is so rich with features that I could never really figure out
 precisely the right thing to do at any given point.  I was using
 recepies rather than knowledge to get the job done - and I was pestering
 the authors for those recepies.  After a few days of very helpful
-assistance from the authors I volunteered to write a users manual for
+assistance from the authors I volenteered to write a users manual for
 httrack - and here it is.  I hope it gets the job done.
 
 <hr>
@@ -221,7 +221,7 @@ Flow control:
   TN timeout, number of seconds after a non-responding link is shutdown (--timeout)
   RN number of retries, in case of timeout or non-fatal errors (*R1) (--retries[=N])
   JN traffic jam control, minimum transfert rate (bytes/seconds) tolerated for a link (--min-rate[=N])
-  HN host is abandoned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow (--host-control[=N])
+  HN host is abandonned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow (--host-control[=N])
 
 Links options:
  %P *extended parsing, attempt to parse all links, even in unknown tags or Javascript (%P0 don't use) (--extended-parsing[=N])
@@ -299,7 +299,7 @@ Guru options: (do NOT use)
  #R  Old FTP routines (debug)
  #T  Generate transfer ops. log every minutes
  #u  Wait time
- #Z  Generate transfer rate statistics every minutes
+ #Z  Generate transfer rate statictics every minutes
  #!  Execute a shell command (-#! "echo hello")
 
 Command-line specific options:
@@ -315,18 +315,18 @@ Details: Option N
   N5 Images/other in web/xxx and HTML in web/HTML
   N99 All files in web/, with random names (gadget !)
   N100 Site-structure, without www.domain.xxx/
-  N101 Identical to N1 except that "web" is replaced by the site's name
-  N102 Identical to N2 except that "web" is replaced by the site's name
-  N103 Identical to N3 except that "web" is replaced by the site's name
-  N104 Identical to N4 except that "web" is replaced by the site's name
-  N105 Identical to N5 except that "web" is replaced by the site's name
-  N199 Identical to N99 except that "web" is replaced by the site's name
-  N1001 Identical to N1 except that there is no "web" directory
-  N1002 Identical to N2 except that there is no "web" directory
-  N1003 Identical to N3 except that there is no "web" directory (option set for g option)
-  N1004 Identical to N4 except that there is no "web" directory
-  N1005 Identical to N5 except that there is no "web" directory
-  N1099 Identical to N99 except that there is no "web" directory
+  N101 Identical to N1 exept that "web" is replaced by the site's name
+  N102 Identical to N2 exept that "web" is replaced by the site's name
+  N103 Identical to N3 exept that "web" is replaced by the site's name
+  N104 Identical to N4 exept that "web" is replaced by the site's name
+  N105 Identical to N5 exept that "web" is replaced by the site's name
+  N199 Identical to N99 exept that "web" is replaced by the site's name
+  N1001 Identical to N1 exept that there is no "web" directory
+  N1002 Identical to N2 exept that there is no "web" directory
+  N1003 Identical to N3 exept that there is no "web" directory (option set for g option)
+  N1004 Identical to N4 exept that there is no "web" directory
+  N1005 Identical to N5 exept that there is no "web" directory
+  N1099 Identical to N99 exept that there is no "web" directory
 Details: User-defined option N
   %n Name of file without file type (ex: image) (--do-not-recatch)
   %N Name of file, including file type (ex: image.gif)
@@ -645,14 +645,14 @@ be mirrored, while the '-w' option does not ask this question but asks
 the remainder of the questions required to mirror the site.
 
 <p align=justify> The -g option allows you to get the files exactly as
-they are and store them in the current directory.  This is handy for a
+they are and store them in the currant directory.  This is handy for a
 relatively small collection of information where organization isn't
 important.  With this option, the html files will not even be parsed to
 look for other URLs.  This option is useful for getting isolated files
 (e.g., httrack -g www.mydrivers.com/drivers/windrv32.exe). 
 
 
-<p align=justify> If I start a collection process and it fails for one
+<p align=justify> If I start a collection process and it fails for ome
 reason or another - such as me interrupting it because I am running out
 of disk space - or a network outage - then I can restart the process by
 using the -i option:
@@ -825,7 +825,7 @@ Flow control:
   TN timeout, number of seconds after a non-responding link is shutdown
   RN number of retries, in case of timeout or non-fatal errors (*R1)
   JN traffic jam control, minimum transfert rate (bytes/seconds) tolerated for a link
-  HN host is abandoned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow
+  HN host is abandonned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow
 </i></b>
 
 <p align=justify> This example allows up to 128 simultaneous downloads. 
@@ -859,20 +859,20 @@ With 48 sockets: 1,30MB/s
 With 128 sockets: 0,93MB/s
 </pre></ul>
 
-<p align=justify> This limits the number of connections per second.  It
-is similar to the above option but allows the pace to be controlled
-rather than the simultanaety.  It is particulsrly useful for long-term
-pulls at low rates that allow little impact on remote infrastructure.
-The default is 10 connections per second.
+<p align=justify> The timeout option causes downloads to time out after
+a non-response from a download attempt.  30 seconds is pretty reasonable
+for many sites.  You might want to increase the number of retries as
+well so that you try again and again after such timeouts. 
 
 <pre><b><i>
 httrack http://www.shoesizes.com -O /tmp/shoesizes -%c20
 </i></b></pre>
 
-<p align=justify> The timeout option causes downloads to time out after
-a non-response from a download attempt.  30 seconds is pretty reasonable
-for many sites.  You might want to increase the number of retries as
-well so that you try again and again after such timeouts. 
+<p align=justify> This limits the number of connections per second.  It
+is similar to the above option but allows the pace to be controlled
+rather than the simultanaety.  It is particulsrly useful for long-term
+pulls at low rates that allow little impact on remote infrastructure.
+The default is 10 connections per second.
 
 <pre><b><i>
 httrack http://www.shoesizes.com -O /tmp/shoesizes -T30
@@ -910,7 +910,7 @@ httrack http://www.shoesizes.com -O /tmp/shoesizes -H3
 
 <p align=justify> Of course these options can be combined to provide a
 powerful set of criteria for when to continue a download and when to
-give it up, how hard to push other sites, and how much to stress
+give it up, how hard to push other sites.  and how much to stress
 infrastructures. 
 
 <hr>
@@ -944,7 +944,7 @@ javascript imported files (.js) are not currently searched for URLs.
 httrack http://www.shoesizes.com -O /tmp/shoesizes '%P0'
 </i></b></pre>
 
-<p align=justify> Now here is a classic bit of cleverness that 'does
+<p align=justify> Now here is a classic bit of cleaverness that 'does
 the right thing' for some cases.  In this instance, we are asking
 httrack to get images - like gif and jpeg files that are used by a web
 page in its display, even though we would not normally get them.  For
@@ -1070,18 +1070,18 @@ Details: Option N
   N5 Images/other in web/xxx and HTML in web/HTML
   N99 All files in web/, with random names (gadget !)
   N100 Site-structure, without www.domain.xxx/
-  N101 Identical to N1 except that "web" is replaced by the site's name
-  N102 Identical to N2 except that "web" is replaced by the site's name
-  N103 Identical to N3 except that "web" is replaced by the site's name
-  N104 Identical to N4 except that "web" is replaced by the site's name
-  N105 Identical to N5 except that "web" is replaced by the site's name
-  N199 Identical to N99 except that "web" is replaced by the site's name
-  N1001 Identical to N1 except that there is no "web" directory
-  N1002 Identical to N2 except that there is no "web" directory
-  N1003 Identical to N3 except that there is no "web" directory (option set for g option)
-  N1004 Identical to N4 except that there is no "web" directory
-  N1005 Identical to N5 except that there is no "web" directory
-  N1099 Identical to N99 except that there is no "web" directory
+  N101 Identical to N1 exept that "web" is replaced by the site's name
+  N102 Identical to N2 exept that "web" is replaced by the site's name
+  N103 Identical to N3 exept that "web" is replaced by the site's name
+  N104 Identical to N4 exept that "web" is replaced by the site's name
+  N105 Identical to N5 exept that "web" is replaced by the site's name
+  N199 Identical to N99 exept that "web" is replaced by the site's name
+  N1001 Identical to N1 exept that there is no "web" directory
+  N1002 Identical to N2 exept that there is no "web" directory
+  N1003 Identical to N3 exept that there is no "web" directory (option set for g option)
+  N1004 Identical to N4 exept that there is no "web" directory
+  N1005 Identical to N5 exept that there is no "web" directory
+  N1099 Identical to N99 exept that there is no "web" directory
 </i></b></pre>
 </ul>
 
@@ -1319,7 +1319,7 @@ pages" This is possible, using: -%A asp=text/html
 
 <p align=justify> The -%A option can be replaced by the alias --assume
 asp=text/html which is MUCH more clear.  You can use multiple
-definitions, separated by ",", or use multiple options.  Therefore, these
+definitions, separed by ",", or use multiple options.  Therefore, these
 two lines are identical:
 
 <pre>
@@ -1517,7 +1517,7 @@ httrack http://www.shoesizes.com -O /tmp/shoesizes -I0
 httrack http://www.shoesizes.com -O /tmp/shoesizes %v
 </i></b></pre>
 
-<p align=justify> Animated information when using console-based version,
+<p align=justify> Animated information when using consol-based version,
 example:
 <pre>
 17/95: localhost/manual/handler.html (6387 bytes) - OK
@@ -1783,7 +1783,7 @@ based authentication)
 <p align=justify> "On hold" option, in seconds
 
 <pre>
- #Z  Generate transfer rate statistics every minutes
+ #Z  Generate transfer rate statictics every minutes
 </pre>
 
 <p align=justify> Generate a log file with transfer statistics
@@ -1942,7 +1942,7 @@ include (+) and filters that indicate what to exclude (-).
 <p align=justify> Starting with the initially specified URLs, the
 default operation mode is to mirror starting from these URLs downward
 into the directory structure of the host (i.e.  if one of your starting
-pages was www.all.net/test/a.html, all links starting with www.all.net/test/
+pagees was www.all.net/test/a.html, all links starting with www.all.net/test/
 will be collected but links in www.all.net/anything-else will not be
 collected, because they are in a higher directory strcuture level.  This
 prevents HTTrack from mirroring the whole site.  If you may want to
@@ -2219,7 +2219,7 @@ and so on...
 </b></i></pre>
 
 <p align=justify> In these cases, there is a small probability of a hash
-collision for large numbers of files.
+collision forlarge numbers of files.
 
 <hr>
 

html/options.html

@@ -195,19 +195,19 @@ NN  name conversion type (0 *original structure 1,2,3 html/data in one directory
   N99 All files in web/, with random names (gadget !)
 
   N100 Site-structure, without www.domain.xxx/
-  N101 Identical to N1 except that "web" is replaced by the site's name
-  N102 Identical to N2 except that "web" is replaced by the site's name
-  N103 Identical to N3 except that "web" is replaced by the site's name
-  N104 Identical to N4 except that "web" is replaced by the site's name
-  N105 Identical to N5 except that "web" is replaced by the site's name
-  N199 Identical to N99 except that "web" is replaced by the site's name
+  N101 Identical to N1 exept that "web" is replaced by the site's name
+  N102 Identical to N2 exept that "web" is replaced by the site's name
+  N103 Identical to N3 exept that "web" is replaced by the site's name
+  N104 Identical to N4 exept that "web" is replaced by the site's name
+  N105 Identical to N5 exept that "web" is replaced by the site's name
+  N199 Identical to N99 exept that "web" is replaced by the site's name
 
-  N1001 Identical to N1 except that there is no "web" directory
-  N1002 Identical to N2 except that there is no "web" directory
-  N1003 Identical to N3 except that there is no "web" directory (option set for g option)
-  N1004 Identical to N4 except that there is no "web" directory
-  N1005 Identical to N5 except that there is no "web" directory
-  N1099 Identical to N99 except that there is no "web" directory
+  N1001 Identical to N1 exept that there is no "web" directory
+  N1002 Identical to N2 exept that there is no "web" directory
+  N1003 Identical to N3 exept that there is no "web" directory (option set for g option)
+  N1004 Identical to N4 exept that there is no "web" directory
+  N1005 Identical to N5 exept that there is no "web" directory
+  N1099 Identical to N99 exept that there is no "web" directory
 
 LN  long names
   L0 Filenames and directory names are limited to 8 characters + 3 for extension
@@ -272,7 +272,7 @@ RN number of retries, in case of timeout or non-fatal errors (*R0)
 This option sets the maximum number of tries that can be processed for a file
 
 o *generate output html file in case of error (404..) (o0 don't generate)
-This option define whether the engine has to generate html output file or not if an error occurred
+This option define whether the engine has to generate html output file or not if an error occured
 
 TN timeout, number of seconds after a non-responding link is shutdown
 This option define the timeout
@@ -282,8 +282,8 @@ JN traffic jam control, minimum transfert rate (bytes/seconds) tolerated for a l
 This option define the minimum transfer rate
 Example: -J200
 
-HN host is abandoned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow
-This option define whether the engine has to abandon a host if a timeout/"too slow" error occurred
+HN host is abandonned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow
+This option define whether the engine has to abandon a host if a timeout/"too slow" error occured
 
 &P extended parsing, attempt to parse all links (even in unknown tags or Javascript)
 This option activates the extended parsing, that attempt to find links in unknown Html code/javascript

html/plug.html

@@ -207,7 +207,7 @@ Below the list of callbacks, and associated external wrappers.
 <tr><td background="img/fade.gif"><i>receivehead</i></td><td background="img/fade.gif">Called when HTTP headers are recevived from the remote server. The <tt>buff</tt> buffer contains text headers, <tt>adr</tt> and <tt>fil</tt> the URL, and <tt>referer_adr</tt> and <tt>referer_fil</tt> the referer URL. The <tt>incoming</tt> structure contains all information related to the current slot.<br>return value: 1 if the mirror can continue, 0 if the mirror must be aborted</td><td background="img/fade.gif"><tt>int   mycallback(t_hts_callbackarg *carg, httrackp* opt, char* buff, const char* adr, const char* fil, const char* referer_adr, const char* referer_fil, htsblk* incoming);</tt></td></tr>
 
 <tr><td background="img/fade.gif"><i>detect</i></td><td background="img/fade.gif">Called when an unknown document is to be parsed. The <tt>str</tt> structure contains all information related to the document.<br>return value: 1 if the type is known and can be parsed, 0 if the document type is unknown</td><td background="img/fade.gif"><tt>int   mycallback(t_hts_callbackarg *carg, httrackp* opt, htsmoduleStruct* str);</tt></td></tr>
-<tr><td background="img/fade.gif"><i>parse</i></td><td background="img/fade.gif">The <tt>str</tt> structure contains all information related to the document.<br>return value: 1 if the document was successfully parsed, 0 if an error occurred</td><td background="img/fade.gif"><tt>int   mycallback(t_hts_callbackarg *carg, httrackp* opt, htsmoduleStruct* str);</tt></td></tr>
+<tr><td background="img/fade.gif"><i>parse</i></td><td background="img/fade.gif">The <tt>str</tt> structure contains all information related to the document.<br>return value: 1 if the document was successfully parsed, 0 if an error occured</td><td background="img/fade.gif"><tt>int   mycallback(t_hts_callbackarg *carg, httrackp* opt, htsmoduleStruct* str);</tt></td></tr>
 
 
 </table>

html/server/about.html

@@ -6,9 +6,79 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
+	<style type="text/css">
+	<!--
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
@@ -69,7 +139,7 @@ ${LANG_K3} : ${HTTRACK_WEB}
 
 <form>
 <input type="button" value="OK" onClick="window.close();"
-			onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </form>
 

html/server/addurl.html

@@ -6,10 +6,75 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
 
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
@@ -73,7 +138,7 @@ function info(str) {
 	<td id="subTitle" align="right">
 		<a href="/server/file.html" target="_blank"
 			onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -85,7 +150,7 @@ ${do:if-file-exists:html/index.html}
 	<td id="subTitle" align="right">
 		<a href="/index.html" target="_blank"
 			onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -118,20 +183,20 @@ ${do:end-if}
 <form action="${thisfile}" name="form">
 <table width="100%">
 <tr><td>${LANG_T2}</td><td>http://<input name="urladr"
-			onMouseOver="info('${html:LANG_T10}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_T10}'); return true" onMouseOut="info('&nbsp;'); return true"
 ></td></tr>
 <tr><td colspan=2>
 
 <table width="100%">
 <th>${LANG_T4}</th>
 <tr><td>${LANG_T5}:</td><td><input name="urllogin"
-			onMouseOver="info('${html:LANG_T12}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_T12}'); return true" onMouseOut="info('&nbsp;'); return true"
 ></td></tr>
 <tr><td>${LANG_T6}:</td><td><input name="urlpass"
-			onMouseOver="info('${html:LANG_T13}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_T13}'); return true" onMouseOut="info('&nbsp;'); return true"
 ></td></tr>
 <tr><td>${LANG_T7}:</td><td><input type="button" value="${LANG_T8}" onClick="alert('not yet implemented!')"
-			onMouseOver="info('${html:LANG_T14}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_T14}'); return true" onMouseOut="info('&nbsp;'); return true"
 ></td></tr>
 </table>
 
@@ -139,7 +204,7 @@ ${do:end-if}
 
 <tr><td>
 <input type="button" value="OK" onClick="if (do_add()) { window.close(); }"
-			onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 

html/server/error.html

@@ -6,8 +6,75 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--

html/server/exit.html

@@ -7,10 +7,10 @@
 	<title>'${projname}' - HTTrack Website Copier</title>
 
 <script language="javascript">
-<!--
+<!--
 function do_load() {
 	window.status=' ';
-	window.close();
+	window.close();
 }
 function do_unload() {
 }

html/server/file.html

@@ -6,8 +6,79 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--

html/server/finished.html

@@ -6,8 +6,75 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
@@ -36,7 +103,7 @@ function info(str) {
 	<td id="subTitle" align="right">
 		<a href="/server/file.html" target="_blank"
 			onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -48,7 +115,7 @@ ${do:if-file-exists:html/index.html}
 	<td id="subTitle" align="right">
 		<a href="/index.html" target="_blank"
 			onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -68,6 +135,9 @@ ${do:end-if}
 		<td id="pageContent"> 
 <!-- ==================== End prologue ==================== -->
 
+<!-- SFX -->
+<embed src="sfx/finished.wav" autostart="true" hidden="true" loop="false" width="0" height="0" />
+
 <table border="0" width="100%">
 <tr><td width="90%">
 	<h2 align="center"><em>${LANG_F18b}</em></h2>
@@ -77,23 +147,23 @@ ${do:end-if}
 
 <br>
 
-<pre>
-
-${do:if-not-empty:commandReturn}
-${LANG_F19}
-<font color="red">
-${commandReturnMsg}
-</font>
-${LANG_F20}
-<font color="blue">
-httrack ${commandReturnCmdl}
-</font>
-${LANG_F21}
-${do:end-if}
-
-${do:if-empty:commandReturn}
+<pre>
+
+${do:if-not-empty:commandReturn}
+${LANG_F19}
+<font color="red">
+${commandReturnMsg}
+</font>
+${LANG_F20}
+<font color="blue">
+httrack ${commandReturnCmdl}
+</font>
+${LANG_F21}
+${do:end-if}
+
+${do:if-empty:commandReturn}
 ${LANG_F22}
-${do:end-if}
+${do:end-if}
 </pre>
 
 ${LANG_G8} : 
@@ -107,7 +177,7 @@ ${path}/${projname}
 <li><a href="/website/hts-log.txt" target="_new">${LANG_D4}</a></li>
 </ul>
 
-<form method="POST" action="exit.html" name="form">
+<form method="POST" action="exit.html" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="command" value="quit">
 
@@ -121,8 +191,8 @@ ${path}/${projname}
 		<table width="100%" border="0"><tr><td align="left">
 		&nbsp;
 		</td><td align="right">
-			<input type="submit" value=" ${LANG_QUIT} "
-				onClick="form.submit()">
+			<input type="submit" value=" ${LANG_QUIT} "
+				onClick="form.submit()">
 		</td></tr></table>
 
 </td></tr>

html/server/help.html

@@ -6,8 +6,79 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
@@ -58,7 +129,7 @@ function info(str) {
 <table class="tableWidth" border="0" width="100%" cellspacing="0">
 <tr><td class="tabCtrl" align="left">
 <a style="background:black;color: white" href="about.html" target="_new"
-			onMouseOver="info('${html:LANG_G21}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_G21}'); return true" onMouseOut="info('&nbsp;'); return true"
 			>
 ${LANG_O16}...
 </a>
@@ -67,7 +138,7 @@ ${LANG_O16}...
 <tr><td class="tabCtrl" align="left">
 <a style="background:black;color: white" 
    href="http://www.httrack.com/update.php3?Product=HTTrack&Version=${HTTRACK_VERSIONID}&VersionStr=${HTTRACK_VERSION}&Platform=${HTS_PLATFORM}&LanguageId=${lang}" target="_new"
-			onMouseOver="info('${html:LANG_O17}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_O17}'); return true" onMouseOut="info('&nbsp;'); return true"
    >
 ${LANG_O17}...
 </a>
@@ -78,7 +149,7 @@ ${do:if-file-exists:html/index.html}
 <tr><td class="tabCtrl" align="left">
 <a style="background:black;color: white" 
    href="/index.html" target="_new"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
    >
 ${LANG_P16}
 </a>

html/server/index.html

@@ -6,8 +6,75 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>HTTrack Website Copier - Offline Browser</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
@@ -43,7 +110,7 @@ function info(str) {
 	<td id="subTitle" align="right">
 		<a href="/server/file.html" target="_blank"
 			onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -55,7 +122,7 @@ ${do:if-file-exists:html/index.html}
 	<td id="subTitle" align="right">
 		<a href="/index.html" target="_blank"
 			onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -113,7 +180,7 @@ ${LANG_THANKYOU}!
 
 	<tr><td align="right">
 		<input name="nextBtn" type="submit" value=" ${LANG_NEXT} >> "
-			onMouseOver="info('${html:LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
 		>
 	</td></tr>
 </table>

html/server/option1.html

@@ -6,17 +6,88 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
 function do_load() {
 	window.status=' ';
-${do:if-not-empty:closeme}
-	window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme}
+	window.close();
+${do:end-if}
+${do:set:closeme:}
 }
 function do_unload() {
 }
@@ -60,7 +131,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step9_opt1.html" target="_blank"
 		onClick="window.open('/step9_opt1.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -71,18 +142,18 @@ ${do:end-if}
 <table class="tableWidth" border="0" width="100%" cellspacing="0">
 <tr>
 
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
 </tr><tr>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
 <td class="tabCtrl" align="center">&nbsp;</td>
 
 </tr>
@@ -96,7 +167,7 @@ ${do:end-if}
 <form method="POST" action="${thisfile}" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
-<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value="">
 
 <!-- clear if not checked -->
 <input type="hidden" name="parseall" value="">
@@ -107,34 +178,34 @@ ${do:end-if}
 <!-- checkboxes -->
 <table border="0" width="100%" cellspacing="0">
 <tr><td><input type="checkbox" name="parseall"  ${checked:parseall} 
-			onMouseOver="info('${html:LANG_I1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I31}</td></tr>
 <tr><td><input type="checkbox" name="link"      ${checked:link}     
-			onMouseOver="info('${html:LANG_I2}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I2}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I32}</td></tr>
 <tr><td><input type="checkbox" name="testall"   ${checked:testall}  
-			onMouseOver="info('${html:LANG_I2b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I2b}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I32b}</td></tr>
 <tr><td><input type="checkbox" name="htmlfirst" ${checked:htmlfirst}
-			onMouseOver="info('${html:LANG_I2c}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I2c}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I32c}</td></tr>
 </table>
 
-<tr><td>
-	<table width="100%">
-	<tr><td align="left">
-	<input type="submit" value="${LANG_OK}"
-				onClick="form.closeme.value=1; form.submit(); return false;"
-				onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td><td align="right">
-	<input type="button" value="${LANG_CANCEL}"
-				onClick="window.close();"
-				onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td></tr>
-	</table>
-</td></tr>
+<tr><td>
+	<table width="100%">
+	<tr><td align="left">
+	<input type="submit" value="${LANG_OK}"
+				onClick="form.closeme.value=1; form.submit(); return false;"
+				onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td><td align="right">
+	<input type="button" value="${LANG_CANCEL}"
+				onClick="window.close();"
+				onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td></tr>
+	</table>
+</td></tr>
 
 </form>
 

html/server/option10.html

@@ -6,17 +6,88 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
 function do_load() {
 	window.status=' ';
-${do:if-not-empty:closeme}
-	window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme}
+	window.close();
+${do:end-if}
+${do:set:closeme:}
 }
 function do_unload() {
 }
@@ -60,7 +131,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step9_opt7.html" target="_blank"
 		onClick="window.open('/step9_opt7.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -71,18 +142,18 @@ ${do:end-if}
 <table class="tableWidth" border="0" width="100%" cellspacing="0">
 <tr>
 
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
 </tr><tr>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
 <td class="tabCtrl" align="center">&nbsp;</td>
 
 </tr>
@@ -96,37 +167,37 @@ ${do:end-if}
 <form method="POST" action="${thisfile}" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
-<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value="">
 
 ${LANG_IOPT10}: 
 <input name="prox" value="${prox}" size="32"
-			onMouseOver="info('${html:LANG_G14}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_G14}'); return true" onMouseOut="info('&nbsp;'); return true"
 >:
 <input name="portprox" value="${portprox}" size="4"
-			onMouseOver="info('${html:LANG_G15}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_G15}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 <br>
 
 <input type="checkbox" name="ftpprox" ${checked:ftpprox}
-			onMouseOver="info('${html:LANG_G15c}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_G15c}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I47c}
 <br><br>
 
-<tr><td>
-	<table width="100%">
-	<tr><td align="left">
-	<input type="submit" value="${LANG_OK}"
-				onClick="form.closeme.value=1; form.submit(); return false;"
-				onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td><td align="right">
-	<input type="button" value="${LANG_CANCEL}"
-				onClick="window.close();"
-				onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td></tr>
-	</table>
-</td></tr>
+<tr><td>
+	<table width="100%">
+	<tr><td align="left">
+	<input type="submit" value="${LANG_OK}"
+				onClick="form.closeme.value=1; form.submit(); return false;"
+				onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td><td align="right">
+	<input type="button" value="${LANG_CANCEL}"
+				onClick="window.close();"
+				onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td></tr>
+	</table>
+</td></tr>
 
 </form>
 

html/server/option11.html

@@ -6,17 +6,88 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
 function do_load() {
 	window.status=' ';
-${do:if-not-empty:closeme}
-	window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme}
+	window.close();
+${do:end-if}
+${do:set:closeme:}
 }
 function do_unload() {
 }
@@ -60,7 +131,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step9_opt9.html" target="_blank"
 		onClick="window.open('/step9_opt9.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -71,18 +142,18 @@ ${do:end-if}
 <table class="tableWidth" border="0" width="100%" cellspacing="0">
 <tr>
 
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
 </tr><tr>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
 <td class="tabCtrl" align="center">&nbsp;</td>
 
 </tr>
@@ -96,7 +167,7 @@ ${do:end-if}
 <form method="POST" action="${thisfile}" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
-<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value="">
 
 ${LANG_W1}:
 <br>
@@ -112,97 +183,97 @@ ${LANG_W3}
 
 <td align="left">
 <input name="ext1" value="${ext1}"
-			onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td><td align="left">
 &#x21d4;
 </td><td align="left">
 <input name="mime1" value="${mime1}"
-			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext2" value="${ext2}"
-			onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td><td align="left">
 &#x21d4;
 </td><td align="left">
 <input name="mime2" value="${mime2}"
-			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext3" value="${ext3}"
-			onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td><td align="left">
 &#x21d4;
 </td><td align="left">
 <input name="mime3" value="${mime3}"
-			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext4" value="${ext4}"
-			onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td><td align="left">
 &#x21d4;
 </td><td align="left">
 <input name="mime4" value="${mime4}"
-			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext5" value="${ext5}"
-			onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td><td align="left">
 &#x21d4;
 </td><td align="left">
 <input name="mime5" value="${mime5}"
-			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext6" value="${ext6}"
-			onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td><td align="left">
 &#x21d4;
 </td><td align="left">
 <input name="mime6" value="${mime6}"
-			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext7" value="${ext7}"
-			onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td><td align="left">
 &#x21d4;
 </td><td align="left">
 <input name="mime7" value="${mime7}"
-			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext8" value="${ext8}"
-			onMouseOver="info('${html:LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td><td align="left">
 &#x21d4;
 </td><td align="left">
 <input name="mime8" value="${mime8}"
-			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
@@ -212,21 +283,21 @@ ${LANG_W3}
 <br><br>
 
 
-<tr><td>
-	<table width="100%">
-	<tr><td align="left">
-	<input type="submit" value="${LANG_OK}"
-				onClick="form.closeme.value=1; form.submit(); return false;"
-				onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td><td align="right">
-	<input type="button" value="${LANG_CANCEL}"
-				onClick="window.close();"
-				onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td></tr>
-	</table>
-</td></tr>
+<tr><td>
+	<table width="100%">
+	<tr><td align="left">
+	<input type="submit" value="${LANG_OK}"
+				onClick="form.closeme.value=1; form.submit(); return false;"
+				onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td><td align="right">
+	<input type="button" value="${LANG_CANCEL}"
+				onClick="window.close();"
+				onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td></tr>
+	</table>
+</td></tr>
 
 </form>
 

html/server/option2.html

@@ -6,23 +6,94 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
 function do_load() {
-	window.status=' ';
-${do:if-not-empty:closeme}
-	window.close();
-${do:end-if}
-${do:set:closeme:}
+	window.status=' ';
+${do:if-not-empty:closeme}
+	window.close();
+${do:end-if}
+${do:set:closeme:}
 }
 function do_unload() {
 }
 function info(str) {
 	window.status = str;
-}
+}
 // -->
 </script>
 
@@ -60,7 +131,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step9_opt5.html" target="_blank"
 		onClick="window.open('/step9_opt5.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -71,18 +142,18 @@ ${do:end-if}
 <table class="tableWidth" border="0" width="100%" cellspacing="0">
 <tr>
 
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
 </tr><tr>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
 <td class="tabCtrl" align="center">&nbsp;</td>
 
 </tr>
@@ -96,62 +167,62 @@ ${do:end-if}
 <form method="POST" action="${thisfile}" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
-<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value="">
 
 ${LANG_I33}
 <br>
 <select name="build"
-			onMouseOver="info('${html:LANG_I3}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I3}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 ${listid:build:LISTDEF_3}
 </select>
 <input type="button" value="${LANG_O2}" 
 	onClick="form.build.selectedIndex=14; window.open('option2b.html', 'option2b', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480').wparent=document; form.submit();"
-		onMouseOver="info('${html:LANG_I4}'); return true" onMouseOut="info('&nbsp;'); return true"
+		onMouseOver="info('${LANG_I4}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 
 <!-- checkboxes -->
 <table border="0" width="100%" cellspacing="0">
-<tr><td>
-<select name="dos"
-			onMouseOver="info('${html:LANG_I8}\r\n${LANG_I8b}'); return true" onMouseOut="info('&nbsp;'); return true"
->
-<option value="0"${ztest:dos: selected::}>&nbsp;</option>
-<option value="1"${ztest:dos:: selected:}>${LANG_I37}</option>
-<option value="2"${ztest:dos::: selected}>${LANG_I37b}</option>
-</select>
+<tr><td>
+<select name="dos"
+			onMouseOver="info('${LANG_I8}\r\n${LANG_I8b}'); return true" onMouseOut="info('&nbsp;'); return true"
+>
+<option value="0"${ztest:dos: selected::}>&nbsp;</option>
+<option value="1"${ztest:dos:: selected:}>${LANG_I37}</option>
+<option value="2"${ztest:dos::: selected}>${LANG_I37b}</option>
+</select>
 </td></tr>
 <tr><td><input type="checkbox" name="errpage"   ${checked:errpage}  
-			onMouseOver="info('${html:LANG_I9}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I9}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I38}</td></tr>
 <tr><td><input type="checkbox" name="external"  ${checked:external} 
-			onMouseOver="info('${html:LANG_I29}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I29}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I56}</td></tr>
 <tr><td><input type="checkbox" name="hidepwd"   ${checked:hidepwd}  
-			onMouseOver="info('${html:LANG_I30}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I30}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I66}</td></tr>
 <tr><td><input type="checkbox" name="hidequery" ${checked:hidequery}
-			onMouseOver="info('${html:LANG_I30b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I30b}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I67}</td></tr>
 <tr><td><input type="checkbox" name="nopurge"   ${checked:nopurge}  
-			onMouseOver="info('${html:LANG_I1a}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1a}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I57}</td></tr>
 </table>
 
-<tr><td>
-	<table width="100%">
-	<tr><td align="left">
-	<input type="submit" value="${LANG_OK}"
+<tr><td>
+	<table width="100%">
+	<tr><td align="left">
+	<input type="submit" value="${LANG_OK}"
 				onClick="form.closeme.value=1; form.submit(); return false;"
-				onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td><td align="right">
-	<input type="button" value="${LANG_CANCEL}"
-				onClick="window.close();"
-				onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td></tr>
-	</table>
+				onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td><td align="right">
+	<input type="button" value="${LANG_CANCEL}"
+				onClick="window.close();"
+				onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td></tr>
+	</table>
 </td></tr>
 
 </form>

html/server/option2b.html

@@ -6,17 +6,88 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
 function do_load() {
 	window.status=' ';
-${do:if-not-empty:closeme}
-	window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme}
+	window.close();
+${do:end-if}
+${do:set:closeme:}
 }
 function do_unload() {
 }
@@ -70,7 +141,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step9_opt5.html" target="_blank"
 		onClick="window.open('/step9_opt5.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -84,7 +155,7 @@ ${do:end-if}
 <form method="POST" action="${thisfile}" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
-<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value="">
 
 <input name="BuildString" size="60" value="${BuildString}">
 
@@ -99,25 +170,25 @@ ${LANG_Q3}
 </pre>
 
 <br>
-
-<tr><td>
-	<table width="100%">
-	<tr><td align="left">
-	<input type="submit" value="${LANG_OK]" 
-${do:output-mode:html-urlescaped}
-		onClick="if (confirm(str_replace(str_replace('${LANG_DIAL7}', '%20', ' '), '%0a', ' '))) { form.closeme.value=1; form.submit(); } return false;"
-${do:output-mode:}
-				onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td><td align="right">
-	<input type="button" value="${LANG_CANCEL}"
-				onClick="window.close();"
-				onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td></tr>
-	</table>
-</td></tr>
-
+
+<tr><td>
+	<table width="100%">
+	<tr><td align="left">
+	<input type="submit" value="${LANG_OK]" 
+${do:output-mode:html-urlescaped}
+		onClick="if (confirm(str_replace(str_replace('${LANG_DIAL7}', '%20', ' '), '%0a', ' '))) { form.closeme.value=1; form.submit(); } return false;"
+${do:output-mode:}
+				onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td><td align="right">
+	<input type="button" value="${LANG_CANCEL}"
+				onClick="window.close();"
+				onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td></tr>
+	</table>
+</td></tr>
+
 </form>
 
 </td></tr>

html/server/option3.html

@@ -6,17 +6,88 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
 function do_load() {
 	window.status=' ';
-${do:if-not-empty:closeme}
-	window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme}
+	window.close();
+${do:end-if}
+${do:set:closeme:}
 }
 function do_unload() {
 }
@@ -60,7 +131,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step9_opt10.html" target="_blank"
 		onClick="window.open('/step9_opt10.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -71,18 +142,18 @@ ${do:end-if}
 <table class="tableWidth" border="0" width="100%" cellspacing="0">
 <tr>
 
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
 </tr><tr>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
 <td class="tabCtrl" align="center">&nbsp;</td>
 
 </tr>
@@ -96,7 +167,7 @@ ${do:end-if}
 <form method="POST" action="${thisfile}" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
-<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value="">
 
 ${LANG_I40c}
 <br>
@@ -104,7 +175,7 @@ ${LANG_I40c}
 <!-- checkboxes -->
 <table border="0" width="100%" cellspacing="0">
 <tr><td><input type="checkbox" name="cache" ${checked:cache}
-			onMouseOver="info('${html:LANG_I5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I5}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I34}</td></tr>
 </table>
 <br>
@@ -112,7 +183,7 @@ ${LANG_I40c}
 ${LANG_I39}
 <br>
 <select name="filter"
-			onMouseOver="info('${html:LANG_I29}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I29}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 ${listid:filter:LISTDEF_4}
 </select>
@@ -121,7 +192,7 @@ ${listid:filter:LISTDEF_4}
 ${LANG_I40}
 <br>
 <select name="travel"
-			onMouseOver="info('${html:LANG_I11}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I11}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 ${listid:travel:LISTDEF_5}
 </select>
@@ -130,7 +201,7 @@ ${listid:travel:LISTDEF_5}
 ${LANG_I40b}
 <br>
 <select name="travel2"
-			onMouseOver="info('${html:LANG_I11b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I11b}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 ${listid:travel2:LISTDEF_6}
 </select>
@@ -139,7 +210,7 @@ ${listid:travel2:LISTDEF_6}
 ${LANG_I40e}
 <br>
 <select name="travel3"
-			onMouseOver="info('${html:LANG_I11c}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I11c}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 ${listid:travel3:LISTDEF_11}
 </select>
@@ -148,26 +219,26 @@ ${listid:travel3:LISTDEF_11}
 <!-- checkboxes -->
 <table border="0" width="100%" cellspacing="0">
 <tr><td><input type="checkbox" name="windebug" ${checked:windebug} 
-			onMouseOver="info('${html:LANG_I1h}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1h}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I40d}</td></tr>
 </table>
 <br>
 
-<tr><td>
-	<table width="100%">
-	<tr><td align="left">
-	<input type="submit" value="${LANG_OK}"
-				onClick="form.closeme.value=1; form.submit(); return false;"
-				onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td><td align="right">
-	<input type="button" value="${LANG_CANCEL}"
-				onClick="window.close();"
-				onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td></tr>
-	</table>
-</td></tr>
+<tr><td>
+	<table width="100%">
+	<tr><td align="left">
+	<input type="submit" value="${LANG_OK}"
+				onClick="form.closeme.value=1; form.submit(); return false;"
+				onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td><td align="right">
+	<input type="button" value="${LANG_CANCEL}"
+				onClick="window.close();"
+				onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td></tr>
+	</table>
+</td></tr>
 
 </form>
 

html/server/option4.html

@@ -6,17 +6,88 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
 function do_load() {
 	window.status=' ';
-${do:if-not-empty:closeme}
-	window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme}
+	window.close();
+${do:end-if}
+${do:set:closeme:}
 }
 function do_unload() {
 }
@@ -60,7 +131,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step9_opt3.html" target="_blank"
 		onClick="window.open('/step9_opt3.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -71,18 +142,18 @@ ${do:end-if}
 <table class="tableWidth" border="0" width="100%" cellspacing="0">
 <tr>
 
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
 </tr><tr>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
 <td class="tabCtrl" align="center">&nbsp;</td>
 
 </tr>
@@ -96,7 +167,7 @@ ${do:end-if}
 <form method="POST" action="refresh.html" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
-<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value="">
 
 <table border="0" width="100%" cellspacing="0">
 
@@ -104,11 +175,11 @@ ${do:end-if}
 ${LANG_I44}
 </td><td>
 <input name="connexion" value="${connexion}" size="4"
-			onMouseOver="info('${html:LANG_I12}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I12}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr><tr><td></td><td>
 <input type="checkbox" name="ka" ${checked:ka} 
-			onMouseOver="info('${html:LANG_I47f}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I47f}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I47e}
 </td></tr>
 
@@ -116,11 +187,11 @@ ${LANG_I44}
 ${LANG_I47d}
 </td><td>
 <input name="timeout" value="${timeout}" size="4"
-			onMouseOver="info('${html:LANG_I13}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I13}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr><tr><td></td><td>
 <input type="checkbox" name="remt" ${checked:remt} 
-			onMouseOver="info('${html:LANG_I14}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I14}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I45}
 </td></tr>
 
@@ -128,7 +199,7 @@ ${LANG_I47d}
 ${LANG_I48}
 </td><td>
 <input name="retry" value="${retry}" size="4"
-			onMouseOver="info('${html:LANG_I17}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I17}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -136,31 +207,31 @@ ${LANG_I48}
 ${LANG_I46}
 </td><td>
 <input name="rate" value="${rate}" size="4"
-			onMouseOver="info('${html:LANG_I15}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I15}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr><tr><td></td><td>
 <input type="checkbox" name="rems" ${checked:rems} 
-			onMouseOver="info('${html:LANG_I16}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I16}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I47}
 </td></tr>
 
 </table>
 
-<tr><td>
-	<table width="100%">
-	<tr><td align="left">
-	<input type="submit" value="${LANG_OK}"
-				onClick="form.closeme.value=1; form.submit(); return false;"
-				onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td><td align="right">
-	<input type="button" value="${LANG_CANCEL}"
-				onClick="window.close();"
-				onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td></tr>
-	</table>
-</td></tr>
+<tr><td>
+	<table width="100%">
+	<tr><td align="left">
+	<input type="submit" value="${LANG_OK}"
+				onClick="form.closeme.value=1; form.submit(); return false;"
+				onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td><td align="right">
+	<input type="button" value="${LANG_CANCEL}"
+				onClick="window.close();"
+				onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td></tr>
+	</table>
+</td></tr>
 
 </form>
 

html/server/option5.html

@@ -6,17 +6,88 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
 function do_load() {
 	window.status=' ';
-${do:if-not-empty:closeme}
-	window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme}
+	window.close();
+${do:end-if}
+${do:set:closeme:}
 }
 function do_unload() {
 }
@@ -60,7 +131,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step9_opt2.html" target="_blank"
 		onClick="window.open('/step9_opt2.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -71,18 +142,18 @@ ${do:end-if}
 <table class="tableWidth" border="0" width="100%" cellspacing="0">
 <tr>
 
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
 </tr><tr>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
 <td class="tabCtrl" align="center">&nbsp;</td>
 
 </tr>
@@ -96,7 +167,7 @@ ${do:end-if}
 <form method="POST" action="${thisfile}" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
-<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value="">
 
 <table border="0" width="100%" cellspacing="0">
 
@@ -104,7 +175,7 @@ ${do:end-if}
 ${LANG_G32}
 </td><td>
 <input name="depth" value="${depth}" size="4"
-			onMouseOver="info('${html:LANG_I1g}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1g}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -112,7 +183,7 @@ ${LANG_G32}
 ${LANG_G32b}
 </td><td>
 <input name="depth2" value="${depth2}" size="4"
-			onMouseOver="info('${html:LANG_I1g2}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1g2}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -120,7 +191,7 @@ ${LANG_G32b}
 ${LANG_I50}
 </td><td>
 <input name="maxhtml" value="${maxhtml}" size="4"
-			onMouseOver="info('${html:LANG_I18}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I18}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -128,7 +199,7 @@ ${LANG_I50}
 ${LANG_I50b}
 </td><td>
 <input name="othermax" value="${othermax}" size="4"
-			onMouseOver="info('${html:LANG_I19}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I19}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -136,7 +207,7 @@ ${LANG_I50b}
 ${LANG_I51}
 </td><td>
 <input name="sizemax" value="${sizemax}" size="4"
-			onMouseOver="info('${html:LANG_I20}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I20}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -144,7 +215,7 @@ ${LANG_I51}
 ${LANG_I65}
 </td><td>
 <input name="pausebytes" value="${pausebytes}" size="4"
-			onMouseOver="info('${html:LANG_I20b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I20b}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -152,7 +223,7 @@ ${LANG_I65}
 ${LANG_I52}
 </td><td>
 <input name="maxtime" value="${maxtime}" size="4"
-			onMouseOver="info('${html:LANG_I21}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I21}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -160,7 +231,7 @@ ${LANG_I52}
 ${LANG_I54}
 </td><td>
 <input name="maxrate" value="${maxrate}" size="4"
-			onMouseOver="info('${html:LANG_I22}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I22}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -168,7 +239,7 @@ ${LANG_I54}
 ${LANG_I64}
 </td><td>
 <input name="maxconn" value="${maxconn}" size="4"
-			onMouseOver="info('${html:LANG_I22b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I22b}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -176,25 +247,25 @@ ${LANG_I64}
 ${LANG_I64b}
 </td><td>
 <input name="maxlinks" value="${maxlinks}" size="4"
-			onMouseOver="info('${html:LANG_I22c}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I22c}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
-<tr><td>
-	<table width="100%">
-	<tr><td align="left">
-	<input type="submit" value="${LANG_OK}"
-				onClick="form.closeme.value=1; form.submit(); return false;"
-				onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td><td align="right">
-	<input type="button" value="${LANG_CANCEL}"
-				onClick="window.close();"
-				onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td></tr>
-	</table>
-</td></tr>
+<tr><td>
+	<table width="100%">
+	<tr><td align="left">
+	<input type="submit" value="${LANG_OK}"
+				onClick="form.closeme.value=1; form.submit(); return false;"
+				onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td><td align="right">
+	<input type="button" value="${LANG_CANCEL}"
+				onClick="window.close();"
+				onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td></tr>
+	</table>
+</td></tr>
 
 </table>
 

html/server/option6.html

@@ -6,17 +6,88 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
 function do_load() {
 	window.status=' ';
-${do:if-not-empty:closeme}
-	window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme}
+	window.close();
+${do:end-if}
+${do:set:closeme:}
 }
 function do_unload() {
 }
@@ -60,7 +131,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step9_opt8.html" target="_blank"
 		onClick="window.open('/step9_opt8.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -71,18 +142,18 @@ ${do:end-if}
 <table class="tableWidth" border="0" width="100%" cellspacing="0">
 <tr>
 
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
 </tr><tr>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
 <td class="tabCtrl" align="center">&nbsp;</td>
 
 </tr>
@@ -96,7 +167,7 @@ ${do:end-if}
 <form method="POST" action="${thisfile}" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
-<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value="">
 
 <table border="0" width="100%" cellspacing="0">
 
@@ -104,7 +175,7 @@ ${do:end-if}
 ${LANG_I43}
 </td><td>
 <input name="user" value="${user}" size="60"
-			onMouseOver="info('${html:LANG_I23}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I23}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -112,27 +183,27 @@ ${LANG_I43}
 ${LANG_I43b}
 </td><td>
 <input name="footer" value="${footer}" size="60"
-			onMouseOver="info('${html:LANG_I23b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I23b}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
 </table>
 
-<tr><td>
-	<table width="100%">
-	<tr><td align="left">
-	<input type="submit" value="${LANG_OK}"
-				onClick="form.closeme.value=1; form.submit(); return false;"
-				onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td><td align="right">
-	<input type="button" value="${LANG_CANCEL}"
-				onClick="window.close();"
-				onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td></tr>
-	</table>
-</td></tr>
+<tr><td>
+	<table width="100%">
+	<tr><td align="left">
+	<input type="submit" value="${LANG_OK}"
+				onClick="form.closeme.value=1; form.submit(); return false;"
+				onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td><td align="right">
+	<input type="button" value="${LANG_CANCEL}"
+				onClick="window.close();"
+				onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td></tr>
+	</table>
+</td></tr>
 
 </form>
 

html/server/option7.html

@@ -6,17 +6,88 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
 function do_load() {
 	window.status=' ';
-${do:if-not-empty:closeme}
-	window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme}
+	window.close();
+${do:end-if}
+${do:set:closeme:}
 }
 function do_unload() {
 }
@@ -60,7 +131,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step9_opt4.html" target="_blank"
 		onClick="window.open('/step9_opt4.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -71,18 +142,18 @@ ${do:end-if}
 <table class="tableWidth" border="0" width="100%" cellspacing="0">
 <tr>
 
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
 </tr><tr>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
 <td class="tabCtrl" align="center">&nbsp;</td>
 
 </tr>
@@ -96,13 +167,13 @@ ${do:end-if}
 <form method="POST" action="${thisfile}" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
-<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value="">
 
 <tt>
 ${LANG_B10}
 </tt>
 <textarea name="url2" cols="60" rows="8"
-			onMouseOver="info('${html:LANG_C3}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_C3}'); return true" onMouseOut="info('&nbsp;'); return true"
 >${url2}</textarea>
 
 <br>
@@ -110,21 +181,21 @@ ${LANG_B10}
 ${LANG_B13}
 </tt>
 
-<tr><td>
-	<table width="100%">
-	<tr><td align="left">
-	<input type="submit" value="${LANG_OK}"
-				onClick="form.closeme.value=1; form.submit(); return false;"
-				onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td><td align="right">
-	<input type="button" value="${LANG_CANCEL}"
-				onClick="window.close();"
-				onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td></tr>
-	</table>
-</td></tr>
+<tr><td>
+	<table width="100%">
+	<tr><td align="left">
+	<input type="submit" value="${LANG_OK}"
+				onClick="form.closeme.value=1; form.submit(); return false;"
+				onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td><td align="right">
+	<input type="button" value="${LANG_CANCEL}"
+				onClick="window.close();"
+				onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td></tr>
+	</table>
+</td></tr>
 
 </form>
 

html/server/option8.html

@@ -6,17 +6,88 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
 function do_load() {
 	window.status=' ';
-${do:if-not-empty:closeme}
-	window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme}
+	window.close();
+${do:end-if}
+${do:set:closeme:}
 }
 function do_unload() {
 }
@@ -60,7 +131,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step9_opt6.html" target="_blank"
 		onClick="window.open('/step9_opt6.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -71,18 +142,18 @@ ${do:end-if}
 <table class="tableWidth" border="0" width="100%" cellspacing="0">
 <tr>
 
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
 </tr><tr>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
 <td class="tabCtrl" align="center">&nbsp;</td>
 
 </tr>
@@ -96,72 +167,72 @@ ${do:end-if}
 <form method="POST" action="${thisfile}" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
-<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value="">
 
 <input type="checkbox" name="cookies" ${checked:cookies}
-			onMouseOver="info('${html:LANG_I1b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1b}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I58}
 <br><br>
 
 ${LANG_I59}
 <br>
 <select name="checktype"
-			onMouseOver="info('${html:LANG_I1c}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1c}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 ${listid:checktype:LISTDEF_7}
 </select>
 <br><br>
 
 <input type="checkbox" name="parsejava" ${checked:parsejava}
-			onMouseOver="info('${html:LANG_I1d}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1d}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I60}
 <br><br>
 
 ${LANG_I55}
 <br>
 <select name="robots"
-			onMouseOver="info('${html:LANG_I28}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I28}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 ${listid:robots:LISTDEF_8}
 </select>
 <br><br>
 
 <input type="checkbox" name="updhack" ${checked:updhack}
-			onMouseOver="info('${html:LANG_I1k}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1k}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I62b}
 <br><br>
 
 <input type="checkbox" name="urlhack" ${checked:urlhack}
-			onMouseOver="info('${html:LANG_I1k2}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1k2}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I62b2}
 <br><br>
 
 <input type="checkbox" name="toler" ${checked:toler}
-			onMouseOver="info('${html:LANG_I1i}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1i}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I62}
 <br><br>
 
 <input type="checkbox" name="http10" ${checked:http10}
-			onMouseOver="info('${html:LANG_I1j}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1j}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I63}
 <br><br>
 
 
-<tr><td>
-	<table width="100%">
-	<tr><td align="left">
-	<input type="submit" value="${LANG_OK}"
-				onClick="form.closeme.value=1; form.submit(); return false;"
-				onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td><td align="right">
-	<input type="button" value="${LANG_CANCEL}"
-				onClick="window.close();"
-				onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td></tr>
-	</table>
-</td></tr>
+<tr><td>
+	<table width="100%">
+	<tr><td align="left">
+	<input type="submit" value="${LANG_OK}"
+				onClick="form.closeme.value=1; form.submit(); return false;"
+				onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td><td align="right">
+	<input type="button" value="${LANG_CANCEL}"
+				onClick="window.close();"
+				onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td></tr>
+	</table>
+</td></tr>
 
 </form>
 

html/server/option9.html

@@ -6,17 +6,88 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+.tabCtrl {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
 function do_load() {
 	window.status=' ';
-${do:if-not-empty:closeme}
-	window.close();
-${do:end-if}
-${do:set:closeme:}
+${do:if-not-empty:closeme}
+	window.close();
+${do:end-if}
+${do:set:closeme:}
 }
 function do_unload() {
 }
@@ -60,7 +131,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step9_opt9.html" target="_blank"
 		onClick="window.open('/step9_opt9.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -71,18 +142,18 @@ ${do:end-if}
 <table class="tableWidth" border="0" width="100%" cellspacing="0">
 <tr>
 
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option1.html" onClick="form.redirect.value='option1.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT1}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT1}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option2.html" onClick="form.redirect.value='option2.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT2}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT2}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option3.html" onClick="form.redirect.value='option3.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT3}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT3}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option4.html" onClick="form.redirect.value='option4.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT4}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT4}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option5.html" onClick="form.redirect.value='option5.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT5}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT5}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option11.html" onClick="form.redirect.value='option11.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT11}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT11}</a></td>
 </tr><tr>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
-<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${html:LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option6.html" onClick="form.redirect.value='option6.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT6}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT6}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option7.html" onClick="form.redirect.value='option7.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT7}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT7}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option8.html" onClick="form.redirect.value='option8.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT8}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT8}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option9.html" onClick="form.redirect.value='option9.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT9}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT9}</a></td>
+<td class="tabCtrl" align="center"><a style="background:black;color: white" href="option10.html" onClick="form.redirect.value='option10.html'; form.submit(); return false;" align="center" onMouseOver="info('${LANG_IOPT10}'); return true" onMouseOut="info('&nbsp;'); return true">${LANG_IOPT10}</a></td>
 <td class="tabCtrl" align="center">&nbsp;</td>
 
 </tr>
@@ -96,53 +167,53 @@ ${do:end-if}
 <form method="POST" action="${thisfile}" name="form">
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
-<input type="hidden" name="closeme" value="">
+<input type="hidden" name="closeme" value="">
 
 <input type="checkbox" name="cache2" ${checked:cache2}
-			onMouseOver="info('${html:LANG_I1e}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1e}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I61}
 <br><br>
 
 <input type="checkbox" name="norecatch" ${checked:norecatch}
-			onMouseOver="info('${html:LANG_I5b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I5b}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I34b}
 <br><br>
 
 <input type="checkbox" name="logf" ${checked:logf}
-			onMouseOver="info('${html:LANG_I7}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I7}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I36}
 <select name="logtype"
-			onMouseOver="info('${html:LANG_I1f}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I1f}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 ${listid:logtype:LISTDEF_9}
 </select>
 <br><br>
 
 <input type="checkbox" name="index" ${checked:index}
-			onMouseOver="info('${html:LANG_I6}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I6}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I35}
 <br><br>
 
 <input type="checkbox" name="index2" ${checked:index2}
-			onMouseOver="info('${html:LANG_I6b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_I6b}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I35b}
 <br><br>
 
-<tr><td>
-	<table width="100%">
-	<tr><td align="left">
-	<input type="submit" value="${LANG_OK}"
-				onClick="form.closeme.value=1; form.submit(); return false;"
-				onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td><td align="right">
-	<input type="button" value="${LANG_CANCEL}"
-				onClick="window.close();"
-				onMouseOver="info('${html:LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
-	>
-	</td></tr>
-	</table>
-</td></tr>
+<tr><td>
+	<table width="100%">
+	<tr><td align="left">
+	<input type="submit" value="${LANG_OK}"
+				onClick="form.closeme.value=1; form.submit(); return false;"
+				onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td><td align="right">
+	<input type="button" value="${LANG_CANCEL}"
+				onClick="window.close();"
+				onMouseOver="info('${LANG_TIPCANCEL}'); return true" onMouseOut="info('&nbsp;'); return true"
+	>
+	</td></tr>
+	</table>
+</td></tr>
 
 </form>
 

html/server/ping.js

@@ -1,26 +0,0 @@
-// Function aimed to ping the webhttrack server regularly to keep it alive
-// If the browser window is closed, the server will eventually shutdown
-function ping_server() {
-	var iframe = document.getElementById('pingiframe');
-	if (iframe && iframe.src) {
-		iframe.src = iframe.src;
-		setTimeout(ping_server, 30000);
-	}
-}
-
-// Create an invisible iframe to hold the server ping result
-// Only modern browsers will support that, but old browsers are compatible
-// with the legacy "wait for browser PID" mode
-if (document && document.createElement && document.body
-    && document.body.appendChild && document.getElementById) {
-	var iframe = document.createElement('iframe');
-	if (iframe) {
-		iframe.id = 'pingiframe';
-		iframe.style.display = "none";
-		iframe.style.visibility = "hidden";
-		iframe.width = iframe.height = 0;
-		iframe.src = "/ping";
-		document.body.appendChild(iframe);
-		ping_server();
-	}
-}

html/server/refresh.html

@@ -7,55 +7,122 @@
 	<META http-equiv="refresh" content="30; URL=finished.html">
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
-<!--
+<!--
 var freeze=0;
-setTimeout(do_refresh, 1000);
+setTimeout(do_refresh, 1000);
 function do_load() {
-	window.status=' ';
-	enable_timer();
-}
-function disable_timer() {
-	if (freeze == 0) {
-		freeze=1;
-	}
-}
-function lock_timer() {
-	freeze=2;
-}
-function enable_timer() {
-	if (freeze == 1) {
-		freeze=0;
-	}
-}
-function unlock_timer() {
-	freeze=0;
-}
-function do_confirm(str) {
-	lock_timer();
-	ret=confirm(str);
-	if (!ret) {
-		unlock_timer();
-	}
-	return ret;
+	window.status=' ';
+	enable_timer();
+}
+function disable_timer() {
+	if (freeze == 0) {
+		freeze=1;
+	}
 }
+function lock_timer() {
+	freeze=2;
+}
+function enable_timer() {
+	if (freeze == 1) {
+		freeze=0;
+	}
+}
+function unlock_timer() {
+	freeze=0;
+}
+function do_confirm(str) {
+	lock_timer();
+	ret=confirm(str);
+	if (!ret) {
+		unlock_timer();
+	}
+	return ret;
+}
 function do_unload() {
 }
 function info(str) {
 	window.status = str;
+}
+function do_refresh() {
+	if (!freeze) {
+		document.location.reload();
+	} else {
+		setTimeout(do_refresh, 1000);
+	}
 }
-function do_refresh() {
-	if (!freeze) {
-		document.location.reload();
-	} else {
-		setTimeout(do_refresh, 1000);
-	}
-}
-function no_refresh() {
-}
+function no_refresh() {
+}
 // -->
 </script>
 
@@ -73,7 +140,7 @@ function no_refresh() {
 	<td id="subTitle" align="right">
 		<a href="/server/file.html" target="_blank"
 			onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -85,7 +152,7 @@ ${do:if-file-exists:html/index.html}
 	<td id="subTitle" align="right">
 		<a href="/index.html" target="_blank"
 			onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -131,8 +198,8 @@ ${do:end-if}
 
 </tr>
 </table>
-
-<br>
+
+<br>
 
 <table border="0" width="100%">
 <tr>
@@ -143,8 +210,8 @@ ${LANG_H20} ${info.currentjob}
 </td>
 </tr>
 </table>
-
-<br>
+
+<br>
 
 <form method="POST" action="step4.html" name="form">
 <input type="hidden" name="sid" value="${sid}">
@@ -152,20 +219,20 @@ ${LANG_H20} ${info.currentjob}
 
 <table border="0" width="100%">
 
-<tr><td>${info.state[0]}</td><td>${info.name[0]}</td><td>${info.file[0]}</td><td>${info.size[0]}/${info.sizetot[0]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[0]}'; form.submit()" onMouseOver="info('${html:LANG_H6}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[1]}</td><td>${info.name[1]}</td><td>${info.file[1]}</td><td>${info.size[1]}/${info.sizetot[1]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[1]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[2]}</td><td>${info.name[2]}</td><td>${info.file[2]}</td><td>${info.size[2]}/${info.sizetot[2]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[2]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[3]}</td><td>${info.name[3]}</td><td>${info.file[3]}</td><td>${info.size[3]}/${info.sizetot[3]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[3]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[4]}</td><td>${info.name[4]}</td><td>${info.file[4]}</td><td>${info.size[4]}/${info.sizetot[4]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[4]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[5]}</td><td>${info.name[5]}</td><td>${info.file[5]}</td><td>${info.size[5]}/${info.sizetot[5]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[5]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[6]}</td><td>${info.name[6]}</td><td>${info.file[6]}</td><td>${info.size[6]}/${info.sizetot[6]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[6]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[7]}</td><td>${info.name[7]}</td><td>${info.file[7]}</td><td>${info.size[7]}/${info.sizetot[7]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[7]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[8]}</td><td>${info.name[8]}</td><td>${info.file[8]}</td><td>${info.size[8]}/${info.sizetot[8]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[8]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[9]}</td><td>${info.name[9]}</td><td>${info.file[9]}</td><td>${info.size[9]}/${info.sizetot[9]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[9]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[10]}</td><td>${info.name[10]}</td><td>${info.file[10]}</td><td>${info.size[10]}/${info.sizetot[10]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[10]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[11]}</td><td>${info.name[11]}</td><td>${info.file[11]}</td><td>${info.size[11]}/${info.sizetot[11]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[11]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[12]}</td><td>${info.name[12]}</td><td>${info.file[12]}</td><td>${info.size[12]}/${info.sizetot[12]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[12]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
-<tr><td>${info.state[13]}</td><td>${info.name[13]}</td><td>${info.file[13]}</td><td>${info.size[13]}/${info.sizetot[13]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[13]}'; form.submit()" onMouseOver="info('${html:LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[0]}</td><td>${info.name[0]}</td><td>${info.file[0]}</td><td>${info.size[0]}/${info.sizetot[0]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[0]}'; form.submit()" onMouseOver="info('${LANG_H6}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[1]}</td><td>${info.name[1]}</td><td>${info.file[1]}</td><td>${info.size[1]}/${info.sizetot[1]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[1]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[2]}</td><td>${info.name[2]}</td><td>${info.file[2]}</td><td>${info.size[2]}/${info.sizetot[2]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[2]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[3]}</td><td>${info.name[3]}</td><td>${info.file[3]}</td><td>${info.size[3]}/${info.sizetot[3]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[3]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[4]}</td><td>${info.name[4]}</td><td>${info.file[4]}</td><td>${info.size[4]}/${info.sizetot[4]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[4]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[5]}</td><td>${info.name[5]}</td><td>${info.file[5]}</td><td>${info.size[5]}/${info.sizetot[5]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[5]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[6]}</td><td>${info.name[6]}</td><td>${info.file[6]}</td><td>${info.size[6]}/${info.sizetot[6]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[6]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[7]}</td><td>${info.name[7]}</td><td>${info.file[7]}</td><td>${info.size[7]}/${info.sizetot[7]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[7]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[8]}</td><td>${info.name[8]}</td><td>${info.file[8]}</td><td>${info.size[8]}/${info.sizetot[8]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[8]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[9]}</td><td>${info.name[9]}</td><td>${info.file[9]}</td><td>${info.size[9]}/${info.sizetot[9]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[9]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[10]}</td><td>${info.name[10]}</td><td>${info.file[10]}</td><td>${info.size[10]}/${info.sizetot[10]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[10]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[11]}</td><td>${info.name[11]}</td><td>${info.file[11]}</td><td>${info.size[11]}/${info.sizetot[11]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[11]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[12]}</td><td>${info.name[12]}</td><td>${info.file[12]}</td><td>${info.size[12]}/${info.sizetot[12]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[12]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
+<tr><td>${info.state[13]}</td><td>${info.name[13]}</td><td>${info.file[13]}</td><td>${info.size[13]}/${info.sizetot[13]}</td><td><input type="submit" value="${LANG_H15}" onClick="form.command.value='cancel-file=${info.url_sav[13]}'; form.submit()" onMouseOver="info('${LANG_H7}'); return true" onMouseOut="info('&nbsp;'); return true"></td></tr>
 
 </table>
 
@@ -179,10 +246,10 @@ ${LANG_H20} ${info.currentjob}
 		<table width="100%" border="0"><tr><td align="left">
 		&nbsp;
 		</td><td align="right">
-			<input type="submit" value=" ${LANG_V4} " 
-				onMouseOver="disable_timer(); info('${LANG_D3}'); return true" 
-				onMouseOut="info('&nbsp;'); enable_timer(); return true"
-				onClick="if (do_confirm('${LANG_G1}')) { form.command.value='cancel'; form.submit(); } return false"
+			<input type="submit" value=" ${LANG_V4} " 
+				onMouseOver="disable_timer(); info('${LANG_D3}'); return true" 
+				onMouseOut="info('&nbsp;'); enable_timer(); return true"
+				onClick="if (do_confirm('${LANG_G1}')) { form.command.value='cancel'; form.submit(); } return false"
 			>
 		</td></tr></table>
 

html/server/step2.html

@@ -6,8 +6,75 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
@@ -52,7 +119,7 @@ function info(str) {
 	<td id="subTitle" align="right">
 		<a href="/server/file.html" target="_blank"
 			onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -64,7 +131,7 @@ ${do:if-file-exists:html/index.html}
 	<td id="subTitle" align="right">
 		<a href="/index.html" target="_blank"
 			onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -93,18 +160,18 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step1.html" target="_blank"
 		onClick="window.open('/step1.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
 </tr></table>
-
+
 ${/* Default values for empty settings */}
-${do:set:cache:1}
+${do:set:cache:1}
 
 ${/* Convert winprofile.ini into internal variables */}
-${do:copy:CurrentUrl:urls}
-${do:copy:Category:projcateg}
+${do:copy:CurrentUrl:urls}
+${do:copy:Category:projcateg}
 ${do:copy:CurrentAction:todo}
 ${do:copy:CurrentURLList:filelist}
 ${do:copy:Proxy:proxy}
@@ -200,7 +267,7 @@ ${do:end-if}
 
 
 ${do:loadhash}
-
+
 		${LANG_S11b}
 		<select name="loadprojname" onChange="form.redirect.value='step2.html'; form.submit()">
 		<option value="">&nbsp;</option>
@@ -211,30 +278,30 @@ ${do:loadhash}
 
 		${LANG_S11}
 		<input name="projname" value="${projname}"
-			onMouseOver="info('${html:html:LANG_S1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_S1}'); return true" onMouseOut="info('&nbsp;'); return true"
 		>
 
-<br>
-
-<table border="0">
-<tr><td>
-
-		${LANG_S13}
-		<select name="loadprojcateg" onChange="form.redirect.value='step2.html'; form.submit()">
-		<option value="">&nbsp;</option>
-		${liststr:wincateg}
-		</select>
-</td><td>
-		<input name="projcateg" value="${projcateg}"
-			onMouseOver="info('${html:html:LANG_S5}'); return true" onMouseOut="info('&nbsp;'); return true"
-		>
-
-</td></tr></table>
-
+<br>
+
+<table border="0">
+<tr><td>
+
+		${LANG_S13}
+		<select name="loadprojcateg" onChange="form.redirect.value='step2.html'; form.submit()">
+		<option value="">&nbsp;</option>
+		${liststr:wincateg}
+		</select>
+</td><td>
+		<input name="projcateg" value="${projcateg}"
+			onMouseOver="info('${LANG_S5}'); return true" onMouseOut="info('&nbsp;'); return true"
+		>
+
+</td></tr></table>
+
 <br>
 		${LANG_S12}
 		<input name="path" value="${path}"
-			onMouseOver="info('${html:html:LANG_S2}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_S2}'); return true" onMouseOut="info('&nbsp;'); return true"
 		>
 		<input type="button" value="refresh" onClick="form.redirect.value='step2.html'; form.submit()">
 
@@ -243,11 +310,11 @@ ${do:loadhash}
 	<tr><td>
 		<table width="100%" border="0"><tr><td align="left">
 			<input type="submit" value=" << ${LANG_PREVIOUS} " onClick="form.redirect.value='index.html'; form.submit()"
-			onMouseOver="info('${html:html:LANG_TIPPREV}'); return true" onMouseOut="info('&nbsp;'); return true"			
+			onMouseOver="info('${LANG_TIPPREV}'); return true" onMouseOut="info('&nbsp;'); return true"			
 			>
 		</td><td align="right">
 			<input name="nextBtn" type="submit" value=" ${LANG_NEXT} >> " onClick="return checkname();" default
-			onMouseOver="info('${html:html:LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
 			>
 		</td></tr></table>
 

html/server/step3.html

@@ -6,8 +6,75 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
@@ -61,7 +128,7 @@ function do_check_child() {
 	<td id="subTitle" align="right">
 		<a href="/server/file.html" target="_blank"
 			onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -73,7 +140,7 @@ ${do:if-file-exists:html/index.html}
 	<td id="subTitle" align="right">
 		<a href="/index.html" target="_blank"
 			onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -102,7 +169,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step2.html" target="_blank"
 		onClick="window.open('/step2.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -118,7 +185,7 @@ ${do:end-if}
 <tr><td>
 		${LANG_G31}
 		<select name="todo"
-			onMouseOver="info('${html:LANG_G9}'); return true" onMouseOut="info('&nbsp;'); return true"		
+			onMouseOver="info('${LANG_G9}'); return true" onMouseOut="info('&nbsp;'); return true"		
 		>
 		${listid:todo:LISTDEF_10}
 		</select>
@@ -131,12 +198,12 @@ ${do:end-if}
 		</td><td>
 		<input type="button" value="${LANG_G43}" 
 		       onClick="doOpenWindow()"
-			onMouseOver="info('${html:LANG_G24b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_G24b}'); return true" onMouseOut="info('&nbsp;'); return true"
 			   >
 		</td></tr></table>
 		<br>
 		<textarea name="urls" cols="50" rows="8"
-			onMouseOver="info('${html:LANG_G11}'); return true" onMouseOut="info('&nbsp;'); return true"		
+			onMouseOver="info('${LANG_G11}'); return true" onMouseOut="info('&nbsp;'); return true"		
 		>
 ${do:output-mode:html}
 		${urls}
@@ -150,7 +217,7 @@ ${do:output-mode:}
 		${LANG_URLLIST}:
 		</td><td>
 		<input name="filelist" value="${filelist}" size="40"
-			onMouseOver="info('${html:LANG_G24c}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_G24c}'); return true" onMouseOut="info('&nbsp;'); return true"
 		>
 		</td></tr></table>
 
@@ -161,7 +228,7 @@ ${do:output-mode:}
 		${LANG_G41}
 		</td><td>
 		<input type="button" value="${LANG_G40}" onClick="window.open('option1.html', 'option1', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_G24}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_G24}'); return true" onMouseOut="info('&nbsp;'); return true"
 		>
 		</td></tr></table>
 
@@ -170,11 +237,11 @@ ${do:output-mode:}
 	<tr><td align="right">
 		<table width="100%" border="0"><tr><td align="left">
 			<input type="submit" value=" << ${LANG_PREVIOUS} " onClick="form.redirect.value='step2.html'; form.submit()"
-			onMouseOver="info('${html:LANG_TIPPREV}'); return true" onMouseOut="info('&nbsp;'); return true"			
+			onMouseOver="info('${LANG_TIPPREV}'); return true" onMouseOut="info('&nbsp;'); return true"			
 			>
 		</td><td align="right">
 			<input name="nextBtn" type="submit" value=" ${LANG_NEXT} >> "
-			onMouseOver="info('${html:LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
 			>
 		</td></tr></table>
 

html/server/step4.html

@@ -6,8 +6,75 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>'${projname}' - HTTrack Website Copier</title>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
-	<script type="text/javascript" src="ping.js" defer></script>
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
 
 <script language="javascript">
 <!--
@@ -43,7 +110,7 @@ function info(str) {
 	<td id="subTitle" align="right">
 		<a href="/server/file.html" target="_blank"
 			onClick="window.open('/server/file.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -55,7 +122,7 @@ ${do:if-file-exists:html/index.html}
 	<td id="subTitle" align="right">
 		<a href="/index.html" target="_blank"
 			onClick="window.open('/server/help.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -84,7 +151,7 @@ ${do:if-file-exists:html/index.html}
 <td>
 	<a href="/step3.html" target="_blank"
 		onClick="window.open('/step3.html', 'help', 'toolbar=no, location=no, directories=no, status=yes, menubar=no, scrollbars=yes, resizable=yes, width=640, height=480'); return false"
-			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -96,34 +163,34 @@ ${do:end-if}
 <input type="hidden" name="sid" value="${sid}">
 <input type="hidden" name="redirect" value="">
 <input type="hidden" name="projpath" value="${path}/${projname}/">
-
-<input type="hidden" name="command_arg_profile" value="path,lang">
+
+<input type="hidden" name="command_arg_profile" value="path,lang">
 
 <table border="0" width="100%">
 <tr><td>
 
-</td></tr>
-
+</td></tr>
+
 <tr><td>
-<input type="radio" name="command_do" value="start" checked><b>${LANG_J10}</b>
-</td></tr>
-<tr><td>
-<input type="radio" name="command_do" value="save">${LANG_J10b}
-</td></tr>
-<tr><td>
-
-${/* Real commands and ini file generated below */}
+<input type="radio" name="command_do" value="start" checked><b>${LANG_J10}</b>
+</td></tr>
+<tr><td>
+<input type="radio" name="command_do" value="save">${LANG_J10b}
+</td></tr>
+<tr><td>
+
+${/* Real commands and ini file generated below */}
 
 <!-- engine commandline -->
 ${do:output-mode:html}
 <textarea name="command" cols="50" rows="4" style="visibility:hidden">
 httrack \
-	--quiet \
+	--quiet \
 	--build-top-index \
 	${test:todo:--mirror:--mirror:--mirror-wizard:--get:--mirrorlinks:--testlinks:--continue:--update}
 	${urls}
 	${test:filelist:-%L "}${filelist}${test:filelist:"}
-	--path "${html:path}/${html:projname}" 
+	--path "${path}/${projname}" 
 \
 	${test:parseall:--near}
 	${test:link:--test}
@@ -136,8 +203,8 @@ ${do:end-if}
 	${test:build:-N0:-N0:-N1:-N2:-N3:-N4:-N5:-N100:-N101:-N102:-N103:-N104:-N105:-N99:-N199:}
 \
 	${ztest:dos::--long-names=0:--long-names=2}
-	${test:robots:--robots=0:--robots=0:--robots=1:--robots=2}
-	${test:errpage:--generate-errors:--generate-errors=0}
+	${test:robots:--robots=0:--robots=0:--robots=1:--robots=2}
+	${test:errpage:--generate-errors:--generate-errors=0}
 	${test:external:--replace-external}
 	${test:hidepwd:--disable-passwords}
 	${test:hidequery:--include-query-string=1:--include-query-string=0}
@@ -169,8 +236,8 @@ ${do:end-if}
 	${test:maxconn:--connection-per-second=}${maxconn}
 	${test:maxlinks:--advanced-maxlinks=}${maxlinks}
 \
-	--user-agent "${html:user}"
-	--footer "${html:footer}"
+	--user-agent "${user}"
+	--footer "${footer}"
 \
 	${url2}
 \
@@ -194,7 +261,7 @@ ${do:end-if}
 ${do:output-mode:inifile}
 <textarea name="winprofile" cols="50" rows="4" style="visibility:hidden">
 CurrentUrl=${urls}
-Category=${projcateg}
+Category=${projcateg}
 CurrentAction=${todo}
 CurrentURLList=${filelist}
 Proxy=${proxy}
@@ -271,25 +338,25 @@ MIMEDefsMime7=${mime7}
 MIMEDefsMime8=${mime8}
 </textarea>
 ${do:output-mode:}
-<!-- winprofile.ini -->
-
-<!-- httrack.ini -->
-${do:output-mode:inifile}
-<textarea name="userprofile" cols="50" rows="4" style="visibility:hidden">
-path=${path}
-lang=${lang_}
-</textarea>
-${do:output-mode:}
-<!-- httrack.ini -->
+<!-- winprofile.ini -->
+
+<!-- httrack.ini -->
+${do:output-mode:inifile}
+<textarea name="userprofile" cols="50" rows="4" style="visibility:hidden">
+path=${path}
+lang=${lang_}
+</textarea>
+${do:output-mode:}
+<!-- httrack.ini -->
 
 </td></tr><tr><td>
 		<table width="100%" border="0"><tr><td align="left">
 			<input type="submit" value=" << ${LANG_PREVIOUS} " onClick="form.command.value=''; form.redirect.value='step3.html'; form.submit()"
-			onMouseOver="info('${html:LANG_TIPPREV}'); return true" onMouseOut="info('&nbsp;'); return true"			
+			onMouseOver="info('${LANG_TIPPREV}'); return true" onMouseOut="info('&nbsp;'); return true"			
 			>
 		</td><td align="right">
 			<input name="nextBtn" type="submit" value=" ${LANG_J9} >> "
-			onMouseOver="info('${html:LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
 			>
 		</td></tr></table>
 

html/server/style.css

@@ -1,66 +0,0 @@
-body {
-	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
-	background: #77b;
-}
-body, td {
-	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
-	}
-
-#subTitle {
-	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
-	}
-
-.tabCtrl {
-	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
-	}
-
-#siteNavigation a, #siteNavigation .current {
-	font-weight: bold;  color: #448;
-	}
-#siteNavigation a:link    { text-decoration: none; }
-#siteNavigation a:visited { text-decoration: none; }
-
-#siteNavigation .current { background-color: #ccd; }
-
-#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
-#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
-
-
-a:link    { text-decoration: underline;  color: #00f; }
-a:visited { text-decoration: underline;  color: #000; }
-a:hover   { text-decoration: underline;  color: #c00; }
-a:active  { text-decoration: underline; }
-
-#pageContent {
-	clear: both;
-	border-bottom: 6px solid #000;
-	padding: 10px;  padding-top: 20px;
-	line-height: 1.65em;
-	background-image: url(images/bg_rings.gif);
-	background-repeat: no-repeat;
-	background-position: top right;
-	}
-
-#pageContent, #siteNavigation {
-	background-color: #ccd;
-	}
-
-
-.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
-.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
-
-hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
-
-h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
-h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
-h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
-h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
-
-.blak { background-color: #000; }
-.hide { display: none; }
-.tableWidth { min-width: 400px; }
-
-.tblRegular       { border-collapse: collapse; }
-.tblRegular td    { padding: 6px;  background-image: url(images/fade.gif);  border: 2px solid #99c; }
-.tblHeaderColor, .tblHeaderColor td { background: #99c; }
-.tblNoBorder td   { border: 0; }

html/step9_opt1.html

@@ -118,7 +118,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
   </small><br><br>
 <!-- -->
   <li>Test validity of all links</li>
-  <br><small>This option forces the engine to test all links in spidered pages, i.e. to check if every link is valid or not by performing a request to the server. If an error occurred, it is reported to the error log-file.
+  <br><small>This option forces the engine to test all links in spidered pages, i.e. to check if every link is valid or not by performing a request to the server. If an error occured, it is reported to the error log-file.
   <br>Useful to test all external links in a website
   </small><br><br>
 <!-- -->

html/step9_opt11.html

@@ -126,7 +126,7 @@ This is possible, using:
 File type: <tt>asp</tt> MIME identity: <tt>text/html</tt>
 <br>
 <br>
-You can declare multiple definitions, or declare multiple types separated by ",", like in:
+You can declare multiple definitions, or declare multiple types separed by ",", like in:
 <br>
 File type: <tt>asp,php,php3</tt> MIME identity: <tt>text/html</tt>
 <br>

html/step9_opt3.html

@@ -119,7 +119,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
   </small><br><br>
 <!-- -->
   <li>Retries</li>
-  <br><small>Number of retries if a non-fatal error occurred (timeout, for example)
+  <br><small>Number of retries if a non-fatal error occured (timeout, for example)
   <br>Note that this will not solve fatal errors such as "Not Found" pages and so on!
   </small><br><br>
 <!-- -->

html/step9_opt5.html

@@ -122,7 +122,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
   </small><br><br>
 <!-- -->
   <li>No error pages</li>
-  <br><small>Do not generate error pages (if a 404 error occurred, for example)
+  <br><small>Do not generate error pages (if a 404 error occured, for example)
   <br>If a page is missing on the remote site, there will not be any warning on the local site
   </small><br><br>
 <!-- -->

html/step9_opt9.html

@@ -122,7 +122,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 <!-- -->
   <li>Create Log files</li>
   <br><small>Create log file where informations, error and warnings about the current mirror will be saved
-  <br>If you <b>do not</b> generate log files, you will not be able to know what errors occurred!
+  <br>If you <b>do not</b> generate log files, you will not be able to know what errors occured!
   <br>It is strongly advised to leave this option checked
   <br>Note: You can define the debug-level of the log-files. Default is "normal"
   </small><br><br>

install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2020-11-14.01; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,21 +35,25 @@ scriptversion=2020-11-14.01; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
+# `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.
 
-tab='	'
 nl='
 '
-IFS=" $tab$nl"
+IFS=" ""	$nl"
 
-# Set DOITPROG to "echo" to test this script.
+# set DOITPROG to echo to test this script
 
+# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-doit_exec=${doit:-exec}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -64,16 +68,22 @@ mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
 posix_mkdir=
 
 # Desired mode of installed file.
 mode=0755
 
-# Create dirs (including intermediate dirs) using mode 755.
-# This is like GNU 'install' as of coreutils 8.32 (2020).
-mkdir_umask=22
-
-backupsuffix=
 chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
@@ -87,7 +97,7 @@ dir_arg=
 dst_arg=
 
 copy_on_change=false
-is_target_a_directory=possibly
+no_target_directory=
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -104,28 +114,18 @@ Options:
      --version  display version info and exit.
 
   -c            (ignored)
-  -C            install only if different (preserve data modification time)
+  -C            install only if different (preserve the last data modification time)
   -d            create directories instead of installing files.
   -g GROUP      $chgrpprog installed files to GROUP.
   -m MODE       $chmodprog installed files to MODE.
   -o USER       $chownprog installed files to USER.
-  -p            pass -p to $cpprog.
   -s            $stripprog installed files.
-  -S SUFFIX     attempt to back up existing files, with suffix SUFFIX.
   -t DIRECTORY  install into DIRECTORY.
   -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
   CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
   RMPROG STRIPPROG
-
-By default, rm is invoked with -f; when overridden with RMPROG,
-it's up to you to specify -f if you want it.
-
-If -S is not specified, no backups are attempted.
-
-Email bug reports to bug-automake@gnu.org.
-Automake home page: https://www.gnu.org/software/automake/
 "
 
 while test $# -ne 0; do
@@ -137,62 +137,46 @@ while test $# -ne 0; do
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift;;
+	shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-        case $mode in
-          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
-            echo "$0: invalid mode: $mode" >&2
-            exit 1;;
-        esac
-        shift;;
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift;;
-
-    -p) cpprog="$cpprog -p";;
+	shift;;
 
     -s) stripcmd=$stripprog;;
 
-    -S) backupsuffix="$2"
-        shift;;
+    -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
+	shift;;
 
-    -t)
-        is_target_a_directory=always
-        dst_arg=$2
-        # Protect names problematic for 'test' and other utilities.
-        case $dst_arg in
-          -* | [=\(\)!]) dst_arg=./$dst_arg;;
-        esac
-        shift;;
-
-    -T) is_target_a_directory=never;;
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --) shift
-        break;;
+    --)	shift
+	break;;
 
-    -*) echo "$0: invalid option: $1" >&2
-        exit 1;;
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
-# We allow the use of options -d and -T together, by making -d
-# take the precedence; this is for compatibility with GNU install.
-
-if test -n "$dir_arg"; then
-  if test -n "$dst_arg"; then
-    echo "$0: target directory not allowed when installing a directory." >&2
-    exit 1
-  fi
-fi
-
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -206,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for 'test' and other utilities.
+    # Protect names problematic for `test' and other utilities.
     case $dst_arg in
       -* | [=\(\)!]) dst_arg=./$dst_arg;;
     esac
@@ -218,20 +202,11 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call 'install-sh -d' without argument.
+  # It's OK to call `install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
-if test -z "$dir_arg"; then
-  if test $# -gt 1 || test "$is_target_a_directory" = always; then
-    if test ! -d "$dst_arg"; then
-      echo "$0: $dst_arg: Is not a directory." >&2
-      exit 1
-    fi
-  fi
-fi
-
 if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
@@ -248,16 +223,16 @@ if test -z "$dir_arg"; then
 
     *[0-7])
       if test -z "$stripcmd"; then
-        u_plus_rw=
+	u_plus_rw=
       else
-        u_plus_rw='% 200'
+	u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-        u_plus_rw=
+	u_plus_rw=
       else
-        u_plus_rw=,u+rw
+	u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -265,7 +240,7 @@ fi
 
 for src
 do
-  # Protect names problematic for 'test' and other utilities.
+  # Protect names problematic for `test' and other utilities.
   case $src in
     -* | [=\(\)!]) src=./$src;;
   esac
@@ -275,10 +250,6 @@ do
     dstdir=$dst
     test -d "$dstdir"
     dstdir_status=$?
-    # Don't chown directories that already exist.
-    if test $dstdir_status = 0; then
-      chowncmd=""
-    fi
   else
 
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -295,148 +266,178 @@ do
     fi
     dst=$dst_arg
 
-    # If destination is a directory, append the input filename.
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test "$is_target_a_directory" = never; then
-        echo "$0: $dst_arg: Is a directory" >&2
-        exit 1
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
       fi
       dstdir=$dst
-      dstbase=`basename "$src"`
-      case $dst in
-	*/) dst=$dst$dstbase;;
-	*)  dst=$dst/$dstbase;;
-      esac
+      dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
-      dstdir=`dirname "$dst"`
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
       test -d "$dstdir"
       dstdir_status=$?
     fi
   fi
 
-  case $dstdir in
-    */) dstdirslash=$dstdir;;
-    *)  dstdirslash=$dstdir/;;
-  esac
-
   obsolete_mkdir_used=false
 
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-        # With -d, create the new directory with the user-specified mode.
-        # Otherwise, rely on $mkdir_umask.
-        if test -n "$dir_arg"; then
-          mkdir_mode=-m$mode
-        else
-          mkdir_mode=
-        fi
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 
-        posix_mkdir=false
-	# The $RANDOM variable is not portable (e.g., dash).  Use it
-	# here however when possible just to lower collision chance.
-	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
 
-	trap '
-	  ret=$?
-	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
-	  exit $ret
-	' 0
-
-	# Because "mkdir -p" follows existing symlinks and we likely work
-	# directly in world-writeable /tmp, make sure that the '$tmpdir'
-	# directory is successfully created first before we actually test
-	# 'mkdir -p'.
-	if (umask $mkdir_umask &&
-	    $mkdirprog $mkdir_mode "$tmpdir" &&
-	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
-	then
-	  if test -z "$dir_arg" || {
-	       # Check for POSIX incompatibilities with -m.
-	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-	       # other-writable bit of parent directory when it shouldn't.
-	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-	       test_tmpdir="$tmpdir/a"
-	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
-	       case $ls_ld_tmpdir in
-		 d????-?r-*) different_mode=700;;
-		 d????-?--*) different_mode=755;;
-		 *) false;;
-	       esac &&
-	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
-		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
-		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-	       }
-	     }
-	  then posix_mkdir=:
-	  fi
-	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
 	else
-	  # Remove any dirs left behind by ancient mkdir implementations.
-	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+	  mkdir_mode=
 	fi
-	trap '' 0;;
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
     esac
 
     if
       $posix_mkdir && (
-        umask $mkdir_umask &&
-        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
 
-      # mkdir does not conform to POSIX,
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
       # or it failed possibly due to a race condition.  Create the
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-        /*) prefix='/';;
-        [-=\(\)!]*) prefix='./';;
-        *)  prefix='';;
+	/*) prefix='/';;
+	[-=\(\)!]*) prefix='./';;
+	*)  prefix='';;
       esac
 
+      eval "$initialize_posix_glob"
+
       oIFS=$IFS
       IFS=/
-      set -f
+      $posix_glob set -f
       set fnord $dstdir
       shift
-      set +f
+      $posix_glob set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-        test X"$d" = X && continue
+	test X"$d" = X && continue
 
-        prefix=$prefix$d
-        if test -d "$prefix"; then
-          prefixes=
-        else
-          if $posix_mkdir; then
-            (umask $mkdir_umask &&
-             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-            # Don't fail if two instances are running concurrently.
-            test -d "$prefix" || exit 1
-          else
-            case $prefix in
-              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-              *) qprefix=$prefix;;
-            esac
-            prefixes="$prefixes '$qprefix'"
-          fi
-        fi
-        prefix=$prefix/
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-        # Don't fail if two instances are running concurrently.
-        (umask $mkdir_umask &&
-         eval "\$doit_exec \$mkdirprog $prefixes") ||
-          test -d "$dstdir" || exit 1
-        obsolete_mkdir_used=true
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -449,25 +450,14 @@ do
   else
 
     # Make a couple of temp file names in the proper directory.
-    dsttmp=${dstdirslash}_inst.$$_
-    rmtmp=${dstdirslash}_rm.$$_
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
 
     # Copy the file name to the temp name.
-    (umask $cp_umask &&
-     { test -z "$stripcmd" || {
-	 # Create $dsttmp read-write so that cp doesn't create it read-only,
-	 # which would cause strip to fail.
-	 if test -z "$doit"; then
-	   : >"$dsttmp" # No need to fork-exec 'touch'.
-	 else
-	   $doit touch "$dsttmp"
-	 fi
-       }
-     } &&
-     $doit_exec $cpprog "$src" "$dsttmp") &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -482,24 +472,20 @@ do
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
-       set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       set +f &&
+       $posix_glob set +f &&
+
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
       rm -f "$dsttmp"
     else
-      # If $backupsuffix is set, and the file being installed
-      # already exists, attempt a backup.  Don't worry if it fails,
-      # e.g., if mv doesn't support -f.
-      if test -n "$backupsuffix" && test -f "$dst"; then
-        $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
-      fi
-
       # Rename the file to the real destination.
       $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
 
@@ -507,24 +493,24 @@ do
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-        # Now remove or move aside any old file at destination location.
-        # We try this two ways since rm can't unlink itself on some
-        # systems and the destination file might be busy for other
-        # reasons.  In this case, the final cleanup might fail but the new
-        # file should still install successfully.
-        {
-          test ! -f "$dst" ||
-          $doit $rmcmd "$dst" 2>/dev/null ||
-          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
-          } ||
-          { echo "$0: cannot unlink or rename $dst" >&2
-            (exit 1); exit 1
-          }
-        } &&
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
 
-        # Now rename the file to the real destination.
-        $doit $mvcmd "$dsttmp" "$dst"
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1
 
@@ -533,9 +519,9 @@ do
 done
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:

lang.def

@@ -56,8 +56,6 @@ Finnish
 LANGUAGE_28
 Croatian
 LANGUAGE_29
-Uzbek
-LANGUAGE_30
 LANGUAGE_NAME
 LANGUAGE_NAME
 LANGUAGE_FILE
@@ -257,7 +255,7 @@ Site mirroring in progress [%s, %s bytes]
 LANG_F18b
 Site mirroring finished!
 LANG_F19
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
 LANG_F20
 \nDuring:\n
 LANG_F21
@@ -267,7 +265,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 LANG_F22b
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 LANG_F22c
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 LANG_F23
 \n\nTip: Click [View log file] to see warning or error messages
 LANG_F24
@@ -432,8 +430,6 @@ LANG_I6
 Create a Start Page
 LANG_I6b
 Create a word database of all html pages
-LANG_I6c
-Build a complete RFC822 mail (MHT/EML) archive of the mirror
 LANG_I7
 Create error logging and report files
 LANG_I8
@@ -482,12 +478,6 @@ LANG_I23
 Browser identity
 LANG_I23b
 Comment to be placed in each HTML file
-LANG_I23c
-Languages accepted by the browser
-LANG_I23d
-Additional HTTP headers to be sent in each requests
-LANG_I23e
-HTTP referer to be sent for initial URLs
 LANG_I24
 Back to starting page
 LANG_I25
@@ -548,8 +538,6 @@ LANG_I35
 Make an index
 LANG_I35b
 Make a word database
-LANG_I35c
-Build a mail archive
 LANG_I36
 Log files
 LANG_I37
@@ -578,12 +566,6 @@ LANG_I43
 Identity
 LANG_I43b
 HTML footer
-LANG_I43c
-Languages
-LANG_I43d
-Additional HTTP Headers
-LANG_I43e
-Default referer URL
 LANG_I44
 N# connections
 LANG_I45
@@ -1005,4 +987,4 @@ You can now close this window
 LANG_SERVEND
 Server terminated
 LANG_FATALERR
-A fatal error has occurred during this mirror
+A fatal error has occured during this mirror

lang.indexes

@@ -1,9 +1,8 @@
 bg:27
 es:3
-cs:21
-zh_tw:14
-zh:13
-hr:29
+cz:21
+ct:14
+cs:13
 da:15
 de:4
 et:16
@@ -12,13 +11,13 @@ fi:28
 fr:2
 el:26
 it:9
-ja:19
+jp:19
 mk:18
 hu:11
 nl:5
 no:23
 pl:6
-pt_br:12
+pt:12
 pt:7
 ro:25
 ru:8
@@ -26,5 +25,4 @@ sk:20
 si:24
 sv:17
 tr:10
-uk:22
-uz:30
+ua:22

lang/Bulgarian.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Ïðîãðåñ íà ñúçäàâàíåòî íà îãëåäàëíèÿ ñàéò [%s, %s áàéòà]
 Site mirroring finished!
 Ñúäàâàíåòî íà îãëåäàëíèÿ ñàéò çàâúðøè!
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
 Âúçíèêíà ïðîáëåì ïî âðåìå íà ñúçäàâàíåòî íà îãëåäàëíèÿ ñàéò\n
 \nDuring:\n
 \nÏî âðåìå íà:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Ñúçäàâàíåòî íà îãëåäàëíèÿ ñàéò çàâúðøè!\nÊëèêíè Èçõîä çà çàòâàðÿíå íà WinHTTrack.\nÂèæòå log-ôàéëîâåòå äà ñà ñå óâåðèòå, ÷å âñè÷êî å íàðåä.\n\nÁëàãîäàðèì, Âè, ÷å èçïîëçâàòå WinHTTrack!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * ÊÎÏÈÐÀÍÅÒÎ ÏÐÅÊÚÑÍÀÒÎ! * *\r\nÒåêóùèÿò âðåìåíåí êåø å íåîáõîäèì çà âñÿêàêâè îáíîâëåíèÿ è ñúäúðæà ñàìî äàííè ñâàëåíè ïî âðåìå íà òàçè ïðåêúñíàòà ñåñèÿ.\r\nÂúçìîæíî å ïðåäøåñòâàùèÿò êåø äà ñúäúðæà ïî-ïúëíà èíôîðìàöèÿ; àêî íå æåëàåòå çà çàãóáèòå òàçè èíôîðìàöèÿ, òðÿáâà äà ÿ âúçñòàíîâèòå è èçòðèåòå òåêóùèÿ êåø.\r\n[Çàáåëåæêà: Òîâà ìîæå äà áúäå ïîñòèãíàòî ëåñíî ÷ðåç èçòðèâàíå íà hts-cache/new.* ôàéëîâåòå]\r\n\r\nÏðåäïîëàãàòå ëè, ÷å ïðåäøåñòâàùèÿ êåø ñúäúðæà ïî ïúëíà èíôîðìàöèÿ è æåëàåòå ëè äà ÿ âúçñòàíîâèòå?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * ÃÐÅØÊÀ ÏÐÈ ÊÎÏÈÐÀÍÅÒÎ! * *\r\nÒåêóùèÿò ñàéò å ïðàçåí.Àêî äåéñòâèåòî å áèëî îáíîâëåíèå, òî ïðåäõîäíîòî îãëåäàëíî êîïèå å âúçñòàíîâåíî.\r\nÏðè÷èíà: ïúðâàòà ñòðàíèöà(è) èëè íå áå îòêðèòà, èëè å âúçíèêíàë ïðîáëåì ñ âðúçêàòà.\r\n=>Óâåðåòå ñå, ÷å òîçè ñàéò âñå îùå ñúùåñòâóâà è/èëè ïðîâåðåòå Âàøèòå proxy íàñòðîéêè! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nÑúâåò: Êëèêíè [Âèæ log-ôàéë] çà ïðåäóïðåäèòåëíèòå ñúîáùåíèÿ èëè ñúîáùåíèÿòà çà ãðåøêè
@@ -926,5 +926,5 @@ You can now close this window
 Ñåãà ìîæåòå äà çàòâîðèòå òîçè ïðîçîðåö
 Server terminated
 Ñúðâúðúò íå îòãîâàðÿ
-A fatal error has occurred during this mirror
+A fatal error has occured during this mirror
 Ôàòàëíà ãðåøêà ïðè ñúçäàâàíåòî íà òîçè îãëåäàëåí ñàéò

lang/Castellano.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Volcado en ejecución [%s, %s bytes]
 Site mirroring finished!
 ¡Copia del sitio finalizada!
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
 Ha ocurrido un problema durante el volcado\n
 \nDuring:\n
 \nDurante:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 El volcado ha finalizado.\nPulse OK para salir de WinHTTrack\n\nConsulte los ficheros de auditoría para verificar que todo ha salido bien\n\n¡Gracias por utilizar WinHTTrack!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * ¡COPIA INTERRUMPIDA! * *\r\nEs necesario el cache temporal actual para cualquier operación de actualización y solamente contiene datos bajados durante la presente sesión abortada.\r\nEl antiguo cache puede contener datos más completos; si vd. no desea perder dichos datos, deberá que restaurarlo y excluir el cache actual.\r\n[Nota: Esto puede hacerse fácilmente aquí excluyendo el hts-cache/nuevo.* ficheros]\r\n\r\n¿Cree que el antiguo cache puede contener datos más completos, y desea restaurarlo?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * ¡ERROR DE VOLCADO! * *\r\nHTTrack ha detectado que el volcado actual está vacío. Si se trataba de una actualización, el volcado anterior ha sido recuperado.\r\nRazón: no se ha(n) encontrado la(s) primera(s) página(s), o ha habido un problema de conexión.\r\n=> Asegúrese de que el sitio web existe aún, y/o compruebe los ajustes de su proxy! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nConsejo: Pulse [Ver ficheros auditoría] para ver los errores y mensajes
@@ -926,5 +926,5 @@ You can now close this window
 Ya puede cerrar esta ventana
 Server terminated
 Servidor desconectado
-A fatal error has occurred during this mirror
+A fatal error has occured during this mirror
 Ha ocurrido un error fatal durante esta copia

lang/Cesky.txt

@@ -3,7 +3,7 @@ LANGUAGE_NAME
 LANGUAGE_FILE
 Cesky
 LANGUAGE_ISO
-cs
+cz
 LANGUAGE_AUTHOR
 Antonín Matìjèík (matejcik@volny.cz) \r \n
 LANGUAGE_CHARSET
@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Probíhá stahování stránek [%s, %s bajtù]
 Site mirroring finished!
 Stahování stránek skonèeno!
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
 Pøi stahování se vyskytl problém\n
 \nDuring:\n
 \nBìhem:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Stahování skonèeno.\nKlikni na Konec pro ukonèení programu WinHTTrack.\nZobraz si protokoly pro kontrolu chyb pøi stahování.\n\nDíky za použití programu WinHTTrack!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * STAHOVÁNÍ ZRUŠENO! * *\r\nPro pokraèování stahování je zapotøebí lokální cache, obsahující stažená data.\r\nPøedchozí cache mùže obsahovat více informací. Pokud je nechceš ztratit, musíš ji obnovit a smazat aktuální cache.\r\n[Poznámka: To mùže být provedeno teï smazáním hts-cache/new.* souborù]\r\n\r\nMyslíš, že cache obsahuje více informací a pøeješ si ji obnovit?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * CHYBA PØI STAHOVÁNÍ! * *\r\nHTTrack zjistil, že se nestáhla žádná data. Pokud se jednalo o aktualizaci, pak pøedešlá data byla obnovena.\r\nDùvod: Nemohla být nalezena první stránka nebo se vyskytl problém se spojením.\r\n=>Provìø zda zadaná adresa existuje anebo zkontroluj nastavení proxy! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nTip: Klikni [Zobraz protokoly] pro zobrazení upozornìní a chyb
@@ -926,5 +926,5 @@ You can now close this window
 
 Server terminated
 
-A fatal error has occurred during this mirror
+A fatal error has occured during this mirror
 

lang/Chinese-BIG5.txt

@@ -3,7 +3,7 @@ Chinese-BIG5
 LANGUAGE_FILE
 Chinese-BIG5
 LANGUAGE_ISO
-zh_TW
+ct
 LANGUAGE_AUTHOR
 David Hing Cheong Hung (DAVEHUNG@mtr.com.hk)\r\n
 LANGUAGE_CHARSET
@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 站點鏡像進行中 [%s, %s byts]
 Site mirroring finished!
 站點鏡像完畢!
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
 鏡像時發生錯誤\n
 \nDuring:\n
 \n發生在以下期間:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 鏡像完成.\n點擊'確定'以離開WinHTTrack.\n如有需要請看日誌檔案, 以確保萬無一失.\n\n謝謝使用WinHTTrack!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * 鏡像被取消! * *\r\n當前臨時的預存區為日後更新所需, 僅存有此次被中斷的鏡像期間內下載的數據.\r\n而原有預存區可能會存有更完整的內容; 如果你不想失去原有的數據, 請恢復之, 并刪除當前預存區.\r\n[注: 欲刪除當前預存區, 僅需刪除以下檔案: hts-cache/new.*]\r\n\r\n你是否肯定原有預存區存有更完整的內容, 并希望恢復之?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * 鏡像出錯!* *\r\nHTTrack檢測到當前鏡像未儲存任何數據. 若使用的更新模式, 則前一次鏡像已被恢復.\r\n原因: 首頁未能找到, 或發生連線錯誤.\r\n=> 請確定欲鏡像的網站存在, 并/或檢查proxy設定! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\n提示: 點擊 [查看日誌檔案] 以查看警告或錯誤消息
@@ -926,5 +926,5 @@ You can now close this window
 你現在可以關閉這視窗
 Server terminated
 伺服器已終止
-A fatal error has occurred during this mirror
+A fatal error has occured during this mirror
 這鏡像發生了不可回復的錯誤

lang/Chinese-Simplified.txt

@@ -3,7 +3,7 @@ Chinese-Simplified
 LANGUAGE_FILE
 Chinese-Simplified
 LANGUAGE_ISO
-zh
+cs
 LANGUAGE_AUTHOR
 Brook Qin (brookqwr at sina.com) \r\n
 LANGUAGE_CHARSET
@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 站点镜像进行中 [%s, %s 字节]
 Site mirroring finished!
 站点镜像完毕!
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
 镜像时发生错误\n
 \nDuring:\n
 \n发生在以下期间:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 镜像完成.\n点击'确定'以退出WinHTTrack.\n如有需要请看日志文件, 以确保万无一失.\n\n谢谢使用WinHTTrack!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * 镜像被取消! * *\r\n当前临时的预存区为日后更新所需, 仅存有此次被中断的镜像期间内下载的数据.\r\n而原有预存区可能会存有更完整的内容; 如果你不想失去原有的数据, 请恢复之, 并删除当前预存区.\r\n[注: 欲删除当前预存区, 仅需删除以下文件: hts-cache/new.*]\r\n\r\n你是否肯定原有预存区存有更完整的内容, 并希望恢复之?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * 镜像出错!* *\r\nHTTrack检测到当前镜像未储存任何数据. 若使用的更新模式, 则前一次镜像已被恢复.\r\n=> 原因: 首页未能找到, 或发生连接错误.\r\n请确定欲镜像的网站存在, 并/或检查代理设置! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\n提示: 点击 [察看日志文件] 以察看警告或错误消息
@@ -926,5 +926,5 @@ You can now close this window
 
 Server terminated
 
-A fatal error has occurred during this mirror
+A fatal error has occured during this mirror
 

lang/Croatian.txt

@@ -1,932 +0,0 @@
-LANGUAGE_NAME
-Hrvatski
-LANGUAGE_FILE
-Croatian
-LANGUAGE_ISO
-hr
-LANGUAGE_AUTHOR
-Dominko Aždajiæ (domazd@mail.ru) \r\n
-LANGUAGE_CHARSET
-ISO-8859-2
-LANGUAGE_WINDOWSID
-Croatian
-OK
-U redu
-Cancel
-Odustati
-Exit
-Svršetak
-Close
-Zatvoriti
-Cancel changes
-Opozvati izmjene
-Click to confirm
-Preuzeti izmjene
-Click to get help!
-Kliknuti za pomoæ!
-Click to return to previous screen
-Kliknuti za povratak na prethodni prikaz
-Click to go to next screen
-Kliknuti za povratak na slijedeæi prikaz
-Hide password
-Sakriti lozinku
-Save project
-Pohraniti projekt
-Close current project?
-Zatvoriti tekuæi projekt?
-Delete this project?
-Izbrisati taj projekt?
-Delete empty project %s?
-Izbrisati prazni projekt %s?
-Action not yet implemented
-Funkcija još nije raspoloživa
-Error deleting this project
-Pogreška tijekom brisanja tog projekta
-Select a rule for the filter
-Izaberite neko pravilo za taj filtar
-Enter keywords for the filter
-Unesite kljuène rijeèi za taj filtar
-Cancel
-Odustati
-Add this rule
-Dodati to pravilo
-Please enter one or several keyword(s) for the rule
-Unesite molim jednu ili više kljuènih rijeèi za to pravilo
-Add Scan Rule
-Dodati pravilo filtriranja
-Criterion
-Pravilo filtra:
-String
-Unesite rijeè:
-Add
-Dodati
-Scan Rules
-Pravila filtriranja
-Use wildcards to exclude or include URLs or links.\nYou can put several scan strings on the same line.\nUse spaces as separators.\n\nExample: +*.zip -www.*.com -www.*.edu/cgi-bin/*.cgi
-Koristite višeznaènik za ukljuèivanje ili iskljuèivanje mrežnih adresa ili poveznica.\nU isti redak možete staviti i nekoliko filtarskih pravila uzastopno.\nUpotrijebite praznine kao razdjelnike.\n\nPrimjerice: +*.zip -www.*.com -www.*.edu/cgi-bin/*.cgi
-Exclude links
-Izuzete poveznice
-Include link(s)
-Obuhvaæene poveznice
-Tip: To have ALL GIF files included, use something like +www.someweb.com/*.gif. \n(+*.gif / -*.gif will include/exclude ALL GIFs from ALL sites)
-Preporuka: Za obuhvaæanje SVIH datoteka GIF, upotrijebite nešto poput +www.neka-mreža.com/*.gif. \n(+*.gif / -*.gif æe ukljuèivat/iskljuèivati SVE GIF-ove sa SVIH stranica)
-Save prefs
-Pohraniti postavke
-Matching links will be excluded:
-Shodne poveznice æe biti izuzete:
-Matching links will be included:
-Shodne poveznice æe biti obuhvaæene:
-Example:
-Primjer:
-gif\r\nWill match all GIF files
-gif\r\nPronalazi sve datoteke GIF
-blue\r\nWill find all files with a matching 'blue' sub-string such as 'bluesky-small.jpeg'
-blue\r\nPronalazi sve datoteke koje sadržavaju 'blue' kao primjerice 'bluesky-small.jpeg'
-bigfile.mov\r\nWill match the file 'bigfile.mov', but not 'bigfile2.mov'
-bigfile.mov\r\Pronalazi sve datoteke 'bigfile.mov', ali ne i 'bigfile2.mov'
-cgi\r\nWill find links with folder name matching sub-string 'cgi' such as /cgi-bin/somecgi.cgi
-cgi\r\nPronalazi sve poveznice s mapama koje u nazivu sadrže 'cgi' kao primjerice /cgi-bin/somecgi.cgi
-cgi-bin\r\nWill find links with folder name matching whole 'cgi-bin' string (but not cgi-bin-2, for example)
-cgi-bin\r\nPronalazi poveznice prema mapama koje u nazivu sadrže cijeli niz 'cgi-bin' (ali ne i primjerice cgi-bin-2)
-someweb.com\r\nWill find links with matching sub-string such as www.someweb.com, private.someweb.com etc.
-someweb.com\r\nPronalazi poveznice s pod-nizovima poput www.neka-mreža.com, privatno.neka-mreža.com itd.
-someweb\r\nWill find links with matching folder sub-string such as www.someweb.com, www.someweb.edu, private.someweb.otherweb.com etc.
-someweb\r\nPronalazi poveznice sa shodnim pod-nizom poput www.neka-mreža.com, www.neka-mreža.edu, private.neka-mreža.druga-mreža.com itd.
-www.someweb.com\r\nWill find links matching whole 'www.someweb.com' sub-string (but not links such as private.someweb.com/..)
-www.someweb.com\r\nPronalazi poveznice koje u nazivu sadrže cijeli pod-niz 'www.neka-mreža.com' (ali ne i poveznice poput privatno.neka-mreža.com/..)
-someweb\r\nWill find any links with matching sub-string such as www.someweb.com/.., www.test.abc/fromsomeweb/index.html, www.test.abc/test/someweb.html etc.
-someweb\r\nPronalazi bilo koju poveznicu sa shodnim pod-nizom poput www.neka-mreža.com/.., www.primjer.abc/s-neke-mreže/kazalo.html, www.primjer.abc/primjer/neka-mreža.html itd.
-www.test.com/test/someweb.html\r\nWill only find the 'www.test.com/test/someweb.html' file. Note that you have to type the complete path (URL + site path)
-www.test.com/test/someweb.html\r\nPronalazi samo datoteku 'www.primjer.com/primjer/neka-mreža.html'. Imajte na umu da morate unijeti potpunu putanju (URL + putanja do mrežnog mjesta)
-All links will match
-Obuhvaæene su sve poveznice
-Add exclusion filter
-Pridodati filtar izuzimanja
-Add inclusion filter
-Pridodati filtar obuhvaæanja
-Existing filters
-Postojeæi filtri
-Cancel changes
-Opozvati izmjene
-Save current preferences as default values
-Tekuæe postavke pohraniti kao polazne vrijednosti
-Click to confirm
-Kliknite za potvrðivanje
-No log files in %s!
-U %s nema datoteka zapisnika!
-No 'index.html' file in %s!
-U %s nema datoteke 'index.html'!
-Click to quit WinHTTrack Website Copier
-Kliknite za okonèavanje rada s WinHTTrack Website Copierom
-View log files
-Prikazati zapisnièke datoteke
-Browse HTML start page
-Prikazati poèetnu stranicu HTML-a
-End of mirror
-Zrcaljenje sadržaja je završeno
-View log files
-Prikazati zapisnièke datoteke
-Browse Mirrored Website
-Prikazati zrcaljene sadržaje
-New project...
-Novi projekt...
-View error and warning reports
-Prikazati izvješæa o pogreškama i upozorenjima
-View report
-Prikaz izvješæa
-Close the log file window
-Zatvoriti okno zapisnièke datoteke
-Info type:
-Vrsta informacija:
-Errors
-Pogreške
-Infos
-Informacije
-Find
-Pronaæi
-Find a word
-Pronaæi rijeè
-Info log file
-Zapisnièka info-datoteka
-Warning/Errors log file
-Datoteka zapisa o upozorenjima/pogreškama
-Unable to initialize the OLE system
-Sustav OLE-a nije mogao biti pokrenut
-WinHTTrack could not find any interrupted download file cache in the specified folder!
-WinHTTrack u navedenoj mapi nije mogao pronaæi meðupohranu nikakvog prekinutog preuzimanja datoteka!
-Could not connect to provider
-Povezivanje s dobavljaèem nije uspjelo
-receive
-zaprimiti
-request
-zatražiti
-connect
-povezati
-search
-tražiti
-ready
-gotovo
-error
-pogreška
-Receiving files..
-Zaprimanje datoteka..
-Parsing HTML file..
-Rašèlanjivanje datoteke HTML-a..
-Purging files..
-Èišæenje datoteka..
-Loading cache in progress..
-U tijeku je uèitavanje meðuspremnika..
-Parsing HTML file (testing links)..
-Rašèlanjivanje datoteke HTML-a (provjeravanje poveznica)..
-Pause - Toggle [Mirror]/[Pause download] to resume operation
-Stanka - Nastavak putem izbornièkih naredbi [Zrcaljenje]/[Stanka preuzimanja]
-Finishing pending transfers - Select [Cancel] to stop now!
-Završavaju se tekuæi prijenosi - Trenutna obustava pomoæu [Odustati]
-scanning
-pregledavanje
-Waiting for scheduled time..
-Èeka se zadano vrijeme..
-Transferring data..
-Prenošenje podataka..
-Connecting to provider
-Povezivanje s dobavljaèem
-[%d seconds] to go before start of operation
-[%d sekundi] do poèetka radnje
-Site mirroring in progress [%s, %s bytes]
-Zrcaljenje sadržaja je u tijeku [%s, %s bajta]
-Site mirroring finished!
-Zrcaljenje sadržaja je završeno!
-A problem occurred during the mirroring operation\n
-Tijekom zrcaljenja je nastao jedan problem\n
-\nDuring:\n
-\nTrajanje:\n
-\nSee the log file if necessary.\n\nClick FINISH to quit WinHTTrack Website Copier.\n\nThanks for using WinHTTrack!
-\nPojedinosti po potrebi pogledajte u zapisnièkoj datoteci.\n\nKliknite na ZAVRŠITI za okonèavanje rada WinHTTrack Website Copiera.\n\nHvala Vam na uporabi WinHTTracka!
-Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) if necessary to ensure that everything is OK.\n\nThanks for using WinHTTrack!
-Zrcaljenje je dovršeno.\nKliknite na Svršetak za okonèavanje rada s WinHTTrackom.\nPogledajte po potrebi u zapisnik(e) kako bi se uvjerili da je sve u redu.\n\nHvala Vam na uporabi WinHTTracka!!
-* * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
-* * ZRCALJENJE JE PREKINUTO! * *\r\nTekuæi privremeni meðuspremnik æe biti potreban za neku buduæu aktualizaciju i sadrži samo podatke, koji su preuzeti tijekom upravo prekinutog zasjedanja.\r\nPrethodni meðuspremnik možda sadrži potpunije podatke; ukoliko te podatke ne želite izgubiti, morate ih ponovno uspostaviti i izbrisati tekuæi meðuspremnik.\r\n[Napomena: To se jednostavno može napraviti brisanjem datoteka hts-cache/new.*]\r\n\r\nMislite li da ovom zasjedanju prethodeæi meðuspremnik može sadržavati potpunije podatke, i želite li ga ponovno uspostaviti?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
-* * POGREŠKA PRI ZRCALJENJU! * *\r\nHTTrack je zapazio da je tekuæe zrcalo prazno. Ukoliko je to bila neka dogradnja, onda je prethodno zrcalo ponovno uspostavljeno.\r\nRazlog: ili prva stranica nije mogla biti pronaðena, ili se pak pojavio neki problem.\r\n=> Uvjerite se da dotièno mrežno mjesto još uvijek postoji, i/ili provjerite postavke Vašeg usmjerivaèa! <=
-\n\nTip: Click [View log file] to see warning or error messages
-\n\nPreporuka: Kliknite na [Prikazati zapisnièke datoteke], kako bi vidjeli upozorenja ili dojave pogreški
-Error deleting a hts-cache/new.* file, please do it manually
-Pogreška pri brisanju datoteke hts-cache/new.*, molim obavite to ruèno
-Do you really want to quit WinHTTrack Website Copier?
-Doista želite okonèati rad s WinHTTrack Website Copierom?
-- Mirroring Mode -\n\nEnter address(es) in URL box
-- Stanje zrcaljenja -\n\nUnesite adresu(-e) u polje URL-a
-- Interactive Wizard Mode (questions) -\n\nEnter address(es) in URL box
-- Interaktivno stanje vodièa s povratnim pitanjima -\n\nUnesite adresu(-e) u polje URL-a
-- File Download Mode -\n\nEnter file address(es) in URL box
-- Stanje preuzimanja datoteka -\n\nUnesite adresu(-e) datoteke u polje URL-a
-- Link Testing Mode -\n\nEnter Web address(es) with links to test in URL box
-- Stanje provjere poveznica -\n\nUnesite spletnu adresu(-e) s poveznicama za provjeravanje u polje URL-a
-- Update Mode -\n\nVerify address(es) in URL box, check parameters if necessary then click on 'NEXT' button
-- Stanje nadograðivanja -\n\nOvjerite adresu(-e) u polje URL-a, provjerite po potrebi parametre a zatim kliknite na gumb 'SLIJEDEÆE'
-- Resume Mode (Interrupted Operation) -\n\nVerify address(es) in URL box, check parameters if necessary then click on 'NEXT' button
-- Stanje nadovezivanja (prekinute radnje) -\n\nOvjerite adresu(-e) u polje URL-a, provjerite po potrebi parametre a zatim kliknite na gumb 'SLIJEDEÆE'
-Log files Path
-Putanja zapisnièkih datoteka
-Path
-Putanja
-- Links List Mode -\n\nUse URL box to enter address(es) of page(s) containing links to mirror
-- Stanje nabrajanja poveznica -\n\nKoristite okvir URL-a za unos adrese(-a) stranice(-a) koje sadrže dotiène poveznice
-New project / Import?
-Novi projekat / Uvoz?
-Choose criterion
-Odaberite kriterij
-Maximum link scanning depth
-Maksimum dubine grananja poveznica
-Enter address(es) here
-Ovdje unijeti adresu(-e)
-Define additional filtering rules
-Odrediti dodatna pravila filtriranja
-Proxy Name (if needed)
-Naziv posrednièkog raèunalo (po potrebi)
-Proxy Port
-Posrednièki port
-Define proxy settings
-Odredite postavke posrednika
-Use standard HTTP proxy as FTP proxy
-Koristiti standardni posrednik HTTP-a kao posrednik FTP-a
-Path
-Putanja
-Select Path
-Odabrati putanju
-Path
-Putanja
-Select Path
-Odabrati putanju
-Quit WinHTTrack Website Copier
-Okonèati rad WinHTTrack Website Copiera
-About WinHTTrack
-O programu WinHTTrack
-Save current preferences as default values
-Tekuæe postavke pohraniti kao polazne vrijednosti
-Click to continue
-Kliknite ovdje za nastavak
-Click to define options
-Kliknite ovdje za odreðivanje moguænosti
-Click to add a URL
-Kliknite ovdje za dodavanje URL-a
-Load URL(s) from text file
-URL(-e) uèitati iz tekstualne datoteke
-WinHTTrack preferences (*.opt)|*.opt||
-Postavke WinHTTracka (*.opt)|*.opt||
-Address List text file (*.txt)|*.txt||
-Tekstualna datoteka sa spiskom adresa (*.txt)|*.txt||
-File not found!
-Datoteka nije pronaðena!
-Do you really want to change the project name/path?
-Doista želite izmijeniti naziv i putanju projekta?
-Load user-default options?
-Uèitati korisnikom zadane polazne moguænosti?
-Save user-default options?
-Pohraniti korisnikom zadane polazne moguænosti?
-Reset all default options?
-Sve moguænosti vratiti na polazno?
-Welcome to WinHTTrack!
-Dobrodošli u WinHTTrack!
-Action:
-Radnja:
-Max Depth
-Maksimum dubine
-Maximum external depth:
-Maksimum vanjske dubine:
-Filters (refuse/accept links) :
-Filtri (odbiti/pohraniti poveznice) :
-Paths
-Putanje
-Save prefs
-Postavke pohraniti
-Define..
-Odrediti..
-Set options..
-Postaviti moguænosti..
-Preferences and mirror options:
-Postavke i moguænosti zrcaljenja:
-Project name
-Naziv projekta
-Add a URL...
-Dodati mrežnu adresu...
-Web Addresses: (URL)
-Mrežne adrese: (URL)
-Stop WinHTTrack?
-Zaustaviti WinHTTrack?
-No log files in %s!
-U %s nema zapisnièkih datoteka!
-Pause Download?
-Napraviti stanku preuzimanja?
-Stop the mirroring operation
-Zaustaviti postupak zrcaljenja
-Minimize to System Tray
-Minimizirati u sustavnu traku odlaganja
-Click to skip a link or stop parsing
-Kliknite za preskok poveznice ili zaustavljanje rašèlanjivanja
-Click to skip a link
-Kliknite za preskok poveznice
-Bytes saved
-Pohranjeno bajta
-Links scanned
-Obraðene poveznice
-Time:
-Vrijeme:
-Connections:
-Veze:
-Running:
-Djelatno:
-Hide
-Sakriti
-Transfer rate
-Stopa prijenosa
-SKIP
-PRESKOÈITI
-Information
-Informacija
-Files written:
-Zapisano datoteka:
-Files updated:
-Aktualizirano datoteka:
-Errors:
-Pogreške:
-In progress:
-U tijeku:
-Follow external links
-Slijediti vanjske poveznice
-Test all links in pages
-Na stranicama provjeriti sve poveznice
-Try to ferret out all links
-Pokušati slijediti sve poveznice
-Download HTML files first (faster)
-Najprije preuzimati datoteke HTML-a (brže)
-Choose local site structure
-Odaberite mjesnu strukturu sadržaja
-Set user-defined structure on disk
-Sâmi odredite strukturu na disku
-Use a cache for updates and retries
-Za dogradnje i ponavljanja koristiti meðuspremnik
-Do not update zero size or user-erased files
-Ne nadopunjavati datoteke koje su prazne ili one koje je korisnik izbrisao
-Create a Start Page
-Napraviti poèetnu stranicu
-Create a word database of all html pages
-Napraviti spisak rijeèi sa svih stranica HTML-a
-Create error logging and report files
-Napraviti datoteke zapisnika pogrešaka i izvješæa o tijeku postupka
-Generate DOS 8-3 filenames ONLY
-Generirati nazive datoteka SAMO sukladno DOS-u 8-3
-Generate ISO9660 filenames ONLY for CDROM medias
-Generirati nazive datoteka SAMO sukladno ISO9660 za medije CDROM-a
-Do not create HTML error pages
-Ne stvarati stranice pogrešaka HTML-a
-Select file types to be saved to disk
-Odaberite vrste datoteka, koje treba pohranjivati na disku
-Select parsing direction
-Odaberite smjer rašèlanjivanja
-Select global parsing direction
-Odaberite opæi smjer rašèlanjivanja
-Setup URL rewriting rules for internal links (downloaded ones) and external links (not downloaded ones)
-Postavke pravila prilagoðavanja URL-a za unutarnje (jednom veæ preuzimane) i vanjske (ni jednom nisu preuzimane) poveznice
-Max simultaneous connections
-Maksimum istovremenih prikljuèivanja/veza
-File timeout
-Vrijeme èekanja na datoteke
-Cancel all links from host if timeout occurs
-Pri prekoraèenju vremena èekanja prekinuti sve poveznice prema dotiènom raèunalu 
-Minimum admissible transfer rate
-Najniža podnošljiva stopa prijenosa
-Cancel all links from host if too slow
-Prekinuti sve poveznice prema ugostiteljskom raèunalu ako je presporo
-Maximum number of retries on non-fatal errors
-Najviši broj pokušaja ponavljanja pri ne-fatalnim pogreškama
-Maximum size for any single HTML file
-Vrhunac velièine neke pojedinaène datoteke HTML-a
-Maximum size for any single non-HTML file
-Vrhunac velièine neke pojedinaène datoteke ne-HTML-a
-Maximum amount of bytes to retrieve from the Web
-Vrhunac iznosa u bajtima za dobaviti s mrežnih mjesta
-Make a pause after downloading this amount of bytes
-Napraviti stanku nakon preuzimanja tog iznosa u bajtima
-Maximum duration time for the mirroring operation
-Vrhunac vremena trajanja za postupak zrcaljenja
-Maximum transfer rate
-Vrhunac stope prijenosa
-Maximum connections/seconds (avoid server overload)
-Najviši broj veza/sekundi (sprjeèava preoptereæivanje poslužitelja)
-Maximum number of links that can be tested (not saved!)
-Najviši broj poveznica, koje mogu biti provjeravane (za pohranjivanje nema ogranièenja!)
-Browser identity
-Preglednièko obilježje
-Comment to be placed in each HTML file
-Komentar koji æe biti smješten u svakoj datoteci HTML-a
-Back to starting page
-Natrag na poèetnu stranicu
-Save current preferences as default values
-Tekuæe postavke pohraniti kao polazne vrijednosti
-Click to continue
-Kliknite za nastavak
-Click to cancel changes
-Kliknuti za opoziv izmjena
-Follow local robots rules on sites
-Na mrežnim mjestima slijediti pravila mjesnih robota
-Links to non-localised external pages will produce error pages
-Poveznice prema nepreslikanim vanjskim stranicama æe stvarati stranice pogreški
-Do not erase obsolete files after update
-Nakon dogradnje ne brisati zastarjele datoteke
-Accept cookies?
-Prihvatiti kolaèiæ?
-Check document type when unknown?
-Provjeravati vrstu datoteke ukoliko je nepoznata?
-Parse java applets to retrieve included files that must be downloaded?
-Rašèlanjivati java applete radi pronalaženja obuhvaæenih datoteka, koje još moraju biti preuzete?
-Store all files in cache instead of HTML only
-Spremati sve datoteke u meðuspremnik a ne samo one u HTML-u
-Log file type (if generated)
-Vrsta datoteke zapisnika (ukoliko je naèinjen)
-Maximum mirroring depth from root address
-Najveæa dubina zrcaljenja od prve adrese
-Maximum mirroring depth for external/forbidden addresses (0, that is, none, is the default)
-Najveæa dubina zrcaljenja za vanjske/zabranjene adrese (polazno je 0, tj. bez vanjskog preuzimanja)
-Create a debugging file
-Naèiniti datoteku za traženje pogrešaka
-Use non-standard requests to get round some server bugs
-Koristiti nestandardne zahtjeve, kako bi se zaobišle neke poslužiteljske pogreške
-Use old HTTP/1.0 requests (limits engine power!)
-Koristiti zahtjeve starog HTTP/1.0 (ogranièava brzinu rada!)
-Attempt to limit retransfers through several tricks (file size test..)
-Raznim varkama pokušati ogranièiti opetovanja prijenosa (provjera velièine datoteka..)
-Attempt to limit the number of links by skipping similar URLs (www.foo.com==foo.com, http=https ..)
-Preskakanjem sliènih URL-a (www.foo.com==foo.com, http=https ..) pokušati ogranièiti broj poveznica
-Write external links without login/password
-Vanjske poveznice zapisivati bez prijave/lozinke
-Write internal links without query string
-Unutarnje poveznice zapisivati bez teksta za upite
-Get non-HTML files related to a link, eg external .ZIP or pictures
-Dobavljati datoteke ne-HTML-a, združene s poveznicom (primjerice vanjski .ZIP ili slike)
-Test all links (even forbidden ones)
-Provjeravati sve poveznice (èak i one zabranjene)
-Try to catch all URLs (even in unknown tags/code)
-Pokušati pronaæi sve URL-e (èak i u nepoznatim oznakama/skriptama)
-Get HTML files first!
-Dobaviti najprije datoteke HTML-a!
-Structure type (how links are saved)
-Vrsta strukture (kako se pohranjuju poveznice)
-Use a cache for updates
-Za dogradnje koristiti meðuspremnik
-Do not re-download locally erased files
-Ne preuzimati ponovno datoteke, koje su veæ mjesno izbrisane
-Make an index
-Napraviti kazalo
-Make a word database
-Napraviti spisak rijeèi
-Log files
-Zapisnièke datoteke
-DOS names (8+3)
-Nazivi sukladno DOS-u (8+3)
-ISO9660 names (CDROM)
-Nazivi prema ISO9660 (CDROM)
-No error pages
-Bez stranica pogrešaka
-Primary Scan Rule
-Glavno pravilo filtra
-Travel mode
-Naèin traženja
-Global travel mode
-Globalni naèin traženja
-These options should be modified only exceptionally
-Ove moguænosti bi trebale biti preinaèavane samo iznimno
-Activate Debugging Mode (winhttrack.log)
-Aktivirati postupak traženja pogrešaka (winhttrack.log)
-Rewrite links: internal / external
-Prilagoditi poveznièke adrese: unutarnje / vanjske
-Flow control
-Nadzor toka
-Limits
-Granice
-Identity
-Obilježje
-HTML footer
-Podnožje HTML-a
-N# connections
-Broj veza
-Abandon host if error
-Pri pogreškama napustiti ugostitelja
-Minimum transfer rate (B/s)
-Minimum stope prijenosa (B/s)
-Abandon host if too slow
-Napustiti ugostitelja ukoliko je prespor
-Configure
-Prilagoditi
-Use proxy for ftp transfers
-Koristiti posrednika za prijenose putem FTP-a
-TimeOut(s)
-Vremenska ogranièenja
-Persistent connections (Keep-Alive)
-Održavati veze (Keep-Alive)
-Reduce connection time and type lookup time using persistent connections
-Održavane veze smanjuju vrijeme povezivanja i vrijeme za traženje vrsta
-Retries
-Opetovanja
-Size limit
-Ogranièenje velièine
-Max size of any HTML file (B)
-Najviši broj bajta u datotekama HTML-a
-Max size of any non-HTML file
-Najveæa velièina datoteka ne-HTML-a
-Max site size
-Najveæa velièina sadržaja
-Max time
-Najduže vrijeme
-Save prefs
-Pohraniti postavke
-Max transfer rate
-Vrhunac stope prijenosa
-Follow robots.txt
-Slijediti robots.txt
-No external pages
-Bez vanjskih stranica
-Do not purge old files
-Ne brisati stare datoteke
-Accept cookies
-Prihvaæati kolaèiæe
-Check document type
-Provjeravati vrstu dokumenata
-Parse java files
-Rašèlanjivati datoteke Java
-Store ALL files in cache
-Spremati SVE datoteke u meðuspremnik
-Tolerant requests (for servers)
-Snošljivi zahtjevi (za poslužitelje)
-Update hack (limit re-transfers)
-Iznuda dogradnji (ogranièava opetovane prijenose)
-URL hacks (join similar URLs)
-URL hacks (združuje sliène URL-e)
-Force old HTTP/1.0 requests (no 1.1)
-Nametati zahtjeve starog HTTP/1.0 (ne 1.1)
-Max connections / seconds
-Najviši broj veza / sekundi
-Maximum number of links
-Najviši broj poveznica
-Pause after downloading..
-Èekati nakon preuzimanja..
-Hide passwords
-Sakriti lozinke
-Hide query strings
-Sakriti tekst za upite
-Links
-Poveznice
-Build
-Graða
-Experts Only
-Samo za struènjake
-Flow Control
-Nadzor toka
-Limits
-Ogranièenja
-Browser ID
-Preglednièki ID
-Scan Rules
-Pravila filtriranja
-Spider
-Pauk
-Log, Index, Cache
-Zapisnik, Kazalo, Meðuspremnik
-Proxy
-Posrednik
-MIME Types
-Vrste MIME
-Do you really want to quit WinHTTrack Website Copier?
-Doista želite okonèati rad WinHTTrack Website Copiera?
-Do not connect to a provider (already connected)
-Ne povezivati s dobaviteljem (veæ je povezano)
-Do not use remote access connection
-Ne koristiti vezu daljinskog pristupa
-Schedule the mirroring operation
-Odrediti vrijeme zrcaljenja
-Quit WinHTTrack Website Copier
-Okonèati rad WinHTTrack Website Copiera
-Back to starting page
-Natrag na poèetnu stranicu
-Click to start!
-Kliknite za poèetak!
-No saved password for this connection!
-Za tu vezu nema pohranjene lozinke!
-Can not get remote connection settings
-Ne mogu se dobiti postavke daljinske veze
-Select a connection provider
-Odaberite dobavitelja veze
-Start
-Zapoèeti
-Please adjust connection parameters if necessary,\nthen press FINISH to launch the mirroring operation.
-Po potrebi prilagodite molim parametre veze,\na zatim stisnite ZAVRŠITI kako bi pokrenuli zrcaljenje.
-Save settings only, do not launch download now.
-Samo pohraniti postavke, preuzimanje ne pokretati sada.
-On hold
-Na èekanju
-Transfer scheduled for: (hh/mm/ss)
-Prijenos je predviðen za: (hh/mm/ss)
-Start
-Zapoèeti
-Connect to provider (RAS)
-Povezati s dobavljaèem (RAS)
-Connect to this provider
-Povezati s tim dobavljaèem
-Disconnect when finished
-Prekinuti vezu kada bude gotovo
-Disconnect modem on completion
-Po dovršetku odvojiti modemsku vezu
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Molimo da nas obavijestite o svim pogreškama i poteškoæama)\r\n\r\nRazvoj:\r\nSuèelje (Windows): Xavier Roche\r\nPauk: Xavier Roche\r\nRazrediRašèlanjivaèaJave: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche i drugi suradnici\r\nPUNO HVALA za prijevodne preporuke upuæujemo:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-About WinHTTrack Website Copier
-O programu WinHTTrack Website Copier
-Please visit our Web page
-Molimo da posjetite našu spletnu stranicu
-Wizard query
-Upit vodièa
-Your answer:
-Vaš odgovor:
-Link detected..
-Pronaðena je poveznica..
-Choose a rule
-Birajte pravilo
-Ignore this link
-Zanemariti tu poveznicu
-Ignore directory
-Zanemariti mape
-Ignore domain
-Zanemariti domenu
-Catch this page only
-Dobaviti samo tu stranicu
-Mirror site
-Sadržaj zrcaljenja
-Mirror domain
-Domena zrcaljenja
-Ignore all
-Bez poveznica
-Wizard query
-Upit vodièa
-NO
-NE
-File
-Datoteka
-Options
-Moguænosti
-Log
-Zapisnik
-Window
-Okno
-Help
-Pomoæ
-Pause transfer
-Napraviti stanku prijenosa
-Exit
-Svršetak
-Modify options
-Izmijeniti moguænosti
-View log
-Prikazati zapisnik
-View error log
-Prikazati zapisnik pogrešaka
-View file transfers
-Prikazati prijenose datoteka
-Hide
-Sakriti
-About WinHTTrack Website Copier
-O programu WinHTTrack Website Copier
-Check program updates...
-Potražiti programske dogradnje...
-&Toolbar
-&Traka alatki
-&Status Bar
-&Traka stanja
-S&plit
-Raz&dijeliti
-File
-Datoteka
-Preferences
-Postavke
-Mirror
-Zrcalo
-Log
-Zapisnik
-Window
-Okno
-Help
-Pomoæ
-Exit
-Svršetak
-Load default options
-Uèitati polazne moguænosti
-Save default options
-Pohraniti polazne moguænosti
-Reset to default options
-Vratiti polazne moguænosti
-Load options...
-Uèitati moguænosti...
-Save options as...
-Moguænosti pohraniti kao...
-Language preference...
-Jeziène postavke...
-Contents...
-Sadržaji...
-About WinHTTrack...
-O programu WinHTTrack...
-New project\tCtrl+N
-Novi projekat\tCtrl+N
-&Open...\tCtrl+O
-&Otvoriti...\tCtrl+O
-&Save\tCtrl+S
-&Pohraniti\tCtrl+S
-Save &As...
-Pohraniti &kao...
-&Delete...
-&Izbrisati...
-&Browse sites...
-&Pregledati sadržaje...
-User-defined structure
-Korisnikom odreðena struktura
-%n\tName of file without file type (ex: image)\r\n%N\tName of file including file type (ex: image.gif)\r\n%t\tFile type only (ex: gif)\r\n%p\tPath [without ending /] (ex: /someimages)\r\n%h\tHost name (ex: www.someweb.com)\r\n%M\tMD5 URL (128 bits, 32 ascii bytes)\r\n%Q\tMD5 query string (128 bits, 32 ascii bytes)\r\n%q\tMD5 small query string (16 bits, 4 ascii bytes)\r\n\r\n%s?\tShort name (ex: %sN)
-%n\tNaziv datoteke bez nastavka (npr. slika)\r\n%N\tNaziv datoteke s nastavkom (npr. slika.gif)\r\n%t\tSamo nastavak naziva datoteke (npr. gif)\r\n%p\tPutanja [bez svršetka /] (npr. /nekeslike)\r\n%h\tNaziv ugostitelja (npr. www.nekisplet.com)\r\n%M\tMD5 URL (128 bita, 32 ascii bajta)\r\n%Q\tTekst upita MD5 (128 bita, 32 ascii bajta)\r\n%q\tKratki tekst upita MD5 (16 bita, 4 ascii bajta)\r\n\r\n%s?\tKratki naziv (npr. %sN)
-Example:\t%h%p/%n%q.%t\n->\t\tc:\\mirror\\www.someweb.com\\someimages\\image.gif
-Primjerice:\t%h%p/%n%q.%t\n->\t\tc:\\zrcaljenje\\www.nekisplet.com\\nekeslike\\slika.gif
-Proxy settings
-Postavke posrednika
-Proxy address:
-Adresa posrednika:
-Proxy port:
-Port posrednika:
-Authentication (only if needed)
-Ovjeravanje (samo po potrebi)
-Login
-Prijava
-Password
-Lozinka
-Enter proxy address here
-Ovdje unesite adresu posrednika
-Enter proxy port here
-Ovdje unesite port posrednika
-Enter proxy login
-Unesite prijavu na posredniku
-Enter proxy password
-Unesite lozinku na posredniku
-Enter project name here
-Ovdje unesite naziv projekta
-Enter saving path here
-Ovdje unesite putanju za pohranjivanje
-Select existing project to update
-Birajte postojeæi projekt za dogradnju
-Click here to select path
-Ovdje kliknite za izbor putanje
-Select or create a new category name, to sort your mirrors in categories
-Odaberite ili nadjenite neki naziv novoj kategoriji, kako bi Vaša zrcaljenja svrstali u kategorije
-HTTrack Project Wizard...
-Pomoènik za projekte HTTracka...
-New project name:
-Naziv novog projekta:
-Existing project name:
-Naziv postojeæeg projekta:
-Project name:
-Naziv projekta:
-Base path:
-Osnovna putanja:
-Project category:
-Kategorija projekta:
-C:\\My Web Sites
-C:\\Moji spletni sadržaji
-Type a new project name, \r\nor select existing project to update/resume
-Utipkajte naziv novog projekta, \r\nili odaberite postojeæi projekat za dograditi/nadovezati
-New project
-Novi projekat
-Insert URL
-Umetnite URL
-URL:
-URL:
-Authentication (only if needed)
-Ovjeravanje (samo ako je nužno)
-Login
-Prijava
-Password
-Lozinka
-Forms or complex links:
-Obrasci ili kompleksne poveznice:
-Capture URL...
-Zahvatiti URL...
-Enter URL address(es) here
-Ovdje unesite adresu(-e) URL-a
-Enter site login
-Unesite prijavu za to mrežno mjesto
-Enter site password
-Unesite lozinku za to mrežno mjesto
-Use this capture tool for links that can only be accessed through forms or javascript code
-Koristite ovu funkciju za dobavu povezanih sadržaja, kojima se inaèe može pristupiti samo putem obrazaca ili kôda JavaScript
-Choose language according to preference
-Izaberite jezik
-Catch URL!
-Dobaviti URL!
-Please set temporary browser proxy settings to the following values (Copy/Paste Proxy Address and Port).\nThen click on the Form SUBMIT button in your browser page, or click on the specific link you want to capture.
-Molimo da privremeno izmijenite preglednikove postavke posrednièkog poslužitelja na slijedeæe vrijednosti (Adresu i port posrednika odavdje preslikati).\nKliknite zatim na stranici obrasca u Vašem pregledniku na gumb SUBMIT/POSLATI ili pak na odreðenu poveznicu, koju želite dobaviti.
-This will send the desired link from your browser to WinHTTrack.
-Time æe željena poveznica iz Vašeg preglednika biti poslana u WinHTTrack.
-ABORT
-PREKINUTI
-Copy/Paste the temporary proxy parameters here
-Privremene postavke posrednièkog poslužitelja preslikati odavdje
-Cancel
-Odustati
-Unable to find Help files!
-Nije bilo moguæe pronaæi datoteke Pomoæi!
-Unable to save parameters!
-Nije bilo moguæe pohraniti parametre!
-Please drag only one folder at a time
-Povucite mišom molim samo jednu mapu istovremeno
-Please drag only folders, not files
-Povucite mišom molim samo mape, ne datoteke
-Please drag folders only
-Povucite mišom molim samo mape
-Select user-defined structure?
-Za preslik sadržaja odabrati korisnikom odreðenu strukturu?
-Please ensure that the user-defined-string is correct,\notherwise filenames will be bogus!
-Provjerite molim je li korisnikom odreðeni znakovni niz ispravan,\nu suprotnom æe nastati iskrivljeni nazivi datoteka!
-Do you really want to use a user-defined structure?
-Doista želite koristiti korisnikom odreðenu strukturu?
-Too manu URLs, cannot handle so many links!!
-Previše je URL-a, ne mogu obraðivati toliko poveznica!!
-Not enough memory, fatal internal error..
-Nema dovoljno spremnika, fatalna unutarnja pogreška..
-Unknown operation!
-Nepoznata operacija!
-Add this URL?\r\n
-Dodati taj URL?\r\n
-Warning: main process is still not responding, cannot add URL(s)..
-Warning: main process is still not responding, cannot add URL(s)..
-Type/MIME associations
-Type/MIME associations
-File types:
-Vrste datoteka:
-MIME identity:
-Istovjetnost MIME:
-Select or modify your file type(s) here
-Ovdje birajte ili izmijenite Vaše vrste datoteka
-Select or modify your MIME type(s) here
-Ovdje birajte ili izmijenite Vaše vrste MIME
-Go up
-Na gore
-Go down
-Na dolje
-File download information
-Informacije o preuzimanju datoteka
-Freeze Window
-Uglaviti okno
-More information:
-Više informacija:
-Welcome to WinHTTrack Website Copier!\n\nPlease click on the NEXT button to\n\n- start a new project\n- or resume a partial download
-Dobrodošli u program WinHTTrack Website Copier!\n\nKliknite molim na gumb SLIJEDEÆE kako bi\n\n- zapoèeli novi projekat\n- ili nastavili nedovršeno preuzimanje
-File names with extension:\nFile names containing:\nThis file name:\nFolder names containing:\nThis folder name:\nLinks on this domain:\nLinks on domains containing:\nLinks from this host:\nLinks containing:\nThis link:\nALL LINKS
-Nazivi datoteka s proširenjem:\nNazivi datoteka sadržavaju:\nTaj naziv datoteke:\nNazivi mapa sadržavaju:\nTaj naziv mape:\nPoveznice u toj domeni:\nPoveznice u domenama sadržavaju:\nPoveznice s tog ugostitelja:\nPoveznice sadržavaju:\nTa poveznica:\nSVE POVEZNICE
-Show all\nHide debug\nHide infos\nHide debug and infos
-Prikazati sve\nSakriti debug\nSakriti informacije\nSakriti debug i informacije
-Site-structure (default)\nHtml in web/,       images/other files in web/images/\nHtml in web/html,   images/other in web/images\nHtml in web/,       images/other in web/\nHtml in web/,       images/other in web/xxx, where xxx is the file extension\nHtml in web/html,   images/other in web/xxx\nSite-structure, without www.domain.xxx/\nHtml in site_name/, images/other files in site_name/images/\nHtml in site_name/html, images/other in site_name/images\nHtml in site_name/, images/other in site_name/\nHtml in site_name/, images/other in site_name/xxx\nHtml in site_name/html, images/other in site_name/xxx\nAll files in web/, with random names (gadget !)\nAll files in site_name/, with random names (gadget !)\nUser-defined structure..
-Struktura sadržaja (polazno)\nHTML u spletu/,       slike/ostale datoteke u spletu/slike/\nHTML u spletu/html,   slike/ostalo u spletu/slike\nHTML u spletu/,       slike/ostalo u spletu/\nHTML u spletu/,       slike/ostalo u spletu/xxx, pri èemu je xxx proširenje naziva datoteke\nHTML u spletu/html,   slike/ostalo u spletu/xxx\nStruktura sadržaja, bez www.domena.xxx/\nHTML u naziv_sadržaja/, slike/ostale datoteke u nazivu_sadržaja/slike/\nHTML u naziv_sadržaja/html, slike/ostalo u naziv_sadržaja/slike\nHTML u naziv_sadržaja/, slike/ostalo u naziv_sadržaja/\nHTML u naziv_sadržaja/, slike/ostalo u naziv_sadržaja/xxx\nHTML u naziv_sadržaja/html, slike/ostalo u naziv_sadržaja/xxx\nSve datoteke u spletu/, s nasumiènim nazivima (gadget !)\nSve datoteke u naziv_sadržaja/, s nasumiènim nazivima (gadget !)\nKorisnikom odreðena struktura..
-Just scan\nStore html files\nStore non html files\nStore all files (default)\nStore html files first
-Samo pregledati poveznice\nStpremiti datoteke HTML-a\nStpremiti datoteke ne-HTML-a\nSpremiti sve datoteke (polazno)\nSpremiti najprije datoteke HTML-a
-Stay in the same directory\nCan go down (default)\nCan go up\nCan both go up & down
-Ostati u istoj mapi\nMože iæi dolje (polazno)\nMože iæi gore\nMože iæi i gore i dolje
-Stay on the same address (default)\nStay on the same domain\nStay on the same top level domain\nGo everywhere on the web
-Ostati na istoj adresi (polazno)\nOstati u istoj domeni\nOstati u istoj demeni vršne razine\nIæi posvuda po spletu
-Never\nIf unknown (except /)\nIf unknown
-Nikada\nUkoliko je nepoznato (izuzev /)\nUkoliko je nepoznato
-no robots.txt rules\nrobots.txt except wizard\nfollow robots.txt rules
-bez pravila iz robots.txt\nslijediti pravila iz robots.txt s izuzetkom pomoènika\nslijediti pravila iz robots.txt
-normal\nextended\ndebug
-uobièajeno\nprošireno\ndebug
-Download web site(s)\nDownload web site(s) + questions\nGet individual files\nDownload all sites in pages (multiple mirror)\nTest links in pages (bookmark test)\n* Continue interrupted download\n* Update existing download
-Preuzimanje spletnih sadržaja\nPreuzimanje spletnih sadržaja + pitanja\nDobavljanje pojedinih datoteka\nPreuzimanje svih sadržaja sa stranica (višestruko zrcaljenje)\nProvjeriti poveznice u stranicama (provjera poveznica)\n* Nastaviti prekinuto preuzimanje\n* Aktualizirati postojeæe preuzimanje
-Relative URI / Absolute URL (default)\nAbsolute URL / Absolute URL\nAbsolute URI / Absolute URL\nOriginal URL / Original URL
-Relativni URI / Apsolutni URL (polazno)\nApsolutni URL / Apsolutni URL\nApsolutni URI / Apsolutni URL\nIzvorni URL / Izvorni URL
-Open Source offline browser
-Open Source offline browser
-Website Copier/Offline Browser. Copy remote websites to your computer. Free.
-Preslikavatelj spletnih sadržaja/Preglednik mjesnih sadržaja. Preslikavanje internetskih sadržaja na Vaše raèunalo. Besplatno.
-httrack, winhttrack, webhttrack, offline browser
-httrack, winhttrack, webhttrack, offline browser
-URL list (.txt)
-Spisak URL-a (.txt)
-Previous
-Prethodno
-Next
-Slijedeæe
-URLs
-URL-i
-Warning
-Upozorenje
-Your browser does not currently support javascript. For better results, please use a javascript-aware browser.
-Vaš preglednik trenutno ne podržava JavaScript. Za bolje rezultate koristite molim preglednik koji ovladava JavaScript.
-Thank you
-Hvala Vam
-You can now close this window
-Sada možete zatvoriti ovo okno
-Server terminated
-Poslužitelj je razriješen
-A fatal error has occurred during this mirror
-Tijekom ovog zrcaljenja je nastala fatalna pogreška

lang/Dansk.txt

@@ -5,7 +5,7 @@ Dansk
 LANGUAGE_ISO
 da
 LANGUAGE_AUTHOR
-Jesper Bramm (bramm@get2net.dk)\r\nscootergrisen\r\n
+Jesper Bramm (bramm@get2net.dk) \r\n
 LANGUAGE_CHARSET
 ISO-8859-1
 LANGUAGE_WINDOWSID
@@ -29,7 +29,7 @@ Klik for at se den forrige sk
 Click to go to next screen
 Klik for at se den næste skærm
 Hide password
-Skjul adgangskode
+Skjul password
 Save project
 Gem projekt
 Close current project?
@@ -39,13 +39,13 @@ Slette dette projekt ?
 Delete empty project %s?
 Vil du slette det tomme projekt med navnet: %s?
 Action not yet implemented
-Denne handling er endnu ikke implementeret
+Denne funktion er ikke implementeret endnu !
 Error deleting this project
 Der opstod fejl under sletningen af dette projekt
 Select a rule for the filter
-Vælg en regel til filteret
+Vælg hvilken regl der gælder for dette filter
 Enter keywords for the filter
-Indtast nøgleord til filteret
+Indtast nøgleord for dette filter
 Cancel
 Annullér
 Add this rule
@@ -63,41 +63,41 @@ Tilf
 Scan Rules
 Skanningsregler
 Use wildcards to exclude or include URLs or links.\nYou can put several scan strings on the same line.\nUse spaces as separators.\n\nExample: +*.zip -www.*.com -www.*.edu/cgi-bin/*.cgi
-Brug 'Jokertegn' [ * ] til at udelukke eller medtage URL' er eller links.\nDu kan indsætte flere skanningsstrenge i samme linje.\nBrug mellemrum som separatortegn.\n\nEksempel: +*.zip -www.*.dk -www.*.edu/cgi-bin/*.cgi
+Brug 'Jokertegn' [ * ] til at udelukke eller medtage URL' er eller links.\nDu kan indsætte flere skannings-strenge i samme linie.\nBrug mellemrum som seperatortegn.\n\nEksempel: +*.zip -www.*.com -www.*.edu/cgi-bin/*.cgi
 Exclude links
 Udeluk link(s)
 Include link(s)
 Medtag link(s)
 Tip: To have ALL GIF files included, use something like +www.someweb.com/*.gif. \n(+*.gif / -*.gif will include/exclude ALL GIFs from ALL sites)
-Tip: For at medtage ALLE GIF-filer, så prøv at bruge: +www.eksempel.dk/*.gif. \n(+*.gif / -*.gif inkluderer/ekskluderer ALLE GIF-filer fra alle websteder)
+Tip: For at medtage ALLE GIF-filer, så prøv at bruge: +www.someweb.com/*.gif.  \n(+*.gif / -*.gif  inkluderer/ekskluderer ALLE GIF-filer fra alle valgte web-sites
 Save prefs
 Gem foretrukne indstillinger
 Matching links will be excluded:
-Matchende links udelukkes
+Macthende links udelukkes
 Matching links will be included:
-Matchende links medtages:
+Macthende links medtages:
 Example:
 Eksempel:
 gif\r\nWill match all GIF files
 gif\r\nVil matche alle .GIF filer
 blue\r\nWill find all files with a matching 'blue' sub-string such as 'bluesky-small.jpeg'
-gul\r\nMedtager alle filer med en matchende 'gul'-understreng, såsom 'gulsky-lille.jpeg'
+blue\r\nMedtager alle filer med en matchende tekststreng. Skriver du f.eks. 'blue' medtages eksempelvis 'bluesky-small.jpeg'\r\n
 bigfile.mov\r\nWill match the file 'bigfile.mov', but not 'bigfile2.mov'
-storfil.mov\r\nVil medtage filen 'storfil.mov', men ikke filen 'storfil2.mov'
+bigfile.mov\r\nVil medtage filen 'bigfile.mov',  men ikke filen 'bigfile2.mov'
 cgi\r\nWill find links with folder name matching sub-string 'cgi' such as /cgi-bin/somecgi.cgi
-cgi\r\nvil finde links med mappenavne der matcher understrengen 'cgi', såsom /cgi-bin/nogetcgi.cgi
+cgi\r\nvil finde links med mappenavne der matcher tekststrengen 'cgi' , eksempelvis /cgi-bin/somecgi.cgi
 cgi-bin\r\nWill find links with folder name matching whole 'cgi-bin' string (but not cgi-bin-2, for example)
-cgi-bin\r\nvil finde links med mappenavne der matcher hele tekststrengen 'cgi-bin', men ikke 'cgi-bin-2'
+cgi-bin\r\nvil finde links med mappenavne der matcher hele tekststrengen 'cgi-bin' ,  men ikke 'cgi-bin-2'
 someweb.com\r\nWill find links with matching sub-string such as www.someweb.com, private.someweb.com etc.
-eksempel.dk\r\nFinder links med matchende understreng, såsom www.eksempel.dk, privat.eksempel.dk osv.
+someweb.com\r\nFinder links med matchende sub-string som f.eks.www.someweb.com, private.someweb.com etc.
 someweb\r\nWill find links with matching folder sub-string such as www.someweb.com, www.someweb.edu, private.someweb.otherweb.com etc.
-eksempel\r\nFinder links med matchende mappe-understreng, såsom www.eksempel.dk, www.eksempel.edu, privat.eksempel.andetweb.dk osv.
+someweb\r\nFinder links med matchende mappe sub-string som f.eks.www.someweb.com, www.someweb.edu, private.someweb.otherweb.com etc.\r\n
 www.someweb.com\r\nWill find links matching whole 'www.someweb.com' sub-string (but not links such as private.someweb.com/..)
-www.eksempel.dk\r\nFinder links der matcher hele understrengen 'www.eksempel.dk' , (men IKKE links, såsom privat.eksempel.dk/..)
+www.someweb.com\r\nFinder links der matcher hele strengen 'www.someweb.com' , (men IKKE links som: private.someweb.com/..)
 someweb\r\nWill find any links with matching sub-string such as www.someweb.com/.., www.test.abc/fromsomeweb/index.html, www.test.abc/test/someweb.html etc.
-eksempel\r\nFinder ethvert link med matchende understreng, såsom www.eksempel.dk/.., www.test.abc/franogetweb/index.html, www.test.abc/test/eksempel.html osv.
+someweb\r\nFinder ethvert link med matchende tekst-streng som f.eks. www.someweb.com/.., www.test.abc/fromsomeweb/index.html, www.test.abc/test/someweb.html etc.\r\n
 www.test.com/test/someweb.html\r\nWill only find the 'www.test.com/test/someweb.html' file. Note that you have to type the complete path (URL + site path)
-www.test.dk/test/eksempel.html\r\nFinder kun 'www.test.dk/test/eksempel.html' file. Bemærk at du skal skrive den fulde sti [URL + webstedsti]
+www.test.com/test/someweb.html\r\nFinder kun 'www.test.com/test/someweb.html' file. Bemærk at du skal skrive den fulde stil[URL+stinavn]
 All links will match
 Alle links vil matche
 Add exclusion filter
@@ -109,33 +109,33 @@ Eksisterende filtre
 Cancel changes
 Annullér ændringer
 Save current preferences as default values
-Gem nuværende indstillinger som standardindstillinger
+Gem nuværende indstillinger som standard-indstillinger
 Click to confirm
 Klik for at bekræfte
 No log files in %s!
-Der findes ingen logfil i %s!
+Der findes ingen log-fil i %s !
 No 'index.html' file in %s!
 Der er ingen 'index.html'-fil i %s!
 Click to quit WinHTTrack Website Copier
 Klik for at afslutte WinHTTrack Website Copier
 View log files
-Vis logfiler
+Se log-fil
 Browse HTML start page
-Se HTML-startside
+Se HTML startside
 End of mirror
-Kopieringen af websted er afsluttet
+Kopieringen er fuldført
 View log files
-Vis logfiler
+Se log filer
 Browse Mirrored Website
-Gennemse kopi-websted
+Gennemse Website
 New project...
 Nyt projekt...
 View error and warning reports
-Vis rapport med fejl og advarsler
+Se fejl og advarsler
 View report
-Vis rapport
+Se rapport
 Close the log file window
-Luk logfil vinduet
+Luk log-fil vinduet
 Info type:
 Informationstype
 Errors
@@ -147,21 +147,21 @@ S
 Find a word
 Søg efter et ord
 Info log file
-Info logfil
+Info log fil
 Warning/Errors log file
-Advarsel/fejl-logfil
+Advarsel/Fejl log-fil
 Unable to initialize the OLE system
 Kan ikke starte OLE-systemet
 WinHTTrack could not find any interrupted download file cache in the specified folder!
-WinHTTrack kunne ikke finde nogen afbrudte download filcache i den angivne mappe!
+WinHTTrack kunne ikke finde nogen afbrudte download fil-cache i den angivne mappe !\r\n
 Could not connect to provider
-Kunne ikke oprette forbindelse til udbyder
+Kan ikke tilslutte til udbyder
 receive
 modtager
 request
 anmoder
 connect
-opret forbindelse
+tilslutter
 search
 søger
 ready
@@ -171,73 +171,73 @@ fejl
 Receiving files..
 Modtager filer...
 Parsing HTML file..
-Overfører HTML-fil...
+Overfører HTML fil...
 Purging files..
 Sletter filer...
 Loading cache in progress..
-Indlæser cache...
+
 Parsing HTML file (testing links)..
-Overfører HTML-fil (tester links)...
+Overfører HTML fil (tester links)....
 Pause - Toggle [Mirror]/[Pause download] to resume operation
-Pause - Vælg fra menuen [Kopiér]/[Pause download] for at genoptage overførslen
+Pause - Vælg fra menuen [Kopiér]/[Pause overførsel] for at genoptage overførslen
 Finishing pending transfers - Select [Cancel] to stop now!
-Afslutter igangværende overførsler - Vælg Annullér for at afslutte nu!
+Afslutter igangværende overførsler - Vælg Annullér for at afslutte nu !
 scanning
 skanner
 Waiting for scheduled time..
 Venter på planlagt tidspunkt...
 Connecting to provider
-Opretter forbindelse til udbyder
+Tilslutter til udbyder
 [%d seconds] to go before start of operation
-[%d sekunder] inden denne handling starter
+[%d seconds] inden denne handling starter
 Site mirroring in progress [%s, %s bytes]
-Websted kopieres nu [%s, %s byte]
+Web-sted kopieres nu  [%s, %s bytes]
 Site mirroring finished!
-Kopieringen af websted er afsluttet!
-A problem occurred during the mirroring operation\n
-Der opstod et problem under kopieringen af websted\n
+Kopieringen er afsluttet !
+A problem occured during the mirroring operation\n
+Der opstod et problem under kopieringen\n
 \nDuring:\n
 \nSamtidigt:\n
 \nSee the log file if necessary.\n\nClick FINISH to quit WinHTTrack Website Copier.\n\nThanks for using WinHTTrack!
-Se eventuelt logfilen.\n\nKlik AFSLUT for at lukke WinHTTrack Website Copier.\n\nTak for at du brugte WinHTTrack!
+Se eventuelt log filen.\n\nKlik AFSLUT for at lukke WinHTTrack Website Copier.\n\nTak for at du brugte WinHTTrack!
 Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) if necessary to ensure that everything is OK.\n\nThanks for using WinHTTrack!
-Kopiering af websted fuldført.\nKlik OK for at afslutte WinHTTrack.\nSe logfil(erne) for at kontrollere at alt forløb OK.\n\nTak for at du brugte WinHTTrack!\r\n
+Website kopieringen er fuldført. \nKlik OK for at afslutte WinHTTrack.\nSe log fil(erne) for at kontrollere at alt forløb OK.\n\nTak for at du brugte WinHTTrack!\r\n
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
-* * KOPIERINGEN ER AFBRUDT! * *\r\nDen nuværende cache er påkrævet for alle opdaterings operationer og indeholder kun data der er downloadet med den aktuelle afbrudte session.\r\nDen tidligere cache kan indeholde mere fyldestgørende information; hvis du ønsker at bevare den information, skal du gendanne den og slette den aktuelle cache.\r\n[Note: Dette kan nemt gøres ved at slette 'hts-cache/new.* files]\r\n\r\nTror du den tidligere cache-fil muligvis indeholder mere fyldestgørende information, og vil du gendanne denne?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
-* * KOPIERINGS FEJL! * *\r\nWinHTTrack har opdaget at den igangværende kopiering er tom. Hvis du var i gang med at opdatere en kopi, vil det tidligere indhold  blive gendannet.\r\nMulig årsag: Den første side kunne enten ikke findes eller der opstod et problem med forbindelsen.\r\n=> Kontroller at webstedet findes og/eller kontroller Proxy-indstillingerne! <=
+** KOPIERINGEN ER OPGIVET**\r\nDen nuværende cache er påkrævet for alle opdaterings operationer og indeholder kun data der er downloadet med den aktuelle afbrudte overførsel.\r\nDen tidligere cache kan indeholde mere fyldestgørende information; hvis du ønsker at bevare den information, skal du gendanne den og slette den aktuelle cache.\r\n[Note: Dette kan nemt gøres ved at slette 'hts-cache/new.* files]\r\n\r\nTror du den tidligere cache-fil muligvis indeholder mere fyldestgørende information, og vil du gendanne denne?
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * KOPIERINGS FEJL * *\r\nWinHTTrack har opdaget at den igangværende kopiering er tom. Hvis du var i gang med at opdatere en kopi, vil det tidligere indhold  blive gendannet \r\nMulig årsag: Den første side kunne enten ikke findes eller der opstod et problem med forbindelsen.\r\n=> Kontroller at webstedet findes og/eller kontroller Proxy-indstillingerne! <=
 \n\nTip: Click [View log file] to see warning or error messages
-\n\nTip: Klik [Vis logfiler]  for at se advarsels- og fejlmeddelelser
+\n\nTip: Klik [Se log fil]  for at se advarsels- og fejlmeddelelser
 Error deleting a hts-cache/new.* file, please do it manually
 Der opstod en fejl i forbindelse med sletningen af hts-cache/new.*filen. Slet venligst filen manuelt.
 Do you really want to quit WinHTTrack Website Copier?
 Vil du afslutte WinHTTrack Website Copier?
 - Mirroring Mode -\n\nEnter address(es) in URL box
-- Kopiering af websted  -\n\nIndtast webadresse(r) i URL-feltet
+- Kopiering af web-sted  -\n\nIndtast web-adresse i URL feltet
 - Interactive Wizard Mode (questions) -\n\nEnter address(es) in URL box
-- Interaktiv guide-tilstand (spørgsmål) -\n\nIndtast webadresse(r) i URL-feltet
+- Interaktiv guide (spørgsmål) -\n\nIndtast web-adresse(er) i URL feltet
 - File Download Mode -\n\nEnter file address(es) in URL box
-- Fil-download-tilstand-\n\nIndtast webadresse(r) i URL-feltet
+- Fil overførselstilstand- \n\nIndtast web-adresse(er) i URL feltet
 - Link Testing Mode -\n\nEnter Web address(es) with links to test in URL box
-- Links test tilstand-\n\nIndtast webadresse(r) i URL-feltet
+- Links test tilstand- \n\nIndtast web-adresse(r) i URL feltet
 - Update Mode -\n\nVerify address(es) in URL box, check parameters if necessary then click on 'NEXT' button
-- Opdateringstilstand -\n\nBekræft webadresse(r) i URL-feltet. Kontroller eventuelt dine indstillinger og klik derefter på 'Næste'.
+- Opdateringstilstand -\n\nBekræft web-adresse i URL feltet. Kontroller eventuelt dine indstillinger og klik derefter på 'NÆSTE'.
 - Resume Mode (Interrupted Operation) -\n\nVerify address(es) in URL box, check parameters if necessary then click on 'NEXT' button
-- Genoptag kopiering (hvis overførslen blev afbrudt) -\n\nBekræft webadresse(r) i URL-feltet. Kontroller eventuelt dine indstillinger og klik derefter på 'Næste'.
+- Genoptag kopiering (hvis overførslen blev afbrudt) -\n\nBekræft web-adresse i URL feltet. Kontroller eventuelt dine indstillinger og klik derefter på 'NÆSTE'.
 Log files Path
-Stinavn for logfil
+Stinavn for log fil
 Path
 Sti
 - Links List Mode -\n\nUse URL box to enter address(es) of page(s) containing links to mirror
-- Links liste -\n\nBrug URL-feltet til at angive adresse(r) på sider der indeholder links der skal kopieres.
+- Links liste - \n\nBrug URL feltet til at angive addresse(r) på sider der indeholder links der skal kopieres.
 New project / Import?
-Nyt projekt / Importér?
+Nyt projekt / Importer?
 Choose criterion
 Vælg kriterier
 Maximum link scanning depth
 Maksimal skanningsdybde for links
 Enter address(es) here
-Indtast webadresse(r) her
+Indtast web-adresse(r) her
 Define additional filtering rules
 Tilføj yderligere filtreringsregler
 Proxy Name (if needed)
@@ -245,9 +245,9 @@ Proxy-navn (om n
 Proxy Port
 Proxy portnummer
 Define proxy settings
-Angiv proxy-indstillinger
+Definér proxy-indstillinger
 Use standard HTTP proxy as FTP proxy
-Brug standard HTTP proxy som FTP-proxy
+Brug standard HTTP proxy som FTP proxy
 Path
 Sti
 Select Path
@@ -261,19 +261,19 @@ Afslut WinHTTrack Website Copier
 About WinHTTrack
 Om WinHTTrack
 Save current preferences as default values
-Gem de nuværende indstillinger som standardindstillinger
+Gem de nuværende instillinger som standardindstillinger
 Click to continue
-Klik for at fortsætte
+Klik for at forsætte
 Click to define options
 Klik for at definere indstillinger
 Click to add a URL
 Klik for at tilføje URL
 Load URL(s) from text file
-Hent URL(er) fra tekstfil
+Hent URL fra tekst fil
 WinHTTrack preferences (*.opt)|*.opt||
 WinHTTrack indstillinger (*.opt)|*.opt||
 Address List text file (*.txt)|*.txt||
-Adresseliste-tekstfil (*.txt)|*.txt||
+Addresse liste tekst fil (*.txt)|*.txt||
 File not found!
 Filen blev ikke fundet!
 Do you really want to change the project name/path?
@@ -293,43 +293,43 @@ Maksimal dybde:
 Maximum external depth:
 Maksimal ekstern dybde:
 Filters (refuse/accept links) :
-Filtrerings-regel (udeluk/medtag links) :
+Filtrerings-regel (udeluk/medtag links)
 Paths
 Sti
 Save prefs
 Gem indstillinger
 Define..
-Angiv...
+Definér...
 Set options..
-Angiv indstillinger...
+Definér indstillinger...
 Preferences and mirror options:
-Indstillinger og muligheder:
+Indstillinger og muligheder
 Project name
 Projektnavn
 Add a URL...
 Tilføj URL...
 Web Addresses: (URL)
-Webadresse: (URL)
-Stop WinHTTrack?
+Web-adresse (URL)
 Stop WinHTTrack?
+Stop WinHTTrack nu?
 No log files in %s!
-Der er ingen logfiler i %s!
+Der er ingen log filer i %s!
 Pause Download?
 Pause kopieringen?
 Stop the mirroring operation
-Stop kopiering af websted?
+Stop kopieringen?
 Minimize to System Tray
-Minimér til proceslinjen
+Minimér til systemlinien
 Click to skip a link or stop parsing
 Klik for at springe et link over eller stoppe overførslen
 Click to skip a link
 Klik for at springe et link over
 Bytes saved
-Byte gemt:
+Bytes gemt:
 Links scanned
-Links skannet:
+Skannede links:
 Time:
-Tid:
+Tid :
 Connections:
 Forbindelser:
 Running:
@@ -337,7 +337,7 @@ K
 Hide
 Minimér
 Transfer rate
-Overfør. hastighed
+Overførselshastighed
 SKIP
 Spring over
 Information
@@ -349,7 +349,7 @@ Opdaterede filer:
 Errors:
 Fejl:
 In progress:
-Arbejder:
+I gang:
 Follow external links
 Følg eksterne links
 Test all links in pages
@@ -357,11 +357,11 @@ Test alle links p
 Try to ferret out all links
 Prøv at udvide alle links
 Download HTML files first (faster)
-Hent HTML-filer først (hurtigere)
+Hent HTML filer først (hurtigere)
 Choose local site structure
-Vælg lokal websted-struktur
+Vælg lokal site-struktur
 Set user-defined structure on disk
-Sæt brugerdefinerede indstillinger for den lokale struktur
+Sæt brugerdefinerede indstilinger for den lokale struktur
 Use a cache for updates and retries
 Brug cache til opdateringer og opdateringsforsøg
 Do not update zero size or user-erased files
@@ -371,11 +371,11 @@ Opret startside
 Create a word database of all html pages
 Opret ord-database fra alle html-sider
 Create error logging and report files
-Lav fejllog og rapport-filer
+Lav fejl-log og rapport-filer
 Generate DOS 8-3 filenames ONLY
-Generér KUN DOS-8-3-filnavne
+Generér KUN DOS 8-3 filnavne
 Generate ISO9660 filenames ONLY for CDROM medias
-Generér KUN ISO9660-filnavne for CDROM-medier
+
 Do not create HTML error pages
 Opret ikke HTML-fejlsider
 Select file types to be saved to disk
@@ -385,7 +385,7 @@ V
 Select global parsing direction
 Vælg overordnet overførselsretning
 Setup URL rewriting rules for internal links (downloaded ones) and external links (not downloaded ones)
-Opret URL-genskrivningsregel for interne links (downloadede links), og eksterne links (ikke downloadede)
+Opret URL genskrivningsregel for interne links (downloadede links), og eksterne links (ikke downloadede)
 Max simultaneous connections
 Maks.antal samtidige forbindelser
 File timeout
@@ -397,37 +397,37 @@ Mindste acceptable overf
 Cancel all links from host if too slow
 Annullér alle links hvis værten er for langsom
 Maximum number of retries on non-fatal errors
-Maksimal antal forsøg efter ikke-fatale fejl
+Maksimale antal forsøg efter ikke-fatale fejl
 Maximum size for any single HTML file
-Maksimal størrelse for enkelte HTML-filer
+Maksimale størrelse for enkelte HTML filer
 Maximum size for any single non-HTML file
-Maksimal størrelse for ikke-HTML-filer
+Maksimale størrelse for ikke-HTML filer
 Maximum amount of bytes to retrieve from the Web
-Maksimal antal byte der må hentes på Web
+Maksimale antal bytes der må hentes på Web
 Make a pause after downloading this amount of bytes
-Hold pause efter download af denne mængde byte
+Hold pause efter download af denne mængde bytes
 Maximum duration time for the mirroring operation
-Maksimal varighed for kopieringen af websted
+Maksimale overførselstid for kopieringen
 Maximum transfer rate
-Maksimal overførselshastighed
+Maksimale overførselshastighed
 Maximum connections/seconds (avoid server overload)
-Maksimal antal forbindelser/sekunder (for at undgå server overbelastning)
+Maksimale antal forbindelser/sekunder (for at undgå server overbelastning)
 Maximum number of links that can be tested (not saved!)
-Maksimal antal links der kan testes (ikke gemt!)
+Maksimalt antal links der kan testes( ikke gemt!)
 Browser identity
-Browser-identitet
+Browser identitet
 Comment to be placed in each HTML file
-Kommentarer der indsættes i alle HTML-filer
+Kommentarer der indsættes i alle HTML filer
 Back to starting page
 Tilbage til startsiden
 Save current preferences as default values
 Gem nuværende indstillinger som standardindstillinger
 Click to continue
-Klik for at fortsætte
+Klik for at forsætte
 Click to cancel changes
 Klik for at annullere ændringerne
 Follow local robots rules on sites
-Følg lokale robot-regler på websteder
+Følg lokale regler på webstedet
 Links to non-localised external pages will produce error pages
 Links til ikke-fundne eksterne sider, vil medføre fejlside(r)
 Do not erase obsolete files after update
@@ -437,13 +437,13 @@ Accept
 Check document type when unknown?
 Kontroller dokumenttypen hvis ukendt?
 Parse java applets to retrieve included files that must be downloaded?
-Overfør Java-applets sammen med inkluderede filer der skal downloades?
+Overfør java applets sammen med indkluderede filer der skal downloades?
 Store all files in cache instead of HTML only
 Gem alle filer i cache fremfor kun HTML ?
 Log file type (if generated)
-Log filtype (hvis genereret)
+Log fil-type (hvis genereret)
 Maximum mirroring depth from root address
-Maksimal kopieringsdybde fra rod-adressen
+Maksimale kopieringsdybde fra rod-adressen
 Maximum mirroring depth for external/forbidden addresses (0, that is, none, is the default)
 Maksimal kopieringsdybde for eksterne/forbudte adresser(0, altså ingen, er standard)
 Create a debugging file
@@ -451,23 +451,23 @@ Opret en fejlfindings-fil
 Use non-standard requests to get round some server bugs
 Brug ikke-standard forespørgsler for at omgå server-fejl
 Use old HTTP/1.0 requests (limits engine power!)
-Brug gamle HTTP/1.0-type forespørgsler (begrænser effektiviteten!)
+Brug gamle HTTP/1.0 -type forespørglser (begrænser effektiviteten !)
 Attempt to limit retransfers through several tricks (file size test..)
-Forsøg at begrænse gen-overførsler gennem brug af 'tricks' (test af filstørrelse...)
+Forsøg at begrænse gen-overførsler gennem brug af 'tricks' (f.eks. test af fil-størrelser...)
 Attempt to limit the number of links by skipping similar URLs (www.foo.com==foo.com, http=https ..)
-Forsøg at begrænse antallet af links, ved at ignorer lignende URL'er (www.foo.dk==foo.dk, http=https ..)
+
 Write external links without login/password
-Skriv eksterne links uden brug af brugernavn/adgangskode
+Skriv ekstrene links uden brug af login/password
 Write internal links without query string
 Skriv interne links uden forespørgsels-streng
 Get non-HTML files related to a link, eg external .ZIP or pictures
-Hent ikke-HTML-filer relateret til et link, eksempelvis .ZIP -filer eller billeder
+Hent ikke-HTML filer relateret til et link, eksempelvis .ZIP -filer eller billeder
 Test all links (even forbidden ones)
 Test alle links (også forbudte links)
 Try to catch all URLs (even in unknown tags/code)
-Forsøg at fange alle URL'er (også selvom html-tags eller kode er ukendt)
+Forsøg at fange alle URL (også selvom html-tags eller kode er ukendt)
 Get HTML files first!
-Hent HTML-filer først!
+Hent HTML filer først!
 Structure type (how links are saved)
 Angiv struktur (hvordan links skal gemmes)
 Use a cache for updates
@@ -479,11 +479,11 @@ Opret et indeks
 Make a word database
 Opret en ord-database
 Log files
-Logfiler
+Log filer
 DOS names (8+3)
-DOS-navne (8+3)
+DOS navne (8+3 karakterer)
 ISO9660 names (CDROM)
-ISO9660-navne (CDROM)
+
 No error pages
 Ingen fejl-sider
 Primary Scan Rule
@@ -495,7 +495,7 @@ Global s
 These options should be modified only exceptionally
 Disse indstillinger bør kun ændres undtagelsesvist!
 Activate Debugging Mode (winhttrack.log)
-Aktivér fejlfindingstilstand (winhttrack.log)
+Aktivér fejfindingstilstand (winhttrack.log)
 Rewrite links: internal / external
 Genskriv links: internt/eksternt
 Flow control
@@ -505,7 +505,7 @@ Begr
 Identity
 Identitet
 HTML footer
-HTML-sidefod
+HTML-fod
 N# connections
 Antal forbindelser
 Abandon host if error
@@ -517,23 +517,23 @@ Forlad v
 Configure
 Konfigurer
 Use proxy for ftp transfers
-Brug proxy til FTP-overførsler
+Brug proxy til FTP overførsler
+TimeOut(s)
 TimeOut(s)
-Timeout(s)
 Persistent connections (Keep-Alive)
-Vedvarende forbindelser (Keep-Alive)
+
 Reduce connection time and type lookup time using persistent connections
-Reducér forbindelsestid og typeopslagstid, ved at anvende vedvarende forbindelser
+
 Retries
 Antal forsøg
 Size limit
 Størrelsesbegrænsning
 Max size of any HTML file (B)
-Maksimal størrelse for HTML-filer (B)
+Maksimal størrelse for enhver HTML fil (Bytes)
 Max size of any non-HTML file
-Maksimal størrelse for ikke-HTML-filer
+Maksimal størrelse for enhver ikke-HTML fil
 Max site size
-Maksimal størrelse af websted
+Maksimalt website størrelse
 Max time
 Maksimal tid
 Save prefs
@@ -541,7 +541,7 @@ Gem indstillinger
 Max transfer rate
 Maksimal overførselshastighed
 Follow robots.txt
-Følg robots.txt
+Følg reglerne i robots.txt
 No external pages
 Ingen eksterne sider
 Do not purge old files
@@ -551,25 +551,25 @@ Accept
 Check document type
 Kontroller dokumenttypen
 Parse java files
-Overfør Java-filer
+Overfør java filer
 Store ALL files in cache
 Gem alle filer i cache
 Tolerant requests (for servers)
 Acceptér forespørgsler (for servere)
 Update hack (limit re-transfers)
-Opdatér hack (begræns gen-overførsler)
+Opdatér hack (Begræns gen-overførsler)
 URL hacks (join similar URLs)
-URL-hacks (sammenføj ligende URL'er)
+
 Force old HTTP/1.0 requests (no 1.1)
 Gennemtving HTTP / 1.0-type forespørgsler (gælder ikke ver. 1.1)
 Max connections / seconds
 Maks.forbindelser/sekunder
 Maximum number of links
-Maksimal antal links
+Maksimale antal af links
 Pause after downloading..
-Pause efter download...
+Pause efter overførsel...
 Hide passwords
-Skjul adgangskoder
+Skjul passwords
 Hide query strings
 Skjul forespørgsels-streng
 Links
@@ -577,29 +577,29 @@ Links
 Build
 Struktur
 Experts Only
-Kun eksperter
+Ekspert indstillinger
 Flow Control
 Flow-kontrol
 Limits
 Begrænsninger
 Browser ID
-Browser-ID
+Browser Identitet
 Scan Rules
 Skanningsregler
 Spider
 Spider
 Log, Index, Cache
-Log, indeks, cache
+Log, Index, Cache
 Proxy
 Proxy
 MIME Types
-MIME-typer
+
 Do you really want to quit WinHTTrack Website Copier?
-Vil du afslutte WinHTTrack Website Copier?
+Vil du afslutte WinHTTrack Website Copier nu?
 Do not connect to a provider (already connected)
-Opret ikke forbindelse til en udbyder (er allerede forbundet)
+Tilslut ikke til en udbyder (Er allerede tilsluttet)
 Do not use remote access connection
-Brug ikke en fjernadgangsforbindelse
+Brug ikke en opkaldsforbindelse
 Schedule the mirroring operation
 Planlæg kopieringen
 Quit WinHTTrack Website Copier
@@ -609,21 +609,21 @@ Tilbage til startsiden
 Click to start!
 Klik for at starte
 No saved password for this connection!
-Der er ikke gemt en adgangskode for denne forbindelse
+Der er ikke gemt et password for denne forbindelse
 Can not get remote connection settings
-Kan ikke hente fjernforbindelsesindstillinger
+Kan ikke indlæse opkaldsindstillinger
 Select a connection provider
-Vælg en forbindelsesudbyder
+Vælg en opkaldsforbindelse (Internetudbyder)
 Start
 Start
 Please adjust connection parameters if necessary,\nthen press FINISH to launch the mirroring operation.
-Justér venligst forbindelsesparameterne hvis det er nødvendigt.\nKlik på Udfør for at starte kopieringen.
+Tilpas opkaldsparametre om nødvendigt.\nKlik på Udfør for at starte kopieringen.\r\n
 Save settings only, do not launch download now.
-Gem indstillingerne, men start ikke download endnu.
+Gem indstillingerne, men start ikke overførslen endnu.
 On hold
-På hold
+Afventer...
 Transfer scheduled for: (hh/mm/ss)
-Overførslen planlagt til: (tt/mm/ss)
+Overførslen planlagt til :(hh/mm/ss)
 Start
 Start
 Connect to provider (RAS)
@@ -633,15 +633,15 @@ Forbind til denne udbyder
 Disconnect when finished
 Afbryd forbindelsen når overførslen er færdig
 Disconnect modem on completion
-Afbryd modem når overførslen er færdig
+Afbryd forbindelsen når overførslen er færdig
 \r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(finder du fejl eller opstår der problemer så kontakt os venligst)\r\n\r\nUdvikling:\r\nBrugerflade (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche og andre bidragydere\r\nMange tak for dansk oversættelse til:\r\nJesper Bramm (bramm@get2net.dk)\r\nscootergrisen
+\r\n(Finder du fejl eller opstår der problemer så kontakt os venligst)\r\n\r\nUdvikling:\r\nGrænseflade (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche og andre bidragsydere\r\nMange tak for dansk oversættelses til:\r\nJesper Bramm (bramm@get2net.dk)
 About WinHTTrack Website Copier
 Om WinHTTrack Website Copier
 Please visit our Web page
-Besøg vores webside
+Besøg vores Web-side
 Wizard query
-Guide-forespørgsel
+Guide forespørgsel
 Your answer:
 Dit svar:
 Link detected..
@@ -657,13 +657,13 @@ Ignorer dom
 Catch this page only
 Gem kun denne side
 Mirror site
-Kopiér websted
+Kopiér web-sted
 Mirror domain
 Kopiér domæne
 Ignore all
 Ignorer alt
 Wizard query
-Guide-forespørgsel
+Guide forespøgsel
 NO
 Nej
 File
@@ -681,23 +681,23 @@ Pause overf
 Exit
 Afslut
 Modify options
-Rediger indstillinger
+Tilpas indstillinger
 View log
-Vis log
+Se log
 View error log
-Vis fejllog
+Se fejl-log
 View file transfers
-Vis filoverførsler
+Se fil-overførsler
 Hide
 Minimér
 About WinHTTrack Website Copier
-Om WinHTTrack Website Copier
+Om WinHTTrack Website Copier...
 Check program updates...
-Søg efter opdateringer...
+Find program opdateringer...
 &Toolbar
-&Værktøjslinje
+&Værktøjslinie
 &Status Bar
-&Statuslinje
+&Statuslinie
 S&plit
 &Opdel
 File
@@ -705,7 +705,7 @@ Filer
 Preferences
 Indstillinger
 Mirror
-Kopiér websted
+Kopiér web-sted
 Log
 Log
 Window
@@ -715,9 +715,9 @@ Hj
 Exit
 Afslut
 Load default options
-Indlæs standardindstillinger
+Indlæs standard indstillinger
 Save default options
-Gem standardindstillinger
+Gem standard indstillinger
 Reset to default options
 Nulstil standardindstillinger
 Load options...
@@ -725,15 +725,15 @@ Indl
 Save options as...
 Gem indstillinger som...
 Language preference...
-Foretrukne sprog...
+Fortrukne sprog...
 Contents...
-Indhold...
+Indhold..
 About WinHTTrack...
 Om WinHTTrack...
 New project\tCtrl+N
 Nyt projekt\tCtrl+N
 &Open...\tCtrl+O
-&Åbn...\tCtrl+O
+&Åben...\tCtrl+O
 &Save\tCtrl+S
 &Gem\tCtrl+S
 Save &As...
@@ -741,13 +741,13 @@ Gem &som...
 &Delete...
 &Slet...
 &Browse sites...
-&Gennemse websteder...
+&Gennemse websteder
 User-defined structure
 Brugerdefineret struktur
 %n\tName of file without file type (ex: image)\r\n%N\tName of file including file type (ex: image.gif)\r\n%t\tFile type only (ex: gif)\r\n%p\tPath [without ending /] (ex: /someimages)\r\n%h\tHost name (ex: www.someweb.com)\r\n%M\tMD5 URL (128 bits, 32 ascii bytes)\r\n%Q\tMD5 query string (128 bits, 32 ascii bytes)\r\n%q\tMD5 small query string (16 bits, 4 ascii bytes)\r\n\r\n%s?\tShort name (ex: %sN)
-%n\tFilnavn uden type(eks: image)\r\n%N\tHele filnavnet inklusive filtype (eks: billede.gif)\r\n%t\tKun filtype (eks: gif)\r\n%p\tSti [uden endelsen /] (eks: /noglebilleder)\r\n%h\tVærts navn (eks: www.eksempel.dk)\r\n%M\tMD5 URL (128 bit, 32 ascii byte)\r\n%Q\tMD5 forespørgsel streng (128 bit, 32 ascii byte)\r\n%q\tMD5 kort forespørgselsstreng (16 bit, 4 ascii byte)\r\n\r\n%s?\tKort navn (eks: %sN)
+%n\tFilnavn uden type(eks: image)\r\n%N\tHele filnavnet inklusive filtype (eks: image.gif)\r\n%t\tKun filtype (eks: gif)\r\n%p\tSti [uden endelsen /] (eks: /someimages)\r\n%h\tVærts navn (eks: www.someweb.com)\r\n%M\tMD5 URL (128 bits, 32 ascii bytes)\r\n%Q\tMD5 forespørgsel streng (128 bits, 32 ascii bytes)\r\n%q\tMD5 kort forespørgselsstreng (16 bits, 4 ascii bytes)\r\n\r\n%s?\tKort navn (eks: %sN)
 Example:\t%h%p/%n%q.%t\n->\t\tc:\\mirror\\www.someweb.com\\someimages\\image.gif
-Eksempel:\t%h%p/%n%q.%t\n->\t\tc:\\mirror\\www.eksempel.dk\\noglebilleder\\billede.gif
+Eksempel:\t%h%p/%n%q.%t\n->\t\tc:\\mirror\\www.someweb.com\\someimages\\image.gif
 Proxy settings
 Proxy-indstillinger
 Proxy address:
@@ -755,19 +755,19 @@ Proxy-adresse
 Proxy port:
 Proxy port
 Authentication (only if needed)
-Godkendelse (kun hvis det er nødvendigt)
+Identifikation (om nødvendigt)
 Login
-Brugernavn
+Brugernavn (Login)
+Password
 Password
-Adgangskode
 Enter proxy address here
 Indtast proxy-adressen her
 Enter proxy port here
 Indtast proxy portnummer her
 Enter proxy login
-Indtast proxy-brugernavn
+Indtast proxy Brugernavn/ login
 Enter proxy password
-Indtast proxy-adgangskode
+Indtast proxy password
 Enter project name here
 Indtast projektets navn her
 Enter saving path here
@@ -777,9 +777,9 @@ V
 Click here to select path
 Klik her for at vælge en stil
 Select or create a new category name, to sort your mirrors in categories
-Vælg eller opret et nyt kategorinavn, for at sortere dine kopierede websteder i kategorier
+
 HTTrack Project Wizard...
-HTTrack-projektguide...
+HTTrack Projektassistent
 New project name:
 Nyt projektnavn
 Existing project name:
@@ -787,13 +787,13 @@ Eksisterende projektnavn:
 Project name:
 Projektnavn:
 Base path:
-Sti til projekt:
+Vælg en fast sti til dine projekter:
 Project category:
-Projektkategori:
+
 C:\\My Web Sites
-C:\\Mine websteder
+C:\\Mine web-steder
 Type a new project name, \r\nor select existing project to update/resume
-Skriv navnet på et nyt projekt, \r\neller vælg at opdatere et eksisterende projekt
+Skriv navnet på et nyt projekt\neller\nvælg at opdatere et eksisterende projekt
 New project
 Nyt projekt
 Insert URL
@@ -801,29 +801,29 @@ Indtast URL
 URL:
 Adresse URL:
 Authentication (only if needed)
-Godkendelse (kun hvis det er nødvendigt)
+Identifikation (om nødvendigt)
 Login
-Brugernavn
+Brugernavn/ Login
+Password
 Password
-Adgangskode
 Forms or complex links:
 Formularer eller komplekse links:
 Capture URL...
-Fang URL...
+Fang URL
 Enter URL address(es) here
-Indtast URL-adresse(r) her
+Indtast URL address(er) her
 Enter site login
-Indtast websted-brugernavn
+Indtast web-site Login
 Enter site password
-Indtast websted-adgangskode
+Indtast web-site password
 Use this capture tool for links that can only be accessed through forms or javascript code
-Brug dette værktøj til at 'fange' links der kun kan opnås adgang til via formularer eller JavaScript-kode
+Brug dette værktøj til at 'fange' links der kun kan opnåes adgang til via formularer eller javascript-kode
 Choose language according to preference
 Vælg dit foretrukne sprog
 Catch URL!
 'Fang' URL!
 Please set temporary browser proxy settings to the following values (Copy/Paste Proxy Address and Port).\nThen click on the Form SUBMIT button in your browser page, or click on the specific link you want to capture.
-Sæt venligst browserens proxy indstillinger til følgende værdier:(Kopiér/Indsæt proxy-adresse og port).\nKlik på  Form SUBMIT knappen på din browser-side,  eller klik på specifikke link du ønsker at hente.\r\n\r\n
+Sæt venligst browserens proxy indstillinger til følgende værdier:(Kopiér/Sæt ind Proxy Addresse og Port).\nKlik på  Form SUBMIT knappen på din browser-side,  eller klik på specifikke link du ønsker at hente.\r\n\r\n
 This will send the desired link from your browser to WinHTTrack.
 Dette vil sende det ønskede link fra din browser til WinHTTrack.
 ABORT
@@ -837,9 +837,9 @@ Kan ikke finde Hj
 Unable to save parameters!
 Kan ikke gemme parametrene!
 Please drag only one folder at a time
-Træk kun én mappe ad gangen
+Træk kun én mappe ad gangen !
 Please drag only folders, not files
-Træk kun mapper, ikke filer
+Træk kun mapper, ikke filer !
 Please drag folders only
 Træk kun mapper
 Select user-defined structure?
@@ -851,80 +851,80 @@ Er du sikker p
 Too manu URLs, cannot handle so many links!!
 For mange URL' er, WinHTTrack kan ikke håndtere så mange links!!!
 Not enough memory, fatal internal error..
-Ikke nok hukommelse, fatal intern fejl...
+Ikke mere hukommelse, alvorlig intern fejl er opstået...
 Unknown operation!
-Ukendt handling!
+Ukendt handling !
 Add this URL?\r\n
 Tilføj denne URL?\r\n
 Warning: main process is still not responding, cannot add URL(s)..
-Advarsel:  Processen svarer stadigvæk ikke ,URL'en kan ikke tilføjes...
+Advarsel:  Processen svarer stadigvæk ikke ,URL'en kan ikke tilføjes....
 Type/MIME associations
-Type/MIME-tilknytning
+Type/MIME tilknytning
 File types:
 Fil typer:
 MIME identity:
-MIME-identitet:
+MIME Identitet:
 Select or modify your file type(s) here
 Vælg eller ændrer dine filtype(r) her
 Select or modify your MIME type(s) here
-Vælg elle ændrer dine MIME-type(r) her
+Vælg elle ændrer dine MIME type(r) her
 Go up
 Gå op
 Go down
 Gå ned
 File download information
-Fil-downloadinformation
+Fil overførselsinformation
 Freeze Window
 Frys vindue
 More information:
 Mere information
 Welcome to WinHTTrack Website Copier!\n\nPlease click on the NEXT button to\n\n- start a new project\n- or resume a partial download
-Velkommen til WinHTTrack Website Copier!\n\nKlik på Næste for at for at\n\n-starte et nyt projekt\n-eller genoptage et delvist download.
+Velkommen til WinHTTrack Website Copier!\n\Klik på Næste for at for at\n-Starte et nyt projekt\neller opdatere et eksisterende projekt.
 File names with extension:\nFile names containing:\nThis file name:\nFolder names containing:\nThis folder name:\nLinks on this domain:\nLinks on domains containing:\nLinks from this host:\nLinks containing:\nThis link:\nALL LINKS
-Filnavne med 'efternavn':\nFilnavne der indeholder:\nDette filnavn:\nMappenavne der indeholder:\nDette mappenavn:\nLinks på dette domæne:\nLinks på dette domæne der indeholder:\nLinks fra denne vært:\nLinks der indeholder:\nDette Link:\nAlle Links*/
+Filnavne med 'efternavn' :\nFilnavne der indeholder:\nDette filnavn:\nMappenavne der indeholder:\nDette mappenavn:\nLinks på dette domæne:\nLinks på dette domæne der indeholder:\nLinks fra denne vært:\nLinks der indeholder:\nDette Link:\nAlle Links*/
 Show all\nHide debug\nHide infos\nHide debug and infos
 Vis alle\nSkjul fejlfinding\nSkjul information\nSkjul fejlfinding og information
 Site-structure (default)\nHtml in web/,       images/other files in web/images/\nHtml in web/html,   images/other in web/images\nHtml in web/,       images/other in web/\nHtml in web/,       images/other in web/xxx, where xxx is the file extension\nHtml in web/html,   images/other in web/xxx\nSite-structure, without www.domain.xxx/\nHtml in site_name/, images/other files in site_name/images/\nHtml in site_name/html, images/other in site_name/images\nHtml in site_name/, images/other in site_name/\nHtml in site_name/, images/other in site_name/xxx\nHtml in site_name/html, images/other in site_name/xxx\nAll files in web/, with random names (gadget !)\nAll files in site_name/, with random names (gadget !)\nUser-defined structure..
-Websted-struktur (standard)\nHtml i web/,       images/other-filer i web/images/\nHtml i web/html,   images/other i web/images\nHtml i web/,       images/other i web/\nHtml i web/,       images/other i web/xxx, hvor xxx er filendelsen\nHtml i web/html,   images/other i web/xxx\nWebsted-struktur, uden www.domæne.xxx/\nHtml i webstednavn/, images/other-filer i webstednavn/images/\nHtml i webstednavn/html, images/other i webstednavn/images\nHtml i webstednavn/, images/other i webstednavn/\nHtml i webstednavn/, images/other i webstednavn/xxx\nHtml i webstednavn/html, images/other i webstednavn/xxx\nAlle filer in web/, med tilfældige navne (gadget !)\nAlle filer i webstednavn/, med tilfældige navne (gadget !)\nBrugerdefineret struktur...
+Site-Struktur (Standard)\nHtml i web/, Billeder og andre i web/images/\nHtml i web/html, Billeder og andre i web/images\nHtml i web/, Billeder og andre i web/\nHtml i web/, Billeder og andre i web/xxx, med xxx hvor Dateityp\nHtml i web/html, Billeder og andre in web/xxx\nSite-Struktur, uden www.domain.xxx/\nHtml i site_name/, Billeder og andre i site_name/images/\nHtml i site_name/html, Billeder og andre i site_name/images\nHtml i site_name/, Billeder og andre i site_name/\nHtml i site_name/, Billeder og andre i site_name/xxx\nHtml i site_name/html, Billeder og andre i site_name/xxx\nAlle Dateien in web/, mit Zufallsnamen (Spielerei!)\nAlle Dateien in site_name/, mit Zufallsnamen (Spielerei!)\nBrugerdefineret Struktur...
 Just scan\nStore html files\nStore non html files\nStore all files (default)\nStore html files first
-ust skan\nGem html-filer\nGem ikke-html-filer\nGem alle filer (standard)\nGem html-filer først
+ust skan\nGem html filer\nGem ikke-html filer\nGem alle filer (standard)\nGem html filer først
 Stay in the same directory\nCan go down (default)\nCan go up\nCan both go up & down
-Bliv i det samme bibliotek\nKan gå ned (standard]\nKan gå op\nKan gå både op og ned
+Bliv i det samme bibliotek\nKan gå ned(standard]\nKan gå op\nKan gå både op og ned
 Stay on the same address (default)\nStay on the same domain\nStay on the same top level domain\nGo everywhere on the web
 Bliv på den samme adresse[standard]\nBliv på på samme domæne\nBliv på samme top level domæne\n Gå overalt på internettet.
 Never\nIf unknown (except /)\nIf unknown
 Aldrig\nUkendt (undtaget /]\nhvis ukendt
 no robots.txt rules\nrobots.txt except wizard\nfollow robots.txt rules
-Ingen robots.txt-regler\nrobots.txt med undtagelse af guiden\nfølg reglerne i robots.txt
+Ingen robots.txt regler\nrobots.txt med undtagelse af giuden\nfølg rotots.txt reglerne
 normal\nextended\ndebug
 Normal\nUdvidet\nFejlfinding
 Download web site(s)\nDownload web site(s) + questions\nGet individual files\nDownload all sites in pages (multiple mirror)\nTest links in pages (bookmark test)\n* Continue interrupted download\n* Update existing download
-Download websted(er)\nDownload websted(er) + spørgsmål\nHent enkelte filer\nDownload alle websteder på sider (flere kopieret websteder)\nTest links på siderne (bogmærke test)\n* Fortsæt afbrudt projekt\n* Opdater tidligere projekt
+Overfør web site(s)\nOverfør web site(s) + sprørgsmål\nHent enkelte filer\nOverfør alle sider (multiple mirror)\nTest links på siderne (bookmark test)\n* Forsæt afbrudt projekt\n* Opdater tidligere projekt
 Relative URI / Absolute URL (default)\nAbsolute URL / Absolute URL\nAbsolute URI / Absolute URL\nOriginal URL / Original URL
-Relativ URL / absolut URL (standard)\nAbsolut URL / absolut URL\nAbsolut URL / absolut URL\nOriginal URL / original URL
+Relativ URL / Absolut URL (standard)\nAbsolut URL / Absolut URL\nAbsolut URL / Absolut URL\nOriginal URL / Original URL
 Open Source offline browser
-Open source-offline-browser
+
 Website Copier/Offline Browser. Copy remote websites to your computer. Free.
-Webstedskopiering/offline-browser. Kopiér fjern-websteder til din computer. Gratis.
+
 httrack, winhttrack, webhttrack, offline browser
-httrack, winhttrack, webhttrack, offline-browser
+
 URL list (.txt)
-URL-liste (.txt)
+
 Previous
-Forrige
+
 Next
-Næste
+
 URLs
-URL'er
+
 Warning
-Advarsel
+
 Your browser does not currently support javascript. For better results, please use a javascript-aware browser.
-Din browser understøtter ikke JavaScript, på nuværende tidspunkt. Brug venligst en browser som forstår JavaScript, for at få et bedre resultat.
+
 Thank you
-Tak
+
 You can now close this window
-Du kan nu lukke vinduet
+
 Server terminated
-Server lukket
-A fatal error has occurred during this mirror
-Det opstod en fatal fejl under kopieringen
+
+A fatal error has occured during this mirror
+

lang/Deutsch.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Spiegelung der Website läuft [%s, %s Byte]
 Site mirroring finished!
 Kopiervorgang beendet
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
 Beim Kopieren der Webseiten ist ein Problem aufgetreten\n
 \nDuring:\n
 \r\n\nWährend:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Kopiervorgang abgeschlossen.\n'Beenden' beendet WinHTTrack.\nIn den Protokolldateien können Sie prüfen, ob Probleme auftraten.\n\nDanke, dass Sie WinHTTrack benutzt haben!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * KOPIERVORGANG ABGEBROCHEN! * *\r\nDer aktuelle temporäre Cache wird für eine künftige Aktualisierung gebraucht. Er enthält nur Daten, die während der soeben abgebrochenen Sitzung heruntergeladen wurden.\r\nEin früher angelegter Cache enthält unter Umständen vollständigere Informationen; wenn Sie diese nicht verlieren wollen, müssen Sie sie wiederherstellen und den aktuellen Cache löschen.\r\n[Hinweis: Dazu werden einfach die Dateien hts-cache/new.* gelöscht]\r\n\r\nWollen Sie den vor dieser Sitzung erzeugten Cache wiederherstellen?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * FEHLER BEIM KOPIEREN! * *\r\nDie aktuelle Webseitenkopie ist leer. Wenn es sich um eine Aktualisierung gehandelt hat, ist die letzte Kopie wiederhergestellt worden.\r\nMögliche Ursachen: Entweder wurde(n) die erste(n) Seite(n) nicht gefunden, oder es gab ein Problem mit der Verbindung.\r\n=> Vergewissern Sie sich, dass die Website noch existiert, und/oder überprüfen Sie die Einstellungen für den Proxy! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \r\n\n\nTipp: Ein Klick auf [Protokoll zeigen] zeigt Warnungen und Fehlermeldungen an
@@ -926,5 +926,5 @@ You can now close this window
 Sie können dieses Fenster jetzt schließen
 Server terminated
 Der Server wurde beendet
-A fatal error has occurred during this mirror
+A fatal error has occured during this mirror
 Fataler Fehler während der Webseiten-Kopie

lang/Eesti.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Saidi kopeerimine [%s, %s baiti]
 Site mirroring finished!
 Saidikopeerimine on lõpetatud!
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
 Saidikopeerimise käigus tekkis probleem\n
 \nDuring:\n
 \nOperatsioonil:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Kopeerimisoperatsioon on lõpetatud.\nKliki Välju, et sulgeda WinHTTrack.\nVaata logifaili veendumaks, et kõik on korras.\n\nTänan WinHTTrack'i kasutamise eest!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * KOPEERIMINE KATKESTATUD! * *\r\nPraegune ajutine cache on vajalik igasuguse uuendamise jaoks ja sisaldab ainult käesoleva katkestatud seansi jooksul tiritud andmeid.\r\nEelmine cache võib sisaldada põhjalikumat informatsiooni; kui sa ei taha seda informatsiooni kaotada, tuleb see taastada ja kustutada praegune cache.\r\n[Märkus: Seda on siin lihtne teha, kustutades hts-cache/new.* failid]\r\n\r\nKas arvad, et eelmine cache võib sisaldada põhjalikumat informatsiooni, ja kas tahad seda taastada?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * KOPEERIMISE VIGA! * *\r\nHTTrack leidis, et praegune veebikoopia on tühi. Kui see on uuendus, taastatakse eelmine koopia.\r\nPõhjus: esimest lehekülge ei leitud, või on ühenduse probleemid.\r\n=> Veendu, et veebisait ikka alles on, ja/või kontrolli proxy seadistust! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nVihje: Hoiatuste ja veateadete nägemiseks kliki [Vaata logifaili]
@@ -711,9 +711,9 @@ Log
 Window
 A&ken
 Help
-Abi
+&Abi
 Exit
-Välju
+&Välju
 Load default options
 Laadi vaikimisi seaded
 Save default options
@@ -926,5 +926,5 @@ You can now close this window
 
 Server terminated
 
-A fatal error has occurred during this mirror
+A fatal error has occured during this mirror
 

lang/English.txt

@@ -196,8 +196,8 @@ Site mirroring in progress [%s, %s bytes]
 Site mirroring in progress [%s, %s bytes]
 Site mirroring finished!
 Site mirroring finished!
-A problem occurred during the mirroring operation\n
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
+A problem occured during the mirroring operation\n
 \nDuring:\n
 \nDuring:\n
 \nSee the log file if necessary.\n\nClick FINISH to quit WinHTTrack Website Copier.\n\nThanks for using WinHTTrack!
@@ -206,8 +206,8 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) if necessary to ensure that everything is OK.\n\nThanks for using WinHTTrack!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nTip: Click [View log file] to see warning or error messages
 Error deleting a hts-cache/new.* file, please do it manually
@@ -372,8 +372,6 @@ Create a Start Page
 Create a Start Page
 Create a word database of all html pages
 Create a word database of all html pages
-Build a complete RFC822 mail (MHT/EML) archive of the mirror
-Build a complete RFC822 mail (MHT/EML) archive of the mirror
 Create error logging and report files
 Create error logging and report files
 Generate DOS 8-3 filenames ONLY
@@ -422,12 +420,6 @@ Browser identity
 Browser identity
 Comment to be placed in each HTML file
 Comment to be placed in each HTML file
-Languages accepted by the browser
-Languages accepted by the browser
-Additional HTTP headers to be sent in each requests
-Additional HTTP headers to be sent in each requests
-HTTP referer to be sent for initial URLs
-HTTP referer to be sent for initial URLs
 Back to starting page
 Back to starting page
 Save current preferences as default values
@@ -488,8 +480,6 @@ Make an index
 Make an index
 Make a word database
 Make a word database
-Build a mail archive
-Build a mail archive
 Log files
 Log files
 DOS names (8+3)
@@ -518,12 +508,6 @@ Identity
 Identity
 HTML footer
 HTML footer
-Languages
-Languages
-Additional HTTP Headers
-Additional HTTP Headers
-Default referer URL
-Default referer URL
 N# connections
 N# connections
 Abandon host if error
@@ -944,35 +928,5 @@ You can now close this window
 You can now close this window
 Server terminated
 Server terminated
-A fatal error has occurred during this mirror
-A fatal error has occurred during this mirror
-View Documentation
-View Documentation
-Go To HTTrack Website
-Go To HTTrack Website
-Go To HTTrack Forum
-Go To HTTrack Forum
-View License
-View License
-Beware: you local browser might be unable to browse files with embedded filenames
-Beware: you local browser might be unable to browse files with embedded filenames
-Recreated HTTrack internal cached resources
-Recreated HTTrack internal cached resources
-Could not create internal cached resources
-Could not create internal cached resources
-Could not get the system external storage directory
-Could not get the system external storage directory
-Could not write to:
-Could not write to:
-Read-only media (SDCARD)
-Read-only media (SDCARD)
-No storage media (SDCARD)
-No storage media (SDCARD)
-HTTrack may not be able to download websites until this problem is fixed
-HTTrack may not be able to download websites until this problem is fixed
-HTTrack: mirror '%s' stopped!
-HTTrack: mirror '%s' stopped!
-Click on this notification to restart the interrupted mirror
-Click on this notification to restart the interrupted mirror
-HTTrack: could not save profile for '%s'!
-HTTrack: could not save profile for '%s'!
+A fatal error has occured during this mirror
+A fatal error has occured during this mirror

lang/Finnish.txt

@@ -196,7 +196,7 @@ Site mirroring in progress [%s, %s bytes]
 Sivun peilaus käynnissä [%s, %s tavua]
 Site mirroring finished!
 Sivun peilaus valmis!
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
 Ongelma peilausoperaation aikana\n
 \nDuring:\n
 \nAikana:\n
@@ -206,7 +206,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Peilausoperaatio valmis.\nPaina poistu sulkeaksesi WinHTTrackin.\nKatso lokitiedosto(j)a varmistaaksesi, että kaikki on kunnossa.\n\nKiitoksia WinHTTrackin käytöstä!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * PEILI KESKEYTETTY! * *\r\nNykyistä välimuistia tarvitaan päivitysoperaatioihin ja se sisältää tietoa vain äsken keskeytetystä imuroinnista.\r\nAiempi välimuisti saattaa sisältää täydellisempää tietoa; jos et halua menettää tätä tietoa, sinun pitää palauttaa se ja poistaa nykyinen välimuisti.\r\n[Huomaa: Tämän voi helposti tehdä nyt poistamalla hts-cache/new.*-tiedostot]\r\n\r\nLuuletko, että edellinen välimuisti sisältäisi täydellisempää tietoa, ja että haluat palauttaa sen?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * PEILIVIRHE! * *\r\nHTTrack huomasi, että nykyinen peili on tyhjä. Jos se oli päivitys, edellinen peli on palautettu.\r\nSyy: ensimmäiset sivut eivät löytyneet tai tapahtui yhteysvirhe.\r\n=> Varmista että nettisivu on yhä olemassa ja tarkista välityspalvelinasetuksesi! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nVinkki: Paina [Näytä lokitiedosto] nähdäksesi varoitus- ja virheviestit
@@ -671,7 +671,7 @@ EI
 File
 &Tiedosto
 Options
-Valinnat
+&Valinnat
 Log
 &Loki
 Window
@@ -681,7 +681,7 @@ O&hje
 Pause transfer
 Pysäytä siirto
 Exit
-Poistu
+&Poistu
 Modify options
 &Muokkaa valintoja
 View log
@@ -713,9 +713,9 @@ Log
 Window
 &Ikkuna
 Help
-Ohje
+O&hje
 Exit
-Poistu
+&Poistu
 Load default options
 &Lataa vakioasetukset
 Save default options
@@ -928,6 +928,6 @@ You can now close this window
 Voit nyt sulkea tämän ikkunan
 Server terminated
 Palvelin lopetettu
-A fatal error has occurred during this mirror
+A fatal error has occured during this mirror
 Tällä peilillä tapahtui vakava virhe
 

lang/Francais.txt

@@ -196,7 +196,7 @@ Site mirroring in progress [%s, %s bytes]
 Copie du site en cours (%s, %s octets)
 Site mirroring finished!
 Copie du site terminée!
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
 Incident durant la copie du site\n
 \nDuring:\n
 Durant:\n
@@ -206,7 +206,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 la copie du site est terminée\nCliquez sur OK pour quitter WinHTTrack\nConsultez au besoin les fichiers journaux pour vérifier que tout s'est bien passé\n\nMerci d'utiliser WinHTTrack!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * COPIE INTERROMPUE! * *\r\nLe cache temporaire actuel est nécessaire pour toute mise à jour et ne contient que les données téléchargées durant la présente session interrompue.\r\nIl est possible que le cache précédent contienne des données plus complètes; si vous ne voulez pas perdre ces données, vous devez le restaurer et effacer le cache actuel.\r\n[Note: Cette opération peut être facilement effectuée ici en effacant les fichiers hts-cache/new.*]\r\n\r\nPensez-vous que le cache précédent pourrait contenir des informations plus complètes, et voulez-vous le restaurer?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * ERREUR DE COPIE! * *\r\nHTTrack a détecté que la copie courante était vide. Si il s'agissait d'une mise à jour, l'ancienne copie a été restaurée.\r\nRaison: soit la (les) première(s) page(s) n'ont pu être téléchargées, soit un problème de connexion est survenu.\r\n=> Vérifiez que le site existe toujours, et/ou vérifiez les réglages du proxy! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \nConseil: sélectionnez la commande 'Voir le fichier journal' pour visionner les messages d'erreur et d'avertissement
@@ -420,10 +420,6 @@ Browser identity
 Identifiants du Navigateur Internet
 Comment to be placed in each HTML file
 Commentaire de page placé dans chaque fichier HTML
-Languages accepted by the browser
-Langues acceptée par le navigateur
-Additional HTTP headers to be sent in each requests
-En-têtes HTTP additionnels à envoyer dans chaque requête
 Back to starting page
 Retour à la page de démarrage
 Save current preferences as default values
@@ -512,10 +508,6 @@ Identity
 Identification
 HTML footer
 En-tête HTML
-Languages
-Langues
-Additional HTTP Headers
-En têtes HTTP additionnels
 N# connections
 Nombre de connexions
 Abandon host if error
@@ -729,7 +721,7 @@ Utiliser les options par d
 Save default options
 Enregistrer en tant qu'options par défaut
 Reset to default options
-Initialiser les options par défaut
+Charger les options par défaut
 Load options...
 Charger les options
 Save options as...
@@ -751,7 +743,7 @@ Enregistrer &sous...
 &Delete...
 &Effacer...
 &Browse sites...
-&Explorer sites...
+&Browse sites...
 User-defined structure
 Définir une structure personnalisée
 %n\tName of file without file type (ex: image)\r\n%N\tName of file including file type (ex: image.gif)\r\n%t\tFile type only (ex: gif)\r\n%p\tPath [without ending /] (ex: /someimages)\r\n%h\tHost name (ex: www.someweb.com)\r\n%M\tMD5 URL (128 bits, 32 ascii bytes)\r\n%Q\tMD5 query string (128 bits, 32 ascii bytes)\r\n%q\tMD5 small query string (16 bits, 4 ascii bytes)\r\n\r\n%s?\tShort name (ex: %sN)
@@ -936,43 +928,5 @@ You can now close this window
 Vous pouvez maintenant fermer cette fenêtre
 Server terminated
 Serveur arrêté
-A fatal error has occurred during this mirror
+A fatal error has occured during this mirror
 Une erreur critique est intervenue durant l'aspiration
-View Documentation
-Lire la documentation
-Go To HTTrack Website
-Visiter le site de HTTrack
-Go To HTTrack Forum
-Visiter le forum de HTTrack
-View License
-Lire la license
-Beware: you local browser might be unable to browse files with embedded filenames
-Attention: il se pourrait que votre navigateur soit incapable de lire les fichiers contenant des espaces
-Recreated HTTrack internal cached resources
-Cache des ressources interne recréé
-Could not create internal cached resources
-Impossible de créer le cache des ressources interne
-Could not get the system external storage directory
-Impossible de localuser le système de stockage externe
-Could not write to:
-Impossible d'écrire dans:
-Read-only media (SDCARD)
-Média en lecture seule (SDCARD)
-No storage media (SDCARD)
-Pas de média (SDCARD)
-HTTrack may not be able to download websites until this problem is fixed
-Il se peut que HTTrack soit incapable de télécharger des sites tant que ce problème n'est pas réglé
-HTTrack: mirror '%s' stopped!
-HTTrack: miroir '%s' stoppé!
-Click on this notification to restart the interrupted mirror
-Cliquez sur cette notification pour redémarrer la copie interrompue
-HTTrack: could not save profile for '%s'!
-HTTrack: impossible de sauver le profil pour '%s'
-Build a complete RFC822 mail (MHT/EML) archive of the mirror
-Construire une archive email complète (MHT/EML) au format RFC822
-HTTP referer to be sent for initial URLs
-Champ HTTP referer a envoyer pour les URL initiales
-Build a mail archive
-Construire une archive mail
-Default referer URL
-Champ referer par défaut

lang/Greek.txt

@@ -196,7 +196,7 @@ Site mirroring in progress [%s, %s bytes]
 Αντιγραφή τοποθεσίας σε εξέλιξη [%s, %s bytes]
 Site mirroring finished!
 Η αντιγραφή της τοποθεσίας τελείωσε!
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
 Δημιουργήθηκε ένα πρόβλημα κατά την διαδικασία αντιγραφής\n
 \nDuring:\n
 \nΚατα τη διάρκεια:\n
@@ -206,7 +206,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Η διαδικασία αντιγραφής τέλειωσε.\nΚλικ στο Έξοδος για να εγκαταλείψετε το WinHTTrack.\nΔείτε το αρχείο γεγονότων αν είναι απαραίτητο, έτσι ώστε να επιβεβαιώσετε ότι όλα είναι εντάξει.\n\nΣας ευχαριστώ για την χρήση του WinHTTrack!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * Η ΑΝΤΙΓΡΑΦΗ ΕΓΚΑΤΑΛΕΙΦΘΗΚΕ! * *\r\nΗ παρούσα προσωρινή cache είναι απαραίτητη για κάθε λειτουργία ανανέωσης και περιλαμβάνει μόνο δεδομένα που κατέβηκαν κατά τη διάρκεια της τωρινής εγκαταλελειμένης περιόδου.\r\nΗ προηγούμενη cache ίσως περιέχει πιο ολοκληρωμένες πληροφορίες. Αν δεν θέλετε να χάσετε αυτές τις πληροφορίες, πρέπει να να τις ανακτήσετε και να διαγράψετε την παρούσα cache.\r\n[Σημείωση: Αυτό μπορεί να γίνει εύκολα σβήνοντας τα αρχεία hts-cache/new.*]\r\n\r\nΝομίζετε πως η προηγούμενη cache ίσως περιέχει πιο ολοκληρωμένες πληροφορίες και θέλετε να την ανακτήσετε;
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * ΣΦΑΛΜΑ ΑΝΤΙΓΡΑΦΗΣ * *\r\nΤο WinHTTrack ανακάλυψε πως το παρόν αντίγραφο είναι άδειο. Αν ήταν μια ανανέωση, το προηγούμενο αντίγραφο ανακτήθηκε.\r\nΛόγος: Οι πρώτη(ες) σελίδα(ες) είτε δεν βρέθηκαν ή υπήρξε πρόβλημα κατά την σύνδεση.\r\n=> Επιβεβαιώστε ότι η τοποθεσία υπάρχει ακόμα και/ή ελέγξτε τις ρυθμίσεις του proxy σας! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nΣυμβουλή: Κλικ στο [Προβολή αρχείο γεγονότων] για να δείτε μηνύματα προειδοποιήσεων ή λαθών
@@ -928,5 +928,5 @@ You can now close this window
 Τώρα μπορείτε να κλείσετε αυτό το παράθυρο
 Server terminated
 Ακυρώθηκε από τον εξυπηρετητή
-A fatal error has occurred during this mirror
+A fatal error has occured during this mirror
 Ένα καταστροφικό σφάλμα προκλήθηκε κατά την αντιγραφή αυτού του τόπου

lang/Italiano.txt

@@ -41,7 +41,7 @@ Eliminare il progetto vuoto %s?
 Action not yet implemented
 Azione non ancora possibile
 Error deleting this project
-C'è stato un errore durante l'eliminazione di questo progetto
+C'é stato un errore durante l'eliminazione di questo progetto
 Select a rule for the filter
 Seleziona le regole per il filtro
 Enter keywords for the filter
@@ -81,7 +81,7 @@ Esempio:
 gif\r\nWill match all GIF files
 gif\r\nTroverà tutti i file gif
 blue\r\nWill find all files with a matching 'blue' sub-string such as 'bluesky-small.jpeg'
-blue\r\nTroverà tutti i file contenenti 'blue', es. 'bluesky-small.jpeg'
+blue\r\nTroverà tutti i file contenenti blue, es. 'bluesky-small.jpeg'
 bigfile.mov\r\nWill match the file 'bigfile.mov', but not 'bigfile2.mov'
 bigfile.mov\r\nTroverà il file 'bigfile.mov', ma non 'bigfile2.mov'
 cgi\r\nWill find links with folder name matching sub-string 'cgi' such as /cgi-bin/somecgi.cgi
@@ -97,7 +97,7 @@ www.someweb.com\r\nTrover
 someweb\r\nWill find any links with matching sub-string such as www.someweb.com/.., www.test.abc/fromsomeweb/index.html, www.test.abc/test/someweb.html etc.
 someweb\r\nTroverà tutti i collegamenti come www.someweb.com/.., www.test.abc/fromsomeweb/index.html, www.test.abc/test/someweb.html etc.
 www.test.com/test/someweb.html\r\nWill only find the 'www.test.com/test/someweb.html' file. Note that you have to type the complete path (URL + site path)
-www.test.com/test/someweb.html\r\nTroverà soltanto il collegamenti www.test.com/test/someweb.html. Nota che bisogna inserire sia l'indirizo (www.xxx.yyy), che il percorso (/test/someweb.html)
+www.test.com/test/someweb.html\r\nTroverà soltanto il collegamenti www.test.com/test/someweb.html. Notate che bisogna inserire sia l'indirizo (www.xxx.yyy), che il percorso (/test/someweb.html)
 All links will match
 Tutti i collegamenti verranno rifiutati/accettati
 Add exclusion filter
@@ -121,7 +121,7 @@ Clicca per uscire da WinHTTrack Website Copier
 View log files
 Visualizza i file di log
 Browse HTML start page
-Visualizza la pagina HTML iniziale
+Visualizza la pagina html iniziale
 End of mirror
 Fine del mirror
 View log files
@@ -169,15 +169,15 @@ pronto
 error
 errore
 Receiving files..
-Ricezione dei file..
+Ricezione dei file
 Parsing HTML file..
 Analisi file html..
 Purging files..
-Pulizia file..
+Pulizia file
 Loading cache in progress..
 Caricamento della cache in corso...
 Parsing HTML file (testing links)..
-Analisi file HTML (test dei collegamenti)..
+Analisi file HTML (test dei collegamenti)
 Pause - Toggle [Mirror]/[Pause download] to resume operation
 Pausa (seleziona [Aiuto]/[Pausa] per continuare)
 Finishing pending transfers - Select [Cancel] to stop now!
@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Mirror in corso [%s, %s bytes]
 Site mirroring finished!
 Mirror del sito completato!
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
 C'è stato un problema durante il mirror\n
 \nDuring:\n
 Durante:\n
@@ -204,8 +204,8 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Il mirror è finito.\nClicca OK per uscire da WinHTTrack.\nGuarda i file log per assicurarti che tutto è andato a buon fine.\n\nGrazie per aver usato WinHTTrack!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * MIRROR INTERROTTO! * *\r\nLa cache corrente è necessaria per le operazioni di aggiornamento e contiene solo i dati scaricati durante questa sessione interrotta.\r\nLa cache precedente potrebbe contenere informazioni più complete; se non vuoi perdere quelle informazioni, devi ripristinarla e cancellare la cache corrente.\r\n[Nota: per fare questo, cancella il contenuto della cartella hts-cache del mirror]\r\n\r\nPensi che la cache precedente possa contenere informazioni più complete e vuoi ripristinarla?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
-* * ERRORE NEL MIRROR! * *\r\nHTTrack ha stabilito che il mirror attuale è vuoto. Se questo è un aggiornamento, il mirror precedente è stato ripristinato.\r\nMotivo: la prima pagina(e) non è stata trovata oppure c'è stato un problema durante la connessione\r\n=> Assicurati che il sito esista ancora, e/o verificate le vostre impostazioni del proxy! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * ERRORE NEL MIRROR! * *\r\nHTTrack ha stabilito che il mirror attuale è vuoto. Se questo è un'aggiornamento, il mirror precedente è stato ripristinato.\r\nMotivo: la prima pagina(e) non è stata trovata oppure c'è stato un problema durante la connessione\r\n=> Assicuratevi che il sito esista ancora, e/o verificate le vostre impostazioni del proxy! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \nSuggerimento: Clicca [Visualizza filr di log] per vedere i messaggi di avvertimento o di errore
 Error deleting a hts-cache/new.* file, please do it manually
@@ -374,10 +374,10 @@ Create error logging and report files
 Crea file di log per segnalare errori e informazioni
 Generate DOS 8-3 filenames ONLY
 Genera solo nomi di file in formato 8.3
-Generate ISO 9660 filenames ONLY for CDROM medias
+Generate ISO9660 filenames ONLY for CDROM medias
 Genera nomi di file in formato ISO9660 per i CDROM
 Do not create HTML error pages
-Non generare pagine d'errore HTML
+Non generare pagine d'errore html
 Select file types to be saved to disk
 Seleziona i tipi di file da scrivere sul disco
 Select parsing direction
@@ -399,7 +399,7 @@ Annulla tutti i collegamenti dal host se
 Maximum number of retries on non-fatal errors
 Massimo numero di tentativi nel caso di un errore non fatale
 Maximum size for any single HTML file
-Massima dimensione per una pagina HTML
+Massima dimensione per una pagina html
 Maximum size for any single non-HTML file
 La dimensione massima per un file
 Maximum amount of bytes to retrieve from the Web
@@ -417,7 +417,7 @@ Massimo numero di link che possono essere testati (non salvati!)
 Browser identity
 Identità del browser
 Comment to be placed in each HTML file
-Piè di pagina per ogni file HTML
+Pié di pagina per ogni file HTML
 Back to starting page
 Torna alla pagina iniziale
 Save current preferences as default values
@@ -455,13 +455,13 @@ Usa richieste HTTP/1.0, limita le capacit
 Attempt to limit retransfers through several tricks (file size test..)
 Tentativo di limitare il numero di ripetizioni dei trasferimenti, usando alcuni truchi (test della dimensione del file..)
 Attempt to limit the number of links by skipping similar URLs (www.foo.com==foo.com, http=https ..)
-Tentativo di limitare il numero di link, saltando URL simili (www.foo.com==foo.com, http=https ..)
+
 Write external links without login/password
 Salva link esterni senza login e password
 Write internal links without query string
 Salva i link interni senza stringa query
 Get non-HTML files related to a link, eg external .ZIP or pictures
-Scarica file non-HTML vicino ai collegamenti (es. .ZIP o immagini presenti all'esterno)
+Scarica file non-html vicino ai collegamenti (es. .ZIP o immagini presenti all'esterno)
 Test all links (even forbidden ones)
 Verifica tutti i collegamenti (anche quelli vietati)
 Try to catch all URLs (even in unknown tags/code)
@@ -483,7 +483,7 @@ File di log
 DOS names (8+3)
 Nomi DOS (8+3)
 ISO9660 names (CDROM)
-Nomi ISO 9660 (CDROM)
+Nomi ISO9660 (CDROM)
 No error pages
 Senza pagine d'errore
 Primary Scan Rule
@@ -505,7 +505,7 @@ Limiti
 Identity
 Identità
 HTML footer
-Piè di pagina HTML
+Pié di pagina HTML
 N# connections
 N° di connessioni
 Abandon host if error
@@ -521,7 +521,7 @@ Usa proxy per trasferimenti ftp
 TimeOut(s)
 TimeOut
 Persistent connections (Keep-Alive)
-Connessioni persistenti (keep-alive)
+Connessioni persistenti (Keep-alive)
 Reduce connection time and type lookup time using persistent connections
 Riduci tempo di connessione e il tempo di verifica del tipo usando la connessione persistente
 Retries
@@ -597,7 +597,7 @@ Tipi MIME
 Do you really want to quit WinHTTrack Website Copier?
 Vuoi veramente uscire da WinHTTrack?
 Do not connect to a provider (already connected)
-Non effettuare la connessione al provider (già connesso)
+non effettuare la connessione al provider (già connesso)
 Do not use remote access connection
 Non usare la connessione di accesso remoto
 Schedule the mirroring operation
@@ -633,7 +633,7 @@ Connessione a questo provider:
 Disconnect when finished
 Disconnetti alla fine
 Disconnect modem on completion
-Disconnetti il modem quando il mirror è finito
+Disconnetti il modem quando il mirror é finito
 \r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
 \r\n(informateci degli errori o problemi)\r\n\rSviluppo:\r\nInterfacccia: Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Italian translations to:\r\nWitold Krakowski (wkrakowski@libero.it)
 About WinHTTrack Website Copier
@@ -645,7 +645,7 @@ La domanda del wizard
 Your answer:
 La vostra risposta:
 Link detected..
-È stato trovato un collegamento
+É stato trovato un collegamento
 Choose a rule
 Scegli una regola
 Ignore this link
@@ -721,17 +721,17 @@ Salva le opzioni di default
 Reset to default options
 Azzera le opzioni di default
 Load options...
-Carica le opzioni...
+Carica le opzioni
 Save options as...
 Salva le opzioni come...
 Language preference...
-Preferenza di lingua...
+Preferenza di lingua
 Contents...
-Indice...
+Indice
 About WinHTTrack...
-Informazioni su WinHTTrack...
+Informazioni su WinHTTrack Website Copier
 New project\tCtrl+N
-Nuovo progetto\tCtrl+N
+Nuovo progetto / importa...
 &Open...\tCtrl+O
 &Apri...\tCtrl+O
 &Save\tCtrl+S
@@ -751,7 +751,7 @@ Esempio:\t%h%p/%n.%t\n->\t\tc:\\mirror\\www.someweb.com\\someimages\\image.gif
 Proxy settings
 Preferenze del proxy
 Proxy address:
-Indirizzo del proxy
+L'Indirizzo del proxy
 Proxy port:
 Port del proxy
 Authentication (only if needed)
@@ -777,9 +777,9 @@ Seleziona da qui un progetto esistente da aggiornare
 Click here to select path
 Clicca qui per selezionare il percorso
 Select or create a new category name, to sort your mirrors in categories
-Seleziona o crea una nuova categoria
+
 HTTrack Project Wizard...
-Wizard per progetto HTTrack...
+Wizard per progetto HTTrack
 New project name:
 Il nome del nuovo progetto:
 Existing project name:
@@ -789,7 +789,7 @@ Il nome del progetto:
 Base path:
 Il percorso base:
 Project category:
-Categoria del progetto:
+
 C:\\My Web Sites
 C:\\Mie pagine Web
 Type a new project name, \r\nor select existing project to update/resume
@@ -837,7 +837,7 @@ Impossibile trovare i file di aiuto
 Unable to save parameters!
 Impossibile salvare i parametri!
 Please drag only one folder at a time
-Trascina solo una cartella alla volta
+Trascina solo una cartella
 Please drag only folders, not files
 Trascina solo una cartella, non un file
 Please drag folders only
@@ -851,7 +851,7 @@ Vuoi veramente selezionare la struttura definita dall'utente?
 Too manu URLs, cannot handle so many links!!
 Troppi URL, il programma non può servire così tanti collegamenti!
 Not enough memory, fatal internal error..
-Troppa poca memoria, errore interno fatale...
+Troppa poca memoria, grave errore interno...
 Unknown operation!
 Operazione sconosciuta!
 Add this URL?\r\n
@@ -879,7 +879,7 @@ Congela la finestra
 More information:
 Più informazioni:
 Welcome to WinHTTrack Website Copier!\n\nPlease click on the NEXT button to\n\n- start a new project\n- or resume a partial download
-Benvenuti nel WinHTTrack Website Copier!\n\nClicca sul pulsante NEXT per iniziare o continuare un progetto
+Benvenuti nel WinHTTrack Website Copier\n\nClicca sul pulsante NEXT per iniziare o continuare un progetto
 File names with extension:\nFile names containing:\nThis file name:\nFolder names containing:\nThis folder name:\nLinks on this domain:\nLinks on domains containing:\nLinks from this host:\nLinks containing:\nThis link:\nALL LINKS
 Tipi di file con l'estensione:\nNomi di file contenenti:\nQuesto nome di file:\nNomi di cartella contenenti:\nQuesto nome cartella:\nCollegamenti in questo dominio:\nCollegamenti nei domini contenenti:\nCollegamenti da questo host:\nCollegamenti contenenti:\nQuesto collegamento:\nTUTTI I COLLEGAMENTI
 Show all\nHide debug\nHide infos\nHide debug and infos
@@ -887,7 +887,7 @@ Mostra tutto\nNascondi il debug\nNascondi le informazioni\nNascondi il debug e l
 Site-structure (default)\nHtml in web/,       images/other files in web/images/\nHtml in web/html,   images/other in web/images\nHtml in web/,       images/other in web/\nHtml in web/,       images/other in web/xxx, where xxx is the file extension\nHtml in web/html,   images/other in web/xxx\nSite-structure, without www.domain.xxx/\nHtml in site_name/, images/other files in site_name/images/\nHtml in site_name/html, images/other in site_name/images\nHtml in site_name/, images/other in site_name/\nHtml in site_name/, images/other in site_name/xxx\nHtml in site_name/html, images/other in site_name/xxx\nAll files in web/, with random names (gadget !)\nAll files in site_name/, with random names (gadget !)\nUser-defined structure..
 Struttura del sito (default)\nHtml nel web,      immagini/altri file nel web/immagini/\nHtml nel web/html,  immagini/altro nel web/immagini\nHtml nel web/,        immagini/altro nel web/\nHtml nel web/,        immagini/altro nel web/xxx, dove xxx è l'estensione del file\nHtml nel web/html,   immagini/altro nel web/xxx\nStruttura del sito, senza www.dominio.xxx/\nHtml nel nome_del_sito/,immagini/altri file nel nome_del_sito/immagini/\nHtml nel nome_del_sito/html,immagini/altro nel nome_del file/immagini\nHtml nel nome_del_sito/,immagini/altro nel nome_del_sito/\nHtml nel nome_del_sito/,immagini/altro nel nome_del_sito/xxx\nHtml nel nome_del_sito/html,immagini/altro nel nome_del_sito/xxx\nTutti i file nel web/,con nomi casuali\nTutti i file nel nome_del_sito/,con nomi casuali\nStruttura definita dall'utente..
 Just scan\nStore html files\nStore non html files\nStore all files (default)\nStore html files first
-Soltanto scanning\nSalva file html\nSalva file non-html\nSalva tutti i file (default)\nSalva prima i file HTML
+Soltanto scanning\nSalva file html\nSalva file non-html\nSalva tutti i file (default)\nSalva prima i file html
 Stay in the same directory\nCan go down (default)\nCan go up\nCan both go up & down
 Non uscire dalla directory\nPuoi andare giù nella struttura (default)\nPuoi salire\nPuoi sia scendere che salire
 Stay on the same address (default)\nStay on the same domain\nStay on the same top level domain\nGo everywhere on the web
@@ -901,7 +901,7 @@ normale\navanzato\ndebug
 Download web site(s)\nDownload web site(s) + questions\nGet individual files\nDownload all sites in pages (multiple mirror)\nTest links in pages (bookmark test)\n* Continue interrupted download\n* Update existing download
 Scarica il sito(i) web\nScarica il sito(i) (con richieste)\nScarica file separati\nScarica tutti i siti nelle pagine (mirror multiplo)\nVerifica i collegamenti nelle pagine (test dei bookmark)\n* Continua un download interrotto\n* Aggiorna un download esistente
 Relative URI / Absolute URL (default)\nAbsolute URL / Absolute URL\nAbsolute URI / Absolute URL\nOriginal URL / Original URL
-URL Relativo / URL Assoluto (default)\nURL Assoluto / URL Assoluto\nURL Assoluto / URL Assoluto\nURL Originale / URL Originale
+URL Relativo / URL Assoluto (default)\nURL Assoluto / URL Assoluto\nURL Assoluto 7 URL Assoluto\nURL Originale / URL Originale
 Open Source offline browser
 Browser offline open source
 Website Copier/Offline Browser. Copy remote websites to your computer. Free.
@@ -926,5 +926,5 @@ You can now close this window
 Puoi chiudere questa finestra adesso
 Server terminated
 Server disconnesso
-A fatal error has occurred during this mirror
+A fatal error has occured during this mirror
 Si è verificato un errore fatale durante la copia