Merged revisions 1288,1291-1293,1296-1297,1303,1305-1307,1311,1313-1315 via svnmerge from

http://proliant/svn/httrack/trunk

........
  r1288 | roche | 2014-07-20 11:19:50 +0200 (dim., 20 juil. 2014) | 3 lines
  
  Additional message when crashing to report the issue.
........
  r1291 | roche | 2014-07-28 22:56:38 +0200 (lun., 28 juil. 2014) | 4 lines
  
  Fixed 'strlen(copyBuff) == qLen failed at htslib.c:3458' assertion failure.
  Rationale: strncat(..., ..., (size_t) -1) does not behave gently on Linux, and is not equivalent to strcat(..., ...) when using optimizations (could it be a corner-case bug ?)
........
  r1292 | roche | 2014-07-28 22:56:57 +0200 (lun., 28 juil. 2014) | 3 lines
  
  Added testcase for 'strlen(copyBuff) == qLen failed at htslib.c:3458'
........
  r1293 | roche | 2014-07-28 23:02:00 +0200 (lun., 28 juil. 2014) | 3 lines
  
  3.48.19
........
  r1296 | roche | 2014-07-28 23:16:44 +0200 (lun., 28 juil. 2014) | 3 lines
  
  Reverted useless check.
........
  r1297 | roche | 2014-07-28 23:19:57 +0200 (lun., 28 juil. 2014) | 3 lines
  
  Updated date
........
  r1303 | roche | 2014-08-16 10:16:08 +0200 (sam., 16 août 2014) | 3 lines
  
  Fixed "configure script cannot detect libressl" (junk4me46806)
........
  r1305 | roche | 2014-08-27 19:01:26 +0200 (mer., 27 août 2014) | 4 lines
  
  Do not include execinfo.h if missing (Android)
  Do not use strnlen if missing (Mac OS X 10.6.8) ( nthpowers)
........
  r1306 | roche | 2014-08-27 20:10:28 +0200 (mer., 27 août 2014) | 3 lines
  
  Off-by-one.
........
  r1307 | roche | 2014-08-27 20:22:56 +0200 (mer., 27 août 2014) | 3 lines
  
  Fixed HAVE_STRNLEN (sheesh, we don't have strnlen.o)
........
  r1311 | roche | 2014-10-04 09:39:18 +0200 (sam., 04 oct. 2014) | 1 line
  
  Fixed typo
........
  r1313 | roche | 2014-10-15 19:33:35 +0200 (mer., 15 oct. 2014) | 3 lines
  
  Typo :)
........
  r1314 | roche | 2014-10-15 21:17:29 +0200 (mer., 15 oct. 2014) | 8 lines
  
  Fixed webhttrack incompatibility with Chrome
    * closes:#53
  
  Also fixed HTML-escaping issues inside webhttrack
  
  Rationale: The webhttrack script made the wrong assumption that once the "browse" command returned, it meant the user killed the navigation window, and it had to kill the server itself. However, modern browsers tend to "attach" to an existing session (creating a new tab, for example, within an existing window), causing the browsing command to return immediately, thus causing the server to be killed immediately by the webhttrack script. I have rewritten the logic behind, and now the server is able to kill himself if the parent script dies, AND if the browsing client did not make any activity for two minutes. The "activity" can be any browser/refreshed page, or the internal "ping" iframe (which pings the server every 30 seconds). With this model, we *should* be compatible with old browsers, and modern ones.
........
  r1315 | roche | 2014-10-15 21:44:22 +0200 (mer., 15 oct. 2014) | 3 lines
  
  3.48.20
........

.github/workflows/ci.yml

