Updated to 3.49.6

Fix: Potential Vulnerability in Cloned Function

INSTALL

@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
-Foundation, Inc.
+   Copyright (C) 1994-1996, 1999-2002, 2004-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
@@ -225,7 +225,7 @@ order to use an ANSI C compiler:
 
 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
+   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.
 

Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 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,
@@ -93,7 +93,7 @@ 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 \
@@ -157,9 +157,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
 	COPYING ChangeLog INSTALL NEWS README compile config.guess \
@@ -221,8 +218,10 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAGS_PIE = @CFLAGS_PIE@
-CPP = @CPP@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
 DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
@@ -236,9 +235,12 @@ 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@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -516,7 +518,6 @@ cscopelist-am: $(am__tagged_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
 

README

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

compile

@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2020 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

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
 
@@ -51,9 +51,16 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 or 0, depending whether the compiler supports simple visibility
+   declarations. */
+#undef HAVE_VISIBILITY
+
 /* 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
 
@@ -108,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 */
@@ -118,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.49.3], [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
@@ -37,10 +37,18 @@ 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)
@@ -76,6 +84,7 @@ AX_CHECK_COMPILE_FLAG([-Wignored-qualifiers], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -
 AX_CHECK_COMPILE_FLAG([-fstrict-aliasing -Wstrict-aliasing], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstrict-aliasing -Wstrict-aliasing"])
 AX_CHECK_COMPILE_FLAG([-fstack-protector], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-protector"])
 AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-clash-protection"])
+AX_CHECK_COMPILE_FLAG([-fcf-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fcf-protection"])
 AX_CHECK_LINK_FLAG([-Wl,--discard-all], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--discard-all"])
 AX_CHECK_LINK_FLAG([-Wl,--no-undefined], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--no-undefined"])
 AX_CHECK_LINK_FLAG([-Wl,-z,relro,-z,now], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,relro,-z,now"])
@@ -141,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)
@@ -239,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]))
@@ -257,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)
@@ -277,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
@@ -288,3 +291,4 @@ html/Makefile
 libtest/Makefile
 tests/Makefile
 ])
+AC_OUTPUT

debian/changelog

@@ -1,3 +1,24 @@
+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)

debian/compat

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

debian/control

@@ -9,7 +9,7 @@ Vcs-Git: https://github.com/xroche/httrack.git
 
 Package: httrack
 Architecture: any
-Multi-Arch: no
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: webhttrack, httrack-doc
 Description: Copy websites to your computer (Offline browser)
@@ -27,7 +27,7 @@ Description: Copy websites to your computer (Offline browser)
 
 Package: webhttrack
 Architecture: any
-Multi-Arch: no
+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)
@@ -50,7 +50,7 @@ Description: Copy websites to your computer, httrack with a Web interface
 
 Package: webhttrack-common
 Architecture: all
-Multi-Arch: allowed
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: webhttrack common files
  This package is the common files of webhttrack, website copier and
@@ -58,7 +58,7 @@ Description: webhttrack common files
 
 Package: libhttrack2
 Architecture: any
-Multi-Arch: no
+Multi-Arch: same
 Section: libs
 Replaces: libhttrack1
 Conflicts: libhttrack1
@@ -69,7 +69,7 @@ Description: Httrack website copier library
 
 Package: libhttrack-dev
 Architecture: any
-Multi-Arch: no
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends}, ${shlibs:Depends}, zlib1g-dev
 Description: Httrack website copier includes and development files
@@ -78,7 +78,7 @@ Description: Httrack website copier includes and development files
 
 Package: httrack-doc
 Architecture: all
-Multi-Arch: allowed
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Description: Httrack website copier additional documentation
@@ -87,7 +87,7 @@ Description: Httrack website copier additional documentation
 
 Package: proxytrack
 Architecture: any
-Multi-Arch: no
+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,2 +1,2 @@
-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 @@
-library-not-linked-against-libc usr/lib/httrack/libtest/libfilename.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.49
-usr/lib/libhttrack.so.2
-usr/lib/libhtsjava.so.2.0.49
-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

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

depcomp

@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2020 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

history.txt

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

