Tagged 3.48.6

Makefile.am

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

Makefile.in

@@ -134,7 +134,6 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -143,12 +142,14 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
-DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -162,7 +163,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -218,6 +218,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -268,7 +269,7 @@ SUBDIRS = src man m4 libtest templates lang html tests
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = INSTALL.Linux \
 		gpl-fr.txt license.txt greetings.txt history.txt \
-		httrack-doc.html lang.def README.md
+		httrack-doc.html lang.def
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

README

@@ -1,5 +1,5 @@
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2015 Xavier Roche and other contributors
+Copyright (C) 1998-2014 Xavier Roche and other contributors
 
 Welcome to HTTrack Website Copier!
 

README.md

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

compile

@@ -1,10 +1,9 @@
 #! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
+# Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2012-03-05.13; # UTC
+scriptversion=2005-05-14.22
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +17,8 @@ scriptversion=2012-03-05.13; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -29,219 +29,21 @@ scriptversion=2012-03-05.13; # UTC
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      lib=$dir/$lib.lib
-      break
-    fi
-  done
-  IFS=$save_IFS
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
 case $1 in
   '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 
 If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
+right script to run: please start by reading the file `INSTALL'.
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
@@ -251,13 +53,11 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
 esac
 
 ofile=
 cfile=
+eat=
 
 for arg
 do
@@ -266,8 +66,8 @@ do
   else
     case $1 in
       -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
 	eat=1
 	case $2 in
 	  *.o | *.obj)
@@ -294,22 +94,22 @@ do
 done
 
 if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
+  # If no `-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
+  # `.c' file was seen then we are probably linking.  That is also
   # ok.
   exec "$@"
 fi
 
 # Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# Note: use `[/.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
 while true; do
   if mkdir "$lockdir" >/dev/null 2>&1; then
     break
@@ -324,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
 ret=$?
 
 if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+  mv "$cofile" "$ofile"
 elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+  mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"
@@ -338,6 +138,5 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
+# time-stamp-end: "$"
 # End:

config.h.in

@@ -6,15 +6,9 @@
 /* Check for ftime */
 #undef FTIME
 
-/* Define if pointers to integers require aligned access */
-#undef HAVE_ALIGNED_ACCESS_REQUIRED
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the <execinfo.h> header file. */
-#undef HAVE_EXECINFO_H
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -39,9 +33,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Check for strnlen */
-#undef HAVE_STRNLEN
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
@@ -51,10 +42,6 @@
 /* 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
 
@@ -80,9 +67,6 @@
    */
 #undef LT_OBJDIR
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Name of package */
 #undef PACKAGE
 
@@ -122,43 +106,5 @@
 /* Check for pthread in pthreads */
 #undef THREADS
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Version number of package */
 #undef VERSION
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
-/* in_port_t */
-#undef in_port_t
-
-/* sa_family_t */
-#undef sa_family_t

configure.ac