@@ -1,87 +0,0 @@
-# Build and test on x86-64 and arm64, and lint the shell scripts.
-name: CI
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-  workflow_dispatch:
-
-# Least privilege: the workflow only needs to read the repo.
-permissions:
-  contents: read
-
-# Cancel superseded runs on the same branch or PR.
-concurrency:
-  group: ci-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: build (${{ matrix.arch }}, ${{ matrix.cc }})
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { arch: x86-64, runner: ubuntu-24.04, cc: gcc }
-          - { arch: x86-64, runner: ubuntu-24.04, cc: clang }
-          - { arch: arm64, runner: ubuntu-24.04-arm, cc: gcc }
-          - { arch: arm64, runner: ubuntu-24.04-arm, cc: clang }
-    env:
-      CC: ${{ matrix.cc }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Install build dependencies
-        run: |
-          set -euo pipefail
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends \
-            build-essential clang autoconf automake libtool autoconf-archive \
-            zlib1g-dev libssl-dev
-
-      - name: Configure
-        run: |
-          set -euo pipefail
-          # autoreconf installs the automake test-driver (not committed) and
-          # validates configure.ac, so "make check" works on a fresh checkout.
-          autoreconf -fi
-          ./configure
-
-      - name: Build
-        run: make -j"$(nproc)"
-
-      - name: Test
-        run: make check
-
-      - name: Print the test log on failure
-        if: failure()
-        run: cat tests/test-suite.log 2>/dev/null || true
-
-  lint:
-    name: lint (shellcheck, shfmt)
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install linters
-        env:
-          SHFMT_VERSION: v3.8.0
-        run: |
-          set -euo pipefail
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends shellcheck
-          # shfmt is not packaged in apt; fetch a pinned release binary.
-          curl -fsSL -o /tmp/shfmt \
-            "https://github.com/mvdan/sh/releases/download/${SHFMT_VERSION}/shfmt_${SHFMT_VERSION}_linux_$(dpkg --print-architecture)"
-          sudo install -m 0755 /tmp/shfmt /usr/local/bin/shfmt
-
-      # Lint the scripts we maintain; the legacy scripts are a separate cleanup.
-      - name: shellcheck
-        run: shellcheck man/makeman.sh tools/mkdeb.sh tests/*.test tests/check-network.sh
-
-      - name: shfmt
-        run: shfmt -d -i 4 man/makeman.sh tools/mkdeb.sh

.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-2017, 2020-2021 Free
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
-Software Foundation, Inc.
+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'
+   Briefly, the shell commands `./configure; make; make install' should
-should configure, build, and install this package.  The following
+configure, build, and install this package.  The following
-more-detailed instructions are generic; see the 'README' file for
+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.
+those values to create a `Makefile' in each directory of the package.
-It may also create one or more '.h' files containing system-dependent
+It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script 'config.status' that
+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
+file `config.log' containing compiler output (useful mainly for
-debugging 'configure').
+debugging `configure').
 
-   It can also use an optional file (typically called 'config.cache' and
+   It can also use an optional file (typically called `config.cache'
-enabled with '--cache-file=config.cache' or simply '-C') that saves the
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
-results of its tests to speed up reconfiguring.  Caching is disabled by
+the results of its tests to speed up reconfiguring.  Caching is
-default to prevent problems with accidental use of stale cache files.
+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
+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
+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
+   The file `configure.ac' (or `configure.in') is used to create
-'configure' by a program called 'autoconf'.  You need 'configure.ac' if
+`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate 'configure' using a newer version of
+you want to change it or regenerate `configure' using a newer version
-'autoconf'.
+of `autoconf'.
 
    The simplest way to compile this package is:
 
-  1. 'cd' to the directory containing the package's source code and type
+  1. `cd' to the directory containing the package's source code and type
-     './configure' to configure the package for your system.
+     `./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
+     source code directory by typing `make clean'.  To also remove the
-     files that 'configure' created (so you can compile the package for
+     files that `configure' created (so you can compile the package for
-     a different kind of computer), type 'make distclean'.  There is
+     a different kind of computer), type `make distclean'.  There is
-     also a 'make maintainer-clean' target, but that is intended mainly
+     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
+   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here is
+by setting variables in the command line or in the environment.  Here
-an example:
+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
+the `configure' script.  `configure' automatically checks for the
-code in the directory that 'configure' is in and in '..'.  This is known
+source code in the directory that `configure' is in and in `..'.  This
-as a "VPATH" build.
+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
+"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single '-arch' option to the preprocessor.  Like
+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
+   By default, `make install' installs the package's commands under
-'/usr/local/bin', include files under '/usr/local/include', etc.  You
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than '/usr/local' by giving
+can specify an installation prefix other than `/usr/local' by giving
-'configure' the option '--prefix=PREFIX', where PREFIX must be an
+`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
+options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run 'configure --help' for a list of the directories
+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
+you can set and what kinds of files go in them.  In general, the
-for these options is expressed in terms of '${prefix}', so that
+default for these options is expressed in terms of `${prefix}', so that
-specifying just '--prefix' will affect all of the other directory
+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',
+`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of '${prefix}', must each be overridden at install time
+but not in terms of `${prefix}', must each be overridden at install
-for the entire installation to be relocated.  The approach of makefile
+time for the entire installation to be relocated.  The approach of
-variable overrides for each directory variable is required by the GNU
+makefile variable overrides for each directory variable is required by
-Coding Standards, and ideally causes no recompilation.  However, some
+the GNU Coding Standards, and ideally causes no recompilation.
-platforms have known limitations with the semantics of shared libraries
+However, some platforms have known limitations with the semantics of
-that end up requiring recompilation when using this method, particularly
+shared libraries that end up requiring recompilation when using this
-noticeable in packages that use GNU Libtool.
+method, particularly noticeable in packages that use GNU Libtool.
 
-   The second method involves providing the 'DESTDIR' variable.  For
+   The second method involves providing the `DESTDIR' variable.  For
-example, 'make install DESTDIR=/alternate/directory' will prepend
+example, `make install DESTDIR=/alternate/directory' will prepend
-'/alternate/directory' before all installation names.  The approach of
+`/alternate/directory' before all installation names.  The approach of
-'DESTDIR' overrides is not required by the GNU Coding Standards, and
+`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}'
+when some directory options were not specified in terms of `${prefix}'
-at 'configure' time.
+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
+with an extra prefix or suffix on their names by giving `configure' the
-option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-   Some packages pay attention to '--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
-'configure', where FEATURE indicates an optional part of the package.
+`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to '--with-PACKAGE' options, where 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
+is something like `gnu-as' or `x' (for the X Window System).  The
-'README' should mention any '--enable-' and '--with-' options that 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
+you can use the `configure' options `--x-includes=DIR' and
-'--x-libraries=DIR' to specify their locations.
+`--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
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-is not installed, it is recommended to use the following options in
+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 timestamps as their
+   HP-UX `make' updates targets which have the same time stamps as
-prerequisites, which makes it generally unusable when shipped generated
+their prerequisites, which makes it generally unusable when shipped
-files such as 'configure' are involved.  Use GNU 'make' instead.
+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
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-workaround.  If GNU CC is not installed, it is therefore recommended to
+a workaround.  If GNU CC is not installed, it is therefore recommended
-try
+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'
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your 'PATH', put it _after_ '/usr/bin'.
+in your `PATH', put it _after_ `/usr/bin'.
 
-   On Haiku, software installed for all users goes in '/boot/common',
+   On Haiku, software installed for all users goes in `/boot/common',
-not '/usr/local'.  It is recommended to use the following options:
+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
+`--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:
+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
+   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
+`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,
+   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called 'config.site' that gives
+you can create a site shell script called `config.site' that gives
-default values for variables like 'CC', 'cache_file', and 'prefix'.
+default values for variables like `CC', `cache_file', and `prefix'.
-'configure' looks for 'PREFIX/share/config.site' if it exists, then
+`configure' looks for `PREFIX/share/config.site' if it exists, then
-'PREFIX/etc/config.site' if it exists.  Or, you can set the
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
-'CONFIG_SITE' environment variable to the location of the site script.
+`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all 'configure' scripts look for a 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
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-Autoconf limitation.  Until the limitation is lifted, you can use this
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
-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'
+`--help'
-'-h'
+`-h'
-     Print a summary of all of the options to 'configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
 
-'--help=short'
+`--help=short'
-'--help=recursive'
+`--help=recursive'
      Print a summary of the options unique to this package's
-     'configure', and exit.  The 'short' variant lists options used only
+     `configure', and exit.  The `short' variant lists options used
-     in the top level, while the 'recursive' variant lists options also
+     only in the top level, while the `recursive' variant lists options
-     present in any nested packages.
+     also present in any nested packages.
 
-'--version'
+`--version'
-'-V'
+`-V'
-     Print the version of Autoconf used to generate the 'configure'
+     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'
+`--config-cache'
-'-C'
+`-C'
-     Alias for '--cache-file=config.cache'.
+     Alias for `--cache-file=config.cache'.
 
-'--quiet'
+`--quiet'
-'--silent'
+`--silent'
-'-q'
+`-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'
+`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names:: for
+     Use DIR as the installation prefix.  *note Installation Names::
-     more details, including other options available for fine-tuning the
+     for more details, including other options available for fine-tuning
-     installation locations.
+     the installation locations.
 
-'--no-create'
+`--no-create'
-'-n'
+`-n'
      Run the configure checks, but stop before creating any output
      files.
 
-'configure' also accepts some other, not widely useful, options.  Run
+`configure' also accepts some other, not widely useful, options.  Run
-'configure --help' for more details.
+`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,13 +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 tools/mkdeb.sh
+		httrack-doc.html lang.def
-
-# Build the signed Debian packages from a clean source export. Pass the signing
-# key and other options through DEB_FLAGS, e.g.:
-#   make deb DEB_FLAGS="--key BB71C7E6CB1AD8FAF53FE42A60C3AA7180598EFB"
-# See tools/mkdeb.sh --help for all options.
-DEB_FLAGS =
-deb:
-	$(SHELL) $(top_srcdir)/tools/mkdeb.sh $(DEB_FLAGS)
-.PHONY: deb

Makefile.in

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 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 = { \
+am__make_dryrun = \
-  if test -z '$(MAKELEVEL)'; then \
+  { \
-    false; \
+    am__dry=no; \
-  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 \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        bs=\\; \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
     esac; \
-  fi; \
+    test $$am__dry = yes; \
-  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))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -88,44 +51,34 @@ 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 \
+	compile 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 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/snprintf.m4 \
-	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac
+	$(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 \
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
+	html-recursive info-recursive install-data-recursive \
-	install-data-recursive install-dvi-recursive \
+	install-dvi-recursive install-exec-recursive \
-	install-exec-recursive install-html-recursive \
+	install-html-recursive install-info-recursive \
-	install-info-recursive install-pdf-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
+	ps-recursive uninstall-recursive
-	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -133,34 +86,12 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-  $(RECURSIVE_TARGETS) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-  $(RECURSIVE_CLEAN_TARGETS) \
+	distdir dist dist-all distcheck
-  $(am__extra_recursive_targets)
+ETAGS = etags
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+CTAGS = 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)`
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
-	COPYING ChangeLog INSTALL NEWS README compile config.guess \
-	config.sub install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -170,7 +101,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,'; \
@@ -198,9 +128,6 @@ 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$$'
@@ -208,7 +135,6 @@ 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@
@@ -217,11 +143,9 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CFLAGS_PIE = @CFLAGS_PIE@
 CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
 DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
@@ -235,10 +159,8 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HTTPS_SUPPORT = @HTTPS_SUPPORT@
@@ -250,7 +172,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@
@@ -259,7 +180,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@
@@ -336,7 +256,6 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -349,14 +268,8 @@ 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 tools/mkdeb.sh
+		httrack-doc.html lang.def
 
-
-# Build the signed Debian packages from a clean source export. Pass the signing
-# key and other options through DEB_FLAGS, e.g.:
-#   make deb DEB_FLAGS="--key BB71C7E6CB1AD8FAF53FE42A60C3AA7180598EFB"
-# See tools/mkdeb.sh --help for all options.
-DEB_FLAGS = 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -376,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)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -396,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
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+	@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
@@ -420,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.
+# into them and run `make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
+# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
+# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
+#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the 'make' command line.
+# (2) otherwise, pass the desired values on the `make' command line.
-$(am__recursive_targets):
+$(RECURSIVE_TARGETS):
-	@fail=; \
+	@fail= failcom='exit 1'; \
-	if $(am__make_keepgoing); then \
+	for f in x $$MAKEFLAGS; do \
-	  failcom='fail=yes'; \
+	  case $$f in \
-	else \
+	    *=* | --[!k]*);; \
-	  failcom='exit 1'; \
+	    *k*) failcom='fail=yes';; \
-	fi; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -453,12 +364,57 @@ $(am__recursive_targets):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-ID: $(am__tagged_files)
+$(RECURSIVE_CLEAN_TARGETS):
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
+	@fail= failcom='exit 1'; \
-tags: tags-recursive
+	for f in x $$MAKEFLAGS; do \
-TAGS: tags
+	  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 \
@@ -474,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; \
@@ -486,11 +447,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-recursive
+ctags: CTAGS
-
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-CTAGS: ctags
+		$(TAGS_FILES) $(LISP)
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	$(am__define_uniq_tagged_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
@@ -499,35 +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'`; \
@@ -592,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
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
+	$(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)
+	$(am__remove_distdir)
-
-dist-zstd: distdir
-	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
-	$(am__post_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" \
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	               "deprecated." >&2
+	$(am__remove_distdir)
-	@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)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
+	$(am__remove_distdir)
 
-dist dist-all:
+dist dist-all: distdir
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
+	$(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
@@ -640,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*) \
@@ -650,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 -R a-w $(distdir); chmod u+w $(distdir)
-	chmod u+w $(distdir)
+	mkdir $(distdir)/_build
-	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+	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 \
+	  && $(am__cd) $(distdir)/_build \
-	  && ../../configure \
+	  && ../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 \
@@ -691,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'
@@ -826,30 +760,25 @@ 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 \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	am--refresh check check-am clean clean-cscope clean-generic \
+	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-xz dist-zip dist-zstd distcheck distclean \
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
-	distclean-generic distclean-hdr distclean-libtool \
+	distclean-libtool distclean-tags distcleancheck distdir \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
-	dvi-am html html-am info info-am install install-am \
+	install install-am install-data install-data-am install-dvi \
-	install-data install-data-am install-dvi install-dvi-am \
+	install-dvi-am install-exec install-exec-am install-html \
-	install-exec install-exec-am install-html install-html-am \
+	install-html-am install-info install-info-am install-man \
-	install-info install-info-am install-man install-pdf \
+	install-pdf install-pdf-am install-ps install-ps-am \
-	install-pdf-am install-ps install-ps-am install-strip \
+	install-strip installcheck installcheck-am installdirs \
-	installcheck installcheck-am installdirs installdirs-am \
+	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am
-	tags tags-am uninstall uninstall-am
 
-.PRECIOUS: Makefile
-
-deb:
-	$(SHELL) $(top_srcdir)/tools/mkdeb.sh $(DEB_FLAGS)
-.PHONY: deb
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

README

@@ -1,16 +1,9 @@
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998-2014 Xavier Roche and other contributors
 
 Welcome to HTTrack Website Copier!
 
 
-Ethical use:
-
-We ask that you do not use HTTrack to grab email addresses or to collect any
-other private information on people. This would disgrace our work and the many
-hours we have spent on it.
-
-
 Information:
 
 The folder html/ contains the documentation
@@ -52,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,9 +1,10 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2012-03-05.13; # UTC
 
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +18,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
@@ -53,7 +54,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN* | MSYS*)
+	  CYGWIN*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@@ -67,7 +68,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/* | msys/*)
+	cygwin/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -112,11 +113,6 @@ func_cl_dashl ()
       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
 
@@ -255,8 +251,7 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -340,9 +335,9 @@ exit $ret
 # 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:

config.h.in

@@ -3,6 +3,9 @@
 /* Check for dlopen in c */
 #undef DLLIB
 
+/* Check for ftime */
+#undef FTIME
+
 /* Define if pointers to integers require aligned access */
 #undef HAVE_ALIGNED_ACCESS_REQUIRED
 
@@ -18,8 +21,8 @@
 /* Define to 1 if you have the `z' library (-lz). */
 #undef HAVE_LIBZ
 
-/* Define to 1 if you have the <minix/config.h> header file. */
+/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MINIX_CONFIG_H
+#undef HAVE_MEMORY_H
 
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
@@ -27,9 +30,6 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -58,9 +58,6 @@
 /* Define to 1 if you have the `vsnprintf' function. */
 #undef HAVE_VSNPRINTF
 
-/* Define to 1 if you have the <wchar.h> header file. */
-#undef HAVE_WCHAR_H
-
 /* Check for in_addr_t */
 #undef HTS_DO_NOT_REDEFINE_in_addr_t
 
@@ -79,9 +76,13 @@
 /* Check for libsocket */
 #undef LIBSOCKET
 
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
 #undef LT_OBJDIR
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* Name of package */
 #undef PACKAGE
 
@@ -109,12 +110,13 @@
 /* Check for setuid */
 #undef SETUID
 
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
 /* The size of `long long', as computed by sizeof. */
 #undef SIZEOF_LONG_LONG
 
-/* Define to 1 if all of the C90 standard headers exist (not just the ones
+/* Define to 1 if you have the ANSI C header files. */
-   required in a freestanding environment). This macro is provided for
-   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* Check for pthread in pthreads */
@@ -124,93 +126,37 @@
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-/* Enable general extensions on macOS.  */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable X/Open compliant socket functions that do not require linking
+/* Enable threading extensions on Solaris.  */
-   with -lxnet on HP-UX 11.11.  */
-#ifndef _HPUX_ALT_XOPEN_SOCKET_API
-# undef _HPUX_ALT_XOPEN_SOCKET_API
-#endif
-/* Identify the host operating system as Minix.
-   This macro does not affect the system headers' behavior.
-   A future release of Autoconf may stop defining this macro.  */
-#ifndef _MINIX
-# undef _MINIX
-#endif
-/* Enable general extensions on NetBSD.
-   Enable NetBSD compatibility extensions on Minix.  */
-#ifndef _NETBSD_SOURCE
-# undef _NETBSD_SOURCE
-#endif
-/* Enable OpenBSD compatibility extensions on NetBSD.
-   Oddly enough, this does nothing on OpenBSD.  */
-#ifndef _OPENBSD_SOURCE
-# undef _OPENBSD_SOURCE
-#endif
-/* Define to 1 if needed for POSIX-compatible behavior.  */
-#ifndef _POSIX_SOURCE
-# undef _POSIX_SOURCE
-#endif
-/* Define to 2 if needed for POSIX-compatible behavior.  */
-#ifndef _POSIX_1_SOURCE
-# undef _POSIX_1_SOURCE
-#endif
-/* Enable POSIX-compatible threading on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
-/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
-#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
-# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
-#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
-# undef __STDC_WANT_IEC_60559_BFP_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
-#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
-# undef __STDC_WANT_IEC_60559_DFP_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
-#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
-# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
-#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
-# undef __STDC_WANT_IEC_60559_TYPES_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
-#ifndef __STDC_WANT_LIB_EXT2__
-# undef __STDC_WANT_LIB_EXT2__
-#endif
-/* Enable extensions specified by ISO/IEC 24747:2009.  */
-#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
-# undef __STDC_WANT_MATH_SPEC_FUNCS__
-#endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable X/Open extensions.  Define to 500 only if necessary
+/* Enable general extensions on Solaris.  */
-   to make mbstate_t available.  */
+#ifndef __EXTENSIONS__
-#ifndef _XOPEN_SOURCE
+# undef __EXTENSIONS__
-# undef _XOPEN_SOURCE
 #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
 