html/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 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,
@@ -94,7 +94,7 @@ 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)
@@ -176,8 +176,10 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAGS_PIE = @CFLAGS_PIE@
-CPP = @CPP@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
 DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
@@ -191,9 +193,12 @@ 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@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -650,7 +655,6 @@ ctags CTAGS:
 
 cscope cscopelist:
 
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 

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

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

html/httrack.man.html

@@ -475,7 +475,7 @@ errors (*R1) (--retries[=N])</p></td></tr>
 <td width="78%">
 
 
-<p>host is abandonned if: 0=never, 1=timeout, 2=slow,
+<p>host is abandoned if: 0=never, 1=timeout, 2=slow,
 3=timeout or slow (--host-control[=N])</p></td></tr>
 </table>
 
@@ -1550,7 +1550,7 @@ memory boundary checks) (--fast-engine)</p></td></tr>
 <td width="78%">
 
 
-<p>generate transfer rate statictics every minutes
+<p>generate transfer rate statistics every minutes
 (--debug-ratestats)</p> </td></tr>
 </table>
 
@@ -1735,7 +1735,7 @@ example)</p> </td></tr>
 <td width="78%">
 
 
-<p>Identical to N1 exept that &quot;web&quot; is replaced
+<p>Identical to N1 except that &quot;web&quot; is replaced
 by the site s name</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1747,7 +1747,7 @@ by the site s name</p></td></tr>
 <td width="78%">
 
 
-<p>Identical to N2 exept that &quot;web&quot; is replaced
+<p>Identical to N2 except that &quot;web&quot; is replaced
 by the site s name</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1759,7 +1759,7 @@ by the site s name</p></td></tr>
 <td width="78%">
 
 
-<p>Identical to N3 exept that &quot;web&quot; is replaced
+<p>Identical to N3 except that &quot;web&quot; is replaced
 by the site s name</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1771,7 +1771,7 @@ by the site s name</p></td></tr>
 <td width="78%">
 
 
-<p>Identical to N4 exept that &quot;web&quot; is replaced
+<p>Identical to N4 except that &quot;web&quot; is replaced
 by the site s name</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1783,7 +1783,7 @@ by the site s name</p></td></tr>
 <td width="78%">
 
 
-<p>Identical to N5 exept that &quot;web&quot; is replaced
+<p>Identical to N5 except that &quot;web&quot; is replaced
 by the site s name</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1795,7 +1795,7 @@ by the site s name</p></td></tr>
 <td width="78%">
 
 
-<p>Identical to N99 exept that &quot;web&quot; is replaced
+<p>Identical to N99 except that &quot;web&quot; is replaced
 by the site s name</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1807,7 +1807,7 @@ by the site s name</p></td></tr>
 <td width="78%">
 
 
-<p>Identical to N1 exept that there is no &quot;web&quot;
+<p>Identical to N1 except that there is no &quot;web&quot;
 directory</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1819,7 +1819,7 @@ directory</p> </td></tr>
 <td width="78%">
 
 
-<p>Identical to N2 exept that there is no &quot;web&quot;
+<p>Identical to N2 except that there is no &quot;web&quot;
 directory</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1831,7 +1831,7 @@ directory</p> </td></tr>
 <td width="78%">
 
 
-<p>Identical to N3 exept that there is no &quot;web&quot;
+<p>Identical to N3 except that there is no &quot;web&quot;
 directory (option set for g option)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1843,7 +1843,7 @@ directory (option set for g option)</p></td></tr>
 <td width="78%">
 
 
-<p>Identical to N4 exept that there is no &quot;web&quot;
+<p>Identical to N4 except that there is no &quot;web&quot;
 directory</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1855,7 +1855,7 @@ directory</p> </td></tr>
 <td width="78%">
 
 
-<p>Identical to N5 exept that there is no &quot;web&quot;
+<p>Identical to N5 except that there is no &quot;web&quot;
 directory</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1867,7 +1867,7 @@ directory</p> </td></tr>
 <td width="78%">
 
 
-<p>Identical to N99 exept that there is no &quot;web&quot;
+<p>Identical to N99 except that there is no &quot;web&quot;
 directory</p> </td></tr>
 </table>
 
