Updated to 3.49.6

Fix: Potential Vulnerability in Cloned Function

.gitmodules

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

INSTALL.Linux

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

Makefile.in

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2021 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,23 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,34 +88,44 @@ 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)/configure.ac
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -86,12 +133,34 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
-ETAGS = etags
-CTAGS = ctags
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir distdir-am dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+	config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
+	COPYING ChangeLog INSTALL NEWS README compile config.guess \
+	config.sub depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -101,6 +170,7 @@ 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,'; \
@@ -128,6 +198,9 @@ 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$$'
@@ -135,6 +208,7 @@ 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@
@@ -143,9 +217,11 @@ 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@
@@ -159,8 +235,10 @@ 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@
@@ -172,6 +250,7 @@ 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@
@@ -180,6 +259,7 @@ 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@
@@ -256,6 +336,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -289,15 +370,14 @@ $(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__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -310,8 +390,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -334,22 +414,25 @@ distclean-libtool:
 	-rm -f libtool config.lt
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  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; \
@@ -364,57 +447,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-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)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -430,12 +468,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	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; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -447,15 +480,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -464,11 +493,35 @@ 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: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -533,41 +586,47 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
+
+dist-zstd: distdir
+	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+	$(am__post_remove_distdir)
 
 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__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_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
@@ -575,11 +634,9 @@ dist dist-all: distdir
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -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*) \
@@ -587,24 +644,27 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
+	*.tar.zst*) \
+	  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(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 \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -625,7 +685,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_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'
@@ -760,24 +820,26 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip dist-zstd distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

README

@@ -1,5 +1,5 @@
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2015 Xavier Roche and other contributors
+Copyright (C) 1998-2017 Xavier Roche and other contributors
 
 Welcome to HTTrack Website Copier!
 
@@ -45,7 +45,7 @@ These options may not be necessary for a normal usage. But they can solve severa
 
 - If you need more than 100,000 links: -#L1000000 (1,000,000 links)
 - If you need more than 500 filters: -#F1000 (1,000 filters)
-- If you need transfer rate statictics every minutes: -#Z
+- If you need transfer rate statistics 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

@@ -20,7 +20,7 @@ http://www.httrack.com/
 
 ## Compile trunk release
 ```sh
-git clone https://github.com/xroche/httrack.git
+git clone https://github.com/xroche/httrack.git --recurse
 cd httrack
 ./configure --prefix=$HOME/usr && make -j8 && make install
 ```

compile

@@ -1,10 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-03-05.13; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +17,7 @@ scriptversion=2012-03-05.13; # 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 <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -54,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@@ -68,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -113,6 +112,11 @@ 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
 
@@ -251,7 +255,8 @@ 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
@@ -335,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

config.h.in

@@ -3,9 +3,6 @@
 /* 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
 
@@ -21,8 +18,8 @@
 /* Define to 1 if you have the `z' library (-lz). */
 #undef HAVE_LIBZ
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <minix/config.h> header file. */
+#undef HAVE_MINIX_CONFIG_H
 
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
@@ -30,6 +27,9 @@
 /* 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,6 +58,9 @@
 /* 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
 
@@ -76,13 +79,9 @@
 /* Check for libsocket */
 #undef LIBSOCKET
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where 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
 
@@ -116,7 +115,9 @@
 /* The size of `long long', as computed by sizeof. */
 #undef SIZEOF_LONG_LONG
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   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 */
@@ -126,37 +127,93 @@
 #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 threading extensions on Solaris.  */
+/* Enable X/Open compliant socket functions that do not require linking
+   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 general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
+/* Enable X/Open extensions.  Define to 500 only if necessary
+   to make mbstate_t available.  */
+#ifndef _XOPEN_SOURCE
+# 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,6 +1,6 @@
-AC_PREREQ(2.59)
+AC_PREREQ([2.71])
 
-AC_INIT([httrack], [3.48.21], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
+AC_INIT([httrack], [3.49.6], [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
@@ -31,16 +31,24 @@ AC_CONFIG_SRCDIR(src/httrack.c)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([subdir-objects])
-VERSION_INFO="2:48:0"
+VERSION_INFO="2:49:0"
 AM_MAINTAINER_MODE
 AC_USE_SYSTEM_EXTENSIONS
 
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_STDC_HEADERS
+m4_warn([obsolete],
+[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
-AM_PROG_LIBTOOL
+LT_INIT
 
 # Export LD_LIBRARY_PATH name or equivalent.
 AC_SUBST(SHLIBPATH_VAR,$shlibpath_var)
@@ -74,8 +82,21 @@ 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_LINK_FLAG([-Wl,--discard-all], [DEFAULT_LDLAGS="$DEFAULT_LDLAGS -Wl,--discard-all"])
-AX_CHECK_LINK_FLAG([-Wl,--no-undefined], [DEFAULT_LDLAGS="$DEFAULT_LDLAGS -Wl,--no-undefined"])
+AX_CHECK_COMPILE_FLAG([-fstack-protector], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-protector"])
+AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-clash-protection"])
+AX_CHECK_COMPILE_FLAG([-fcf-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fcf-protection"])
+AX_CHECK_LINK_FLAG([-Wl,--discard-all], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--discard-all"])
+AX_CHECK_LINK_FLAG([-Wl,--no-undefined], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--no-undefined"])
+AX_CHECK_LINK_FLAG([-Wl,-z,relro,-z,now], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,relro,-z,now"])
+AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,noexecstack"])
+
+### PIE
+CFLAGS_PIE=""
+LDFLAGS_PIE=""
+AX_CHECK_COMPILE_FLAG([-fpie -pie], [CFLAGS_PIE="-fpie -pie"])
+AX_CHECK_LINK_FLAG([-pie], [LDFLAGS_PIE="-pie"])
+AC_SUBST([CFLAGS_PIE])
+AC_SUBST([LDFLAGS_PIE])
 
 ## Export all symbols for backtraces
 AX_CHECK_COMPILE_FLAG([-rdynamic], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -rdynamic"])
@@ -129,8 +150,7 @@ CHECK_ZLIB()
 ### OpenSSL is explicitly enabled/disabled ?
 AC_MSG_CHECKING(whether to enable https support)
 AC_ARG_ENABLE([https],
-	[AC_HELP_STRING([--enable-https=@<:@yes/no/auto@:>@],
-		[Enable https support @<:@default=yes@:>@])],
+	[AS_HELP_STRING([--enable-https=@<:@yes/no/auto@:>@],[Enable https support @<:@default=yes@:>@])],
 	[
 	case "${enableval}" in
 	no|yes|auto)
@@ -160,7 +180,7 @@ AC_CHECK_LIB(crypto, EVP_get_digestbyname,
 	]
 	)
 LIBS="$LIBS $OPENSSL_LIBS"
-AC_CHECK_LIB(ssl, SSL_library_init,
+AC_CHECK_LIB(ssl, SSL_CTX_new,
 	[
 	OPENSSL_LIBS="$OPENSSL_LIBS -lssl"
 	AC_DEFINE(HTS_USEOPENSSL, 1, [Check for OpenSSL])
@@ -227,10 +247,6 @@ 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]))
@@ -245,8 +261,7 @@ 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],
-	[AC_HELP_STRING([--enable-online-unit-tests=@<:@yes/no/auto@:>@],
-		[Enable online-unit-tests @<:@default=yes@:>@])],
+	[AS_HELP_STRING([--enable-online-unit-tests=@<:@yes/no/auto@:>@],[Enable online-unit-tests @<:@default=yes@:>@])],
 	[
 	case "${enableval}" in
 	no|yes|auto)
@@ -265,7 +280,7 @@ AC_ARG_ENABLE([online-unit-tests],
 AC_SUBST(ONLINE_UNIT_TESTS,$online_unit_tests)
 
 # Final output
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 src/Makefile
 man/Makefile
@@ -276,3 +291,4 @@ html/Makefile
 libtest/Makefile
 tests/Makefile
 ])
+AC_OUTPUT

debian/changelog

@@ -1,3 +1,64 @@
+httrack (3.49.6-1) unstable; urgency=medium
+
+  * Updated to 3.49.6 (3.49-6)
+    Fixed CVE-2017-14062
+
+ -- Xavier Roche <roche@proliant.localnet>  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)

debian/compat

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

debian/control

@@ -2,14 +2,14 @@ Source: httrack
 Section: web
 Priority: optional
 Maintainer: Xavier Roche <roche@httrack.com>
-Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 8.0.0), dh-autoreconf, autotools-dev, autoconf, autoconf-archive, automake, libtool, zlib1g-dev, libssl-dev
+Standards-Version: 4.6.2
+Build-Depends: debhelper (>= 12.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-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,7 +27,8 @@ Description: Copy websites to your computer (Offline browser)
 
 Package: webhttrack
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, webhttrack-common, iceape-browser | iceweasel | icecat | mozilla | firefox | mozilla-firefox | www-browser
+Multi-Arch: foreign
+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
@@ -49,6 +50,7 @@ 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
@@ -56,26 +58,27 @@ 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
@@ -84,6 +87,7 @@ 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/httrack-doc.debhelper.log

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

debian/httrack-doc.files

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

debian/httrack.debhelper.log

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

debian/httrack.lintian-overrides

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

debian/libhttrack-dev.debhelper.log

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

debian/libhttrack-dev.files

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

debian/libhttrack-dev.lintian-overrides

@@ -1 +1,5 @@
-hardening-no-fortify-functions usr/lib/httrack/libtest/libfilenameiisbug.so.1.0.0
+libhttrack-dev: breakout-link *
+libhttrack-dev: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/httrack/libtest/*
+libhttrack-dev: library-not-linked-against-libc usr/lib/*/httrack/libtest/*
+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
+usr/lib/*/libhtsswf.so.1.0.0
+usr/lib/*/libhtsswf.so.1

debian/libhttrack2.debhelper.log

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

debian/libhttrack2.files

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

debian/libhttrack2.lintian-overrides

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

debian/proxytrack.debhelper.log

@@ -1,2 +0,0 @@
-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, hppa..
+# *** Patch for s390, mips ..
 # 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 hppa m68k arm))
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),s390 mips mipsel m68k arm))
 	CFLAGS += -DNOSTRDEBUG
 endif
 
@@ -81,37 +81,26 @@ 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/*.la
-	rm -f $(CURDIR)/debian/httrack/usr/lib/httrack/*.la
+	rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+	rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/*.la
 	# remove *.a unless we do not have *.so files
 	# see BUG #744594
-	if ls $(CURDIR)/debian/httrack/usr/lib/*.so >/dev/null 2>/dev/null ; then \
-		rm -f $(CURDIR)/debian/httrack/usr/lib/*.a ; \
+	if ls $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/*.so >/dev/null 2>/dev/null ; then \
+		rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/*.a ; \
 	fi
-	if ls $(CURDIR)/debian/httrack/usr/lib/httrack/*.so >/dev/null 2>/dev/null ; then \
-		rm -f $(CURDIR)/debian/httrack/usr/lib/httrack/*.a ; \
+	if ls $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/*.so >/dev/null 2>/dev/null ; then \
+		rm -f $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/*.a ; \
 	fi
-	mv $(CURDIR)/debian/httrack/usr/lib/httrack/lib* \
+	mv $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/lib* \
 		$(CURDIR)/debian/httrack/usr/share/httrack/libtest/
-	mkdir -p $(CURDIR)/debian/httrack/usr/lib/httrack/libtest
+	mkdir -p $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest
 	mv $(CURDIR)/debian/httrack/usr/share/httrack/libtest/lib* \
-		$(CURDIR)/debian/httrack/usr/lib/httrack/libtest
-	ln -s ../../../share/httrack/libtest/readme.txt \
-		 $(CURDIR)/debian/httrack/usr/lib/httrack/libtest/readme.txt
+		$(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest
+	ln -s /usr/share/httrack/libtest/readme.txt \
+		 $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest/readme.txt
 
-	# 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_lintian
 
 	dh_movefiles --sourcedir=debian/httrack
 
@@ -143,10 +132,10 @@ binary-arch: build install
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -a -X/usr/lib/httrack/libtest --version-info
+	dh_makeshlibs -a -X/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest --version-info
 	dh_installdeb -a
 	# we depend on the current version (ABI may change)
-	dh_shlibdeps -a -ldebian/libhttrack2/usr/lib
+	dh_shlibdeps -a -ldebian/libhttrack2/usr/lib/$(DEB_HOST_MULTIARCH)
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a

debian/webhttrack-common.debhelper.log

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

debian/webhttrack-common.lintian-overrides

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

debian/webhttrack.debhelper.log

@@ -1,2 +0,0 @@
-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

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

debian/webhttrack.menu

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

history.txt

@@ -3,6 +3,38 @@ HTTrack Website Copier release history:
 --------------------------------------
 
 This file lists all changes and fixes that have been made for HTTrack
+
+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

html/Makefile.am

@@ -39,6 +39,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) ../doc/httrack html \
+			&& $(LN_S) $(htmldir) html \
 		) \
 	fi

html/Makefile.in

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2021 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.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,19 +89,31 @@ 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)/configure.ac
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -111,10 +160,13 @@ DATA = $(HelpHtml_DATA) $(HelpHtmlTxt_DATA) $(HelpHtmldiv_DATA) \
 	$(HelpHtmlroot_DATA) $(VFolderEntry_DATA) $(WebHtml_DATA) \
 	$(WebHtmlimages_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@
@@ -123,9 +175,11 @@ 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@
@@ -139,8 +193,10 @@ 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@
@@ -152,6 +208,7 @@ 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@
@@ -160,6 +217,7 @@ 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@
@@ -236,6 +294,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -294,14 +353,13 @@ $(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__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -591,14 +649,16 @@ 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: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -747,22 +807,23 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 .MAKE: install-am install-data-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-HelpHtmlDATA \
-	install-HelpHtmlTxtDATA install-HelpHtmldivDATA \
-	install-HelpHtmlimagesDATA install-HelpHtmlimgDATA \
-	install-HelpHtmlrootDATA install-VFolderEntryDATA \
-	install-WebHtmlDATA install-WebHtmlimagesDATA \
-	install-WebIcon16x16DATA install-WebIcon32x32DATA \
-	install-WebIcon48x48DATA install-WebPixmapDATA install-am \
-	install-data install-data-am install-data-hook install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-HelpHtmlDATA install-HelpHtmlTxtDATA \
+	install-HelpHtmldivDATA install-HelpHtmlimagesDATA \
+	install-HelpHtmlimgDATA install-HelpHtmlrootDATA \
+	install-VFolderEntryDATA install-WebHtmlDATA \
+	install-WebHtmlimagesDATA install-WebIcon16x16DATA \
+	install-WebIcon32x32DATA install-WebIcon48x48DATA \
+	install-WebPixmapDATA install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 	uninstall-HelpHtmldivDATA uninstall-HelpHtmlimagesDATA \
 	uninstall-HelpHtmlimgDATA uninstall-HelpHtmlrootDATA \
 	uninstall-VFolderEntryDATA uninstall-WebHtmlDATA \
@@ -770,11 +831,13 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 	uninstall-WebIcon32x32DATA 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) ../doc/httrack html \
+			&& $(LN_S) $(htmldir) 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 occured.
+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.
 
 <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 volenteered to write a users manual for
+assistance from the authors I volunteered 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 abandonned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow (--host-control[=N])
+  HN host is abandoned 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 statictics every minutes
+ #Z  Generate transfer rate statistics 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 exept that "web" is replaced by the site's name
-  N102 Identical to N2 exept that "web" is replaced by the site's name
-  N103 Identical to N3 exept that "web" is replaced by the site's name
-  N104 Identical to N4 exept that "web" is replaced by the site's name
-  N105 Identical to N5 exept that "web" is replaced by the site's name
-  N199 Identical to N99 exept that "web" is replaced by the site's name
-  N1001 Identical to N1 exept that there is no "web" directory
-  N1002 Identical to N2 exept that there is no "web" directory
-  N1003 Identical to N3 exept that there is no "web" directory (option set for g option)
-  N1004 Identical to N4 exept that there is no "web" directory
-  N1005 Identical to N5 exept that there is no "web" directory
-  N1099 Identical to N99 exept that there is no "web" directory
+  N101 Identical to N1 except that "web" is replaced by the site's name
+  N102 Identical to N2 except that "web" is replaced by the site's name
+  N103 Identical to N3 except that "web" is replaced by the site's name
+  N104 Identical to N4 except that "web" is replaced by the site's name
+  N105 Identical to N5 except that "web" is replaced by the site's name
+  N199 Identical to N99 except that "web" is replaced by the site's name
+  N1001 Identical to N1 except that there is no "web" directory
+  N1002 Identical to N2 except that there is no "web" directory
+  N1003 Identical to N3 except that there is no "web" directory (option set for g option)
+  N1004 Identical to N4 except that there is no "web" directory
+  N1005 Identical to N5 except that there is no "web" directory
+  N1099 Identical to N99 except that there is no "web" directory
 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 currant directory.  This is handy for a
+they are and store them in the current 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 ome
+<p align=justify> If I start a collection process and it fails for one
 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 abandonned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow
+  HN host is abandoned 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,21 +859,21 @@ With 48 sockets: 1,30MB/s
 With 128 sockets: 0,93MB/s
 </pre></ul>
 
-<p align=justify> The timeout option causes downloads to time out after
-a non-response from a download attempt.  30 seconds is pretty reasonable
-for many sites.  You might want to increase the number of retries as
-well so that you try again and again after such timeouts. 
-
-<pre><b><i>
-httrack http://www.shoesizes.com -O /tmp/shoesizes -%c20
-</i></b></pre>
-
 <p align=justify> This limits the number of connections per second.  It
 is similar to the above option but allows the pace to be controlled
 rather than the simultanaety.  It is particulsrly useful for long-term
 pulls at low rates that allow little impact on remote infrastructure.
 The default is 10 connections per second.
 
+<pre><b><i>
+httrack http://www.shoesizes.com -O /tmp/shoesizes -%c20
+</i></b></pre>
+
+<p align=justify> The timeout option causes downloads to time out after
+a non-response from a download attempt.  30 seconds is pretty reasonable
+for many sites.  You might want to increase the number of retries as
+well so that you try again and again after such timeouts. 
+
 <pre><b><i>
 httrack http://www.shoesizes.com -O /tmp/shoesizes -T30
 </i></b></pre>
@@ -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 cleaverness that 'does
+<p align=justify> Now here is a classic bit of cleverness 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 exept that "web" is replaced by the site's name
-  N102 Identical to N2 exept that "web" is replaced by the site's name
-  N103 Identical to N3 exept that "web" is replaced by the site's name
-  N104 Identical to N4 exept that "web" is replaced by the site's name
-  N105 Identical to N5 exept that "web" is replaced by the site's name
-  N199 Identical to N99 exept that "web" is replaced by the site's name
-  N1001 Identical to N1 exept that there is no "web" directory
-  N1002 Identical to N2 exept that there is no "web" directory
-  N1003 Identical to N3 exept that there is no "web" directory (option set for g option)
-  N1004 Identical to N4 exept that there is no "web" directory
-  N1005 Identical to N5 exept that there is no "web" directory
-  N1099 Identical to N99 exept that there is no "web" directory
+  N101 Identical to N1 except that "web" is replaced by the site's name
+  N102 Identical to N2 except that "web" is replaced by the site's name
+  N103 Identical to N3 except that "web" is replaced by the site's name
+  N104 Identical to N4 except that "web" is replaced by the site's name
+  N105 Identical to N5 except that "web" is replaced by the site's name
+  N199 Identical to N99 except that "web" is replaced by the site's name
+  N1001 Identical to N1 except that there is no "web" directory
+  N1002 Identical to N2 except that there is no "web" directory
+  N1003 Identical to N3 except that there is no "web" directory (option set for g option)
+  N1004 Identical to N4 except that there is no "web" directory
+  N1005 Identical to N5 except that there is no "web" directory
+  N1099 Identical to N99 except that there is no "web" directory
 </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, separed by ",", or use multiple options.  Therefore, these
+definitions, separated 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 consol-based version,
+<p align=justify> Animated information when using console-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 statictics every minutes
+ #Z  Generate transfer rate statistics 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
-pagees was www.all.net/test/a.html, all links starting with www.all.net/test/
+pages 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 forlarge numbers of files.
+collision for large 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 exept that "web" is replaced by the site's name
-  N102 Identical to N2 exept that "web" is replaced by the site's name
-  N103 Identical to N3 exept that "web" is replaced by the site's name
-  N104 Identical to N4 exept that "web" is replaced by the site's name
-  N105 Identical to N5 exept that "web" is replaced by the site's name
-  N199 Identical to N99 exept that "web" is replaced by the site's name
+  N101 Identical to N1 except that "web" is replaced by the site's name
+  N102 Identical to N2 except that "web" is replaced by the site's name
+  N103 Identical to N3 except that "web" is replaced by the site's name
+  N104 Identical to N4 except that "web" is replaced by the site's name
+  N105 Identical to N5 except that "web" is replaced by the site's name
+  N199 Identical to N99 except that "web" is replaced by the site's name
 
-  N1001 Identical to N1 exept that there is no "web" directory
-  N1002 Identical to N2 exept that there is no "web" directory
-  N1003 Identical to N3 exept that there is no "web" directory (option set for g option)
-  N1004 Identical to N4 exept that there is no "web" directory
-  N1005 Identical to N5 exept that there is no "web" directory
-  N1099 Identical to N99 exept that there is no "web" directory
+  N1001 Identical to N1 except that there is no "web" directory
+  N1002 Identical to N2 except that there is no "web" directory
+  N1003 Identical to N3 except that there is no "web" directory (option set for g option)
+  N1004 Identical to N4 except that there is no "web" directory
+  N1005 Identical to N5 except that there is no "web" directory
+  N1099 Identical to N99 except that there is no "web" directory
 
 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 occured
+This option define whether the engine has to generate html output file or not if an error occurred
 
 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 abandonned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow
-This option define whether the engine has to abandon a host if a timeout/"too slow" error occured
+HN host is abandoned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow
+This option define whether the engine has to abandon a host if a timeout/"too slow" error occurred
 
 &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 occured</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>
 
 
 </table>

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 occured, 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 occurred, 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 separed by ",", like in:
+You can declare multiple definitions, or declare multiple types separated 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 occured (timeout, for example)
+  <br><small>Number of retries if a non-fatal error occurred (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 occured, for example)
+  <br><small>Do not generate error pages (if a 404 error occurred, 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 occured!
+  <br>If you <b>do not</b> generate log files, you will not be able to know what errors occurred!
   <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=2011-01-19.21; # UTC
+scriptversion=2020-11-14.01; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,25 +35,21 @@ scriptversion=2011-01-19.21; # 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=" ""	$nl"
+IFS=" $tab$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-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,22 +64,16 @@ 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=
@@ -97,7 +87,7 @@ dir_arg=
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -114,18 +104,28 @@ Options:
      --version  display version info and exit.
 
   -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
+  -C            install only if different (preserve 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,46 +137,62 @@ 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
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
+
+    -p) cpprog="$cpprog -p";;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-	# Protect names problematic for `test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
+    -S) backupsuffix="$2"
+        shift;;
 
-    -T) no_target_directory=true;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
+
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -190,7 +206,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
@@ -202,11 +218,20 @@ 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
@@ -223,16 +248,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
@@ -240,7 +265,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
@@ -250,6 +275,10 @@ 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
@@ -266,178 +295,148 @@ do
     fi
     dst=$dst_arg
 
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
+    # If destination is a directory, append the input filename.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
-      dst=$dstdir/`basename "$src"`
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
       dstdir_status=0
     else
-      # 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'
-      `
-
+      dstdir=`dirname "$dst"`
       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
       '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
 
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
+        posix_mkdir=false
+	# The $RANDOM variable is not portable (e.g., dash).  Use it
+	# here however when possible just to lower collision chance.
+	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
+	trap '
+	  ret=$?
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+	  exit $ret
+	' 0
+
+	# Because "mkdir -p" follows existing symlinks and we likely work
+	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directory is successfully created first before we actually test
+	# 'mkdir -p'.
+	if (umask $mkdir_umask &&
+	    $mkdirprog $mkdir_mode "$tmpdir" &&
+	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+	then
+	  if test -z "$dir_arg" || {
+	       # Check for POSIX incompatibilities with -m.
+	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+	       # other-writable bit of parent directory when it shouldn't.
+	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+	       test_tmpdir="$tmpdir/a"
+	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+	       case $ls_ld_tmpdir in
+		 d????-?r-*) different_mode=700;;
+		 d????-?--*) different_mode=755;;
+		 *) false;;
+	       esac &&
+	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+	       }
+	     }
+	  then posix_mkdir=:
+	  fi
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
 	else
-	  mkdir_mode=
+	  # Remove any dirs left behind by ancient mkdir implementations.
+	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
 	fi
-
-	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;;
+	trap '' 0;;
     esac
 
     if
       $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
 
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # 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=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-	test X"$d" = X && continue
+        test X"$d" = X && continue
 
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask $mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -450,14 +449,25 @@ do
   else
 
     # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_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 && $doit_exec $cpprog "$src" "$dsttmp") &&
+    (umask $cp_umask &&
+     { test -z "$stripcmd" || {
+	 # Create $dsttmp read-write so that cp doesn't create it read-only,
+	 # which would cause strip to fail.
+	 if test -z "$doit"; then
+	   : >"$dsttmp" # No need to fork-exec 'touch'.
+	 else
+	   $doit touch "$dsttmp"
+	 fi
+       }
+     } &&
+     $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -472,20 +482,24 @@ do
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       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 ||
 
@@ -493,24 +507,24 @@ do
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
 
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1
 
@@ -519,9 +533,9 @@ do
 done
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

lang.def

@@ -56,6 +56,8 @@ Finnish
 LANGUAGE_28
 Croatian
 LANGUAGE_29
+Uzbek
+LANGUAGE_30
 LANGUAGE_NAME
 LANGUAGE_NAME
 LANGUAGE_FILE
@@ -255,7 +257,7 @@ Site mirroring in progress [%s, %s bytes]
 LANG_F18b
 Site mirroring finished!
 LANG_F19
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 LANG_F20
 \nDuring:\n
 LANG_F21
@@ -265,7 +267,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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\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
@@ -1003,4 +1005,4 @@ You can now close this window
 LANG_SERVEND
 Server terminated
 LANG_FATALERR
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror

lang.indexes

@@ -27,3 +27,4 @@ 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 occured during the mirroring operation\n
+A problem occurred 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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\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 occured during this mirror
+A fatal error has occurred 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 occured during the mirroring operation\n
+A problem occurred 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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\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 occured during this mirror
+A fatal error has occurred 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 occured during the mirroring operation\n
+A problem occurred 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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\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 occured during this mirror
+A fatal error has occurred 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 occured during the mirroring operation\n
+A problem occurred 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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\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 occured during this mirror
+A fatal error has occurred 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 occured during the mirroring operation\n
+A problem occurred 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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\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 occured during this mirror
+A fatal error has occurred 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 occured during the mirroring operation\n
+A problem occurred 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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * POGREŠKA PRI ZRCALJENJU! * *\r\nHTTrack je zapazio da je tekuæe zrcalo prazno. Ukoliko je to bila neka dogradnja, onda je prethodno zrcalo ponovno uspostavljeno.\r\nRazlog: ili prva stranica nije mogla biti pronaðena, ili se pak pojavio neki problem.\r\n=> Uvjerite se da dotièno mrežno mjesto još uvijek postoji, i/ili provjerite postavke Vašeg usmjerivaèa! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nPreporuka: Kliknite na [Prikazati zapisnièke datoteke], kako bi vidjeli upozorenja ili dojave pogreški
@@ -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 occured during this mirror
+A fatal error has occurred during this mirror
 Tijekom ovog zrcaljenja je nastala fatalna pogreška

lang/Dansk.txt

@@ -5,7 +5,7 @@ Dansk
 LANGUAGE_ISO
 da
 LANGUAGE_AUTHOR
-Jesper Bramm (bramm@get2net.dk) \r\n
+Jesper Bramm (bramm@get2net.dk)\r\nscootergrisen\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 password
+Skjul adgangskode
 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 funktion er ikke implementeret endnu !
+Denne handling er endnu ikke implementeret
 Error deleting this project
 Der opstod fejl under sletningen af dette projekt
 Select a rule for the filter
-Vælg hvilken regl der gælder for dette filter
+Vælg en regel til filteret
 Enter keywords for the filter
-Indtast nøgleord for dette filter
+Indtast nøgleord til filteret
 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 skannings-strenge i samme linie.\nBrug mellemrum som seperatortegn.\n\nEksempel: +*.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
 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.someweb.com/*.gif.  \n(+*.gif / -*.gif  inkluderer/ekskluderer ALLE GIF-filer fra alle valgte web-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)
 Save prefs
 Gem foretrukne indstillinger
 Matching links will be excluded:
-Macthende links udelukkes
+Matchende links udelukkes
 Matching links will be included:
-Macthende links medtages:
+Matchende 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'
-blue\r\nMedtager alle filer med en matchende tekststreng. Skriver du f.eks. 'blue' medtages eksempelvis 'bluesky-small.jpeg'\r\n
+gul\r\nMedtager alle filer med en matchende 'gul'-understreng, såsom 'gulsky-lille.jpeg'
 bigfile.mov\r\nWill match the file 'bigfile.mov', but not 'bigfile2.mov'
-bigfile.mov\r\nVil medtage filen 'bigfile.mov',  men ikke filen 'bigfile2.mov'
+storfil.mov\r\nVil medtage filen 'storfil.mov', men ikke filen 'storfil2.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 tekststrengen 'cgi' , eksempelvis /cgi-bin/somecgi.cgi
+cgi\r\nvil finde links med mappenavne der matcher understrengen 'cgi', såsom /cgi-bin/nogetcgi.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.
-someweb.com\r\nFinder links med matchende sub-string som f.eks.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\r\nWill find links with matching folder sub-string such as www.someweb.com, www.someweb.edu, private.someweb.otherweb.com etc.
-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
+eksempel\r\nFinder links med matchende mappe-understreng, såsom www.eksempel.dk, www.eksempel.edu, privat.eksempel.andetweb.dk osv.
 www.someweb.com\r\nWill find links matching whole 'www.someweb.com' sub-string (but not links such as private.someweb.com/..)
-www.someweb.com\r\nFinder links der matcher hele strengen 'www.someweb.com' , (men IKKE links som: private.someweb.com/..)
+www.eksempel.dk\r\nFinder links der matcher hele understrengen 'www.eksempel.dk' , (men IKKE links, såsom privat.eksempel.dk/..)
 someweb\r\nWill find any links with matching sub-string such as www.someweb.com/.., www.test.abc/fromsomeweb/index.html, www.test.abc/test/someweb.html etc.
-someweb\r\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
+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.
 www.test.com/test/someweb.html\r\nWill only find the 'www.test.com/test/someweb.html' file. Note that you have to type the complete path (URL + site path)
-www.test.com/test/someweb.html\r\nFinder kun 'www.test.com/test/someweb.html' file. Bemærk at du skal skrive den fulde stil[URL+stinavn]
+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]
 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 standard-indstillinger
+Gem nuværende indstillinger som standardindstillinger
 Click to confirm
 Klik for at bekræfte
 No log files in %s!
-Der findes ingen log-fil i %s !
+Der findes ingen logfil 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
-Se log-fil
+Vis logfiler
 Browse HTML start page
-Se HTML startside
+Se HTML-startside
 End of mirror
-Kopieringen er fuldført
+Kopieringen af websted er afsluttet
 View log files
-Se log filer
+Vis logfiler
 Browse Mirrored Website
-Gennemse Website
+Gennemse kopi-websted
 New project...
 Nyt projekt...
 View error and warning reports
-Se fejl og advarsler
+Vis rapport med fejl og advarsler
 View report
-Se rapport
+Vis rapport
 Close the log file window
-Luk log-fil vinduet
+Luk logfil vinduet
 Info type:
 Informationstype
 Errors
@@ -147,21 +147,21 @@ S
 Find a word
 Søg efter et ord
 Info log file
-Info log fil
+Info logfil
 Warning/Errors log file
-Advarsel/Fejl log-fil
+Advarsel/fejl-logfil
 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 fil-cache i den angivne mappe !\r\n
+WinHTTrack kunne ikke finde nogen afbrudte download filcache i den angivne mappe!
 Could not connect to provider
-Kan ikke tilslutte til udbyder
+Kunne ikke oprette forbindelse til udbyder
 receive
 modtager
 request
 anmoder
 connect
-tilslutter
+opret forbindelse
 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 overførsel] for at genoptage overførslen
+Pause - Vælg fra menuen [Kopiér]/[Pause download] 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
-Tilslutter til udbyder
+Opretter forbindelse til udbyder
 [%d seconds] to go before start of operation
-[%d seconds] inden denne handling starter
+[%d sekunder] inden denne handling starter
 Site mirroring in progress [%s, %s bytes]
-Web-sted kopieres nu  [%s, %s bytes]
+Websted kopieres nu [%s, %s byte]
 Site mirroring finished!
-Kopieringen er afsluttet !
-A problem occured during the mirroring operation\n
-Der opstod et problem under kopieringen\n
+Kopieringen af websted er afsluttet!
+A problem occurred during the mirroring operation\n
+Der opstod et problem under kopieringen af websted\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 log filen.\n\nKlik AFSLUT for at lukke WinHTTrack Website Copier.\n\nTak for at du brugte WinHTTrack!
+Se eventuelt logfilen.\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!
-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
+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
 * * 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 OPGIVET**\r\nDen nuværende cache er påkrævet for alle opdaterings operationer og indeholder kun data der er downloadet med den aktuelle afbrudte overførsel.\r\nDen tidligere cache kan indeholde mere fyldestgørende information; hvis du ønsker at bevare den information, skal du gendanne den og slette den aktuelle cache.\r\n[Note: Dette kan nemt gøres ved at slette 'hts-cache/new.* files]\r\n\r\nTror du den tidligere cache-fil muligvis indeholder mere fyldestgørende information, og vil du gendanne denne?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
-* * KOPIERINGS FEJL * *\r\nWinHTTrack har opdaget at den igangværende kopiering er tom. Hvis du var i gang med at opdatere en kopi, vil det tidligere indhold  blive gendannet \r\nMulig årsag: Den første side kunne enten ikke findes eller der opstod et problem med forbindelsen.\r\n=> Kontroller at webstedet findes og/eller kontroller Proxy-indstillingerne! <=
+* * KOPIERINGEN ER AFBRUDT! * *\r\nDen nuværende cache er påkrævet for alle opdaterings operationer og indeholder kun data der er downloadet med den aktuelle afbrudte session.\r\nDen tidligere cache kan indeholde mere fyldestgørende information; hvis du ønsker at bevare den information, skal du gendanne den og slette den aktuelle cache.\r\n[Note: Dette kan nemt gøres ved at slette 'hts-cache/new.* files]\r\n\r\nTror du den tidligere cache-fil muligvis indeholder mere fyldestgørende information, og vil du gendanne denne?
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * KOPIERINGS FEJL! * *\r\nWinHTTrack har opdaget at den igangværende kopiering er tom. Hvis du var i gang med at opdatere en kopi, vil det tidligere indhold  blive gendannet.\r\nMulig årsag: Den første side kunne enten ikke findes eller der opstod et problem med forbindelsen.\r\n=> Kontroller at webstedet findes og/eller kontroller Proxy-indstillingerne! <=
 \n\nTip: Click [View log file] to see warning or error messages
-\n\nTip: Klik [Se log fil]  for at se advarsels- og fejlmeddelelser
+\n\nTip: Klik [Vis logfiler]  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 web-sted  -\n\nIndtast web-adresse i URL feltet
+- Kopiering af websted  -\n\nIndtast webadresse(r) i URL-feltet
 - Interactive Wizard Mode (questions) -\n\nEnter address(es) in URL box
-- Interaktiv guide (spørgsmål) -\n\nIndtast web-adresse(er) i URL feltet
+- Interaktiv guide-tilstand (spørgsmål) -\n\nIndtast webadresse(r) i URL-feltet
 - File Download Mode -\n\nEnter file address(es) in URL box
-- Fil overførselstilstand- \n\nIndtast web-adresse(er) i URL feltet
+- Fil-download-tilstand-\n\nIndtast webadresse(r) i URL-feltet
 - Link Testing Mode -\n\nEnter Web address(es) with links to test in URL box
-- Links test tilstand- \n\nIndtast web-adresse(r) i URL feltet
+- Links test tilstand-\n\nIndtast webadresse(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 web-adresse i URL feltet. Kontroller eventuelt dine indstillinger og klik derefter på 'NÆSTE'.
+- Opdateringstilstand -\n\nBekræft webadresse(r) 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 web-adresse i URL feltet. Kontroller eventuelt dine indstillinger og klik derefter på 'NÆSTE'.
+- 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'.
 Log files Path
-Stinavn for log fil
+Stinavn for logfil
 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 addresse(r) på sider der indeholder links der skal kopieres.
+- Links liste -\n\nBrug URL-feltet til at angive adresse(r) på sider der indeholder links der skal kopieres.
 New project / Import?
-Nyt projekt / Importer?
+Nyt projekt / Importér?
 Choose criterion
 Vælg kriterier
 Maximum link scanning depth
 Maksimal skanningsdybde for links
 Enter address(es) here
-Indtast web-adresse(r) her
+Indtast webadresse(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
-Definér proxy-indstillinger
+Angiv 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 instillinger som standardindstillinger
+Gem de nuværende indstillinger som standardindstillinger
 Click to continue
-Klik for at forsætte
+Klik for at fortsæ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 fra tekst fil
+Hent URL(er) fra tekstfil
 WinHTTrack preferences (*.opt)|*.opt||
 WinHTTrack indstillinger (*.opt)|*.opt||
 Address List text file (*.txt)|*.txt||
-Addresse liste tekst fil (*.txt)|*.txt||
+Adresseliste-tekstfil (*.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..
-Definér...
+Angiv...
 Set options..
-Definér indstillinger...
+Angiv indstillinger...
 Preferences and mirror options:
-Indstillinger og muligheder
+Indstillinger og muligheder:
 Project name
 Projektnavn
 Add a URL...
 Tilføj URL...
 Web Addresses: (URL)
-Web-adresse (URL)
+Webadresse: (URL)
+Stop WinHTTrack?
 Stop WinHTTrack?
-Stop WinHTTrack nu?
 No log files in %s!
-Der er ingen log filer i %s!
+Der er ingen logfiler i %s!
 Pause Download?
 Pause kopieringen?
 Stop the mirroring operation
-Stop kopieringen?
+Stop kopiering af websted?
 Minimize to System Tray
-Minimér til systemlinien
+Minimér til proceslinjen
 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
-Bytes gemt:
+Byte gemt:
 Links scanned
-Skannede links:
+Links skannet:
 Time:
-Tid :
+Tid:
 Connections:
 Forbindelser:
 Running:
@@ -337,7 +337,7 @@ K
 Hide
 Minimér
 Transfer rate
-Overførselshastighed
+Overfør. hastighed
 SKIP
 Spring over
 Information
@@ -349,7 +349,7 @@ Opdaterede filer:
 Errors:
 Fejl:
 In progress:
-I gang:
+Arbejder:
 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 site-struktur
+Vælg lokal websted-struktur
 Set user-defined structure on disk
-Sæt brugerdefinerede indstilinger for den lokale struktur
+Sæt brugerdefinerede indstillinger 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 fejl-log og rapport-filer
+Lav fejllog 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
-Maksimale antal forsøg efter ikke-fatale fejl
+Maksimal antal forsøg efter ikke-fatale fejl
 Maximum size for any single HTML file
-Maksimale størrelse for enkelte HTML filer
+Maksimal størrelse for enkelte HTML-filer
 Maximum size for any single non-HTML file
-Maksimale størrelse for ikke-HTML filer
+Maksimal størrelse for ikke-HTML-filer
 Maximum amount of bytes to retrieve from the Web
-Maksimale antal bytes der må hentes på Web
+Maksimal antal byte der må hentes på Web
 Make a pause after downloading this amount of bytes
-Hold pause efter download af denne mængde bytes
+Hold pause efter download af denne mængde byte
 Maximum duration time for the mirroring operation
-Maksimale overførselstid for kopieringen
+Maksimal varighed for kopieringen af websted
 Maximum transfer rate
-Maksimale overførselshastighed
+Maksimal overførselshastighed
 Maximum connections/seconds (avoid server overload)
-Maksimale antal forbindelser/sekunder (for at undgå server overbelastning)
+Maksimal antal forbindelser/sekunder (for at undgå server overbelastning)
 Maximum number of links that can be tested (not saved!)
-Maksimalt antal links der kan testes( ikke gemt!)
+Maksimal 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 forsætte
+Klik for at fortsætte
 Click to cancel changes
 Klik for at annullere ændringerne
 Follow local robots rules on sites
-Følg lokale regler på webstedet
+Følg lokale robot-regler på websteder
 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 indkluderede filer der skal downloades?
+Overfør Java-applets sammen med inkluderede 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 fil-type (hvis genereret)
+Log filtype (hvis genereret)
 Maximum mirroring depth from root address
-Maksimale kopieringsdybde fra rod-adressen
+Maksimal 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ørglser (begrænser effektiviteten !)
+Brug gamle HTTP/1.0-type forespørgsler (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' (f.eks. test af fil-størrelser...)
+Forsøg at begrænse gen-overførsler gennem brug af 'tricks' (test af filstørrelse...)
 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 ekstrene links uden brug af login/password
+Skriv eksterne links uden brug af brugernavn/adgangskode
 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 (også selvom html-tags eller kode er ukendt)
+Forsøg at fange alle URL'er (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
-Log filer
+Logfiler
 DOS names (8+3)
-DOS navne (8+3 karakterer)
+DOS-navne (8+3)
 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 fejfindingstilstand (winhttrack.log)
+Aktivér fejlfindingstilstand (winhttrack.log)
 Rewrite links: internal / external
 Genskriv links: internt/eksternt
 Flow control
@@ -505,7 +505,7 @@ Begr
 Identity
 Identitet
 HTML footer
-HTML-fod
+HTML-sidefod
 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
-TimeOut(s)
+Brug proxy til FTP-overførsler
 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 enhver HTML fil (Bytes)
+Maksimal størrelse for HTML-filer (B)
 Max size of any non-HTML file
-Maksimal størrelse for enhver ikke-HTML fil
+Maksimal størrelse for ikke-HTML-filer
 Max site size
-Maksimalt website størrelse
+Maksimal størrelse af websted
 Max time
 Maksimal tid
 Save prefs
@@ -541,7 +541,7 @@ Gem indstillinger
 Max transfer rate
 Maksimal overførselshastighed
 Follow robots.txt
-Følg reglerne i robots.txt
+Følg 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
-Maksimale antal af links
+Maksimal antal links
 Pause after downloading..
-Pause efter overførsel...
+Pause efter download...
 Hide passwords
-Skjul passwords
+Skjul adgangskoder
 Hide query strings
 Skjul forespørgsels-streng
 Links
@@ -577,29 +577,29 @@ Links
 Build
 Struktur
 Experts Only
-Ekspert indstillinger
+Kun eksperter
 Flow Control
 Flow-kontrol
 Limits
 Begrænsninger
 Browser ID
-Browser Identitet
+Browser-ID
 Scan Rules
 Skanningsregler
 Spider
 Spider
 Log, Index, Cache
-Log, Index, Cache
+Log, indeks, cache
 Proxy
 Proxy
 MIME Types
-
+MIME-typer
 Do you really want to quit WinHTTrack Website Copier?
-Vil du afslutte WinHTTrack Website Copier nu?
+Vil du afslutte WinHTTrack Website Copier?
 Do not connect to a provider (already connected)
-Tilslut ikke til en udbyder (Er allerede tilsluttet)
+Opret ikke forbindelse til en udbyder (er allerede forbundet)
 Do not use remote access connection
-Brug ikke en opkaldsforbindelse
+Brug ikke en fjernadgangsforbindelse
 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 et password for denne forbindelse
+Der er ikke gemt en adgangskode for denne forbindelse
 Can not get remote connection settings
-Kan ikke indlæse opkaldsindstillinger
+Kan ikke hente fjernforbindelsesindstillinger
 Select a connection provider
-Vælg en opkaldsforbindelse (Internetudbyder)
+Vælg en forbindelsesudbyder
 Start
 Start
 Please adjust connection parameters if necessary,\nthen press FINISH to launch the mirroring operation.
-Tilpas opkaldsparametre om nødvendigt.\nKlik på Udfør for at starte kopieringen.\r\n
+Justér venligst forbindelsesparameterne hvis det er nødvendigt.\nKlik på Udfør for at starte kopieringen.
 Save settings only, do not launch download now.
-Gem indstillingerne, men start ikke overførslen endnu.
+Gem indstillingerne, men start ikke download endnu.
 On hold
-Afventer...
+På hold
 Transfer scheduled for: (hh/mm/ss)
-Overførslen planlagt til :(hh/mm/ss)
+Overførslen planlagt til: (tt/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 forbindelsen når overførslen er færdig
+Afbryd modem 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\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)
+\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
 About WinHTTrack Website Copier
 Om WinHTTrack Website Copier
 Please visit our Web page
-Besøg vores Web-side
+Besøg vores webside
 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 web-sted
+Kopiér websted
 Mirror domain
 Kopiér domæne
 Ignore all
 Ignorer alt
 Wizard query
-Guide forespøgsel
+Guide-forespørgsel
 NO
 Nej
 File
@@ -681,23 +681,23 @@ Pause overf
 Exit
 Afslut
 Modify options
-Tilpas indstillinger
+Rediger indstillinger
 View log
-Se log
+Vis log
 View error log
-Se fejl-log
+Vis fejllog
 View file transfers
-Se fil-overførsler
+Vis filoverførsler
 Hide
 Minimér
 About WinHTTrack Website Copier
-Om WinHTTrack Website Copier...
+Om WinHTTrack Website Copier
 Check program updates...
-Find program opdateringer...
+Søg efter opdateringer...
 &Toolbar
-&Værktøjslinie
+&Værktøjslinje
 &Status Bar
-&Statuslinie
+&Statuslinje
 S&plit
 &Opdel
 File
@@ -705,7 +705,7 @@ Filer
 Preferences
 Indstillinger
 Mirror
-Kopiér web-sted
+Kopiér websted
 Log
 Log
 Window
@@ -715,9 +715,9 @@ Hj
 Exit
 Afslut
 Load default options
-Indlæs standard indstillinger
+Indlæs standardindstillinger
 Save default options
-Gem standard indstillinger
+Gem standardindstillinger
 Reset to default options
 Nulstil standardindstillinger
 Load options...
@@ -725,15 +725,15 @@ Indl
 Save options as...
 Gem indstillinger som...
 Language preference...
-Fortrukne sprog...
+Foretrukne sprog...
 Contents...
-Indhold..
+Indhold...
 About WinHTTrack...
 Om WinHTTrack...
 New project\tCtrl+N
 Nyt projekt\tCtrl+N
 &Open...\tCtrl+O
-&Åben...\tCtrl+O
+&Åbn...\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: 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)
+%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)
 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.someweb.com\\someimages\\image.gif
+Eksempel:\t%h%p/%n%q.%t\n->\t\tc:\\mirror\\www.eksempel.dk\\noglebilleder\\billede.gif
 Proxy settings
 Proxy-indstillinger
 Proxy address:
@@ -755,19 +755,19 @@ Proxy-adresse
 Proxy port:
 Proxy port
 Authentication (only if needed)
-Identifikation (om nødvendigt)
+Godkendelse (kun hvis det er nødvendigt)
 Login
-Brugernavn (Login)
-Password
+Brugernavn
 Password
+Adgangskode
 Enter proxy address here
 Indtast proxy-adressen her
 Enter proxy port here
 Indtast proxy portnummer her
 Enter proxy login
-Indtast proxy Brugernavn/ login
+Indtast proxy-brugernavn
 Enter proxy password
-Indtast proxy password
+Indtast proxy-adgangskode
 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 Projektassistent
+HTTrack-projektguide...
 New project name:
 Nyt projektnavn
 Existing project name:
@@ -787,13 +787,13 @@ Eksisterende projektnavn:
 Project name:
 Projektnavn:
 Base path:
-Vælg en fast sti til dine projekter:
+Sti til projekt:
 Project category:
-
+Projektkategori:
 C:\\My Web Sites
-C:\\Mine web-steder
+C:\\Mine websteder
 Type a new project name, \r\nor select existing project to update/resume
-Skriv navnet på et nyt projekt\neller\nvælg at opdatere et eksisterende projekt
+Skriv navnet på et nyt projekt, \r\neller væ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)
-Identifikation (om nødvendigt)
+Godkendelse (kun hvis det er nødvendigt)
 Login
-Brugernavn/ Login
-Password
+Brugernavn
 Password
+Adgangskode
 Forms or complex links:
 Formularer eller komplekse links:
 Capture URL...
-Fang URL
+Fang URL...
 Enter URL address(es) here
-Indtast URL address(er) her
+Indtast URL-adresse(r) her
 Enter site login
-Indtast web-site Login
+Indtast websted-brugernavn
 Enter site password
-Indtast web-site password
+Indtast websted-adgangskode
 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åes adgang til via formularer eller javascript-kode
+Brug dette værktøj til at 'fange' links der kun kan opnås 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/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
+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
 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 mere hukommelse, alvorlig intern fejl er opstået...
+Ikke nok hukommelse, fatal intern fejl...
 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 overførselsinformation
+Fil-downloadinformation
 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\Klik på Næste for at for at\n-Starte et nyt projekt\neller opdatere et eksisterende projekt.
+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.
 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..
-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...
+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...
 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 giuden\nfølg rotots.txt reglerne
+Ingen robots.txt-regler\nrobots.txt med undtagelse af guiden\nfølg reglerne i robots.txt
 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
-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
+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
 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
-
-A fatal error has occured during this mirror
-
+Server lukket
+A fatal error has occurred 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 occured during the mirroring operation\n
+A problem occurred 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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\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 occured during this mirror
+A fatal error has occurred during this mirror
 Fataler Fehler während der Webseiten-Kopie

lang/Eesti.txt

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

lang/English.txt

@@ -196,8 +196,8 @@ Site mirroring in progress [%s, %s bytes]
 Site mirroring in progress [%s, %s bytes]
 Site mirroring finished!
 Site mirroring finished!
-A problem occured during the mirroring operation\n
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 \nDuring:\n
 \nDuring:\n
 \nSee the log file if necessary.\n\nClick FINISH to quit WinHTTrack Website Copier.\n\nThanks for using WinHTTrack!
@@ -206,8 +206,8 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) if necessary to ensure that everything is OK.\n\nThanks for using WinHTTrack!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nTip: Click [View log file] to see warning or error messages
 Error deleting a hts-cache/new.* file, please do it manually
@@ -944,8 +944,8 @@ You can now close this window
 You can now close this window
 Server terminated
 Server terminated
-A fatal error has occured during this mirror
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
+A fatal error has occurred during this mirror
 View Documentation
 View Documentation
 Go To HTTrack Website

lang/Finnish.txt

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

lang/Francais.txt

@@ -196,7 +196,7 @@ Site mirroring in progress [%s, %s bytes]
 Copie du site en cours (%s, %s octets)
 Site mirroring finished!
 Copie du site terminée!
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Incident durant la copie du site\n
 \nDuring:\n
 Durant:\n
@@ -206,7 +206,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 la copie du site est terminée\nCliquez sur OK pour quitter WinHTTrack\nConsultez au besoin les fichiers journaux pour vérifier que tout s'est bien passé\n\nMerci d'utiliser WinHTTrack!
 * * MIRROR ABORTED! * *\r\nThe current temporary cache is required for any update operation and only contains data downloaded during the present aborted session.\r\nThe former cache might contain more complete information; if you do not want to lose that information, you have to restore it and delete the current cache.\r\n[Note: This can easily be done here by erasing the hts-cache/new.* files]\r\n\r\nDo you think the former cache might contain more complete information, and do you want to restore it?
 * * COPIE INTERROMPUE! * *\r\nLe cache temporaire actuel est nécessaire pour toute mise à jour et ne contient que les données téléchargées durant la présente session interrompue.\r\nIl est possible que le cache précédent contienne des données plus complètes; si vous ne voulez pas perdre ces données, vous devez le restaurer et effacer le cache actuel.\r\n[Note: Cette opération peut être facilement effectuée ici en effacant les fichiers hts-cache/new.*]\r\n\r\nPensez-vous que le cache précédent pourrait contenir des informations plus complètes, et voulez-vous le restaurer?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * ERREUR DE COPIE! * *\r\nHTTrack a détecté que la copie courante était vide. Si il s'agissait d'une mise à jour, l'ancienne copie a été restaurée.\r\nRaison: soit la (les) première(s) page(s) n'ont pu être téléchargées, soit un problème de connexion est survenu.\r\n=> Vérifiez que le site existe toujours, et/ou vérifiez les réglages du proxy! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \nConseil: sélectionnez la commande 'Voir le fichier journal' pour visionner les messages d'erreur et d'avertissement
@@ -936,7 +936,7 @@ You can now close this window
 Vous pouvez maintenant fermer cette fenêtre
 Server terminated
 Serveur arrêté
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 Une erreur critique est intervenue durant l'aspiration
 View Documentation
 Lire la documentation

lang/Greek.txt

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

lang/Italiano.txt

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

lang/Japanese.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 サイトのコピー（ミラー）進行中 [%s, %s bytes]
 Site mirroring finished!
 サイトのコピー（ミラー）完了
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 コピー（ミラー）の際、問題が発生しました\n
 \nDuring:\n
 \r\n\n発生した箇所:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 コピー（ミラー）は完了しました。\n「終了」で WinHTTrackを終了します。\n必要なら全てがOKであることを確認するためにログファイルをご覧になってください。\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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * コピー（ミラー）のエラー! * *\r\nHTTrackは現在のコピー（ミラー）が空であると感知しました。もしこれが更新であるなら、以前のコピー（ミラー）が復元されます。\r\n原因:最初のページが見つからない、または接続に問題が発生しました。\r\n=> Webサイトがまだ存在すること、またはプロキシの設定を確認してください。<=
 \n\nTip: Click [View log file] to see warning or error messages
 \r\n\n\nTipp: [ログを見る] をクリックすると警告とエラーを見ることができます。
@@ -926,5 +926,5 @@ You can now close this window
 
 Server terminated
 
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 

lang/Macedonian.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Âî òåê å êîïèðàœå íà ñà¼òîò [%s, %s áà¼òè]
 Site mirroring finished!
 Êîïèðàœåòî íà ñà¼òîò å çàâðøåíî!
-A problem occured during the mirroring operation\n
+A problem occurred 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Ñåãàøíèîò temporary êåø å ïîòðåáåí çà ñåêî¼à update îïåðàöè¼à è ãè ñîäðæè ñàìî ïîäàòîöèòå ñèìíàòè ïðè ñåãàøíàòà ïðåêèíàòà ñåñè¼à.\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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 **ÃÐÅØÊÀ ÏÐÈ ÊÎÏÈÐÀŒÅÒÎ**\r\nHTTrack îòêðè äåêà ñåãàøíèîò êåø å ïðàçåí. Àêî áèë update, ïðåòõîäíàòà êîïè¼à å ïîâðàòåíà.\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 occured during this mirror
+A fatal error has occurred during this mirror
 Íàñòàíà ôàòàëíà ãðåøêà ïðè îâî¼ mirror

lang/Magyar.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 A tükrözés folyamatban [%s, %s bájt]
 Site mirroring finished!
 A webhely tükrözése befejezõdött
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 A tükrözés közben hiba történt\n
 \nDuring:\n
 \nKözben:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 A tükrözés befejezõdött.\nKattintson az OK gombra a WinHTTrack bezárásához.\nNézze meg a naplófájl(oka)t, ha szükséges, hogy meggyõzõdjön róla, minden rendben van-e.\n\nKöszönet a WinHTTrack használatáért!
 * * 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?
 * * TÜKRÖZÉS MEGSZAKÍTVA! * *\r\nA frissítéshez az aktuális ideiglenes gyorsítótárra van szükség, és csak az imént megszakított mûvelettel letöltött adatokat tartalmazza.\r\nA régi gyorsítótár bizonyára több információt tartalmaz; ha nem akarja elveszíteni azt az információt, vissza kell állítania és törölnie a jelenlegi gyorsítótárat.\r\n[Megjegyzés: Ez könnyen elvégezhetõ itt a hts-cache/new fájlok* törlésével.]\r\n\r\nÚgy gondolja, hogy a régi gyorsítótár teljesebb információt tartalmazhat, és vissza kívánja állítani?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * TÜKRÖZÉSI HIBA! * *\r\nA HTTrack felismerte, hogy az aktuális tükrözés üres. Ha frissítés volt, vissza lett állítva az elõzõ tükrözés.\r\nOk: az elsõ oldal(ak) vagy nem találhatók, vagy csatlakozási probléma lépett föl.\r\n=> Nézze meg, hogy a webhely létezik-e még, és/vagy ellenõrizze a proxy beállításokat! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \nTipp: Kattintson a [Naplófájl megjelenítése] menüpontra a figyelmeztetések vagy hibaüzenetek megtekintéséhez
@@ -926,5 +926,5 @@ You can now close this window
 Mostmár bezárhatja ezt az ablakot
 Server terminated
 A kiszolgáló befejezte a kapcsolatot
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 Végzetes hiba történt a tükrözés közben

lang/Makefile.in

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2021 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.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,19 +89,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = lang
-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)/configure.ac
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -101,10 +150,13 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(langdir)" "$(DESTDIR)$(langrootdir)"
 DATA = $(lang_DATA) $(langroot_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@
@@ -113,9 +165,11 @@ 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@
@@ -129,8 +183,10 @@ 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@
@@ -142,6 +198,7 @@ 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@
@@ -150,6 +207,7 @@ 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@
@@ -226,6 +284,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -254,14 +313,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lang/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu lang/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__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -320,14 +378,16 @@ uninstall-langrootDATA:
 	@list='$(langroot_DATA)'; test -n "$(langrootdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(langrootdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
+cscope cscopelist:
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -463,17 +523,19 @@ uninstall-am: uninstall-langDATA uninstall-langrootDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-langDATA \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-langDATA \
 	install-langrootDATA install-man install-pdf install-pdf-am \
 	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 uninstall uninstall-am \
-	uninstall-langDATA uninstall-langrootDATA
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-langDATA uninstall-langrootDATA
+
+.PRECIOUS: Makefile
 
 
 #dist-hook:

lang/Nederlands.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Spiegeling is bezig... [%s, %s bytes]
 Site mirroring finished!
 Spiegeling beëindigd!
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Een probleem is opgetreden tijdens de spiegeling\n
 \nDuring:\n
 \r\n\nTijdens:\n\r\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 De spiegeling is uitgevoerd.\nKlik OK om WinHTTrack te beëindigen.\nIndien nodig, zie protocolbestand(en) om zeker te gaan dat alles OK is\n\nAlvast bedankt voor het gebruik van 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?
 * * SPIEGELING AFGEBROKEN! * *\r\nDe aktuele tijdelijke cache is noodzakelijk voor gelijkwelke update operatie en bevat enkel data gedownload gedurende de zoeven afgebroken sessie.\r\nDe eerste cache kan juistere informaties bevatten; indien je deze informatie niet wenst te verliezen, dan moet je deze restoren and de aktuele cache wissen.\r\n[Opmerking: Dit is het eenvoudigst door het wissen van de hts-cache/new.* bestanden]\r\n\r\nDenk je dat de eerste cache juistere informaties bevat, en wil je deze restoren?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * FOUT MET DE SPIEGELING * *\r\nHTTrack heeft vastgesteld dat de aktuele spiegeling leeg is. Indien het een update was, is de vorige copie terug actueel.\r\nReden: de eerste pagina(s) konden ofwel niet gevonden worden, of er was een probleem met de connectie.\r\n=> Verzeker je ervan, dat de website nog steeds bestaat en/of je proxy settings correct zijn! <=
 \n\nTip: Click [View log file] to see warning or error messages
 :\r\n\n\nTip: Klik [Toon protocolbestand] voor de fouten en mededelingen\r\n
@@ -926,5 +926,5 @@ You can now close this window
 Je kunt dit verster nu sluiten
 Server terminated
 Server beeindigd
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 Een fatale fout is opgetreden tijdens deze spiegeling

lang/Norsk.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Kopiering pågår [%s, %s bytes]
 Site mirroring finished!
 Kopieringen er fullført!
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Et problem oppsto under kopieringen\n
 \nDuring:\n
 \nUnder:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Kopieringen er fullført.\nKlikk AVSLUTT for å avslutte WinHTTrack.\nVis loggfil(er) vis det er nødvendig, for å sjekke at alt er OK.\n\nTakk for at du brukte 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?
 * * KOPIERINGEN ER AVBRUTT! * *\r\nDen nåværende midlertidige cachen er obligatorisk for alle oppdateringsoperasjoner, og inneholder bare data fra den siste avbrutte kopieringsprosessen.\r\nDen tidligere cachen kan inneholde fyldigere informasjon; hvis du ønsker å beholde den informasjonen må du gjenopprette den og slette den aktuelle cachen.\r\n[OBS: Dette kan lettest gjøres ved å slette alle 'hts-cache/new.*'-filer]\r\n\r\nTror du den tidligere cache-filen kanskje inneholder fyldigere informasjon, og vil du gjenopprette den?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * KOPIERINGSFEIL! * *\r\nHttrack har oppdaget at den gjeldende websiden er tom. Hvis du var i gang med å oppdatere enn kopi, vil det gamle innholdet bli gjenopprettet.\r\nMulig årsak: Den første siden kunne enten ikke finnes, eller det oppstod et problem med forbindelsen.\r\n=> Kontroller at websiden fremdeles finnes, og/eller sjekk proxy-innstillingene dine! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nTips: Klikk på [Vis loggfil] for å se advarsler og feilmeldinger
@@ -926,5 +926,5 @@ You can now close this window
 
 Server terminated
 
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 

lang/Polski.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Tworzenie lustra w toku (%s, %s bajtów)
 Site mirroring finished!
 Zakoñczono tworzenie lustra (mirroru)
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Poajwi³ siê problem podczas tworzenia lustra\r\n
 \nDuring:\n
 Podczas:\r\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Zakoñczono tworzenie lustra.\r\nKliknij OK aby wyjœæ z WinHTTrack.\r\nSprawdŸ logi, upewnij siê, czy wszystko przebieg³o dobrze.\r\nDziêkujemy za u¿ywanie HTTrack !
 * * 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?
 * * TWORZENIE LUSTRA PRZERWANE! * *\r\nObecnie wykorzystywany cache, wymagany dla jakichkolwiek operacji uaktualniaj¹cych zawiera jedynie dane z obecnej przerwanej sesji.\r\nPoprzedni cache mo¿e zawieraæ bardziej kompletne dane; jeœli nie chcesz ich straciæ, przywróæ je i usuñ obecny cache.\r\n[Uwaga: Mo¿esz to ³atwo zrobiæ tutaj poprzez skasowanie htscache/new.* pliki]\r\nCzy uwa¿asz, ¿e poprzedni cache mo¿e zawieraæ bardziej kompletne informacje i czy przywróciæ go ?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * B£¡D LUSTRA! * *\r\nHTtrack stwierdza ze obecne lustro jest puste. Je¶li by³o to uaktualnienie, to przywrócono poprzedni± wersjê lustra. Powód: Nie mo¿na by³o odczytaæ pierwszych stron lub wyst±pi³ b³±d po³±czenia.\r\n=> Upewnij siê czy strona ci±gle istnieje, lub te¿ sprawd¼ ustawienia proxy! <=
 \n\nTip: Click [View log file] to see warning or error messages
 Tip: Kliknij (Poka¿ logi) aby zobaczyæ informacje o b³êdach i ostrze¿eniach
@@ -926,5 +926,5 @@ You can now close this window
 Mozesz teraz zamknac to okno.
 Server terminated
 Serwer zakonczyl prace
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 Podczas tworzenia lustra wydarzyl sie fatalny blad.

lang/Portugues-Brasil.txt

@@ -147,9 +147,9 @@ Localizar
 Find a word
 Localizar uma palavra
 Info log file
-Informações do relatório
+Arquivo de registro de informações
 Warning/Errors log file
-Atenção/Erros de relatório
+Aviso/Arquivo de registro de erros
 Unable to initialize the OLE system
 Não foi possível iniciar o sistema OLE
 WinHTTrack could not find any interrupted download file cache in the specified folder!
@@ -171,7 +171,7 @@ erro
 Receiving files..
 Recebendo arquivos...
 Parsing HTML file..
-Analizando arquivo HTML...
+Analisando arquivo HTML...
 Purging files..
 Limpando arquivos...
 Loading cache in progress..
@@ -183,9 +183,9 @@ Pausa - Escolher [C
 Finishing pending transfers - Select [Cancel] to stop now!
 Finalizando transferências pendentes - Selecione [Cancelar] para parar agora!
 scanning
-analizando
+analisando
 Waiting for scheduled time..
-Aguardando horário programado para iniciar...
+Aguardando horário agendado...
 Transferring data..
 Transferindo dados..
 Connecting to provider
@@ -196,7 +196,7 @@ Site mirroring in progress [%s, %s bytes]
 Processo de recebimento [%s, %s bytes]
 Site mirroring finished!
 Cópia do site finalizada!
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Ocorreu um problema durante a operação de recebimento\n
 \nDuring:\n
 Durante:\n
@@ -206,7 +206,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Cópia finalizada.\nClique OK para sair.\nVeja o relatório para verificar se está tudo OK.\n\nObrigado por utilizar o 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?
 * * CÓPIA INTERROMPIDA! * *\r\nO cache temporário atual é necessário para qualquer operação de atualização e somente contém dados carregados durante a presente sessão.\r\nÉ possível que o cache anterior contenha dados mais completas; se você não quiser perder esses dados, você deve restaurá-lo e excluir o cache atual.\r\n[Nota: Esta operação pode ser facilmente executada aqui excluindo os arquivos hts-cache/novo.*]\r\n\r\nVocê acredita que o cache anterior pode conter informações mais completas, e você deseja restaurá-lo?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * ERRO DE CÓPIA! * *\r\nO HTTrack detectou que a cópia atual está vazia. Se ela fosse uma atualização, a cópia anterior teria sido restaurada.\r\nCausa: a primeira página não foi encontrada, ou um problema de conexão ocorreu.\r\n=> Assegure-se de que o website existe, e/ou verifique suas configurações proxy! <=
 \n\nTip: Click [View log file] to see warning or error messages
 Dica: Clique [Ver relatório] para visualizar avisos e as mensagens de erro
@@ -372,6 +372,8 @@ Create a Start Page
 Criar uma página inicial
 Create a word database of all html pages
 Criar uma base de dados da palavra de todas páginas HTML
+Build a complete RFC822 mail (MHT/EML) archive of the mirror
+Criar arquivo de e-mail RFC822 completo (MHT/EML) do espelho
 Create error logging and report files
 Criar relatórios de erros e informações
 Generate DOS 8-3 filenames ONLY
@@ -420,6 +422,12 @@ Browser identity
 Indentidade do navegador
 Comment to be placed in each HTML file
 Notas de rodapé em cada arquivo HTML
+Languages accepted by the browser
+Idiomas aceitos pelo navegador
+Additional HTTP headers to be sent in each requests
+Cabeçalhos HTTP adicionais para serem enviados em cada solicitação
+HTTP referer to be sent for initial URLs
+Referenciador HTTP a ser enviado para URLs iniciais
 Back to starting page
 Voltar à página inicial
 Save current preferences as default values
@@ -480,6 +488,8 @@ Make an index
 Criar um índice
 Make a word database
 Criar um banco de dados de palavras
+Build a mail archive
+Criar um arquivo de mensagens
 Log files
 Relatórios
 DOS names (8+3)
@@ -508,6 +518,12 @@ Identity
 Identificação
 HTML footer
 Rodapé do HTML
+Languages
+Idiomas
+Additional HTTP Headers
+Cabeçalhos HTTP adicionais
+Default referer URL
+URL de referência padrão
 N# connections
 Número de conexões
 Abandon host if error
@@ -889,7 +905,7 @@ Exibir tudo\nOcultar erros\nOcultar informa
 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..
 Estrutura do site (padrão)\nHtml na web/,       imagens/outros arquivos na web/imagens/\nHtml na web/html,   imagens/outros na web/imagens\nHtml na web/,       imagens/outros na web/\nHtml na web/,       imagens/outros na web/xxx, quando xxx é a extensão do arquivo\nHtml na web/html,   imagens/outros na web/xxx\nEstrutura do site, sem www.dominio.xxx/\nHtml no nome_do_site/, imagens/outros no nome_do_site/imagens/\nHtml no nome_do_site/html, imagens/outros no nome_do_site/imagens\nHtml no nome_do_site/, imagens/outros no nome_do_site/\nHtml no nome_do_site/, imagens/outros no nome_do_site/xxx\nHtml no nome_do_site/html, imagens/outros no nome_do_site/xxx\nTodos os arquivos na web/, com nomes aleatórios (gadget !)\nTodos os arquivos no nome_do_site/, com nomes aleatórios (gadget !)\nEstrutura definida pelo usuário..
 Just scan\nStore html files\nStore non html files\nStore all files (default)\nStore html files first
-Somente analizar\nArmazenar arquivos html\nArmazenar arquivos não html\nAmazenar todos os arquivos (padrão)\nArmazenar arquivos html primeiro
+Somente analisar\nArmazenar arquivos html\nArmazenar arquivos não html\nAmazenar todos os arquivos (padrão)\nArmazenar arquivos html primeiro
 Stay in the same directory\nCan go down (default)\nCan go up\nCan both go up & down
 Permanecer no mesmo diretório\nPermite ir para abaixo (padrão)\nPermite ir para cima\nPermite ir para cima & para baixo
 Stay on the same address (default)\nStay on the same domain\nStay on the same top level domain\nGo everywhere on the web
@@ -925,8 +941,38 @@ Seu Navegador atualmente n
 Thank you
 Obrigado
 You can now close this window
-Vocë pode fechar esta janela agora
+Você pode fechar esta janela agora
 Server terminated
 Servidor finalizado
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 Um erro fatal ocorreu durante este espelho
+View Documentation
+Exibir documentação
+Go To HTTrack Website
+Ir Para o Site do HTTrack
+Go To HTTrack Forum
+Ir Para o Fórum do HTTrack
+View License
+Exibir Licença
+Beware: you local browser might be unable to browse files with embedded filenames
+Cuidado: seu navegador local pode não conseguir procurar arquivos com nomes de arquivos incorporados
+Recreated HTTrack internal cached resources
+Recursos em cache internos do HTTrack recriados
+Could not create internal cached resources
+Não foi possível criar recursos em cache internos
+Could not get the system external storage directory
+Não foi possível obter o diretório de armazenamento externo do sistema
+Could not write to:
+Não foi possível gravar em:
+Read-only media (SDCARD)
+Mídia somente leitura (SDCARD)
+No storage media (SDCARD)
+Nenhuma mídia de armazenamento (SDCARD)
+HTTrack may not be able to download websites until this problem is fixed
+O HTTrack pode não conseguir baixar sites até que esse problema seja corrigido
+HTTrack: mirror '%s' stopped!
+HTTrack: espelho '%s' interrompido!
+Click on this notification to restart the interrupted mirror
+Clique nesta notificação para reiniciar o espelho interrompido
+HTTrack: could not save profile for '%s'!
+HTTrack: não foi possível salvar o perfil para '%s'!

lang/Portugues.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 A copiar (%s, %s Bytes)
 Site mirroring finished!
 Cópia terminada
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Ocorreu um problema durante a cópia\n
 \nDuring:\n
 Durante:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Cópia terminada.\nClique OK para sair.\nVeja o relatório para verificar se não há erros.\n\nObrigado por usar o 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?
 * * CÓPIA INTERROMPIDA! * *\r\nA cache temporária actual é necessária para actualização e só contém os dados carregados durante a sessão em curso.\r\nÉ possível que a cache anterior contenha dados mais completos; para não perder esses dados, deve restaurá-la e apagar a cache actual.\r\n[Nota: Esta operação pode ser facilmente executada aqui apagando os ficheiros hts-cache/new.*]\r\n\r\nPensa que a cache anterior pode conter informações mais completas e quer restaurá-la?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * ERRO DE CÓPIA! * *\r\nHTTrack detectou que a cópia actual está vazia. Se fez uma actualização, a cópia anterior foi restaurada.\r\nRazão: a primeira página não foi encontrada ou ocorreu um problema na conexão.\r\n=> Certifique-se de que o site existe e confirme as configurações do proxy! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \nSugestão:Clique [Ver relatório] para ver os avisos e as mensagens de erro
@@ -926,5 +926,5 @@ You can now close this window
 
 Server terminated
 
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 

lang/Romanian.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Clonare sit în desfăşurare [%s %s octeţi]
 Site mirroring finished!
 Clonare site terminată!
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 A survenit o eroare în timpul operaţiei de clonare
 \nDuring:\n
 \nDurează:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Operaţia de clonare terminată. \nClick Ieşire pentru a părăsi WinHTTrack. \nVezi fişierele jurnal dacă este necesar, pentru a vă asigura că totul e OK. \n\nVă mulţumim că folosiţi 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?
 * *CLONARE ÎNTRERUPTĂ! * * \r\nCache-ul teporar este necesar pentru orice operaţie de actualizare şi nu conţine decât datele descărcate în timpul sesiunii curente întrerupte.\r\nCache-ul precedent poate conţine informaţia mai completă; dacă nu doriţi să pierdeţi aceste date, trebuie să restauraţi şi să ştergeţi cache-ul curent\r\n(Notă: Această operaţie poate fi făcută cu uşurinţă prin ştergerea fişierelor hts-cache/new.*)\r\n\r\n Credeşi că vechiul cache poate conţine mai multe informaţii şi doriţi să le restauraţi?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * EROARE CLONARE! * *\r\nHTTrack a detectat că, clona curentă este goală. Dacă a fost o actualizare, clona precedentă a fost restaurată.\r\nMotivul: Fie prima(ele) pagină(i) nu pot(ate) fi găsită(e), fie a intervenit o problemă de conectare.\r\n=>Asiguraţi-vă că situl există şi/sau verificaţi setările legate de proxy!<=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nSfat:Click [Vizualizează fişierul jurnal] pentru a vedea mesajele de avertizare sau eroare.
@@ -926,5 +926,5 @@ You can now close this window
 Acum puteţi închide această fereastră.
 Server terminated
 Server terminat
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 A survenit o eroare fatală în timpul acestei clonări.

lang/Russian.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Ñîçäàåòñÿ çåðêàëî [%s, %s áàéò]
 Site mirroring finished!
 Ñîçäàíèå çåðêàëà çàâåðøåíî!
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
  ïðîöåññå çàêà÷êè ïðîèçîøëà îøèáêà\n
 \nDuring:\n
  òå÷åíèå:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Ñîçäàíèå çåðêàëà çàâåðøåíî.\nÄëÿ âûõîäà èç ïðîãðàììû íàæìèòå êíîïêó OK.\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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * ÎØÈÁÊÀ! * *\r\nÒåêóùåå çåðêàëî - ïóñòî. Åñëè ýòî áûëî îáíîâëåíèå, ïðåäûäóùàÿ âåðñèÿ çåðêàëà âîññòàíîâëåíà.\r\nÏðè÷èíà: ïåðâàÿ ñòðàíèöà(û) èëè íå íàéäåíà, èëè áûëè ïðîáëåìû ñ ñîåäèíåíèåì.\r\n=> Óáåäèòåñü, ÷òî âåáñàéò âñå åùå ñóùåñòâóåò, è/èëè ïðîâåðüòå óñòàíîâêè ïðîêñè-ñåðâåðà! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \nÏîäñêàçêà: Äëÿ ïðîñìîòðà ñîîáùåíèé îá îøèáêàõ è ïðåäóïðåæäåíèé íàæìèòå [Ïðîñìîòð ëîã ôàéëà]
@@ -926,5 +926,5 @@ You can now close this window
 Òåïåðü Âû ìîæåòå çàêðûòü ýòî îêíî
 Server terminated
 Server terminated
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 Âî âðåìÿ òåêóùåé çàêà÷êè ïðîèçîøëà ôàòàëüíàÿ îøèáêà

lang/Slovak.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Prebieha kopírovanie stránky [%s, %s bytov]
 Site mirroring finished!
 Kopírovanie stránky ukonèené!
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Poèas kopírovania sa vyskytol problém\n
 \nDuring:\n
 \nPoèas:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Operácia kopírovania ukonèená.\nKliknutím na Exit opusti<74> WinHTTrack.\nPozrie<69> protokoly súbor(y), ak sa treba uisti<74>, že všetkoje v poriadku.\n\nVïaka za použitie 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?
 * * KOPÍROVANIE PRERUŠENÉ! * *\r\nAktuálna doèasná cache je potrebná prevšetky aktualizaèné operácie a obsahuje iba dáta stiahnuté poèas tejto prerušenej operácie\r\nPredchádzajúca chache môže obsahova<76> kompletnejšie informácie. Ak sa tieto informácie nemajú strati<74>, treba ju obnovi<76> a vymaza<7A> terajšiu aktuálnu cache.\r\n[Poznámka: Dá sa to urobi<62> teraz vymazaním  súborov hts-cache/new.* ]\r\n\r\nObsahuje predchádzajúca cache obsahuje kompletnejšiu informáciu a má sa obnovi<76>?\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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * CHYBA KOPÍROVANIA! * *\r\nHTTrack zistil, že táto kópia je prázdna. Ak mala by<62> aktualizovaná, predchádzajúca kópia bola obnovená.\r\nDôvod: Úvodná stránka buï nebola nájdená, alebo nastal problém so spojením.\r\n=> Presvedèi<C3A8> sa,  èi webstránka ešte existuje a/alebo skontrolova<76> vlastné nastavenie proxy! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nTip: Kliknú<6E> na [Zobrazi<7A> protokol] a pozrie<69> na upozornania alebo chybové hlásenia
@@ -926,5 +926,5 @@ You can now close this window
 
 Server terminated
 
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 

lang/Slovenian.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 
 Site mirroring finished!
 Zrcaljenje strani je dokonèano!
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Prišlo je do napake med zrcaljenjem strani\n
 \nDuring:\n
 \nmed:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Zrcaljenje je popolnoma dokonèano.\nKliknite na gumb Izhod za konec dela s programom WinHTTrack.\nPreberite log datoteko(e), èe se želite preprièati, da je bilo vse vredu.\n\nZahvaljujemo se za to, da ste uporabljali 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?
 * * ZRCALJENJE JE PREKINJENO! * *\r\nTekoèi zaèasni predpomnilnik je bil zahtevan za kaktere koli postopke nadgradnje in vsebuje le prenešene podatke znotraj prekinjene seje.\r\nOblikovani predpomnilnik vsebuje veè popolnih informacij; èe ne želite izgubiti teh podatkov jih lahko obnovite in zbrišete tekoèi predpomnilnik.\r\n[Opomba: To lahko enostavneje storite, èe boste roèno zbrisali hts-cache/ nemudoma * datoteke]\r\n\r\nMislite, da oblikovani predpomnilnik vsebuje veè popolnih informacij in jih želite obnoviti?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * NAPAKA MED ZRCALJENJEM! * *\r\nHTTrack je ugotovil, da je aktivno zrcaljenje prazno. Èe je bilo nadgrajeno bo obnovljeno prejšnje zrcaljenje.\r\nVzrok: prva stran ni bila najdena ali pa vsebuje napake.\r\n=> Preprièajte se ali spletna stran sploh obstaja in/ ali ste preverili vaše nastavitve proxy strežnika! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nNamig: Kliknite na [Preglej log datoteko] kjer boste lahko prebrali vsa opozorila in sporoèila o napakah
@@ -926,5 +926,5 @@ You can now close this window
 
 Server terminated
 
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 

lang/Svenska.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Webb kopieras nu  [%s, %s bytes]
 Site mirroring finished!
 Kopieringen är avslutad !
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Det uppstod ett problem under kopieringen
 \nDuring:\n
 \nUnder:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Webb kopieringen är utförd. \nKlicka OK för att avsluta WinHTTrack.\nGranska log-fil(erna) för att kontrollera att allt har fungerat.\n\nTack för att du avänder 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 ÄR AVBRUTEN! * *\r\nDen nuvarnde cachen är obligatorisk för alla uppdaterings operationer och innehåller data från senaste nerladdning med den aktuella avbrutna överföringen.\r\nDen tidigare cachen kan innehålla mera komplett information; on du önskar att spara den informationen, ska du återskapa den och radera den aktuella cachen.\r\n[Note: Detta kan lättast göras genom att radera samtliga 'hts-cache/new.* filer]\r\n\r\nTror du att den tidigare cache-fil eventuellt innehåler mera komplett information, och vill du återställa den?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * KOPIERINGSFEL! * *\r\nWinHTTrack har upptäckt att den nuvarande webb-kopieringen är tom. Om det var en uppdatering du utförde, har den gamla kopian återskapats.\r\nMöjlig fel: Den första sidan kunde antingen inte hittas eller uppstod det ett problem med förbindelsen.\r\n=> Kontrollera att webbservern finns och/eller kontrollera Proxy-inställningen! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nTips: Klicka [Granska log fil]  för att granska varning/fel-meddelande
@@ -926,5 +926,5 @@ You can now close this window
 
 Server terminated
 
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 

lang/Turkish.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Sitenin yansýsý alýnýyor [%s, %s bayt]
 Site mirroring finished!
 Sitenin yansýsý alýndý!
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Yansý iþlemi sýrasýnda bir hata oluþtu\n
 \nDuring:\n
 \nSüresince:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Yansý iþlemi tamamlandý.\nWinHTTrac'dan çýkmak için Çýk'a týklayýn.\nHerþeyin düzgün yapýldýðýndan emin olmak için kayýt dosyasýna bakabilirsiniz.\n\nWinHTTrack kullandýðýnýz için teþekkürler!
 * * 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?
 * * YANSI ÝÞLEMÝ ÝPTAL EDÝLDÝ! * *\r\nHerhangi bir güncelleme iþlemi için þuanki geçici kayýtlar gereklidir ve bu kayýtlar indirilen dosyalarý tutarlar.\r\nBiçimlendirilmiþ kayýt daha fazla bilgi içerebilir; eðer bu bilgiyi kaybetmek istemiyorsanýz, bu kaydý yedekleyebilir ve geçici olanýný silebilirsiniz.\r\n[Not: Bu iþlemi hts-cache/new.* dosyalarýný silerek kolaylýkla yapabilirsiniz]\r\n\rBiçimlendirilmiþ kaydý geri almak istiyor musunuz?
-* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * YANSI ÝÞLEMÝ HATASI! * *\r\nHTTrack kullanýlan yanýsnýn boþ olduðunu tespit etti. Eðer bu bir güncelleme ise, önceki yansý geri alýnabilir.\r\nNeden: baþlangýç sayfa(lar)ý bulunamadý veya bir baðlantý problemi oluþtu.\r\n=> Web sitesinin olup olmadýðýný ve vekil sunucu ayarlarýnýzý kontrol edin! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\Ýpucu: Hata ve uyarý mesajlarýný görmek için [Kayýt dosyasýný göster]'e týklayýnn
@@ -926,5 +926,5 @@ You can now close this window
 Bu pencereyi artýk kapatabilirsiniz
 Server terminated
 Sunucu sonlandýrdý
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 Bu yansýlama iþlemi sýrasýnda ölümcül bir hata oluþtu

lang/Ukrainian.txt

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Ñòâîðþºòüñÿ äçåðêàëî [%s, %s áàéò]
 Site mirroring finished!
 Ñòâîðåííÿ äçåðêàëà çàâåðøåíå!
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Ó ïðîöåñ³ çàâàíòàæåííÿ â³äáóëàñÿ ïîìèëêà\n
 \nDuring:\n
 Ó ïëèí³:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 Ñòâîðåííÿ äçåðêàëà çàâåðøåíå.\näëÿ âèõîäó ç ïðîãðàìè íàòèñí³òü êíîïêó OK.\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 occured.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
+* * MIRROR ERROR! * *\r\nHTTrack has detected that the current mirror is empty. If it was an update, the previous mirror has been restored.\r\nReason: the first page(s) either could not be found, or a connection problem occurred.\r\n=> Ensure that the website still exists, and/or check your proxy settings! <=
 * * ÏÎÌÈËÊÀ! * *\r\nöå äçåðêàëî - ïîðîæíº. ßêùî öå áóëî â³äíîâëåííÿ, âåðñ³ÿ äçåðêàëà â³äíîâëåíà.\r\nïðè÷èíà: ïåðøà ñòîð³íêà(è) ÷è íå çíàéäåíà, ÷è áóëè ïðîáëåìè ç ç'ºäíàííÿì.\r\n=> Ïåðåêîíàéòåñÿ, ùî âåáñàéò ùå ³ñíóº, ³/÷è ïåðåâ³ðòå  óñòàíîâêè ïðîêñ³-ñåðâåðà! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \nïîäñêàçêà:Äëÿ ïåðåãëÿäó ïîâ³äîìëåíü ïðî ïîìèëêè ³ ïîïåðåäæåíü íàòèñí³òü [Ïåðåãëÿä ëîã ôàéëó]
@@ -926,5 +926,5 @@ You can now close this window
 
 Server terminated
 
-A fatal error has occured during this mirror
+A fatal error has occurred during this mirror
 

lang/Uzbek.txt

@@ -0,0 +1,930 @@
+LANGUAGE_NAME
+Uzbek Latin
+LANGUAGE_FILE
+Uzbek
+LANGUAGE_ISO
+uz
+LANGUAGE_AUTHOR
+Shamsiddinov Zafar (zfrx94 at mail.ru) \r\n
+LANGUAGE_CHARSET
+windows-1251
+LANGUAGE_WINDOWSID
+Uzbek Latin
+OK
+OK
+Cancel
+Bekor qilmoq
+Exit
+Chiqish
+Close
+Yopmoq
+Cancel changes
+O’zgarishlarni bekor qilmoq
+Click to confirm
+Tasdiqlamoq
+Click to get help!
+Yordam olmoq
+Click to return to previous screen
+Ortga qaytmoq
+Click to go to next screen
+Keyingi ekranga o’tish
+Hide password
+Parolni berkitmoq
+Save project
+Loyihani saqlamoq
+Close current project?
+Joriy loyiha yopilsinmi?
+Delete this project?
+Ushbu loyiha o’chirilsinmi?
+Delete empty project %s?
+Bo’sh %s loyihasi o’chirilsinmi?
+Action not yet implemented
+Hozircha tadbiq etilmagan
+Error deleting this project
+Loyihani o’chirishda xatolik
+Select a rule for the filter
+Filtr turini tanlamoq
+Enter keywords for the filter
+Filtr uchun qiymat kiritish
+Cancel
+Bekor qilmoq
+Add this rule
+Bu shartni qo’shmoq
+Please enter one or several keyword(s) for the rule
+Filtr shartini kiriting
+Add Scan Rule
+Filtr qo’shmoq
+Criterion
+Turni tanlamoq:
+String
+Qiymat kiritish:
+Add
+Qo’shmoq
+Scan Rules
+Filtrlar
+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
+Niqobdan foydalanib siz bir necha manzillarni bira yo’la mustasno/yoqishingiz mumkin\nFiltrlarni ajratish uchun vergul yoki probeldan foydalaning.\nMasalan: +*.zip -www.*.com,-www.*.edu/cgi-bin/*.cgi
+Exclude links
+Mustasno qilmoq...
+Include link(s)
+Yoqmoq...
+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)
+Maslahat: Agar hamma gif-fayllarni ko’chirib olmoqchi bo’lsangiz, unda +www.someweb.com/*.gif. filtrdan foydalaning.\n(+*.gif / -*.gif  barcha gif-fayllarni barcha saytlardan, ko’chirib olishni ruxsat etadi/taqiqlaydi.)
+Save prefs
+Moslashtirishni saqlamoq
+Matching links will be excluded:
+Ëèíêè, óäîâëåòâîðÿþùèå ýòîìó óñëîâèþ áóäóò èñêëþ÷åíû:
+Matching links will be included:
+Ëèíêè, óäîâëåòâîðÿþùèå ýòîìó óñëîâèþ áóäóò âêëþ÷åíû:
+Example:
+Masalan:
+gif\r\nWill match all GIF files
+gif\r\nHamma gif fayllarni aniqlaydi (yoki GIF)
+blue\r\nWill find all files with a matching 'blue' sub-string such as 'bluesky-small.jpeg'
+blue\r\n'blue' nomi ostidagi hamma fayllarni topadi, masalan 'bluesky-small.jpeg'
+bigfile.mov\r\nWill match the file 'bigfile.mov', but not 'bigfile2.mov'
+bigfile.mov\r\n'bigfile.mov' faylini topadi, ammo 'bigfile2.mov' faylini emas
+cgi\r\nWill find links with folder name matching sub-string 'cgi' such as /cgi-bin/somecgi.cgi
+cgi\r\n'cgi' satriostidagilarni topadi, /cgi-bin/somecgi.cgi ga o’xshash
+cgi-bin\r\nWill find links with folder name matching whole 'cgi-bin' string (but not cgi-bin-2, for example)
+cgi-bin\r\n'cgi-bin' jildi tarkibidagi manzillarni tutib olmoq (lekin cgi-bin-2 emas, masalan)
+someweb.com\r\nWill find links with matching sub-string such as www.someweb.com, private.someweb.com etc.
+someweb.com\r\nwww.someweb.com, private.someweb.com v. b. shunga o’xshash havolalarni tutib olmoq
+someweb\r\nWill find links with matching folder sub-string such as www.someweb.com, www.someweb.edu, private.someweb.otherweb.com etc.
+someweb\r\nÎòëîâèò àäðåñà òèïà www.someweb.com, www.someweb.edu, private.someweb.otherweb.com è ò.ä.\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.someweb.com\r\nÎòëîâèò àäðåñà, òàêèå êàê www.someweb.com/... (íî íå òàêèå, êàê 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.
+someweb\r\nÎòëîâèò âñå ëèíêè òàêèå, êàê www.someweb.com/.., www.test.abc/fromsomeweb/index.html, www.test.abc/test/someweb.html è ò.ï.
+www.test.com/test/someweb.html\r\nWill only find the 'www.test.com/test/someweb.html' file. Note that you have to type the complete path (URL + site path)
+www.test.com/test/someweb.html\r\nÎòëîâèò òîëüêî www.test.com/test/someweb.html. Çàìåòèì, ÷òî íåîáõîäèìî óêàçàòü ïîëíûé àäðåñ ðåñóðñà - õîñò (www.xxx.yyy) è ïóòü (/test/someweb.html)
+All links will match
+Barcha havolarga ruxsat etilgan
+Add exclusion filter
+Mustasno filtrni qo’shmoq
+Add inclusion filter
+Faol filtrni qo’shmoq
+Existing filters
+Qo’shimcha filtrlar
+Cancel changes
+O’zgarishlarni bekor qilmoq
+Save current preferences as default values
+Joriy sozlanmani odatiy tarzda saqlamoq
+Click to confirm
+Tasdiqlamoq
+No log files in %s!
+%s-da log fayl mavjud emas!
+No 'index.html' file in %s!
+%s-da index.html fayli mavjud emas!
+Click to quit WinHTTrack Website Copier
+WinHTTrack Website Copier dasturidan chiqish
+View log files
+Log fayllarni ko’rish
+Browse HTML start page
+Boshlang’ich html sahifani namoyish etmoq
+End of mirror
+Ko’zgu yaratish bajarildi
+View log files
+Log fayllarni ko’rish
+Browse Mirrored Website
+Ko’zguni ko’rish
+New project...
+Yangi loyiha...
+View error and warning reports
+Xatolik va ogohlantirishlar haqidagi hisobotni ko’rish
+View report
+Hisobotni ko’rish
+Close the log file window
+Log oynasini yopish
+Info type:
+Ma’lumot turi:
+Errors
+Xatolar
+Infos
+Ma’lumot
+Find
+Izlash
+Find a word
+So’zni izlash
+Info log file
+Log-fayl haqida
+Warning/Errors log file
+Xatolar/Ogohlatirishlar log fayli
+Unable to initialize the OLE system
+OLE tizimiga kirib bo’lmadi
+WinHTTrack could not find any interrupted download file cache in the specified folder!
+WinHTTrack ko’rsatilgan jilddan bekor qilingan yuklama keshini topa olmadi!
+Could not connect to provider
+Provayder bilan bog’lanishning imkoni yo’q
+receive
+olindi
+request
+so’rov
+connect
+bog'lanish
+search
+izlash
+ready
+tayyor
+error
+xatolik
+Receiving files..
+Fayllar olinmoqda..
+Parsing HTML file..
+HTML fayli tahlil qilinmoqda...
+Purging files..
+Fayllar o’chirilmoqda...
+Loading cache in progress..
+Keshni yuklash ketmoqda..
+Parsing HTML file (testing links)..
+HTML fayli analizlanmoqda (havolalar tekshirilmoqda)...
+Pause - Toggle [Mirror]/[Pause download] to resume operation
+To’xtatildi (davomo etish uchun [Ko’zgu]ni/[Ko’chirishni to’xtatib turish]ni tanlang)
+Finishing pending transfers - Select [Cancel] to stop now!
+Ko’chirishni kechiktirish tugatilmoqda - bekor qilish uchun, Cancelni bosing!
+scanning
+tekshirilmoqda
+Waiting for scheduled time..
+Tayinlangan vaqt boshlanishu kutilmoqda..
+Connecting to provider
+Provayder bilan bog’lanilmoqda
+[%d seconds] to go before start of operation
+Boshlanishiga [%d soniya] qoldi
+Site mirroring in progress [%s, %s bytes]
+Ko’zgu yaratilmoqda [%s, %s bayt]
+Site mirroring finished!
+Ko’zgu yaratish bajarildi!
+A problem occurred during the mirroring operation\n
+Ko’chirib olish jarayonida xatolik yuz berdi\n
+\nDuring:\n
+Davomida:\n
+\nSee the log file if necessary.\n\nClick FINISH to quit WinHTTrack Website Copier.\n\nThanks for using WinHTTrack!
+Agar, zarurat bo’lsa, log faylni ko’ring.\n\nWinHTTrack chiqish uchun OKni bosing.\n\nWinHTTrackdan foydalanganligingiz uchun tashakkur!
+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!
+Ko’zgu yaratish bajarildi.\nDasturdan chiqish uchun OKni bosing.\nKo’chirib olish muvaffaqiyatli bajarilganligini ko’rish uchun log fayl(lar)ni ko’ring.\n\nWinHTTrackdan foydalanganligingiz uchun tashakkur!
+* * 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?
+* * KO’CHIRIB OLISH BEKOR QILINDI! * *\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! <=
+* * XATOLIK! * *\r\nJoriy ko’zgu - bo’sh. Agar yangilanadigan bo’lsa, oldingi ko’zgu tiklanadi.\r\nSababi: birinchi sahifa(lar) topilmadi yoki bog’lanib bo’lmadi.\r\n=> Veb-saytning mavjudligiga ishonch hosil qiling, è/yoki proksi-serverning o’rnatilganligini tekshiring! <=
+\n\nTip: Click [View log file] to see warning or error messages
+\nMaslahat: Xatolik va ogohlantirishlar haqidagi xabarni ko’rish uchun [log faylni ko’rish]ni bosing.
+Error deleting a hts-cache/new.* file, please do it manually
+hts-cache/new.* faylini o’chirishda xatolik, iltimos, uni o’zingiz o’chiring.\r\n
+Do you really want to quit WinHTTrack Website Copier?
+Siz haqiqatan ham WinHTTrackdan chiqishni xohlaysizmi?
+- Mirroring Mode -\n\nEnter address(es) in URL box
+- Ko’zgulashtirish rejimi -\n\nURL maydoniga manzil(lar)ni kiriting.
+- Interactive Wizard Mode (questions) -\n\nEnter address(es) in URL box
+- Interfaol rejimi - 'Wizard' uslubida ko’zgu yaratish (so’rovlar bo’lishi mumkin) -\n\nURL maydoniga manzil(lar)ni kiriting.
+- File Download Mode -\n\nEnter file address(es) in URL box
+- Alohida fayllarni ko’chirib olish rejimi -\n\nURL maydoniga manzil(lar)ni kiriting.
+- Link Testing Mode -\n\nEnter Web address(es) with links to test in URL box
+- Havolalarni sinash rejimi-\n\nSinab ko’rishni xohlasangiz, URL'lari mavjud sahifa manzilini kiriting.
+- Update Mode -\n\nVerify address(es) in URL box, check parameters if necessary then click on 'NEXT' button
+- Yangilash rejimi -\n\nURL maydonidagi manzil(lar)ni tekshiring, so’ngra 'Keyingi' tugmasini bosing.
+- Resume Mode (Interrupted Operation) -\n\nVerify address(es) in URL box, check parameters if necessary then click on 'NEXT' button
+- Olding hosil qilingan ko’zguni davom etirish rejimi -\n\nURL maydonidagi manzil(lar)ni tekshiring, so’ngra 'Keyingi' tugmasini bosing.
+Log files Path
+Log fayl yo’lagi
+Path
+Yo’lak
+- Links List Mode -\n\nUse URL box to enter address(es) of page(s) containing links to mirror
+Ro’yxatdan ko’zgu yaratish rejimi-\n\nKo’zgu yaratish uchun URL maydoniga manzil(lar), sahifa(lar)ni kiriting.
+New project / Import?
+Yangi loyiha / import qilinsinmi?
+Choose criterion
+Amalni tanlang
+Maximum link scanning depth
+Tekshirish maksimal teranligi
+Enter address(es) here
+Manzilni kiriting
+Define additional filtering rules
+Qo’shimcha filtrni tayinlang
+Proxy Name (if needed)
+Proksi nomi, agar kerak bo’lsa
+Proxy Port
+Proksi-server porti raqami
+Define proxy settings
+Proksini o’rnatishni tayinlang
+Use standard HTTP proxy as FTP proxy
+HTTP proksini FTP proksiday ishlatish
+Path
+Yo’lak
+Select Path
+Yo’lakni tanlang
+Path
+Yo’lak
+Select Path
+Yo’lakni tanlang
+Quit WinHTTrack Website Copier
+WinHTTrack Website Copierdan chiqish
+About WinHTTrack
+WinHTTrack dasturi haqida
+Save current preferences as default values
+Joriy o’rnatishni odatiy qilib saqlamoq
+Click to continue
+Davom etirmoq
+Click to define options
+Ko’chirish parametrini belgilamoq
+Click to add a URL
+URL qo’shmoq
+Load URL(s) from text file
+Matnli fayldan URL(lar)ni yuklamoq
+WinHTTrack preferences (*.opt)|*.opt||
+WinHTTrack sozlanmalari (*.opt)|*.opt||
+Address List text file (*.txt)|*.txt||
+Manzillar ro’yxati matnli fayli(*.txt)|*.txt||
+File not found!
+Fayl topilmadi!
+Do you really want to change the project name/path?
+Loyiha/yo’lak nomini o’zgartirishni xohlaysizmi?
+Load user-default options?
+Sukut bo’yicha o’rnatish yuklansinmi?
+Save user-default options?
+Sozlanmalar saqlansinmi?
+Reset all default options?
+Sukut bo’yicha barcha parametrlar qayta o’rnatilsinmi?
+Welcome to WinHTTrack!
+WinHTTrackga xush kelibsiz!
+Action:
+Faoliyatlar turi:
+Max Depth
+Maks. teranlik:
+Maximum external depth:
+Tashqi saytlarning maksimal teranligi:
+Filters (refuse/accept links) :
+Filtrlar (havolalarni yoqmoq/o’chirib qo’ymoq)
+Paths
+Yo’laklar
+Save prefs
+Sozlanmalarni saqlamoq
+Define..
+Belgilamoq...
+Set options..
+Parametrlarni moslamoq...
+Preferences and mirror options:
+Ko’chirib olish parametrlarini moslash:
+Project name
+Loyiha nomi
+Add a URL...
+URLga qo’shmoq...
+Web Addresses: (URL)
+Veb manzil: (URL)
+Stop WinHTTrack?
+WinHTTrack to’xtatilsinmi?
+No log files in %s!
+%s da log fayllar yo’q!
+Pause Download?
+Ko’chirib olish to’xtatib turilsinmi?
+Stop the mirroring operation
+Ko’chirib olishni to’xtatish
+Minimize to System Tray
+Tizim treyiga berkitmoq
+Click to skip a link or stop parsing
+Havolani o’tkazib yuborish yoki fayl analizini to’xtatish
+Click to skip a link
+Havolani o’tkazib yuborish
+Bytes saved
+Saqlangan bayt:
+Links scanned
+Tekshirilgan havolalar:
+Time:
+Vaqt:
+Connections:
+Bog’lanish:
+Running:
+Holati:
+Hide
+Berkitmoq
+Transfer rate
+Ko’chirib olish tezligi:
+SKIP
+O’TKAZIB YUBORISH
+Information
+Ma'lumot
+Files written:
+Saqlangan fayllar:
+Files updated:
+Yangilangan fayllar:
+Errors:
+Xatoliklar:
+In progress:
+Prossesda:
+Follow external links
+Tashqi havoladan fayllarni olmoq
+Test all links in pages
+Sahifadangi barcha fayllarni tekshirmoq
+Try to ferret out all links
+Barcha havolalarni aniqlashga harakat qilmoq
+Download HTML files first (faster)
+Avval HTML-fayllarni ko’chirib olmoq (tez)
+Choose local site structure
+Saytning mahalliy strukturasini tanlamoq
+Set user-defined structure on disk
+Tayinlangan saytning mahalliy strukturasini o’rnatmoq
+Use a cache for updates and retries
+Èñïîëüçîâàòü êýø äëÿ îáíîâëåíèÿ è äîêà÷êè
+Do not update zero size or user-erased files
+Íå êà÷àòü ôàéëû, êîòîðûå áûëè îäíàæäû ñêà÷àíû, äàæå åñëè îíè íóëåâîé äëèíû èëè óäàëåíû
+Create a Start Page
+Boshlang’ich sahifani yaratmoq
+Create a word database of all html pages
+Ñîçäàòü áàçó äàííûõ ñëîâ, ñîäåðæàùèõñÿ â html-ñòðàíèöàõ
+Create error logging and report files
+Ñîçäàòü ëîã ôàéëû ñ èíôîðìàöèåé î ðàáîòå è îøèáêàõ
+Generate DOS 8-3 filenames ONLY
+Ñîçäàâàòü ôàéëû â DOS-ôîðìàòå 8.3
+Generate ISO9660 filenames ONLY for CDROM medias
+Ñîçäàâàòü èìåíà ôàéëîâ â ñòàíäàðòå ISO9660 òîëüêî äëÿ CDROM
+Do not create HTML error pages
+html-xatoliklari fayllarini yozmaslik
+Select file types to be saved to disk
+Diskka saqlash uchun fayl turini tanlang
+Select parsing direction
+Âûáåðèòå íàïðàâëåíèå ïðîäâèæåíèÿ ïî ñàéòó
+Select global parsing direction
+Âûáåðèòå ãëîáàëüíîå íàïðàâëåíèå ïðîäâèæåíèÿ ïî ñàéòó
+Setup URL rewriting rules for internal links (downloaded ones) and external links (not downloaded ones)
+Óñòàíîâèòü ïðàâèëà ïåðåèìåíîâàíèÿ ëèíêîâ êàê äëÿ âíóòðåííèõ (çàêà÷èâàåìûõ) òàê è äëÿ âíåøíèõ (íå çàãðóæàåìûõ) àäðåñîâ
+Max simultaneous connections
+Ìàêñèìàëüíîå ÷èñëî ñîåäèíåíèé
+File timeout
+Ìàêñèìàëüíîå âðåìÿ íå àêòèâíîñòè çàêà÷êè
+Cancel all links from host if timeout occurs
+ ñëó÷àå ïðåâûøåíèÿ âðåìåíè îæèäàíèÿ îòìåíèòü âñå ëèíêè ñ äàííîãî õîñòà
+Minimum admissible transfer rate
+Ìèíèìàëüíî äîïóñòèìàÿ ñêîðîñòü çàêà÷êè
+Cancel all links from host if too slow
+ ñëó÷àå, åñëè õîñò ñëèøêîì ìåäëåííûé, îòìåíèòü âñå ëèíêè ñ äàííîãî õîñòà
+Maximum number of retries on non-fatal errors
+Ìàêñèìàëüíîå ÷èñëî ïîâòîðíûõ ïîïûòîê, â ñëó÷àå íå ôàòàëüíûõ îøèáîê.
+Maximum size for any single HTML file
+Ìàêñèìàëüíûé ðàçìåð ëþáîãî html-ôàéëà
+Maximum size for any single non-HTML file
+Ìàêñèìàëüíûé ðàçìåð ëþáîãî íå HTML-ôàéëà
+Maximum amount of bytes to retrieve from the Web
+Ìàêñèìàëüíîå êîëè÷åñòâî áàéò, äîïóñòèìûõ äëÿ çàêà÷êè
+Make a pause after downloading this amount of bytes
+Ïîñëå çàãðóçêè óêàçàííîãî ÷èñëà áàéòîâ, ñäåëàòü ïàóçó
+Maximum duration time for the mirroring operation
+Ìàêñ. ïðîäîëæèòåëüíîñòü çåðêàëèçàöèè
+Maximum transfer rate
+Ìàêñ. ñêîðîñòü çàêà÷êè
+Maximum connections/seconds (avoid server overload)
+Ìàêñ. êîëè÷åñòâî ñîåäèíåíèé â ñåêóíäó (íå ïåðåãðóæàòü ñåðâåð)
+Maximum number of links that can be tested (not saved!)
+Ìàêñèìàëüíîå ÷èñëî òåñòèðóåìûõ ëèíêîâ (òåñòèðóåìûõ, à íå ñîõðàíÿåìûõ!)
+Browser identity
+Èäåíòèôèêàöèÿ áðîóçåðà (ñòðîêà User-Agent)
+Comment to be placed in each HTML file
+Êîììåíòàðèé, ðàçìåùàåìûé â êàæäîì HTML ôàéëå
+Back to starting page
+Boshlang’ich sahifaga o’tish
+Save current preferences as default values
+Ñîõðàíèòü íàñòðîéêè êàê çíà÷åíèÿ ïî óìîë÷àíèþ
+Click to continue
+Davom etmoq
+Click to cancel changes
+O’zgarishlarni bekor qilish
+Follow local robots rules on sites
+Ïîä÷èíÿòüñÿ ïðàâèëàì äëÿ ðîáîòîâ, óñòàíàâëèâàåìûì ñàéòàìè
+Links to non-localised external pages will produce error pages
+Ïî ññûëêàì íà âíåøíèå ñòðàíèöû (íå ñêà÷àííûå) áóäåò ïåðåõîä ê ñòðàíèöàì îøèáîê
+Do not erase obsolete files after update
+Íå óäàëÿòü ñòàðûå ôàéëû ïîñëå ïðîöåäóðû îáíîâëåíèÿ çåðêàëà
+Accept cookies?
+Ðàçðåøèòü cookies?
+Check document type when unknown?
+Ïðîâåðÿòü òèï äîêóìåíòà, â ñëó÷àå êîãäà îí íå èçâåñòåí?
+Parse java applets to retrieve included files that must be downloaded?
+Àíàëèçèðîâàòü ÿâà-àïïëåòû ñ öåëüþ îïðåäåëåíèÿ âêëþ÷àåìûå ôàéëîâ?
+Store all files in cache instead of HTML only
+Ïðèíóäèòåëüíî ñîõðàíÿòü âñå ôàéëû â êýøå, à íå òîëüêî ôàéëû HTML
+Log file type (if generated)
+Òèï log ôàëà
+Maximum mirroring depth from root address
+Ìàêñ. ãëóáèíà ñîçäàíèÿ çåðêàëà îò íà÷àëüíîãî àäðåñà
+Maximum mirroring depth for external/forbidden addresses (0, that is, none, is the default)
+Ìàêñèìàëüíàÿ ãëóáèíà çàêà÷êè äëÿ âíåøíèõ/çàïðåùåííûõ àäðåñîâ (0, ò.å., íåò îãðàíè÷åíèé, ýòî çíà÷åíèå ïîóìîë÷àíèþ)
+Create a debugging file
+Ñîçäàòü ôàéë ñ îòëàäî÷íîé èíôîðìàöèåé
+Use non-standard requests to get round some server bugs
+Ïîïûòàòüñÿ îáîéòè îøèáêè íåêîòîðûõ ñåðâåðîâ, èñïîëüçóÿ íå ñòàíäàðòíûå çàïðîñû
+Use old HTTP/1.0 requests (limits engine power!)
+Èñïîëüçîâàòü ñòàðûé ïðîòîêîë HTTP/1.0 (îãðàíè÷èò âîçìîæíîñòè ïðîãðàììû!)
+Attempt to limit retransfers through several tricks (file size test..)
+Ïîïûòêà îãðàíè÷èòü ïåðåêà÷êó èñïîëüóÿ íåêîòîðûå ïðèåìû (òåñò íà ðàçìåð ôàéëà..)
+Attempt to limit the number of links by skipping similar URLs (www.foo.com==foo.com, http=https ..)
+Îãðàíè÷èòü ÷èñëî ëèíêîâ, óäàëÿÿ àíàëîãè÷íûå ëèíêè (www.foo.com==foo.com, http=https ..)
+Write external links without login/password
+Ñîõðàíÿòü âíåøíèå ëèíêè áåç ëîãèíà/ïàðîëÿ
+Write internal links without query string
+Ñîõðàíÿòü âíóòðåííèå ëèíêè óñå÷åííî (äî çàíàêà ?)
+Get non-HTML files related to a link, eg external .ZIP or pictures
+html fayllarga yaqin bo’lmagan havolalarni ko’chirib olmaslik (msln.: tashqi .ZIP yoki graf. fayllar)
+Test all links (even forbidden ones)
+Barcha havolalarni sinab ko’rmoq (hatto taqiqlanganlarini ham)
+Try to catch all URLs (even in unknown tags/code)
+Ñòàðàòüñÿ îïðåäåëÿòü âñå URL'û (äàæå â íåîïîçíàííûõ òýãàõ/ñêðèïòàõ)
+Get HTML files first!
+Ïîëó÷èòü âíà÷àëå HTML ôàéëû!
+Structure type (how links are saved)
+Òèï ëîêàëüíîé ñòðóêòóðû çåðêàëà (ñïîñîá ñîõðàíåíèÿ ôàéëîâ)
+Use a cache for updates
+Èñïîëüçîâàòü êýø äëÿ îáíîâëåíèÿ
+Do not re-download locally erased files
+Íå êà÷àòü çàíîâî ëîêàëüíî óäàëåííûå ôàéëû
+Make an index
+Indeks yaratmoq
+Make a word database
+So’z bazasini yaratmoq
+Log files
+Log fayllar
+DOS names (8+3)
+DOS-fayllar formati (8+3)
+ISO9660 names (CDROM)
+ISO9660 standartidagi nomlar (CDROM)
+No error pages
+Xatosiz sahifalar
+Primary Scan Rule
+Asosiy filtr
+Travel mode
+Tekshirish rejimi
+Global travel mode
+Global tekshiruv rejimi
+These options should be modified only exceptionally
+Êàê ïðàâèëî, ýòè íàñòðîéêè èçìåíÿòü íå ñëåäóåò
+Activate Debugging Mode (winhttrack.log)
+Tuzatish rejimini yoqmoq (winhttrack.log)
+Rewrite links: internal / external
+Havolalarni qayta nomlamoq: ichki/tashqi
+Flow control
+Tekshrish yo’nalishi nazorati
+Limits
+Cheklovlar
+Identity
+Identifikator
+HTML footer
+Quyi HTML kolontitul
+N# connections
+N# bog’lanish
+Abandon host if error
+Ïðåêðàòèòü çàêà÷êó ñ õîñòà, â ñëó÷àå îøèáêè
+Minimum transfer rate (B/s)
+Ìèíèìàëüíàÿ ñêîðîñòü çàêà÷êè (B/s)
+Abandon host if too slow
+Ïðåêðàòèòü çàêà÷êó ñ õîñòà, åñëè îíà ñëèøêîì ìåäëåííàÿ
+Configure
+Moslamoq
+Use proxy for ftp transfers
+Èñïîëüçîâàòü ïðîêñè äëÿ ftp-çàêà÷êè
+TimeOut(s)
+Taym-out
+Persistent connections (Keep-Alive)
+Ïîñòîÿííûå ñîåäèíåíèÿ (Keep-Alive)
+Reduce connection time and type lookup time using persistent connections
+Óìåíüøèòü âðåìåíà ñîåäèíåíèÿ è îáðàùåíèÿ èñïîëüçóÿ ïîñòîÿííûå ñîåäèíåíèÿ
+Retries
+Ïîâòîðíûå ïîïûòêè
+Size limit
+Îãðàíè÷åíèå ïî ðàçìåðó
+Max size of any HTML file (B)
+Ìàêñ. ðàçìåð html-ôàéëà:
+Max size of any non-HTML file
+Ìàêñ. ðàçìåð íå-html:
+Max site size
+Ìàêñ. ðàçìåð ñàéòà
+Max time
+Ìàêñ. âðåìÿ çàêà÷êè
+Save prefs
+Sozlanmani saqlash
+Max transfer rate
+Ìàêñ. ñêîðîñòü çàêà÷êè
+Follow robots.txt
+Ñëåäîâàòü ïðàâèëàì èç robots.txt
+No external pages
+Tashqi havolalarsiz
+Do not purge old files
+Íå óäàëÿòü ñòàðûå ôàéëû
+Accept cookies
+Ðàçðåøèòü cookies
+Check document type
+Ïðîâåðÿòü òèï äîêóìåíòà
+Parse java files
+Àíàëèç ÿâà ôàéëîâ
+Store ALL files in cache
+Ñîõðàíÿòü ÂÑÅ ôàéëû â êýøå
+Tolerant requests (for servers)
+Òîëåðàíòíûå çàïðîñû (ê ñåðâåðàì)
+Update hack (limit re-transfers)
+Update hack (îãðàíè÷åíèå ïîâòîðíûõ çàêà÷åê)
+URL hacks (join similar URLs)
+Õàê URL (îáúåäåíèòü àíàëîãè÷íûå URLs)
+Force old HTTP/1.0 requests (no 1.1)
+Èñïîëüçîâàòü ñòàðûé ïðîòîêîë HTTP/1.0 (íå 1.1)
+Max connections / seconds
+Ìàêñ. ÷èñëî ñîåäèíåíèé/ñåê.
+Maximum number of links
+Ìàêñèìàëüíîå ÷èñëî ëèíêîâ
+Pause after downloading..
+Ïàóçà ïîñëå çàãðóçêè...
+Hide passwords
+Parollarni berkitmoq
+Hide query strings
+Ñïðÿòàòü çàïðîñíóþ ÷àñòü ñòðîêè (âñå, ÷òî ïîñëå çíàêà ?)
+Links
+Havolalar
+Build
+Ñòðóêòóðà
+Experts Only
+Ýêñïåðò
+Flow Control
+Óïðàâëåíèå çàêà÷êîé
+Limits
+Îãðàíè÷åíèÿ
+Browser ID
+Èäåíòèôèêàöèÿ
+Scan Rules
+Ôèëüòðû
+Spider
+Êà÷àëêà
+Log, Index, Cache
+Ëîã, Èíäåêñ. Êýø
+Proxy
+Ïðîêñè
+MIME Types
+MIME Types (Òèïû ôàéëîâ)
+Do you really want to quit WinHTTrack Website Copier?
+Âû äåéñòâèòåëüíî õîòèòå çàâåðøèòü ðàáîòó ñ ïðîãðàììîé?
+Do not connect to a provider (already connected)
+Íå ñîåäèíÿòüñÿ ñ ïðîâàéäåðîì (ñîåäèíåíèå óæå óñòàíîâëåíî)
+Do not use remote access connection
+Íå èñïîüçîâàòü óäàëåííîé ñîåäèíåíèÿ
+Schedule the mirroring operation
+Çàêà÷êà ïî ðàñïèñàíèþ
+Quit WinHTTrack Website Copier
+Âûéòè èç WinHTTrack Website Copier
+Back to starting page
+Íàçàä ê íà÷àëüíîé ñòðàíèöå
+Click to start!
+Start!
+No saved password for this connection!
+Íåò ñîõðàíåííîãî ïàðîëÿ äëÿ ýòîãî ñîåäèíåíèÿ
+Can not get remote connection settings
+Íå ìîãó ïîëó÷èòü óñòàíîâêè óäàëåííîãî ñîåäèíåíèÿ
+Select a connection provider
+Âûáåðèòå ïðîâàéäåðà, ê êîòîðîìó óñòàíîâèòü ñîåäèíåíèå
+Start
+Boshlamoq
+Please adjust connection parameters if necessary,\nthen press FINISH to launch the mirroring operation.
+Âû ìîæåòå èëè íà÷àòü çàêà÷êó, íàæàâ êíîïêó ÑÒÀÐÒ, èëè ìîæåòå çàäàòü äîïîëíèòåëüíûå ïàðàìåòðû ñîåäèíåíèÿ
+Save settings only, do not launch download now.
+Òîëüêî ñîõðàíèòü óñòàíîâêè, íå íà÷èíàòü çàêà÷êó.
+On hold
+Çàäåðæêà
+Transfer scheduled for: (hh/mm/ss)
+Æäåì äî: (hh/mm/ss)
+Start
+Íà÷àòü!
+Connect to provider (RAS)
+Ñîåäèíèòüñÿ ñ ïðîâàéäåðîì (RAS)
+Connect to this provider
+Ñîåäèíèòüñÿ ñ ýòèì ïðîâàéäåðîì
+Disconnect when finished
+Îòñîåäèíèòüñÿ ïðè çàâåðøåíèè
+Disconnect modem on completion
+Îòñîåäåíèòü ïðè çàâåðøåíèè
+\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(Ñîîáùèòå íàì ïîæàëóéñòà î çàìå÷åííûõ ïðîáëåìàõ è îøèáêàõ)\r\n\r\nÐàçðàáîòêà:\r\nÈíòåðôåéñ (Windows): Xavier Roche\r\nÊà÷àëêà (spider): Xavier Roche\r\nÏàðñåð ÿâà-êëàññîâ: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Russian translations to:\r\nAndrei Iliev (andreiiliev@mail.ru)
+About WinHTTrack Website Copier
+Î ïðîãðàììå WinHTTrack Website Copier
+Please visit our Web page
+Ïîæàëóéñòà, ïîñåòèòå íàøó âåá-ñòðàíèöó
+Wizard query
+Âîïðîñ ìàñòåðà
+Your answer:
+Javobingiz:
+Link detected..
+Íàéäåí ëèíê..
+Choose a rule
+Qoidani tanlang
+Ignore this link
+Èãíîðèðîâàòü ýòîò ëèíê
+Ignore directory
+Èãíîðèðîâàòü äèðåêòîðèþ
+Ignore domain
+Èãíîðèðîâàòü äîìåí
+Catch this page only
+Ñêà÷àòü òîëüêî ýòó ñòðàíè÷êó
+Mirror site
+Çåðêàëèçîâàòü ñàéò
+Mirror domain
+Çåðêàëèçîâàòü äîìåí
+Ignore all
+Èãíîðèðîâàòü âñå
+Wizard query
+Âîïðîñ ìàñòåðà
+NO
+YO’Q
+File
+Fayl
+Options
+Tanlovlar
+Log
+Log
+Window
+Oyna
+Help
+Yordam
+Pause transfer
+Ïðèîñòàíîâèòü çàêà÷êó
+Exit
+Chiqish
+Modify options
+Èçìåíèòü íàñòðîéêè
+View log
+Logni ko’rmoq
+View error log
+Log xatolarni ko’rmoq
+View file transfers
+Fayllarni uzatish prossesini ko’rmoq
+Hide
+Berkitmoq
+About WinHTTrack Website Copier
+Dastur haqida...
+Check program updates...
+Ïðîâåðèòü íàëè÷èå îáíîâëåííèé ïðîãðàììû...
+&Toolbar
+Uskunalar paneli
+&Status Bar
+Holat paneli
+S&plit
+Ajratmoq
+File
+Fayl
+Preferences
+Sozlanmalar
+Mirror
+Ko’zgu
+Log
+Log
+Window
+Îêíî
+Help
+Ïîìîùü
+Exit
+Âûõîä
+Load default options
+Çàãðóçèòü çíà÷åíèÿ ïàðàìåòðîâ ïî óìîë÷àíèþ
+Save default options
+Ñîõðàíèòü çíà÷åíèÿ ïî óìîë÷àíèþ
+Reset to default options
+Î÷èñòèòü çíà÷åíèÿ ïî óìîë÷àíèþ
+Load options...
+Çàãðóçèòü íàñòðîéêè...
+Save options as...
+Ñîõðàíèòü íàñòðîéêè êàê...
+Language preference...
+Tilni tanlash
+Contents...
+Mundarija...
+About WinHTTrack...
+WinHTTrack haqida...
+New project\tCtrl+N
+Yangi loyiha\tCtrl+N
+&Open...\tCtrl+O
+&Ochmoq...\tCtrl+O
+&Save\tCtrl+S
+&Saqlamoq\tCtrl+S
+Save &As...
+Quyidagidek &saqlamoq...
+&Delete...
+&O’chirmoq...
+&Browse sites...
+&Saytlarni ko’rish...
+User-defined structure
+Çàäàíèå ñòðóêòóðû
+%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\tÈìÿ ôàéëà áåç ðàñøèðåíèÿ (íàïð.: image)\r\n%N\tÈìÿ ôàéëà ñ ðàñøèðåíèåì (íàïð.: image.gif)\r\n%t\tÐàñøèðåíèå ôàéëà (íàïð.: gif)\r\n%p\tÏóòü ê ôàéëó [áåç îêàí÷èâàþùåãî /] (íàïð.: /someimages)\r\n%h\tÈìÿ õîñòà (íàïð.: www.someweb.com)\r\n%M\tURL MD5 (128 bits, 32 ascii bytes)\r\n%Q\tquery string MD5 (128 bits, 32 ascii bytes)\r\n%q\tsmall query string MD5 (16 bits, 4 ascii bytes)\r\n\r\n%s?\tDOS'êîå èìÿ (íàïð: %sN)
+Example:\t%h%p/%n%q.%t\n->\t\tc:\\mirror\\www.someweb.com\\someimages\\image.gif
+Masalan:\t%h%p/%n%q.%t\n->\t\tc:\\mirror\\www.someweb.com\\someimages\\image.gif
+Proxy settings
+Proksini moslash
+Proxy address:
+Proksi manzili:
+Proxy port:
+Port raqami:
+Authentication (only if needed)
+Àóòåíòèôèêàöèÿ (åñëè òðåáóåòñÿ)
+Login
+Login
+Password
+Parol
+Enter proxy address here
+Ââåäèòå àäðåñ ïðîêñè ñåðâåðà
+Enter proxy port here
+Ââåäèòå íîìåð ïîðòà ïðîêñè ñåðâåðà
+Enter proxy login
+Ââåäèòå ëîãèí ïðîêñè
+Enter proxy password
+Ââåäèòå ïàðîëü äëÿ ïðîêñè ñåðâåðà
+Enter project name here
+Ââåäèòå èìÿ ïðîåêòà
+Enter saving path here
+Óêàæèòå êàòàëîã äëÿ ñîõðàíåíèÿ ïðîåêòà
+Select existing project to update
+Äëÿ îáíîâëåíèÿ ïðîåêòà, âûáåðèòå åãî èç ñïèñêà
+Click here to select path
+Âûáðàòü êàòàëîã ïðîåêòà
+Select or create a new category name, to sort your mirrors in categories
+Âûáðàòü èëè ñîçäàòü íîâóþ êàòåãîðèþ äëÿ ñîðòèðîâêè çåðêàë ïî êàòåãîðèÿì
+HTTrack Project Wizard...
+HTTrack loyiha yaratuvchisi...
+New project name:
+Yangi loyiha nomi:
+Existing project name:
+Mavjud loyiha nomi:
+Project name:
+Loyiha nomi:
+Base path:
+Jild:
+Project category:
+Loyiha kategoriyasi:
+C:\\My Web Sites
+C:\\Veb saytlarim
+Type a new project name, \r\nor select existing project to update/resume
+Yangi loyiha nomini kiriting, \r\nyoki mavjud loyihani yangilash/davom etirish uchun tanlang
+New project
+Yangi loyiha
+Insert URL
+URLni qo’ymoq
+URL:
+URL:
+Authentication (only if needed)
+Autentifikatsiya (agar kerak bo’lsa)
+Login
+Login:
+Password
+Parol:
+Forms or complex links:
+Murakkab havolalar:
+Capture URL...
+Çàñå÷ü URL...
+Enter URL address(es) here
+URL manzilni kiriting
+Enter site login
+Ââåäèòå ëîãèí äëÿ äîñòóïà ê ñàéòó
+Enter site password
+Ââåäèòå ïàðîëü äëÿ äîñòóïà ê ñàéòó
+Use this capture tool for links that can only be accessed through forms or javascript code
+Èñïîëüçóéòå ýòî ñðåäñòâî äëÿ îòëîâà äèíàìè÷åñêèõ URL (javascript, ôîðìû è ò.ï.)
+Choose language according to preference
+Âûáîð ÿçûêà
+Catch URL!
+URLni tuting!
+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.
+Âðåìåííî óñòàíîâèòå â íàñòðîéêàõ ïðîêñè âàøåãî áðîóçåðà óêàçàííûå íèæå çíà÷åíèÿ àäðåñà è íîìåðà ïîðòà.\nÇàòåì, â áðîóçåðå âûïîëíèòå íåîáõîäèìûå äåéñòâèÿ (ïîñëàòü ôîðìó, àêòèâèçèðîâàòü ñêðèïò è ò.ï.) .
+This will send the desired link from your browser to WinHTTrack.
+Òàêèì îáðàçîì âû ñìîæåòå ïåðåäàòü æåëàåìûé ëèíê èç áðàóçåðà â HTTrack.
+ABORT
+Bekor qilmoq
+Copy/Paste the temporary proxy parameters here
+Vaqtinchalik proksi sozlamasini nusxalamoq/qo’ymoq
+Cancel
+Bekor qilmoq
+Unable to find Help files!
+Íå íàéäåíû ôàéëû ïîìîùè!
+Unable to save parameters!
+Parametrlarni saqlashning imkoni yo’q!
+Please drag only one folder at a time
+Iltimos, faqat bitta jildni surib olib keling
+Please drag only folders, not files
+Iltimos, faqat fayllarni jildni surib olib keling, fayllarni emas
+Please drag folders only
+Iltimos, faqat jildlarni surib olib keling
+Select user-defined structure?
+Âûáðàòü çàäàííóþ âàìè ñòðóêòóðó?
+Please ensure that the user-defined-string is correct,\notherwise filenames will be bogus!
+Ïðîâåðüòå, ÷òî îïðåäåëåííàÿ âàìè ñòðóêòóðà ïðàâèëüíà, â ïðîòèâíîì ñëó÷àå, èìåíà ôàéëîâ áóäóò íåïðåäñêàçóåìû
+Do you really want to use a user-defined structure?
+Âû äåéñòâèòåëüíî õîòèòå âûáðàòü çàäàííóþ ñòðóêòóðó?
+Too manu URLs, cannot handle so many links!!
+Ñëèøêîì ìíîãî URL'îâ, íå ìîãó îáðàáîòàòü òàêîå êîëè÷åñòâî ëèíêîâ!
+Not enough memory, fatal internal error..
+Xotira yetarli emas, jiddiy ichki xatolik...
+Unknown operation!
+Noma'lum operatsiya
+Add this URL?\r\n
+Ushbu URL qo’shilsinmi?\r\n
+Warning: main process is still not responding, cannot add URL(s)..
+Diqqat: so’rovlarga javob bermayapti, URLlarni qo’shishning imkoni yo’q...
+Type/MIME associations
+Ñîîòâåòñâèå òèïó ôàéëîâ (Type/MIME)
+File types:
+Fayl turlari:
+MIME identity:
+MIME identity
+Select or modify your file type(s) here
+Âûáðàòü èëè èçìåíèòü òèïû ôàéëîâ
+Select or modify your MIME type(s) here
+Fayllar turini tanlamoq yoki o’zgartirmoq
+Go up
+Yuqoriga
+Go down
+Pastga
+File download information
+Yuklab olingan fayl haqida
+Freeze Window
+Oynani qotirib qo’ymoq
+More information:
+Qo’shimcha ma’lumot:
+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
+Äîáðî ïîæàëîâàòü â ïðîãðàììó WinHTTrack Website Copier!\n\nÏîæàëóéñòà íàæìèòå êíîïêó ÄÀËÅÅ äëÿ òîãî, ÷òîáû\n\n- íà÷àòü íîâûé ïðîåêò\n- èëè âîçîáíîâèòü ÷àñòè÷íóþ çàêà÷êó
+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
+Èìåíà ôàéëîâ ñ ðàøèðåíèåì:\nÈìåíà ôàéëîâ, ñîäåðæàùèå:\nÝòîò ôàéë:\nÈìåíà ôîëäåðîâ ñîäåðæàò:\nÝòîò ôîëäåð:\nËèíêè èç ýòîãî äîìåíà:\nËèíêè èç äîìåíîâ, ñîäåðæàùèå:\nËèíêè èç ýòîãî õîñòà:\nËèíêè ñîäåðæàùèå:\nÝòîò ëèíê:\nÂÑÅ ËÈÍÊÈ
+Show all\nHide debug\nHide infos\nHide debug and infos
+Ïîêàçàòü âñå\nÑïðÿòàòü îòëàäêó\nÑïðÿòàòü èíôî\nÑïðÿòàòü îòëàäêó è èíôî
+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..
+Ñòðóêòóðà ñàéòà (ïî óìîë÷àíèþ)\nHtml/, ôàéëû èçîáðàæåíèé/äðóãèå ôàéëû/ôàéëû èçîáðàæåíèé/\nHtml/html, ôàéëû èçîáðàæåíèé/äðóãèå ôàéëû/ôàéëû èçîáðàæåíèé\nHtml/, ôàéëû èçîáðàæåíèé/äðóãèå ôàéëû/\nHtml/, ôàéëû èçîáðàæåíèé/äðóãèå ôàéëû/xxx, ãäå xxx - ðàñøèðåíèå ôàéëà\nHtml, ôàéëû èçîáðàæåíèé/äðóãèå ôàéëû/xxx\nÑòðóêòóðà ñàéòà áåç www.domain.xxx/\nHtml â site_name/ ôàéëû èçîáðàæåíèé/äðóãèå ôàéëû â site_name/ôàéëû èçîáðàæåíèé/\nHtml â site_name/html, ôàéëû èçîáðàæåíèé/äðóãèå ôàéëû â site_name/ôàéëû èçîáðàæåíèé\nHtml â site_name/, ôàéëû èçîáðàæåíèé/äðóãèå ôàéëû â site_name/\nHtml â site_name/, ôàéëû èçîáðàæåíèé/äðóãèå ôàéëû â site_name/xxx\nHtml â site_name/html, ôàéëû èçîáðàæåíèé/äðóãèå ôàéëû â site_name/xxx\nÂñå ôàéëû èç âåáà/, ñ ïðîèçâîëüíûìè èìåíàìè (íîâèíêà !)\nÂñå ôàéëû èç site_name/, ñ ïðîèçâîëüíûìè èìåíàìè (íîâèíêà !)\nÇàäàííàÿ ïîëüçîâàòåëåì ñòðóêòóðà...
+Just scan\nStore html files\nStore non html files\nStore all files (default)\nStore html files first
+Òîëüêî ñêàíèðîâàòü\nÑîõðàíÿòü html ôàéëû\nÑîõðàíÿòü íå html ôàéëû\nÑîõðàíÿòü âñå ôàéëû (ïî óìîë÷àíèþ)\nÑîõðàíÿòü âíà÷àëå html ôàéëû
+Stay in the same directory\nCan go down (default)\nCan go up\nCan both go up & down
+Îñòàâàòüñÿ â òîéæå äèðåêòîðèè\nÌîæíî äâèãàòüñÿ âíèç (ïî óìîë÷àíèþ)\nÌîæíî äâèãàòüñÿ ââåðõ\nÌîæíî äâèãàòüñÿ ââåðõ è âíèç
+Stay on the same address (default)\nStay on the same domain\nStay on the same top level domain\nGo everywhere on the web
+Îñòàâàòüñÿ íà òîì æå àäðåñå (ïî óìîë÷àíèþ)\nÎñòàâàòüñÿ íà òîì æå äîìåíå\nÎñòàâàòüñÿ íà òîì æå äîìåíå âåðõíåãî óðîâíÿ\nÈäòè êóäà óãîäíî
+Never\nIf unknown (except /)\nIf unknown
+Hech qachon\nAgar noma'lum bo’lsa (/ dan boshqasi)\nAgar noma'lum bo’lsa
+no robots.txt rules\nrobots.txt except wizard\nfollow robots.txt rules
+Íå ïîä÷èíÿòüñÿ ïðàâèëàì robots.txt\nrobots.txt êðîìå Ìàñòåðà\nïîä÷èíÿòüñÿ ïðàâèëàì robots.txt
+normal\nextended\ndebug
+Odatiy\nkengaytirilgan\ntuzatish
+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
+Sayt(lar)ni ko’chirib olish\nSayt(lar)ni ko’chirib olmoq +savollar\nAlohida fayllarni yuklab olmoq\nBarcha saytlarni sahifalari bilan ko’chirib olish (bir necha ko’zgu)\nHavolalarni sahifasi bilan sinamoq (xatcho’p testi)\n* To’xtatilganni davom etirmoq\n* Mavjud yuklamani yangilamoq
+Relative URI / Absolute URL (default)\nAbsolute URL / Absolute URL\nAbsolute URI / Absolute URL\nOriginal URL / Original URL
+Îòíîñèòåëüíûé URI / Àáñîëþòíûé URL (ïî óìîë÷àíèþ)\nÀáñîëþòíûé URL / Àáñîëþòíûé URL\nÀáñîëþòíûé URI / Àáñîëþòíûé URL\nÏåðâîíà÷àëüíûé URL / Ïåðâîíà÷àëüíûé URL
+Open Source offline browser
+Open Source offlayn brauzer
+Website Copier/Offline Browser. Copy remote websites to your computer. Free.
+Veb-saytlarni oluvchi/Offlayn brauzer. Kompyuteringizga veb-saytlarni ko’chirib beradi. Bepul.
+httrack, winhttrack, webhttrack, offline browser
+httrack, winhttrack, webhttrack, offline browser
+URL list (.txt)
+URLlar ro’yxati (.txt)
+Previous
+Ortga
+Next
+Keyingi
+URLs
+URLs
+Warning
+Ogohlatirish
+Your browser does not currently support javascript. For better results, please use a javascript-aware browser.
+Âàø áðàóçåð èëè íå ïîääåðæèâàåò javascript èëè åãî ïîääåðæêà âûêëþ÷åíà. Äëÿ ïîëó÷åíèÿ íàèëó÷øåãî ðåçóëüòàòà àêòèâèçèðóéòå ïîääåðæêó javascript.
+Thank you
+Rahmat
+You can now close this window
+Endi bu oynani yopsangiz bo’ladi
+Server terminated
+Server terminated
+A fatal error has occurred during this mirror
+Joriy ko’chirish vaqtida jiddiy xatolik yuz berdi

libtest/Makefile.am

@@ -12,39 +12,41 @@ AM_CPPFLAGS = \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DDATADIR=\""$(datadir)"\" \
 	-DLIBDIR=\""$(libdir)"\"
-
 AM_CPPFLAGS += -I../src
-AM_LDFLAGS = -L../src
+
+AM_LDFLAGS = \
+	@DEFAULT_LDFLAGS@ \
+	-L../src
 
 # Examples
 libbaselinks_la_SOURCES =  callbacks-example-baselinks.c
 libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libbaselinks_la_LDFLAGS = -version-info 1:0:0
+libbaselinks_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libchangecontent_la_SOURCES =  callbacks-example-changecontent.c
 libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libchangecontent_la_LDFLAGS = -version-info 1:0:0
+libchangecontent_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libcontentfilter_la_SOURCES =  callbacks-example-contentfilter.c
 libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libcontentfilter_la_LDFLAGS = -version-info 1:0:0
+libcontentfilter_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libdisplayheader_la_SOURCES =  callbacks-example-displayheader.c
 libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libdisplayheader_la_LDFLAGS = -version-info 1:0:0
+libdisplayheader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libfilename2_la_SOURCES =  callbacks-example-filename2.c
 libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libfilename2_la_LDFLAGS = -version-info 1:0:0
+libfilename2_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libfilename_la_SOURCES =  callbacks-example-filename.c
 libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libfilename_la_LDFLAGS = -version-info 1:0:0
+libfilename_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libfilenameiisbug_la_SOURCES =  callbacks-example-filenameiisbug.c
 libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0
+libfilenameiisbug_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 liblistlinks_la_SOURCES =  callbacks-example-listlinks.c
 liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-liblistlinks_la_LDFLAGS = -version-info 1:0:0
+liblistlinks_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 liblog_la_SOURCES =  callbacks-example-log.c
 liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-liblog_la_LDFLAGS = -version-info 1:0:0
+liblog_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libsimple_la_SOURCES =  callbacks-example-simple.c
 libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libsimple_la_LDFLAGS = -version-info 1:0:0
+libsimple_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la

libtest/Makefile.in

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2021 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.
@@ -17,23 +16,61 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,15 +90,15 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = libtest
-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)/configure.ac
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -100,85 +137,128 @@ libbaselinks_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/src/libhttrack.la
 am_libbaselinks_la_OBJECTS = callbacks-example-baselinks.lo
 libbaselinks_la_OBJECTS = $(am_libbaselinks_la_OBJECTS)
-libbaselinks_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libbaselinks_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libbaselinks_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libbaselinks_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
 libchangecontent_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/src/libhttrack.la
 am_libchangecontent_la_OBJECTS = callbacks-example-changecontent.lo
 libchangecontent_la_OBJECTS = $(am_libchangecontent_la_OBJECTS)
-libchangecontent_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libchangecontent_la_LDFLAGS) $(LDFLAGS) -o $@
+libchangecontent_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libchangecontent_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 libcontentfilter_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/src/libhttrack.la
 am_libcontentfilter_la_OBJECTS = callbacks-example-contentfilter.lo
 libcontentfilter_la_OBJECTS = $(am_libcontentfilter_la_OBJECTS)
-libcontentfilter_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libcontentfilter_la_LDFLAGS) $(LDFLAGS) -o $@
+libcontentfilter_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libcontentfilter_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 libdisplayheader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/src/libhttrack.la
 am_libdisplayheader_la_OBJECTS = callbacks-example-displayheader.lo
 libdisplayheader_la_OBJECTS = $(am_libdisplayheader_la_OBJECTS)
-libdisplayheader_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libdisplayheader_la_LDFLAGS) $(LDFLAGS) -o $@
+libdisplayheader_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libdisplayheader_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 libfilename_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/src/libhttrack.la
 am_libfilename_la_OBJECTS = callbacks-example-filename.lo
 libfilename_la_OBJECTS = $(am_libfilename_la_OBJECTS)
-libfilename_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libfilename_la_LDFLAGS) $(LDFLAGS) -o $@
+libfilename_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libfilename_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
 libfilename2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/src/libhttrack.la
 am_libfilename2_la_OBJECTS = callbacks-example-filename2.lo
 libfilename2_la_OBJECTS = $(am_libfilename2_la_OBJECTS)
-libfilename2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libfilename2_la_LDFLAGS) $(LDFLAGS) -o $@
+libfilename2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libfilename2_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
 libfilenameiisbug_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/src/libhttrack.la
 am_libfilenameiisbug_la_OBJECTS = callbacks-example-filenameiisbug.lo
 libfilenameiisbug_la_OBJECTS = $(am_libfilenameiisbug_la_OBJECTS)
-libfilenameiisbug_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libfilenameiisbug_la_LDFLAGS) $(LDFLAGS) -o $@
+libfilenameiisbug_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libfilenameiisbug_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 liblistlinks_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/src/libhttrack.la
 am_liblistlinks_la_OBJECTS = callbacks-example-listlinks.lo
 liblistlinks_la_OBJECTS = $(am_liblistlinks_la_OBJECTS)
-liblistlinks_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(liblistlinks_la_LDFLAGS) $(LDFLAGS) -o $@
+liblistlinks_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(liblistlinks_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
 liblog_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(top_builddir)/src/libhttrack.la
 am_liblog_la_OBJECTS = callbacks-example-log.lo
 liblog_la_OBJECTS = $(am_liblog_la_OBJECTS)
-liblog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+liblog_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(liblog_la_LDFLAGS) $(LDFLAGS) -o $@
 libsimple_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(top_builddir)/src/libhttrack.la
 am_libsimple_la_OBJECTS = callbacks-example-simple.lo
 libsimple_la_OBJECTS = $(am_libsimple_la_OBJECTS)
-libsimple_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+libsimple_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libsimple_la_LDFLAGS) $(LDFLAGS) -o $@
+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 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/callbacks-example-baselinks.Plo \
+	./$(DEPDIR)/callbacks-example-changecontent.Plo \
+	./$(DEPDIR)/callbacks-example-contentfilter.Plo \
+	./$(DEPDIR)/callbacks-example-displayheader.Plo \
+	./$(DEPDIR)/callbacks-example-filename.Plo \
+	./$(DEPDIR)/callbacks-example-filename2.Plo \
+	./$(DEPDIR)/callbacks-example-filenameiisbug.Plo \
+	./$(DEPDIR)/callbacks-example-listlinks.Plo \
+	./$(DEPDIR)/callbacks-example-log.Plo \
+	./$(DEPDIR)/callbacks-example-simple.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libbaselinks_la_SOURCES) $(libchangecontent_la_SOURCES) \
 	$(libcontentfilter_la_SOURCES) $(libdisplayheader_la_SOURCES) \
 	$(libfilename_la_SOURCES) $(libfilename2_la_SOURCES) \
@@ -196,12 +276,29 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 DATA = $(exemples_DATA)
-ETAGS = etags
-CTAGS = ctags
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 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@
@@ -210,9 +307,11 @@ 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@
@@ -226,8 +325,10 @@ 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@
@@ -239,6 +340,7 @@ 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@
@@ -247,6 +349,7 @@ 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@
@@ -323,6 +426,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -337,39 +441,42 @@ EXTRA_DIST = $(exemples_DATA) libtest.mak libtest.vcproj
 AM_CPPFLAGS = @DEFAULT_CFLAGS@ @THREADS_CFLAGS@ @V6_FLAG@ @LFS_FLAG@ \
 	-DPREFIX=\""$(prefix)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DDATADIR=\""$(datadir)"\" -DLIBDIR=\""$(libdir)"\" -I../src
-AM_LDFLAGS = -L../src
+AM_LDFLAGS = \
+	@DEFAULT_LDFLAGS@ \
+	-L../src
+
 
 # Examples
 libbaselinks_la_SOURCES = callbacks-example-baselinks.c
 libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libbaselinks_la_LDFLAGS = -version-info 1:0:0
+libbaselinks_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libchangecontent_la_SOURCES = callbacks-example-changecontent.c
 libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libchangecontent_la_LDFLAGS = -version-info 1:0:0
+libchangecontent_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libcontentfilter_la_SOURCES = callbacks-example-contentfilter.c
 libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libcontentfilter_la_LDFLAGS = -version-info 1:0:0
+libcontentfilter_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libdisplayheader_la_SOURCES = callbacks-example-displayheader.c
 libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libdisplayheader_la_LDFLAGS = -version-info 1:0:0
+libdisplayheader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libfilename2_la_SOURCES = callbacks-example-filename2.c
 libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libfilename2_la_LDFLAGS = -version-info 1:0:0
+libfilename2_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libfilename_la_SOURCES = callbacks-example-filename.c
 libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libfilename_la_LDFLAGS = -version-info 1:0:0
+libfilename_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libfilenameiisbug_la_SOURCES = callbacks-example-filenameiisbug.c
 libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0
+libfilenameiisbug_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 liblistlinks_la_SOURCES = callbacks-example-listlinks.c
 liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-liblistlinks_la_LDFLAGS = -version-info 1:0:0
+liblistlinks_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 liblog_la_SOURCES = callbacks-example-log.c
 liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-liblog_la_LDFLAGS = -version-info 1:0:0
+liblog_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 libsimple_la_SOURCES = callbacks-example-simple.c
 libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
-libsimple_la_LDFLAGS = -version-info 1:0:0
+libsimple_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la
 all: all-am
 
@@ -387,14 +494,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libtest/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu libtest/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__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -405,6 +511,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
@@ -431,32 +538,44 @@ uninstall-pkglibLTLIBRARIES:
 
 clean-pkglibLTLIBRARIES:
 	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libbaselinks.la: $(libbaselinks_la_OBJECTS) $(libbaselinks_la_DEPENDENCIES) $(EXTRA_libbaselinks_la_DEPENDENCIES) 
-	$(libbaselinks_la_LINK) -rpath $(pkglibdir) $(libbaselinks_la_OBJECTS) $(libbaselinks_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libbaselinks_la_LINK) -rpath $(pkglibdir) $(libbaselinks_la_OBJECTS) $(libbaselinks_la_LIBADD) $(LIBS)
+
 libchangecontent.la: $(libchangecontent_la_OBJECTS) $(libchangecontent_la_DEPENDENCIES) $(EXTRA_libchangecontent_la_DEPENDENCIES) 
-	$(libchangecontent_la_LINK) -rpath $(pkglibdir) $(libchangecontent_la_OBJECTS) $(libchangecontent_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libchangecontent_la_LINK) -rpath $(pkglibdir) $(libchangecontent_la_OBJECTS) $(libchangecontent_la_LIBADD) $(LIBS)
+
 libcontentfilter.la: $(libcontentfilter_la_OBJECTS) $(libcontentfilter_la_DEPENDENCIES) $(EXTRA_libcontentfilter_la_DEPENDENCIES) 
-	$(libcontentfilter_la_LINK) -rpath $(pkglibdir) $(libcontentfilter_la_OBJECTS) $(libcontentfilter_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libcontentfilter_la_LINK) -rpath $(pkglibdir) $(libcontentfilter_la_OBJECTS) $(libcontentfilter_la_LIBADD) $(LIBS)
+
 libdisplayheader.la: $(libdisplayheader_la_OBJECTS) $(libdisplayheader_la_DEPENDENCIES) $(EXTRA_libdisplayheader_la_DEPENDENCIES) 
-	$(libdisplayheader_la_LINK) -rpath $(pkglibdir) $(libdisplayheader_la_OBJECTS) $(libdisplayheader_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libdisplayheader_la_LINK) -rpath $(pkglibdir) $(libdisplayheader_la_OBJECTS) $(libdisplayheader_la_LIBADD) $(LIBS)
+
 libfilename.la: $(libfilename_la_OBJECTS) $(libfilename_la_DEPENDENCIES) $(EXTRA_libfilename_la_DEPENDENCIES) 
-	$(libfilename_la_LINK) -rpath $(pkglibdir) $(libfilename_la_OBJECTS) $(libfilename_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libfilename_la_LINK) -rpath $(pkglibdir) $(libfilename_la_OBJECTS) $(libfilename_la_LIBADD) $(LIBS)
+
 libfilename2.la: $(libfilename2_la_OBJECTS) $(libfilename2_la_DEPENDENCIES) $(EXTRA_libfilename2_la_DEPENDENCIES) 
-	$(libfilename2_la_LINK) -rpath $(pkglibdir) $(libfilename2_la_OBJECTS) $(libfilename2_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libfilename2_la_LINK) -rpath $(pkglibdir) $(libfilename2_la_OBJECTS) $(libfilename2_la_LIBADD) $(LIBS)
+
 libfilenameiisbug.la: $(libfilenameiisbug_la_OBJECTS) $(libfilenameiisbug_la_DEPENDENCIES) $(EXTRA_libfilenameiisbug_la_DEPENDENCIES) 
-	$(libfilenameiisbug_la_LINK) -rpath $(pkglibdir) $(libfilenameiisbug_la_OBJECTS) $(libfilenameiisbug_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libfilenameiisbug_la_LINK) -rpath $(pkglibdir) $(libfilenameiisbug_la_OBJECTS) $(libfilenameiisbug_la_LIBADD) $(LIBS)
+
 liblistlinks.la: $(liblistlinks_la_OBJECTS) $(liblistlinks_la_DEPENDENCIES) $(EXTRA_liblistlinks_la_DEPENDENCIES) 
-	$(liblistlinks_la_LINK) -rpath $(pkglibdir) $(liblistlinks_la_OBJECTS) $(liblistlinks_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(liblistlinks_la_LINK) -rpath $(pkglibdir) $(liblistlinks_la_OBJECTS) $(liblistlinks_la_LIBADD) $(LIBS)
+
 liblog.la: $(liblog_la_OBJECTS) $(liblog_la_DEPENDENCIES) $(EXTRA_liblog_la_DEPENDENCIES) 
-	$(liblog_la_LINK) -rpath $(pkglibdir) $(liblog_la_OBJECTS) $(liblog_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(liblog_la_LINK) -rpath $(pkglibdir) $(liblog_la_OBJECTS) $(liblog_la_LIBADD) $(LIBS)
+
 libsimple.la: $(libsimple_la_OBJECTS) $(libsimple_la_DEPENDENCIES) $(EXTRA_libsimple_la_DEPENDENCIES) 
-	$(libsimple_la_LINK) -rpath $(pkglibdir) $(libsimple_la_OBJECTS) $(libsimple_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libsimple_la_LINK) -rpath $(pkglibdir) $(libsimple_la_OBJECTS) $(libsimple_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -464,40 +583,46 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-baselinks.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-changecontent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-contentfilter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-displayheader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-filename.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-filename2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-filenameiisbug.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-listlinks.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-log.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-simple.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-baselinks.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-changecontent.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-contentfilter.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-displayheader.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-filename.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-filename2.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-filenameiisbug.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-listlinks.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-log.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-simple.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -526,26 +651,15 @@ uninstall-exemplesDATA:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(exemplesdir)'; $(am__uninstall_files_from_dir)
 
-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
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	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; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -557,15 +671,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	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; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -574,11 +684,28 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+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
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -651,7 +778,16 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/callbacks-example-baselinks.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-changecontent.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-contentfilter.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-displayheader.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-filename.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-filename2.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-filenameiisbug.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-listlinks.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-log.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-simple.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -697,7 +833,16 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/callbacks-example-baselinks.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-changecontent.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-contentfilter.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-displayheader.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-filename.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-filename2.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-filenameiisbug.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-listlinks.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-log.Plo
+	-rm -f ./$(DEPDIR)/callbacks-example-simple.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -718,20 +863,23 @@ uninstall-am: uninstall-exemplesDATA uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am \
-	install-exemplesDATA install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pkglibLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-exemplesDATA uninstall-pkglibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exemplesDATA install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-exemplesDATA \
+	uninstall-pkglibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

license.txt

@@ -1,7 +1,7 @@
 HTTrack Website Copier License Agreement:
 
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2015 Xavier Roche and other contributors
+Copyright (C) 1998-2017 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

m4/Makefile.in

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2021 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,23 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,19 +88,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = m4
-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)/configure.ac
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -71,10 +120,13 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+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@
@@ -83,9 +135,11 @@ 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@
@@ -99,8 +153,10 @@ 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@
@@ -112,6 +168,7 @@ 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@
@@ -120,6 +177,7 @@ 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@
@@ -196,6 +254,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -220,14 +279,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu m4/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__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -244,14 +302,16 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
+cscope cscopelist:
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -384,15 +444,18 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

m4/snprintf.m4

@@ -4,6 +4,8 @@ AC_MSG_CHECKING(for working snprintf)
 AC_CACHE_VAL(ac_cv_have_working_snprintf,
 [AC_TRY_RUN(
 [#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 int main(void)
 {
@@ -23,6 +25,8 @@ AC_MSG_CHECKING(for working vsnprintf)
 AC_CACHE_VAL(ac_cv_have_working_vsnprintf,
 [AC_TRY_RUN(
 [#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <stdarg.h>
 
 int my_vsnprintf (char *buf, const char *tmpl, ...)

m4/visibility.m4

@@ -0,0 +1,82 @@
+# visibility.m4 serial 8
+dnl Copyright (C) 2005, 2008, 2010-2023 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Tests whether the compiler supports the command-line option
+dnl -fvisibility=hidden and the function and variable attributes
+dnl __attribute__((__visibility__("hidden"))) and
+dnl __attribute__((__visibility__("default"))).
+dnl Does *not* test for __visibility__("protected") - which has tricky
+dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
+dnl Mac OS X.
+dnl Does *not* test for __visibility__("internal") - which has processor
+dnl dependent semantics.
+dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
+dnl "really only recommended for legacy code".
+dnl Set the variable CFLAG_VISIBILITY.
+dnl Defines and sets the variable HAVE_VISIBILITY.
+
+AC_DEFUN([gl_VISIBILITY],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  CFLAG_VISIBILITY=
+  HAVE_VISIBILITY=0
+  if test -n "$GCC"; then
+    dnl First, check whether -Werror can be added to the command line, or
+    dnl whether it leads to an error because of some other option that the
+    dnl user has put into $CC $CFLAGS $CPPFLAGS.
+    AC_CACHE_CHECK([whether the -Werror option is usable],
+      [gl_cv_cc_vis_werror],
+      [gl_save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -Werror"
+       AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[]], [[]])],
+         [gl_cv_cc_vis_werror=yes],
+         [gl_cv_cc_vis_werror=no])
+       CFLAGS="$gl_save_CFLAGS"
+      ])
+    dnl Now check whether visibility declarations are supported.
+    AC_CACHE_CHECK([for simple visibility declarations],
+      [gl_cv_cc_visibility],
+      [gl_save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -fvisibility=hidden"
+       dnl We use the option -Werror and a function dummyfunc, because on some
+       dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
+       dnl "visibility attribute not supported in this configuration; ignored"
+       dnl at the first function definition in every compilation unit, and we
+       dnl don't want to use the option in this case.
+       if test $gl_cv_cc_vis_werror = yes; then
+         CFLAGS="$CFLAGS -Werror"
+       fi
+       AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+              extern __attribute__((__visibility__("default"))) int exportedvar;
+              extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+              extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+              void dummyfunc (void);
+              int hiddenvar;
+              int exportedvar;
+              int hiddenfunc (void) { return 51; }
+              int exportedfunc (void) { return 1225736919; }
+              void dummyfunc (void) {}
+            ]],
+            [[]])],
+         [gl_cv_cc_visibility=yes],
+         [gl_cv_cc_visibility=no])
+       CFLAGS="$gl_save_CFLAGS"
+      ])
+    if test $gl_cv_cc_visibility = yes; then
+      CFLAG_VISIBILITY="-fvisibility=hidden"
+      HAVE_VISIBILITY=1
+    fi
+  fi
+  AC_SUBST([CFLAG_VISIBILITY])
+  AC_SUBST([HAVE_VISIBILITY])
+  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
+    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
+])

man/Makefile.in

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2021 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,23 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,19 +88,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = man
-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)/configure.ac
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -102,10 +151,13 @@ man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)"
 NROFF = nroff
 MANS = $(man_MANS)
+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@
@@ -114,9 +166,11 @@ 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@
@@ -130,8 +184,10 @@ 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@
@@ -143,6 +199,7 @@ 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@
@@ -151,6 +208,7 @@ 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@
@@ -227,6 +285,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -254,14 +313,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu man/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__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -321,27 +379,16 @@ uninstall-man1:
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
 
+cscope cscopelist:
 
-distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -479,16 +526,19 @@ uninstall-man: uninstall-man1
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-man1 \
-	install-pdf install-pdf-am 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 \
-	uninstall uninstall-am uninstall-man uninstall-man1
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-pdf install-pdf-am 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 uninstall-am uninstall-man \
+	uninstall-man1
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

man/httrack.1

@@ -1,7 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii httrack.1
 .\"
-.TH httrack 1 "14 March 2015" "httrack website copier"
+.TH httrack 1 "27 January 2024" "httrack website copier"
 .SH NAME
 httrack \- offline browser : copy websites to a local directory
 .SH SYNOPSIS
@@ -263,7 +263,7 @@ number of retries, in case of timeout or non\-fatal errors (*R1) (\-\-retries[=N
 .IP \-JN
 traffic jam control, minimum transfert rate (bytes/seconds) tolerated for a link (\-\-min\-rate[=N])
 .IP \-HN
-host is abandonned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow (\-\-host\-control[=N])
+host is abandoned if: 0=never, 1=timeout, 2=slow, 3=timeout or slow (\-\-host\-control[=N])
 
 .SS Links options:
 .IP \-%P
@@ -439,7 +439,7 @@ version info (\-\-version)
 .IP \-#K
 scan stdin (debug) (\-\-debug\-scanstdin)
 .IP \-#L
-maximum number of links (\-#L1000000) (\-\-advanced\-maxlinks)
+maximum number of links (\-#L1000000) (\-\-advanced\-maxlinks[=N])
 .IP \-#p
 display ugly progress information (\-\-advanced\-progressinfo)
 .IP \-#P
@@ -451,7 +451,7 @@ generate transfer ops. log every minutes (\-\-debug\-xfrstats)
 .IP \-#u
 wait time (\-\-advanced\-wait)
 .IP \-#Z
-generate transfer rate statictics every minutes (\-\-debug\-ratestats)
+generate transfer rate statistics every minutes (\-\-debug\-ratestats)
 
 .SS Dangerous options: (do NOT use unless you exactly know what you are doing)
 .IP \-%!
@@ -485,29 +485,29 @@ All files in web/, with random names (gadget !)
 .IP \-N100
 Site\-structure, without www.domain.xxx/
 .IP \-N101
-Identical to N1 exept that "web" is replaced by the site s name
+Identical to N1 except that "web" is replaced by the site s name
 .IP \-N102
-Identical to N2 exept that "web" is replaced by the site s name
+Identical to N2 except that "web" is replaced by the site s name
 .IP \-N103
-Identical to N3 exept that "web" is replaced by the site s name
+Identical to N3 except that "web" is replaced by the site s name
 .IP \-N104
-Identical to N4 exept that "web" is replaced by the site s name
+Identical to N4 except that "web" is replaced by the site s name
 .IP \-N105
-Identical to N5 exept that "web" is replaced by the site s name
+Identical to N5 except that "web" is replaced by the site s name
 .IP \-N199
-Identical to N99 exept that "web" is replaced by the site s name
+Identical to N99 except that "web" is replaced by the site s name
 .IP \-N1001
-Identical to N1 exept that there is no "web" directory
+Identical to N1 except that there is no "web" directory
 .IP \-N1002
-Identical to N2 exept that there is no "web" directory
+Identical to N2 except that there is no "web" directory
 .IP \-N1003
-Identical to N3 exept that there is no "web" directory (option set for g option)
+Identical to N3 except that there is no "web" directory (option set for g option)
 .IP \-N1004
-Identical to N4 exept that there is no "web" directory
+Identical to N4 except that there is no "web" directory
 .IP \-N1005
-Identical to N5 exept that there is no "web" directory
+Identical to N5 except that there is no "web" directory
 .IP \-N1099
-Identical to N99 exept that there is no "web" directory
+Identical to N99 except that there is no "web" directory
 .SS Details: User\-defined option N
    %n  Name of file without file type (ex: image)
    %N  Name of file, including file type (ex: image.gif)
@@ -610,7 +610,7 @@ Please reports bugs to
 .B <bugs@httrack.com>.
 Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary.
 .SH COPYRIGHT
-Copyright (C) 1998-2015 Xavier Roche and other contributors
+Copyright (C) 1998-2024 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

missing

@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:

src/Makefile.am

@@ -23,29 +23,40 @@ AM_CPPFLAGS = \
 	-DPREFIX=\""$(prefix)"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DDATADIR=\""$(datadir)"\" \
-	-DLIBDIR=\""$(libdir)"\"
+	-DLIBDIR=\""$(libdir)"\" \
+	-I"$(abs_srcdir)" \
+	-I"$(abs_srcdir)/coucal"
+
+AM_LDFLAGS = \
+	@DEFAULT_LDFLAGS@
 
 bin_PROGRAMS = proxytrack httrack htsserver
 
 httrack_LDADD = $(THREADS_LIBS) libhttrack.la
 htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
 proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)
-proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT -DZLIB_CONST -DHTS_INTHASH_USES_MD5
-htsserver_CFLAGS = $(AM_CFLAGS) -DZLIB_CONST -DHTS_INTHASH_USES_MD5
+
+httrack_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PIE)
+proxytrack_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PIE) -DNO_MALLOCT -DZLIB_CONST -DHTS_INTHASH_USES_MD5
+htsserver_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PIE) -DZLIB_CONST -DHTS_INTHASH_USES_MD5
+
+httrack_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
+proxytrack_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
+htsserver_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
 
 lib_LTLIBRARIES = libhttrack.la libhtsjava.la
 
 htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h
 proxytrack_SOURCES = proxy/main.c \
 	proxy/proxytrack.c proxy/store.c \
-	coucal.c htsmd5.c md5.c \
+	coucal/coucal.c htsmd5.c md5.c \
 	minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c
 
 whttrackrundir = $(bindir)
 whttrackrun_SCRIPTS = webhttrack
 
 libhttrack_la_SOURCES =  htscore.c htsparse.c htsback.c htscache.c \
-	htscatchurl.c htsfilters.c htsftp.c htshash.c coucal.c \
+	htscatchurl.c htsfilters.c htsftp.c htshash.c coucal/coucal.c \
 	htshelp.c htslib.c htscoremain.c \
 	htsname.c htsrobots.c htstools.c htswizard.c \
 	htsalias.c htsthread.c htsindex.c htsbauth.c \
@@ -56,7 +67,7 @@ libhttrack_la_SOURCES =  htscore.c htsparse.c htsback.c htscache.c \
 	hts-indextmpl.h htsalias.h htsback.h htsbase.h htssafe.h \
 	htsbasenet.h htsbauth.h htscache.h htscatchurl.h  \
 	htsconfig.h htscore.h htsparse.h htscoremain.h htsdefines.h  \
-	htsfilters.h htsftp.h htsglobal.h htshash.h coucal.h \
+	htsfilters.h htsftp.h htsglobal.h htshash.h coucal/coucal.h \
 	htshelp.h htsindex.h htslib.h htsmd5.h \
 	htsmodules.h htsname.h htsnet.h \
 	htsopt.h htsrobots.h htsthread.h  \
@@ -64,19 +75,19 @@ libhttrack_la_SOURCES =  htscore.c htsparse.c htsback.c htscache.c \
 	htsstrings.h htsarrays.h httrack-library.h \
 	htscharset.h punycode.h htsencoding.h \
 	htsentities.h htsentities.sh htsbasiccharsets.sh htscodepages.h \
-	md5.h murmurhash3.h \
+	md5.h coucal/murmurhash3.h \
 	minizip/crypt.h minizip/ioapi.h minizip/mztools.h minizip/unzip.h minizip/zip.h
 libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(OPENSSL_LIBS) $(DL_LIBS) $(SOCKET_LIBS) $(ICONV_LIBS)
 libhttrack_la_CFLAGS = $(AM_CFLAGS) -DLIBHTTRACK_EXPORTS -DZLIB_CONST
-libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO)
+libhttrack_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSION_INFO)
 
 libhtsjava_la_SOURCES = htsjava.c htsjava.h
 libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
-libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO)
+libhtsjava_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(VERSION_INFO)
 
 EXTRA_DIST = httrack.h webhttrack \
-		murmurhash3.h.diff \
-		murmurhash3.h.orig \
+		coucal/murmurhash3.h.diff \
+		coucal/murmurhash3.h.orig \
 		minizip/iowin32.c \
 		minizip/iowin32.h \
 		minizip/ioapi.c.diff \
@@ -98,4 +109,5 @@ EXTRA_DIST = httrack.h webhttrack \
 		proxy/proxytrack.h \
 		proxy/store.h \
 		proxy/proxytrack.vcproj \
+		coucal/* \
 		*.dsw *.dsp *.vcproj

src/coucal.h

@@ -1,529 +0,0 @@
-/* ------------------------------------------------------------ */
-/*
-Coucal, Cuckoo hashing-based hashtable with stash area.
-Copyright (C) 2013-2014 Xavier Roche (http://www.httrack.com/)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/**
- * Coucal, a Cuckoo-hashing-based hashtable with stash area C library.
- *
- * This hashtable library provides key/value hashtable, with by default a
- * string key, and integer/pointer value (with an associated optional
- * allocator). Both key and value can be of any type, using custom settings.
- * By default, the string key is dup'ed using a string pool, and the opaque
- * value is stored as-is (either the pointer, or an uintptr_t integer value).
- * It features O(1) average insertion, and guaranteed O(1) lookup, replace,
- * and delete operations.
- *
- * Implementation notes:
- * Implementation is auto-rehashable, and uses cuckoo hashing of size 2**n
- * with a Murmur or MD5 hash function, with one additional auxiliary hash
- * function.
- * It also uses a small stash area to handle rare cases of collisions.
- * Enumeration of all key/values is possible, deletion is also possible, but
- * currently without any auto-shrinking (ie. table will never shrink).
- * Overall, two main blocks are allocated: one for the items, and one for
- * the keys (pool).
- * If the string pool is being used (to store dup'ed keys), deleting is only
- * O(1) average, because the pool needs to be compacted time to time.
- * Currently the default maximum number of elements in the hashtable is
- * 2**31 - 1 (that is, 2,147,483,648 elements), but this default can be changed
- * by setting COUCAL_HASH_SIZE to a higher value (64 is the only higher value
- * currently supported), and rebuilding the library.
- *
- * References: 
- *
- * Cuckoo Hashing, by Rasmus Pagh and Flemming Friche Rodler
- * http://www.it-c.dk/people/pagh/papers/cuckoo-jour.pdf
- *
- * Cuckoo Stash, by Adam Kirsch, Michael Mitzenmacher and Udi Wieder
- * http://research.microsoft.com/pubs/73856/stash-full.9-30.pdf
- *
- * MurmurHash3, by Austin Appleby
- * http://en.wikipedia.org/wiki/MurmurHash
- *
- * MD5 http://en.wikipedia.org/wiki/MD5
- * FNV http://www.isthe.com/chongo/tech/comp/fnv/
- **/
-
-#ifndef COUCAL_DEFH
-#define COUCAL_DEFH
-
-/* Includes */
-#ifdef _WIN32
-#include <stddef.h>
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-#elif (defined(SOLARIS) || defined(sun) || defined(HAVE_INTTYPES_H) \
-  || defined(BSD) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__))
-#include <inttypes.h>
-#else
-#include <stdint.h>
-#endif
-#include <stdarg.h>
-
-/* External definitions */
-#ifndef COUCAL_EXTERN
-#ifdef _WIN32
-#ifdef COUCAL_BUILDING
-#define COUCAL_EXTERN __declspec(dllimport)
-#else
-#define COUCAL_EXTERN __declspec(dllexport)
-#endif
-#elif ( ( defined(__GNUC__) && ( __GNUC__ >= 4 ) ) \
-        || ( defined(HAVE_VISIBILITY) && HAVE_VISIBILITY ) )
-#define COUCAL_EXTERN extern __attribute__ ((visibility("default")))
-#else
-#define COUCAL_EXTERN extern
-#endif
-#endif
-
-/** Key opaque type. May be a regular 'const char*'. **/
-typedef void* coucal_key;
-
-/** Key constant (can not be modified) opaque type. **/
-typedef const void* coucal_key_const;
-
-/** Opaque user-defined pointer. **/
-typedef void* coucal_opaque;
-
-/** Value (union of any value). **/
-typedef union coucal_value {
-  /** Integer value. **/
-  intptr_t intg;
-
-  /** Unsigned integer value. **/
-  uintptr_t uintg;
-
-  /** Pointer value. **/
-  void *ptr;
-} coucal_value;
-
-/** Value constant. **/
-typedef const coucal_value coucal_value_const;
-
-/** NULL Value. **/
-#define INTHASH_VALUE_NULL { 0 }
-
-#ifndef HTS_DEF_FWSTRUCT_coucal_item
-#define HTS_DEF_FWSTRUCT_coucal_item
-typedef struct coucal_item coucal_item;
-#endif
-
-/** Coucal primary hash size. Default is 32-bit. **/
-#ifndef COUCAL_HASH_SIZE
-#define COUCAL_HASH_SIZE 32
-#endif
-
-/** Hash integer type. **/
-#if (COUCAL_HASH_SIZE == 32)
-
-/** 32-bit hash key. **/
-typedef uint32_t coucal_hashkey;
-
-#elif (COUCAL_HASH_SIZE == 64)
-
-/** 64-bit hash key. **/
-typedef uint64_t coucal_hashkey;
-
-#else
-#error "Unsupported COUCAL_HASH_SIZE"
-#endif
-
-/** Pair of hashes **/
-typedef struct coucal_hashkeys {
-  coucal_hashkey hash1;
-  coucal_hashkey hash2;
-} coucal_hashkeys;
-
-/** NULL pair of hashes. **/
-#define INTHASH_KEYS_NULL { 0, 0 }
-
-/** Item holding a value. **/
-struct coucal_item {
-  /** Key. **/
-  coucal_key name;
-
-  /** Value. **/
-  coucal_value value;
-
-  /** Hashes of the key. **/
-  coucal_hashkeys hashes;
-};
-
-/** Log level. **/
-typedef enum coucal_loglevel {
-  coucal_log_critical,
-  coucal_log_warning,
-  coucal_log_info,
-  coucal_log_debug,
-  coucal_log_trace
-} coucal_loglevel;
-
-/**  free handler. Only used when values are markes as xxc **/
-typedef void (*t_coucal_key_freehandler)(coucal_opaque arg,
-                                         coucal_key key);
-
-/** Value free handler. Only used when values are markes as xxc **/
-typedef void (*t_coucal_value_freehandler)(coucal_opaque arg,
-                                           coucal_value value);
-
-/** Key dup handler. **/
-typedef coucal_key (*t_coucal_duphandler)(coucal_opaque arg,
-                                          coucal_key_const name);
-
-/** Key hash computation handler. **/
-typedef coucal_hashkeys (*t_coucal_hasheshandler)(coucal_opaque arg,
-                                                  coucal_key_const name);
-
-/** Hashtable logging handler. **/
-typedef void (*t_coucal_loghandler)(coucal_opaque arg, coucal_loglevel level, 
-                                    const char* format, va_list args);
-
-/** Hashtable fatal assertion failure. **/
-typedef void (*t_coucal_asserthandler)(coucal_opaque arg, const char* exp,
-                                       const char* file, int line);
-
-/** Key printer (debug) **/
-typedef const char* (*t_coucal_printkeyhandler)(coucal_opaque arg,
-                                                coucal_key_const name);
-
-/** Value printer (debug) **/
-typedef const char* (*t_coucal_printvaluehandler)(coucal_opaque arg,
-                                                  coucal_value_const value);
-
-/**
- * Value comparison handler (returns non-zero value if strings are equal).
- **/
-typedef int (*t_coucal_cmphandler)(coucal_opaque arg,
-                                   coucal_key_const a,
-                                   coucal_key_const b);
-
-/** Hashtable (opaque structure). **/
-#ifndef HTS_DEF_FWSTRUCT_struct_coucal
-#define HTS_DEF_FWSTRUCT_struct_coucal
-typedef struct struct_coucal struct_coucal, *coucal;
-#endif
-
-/** Hashtable enumeration (opaque structure). **/
-#ifndef HTS_DEF_FWSTRUCT_struct_coucal_enum
-#define HTS_DEF_FWSTRUCT_struct_coucal_enum
-typedef struct struct_coucal_enum struct_coucal_enum;
-#endif
-
-/** Enumeration. **/
-struct struct_coucal_enum {
-  coucal table;
-  size_t index;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Create a new hashtable, with initial bucket size of 'size'.
- * If size is 0, use the default minimal bucket size.
- * Return a non-NULL pointer upon success.
- *
- * By default, keys are supposed to be '\0'-terminated strings, which are
- * duplicated by the library (the passed pointer does not need to be
- * persistent), and values are opaque pointers (or integers) which are copied
- * "as is", without further processing. Use coucal_value_set_key_handler()
- * and coucal_value_set_value_handler() to alter this default behavior.
- **/
-COUCAL_EXTERN coucal coucal_new(size_t size);
-
-/**
- * Was the hashtable successfully created ?
- * Return non-zero value if the hashtable is valid.
- **/
-COUCAL_EXTERN int coucal_created(coucal hashtable);
-
-/**
- * Delete a hashtable, freeing all entries.
- **/
-COUCAL_EXTERN void coucal_delete(coucal * hashtable);
-
-/**
- * Return the number of items in the hashtable.
- **/
-COUCAL_EXTERN size_t coucal_nitems(coucal hashtable);
-
-/**
- * Return the memory size taken by the hashtable.
- * (This does not take account of the possible memory taken by values)
- **/
-COUCAL_EXTERN size_t coucal_memory_size(coucal hashtable);
-
-/**
- * Return the library hash size compiled.
- * The returned value MUST match COUCAL_HASH_SIZE.
- **/
-COUCAL_EXTERN size_t coucal_hash_size(void);
-
-/**
- * If 'flag' is non-zero, calls coucal_value_set_value_handler() with
- * default system free() handler function, otherwise, free the value handlers.
- **/
-COUCAL_EXTERN void coucal_value_is_malloc(coucal hashtable, int flag);
-
-/**
- * Set handlers for values.
- * free: this handler will be called when a value is to be removed from
- * the hashtable. if NULL, values won't be free'd.
- * arg: opaque custom argument to be used by functions.
- * Handler(s) MUST NOT be changed once elements have been added.
- **/
-COUCAL_EXTERN void coucal_value_set_value_handler(coucal hashtable,
-                                                  t_coucal_value_freehandler free,
-                                                  coucal_opaque arg);
-
-/**
- * Set handlers for keys.
- * dup: handler called to duplicate a key. if NULL, the internal pool is used.
- * free: handler called to free a key. if NULL, the internal pool is used.
- * hash: hashing handler, called to hash a key. if NULL, the default hash
- * function is used.
- * equals: comparison handler, returning non-zero value when two keys are
- * identical. if NULL, the default comparison function is used.
- * arg: opaque custom argument to be used by functions.
- * Handler(s) MUST NOT be changed once elements have been added.
- **/
-COUCAL_EXTERN void coucal_value_set_key_handler(coucal hashtable,
-                                                t_coucal_duphandler dup,
-                                                t_coucal_key_freehandler free,
-                                                t_coucal_hasheshandler hash,
-                                                t_coucal_cmphandler equals,
-                                                coucal_opaque arg);
-
-/**
- * Set assertion failure handler.
- * log: handler called upon serious programming error
- * fatal: handler called upon serious programming error
- **/
-COUCAL_EXTERN void coucal_set_assert_handler(coucal hashtable,
-                                             t_coucal_loghandler log,
-                                             t_coucal_asserthandler fatal,
-                                             coucal_opaque arg);
-
-/**
- * Set pretty print loggers (debug). Both handlers must return a string
- * pointer which shall be valid until the next call. Both key and value
- * pointers shall be valid at the same time.
- * name: handler called to print the string representation of the name
- * value: handler called to print the string representation of the value
- **/
-COUCAL_EXTERN void coucal_set_print_handler(coucal hashtable,
-                                            t_coucal_printkeyhandler key,
-                                            t_coucal_printvaluehandler value,
-                                            coucal_opaque arg);
-
-/**
- * Set the hashtable name, for degugging purpose.
- * name: the hashtable name (ASCII or UTF-8)
- */
-COUCAL_EXTERN void coucal_set_name(coucal hashtable, coucal_key_const name);
-
-/**
- * Get the hashtable name, for degugging purpose.
- * Return NULL if no name was defined.
- **/
-COUCAL_EXTERN const char* coucal_get_name(coucal hashtable);
-
-/**
- * Read an integer entry from the hashtable.
- * Return non-zero value upon success and sets intvalue.
- **/
-COUCAL_EXTERN int coucal_read(coucal hashtable, coucal_key_const name,
-                              intptr_t * intvalue);
-
-/**
- * Same as coucal_read(), but return 0 is the value was zero.
- **/
-COUCAL_EXTERN int coucal_readptr(coucal hashtable, coucal_key_const name,
-                                 intptr_t * intvalue);
-
-/**
- * Read an integer entry from the hashtable.
- * Return 0 if the entry could not be found.
- **/
-COUCAL_EXTERN intptr_t coucal_get_intptr(coucal hashtable,
-                                         coucal_key_const name);
-
-/**
- * Return non-zero value if the given entry exists.
- **/
-COUCAL_EXTERN int coucal_exists(coucal hashtable, coucal_key_const name);
-
-/**
- * Read an entry from the hashtable.
- * Return non-zero value upon success and sets value.
- **/
-COUCAL_EXTERN int coucal_read_value(coucal hashtable, coucal_key_const name,
-                                    coucal_value *value);
-
-/**
- * Write an entry to the hashtable.
- * Return non-zero value if the entry was added, zero if it was replaced.
- **/
-COUCAL_EXTERN int coucal_write_value(coucal hashtable, coucal_key_const name,
-                                     coucal_value_const value);
-
-/**
- * Read a pointer entry from the hashtable.
- * Return non-zero value upon success and sets value.
- **/
-COUCAL_EXTERN int coucal_read_pvoid(coucal hashtable, coucal_key_const name,
-                                    void **value);
-
-/**
- * Read a pointer entry from the hashtable and returns its value.
- * Return NULL if the entry could not be found.
- **/
-COUCAL_EXTERN void* coucal_get_pvoid(coucal hashtable, coucal_key_const name);
-
-/**
- * Write a pointer entry to the hashtable.
- * Return non-zero value if the entry was added, zero if it was replaced.
- **/
-COUCAL_EXTERN int coucal_write_pvoid(coucal hashtable, coucal_key_const name,
-                                     void *value);
-
-/**
- * Alias to coucal_write_pvoid()
- **/
-COUCAL_EXTERN void coucal_add_pvoid(coucal hashtable, coucal_key_const name,
-                                    void *value);
-
-/**
- * Write an integer entry to the hashtable.
- * Return non-zero value if the entry was added, zero if it was replaced.
- **/
-COUCAL_EXTERN int coucal_write(coucal hashtable, coucal_key_const name,
-                               intptr_t value);
-
-/**
- * Alias to coucal_write()
- **/
-COUCAL_EXTERN void coucal_add(coucal hashtable, coucal_key_const name,
-                              intptr_t value);
-
-/**
- * Increment an entry value in the hashtable
- * (or create a new entry with value 1 if it does not yet exist)
- * Return non-zero value if the entry was added, zero if it was changed.
- **/
-COUCAL_EXTERN int coucal_inc(coucal hashtable, coucal_key_const name);
-
-/**
- * Decrement an entry value in the hashtable 
- * (or create a new entry with value -1 if it does not yet exist)
- * Return non-zero value if the entry was added, zero if it was changed.
- **/
-COUCAL_EXTERN int coucal_dec(coucal hashtable, coucal_key_const name);
-
-/**
- * Fetch an entry value from the hashtable.
- * Returns NULL if the entry could not be found.
- * The returned pointer is only valid until next call to this library, and can
- * be used for read or write operations.
- **/
-COUCAL_EXTERN coucal_value* coucal_fetch_value(coucal hashtable,
-                                               coucal_key_const name);
-
-/**
- * Fetch an entry value from the hashtable, given a name, and its hashes.
- * Returns NULL if the entry could not be found.
- * The returned pointer is only valid until next call to this library, and can
- * be used for read or write operations.
- * The hashes MUST have been computed using coucal_calc_hashes(), or by
- * copying an existing hash during an enumeration.
- * The use of a non-matching hash is safe, but will return NULL.
- **/
-COUCAL_EXTERN coucal_value* coucal_fetch_value_hashes(coucal hashtable,
-                                                      coucal_key_const name,
-                                                      const coucal_hashkeys
-                                                      *hashes);
-
-/**
- * Remove an entry from the hashtable
- * Return non-zero value if the entry was removed, zero otherwise.
- **/
-COUCAL_EXTERN int coucal_remove(coucal hashtable, coucal_key_const name);
-
-/**
- * Return a new enumerator.
- * Note: deleting entries is safe while enumerating, but adding entries 
- * lead to undefined enumeration behavior (yet safe).
- **/
-COUCAL_EXTERN struct_coucal_enum coucal_enum_new(coucal hashtable);
-
-/**
- * Enumerate the next entry.
- **/
-COUCAL_EXTERN coucal_item *coucal_enum_next(struct_coucal_enum * e);
-
-/**
- * Compute a hash of a key for the hashtable 'hashtable'.
- * The returned hash is suitable for use with coucal_fetch_value_hashes()
- * Note: the default implementation uses coucal_hash_string()
- **/
-COUCAL_EXTERN coucal_hashkeys coucal_calc_hashes(coucal hashtable, 
-                                                 coucal_key_const value);
-
-/**
- * Compute a hash, given a string. This is the default function used for
- * hashing keys, which are by default strings. This function uses
- * coucal_hash_data() as backend.
- **/
-COUCAL_EXTERN coucal_hashkeys coucal_hash_string(const char *value);
-
-/**
- * Compute a hash, given an opaque buffer.
- **/
-COUCAL_EXTERN coucal_hashkeys coucal_hash_data(const void *data, size_t size);
-
-/**
- * Set default global assertion failure handler.
- * The handler will be used if no specific handler was defined in the
- * hashtable itself.
- * log: handler called upon serious error log (opaque argument 
- * is the hashtable itself)
- * fatal: handler called upon serious programming error (opaque argument 
- * is the hashtable itself)
- **/
-COUCAL_EXTERN void coucal_set_global_assert_handler(t_coucal_loghandler log,
-                                                    t_coucal_asserthandler fatal);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

src/hts-indextmpl.h

@@ -1,7 +1,7 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2015 Xavier Roche and other contributors
+Copyright (C) 1998-2017 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