configure.ac

@@ -1,9 +1,9 @@
-AC_PREREQ([2.71])
+AC_PREREQ(2.59)
 
-AC_INIT([httrack], [3.49.8], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
+AC_INIT([httrack], [3.48.20], [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
+Copyright (C) 1998-2014 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
@@ -31,24 +31,16 @@ 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"
+VERSION_INFO="2:48:0"
 AM_MAINTAINER_MODE
 AC_USE_SYSTEM_EXTENSIONS
 
 AC_PROG_CC
 AM_PROG_CC_C_O
-m4_warn([obsolete],
+AC_STDC_HEADERS
-[The preprocessor macro `STDC_HEADERS' is obsolete.
-  Except in unusual embedded environments, you can safely include all
-  ISO C90 headers unconditionally.])dnl
-# Autoupdate added the next two lines to ensure that your configure
-# script's behavior did not change.  They are probably safe to remove.
-AC_CHECK_INCLUDES_DEFAULT
-AC_PROG_EGREP
-
 LT_INIT
 AC_PROG_LN_S
-LT_INIT
+AM_PROG_LIBTOOL
 
 # Export LD_LIBRARY_PATH name or equivalent.
 AC_SUBST(SHLIBPATH_VAR,$shlibpath_var)
@@ -82,21 +74,8 @@ AX_CHECK_COMPILE_FLAG([-Wmissing-parameter-type], [DEFAULT_CFLAGS="$DEFAULT_CFLA
 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_LINK_FLAG([-Wl,--discard-all], [DEFAULT_LDLAGS="$DEFAULT_LDLAGS -Wl,--discard-all"])
-AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-clash-protection"])
+AX_CHECK_LINK_FLAG([-Wl,--no-undefined], [DEFAULT_LDLAGS="$DEFAULT_LDLAGS -Wl,--no-undefined"])
-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"])
@@ -114,9 +93,8 @@ AC_SUBST([AM_CFLAGS])
 #*) AC_DEFINE(HTS_PLATFORM, 3, [Default value used]);;
 #esac
 
-### Probe long long size for 64-bit integer support. SIZEOF_LONG is not probed:
+### Check size of long and long long.
-### it varies by architecture and would break Multi-Arch co-installation of
+AC_CHECK_SIZEOF(long)
-### libhttrack-dev (Debian #1133728). md5.h uses <stdint.h> instead.
 AC_CHECK_SIZEOF(long long)
 
 ### check for in_addr_t
@@ -151,7 +129,8 @@ CHECK_ZLIB()
 ### OpenSSL is explicitly enabled/disabled ?
 AC_MSG_CHECKING(whether to enable https support)
 AC_ARG_ENABLE([https],
-	[AS_HELP_STRING([--enable-https=@<:@yes/no/auto@:>@],[Enable https support @<:@default=yes@:>@])],
+	[AC_HELP_STRING([--enable-https=@<:@yes/no/auto@:>@],
+		[Enable https support @<:@default=yes@:>@])],
 	[
 	case "${enableval}" in
 	no|yes|auto)
@@ -181,7 +160,7 @@ AC_CHECK_LIB(crypto, EVP_get_digestbyname,
 	]
 	)
 LIBS="$LIBS $OPENSSL_LIBS"
-AC_CHECK_LIB(ssl, SSL_CTX_new,
+AC_CHECK_LIB(ssl, SSL_library_init,
 	[
 	OPENSSL_LIBS="$OPENSSL_LIBS -lssl"
 	AC_DEFINE(HTS_USEOPENSSL, 1, [Check for OpenSSL])
@@ -248,6 +227,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]))
@@ -262,7 +245,8 @@ 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],
-	[AS_HELP_STRING([--enable-online-unit-tests=@<:@yes/no/auto@:>@],[Enable online-unit-tests @<:@default=yes@:>@])],
+	[AC_HELP_STRING([--enable-online-unit-tests=@<:@yes/no/auto@:>@],
+		[Enable online-unit-tests @<:@default=yes@:>@])],
 	[
 	case "${enableval}" in
 	no|yes|auto)
@@ -281,7 +265,7 @@ AC_ARG_ENABLE([online-unit-tests],
 AC_SUBST(ONLINE_UNIT_TESTS,$online_unit_tests)
 
 # Final output
-AC_CONFIG_FILES([
+AC_OUTPUT([
 Makefile
 src/Makefile
 man/Makefile
@@ -292,4 +276,3 @@ html/Makefile
 libtest/Makefile
 tests/Makefile
 ])
-AC_OUTPUT

debian/changelog

@@ -1,95 +1,3 @@
-httrack (3.49.8-1) unstable; urgency=medium
-
-  * New upstream release.
-  * Drop the OpenSSL linking exception from the license: OpenSSL 3.0+ is
-    Apache-2.0 and GPL-compatible, so it is no longer needed. httrack is now
-    plain GPL-3.0-or-later. Updated debian/copyright accordingly.
-
- -- Xavier Roche <xavier@debian.org>  Sun, 07 Jun 2026 14:29:24 +0200
-
-httrack (3.49.7-2) unstable; urgency=medium
-
-  * Bump Standards-Version to 4.7.0 (no changes needed).
-  * Switch to debhelper-compat (= 13); drop the dh-autoreconf and
-    autotools-dev build dependencies.
-
- -- Xavier Roche <xavier@debian.org>  Sun, 07 Jun 2026 14:13:39 +0200
-
-httrack (3.49.7-1) unstable; urgency=medium
-
-  * New upstream release.
-  * Make config.h architecture-independent for Multi-Arch: same. closes:#1133728
-  * Fix man page rendering of the -%! security warning. closes:#1061053
-
- -- Xavier Roche <xavier@debian.org>  Sat, 06 Jun 2026 21:03:05 +0200
-
-httrack (3.49.6-1) unstable; urgency=medium
-
-  * Updated to 3.49.6 (3.49-6)
-    Fixed CVE-2017-14062
-
- -- Xavier Roche <xavier@debian.org>  Tue, 11 Mar 2025 19:43:39 +0100
-
-httrack (3.49.5-1) unstable; urgency=medium
-
-  * Updated to 3.49.5 (3.49-5)
-    Fixed CVE-2023-45853
-
- -- Xavier Roche <xavier@debian.org>  Sat, 27 Jan 2024 14:30:23 +0100
-
-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)

debian/compat

@@ -0,0 +1 @@
+8

debian/control

@@ -2,14 +2,14 @@ Source: httrack
 Section: web
 Priority: optional
 Maintainer: Xavier Roche <roche@httrack.com>
-Standards-Version: 4.7.0
+Standards-Version: 3.9.5
-Build-Depends: debhelper-compat (= 13), autoconf, autoconf-archive, automake, libtool, zlib1g-dev, libssl-dev
+Build-Depends: debhelper (>= 8.0.0), dh-autoreconf, autotools-dev, autoconf, autoconf-archive, automake, libtool, zlib1g-dev, libssl-dev
 Homepage: http://www.httrack.com
-Vcs-Git: https://github.com/xroche/httrack.git
+Vcs-Svn: http://httrack.googlecode.com/svn/trunk
+Vcs-Browser: https://code.google.com/p/httrack/source/browse/trunk/src
 
 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 +27,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
-Depends: ${misc:Depends}, ${shlibs:Depends}, webhttrack-common, iceape-browser | iceweasel | icecat | mozilla | firefox | mozilla-firefox | www-browser | sensible-utils
 Replaces: webhttrack-common (<< 3.43.9-2)
 Breaks: webhttrack-common (<< 3.43.9-2)
 Suggests: httrack, httrack-doc
@@ -50,7 +49,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 +56,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 +84,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

@@ -19,3 +19,13 @@ 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.
+
+In addition, as a special exception, Xavier Roche gives permission to
+link the code of this program with the openSSL library (or with
+modified versions of openSSL that use the same license as openSSL),
+and distribute linked combinations including the two.  You must obey
+the GNU General Public License in all respects for all of the code
+used other than openSSL.  If you modify this file, you may extend this
+exception to your version of the file, but you are not obligated to do
+so.  If you do not wish to do so, delete this exception statement from
+your version.

debian/httrack-doc.debhelper.log

@@ -0,0 +1,2 @@
+dh_lintian
+dh_autoreconf

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
+extra-license-file usr/share/httrack/html/license.txt
-httrack-doc: package-contains-documentation-outside-usr-share-doc usr/share/httrack/*
+duplicate-changelog-files usr/share/doc/httrack/changelog.gz usr/share/doc/httrack/history.txt.gz
+extended-description-is-probably-too-short

debian/httrack.debhelper.log

@@ -0,0 +1,2 @@
+dh_lintian
+dh_autoreconf

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.debhelper.log

@@ -0,0 +1,2 @@
+dh_lintian
+dh_autoreconf

debian/libhttrack-dev.files

@@ -1,5 +1,6 @@
 usr/include/httrack
-usr/lib/*/libhttrack.{so}
+usr/lib/libhttrack.{so}
-usr/lib/*/libhtsjava.{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 *
+hardening-no-fortify-functions usr/lib/httrack/libtest/libfilenameiisbug.so.1.0.0
-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/*
-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

debian/libhttrack-swf1.files

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

debian/libhttrack2.debhelper.log

@@ -0,0 +1,2 @@
+dh_lintian
+dh_autoreconf

debian/libhttrack2.files

@@ -1,5 +1,5 @@
-usr/lib/*/libhttrack.so.2.0.49
+usr/lib/libhttrack.so.2.0.48
-usr/lib/*/libhttrack.so.2
+usr/lib/libhttrack.so.2
-usr/lib/*/libhtsjava.so.2.0.49
+usr/lib/libhtsjava.so.2.0.48
-usr/lib/*/libhtsjava.so.2
+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/proxytrack.debhelper.log

@@ -0,0 +1,2 @@
+dh_lintian
+dh_autoreconf

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
 
@@ -81,26 +81,37 @@ install: build
 	mv $(CURDIR)/debian/httrack/usr/share/httrack/html/httrack-doc.html \
 		$(CURDIR)/debian/httrack/usr/share/doc/httrack/httrack-doc.html
 
+	# 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/
 	# 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/*.la
-	rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/*.la
+	rm -f $(CURDIR)/debian/httrack/usr/lib/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 \
+	if ls $(CURDIR)/debian/httrack/usr/lib/*.so >/dev/null 2>/dev/null ; then \
-		rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/*.a ; \
+		rm -f $(CURDIR)/debian/httrack/usr/lib/*.a ; \
 	fi
-	if ls $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/*.so >/dev/null 2>/dev/null ; then \
+	if ls $(CURDIR)/debian/httrack/usr/lib/httrack/*.so >/dev/null 2>/dev/null ; then \
-		rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/*.a ; \
+		rm -f $(CURDIR)/debian/httrack/usr/lib/httrack/*.a ; \
 	fi
-	mv $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/lib* \
+	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
+		$(CURDIR)/debian/httrack/usr/lib/httrack/libtest
-	ln -s /usr/share/httrack/libtest/readme.txt \
+	ln -s ../../../share/httrack/libtest/readme.txt \
-		 $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/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 +143,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.debhelper.log

@@ -0,0 +1,2 @@
+dh_lintian
+dh_autoreconf

debian/webhttrack-common.lintian-overrides

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

debian/webhttrack.debhelper.log

@@ -0,0 +1,2 @@
+dh_lintian
+dh_autoreconf

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-2021 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
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-    exit 1;
+     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.
+   # This is just like dashmstdout with a different argument.
-  dashmflag=-xM
+   dashmflag=-xM
-  depmode=dashmstdout
+   depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-  # This is just like msvisualcpp but w/o cygpath translation.
+   # This is just like msvisualcpp but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
+   # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
+   # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
+   cygpath_u='sed s,\\\\,/,g'
-  depmode=msvisualcpp
+   depmode=msvisualcpp
 fi
 
 if test "$depmode" = msvc7msys; then
-  # This is just like msvc7 but w/o cygpath translation.
+   # This is just like msvc7 but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
+   # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
+   # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
+   cygpath_u='sed s,\\\\,/,g'
-  depmode=msvc7
+   depmode=msvc7
 fi
 
 if test "$depmode" = xlc; then
-  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
-  gccflag=-qmakedep=gcc,-MF
+   gccflag=-qmakedep=gcc,-MF
-  depmode=gcc
+   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
+##   -MM, not -M (despite what the docs say).
-##   supported by the other compilers which use the 'gcc' depmode.
 ## - 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
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-  # letters.
+## 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/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
-    | 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' \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-      | tr "$nl" ' ' >> "$depfile"
+    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/$/:/' \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-      >> "$depfile"
+   >> "$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"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  set_base_from "$object"
+  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
+  if test -f "$tmpdepfile"; then
-  ;;
+    # Each line is of the form 'foo.o: dependent.h'.
-
+    # Do two passes, one to just change these to
-tcc)
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
-  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-  # FIXME: That version still under development at the moment of writing.
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  #        Make that this statement remains true also for stable, released
+  else
-  #        versions.
+    # The sourcefile does not contain any dependencies, so just
-  # It will wrap lines (doesn't matter whether long or short) with a
+    # store a dummy comment line, to avoid errors with the Makefile
-  # trailing '\', as in:
+    # "include basename.Plo" scheme.
-  #
+    echo "#dummy" > "$depfile"
-  #   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
   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
+icc)
-## shell code in configure will try each of these formats in the order
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
-## listed in this file.  A plain '-MD' option would be understood by many
+  # However on
-## compilers, so we must ensure this comes after the gcc and icc options.
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-pgcc)
+  # ICC 7.0 will fill foo.d with something like
-  # Portland's C compiler understands '-MD'.
+  #    foo.o: sub/foo.c
-  # Will always output deps to 'file.d' where file is the root name of the
+  #    foo.o: sub/foo.h
-  # source file under compilation, even if file resides in a subdirectory.
+  # which is wrong.  We want
-  # The object file name does not affect the name of the '.d' file.
+  #    sub/foo.o: sub/foo.c
-  # pgcc 10.2 will output
+  #    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"
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
-  # Use the source, not the object, to determine the base name, since
+  # will emit a similar output, but also prepend the continuation lines
-  # that's sadly what pgcc will do too.
+  # with horizontal tabulation characters.
-  set_base_from "$source"
+  "$@" -MD -MF "$tmpdepfile"
-  tmpdepfile=$base.d
+  stat=$?
-
+  if test $stat -eq 0; then :
-  # For projects that build the same source file twice into different object
+  else
-  # 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
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
+  # Each line is of the form 'foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.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:'.
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
-  # Some versions of the HPUX 10.20 sed can't process this invocation
+    < "$tmpdepfile" > "$depfile"
-  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    s/[ '"$tab"'][ '"$tab"']*/ /g
-    | sed -e 's/$/ :/' >> "$depfile"
+    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"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  set_base_from "$object"
+  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/ \\*$//
+	       s/ \\*$//
-               s/$/:/
+	       s/$/:/
-               p
+	       p
-             }' "$tmpdepfile" >> "$depfile"
+	     }' "$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
+   # The Tru64 compiler uses -MD to generate dependencies as a side
-  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+   # 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
+   # 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.
+   # dependencies in 'foo.d' instead, so we check for that too.
-  # Subdirectories are respected.
+   # Subdirectories are respected.
-  set_dir_from  "$object"
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  set_base_from "$object"
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
-  if test "$libtool" = yes; then
+   if test "$libtool" = yes; then
-    # Libtool generates 2 separate objects for the 2 libraries.  These
+      # With Tru64 cc, shared objects can also be used to make a
-    # two compilations output dependencies in $dir.libs/$base.o.d and
+      # static library.  This mechanism is used in libtool 1.4 series to
-    # in $dir$base.o.d.  We have to check for both files, because
+      # handle both shared and static libraries in a single compilation.
-    # one of the two compilations can be disabled.  We should prefer
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      #
-    # automatically cleaned when .libs/ is deleted, while ignoring
+      # With libtool 1.5 this exception was removed, and libtool now
-    # the former would cause a distcleancheck panic.
+      # generates 2 separate objects for the 2 libraries.  These two
-    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+      # compilations output dependencies in $dir.libs/$base.o.d and
-    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+      # in $dir$base.o.d.  We have to check for both files, because
-    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      # one of the two compilations can be disabled.  We should prefer
-    "$@" -Wc,-MD
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-  else
+      # automatically cleaned when .libs/ is deleted, while ignoring
-    tmpdepfile1=$dir$base.d
+      # the former would cause a distcleancheck panic.
-    tmpdepfile2=$dir$base.d
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-    tmpdepfile3=$dir$base.d
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-    "$@" -MD
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-  fi
+      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=$?
+   stat=$?
-  if test $stat -ne 0; then
+   if test $stat -eq 0; then :
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+   else
-    exit $stat
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-  fi
+      exit $stat
+   fi
 
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-  do
+   do
-    test -f "$tmpdepfile" && break
+     test -f "$tmpdepfile" && break
-  done
+   done
-  # Same post-processing that is required for AIX mode.
+   if test -f "$tmpdepfile"; then
-  aix_post_process_depfile
+      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
+  tr ' ' "$nl" < "$tmpdepfile" | \
-  # correctly.  Breaking it into two sed invocations is a workaround.
+## Some versions of the HPUX 10.20 sed can't process this invocation
-  tr ' ' "$nl" < "$tmpdepfile" \
+## correctly.  Breaking it into two sed invocations is a workaround.
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-    | 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
+  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
-  # correctly.  Breaking it into two sed invocations is a workaround.
+## Some versions of the HPUX 10.20 sed can't process this invocation
-  sed '1,2d' "$tmpdepfile" \
+## correctly.  Breaking it into two sed invocations is a workaround.
-    | tr ' ' "$nl" \
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -705,10 +622,10 @@ cpp)
     esac
   done
 
-  "$@" -E \
+  "$@" -E |
-    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    | sed '$ s: \\$::' > "$tmpdepfile"
+    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 "$@"
+	set fnord "$@"
-        shift
+	shift
-        shift
+	shift
-        ;;
+	;;
     *)
-        set fnord "$@" "$arg"
+	set fnord "$@" "$arg"
-        shift
+	shift
-        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

@@ -3,50 +3,7 @@ HTTrack Website Copier release history:
 --------------------------------------
 
 This file lists all changes and fixes that have been made for HTTrack
-
+3.48-20
-3.49-8
-+ Changed: dropped the obsolete OpenSSL linking exception (OpenSSL 3.0+ is
-  Apache-2.0 and GPL-compatible); httrack is now plain GPLv3-or-later
-
-3.49-7
-+ Fixed: keep generated config.h architecture-independent (Debian #1133728)
-+ Fixed: man page rendered the -%! warning as bogus options (Debian #1061053)
-
-3.49-6
-+ Fixed: puny_decode CVE-2017-14062
-
-3.49-5
-+ Fixed: MiniZip CVE-2023-45853
-+ Lintian fixes, multiple build fixes
-
-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)

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
@@ -21,6 +22,7 @@ HelpHtmlimages_DATA = images/*
 HelpHtmlTxt_DATA = ../greetings.txt ../history.txt ../license.txt
 WebHtml_DATA = server/*.html server/*.js server/*.css
 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
@@ -39,6 +41,6 @@ EXTRA_DIST = $(HelpHtml_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlimages_DATA) \
 install-data-hook:
 	if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
 		( cd $(DESTDIR)$(prefix)/share/httrack \
-			&& $(LN_S) $(htmldir) html \
+			&& $(LN_S) ../doc/httrack html \
 		) \
 	fi

html/Makefile.in

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 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 = { \
+am__make_dryrun = \
-  if test -z '$(MAKELEVEL)'; then \
+  { \
-    false; \
+    am__dry=no; \
-  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 \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        bs=\\; \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
     esac; \
-  fi; \
+    test $$am__dry = yes; \
-  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))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -89,31 +52,19 @@ 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 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/snprintf.m4 \
-	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac
+	$(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,18 @@ am__installdirs = "$(DESTDIR)$(HelpHtmldir)" \
 	"$(DESTDIR)$(HelpHtmlimagesdir)" "$(DESTDIR)$(HelpHtmlimgdir)" \
 	"$(DESTDIR)$(HelpHtmlrootdir)" "$(DESTDIR)$(VFolderEntrydir)" \
 	"$(DESTDIR)$(WebHtmldir)" "$(DESTDIR)$(WebHtmlimagesdir)" \
-	"$(DESTDIR)$(WebIcon16x16dir)" "$(DESTDIR)$(WebIcon32x32dir)" \
+	"$(DESTDIR)$(WebHtmlsfxdir)" "$(DESTDIR)$(WebIcon16x16dir)" \
-	"$(DESTDIR)$(WebIcon48x48dir)" "$(DESTDIR)$(WebPixmapdir)"
+	"$(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,11 +124,9 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CFLAGS_PIE = @CFLAGS_PIE@
 CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
 DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
@@ -193,10 +140,8 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 GREP = @GREP@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HTTPS_SUPPORT = @HTTPS_SUPPORT@
@@ -208,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@
@@ -217,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@
@@ -294,7 +237,6 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -311,6 +253,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
@@ -324,6 +267,7 @@ HelpHtmlimages_DATA = images/*
 HelpHtmlTxt_DATA = ../greetings.txt ../history.txt ../license.txt
 WebHtml_DATA = server/*.html server/*.js server/*.css
 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
@@ -333,7 +277,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
@@ -353,13 +297,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)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -565,6 +510,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=; \
@@ -649,16 +615,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:
+ctags: CTAGS
+CTAGS:
 
-cscope cscopelist:
 
-distdir: $(BUILT_SOURCES)
+distdir: $(DISTFILES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -692,7 +656,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
@@ -749,9 +713,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-WebHtmlimagesDATA install-WebHtmlsfxDATA \
-	install-WebIcon32x32DATA install-WebIcon48x48DATA \
+	install-WebIcon16x16DATA install-WebIcon32x32DATA \
-	install-WebPixmapDATA
+	install-WebIcon48x48DATA install-WebPixmapDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-am
@@ -800,20 +764,20 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 	uninstall-HelpHtmldivDATA uninstall-HelpHtmlimagesDATA \
 	uninstall-HelpHtmlimgDATA uninstall-HelpHtmlrootDATA \
 	uninstall-VFolderEntryDATA uninstall-WebHtmlDATA \
-	uninstall-WebHtmlimagesDATA uninstall-WebIcon16x16DATA \
+	uninstall-WebHtmlimagesDATA uninstall-WebHtmlsfxDATA \
-	uninstall-WebIcon32x32DATA uninstall-WebIcon48x48DATA \
+	uninstall-WebIcon16x16DATA uninstall-WebIcon32x32DATA \
-	uninstall-WebPixmapDATA
+	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 distclean-generic distclean-libtool distdir dvi \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	dvi-am html html-am info info-am install install-HelpHtmlDATA \
-	install install-HelpHtmlDATA install-HelpHtmlTxtDATA \
+	install-HelpHtmlTxtDATA install-HelpHtmldivDATA \
-	install-HelpHtmldivDATA install-HelpHtmlimagesDATA \
+	install-HelpHtmlimagesDATA install-HelpHtmlimgDATA \
-	install-HelpHtmlimgDATA install-HelpHtmlrootDATA \
+	install-HelpHtmlrootDATA install-VFolderEntryDATA \
-	install-VFolderEntryDATA install-WebHtmlDATA \
+	install-WebHtmlDATA install-WebHtmlimagesDATA \
-	install-WebHtmlimagesDATA install-WebIcon16x16DATA \
+	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 \
@@ -822,22 +786,21 @@ 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-WebHtmlimagesDATA uninstall-WebHtmlsfxDATA \
-	uninstall-WebIcon32x32DATA uninstall-WebIcon48x48DATA \
+	uninstall-WebIcon16x16DATA uninstall-WebIcon32x32DATA \
-	uninstall-WebPixmapDATA uninstall-am
+	uninstall-WebIcon48x48DATA uninstall-WebPixmapDATA \
-
+	uninstall-am
-.PRECIOUS: Makefile
 
 
 install-data-hook:
 	if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
 		( cd $(DESTDIR)$(prefix)/share/httrack \
-			&& $(LN_S) $(htmldir) html \
+			&& $(LN_S) ../doc/httrack html \
 		) \
 	fi
 

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
+  N101 Identical to N1 exept that "web" is replaced by the site's name
-  N102 Identical to N2 except 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 except 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 except 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 except 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 except 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
+  N1001 Identical to N1 exept that there is no "web" directory
-  N1002 Identical to N2 except that there is no "web" directory
+  N1002 Identical to N2 exept that there is no "web" directory
-  N1003 Identical to N3 except that there is no "web" directory (option set for g option)
+  N1003 Identical to N3 exept that there is no "web" directory (option set for g option)
-  N1004 Identical to N4 except that there is no "web" directory
+  N1004 Identical to N4 exept that there is no "web" directory
-  N1005 Identical to N5 except that there is no "web" directory
+  N1005 Identical to N5 exept that there is no "web" directory
-  N1099 Identical to N99 except 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
+<p align=justify> The timeout option causes downloads to time out after
-is similar to the above option but allows the pace to be controlled
+a non-response from a download attempt.  30 seconds is pretty reasonable
-rather than the simultanaety.  It is particulsrly useful for long-term
+for many sites.  You might want to increase the number of retries as
-pulls at low rates that allow little impact on remote infrastructure.
+well so that you try again and again after such timeouts. 
-The default is 10 connections per second.
 
 <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
+<p align=justify> This limits the number of connections per second.  It
-a non-response from a download attempt.  30 seconds is pretty reasonable
+is similar to the above option but allows the pace to be controlled
-for many sites.  You might want to increase the number of retries as
+rather than the simultanaety.  It is particulsrly useful for long-term
-well so that you try again and again after such timeouts. 
+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
+  N101 Identical to N1 exept that "web" is replaced by the site's name
-  N102 Identical to N2 except 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 except 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 except 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 except 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 except 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
+  N1001 Identical to N1 exept that there is no "web" directory
-  N1002 Identical to N2 except that there is no "web" directory
+  N1002 Identical to N2 exept that there is no "web" directory
-  N1003 Identical to N3 except that there is no "web" directory (option set for g option)
+  N1003 Identical to N3 exept that there is no "web" directory (option set for g option)
-  N1004 Identical to N4 except that there is no "web" directory
+  N1004 Identical to N4 exept that there is no "web" directory
-  N1005 Identical to N5 except that there is no "web" directory
+  N1005 Identical to N5 exept that there is no "web" directory
-  N1099 Identical to N99 except 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
+  N101 Identical to N1 exept that "web" is replaced by the site's name
-  N102 Identical to N2 except 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 except 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 except 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 except 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 except 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
+  N1001 Identical to N1 exept that there is no "web" directory
-  N1002 Identical to N2 except that there is no "web" directory
+  N1002 Identical to N2 exept that there is no "web" directory
-  N1003 Identical to N3 except that there is no "web" directory (option set for g option)
+  N1003 Identical to N3 exept that there is no "web" directory (option set for g option)
-  N1004 Identical to N4 except that there is no "web" directory
+  N1004 Identical to N4 exept that there is no "web" directory
-  N1005 Identical to N5 except that there is no "web" directory
+  N1005 Identical to N5 exept that there is no "web" directory
-  N1099 Identical to N99 except 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
+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 occurred
+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/finished.html

@@ -68,6 +68,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>

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
+	case $mode in
-          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+	  *' '* | *'	'* | *'
-            echo "$0: invalid mode: $mode" >&2
+'*	  | *'*'* | *'?'* | *'['*)
-            exit 1;;
+	    echo "$0: invalid mode: $mode" >&2
-        esac
+	    exit 1;;
-        shift;;
+	esac
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift;;
+	shift;;
-
-    -p) cpprog="$cpprog -p";;
 
     -s) stripcmd=$stripprog;;
 
-    -S) backupsuffix="$2"
+    -t) dst_arg=$2
-        shift;;
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
+	shift;;
 
-    -t)
+    -T) no_target_directory=true;;
-        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;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --) shift
+    --)	shift
-        break;;
+	break;;
 
-    -*) echo "$0: invalid option: $1" >&2
+    -*)	echo "$0: invalid option: $1" >&2
-        exit 1;;
+	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
+      if test -n "$no_target_directory"; then
-        echo "$0: $dst_arg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
-        exit 1
+	exit 1
       fi
       dstdir=$dst
-      dstbase=`basename "$src"`
+      dst=$dstdir/`basename "$src"`
-      case $dst in
-	*/) dst=$dst$dstbase;;
-	*)  dst=$dst/$dstbase;;
-      esac
       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.
+	# Create intermediate dirs using mode 755 as modified by the umask.
-        # Otherwise, rely on $mkdir_umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
-        if test -n "$dir_arg"; then
+	umask=`umask`
-          mkdir_mode=-m$mode
+	case $stripcmd.$umask in
-        else
+	  # Optimize common cases.
-          mkdir_mode=
+	  *[2367][2367]) mkdir_umask=$umask;;
-        fi
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 
-        posix_mkdir=false
+	  *[0-7])
-	# The $RANDOM variable is not portable (e.g., dash).  Use it
+	    mkdir_umask=`expr $umask + 22 \
-	# here however when possible just to lower collision chance.
+	      - $umask % 100 % 40 + $umask % 20 \
-	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
 
-	trap '
+	# With -d, create the new directory with the user-specified mode.
-	  ret=$?
+	# Otherwise, rely on $mkdir_umask.
-	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+	if test -n "$dir_arg"; then
-	  exit $ret
+	  mkdir_mode=-m$mode
-	' 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"
 	else
-	  # Remove any dirs left behind by ancient mkdir implementations.
+	  mkdir_mode=
-	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
 	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 &&
+	umask $mkdir_umask &&
-        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+	$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
+	prefix=$prefix$d
-        if test -d "$prefix"; then
+	if test -d "$prefix"; then
-          prefixes=
+	  prefixes=
-        else
+	else
-          if $posix_mkdir; then
+	  if $posix_mkdir; then
-            (umask $mkdir_umask &&
+	    (umask=$mkdir_umask &&
-             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-            # Don't fail if two instances are running concurrently.
+	    # Don't fail if two instances are running concurrently.
-            test -d "$prefix" || exit 1
+	    test -d "$prefix" || exit 1
-          else
+	  else
-            case $prefix in
+	    case $prefix in
-              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-              *) qprefix=$prefix;;
+	      *) qprefix=$prefix;;
-            esac
+	    esac
-            prefixes="$prefixes '$qprefix'"
+	    prefixes="$prefixes '$qprefix'"
-          fi
+	  fi
-        fi
+	fi
-        prefix=$prefix/
+	prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-        # Don't fail if two instances are running concurrently.
+	# Don't fail if two instances are running concurrently.
-        (umask $mkdir_umask &&
+	(umask $mkdir_umask &&
-         eval "\$doit_exec \$mkdirprog $prefixes") ||
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-          test -d "$dstdir" || exit 1
+	  test -d "$dstdir" || exit 1
-        obsolete_mkdir_used=true
+	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.$$_
+    dsttmp=$dstdir/_inst.$$_
-    rmtmp=${dstdirslash}_rm.$$_
+    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 &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-     { 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") &&
 
     # 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` &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-       set -f &&
+
+       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.
+	# Now remove or move aside any old file at destination location.
-        # We try this two ways since rm can't unlink itself on some
+	# We try this two ways since rm can't unlink itself on some
-        # systems and the destination file might be busy for other
+	# systems and the destination file might be busy for other
-        # reasons.  In this case, the final cleanup might fail but the new
+	# reasons.  In this case, the final cleanup might fail but the new
-        # file should still install successfully.
+	# file should still install successfully.
-        {
+	{
-          test ! -f "$dst" ||
+	  test ! -f "$dst" ||
-          $doit $rmcmd "$dst" 2>/dev/null ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-          } ||
+	  } ||
-          { echo "$0: cannot unlink or rename $dst" >&2
+	  { echo "$0: cannot unlink or rename $dst" >&2
-            (exit 1); exit 1
+	    (exit 1); exit 1
-          }
+	  }
-        } &&
+	} &&
 
-        # Now rename the file to the real destination.
+	# Now rename the file to the real destination.
-        $doit $mvcmd "$dsttmp" "$dst"
+	$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
@@ -1005,4 +1003,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

@@ -27,4 +27,3 @@ si:24
 sv:17
 tr:10
 uk:22
-uz:30

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

@@ -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

@@ -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

@@ -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

@@ -196,7 +196,7 @@ 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
+A problem occured during the mirroring operation\n
 Tijekom zrcaljenja je nastao jedan problem\n
 \nDuring:\n
 \nTrajanje:\n
@@ -206,7 +206,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 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! <=
+* * 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! <=
 * * 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
@@ -928,5 +928,5 @@ 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
+A fatal error has occured 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!
+Kopieringen er afsluttet !
-A problem occurred during the mirroring operation\n
+A problem occured during the mirroring operation\n
-Der opstod et problem under kopieringen af websted\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?
+** 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 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! <=
-* * 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! <=
+* * 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)
+Web-adresse (URL)
-Stop WinHTTrack?
 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
+A fatal error has occured during this mirror
-Det opstod en fatal fejl under kopieringen
+

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