@@ -2202,7 +2202,7 @@ other information you deem necessary.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright (C)
-1998-2023 Xavier Roche and other contributors</p>
+1998-2024 Xavier Roche and other contributors</p>
 
 <p style="margin-left:11%; margin-top: 1em">This program is
 free software: you can redistribute it and/or modify it

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

lang.def

@@ -257,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
@@ -267,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
@@ -1005,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/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

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Websted kopieres nu [%s, %s byte]
 Site mirroring finished!
 Kopieringen af websted er afsluttet!
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Der opstod et problem under kopieringen af websted\n
 \nDuring:\n
 \nSamtidigt:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 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 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 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! <=
 * * KOPIERINGS FEJL! * *\r\nWinHTTrack har opdaget at den igangværende kopiering er tom. Hvis du var i gang med at opdatere en kopi, vil det tidligere indhold  blive gendannet.\r\nMulig årsag: Den første side kunne enten ikke findes eller der opstod et problem med forbindelsen.\r\n=> Kontroller at webstedet findes og/eller kontroller Proxy-indstillingerne! <=
 \n\nTip: Click [View log file] to see warning or error messages
 \n\nTip: Klik [Vis logfiler]  for at se advarsels- og fejlmeddelelser
@@ -926,5 +926,5 @@ You can now close this window
 Du kan nu lukke vinduet
 Server terminated
 Server lukket
-A fatal error has occured during this mirror
+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

@@ -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,7 +204,7 @@ 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! <=
+* * 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
@@ -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,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 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,
@@ -94,7 +94,7 @@ 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)
@@ -166,8 +166,10 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAGS_PIE = @CFLAGS_PIE@
-CPP = @CPP@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
 DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
@@ -181,9 +183,12 @@ 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@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -379,7 +384,6 @@ ctags CTAGS:
 
 cscope cscopelist:
 
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 

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

@@ -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
@@ -944,7 +944,7 @@ You can now close this window
 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

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

@@ -194,7 +194,7 @@ Site mirroring in progress [%s, %s bytes]
 Ko’zgu yaratilmoqda [%s, %s bayt]
 Site mirroring finished!
 Ko’zgu yaratish bajarildi!
-A problem occured during the mirroring operation\n
+A problem occurred during the mirroring operation\n
 Ko’chirib olish jarayonida xatolik yuz berdi\n
 \nDuring:\n
 Davomida:\n
@@ -204,7 +204,7 @@ Mirroring operation complete.\nClick Exit to quit WinHTTrack.\nSee log file(s) i
 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 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! <=
 * * 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.
@@ -926,5 +926,5 @@ You can now close this window
 Endi bu oynani yopsangiz bo’ladi
 Server terminated
 Server terminated
-A fatal error has occured during this mirror
+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,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 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,
@@ -95,7 +95,7 @@ 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)
@@ -293,8 +293,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -310,8 +308,10 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAGS_PIE = @CFLAGS_PIE@
-CPP = @CPP@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
 DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
@@ -325,9 +325,12 @@ 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@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -438,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
 
@@ -696,7 +702,6 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 

m4/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 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,
@@ -93,7 +93,7 @@ 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)
@@ -136,8 +136,10 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAGS_PIE = @CFLAGS_PIE@
-CPP = @CPP@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
 DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
@@ -151,9 +153,12 @@ 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@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -303,7 +308,6 @@ ctags CTAGS:
 
 cscope cscopelist:
 
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 

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,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 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,
@@ -93,7 +93,7 @@ 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)
@@ -167,8 +167,10 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAGS_PIE = @CFLAGS_PIE@
-CPP = @CPP@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
 DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
@@ -182,9 +184,12 @@ 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@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -380,7 +385,6 @@ ctags CTAGS:
 
 cscope cscopelist:
 
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 

man/httrack.1

@@ -1,7 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii httrack.1
 .\"
-.TH httrack 1 "13 January 2023" "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
@@ -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-2023 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

@@ -27,6 +27,9 @@ AM_CPPFLAGS = \
 	-I"$(abs_srcdir)" \
 	-I"$(abs_srcdir)/coucal"
 