@@ -1,46 +1,18 @@
-AC_PREREQ(2.59)
-
-AC_INIT([httrack], [3.48.21], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
-AC_COPYRIGHT([
-HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2015 Xavier Roche and other contributors
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Important notes:
-
-- We hereby ask people using this source NOT to use it in purpose of grabbing
-emails addresses, or collecting any other private information on persons.
-This would disgrace our work, and spoil the many hours we spent on it.
-
-Please visit our Website: http://www.httrack.com
-])
-
+AC_INIT([httrack], [3.48.5], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
 AC_CONFIG_SRCDIR(src/httrack.c)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([subdir-objects])
+AM_INIT_AUTOMAKE
 VERSION_INFO="2:48:0"
 AM_MAINTAINER_MODE
-AC_USE_SYSTEM_EXTENSIONS
+
+AC_PREREQ(2.50)
 
 AC_PROG_CC
-AM_PROG_CC_C_O
+AC_PROG_CXX
 AC_STDC_HEADERS
 LT_INIT
 AC_PROG_LN_S
-AM_PROG_LIBTOOL
 
 # Export LD_LIBRARY_PATH name or equivalent.
 AC_SUBST(SHLIBPATH_VAR,$shlibpath_var)
@@ -48,42 +20,12 @@ AC_SUBST(SHLIBPATH_VAR,$shlibpath_var)
 # Export .libs or equivalent.
 AC_SUBST(LT_CV_OBJDIR,$lt_cv_objdir)
 
-# Export version info
-AC_SUBST(VERSION_INFO)
-
 ### Default CFLAGS
-DEFAULT_CFLAGS="-Wall -Wformat -Wformat-security \
--Wmultichar -Wwrite-strings -Wcast-qual -Wcast-align \
--Wstrict-prototypes -Wmissing-prototypes \
--Wmissing-declarations -Wdeclaration-after-statement \
--Wpointer-arith -Wsequence-point -Wnested-externs \
--D_REENTRANT"
+DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \
+-Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
+-Wnested-externs -D_REENTRANT"
 AC_SUBST(DEFAULT_CFLAGS)
-DEFAULT_LDFLAGS=""
-AC_SUBST(DEFAULT_LDFLAGS)
-
-### Additional flags (if supported)
-AX_CHECK_COMPILE_FLAG([-Wparentheses], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wparentheses"])
-AX_CHECK_COMPILE_FLAG([-Winit-self], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Winit-self"])
-AX_CHECK_COMPILE_FLAG([-Wunused-but-set-parameter], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wunused-but-set-parameter"])
-AX_CHECK_COMPILE_FLAG([-Waddress], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Waddress"])
-AX_CHECK_COMPILE_FLAG([-Wuninitialized], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wuninitialized"])
-AX_CHECK_COMPILE_FLAG([-Wformat=2], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wformat=2"])
-AX_CHECK_COMPILE_FLAG([-Wformat-nonliteral], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wformat-nonliteral"])
-AX_CHECK_COMPILE_FLAG([-Wmissing-parameter-type], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wmissing-parameter-type"])
-AX_CHECK_COMPILE_FLAG([-Wold-style-definition], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wold-style-definition"])
-AX_CHECK_COMPILE_FLAG([-Wignored-qualifiers], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wignored-qualifiers"])
-AX_CHECK_COMPILE_FLAG([-fstrict-aliasing -Wstrict-aliasing], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstrict-aliasing -Wstrict-aliasing"])
-AX_CHECK_LINK_FLAG([-Wl,--discard-all], [DEFAULT_LDLAGS="$DEFAULT_LDLAGS -Wl,--discard-all"])
-AX_CHECK_LINK_FLAG([-Wl,--no-undefined], [DEFAULT_LDLAGS="$DEFAULT_LDLAGS -Wl,--no-undefined"])
-
-## Export all symbols for backtraces
-AX_CHECK_COMPILE_FLAG([-rdynamic], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -rdynamic"])
-
-### Check for -fvisibility=hidden support
-gl_VISIBILITY
-AM_CFLAGS="$AM_CFLAGS $CFLAG_VISIBILITY"
-AC_SUBST([AM_CFLAGS])
+AC_SUBST(VERSION_INFO)
 
 ### Check for platform
 #case $host in
@@ -105,24 +47,6 @@ AC_MSG_WARN([*** in_addr_t not found]),
 #include <netinet/in.h>
 #include <arpa/inet.h>])
 
-# check for in_port_
-AC_CHECK_TYPE(in_port_t, [], [AC_DEFINE([in_port_t], [uint16_t], [in_port_t])], [
-#include <sys/types.h>
-#include <netinet/in.h>
-])
-
-# check for sa_family_t
-AC_CHECK_TYPE(sa_family_t, [], [AC_DEFINE([sa_family_t], [uint16_t], [sa_family_t])], [
-#include <sys/types.h>
-#include <netinet/in.h>
-])
-
-# check wether misaligned access is possible or not
-AX_CHECK_ALIGNED_ACCESS_REQUIRED
-
-# check for various headers
-AC_CHECK_HEADERS([execinfo.h])
-
 ### zlib
 CHECK_ZLIB()
 
@@ -153,16 +77,9 @@ if test x"$https_support" = x"no"; then
 AC_MSG_NOTICE([disabling https support])
 AC_DEFINE(HTS_USEOPENSSL, 0)
 else
-SAVE_LIBS=$LIBS
-AC_CHECK_LIB(crypto, EVP_get_digestbyname,
-	[
-	OPENSSL_LIBS="-lcrypto"
-	]
-	)
-LIBS="$LIBS $OPENSSL_LIBS"
 AC_CHECK_LIB(ssl, SSL_library_init,
 	[
-	OPENSSL_LIBS="$OPENSSL_LIBS -lssl"
+	OPENSSL_LIBS="-lcrypto -lssl"
 	AC_DEFINE(HTS_USEOPENSSL, 1, [Check for OpenSSL])
 	],
 	[
@@ -173,7 +90,6 @@ AC_CHECK_LIB(ssl, SSL_library_init,
 	fi
 	]
 	)
-LIBS=$SAVE_LIBS
 AC_SUBST(OPENSSL_LIBS)
 fi
 
@@ -238,10 +154,6 @@ AC_DEFINE(SETUID, 1,[Check for setuid])], AC_MSG_RESULT([not found]))
 ### Check for snprintf
 AC_FUNC_SNPRINTF()
 
-### Check for strnlen
-AC_CHECK_LIB(c, strnlen, [
-AC_DEFINE(HAVE_STRNLEN, 1,[Check for strnlen])], AC_MSG_RESULT([not found]))
-
 ## Online unit tests
 AC_MSG_CHECKING(whether to enable online unit tests)
 AC_ARG_ENABLE([online-unit-tests],

debian/changelog

@@ -1,106 +1,3 @@
-httrack (3.48.21-1) unstable; urgency=low
-
-  * Updated to 3.48.21 (3.48-21)
-
- -- Xavier Roche <xavier@debian.org>  Sat, 14 Mar 2015 15:02:53 +0100
-
-httrack (3.48.20-1) unstable; urgency=low
-
-  * Updated to 3.48.20 (3.48-20)
-    closes:#765019
-
- -- Xavier Roche <xavier@debian.org>  Wed, 15 Oct 2014 21:37:54 +0200
-
-httrack (3.48.19-1) unstable; urgency=low
-
-  * Updated to 3.48.19 (3.48-19)
-    closes:#756328
-
- -- Xavier Roche <xavier@debian.org>  Mon, 28 Jul 2014 22:52:19 +0200
-
-httrack (3.48.18-1) unstable; urgency=low
-
-  * Updated to 3.48.18 (3.48-18)
-    closes:#755107
-
- -- Xavier Roche <xavier@debian.org>  Thu, 17 Jul 2014 21:35:10 +0200
-
-httrack (3.48.17-1) unstable; urgency=low
-
-  * Updated to 3.48.17 (3.48-17)
-
- -- Xavier Roche <xavier@debian.org>  Sat, 12 Jul 2014 15:21:14 +0200
-
-httrack (3.48.16-1) unstable; urgency=low
-
-  * Updated to 3.48.16 (3.48-16)
-    fixed FTBFS on ARM/MIPS again
-
- -- Xavier Roche <xavier@debian.org>  Wed, 09 Jul 2014 07:02:08 +0200
-
-httrack (3.48.15-1) unstable; urgency=low
-
-  * Updated to 3.48.15 (3.48-15)
-    fixed FTBFS on ARM/MIPS
-
- -- Xavier Roche <xavier@debian.org>  Tue, 08 Jul 2014 22:05:14 +0200
-
-httrack (3.48.14-1) unstable; urgency=low
-
-  * Updated to 3.48.14 (3.48-14)
-
- -- Xavier Roche <xavier@debian.org>  Tue, 08 Jul 2014 20:36:55 +0200
-
-httrack (3.48.13-1) unstable; urgency=low
-
-  * Updated to 3.48.13 (3.48-13)
-    closes:#750931
-
- -- Xavier Roche <xavier@debian.org>  Sun, 08 Jun 2014 16:22:13 +0200
-
-httrack (3.48.12-1) unstable; urgency=low
-
-  * Updated to 3.48.12 (3.48-12)
-    Should fix missing/broken .h for libhttrack-dev
-
- -- Xavier Roche <xavier@debian.org>  Sun, 08 Jun 2014 13:19:49 +0200
-
-httrack (3.48.11-1) unstable; urgency=low
-
-  * Updated to 3.48.11 (3.48-11)
-
- -- Xavier Roche <xavier@debian.org>  Fri, 06 Jun 2014 17:58:12 +0200
-
-httrack (3.48.10-1) unstable; urgency=low
-
-  * Updated to 3.48.10 (3.48-10)
-
- -- Xavier Roche <xavier@debian.org>  Wed, 04 Jun 2014 19:00:07 +0200
-
-httrack (3.48.9-1) unstable; urgency=low
-
-  * Updated to 3.48.9 (3.48-9)
-
- -- Xavier Roche <xavier@debian.org>  Wed, 21 May 2014 19:22:04 +0200
-
-httrack (3.48.8-1) unstable; urgency=low
-
-  * Updated to 3.48.8 (3.48-8)
-
- -- Xavier Roche <xavier@debian.org>  Thu, 15 May 2014 19:21:21 +0200
-
-httrack (3.48.7-1) unstable; urgency=low
-
-  * Updated to 3.48.7 (3.48-7)
-
- -- Xavier Roche <xavier@debian.org>  Wed, 14 May 2014 19:51:57 +0200
-
-httrack (3.48.6-1) unstable; urgency=low
-
-  * Updated to 3.48.6 (3.48-6)
-
- -- Xavier Roche <xavier@debian.org>  Tue, 13 May 2014 21:23:02 +0200
-
 httrack (3.48.5-1) unstable; urgency=low
 
   * Updated to 3.48.5 (3.48-5)

debian/control

@@ -3,10 +3,8 @@ Section: web
 Priority: optional
 Maintainer: Xavier Roche <roche@httrack.com>
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 8.0.0), dh-autoreconf, autotools-dev, autoconf, autoconf-archive, automake, libtool, zlib1g-dev, libssl-dev
+Build-Depends: debhelper (>= 8.0.0), dh-autoreconf, autotools-dev, autoconf, automake, libtool, zlib1g-dev, libssl-dev
 Homepage: http://www.httrack.com
-Vcs-Git: https://github.com/xroche/httrack.git
-Vcs-Browser: https://code.google.com/p/httrack/source/browse/trunk/src
 
 Package: httrack
 Architecture: any

history.txt

@@ -2,38 +2,9 @@
 HTTrack Website Copier release history:
 --------------------------------------
 
-This file lists all changes and fixes that have been made for HTTrack
-3.48-21
-+ Fixed: Google RPMs use /usr/bin/google-chrome as program location (Cickumqt)
-+ Fixed: Fixed htsserver not dying (immediately) on quit
-+ New: Updated WIN32 OpenSSL to 1.0.1j (Evgeniy)
-+ Fixed: webhttrack incompatibility with Chrome
-+ Fixed: assertion failure at htslib.c:3458 (strlen(copyBuff) == qLen) seen on Linux
-+ Fixed: infamous crashes inside the DNS cache due to a corruption within the option structure (E.Kalinowski/karbofos)
-+ New: added minimalistic crash reporting on Windows and Linux
-+ Fixed: URL list not working anymore (tom swift)
-+ Fixed: FTBFS on ARM
-+ Fixed: buggy FFFD (replacement character) in place of leading non-ascii character such as Chinese ones (aballboy)
-+ Fixed: FTBFS when compiling with zlib versions < 1.2.70 (sammyx)
-+ Fixed: buggy SVG (Smiling Spectre)
-+ Fixed: do not uncompress .tgz advertised as "streamed" (Smiling Spectre)
-+ Fixed: NULL pointer dereferencing in back_unserialize (htsback.c:976)
-+ Fixed: library development files
-+ Fixed: --advanced-maxlinks broken (Localhost)
-+ Fixed: -devel package should now be standalone
-+ Fixed: assertion failure at htscore.c:244 (len + liensbuf->string_buffer_size < liensbuf->string_buffer_capa)
-+ Fixed: injection-proof templates
-+ Fixed: htshash.c:330 assertion failure ("error invalidating hash entry") (Sergey)
-+ Fixed: Windows 2000 regression (fantozzi.usenet)
-+ Fixed: code cleanup (aliasing issues, const correctness, safe strings)
-+ New: handle --advanced-maxlinks=0 to disable maximum link limits
-+ New: updated ZIP routines (zlib 1.2.8)
-+ Fixed: broken 32-bit version
-+ Fixed: assertion "segOutputSize < segSize assertion fails at htscharset.c:993"
-+ Fixed: new zlib version fixing CVE-2004-0797 and CVE-2005-2096
-+ Fixed: more reliable crash reporting
-+ Fixed: fixed infamous "hashtable internal error: cuckoo/stash collision" errors
-+ Fixed: safety cleanup in many strings operations
+This file lists all changes and fixes that have been made for HTTrack.
+
+3.48-3
 + Fixed: buggy option pannels
 + New: Enforce check against CVE-2014-0160
 + New: improved hashtables to speedup large mirrors

html/Makefile.am

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

html/Makefile.in

@@ -104,17 +104,17 @@ am__installdirs = "$(DESTDIR)$(HelpHtmldir)" \
 	"$(DESTDIR)$(HelpHtmlimagesdir)" "$(DESTDIR)$(HelpHtmlimgdir)" \
 	"$(DESTDIR)$(HelpHtmlrootdir)" "$(DESTDIR)$(VFolderEntrydir)" \
 	"$(DESTDIR)$(WebHtmldir)" "$(DESTDIR)$(WebHtmlimagesdir)" \
-	"$(DESTDIR)$(WebIcon16x16dir)" "$(DESTDIR)$(WebIcon32x32dir)" \
-	"$(DESTDIR)$(WebIcon48x48dir)" "$(DESTDIR)$(WebPixmapdir)"
+	"$(DESTDIR)$(WebHtmlsfxdir)" "$(DESTDIR)$(WebIcon16x16dir)" \
+	"$(DESTDIR)$(WebIcon32x32dir)" "$(DESTDIR)$(WebIcon48x48dir)" \
+	"$(DESTDIR)$(WebPixmapdir)"
 DATA = $(HelpHtml_DATA) $(HelpHtmlTxt_DATA) $(HelpHtmldiv_DATA) \
 	$(HelpHtmlimages_DATA) $(HelpHtmlimg_DATA) \
 	$(HelpHtmlroot_DATA) $(VFolderEntry_DATA) $(WebHtml_DATA) \
-	$(WebHtmlimages_DATA) $(WebIcon16x16_DATA) \
+	$(WebHtmlimages_DATA) $(WebHtmlsfx_DATA) $(WebIcon16x16_DATA) \
 	$(WebIcon32x32_DATA) $(WebIcon48x48_DATA) $(WebPixmap_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -123,12 +123,14 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
-DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -142,7 +144,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -198,6 +199,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -252,6 +254,7 @@ HelpHtmlimagesdir = $(HelpHtmldir)/images
 HelpHtmlTxtdir = $(HelpHtmldir)
 WebHtmldir = $(HelpHtmldir)/server
 WebHtmlimagesdir = $(HelpHtmldir)/server/images
+WebHtmlsfxdir = $(HelpHtmldir)/server/sfx
 WebPixmapdir = $(datadir)/pixmaps
 WebIcon16x16dir = $(datadir)/icons/hicolor/16x16/apps
 WebIcon32x32dir = $(datadir)/icons/hicolor/32x32/apps
@@ -263,8 +266,9 @@ HelpHtmldiv_DATA = div/search.sh
 HelpHtmlimg_DATA = img/*
 HelpHtmlimages_DATA = images/*
 HelpHtmlTxt_DATA = ../greetings.txt ../history.txt ../license.txt
-WebHtml_DATA = server/*.html server/*.js server/*.css
+WebHtml_DATA = server/*.html
 WebHtmlimages_DATA = server/images/*
+WebHtmlsfx_DATA = server/sfx/*
 # note: converted & normalized by
 # ico2xpm favicon.ico -o httrack.xpm
 # mogrify -format xpm -map /usr/share/doc/menu/examples/cmap.xpm httrack.xpm
@@ -274,7 +278,7 @@ WebIcon32x32_DATA = server/div/32x32/*.png
 WebIcon48x48_DATA = server/div/48x48/*.png
 VFolderEntry_DATA = server/div/*.desktop
 EXTRA_DIST = $(HelpHtml_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlimages_DATA) \
-	$(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) \
+	$(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) $(WebHtmlsfx_DATA) \
 	$(WebPixmap_DATA) $(WebIcon16x16_DATA) $(WebIcon32x32_DATA) $(WebIcon48x48_DATA) \
 	$(VFolderEntry_DATA) \
 	httrack.css
@@ -507,6 +511,27 @@ uninstall-WebHtmlimagesDATA:
 	@list='$(WebHtmlimages_DATA)'; test -n "$(WebHtmlimagesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(WebHtmlimagesdir)'; $(am__uninstall_files_from_dir)
+install-WebHtmlsfxDATA: $(WebHtmlsfx_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(WebHtmlsfx_DATA)'; test -n "$(WebHtmlsfxdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(WebHtmlsfxdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(WebHtmlsfxdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(WebHtmlsfxdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(WebHtmlsfxdir)" || exit $$?; \
+	done
+
+uninstall-WebHtmlsfxDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(WebHtmlsfx_DATA)'; test -n "$(WebHtmlsfxdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(WebHtmlsfxdir)'; $(am__uninstall_files_from_dir)
 install-WebIcon16x16DATA: $(WebIcon16x16_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(WebIcon16x16_DATA)'; test -n "$(WebIcon16x16dir)" || list=; \
@@ -632,7 +657,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(HelpHtmldir)" "$(DESTDIR)$(HelpHtmlTxtdir)" "$(DESTDIR)$(HelpHtmldivdir)" "$(DESTDIR)$(HelpHtmlimagesdir)" "$(DESTDIR)$(HelpHtmlimgdir)" "$(DESTDIR)$(HelpHtmlrootdir)" "$(DESTDIR)$(VFolderEntrydir)" "$(DESTDIR)$(WebHtmldir)" "$(DESTDIR)$(WebHtmlimagesdir)" "$(DESTDIR)$(WebIcon16x16dir)" "$(DESTDIR)$(WebIcon32x32dir)" "$(DESTDIR)$(WebIcon48x48dir)" "$(DESTDIR)$(WebPixmapdir)"; do \
+	for dir in "$(DESTDIR)$(HelpHtmldir)" "$(DESTDIR)$(HelpHtmlTxtdir)" "$(DESTDIR)$(HelpHtmldivdir)" "$(DESTDIR)$(HelpHtmlimagesdir)" "$(DESTDIR)$(HelpHtmlimgdir)" "$(DESTDIR)$(HelpHtmlrootdir)" "$(DESTDIR)$(VFolderEntrydir)" "$(DESTDIR)$(WebHtmldir)" "$(DESTDIR)$(WebHtmlimagesdir)" "$(DESTDIR)$(WebHtmlsfxdir)" "$(DESTDIR)$(WebIcon16x16dir)" "$(DESTDIR)$(WebIcon32x32dir)" "$(DESTDIR)$(WebIcon48x48dir)" "$(DESTDIR)$(WebPixmapdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -689,9 +714,9 @@ install-data-am: install-HelpHtmlDATA install-HelpHtmlTxtDATA \
 	install-HelpHtmldivDATA install-HelpHtmlimagesDATA \
 	install-HelpHtmlimgDATA install-HelpHtmlrootDATA \
 	install-VFolderEntryDATA install-WebHtmlDATA \
-	install-WebHtmlimagesDATA install-WebIcon16x16DATA \
-	install-WebIcon32x32DATA install-WebIcon48x48DATA \
-	install-WebPixmapDATA
+	install-WebHtmlimagesDATA install-WebHtmlsfxDATA \
+	install-WebIcon16x16DATA install-WebIcon32x32DATA \
+	install-WebIcon48x48DATA install-WebPixmapDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-am
@@ -740,9 +765,9 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 	uninstall-HelpHtmldivDATA uninstall-HelpHtmlimagesDATA \
 	uninstall-HelpHtmlimgDATA uninstall-HelpHtmlrootDATA \
 	uninstall-VFolderEntryDATA uninstall-WebHtmlDATA \
-	uninstall-WebHtmlimagesDATA uninstall-WebIcon16x16DATA \
-	uninstall-WebIcon32x32DATA uninstall-WebIcon48x48DATA \
-	uninstall-WebPixmapDATA
+	uninstall-WebHtmlimagesDATA uninstall-WebHtmlsfxDATA \
+	uninstall-WebIcon16x16DATA uninstall-WebIcon32x32DATA \
+	uninstall-WebIcon48x48DATA uninstall-WebPixmapDATA
 
 .MAKE: install-am install-data-am install-strip
 
@@ -753,28 +778,30 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 	install-HelpHtmlimagesDATA install-HelpHtmlimgDATA \
 	install-HelpHtmlrootDATA install-VFolderEntryDATA \
 	install-WebHtmlDATA install-WebHtmlimagesDATA \
-	install-WebIcon16x16DATA install-WebIcon32x32DATA \
-	install-WebIcon48x48DATA install-WebPixmapDATA install-am \
-	install-data install-data-am install-data-hook install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
+	install-WebHtmlsfxDATA install-WebIcon16x16DATA \
+	install-WebIcon32x32DATA install-WebIcon48x48DATA \
+	install-WebPixmapDATA install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall \
+	uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 	uninstall-HelpHtmldivDATA uninstall-HelpHtmlimagesDATA \
 	uninstall-HelpHtmlimgDATA uninstall-HelpHtmlrootDATA \
 	uninstall-VFolderEntryDATA uninstall-WebHtmlDATA \
-	uninstall-WebHtmlimagesDATA uninstall-WebIcon16x16DATA \
-	uninstall-WebIcon32x32DATA uninstall-WebIcon48x48DATA \
-	uninstall-WebPixmapDATA uninstall-am
+	uninstall-WebHtmlimagesDATA uninstall-WebHtmlsfxDATA \
+	uninstall-WebIcon16x16DATA uninstall-WebIcon32x32DATA \
+	uninstall-WebIcon48x48DATA uninstall-WebPixmapDATA \
+	uninstall-am
 
 
 install-data-hook:
 	if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
 		( cd $(DESTDIR)$(prefix)/share/httrack \
-			&& $(LN_S) ../doc/httrack html \
+			&& $(LN_S) $(htmldir) html \
 		) \
 	fi
 

html/httrack.man.html

@@ -51,99 +51,98 @@ offline browser : copy websites to a local directory</p>
 
 
 <p style="margin-left:11%; margin-top: 1em"><b>httrack [
-url ]... [ &minus;filter ]... [ +filter ]... [ &minus;O,
-&minus;&minus;path</b> ] [ <b>&minus;w,
-&minus;&minus;mirror</b> ] [ <b>&minus;W,
-&minus;&minus;mirror&minus;wizard</b> ] [ <b>&minus;g,
-&minus;&minus;get&minus;files</b> ] [ <b>&minus;i,
-&minus;&minus;continue</b> ] [ <b>&minus;Y,
-&minus;&minus;mirrorlinks</b> ] [ <b>&minus;P,
-&minus;&minus;proxy</b> ] [ <b>&minus;%f,
-&minus;&minus;httpproxy&minus;ftp[=N]</b> ] [ <b>&minus;%b,
-&minus;&minus;bind</b> ] [ <b>&minus;rN,
-&minus;&minus;depth[=N]</b> ] [ <b>&minus;%eN,
-&minus;&minus;ext&minus;depth[=N]</b> ] [ <b>&minus;mN,
-&minus;&minus;max&minus;files[=N]</b> ] [ <b>&minus;MN,
-&minus;&minus;max&minus;size[=N]</b> ] [ <b>&minus;EN,
-&minus;&minus;max&minus;time[=N]</b> ] [ <b>&minus;AN,
-&minus;&minus;max&minus;rate[=N]</b> ] [ <b>&minus;%cN,
+url ]... [ &minus;filter ]... [ +filter ]... [ &minus;O
+&minus;&minus;path</b> ] [ <b>&minus;w
+&minus;&minus;mirror</b> ] [ <b>&minus;W
+&minus;&minus;mirror&minus;wizard</b> ] [ <b>&minus;g
+&minus;&minus;get&minus;files</b> ] [ <b>&minus;i
+&minus;&minus;continue</b> ] [ <b>&minus;Y
+&minus;&minus;mirrorlinks</b> ] [ <b>&minus;P
+&minus;&minus;proxy</b> ] [ <b>&minus;%f
+&minus;&minus;httpproxy&minus;ftp[=N]</b> ] [ <b>&minus;%b
+&minus;&minus;bind</b> ] [ <b>&minus;rN
+&minus;&minus;depth[=N]</b> ] [ <b>&minus;%eN
+&minus;&minus;ext&minus;depth[=N]</b> ] [ <b>&minus;mN
+&minus;&minus;max&minus;files[=N]</b> ] [ <b>&minus;MN
+&minus;&minus;max&minus;size[=N]</b> ] [ <b>&minus;EN
+&minus;&minus;max&minus;time[=N]</b> ] [ <b>&minus;AN
+&minus;&minus;max&minus;rate[=N]</b> ] [ <b>&minus;%cN
 &minus;&minus;connection&minus;per&minus;second[=N]</b> ] [
-<b>&minus;GN, &minus;&minus;max&minus;pause[=N]</b> ] [
-<b>&minus;cN, &minus;&minus;sockets[=N]</b> ] [
-<b>&minus;TN, &minus;&minus;timeout[=N]</b> ] [
-<b>&minus;RN, &minus;&minus;retries[=N]</b> ] [
-<b>&minus;JN, &minus;&minus;min&minus;rate[=N]</b> ] [
-<b>&minus;HN, &minus;&minus;host&minus;control[=N]</b> ] [
-<b>&minus;%P, &minus;&minus;extended&minus;parsing[=N]</b> ]
-[ <b>&minus;n, &minus;&minus;near</b> ] [ <b>&minus;t,
-&minus;&minus;test</b> ] [ <b>&minus;%L,
-&minus;&minus;list</b> ] [ <b>&minus;%S,
-&minus;&minus;urllist</b> ] [ <b>&minus;NN,
-&minus;&minus;structure[=N]</b> ] [ <b>&minus;%D,
+<b>&minus;GN &minus;&minus;max&minus;pause[=N]</b> ] [
+<b>&minus;cN &minus;&minus;sockets[=N]</b> ] [ <b>&minus;TN
+&minus;&minus;timeout[=N]</b> ] [ <b>&minus;RN
+&minus;&minus;retries[=N]</b> ] [ <b>&minus;JN
+&minus;&minus;min&minus;rate[=N]</b> ] [ <b>&minus;HN
+&minus;&minus;host&minus;control[=N]</b> ] [ <b>&minus;%P
+&minus;&minus;extended&minus;parsing[=N]</b> ] [ <b>&minus;n
+&minus;&minus;near</b> ] [ <b>&minus;t
+&minus;&minus;test</b> ] [ <b>&minus;%L
+&minus;&minus;list</b> ] [ <b>&minus;%S
+&minus;&minus;urllist</b> ] [ <b>&minus;NN
+&minus;&minus;structure[=N]</b> ] [ <b>&minus;%D
 &minus;&minus;cached&minus;delayed&minus;type&minus;check</b>
-] [ <b>&minus;%M, &minus;&minus;mime&minus;html</b> ] [
-<b>&minus;LN, &minus;&minus;long&minus;names[=N]</b> ] [
-<b>&minus;KN, &minus;&minus;keep&minus;links[=N]</b> ] [
-<b>&minus;x, &minus;&minus;replace&minus;external</b> ] [
-<b>&minus;%x, &minus;&minus;disable&minus;passwords</b> ] [
-<b>&minus;%q,
+] [ <b>&minus;%M &minus;&minus;mime&minus;html</b> ] [
+<b>&minus;LN &minus;&minus;long&minus;names[=N]</b> ] [
+<b>&minus;KN &minus;&minus;keep&minus;links[=N]</b> ] [
+<b>&minus;x &minus;&minus;replace&minus;external</b> ] [
+<b>&minus;%x &minus;&minus;disable&minus;passwords</b> ] [
+<b>&minus;%q
 &minus;&minus;include&minus;query&minus;string</b> ] [
-<b>&minus;o, &minus;&minus;generate&minus;errors</b> ] [
-<b>&minus;X, &minus;&minus;purge&minus;old[=N]</b> ] [
-<b>&minus;%p, &minus;&minus;preserve</b> ] [ <b>&minus;%T,
-&minus;&minus;utf8&minus;conversion</b> ] [ <b>&minus;bN,
-&minus;&minus;cookies[=N]</b> ] [ <b>&minus;u,
-&minus;&minus;check&minus;type[=N]</b> ] [ <b>&minus;j,
-&minus;&minus;parse&minus;java[=N]</b> ] [ <b>&minus;sN,
-&minus;&minus;robots[=N]</b> ] [ <b>&minus;%h,
-&minus;&minus;http&minus;10</b> ] [ <b>&minus;%k,
-&minus;&minus;keep&minus;alive</b> ] [ <b>&minus;%B,
-&minus;&minus;tolerant</b> ] [ <b>&minus;%s,
-&minus;&minus;updatehack</b> ] [ <b>&minus;%u,
-&minus;&minus;urlhack</b> ] [ <b>&minus;%A,
-&minus;&minus;assume</b> ] [ <b>&minus;@iN,
-&minus;&minus;protocol[=N]</b> ] [ <b>&minus;%w,
-&minus;&minus;disable&minus;module</b> ] [ <b>&minus;F,
-&minus;&minus;user&minus;agent</b> ] [ <b>&minus;%R,
-&minus;&minus;referer</b> ] [ <b>&minus;%E,
-&minus;&minus;from</b> ] [ <b>&minus;%F,
-&minus;&minus;footer</b> ] [ <b>&minus;%l,
-&minus;&minus;language</b> ] [ <b>&minus;%a,
-&minus;&minus;accept</b> ] [ <b>&minus;%X,
-&minus;&minus;headers</b> ] [ <b>&minus;C,
-&minus;&minus;cache[=N]</b> ] [ <b>&minus;k,
+<b>&minus;o &minus;&minus;generate&minus;errors</b> ] [
+<b>&minus;X &minus;&minus;purge&minus;old[=N]</b> ] [
+<b>&minus;%p &minus;&minus;preserve</b> ] [ <b>&minus;%T
+&minus;&minus;utf8&minus;conversion</b> ] [ <b>&minus;bN
+&minus;&minus;cookies[=N]</b> ] [ <b>&minus;u
+&minus;&minus;check&minus;type[=N]</b> ] [ <b>&minus;j
+&minus;&minus;parse&minus;java[=N]</b> ] [ <b>&minus;sN
+&minus;&minus;robots[=N]</b> ] [ <b>&minus;%h
+&minus;&minus;http&minus;10</b> ] [ <b>&minus;%k
+&minus;&minus;keep&minus;alive</b> ] [ <b>&minus;%B
+&minus;&minus;tolerant</b> ] [ <b>&minus;%s
+&minus;&minus;updatehack</b> ] [ <b>&minus;%u
+&minus;&minus;urlhack</b> ] [ <b>&minus;%A
+&minus;&minus;assume</b> ] [ <b>&minus;@iN
+&minus;&minus;protocol[=N]</b> ] [ <b>&minus;%w
+&minus;&minus;disable&minus;module</b> ] [ <b>&minus;F
+&minus;&minus;user&minus;agent</b> ] [ <b>&minus;%R
+&minus;&minus;referer</b> ] [ <b>&minus;%E
+&minus;&minus;from</b> ] [ <b>&minus;%F
+&minus;&minus;footer</b> ] [ <b>&minus;%l
+&minus;&minus;language</b> ] [ <b>&minus;%a
+&minus;&minus;accept</b> ] [ <b>&minus;%X
+&minus;&minus;headers</b> ] [ <b>&minus;C
+&minus;&minus;cache[=N]</b> ] [ <b>&minus;k
 &minus;&minus;store&minus;all&minus;in&minus;cache</b> ] [
-<b>&minus;%n, &minus;&minus;do&minus;not&minus;recatch</b> ]
-[ <b>&minus;%v, &minus;&minus;display</b> ] [ <b>&minus;Q,
-&minus;&minus;do&minus;not&minus;log</b> ] [ <b>&minus;q,
-&minus;&minus;quiet</b> ] [ <b>&minus;z,
-&minus;&minus;extra&minus;log</b> ] [ <b>&minus;Z,
-&minus;&minus;debug&minus;log</b> ] [ <b>&minus;v,
-&minus;&minus;verbose</b> ] [ <b>&minus;f,
-&minus;&minus;file&minus;log</b> ] [ <b>&minus;f2,
-&minus;&minus;single&minus;log</b> ] [ <b>&minus;I,
-&minus;&minus;index</b> ] [ <b>&minus;%i,
+<b>&minus;%n &minus;&minus;do&minus;not&minus;recatch</b> ]
+[ <b>&minus;%v &minus;&minus;display</b> ] [ <b>&minus;Q
+&minus;&minus;do&minus;not&minus;log</b> ] [ <b>&minus;q
+&minus;&minus;quiet</b> ] [ <b>&minus;z
+&minus;&minus;extra&minus;log</b> ] [ <b>&minus;Z
+&minus;&minus;debug&minus;log</b> ] [ <b>&minus;v
+&minus;&minus;verbose</b> ] [ <b>&minus;f
+&minus;&minus;file&minus;log</b> ] [ <b>&minus;f2
+&minus;&minus;single&minus;log</b> ] [ <b>&minus;I
+&minus;&minus;index</b> ] [ <b>&minus;%i
 &minus;&minus;build&minus;top&minus;index</b> ] [
-<b>&minus;%I, &minus;&minus;search&minus;index</b> ] [
-<b>&minus;pN, &minus;&minus;priority[=N]</b> ] [
-<b>&minus;S,
+<b>&minus;%I &minus;&minus;search&minus;index</b> ] [
+<b>&minus;pN &minus;&minus;priority[=N]</b> ] [ <b>&minus;S
 &minus;&minus;stay&minus;on&minus;same&minus;dir</b> ] [
-<b>&minus;D, &minus;&minus;can&minus;go&minus;down</b> ] [
-<b>&minus;U, &minus;&minus;can&minus;go&minus;up</b> ] [
-<b>&minus;B,
+<b>&minus;D &minus;&minus;can&minus;go&minus;down</b> ] [
+<b>&minus;U &minus;&minus;can&minus;go&minus;up</b> ] [
+<b>&minus;B
 &minus;&minus;can&minus;go&minus;up&minus;and&minus;down</b>
-] [ <b>&minus;a,
+] [ <b>&minus;a
 &minus;&minus;stay&minus;on&minus;same&minus;address</b> ] [
-<b>&minus;d,
+<b>&minus;d
 &minus;&minus;stay&minus;on&minus;same&minus;domain</b> ] [
-<b>&minus;l,
+<b>&minus;l
 &minus;&minus;stay&minus;on&minus;same&minus;tld</b> ] [
-<b>&minus;e, &minus;&minus;go&minus;everywhere</b> ] [
-<b>&minus;%H, &minus;&minus;debug&minus;headers</b> ] [
-<b>&minus;%!,
+<b>&minus;e &minus;&minus;go&minus;everywhere</b> ] [
+<b>&minus;%H &minus;&minus;debug&minus;headers</b> ] [
+<b>&minus;%!
 &minus;&minus;disable&minus;security&minus;limits</b> ] [
-<b>&minus;V, &minus;&minus;userdef&minus;cmd</b> ] [
-<b>&minus;%W, &minus;&minus;callback</b> ] [ <b>&minus;K,
+<b>&minus;V &minus;&minus;userdef&minus;cmd</b> ] [
+<b>&minus;%W &minus;&minus;callback</b> ] [ <b>&minus;K
 &minus;&minus;keep&minus;links[=N]</b> ] [</p>
 
 <h2>DESCRIPTION
@@ -185,7 +184,7 @@ sites</p>
 www.someweb.com/bob/bobby.html +* &minus;r6</b></p>
 
 <p style="margin-left:22%;">means get all files starting
-from bobby.html, with 6 link&minus;depth, and possibility of
+from bobby.html with 6 link&minus;depth and possibility of
 going everywhere on the web</p>
 
 <p style="margin-left:11%;"><b>httrack
@@ -234,7 +233,7 @@ options:</b></p>
 
 
 <p>path for mirror/logfiles+cache (&minus;O path
-mirror[,path cache and logfiles]) (&minus;&minus;path
+mirror[path cache and logfiles]) (&minus;&minus;path
 &lt;param&gt;)</p> </td></tr>
 </table>
 
@@ -265,7 +264,7 @@ options:</b></p>
 <td width="78%">
 
 
-<p>mirror web sites, semi&minus;automatic (asks questions)
+<p>mirror web sites semi&minus;automatic (asks questions)
 (&minus;&minus;mirror&minus;wizard)</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -356,11 +355,11 @@ options:</b></p>
        cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 
 
 <p style="margin-top: 1em">&minus;rN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
 
 
@@ -368,11 +367,11 @@ options:</b></p>
 r9999) (&minus;&minus;depth[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 
 
 <p>&minus;%eN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
 
 
@@ -380,11 +379,11 @@ r9999) (&minus;&minus;depth[=N])</p></td></tr>
 (&minus;&minus;ext&minus;depth[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 
 
 <p>&minus;mN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
 
 
@@ -392,22 +391,22 @@ r9999) (&minus;&minus;depth[=N])</p></td></tr>
 (&minus;&minus;max&minus;files[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 
 
-<p>&minus;mN,N2</p></td>
-<td width="2%"></td>
+<p>&minus;mNN2</p></td>
+<td width="4%"></td>
 <td width="78%">
 
 
 <p>maximum file length for non html (N) and html (N2)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 
 
 <p>&minus;MN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
 
 
@@ -415,23 +414,23 @@ r9999) (&minus;&minus;depth[=N])</p></td></tr>
 (&minus;&minus;max&minus;size[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 
 
 <p>&minus;EN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
 
 
-<p>maximum mirror time in seconds (60=1 minute, 3600=1
-hour) (&minus;&minus;max&minus;time[=N])</p></td></tr>
+<p>maximum mirror time in seconds (60=1 minute 3600=1 hour)
+(&minus;&minus;max&minus;time[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 
 
 <p>&minus;AN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
 
 
@@ -439,11 +438,11 @@ hour) (&minus;&minus;max&minus;time[=N])</p></td></tr>
 (&minus;&minus;max&minus;rate[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 
 
 <p>&minus;%cN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
 
 
@@ -451,15 +450,15 @@ hour) (&minus;&minus;max&minus;time[=N])</p></td></tr>
 (&minus;&minus;connection&minus;per&minus;second[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="9%">
+<td width="7%">
 
 
 <p>&minus;GN</p></td>
-<td width="2%"></td>
+<td width="4%"></td>
 <td width="78%">
 
 
-<p>pause transfer if N bytes reached, and wait until lock
+<p>pause transfer if N bytes reached and wait until lock
 file is deleted (&minus;&minus;max&minus;pause[=N])</p></td></tr>
 </table>
 
@@ -490,7 +489,7 @@ control:</b></p>
 <td width="78%">
 
 
-<p>timeout, number of seconds after a non&minus;responding
+<p>timeout number of seconds after a non&minus;responding
 link is shutdown (&minus;&minus;timeout[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -502,7 +501,7 @@ link is shutdown (&minus;&minus;timeout[=N])</p></td></tr>
 <td width="78%">
 
 
-<p>number of retries, in case of timeout or non&minus;fatal
+<p>number of retries in case of timeout or non&minus;fatal
 errors (*R1) (&minus;&minus;retries[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -514,7 +513,7 @@ errors (*R1) (&minus;&minus;retries[=N])</p></td></tr>
 <td width="78%">
 
 
-<p>traffic jam control, minimum transfert rate
+<p>traffic jam control minimum transfert rate
 (bytes/seconds) tolerated for a link
 (&minus;&minus;min&minus;rate[=N])</p> </td></tr>
 <tr valign="top" align="left">
@@ -527,7 +526,7 @@ errors (*R1) (&minus;&minus;retries[=N])</p></td></tr>
 <td width="78%">
 
 
-<p>host is abandonned if: 0=never, 1=timeout, 2=slow,
+<p>host is abandonned if: 0=never 1=timeout 2=slow
 3=timeout or slow (&minus;&minus;host&minus;control[=N])</p></td></tr>
 </table>
 
@@ -546,8 +545,8 @@ options:</b></p>
 <td width="78%">
 
 
-<p style="margin-top: 1em">*extended parsing, attempt to
-parse all links, even in unknown tags or Javascript (%P0 don
+<p style="margin-top: 1em">*extended parsing attempt to
+parse all links even in unknown tags or Javascript (%P0 don
 t use) (&minus;&minus;extended&minus;parsing[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -616,7 +615,7 @@ options:</b></p>
 
 
 <p style="margin-top: 1em">structure type (0 *original
-structure, 1+: see below) (&minus;&minus;structure[=N])</p></td></tr>
+structure 1+: see below) (&minus;&minus;structure[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="4%">
@@ -639,9 +638,9 @@ structure, 1+: see below) (&minus;&minus;structure[=N])</p></td></tr>
 <td width="78%">
 
 
-<p>delayed type check, don t make any link test but wait
-for files download to start instead (experimental) (%N0 don
-t use, %N1 use for unknown extensions, * %N2 always use)</p></td></tr>
+<p>delayed type check don t make any link test but wait for
+files download to start instead (experimental) (%N0 don t
+use %N1 use for unknown extensions * %N2 always use)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="4%">
@@ -652,8 +651,8 @@ t use, %N1 use for unknown extensions, * %N2 always use)</p></td></tr>
 <td width="78%">
 
 
-<p>cached delayed type check, don t wait for remote type
-during updates, to speedup them (%D0 wait, * %D1 don t wait)
+<p>cached delayed type check don t wait for remote type
+during updates to speedup them (%D0 wait * %D1 don t wait)
 (&minus;&minus;cached&minus;delayed&minus;type&minus;check)</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -692,8 +691,8 @@ L2 ISO9660 compatible)
 
 
 <p>keep original links (e.g. http://www.adr/link) (K0
-*relative link, K absolute links, K4 original links, K3
-absolute URI links, K5 transparent proxy link)
+*relative link K absolute links K4 original links K3
+absolute URI links K5 transparent proxy link)
 (&minus;&minus;keep&minus;links[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -730,7 +729,7 @@ protected websites (%x0 include)
 <td width="78%">
 
 
-<p>*include query string for local files (useless, for
+<p>*include query string for local files (useless for
 information purpose only) (%q0 don t include)
 (&minus;&minus;include&minus;query&minus;string)</p> </td></tr>
 <tr valign="top" align="left">
@@ -799,7 +798,7 @@ options:</b></p>
 
 
 <p style="margin-top: 1em">accept cookies in cookies.txt
-(0=do not accept,* 1=accept) (&minus;&minus;cookies[=N])</p></td></tr>
+(0=do not accept* 1=accept) (&minus;&minus;cookies[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -810,8 +809,8 @@ options:</b></p>
 <td width="78%">
 
 
-<p>check document type if unknown (cgi,asp..) (u0 don t
-check, * u1 check but /, u2 check always)
+<p>check document type if unknown (cgiasp..) (u0 don t
+check * u1 check but / u2 check always)
 (&minus;&minus;check&minus;type[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -823,9 +822,9 @@ check, * u1 check but /, u2 check always)
 <td width="78%">
 
 
-<p>*parse Java Classes (j0 don t parse, bitmask: |1 parse
-default, |2 don t parse .class |4 don t parse .js |8 don t
-be aggressive) (&minus;&minus;parse&minus;java[=N])</p></td></tr>
+<p>*parse Java Classes (j0 don t parse bitmask: |1 parse
+default |2 don t parse .class |4 don t parse .js |8 don t be
+aggressive) (&minus;&minus;parse&minus;java[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -837,8 +836,8 @@ be aggressive) (&minus;&minus;parse&minus;java[=N])</p></td></tr>
 
 
 <p>follow robots.txt and meta robots tags
-(0=never,1=sometimes,* 2=always, 3=always (even strict
-rules)) (&minus;&minus;robots[=N])</p></td></tr>
+(0=never1=sometimes* 2=always 3=always (even strict rules))
+(&minus;&minus;robots[=N])</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -849,9 +848,8 @@ rules)) (&minus;&minus;robots[=N])</p></td></tr>
 <td width="78%">
 
 
-<p>force HTTP/1.0 requests (reduce update features, only
-for old servers or proxies)
-(&minus;&minus;http&minus;10)</p> </td></tr>
+<p>force HTTP/1.0 requests (reduce update features only for
+old servers or proxies) (&minus;&minus;http&minus;10)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -862,7 +860,7 @@ for old servers or proxies)
 <td width="78%">
 
 
-<p>use keep&minus;alive if possible, greately reducing
+<p>use keep&minus;alive if possible greately reducing
 latency for small files and test requests (%k0 don t use)
 (&minus;&minus;keep&minus;alive)</p> </td></tr>
 <tr valign="top" align="left">
@@ -876,7 +874,7 @@ latency for small files and test requests (%k0 don t use)
 
 
 <p>tolerant requests (accept bogus responses on some
-servers, but not standard!) (&minus;&minus;tolerant)</p></td></tr>
+servers but not standard!) (&minus;&minus;tolerant)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -888,7 +886,7 @@ servers, but not standard!) (&minus;&minus;tolerant)</p></td></tr>
 
 
 <p>update hacks: various hacks to limit re&minus;transfers
-when updating (identical size, bogus response..)
+when updating (identical size bogus response..)
 (&minus;&minus;updatehack)</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -901,7 +899,7 @@ when updating (identical size, bogus response..)
 
 
 <p>url hacks: various hacks to limit duplicate URLs (strip
-//, www.foo.com==foo.com..) (&minus;&minus;urlhack)</p></td></tr>
+// www.foo.com==foo.com..) (&minus;&minus;urlhack)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -912,9 +910,9 @@ when updating (identical size, bogus response..)
 <td width="78%">
 
 
-<p>assume that a type (cgi,asp..) is always linked with a
+<p>assume that a type (cgiasp..) is always linked with a
 mime type (&minus;%A
-php3,cgi=text/html;dat,bin=application/x&minus;zip)
+php3cgi=text/html;datbin=application/x&minus;zip)
 (&minus;&minus;assume &lt;param&gt;)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -938,7 +936,7 @@ php3,cgi=text/html;dat,bin=application/x&minus;zip)
 <td width="78%">
 
 
-<p>internet protocol (0=both ipv6+ipv4, 4=ipv4 only, 6=ipv6
+<p>internet protocol (0=both ipv6+ipv4 4=ipv4 only 6=ipv6
 only) (&minus;&minus;protocol[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1020,7 +1018,7 @@ HTTP headers (&minus;F &quot;user&minus;agent name&quot;)
 <td width="78%">
 
 
-<p>preffered language (&minus;%l &quot;fr, en, jp, *&quot;
+<p>preffered language (&minus;%l &quot;fr en jp *&quot;
 (&minus;&minus;language &lt;param&gt;)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1032,8 +1030,8 @@ HTTP headers (&minus;F &quot;user&minus;agent name&quot;)
 <td width="78%">
 
 
-<p>accepted formats (&minus;%a
-&quot;text/html,image/png;q=0.9,*/*;q=0.1&quot;
+<p>accepted formats (&minus;%l
+&quot;text/htmlimage/pngimage/jpegimage/gif;q=0.9*/*;q=0.1&quot;
 (&minus;&minus;accept &lt;param&gt;)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1050,7 +1048,7 @@ HTTP headers (&minus;F &quot;user&minus;agent name&quot;)
 &lt;param&gt;)</p> </td></tr>
 </table>
 
-<p style="margin-left:11%; margin-top: 1em"><b>Log, index,
+<p style="margin-left:11%; margin-top: 1em"><b>Log index
 cache</b></p>
 
 <table width="100%" border="0" rules="none" frame="void"
@@ -1066,7 +1064,7 @@ cache</b></p>
 
 
 <p style="margin-top: 1em">create/use a cache for updates
-and retries (C0 no cache,C1 cache is prioritary,* C2 test
+and retries (C0 no cacheC1 cache is prioritary* C2 test
 update before) (&minus;&minus;cache[=N])</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1249,7 +1247,7 @@ options:</b></p>
 <td width="78%">
 
 
-<p>just scan, don t save anything (for checking links)</p></td></tr>
+<p>just scan don t save anything (for checking links)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -1293,7 +1291,7 @@ options:</b></p>
 <td width="78%">
 
 
-<p>get html files before, then treat other files</p></td></tr>
+<p>get html files before then treat other files</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="6%">
@@ -1650,14 +1648,14 @@ doing)</b></p>
 
 
 <p style="margin-top: 1em">bypass built&minus;in security
-limits aimed to avoid bandwidth abuses (bandwidth,
+limits aimed to avoid bandwidth abuses (bandwidth
 simultaneous connections)
 (&minus;&minus;disable&minus;security&minus;limits)</p> </td></tr>
 </table>
 
 <p style="margin-left:11%;">&minus;IMPORTANT</p>
 
-<p style="margin-left:22%;">NOTE: DANGEROUS OPTION, ONLY
+<p style="margin-left:22%;">NOTE: DANGEROUS OPTION ONLY
 SUITABLE FOR EXPERTS</p>
 
 <table width="100%" border="0" rules="none" frame="void"
@@ -1694,7 +1692,7 @@ specific options:</b></p>
 
 
 <p style="margin-top: 1em">execute system command after
-each files ($0 is the filename: &minus;V &quot;rm \$0&quot;)
+each files ($0 is the filename: &minus;V &quot;rm &quot;)
 (&minus;&minus;userdef&minus;cmd &lt;param&gt;)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1707,7 +1705,7 @@ each files ($0 is the filename: &minus;V &quot;rm \$0&quot;)
 
 
 <p>use an external library function as a wrapper (&minus;%W
-myfoo.so[,myparameters]) (&minus;&minus;callback
+myfoo.so[myparameters]) (&minus;&minus;callback
 &lt;param&gt;)</p> </td></tr>
 </table>
 
@@ -1738,7 +1736,7 @@ Option N</b></p>
 <td width="78%">
 
 
-<p>HTML in web/, images/other files in web/images/</p></td></tr>
+<p>HTML in web/ images/other files in web/images/</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="9%">
@@ -1749,7 +1747,7 @@ Option N</b></p>
 <td width="78%">
 
 
-<p>HTML in web/HTML, images/other in web/images</p></td></tr>
+<p>HTML in web/HTML images/other in web/images</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="9%">
@@ -1760,7 +1758,7 @@ Option N</b></p>
 <td width="78%">
 
 
-<p>HTML in web/, images/other in web/</p></td></tr>
+<p>HTML in web/ images/other in web/</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="9%">
@@ -1771,8 +1769,8 @@ Option N</b></p>
 <td width="78%">
 
 
-<p>HTML in web/, images/other in web/xxx, where xxx is the
-file extension (all gif will be placed onto web/gif, for
+<p>HTML in web/ images/other in web/xxx where xxx is the
+file extension (all gif will be placed onto web/gif for
 example)</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -1795,7 +1793,7 @@ example)</p> </td></tr>
 <td width="78%">
 
 
-<p>All files in web/, with random names (gadget !)</p></td></tr>
+<p>All files in web/ with random names (gadget !)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="9%">
@@ -1806,7 +1804,7 @@ example)</p> </td></tr>
 <td width="78%">
 
 
-<p>Site&minus;structure, without www.domain.xxx/</p></td></tr>
+<p>Site&minus;structure without www.domain.xxx/</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="9%">
@@ -1956,15 +1954,15 @@ directory</p> </td></tr>
 <p style="margin-left:11%; margin-top: 1em"><b>Details:
 User&minus;defined option N</b> <br>
 %n Name of file without file type (ex: image) <br>
-%N Name of file, including file type (ex: image.gif) <br>
+%N Name of file including file type (ex: image.gif) <br>
 %t File type (ex: gif) <br>
 %p Path [without ending /] (ex: /someimages) <br>
 %h Host name (ex: www.someweb.com) <br>
-%M URL MD5 (128 bits, 32 ascii bytes) <br>
-%Q query string MD5 (128 bits, 32 ascii bytes) <br>
+%M URL MD5 (128 bits 32 ascii bytes) <br>
+%Q query string MD5 (128 bits 32 ascii bytes) <br>
 %k full query string <br>
 %r protocol name (ex: http) <br>
-%q small query string MD5 (16 bits, 4 ascii bytes) <br>
+%q small query string MD5 (16 bits 4 ascii bytes) <br>
 %s? Short name version (ex: %sN) <br>
 %[param] param variable in query string <br>
 %[param:before:after:empty:notfound] advanced variable
@@ -2042,8 +2040,8 @@ parameter could not be found</p>
 <td width="78%">
 
 
-<p>fields, except the first one (the parameter name), can
-be empty</p></td></tr>
+<p>fields except the first one (the parameter name) can be
+empty</p> </td></tr>
 </table>
 
 <p style="margin-left:11%; margin-top: 1em"><b>Details:
@@ -2062,7 +2060,7 @@ Option K</b></p>
 
 
 <p style="margin-top: 1em">foo.cgi?q=45 &minus;&gt;
-foo4B54.html?q=45 (relative URI, default)</p></td></tr>
+foo4B54.html?q=45 (relative URI default)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="4%">
@@ -2132,7 +2130,7 @@ site(s) (default)</p>
 <td width="78%">
 
 
-<p>&lt;URLs&gt; get the files indicated, do not seek other
+<p>&lt;URLs&gt; get the files indicated do not seek other
 URLs (&minus;qg)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
@@ -2160,7 +2158,7 @@ pages (&minus;r1p0C0I0t)</p>
 
 <p style="margin-left:11%;">&minus;&minus;spider</p>
 
-<p style="margin-left:22%;">&lt;URLs&gt; spider site(s), to
+<p style="margin-left:22%;">&lt;URLs&gt; spider site(s) to
 test links: reports Errors &amp; Warnings
 (&minus;p0C0I0t)</p>
 
@@ -2171,17 +2169,17 @@ test links: reports Errors &amp; Warnings
 
 <p style="margin-left:11%;">&minus;&minus;skeleton</p>
 
-<p style="margin-left:22%;">&lt;URLs&gt; make a mirror, but
+<p style="margin-left:22%;">&lt;URLs&gt; make a mirror but
 gets only html files (&minus;p1)</p>
 
 <p style="margin-left:11%;">&minus;&minus;update</p>
 
-<p style="margin-left:22%;">update a mirror, without
+<p style="margin-left:22%;">update a mirror without
 confirmation (&minus;iC2)</p>
 
 <p style="margin-left:11%;">&minus;&minus;continue</p>
 
-<p style="margin-left:22%;">continue a mirror, without
+<p style="margin-left:22%;">continue a mirror without
 confirmation (&minus;iC1)</p>
 
 <p style="margin-left:11%;">&minus;&minus;catchurl</p>
@@ -2286,7 +2284,7 @@ other information you deem necessary.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright (C)
-1998-2015 Xavier Roche and other contributors</p>
+1998-2014 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/server/about.html

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

html/server/addurl.html

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

html/server/error.html

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

html/server/exit.html

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

html/server/file.html

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

html/server/finished.html

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

html/server/help.html

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

html/server/index.html

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

html/server/option1.html

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

html/server/option10.html

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

html/server/option11.html

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

html/server/option2.html

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

html/server/option2b.html

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

html/server/option3.html

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

html/server/option4.html

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

html/server/option5.html

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

html/server/option6.html

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

html/server/option7.html

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

html/server/option8.html

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

html/server/option9.html

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

html/server/ping.js

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

html/server/refresh.html

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

html/server/step2.html

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

html/server/step3.html

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

html/server/step4.html

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

html/server/style.css

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

lang/Makefile.in

@@ -104,7 +104,6 @@ DATA = $(lang_DATA) $(langroot_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -113,12 +112,14 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
-DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -132,7 +133,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -188,6 +188,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@

libtest/Makefile.am

@@ -1,9 +1,9 @@
 
 exemplesdir = $(datadir)/httrack/libtest
 exemples_DATA = *.c *.h *.txt
-EXTRA_DIST = $(exemples_DATA) libtest.mak libtest.vcproj
+EXTRA_DIST = $(exemples_DATA)
 
-AM_CPPFLAGS = \
+INCLUDES = \
 	@DEFAULT_CFLAGS@ \
 	@THREADS_CFLAGS@ \
 	@V6_FLAG@ \
@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
 	-DDATADIR=\""$(datadir)"\" \
 	-DLIBDIR=\""$(libdir)"\"
 
-AM_CPPFLAGS += -I../src
+AM_CPPFLAGS = -I../src
 AM_LDFLAGS = -L../src
 
 # Examples

libtest/Makefile.in

@@ -201,7 +201,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -210,12 +209,14 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
-DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -229,7 +230,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -285,6 +285,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -333,10 +334,18 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 exemplesdir = $(datadir)/httrack/libtest
 exemples_DATA = *.c *.h *.txt
-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
+EXTRA_DIST = $(exemples_DATA)
+INCLUDES = \
+	@DEFAULT_CFLAGS@ \
+	@THREADS_CFLAGS@ \
+	@V6_FLAG@ \
+	@LFS_FLAG@ \
+	-DPREFIX=\""$(prefix)"\" \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DDATADIR=\""$(datadir)"\" \
+	-DLIBDIR=\""$(libdir)"\"
+
+AM_CPPFLAGS = -I../src
 AM_LDFLAGS = -L../src
 
 # Examples
@@ -476,25 +485,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-simple.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

libtest/callbacks-example-log.c

@@ -100,9 +100,9 @@ EXTERNAL_FUNCTION int hts_plug(httrackp * opt, const char *argv) {
   if (arg == NULL)
     arg = "log-wrapper-info";
   hts_log(opt, arg, "* plugging functions");
-  CHAIN_FUNCTION(opt, check_html, process_file, (void *) (uintptr_t) arg);
-  CHAIN_FUNCTION(opt, start, start_of_mirror, (void *) (uintptr_t) arg);
-  CHAIN_FUNCTION(opt, end, end_of_mirror, (void *) (uintptr_t) arg);
+  CHAIN_FUNCTION(opt, check_html, process_file, (char *) arg);
+  CHAIN_FUNCTION(opt, start, start_of_mirror, (char *) arg);
+  CHAIN_FUNCTION(opt, end, end_of_mirror, (char *) arg);
 
   hts_log(opt, arg, "* module successfully plugged");
   return 1;                     /* success */

libtest/libtest.mak

@@ -1,44 +0,0 @@
-# Makefile
-
-OBJDIR = ./Release/
-PATH = $(DEVSTU)\vc\bin;$(DEVSTU)\sharedide\bin;$(PATH)
-INCLUDES = /I "." /I ".." /I "../src" /I "$(DEVSTU)\vc\include" /I"../../openssl-1.0.1j\include\openssl"
-LIB_FLAGS = /link /LIBPATH:"L:\HTTrack\httrack\src_win\libhttrack" /LIBPATH:"L:\HTTrack\httrack\libhttrack"
-COMMON_FLAGS = /W3 /O2 /Fo"$(OBJDIR)" /Fd"$(OBJDIR)" /Fa"$(OBJDIR)" $(INCLUDES)
-CPP_FLAGS = /LD $(COMMON_FLAGS) libhttrack.lib
-BIN_FLAGS = /link /LIBPATH:"C:\temp\Debuglib"
-
-all:
-  cl $(CPP_FLAGS) \
-    callbacks-example-simple.c -Fe$(OBJDIR)callbacks-example-simple.dll \
-    $(LIB_FLAGS)
-  cl $(CPP_FLAGS) \
-    callbacks-example-log.c -Fe$(OBJDIR)callbacks-example-log.dll \
-    $(LIB_FLAGS)
-  cl $(CPP_FLAGS) \
-    callbacks-example-baselinks.c -Fe$(OBJDIR)callbacks-example-baselinks.dll \
-    $(LIB_FLAGS)
-  cl $(CPP_FLAGS) \
-    callbacks-example-contentfilter.c -Fe$(OBJDIR)callbacks-example-contentfilter.dll \
-    $(LIB_FLAGS)
-  cl $(CPP_FLAGS) \
-    callbacks-example-displayheader.c -Fe$(OBJDIR)callbacks-example-displayheader.dll \
-    $(LIB_FLAGS)
-  cl $(CPP_FLAGS) \
-    callbacks-example-filename.c -Fe$(OBJDIR)callbacks-example-filename.dll \
-    $(LIB_FLAGS)
-  cl $(CPP_FLAGS) \
-    callbacks-example-filename2.c -Fe$(OBJDIR)callbacks-example-filename2.dll \
-    $(LIB_FLAGS)
-  cl $(CPP_FLAGS) \
-    callbacks-example-filenameiisbug.c -Fe$(OBJDIR)callbacks-example-filenameiisbug.dll \
-    $(LIB_FLAGS)
-  cl $(CPP_FLAGS) \
-    callbacks-example-changecontent.c -Fe$(OBJDIR)callbacks-example-changecontent.dll \
-    $(LIB_FLAGS)
-  cl $(CPP_FLAGS) \
-    callbacks-example-listlinks.c -Fe$(OBJDIR)callbacks-example-listlinks.dll \
-    $(LIB_FLAGS)
-  cl $(COMMON_FLAGS) \
-    example.c wsock32.lib libhttrack.lib -Fe$(OBJDIR)example.exe \
-    $(BIN_FLAGS)

libtest/libtest.vcproj

@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libtest"
-	ProjectGUID="{76424734-BC12-4472-ABE2-B5C7A4A0B733}"
-	Keyword="MakeFileProj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="0"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="nmake -f libtest.mak"
-				ReBuildCommandLine=""
-				CleanCommandLine="del *.obj"
-				Output=""
-				PreprocessorDefinitions=""
-				IncludeSearchPath=""
-				ForcedIncludes=""
-				AssemblySearchPath=""
-				ForcedUsingAssemblies=""
-				CompileAsManaged=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="0"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="nmake -f libtest.mak"
-				ReBuildCommandLine=""
-				CleanCommandLine="del *.obj"
-				Output=""
-				PreprocessorDefinitions=""
-				IncludeSearchPath=""
-				ForcedIncludes=""
-				AssemblySearchPath=""
-				ForcedUsingAssemblies=""
-				CompileAsManaged=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="0"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="nmake -f libtest.mak"
-				ReBuildCommandLine=""
-				CleanCommandLine="del *.obj"
-				Output=""
-				PreprocessorDefinitions=""
-				IncludeSearchPath=""
-				ForcedIncludes=""
-				AssemblySearchPath=""
-				ForcedUsingAssemblies=""
-				CompileAsManaged=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="0"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="nmake -f libtest.mak"
-				ReBuildCommandLine=""
-				CleanCommandLine="del *.obj"
-				Output=""
-				PreprocessorDefinitions=""
-				IncludeSearchPath=""
-				ForcedIncludes=""
-				AssemblySearchPath=""
-				ForcedUsingAssemblies=""
-				CompileAsManaged=""
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\callbacks-example-baselinks.c"
-				>
-			</File>
-			<File
-				RelativePath=".\callbacks-example-changecontent.c"
-				>
-			</File>
-			<File
-				RelativePath=".\callbacks-example-contentfilter.c"
-				>
-			</File>
-			<File
-				RelativePath=".\callbacks-example-displayheader.c"
-				>
-			</File>
-			<File
-				RelativePath=".\callbacks-example-filename.c"
-				>
-			</File>
-			<File
-				RelativePath=".\callbacks-example-filename2.c"
-				>
-			</File>
-			<File
-				RelativePath=".\callbacks-example-filenameiisbug.c"
-				>
-			</File>
-			<File
-				RelativePath=".\callbacks-example-listlinks.c"
-				>
-			</File>
-			<File
-				RelativePath=".\callbacks-example-log.c"
-				>
-			</File>
-			<File
-				RelativePath=".\callbacks-example-simple.c"
-				>
-			</File>
-			<File
-				RelativePath=".\example.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\example.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\libtest.mak"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\readme.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

license.txt

@@ -1,7 +1,7 @@
 HTTrack Website Copier License Agreement:
 
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2015 Xavier Roche and other contributors
+Copyright (C) 1998-2014 Xavier Roche and other contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

m4/Makefile.in

@@ -74,7 +74,6 @@ am__can_run_installinfo = \
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -83,12 +82,14 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
-DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -102,7 +103,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -158,6 +158,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@

man/Makefile.in

@@ -105,7 +105,6 @@ MANS = $(man_MANS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -114,12 +113,14 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
-DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -133,7 +134,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -189,6 +189,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@

man/httrack.1

@@ -1,182 +1,182 @@
 .\" Process this file with
 .\" groff -man -Tascii httrack.1
 .\"
-.TH httrack 1 "14 March 2015" "httrack website copier"
+.TH httrack 1 "02 May 2014" "httrack website copier"
 .SH NAME
 httrack \- offline browser : copy websites to a local directory
 .SH SYNOPSIS
 .B httrack [ url ]... [ \-filter ]... [ +filter ]... [ 
-.B \-O, \-\-path 
+.B \-O\, \-\-path 
 ] [ 
-.B \-w, \-\-mirror 
+.B \-w\, \-\-mirror 
 ] [ 
-.B \-W, \-\-mirror\-wizard 
+.B \-W\, \-\-mirror\-wizard 
 ] [ 
-.B \-g, \-\-get\-files 
+.B \-g\, \-\-get\-files 
 ] [ 
-.B \-i, \-\-continue 
+.B \-i\, \-\-continue 
 ] [ 
-.B \-Y, \-\-mirrorlinks 
+.B \-Y\, \-\-mirrorlinks 
 ] [ 
-.B \-P, \-\-proxy 
+.B \-P\, \-\-proxy 
 ] [ 
-.B \-%f, \-\-httpproxy\-ftp[=N] 
+.B \-%f\, \-\-httpproxy\-ftp[=N] 
 ] [ 
-.B \-%b, \-\-bind 
+.B \-%b\, \-\-bind 
 ] [ 
-.B \-rN, \-\-depth[=N] 
+.B \-rN\, \-\-depth[=N] 
 ] [ 
-.B \-%eN, \-\-ext\-depth[=N] 
+.B \-%eN\, \-\-ext\-depth[=N] 
 ] [ 
-.B \-mN, \-\-max\-files[=N] 
+.B \-mN\, \-\-max\-files[=N] 
 ] [ 
-.B \-MN, \-\-max\-size[=N] 
+.B \-MN\, \-\-max\-size[=N] 
 ] [ 
-.B \-EN, \-\-max\-time[=N] 
+.B \-EN\, \-\-max\-time[=N] 
 ] [ 
-.B \-AN, \-\-max\-rate[=N] 
+.B \-AN\, \-\-max\-rate[=N] 
 ] [ 
-.B \-%cN, \-\-connection\-per\-second[=N] 
+.B \-%cN\, \-\-connection\-per\-second[=N] 
 ] [ 
-.B \-GN, \-\-max\-pause[=N] 
+.B \-GN\, \-\-max\-pause[=N] 
 ] [ 
-.B \-cN, \-\-sockets[=N] 
+.B \-cN\, \-\-sockets[=N] 
 ] [ 
-.B \-TN, \-\-timeout[=N] 
+.B \-TN\, \-\-timeout[=N] 
 ] [ 
-.B \-RN, \-\-retries[=N] 
+.B \-RN\, \-\-retries[=N] 
 ] [ 
-.B \-JN, \-\-min\-rate[=N] 
+.B \-JN\, \-\-min\-rate[=N] 
 ] [ 
-.B \-HN, \-\-host\-control[=N] 
+.B \-HN\, \-\-host\-control[=N] 
 ] [ 
-.B \-%P, \-\-extended\-parsing[=N] 
+.B \-%P\, \-\-extended\-parsing[=N] 
 ] [ 
-.B \-n, \-\-near 
+.B \-n\, \-\-near 
 ] [ 
-.B \-t, \-\-test 
+.B \-t\, \-\-test 
 ] [ 
-.B \-%L, \-\-list 
+.B \-%L\, \-\-list 
 ] [ 
-.B \-%S, \-\-urllist 
+.B \-%S\, \-\-urllist 
 ] [ 
-.B \-NN, \-\-structure[=N] 
+.B \-NN\, \-\-structure[=N] 
 ] [ 
-.B \-%D, \-\-cached\-delayed\-type\-check 
+.B \-%D\, \-\-cached\-delayed\-type\-check 
 ] [ 
-.B \-%M, \-\-mime\-html 
+.B \-%M\, \-\-mime\-html 
 ] [ 
-.B \-LN, \-\-long\-names[=N] 
+.B \-LN\, \-\-long\-names[=N] 
 ] [ 
-.B \-KN, \-\-keep\-links[=N] 
+.B \-KN\, \-\-keep\-links[=N] 
 ] [ 
-.B \-x, \-\-replace\-external 
+.B \-x\, \-\-replace\-external 
 ] [ 
-.B \-%x, \-\-disable\-passwords 
+.B \-%x\, \-\-disable\-passwords 
 ] [ 
-.B \-%q, \-\-include\-query\-string 
+.B \-%q\, \-\-include\-query\-string 
 ] [ 
-.B \-o, \-\-generate\-errors 
+.B \-o\, \-\-generate\-errors 
 ] [ 
-.B \-X, \-\-purge\-old[=N] 
+.B \-X\, \-\-purge\-old[=N] 
 ] [ 
-.B \-%p, \-\-preserve 
+.B \-%p\, \-\-preserve 
 ] [ 
-.B \-%T, \-\-utf8\-conversion 
+.B \-%T\, \-\-utf8\-conversion 
 ] [ 
-.B \-bN, \-\-cookies[=N] 
+.B \-bN\, \-\-cookies[=N] 
 ] [ 
-.B \-u, \-\-check\-type[=N] 
+.B \-u\, \-\-check\-type[=N] 
 ] [ 
-.B \-j, \-\-parse\-java[=N] 
+.B \-j\, \-\-parse\-java[=N] 
 ] [ 
-.B \-sN, \-\-robots[=N] 
+.B \-sN\, \-\-robots[=N] 
 ] [ 
-.B \-%h, \-\-http\-10 
+.B \-%h\, \-\-http\-10 
 ] [ 
-.B \-%k, \-\-keep\-alive 
+.B \-%k\, \-\-keep\-alive 
 ] [ 
-.B \-%B, \-\-tolerant 
+.B \-%B\, \-\-tolerant 
 ] [ 
-.B \-%s, \-\-updatehack 
+.B \-%s\, \-\-updatehack 
 ] [ 
-.B \-%u, \-\-urlhack 
+.B \-%u\, \-\-urlhack 
 ] [ 
-.B \-%A, \-\-assume 
+.B \-%A\, \-\-assume 
 ] [ 
-.B \-@iN, \-\-protocol[=N] 
+.B \-@iN\, \-\-protocol[=N] 
 ] [ 
-.B \-%w, \-\-disable\-module 
+.B \-%w\, \-\-disable\-module 
 ] [ 
-.B \-F, \-\-user\-agent 
+.B \-F\, \-\-user\-agent 
 ] [ 
-.B \-%R, \-\-referer 
+.B \-%R\, \-\-referer 
 ] [ 
-.B \-%E, \-\-from 
+.B \-%E\, \-\-from 
 ] [ 
-.B \-%F, \-\-footer 
+.B \-%F\, \-\-footer 
 ] [ 
-.B \-%l, \-\-language 
+.B \-%l\, \-\-language 
 ] [ 
-.B \-%a, \-\-accept 
+.B \-%a\, \-\-accept 
 ] [ 
-.B \-%X, \-\-headers 
+.B \-%X\, \-\-headers 
 ] [ 
-.B \-C, \-\-cache[=N] 
+.B \-C\, \-\-cache[=N] 
 ] [ 
-.B \-k, \-\-store\-all\-in\-cache 
+.B \-k\, \-\-store\-all\-in\-cache 
 ] [ 
-.B \-%n, \-\-do\-not\-recatch 
+.B \-%n\, \-\-do\-not\-recatch 
 ] [ 
-.B \-%v, \-\-display 
+.B \-%v\, \-\-display 
 ] [ 
-.B \-Q, \-\-do\-not\-log 
+.B \-Q\, \-\-do\-not\-log 
 ] [ 
-.B \-q, \-\-quiet 
+.B \-q\, \-\-quiet 
 ] [ 
-.B \-z, \-\-extra\-log 
+.B \-z\, \-\-extra\-log 
 ] [ 
-.B \-Z, \-\-debug\-log 
+.B \-Z\, \-\-debug\-log 
 ] [ 
-.B \-v, \-\-verbose 
+.B \-v\, \-\-verbose 
 ] [ 
-.B \-f, \-\-file\-log 
+.B \-f\, \-\-file\-log 
 ] [ 
-.B \-f2, \-\-single\-log 
+.B \-f2\, \-\-single\-log 
 ] [ 
-.B \-I, \-\-index 
+.B \-I\, \-\-index 
 ] [ 
-.B \-%i, \-\-build\-top\-index 
+.B \-%i\, \-\-build\-top\-index 
 ] [ 
-.B \-%I, \-\-search\-index 
+.B \-%I\, \-\-search\-index 
 ] [ 
-.B \-pN, \-\-priority[=N] 
+.B \-pN\, \-\-priority[=N] 
 ] [ 
-.B \-S, \-\-stay\-on\-same\-dir 
+.B \-S\, \-\-stay\-on\-same\-dir 
 ] [ 
-.B \-D, \-\-can\-go\-down 
+.B \-D\, \-\-can\-go\-down 
 ] [ 
-.B \-U, \-\-can\-go\-up 
+.B \-U\, \-\-can\-go\-up 
 ] [ 
-.B \-B, \-\-can\-go\-up\-and\-down 
+.B \-B\, \-\-can\-go\-up\-and\-down 
 ] [ 
-.B \-a, \-\-stay\-on\-same\-address 
+.B \-a\, \-\-stay\-on\-same\-address 
 ] [ 
-.B \-d, \-\-stay\-on\-same\-domain 
+.B \-d\, \-\-stay\-on\-same\-domain 
 ] [ 
-.B \-l, \-\-stay\-on\-same\-tld 
+.B \-l\, \-\-stay\-on\-same\-tld 
 ] [ 
-.B \-e, \-\-go\-everywhere 
+.B \-e\, \-\-go\-everywhere 
 ] [ 
-.B \-%H, \-\-debug\-headers 
+.B \-%H\, \-\-debug\-headers 
 ] [ 
-.B \-%!, \-\-disable\-security\-limits 
+.B \-%!\, \-\-disable\-security\-limits 
 ] [ 
-.B \-V, \-\-userdef\-cmd 
+.B \-V\, \-\-userdef\-cmd 
 ] [ 
-.B \-%W, \-\-callback 
+.B \-%W\, \-\-callback 
 ] [ 
-.B \-K, \-\-keep\-links[=N] 
+.B \-K\, \-\-keep\-links[=N] 
 ] [ 
 .B 
 .SH DESCRIPTION
@@ -191,7 +191,7 @@ allows you to download a World Wide Web site from the Internet to a local direct
  mirror the two sites together (with shared links) and accept any .jpg files on .com sites
 .TP
 .B httrack www.someweb.com/bob/bobby.html +* \-r6
-means get all files starting from bobby.html, with 6 link\-depth, and possibility of going everywhere on the web
+means get all files starting from bobby.html\, with 6 link\-depth\, and possibility of going everywhere on the web
 .TP
 .B httrack www.someweb.com/bob/bobby.html \-\-spider \-P proxy.myhost.com:8080
 runs the spider on www.someweb.com/bob/bobby.html using a proxy
@@ -208,7 +208,7 @@ continues a mirror in the current folder
 .SS General options:
 .IP \-O
 path for mirror/logfiles+cache (\-O path
-mirror[,path
+mirror[\,path
 cache
 and
 logfiles]) (\-\-path <param>)
@@ -217,7 +217,7 @@ logfiles]) (\-\-path <param>)
 .IP \-w
 *mirror web sites (\-\-mirror)
 .IP \-W
-mirror web sites, semi\-automatic (asks questions) (\-\-mirror\-wizard)
+mirror web sites\, semi\-automatic (asks questions) (\-\-mirror\-wizard)
 .IP \-g
 just get files (saved in the current directory) (\-\-get\-files)
 .IP \-i
@@ -240,34 +240,34 @@ set the mirror depth to N (* r9999) (\-\-depth[=N])
 set the external links depth to N (* %e0) (\-\-ext\-depth[=N])
 .IP \-mN
 maximum file length for a non\-html file (\-\-max\-files[=N])
-.IP \-mN,N2
+.IP \-mN\,N2
 maximum file length for non html (N) and html (N2)
 .IP \-MN
 maximum overall size that can be uploaded/scanned (\-\-max\-size[=N])
 .IP \-EN
-maximum mirror time in seconds (60=1 minute, 3600=1 hour) (\-\-max\-time[=N])
+maximum mirror time in seconds (60=1 minute\, 3600=1 hour) (\-\-max\-time[=N])
 .IP \-AN
 maximum transfer rate in bytes/seconds (1000=1KB/s max) (\-\-max\-rate[=N])
 .IP \-%cN
 maximum number of connections/seconds (*%c10) (\-\-connection\-per\-second[=N])
 .IP \-GN
-pause transfer if N bytes reached, and wait until lock file is deleted (\-\-max\-pause[=N])
+pause transfer if N bytes reached\, and wait until lock file is deleted (\-\-max\-pause[=N])
 
 .SS Flow control:
 .IP \-cN
 number of multiple connections (*c8) (\-\-sockets[=N])
 .IP \-TN
-timeout, number of seconds after a non\-responding link is shutdown (\-\-timeout[=N])
+timeout\, number of seconds after a non\-responding link is shutdown (\-\-timeout[=N])
 .IP \-RN
-number of retries, in case of timeout or non\-fatal errors (*R1) (\-\-retries[=N])
+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])
+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 abandonned if: 0=never\, 1=timeout\, 2=slow\, 3=timeout or slow (\-\-host\-control[=N])
 
 .SS Links options:
 .IP \-%P
-*extended parsing, attempt to parse all links, even in unknown tags or Javascript (%P0 don t use) (\-\-extended\-parsing[=N])
+*extended parsing\, attempt to parse all links\, even in unknown tags or Javascript (%P0 don t use) (\-\-extended\-parsing[=N])
 .IP \-n
 get non\-html files  near  an html file (ex: an image located outside) (\-\-near)
 .IP \-t
@@ -279,25 +279,25 @@ test all URLs (even forbidden ones) (\-\-test)
 
 .SS Build options:
 .IP \-NN
-structure type (0 *original structure, 1+: see below) (\-\-structure[=N])
+structure type (0 *original structure\, 1+: see below) (\-\-structure[=N])
 .IP \-or
 user defined structure (\-N "%h%p/%n%q.%t")
 .IP \-%N
-delayed type check, don t make any link test but wait for files download to start instead (experimental) (%N0 don t use, %N1 use for unknown extensions, * %N2 always use)
+delayed type check\, don t make any link test but wait for files download to start instead (experimental) (%N0 don t use\, %N1 use for unknown extensions\, * %N2 always use)
 .IP \-%D
-cached delayed type check, don t wait for remote type during updates, to speedup them (%D0 wait, * %D1 don t wait) (\-\-cached\-delayed\-type\-check)
+cached delayed type check\, don t wait for remote type during updates\, to speedup them (%D0 wait\, * %D1 don t wait) (\-\-cached\-delayed\-type\-check)
 .IP \-%M
 generate a RFC MIME\-encapsulated full\-archive (.mht) (\-\-mime\-html)
 .IP \-LN
 long names (L1 *long names / L0 8\-3 conversion / L2 ISO9660 compatible) (\-\-long\-names[=N])
 .IP \-KN
-keep original links (e.g. http://www.adr/link) (K0 *relative link, K absolute links, K4 original links, K3 absolute URI links, K5 transparent proxy link) (\-\-keep\-links[=N])
+keep original links (e.g. http://www.adr/link) (K0 *relative link\, K absolute links\, K4 original links\, K3 absolute URI links\, K5 transparent proxy link) (\-\-keep\-links[=N])
 .IP \-x
 replace external html links by error pages (\-\-replace\-external)
 .IP \-%x
 do not include any password for external password protected websites (%x0 include) (\-\-disable\-passwords)
 .IP \-%q
-*include query string for local files (useless, for information purpose only) (%q0 don t include) (\-\-include\-query\-string)
+*include query string for local files (useless\, for information purpose only) (%q0 don t include) (\-\-include\-query\-string)
 .IP \-o
 *generate output html file in case of error (404..) (o0 don t generate) (\-\-generate\-errors)
 .IP \-X
@@ -309,29 +309,29 @@ links conversion to UTF\-8 (\-\-utf8\-conversion)
 
 .SS Spider options:
 .IP \-bN
-accept cookies in cookies.txt (0=do not accept,* 1=accept) (\-\-cookies[=N])
+accept cookies in cookies.txt (0=do not accept\,* 1=accept) (\-\-cookies[=N])
 .IP \-u
-check document type if unknown (cgi,asp..) (u0 don t check, * u1 check but /, u2 check always) (\-\-check\-type[=N])
+check document type if unknown (cgi\,asp..) (u0 don t check\, * u1 check but /\, u2 check always) (\-\-check\-type[=N])
 .IP \-j
-*parse Java Classes (j0 don t parse, bitmask: |1 parse default, |2 don t parse .class |4 don t parse .js |8 don t be aggressive) (\-\-parse\-java[=N])
+*parse Java Classes (j0 don t parse\, bitmask: |1 parse default\, |2 don t parse .class |4 don t parse .js |8 don t be aggressive) (\-\-parse\-java[=N])
 .IP \-sN
-follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always, 3=always (even strict rules)) (\-\-robots[=N])
+follow robots.txt and meta robots tags (0=never\,1=sometimes\,* 2=always\, 3=always (even strict rules)) (\-\-robots[=N])
 .IP \-%h
-force HTTP/1.0 requests (reduce update features, only for old servers or proxies) (\-\-http\-10)
+force HTTP/1.0 requests (reduce update features\, only for old servers or proxies) (\-\-http\-10)
 .IP \-%k
-use keep\-alive if possible, greately reducing latency for small files and test requests (%k0 don t use) (\-\-keep\-alive)
+use keep\-alive if possible\, greately reducing latency for small files and test requests (%k0 don t use) (\-\-keep\-alive)
 .IP \-%B
-tolerant requests (accept bogus responses on some servers, but not standard!) (\-\-tolerant)
+tolerant requests (accept bogus responses on some servers\, but not standard!) (\-\-tolerant)
 .IP \-%s
-update hacks: various hacks to limit re\-transfers when updating (identical size, bogus response..) (\-\-updatehack)
+update hacks: various hacks to limit re\-transfers when updating (identical size\, bogus response..) (\-\-updatehack)
 .IP \-%u
-url hacks: various hacks to limit duplicate URLs (strip //, www.foo.com==foo.com..) (\-\-urlhack)
+url hacks: various hacks to limit duplicate URLs (strip //\, www.foo.com==foo.com..) (\-\-urlhack)
 .IP \-%A
-assume that a type (cgi,asp..) is always linked with a mime type (\-%A php3,cgi=text/html;dat,bin=application/x\-zip) (\-\-assume <param>)
+assume that a type (cgi\,asp..) is always linked with a mime type (\-%A php3\,cgi=text/html;dat\,bin=application/x\-zip) (\-\-assume <param>)
 .IP \-can
 also be used to force a specific file type: \-\-assume foo.cgi=text/html
 .IP \-@iN
-internet protocol (0=both ipv6+ipv4, 4=ipv4 only, 6=ipv6 only) (\-\-protocol[=N])
+internet protocol (0=both ipv6+ipv4\, 4=ipv4 only\, 6=ipv6 only) (\-\-protocol[=N])
 .IP \-%w
 disable a specific external mime module (\-%w htsswf \-%w htsjava) (\-\-disable\-module <param>)
 
@@ -345,15 +345,15 @@ from email address sent in HTTP headers (\-\-from <param>)
 .IP \-%F
 footer string in Html code (\-%F "Mirrored [from host %s [file %s [at %s]]]" (\-\-footer <param>)
 .IP \-%l
-preffered language (\-%l "fr, en, jp, *" (\-\-language <param>)
+preffered language (\-%l "fr\, en\, jp\, *" (\-\-language <param>)
 .IP \-%a
-accepted formats (\-%a "text/html,image/png;q=0.9,*/*;q=0.1" (\-\-accept <param>)
+accepted formats (\-%l "text/html\,image/png\,image/jpeg\,image/gif;q=0.9\,*/*;q=0.1" (\-\-accept <param>)
 .IP \-%X
 additional HTTP header line (\-%X "X\-Magic: 42" (\-\-headers <param>)
 
-.SS Log, index, cache
+.SS Log\, index\, cache
 .IP \-C
-create/use a cache for updates and retries (C0 no cache,C1 cache is prioritary,* C2 test update before) (\-\-cache[=N])
+create/use a cache for updates and retries (C0 no cache\,C1 cache is prioritary\,* C2 test update before) (\-\-cache[=N])
 .IP \-k
 store all files in cache (not useful if files on disk) (\-\-store\-all\-in\-cache)
 .IP \-%n
@@ -385,7 +385,7 @@ make an searchable index for this mirror (* %I0 don t make) (\-\-search\-index)
 .IP \-pN
 priority mode: (* p3) (\-\-priority[=N])
 .IP \-p0
-just scan, don t save anything (for checking links)
+just scan\, don t save anything (for checking links)
 .IP \-p1
 save only html files
 .IP \-p2
@@ -393,7 +393,7 @@ save only non html files
 .IP \-*p3
 save all files
 .IP \-p7
-get html files before, then treat other files
+get html files before\, then treat other files
 .IP \-S
 stay on the same directory (\-\-stay\-on\-same\-dir)
 .IP \-D
@@ -455,35 +455,35 @@ generate transfer rate statictics every minutes (\-\-debug\-ratestats)
 
 .SS Dangerous options: (do NOT use unless you exactly know what you are doing)
 .IP \-%!
-bypass built\-in security limits aimed to avoid bandwidth abuses (bandwidth, simultaneous connections) (\-\-disable\-security\-limits)
+bypass built\-in security limits aimed to avoid bandwidth abuses (bandwidth\, simultaneous connections) (\-\-disable\-security\-limits)
 .IP \-IMPORTANT
-NOTE: DANGEROUS OPTION, ONLY SUITABLE FOR EXPERTS
+NOTE: DANGEROUS OPTION\, ONLY SUITABLE FOR EXPERTS
 .IP \-USE
 IT WITH EXTREME CARE
 
 .SS Command\-line specific options:
 .IP \-V
-execute system command after each files ($0 is the filename: \-V "rm \\$0") (\-\-userdef\-cmd <param>)
+execute system command after each files ($0 is the filename: \-V "rm \$0") (\-\-userdef\-cmd <param>)
 .IP \-%W
-use an external library function as a wrapper (\-%W myfoo.so[,myparameters]) (\-\-callback <param>)
+use an external library function as a wrapper (\-%W myfoo.so[\,myparameters]) (\-\-callback <param>)
 
 .SS Details: Option N
 .IP \-N0
 Site\-structure (default)
 .IP \-N1
-HTML in web/, images/other files in web/images/
+HTML in web/\, images/other files in web/images/
 .IP \-N2
-HTML in web/HTML, images/other in web/images
+HTML in web/HTML\, images/other in web/images
 .IP \-N3
-HTML in web/,  images/other in web/
+HTML in web/\,  images/other in web/
 .IP \-N4
-HTML in web/, images/other in web/xxx, where xxx is the file extension (all gif will be placed onto web/gif, for example)
+HTML in web/\, images/other in web/xxx\, where xxx is the file extension (all gif will be placed onto web/gif\, for example)
 .IP \-N5
 Images/other in web/xxx and HTML in web/HTML
 .IP \-N99
-All files in web/, with random names (gadget !)
+All files in web/\, with random names (gadget !)
 .IP \-N100
-Site\-structure, without www.domain.xxx/
+Site\-structure\, without www.domain.xxx/
 .IP \-N101
 Identical to N1 exept that "web" is replaced by the site s name
 .IP \-N102
@@ -510,15 +510,15 @@ Identical to N5 exept that there is no "web" directory
 Identical to N99 exept 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)
+   %N  Name of file\, including file type (ex: image.gif)
    %t  File type (ex: gif)
    %p  Path [without ending /] (ex: /someimages)
    %h  Host name (ex: www.someweb.com)
-   %M  URL MD5 (128 bits, 32 ascii bytes)
-   %Q  query string MD5 (128 bits, 32 ascii bytes)
+   %M  URL MD5 (128 bits\, 32 ascii bytes)
+   %Q  query string MD5 (128 bits\, 32 ascii bytes)
    %k  full query string
    %r  protocol name (ex: http)
-   %q  small query string MD5 (16 bits, 4 ascii bytes)
+   %q  small query string MD5 (16 bits\, 4 ascii bytes)
       %s?  Short name version (ex: %sN)
    %[param]  param variable in query string
    %[param:before:after:empty:notfound]  advanced variable extraction
@@ -535,11 +535,11 @@ Identical to N99 exept that there is no "web" directory
 .IP \-empty
 : string replacement if the parameter was empty
 .IP \-all
-fields, except the first one (the parameter name), can be empty
+fields\, except the first one (the parameter name)\, can be empty
 
 .SS Details: Option K
 .IP \-K0
-foo.cgi?q=45  \->  foo4B54.html?q=45 (relative URI, default)
+foo.cgi?q=45  \->  foo4B54.html?q=45 (relative URI\, default)
 .IP \-K
 \->  http://www.foobar.com/folder/foo.cgi?q=45 (absolute URL) (\-\-keep\-links[=N])
 .IP \-K3
@@ -553,7 +553,7 @@ foo.cgi?q=45  \->  foo4B54.html?q=45 (relative URI, default)
 .IP \-\-mirror
      <URLs> *make a mirror of site(s) (default)
 .IP \-\-get
-        <URLs>  get the files indicated, do not seek other URLs (\-qg)
+        <URLs>  get the files indicated\, do not seek other URLs (\-qg)
 .IP \-\-list
   <text file>  add all URL located in this text file (\-%L)
 .IP \-\-mirrorlinks
@@ -561,15 +561,15 @@ foo.cgi?q=45  \->  foo4B54.html?q=45 (relative URI, default)
 .IP \-\-testlinks
   <URLs>  test links in pages (\-r1p0C0I0t)
 .IP \-\-spider
-     <URLs>  spider site(s), to test links: reports Errors & Warnings (\-p0C0I0t)
+     <URLs>  spider site(s)\, to test links: reports Errors & Warnings (\-p0C0I0t)
 .IP \-\-testsite
    <URLs>  identical to \-\-spider
 .IP \-\-skeleton
-   <URLs>  make a mirror, but gets only html files (\-p1)
+   <URLs>  make a mirror\, but gets only html files (\-p1)
 .IP \-\-update
-             update a mirror, without confirmation (\-iC2)
+             update a mirror\, without confirmation (\-iC2)
 .IP \-\-continue
-           continue a mirror, without confirmation (\-iC1)
+           continue a mirror\, without confirmation (\-iC1)
 
 .IP \-\-catchurl
            create a temporary proxy to capture an URL or a form post URL
@@ -610,7 +610,7 @@ Please reports bugs to
 .B <bugs@httrack.com>.
 Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary.
 .SH COPYRIGHT
-Copyright (C) 1998-2015 Xavier Roche and other contributors
+Copyright (C) 1998-2014 Xavier Roche and other contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by