+AM_LDFLAGS = \
+	@DEFAULT_LDFLAGS@
+
 bin_PROGRAMS = proxytrack httrack htsserver
 
 httrack_LDADD = $(THREADS_LIBS) libhttrack.la
@@ -76,11 +79,11 @@ libhttrack_la_SOURCES =  htscore.c htsparse.c htsback.c htscache.c \
 	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 \
 		coucal/murmurhash3.h.diff \

src/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 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,
@@ -98,7 +98,7 @@ 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)
@@ -309,8 +309,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -326,8 +324,10 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAGS_PIE = @CFLAGS_PIE@
-CPP = @CPP@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
 DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
@@ -341,9 +341,12 @@ 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@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -477,6 +480,9 @@ AM_CPPFLAGS = \
 	-I"$(abs_srcdir)" \
 	-I"$(abs_srcdir)/coucal"
 
+AM_LDFLAGS = \
+	@DEFAULT_LDFLAGS@
+
 httrack_LDADD = $(THREADS_LIBS) libhttrack.la
 htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
 proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)
@@ -520,10 +526,10 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \
 
 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 \
 		coucal/murmurhash3.h.diff \
 		coucal/murmurhash3.h.orig \
@@ -1348,7 +1354,6 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 

src/htsback.c

@@ -333,8 +333,8 @@ int back_cleanup_background(httrackp * opt, cache_back * cache,
             free(filename);
         } else {
           hts_log_print(opt, LOG_WARNING | LOG_ERRNO,
-                        "engine: warning: serialize error for %s%s to %s: memory full",
-                        back[i].url_adr, back[i].url_fil, filename);
+                        "engine: warning: serialize error for %s%s: memory full",
+                        back[i].url_adr, back[i].url_fil);
         }
       }
 #else

src/htscore.c

@@ -413,7 +413,7 @@ if (makeindex_fp) { \
   if (makeindex_links == 1) { \
     char BIGSTK link_escaped[HTS_URLMAXSIZE*2]; \
     escape_uri_utf(makeindex_firstlink, link_escaped, sizeof(link_escaped)); \
-    sprintf(tempo,"<meta HTTP-EQUIV=\"Refresh\" CONTENT=\"0; URL=%s\">"CRLF, link_escaped); \
+    snprintf(tempo,sizeof(tempo),"<meta HTTP-EQUIV=\"Refresh\" CONTENT=\"0; URL=%s\">"CRLF, link_escaped); \
   } else \
     tempo[0]='\0'; \
     hts_template_format(makeindex_fp,template_footer, \

src/htscoremain.c

@@ -3164,8 +3164,8 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
                       "* security warning: maximum number of simultaneous connections limited to %d to avoid server overload",
                       (int) opt->maxsoc);
       }
-      if (opt->maxrate <= 0 || opt->maxrate > 250000) {
-        opt->maxrate = 250000;
+      if (opt->maxrate <= 0 || opt->maxrate > 10000000) {
+        opt->maxrate = 10000000;
         hts_log_print(opt, LOG_WARNING,
                       "* security warning: maximum bandwidth limited to %d to avoid server overload",
                       (int) opt->maxrate);

src/htsftp.c

@@ -113,9 +113,9 @@ void launch_ftp(FTPDownloadStruct * params) {
 
 // pour l'arrêt du ftp
 #ifdef _WIN32
-#define _T_SOC_close(soc)  closesocket(soc); soc=INVALID_SOCKET;
+#define _T_SOC_close(soc)  do { closesocket(soc); soc=INVALID_SOCKET; } while(0)
 #else
-#define _T_SOC_close(soc)  close(soc); soc=INVALID_SOCKET;
+#define _T_SOC_close(soc)  do { close(soc); soc=INVALID_SOCKET; } while(0)
 #endif
 #define _HALT_FTP { \
   if ( soc_ctl     != INVALID_SOCKET ) _T_SOC_close(soc_ctl); \
@@ -603,7 +603,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
                   deletesoc(soc_dat);
                   soc_dat = INVALID_SOCKET;
                   //
-                  snprintf(back->r.msg, sizeof(back->r.msg), "RETR command errror: %s",
+                  snprintf(back->r.msg, sizeof(back->r.msg), "RETR command error: %s",
                           linejmp(line));
                   // back->status=STATUS_FTP_READY;    // fini
                   back->r.statuscode = STATUSCODE_INVALID;
@@ -657,7 +657,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
                 back->r.statuscode = STATUSCODE_INVALID;
               }
             } else {
-              snprintf(back->r.msg, sizeof(back->r.msg), "RETR command errror: %s", linejmp(line));
+              snprintf(back->r.msg, sizeof(back->r.msg), "RETR command error: %s", linejmp(line));
               // back->status=STATUS_FTP_READY;    // fini
               back->r.statuscode = STATUSCODE_INVALID;
             }

src/htsglobal.h

@@ -36,8 +36,8 @@ Please visit our Website: http://www.httrack.com
 #define HTTRACK_GLOBAL_DEFH
 
 // Version (also check external version information)
-#define HTTRACK_VERSION      "3.49-3"
-#define HTTRACK_VERSIONID    "3.49.3"
+#define HTTRACK_VERSION      "3.49-6"
+#define HTTRACK_VERSIONID    "3.49.6"
 #define HTTRACK_AFF_VERSION  "3.x"
 #define HTTRACK_LIB_VERSION  "2.0"
 
@@ -93,10 +93,6 @@ Please visit our Website: http://www.httrack.com
 
 #include "config.h"
 
-#ifndef FTIME
-#define HTS_DO_NOT_USE_FTIME
-#endif
-
 #ifndef SETUID
 #define HTS_DO_NOT_USE_UID
 #endif
@@ -208,9 +204,9 @@ Please visit our Website: http://www.httrack.com
 
 /* Copyright (C) 1998-2017 Xavier Roche and other contributors */
 #define HTTRACK_AFF_AUTHORS "[XR&CO'2014]"
-#define HTS_DEFAULT_FOOTER "<!-- Mirrored from %s%s by HTTrack Website Copier/"HTTRACK_AFF_VERSION" "HTTRACK_AFF_AUTHORS", %s -->"
+#define HTS_DEFAULT_FOOTER "<!-- Mirrored from %s%s by HTTrack Website Copier/" HTTRACK_AFF_VERSION " " HTTRACK_AFF_AUTHORS ", %s -->"
 #define HTTRACK_WEB "http://www.httrack.com"
-#define HTS_UPDATE_WEBSITE "http://www.httrack.com/update.php3?Product=HTTrack&Version="HTTRACK_VERSIONID"&VersionStr="HTTRACK_VERSION"&Platform=%d&Language=%s"
+#define HTS_UPDATE_WEBSITE "http://www.httrack.com/update.php3?Product=HTTrack&Version=" HTTRACK_VERSIONID "&VersionStr=" HTTRACK_VERSION "&Platform=%d&Language=%s"
 
 #define H_CRLF "\x0d\x0a"
 #define CRLF   "\x0d\x0a"

src/htshelp.c

@@ -320,7 +320,7 @@ void help_wizard(httrackp * opt) {
       printf("\n");
       if (strlen(stropt) == 1)
         stropt[0] = '\0';       // aucune
-      sprintf(cmd, "%s %s %s %s", urls, stropt, stropt2, strwild);
+      snprintf(cmd, sizeof(cmd), "%s %s %s %s", urls, stropt, stropt2, strwild);
       printf("---> Wizard command line: httrack %s\n\n", cmd);
       printf("Ready to launch the mirror? (Y/n) :");
       fflush(stdout);
@@ -423,7 +423,7 @@ void help_catchurl(const char *dest_path) {
       int i = 0;
 
       do {
-        sprintf(dest, "%s%s%d", dest_path, "hts-post", i);
+        snprintf(dest, sizeof(dest), "%s%s%d", dest_path, "hts-post", i);
         i++;
       } while(fexist(dest));
       {
@@ -439,7 +439,7 @@ void help_catchurl(const char *dest_path) {
         char BIGSTK finalurl[HTS_URLMAXSIZE * 2];
 
         inplace_escape_check_url(dest, sizeof(dest));
-        sprintf(finalurl, "%s" POSTTOK "file:%s", url, dest);
+        snprintf(finalurl, sizeof(finalurl), "%s" POSTTOK "file:%s", url, dest);
         printf("\nThe URL is: \"%s\"\n", finalurl);
         printf("You can capture it through: httrack \"%s\"\n", finalurl);
       }
@@ -480,14 +480,14 @@ void help(const char *app, int more) {
   if (more)
     infomsg("1");
   if (more != 2) {
-    sprintf(info,
+    snprintf(info, sizeof(info),
             "HTTrack version " HTTRACK_VERSION "%s",
             hts_is_available());
     infomsg(info);
 #ifdef HTTRACK_AFF_WARNING
     infomsg("NOTE: " HTTRACK_AFF_WARNING);
 #endif
-    sprintf(info,
+    snprintf(info, sizeof(info),
             "\tusage: %s <URLs> [-option] [+<URL_FILTER>] [-<URL_FILTER>] [+<mime:MIME_FILTER>] [-<mime:MIME_FILTER>]",
             app);
     infomsg(info);
@@ -532,7 +532,7 @@ void help(const char *app, int more) {
   infomsg
     ("  JN traffic jam control, minimum transfert rate (bytes/seconds) tolerated for a link");
   infomsg
-    ("  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");
   infomsg("");
   infomsg("Links options:");
   infomsg
@@ -662,7 +662,7 @@ void help(const char *app, int more) {
   infomsg(" #R  old FTP routines (debug)");
   infomsg(" #T  generate transfer ops. log every minutes");
   infomsg(" #u  wait time");
-  infomsg(" #Z  generate transfer rate statictics every minutes");
+  infomsg(" #Z  generate transfer rate statistics every minutes");
   infomsg("");
   infomsg
     ("Dangerous options: (do NOT use unless you exactly know what you are doing)");
@@ -689,24 +689,24 @@ void help(const char *app, int more) {
   infomsg("  N99 All files in web/, with random names (gadget !)");
   infomsg("  N100 Site-structure, without www.domain.xxx/");
   infomsg
-    ("  N101 Identical to N1 exept that \"web\" is replaced by the site's name");
+    ("  N101 Identical to N1 except that \"web\" is replaced by the site's name");
   infomsg
-    ("  N102 Identical to N2 exept that \"web\" is replaced by the site's name");
+    ("  N102 Identical to N2 except that \"web\" is replaced by the site's name");
   infomsg
-    ("  N103 Identical to N3 exept that \"web\" is replaced by the site's name");
+    ("  N103 Identical to N3 except that \"web\" is replaced by the site's name");
   infomsg
-    ("  N104 Identical to N4 exept that \"web\" is replaced by the site's name");
+    ("  N104 Identical to N4 except that \"web\" is replaced by the site's name");
   infomsg
-    ("  N105 Identical to N5 exept that \"web\" is replaced by the site's name");
+    ("  N105 Identical to N5 except that \"web\" is replaced by the site's name");
   infomsg
-    ("  N199 Identical to N99 exept that \"web\" is replaced by the site's name");
-  infomsg("  N1001 Identical to N1 exept that there is no \"web\" directory");
-  infomsg("  N1002 Identical to N2 exept that there is no \"web\" directory");
+    ("  N199 Identical to N99 except that \"web\" is replaced by the site's name");
+  infomsg("  N1001 Identical to N1 except that there is no \"web\" directory");
+  infomsg("  N1002 Identical to N2 except that there is no \"web\" directory");
   infomsg
-    ("  N1003 Identical to N3 exept that there is no \"web\" directory (option set for g option)");
-  infomsg("  N1004 Identical to N4 exept that there is no \"web\" directory");
-  infomsg("  N1005 Identical to N5 exept that there is no \"web\" directory");
-  infomsg("  N1099 Identical to N99 exept that there is no \"web\" directory");
+    ("  N1003 Identical to N3 except that there is no \"web\" directory (option set for g option)");
+  infomsg("  N1004 Identical to N4 except that there is no \"web\" directory");
+  infomsg("  N1005 Identical to N5 except that there is no \"web\" directory");
+  infomsg("  N1099 Identical to N99 except that there is no \"web\" directory");
   infomsg("Details: User-defined option N");
   infomsg("  '%n' Name of file without file type (ex: image)");
   infomsg("  '%N' Name of file, including file type (ex: image.gif)");
@@ -792,7 +792,7 @@ void help(const char *app, int more) {
   infomsg("example: httrack --continue");
   infomsg("continues a mirror in the current folder");
   infomsg("");
-  sprintf(info, "HTTrack version " HTTRACK_VERSION "%s",
+  snprintf(info, sizeof(info), "HTTrack version " HTTRACK_VERSION "%s",
           hts_is_available());
   infomsg(info);
   infomsg("Copyright (C) 1998-2017 Xavier Roche and other contributors");

src/htsjava.c

@@ -268,7 +268,7 @@ static int hts_parse_java(t_hts_callbackarg * carg, httrackp * opt,
 
                   tempo[0] = '\0';
 
-                  sprintf(tempo, "%s.class", tab[tab[i].index1].name);
+                  snprintf(tempo, sizeof(tempo), "%s.class", tab[tab[i].index1].name);
 #if JAVADEBUG
                   printf("add %s\n", tempo);
 #endif
@@ -425,7 +425,7 @@ static RESP_STRUCT readtable(htsmoduleStruct * str, FILE * fp,
         if (!feof(fp)) {
           trans.type = -1;
         } else {
-          sprintf(str->err_msg, "Internal stucture error (ASCII)");
+          sprintf(str->err_msg, "Internal structure error (ASCII)");
           *error = 1;
         }
         return (trans);

src/htslib.c

@@ -2602,7 +2602,6 @@ TStamp time_local(void) {
 
 // number of millisec since 1970
 HTSEXT_API TStamp mtime_local(void) {
-#ifndef HTS_DO_NOT_USE_FTIME
 #ifndef _WIN32
   struct timeval tv;
   if (gettimeofday(&tv, NULL) != 0) {
@@ -2617,11 +2616,6 @@ HTSEXT_API TStamp mtime_local(void) {
   return (TStamp) (((TStamp) B.time * (TStamp) 1000)
                    + ((TStamp) B.millitm));
 #endif
-#else
-  // not precise..
-  return (TStamp) (((TStamp) time_local() * (TStamp) 1000)
-                   + ((TStamp) 0));
-#endif
 }
 
 // convertit un nombre de secondes en temps (chaine)
@@ -2784,18 +2778,13 @@ struct tm *convert_time_rfc822(struct tm *result, const char *s) {
   return NULL;
 }
 
-static time_t getGMT(struct tm *tm) {   /* hey, time_t is local! */
-  time_t t = mktime(tm);
+static time_t getGMT(struct tm *tm) {
+  time_t t = timegm(tm);
 
   if (t != (time_t) - 1 && t != (time_t) 0) {
-    /* BSD does not have static "timezone" declared */
-#if (defined(BSD) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__))
-    time_t now = time(NULL);
-    time_t timezone = -localtime(&now)->tm_gmtoff;
-#endif
-    return (time_t) (t - timezone);
+    return (time_t) t;
   }
-  return (time_t) - 1;
+  return (time_t) -1;
 }
 
 /* sets file time. -1 if error */
@@ -5518,7 +5507,7 @@ HTSEXT_API httrackp *hts_create_opt(void) {
   opt->maxcache = 1048576 * 32; // a peu près 32Mo en cache max -- OPTION NON PARAMETRABLE POUR L'INSTANT --
   //opt->maxcache_anticipate=256;  // maximum de liens à anticiper
   opt->maxtime = -1;            // temps max en secondes
-  opt->maxrate = 25000;         // taux maxi
+  opt->maxrate = 100000;        // taux maxi
   opt->maxconn = 5.0;           // nombre connexions/s
   opt->waittime = -1;           // wait until.. hh*3600+mm*60+ss
   //

src/htsmodules.h

@@ -78,7 +78,7 @@ struct htsmoduleStruct {
 
   /* Write-only */
   const char *wrapper_name;     /* name of wrapper (static string) */
-  char *err_msg;                /* if an error occured, the error message (max. 1KB) */
+  char *err_msg;                /* if an error occurred, the error message (max. 1KB) */
 
   /* Read/Write */
   int relativeToHtmlLink;       /* set this to 1 if all urls you pass to addLink

src/htsparse.c

@@ -175,7 +175,7 @@ Please visit our Website: http://www.httrack.com
   if (makeindex_links == 1) { \
   char BIGSTK link_escaped[HTS_URLMAXSIZE*2]; \
   escape_uri_utf(makeindex_firstlink, link_escaped, sizeof(link_escaped)); \
-  sprintf(tempo,"<meta HTTP-EQUIV=\"Refresh\" CONTENT=\"0; URL=%s\">"CRLF,link_escaped); \
+  snprintf(tempo,sizeof(tempo),"<meta HTTP-EQUIV=\"Refresh\" CONTENT=\"0; URL=%s\">"CRLF,link_escaped); \
   } else \
   tempo[0]='\0'; \
   hts_template_format(makeindex_fp,template_footer, \

src/htsserver.c

@@ -347,7 +347,7 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
       /* */
       {"connexion", 4},
       /* */
-      {"maxrate", 25000},
+      {"maxrate", 100000},
       /* */
       {"build", 1},
       /* */

src/htsweb.c

@@ -152,7 +152,7 @@ int main(int argc, char *argv[]) {
   int defaultPort = 0;
   int parentPid = 0;
 
-  printf("Initialzing the server..\n");
+  printf("Initializing the server..\n");
 
 #ifdef _WIN32
   {
@@ -229,7 +229,7 @@ int main(int argc, char *argv[]) {
   {
     char tmp[32];
 
-    sprintf(tmp, "%d", -1);
+    snprintf(tmp, sizeof(tmp), "%d", -1);
     smallserver_setkey("HTS_PLATFORM", tmp);
   }
   smallserver_setkey("HTTRACK_WEB", HTTRACK_WEB);
@@ -248,7 +248,7 @@ int main(int argc, char *argv[]) {
     char digest[32 + 2];
 
     srand((unsigned int) time(NULL));
-    sprintf(buff, "%d-%d", (int) time(NULL), (int) rand());
+    snprintf(buff, sizeof(buff), "%d-%d", (int) time(NULL), (int) rand());
     domd5mem(buff, strlen(buff), digest, 1);
     smallserver_setkey("sid", digest);
     smallserver_setkey("_sid", digest);
@@ -673,8 +673,8 @@ int __cdecl htsshow_loop(t_hts_callbackarg * carg, httrackp * opt, lien_back * b
                       strncat(proto, back[i].url_adr, count);
                     }
                   }
-                  sprintf(StatsBuffer[index].state, "%s: %s", proto,
-                          back[i].info);
+                  snprintf(StatsBuffer[index].state, sizeof(StatsBuffer[index].state),
+                          "%s: %s", proto, back[i].info);
                   ok = 1;
                 }
                 break;
@@ -771,22 +771,22 @@ int __cdecl htsshow_loop(t_hts_callbackarg * carg, httrackp * opt, lien_back * b
           tmp[0] = '\0';
           switch (hts_is_testing(opt)) {
           case 0:
-            sprintf(tmp, "parsing HTML file (%d%%)", parsing);
+            snprintf(tmp, sizeof(tmp), "parsing HTML file (%d%%)", parsing);
             break;
           case 1:
-            sprintf(tmp, "parsing HTML file: testing links (%d%%)", parsing);
+            snprintf(tmp, sizeof(tmp), "parsing HTML file: testing links (%d%%)", parsing);
             break;
           case 2:
-            sprintf(tmp, "purging files");
+            snprintf(tmp, sizeof(tmp), "purging files");
             break;
           case 3:
-            sprintf(tmp, "loading cache");
+            snprintf(tmp, sizeof(tmp), "loading cache");
             break;
           case 4:
-            sprintf(tmp, "waiting (scheduler)");
+            snprintf(tmp, sizeof(tmp), "waiting (scheduler)");
             break;
           case 5:
-            sprintf(tmp, "waiting (throttle)");
+            snprintf(tmp, sizeof(tmp), "waiting (throttle)");
             break;
           }
           smallserver_setkey("info.currentjob", tmp);